From 7a9b00ce7716f522d49aa36666c74a71cd12203a Mon Sep 17 00:00:00 2001
From: robert <robert@openbsd.org>
Date: Sat, 11 Nov 2023 18:20:20 +0000
Subject: [PATCH] merge clang-16.0.6

---
 gnu/llvm/clang/CODE_OWNERS.TXT                |    62 -
 gnu/llvm/clang/INPUTS/Cocoa_h.m               |     2 -
 gnu/llvm/clang/INPUTS/all-std-headers.cpp     |    86 -
 gnu/llvm/clang/INPUTS/c99-intconst-1.c        |   639 -
 gnu/llvm/clang/INPUTS/carbon_h.c              |     4 -
 gnu/llvm/clang/INPUTS/cfg-big-switch.c        |    27 -
 gnu/llvm/clang/INPUTS/cfg-long-chain1.c       |    20 -
 gnu/llvm/clang/INPUTS/cfg-long-chain2.c       |    20 -
 gnu/llvm/clang/INPUTS/cfg-long-chain3.c       |    21 -
 gnu/llvm/clang/INPUTS/cfg-nested-switches.c   |    36 -
 .../clang/INPUTS/cfg-nested-var-scopes.cpp    |    59 -
 gnu/llvm/clang/INPUTS/iostream.cc             |     5 -
 gnu/llvm/clang/INPUTS/macro_pounder_fn.c      |    17 -
 gnu/llvm/clang/INPUTS/macro_pounder_obj.c     |    16 -
 gnu/llvm/clang/INPUTS/stpcpy-test.c           |    47 -
 gnu/llvm/clang/docs/Block-ABI-Apple.txt       |     1 -
 .../clang/docs/ClangCommandLineReference.rst  |  4057 ---
 gnu/llvm/clang/docs/CommandGuide/clang.rst    |    48 +-
 gnu/llvm/clang/docs/Makefile.sphinx           |   163 -
 .../examples/clang-interpreter/CMakeLists.txt |    93 -
 .../examples/clang-interpreter/README.txt     |    20 -
 .../clang/examples/clang-interpreter/Test.cxx |    33 -
 .../clang/examples/clang-interpreter/main.cpp |   234 -
 .../clang/include/clang/AST/FormatString.h    |    30 +-
 .../clang/Analysis/AnalysisDiagnostic.h       |    14 -
 .../include/clang/Basic/CodeGenOptions.def    |    83 +-
 .../clang/Basic/DiagnosticFrontendKinds.td    |    51 +-
 .../include/clang/Basic/DiagnosticGroups.td   |   154 +-
 .../clang/Basic/DiagnosticSemaKinds.td        |   997 +-
 .../clang/include/clang/Basic/LangOptions.def |    66 +-
 .../clang/include/clang/Basic/TargetInfo.h    |   271 +-
 .../clang/include/clang/Basic/X86Target.def   |   110 -
 .../clang/include/clang/Driver/Options.td     |  1599 +-
 .../Lex/DependencyDirectivesSourceMinimizer.h |   112 -
 ...rExcludedConditionalDirectiveSkipMapping.h |    30 -
 gnu/llvm/clang/include/clang/Sema/Sema.h      |  1877 +-
 .../StaticAnalyzer/Checkers/LocalCheckers.h   |    27 -
 gnu/llvm/clang/lib/AST/FormatString.cpp       |   145 +-
 gnu/llvm/clang/lib/Basic/TargetInfo.cpp       |   154 +-
 gnu/llvm/clang/lib/Basic/Targets/Mips.h       |     9 +-
 gnu/llvm/clang/lib/Basic/Targets/OSTargets.h  |   173 +-
 gnu/llvm/clang/lib/Basic/Targets/RISCV.cpp    |   312 +-
 gnu/llvm/clang/lib/Basic/Targets/SystemZ.h    |    62 +-
 gnu/llvm/clang/lib/Basic/Targets/X86.cpp      |   241 +-
 gnu/llvm/clang/lib/Basic/Targets/X86.h        |    95 +-
 gnu/llvm/clang/lib/CodeGen/CGCall.cpp         |   721 +-
 .../lib/CodeGen/CGOpenMPRuntimeAMDGCN.cpp     |    60 -
 .../clang/lib/CodeGen/CGOpenMPRuntimeAMDGCN.h |    43 -
 .../lib/CodeGen/CGOpenMPRuntimeNVPTX.cpp      |    56 -
 .../clang/lib/CodeGen/CGOpenMPRuntimeNVPTX.h  |    43 -
 gnu/llvm/clang/lib/CodeGen/CodeGenModule.cpp  |  1638 +-
 gnu/llvm/clang/lib/CodeGen/TargetInfo.cpp     |  2454 +-
 gnu/llvm/clang/lib/Driver/Driver.cpp          |  2435 +-
 .../lib/Driver/ToolChains/Arch/RISCV.cpp      |   549 +-
 .../clang/lib/Driver/ToolChains/Arch/X86.cpp  |    79 +-
 .../clang/lib/Driver/ToolChains/Clang.cpp     |  2550 +-
 gnu/llvm/clang/lib/Driver/ToolChains/Gnu.cpp  |   394 +-
 gnu/llvm/clang/lib/Driver/ToolChains/HIP.cpp  |   458 -
 gnu/llvm/clang/lib/Driver/ToolChains/HIP.h    |   108 -
 .../lib/Driver/ToolChains/MSVCSetupApi.h      |   514 -
 .../clang/lib/Driver/ToolChains/OpenBSD.cpp   |    96 +-
 .../clang/lib/Driver/ToolChains/OpenBSD.h     |    14 +-
 .../clang/lib/Frontend/CompilerInstance.cpp   |   598 +-
 .../clang/lib/Frontend/CompilerInvocation.cpp |  1069 +-
 .../clang/lib/Frontend/InitHeaderSearch.cpp   |   656 -
 .../DependencyDirectivesSourceMinimizer.cpp   |   961 -
 gnu/llvm/clang/lib/Sema/SemaChecking.cpp      |  3113 ++-
 gnu/llvm/clang/lib/Sema/SemaDeclAttr.cpp      |  1506 +-
 gnu/llvm/clang/lib/Sema/SemaDeclCXX.cpp       |  1489 +-
 .../clang/lib/StaticAnalyzer/Checkers/Taint.h |   106 -
 .../clang-offload-wrapper/CMakeLists.txt      |    19 -
 .../ClangOffloadWrapper.cpp                   |   378 -
 .../clang/tools/clang-shlib/CMakeLists.txt    |     2 +-
 .../unittests/AST/ASTContextParentMapTest.cpp |   123 -
 .../unittests/AST/ASTImporterFixtures.cpp     |   238 -
 .../clang/unittests/AST/ASTImporterFixtures.h |   472 -
 .../AST/ASTImporterGenericRedeclTest.cpp      |   647 -
 .../AST/ASTImporterODRStrategiesTest.cpp      |   696 -
 .../unittests/AST/ASTImporterObjCTest.cpp     |    89 -
 .../clang/unittests/AST/ASTImporterTest.cpp   |  6802 -----
 .../AST/ASTImporterVisibilityTest.cpp         |   521 -
 gnu/llvm/clang/unittests/AST/ASTPrint.h       |   115 -
 .../clang/unittests/AST/ASTTraverserTest.cpp  |  1845 --
 .../clang/unittests/AST/ASTTypeTraitsTest.cpp |   195 -
 .../clang/unittests/AST/ASTVectorTest.cpp     |    92 -
 gnu/llvm/clang/unittests/AST/CMakeLists.txt   |    49 -
 gnu/llvm/clang/unittests/AST/CommentLexer.cpp |  1845 --
 .../clang/unittests/AST/CommentParser.cpp     |  1445 -
 .../clang/unittests/AST/CommentTextTest.cpp   |   134 -
 .../unittests/AST/DataCollectionTest.cpp      |   172 -
 gnu/llvm/clang/unittests/AST/DeclMatcher.h    |    78 -
 .../clang/unittests/AST/DeclPrinterTest.cpp   |  1397 -
 gnu/llvm/clang/unittests/AST/DeclTest.cpp     |   140 -
 .../unittests/AST/EvaluateAsRValueTest.cpp    |   110 -
 .../unittests/AST/ExternalASTSourceTest.cpp   |    82 -
 gnu/llvm/clang/unittests/AST/MatchVerifier.h  |   320 -
 .../unittests/AST/NamedDeclPrinterTest.cpp    |   267 -
 .../unittests/AST/RecursiveASTVisitorTest.cpp |   105 -
 .../clang/unittests/AST/SizelessTypesTest.cpp |    86 -
 .../unittests/AST/SourceLocationTest.cpp      |   914 -
 .../clang/unittests/AST/StmtPrinterTest.cpp   |   265 -
 .../AST/StructuralEquivalenceTest.cpp         |  1784 --
 .../clang/unittests/AST/TypePrinterTest.cpp   |    65 -
 .../ASTMatchers/ASTMatchersInternalTest.cpp   |   252 -
 .../ASTMatchers/ASTMatchersNarrowingTest.cpp  |  4449 ---
 .../ASTMatchers/ASTMatchersNodeTest.cpp       |  2325 --
 .../unittests/ASTMatchers/ASTMatchersTest.h   |   448 -
 .../ASTMatchers/ASTMatchersTraversalTest.cpp  |  5749 ----
 .../unittests/ASTMatchers/CMakeLists.txt      |    30 -
 .../ASTMatchers/Dynamic/CMakeLists.txt        |    22 -
 .../ASTMatchers/Dynamic/ParserTest.cpp        |   644 -
 .../ASTMatchers/Dynamic/RegistryTest.cpp      |   591 -
 .../ASTMatchers/Dynamic/VariantValueTest.cpp  |   209 -
 .../ASTMatchers/GtestMatchersTest.cpp         |   418 -
 .../clang/unittests/Analysis/CFGBuildResult.h |    82 -
 .../unittests/Analysis/CFGDominatorTree.cpp   |   194 -
 gnu/llvm/clang/unittests/Analysis/CFGTest.cpp |   273 -
 .../clang/unittests/Analysis/CMakeLists.txt   |    30 -
 .../unittests/Analysis/CloneDetectionTest.cpp |   111 -
 .../Analysis/ExprMutationAnalyzerTest.cpp     |  1463 -
 .../Analysis/MacroExpansionContextTest.cpp    |   424 -
 gnu/llvm/clang/unittests/Basic/CMakeLists.txt |    21 -
 .../clang/unittests/Basic/CharInfoTest.cpp    |   503 -
 .../unittests/Basic/DarwinSDKInfoTest.cpp     |    66 -
 .../clang/unittests/Basic/DiagnosticTest.cpp  |    95 -
 .../clang/unittests/Basic/FileEntryTest.cpp   |   207 -
 .../clang/unittests/Basic/FileManagerTest.cpp |   586 -
 .../unittests/Basic/LineOffsetMappingTest.cpp |    79 -
 .../clang/unittests/Basic/SanitizersTest.cpp  |    49 -
 .../unittests/Basic/SourceManagerTest.cpp     |   519 -
 gnu/llvm/clang/unittests/CMakeLists.txt       |    47 -
 .../unittests/CodeGen/BufferSourceTest.cpp    |    51 -
 .../clang/unittests/CodeGen/CMakeLists.txt    |    23 -
 .../CodeGen/CheckTargetFeaturesTest.cpp       |    39 -
 .../unittests/CodeGen/CodeGenExternalTest.cpp |   276 -
 gnu/llvm/clang/unittests/CodeGen/IRMatchers.h |   451 -
 .../unittests/CodeGen/TBAAMetadataTest.cpp    |  1242 -
 .../clang/unittests/CodeGen/TestCompiler.h    |   111 -
 .../clang/unittests/CrossTU/CMakeLists.txt    |    18 -
 .../CrossTU/CrossTranslationUnitTest.cpp      |   277 -
 .../unittests/DirectoryWatcher/CMakeLists.txt |    18 -
 .../DirectoryWatcher/DirectoryWatcherTest.cpp |   501 -
 .../clang/unittests/Driver/CMakeLists.txt     |    20 -
 .../clang/unittests/Driver/DistroTest.cpp     |   396 -
 .../unittests/Driver/ModuleCacheTest.cpp      |    27 -
 .../clang/unittests/Driver/MultilibTest.cpp   |   375 -
 .../unittests/Driver/SanitizerArgsTest.cpp    |   141 -
 .../clang/unittests/Driver/ToolChainTest.cpp  |   367 -
 .../clang/unittests/Format/CMakeLists.txt     |    34 -
 .../clang/unittests/Format/CleanupTest.cpp    |   532 -
 .../clang/unittests/Format/FormatTest.cpp     | 22252 ----------------
 .../unittests/Format/FormatTestCSharp.cpp     |  1104 -
 .../unittests/Format/FormatTestComments.cpp   |  3983 ---
 .../clang/unittests/Format/FormatTestJS.cpp   |  2608 --
 .../clang/unittests/Format/FormatTestJava.cpp |   588 -
 .../clang/unittests/Format/FormatTestJson.cpp |   197 -
 .../clang/unittests/Format/FormatTestObjC.cpp |  1531 --
 .../unittests/Format/FormatTestProto.cpp      |   671 -
 .../unittests/Format/FormatTestRawStrings.cpp |   997 -
 .../unittests/Format/FormatTestSelective.cpp  |   608 -
 .../unittests/Format/FormatTestTableGen.cpp   |    59 -
 .../unittests/Format/FormatTestTextProto.cpp  |   744 -
 .../clang/unittests/Format/FormatTestUtils.h  |    67 -
 .../unittests/Format/MacroExpanderTest.cpp    |   207 -
 .../Format/NamespaceEndCommentsFixerTest.cpp  |  1190 -
 .../unittests/Format/SortImportsTestJS.cpp    |   447 -
 .../unittests/Format/SortImportsTestJava.cpp  |   353 -
 .../unittests/Format/SortIncludesTest.cpp     |  1050 -
 gnu/llvm/clang/unittests/Format/TestLexer.h   |   123 -
 .../unittests/Format/TokenAnnotatorTest.cpp   |    72 -
 .../Format/UsingDeclarationsSorterTest.cpp    |   374 -
 .../clang/unittests/Frontend/ASTUnitTest.cpp  |   177 -
 .../clang/unittests/Frontend/CMakeLists.txt   |    27 -
 .../unittests/Frontend/CodeGenActionTest.cpp  |    62 -
 .../Frontend/CompilerInstanceTest.cpp         |    95 -
 .../Frontend/CompilerInvocationTest.cpp       |   998 -
 .../unittests/Frontend/FixedPointString.cpp   |   107 -
 .../unittests/Frontend/FrontendActionTest.cpp |   295 -
 .../unittests/Frontend/OutputStreamTest.cpp   |   112 -
 .../unittests/Frontend/PCHPreambleTest.cpp    |   265 -
 .../Frontend/ParsedSourceLocationTest.cpp     |    36 -
 .../unittests/Frontend/TextDiagnosticTest.cpp |   100 -
 gnu/llvm/clang/unittests/Index/CMakeLists.txt |    19 -
 gnu/llvm/clang/unittests/Index/IndexTests.cpp |   382 -
 .../unittests/Interpreter/CMakeLists.txt      |    14 -
 .../Interpreter/IncrementalProcessingTest.cpp |    80 -
 .../unittests/Interpreter/InterpreterTest.cpp |   128 -
 .../unittests/Introspection/CMakeLists.txt    |    22 -
 .../Introspection/IntrospectionTest.cpp       |  1606 --
 gnu/llvm/clang/unittests/Lex/CMakeLists.txt   |    21 -
 ...ependencyDirectivesSourceMinimizerTest.cpp |   820 -
 .../clang/unittests/Lex/HeaderMapTest.cpp     |   187 -
 .../clang/unittests/Lex/HeaderMapTestUtils.h  |   100 -
 .../clang/unittests/Lex/HeaderSearchTest.cpp  |   183 -
 gnu/llvm/clang/unittests/Lex/LexerTest.cpp    |   635 -
 .../clang/unittests/Lex/PPCallbacksTest.cpp   |   555 -
 .../Lex/PPConditionalDirectiveRecordTest.cpp  |   134 -
 .../clang/unittests/Rename/CMakeLists.txt     |    29 -
 .../clang/unittests/Rename/ClangRenameTest.h  |   116 -
 .../unittests/Rename/RenameAliasTest.cpp      |   303 -
 .../unittests/Rename/RenameClassTest.cpp      |   820 -
 .../clang/unittests/Rename/RenameEnumTest.cpp |   189 -
 .../unittests/Rename/RenameFunctionTest.cpp   |   573 -
 .../unittests/Rename/RenameMemberTest.cpp     |   228 -
 .../clang/unittests/Rewrite/CMakeLists.txt    |    15 -
 .../unittests/Rewrite/RewriteBufferTest.cpp   |   113 -
 .../clang/unittests/Rewrite/RewriterTest.cpp  |    80 -
 gnu/llvm/clang/unittests/Sema/CMakeLists.txt  |    28 -
 .../clang/unittests/Sema/CodeCompleteTest.cpp |   496 -
 .../unittests/Sema/ExternalSemaSourceTest.cpp |   317 -
 .../Sema/GslOwnerPointerInference.cpp         |    55 -
 .../unittests/Serialization/CMakeLists.txt    |    20 -
 .../Serialization/InMemoryModuleCacheTest.cpp |   119 -
 .../Serialization/ModuleCacheTest.cpp         |   179 -
 .../StaticAnalyzer/AnalyzerOptionsTest.cpp    |    97 -
 .../BugReportInterestingnessTest.cpp          |   162 -
 .../unittests/StaticAnalyzer/CMakeLists.txt   |    33 -
 .../StaticAnalyzer/CallDescriptionTest.cpp    |   162 -
 .../StaticAnalyzer/CallEventTest.cpp          |    89 -
 .../StaticAnalyzer/CheckerRegistration.h      |   110 -
 .../FalsePositiveRefutationBRVisitorTest.cpp  |   223 -
 .../StaticAnalyzer/ParamRegionTest.cpp        |   124 -
 .../unittests/StaticAnalyzer/RangeSetTest.cpp |   349 -
 .../RegisterCustomCheckersTest.cpp            |   461 -
 .../unittests/StaticAnalyzer/Reusables.h      |   155 -
 .../unittests/StaticAnalyzer/SValTest.cpp     |   366 -
 .../unittests/StaticAnalyzer/StoreTest.cpp    |   155 -
 .../StaticAnalyzer/SymbolReaperTest.cpp       |    71 -
 .../TestReturnValueUnderConstruction.cpp      |   121 -
 .../unittests/Tooling/ASTSelectionTest.cpp    |  1084 -
 .../clang/unittests/Tooling/CMakeLists.txt    |    91 -
 .../clang/unittests/Tooling/CastExprTest.cpp  |    57 -
 .../unittests/Tooling/CommentHandlerTest.cpp  |   223 -
 .../Tooling/CompilationDatabaseTest.cpp       |   977 -
 .../Tooling/DependencyScannerTest.cpp         |   238 -
 .../unittests/Tooling/DiagnosticsYamlTest.cpp |   220 -
 .../clang/unittests/Tooling/ExecutionTest.cpp |   297 -
 .../clang/unittests/Tooling/FixItTest.cpp     |   231 -
 .../unittests/Tooling/HeaderIncludesTest.cpp  |   555 -
 ...exicallyOrderedRecursiveASTVisitorTest.cpp |   226 -
 .../clang/unittests/Tooling/LookupTest.cpp    |   251 -
 .../unittests/Tooling/QualTypeNamesTest.cpp   |   260 -
 .../unittests/Tooling/RangeSelectorTest.cpp   |   778 -
 .../RecursiveASTVisitorTestDeclVisitor.cpp    |   139 -
 ...ecursiveASTVisitorTestPostOrderVisitor.cpp |   115 -
 .../RecursiveASTVisitorTestTypeLocVisitor.cpp |    91 -
 .../Tooling/RecursiveASTVisitorTests/Attr.cpp |    51 -
 .../CXXBoolLiteralExpr.cpp                    |    36 -
 .../CXXMemberCall.cpp                         |    97 -
 .../CXXMethodDecl.cpp                         |    76 -
 .../CXXOperatorCallExprTraverser.cpp          |    37 -
 .../CallbacksBinaryOperator.cpp               |   210 -
 .../CallbacksCallExpr.cpp                     |   248 -
 .../CallbacksCommon.h                         |   101 -
 .../CallbacksCompoundAssignOperator.cpp       |   211 -
 .../CallbacksLeaf.cpp                         |   284 -
 .../CallbacksUnaryOperator.cpp                |   200 -
 .../RecursiveASTVisitorTests/Class.cpp        |    40 -
 .../RecursiveASTVisitorTests/Concept.cpp      |    45 -
 .../ConstructExpr.cpp                         |    75 -
 .../RecursiveASTVisitorTests/DeclRefExpr.cpp  |   124 -
 .../RecursiveASTVisitorTests/ImplicitCtor.cpp |    42 -
 .../ImplicitCtorInitializer.cpp               |    57 -
 .../InitListExprPostOrder.cpp                 |    35 -
 .../InitListExprPostOrderNoQueue.cpp          |    39 -
 .../InitListExprPreOrder.cpp                  |    52 -
 .../InitListExprPreOrderNoQueue.cpp           |    37 -
 .../IntegerLiteral.cpp                        |    32 -
 .../LambdaDefaultCapture.cpp                  |    34 -
 .../RecursiveASTVisitorTests/LambdaExpr.cpp   |    99 -
 .../LambdaTemplateParams.cpp                  |    53 -
 .../MemberPointerTypeLoc.cpp                  |    58 -
 .../NestedNameSpecifiers.cpp                  |    73 -
 .../RecursiveASTVisitorTests/ParenExpr.cpp    |    29 -
 .../TemplateArgumentLocTraverser.cpp          |    39 -
 .../TraversalScope.cpp                        |    57 -
 .../Tooling/RefactoringActionRulesTest.cpp    |   247 -
 .../Tooling/RefactoringCallbacksTest.cpp      |   151 -
 .../unittests/Tooling/RefactoringTest.cpp     |  1734 --
 .../clang/unittests/Tooling/ReplacementTest.h |    55 -
 .../Tooling/ReplacementsYamlTest.cpp          |   122 -
 .../clang/unittests/Tooling/RewriterTest.cpp  |    53 -
 .../unittests/Tooling/RewriterTestContext.h   |   144 -
 .../Tooling/SourceCodeBuildersTest.cpp        |   248 -
 .../unittests/Tooling/SourceCodeTest.cpp      |   691 -
 .../clang/unittests/Tooling/StencilTest.cpp   |   710 -
 .../Tooling/Syntax/BuildTreeTest.cpp          |  5840 ----
 .../unittests/Tooling/Syntax/CMakeLists.txt   |    30 -
 .../Tooling/Syntax/MutationsTest.cpp          |    74 -
 .../Tooling/Syntax/SynthesisTest.cpp          |   269 -
 .../unittests/Tooling/Syntax/TokensTest.cpp   |  1050 -
 .../unittests/Tooling/Syntax/TreeTest.cpp     |   406 -
 .../unittests/Tooling/Syntax/TreeTestBase.cpp |   178 -
 .../unittests/Tooling/Syntax/TreeTestBase.h   |    68 -
 .../clang/unittests/Tooling/TestVisitor.h     |   252 -
 .../clang/unittests/Tooling/ToolingTest.cpp   |   913 -
 .../unittests/Tooling/TransformerTest.cpp     |  1641 --
 .../clang/unittests/libclang/CMakeLists.txt   |    10 -
 .../libclang/CrashTests/CMakeLists.txt        |     8 -
 .../libclang/CrashTests/LibclangCrashTest.cpp |    37 -
 .../clang/unittests/libclang/LibclangTest.cpp |   932 -
 gnu/llvm/clang/unittests/libclang/TestUtils.h |    94 -
 302 files changed, 17230 insertions(+), 140183 deletions(-)
 delete mode 100644 gnu/llvm/clang/CODE_OWNERS.TXT
 delete mode 100644 gnu/llvm/clang/INPUTS/Cocoa_h.m
 delete mode 100644 gnu/llvm/clang/INPUTS/all-std-headers.cpp
 delete mode 100644 gnu/llvm/clang/INPUTS/c99-intconst-1.c
 delete mode 100644 gnu/llvm/clang/INPUTS/carbon_h.c
 delete mode 100644 gnu/llvm/clang/INPUTS/cfg-big-switch.c
 delete mode 100644 gnu/llvm/clang/INPUTS/cfg-long-chain1.c
 delete mode 100644 gnu/llvm/clang/INPUTS/cfg-long-chain2.c
 delete mode 100644 gnu/llvm/clang/INPUTS/cfg-long-chain3.c
 delete mode 100644 gnu/llvm/clang/INPUTS/cfg-nested-switches.c
 delete mode 100644 gnu/llvm/clang/INPUTS/cfg-nested-var-scopes.cpp
 delete mode 100644 gnu/llvm/clang/INPUTS/iostream.cc
 delete mode 100644 gnu/llvm/clang/INPUTS/macro_pounder_fn.c
 delete mode 100644 gnu/llvm/clang/INPUTS/macro_pounder_obj.c
 delete mode 100644 gnu/llvm/clang/INPUTS/stpcpy-test.c
 delete mode 100644 gnu/llvm/clang/docs/Block-ABI-Apple.txt
 delete mode 100644 gnu/llvm/clang/docs/ClangCommandLineReference.rst
 delete mode 100644 gnu/llvm/clang/docs/Makefile.sphinx
 delete mode 100644 gnu/llvm/clang/examples/clang-interpreter/CMakeLists.txt
 delete mode 100644 gnu/llvm/clang/examples/clang-interpreter/README.txt
 delete mode 100644 gnu/llvm/clang/examples/clang-interpreter/Test.cxx
 delete mode 100644 gnu/llvm/clang/examples/clang-interpreter/main.cpp
 delete mode 100644 gnu/llvm/clang/include/clang/Analysis/AnalysisDiagnostic.h
 delete mode 100644 gnu/llvm/clang/include/clang/Basic/X86Target.def
 delete mode 100644 gnu/llvm/clang/include/clang/Lex/DependencyDirectivesSourceMinimizer.h
 delete mode 100644 gnu/llvm/clang/include/clang/Lex/PreprocessorExcludedConditionalDirectiveSkipMapping.h
 delete mode 100644 gnu/llvm/clang/include/clang/StaticAnalyzer/Checkers/LocalCheckers.h
 delete mode 100644 gnu/llvm/clang/lib/CodeGen/CGOpenMPRuntimeAMDGCN.cpp
 delete mode 100644 gnu/llvm/clang/lib/CodeGen/CGOpenMPRuntimeAMDGCN.h
 delete mode 100644 gnu/llvm/clang/lib/CodeGen/CGOpenMPRuntimeNVPTX.cpp
 delete mode 100644 gnu/llvm/clang/lib/CodeGen/CGOpenMPRuntimeNVPTX.h
 delete mode 100644 gnu/llvm/clang/lib/Driver/ToolChains/HIP.cpp
 delete mode 100644 gnu/llvm/clang/lib/Driver/ToolChains/HIP.h
 delete mode 100644 gnu/llvm/clang/lib/Driver/ToolChains/MSVCSetupApi.h
 delete mode 100644 gnu/llvm/clang/lib/Frontend/InitHeaderSearch.cpp
 delete mode 100644 gnu/llvm/clang/lib/Lex/DependencyDirectivesSourceMinimizer.cpp
 delete mode 100644 gnu/llvm/clang/lib/StaticAnalyzer/Checkers/Taint.h
 delete mode 100644 gnu/llvm/clang/tools/clang-offload-wrapper/CMakeLists.txt
 delete mode 100644 gnu/llvm/clang/tools/clang-offload-wrapper/ClangOffloadWrapper.cpp
 delete mode 100644 gnu/llvm/clang/unittests/AST/ASTContextParentMapTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/AST/ASTImporterFixtures.cpp
 delete mode 100644 gnu/llvm/clang/unittests/AST/ASTImporterFixtures.h
 delete mode 100644 gnu/llvm/clang/unittests/AST/ASTImporterGenericRedeclTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/AST/ASTImporterODRStrategiesTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/AST/ASTImporterObjCTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/AST/ASTImporterTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/AST/ASTImporterVisibilityTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/AST/ASTPrint.h
 delete mode 100644 gnu/llvm/clang/unittests/AST/ASTTraverserTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/AST/ASTTypeTraitsTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/AST/ASTVectorTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/AST/CMakeLists.txt
 delete mode 100644 gnu/llvm/clang/unittests/AST/CommentLexer.cpp
 delete mode 100644 gnu/llvm/clang/unittests/AST/CommentParser.cpp
 delete mode 100644 gnu/llvm/clang/unittests/AST/CommentTextTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/AST/DataCollectionTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/AST/DeclMatcher.h
 delete mode 100644 gnu/llvm/clang/unittests/AST/DeclPrinterTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/AST/DeclTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/AST/EvaluateAsRValueTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/AST/ExternalASTSourceTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/AST/MatchVerifier.h
 delete mode 100644 gnu/llvm/clang/unittests/AST/NamedDeclPrinterTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/AST/RecursiveASTVisitorTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/AST/SizelessTypesTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/AST/SourceLocationTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/AST/StmtPrinterTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/AST/StructuralEquivalenceTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/AST/TypePrinterTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/ASTMatchers/ASTMatchersInternalTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/ASTMatchers/ASTMatchersNarrowingTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/ASTMatchers/ASTMatchersNodeTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/ASTMatchers/ASTMatchersTest.h
 delete mode 100644 gnu/llvm/clang/unittests/ASTMatchers/ASTMatchersTraversalTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/ASTMatchers/CMakeLists.txt
 delete mode 100644 gnu/llvm/clang/unittests/ASTMatchers/Dynamic/CMakeLists.txt
 delete mode 100644 gnu/llvm/clang/unittests/ASTMatchers/Dynamic/ParserTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/ASTMatchers/Dynamic/RegistryTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/ASTMatchers/Dynamic/VariantValueTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/ASTMatchers/GtestMatchersTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Analysis/CFGBuildResult.h
 delete mode 100644 gnu/llvm/clang/unittests/Analysis/CFGDominatorTree.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Analysis/CFGTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Analysis/CMakeLists.txt
 delete mode 100644 gnu/llvm/clang/unittests/Analysis/CloneDetectionTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Analysis/ExprMutationAnalyzerTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Analysis/MacroExpansionContextTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Basic/CMakeLists.txt
 delete mode 100644 gnu/llvm/clang/unittests/Basic/CharInfoTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Basic/DarwinSDKInfoTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Basic/DiagnosticTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Basic/FileEntryTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Basic/FileManagerTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Basic/LineOffsetMappingTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Basic/SanitizersTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Basic/SourceManagerTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/CMakeLists.txt
 delete mode 100644 gnu/llvm/clang/unittests/CodeGen/BufferSourceTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/CodeGen/CMakeLists.txt
 delete mode 100644 gnu/llvm/clang/unittests/CodeGen/CheckTargetFeaturesTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/CodeGen/CodeGenExternalTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/CodeGen/IRMatchers.h
 delete mode 100644 gnu/llvm/clang/unittests/CodeGen/TBAAMetadataTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/CodeGen/TestCompiler.h
 delete mode 100644 gnu/llvm/clang/unittests/CrossTU/CMakeLists.txt
 delete mode 100644 gnu/llvm/clang/unittests/CrossTU/CrossTranslationUnitTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/DirectoryWatcher/CMakeLists.txt
 delete mode 100644 gnu/llvm/clang/unittests/DirectoryWatcher/DirectoryWatcherTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Driver/CMakeLists.txt
 delete mode 100644 gnu/llvm/clang/unittests/Driver/DistroTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Driver/ModuleCacheTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Driver/MultilibTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Driver/SanitizerArgsTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Driver/ToolChainTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Format/CMakeLists.txt
 delete mode 100644 gnu/llvm/clang/unittests/Format/CleanupTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Format/FormatTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Format/FormatTestCSharp.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Format/FormatTestComments.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Format/FormatTestJS.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Format/FormatTestJava.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Format/FormatTestJson.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Format/FormatTestObjC.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Format/FormatTestProto.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Format/FormatTestRawStrings.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Format/FormatTestSelective.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Format/FormatTestTableGen.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Format/FormatTestTextProto.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Format/FormatTestUtils.h
 delete mode 100644 gnu/llvm/clang/unittests/Format/MacroExpanderTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Format/NamespaceEndCommentsFixerTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Format/SortImportsTestJS.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Format/SortImportsTestJava.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Format/SortIncludesTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Format/TestLexer.h
 delete mode 100644 gnu/llvm/clang/unittests/Format/TokenAnnotatorTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Format/UsingDeclarationsSorterTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Frontend/ASTUnitTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Frontend/CMakeLists.txt
 delete mode 100644 gnu/llvm/clang/unittests/Frontend/CodeGenActionTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Frontend/CompilerInstanceTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Frontend/CompilerInvocationTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Frontend/FixedPointString.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Frontend/FrontendActionTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Frontend/OutputStreamTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Frontend/PCHPreambleTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Frontend/ParsedSourceLocationTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Frontend/TextDiagnosticTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Index/CMakeLists.txt
 delete mode 100644 gnu/llvm/clang/unittests/Index/IndexTests.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Interpreter/CMakeLists.txt
 delete mode 100644 gnu/llvm/clang/unittests/Interpreter/IncrementalProcessingTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Interpreter/InterpreterTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Introspection/CMakeLists.txt
 delete mode 100644 gnu/llvm/clang/unittests/Introspection/IntrospectionTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Lex/CMakeLists.txt
 delete mode 100644 gnu/llvm/clang/unittests/Lex/DependencyDirectivesSourceMinimizerTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Lex/HeaderMapTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Lex/HeaderMapTestUtils.h
 delete mode 100644 gnu/llvm/clang/unittests/Lex/HeaderSearchTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Lex/LexerTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Lex/PPCallbacksTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Lex/PPConditionalDirectiveRecordTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Rename/CMakeLists.txt
 delete mode 100644 gnu/llvm/clang/unittests/Rename/ClangRenameTest.h
 delete mode 100644 gnu/llvm/clang/unittests/Rename/RenameAliasTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Rename/RenameClassTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Rename/RenameEnumTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Rename/RenameFunctionTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Rename/RenameMemberTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Rewrite/CMakeLists.txt
 delete mode 100644 gnu/llvm/clang/unittests/Rewrite/RewriteBufferTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Rewrite/RewriterTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Sema/CMakeLists.txt
 delete mode 100644 gnu/llvm/clang/unittests/Sema/CodeCompleteTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Sema/ExternalSemaSourceTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Sema/GslOwnerPointerInference.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Serialization/CMakeLists.txt
 delete mode 100644 gnu/llvm/clang/unittests/Serialization/InMemoryModuleCacheTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Serialization/ModuleCacheTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/StaticAnalyzer/AnalyzerOptionsTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/StaticAnalyzer/BugReportInterestingnessTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/StaticAnalyzer/CMakeLists.txt
 delete mode 100644 gnu/llvm/clang/unittests/StaticAnalyzer/CallDescriptionTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/StaticAnalyzer/CallEventTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/StaticAnalyzer/CheckerRegistration.h
 delete mode 100644 gnu/llvm/clang/unittests/StaticAnalyzer/FalsePositiveRefutationBRVisitorTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/StaticAnalyzer/ParamRegionTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/StaticAnalyzer/RangeSetTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/StaticAnalyzer/RegisterCustomCheckersTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/StaticAnalyzer/Reusables.h
 delete mode 100644 gnu/llvm/clang/unittests/StaticAnalyzer/SValTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/StaticAnalyzer/StoreTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/StaticAnalyzer/SymbolReaperTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/StaticAnalyzer/TestReturnValueUnderConstruction.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Tooling/ASTSelectionTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Tooling/CMakeLists.txt
 delete mode 100644 gnu/llvm/clang/unittests/Tooling/CastExprTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Tooling/CommentHandlerTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Tooling/CompilationDatabaseTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Tooling/DependencyScannerTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Tooling/DiagnosticsYamlTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Tooling/ExecutionTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Tooling/FixItTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Tooling/HeaderIncludesTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Tooling/LexicallyOrderedRecursiveASTVisitorTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Tooling/LookupTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Tooling/QualTypeNamesTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Tooling/RangeSelectorTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTestDeclVisitor.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTestPostOrderVisitor.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTestTypeLocVisitor.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/Attr.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/CXXBoolLiteralExpr.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/CXXMemberCall.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/CXXMethodDecl.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/CXXOperatorCallExprTraverser.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/CallbacksBinaryOperator.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/CallbacksCallExpr.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/CallbacksCommon.h
 delete mode 100644 gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/CallbacksCompoundAssignOperator.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/CallbacksLeaf.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/CallbacksUnaryOperator.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/Class.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/Concept.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/ConstructExpr.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/DeclRefExpr.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/ImplicitCtor.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/ImplicitCtorInitializer.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/InitListExprPostOrder.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/InitListExprPostOrderNoQueue.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/InitListExprPreOrder.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/InitListExprPreOrderNoQueue.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/IntegerLiteral.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/LambdaDefaultCapture.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/LambdaExpr.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/LambdaTemplateParams.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/MemberPointerTypeLoc.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/NestedNameSpecifiers.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/ParenExpr.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/TemplateArgumentLocTraverser.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/TraversalScope.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Tooling/RefactoringActionRulesTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Tooling/RefactoringCallbacksTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Tooling/RefactoringTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Tooling/ReplacementTest.h
 delete mode 100644 gnu/llvm/clang/unittests/Tooling/ReplacementsYamlTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Tooling/RewriterTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Tooling/RewriterTestContext.h
 delete mode 100644 gnu/llvm/clang/unittests/Tooling/SourceCodeBuildersTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Tooling/SourceCodeTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Tooling/StencilTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Tooling/Syntax/BuildTreeTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Tooling/Syntax/CMakeLists.txt
 delete mode 100644 gnu/llvm/clang/unittests/Tooling/Syntax/MutationsTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Tooling/Syntax/SynthesisTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Tooling/Syntax/TokensTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Tooling/Syntax/TreeTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Tooling/Syntax/TreeTestBase.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Tooling/Syntax/TreeTestBase.h
 delete mode 100644 gnu/llvm/clang/unittests/Tooling/TestVisitor.h
 delete mode 100644 gnu/llvm/clang/unittests/Tooling/ToolingTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/Tooling/TransformerTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/libclang/CMakeLists.txt
 delete mode 100644 gnu/llvm/clang/unittests/libclang/CrashTests/CMakeLists.txt
 delete mode 100644 gnu/llvm/clang/unittests/libclang/CrashTests/LibclangCrashTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/libclang/LibclangTest.cpp
 delete mode 100644 gnu/llvm/clang/unittests/libclang/TestUtils.h

diff --git a/gnu/llvm/clang/CODE_OWNERS.TXT b/gnu/llvm/clang/CODE_OWNERS.TXT
deleted file mode 100644
index faf9575a289..00000000000
--- a/gnu/llvm/clang/CODE_OWNERS.TXT
+++ /dev/null
@@ -1,62 +0,0 @@
-This file is a list of the people responsible for ensuring that patches for a
-particular part of Clang are reviewed, either by themself or by someone else.
-They are also the gatekeepers for their part of Clang, with the final word on
-what goes in or not.
-
-The list is sorted by surname and formatted to allow easy grepping and
-beautification by scripts.  The fields are: name (N), email (E), web-address
-(W), PGP key ID and fingerprint (P), description (D), and snail-mail address
-(S).
-
-N: Aaron Ballman
-E: aaron@aaronballman.com
-D: Clang attributes
-
-N: Alexey Bataev
-E: a.bataev@hotmail.com
-D: OpenMP support
-
-N: Chandler Carruth
-E: chandlerc@gmail.com
-E: chandlerc@google.com
-D: CMake, library layering
-
-N: Eric Christopher
-E: echristo@gmail.com
-D: Debug Information, inline assembly
-
-N: Devin Coughlin
-E: dcoughlin@apple.com
-D: Clang Static Analyzer
-
-N: Doug Gregor
-E: dgregor@apple.com
-D: Emeritus owner
-
-N: Reid Kleckner
-E: rnk@google.com
-D: Microsoft C++ ABI compatibility and general Windows support
-
-N: Manuel Klimek
-E: klimek@google.com
-D: AST matchers, LibTooling
-
-N: Anton Korobeynikov
-E: anton@korobeynikov.info
-D: Exception handling, Windows codegen, ARM EABI
-
-N: John McCall
-E: rjmccall@apple.com
-D: Clang LLVM IR generation
-
-N: Brad Smith
-E: brad@comstyle.com
-D: OpenBSD driver
-
-N: Richard Smith
-E: richard@metafoo.co.uk
-D: All parts of Clang not covered by someone else
-
-N: Anastasia Stulova
-E: anastasia.stulova@arm.com
-D: OpenCL support
diff --git a/gnu/llvm/clang/INPUTS/Cocoa_h.m b/gnu/llvm/clang/INPUTS/Cocoa_h.m
deleted file mode 100644
index e6ba59924d6..00000000000
--- a/gnu/llvm/clang/INPUTS/Cocoa_h.m
+++ /dev/null
@@ -1,2 +0,0 @@
-
-#import <Cocoa/Cocoa.h>
diff --git a/gnu/llvm/clang/INPUTS/all-std-headers.cpp b/gnu/llvm/clang/INPUTS/all-std-headers.cpp
deleted file mode 100644
index 5b5f4eca979..00000000000
--- a/gnu/llvm/clang/INPUTS/all-std-headers.cpp
+++ /dev/null
@@ -1,86 +0,0 @@
-#include <algorithm> 
-#include <bitset> 
-#include <cassert>
-#include <cctype>
-#include <cerrno>
-#include <cfloat>
-#include <ciso646>
-#include <climits>
-#include <clocale>
-#include <cmath>
-#include <complex>
-#include <csetjmp>
-#include <csignal>
-#include <cstdarg>
-#include <cstddef>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
-#include <ctime>
-#include <cwchar>
-#include <cwctype>
-#include <deque>
-#include <exception>
-#include <fstream> 
-#include <functional> 
-#include <iomanip> 
-#include <ios> 
-#include <iosfwd>
-#include <iostream>
-#include <istream>
-#include <iterator>
-#include <limits> 
-#include <list> 
-#include <locale> 
-#include <map>
-#include <memory>
-#include <new>
-#include <numeric> 
-#include <ostream>
-#include <queue> 
-#include <set> 
-#include <sstream>
-#include <stack>
-#include <stdexcept>
-#include <streambuf>
-#include <string>
-#if __has_include(<strstream>)
-#include <strstream>
-#endif
-#include <typeinfo>
-#include <utility>
-#include <valarray>
-#include <vector>
-
-#if __cplusplus >= 201103 || defined(__GXX_EXPERIMENTAL_CXX0X__)
-#include <array>
-#if __has_include(<atomic>)
-#include <atomic>
-#endif
-#include <chrono>
-#if __has_include(<codecvt>)
-#include <codecvt>
-#endif
-#include <condition_variable>
-#include <forward_list>
-#if __has_include(<future>)
-#include <future>
-#endif
-#include <initializer_list>
-#include <mutex>
-#include <random>
-#include <ratio>
-#include <regex>
-#if __has_include(<scoped_allocator>)
-#include <scoped_allocator>
-#endif
-#include <system_error>
-#include <thread>
-#include <tuple>
-#include <type_traits>
-#if __has_include(<typeindex>)
-#include <typeindex>
-#endif
-#include <unordered_map>
-#include <unordered_set>
-#endif
diff --git a/gnu/llvm/clang/INPUTS/c99-intconst-1.c b/gnu/llvm/clang/INPUTS/c99-intconst-1.c
deleted file mode 100644
index 629b0bcac20..00000000000
--- a/gnu/llvm/clang/INPUTS/c99-intconst-1.c
+++ /dev/null
@@ -1,639 +0,0 @@
-/* Test for integer constant types.  */
-
-/* Origin: Joseph Myers <jsm28@cam.ac.uk>.  */
-/* { dg-do compile } */
-/* { dg-options "-std=iso9899:1999 -pedantic-errors" } */
-
-#include <limits.h>
-
-/* Assertion that constant C is of type T.  */
-#define ASSERT_CONST_TYPE(C, T)			\
-	do {					\
-	  typedef T type;			\
-	  typedef type **typepp;		\
-	  typedef __typeof__((C)) ctype;	\
-	  typedef ctype **ctypepp;		\
-	  typepp x = 0;				\
-	  ctypepp y = 0;			\
-	  x = y;				\
-	  y = x;				\
-	} while (0)
-
-/* (T *) if E is zero, (void *) otherwise.  */
-#define type_if_not(T, E) __typeof__(0 ? (T *)0 : (void *)(E))
-
-/* (T *) if E is nonzero, (void *) otherwise.  */
-#define type_if(T, E) type_if_not(T, !(E))
-
-/* Combine pointer types, all but one (void *).  */
-#define type_comb2(T1, T2) __typeof__(0 ? (T1)0 : (T2)0)
-#define type_comb3(T1, T2, T3) type_comb2(T1, type_comb2(T2, T3))
-#define type_comb4(T1, T2, T3, T4)				\
-	type_comb2(T1, type_comb2(T2, type_comb2(T3, T4)))
-#define type_comb6(T1, T2, T3, T4, T5, T6)				   \
-	type_comb2(T1,							   \
-		   type_comb2(T2,					   \
-			      type_comb2(T3,				   \
-					 type_comb2(T4,			   \
-						    type_comb2(T5, T6)))))
-
-/* (T1 *) if E1, otherwise (T2 *) if E2.  */
-#define first_of2p(T1, E1, T2, E2) type_comb2(type_if(T1, (E1)),	   \
-					     type_if(T2, (!(E1) && (E2))))
-/* (T1 *) if E1, otherwise (T2 *) if E2, otherwise (T3 *) if E3.  */
-#define first_of3p(T1, E1, T2, E2, T3, E3)			\
-	type_comb3(type_if(T1, (E1)),				\
-		   type_if(T2, (!(E1) && (E2))),		\
-		   type_if(T3, (!(E1) && !(E2) && (E3))))
-/* (T1 *) if E1, otherwise (T2 *) if E2, otherwise (T3 *) if E3, otherwise
-   (T4 *) if E4.  */
-#define first_of4p(T1, E1, T2, E2, T3, E3, T4, E4)			\
-	type_comb4(type_if(T1, (E1)),					\
-		   type_if(T2, (!(E1) && (E2))),			\
-		   type_if(T3, (!(E1) && !(E2) && (E3))),		\
-		   type_if(T4, (!(E1) && !(E2) && !(E3) && (E4))))
-/* (T1 *) if E1, otherwise (T2 *) if E2, otherwise (T3 *) if E3, otherwise
-   (T4 *) if E4, otherwise (T5 *) if E5, otherwise (T6 *) if E6.  */
-#define first_of6p(T1, E1, T2, E2, T3, E3, T4, E4, T5, E5, T6, E6)	    \
-	type_comb6(type_if(T1, (E1)),					    \
-		   type_if(T2, (!(E1) && (E2))),			    \
-		   type_if(T3, (!(E1) && !(E2) && (E3))),		    \
-		   type_if(T4, (!(E1) && !(E2) && !(E3) && (E4))),	    \
-		   type_if(T5, (!(E1) && !(E2) && !(E3) && !(E4) && (E5))), \
-		   type_if(T6, (!(E1) && !(E2) && !(E3)			    \
-				&& !(E4) && !(E5) && (E6))))
-
-/* Likewise, but return the original type rather than a pointer type.  */
-#define first_of2(T1, E1, T2, E2)			\
-	__typeof__(*((first_of2p(T1, (E1), T2, (E2)))0))
-#define first_of3(T1, E1, T2, E2, T3, E3)				\
-	__typeof__(*((first_of3p(T1, (E1), T2, (E2), T3, (E3)))0))
-#define first_of4(T1, E1, T2, E2, T3, E3, T4, E4)			    \
-	__typeof__(*((first_of4p(T1, (E1), T2, (E2), T3, (E3), T4, (E4)))0))
-#define first_of6(T1, E1, T2, E2, T3, E3, T4, E4, T5, E5, T6, E6)	\
-	__typeof__(*((first_of6p(T1, (E1), T2, (E2), T3, (E3),		\
-				 T4, (E4), T5, (E5), T6, (E6)))0))
-
-/* Types of constants according to the C99 rules.  */
-#define C99_UNSUF_DEC_TYPE(C)				\
-	first_of3(int, (C) <= INT_MAX,			\
-		  long int, (C) <= LONG_MAX,		\
-		  long long int, (C) <= LLONG_MAX)
-#define C99_UNSUF_OCTHEX_TYPE(C)				\
-	first_of6(int, (C) <= INT_MAX,				\
-		  unsigned int, (C) <= UINT_MAX,		\
-		  long int, (C) <= LONG_MAX,			\
-		  unsigned long int, (C) <= ULONG_MAX,		\
-		  long long int, (C) <= LLONG_MAX,		\
-		  unsigned long long int, (C) <= ULLONG_MAX)
-#define C99_SUFu_TYPE(C)					\
-	first_of3(unsigned int, (C) <= UINT_MAX,		\
-		  unsigned long int, (C) <= ULONG_MAX,		\
-		  unsigned long long int, (C) <= ULLONG_MAX)
-#define C99_SUFl_DEC_TYPE(C)				\
-	first_of2(long int, (C) <= LONG_MAX,		\
-		  long long int, (C) <= LLONG_MAX)
-#define C99_SUFl_OCTHEX_TYPE(C)					\
-	first_of4(long int, (C) <= LONG_MAX,			\
-		  unsigned long int, (C) <= ULONG_MAX,		\
-		  long long int, (C) <= LLONG_MAX,		\
-		  unsigned long long int, (C) <= ULLONG_MAX)
-#define C99_SUFul_TYPE(C)					\
-	first_of2(unsigned long int, (C) <= ULONG_MAX,		\
-		  unsigned long long int, (C) <= ULLONG_MAX)
-#define C99_SUFll_OCTHEX_TYPE(C)				\
-	first_of2(long long int, (C) <= LLONG_MAX,		\
-		  unsigned long long int, (C) <= ULLONG_MAX)
-
-/* Checks that constants have correct type.  */
-#define CHECK_UNSUF_DEC_TYPE(C) ASSERT_CONST_TYPE((C), C99_UNSUF_DEC_TYPE((C)))
-#define CHECK_UNSUF_OCTHEX_TYPE(C)				\
-	ASSERT_CONST_TYPE((C), C99_UNSUF_OCTHEX_TYPE((C)))
-#define CHECK_SUFu_TYPE(C) ASSERT_CONST_TYPE((C), C99_SUFu_TYPE((C)))
-#define CHECK_SUFl_DEC_TYPE(C) ASSERT_CONST_TYPE((C), C99_SUFl_DEC_TYPE((C)))
-#define CHECK_SUFl_OCTHEX_TYPE(C)				\
-	ASSERT_CONST_TYPE((C), C99_SUFl_OCTHEX_TYPE((C)))
-#define CHECK_SUFul_TYPE(C) ASSERT_CONST_TYPE((C), C99_SUFul_TYPE((C)))
-#define CHECK_SUFll_DEC_TYPE(C) ASSERT_CONST_TYPE((C), long long int)
-#define CHECK_SUFll_OCTHEX_TYPE(C)				\
-	ASSERT_CONST_TYPE((C), C99_SUFll_OCTHEX_TYPE((C)))
-#define CHECK_SUFull_TYPE(C) ASSERT_CONST_TYPE((C), unsigned long long int)
-
-/* Check a decimal value, with all suffixes.  */
-#define CHECK_DEC_CONST(C)			\
-	CHECK_UNSUF_DEC_TYPE(C);		\
-	CHECK_SUFu_TYPE(C##u);			\
-	CHECK_SUFu_TYPE(C##U);			\
-	CHECK_SUFl_DEC_TYPE(C##l);		\
-	CHECK_SUFl_DEC_TYPE(C##L);		\
-	CHECK_SUFul_TYPE(C##ul);		\
-	CHECK_SUFul_TYPE(C##uL);		\
-	CHECK_SUFul_TYPE(C##Ul);		\
-	CHECK_SUFul_TYPE(C##UL);		\
-	CHECK_SUFll_DEC_TYPE(C##ll);		\
-	CHECK_SUFll_DEC_TYPE(C##LL);		\
-	CHECK_SUFull_TYPE(C##ull);		\
-	CHECK_SUFull_TYPE(C##uLL);		\
-	CHECK_SUFull_TYPE(C##Ull);		\
-	CHECK_SUFull_TYPE(C##ULL);
-
-/* Check an octal or hexadecimal value, with all suffixes.  */
-#define CHECK_OCTHEX_CONST(C)			\
-	CHECK_UNSUF_OCTHEX_TYPE(C);		\
-	CHECK_SUFu_TYPE(C##u);			\
-	CHECK_SUFu_TYPE(C##U);			\
-	CHECK_SUFl_OCTHEX_TYPE(C##l);		\
-	CHECK_SUFl_OCTHEX_TYPE(C##L);		\
-	CHECK_SUFul_TYPE(C##ul);		\
-	CHECK_SUFul_TYPE(C##uL);		\
-	CHECK_SUFul_TYPE(C##Ul);		\
-	CHECK_SUFul_TYPE(C##UL);		\
-	CHECK_SUFll_OCTHEX_TYPE(C##ll);		\
-	CHECK_SUFll_OCTHEX_TYPE(C##LL);		\
-	CHECK_SUFull_TYPE(C##ull);		\
-	CHECK_SUFull_TYPE(C##uLL);		\
-	CHECK_SUFull_TYPE(C##Ull);		\
-	CHECK_SUFull_TYPE(C##ULL);
-
-#define CHECK_OCT_CONST(C) CHECK_OCTHEX_CONST(C)
-#define CHECK_HEX_CONST(C)			\
-	CHECK_OCTHEX_CONST(0x##C);		\
-	CHECK_OCTHEX_CONST(0X##C);
-
-/* True iff "long long" is at least B bits.  This presumes that (B-2)/3 is at
-   most 63.  */
-#define LLONG_AT_LEAST(B)			\
-	(LLONG_MAX >> ((B)-2)/3 >> ((B)-2)/3	\
-	 >> ((B)-2 - ((B)-2)/3 - ((B)-2)/3))
-
-#define LLONG_HAS_BITS(B) (LLONG_AT_LEAST((B)) && !LLONG_AT_LEAST((B) + 1))
-
-void
-foo (void)
-{
-  /* Decimal.  */
-  /* Check all 2^n and 2^n - 1 up to 2^71 - 1.  */
-  CHECK_DEC_CONST(1);
-  CHECK_DEC_CONST(2);
-  CHECK_DEC_CONST(3);
-  CHECK_DEC_CONST(4);
-  CHECK_DEC_CONST(7);
-  CHECK_DEC_CONST(8);
-  CHECK_DEC_CONST(15);
-  CHECK_DEC_CONST(16);
-  CHECK_DEC_CONST(31);
-  CHECK_DEC_CONST(32);
-  CHECK_DEC_CONST(63);
-  CHECK_DEC_CONST(64);
-  CHECK_DEC_CONST(127);
-  CHECK_DEC_CONST(128);
-  CHECK_DEC_CONST(255);
-  CHECK_DEC_CONST(256);
-  CHECK_DEC_CONST(511);
-  CHECK_DEC_CONST(512);
-  CHECK_DEC_CONST(1023);
-  CHECK_DEC_CONST(1024);
-  CHECK_DEC_CONST(2047);
-  CHECK_DEC_CONST(2048);
-  CHECK_DEC_CONST(4095);
-  CHECK_DEC_CONST(4096);
-  CHECK_DEC_CONST(8191);
-  CHECK_DEC_CONST(8192);
-  CHECK_DEC_CONST(16383);
-  CHECK_DEC_CONST(16384);
-  CHECK_DEC_CONST(32767);
-  CHECK_DEC_CONST(32768);
-  CHECK_DEC_CONST(65535);
-  CHECK_DEC_CONST(65536);
-  CHECK_DEC_CONST(131071);
-  CHECK_DEC_CONST(131072);
-  CHECK_DEC_CONST(262143);
-  CHECK_DEC_CONST(262144);
-  CHECK_DEC_CONST(524287);
-  CHECK_DEC_CONST(524288);
-  CHECK_DEC_CONST(1048575);
-  CHECK_DEC_CONST(1048576);
-  CHECK_DEC_CONST(2097151);
-  CHECK_DEC_CONST(2097152);
-  CHECK_DEC_CONST(4194303);
-  CHECK_DEC_CONST(4194304);
-  CHECK_DEC_CONST(8388607);
-  CHECK_DEC_CONST(8388608);
-  CHECK_DEC_CONST(16777215);
-  CHECK_DEC_CONST(16777216);
-  CHECK_DEC_CONST(33554431);
-  CHECK_DEC_CONST(33554432);
-  CHECK_DEC_CONST(67108863);
-  CHECK_DEC_CONST(67108864);
-  CHECK_DEC_CONST(134217727);
-  CHECK_DEC_CONST(134217728);
-  CHECK_DEC_CONST(268435455);
-  CHECK_DEC_CONST(268435456);
-  CHECK_DEC_CONST(536870911);
-  CHECK_DEC_CONST(536870912);
-  CHECK_DEC_CONST(1073741823);
-  CHECK_DEC_CONST(1073741824);
-  CHECK_DEC_CONST(2147483647);
-  CHECK_DEC_CONST(2147483648);
-  CHECK_DEC_CONST(4294967295);
-  CHECK_DEC_CONST(4294967296);
-  CHECK_DEC_CONST(8589934591);
-  CHECK_DEC_CONST(8589934592);
-  CHECK_DEC_CONST(17179869183);
-  CHECK_DEC_CONST(17179869184);
-  CHECK_DEC_CONST(34359738367);
-  CHECK_DEC_CONST(34359738368);
-  CHECK_DEC_CONST(68719476735);
-  CHECK_DEC_CONST(68719476736);
-  CHECK_DEC_CONST(137438953471);
-  CHECK_DEC_CONST(137438953472);
-  CHECK_DEC_CONST(274877906943);
-  CHECK_DEC_CONST(274877906944);
-  CHECK_DEC_CONST(549755813887);
-  CHECK_DEC_CONST(549755813888);
-  CHECK_DEC_CONST(1099511627775);
-  CHECK_DEC_CONST(1099511627776);
-  CHECK_DEC_CONST(2199023255551);
-  CHECK_DEC_CONST(2199023255552);
-  CHECK_DEC_CONST(4398046511103);
-  CHECK_DEC_CONST(4398046511104);
-  CHECK_DEC_CONST(8796093022207);
-  CHECK_DEC_CONST(8796093022208);
-  CHECK_DEC_CONST(17592186044415);
-  CHECK_DEC_CONST(17592186044416);
-  CHECK_DEC_CONST(35184372088831);
-  CHECK_DEC_CONST(35184372088832);
-  CHECK_DEC_CONST(70368744177663);
-  CHECK_DEC_CONST(70368744177664);
-  CHECK_DEC_CONST(140737488355327);
-  CHECK_DEC_CONST(140737488355328);
-  CHECK_DEC_CONST(281474976710655);
-  CHECK_DEC_CONST(281474976710656);
-  CHECK_DEC_CONST(562949953421311);
-  CHECK_DEC_CONST(562949953421312);
-  CHECK_DEC_CONST(1125899906842623);
-  CHECK_DEC_CONST(1125899906842624);
-  CHECK_DEC_CONST(2251799813685247);
-  CHECK_DEC_CONST(2251799813685248);
-  CHECK_DEC_CONST(4503599627370495);
-  CHECK_DEC_CONST(4503599627370496);
-  CHECK_DEC_CONST(9007199254740991);
-  CHECK_DEC_CONST(9007199254740992);
-  CHECK_DEC_CONST(18014398509481983);
-  CHECK_DEC_CONST(18014398509481984);
-  CHECK_DEC_CONST(36028797018963967);
-  CHECK_DEC_CONST(36028797018963968);
-  CHECK_DEC_CONST(72057594037927935);
-  CHECK_DEC_CONST(72057594037927936);
-  CHECK_DEC_CONST(144115188075855871);
-  CHECK_DEC_CONST(144115188075855872);
-  CHECK_DEC_CONST(288230376151711743);
-  CHECK_DEC_CONST(288230376151711744);
-  CHECK_DEC_CONST(576460752303423487);
-  CHECK_DEC_CONST(576460752303423488);
-  CHECK_DEC_CONST(1152921504606846975);
-  CHECK_DEC_CONST(1152921504606846976);
-  CHECK_DEC_CONST(2305843009213693951);
-  CHECK_DEC_CONST(2305843009213693952);
-  CHECK_DEC_CONST(4611686018427387903);
-  CHECK_DEC_CONST(4611686018427387904);
-  CHECK_DEC_CONST(9223372036854775807);
-#if LLONG_AT_LEAST(65)
-  CHECK_DEC_CONST(9223372036854775808);
-  CHECK_DEC_CONST(18446744073709551615);
-#endif
-#if LLONG_AT_LEAST(66)
-  CHECK_DEC_CONST(18446744073709551616);
-  CHECK_DEC_CONST(36893488147419103231);
-#endif
-#if LLONG_AT_LEAST(67)
-  CHECK_DEC_CONST(36893488147419103232);
-  CHECK_DEC_CONST(73786976294838206463);
-#endif
-#if LLONG_AT_LEAST(68)
-  CHECK_DEC_CONST(73786976294838206464);
-  CHECK_DEC_CONST(147573952589676412927);
-#endif
-#if LLONG_AT_LEAST(69)
-  CHECK_DEC_CONST(147573952589676412928);
-  CHECK_DEC_CONST(295147905179352825855);
-#endif
-#if LLONG_AT_LEAST(70)
-  CHECK_DEC_CONST(295147905179352825856);
-  CHECK_DEC_CONST(590295810358705651711);
-#endif
-#if LLONG_AT_LEAST(71)
-  CHECK_DEC_CONST(590295810358705651712);
-  CHECK_DEC_CONST(1180591620717411303423);
-#endif
-#if LLONG_AT_LEAST(72)
-  CHECK_DEC_CONST(1180591620717411303424);
-  CHECK_DEC_CONST(2361183241434822606847);
-#endif
-  /* Octal and hexadecimal.  */
-  /* Check all 2^n and 2^n - 1 up to 2^72 - 1.  */
-  CHECK_OCT_CONST(0);
-  CHECK_HEX_CONST(0);
-  CHECK_OCT_CONST(01);
-  CHECK_HEX_CONST(1);
-  CHECK_OCT_CONST(02);
-  CHECK_HEX_CONST(2);
-  CHECK_OCT_CONST(03);
-  CHECK_HEX_CONST(3);
-  CHECK_OCT_CONST(04);
-  CHECK_HEX_CONST(4);
-  CHECK_OCT_CONST(07);
-  CHECK_HEX_CONST(7);
-  CHECK_OCT_CONST(010);
-  CHECK_HEX_CONST(8);
-  CHECK_OCT_CONST(017);
-  CHECK_HEX_CONST(f);
-  CHECK_OCT_CONST(020);
-  CHECK_HEX_CONST(10);
-  CHECK_OCT_CONST(037);
-  CHECK_HEX_CONST(1f);
-  CHECK_OCT_CONST(040);
-  CHECK_HEX_CONST(20);
-  CHECK_OCT_CONST(077);
-  CHECK_HEX_CONST(3f);
-  CHECK_OCT_CONST(0100);
-  CHECK_HEX_CONST(40);
-  CHECK_OCT_CONST(0177);
-  CHECK_HEX_CONST(7f);
-  CHECK_OCT_CONST(0200);
-  CHECK_HEX_CONST(80);
-  CHECK_OCT_CONST(0377);
-  CHECK_HEX_CONST(ff);
-  CHECK_OCT_CONST(0400);
-  CHECK_HEX_CONST(100);
-  CHECK_OCT_CONST(0777);
-  CHECK_HEX_CONST(1ff);
-  CHECK_OCT_CONST(01000);
-  CHECK_HEX_CONST(200);
-  CHECK_OCT_CONST(01777);
-  CHECK_HEX_CONST(3ff);
-  CHECK_OCT_CONST(02000);
-  CHECK_HEX_CONST(400);
-  CHECK_OCT_CONST(03777);
-  CHECK_HEX_CONST(7ff);
-  CHECK_OCT_CONST(04000);
-  CHECK_HEX_CONST(800);
-  CHECK_OCT_CONST(07777);
-  CHECK_HEX_CONST(fff);
-  CHECK_OCT_CONST(010000);
-  CHECK_HEX_CONST(1000);
-  CHECK_OCT_CONST(017777);
-  CHECK_HEX_CONST(1fff);
-  CHECK_OCT_CONST(020000);
-  CHECK_HEX_CONST(2000);
-  CHECK_OCT_CONST(037777);
-  CHECK_HEX_CONST(3fff);
-  CHECK_OCT_CONST(040000);
-  CHECK_HEX_CONST(4000);
-  CHECK_OCT_CONST(077777);
-  CHECK_HEX_CONST(7fff);
-  CHECK_OCT_CONST(0100000);
-  CHECK_HEX_CONST(8000);
-  CHECK_OCT_CONST(0177777);
-  CHECK_HEX_CONST(ffff);
-  CHECK_OCT_CONST(0200000);
-  CHECK_HEX_CONST(10000);
-  CHECK_OCT_CONST(0377777);
-  CHECK_HEX_CONST(1ffff);
-  CHECK_OCT_CONST(0400000);
-  CHECK_HEX_CONST(20000);
-  CHECK_OCT_CONST(0777777);
-  CHECK_HEX_CONST(3ffff);
-  CHECK_OCT_CONST(01000000);
-  CHECK_HEX_CONST(40000);
-  CHECK_OCT_CONST(01777777);
-  CHECK_HEX_CONST(7ffff);
-  CHECK_OCT_CONST(02000000);
-  CHECK_HEX_CONST(80000);
-  CHECK_OCT_CONST(03777777);
-  CHECK_HEX_CONST(fffff);
-  CHECK_OCT_CONST(04000000);
-  CHECK_HEX_CONST(100000);
-  CHECK_OCT_CONST(07777777);
-  CHECK_HEX_CONST(1fffff);
-  CHECK_OCT_CONST(010000000);
-  CHECK_HEX_CONST(200000);
-  CHECK_OCT_CONST(017777777);
-  CHECK_HEX_CONST(3fffff);
-  CHECK_OCT_CONST(020000000);
-  CHECK_HEX_CONST(400000);
-  CHECK_OCT_CONST(037777777);
-  CHECK_HEX_CONST(7fffff);
-  CHECK_OCT_CONST(040000000);
-  CHECK_HEX_CONST(800000);
-  CHECK_OCT_CONST(077777777);
-  CHECK_HEX_CONST(ffffff);
-  CHECK_OCT_CONST(0100000000);
-  CHECK_HEX_CONST(1000000);
-  CHECK_OCT_CONST(0177777777);
-  CHECK_HEX_CONST(1ffffff);
-  CHECK_OCT_CONST(0200000000);
-  CHECK_HEX_CONST(2000000);
-  CHECK_OCT_CONST(0377777777);
-  CHECK_HEX_CONST(3ffffff);
-  CHECK_OCT_CONST(0400000000);
-  CHECK_HEX_CONST(4000000);
-  CHECK_OCT_CONST(0777777777);
-  CHECK_HEX_CONST(7ffffff);
-  CHECK_OCT_CONST(01000000000);
-  CHECK_HEX_CONST(8000000);
-  CHECK_OCT_CONST(01777777777);
-  CHECK_HEX_CONST(fffffff);
-  CHECK_OCT_CONST(02000000000);
-  CHECK_HEX_CONST(10000000);
-  CHECK_OCT_CONST(03777777777);
-  CHECK_HEX_CONST(1fffffff);
-  CHECK_OCT_CONST(04000000000);
-  CHECK_HEX_CONST(20000000);
-  CHECK_OCT_CONST(07777777777);
-  CHECK_HEX_CONST(3fffffff);
-  CHECK_OCT_CONST(010000000000);
-  CHECK_HEX_CONST(40000000);
-  CHECK_OCT_CONST(017777777777);
-  CHECK_HEX_CONST(7fffffff);
-  CHECK_OCT_CONST(020000000000);
-  CHECK_HEX_CONST(80000000);
-  CHECK_OCT_CONST(037777777777);
-  CHECK_HEX_CONST(ffffffff);
-  CHECK_OCT_CONST(040000000000);
-  CHECK_HEX_CONST(100000000);
-  CHECK_OCT_CONST(077777777777);
-  CHECK_HEX_CONST(1ffffffff);
-  CHECK_OCT_CONST(0100000000000);
-  CHECK_HEX_CONST(200000000);
-  CHECK_OCT_CONST(0177777777777);
-  CHECK_HEX_CONST(3ffffffff);
-  CHECK_OCT_CONST(0200000000000);
-  CHECK_HEX_CONST(400000000);
-  CHECK_OCT_CONST(0377777777777);
-  CHECK_HEX_CONST(7ffffffff);
-  CHECK_OCT_CONST(0400000000000);
-  CHECK_HEX_CONST(800000000);
-  CHECK_OCT_CONST(0777777777777);
-  CHECK_HEX_CONST(fffffffff);
-  CHECK_OCT_CONST(01000000000000);
-  CHECK_HEX_CONST(1000000000);
-  CHECK_OCT_CONST(01777777777777);
-  CHECK_HEX_CONST(1fffffffff);
-  CHECK_OCT_CONST(02000000000000);
-  CHECK_HEX_CONST(2000000000);
-  CHECK_OCT_CONST(03777777777777);
-  CHECK_HEX_CONST(3fffffffff);
-  CHECK_OCT_CONST(04000000000000);
-  CHECK_HEX_CONST(4000000000);
-  CHECK_OCT_CONST(07777777777777);
-  CHECK_HEX_CONST(7fffffffff);
-  CHECK_OCT_CONST(010000000000000);
-  CHECK_HEX_CONST(8000000000);
-  CHECK_OCT_CONST(017777777777777);
-  CHECK_HEX_CONST(ffffffffff);
-  CHECK_OCT_CONST(020000000000000);
-  CHECK_HEX_CONST(10000000000);
-  CHECK_OCT_CONST(037777777777777);
-  CHECK_HEX_CONST(1ffffffffff);
-  CHECK_OCT_CONST(040000000000000);
-  CHECK_HEX_CONST(20000000000);
-  CHECK_OCT_CONST(077777777777777);
-  CHECK_HEX_CONST(3ffffffffff);
-  CHECK_OCT_CONST(0100000000000000);
-  CHECK_HEX_CONST(40000000000);
-  CHECK_OCT_CONST(0177777777777777);
-  CHECK_HEX_CONST(7ffffffffff);
-  CHECK_OCT_CONST(0200000000000000);
-  CHECK_HEX_CONST(80000000000);
-  CHECK_OCT_CONST(0377777777777777);
-  CHECK_HEX_CONST(fffffffffff);
-  CHECK_OCT_CONST(0400000000000000);
-  CHECK_HEX_CONST(100000000000);
-  CHECK_OCT_CONST(0777777777777777);
-  CHECK_HEX_CONST(1fffffffffff);
-  CHECK_OCT_CONST(01000000000000000);
-  CHECK_HEX_CONST(200000000000);
-  CHECK_OCT_CONST(01777777777777777);
-  CHECK_HEX_CONST(3fffffffffff);
-  CHECK_OCT_CONST(02000000000000000);
-  CHECK_HEX_CONST(400000000000);
-  CHECK_OCT_CONST(03777777777777777);
-  CHECK_HEX_CONST(7fffffffffff);
-  CHECK_OCT_CONST(04000000000000000);
-  CHECK_HEX_CONST(800000000000);
-  CHECK_OCT_CONST(07777777777777777);
-  CHECK_HEX_CONST(ffffffffffff);
-  CHECK_OCT_CONST(010000000000000000);
-  CHECK_HEX_CONST(1000000000000);
-  CHECK_OCT_CONST(017777777777777777);
-  CHECK_HEX_CONST(1ffffffffffff);
-  CHECK_OCT_CONST(020000000000000000);
-  CHECK_HEX_CONST(2000000000000);
-  CHECK_OCT_CONST(037777777777777777);
-  CHECK_HEX_CONST(3ffffffffffff);
-  CHECK_OCT_CONST(040000000000000000);
-  CHECK_HEX_CONST(4000000000000);
-  CHECK_OCT_CONST(077777777777777777);
-  CHECK_HEX_CONST(7ffffffffffff);
-  CHECK_OCT_CONST(0100000000000000000);
-  CHECK_HEX_CONST(8000000000000);
-  CHECK_OCT_CONST(0177777777777777777);
-  CHECK_HEX_CONST(fffffffffffff);
-  CHECK_OCT_CONST(0200000000000000000);
-  CHECK_HEX_CONST(10000000000000);
-  CHECK_OCT_CONST(0377777777777777777);
-  CHECK_HEX_CONST(1fffffffffffff);
-  CHECK_OCT_CONST(0400000000000000000);
-  CHECK_HEX_CONST(20000000000000);
-  CHECK_OCT_CONST(0777777777777777777);
-  CHECK_HEX_CONST(3fffffffffffff);
-  CHECK_OCT_CONST(01000000000000000000);
-  CHECK_HEX_CONST(40000000000000);
-  CHECK_OCT_CONST(01777777777777777777);
-  CHECK_HEX_CONST(7fffffffffffff);
-  CHECK_OCT_CONST(02000000000000000000);
-  CHECK_HEX_CONST(80000000000000);
-  CHECK_OCT_CONST(03777777777777777777);
-  CHECK_HEX_CONST(ffffffffffffff);
-  CHECK_OCT_CONST(04000000000000000000);
-  CHECK_HEX_CONST(100000000000000);
-  CHECK_OCT_CONST(07777777777777777777);
-  CHECK_HEX_CONST(1ffffffffffffff);
-  CHECK_OCT_CONST(010000000000000000000);
-  CHECK_HEX_CONST(200000000000000);
-  CHECK_OCT_CONST(017777777777777777777);
-  CHECK_HEX_CONST(3ffffffffffffff);
-  CHECK_OCT_CONST(020000000000000000000);
-  CHECK_HEX_CONST(400000000000000);
-  CHECK_OCT_CONST(037777777777777777777);
-  CHECK_HEX_CONST(7ffffffffffffff);
-  CHECK_OCT_CONST(040000000000000000000);
-  CHECK_HEX_CONST(800000000000000);
-  CHECK_OCT_CONST(077777777777777777777);
-  CHECK_HEX_CONST(fffffffffffffff);
-  CHECK_OCT_CONST(0100000000000000000000);
-  CHECK_HEX_CONST(1000000000000000);
-  CHECK_OCT_CONST(0177777777777777777777);
-  CHECK_HEX_CONST(1fffffffffffffff);
-  CHECK_OCT_CONST(0200000000000000000000);
-  CHECK_HEX_CONST(2000000000000000);
-  CHECK_OCT_CONST(0377777777777777777777);
-  CHECK_HEX_CONST(3fffffffffffffff);
-  CHECK_OCT_CONST(0400000000000000000000);
-  CHECK_HEX_CONST(4000000000000000);
-  CHECK_OCT_CONST(0777777777777777777777);
-  CHECK_HEX_CONST(7fffffffffffffff);
-  CHECK_OCT_CONST(01000000000000000000000);
-  CHECK_HEX_CONST(8000000000000000);
-  CHECK_OCT_CONST(01777777777777777777777);
-  CHECK_HEX_CONST(ffffffffffffffff);
-#if LLONG_AT_LEAST(65)
-  CHECK_OCT_CONST(02000000000000000000000);
-  CHECK_HEX_CONST(10000000000000000);
-  CHECK_OCT_CONST(03777777777777777777777);
-  CHECK_HEX_CONST(1ffffffffffffffff);
-#endif
-#if LLONG_AT_LEAST(66)
-  CHECK_OCT_CONST(04000000000000000000000);
-  CHECK_HEX_CONST(20000000000000000);
-  CHECK_OCT_CONST(07777777777777777777777);
-  CHECK_HEX_CONST(3ffffffffffffffff);
-#endif
-#if LLONG_AT_LEAST(67)
-  CHECK_OCT_CONST(010000000000000000000000);
-  CHECK_HEX_CONST(40000000000000000);
-  CHECK_OCT_CONST(017777777777777777777777);
-  CHECK_HEX_CONST(7ffffffffffffffff);
-#endif
-#if LLONG_AT_LEAST(68)
-  CHECK_OCT_CONST(020000000000000000000000);
-  CHECK_HEX_CONST(80000000000000000);
-  CHECK_OCT_CONST(037777777777777777777777);
-  CHECK_HEX_CONST(fffffffffffffffff);
-#endif
-#if LLONG_AT_LEAST(69)
-  CHECK_OCT_CONST(040000000000000000000000);
-  CHECK_HEX_CONST(100000000000000000);
-  CHECK_OCT_CONST(077777777777777777777777);
-  CHECK_HEX_CONST(1fffffffffffffffff);
-#endif
-#if LLONG_AT_LEAST(70)
-  CHECK_OCT_CONST(0100000000000000000000000);
-  CHECK_HEX_CONST(200000000000000000);
-  CHECK_OCT_CONST(0177777777777777777777777);
-  CHECK_HEX_CONST(3fffffffffffffffff);
-#endif
-#if LLONG_AT_LEAST(71)
-  CHECK_OCT_CONST(0200000000000000000000000);
-  CHECK_HEX_CONST(400000000000000000);
-  CHECK_OCT_CONST(0377777777777777777777777);
-  CHECK_HEX_CONST(7fffffffffffffffff);
-#endif
-#if LLONG_AT_LEAST(72)
-  CHECK_OCT_CONST(0400000000000000000000000);
-  CHECK_HEX_CONST(800000000000000000);
-  CHECK_OCT_CONST(0777777777777777777777777);
-  CHECK_HEX_CONST(ffffffffffffffffff);
-#endif
-}
diff --git a/gnu/llvm/clang/INPUTS/carbon_h.c b/gnu/llvm/clang/INPUTS/carbon_h.c
deleted file mode 100644
index 599f123a36c..00000000000
--- a/gnu/llvm/clang/INPUTS/carbon_h.c
+++ /dev/null
@@ -1,4 +0,0 @@
-
-#include <Carbon/Carbon.h>
-
-//#import<vecLib/vecLib.h>
diff --git a/gnu/llvm/clang/INPUTS/cfg-big-switch.c b/gnu/llvm/clang/INPUTS/cfg-big-switch.c
deleted file mode 100644
index a48b51a2e30..00000000000
--- a/gnu/llvm/clang/INPUTS/cfg-big-switch.c
+++ /dev/null
@@ -1,27 +0,0 @@
-#define EXPAND_2_CASES(i, x, y)    CASE(i, x, y);             CASE(i + 1, x, y);
-#define EXPAND_4_CASES(i, x, y)    EXPAND_2_CASES(i, x, y)    EXPAND_2_CASES(i + 2, x, y)
-#define EXPAND_8_CASES(i, x, y)    EXPAND_4_CASES(i, x, y)    EXPAND_4_CASES(i + 4, x, y)
-#define EXPAND_16_CASES(i, x, y)   EXPAND_8_CASES(i, x, y)    EXPAND_8_CASES(i + 8, x, y)
-#define EXPAND_32_CASES(i, x, y)   EXPAND_16_CASES(i, x, y)   EXPAND_16_CASES(i + 16, x, y)
-#define EXPAND_64_CASES(i, x, y)   EXPAND_32_CASES(i, x, y)   EXPAND_32_CASES(i + 32, x, y)
-#define EXPAND_128_CASES(i, x, y)  EXPAND_64_CASES(i, x, y)   EXPAND_64_CASES(i + 64, x, y)
-#define EXPAND_256_CASES(i, x, y)  EXPAND_128_CASES(i, x, y)  EXPAND_128_CASES(i + 128, x, y)
-#define EXPAND_512_CASES(i, x, y)  EXPAND_256_CASES(i, x, y)  EXPAND_256_CASES(i + 256, x, y)
-#define EXPAND_1024_CASES(i, x, y) EXPAND_512_CASES(i, x, y)  EXPAND_512_CASES(i + 512, x, y)
-#define EXPAND_2048_CASES(i, x, y) EXPAND_1024_CASES(i, x, y) EXPAND_1024_CASES(i + 1024, x, y)
-#define EXPAND_4096_CASES(i, x, y) EXPAND_2048_CASES(i, x, y) EXPAND_2048_CASES(i + 2048, x, y)
-
-// This has a *monstrous* single fan-out in the CFG, across 8000 blocks inside
-// the while loop.
-unsigned cfg_big_switch(int x) {
-  unsigned y = 0;
-  while (x > 0) {
-    switch(x) {
-#define CASE(i, x, y) \
-      case i: { int case_var = 3*x + i; y += case_var - 1; break; }
-EXPAND_4096_CASES(0, x, y);
-    }
-    --x;
-  }
-  return y;
-}
diff --git a/gnu/llvm/clang/INPUTS/cfg-long-chain1.c b/gnu/llvm/clang/INPUTS/cfg-long-chain1.c
deleted file mode 100644
index 2f55b2ada20..00000000000
--- a/gnu/llvm/clang/INPUTS/cfg-long-chain1.c
+++ /dev/null
@@ -1,20 +0,0 @@
-#define EXPAND_2_BRANCHES(i, x, y)    BRANCH(i, x, y);              BRANCH(i + 1, x, y);
-#define EXPAND_4_BRANCHES(i, x, y)    EXPAND_2_BRANCHES(i, x, y)    EXPAND_2_BRANCHES(i + 2, x, y)
-#define EXPAND_8_BRANCHES(i, x, y)    EXPAND_4_BRANCHES(i, x, y)    EXPAND_4_BRANCHES(i + 4, x, y)
-#define EXPAND_16_BRANCHES(i, x, y)   EXPAND_8_BRANCHES(i, x, y)    EXPAND_8_BRANCHES(i + 8, x, y)
-#define EXPAND_32_BRANCHES(i, x, y)   EXPAND_16_BRANCHES(i, x, y)   EXPAND_16_BRANCHES(i + 16, x, y)
-#define EXPAND_64_BRANCHES(i, x, y)   EXPAND_32_BRANCHES(i, x, y)   EXPAND_32_BRANCHES(i + 32, x, y)
-#define EXPAND_128_BRANCHES(i, x, y)  EXPAND_64_BRANCHES(i, x, y)   EXPAND_64_BRANCHES(i + 64, x, y)
-#define EXPAND_256_BRANCHES(i, x, y)  EXPAND_128_BRANCHES(i, x, y)  EXPAND_128_BRANCHES(i + 128, x, y)
-#define EXPAND_512_BRANCHES(i, x, y)  EXPAND_256_BRANCHES(i, x, y)  EXPAND_256_BRANCHES(i + 256, x, y)
-#define EXPAND_1024_BRANCHES(i, x, y) EXPAND_512_BRANCHES(i, x, y)  EXPAND_512_BRANCHES(i + 512, x, y)
-#define EXPAND_2048_BRANCHES(i, x, y) EXPAND_1024_BRANCHES(i, x, y) EXPAND_1024_BRANCHES(i + 1024, x, y)
-#define EXPAND_4096_BRANCHES(i, x, y) EXPAND_2048_BRANCHES(i, x, y) EXPAND_2048_BRANCHES(i + 2048, x, y)
-
-unsigned cfg_long_chain_single_exit(unsigned x) {
-  unsigned y = 0;
-#define BRANCH(i, x, y) if ((x % 13171) < i) { int var = x / 13171; y ^= var; }
-  EXPAND_4096_BRANCHES(1, x, y);
-#undef BRANCH
-  return y;
-}
diff --git a/gnu/llvm/clang/INPUTS/cfg-long-chain2.c b/gnu/llvm/clang/INPUTS/cfg-long-chain2.c
deleted file mode 100644
index 150a084e57b..00000000000
--- a/gnu/llvm/clang/INPUTS/cfg-long-chain2.c
+++ /dev/null
@@ -1,20 +0,0 @@
-#define EXPAND_2_BRANCHES(i, x, y)    BRANCH(i, x, y);              BRANCH(i + 1, x, y);
-#define EXPAND_4_BRANCHES(i, x, y)    EXPAND_2_BRANCHES(i, x, y)    EXPAND_2_BRANCHES(i + 2, x, y)
-#define EXPAND_8_BRANCHES(i, x, y)    EXPAND_4_BRANCHES(i, x, y)    EXPAND_4_BRANCHES(i + 4, x, y)
-#define EXPAND_16_BRANCHES(i, x, y)   EXPAND_8_BRANCHES(i, x, y)    EXPAND_8_BRANCHES(i + 8, x, y)
-#define EXPAND_32_BRANCHES(i, x, y)   EXPAND_16_BRANCHES(i, x, y)   EXPAND_16_BRANCHES(i + 16, x, y)
-#define EXPAND_64_BRANCHES(i, x, y)   EXPAND_32_BRANCHES(i, x, y)   EXPAND_32_BRANCHES(i + 32, x, y)
-#define EXPAND_128_BRANCHES(i, x, y)  EXPAND_64_BRANCHES(i, x, y)   EXPAND_64_BRANCHES(i + 64, x, y)
-#define EXPAND_256_BRANCHES(i, x, y)  EXPAND_128_BRANCHES(i, x, y)  EXPAND_128_BRANCHES(i + 128, x, y)
-#define EXPAND_512_BRANCHES(i, x, y)  EXPAND_256_BRANCHES(i, x, y)  EXPAND_256_BRANCHES(i + 256, x, y)
-#define EXPAND_1024_BRANCHES(i, x, y) EXPAND_512_BRANCHES(i, x, y)  EXPAND_512_BRANCHES(i + 512, x, y)
-#define EXPAND_2048_BRANCHES(i, x, y) EXPAND_1024_BRANCHES(i, x, y) EXPAND_1024_BRANCHES(i + 1024, x, y)
-#define EXPAND_4096_BRANCHES(i, x, y) EXPAND_2048_BRANCHES(i, x, y) EXPAND_2048_BRANCHES(i + 2048, x, y)
-
-unsigned cfg_long_chain_multiple_exit(unsigned x) {
-  unsigned y = 0;
-#define BRANCH(i, x, y) if (((x % 13171) + ++y) < i) { int var = x / 13171 + y; return var; } 
-  EXPAND_4096_BRANCHES(1, x, y);
-#undef BRANCH
-  return 42;
-}
diff --git a/gnu/llvm/clang/INPUTS/cfg-long-chain3.c b/gnu/llvm/clang/INPUTS/cfg-long-chain3.c
deleted file mode 100644
index cca4bdcf1ac..00000000000
--- a/gnu/llvm/clang/INPUTS/cfg-long-chain3.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#define EXPAND_2_BRANCHES(i, x, y)    BRANCH(i, x, y);              BRANCH(i + 1, x, y);
-#define EXPAND_4_BRANCHES(i, x, y)    EXPAND_2_BRANCHES(i, x, y)    EXPAND_2_BRANCHES(i + 2, x, y)
-#define EXPAND_8_BRANCHES(i, x, y)    EXPAND_4_BRANCHES(i, x, y)    EXPAND_4_BRANCHES(i + 4, x, y)
-#define EXPAND_16_BRANCHES(i, x, y)   EXPAND_8_BRANCHES(i, x, y)    EXPAND_8_BRANCHES(i + 8, x, y)
-#define EXPAND_32_BRANCHES(i, x, y)   EXPAND_16_BRANCHES(i, x, y)   EXPAND_16_BRANCHES(i + 16, x, y)
-#define EXPAND_64_BRANCHES(i, x, y)   EXPAND_32_BRANCHES(i, x, y)   EXPAND_32_BRANCHES(i + 32, x, y)
-#define EXPAND_128_BRANCHES(i, x, y)  EXPAND_64_BRANCHES(i, x, y)   EXPAND_64_BRANCHES(i + 64, x, y)
-#define EXPAND_256_BRANCHES(i, x, y)  EXPAND_128_BRANCHES(i, x, y)  EXPAND_128_BRANCHES(i + 128, x, y)
-#define EXPAND_512_BRANCHES(i, x, y)  EXPAND_256_BRANCHES(i, x, y)  EXPAND_256_BRANCHES(i + 256, x, y)
-#define EXPAND_1024_BRANCHES(i, x, y) EXPAND_512_BRANCHES(i, x, y)  EXPAND_512_BRANCHES(i + 512, x, y)
-#define EXPAND_2048_BRANCHES(i, x, y) EXPAND_1024_BRANCHES(i, x, y) EXPAND_1024_BRANCHES(i + 1024, x, y)
-#define EXPAND_4096_BRANCHES(i, x, y) EXPAND_2048_BRANCHES(i, x, y) EXPAND_2048_BRANCHES(i + 2048, x, y)
-
-unsigned cfg_long_chain_many_preds(unsigned x) {
-  unsigned y = 0;
-#define BRANCH(i, x, y) if ((x % 13171) < i) { int var = x / 13171; y ^= var; } else
-  EXPAND_4096_BRANCHES(1, x, y);
-#undef BRANCH
-  int var = x / 13171; y^= var;
-  return y;
-}
diff --git a/gnu/llvm/clang/INPUTS/cfg-nested-switches.c b/gnu/llvm/clang/INPUTS/cfg-nested-switches.c
deleted file mode 100644
index 3db10b443d2..00000000000
--- a/gnu/llvm/clang/INPUTS/cfg-nested-switches.c
+++ /dev/null
@@ -1,36 +0,0 @@
-#define EXPAND_2_INNER_CASES(i, x, y)    INNER_CASE(i, x, y);             INNER_CASE(i + 1, x, y);
-#define EXPAND_4_INNER_CASES(i, x, y)    EXPAND_2_INNER_CASES(i, x, y)    EXPAND_2_INNER_CASES(i + 2, x, y)
-#define EXPAND_8_INNER_CASES(i, x, y)    EXPAND_4_INNER_CASES(i, x, y)    EXPAND_4_INNER_CASES(i + 4, x, y)
-#define EXPAND_16_INNER_CASES(i, x, y)   EXPAND_8_INNER_CASES(i, x, y)    EXPAND_8_INNER_CASES(i + 8, x, y)
-#define EXPAND_32_INNER_CASES(i, x, y)   EXPAND_16_INNER_CASES(i, x, y)   EXPAND_16_INNER_CASES(i + 16, x, y)
-#define EXPAND_64_INNER_CASES(i, x, y)   EXPAND_32_INNER_CASES(i, x, y)   EXPAND_32_INNER_CASES(i + 32, x, y)
-
-#define EXPAND_2_OUTER_CASES(i, x, y)    OUTER_CASE(i, x, y);             OUTER_CASE(i + 1, x, y);
-#define EXPAND_4_OUTER_CASES(i, x, y)    EXPAND_2_OUTER_CASES(i, x, y)    EXPAND_2_OUTER_CASES(i + 2, x, y)
-#define EXPAND_8_OUTER_CASES(i, x, y)    EXPAND_4_OUTER_CASES(i, x, y)    EXPAND_4_OUTER_CASES(i + 4, x, y)
-#define EXPAND_16_OUTER_CASES(i, x, y)   EXPAND_8_OUTER_CASES(i, x, y)    EXPAND_8_OUTER_CASES(i + 8, x, y)
-#define EXPAND_32_OUTER_CASES(i, x, y)   EXPAND_16_OUTER_CASES(i, x, y)   EXPAND_16_OUTER_CASES(i + 16, x, y)
-#define EXPAND_64_OUTER_CASES(i, x, y)   EXPAND_32_OUTER_CASES(i, x, y)   EXPAND_32_OUTER_CASES(i + 32, x, y)
-
-// Rather than a single monstrous fan-out, this fans out in smaller increments,
-// but to a similar size.
-unsigned cfg_nested_switch(int x) {
-  unsigned y = 0;
-  while (x > 0) {
-    switch (x) {
-#define INNER_CASE(i, x, y) \
-          case i: { int case_var = 3*x + i; y += case_var - 1; break; }
-#define OUTER_CASE(i, x, y) \
-      case i: { \
-        int case_var = y >> 8; \
-        switch (case_var) { \
-          EXPAND_64_INNER_CASES(0, x, y); \
-        } \
-        break; \
-      }
-EXPAND_64_OUTER_CASES(0, x, y);
-    }
-    --x;
-  }
-  return y;
-}
diff --git a/gnu/llvm/clang/INPUTS/cfg-nested-var-scopes.cpp b/gnu/llvm/clang/INPUTS/cfg-nested-var-scopes.cpp
deleted file mode 100644
index 0944ec268f1..00000000000
--- a/gnu/llvm/clang/INPUTS/cfg-nested-var-scopes.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-// Hammer the CFG with large numbers of overlapping variable scopes, which
-// implicit destructors triggered at each edge.
-
-#define EXPAND_BASIC_STRUCT(i) struct X##i { X##i(int); ~X##i(); };
-#define EXPAND_NORET_STRUCT(i) struct X##i { X##i(int); ~X##i() __attribute__((noreturn)); };
-EXPAND_BASIC_STRUCT(0000); EXPAND_NORET_STRUCT(0001);
-EXPAND_BASIC_STRUCT(0010); EXPAND_BASIC_STRUCT(0011);
-EXPAND_BASIC_STRUCT(0100); EXPAND_NORET_STRUCT(0101);
-EXPAND_NORET_STRUCT(0110); EXPAND_BASIC_STRUCT(0111);
-EXPAND_BASIC_STRUCT(1000); EXPAND_NORET_STRUCT(1001);
-EXPAND_BASIC_STRUCT(1010); EXPAND_BASIC_STRUCT(1011);
-EXPAND_NORET_STRUCT(1100); EXPAND_NORET_STRUCT(1101);
-EXPAND_BASIC_STRUCT(1110); EXPAND_BASIC_STRUCT(1111);
-
-#define EXPAND_2_VARS(c, i, x)  const X##i var_##c##_##i##0(x), &var_##c##_##i##1 = X##i(x)
-#define EXPAND_4_VARS(c, i, x)  EXPAND_2_VARS(c, i##0, x);  EXPAND_2_VARS(c, i##1, x)
-#define EXPAND_8_VARS(c, i, x)  EXPAND_4_VARS(c, i##0, x);  EXPAND_4_VARS(c, i##1, x)
-#define EXPAND_16_VARS(c, i, x) EXPAND_8_VARS(c, i##0, x);  EXPAND_8_VARS(c, i##1, x)
-#define EXPAND_32_VARS(c, x)    EXPAND_16_VARS(c, 0, x);    EXPAND_16_VARS(c, 1, x)
-
-#define EXPAND_2_INNER_CASES(i, x, y)    INNER_CASE(i, x, y);             INNER_CASE(i + 1, x, y);
-#define EXPAND_4_INNER_CASES(i, x, y)    EXPAND_2_INNER_CASES(i, x, y)    EXPAND_2_INNER_CASES(i + 2, x, y)
-#define EXPAND_8_INNER_CASES(i, x, y)    EXPAND_4_INNER_CASES(i, x, y)    EXPAND_4_INNER_CASES(i + 4, x, y)
-#define EXPAND_16_INNER_CASES(i, x, y)   EXPAND_8_INNER_CASES(i, x, y)    EXPAND_8_INNER_CASES(i + 8, x, y)
-#define EXPAND_32_INNER_CASES(i, x, y)   EXPAND_16_INNER_CASES(i, x, y)   EXPAND_16_INNER_CASES(i + 16, x, y)
-
-#define EXPAND_2_OUTER_CASES(i, x, y)    OUTER_CASE(i, x, y);             OUTER_CASE(i + 1, x, y);
-#define EXPAND_4_OUTER_CASES(i, x, y)    EXPAND_2_OUTER_CASES(i, x, y)    EXPAND_2_OUTER_CASES(i + 2, x, y)
-#define EXPAND_8_OUTER_CASES(i, x, y)    EXPAND_4_OUTER_CASES(i, x, y)    EXPAND_4_OUTER_CASES(i + 4, x, y)
-#define EXPAND_16_OUTER_CASES(i, x, y)   EXPAND_8_OUTER_CASES(i, x, y)    EXPAND_8_OUTER_CASES(i + 8, x, y)
-#define EXPAND_32_OUTER_CASES(i, x, y)   EXPAND_16_OUTER_CASES(i, x, y)   EXPAND_16_OUTER_CASES(i + 16, x, y)
-
-unsigned cfg_nested_vars(int x) {
-  int y = 0;
-  while (x > 0) {
-    EXPAND_32_VARS(a, x);
-    switch (x) {
-#define INNER_CASE(i, x, y) \
-          case i: { \
-            int case_var = 3*x + i; \
-            EXPAND_32_VARS(c, case_var); \
-            y += case_var - 1; \
-            break; \
-          }
-#define OUTER_CASE(i, x, y) \
-      case i: { \
-        int case_var = y >> 8; \
-        EXPAND_32_VARS(b, y); \
-        switch (case_var) { \
-          EXPAND_32_INNER_CASES(0, x, y); \
-        } \
-        break; \
-      }
-EXPAND_32_OUTER_CASES(0, x, y);
-    }
-    --x;
-  }
-  return y;
-}
diff --git a/gnu/llvm/clang/INPUTS/iostream.cc b/gnu/llvm/clang/INPUTS/iostream.cc
deleted file mode 100644
index eb12fc9aaf4..00000000000
--- a/gnu/llvm/clang/INPUTS/iostream.cc
+++ /dev/null
@@ -1,5 +0,0 @@
-// clang -I/usr/include/c++/4.0.0 -I/usr/include/c++/4.0.0/powerpc-apple-darwin8 -I/usr/include/c++/4.0.0/backward INPUTS/iostream.cc -Eonly
-
-#include <iostream>
-
-#include <stdint.h>
diff --git a/gnu/llvm/clang/INPUTS/macro_pounder_fn.c b/gnu/llvm/clang/INPUTS/macro_pounder_fn.c
deleted file mode 100644
index 73f40a1d6db..00000000000
--- a/gnu/llvm/clang/INPUTS/macro_pounder_fn.c
+++ /dev/null
@@ -1,17 +0,0 @@
-
-// This pounds on macro expansion for performance reasons.  This is currently
-// heavily constrained by darwin's malloc.
-
-// Function-like macros.
-#define A0(A, B) A B
-#define A1(A, B) A0(A,B) A0(A,B) A0(A,B) A0(A,B) A0(A,B) A0(A,B)
-#define A2(A, B) A1(A,B) A1(A,B) A1(A,B) A1(A,B) A1(A,B) A1(A,B)
-#define A3(A, B) A2(A,B) A2(A,B) A2(A,B) A2(A,B) A2(A,B) A2(A,B)
-#define A4(A, B) A3(A,B) A3(A,B) A3(A,B) A3(A,B) A3(A,B) A3(A,B)
-#define A5(A, B) A4(A,B) A4(A,B) A4(A,B) A4(A,B) A4(A,B) A4(A,B)
-#define A6(A, B) A5(A,B) A5(A,B) A5(A,B) A5(A,B) A5(A,B) A5(A,B)
-#define A7(A, B) A6(A,B) A6(A,B) A6(A,B) A6(A,B) A6(A,B) A6(A,B)
-#define A8(A, B) A7(A,B) A7(A,B) A7(A,B) A7(A,B) A7(A,B) A7(A,B)
-
-A8(a, b)
-
diff --git a/gnu/llvm/clang/INPUTS/macro_pounder_obj.c b/gnu/llvm/clang/INPUTS/macro_pounder_obj.c
deleted file mode 100644
index d2465f34edb..00000000000
--- a/gnu/llvm/clang/INPUTS/macro_pounder_obj.c
+++ /dev/null
@@ -1,16 +0,0 @@
-
-// This pounds on macro expansion for performance reasons.  This is currently
-// heavily constrained by darwin's malloc.
-
-// Object-like expansions
-#define A0 a b
-#define A1 A0 A0 A0 A0 A0 A0
-#define A2 A1 A1 A1 A1 A1 A1
-#define A3 A2 A2 A2 A2 A2 A2
-#define A4 A3 A3 A3 A3 A3 A3
-#define A5 A4 A4 A4 A4 A4 A4
-#define A6 A5 A5 A5 A5 A5 A5
-#define A7 A6 A6 A6 A6 A6 A6
-#define A8 A7 A7 A7 A7 A7 A7
-
-A8
diff --git a/gnu/llvm/clang/INPUTS/stpcpy-test.c b/gnu/llvm/clang/INPUTS/stpcpy-test.c
deleted file mode 100644
index b96a8066e63..00000000000
--- a/gnu/llvm/clang/INPUTS/stpcpy-test.c
+++ /dev/null
@@ -1,47 +0,0 @@
-#define __extension__
-
-#define __stpcpy(dest, src) (__extension__ (__builtin_constant_p (src) ? (__string2_1bptr_p (src) && strlen (src) + 1 <= 8 ? __stpcpy_small (dest, __stpcpy_args (src), strlen (src) + 1) : ((char *) __mempcpy (dest, src, strlen (src) + 1) - 1)) : __stpcpy (dest, src)))
-#define stpcpy(dest, src) __stpcpy (dest, src)
-#define __stpcpy_args(src) __extension__ __STRING2_SMALL_GET16 (src, 0), __extension__ __STRING2_SMALL_GET16 (src, 4), __extension__ __STRING2_SMALL_GET32 (src, 0), __extension__ __STRING2_SMALL_GET32 (src, 4)
-
-#define __mempcpy(dest, src, n) (__extension__ (__builtin_constant_p (src) && __builtin_constant_p (n) && __string2_1bptr_p (src) && n <= 8 ? __mempcpy_small (dest, __mempcpy_args (src), n) : __mempcpy (dest, src, n)))
-#define mempcpy(dest, src, n) __mempcpy (dest, src, n)
-#define __mempcpy_args(src) ((char *) (src))[0], ((char *) (src))[2], ((char *) (src))[4], ((char *) (src))[6], __extension__ __STRING2_SMALL_GET16 (src, 0), __extension__ __STRING2_SMALL_GET16 (src, 4), __extension__ __STRING2_SMALL_GET32 (src, 0), __extension__ __STRING2_SMALL_GET32 (src, 4)
-
-#define __STRING2_SMALL_GET16(src, idx) (((__const unsigned char *) (__const char *) (src))[idx + 1] << 8 | ((__const unsigned char *) (__const char *) (src))[idx])
-
-#define __STRING2_SMALL_GET32(src, idx) (((((__const unsigned char *) (__const char *) (src))[idx + 3] << 8 | ((__const unsigned char *) (__const char *) (src))[idx + 2]) << 8 | ((__const unsigned char *) (__const char *) (src))[idx + 1]) << 8 | ((__const unsigned char *) (__const char *) (src))[idx])
-
-stpcpy (stpcpy (stpcpy (stpcpy (a, b), c), d), e)
-stpcpy (stpcpy (stpcpy (stpcpy (a, b), c), d), e)
-stpcpy (stpcpy (stpcpy (stpcpy (a, b), c), d), e)
-stpcpy (stpcpy (stpcpy (stpcpy (a, b), c), d), e)
-stpcpy (stpcpy (stpcpy (stpcpy (a, b), c), d), e)
-stpcpy (stpcpy (stpcpy (stpcpy (a, b), c), d), e)
-stpcpy (stpcpy (stpcpy (stpcpy (a, b), c), d), e)
-stpcpy (stpcpy (stpcpy (stpcpy (a, b), c), d), e)
-stpcpy (stpcpy (stpcpy (stpcpy (a, b), c), d), e)
-stpcpy (stpcpy (stpcpy (stpcpy (a, b), c), d), e)
-stpcpy (stpcpy (stpcpy (stpcpy (a, b), c), d), e)
-stpcpy (stpcpy (stpcpy (stpcpy (a, b), c), d), e)
-stpcpy (stpcpy (stpcpy (stpcpy (a, b), c), d), e)
-stpcpy (stpcpy (stpcpy (stpcpy (a, b), c), d), e)
-stpcpy (stpcpy (stpcpy (stpcpy (a, b), c), d), e)
-stpcpy (stpcpy (stpcpy (stpcpy (a, b), c), d), e)
-stpcpy (stpcpy (stpcpy (stpcpy (a, b), c), d), e)
-stpcpy (stpcpy (stpcpy (stpcpy (a, b), c), d), e)
-stpcpy (stpcpy (stpcpy (stpcpy (a, b), c), d), e)
-stpcpy (stpcpy (stpcpy (stpcpy (a, b), c), d), e)
-stpcpy (stpcpy (stpcpy (stpcpy (a, b), c), d), e)
-stpcpy (stpcpy (stpcpy (stpcpy (a, b), c), d), e)
-stpcpy (stpcpy (stpcpy (stpcpy (a, b), c), d), e)
-stpcpy (stpcpy (stpcpy (stpcpy (a, b), c), d), e)
-stpcpy (stpcpy (stpcpy (stpcpy (a, b), c), d), e)
-stpcpy (stpcpy (stpcpy (stpcpy (a, b), c), d), e)
-stpcpy (stpcpy (stpcpy (stpcpy (a, b), c), d), e)
-stpcpy (stpcpy (stpcpy (stpcpy (a, b), c), d), e)
-stpcpy (stpcpy (stpcpy (stpcpy (a, b), c), d), e)
-stpcpy (stpcpy (stpcpy (stpcpy (a, b), c), d), e)
-stpcpy (stpcpy (stpcpy (stpcpy (a, b), c), d), e)
-stpcpy (stpcpy (stpcpy (stpcpy (a, b), c), d), e)
-stpcpy (stpcpy (stpcpy (stpcpy (a, b), c), d), e)
diff --git a/gnu/llvm/clang/docs/Block-ABI-Apple.txt b/gnu/llvm/clang/docs/Block-ABI-Apple.txt
deleted file mode 100644
index 1b04cc9e133..00000000000
--- a/gnu/llvm/clang/docs/Block-ABI-Apple.txt
+++ /dev/null
@@ -1 +0,0 @@
-*NOTE* This document has moved to https://clang.llvm.org/docs/Block-ABI-Apple.html.
diff --git a/gnu/llvm/clang/docs/ClangCommandLineReference.rst b/gnu/llvm/clang/docs/ClangCommandLineReference.rst
deleted file mode 100644
index 74557c5bd58..00000000000
--- a/gnu/llvm/clang/docs/ClangCommandLineReference.rst
+++ /dev/null
@@ -1,4057 +0,0 @@
-..
-  -------------------------------------------------------------------
-  NOTE: This file is automatically generated by running clang-tblgen
-  -gen-opt-docs. Do not edit this file by hand!!
-  -------------------------------------------------------------------
-
-=====================================
-Clang command line argument reference
-=====================================
-.. contents::
-   :local:
-
-Introduction
-============
-
-This page lists the command line arguments currently supported by the
-GCC-compatible ``clang`` and ``clang++`` drivers.
-
-
-.. program:: clang
-.. option:: -B<prefix>, --prefix <arg>, --prefix=<arg>
-
-Search $prefix/$triple-$file and $prefix$file for executables, libraries, includes, and data files used by the compiler. $prefix may or may not be a directory
-
-.. option:: -F<arg>
-
-Add directory to framework include search path
-
-.. option:: -ObjC
-
-Treat source input files as Objective-C inputs
-
-.. program:: clang1
-.. option:: -ObjC++
-.. program:: clang
-
-Treat source input files as Objective-C++ inputs
-
-.. option:: -Qn, -fno-ident
-
-Do not emit metadata containing compiler name and version
-
-.. option:: -Qunused-arguments
-
-Don't emit warning for unused driver arguments
-
-.. option:: -Qy, -fident
-
-Emit metadata containing compiler name and version
-
-.. option:: -Wa,<arg>,<arg2>...
-
-Pass the comma separated arguments in <arg> to the assembler
-
-.. option:: -Wlarge-by-value-copy=<arg>
-
-.. option:: -Xarch\_<arg1> <arg2>
-
-.. program:: clang1
-.. option:: -Xarch\_device <arg>
-.. program:: clang
-
-Pass <arg> to the CUDA/HIP device compilation
-
-.. program:: clang2
-.. option:: -Xarch\_host <arg>
-.. program:: clang
-
-Pass <arg> to the CUDA/HIP host compilation
-
-.. option:: -Xcuda-fatbinary <arg>
-
-Pass <arg> to fatbinary invocation
-
-.. option:: -Xcuda-ptxas <arg>
-
-Pass <arg> to the ptxas assembler
-
-.. option:: -Xopenmp-target <arg>
-
-Pass <arg> to the target offloading toolchain.
-
-.. program:: clang1
-.. option:: -Xopenmp-target=<triple> <arg>
-.. program:: clang
-
-Pass <arg> to the target offloading toolchain identified by <triple>.
-
-.. option:: -Z<arg>
-
-.. option:: -a<arg>, --profile-blocks
-
-.. option:: -all\_load
-
-.. option:: -allowable\_client <arg>
-
-.. option:: --analyze
-
-Run the static analyzer
-
-.. option:: --analyzer-no-default-checks
-
-.. option:: --analyzer-output<arg>
-
-Static analyzer report output format (html\|plist\|plist-multi-file\|plist-html\|sarif\|sarif-html\|text).
-
-.. option:: -arch <arg>
-
-.. program:: clang1
-.. option:: -arch\_errors\_fatal
-.. program:: clang
-
-.. program:: clang2
-.. option:: -arch\_only <arg>
-.. program:: clang
-
-.. option:: -arcmt-migrate-emit-errors
-
-Emit ARC errors even if the migrator can fix them
-
-.. option:: -arcmt-migrate-report-output <arg>
-
-Output path for the plist report
-
-.. option:: --autocomplete=<arg>
-
-.. option:: -bind\_at\_load
-
-.. option:: -bundle
-
-.. program:: clang1
-.. option:: -bundle\_loader <arg>
-.. program:: clang
-
-.. option:: -client\_name<arg>
-
-.. option:: -compatibility\_version<arg>
-
-.. option:: --config <arg>
-
-Specifies configuration file
-
-.. option:: --constant-cfstrings
-
-.. option:: --cuda-compile-host-device
-
-Compile CUDA code for both host and device (default).  Has no effect on non-CUDA compilations.
-
-.. option:: --cuda-device-only
-
-Compile CUDA code for device only
-
-.. option:: --cuda-host-only
-
-Compile CUDA code for host only.  Has no effect on non-CUDA compilations.
-
-.. option:: --cuda-include-ptx=<arg>, --no-cuda-include-ptx=<arg>
-
-Include PTX for the following GPU architecture (e.g. sm\_35) or 'all'. May be specified more than once.
-
-.. option:: --cuda-noopt-device-debug, --no-cuda-noopt-device-debug
-
-Enable device-side debug info generation. Disables ptxas optimizations.
-
-.. option:: -cuid=<arg>
-
-An ID for compilation unit, which should be the same for the same compilation unit but different for different compilation units. It is used to externalize device-side static variables for single source offloading languages CUDA and HIP so that they can be accessed by the host code of the same compilation unit.
-
-.. option:: -current\_version<arg>
-
-.. option:: -dead\_strip
-
-.. option:: -dependency-dot <arg>
-
-Filename to write DOT-formatted header dependencies to
-
-.. option:: -dependency-file <arg>
-
-Filename (or -) to write dependency output to
-
-.. option:: -dsym-dir<dir>
-
-Directory to output dSYM's (if any) to
-
-.. option:: -dumpmachine
-
-.. option:: -dumpversion
-
-.. option:: --dyld-prefix=<arg>, --dyld-prefix <arg>
-
-.. option:: -dylib\_file <arg>
-
-.. option:: -dylinker
-
-.. program:: clang1
-.. option:: -dylinker\_install\_name<arg>
-.. program:: clang
-
-.. option:: -dynamic
-
-.. option:: -dynamiclib
-
-.. option:: -emit-ast
-
-Emit Clang AST files for source inputs
-
-.. option:: --emit-static-lib
-
-Enable linker job to emit a static library.
-
-.. option:: -enable-trivial-auto-var-init-zero-knowing-it-will-be-removed-from-clang
-
-Trivial automatic variable initialization to zero is only here for benchmarks, it'll eventually be removed, and I'm OK with that because I'm only using it to benchmark
-
-.. option:: -exported\_symbols\_list <arg>
-
-.. option:: -faligned-new=<arg>
-
-.. option:: -ffixed-r19
-
-Reserve register r19 (Hexagon only)
-
-.. option:: -fgpu-flush-denormals-to-zero, -fcuda-flush-denormals-to-zero, -fno-gpu-flush-denormals-to-zero
-
-Flush denormal floating point values to zero in CUDA/HIP device mode.
-
-.. option:: -fheinous-gnu-extensions
-
-.. option:: -flat\_namespace
-
-.. option:: -fopenmp-targets=<arg1>,<arg2>...
-
-Specify comma-separated list of triples OpenMP offloading targets to be supported
-
-.. option:: -force\_cpusubtype\_ALL
-
-.. program:: clang1
-.. option:: -force\_flat\_namespace
-.. program:: clang
-
-.. program:: clang2
-.. option:: -force\_load <arg>
-.. program:: clang
-
-.. option:: -framework <arg>
-
-.. option:: -frtlib-add-rpath, -fno-rtlib-add-rpath
-
-Add -rpath with architecture-specific resource directory to the linker flags
-
-.. option:: -fsanitize-system-ignorelist=<arg>, -fsanitize-system-blacklist=<arg>
-
-Path to system ignorelist file for sanitizers
-
-.. option:: -fshow-skipped-includes
-
-#include files may be "skipped" due to include guard optimization
-             or #pragma once. This flag makes -H show also such includes.
-
-.. option:: -fsystem-module
-
-Build this module as a system module. Only used with -emit-module
-
-.. option:: -fuse-cuid=<arg>
-
-Method to generate ID's for compilation units for single source offloading languages CUDA and HIP: 'hash' (ID's generated by hashing file path and command line options) \| 'random' (ID's generated as random numbers) \| 'none' (disabled). Default is 'hash'. This option will be overriden by option '-cuid=\[ID\]' if it is specified.
-
-.. option:: --gcc-toolchain=<arg>, -gcc-toolchain <arg>
-
-Search for GCC installation in the specified directory on targets which commonly use GCC. The directory usually contains 'lib{,32,64}/gcc{,-cross}/$triple' and 'include'. If specified, sysroot is skipped for GCC detection. Note: executables (e.g. ld) used by the compiler are not overridden by the selected GCC installation
-
-.. option:: -gcodeview
-
-Generate CodeView debug information
-
-.. option:: -gcodeview-ghash, -gno-codeview-ghash
-
-Emit type record hashes in a .debug$H section
-
-.. option:: --gpu-instrument-lib=<arg>
-
-Instrument device library for HIP, which is a LLVM bitcode containing \_\_cyg\_profile\_func\_enter and \_\_cyg\_profile\_func\_exit
-
-.. option:: --gpu-max-threads-per-block=<arg>
-
-Default max threads per block for kernel launch bounds for HIP
-
-.. option:: -headerpad\_max\_install\_names<arg>
-
-.. option:: -help, --help
-
-Display available options
-
-.. option:: --help-hidden
-
-Display help for hidden options
-
-.. option:: --hip-link
-
-Link clang-offload-bundler bundles for HIP
-
-.. option:: --hip-version=<arg>
-
-HIP version in the format of major.minor.patch
-
-.. option:: -ibuiltininc
-
-Enable builtin #include directories even when -nostdinc is used before or after -ibuiltininc. Using -nobuiltininc after the option disables it
-
-.. option:: -image\_base <arg>
-
-.. option:: -index-header-map
-
-Make the next included directory (-I or -F) an indexer header map
-
-.. option:: -init <arg>
-
-.. option:: -install\_name <arg>
-
-.. option:: -interface-stub-version=<arg>
-
-.. option:: -keep\_private\_externs
-
-.. option:: -lazy\_framework <arg>
-
-.. program:: clang1
-.. option:: -lazy\_library <arg>
-.. program:: clang
-
-.. option:: -mbig-endian, -EB
-
-.. option:: -mbranch-protection=<arg>
-
-Enforce targets of indirect branches and function returns
-
-.. option:: -menable-unsafe-fp-math
-
-Allow unsafe floating-point math optimizations which may decrease precision
-
-.. option:: -mharden-sls=<arg>
-
-Select straight-line speculation hardening scope
-
-.. option:: --migrate
-
-Run the migrator
-
-.. option:: -mios-simulator-version-min=<arg>, -miphonesimulator-version-min=<arg>
-
-.. option:: -mlinker-version=<arg>
-
-.. option:: -mlittle-endian, -EL
-
-.. option:: -mllvm <arg>
-
-Additional arguments to forward to LLVM's option processing
-
-.. option:: -module-dependency-dir <arg>
-
-Directory to dump module dependencies to
-
-.. option:: -mtvos-simulator-version-min=<arg>, -mappletvsimulator-version-min=<arg>
-
-.. option:: -multi\_module
-
-.. option:: -multiply\_defined <arg>
-
-.. program:: clang1
-.. option:: -multiply\_defined\_unused <arg>
-.. program:: clang
-
-.. option:: -mwatchos-simulator-version-min=<arg>, -mwatchsimulator-version-min=<arg>
-
-.. option:: --no-cuda-version-check
-
-Don't error out if the detected version of the CUDA install is too low for the requested CUDA gpu architecture.
-
-.. option:: -no-integrated-cpp, --no-integrated-cpp
-
-.. option:: -no\_dead\_strip\_inits\_and\_terms
-
-.. option:: -nobuiltininc
-
-Disable builtin #include directories
-
-.. option:: -nodefaultlibs
-
-.. option:: -nofixprebinding
-
-.. option:: -nogpuinc, -nocudainc
-
-Do not add include paths for CUDA/HIP and do not include the default CUDA/HIP wrapper headers
-
-.. option:: -nogpulib, -nocudalib
-
-Do not link device library for CUDA/HIP device compilation
-
-.. option:: -nolibc
-
-.. option:: -nomultidefs
-
-.. option:: -nopie, -no-pie
-
-.. option:: -noprebind
-
-.. option:: -noprofilelib
-
-.. option:: -noseglinkedit
-
-.. option:: -nostdinc, --no-standard-includes
-
-.. program:: clang1
-.. option:: -nostdinc++
-.. program:: clang
-
-Disable standard #include directories for the C++ standard library
-
-.. option:: -nostdlib++
-
-.. option:: -nostdlibinc
-
-.. option:: -o<file>, --output <arg>, --output=<arg>
-
-Write output to <file>
-
-.. option:: -objcmt-atomic-property
-
-Make migration to 'atomic' properties
-
-.. option:: -objcmt-migrate-all
-
-Enable migration to modern ObjC
-
-.. option:: -objcmt-migrate-annotation
-
-Enable migration to property and method annotations
-
-.. option:: -objcmt-migrate-designated-init
-
-Enable migration to infer NS\_DESIGNATED\_INITIALIZER for initializer methods
-
-.. option:: -objcmt-migrate-instancetype
-
-Enable migration to infer instancetype for method result type
-
-.. option:: -objcmt-migrate-literals
-
-Enable migration to modern ObjC literals
-
-.. option:: -objcmt-migrate-ns-macros
-
-Enable migration to NS\_ENUM/NS\_OPTIONS macros
-
-.. option:: -objcmt-migrate-property
-
-Enable migration to modern ObjC property
-
-.. option:: -objcmt-migrate-property-dot-syntax
-
-Enable migration of setter/getter messages to property-dot syntax
-
-.. option:: -objcmt-migrate-protocol-conformance
-
-Enable migration to add protocol conformance on classes
-
-.. option:: -objcmt-migrate-readonly-property
-
-Enable migration to modern ObjC readonly property
-
-.. option:: -objcmt-migrate-readwrite-property
-
-Enable migration to modern ObjC readwrite property
-
-.. option:: -objcmt-migrate-subscripting
-
-Enable migration to modern ObjC subscripting
-
-.. option:: -objcmt-ns-nonatomic-iosonly
-
-Enable migration to use NS\_NONATOMIC\_IOSONLY macro for setting property's 'atomic' attribute
-
-.. option:: -objcmt-returns-innerpointer-property
-
-Enable migration to annotate property with NS\_RETURNS\_INNER\_POINTER
-
-.. option:: -objcmt-whitelist-dir-path=<arg>, -objcmt-white-list-dir-path=<arg>
-
-Only modify files with a filename contained in the provided directory path
-
-.. option:: -object
-
-.. option:: --offload-arch=<arg>, --cuda-gpu-arch=<arg>, --no-offload-arch=<arg>
-
-CUDA offloading device architecture (e.g. sm\_35), or HIP offloading target ID in the form of a device architecture followed by target ID features delimited by a colon. Each target ID feature is a pre-defined string followed by a plus or minus sign (e.g. gfx908:xnack+:sramecc-).  May be specified more than once.
-
-.. option:: -p, --profile
-
-.. option:: -pagezero\_size<arg>
-
-.. option:: -pg
-
-Enable mcount instrumentation
-
-.. option:: -pipe, --pipe
-
-Use pipes between commands, when possible
-
-.. option:: -prebind
-
-.. program:: clang1
-.. option:: -prebind\_all\_twolevel\_modules
-.. program:: clang
-
-.. option:: -preload
-
-.. option:: --print-diagnostic-categories
-
-.. option:: -print-effective-triple, --print-effective-triple
-
-Print the effective target triple
-
-.. option:: -print-file-name=<file>, --print-file-name=<file>, --print-file-name <arg>
-
-Print the full library path of <file>
-
-.. option:: -print-ivar-layout
-
-Enable Objective-C Ivar layout bitmap print trace
-
-.. option:: -print-libgcc-file-name, --print-libgcc-file-name
-
-Print the library path for the currently used compiler runtime library ("libgcc.a" or "libclang\_rt.builtins.\*.a")
-
-.. option:: -print-multi-directory, --print-multi-directory
-
-.. option:: -print-multi-lib, --print-multi-lib
-
-.. option:: -print-multiarch, --print-multiarch
-
-Print the multiarch target triple
-
-.. option:: -print-prog-name=<name>, --print-prog-name=<name>, --print-prog-name <arg>
-
-Print the full program path of <name>
-
-.. option:: -print-resource-dir, --print-resource-dir
-
-Print the resource directory pathname
-
-.. option:: -print-rocm-search-dirs, --print-rocm-search-dirs
-
-Print the paths used for finding ROCm installation
-
-.. option:: -print-runtime-dir, --print-runtime-dir
-
-Print the directory pathname containing clangs runtime libraries
-
-.. option:: -print-search-dirs, --print-search-dirs
-
-Print the paths used for finding libraries and programs
-
-.. option:: -print-target-triple, --print-target-triple
-
-Print the normalized target triple
-
-.. option:: -print-targets, --print-targets
-
-Print the registered targets
-
-.. option:: -private\_bundle
-
-.. option:: -pthread, -no-pthread
-
-Support POSIX threads in generated code
-
-.. option:: -pthreads
-
-.. option:: -read\_only\_relocs <arg>
-
-.. option:: -relocatable-pch, --relocatable-pch
-
-Whether to build a relocatable precompiled header
-
-.. option:: -remap
-
-.. option:: -rewrite-legacy-objc
-
-Rewrite Legacy Objective-C source to C++
-
-.. option:: -rtlib=<arg>, --rtlib=<arg>, --rtlib <arg>
-
-Compiler runtime library to use
-
-.. option:: -save-stats=<arg>, --save-stats=<arg>, -save-stats (equivalent to -save-stats=cwd), --save-stats (equivalent to -save-stats=cwd)
-
-Save llvm statistics.
-
-.. option:: -save-temps=<arg>, --save-temps=<arg>, -save-temps (equivalent to -save-temps=cwd), --save-temps (equivalent to -save-temps=cwd)
-
-Save intermediate compilation results.
-
-.. option:: -sectalign <arg1> <arg2> <arg3>
-
-.. option:: -sectcreate <arg1> <arg2> <arg3>
-
-.. option:: -sectobjectsymbols <arg1> <arg2>
-
-.. option:: -sectorder <arg1> <arg2> <arg3>
-
-.. option:: -seg1addr<arg>
-
-.. option:: -seg\_addr\_table <arg>
-
-.. program:: clang1
-.. option:: -seg\_addr\_table\_filename <arg>
-.. program:: clang
-
-.. option:: -segaddr <arg1> <arg2>
-
-.. option:: -segcreate <arg1> <arg2> <arg3>
-
-.. option:: -seglinkedit
-
-.. option:: -segprot <arg1> <arg2> <arg3>
-
-.. option:: -segs\_read\_<arg>
-
-.. program:: clang1
-.. option:: -segs\_read\_only\_addr <arg>
-.. program:: clang
-
-.. program:: clang2
-.. option:: -segs\_read\_write\_addr <arg>
-.. program:: clang
-
-.. option:: -serialize-diagnostics <arg>, --serialize-diagnostics <arg>
-
-Serialize compiler diagnostics to a file
-
-.. option:: -shared-libgcc
-
-.. option:: -shared-libsan, -shared-libasan
-
-Dynamically link the sanitizer runtime
-
-.. option:: -single\_module
-
-.. option:: -static-libgcc
-
-.. option:: -static-libsan
-
-Statically link the sanitizer runtime
-
-.. option:: -static-libstdc++
-
-.. option:: -static-openmp
-
-Use the static host OpenMP runtime while linking.
-
-.. option:: -std-default=<arg>
-
-.. option:: -stdlib=<arg>, --stdlib=<arg>, --stdlib <arg>
-
-C++ standard library to use
-
-.. option:: -sub\_library<arg>
-
-.. program:: clang1
-.. option:: -sub\_umbrella<arg>
-.. program:: clang
-
-.. option:: --sysroot=<arg>, --sysroot <arg>
-
-.. option:: --target-help
-
-.. option:: --target=<arg>, -target <arg>
-
-Generate code for the given target
-
-.. option:: -time
-
-Time individual commands
-
-.. option:: -traditional, --traditional
-
-.. option:: -traditional-cpp, --traditional-cpp
-
-Enable some traditional CPP emulation
-
-.. option:: -twolevel\_namespace
-
-.. program:: clang1
-.. option:: -twolevel\_namespace\_hints
-.. program:: clang
-
-.. option:: -umbrella <arg>
-
-.. option:: -unexported\_symbols\_list <arg>
-
-.. option:: -unwindlib=<arg>, --unwindlib=<arg>
-
-Unwind library to use
-
-.. option:: -v, --verbose
-
-Show commands to run and use verbose output
-
-.. option:: --verify-debug-info
-
-Verify the binary representation of debug output
-
-.. option:: --version
-
-Print version information
-
-.. option:: -w, --no-warnings
-
-Suppress all warnings
-
-.. option:: -weak-l<arg>
-
-.. option:: -weak\_framework <arg>
-
-.. program:: clang1
-.. option:: -weak\_library <arg>
-.. program:: clang
-
-.. program:: clang2
-.. option:: -weak\_reference\_mismatches <arg>
-.. program:: clang
-
-.. option:: -whatsloaded
-
-.. option:: -why\_load, -whyload
-
-.. option:: -working-directory<arg>, -working-directory=<arg>
-
-Resolve file paths relative to the specified directory
-
-.. option:: -x<language>, --language <arg>, --language=<arg>
-
-Treat subsequent input files as having type <language>
-
-.. option:: -y<arg>
-
-Actions
-=======
-The action to perform on the input.
-
-.. option:: -E, --preprocess
-
-Only run the preprocessor
-
-.. option:: -S, --assemble
-
-Only run preprocess and compilation steps
-
-.. option:: -c, --compile
-
-Only run preprocess, compile, and assemble steps
-
-.. option:: -emit-interface-stubs
-
-Generate Interface Stub Files.
-
-.. option:: -emit-llvm
-
-Use the LLVM representation for assembler and object files
-
-.. option:: -emit-merged-ifs
-
-Generate Interface Stub Files, emit merged text not binary.
-
-.. option:: -fsyntax-only
-
-.. option:: -module-file-info
-
-Provide information about a particular module file
-
-.. option:: --precompile
-
-Only precompile the input
-
-.. option:: -rewrite-objc
-
-Rewrite Objective-C source to C++
-
-.. option:: -verify-pch
-
-Load and verify that a pre-compiled header file is not stale
-
-Compilation flags
-=================
-
-Flags controlling the behavior of Clang during compilation. These flags have
-no effect during actions that do not perform compilation.
-
-.. option:: -Xassembler <arg>
-
-Pass <arg> to the assembler
-
-.. option:: -Xclang <arg>
-
-Pass <arg> to the clang compiler
-
-.. option:: -ansi, --ansi
-
-.. option:: -fc++-abi=<arg>
-
-C++ ABI to use. This will override the target C++ ABI.
-
-.. option:: -fclang-abi-compat=<version>
-
-Attempt to match the ABI of Clang <version>
-
-.. option:: -fcomment-block-commands=<arg>,<arg2>...
-
-Treat each comma separated argument in <arg> as a documentation comment block command
-
-.. option:: -fcomplete-member-pointers, -fno-complete-member-pointers
-
-Require member pointer base types to be complete if they would be significant under the Microsoft ABI
-
-.. option:: -fcrash-diagnostics-dir=<dir>
-
-Put crash-report files in <dir>
-
-.. option:: -fdeclspec, -fno-declspec
-
-Allow \_\_declspec as a keyword
-
-.. option:: -fdepfile-entry=<arg>
-
-.. option:: -fdiagnostics-fixit-info, -fno-diagnostics-fixit-info
-
-.. option:: -fdiagnostics-format=<arg>
-
-.. option:: -fdiagnostics-parseable-fixits
-
-Print fix-its in machine parseable form
-
-.. option:: -fdiagnostics-print-source-range-info
-
-Print source range spans in numeric form
-
-.. option:: -fdiagnostics-show-category=<arg>
-
-.. option:: -fdiscard-value-names, -fno-discard-value-names
-
-Discard value names in LLVM IR
-
-.. option:: -fexperimental-relative-c++-abi-vtables, -fno-experimental-relative-c++-abi-vtables
-
-Use the experimental C++ class ABI for classes with virtual tables
-
-.. option:: -fexperimental-strict-floating-point
-
-Enables experimental strict floating point in LLVM.
-
-.. option:: -ffine-grained-bitfield-accesses, -fno-fine-grained-bitfield-accesses
-
-Use separate accesses for consecutive bitfield runs with legal widths and alignments.
-
-.. option:: -fglobal-isel, -fexperimental-isel, -fno-global-isel
-
-Enables the global instruction selector
-
-.. option:: -finline-functions, -fno-inline-functions
-
-Inline suitable functions
-
-.. option:: -finline-hint-functions
-
-Inline functions which are (explicitly or implicitly) marked inline
-
-.. option:: -flegacy-pass-manager, -fno-experimental-new-pass-manager, -fno-legacy-pass-manager
-
-Use the legacy pass manager in LLVM
-
-.. option:: -fno-crash-diagnostics
-
-Disable auto-generation of preprocessed source files and a script for reproduction during a clang crash
-
-.. option:: -fno-sanitize-ignorelist, -fno-sanitize-blacklist
-
-Don't use ignorelist file for sanitizers
-
-.. option:: -fparse-all-comments
-
-.. option:: -frecord-command-line, -fno-record-command-line, -frecord-gcc-switches
-
-.. option:: -fsanitize-address-destructor=<arg>
-
-Set destructor type used in ASan instrumentation
-
-.. option:: -fsanitize-address-field-padding=<arg>
-
-Level of field padding for AddressSanitizer
-
-.. option:: -fsanitize-address-globals-dead-stripping
-
-Enable linker dead stripping of globals in AddressSanitizer
-
-.. option:: -fsanitize-address-poison-custom-array-cookie, -fno-sanitize-address-poison-custom-array-cookie
-
-Enable poisoning array cookies when using custom operator new\[\] in AddressSanitizer
-
-.. option:: -fsanitize-address-use-after-return=<mode>
-
-Select the mode of detecting stack use-after-return in AddressSanitizer
-
-.. option:: -fsanitize-address-use-after-scope, -fno-sanitize-address-use-after-scope
-
-Enable use-after-scope detection in AddressSanitizer
-
-.. option:: -fsanitize-address-use-odr-indicator, -fno-sanitize-address-use-odr-indicator
-
-Enable ODR indicator globals to avoid false ODR violation reports in partially sanitized programs at the cost of an increase in binary size
-
-.. option:: -fsanitize-cfi-canonical-jump-tables, -fno-sanitize-cfi-canonical-jump-tables
-
-Make the jump table addresses canonical in the symbol table
-
-.. option:: -fsanitize-cfi-cross-dso, -fno-sanitize-cfi-cross-dso
-
-Enable control flow integrity (CFI) checks for cross-DSO calls.
-
-.. option:: -fsanitize-cfi-icall-generalize-pointers
-
-Generalize pointers in CFI indirect call type signature checks
-
-.. option:: -fsanitize-coverage-allowlist=<arg>, -fsanitize-coverage-whitelist=<arg>
-
-Restrict sanitizer coverage instrumentation exclusively to modules and functions that match the provided special case list, except the blocked ones
-
-.. option:: -fsanitize-coverage-ignorelist=<arg>, -fsanitize-coverage-blacklist=<arg>
-
-Disable sanitizer coverage instrumentation for modules and functions that match the provided special case list, even the allowed ones
-
-.. option:: -fsanitize-coverage=<arg1>,<arg2>..., -fno-sanitize-coverage=<arg1>,<arg2>...
-
-Specify the type of coverage instrumentation for Sanitizers
-
-.. option:: -fsanitize-hwaddress-abi=<arg>
-
-Select the HWAddressSanitizer ABI to target (interceptor or platform, default interceptor). This option is currently unused.
-
-.. option:: -fsanitize-hwaddress-experimental-aliasing, -fno-sanitize-hwaddress-experimental-aliasing
-
-Enable aliasing mode in HWAddressSanitizer
-
-.. option:: -fsanitize-ignorelist=<arg>, -fsanitize-blacklist=<arg>
-
-Path to ignorelist file for sanitizers
-
-.. option:: -fsanitize-link-c++-runtime, -fno-sanitize-link-c++-runtime
-
-.. option:: -fsanitize-link-runtime, -fno-sanitize-link-runtime
-
-.. option:: -fsanitize-memory-track-origins, -fno-sanitize-memory-track-origins
-
-Enable origins tracking in MemorySanitizer
-
-.. program:: clang1
-.. option:: -fsanitize-memory-track-origins=<arg>
-.. program:: clang
-
-Enable origins tracking in MemorySanitizer
-
-.. option:: -fsanitize-memory-use-after-dtor, -fno-sanitize-memory-use-after-dtor
-
-Enable use-after-destroy detection in MemorySanitizer
-
-.. option:: -fsanitize-minimal-runtime, -fno-sanitize-minimal-runtime
-
-.. option:: -fsanitize-recover=<arg1>,<arg2>..., -fno-sanitize-recover=<arg1>,<arg2>..., -fsanitize-recover (equivalent to -fsanitize-recover=all)
-
-Enable recovery for specified sanitizers
-
-.. option:: -fsanitize-stats, -fno-sanitize-stats
-
-Enable sanitizer statistics gathering.
-
-.. option:: -fsanitize-thread-atomics, -fno-sanitize-thread-atomics
-
-Enable atomic operations instrumentation in ThreadSanitizer (default)
-
-.. option:: -fsanitize-thread-func-entry-exit, -fno-sanitize-thread-func-entry-exit
-
-Enable function entry/exit instrumentation in ThreadSanitizer (default)
-
-.. option:: -fsanitize-thread-memory-access, -fno-sanitize-thread-memory-access
-
-Enable memory access instrumentation in ThreadSanitizer (default)
-
-.. option:: -fsanitize-trap=<arg1>,<arg2>..., -fno-sanitize-trap=<arg1>,<arg2>..., -fsanitize-trap (equivalent to -fsanitize-trap=all), -fsanitize-undefined-trap-on-error (equivalent to -fsanitize-trap=undefined)
-
-Enable trapping for specified sanitizers
-
-.. option:: -fsanitize-undefined-strip-path-components=<number>
-
-Strip (or keep only, if negative) a given number of path components when emitting check metadata.
-
-.. option:: -fsanitize=<check>,<arg2>..., -fno-sanitize=<arg1>,<arg2>...
-
-Turn on runtime checks for various forms of undefined or suspicious behavior. See user manual for available checks
-
-.. option:: -moutline, -mno-outline
-
-Enable function outlining (AArch64 only)
-
-.. option:: -moutline-atomics, -mno-outline-atomics
-
-Generate local calls to out-of-line atomic operations
-
-.. option:: --param <arg>, --param=<arg>
-
-.. option:: -print-supported-cpus, --print-supported-cpus, -mcpu=?, -mtune=?
-
-Print supported cpu models for the given target (if target is not specified, it will print the supported cpus for the default target)
-
-.. option:: -std=<arg>, --std=<arg>, --std <arg>
-
-Language standard to compile for
-
-Preprocessor flags
-~~~~~~~~~~~~~~~~~~
-
-Flags controlling the behavior of the Clang preprocessor.
-
-.. option:: -C, --comments
-
-Include comments in preprocessed output
-
-.. option:: -CC, --comments-in-macros
-
-Include comments from within macros in preprocessed output
-
-.. option:: -D<macro>=<value>, --define-macro <arg>, --define-macro=<arg>
-
-Define <macro> to <value> (or 1 if <value> omitted)
-
-.. option:: -H, --trace-includes
-
-Show header includes and nesting depth
-
-.. option:: -P, --no-line-commands
-
-Disable linemarker output in -E mode
-
-.. option:: -U<macro>, --undefine-macro <arg>, --undefine-macro=<arg>
-
-Undefine macro <macro>
-
-.. option:: -Wp,<arg>,<arg2>...
-
-Pass the comma separated arguments in <arg> to the preprocessor
-
-.. option:: -Xpreprocessor <arg>
-
-Pass <arg> to the preprocessor
-
-.. option:: -fmacro-prefix-map=<arg>
-
-remap file source paths in predefined preprocessor macros
-
-Include path management
------------------------
-
-Flags controlling how ``#include``\s are resolved to files.
-
-.. option:: -I<dir>, --include-directory <arg>, --include-directory=<arg>
-
-Add directory to include search path. For C++ inputs, if
-there are multiple -I options, these directories are searched
-in the order they are given before the standard system directories
-are searched. If the same directory is in the SYSTEM include search
-paths, for example if also specified with -isystem, the -I option
-will be ignored
-
-.. option:: -I-, --include-barrier
-
-Restrict all prior -I flags to double-quoted inclusion and remove current directory from include path
-
-.. option:: --amdgpu-arch-tool=<arg>
-
-Tool used for detecting AMD GPU arch in the system.
-
-.. option:: --cuda-path-ignore-env
-
-Ignore environment variables to detect CUDA installation
-
-.. option:: --cuda-path=<arg>
-
-CUDA installation path
-
-.. option:: -cxx-isystem<directory>
-
-Add directory to the C++ SYSTEM include search path
-
-.. option:: -fbuild-session-file=<file>
-
-Use the last modification time of <file> as the build session timestamp
-
-.. option:: -fbuild-session-timestamp=<time since Epoch in seconds>
-
-Time when the current build session started
-
-.. option:: -fmodule-file=\[<name>=\]<file>
-
-Specify the mapping of module name to precompiled module file, or load a module file if name is omitted.
-
-.. option:: -fmodules-cache-path=<directory>
-
-Specify the module cache path
-
-.. option:: -fmodules-disable-diagnostic-validation
-
-Disable validation of the diagnostic options when loading the module
-
-.. option:: -fmodules-prune-after=<seconds>
-
-Specify the interval (in seconds) after which a module file will be considered unused
-
-.. option:: -fmodules-prune-interval=<seconds>
-
-Specify the interval (in seconds) between attempts to prune the module cache
-
-.. option:: -fmodules-user-build-path <directory>
-
-Specify the module user build path
-
-.. option:: -fmodules-validate-once-per-build-session
-
-Don't verify input files for the modules if the module has been successfully validated or loaded during this build session
-
-.. option:: -fmodules-validate-system-headers, -fno-modules-validate-system-headers
-
-Validate the system headers that a module depends on when loading the module
-
-.. option:: -fprebuilt-module-path=<directory>
-
-Specify the prebuilt module path
-
-.. option:: --hip-path=<arg>
-
-HIP runtime installation path, used for finding HIP version and adding HIP include path.
-
-.. option:: -idirafter<arg>, --include-directory-after <arg>, --include-directory-after=<arg>
-
-Add directory to AFTER include search path
-
-.. option:: -iframework<arg>
-
-Add directory to SYSTEM framework search path
-
-.. option:: -iframeworkwithsysroot<directory>
-
-Add directory to SYSTEM framework search path, absolute paths are relative to -isysroot
-
-.. option:: -imacros<file>, --imacros<file>, --imacros=<arg>
-
-Include macros from file before parsing
-
-.. option:: -include<file>, --include<file>, --include=<arg>
-
-Include file before parsing
-
-.. option:: -include-pch <file>
-
-Include precompiled header file
-
-.. option:: -iprefix<dir>, --include-prefix <arg>, --include-prefix=<arg>
-
-Set the -iwithprefix/-iwithprefixbefore prefix
-
-.. option:: -iquote<directory>
-
-Add directory to QUOTE include search path
-
-.. option:: -isysroot<dir>
-
-Set the system root directory (usually /)
-
-.. option:: -isystem<directory>
-
-Add directory to SYSTEM include search path
-
-.. option:: -isystem-after<directory>
-
-Add directory to end of the SYSTEM include search path
-
-.. option:: -ivfsoverlay<arg>
-
-Overlay the virtual filesystem described by file over the real file system
-
-.. option:: -iwithprefix<dir>, --include-with-prefix <arg>, --include-with-prefix-after <arg>, --include-with-prefix-after=<arg>, --include-with-prefix=<arg>
-
-Set directory to SYSTEM include search path with prefix
-
-.. option:: -iwithprefixbefore<dir>, --include-with-prefix-before <arg>, --include-with-prefix-before=<arg>
-
-Set directory to include search path with prefix
-
-.. option:: -iwithsysroot<directory>
-
-Add directory to SYSTEM include search path, absolute paths are relative to -isysroot
-
-.. option:: --libomptarget-amdgcn-bc-path=<arg>
-
-Path to libomptarget-amdgcn bitcode library
-
-.. option:: --libomptarget-nvptx-bc-path=<arg>
-
-Path to libomptarget-nvptx bitcode library
-
-.. option:: --ptxas-path=<arg>
-
-Path to ptxas (used for compiling CUDA code)
-
-.. option:: --rocm-path=<arg>
-
-ROCm installation path, used for finding and automatically linking required bitcode libraries.
-
-.. program:: clang1
-.. option:: -stdlib++-isystem<directory>
-.. program:: clang
-
-Use directory as the C++ standard library include path
-
-.. option:: --system-header-prefix=<prefix>, --no-system-header-prefix=<prefix>, --system-header-prefix <arg>
-
-Treat all #include paths starting with <prefix> as including a system header.
-
-Dependency file generation
---------------------------
-
-Flags controlling generation of a dependency file for ``make``-like build
-systems.
-
-.. option:: -M, --dependencies
-
-Like -MD, but also implies -E and writes to stdout by default
-
-.. option:: -MD, --write-dependencies
-
-Write a depfile containing user and system headers
-
-.. option:: -MF<file>
-
-Write depfile output from -MMD, -MD, -MM, or -M to <file>
-
-.. option:: -MG, --print-missing-file-dependencies
-
-Add missing headers to depfile
-
-.. option:: -MJ<arg>
-
-Write a compilation database entry per input
-
-.. option:: -MM, --user-dependencies
-
-Like -MMD, but also implies -E and writes to stdout by default
-
-.. option:: -MMD, --write-user-dependencies
-
-Write a depfile containing user headers
-
-.. option:: -MP
-
-Create phony target for each dependency (other than main file)
-
-.. option:: -MQ<arg>
-
-Specify name of main file output to quote in depfile
-
-.. option:: -MT<arg>
-
-Specify name of main file output in depfile
-
-.. option:: -MV
-
-Use NMake/Jom format for the depfile
-
-Dumping preprocessor state
---------------------------
-
-Flags allowing the state of the preprocessor to be dumped in various ways.
-
-.. option:: -d
-
-.. program:: clang1
-.. option:: -d<arg>
-.. program:: clang
-
-.. option:: -dD
-
-Print macro definitions in -E mode in addition to normal output
-
-.. option:: -dI
-
-Print include directives in -E mode in addition to normal output
-
-.. option:: -dM
-
-Print macro definitions in -E mode instead of normal output
-
-Diagnostic flags
-~~~~~~~~~~~~~~~~
-
-Flags controlling which warnings, errors, and remarks Clang will generate.
-See the :doc:`full list of warning and remark flags <DiagnosticsReference>`.
-
-.. option:: -R<remark>
-
-Enable the specified remark
-
-.. option:: -Rpass-analysis=<arg>
-
-Report transformation analysis from optimization passes whose name matches the given POSIX regular expression
-
-.. option:: -Rpass-missed=<arg>
-
-Report missed transformations by optimization passes whose name matches the given POSIX regular expression
-
-.. option:: -Rpass=<arg>
-
-Report transformations performed by optimization passes whose name matches the given POSIX regular expression
-
-.. option:: -W<warning>, --extra-warnings, --warn-<arg>, --warn-=<arg>
-
-Enable the specified warning
-
-.. option:: -Wdeprecated, -Wno-deprecated
-
-Enable warnings for deprecated constructs and define \_\_DEPRECATED
-
-.. option:: -Wnonportable-cfstrings<arg>, -Wno-nonportable-cfstrings<arg>
-
-Target-independent compilation options
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.. option:: -Wframe-larger-than=<arg>
-
-.. option:: -fPIC, -fno-PIC
-
-.. option:: -fPIE, -fno-PIE
-
-.. option:: -faccess-control, -fno-access-control
-
-.. option:: -faddrsig, -fno-addrsig
-
-Emit an address-significance table
-
-.. option:: -falign-functions, -fno-align-functions
-
-.. program:: clang1
-.. option:: -falign-functions=<arg>
-.. program:: clang
-
-.. program:: clang1
-.. option:: -faligned-allocation, -faligned-new, -fno-aligned-allocation
-.. program:: clang
-
-Enable C++17 aligned allocation functions
-
-.. option:: -fallow-editor-placeholders, -fno-allow-editor-placeholders
-
-Treat editor placeholders as valid source code
-
-.. option:: -fallow-unsupported
-
-.. option:: -faltivec, -fno-altivec
-
-.. option:: -fansi-escape-codes
-
-Use ANSI escape codes for diagnostics
-
-.. option:: -fapple-kext, -findirect-virtual-calls, -fterminated-vtables
-
-Use Apple's kernel extensions ABI
-
-.. option:: -fapple-link-rtlib
-
-Force linking the clang builtins runtime library
-
-.. option:: -fapple-pragma-pack, -fno-apple-pragma-pack
-
-Enable Apple gcc-compatible #pragma pack handling
-
-.. option:: -fapplication-extension, -fno-application-extension
-
-Restrict code to those available for App Extensions
-
-.. option:: -fasm, -fno-asm
-
-.. option:: -fasm-blocks, -fno-asm-blocks
-
-.. option:: -fassociative-math, -fno-associative-math
-
-.. option:: -fassume-sane-operator-new, -fno-assume-sane-operator-new
-
-.. option:: -fast
-
-.. option:: -fastcp
-
-.. option:: -fastf
-
-.. option:: -fasync-exceptions, -fno-async-exceptions
-
-Enable EH Asynchronous exceptions
-
-.. option:: -fasynchronous-unwind-tables, -fno-asynchronous-unwind-tables
-
-.. option:: -fautolink, -fno-autolink
-
-.. option:: -fbasic-block-sections=<arg>
-
-Generate labels for each basic block or place each basic block or a subset of basic blocks in its own section.
-
-.. option:: -fbinutils-version=<major.minor>
-
-Produced object files can use all ELF features supported by this binutils version and newer. If -fno-integrated-as is specified, the generated assembly will consider GNU as support. 'none' means that all ELF features can be used, regardless of binutils support. Defaults to 2.26.
-
-.. option:: -fblocks, -fno-blocks
-
-Enable the 'blocks' language feature
-
-.. option:: -fbootclasspath=<arg>, --bootclasspath <arg>, --bootclasspath=<arg>
-
-.. option:: -fborland-extensions, -fno-borland-extensions
-
-Accept non-standard constructs supported by the Borland compiler
-
-.. option:: -fbracket-depth=<arg>
-
-.. option:: -fbuiltin, -fno-builtin
-
-.. option:: -fbuiltin-module-map
-
-Load the clang builtins module map file.
-
-.. program:: clang1
-.. option:: -fc++-static-destructors, -fno-c++-static-destructors
-.. program:: clang
-
-.. option:: -fcaret-diagnostics, -fno-caret-diagnostics
-
-.. option:: -fcf-protection=<arg>, -fcf-protection (equivalent to -fcf-protection=full)
-
-Instrument control-flow architecture protection. Options: return, branch, full, none.
-
-.. option:: -fcf-runtime-abi=<arg>
-
-.. option:: -fchar8\_t, -fno-char8\_t
-
-Enable C++ builtin type char8\_t
-
-.. option:: -fclasspath=<arg>, --CLASSPATH <arg>, --CLASSPATH=<arg>, --classpath <arg>, --classpath=<arg>
-
-.. option:: -fcolor-diagnostics, -fno-color-diagnostics
-
-Enable colors in diagnostics
-
-.. option:: -fcommon, -fno-common
-
-Place uninitialized global variables in a common block
-
-.. option:: -fcompile-resource=<arg>, --resource <arg>, --resource=<arg>
-
-.. option:: -fconstant-cfstrings, -fno-constant-cfstrings
-
-.. option:: -fconstant-string-class=<arg>
-
-.. option:: -fconstexpr-backtrace-limit=<arg>
-
-.. option:: -fconstexpr-depth=<arg>
-
-.. option:: -fconstexpr-steps=<arg>
-
-.. option:: -fconvergent-functions
-
-Assume functions may be convergent
-
-.. option:: -fcoroutines-ts, -fno-coroutines-ts
-
-Enable support for the C++ Coroutines TS
-
-.. option:: -fcoverage-compilation-dir=<arg>
-
-The compilation directory to embed in the coverage mapping.
-
-.. option:: -fcoverage-mapping, -fno-coverage-mapping
-
-Generate coverage mapping to enable code coverage analysis
-
-.. option:: -fcoverage-prefix-map=<arg>
-
-remap file source paths in coverage mapping
-
-.. option:: -fcreate-profile
-
-.. option:: -fcs-profile-generate
-
-Generate instrumented code to collect context sensitive execution counts into default.profraw (overridden by LLVM\_PROFILE\_FILE env var)
-
-.. program:: clang1
-.. option:: -fcs-profile-generate=<directory>
-.. program:: clang
-
-Generate instrumented code to collect context sensitive execution counts into <directory>/default.profraw (overridden by LLVM\_PROFILE\_FILE env var)
-
-.. option:: -fcuda-approx-transcendentals, -fno-cuda-approx-transcendentals
-
-Use approximate transcendental functions
-
-.. option:: -fcuda-short-ptr, -fno-cuda-short-ptr
-
-Use 32-bit pointers for accessing const/local/shared address spaces
-
-.. option:: -fcxx-exceptions, -fno-cxx-exceptions
-
-Enable C++ exceptions
-
-.. option:: -fcxx-modules, -fno-cxx-modules
-
-.. option:: -fdata-sections, -fno-data-sections
-
-Place each data in its own section
-
-.. option:: -fdebug-compilation-dir=<arg>, -fdebug-compilation-dir <arg>
-
-The compilation directory to embed in the debug info
-
-.. option:: -fdebug-default-version=<arg>
-
-Default DWARF version to use, if a -g option caused DWARF debug info to be produced
-
-.. option:: -fdebug-info-for-profiling, -fno-debug-info-for-profiling
-
-Emit extra debug info to make sample profile more accurate
-
-.. option:: -fdebug-macro, -fno-debug-macro
-
-Emit macro debug information
-
-.. option:: -fdebug-pass-arguments
-
-.. option:: -fdebug-pass-structure
-
-.. option:: -fdebug-prefix-map=<arg>
-
-remap file source paths in debug info
-
-.. option:: -fdebug-ranges-base-address, -fno-debug-ranges-base-address
-
-Use DWARF base address selection entries in .debug\_ranges
-
-.. option:: -fdebug-types-section, -fno-debug-types-section
-
-Place debug types in their own section (ELF Only)
-
-.. option:: -fdelayed-template-parsing, -fno-delayed-template-parsing
-
-Parse templated function definitions at the end of the translation unit
-
-.. option:: -fdelete-null-pointer-checks, -fno-delete-null-pointer-checks
-
-Treat usage of null pointers as undefined behavior (default)
-
-.. option:: -fdenormal-fp-math=<arg>
-
-.. option:: -fdiagnostics-absolute-paths
-
-Print absolute paths in diagnostics
-
-.. option:: -fdiagnostics-color, -fno-diagnostics-color
-
-.. program:: clang1
-.. option:: -fdiagnostics-color=<arg>
-.. program:: clang
-
-.. option:: -fdiagnostics-hotness-threshold=<value>
-
-Prevent optimization remarks from being output if they do not have at least this profile count. Use 'auto' to apply the threshold from profile summary
-
-.. option:: -fdiagnostics-show-hotness, -fno-diagnostics-show-hotness
-
-Enable profile hotness information in diagnostic line
-
-.. option:: -fdiagnostics-show-note-include-stack, -fno-diagnostics-show-note-include-stack
-
-Display include stacks for diagnostic notes
-
-.. option:: -fdiagnostics-show-option, -fno-diagnostics-show-option
-
-Print option name with mappable diagnostics
-
-.. option:: -fdiagnostics-show-template-tree
-
-Print a template comparison tree for differing templates
-
-.. option:: -fdigraphs, -fno-digraphs
-
-Enable alternative token representations '<:', ':>', '<%', '%>', '%:', '%:%:' (default)
-
-.. option:: -fdirect-access-external-data, -fno-direct-access-external-data
-
-Don't use GOT indirection to reference external data symbols
-
-.. option:: -fdollars-in-identifiers, -fno-dollars-in-identifiers
-
-Allow '$' in identifiers
-
-.. option:: -fdouble-square-bracket-attributes, -fno-double-square-bracket-attributes
-
-Enable '\[\[\]\]' attributes in all C and C++ language modes
-
-.. option:: -fdwarf-directory-asm, -fno-dwarf-directory-asm
-
-.. option:: -fdwarf-exceptions
-
-Use DWARF style exceptions
-
-.. option:: -felide-constructors, -fno-elide-constructors
-
-.. option:: -feliminate-unused-debug-symbols, -fno-eliminate-unused-debug-symbols
-
-.. option:: -feliminate-unused-debug-types, -fno-eliminate-unused-debug-types
-
-Do not emit  debug info for defined but unused types
-
-.. option:: -fembed-bitcode=<option>, -fembed-bitcode (equivalent to -fembed-bitcode=all), -fembed-bitcode-marker (equivalent to -fembed-bitcode=marker)
-
-Embed LLVM bitcode (option: off, all, bitcode, marker)
-
-.. option:: -femit-all-decls
-
-Emit all declarations, even if unused
-
-.. option:: -femulated-tls, -fno-emulated-tls
-
-Use emutls functions to access thread\_local variables
-
-.. option:: -fenable-matrix
-
-Enable matrix data type and related builtin functions
-
-.. option:: -fencoding=<arg>, --encoding <arg>, --encoding=<arg>
-
-.. option:: -ferror-limit=<arg>
-
-.. option:: -fescaping-block-tail-calls, -fno-escaping-block-tail-calls
-
-.. option:: -fexceptions, -fno-exceptions
-
-Enable support for exception handling
-
-.. option:: -fexec-charset=<arg>
-
-.. option:: -fexperimental-new-constant-interpreter
-
-Enable the experimental new constant interpreter
-
-.. option:: -fextdirs=<arg>, --extdirs <arg>, --extdirs=<arg>
-
-.. option:: -fextend-arguments=<arg>
-
-Controls how scalar integer arguments are extended in calls to unprototyped and varargs functions
-
-.. option:: -ffast-math, -fno-fast-math
-
-Allow aggressive, lossy floating-point optimizations
-
-.. option:: -ffile-compilation-dir=<arg>
-
-The compilation directory to embed in the debug info and coverage mapping.
-
-.. option:: -ffile-prefix-map=<arg>
-
-remap file source paths in debug info and predefined preprocessor macros
-
-.. option:: -ffinite-loops, -fno-finite-loops
-
-Assume all loops are finite.
-
-.. option:: -ffinite-math-only, -fno-finite-math-only
-
-.. option:: -ffixed-point, -fno-fixed-point
-
-Enable fixed point types
-
-.. option:: -ffor-scope, -fno-for-scope
-
-.. option:: -fforce-dwarf-frame, -fno-force-dwarf-frame
-
-Always emit a debug frame section
-
-.. option:: -fforce-emit-vtables, -fno-force-emit-vtables
-
-Emits more virtual tables to improve devirtualization
-
-.. option:: -fforce-enable-int128, -fno-force-enable-int128
-
-Enable support for int128\_t type
-
-.. option:: -ffp-contract=<arg>
-
-Form fused FP ops (e.g. FMAs): fast (fuses across statements disregarding pragmas) \| on (only fuses in the same statement unless dictated by pragmas) \| off (never fuses) \| fast-honor-pragmas (fuses across statements unless diectated by pragmas). Default is 'fast' for CUDA, 'fast-honor-pragmas' for HIP, and 'on' otherwise.
-
-.. option:: -ffp-exception-behavior=<arg>
-
-Specifies the exception behavior of floating-point operations.
-
-.. option:: -ffp-model=<arg>
-
-Controls the semantics of floating-point calculations.
-
-.. option:: -ffreestanding
-
-Assert that the compilation takes place in a freestanding environment
-
-.. option:: -ffunction-sections, -fno-function-sections
-
-Place each function in its own section
-
-.. option:: -fgnu-inline-asm, -fno-gnu-inline-asm
-
-.. option:: -fgnu-keywords, -fno-gnu-keywords
-
-Allow GNU-extension keywords regardless of language standard
-
-.. option:: -fgnu-runtime
-
-Generate output compatible with the standard GNU Objective-C runtime
-
-.. option:: -fgnu89-inline, -fno-gnu89-inline
-
-Use the gnu89 inline semantics
-
-.. option:: -fgnuc-version=<arg>
-
-Sets various macros to claim compatibility with the given GCC version (default is 4.2.1)
-
-.. option:: -fgpu-allow-device-init, -fno-gpu-allow-device-init
-
-Allow device side init function in HIP (experimental)
-
-.. option:: -fgpu-defer-diag, -fno-gpu-defer-diag
-
-Defer host/device related diagnostic messages for CUDA/HIP
-
-.. option:: -fgpu-rdc, -fcuda-rdc, -fno-gpu-rdc
-
-Generate relocatable device code, also known as separate compilation mode
-
-.. option:: -fgpu-sanitize, -fno-gpu-sanitize
-
-Enable sanitizer for AMDGPU target
-
-.. option:: -fhip-fp32-correctly-rounded-divide-sqrt, -fno-hip-fp32-correctly-rounded-divide-sqrt
-
-Specify that single precision floating-point divide and sqrt used in the program source are correctly rounded (HIP device compilation only)
-
-.. option:: -fhip-new-launch-api, -fno-hip-new-launch-api
-
-Use new kernel launching API for HIP
-
-.. option:: -fhonor-infinities, -fhonor-infinites, -fno-honor-infinities
-
-.. option:: -fhonor-nans, -fno-honor-nans
-
-.. option:: -fhosted
-
-.. option:: -fignore-exceptions
-
-Enable support for ignoring exception handling constructs
-
-.. option:: -fimplicit-module-maps, -fmodule-maps, -fno-implicit-module-maps
-
-Implicitly search the file system for module map files.
-
-.. option:: -fimplicit-modules, -fno-implicit-modules
-
-.. option:: -finput-charset=<arg>
-
-Specify the default character set for source files
-
-.. option:: -finstrument-function-entry-bare
-
-Instrument function entry only, after inlining, without arguments to the instrumentation call
-
-.. option:: -finstrument-functions
-
-Generate calls to instrument function entry and exit
-
-.. option:: -finstrument-functions-after-inlining
-
-Like -finstrument-functions, but insert the calls after inlining
-
-.. option:: -fintegrated-as, -fno-integrated-as, -integrated-as
-
-Enable the integrated assembler
-
-.. option:: -fintegrated-cc1, -fno-integrated-cc1
-
-Run cc1 in-process
-
-.. option:: -fjump-tables, -fno-jump-tables
-
-Use jump tables for lowering switches
-
-.. option:: -fkeep-static-consts, -fno-keep-static-consts
-
-Keep static const variables if unused
-
-.. option:: -flax-vector-conversions=<arg>, -flax-vector-conversions (equivalent to -flax-vector-conversions=integer), -fno-lax-vector-conversions (equivalent to -flax-vector-conversions=none)
-
-Enable implicit vector bit-casts
-
-.. option:: -flimited-precision=<arg>
-
-.. option:: -flto, -fno-lto
-
-Enable LTO in 'full' mode
-
-.. option:: -flto-jobs=<arg>
-
-Controls the backend parallelism of -flto=thin (default of 0 means the number of threads will be derived from the number of CPUs detected)
-
-.. program:: clang1
-.. option:: -flto=<arg>
-.. program:: clang
-
-Set LTO mode to either 'full' or 'thin'
-
-.. program:: clang2
-.. option:: -flto=auto
-.. program:: clang
-
-.. program:: clang3
-.. option:: -flto=jobserver
-.. program:: clang
-
-.. option:: -fmacro-backtrace-limit=<arg>
-
-.. option:: -fmath-errno, -fno-math-errno
-
-Require math functions to indicate errors by setting errno
-
-.. option:: -fmax-tokens=<arg>
-
-Max total number of preprocessed tokens for -Wmax-tokens.
-
-.. option:: -fmax-type-align=<arg>
-
-Specify the maximum alignment to enforce on pointers lacking an explicit alignment
-
-.. option:: -fmemory-profile, -fno-memory-profile
-
-Enable heap memory profiling
-
-.. program:: clang1
-.. option:: -fmemory-profile=<directory>
-.. program:: clang
-
-Enable heap memory profiling and dump results into <directory>
-
-.. option:: -fmerge-all-constants, -fno-merge-all-constants
-
-Allow merging of constants
-
-.. option:: -fmessage-length=<arg>
-
-Format message diagnostics so that they fit within N columns
-
-.. option:: -fmodule-file-deps, -fno-module-file-deps
-
-.. option:: -fmodule-map-file=<file>
-
-Load this module map file
-
-.. option:: -fmodule-name=<name>, -fmodule-implementation-of <arg>
-
-Specify the name of the module to build
-
-.. option:: -fmodules, -fno-modules
-
-Enable the 'modules' language feature
-
-.. option:: -fmodules-decluse, -fno-modules-decluse
-
-Require declaration of modules used within a module
-
-.. option:: -fmodules-ignore-macro=<arg>
-
-Ignore the definition of the given macro when building and loading modules
-
-.. option:: -fmodules-search-all, -fno-modules-search-all
-
-Search even non-imported modules to resolve references
-
-.. option:: -fmodules-strict-decluse
-
-Like -fmodules-decluse but requires all headers to be in modules
-
-.. option:: -fmodules-ts
-
-Enable support for the C++ Modules TS
-
-.. option:: -fmodules-validate-input-files-content
-
-Validate PCM input files based on content if mtime differs
-
-.. option:: -fms-compatibility, -fno-ms-compatibility
-
-Enable full Microsoft Visual C++ compatibility
-
-.. option:: -fms-compatibility-version=<arg>
-
-Dot-separated value representing the Microsoft compiler version number to report in \_MSC\_VER (0 = don't define it (default))
-
-.. option:: -fms-extensions, -fno-ms-extensions
-
-Accept some non-standard constructs supported by the Microsoft compiler
-
-.. option:: -fms-memptr-rep=<arg>
-
-.. option:: -fms-volatile
-
-.. option:: -fmsc-version=<arg>
-
-Microsoft compiler version number to report in \_MSC\_VER (0 = don't define it (default))
-
-.. option:: -fmudflap
-
-.. option:: -fmudflapth
-
-.. option:: -fnested-functions
-
-.. option:: -fnew-alignment=<align>, -fnew-alignment <arg>
-
-Specifies the largest alignment guaranteed by '::operator new(size\_t)'
-
-.. option:: -fnext-runtime
-
-.. option:: -fno-builtin-<arg>
-
-Disable implicit builtin knowledge of a specific function
-
-.. option:: -fno-elide-type
-
-Do not elide types when printing diagnostics
-
-.. option:: -fno-max-type-align
-
-.. option:: -fno-strict-modules-decluse
-
-.. option:: -fno-temp-file
-
-Directly create compilation output files. This may lead to incorrect incremental builds if the compiler crashes
-
-.. option:: -fno-working-directory
-
-.. option:: -fno\_modules-validate-input-files-content
-
-.. program:: clang1
-.. option:: -fno\_pch-validate-input-files-content
-.. program:: clang
-
-.. option:: -fnoxray-link-deps
-
-.. option:: -fobjc-abi-version=<arg>
-
-.. option:: -fobjc-arc, -fno-objc-arc
-
-Synthesize retain and release calls for Objective-C pointers
-
-.. option:: -fobjc-arc-exceptions, -fno-objc-arc-exceptions
-
-Use EH-safe code when synthesizing retains and releases in -fobjc-arc
-
-.. option:: -fobjc-convert-messages-to-runtime-calls, -fno-objc-convert-messages-to-runtime-calls
-
-.. option:: -fobjc-disable-direct-methods-for-testing
-
-Ignore attribute objc\_direct so that direct methods can be tested
-
-.. option:: -fobjc-encode-cxx-class-template-spec, -fno-objc-encode-cxx-class-template-spec
-
-Fully encode c++ class template specialization
-
-.. option:: -fobjc-exceptions, -fno-objc-exceptions
-
-Enable Objective-C exceptions
-
-.. option:: -fobjc-infer-related-result-type, -fno-objc-infer-related-result-type
-
-.. option:: -fobjc-legacy-dispatch, -fno-objc-legacy-dispatch
-
-.. option:: -fobjc-link-runtime
-
-.. option:: -fobjc-nonfragile-abi, -fno-objc-nonfragile-abi
-
-.. option:: -fobjc-nonfragile-abi-version=<arg>
-
-.. option:: -fobjc-runtime=<arg>
-
-Specify the target Objective-C runtime kind and version
-
-.. option:: -fobjc-sender-dependent-dispatch
-
-.. option:: -fobjc-weak, -fno-objc-weak
-
-Enable ARC-style weak references in Objective-C
-
-.. option:: -foffload-lto, -fno-offload-lto
-
-Enable LTO in 'full' mode for offload compilation
-
-.. program:: clang1
-.. option:: -foffload-lto=<arg>
-.. program:: clang
-
-Set LTO mode to either 'full' or 'thin' for offload compilation
-
-.. option:: -fomit-frame-pointer, -fno-omit-frame-pointer
-
-.. option:: -fopenmp, -fno-openmp
-
-Parse OpenMP pragmas and generate parallel code.
-
-.. option:: -fopenmp-simd, -fno-openmp-simd
-
-Emit OpenMP code only for SIMD-based constructs.
-
-.. option:: -fopenmp-version=<arg>
-
-.. program:: clang1
-.. option:: -fopenmp=<arg>
-.. program:: clang
-
-.. option:: -foperator-arrow-depth=<arg>
-
-.. option:: -foperator-names, -fno-operator-names
-
-.. option:: -foptimization-record-file=<file>
-
-Specify the output name of the file containing the optimization remarks. Implies -fsave-optimization-record. On Darwin platforms, this cannot be used with multiple -arch <arch> options.
-
-.. option:: -foptimization-record-passes=<regex>
-
-Only include passes which match a specified regular expression in the generated optimization record (by default, include all passes)
-
-.. option:: -foptimize-sibling-calls, -fno-optimize-sibling-calls
-
-.. option:: -forder-file-instrumentation
-
-Generate instrumented code to collect order file into default.profraw file (overridden by '=' form of option or LLVM\_PROFILE\_FILE env var)
-
-.. option:: -foutput-class-dir=<arg>, --output-class-directory <arg>, --output-class-directory=<arg>
-
-.. option:: -fpack-struct, -fno-pack-struct
-
-.. program:: clang1
-.. option:: -fpack-struct=<arg>
-.. program:: clang
-
-Specify the default maximum struct packing alignment
-
-.. option:: -fpascal-strings, -fno-pascal-strings, -mpascal-strings
-
-Recognize and construct Pascal-style string literals
-
-.. option:: -fpass-plugin=<dsopath>
-
-Load pass plugin from a dynamic shared object file (only with new pass manager).
-
-.. option:: -fpatchable-function-entry=<N,M>
-
-Generate M NOPs before function entry and N-M NOPs after function entry
-
-.. option:: -fpcc-struct-return
-
-Override the default ABI to return all structs on the stack
-
-.. option:: -fpch-codegen, -fno-pch-codegen
-
-Generate code for uses of this PCH that assumes an explicit object file will be built for the PCH
-
-.. option:: -fpch-debuginfo, -fno-pch-debuginfo
-
-Generate debug info for types in an object file built from this PCH and do not generate them elsewhere
-
-.. option:: -fpch-instantiate-templates, -fno-pch-instantiate-templates
-
-Instantiate templates already while building a PCH
-
-.. option:: -fpch-preprocess
-
-.. option:: -fpch-validate-input-files-content
-
-Validate PCH input files based on content if mtime differs
-
-.. option:: -fpic, -fno-pic
-
-.. option:: -fpie, -fno-pie
-
-.. option:: -fplt, -fno-plt
-
-.. option:: -fplugin=<dsopath>
-
-Load the named plugin (dynamic shared object)
-
-.. option:: -fprebuilt-implicit-modules, -fno-prebuilt-implicit-modules
-
-Look up implicit modules in the prebuilt module path
-
-.. option:: -fpreserve-as-comments, -fno-preserve-as-comments
-
-.. option:: -fproc-stat-report<arg>
-
-Print subprocess statistics
-
-.. program:: clang1
-.. option:: -fproc-stat-report=<arg>
-.. program:: clang
-
-Save subprocess statistics to the given file
-
-.. option:: -fprofile-arcs, -fno-profile-arcs
-
-.. option:: -fprofile-dir=<arg>
-
-.. option:: -fprofile-exclude-files=<arg>
-
-Instrument only functions from files where names don't match all the regexes separated by a semi-colon
-
-.. option:: -fprofile-filter-files=<arg>
-
-Instrument only functions from files where names match any regex separated by a semi-colon
-
-.. option:: -fprofile-generate, -fno-profile-generate
-
-Generate instrumented code to collect execution counts into default.profraw (overridden by LLVM\_PROFILE\_FILE env var)
-
-.. program:: clang1
-.. option:: -fprofile-generate=<directory>
-.. program:: clang
-
-Generate instrumented code to collect execution counts into <directory>/default.profraw (overridden by LLVM\_PROFILE\_FILE env var)
-
-.. option:: -fprofile-instr-generate, -fno-profile-instr-generate
-
-Generate instrumented code to collect execution counts into default.profraw file (overridden by '=' form of option or LLVM\_PROFILE\_FILE env var)
-
-.. program:: clang1
-.. option:: -fprofile-instr-generate=<file>
-.. program:: clang
-
-Generate instrumented code to collect execution counts into <file> (overridden by LLVM\_PROFILE\_FILE env var)
-
-.. option:: -fprofile-instr-use, -fno-profile-instr-use, -fprofile-use
-
-.. program:: clang1
-.. option:: -fprofile-instr-use=<arg>
-.. program:: clang
-
-Use instrumentation data for profile-guided optimization
-
-.. option:: -fprofile-list=<arg>
-
-Filename defining the list of functions/files to instrument
-
-.. option:: -fprofile-remapping-file=<file>
-
-Use the remappings described in <file> to match the profile data against names in the program
-
-.. option:: -fprofile-sample-accurate, -fauto-profile-accurate, -fno-profile-sample-accurate
-
-Specifies that the sample profile is accurate. If the sample
-               profile is accurate, callsites without profile samples are marked
-               as cold. Otherwise, treat callsites without profile samples as if
-               we have no profile
-
-.. option:: -fprofile-sample-use, -fauto-profile, -fno-profile-sample-use
-
-.. program:: clang1
-.. option:: -fprofile-sample-use=<arg>, -fauto-profile=<arg>
-.. program:: clang
-
-Enable sample-based profile guided optimizations
-
-.. option:: -fprofile-update=<method>
-
-Set update method of profile counters (atomic,prefer-atomic,single)
-
-.. program:: clang1
-.. option:: -fprofile-use=<pathname>
-.. program:: clang
-
-Use instrumentation data for profile-guided optimization. If pathname is a directory, it reads from <pathname>/default.profdata. Otherwise, it reads from file <pathname>.
-
-.. option:: -fpseudo-probe-for-profiling, -fno-pseudo-probe-for-profiling
-
-Emit pseudo probes for sample profiling
-
-.. option:: -freciprocal-math, -fno-reciprocal-math
-
-Allow division operations to be reassociated
-
-.. option:: -freg-struct-return
-
-Override the default ABI to return small structs in registers
-
-.. option:: -fregister-global-dtors-with-atexit, -fno-register-global-dtors-with-atexit
-
-Use atexit or \_\_cxa\_atexit to register global destructors
-
-.. option:: -frelaxed-template-template-args, -fno-relaxed-template-template-args
-
-Enable C++17 relaxed template template argument matching
-
-.. option:: -freroll-loops, -fno-reroll-loops
-
-Turn on loop reroller
-
-.. option:: -fretain-comments-from-system-headers
-
-.. option:: -frewrite-imports, -fno-rewrite-imports
-
-.. option:: -frewrite-includes, -fno-rewrite-includes
-
-.. option:: -frewrite-map-file=<arg>
-
-.. option:: -fropi, -fno-ropi
-
-Generate read-only position independent code (ARM only)
-
-.. option:: -frounding-math, -fno-rounding-math
-
-.. option:: -frtti, -fno-rtti
-
-.. option:: -frtti-data, -fno-rtti-data
-
-.. option:: -frwpi, -fno-rwpi
-
-Generate read-write position independent code (ARM only)
-
-.. option:: -fsave-optimization-record, -fno-save-optimization-record
-
-Generate a YAML optimization record file
-
-.. program:: clang1
-.. option:: -fsave-optimization-record=<format>
-.. program:: clang
-
-Generate an optimization record file in a specific format
-
-.. option:: -fseh-exceptions
-
-Use SEH style exceptions
-
-.. option:: -fsemantic-interposition, -fno-semantic-interposition
-
-.. option:: -fshort-enums, -fno-short-enums
-
-Allocate to an enum type only as many bytes as it needs for the declared range of possible values
-
-.. option:: -fshort-wchar, -fno-short-wchar
-
-Force wchar\_t to be a short unsigned int
-
-.. option:: -fshow-column, -fno-show-column
-
-.. option:: -fshow-overloads=<arg>
-
-Which overload candidates to show when overload resolution fails: best\|all; defaults to all
-
-.. option:: -fshow-source-location, -fno-show-source-location
-
-.. option:: -fsignaling-math, -fno-signaling-math
-
-.. option:: -fsigned-bitfields
-
-.. option:: -fsigned-char, -fno-signed-char, --signed-char
-
-char is signed
-
-.. option:: -fsigned-zeros, -fno-signed-zeros
-
-.. option:: -fsized-deallocation, -fno-sized-deallocation
-
-Enable C++14 sized global deallocation functions
-
-.. option:: -fsjlj-exceptions
-
-Use SjLj style exceptions
-
-.. option:: -fslp-vectorize, -fno-slp-vectorize, -ftree-slp-vectorize
-
-Enable the superword-level parallelism vectorization passes
-
-.. option:: -fspell-checking, -fno-spell-checking
-
-.. option:: -fspell-checking-limit=<arg>
-
-.. option:: -fsplit-dwarf-inlining, -fno-split-dwarf-inlining
-
-Provide minimal debug info in the object/executable to facilitate online symbolication/stack traces in the absence of .dwo/.dwp files when using Split DWARF
-
-.. option:: -fsplit-lto-unit, -fno-split-lto-unit
-
-Enables splitting of the LTO unit
-
-.. option:: -fsplit-machine-functions, -fno-split-machine-functions
-
-Enable late function splitting using profile information (x86 ELF)
-
-.. option:: -fsplit-stack, -fno-split-stack
-
-Use segmented stack
-
-.. option:: -fstack-clash-protection, -fno-stack-clash-protection
-
-Enable stack clash protection
-
-.. option:: -fstack-protector, -fno-stack-protector
-
-Enable stack protectors for some functions vulnerable to stack smashing. This uses a loose heuristic which considers functions vulnerable if they contain a char (or 8bit integer) array or constant sized calls to alloca , which are of greater size than ssp-buffer-size (default: 8 bytes). All variable sized calls to alloca are considered vulnerable. A function with a stack protector has a guard value added to the stack frame that is checked on function exit. The guard value must be positioned in the stack frame such that a buffer overflow from a vulnerable variable will overwrite the guard value before overwriting the function's return address. The reference stack guard value is stored in a global variable.
-
-.. option:: -fstack-protector-all
-
-Enable stack protectors for all functions
-
-.. option:: -fstack-protector-strong
-
-Enable stack protectors for some functions vulnerable to stack smashing. Compared to -fstack-protector, this uses a stronger heuristic that includes functions containing arrays of any size (and any type), as well as any calls to alloca or the taking of an address from a local variable
-
-.. option:: -fstack-size-section, -fno-stack-size-section
-
-Emit section containing metadata on function stack sizes
-
-.. option:: -fstack-usage
-
-Emit .su file containing information on function stack sizes
-
-.. option:: -fstandalone-debug, -fno-limit-debug-info, -fno-standalone-debug
-
-Emit full debug info for all types used by the program
-
-.. option:: -fstrict-aliasing, -fno-strict-aliasing
-
-.. option:: -fstrict-enums, -fno-strict-enums
-
-Enable optimizations based on the strict definition of an enum's value range
-
-.. option:: -fstrict-float-cast-overflow, -fno-strict-float-cast-overflow
-
-Assume that overflowing float-to-int casts are undefined (default)
-
-.. option:: -fstrict-overflow, -fno-strict-overflow
-
-.. option:: -fstrict-return, -fno-strict-return
-
-.. option:: -fstrict-vtable-pointers, -fno-strict-vtable-pointers
-
-Enable optimizations based on the strict rules for overwriting polymorphic C++ objects
-
-.. option:: -fstruct-path-tbaa, -fno-struct-path-tbaa
-
-.. option:: -fsymbol-partition=<arg>
-
-.. option:: -ftabstop=<arg>
-
-.. option:: -ftemplate-backtrace-limit=<arg>
-
-.. option:: -ftemplate-depth-<arg>
-
-.. option:: -ftemplate-depth=<arg>
-
-.. option:: -ftest-coverage, -fno-test-coverage
-
-.. option:: -fthin-link-bitcode=<arg>
-
-Write minimized bitcode to <file> for the ThinLTO thin link only
-
-.. option:: -fthinlto-index=<arg>
-
-Perform ThinLTO importing using provided function summary index
-
-.. option:: -fthreadsafe-statics, -fno-threadsafe-statics
-
-.. option:: -ftime-report
-
-.. program:: clang1
-.. option:: -ftime-report=<arg>
-.. program:: clang
-
-(For new pass manager) "per-pass": one report for each pass; "per-pass-run": one report for each pass invocation
-
-.. option:: -ftime-trace
-
-
-Turn on time profiler. Generates JSON file based on output filename. Results
-can be analyzed with chrome://tracing or `Speedscope App
-<https://www.speedscope.app>`_ for flamegraph visualization.
-
-.. option:: -ftime-trace-granularity=<arg>
-
-Minimum time granularity (in microseconds) traced by time profiler
-
-.. option:: -ftls-model=<arg>
-
-.. option:: -ftrap-function=<arg>
-
-Issue call to specified function rather than a trap instruction
-
-.. option:: -ftrapping-math, -fno-trapping-math
-
-.. option:: -ftrapv
-
-Trap on integer overflow
-
-.. option:: -ftrapv-handler <arg>
-
-.. program:: clang1
-.. option:: -ftrapv-handler=<function name>
-.. program:: clang
-
-Specify the function to be called on overflow
-
-.. option:: -ftrigraphs, -fno-trigraphs, -trigraphs, --trigraphs
-
-Process trigraph sequences
-
-.. option:: -ftrivial-auto-var-init-stop-after=<arg>
-
-Stop initializing trivial automatic stack variables after the specified number of instances
-
-.. option:: -ftrivial-auto-var-init=<arg>
-
-Initialize trivial automatic stack variables: uninitialized (default) \| pattern
-
-.. option:: -funique-basic-block-section-names, -fno-unique-basic-block-section-names
-
-Use unique names for basic block sections (ELF Only)
-
-.. option:: -funique-internal-linkage-names, -fno-unique-internal-linkage-names
-
-Uniqueify Internal Linkage Symbol Names by appending the MD5 hash of the module path
-
-.. option:: -funique-section-names, -fno-unique-section-names
-
-.. option:: -funit-at-a-time, -fno-unit-at-a-time
-
-.. option:: -funroll-loops, -fno-unroll-loops
-
-Turn on loop unroller
-
-.. option:: -funsafe-math-optimizations, -fno-unsafe-math-optimizations
-
-.. option:: -funsigned-bitfields
-
-.. option:: -funsigned-char, -fno-unsigned-char, --unsigned-char
-
-.. option:: -funwind-tables, -fno-unwind-tables
-
-.. option:: -fuse-cxa-atexit, -fno-use-cxa-atexit
-
-.. option:: -fuse-init-array, -fno-use-init-array
-
-.. option:: -fuse-ld=<arg>
-
-.. option:: -fuse-line-directives, -fno-use-line-directives
-
-Use #line in preprocessed output
-
-.. option:: -fvalidate-ast-input-files-content
-
-Compute and store the hash of input files used to build an AST. Files with mismatching mtime's are considered valid if both contents is identical
-
-.. option:: -fveclib=<arg>
-
-Use the given vector functions library
-
-.. option:: -fvectorize, -fno-vectorize, -ftree-vectorize
-
-Enable the loop vectorization passes
-
-.. option:: -fverbose-asm, -dA, -fno-verbose-asm
-
-Generate verbose assembly output
-
-.. option:: -fvirtual-function-elimination, -fno-virtual-function-elimination
-
-Enables dead virtual function elimination optimization. Requires -flto=full
-
-.. option:: -fvisibility-dllexport=<arg>
-
-The visibility for dllexport defintions \[-fvisibility-from-dllstorageclass\]
-
-.. option:: -fvisibility-externs-dllimport=<arg>
-
-The visibility for dllimport external declarations \[-fvisibility-from-dllstorageclass\]
-
-.. option:: -fvisibility-externs-nodllstorageclass=<arg>
-
-The visibility for external declarations without an explicit DLL dllstorageclass \[-fvisibility-from-dllstorageclass\]
-
-.. option:: -fvisibility-from-dllstorageclass, -fno-visibility-from-dllstorageclass
-
-Set the visiblity of symbols in the generated code from their DLL storage class
-
-.. option:: -fvisibility-global-new-delete-hidden
-
-Give global C++ operator new and delete declarations hidden visibility
-
-.. option:: -fvisibility-inlines-hidden, -fno-visibility-inlines-hidden
-
-Give inline C++ member functions hidden visibility by default
-
-.. option:: -fvisibility-inlines-hidden-static-local-var, -fno-visibility-inlines-hidden-static-local-var
-
-When -fvisibility-inlines-hidden is enabled, static variables in inline C++ member functions will also be given hidden visibility by default
-
-.. option:: -fvisibility-ms-compat
-
-Give global types 'default' visibility and global functions and variables 'hidden' visibility by default
-
-.. option:: -fvisibility-nodllstorageclass=<arg>
-
-The visibility for defintiions without an explicit DLL export class \[-fvisibility-from-dllstorageclass\]
-
-.. option:: -fvisibility=<arg>
-
-Set the default symbol visibility for all global declarations
-
-.. option:: -fwarn-stack-size=<arg>
-
-.. option:: -fwasm-exceptions
-
-Use WebAssembly style exceptions
-
-.. option:: -fwhole-program-vtables, -fno-whole-program-vtables
-
-Enables whole-program vtable optimization. Requires -flto
-
-.. option:: -fwrapv, -fno-wrapv
-
-Treat signed integer overflow as two's complement
-
-.. option:: -fwritable-strings
-
-Store string literals as writable data
-
-.. option:: -fxl-pragma-pack, -fno-xl-pragma-pack
-
-Enable IBM XL #pragma pack handling
-
-.. option:: -fxray-always-emit-customevents, -fno-xray-always-emit-customevents
-
-Always emit \_\_xray\_customevent(...) calls even if the containing function is not always instrumented
-
-.. option:: -fxray-always-emit-typedevents, -fno-xray-always-emit-typedevents
-
-Always emit \_\_xray\_typedevent(...) calls even if the containing function is not always instrumented
-
-.. option:: -fxray-always-instrument=<arg>
-
-DEPRECATED: Filename defining the whitelist for imbuing the 'always instrument' XRay attribute.
-
-.. option:: -fxray-attr-list=<arg>
-
-Filename defining the list of functions/types for imbuing XRay attributes.
-
-.. option:: -fxray-function-groups=<arg>
-
-Only instrument 1 of N groups
-
-.. option:: -fxray-function-index, -fno-xray-function-index
-
-.. option:: -fxray-ignore-loops, -fno-xray-ignore-loops
-
-Don't instrument functions with loops unless they also meet the minimum function size
-
-.. option:: -fxray-instruction-threshold<arg>
-
-.. program:: clang1
-.. option:: -fxray-instruction-threshold=<arg>
-.. program:: clang
-
-Sets the minimum function size to instrument with XRay
-
-.. option:: -fxray-instrument, -fno-xray-instrument
-
-Generate XRay instrumentation sleds on function entry and exit
-
-.. option:: -fxray-instrumentation-bundle=<arg>
-
-Select which XRay instrumentation points to emit. Options: all, none, function-entry, function-exit, function, custom. Default is 'all'.  'function' includes both 'function-entry' and 'function-exit'.
-
-.. option:: -fxray-link-deps
-
-Tells clang to add the link dependencies for XRay.
-
-.. option:: -fxray-modes=<arg>
-
-List of modes to link in by default into XRay instrumented binaries.
-
-.. option:: -fxray-never-instrument=<arg>
-
-DEPRECATED: Filename defining the whitelist for imbuing the 'never instrument' XRay attribute.
-
-.. option:: -fxray-selected-function-group=<arg>
-
-When using -fxray-function-groups, select which group of functions to instrument. Valid range is 0 to fxray-function-groups - 1
-
-.. option:: -fzero-initialized-in-bss, -fno-zero-initialized-in-bss
-
-.. option:: -fzvector, -fno-zvector, -mzvector
-
-Enable System z vector language extension
-
-.. option:: --gpu-bundle-output, --no-gpu-bundle-output
-
-Bundle output files of HIP device compilation
-
-.. option:: -pedantic, --pedantic, -no-pedantic, --no-pedantic
-
-Warn on language extensions
-
-.. option:: -pedantic-errors, --pedantic-errors
-
-OpenCL flags
-------------
-.. option:: -cl-denorms-are-zero
-
-OpenCL only. Allow denormals to be flushed to zero.
-
-.. option:: -cl-fast-relaxed-math
-
-OpenCL only. Sets -cl-finite-math-only and -cl-unsafe-math-optimizations, and defines \_\_FAST\_RELAXED\_MATH\_\_.
-
-.. option:: -cl-finite-math-only
-
-OpenCL only. Allow floating-point optimizations that assume arguments and results are not NaNs or +-Inf.
-
-.. option:: -cl-fp32-correctly-rounded-divide-sqrt
-
-OpenCL only. Specify that single precision floating-point divide and sqrt used in the program source are correctly rounded.
-
-.. option:: -cl-kernel-arg-info
-
-OpenCL only. Generate kernel argument metadata.
-
-.. option:: -cl-mad-enable
-
-OpenCL only. Allow use of less precise MAD computations in the generated binary.
-
-.. option:: -cl-no-signed-zeros
-
-OpenCL only. Allow use of less precise no signed zeros computations in the generated binary.
-
-.. option:: -cl-no-stdinc
-
-OpenCL only. Disables all standard includes containing non-native compiler types and functions.
-
-.. option:: -cl-opt-disable
-
-OpenCL only. This option disables all optimizations. By default optimizations are enabled.
-
-.. option:: -cl-single-precision-constant
-
-OpenCL only. Treat double precision floating-point constant as single precision constant.
-
-.. option:: -cl-std=<arg>
-
-OpenCL language standard to compile for.
-
-.. option:: -cl-strict-aliasing
-
-OpenCL only. This option is added for compatibility with OpenCL 1.0.
-
-.. option:: -cl-uniform-work-group-size
-
-OpenCL only. Defines that the global work-size be a multiple of the work-group size specified to clEnqueueNDRangeKernel
-
-.. option:: -cl-unsafe-math-optimizations
-
-OpenCL only. Allow unsafe floating-point optimizations.  Also implies -cl-no-signed-zeros and -cl-mad-enable.
-
-SYCL flags
-----------
-.. option:: -fsycl, -fno-sycl
-
-Enables SYCL kernels compilation for device
-
-.. option:: -sycl-std=<arg>
-
-SYCL language standard to compile for.
-
-Target-dependent compilation options
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.. option:: -G<size>, -G=<arg>, -msmall-data-limit=<arg>, -msmall-data-threshold=<arg>
-
-Put objects of at most <size> bytes into small data section (MIPS / Hexagon)
-
-.. option:: -ffixed-x1
-
-Reserve the x1 register (AArch64/RISC-V only)
-
-.. option:: -ffixed-x10
-
-Reserve the x10 register (AArch64/RISC-V only)
-
-.. option:: -ffixed-x11
-
-Reserve the x11 register (AArch64/RISC-V only)
-
-.. option:: -ffixed-x12
-
-Reserve the x12 register (AArch64/RISC-V only)
-
-.. option:: -ffixed-x13
-
-Reserve the x13 register (AArch64/RISC-V only)
-
-.. option:: -ffixed-x14
-
-Reserve the x14 register (AArch64/RISC-V only)
-
-.. option:: -ffixed-x15
-
-Reserve the x15 register (AArch64/RISC-V only)
-
-.. option:: -ffixed-x16
-
-Reserve the x16 register (AArch64/RISC-V only)
-
-.. option:: -ffixed-x17
-
-Reserve the x17 register (AArch64/RISC-V only)
-
-.. option:: -ffixed-x18
-
-Reserve the x18 register (AArch64/RISC-V only)
-
-.. option:: -ffixed-x19
-
-Reserve the x19 register (AArch64/RISC-V only)
-
-.. option:: -ffixed-x2
-
-Reserve the x2 register (AArch64/RISC-V only)
-
-.. option:: -ffixed-x20
-
-Reserve the x20 register (AArch64/RISC-V only)
-
-.. option:: -ffixed-x21
-
-Reserve the x21 register (AArch64/RISC-V only)
-
-.. option:: -ffixed-x22
-
-Reserve the x22 register (AArch64/RISC-V only)
-
-.. option:: -ffixed-x23
-
-Reserve the x23 register (AArch64/RISC-V only)
-
-.. option:: -ffixed-x24
-
-Reserve the x24 register (AArch64/RISC-V only)
-
-.. option:: -ffixed-x25
-
-Reserve the x25 register (AArch64/RISC-V only)
-
-.. option:: -ffixed-x26
-
-Reserve the x26 register (AArch64/RISC-V only)
-
-.. option:: -ffixed-x27
-
-Reserve the x27 register (AArch64/RISC-V only)
-
-.. option:: -ffixed-x28
-
-Reserve the x28 register (AArch64/RISC-V only)
-
-.. option:: -ffixed-x29
-
-Reserve the x29 register (AArch64/RISC-V only)
-
-.. option:: -ffixed-x3
-
-Reserve the x3 register (AArch64/RISC-V only)
-
-.. option:: -ffixed-x30
-
-Reserve the x30 register (AArch64/RISC-V only)
-
-.. option:: -ffixed-x31
-
-Reserve the x31 register (AArch64/RISC-V only)
-
-.. option:: -ffixed-x4
-
-Reserve the x4 register (AArch64/RISC-V only)
-
-.. option:: -ffixed-x5
-
-Reserve the x5 register (AArch64/RISC-V only)
-
-.. option:: -ffixed-x6
-
-Reserve the x6 register (AArch64/RISC-V only)
-
-.. option:: -ffixed-x7
-
-Reserve the x7 register (AArch64/RISC-V only)
-
-.. option:: -ffixed-x8
-
-Reserve the x8 register (AArch64/RISC-V only)
-
-.. option:: -ffixed-x9
-
-Reserve the x9 register (AArch64/RISC-V only)
-
-.. option:: -m16
-
-.. option:: -m32
-
-.. option:: -m64
-
-.. option:: -mabi=<arg>
-
-.. program:: clang1
-.. option:: -mabi=vec-default
-.. program:: clang
-
-Enable the default Altivec ABI on AIX (AIX only). Uses only volatile vector registers.
-
-.. program:: clang2
-.. option:: -mabi=vec-extabi
-.. program:: clang
-
-Enable the extended Altivec ABI on AIX (AIX only). Uses volatile and nonvolatile vector registers
-
-.. option:: -maix-struct-return
-
-Return all structs in memory (PPC32 only)
-
-.. option:: -malign-branch-boundary=<arg>
-
-Specify the boundary's size to align branches
-
-.. option:: -malign-branch=<arg1>,<arg2>...
-
-Specify types of branches to align
-
-.. option:: -malign-double
-
-Align doubles to two words in structs (x86 only)
-
-.. option:: -mamdgpu-ieee, -mno-amdgpu-ieee
-
-Sets the IEEE bit in the expected default floating point  mode register. Floating point opcodes that support exception flag gathering quiet and propagate signaling NaN inputs per IEEE 754-2008. This option changes the ABI. (AMDGPU only)
-
-.. option:: -march=<arg>
-
-.. option:: -masm=<arg>
-
-.. option:: -mbackchain, -mno-backchain
-
-Link stack frames through backchain on System Z
-
-.. option:: -mbranches-within-32B-boundaries
-
-Align selected branches (fused, jcc, jmp) within 32-byte boundary
-
-.. option:: -mcmodel=<arg>, -mcmodel=medany (equivalent to -mcmodel=medium), -mcmodel=medlow (equivalent to -mcmodel=small)
-
-.. option:: -mcode-object-v3, -mno-code-object-v3
-
-Legacy option to specify code object ABI V3 (AMDGPU only)
-
-.. option:: -mcode-object-version=<version>
-
-Specify code object ABI version. Defaults to 3. (AMDGPU only)
-
-.. option:: -mconsole<arg>
-
-.. program:: clang1
-.. option:: -mcpu=<arg>, -mv5 (equivalent to -mcpu=hexagonv5), -mv55 (equivalent to -mcpu=hexagonv55), -mv60 (equivalent to -mcpu=hexagonv60), -mv62 (equivalent to -mcpu=hexagonv62), -mv65 (equivalent to -mcpu=hexagonv65), -mv66 (equivalent to -mcpu=hexagonv66), -mv67 (equivalent to -mcpu=hexagonv67), -mv67t (equivalent to -mcpu=hexagonv67t), -mv68 (equivalent to -mcpu=hexagonv68)
-.. program:: clang
-
-.. option:: -mcrc, -mno-crc
-
-Allow use of CRC instructions (ARM/Mips only)
-
-.. option:: -mdefault-build-attributes<arg>, -mno-default-build-attributes<arg>
-
-.. option:: -mdll<arg>
-
-.. option:: -mdouble=<arg>
-
-Force double to be 32 bits or 64 bits
-
-.. option:: -mdynamic-no-pic<arg>
-
-.. option:: -meabi <arg>
-
-Set EABI type, e.g. 4, 5 or gnu (default depends on triple)
-
-.. option:: -menable-experimental-extensions
-
-Enable use of experimental RISC-V extensions.
-
-.. option:: -mfentry
-
-Insert calls to fentry at function entry (x86/SystemZ only)
-
-.. option:: -mfloat-abi=<arg>
-
-.. option:: -mfpmath=<arg>
-
-.. option:: -mfpu=<arg>
-
-.. option:: -mglobal-merge, -mno-global-merge
-
-Enable merging of globals
-
-.. option:: -mhard-float
-
-.. option:: -mhwdiv=<arg>, --mhwdiv <arg>, --mhwdiv=<arg>
-
-.. option:: -mhwmult=<arg>
-
-.. option:: -miamcu, -mno-iamcu
-
-Use Intel MCU ABI
-
-.. option:: -mignore-xcoff-visibility
-
-Not emit the visibility attribute for asm in AIX OS or give all symbols 'unspecified' visibility in XCOFF object file
-
-.. option:: -mimplicit-float, -mno-implicit-float
-
-.. option:: -mimplicit-it=<arg>
-
-.. option:: -mincremental-linker-compatible, -mno-incremental-linker-compatible
-
-(integrated-as) Emit an object file which can be used with an incremental linker
-
-.. option:: -miphoneos-version-min=<arg>, -mios-version-min=<arg>
-
-.. option:: -mkernel
-
-.. option:: -mlong-calls, -mno-long-calls
-
-Generate branches with extended addressability, usually via indirect jumps.
-
-.. option:: -mlvi-cfi, -mno-lvi-cfi
-
-Enable only control-flow mitigations for Load Value Injection (LVI)
-
-.. option:: -mlvi-hardening, -mno-lvi-hardening
-
-Enable all mitigations for Load Value Injection (LVI)
-
-.. option:: -mmacosx-version-min=<arg>, -mmacos-version-min=<arg>
-
-Set Mac OS X deployment target
-
-.. option:: -mmcu=<arg>
-
-.. option:: -mms-bitfields, -mno-ms-bitfields
-
-Set the default structure layout to be compatible with the Microsoft compiler standard
-
-.. option:: -mnop-mcount
-
-Generate mcount/\_\_fentry\_\_ calls as nops. To activate they need to be patched in.
-
-.. option:: -momit-leaf-frame-pointer, -mno-omit-leaf-frame-pointer
-
-Omit frame pointer setup for leaf functions
-
-.. option:: -moslib=<arg>
-
-.. option:: -mpacked-stack, -mno-packed-stack
-
-Use packed stack layout (SystemZ only).
-
-.. option:: -mpad-max-prefix-size=<arg>
-
-Specify maximum number of prefixes to use for padding
-
-.. option:: -mprefer-vector-width=<arg>
-
-Specifies preferred vector width for auto-vectorization. Defaults to 'none' which allows target specific decisions.
-
-.. option:: -mqdsp6-compat
-
-Enable hexagon-qdsp6 backward compatibility
-
-.. option:: -mrecip
-
-.. program:: clang1
-.. option:: -mrecip=<arg1>,<arg2>...
-.. program:: clang
-
-.. option:: -mrecord-mcount
-
-Generate a \_\_mcount\_loc section entry for each \_\_fentry\_\_ call.
-
-.. option:: -mred-zone, -mno-red-zone
-
-.. option:: -mregparm=<arg>
-
-.. option:: -mrelax, -mno-relax
-
-Enable linker relaxation
-
-.. option:: -mrelax-all, -mno-relax-all
-
-(integrated-as) Relax all machine instructions
-
-.. option:: -mretpoline, -mno-retpoline
-
-.. option:: -mrtd, -mno-rtd
-
-Make StdCall calling convention the default
-
-.. option:: -mseses, -mno-seses
-
-Enable speculative execution side effect suppression (SESES). Includes LVI control flow integrity mitigations
-
-.. option:: -msign-return-address=<arg>
-
-Select return address signing scope
-
-.. option:: -msim
-
-.. option:: -msoft-float, -mno-soft-float
-
-Use software floating point
-
-.. option:: -mspeculative-load-hardening, -mno-speculative-load-hardening
-
-.. option:: -mstack-alignment=<arg>
-
-Set the stack alignment
-
-.. option:: -mstack-arg-probe, -mno-stack-arg-probe
-
-Enable stack probes
-
-.. option:: -mstack-probe-size=<arg>
-
-Set the stack probe size
-
-.. option:: -mstack-protector-guard-offset=<arg>
-
-Use the given offset for addressing the stack-protector guard
-
-.. option:: -mstack-protector-guard-reg=<arg>
-
-Use the given reg for addressing the stack-protector guard
-
-.. option:: -mstack-protector-guard=<arg>
-
-Use the given guard (global, tls) for addressing the stack-protector guard
-
-.. option:: -mstackrealign, -mno-stackrealign
-
-Force realign the stack at entry to every function
-
-.. option:: -msvr4-struct-return
-
-Return small structs in registers (PPC32 only)
-
-.. option:: -mthread-model <arg>
-
-The thread model to use, e.g. posix, single (posix by default)
-
-.. option:: -mthreads<arg>
-
-.. option:: -mthumb, -mno-thumb
-
-.. option:: -mtls-direct-seg-refs, -mno-tls-direct-seg-refs
-
-Enable direct TLS access through segment registers (default)
-
-.. option:: -mtls-size=<arg>
-
-Specify bit size of immediate TLS offsets (AArch64 ELF only): 12 (for 4KB) \| 24 (for 16MB, default) \| 32 (for 4GB) \| 48 (for 256TB, needs -mcmodel=large)
-
-.. program:: clang1
-.. option:: -mtune=<arg>
-.. program:: clang
-
-Only supported on X86 and RISC-V. Otherwise accepted for compatibility with GCC.
-
-.. option:: -mtvos-version-min=<arg>, -mappletvos-version-min=<arg>
-
-.. option:: -municode<arg>
-
-.. option:: -munsafe-fp-atomics, -mno-unsafe-fp-atomics
-
-Enable unsafe floating point atomic instructions (AMDGPU only)
-
-.. option:: -mvx, -mno-vx
-
-.. option:: -mwarn-nonportable-cfstrings, -mno-warn-nonportable-cfstrings
-
-.. option:: -mwatchos-version-min=<arg>
-
-.. option:: -mwavefrontsize64, -mno-wavefrontsize64
-
-Specify wavefront size 64 mode (AMDGPU only)
-
-.. option:: -mwindows<arg>
-
-.. option:: -mx32
-
-AARCH64
--------
-.. option:: -fcall-saved-x10
-
-Make the x10 register call-saved (AArch64 only)
-
-.. option:: -fcall-saved-x11
-
-Make the x11 register call-saved (AArch64 only)
-
-.. option:: -fcall-saved-x12
-
-Make the x12 register call-saved (AArch64 only)
-
-.. option:: -fcall-saved-x13
-
-Make the x13 register call-saved (AArch64 only)
-
-.. option:: -fcall-saved-x14
-
-Make the x14 register call-saved (AArch64 only)
-
-.. option:: -fcall-saved-x15
-
-Make the x15 register call-saved (AArch64 only)
-
-.. option:: -fcall-saved-x18
-
-Make the x18 register call-saved (AArch64 only)
-
-.. option:: -fcall-saved-x8
-
-Make the x8 register call-saved (AArch64 only)
-
-.. option:: -fcall-saved-x9
-
-Make the x9 register call-saved (AArch64 only)
-
-.. option:: -mfix-cortex-a53-835769, -mno-fix-cortex-a53-835769
-
-Workaround Cortex-A53 erratum 835769 (AArch64 only)
-
-.. option:: -mgeneral-regs-only
-
-Generate code which only uses the general purpose registers (AArch64 only)
-
-.. option:: -mmark-bti-property
-
-Add .note.gnu.property with BTI to assembly files (AArch64 only)
-
-.. option:: -msve-vector-bits=<arg>
-
-Specify the size in bits of an SVE vector register. Defaults to the vector length agnostic value of "scalable". (AArch64 only)
-
-AMDGPU
-------
-.. option:: -mcumode, -mno-cumode
-
-Specify CU wavefront execution mode (AMDGPU only)
-
-.. option:: -mtgsplit, -mno-tgsplit
-
-Enable threadgroup split execution mode (AMDGPU only)
-
-ARM
----
-.. option:: -faapcs-bitfield-load
-
-Follows the AAPCS standard that all volatile bit-field write generates at least one load. (ARM only).
-
-.. option:: -faapcs-bitfield-width, -fno-aapcs-bitfield-width
-
-Follow the AAPCS standard requirement stating that volatile bit-field width is dictated by the field container type. (ARM only).
-
-.. option:: -ffixed-r9
-
-Reserve the r9 register (ARM only)
-
-.. option:: -mcmse
-
-Allow use of CMSE (Armv8-M Security Extensions)
-
-.. option:: -mexecute-only, -mno-execute-only, -mpure-code
-
-Disallow generation of data access to code sections (ARM only)
-
-.. option:: -mno-movt
-
-Disallow use of movt/movw pairs (ARM only)
-
-.. option:: -mno-neg-immediates
-
-Disallow converting instructions with negative immediates to their negation or inversion.
-
-.. option:: -mnocrc
-
-Disallow use of CRC instructions (ARM only)
-
-.. option:: -mrestrict-it, -mno-restrict-it
-
-Disallow generation of deprecated IT blocks for ARMv8. It is on by default for ARMv8 Thumb mode.
-
-.. option:: -mtp=<arg>
-
-Thread pointer access method (AArch32/AArch64 only)
-
-.. option:: -munaligned-access, -mno-unaligned-access
-
-Allow memory accesses to be unaligned (AArch32/AArch64 only)
-
-Hexagon
--------
-.. option:: -mieee-rnd-near
-
-.. option:: -mmemops, -mno-memops
-
-Enable generation of memop instructions
-
-.. option:: -mnvj, -mno-nvj
-
-Enable generation of new-value jumps
-
-.. option:: -mnvs, -mno-nvs
-
-Enable generation of new-value stores
-
-.. option:: -mpackets, -mno-packets
-
-Enable generation of instruction packets
-
-Hexagon
--------
-.. option:: -mhvx, -mno-hvx
-
-Enable Hexagon Vector eXtensions
-
-.. option:: -mhvx-length=<arg>
-
-Set Hexagon Vector Length
-
-.. program:: clang1
-.. option:: -mhvx=<arg>
-.. program:: clang
-
-Enable Hexagon Vector eXtensions
-
-M68k
-----
-.. option:: -ffixed-a0
-
-Reserve the a0 register (M68k only)
-
-.. option:: -ffixed-a1
-
-Reserve the a1 register (M68k only)
-
-.. option:: -ffixed-a2
-
-Reserve the a2 register (M68k only)
-
-.. option:: -ffixed-a3
-
-Reserve the a3 register (M68k only)
-
-.. option:: -ffixed-a4
-
-Reserve the a4 register (M68k only)
-
-.. option:: -ffixed-a5
-
-Reserve the a5 register (M68k only)
-
-.. option:: -ffixed-a6
-
-Reserve the a6 register (M68k only)
-
-.. option:: -ffixed-d0
-
-Reserve the d0 register (M68k only)
-
-.. option:: -ffixed-d1
-
-Reserve the d1 register (M68k only)
-
-.. option:: -ffixed-d2
-
-Reserve the d2 register (M68k only)
-
-.. option:: -ffixed-d3
-
-Reserve the d3 register (M68k only)
-
-.. option:: -ffixed-d4
-
-Reserve the d4 register (M68k only)
-
-.. option:: -ffixed-d5
-
-Reserve the d5 register (M68k only)
-
-.. option:: -ffixed-d6
-
-Reserve the d6 register (M68k only)
-
-.. option:: -ffixed-d7
-
-Reserve the d7 register (M68k only)
-
-.. option:: -m68000
-
-.. option:: -m68010
-
-.. option:: -m68020
-
-.. option:: -m68030
-
-.. option:: -m68040
-
-.. option:: -m68060
-
-MIPS
-----
-.. option:: -mabicalls, -mno-abicalls
-
-Enable SVR4-style position-independent code (Mips only)
-
-.. option:: -mabs=<arg>
-
-.. option:: -mcheck-zero-division, -mno-check-zero-division
-
-.. option:: -mcompact-branches=<arg>
-
-.. option:: -mdouble-float
-
-.. option:: -mdsp, -mno-dsp
-
-.. option:: -mdspr2, -mno-dspr2
-
-.. option:: -membedded-data, -mno-embedded-data
-
-Place constants in the .rodata section instead of the .sdata section even if they meet the -G <size> threshold (MIPS)
-
-.. option:: -mextern-sdata, -mno-extern-sdata
-
-Assume that externally defined data is in the small data if it meets the -G <size> threshold (MIPS)
-
-.. option:: -mfp32
-
-Use 32-bit floating point registers (MIPS only)
-
-.. option:: -mfp64
-
-Use 64-bit floating point registers (MIPS only)
-
-.. option:: -mginv, -mno-ginv
-
-.. option:: -mgpopt, -mno-gpopt
-
-Use GP relative accesses for symbols known to be in a small data section (MIPS)
-
-.. option:: -mindirect-jump=<arg>
-
-Change indirect jump instructions to inhibit speculation
-
-.. option:: -mips16
-
-.. option:: -mldc1-sdc1, -mno-ldc1-sdc1
-
-.. option:: -mlocal-sdata, -mno-local-sdata
-
-Extend the -G behaviour to object local data (MIPS)
-
-.. option:: -mmadd4, -mno-madd4
-
-Enable the generation of 4-operand madd.s, madd.d and related instructions.
-
-.. option:: -mmicromips, -mno-micromips
-
-.. option:: -mmsa, -mno-msa
-
-Enable MSA ASE (MIPS only)
-
-.. option:: -mmt, -mno-mt
-
-Enable MT ASE (MIPS only)
-
-.. option:: -mnan=<arg>
-
-.. option:: -mno-mips16
-
-.. option:: -msingle-float
-
-.. option:: -mvirt, -mno-virt
-
-.. option:: -mxgot, -mno-xgot
-
-PowerPC
--------
-.. option:: -maltivec, -mno-altivec
-
-.. option:: -mcmpb, -mno-cmpb
-
-.. option:: -mcrbits, -mno-crbits
-
-.. option:: -mcrypto, -mno-crypto
-
-.. option:: -mdirect-move, -mno-direct-move
-
-.. option:: -mefpu2
-
-.. option:: -mfloat128, -mno-float128
-
-.. option:: -mfprnd, -mno-fprnd
-
-.. option:: -mhtm, -mno-htm
-
-.. option:: -minvariant-function-descriptors, -mno-invariant-function-descriptors
-
-.. option:: -misel, -mno-isel
-
-.. option:: -mlongcall, -mno-longcall
-
-.. option:: -mmfocrf, -mmfcrf, -mno-mfocrf
-
-.. option:: -mmma, -mno-mma
-
-.. option:: -mpaired-vector-memops, -mno-paired-vector-memops
-
-.. option:: -mpcrel, -mno-pcrel
-
-.. option:: -mpopcntd, -mno-popcntd
-
-.. option:: -mpower10-vector, -mno-power10-vector
-
-.. option:: -mpower8-vector, -mno-power8-vector
-
-.. option:: -mpower9-vector, -mno-power9-vector
-
-.. option:: -mprefixed, -mno-prefixed
-
-.. option:: -mprivileged
-
-.. option:: -mrop-protect
-
-.. option:: -msecure-plt
-
-.. option:: -mspe, -mno-spe
-
-.. option:: -mvsx, -mno-vsx
-
-WebAssembly
------------
-.. option:: -matomics, -mno-atomics
-
-.. option:: -mbulk-memory, -mno-bulk-memory
-
-.. option:: -mexception-handling, -mno-exception-handling
-
-.. option:: -mmultivalue, -mno-multivalue
-
-.. option:: -mmutable-globals, -mno-mutable-globals
-
-.. option:: -mnontrapping-fptoint, -mno-nontrapping-fptoint
-
-.. option:: -mreference-types, -mno-reference-types
-
-.. option:: -msign-ext, -mno-sign-ext
-
-.. option:: -msimd128, -mno-simd128
-
-.. option:: -mtail-call, -mno-tail-call
-
-WebAssembly Driver
-------------------
-.. option:: -mexec-model=<arg>
-
-Execution model (WebAssembly only)
-
-X86
----
-.. option:: -m3dnow, -mno-3dnow
-
-.. option:: -m3dnowa, -mno-3dnowa
-
-.. option:: -madx, -mno-adx
-
-.. option:: -maes, -mno-aes
-
-.. option:: -mamx-bf16, -mno-amx-bf16
-
-.. option:: -mamx-int8, -mno-amx-int8
-
-.. option:: -mamx-tile, -mno-amx-tile
-
-.. option:: -mavx, -mno-avx
-
-.. option:: -mavx2, -mno-avx2
-
-.. option:: -mavx512bf16, -mno-avx512bf16
-
-.. option:: -mavx512bitalg, -mno-avx512bitalg
-
-.. option:: -mavx512bw, -mno-avx512bw
-
-.. option:: -mavx512cd, -mno-avx512cd
-
-.. option:: -mavx512dq, -mno-avx512dq
-
-.. option:: -mavx512er, -mno-avx512er
-
-.. option:: -mavx512f, -mno-avx512f
-
-.. option:: -mavx512ifma, -mno-avx512ifma
-
-.. option:: -mavx512pf, -mno-avx512pf
-
-.. option:: -mavx512vbmi, -mno-avx512vbmi
-
-.. option:: -mavx512vbmi2, -mno-avx512vbmi2
-
-.. option:: -mavx512vl, -mno-avx512vl
-
-.. option:: -mavx512vnni, -mno-avx512vnni
-
-.. option:: -mavx512vp2intersect, -mno-avx512vp2intersect
-
-.. option:: -mavx512vpopcntdq, -mno-avx512vpopcntdq
-
-.. option:: -mavxvnni, -mno-avxvnni
-
-.. option:: -mbmi, -mno-bmi
-
-.. option:: -mbmi2, -mno-bmi2
-
-.. option:: -mcldemote, -mno-cldemote
-
-.. option:: -mclflushopt, -mno-clflushopt
-
-.. option:: -mclwb, -mno-clwb
-
-.. option:: -mclzero, -mno-clzero
-
-.. option:: -mcx16, -mno-cx16
-
-.. option:: -menqcmd, -mno-enqcmd
-
-.. option:: -mf16c, -mno-f16c
-
-.. option:: -mfma, -mno-fma
-
-.. option:: -mfma4, -mno-fma4
-
-.. option:: -mfsgsbase, -mno-fsgsbase
-
-.. option:: -mfxsr, -mno-fxsr
-
-.. option:: -mgfni, -mno-gfni
-
-.. option:: -mhreset, -mno-hreset
-
-.. option:: -minvpcid, -mno-invpcid
-
-.. option:: -mkl, -mno-kl
-
-.. option:: -mlwp, -mno-lwp
-
-.. option:: -mlzcnt, -mno-lzcnt
-
-.. option:: -mmmx, -mno-mmx
-
-.. option:: -mmovbe, -mno-movbe
-
-.. option:: -mmovdir64b, -mno-movdir64b
-
-.. option:: -mmovdiri, -mno-movdiri
-
-.. option:: -mmwaitx, -mno-mwaitx
-
-.. option:: -mpclmul, -mno-pclmul
-
-.. option:: -mpconfig, -mno-pconfig
-
-.. option:: -mpku, -mno-pku
-
-.. option:: -mpopcnt, -mno-popcnt
-
-.. option:: -mprefetchwt1, -mno-prefetchwt1
-
-.. option:: -mprfchw, -mno-prfchw
-
-.. option:: -mptwrite, -mno-ptwrite
-
-.. option:: -mrdpid, -mno-rdpid
-
-.. option:: -mrdrnd, -mno-rdrnd
-
-.. option:: -mrdseed, -mno-rdseed
-
-.. option:: -mretpoline-external-thunk, -mno-retpoline-external-thunk
-
-.. option:: -mrtm, -mno-rtm
-
-.. option:: -msahf, -mno-sahf
-
-.. option:: -mserialize, -mno-serialize
-
-.. option:: -msgx, -mno-sgx
-
-.. option:: -msha, -mno-sha
-
-.. option:: -mshstk, -mno-shstk
-
-.. option:: -msse, -mno-sse
-
-.. option:: -msse2, -mno-sse2
-
-.. option:: -msse3, -mno-sse3
-
-.. option:: -msse4.1, -mno-sse4.1
-
-.. program:: clang1
-.. option:: -msse4.2, -mno-sse4.2, -msse4
-.. program:: clang
-
-.. option:: -msse4a, -mno-sse4a
-
-.. option:: -mssse3, -mno-ssse3
-
-.. option:: -mtbm, -mno-tbm
-
-.. option:: -mtsxldtrk, -mno-tsxldtrk
-
-.. option:: -muintr, -mno-uintr
-
-.. option:: -mvaes, -mno-vaes
-
-.. option:: -mvpclmulqdq, -mno-vpclmulqdq
-
-.. option:: -mvzeroupper, -mno-vzeroupper
-
-.. option:: -mwaitpkg, -mno-waitpkg
-
-.. option:: -mwbnoinvd, -mno-wbnoinvd
-
-.. option:: -mwidekl, -mno-widekl
-
-.. option:: -mx87, -m80387, -mno-x87
-
-.. option:: -mxop, -mno-xop
-
-.. option:: -mxsave, -mno-xsave
-
-.. option:: -mxsavec, -mno-xsavec
-
-.. option:: -mxsaveopt, -mno-xsaveopt
-
-.. option:: -mxsaves, -mno-xsaves
-
-RISCV
------
-.. option:: -msave-restore, -mno-save-restore
-
-Enable using library calls for save and restore
-
-Long double flags
------------------
-Selects the long double implementation
-
-.. option:: -mlong-double-128
-
-Force long double to be 128 bits
-
-.. option:: -mlong-double-64
-
-Force long double to be 64 bits
-
-.. option:: -mlong-double-80
-
-Force long double to be 80 bits, padded to 128 bits for storage
-
-Optimization level
-~~~~~~~~~~~~~~~~~~
-
-Flags controlling how much optimization should be performed.
-
-.. option:: -O<arg>, -O (equivalent to -O1), --optimize, --optimize=<arg>
-
-.. option:: -Ofast<arg>
-
-Debug information generation
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Flags controlling how much and what kind of debug information should be
-generated.
-
-Kind and level of debug information
------------------------------------
-.. option:: -g, --debug, --debug=<arg>
-
-Generate source-level debug information
-
-.. option:: -gdwarf
-
-Generate source-level debug information with the default dwarf version
-
-.. option:: -gdwarf-2
-
-Generate source-level debug information with dwarf version 2
-
-.. option:: -gdwarf-3
-
-Generate source-level debug information with dwarf version 3
-
-.. option:: -gdwarf-4
-
-Generate source-level debug information with dwarf version 4
-
-.. option:: -gdwarf-5
-
-Generate source-level debug information with dwarf version 5
-
-.. option:: -gdwarf32
-
-Enables DWARF32 format for ELF binaries, if debug information emission is enabled.
-
-.. option:: -gdwarf64
-
-Enables DWARF64 format for ELF binaries, if debug information emission is enabled.
-
-.. option:: -gfull
-
-.. option:: -ginline-line-tables, -gno-inline-line-tables
-
-.. option:: -gused
-
-Debug level
-___________
-.. option:: -g0
-
-.. option:: -g2
-
-.. option:: -g3
-
-.. option:: -ggdb0
-
-.. option:: -ggdb1
-
-.. option:: -ggdb2
-
-.. option:: -ggdb3
-
-.. option:: -gline-directives-only
-
-Emit debug line info directives only
-
-.. option:: -gline-tables-only, -g1, -gmlt
-
-Emit debug line number tables only
-
-.. option:: -gmodules
-
-Generate debug info with external references to clang modules or precompiled headers
-
-Debugger to tune debug information for
-______________________________________
-.. option:: -gdbx
-
-.. option:: -ggdb
-
-.. option:: -glldb
-
-.. option:: -gsce
-
-Debug information flags
------------------------
-.. option:: -gcolumn-info, -gno-column-info
-
-.. option:: -gdwarf-aranges
-
-.. option:: -gembed-source, -gno-embed-source
-
-Embed source text in DWARF debug sections
-
-.. option:: -ggnu-pubnames, -gno-gnu-pubnames
-
-.. option:: -gpubnames, -gno-pubnames
-
-.. option:: -grecord-command-line, -gno-record-command-line, -grecord-gcc-switches
-
-.. option:: -gsplit-dwarf, -gno-split-dwarf
-
-.. program:: clang1
-.. option:: -gsplit-dwarf=<arg>
-.. program:: clang
-
-Set DWARF fission mode to either 'split' or 'single'
-
-.. option:: -gstrict-dwarf, -gno-strict-dwarf
-
-.. option:: -gz=<arg>, -gz (equivalent to -gz=zlib)
-
-DWARF debug sections compression type
-
-Static analyzer flags
-=====================
-
-Flags controlling the behavior of the Clang Static Analyzer.
-
-.. option:: -Xanalyzer <arg>
-
-Pass <arg> to the static analyzer
-
-Fortran compilation flags
-=========================
-
-Flags that will be passed onto the ``gfortran`` compiler when Clang is given
-a Fortran input.
-
-.. option:: -A<arg>, --assert <arg>, --assert=<arg>
-
-.. option:: -A-<arg>
-
-.. option:: -faggressive-function-elimination, -fno-aggressive-function-elimination
-
-.. option:: -falign-commons, -fno-align-commons
-
-.. option:: -fall-intrinsics, -fno-all-intrinsics
-
-.. option:: -fautomatic, -fno-automatic
-
-.. option:: -fbacktrace, -fno-backtrace
-
-.. option:: -fblas-matmul-limit=<arg>
-
-.. option:: -fbounds-check, -fno-bounds-check
-
-.. option:: -fcheck-array-temporaries, -fno-check-array-temporaries
-
-.. option:: -fcheck=<arg>
-
-.. option:: -fcoarray=<arg>
-
-.. option:: -fconvert=<arg>
-
-.. option:: -fcray-pointer, -fno-cray-pointer
-
-.. option:: -fd-lines-as-code, -fno-d-lines-as-code
-
-.. option:: -fd-lines-as-comments, -fno-d-lines-as-comments
-
-.. option:: -fdollar-ok, -fno-dollar-ok
-
-.. option:: -fdump-fortran-optimized, -fno-dump-fortran-optimized
-
-.. option:: -fdump-fortran-original, -fno-dump-fortran-original
-
-.. option:: -fdump-parse-tree, -fno-dump-parse-tree
-
-.. option:: -fexternal-blas, -fno-external-blas
-
-.. option:: -ff2c, -fno-f2c
-
-.. option:: -ffpe-trap=<arg>
-
-.. option:: -ffree-line-length-<arg>
-
-.. option:: -ffrontend-optimize, -fno-frontend-optimize
-
-.. option:: -finit-character=<arg>
-
-.. option:: -finit-integer=<arg>
-
-.. option:: -finit-local-zero, -fno-init-local-zero
-
-.. option:: -finit-logical=<arg>
-
-.. option:: -finit-real=<arg>
-
-.. option:: -finteger-4-integer-8, -fno-integer-4-integer-8
-
-.. option:: -fmax-array-constructor=<arg>
-
-.. option:: -fmax-errors=<arg>
-
-.. option:: -fmax-identifier-length, -fno-max-identifier-length
-
-.. option:: -fmax-stack-var-size=<arg>
-
-.. option:: -fmax-subrecord-length=<arg>
-
-.. option:: -fmodule-private, -fno-module-private
-
-.. option:: -fpack-derived, -fno-pack-derived
-
-.. option:: -fprotect-parens, -fno-protect-parens
-
-.. option:: -frange-check, -fno-range-check
-
-.. option:: -freal-4-real-10, -fno-real-4-real-10
-
-.. option:: -freal-4-real-16, -fno-real-4-real-16
-
-.. option:: -freal-4-real-8, -fno-real-4-real-8
-
-.. option:: -freal-8-real-10, -fno-real-8-real-10
-
-.. option:: -freal-8-real-16, -fno-real-8-real-16
-
-.. option:: -freal-8-real-4, -fno-real-8-real-4
-
-.. option:: -frealloc-lhs, -fno-realloc-lhs
-
-.. option:: -frecord-marker=<arg>
-
-.. option:: -frecursive, -fno-recursive
-
-.. option:: -frepack-arrays, -fno-repack-arrays
-
-.. option:: -fsecond-underscore, -fno-second-underscore
-
-.. option:: -fsign-zero, -fno-sign-zero
-
-.. option:: -fstack-arrays, -fno-stack-arrays
-
-.. option:: -funderscoring, -fno-underscoring
-
-.. option:: -fwhole-file, -fno-whole-file
-
-.. option:: -imultilib <arg>
-
-.. option:: -static-libgfortran
-
-Linker flags
-============
-Flags that are passed on to the linker
-
-.. option:: -L<dir>, --library-directory <arg>, --library-directory=<arg>
-
-Add directory to library search path
-
-.. option:: -Mach
-
-.. option:: -T<script>
-
-Specify <script> as linker script
-
-.. option:: -Tbss<addr>
-
-Set starting address of BSS to <addr>
-
-.. option:: -Tdata<addr>
-
-Set starting address of DATA to <addr>
-
-.. option:: -Ttext<addr>
-
-Set starting address of TEXT to <addr>
-
-.. option:: -Wl,<arg>,<arg2>...
-
-Pass the comma separated arguments in <arg> to the linker
-
-.. option:: -X
-
-.. option:: -Xlinker <arg>, --for-linker <arg>, --for-linker=<arg>
-
-Pass <arg> to the linker
-
-.. program:: clang1
-.. option:: -Z
-.. program:: clang
-
-.. option:: -coverage, --coverage
-
-.. option:: -e<arg>, --entry
-
-.. option:: -filelist <arg>
-
-.. option:: --hip-device-lib=<arg>
-
-HIP device library
-
-.. option:: -l<arg>
-
-.. option:: --ld-path=<arg>
-
-.. option:: -nostartfiles
-
-.. program:: clang1
-.. option:: -nostdlib, --no-standard-libraries
-.. program:: clang
-
-.. option:: -pie
-
-.. option:: -r
-
-.. option:: -rdynamic
-
-.. option:: --rocm-device-lib-path=<arg>, --hip-device-lib-path=<arg>
-
-ROCm device library path. Alternative to rocm-path.
-
-.. option:: -rpath <arg>
-
-.. option:: -s
-
-.. option:: -shared, --shared
-
-.. option:: -specs=<arg>, --specs=<arg>
-
-.. option:: -static, --static
-
-.. option:: -static-pie
-
-.. option:: -t
-
-.. option:: -u<arg>, --force-link <arg>, --force-link=<arg>
-
-.. option:: -undef
-
-undef all system defines
-
-.. option:: -undefined<arg>, --no-undefined
-
-.. option:: -z <arg>
-
-Pass -z <arg> to the linker
-
diff --git a/gnu/llvm/clang/docs/CommandGuide/clang.rst b/gnu/llvm/clang/docs/CommandGuide/clang.rst
index 46b2be286c4..7430028235c 100644
--- a/gnu/llvm/clang/docs/CommandGuide/clang.rst
+++ b/gnu/llvm/clang/docs/CommandGuide/clang.rst
@@ -75,7 +75,7 @@ Stage Selection Options
 
 .. option:: -fsyntax-only
 
- Run the preprocessor, parser and type checking stages.
+ Run the preprocessor, parser and semantic analysis stages.
 
 .. option:: -S
 
@@ -185,15 +185,23 @@ Language Selection and Mode Options
 
    ISO C++ 2017 with amendments and GNU extensions
 
-  | ``c++2a``
+  | ``c++20``
 
-   Working draft for ISO C++ 2020
+   ISO C++ 2020 with amendments
 
-  | ``gnu++2a``
+  | ``gnu++20``
 
-   Working draft for ISO C++ 2020 with GNU extensions
+   ISO C++ 2020 with amendments and GNU extensions
 
- The default C++ language standard is ``gnu++14``.
+  | ``c++2b``
+
+   Working draft for ISO C++ 2023
+
+  | ``gnu++2b``
+
+   Working draft for ISO C++ 2023 with GNU extensions
+
+ The default C++ language standard is ``gnu++17``.
 
  Supported values for the OpenCL language are:
 
@@ -252,8 +260,24 @@ Language Selection and Mode Options
 
 .. option:: -fno-builtin
 
- Disable special handling and optimizations of builtin functions like
- :c:func:`strlen` and :c:func:`malloc`.
+ Disable special handling and optimizations of well-known library functions,
+ like :c:func:`strlen` and :c:func:`malloc`.
+
+.. option:: -fno-builtin-<function>
+
+ Disable special handling and optimizations for the specific library function.
+ For example, ``-fno-builtin-strlen`` removes any special handling for the
+ :c:func:`strlen` library function.
+
+.. option:: -fno-builtin-std-<function>
+
+ Disable special handling and optimizations for the specific C++ standard
+ library function in namespace ``std``. For example,
+ ``-fno-builtin-std-move_if_noexcept`` removes any special handling for the
+ :cpp:func:`std::move_if_noexcept` library function.
+
+ For C standard library functions that the C++ standard library also provides
+ in namespace ``std``, use :option:`-fno-builtin-\<function\>` instead.
 
 .. option:: -fmath-errno
 
@@ -323,7 +347,11 @@ number of cross compilers, or may only support a native target.
 
 .. option:: -arch <architecture>
 
-  Specify the architecture to build for.
+  Specify the architecture to build for (Mac OS X specific).
+
+.. option:: -target <architecture>
+
+  Specify the architecture to build for (all platforms).
 
 .. option:: -mmacosx-version-min=<version>
 
@@ -662,7 +690,7 @@ ENVIRONMENT
 BUGS
 ----
 
-To report bugs, please visit <https://bugs.llvm.org/>.  Most bug reports should
+To report bugs, please visit <https://github.com/llvm/llvm-project/issues/>.  Most bug reports should
 include preprocessed source files (use the :option:`-E` option) and the full
 output of the compiler, along with information to reproduce.
 
diff --git a/gnu/llvm/clang/docs/Makefile.sphinx b/gnu/llvm/clang/docs/Makefile.sphinx
deleted file mode 100644
index 7949e39c368..00000000000
--- a/gnu/llvm/clang/docs/Makefile.sphinx
+++ /dev/null
@@ -1,163 +0,0 @@
-# Makefile for Sphinx documentation
-#
-
-# You can set these variables from the command line.
-SPHINXOPTS    =
-SPHINXBUILD   = sphinx-build
-PAPER         =
-BUILDDIR      = _build
-
-# Internal variables.
-PAPEROPT_a4     = -D latex_paper_size=a4
-PAPEROPT_letter = -D latex_paper_size=letter
-ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
-# the i18n builder cannot share the environment and doctrees with the others
-I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
-
-.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext default
-
-default: html
-
-help:
-	@echo "Please use \`make <target>' where <target> is one of"
-	@echo "  html       to make standalone HTML files"
-	@echo "  dirhtml    to make HTML files named index.html in directories"
-	@echo "  singlehtml to make a single large HTML file"
-	@echo "  pickle     to make pickle files"
-	@echo "  json       to make JSON files"
-	@echo "  htmlhelp   to make HTML files and a HTML help project"
-	@echo "  qthelp     to make HTML files and a qthelp project"
-	@echo "  devhelp    to make HTML files and a Devhelp project"
-	@echo "  epub       to make an epub"
-	@echo "  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
-	@echo "  latexpdf   to make LaTeX files and run them through pdflatex"
-	@echo "  text       to make text files"
-	@echo "  man        to make manual pages"
-	@echo "  texinfo    to make Texinfo files"
-	@echo "  info       to make Texinfo files and run them through makeinfo"
-	@echo "  gettext    to make PO message catalogs"
-	@echo "  changes    to make an overview of all changed/added/deprecated items"
-	@echo "  linkcheck  to check all external links for integrity"
-	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
-
-clean:
-	-rm -rf $(BUILDDIR)/*
-
-html:
-	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
-	@echo
-	@# FIXME: Remove this `cp` once HTML->Sphinx transition is completed.
-	@# Kind of a hack, but HTML-formatted docs are on the way out anyway.
-	@echo "Copying legacy HTML-formatted docs into $(BUILDDIR)/html"
-	@cp -a *.html $(BUILDDIR)/html
-	@# FIXME: What we really need is a way to specify redirects, so that
-	@# we can just redirect to a reST'ified version of this document.
-	@# PR14714 is tracking the issue of redirects.
-	@cp -a Block-ABI-Apple.txt $(BUILDDIR)/html
-	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
-
-dirhtml:
-	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
-	@echo
-	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
-
-singlehtml:
-	$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
-	@echo
-	@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
-
-pickle:
-	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
-	@echo
-	@echo "Build finished; now you can process the pickle files."
-
-json:
-	$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
-	@echo
-	@echo "Build finished; now you can process the JSON files."
-
-htmlhelp:
-	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
-	@echo
-	@echo "Build finished; now you can run HTML Help Workshop with the" \
-	      ".hhp project file in $(BUILDDIR)/htmlhelp."
-
-qthelp:
-	$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
-	@echo
-	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
-	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
-	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/Clang.qhcp"
-	@echo "To view the help file:"
-	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/Clang.qhc"
-
-devhelp:
-	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
-	@echo
-	@echo "Build finished."
-	@echo "To view the help file:"
-	@echo "# mkdir -p $$HOME/.local/share/devhelp/Clang"
-	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/Clang"
-	@echo "# devhelp"
-
-epub:
-	$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
-	@echo
-	@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
-
-latex:
-	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
-	@echo
-	@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
-	@echo "Run \`make' in that directory to run these through (pdf)latex" \
-	      "(use \`make latexpdf' here to do that automatically)."
-
-latexpdf:
-	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
-	@echo "Running LaTeX files through pdflatex..."
-	$(MAKE) -C $(BUILDDIR)/latex all-pdf
-	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
-
-text:
-	$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
-	@echo
-	@echo "Build finished. The text files are in $(BUILDDIR)/text."
-
-man:
-	$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
-	@echo
-	@echo "Build finished. The manual pages are in $(BUILDDIR)/man."
-
-texinfo:
-	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
-	@echo
-	@echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo."
-	@echo "Run \`make' in that directory to run these through makeinfo" \
-	      "(use \`make info' here to do that automatically)."
-
-info:
-	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
-	@echo "Running Texinfo files through makeinfo..."
-	make -C $(BUILDDIR)/texinfo info
-	@echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo."
-
-gettext:
-	$(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale
-	@echo
-	@echo "Build finished. The message catalogs are in $(BUILDDIR)/locale."
-
-changes:
-	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
-	@echo
-	@echo "The overview file is in $(BUILDDIR)/changes."
-
-linkcheck:
-	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
-	@echo
-	@echo "Link check complete; look for any errors in the above output " \
-	      "or in $(BUILDDIR)/linkcheck/output.txt."
-
-doctest:
-	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
-	@echo "Testing of doctests in the sources finished, look at the " \
-	      "results in $(BUILDDIR)/doctest/output.txt."
diff --git a/gnu/llvm/clang/examples/clang-interpreter/CMakeLists.txt b/gnu/llvm/clang/examples/clang-interpreter/CMakeLists.txt
deleted file mode 100644
index 11056aa379a..00000000000
--- a/gnu/llvm/clang/examples/clang-interpreter/CMakeLists.txt
+++ /dev/null
@@ -1,93 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  Core
-  ExecutionEngine
-  MC
-  MCJIT
-  Object
-  OrcJit
-  Option
-  RuntimeDyld
-  Support
-  native
-  )
-
-add_clang_executable(clang-interpreter
-  main.cpp
-  )
-
-add_dependencies(clang-interpreter
-  clang-resource-headers
-  )
-
-clang_target_link_libraries(clang-interpreter
-  PRIVATE
-  clangBasic
-  clangCodeGen
-  clangDriver
-  clangFrontend
-  clangSerialization
-  )
-
-export_executable_symbols(clang-interpreter)
-
-if (MSVC)
-  # Is this a CMake bug that even with export_executable_symbols, Windows
-  # needs to explictly export the type_info vtable
-  set_property(TARGET clang-interpreter
-               APPEND_STRING PROPERTY LINK_FLAGS " /EXPORT:??_7type_info@@6B@")
-endif()
-
-function(clang_enable_exceptions TARGET)
-  # Really have to jump through hoops to enable exception handling independent
-  # of how LLVM is being built.
-  if (NOT LLVM_REQUIRES_EH AND NOT LLVM_REQUIRES_RTTI)
-    if (MSVC)
-      # /EHs to allow throwing from extern "C"
-      set(excptnExceptions_ON "/D _HAS_EXCEPTIONS=1 /EHs /wd4714")
-      set(excptnExceptions_OFF "/D _HAS_EXCEPTIONS=0 /EHs-c-")
-      set(excptnRTTI_ON "/GR")
-      set(excptnRTTI_OFF "/GR-")
-      set(excptnEHRTTIRegEx "(/EHs(-c-?)|_HAS_EXCEPTIONS=(0|1))")
-    else()
-      set(excptnExceptions_ON "-fexceptions")
-      set(excptnExceptions_OFF "-fno-exceptions")
-      set(excptnRTTI_ON "-frtti")
-      set(excptnRTTI_OFF "-fno-rtti")
-      set(excptnEHRTTIRegEx "-f(exceptions|no-exceptions)")
-    endif()
-    if (LLVM_REQUIRES_EH)
-      set(excptnExceptions_DFLT ${excptnExceptions_ON})
-    else()
-      set(excptnExceptions_DFLT ${excptnExceptions_OFF})
-    endif()
-    if (LLVM_REQUIRES_RTTI)
-      set(excptnRTTI_DFLT ${excptnRTTI_ON})
-    else()
-      set(excptnRTTI_DFLT ${excptnRTTI_OFF})
-    endif()
-
-    # Strip the exception & rtti flags from the target
-    get_property(addedFlags TARGET ${TARGET} PROPERTY COMPILE_FLAGS)
-    string(REGEX REPLACE ${excptnEHRTTIRegEx} "" editedFlags "${addedFlags}")
-    string(REPLACE ${excptnRTTI_OFF} "" editedFlags "${editedFlags}")
-    set_property(TARGET ${TARGET} PROPERTY COMPILE_FLAGS "${editedFlags}")
-
-    get_property(addedFlags TARGET ${TARGET} PROPERTY COMPILE_DEFINITIONS)
-    string(REGEX REPLACE ${excptnEHRTTIRegEx} "" editedFlags "${addedFlags}")
-    string(REPLACE ${excptnRTTI_OFF} "" editedFlags "${editedFlags}")
-    set_property(TARGET ${TARGET} PROPERTY COMPILE_DEFINITIONS "${editedFlags}")
-
-    # Re-add the exception & rtti flags from LLVM
-    set_property(SOURCE main.cpp APPEND_STRING PROPERTY COMPILE_FLAGS
-                   " ${excptnExceptions_DFLT} ${excptnRTTI_DFLT} ")
-    set_property(SOURCE Manager.cpp APPEND_STRING PROPERTY COMPILE_FLAGS
-                   " ${excptnExceptions_DFLT} ${excptnRTTI_DFLT} ")
-
-    # Invoke with exceptions & rtti
-    set_property(SOURCE Invoke.cpp APPEND_STRING PROPERTY COMPILE_FLAGS
-                   " ${excptnExceptions_ON} ${excptnRTTI_ON} ")
-
-  endif()
-endfunction(clang_enable_exceptions)
-
-clang_enable_exceptions(clang-interpreter)
diff --git a/gnu/llvm/clang/examples/clang-interpreter/README.txt b/gnu/llvm/clang/examples/clang-interpreter/README.txt
deleted file mode 100644
index b4f8a935cef..00000000000
--- a/gnu/llvm/clang/examples/clang-interpreter/README.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-This is an example of Clang based interpreter, for executing standalone C/C++
-programs.
-
-It demonstrates the following features:
- 1. Parsing standard compiler command line arguments using the Driver library.
-
- 2. Constructing a Clang compiler instance, using the appropriate arguments
-    derived in step #1.
-
- 3. Invoking the Clang compiler to lex, parse, syntax check, and then generate
-    LLVM code.
-
- 4. Use the LLVM JIT functionality to execute the final module.
-
- 5. Intercepting a Win64 library call to allow throwing and catching exceptions
-    in and from the JIT.
-
-The implementation has many limitations and is not designed to be a full fledged
-interpreter. It is designed to demonstrate a simple but functional use of the
-Clang compiler libraries.
diff --git a/gnu/llvm/clang/examples/clang-interpreter/Test.cxx b/gnu/llvm/clang/examples/clang-interpreter/Test.cxx
deleted file mode 100644
index ed7fc86f9e5..00000000000
--- a/gnu/llvm/clang/examples/clang-interpreter/Test.cxx
+++ /dev/null
@@ -1,33 +0,0 @@
-//===-- examples/clang-interpreter/Test.cxx - Clang C Interpreter Example -===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// Example throwing in and from the JIT (particularly on Win64).
-//
-// ./bin/clang-interpreter <src>/tools/clang/examples/clang-interpreter/Test.cxx
-
-#include <stdexcept>
-#include <stdio.h>
-
-static void ThrowerAnError(const char* Name) {
-  throw std::runtime_error(Name);
-}
-
-int main(int argc, const char** argv) {
-  for (int I = 0; I < argc; ++I)
-   printf("arg[%d]='%s'\n", I, argv[I]);
-
-  try {
-    ThrowerAnError("In JIT");
-  } catch (const std::exception& E) {
-    printf("Caught: '%s'\n", E.what());
-  } catch (...) {
-    printf("Unknown exception\n");
-  }
-  ThrowerAnError("From JIT");
-  return 0;
-}
diff --git a/gnu/llvm/clang/examples/clang-interpreter/main.cpp b/gnu/llvm/clang/examples/clang-interpreter/main.cpp
deleted file mode 100644
index 342d4208947..00000000000
--- a/gnu/llvm/clang/examples/clang-interpreter/main.cpp
+++ /dev/null
@@ -1,234 +0,0 @@
-//===-- examples/clang-interpreter/main.cpp - Clang C Interpreter Example -===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/Basic/DiagnosticOptions.h"
-#include "clang/CodeGen/CodeGenAction.h"
-#include "clang/Driver/Compilation.h"
-#include "clang/Driver/Driver.h"
-#include "clang/Driver/Tool.h"
-#include "clang/Frontend/CompilerInstance.h"
-#include "clang/Frontend/CompilerInvocation.h"
-#include "clang/Frontend/FrontendDiagnostic.h"
-#include "clang/Frontend/TextDiagnosticPrinter.h"
-#include "llvm/ADT/SmallString.h"
-#include "llvm/ExecutionEngine/ExecutionEngine.h"
-#include "llvm/ExecutionEngine/Orc/CompileUtils.h"
-#include "llvm/ExecutionEngine/Orc/ExecutionUtils.h"
-#include "llvm/ExecutionEngine/Orc/IRCompileLayer.h"
-#include "llvm/ExecutionEngine/Orc/RTDyldObjectLinkingLayer.h"
-#include "llvm/ExecutionEngine/SectionMemoryManager.h"
-#include "llvm/IR/DataLayout.h"
-#include "llvm/IR/Mangler.h"
-#include "llvm/IR/Module.h"
-#include "llvm/Support/FileSystem.h"
-#include "llvm/Support/Host.h"
-#include "llvm/Support/ManagedStatic.h"
-#include "llvm/Support/Path.h"
-#include "llvm/Support/TargetSelect.h"
-#include "llvm/Support/raw_ostream.h"
-#include "llvm/Target/TargetMachine.h"
-
-using namespace clang;
-using namespace clang::driver;
-
-// This function isn't referenced outside its translation unit, but it
-// can't use the "static" keyword because its address is used for
-// GetMainExecutable (since some platforms don't support taking the
-// address of main, and some platforms can't implement GetMainExecutable
-// without being given the address of a function in the main executable).
-std::string GetExecutablePath(const char *Argv0, void *MainAddr) {
-  return llvm::sys::fs::getMainExecutable(Argv0, MainAddr);
-}
-
-namespace llvm {
-namespace orc {
-
-class SimpleJIT {
-private:
-  ExecutionSession ES;
-  std::unique_ptr<TargetMachine> TM;
-  const DataLayout DL;
-  MangleAndInterner Mangle{ES, DL};
-  JITDylib &MainJD{ES.createBareJITDylib("<main>")};
-  RTDyldObjectLinkingLayer ObjectLayer{ES, createMemMgr};
-  IRCompileLayer CompileLayer{ES, ObjectLayer,
-                              std::make_unique<SimpleCompiler>(*TM)};
-
-  static std::unique_ptr<SectionMemoryManager> createMemMgr() {
-    return std::make_unique<SectionMemoryManager>();
-  }
-
-  SimpleJIT(
-      std::unique_ptr<TargetMachine> TM, DataLayout DL,
-      std::unique_ptr<DynamicLibrarySearchGenerator> ProcessSymbolsGenerator)
-      : TM(std::move(TM)), DL(std::move(DL)) {
-    llvm::sys::DynamicLibrary::LoadLibraryPermanently(nullptr);
-    MainJD.addGenerator(std::move(ProcessSymbolsGenerator));
-  }
-
-public:
-  ~SimpleJIT() {
-    if (auto Err = ES.endSession())
-      ES.reportError(std::move(Err));
-  }
-
-  static Expected<std::unique_ptr<SimpleJIT>> Create() {
-    auto JTMB = JITTargetMachineBuilder::detectHost();
-    if (!JTMB)
-      return JTMB.takeError();
-
-    auto TM = JTMB->createTargetMachine();
-    if (!TM)
-      return TM.takeError();
-
-    auto DL = (*TM)->createDataLayout();
-
-    auto ProcessSymbolsGenerator =
-        DynamicLibrarySearchGenerator::GetForCurrentProcess(
-            DL.getGlobalPrefix());
-
-    if (!ProcessSymbolsGenerator)
-      return ProcessSymbolsGenerator.takeError();
-
-    return std::unique_ptr<SimpleJIT>(new SimpleJIT(
-        std::move(*TM), std::move(DL), std::move(*ProcessSymbolsGenerator)));
-  }
-
-  const TargetMachine &getTargetMachine() const { return *TM; }
-
-  Error addModule(ThreadSafeModule M) {
-    return CompileLayer.add(MainJD, std::move(M));
-  }
-
-  Expected<JITEvaluatedSymbol> findSymbol(const StringRef &Name) {
-    return ES.lookup({&MainJD}, Mangle(Name));
-  }
-
-  Expected<JITTargetAddress> getSymbolAddress(const StringRef &Name) {
-    auto Sym = findSymbol(Name);
-    if (!Sym)
-      return Sym.takeError();
-    return Sym->getAddress();
-  }
-};
-
-} // end namespace orc
-} // end namespace llvm
-
-llvm::ExitOnError ExitOnErr;
-
-int main(int argc, const char **argv) {
-  // This just needs to be some symbol in the binary; C++ doesn't
-  // allow taking the address of ::main however.
-  void *MainAddr = (void*) (intptr_t) GetExecutablePath;
-  std::string Path = GetExecutablePath(argv[0], MainAddr);
-  IntrusiveRefCntPtr<DiagnosticOptions> DiagOpts = new DiagnosticOptions();
-  TextDiagnosticPrinter *DiagClient =
-    new TextDiagnosticPrinter(llvm::errs(), &*DiagOpts);
-
-  IntrusiveRefCntPtr<DiagnosticIDs> DiagID(new DiagnosticIDs());
-  DiagnosticsEngine Diags(DiagID, &*DiagOpts, DiagClient);
-
-  const std::string TripleStr = llvm::sys::getProcessTriple();
-  llvm::Triple T(TripleStr);
-
-  // Use ELF on Windows-32 and MingW for now.
-#ifndef CLANG_INTERPRETER_COFF_FORMAT
-  if (T.isOSBinFormatCOFF())
-    T.setObjectFormat(llvm::Triple::ELF);
-#endif
-
-  ExitOnErr.setBanner("clang interpreter");
-
-  Driver TheDriver(Path, T.str(), Diags);
-  TheDriver.setTitle("clang interpreter");
-  TheDriver.setCheckInputsExist(false);
-
-  // FIXME: This is a hack to try to force the driver to do something we can
-  // recognize. We need to extend the driver library to support this use model
-  // (basically, exactly one input, and the operation mode is hard wired).
-  SmallVector<const char *, 16> Args(argv, argv + argc);
-  Args.push_back("-fsyntax-only");
-  std::unique_ptr<Compilation> C(TheDriver.BuildCompilation(Args));
-  if (!C)
-    return 0;
-
-  // FIXME: This is copied from ASTUnit.cpp; simplify and eliminate.
-
-  // We expect to get back exactly one command job, if we didn't something
-  // failed. Extract that job from the compilation.
-  const driver::JobList &Jobs = C->getJobs();
-  if (Jobs.size() != 1 || !isa<driver::Command>(*Jobs.begin())) {
-    SmallString<256> Msg;
-    llvm::raw_svector_ostream OS(Msg);
-    Jobs.Print(OS, "; ", true);
-    Diags.Report(diag::err_fe_expected_compiler_job) << OS.str();
-    return 1;
-  }
-
-  const driver::Command &Cmd = cast<driver::Command>(*Jobs.begin());
-  if (llvm::StringRef(Cmd.getCreator().getName()) != "clang") {
-    Diags.Report(diag::err_fe_expected_clang_command);
-    return 1;
-  }
-
-  // Initialize a compiler invocation object from the clang (-cc1) arguments.
-  const llvm::opt::ArgStringList &CCArgs = Cmd.getArguments();
-  std::unique_ptr<CompilerInvocation> CI(new CompilerInvocation);
-  CompilerInvocation::CreateFromArgs(*CI, CCArgs, Diags);
-
-  // Show the invocation, with -v.
-  if (CI->getHeaderSearchOpts().Verbose) {
-    llvm::errs() << "clang invocation:\n";
-    Jobs.Print(llvm::errs(), "\n", true);
-    llvm::errs() << "\n";
-  }
-
-  // FIXME: This is copied from cc1_main.cpp; simplify and eliminate.
-
-  // Create a compiler instance to handle the actual work.
-  CompilerInstance Clang;
-  Clang.setInvocation(std::move(CI));
-
-  // Create the compilers actual diagnostics engine.
-  Clang.createDiagnostics();
-  if (!Clang.hasDiagnostics())
-    return 1;
-
-  // Infer the builtin include path if unspecified.
-  if (Clang.getHeaderSearchOpts().UseBuiltinIncludes &&
-      Clang.getHeaderSearchOpts().ResourceDir.empty())
-    Clang.getHeaderSearchOpts().ResourceDir =
-      CompilerInvocation::GetResourcesPath(argv[0], MainAddr);
-
-  // Create and execute the frontend to generate an LLVM bitcode module.
-  std::unique_ptr<CodeGenAction> Act(new EmitLLVMOnlyAction());
-  if (!Clang.ExecuteAction(*Act))
-    return 1;
-
-  llvm::InitializeNativeTarget();
-  llvm::InitializeNativeTargetAsmPrinter();
-
-  int Res = 255;
-  std::unique_ptr<llvm::LLVMContext> Ctx(Act->takeLLVMContext());
-  std::unique_ptr<llvm::Module> Module = Act->takeModule();
-
-  if (Module) {
-    auto J = ExitOnErr(llvm::orc::SimpleJIT::Create());
-
-    ExitOnErr(J->addModule(
-        llvm::orc::ThreadSafeModule(std::move(Module), std::move(Ctx))));
-    auto Main = (int (*)(...))ExitOnErr(J->getSymbolAddress("main"));
-    Res = Main();
-  }
-
-  // Shutdown.
-  llvm::llvm_shutdown();
-
-  return Res;
-}
diff --git a/gnu/llvm/clang/include/clang/AST/FormatString.h b/gnu/llvm/clang/include/clang/AST/FormatString.h
index 231ff6a116e..6ebf9a40894 100644
--- a/gnu/llvm/clang/include/clang/AST/FormatString.h
+++ b/gnu/llvm/clang/include/clang/AST/FormatString.h
@@ -15,10 +15,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CLANG_ANALYSIS_ANALYSES_FORMATSTRING_H
-#define LLVM_CLANG_ANALYSIS_ANALYSES_FORMATSTRING_H
+#ifndef LLVM_CLANG_AST_FORMATSTRING_H
+#define LLVM_CLANG_AST_FORMATSTRING_H
 
 #include "clang/AST/CanonicalType.h"
+#include <optional>
 
 namespace clang {
 
@@ -127,8 +128,12 @@ public:
     dArg,
     DArg, // Apple extension
     iArg,
+    // C23 conversion specifiers.
+    bArg,
+    BArg,
+
     IntArgBeg = dArg,
-    IntArgEnd = iArg,
+    IntArgEnd = BArg,
 
     oArg,
     OArg, // Apple extension
@@ -239,7 +244,7 @@ public:
 
   bool isPrintfKind() const { return IsPrintf; }
 
-  Optional<ConversionSpecifier> getStandardSpecifier() const;
+  std::optional<ConversionSpecifier> getStandardSpecifier() const;
 
 protected:
   bool IsPrintf;
@@ -259,8 +264,14 @@ public:
     /// instance, "%d" and float.
     NoMatch = 0,
     /// The conversion specifier and the argument type are compatible. For
-    /// instance, "%d" and _Bool.
+    /// instance, "%d" and int.
     Match = 1,
+    /// The conversion specifier and the argument type are compatible because of
+    /// default argument promotions. For instance, "%hhd" and int.
+    MatchPromotion,
+    /// The conversion specifier and the argument type are compatible but still
+    /// seems likely to be an error. For instanace, "%hhd" and short.
+    NoMatchPromotionTypeConfusion,
     /// The conversion specifier and the argument type are disallowed by the C
     /// standard, but are in practice harmless. For instance, "%p" and int*.
     NoMatchPedantic,
@@ -334,11 +345,11 @@ public:
                  unsigned amountLength,
                  bool usesPositionalArg)
   : start(amountStart), length(amountLength), hs(howSpecified), amt(amount),
-  UsesPositionalArg(usesPositionalArg), UsesDotPrefix(0) {}
+  UsesPositionalArg(usesPositionalArg), UsesDotPrefix(false) {}
 
   OptionalAmount(bool valid = true)
   : start(nullptr),length(0), hs(valid ? NotSpecified : Invalid), amt(0),
-  UsesPositionalArg(0), UsesDotPrefix(0) {}
+  UsesPositionalArg(false), UsesDotPrefix(false) {}
 
   explicit OptionalAmount(unsigned Amount)
     : start(nullptr), length(0), hs(Constant), amt(Amount),
@@ -458,7 +469,7 @@ public:
 
   bool hasStandardLengthModifier() const;
 
-  Optional<LengthModifier> getCorrectedLengthModifier() const;
+  std::optional<LengthModifier> getCorrectedLengthModifier() const;
 
   bool hasStandardConversionSpecifier(const LangOptions &LangOpt) const;
 
@@ -728,7 +739,8 @@ public:
 
   virtual bool HandlePrintfSpecifier(const analyze_printf::PrintfSpecifier &FS,
                                      const char *startSpecifier,
-                                     unsigned specifierLen) {
+                                     unsigned specifierLen,
+                                     const TargetInfo &Target) {
     return true;
   }
 
diff --git a/gnu/llvm/clang/include/clang/Analysis/AnalysisDiagnostic.h b/gnu/llvm/clang/include/clang/Analysis/AnalysisDiagnostic.h
deleted file mode 100644
index fd5f2ffe648..00000000000
--- a/gnu/llvm/clang/include/clang/Analysis/AnalysisDiagnostic.h
+++ /dev/null
@@ -1,14 +0,0 @@
-//===--- DiagnosticAnalysis.h - Diagnostics for libanalysis -----*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_CLANG_ANALYSIS_ANALYSISDIAGNOSTIC_H
-#define LLVM_CLANG_ANALYSIS_ANALYSISDIAGNOSTIC_H
-
-#include "clang/Basic/DiagnosticAnalysis.h"
-
-#endif
diff --git a/gnu/llvm/clang/include/clang/Basic/CodeGenOptions.def b/gnu/llvm/clang/include/clang/Basic/CodeGenOptions.def
index 4f4b4bf48f0..62478b7e183 100644
--- a/gnu/llvm/clang/include/clang/Basic/CodeGenOptions.def
+++ b/gnu/llvm/clang/include/clang/Basic/CodeGenOptions.def
@@ -30,7 +30,7 @@ CODEGENOPT(Name, Bits, Default)
 CODEGENOPT(DisableIntegratedAS, 1, 0) ///< -no-integrated-as
 ENUM_CODEGENOPT(CompressDebugSections, llvm::DebugCompressionType, 2,
                 llvm::DebugCompressionType::None)
-CODEGENOPT(RelaxELFRelocations, 1, 0) ///< -Wa,--mrelax-relocations
+CODEGENOPT(RelaxELFRelocations, 1, 1) ///< -Wa,-mrelax-relocations={yes,no}
 CODEGENOPT(AsmVerbose        , 1, 0) ///< -dA, -fverbose-asm.
 CODEGENOPT(Dwarf64           , 1, 0) ///< -gdwarf64.
 CODEGENOPT(Dwarf32           , 1, 1) ///< -gdwarf32.
@@ -54,6 +54,7 @@ CODEGENOPT(UniqueBasicBlockSectionNames, 1, 1) ///< Set for -funique-basic-block
 CODEGENOPT(EnableAIXExtendedAltivecABI, 1, 0) ///< Set for -mabi=vec-extabi. Enables the extended Altivec ABI on AIX.
 ENUM_CODEGENOPT(FramePointer, FramePointerKind, 2, FramePointerKind::None) /// frame-pointer: all,non-leaf,none
 
+CODEGENOPT(ClearASTBeforeBackend , 1, 0) ///< Free the AST before running backend code generation. Only works with -disable-free.
 CODEGENOPT(DisableFree       , 1, 0) ///< Don't free memory.
 CODEGENOPT(DiscardValueNames , 1, 0) ///< Discard Value Names from the IR (LLVMContext flag)
 CODEGENOPT(DisableLLVMPasses , 1, 0) ///< Don't run any LLVM IR passes to get
@@ -64,7 +65,6 @@ CODEGENOPT(DisableO0ImplyOptNone , 1, 0) ///< Don't annonate function with optno
 CODEGENOPT(ExperimentalStrictFloatingPoint, 1, 0) ///< Enables the new, experimental
                                                   ///< strict floating point.
 CODEGENOPT(EnableNoundefAttrs, 1, 0) ///< Enable emitting `noundef` attributes on IR call arguments and return values
-CODEGENOPT(LegacyPassManager, 1, 0) ///< Use the legacy pass manager.
 CODEGENOPT(DebugPassManager, 1, 0) ///< Prints debug information for the new
                                    ///< pass manager.
 CODEGENOPT(DisableRedZone    , 1, 0) ///< Set when -mno-red-zone is enabled.
@@ -88,9 +88,10 @@ CODEGENOPT(EmitGcovArcs      , 1, 0) ///< Emit coverage data files, aka. GCDA.
 CODEGENOPT(EmitGcovNotes     , 1, 0) ///< Emit coverage "notes" files, aka GCNO.
 CODEGENOPT(EmitOpenCLArgMetadata , 1, 0) ///< Emit OpenCL kernel arg metadata.
 CODEGENOPT(EmulatedTLS       , 1, 0) ///< Set by default or -f[no-]emulated-tls.
-CODEGENOPT(ExplicitEmulatedTLS , 1, 0) ///< Set if -f[no-]emulated-tls is used.
 /// Embed Bitcode mode (off/all/bitcode/marker).
 ENUM_CODEGENOPT(EmbedBitcode, EmbedBitcodeKind, 2, Embed_Off)
+/// Inline asm dialect, -masm=(att|intel)
+ENUM_CODEGENOPT(InlineAsmDialect, InlineAsmDialectKind, 1, IAD_ATT)
 CODEGENOPT(ForbidGuardVariables , 1, 0) ///< Issue errors if C++ guard variables
                                         ///< are required.
 CODEGENOPT(FunctionSections  , 1, 0) ///< Set when -ffunction-sections is enabled.
@@ -104,12 +105,20 @@ CODEGENOPT(CFProtectionReturn , 1, 0) ///< if -fcf-protection is
                                       ///< set to full or return.
 CODEGENOPT(CFProtectionBranch , 1, 0) ///< if -fcf-protection is
                                       ///< set to full or branch.
+CODEGENOPT(FunctionReturnThunks, 1, 0) ///< -mfunction-return={keep|thunk-extern}
+CODEGENOPT(IndirectBranchCSPrefix, 1, 0) ///< if -mindirect-branch-cs-prefix
+                                         ///< is set.
+
 CODEGENOPT(XRayInstrumentFunctions , 1, 0) ///< Set when -fxray-instrument is
                                            ///< enabled.
 CODEGENOPT(StackSizeSection  , 1, 0) ///< Set when -fstack-size-section is enabled.
 CODEGENOPT(ForceDwarfFrameSection , 1, 0) ///< Set when -fforce-dwarf-frame is
                                           ///< enabled.
 
+///< Set when -femit-dwarf-unwind is passed.
+ENUM_CODEGENOPT(EmitDwarfUnwind, llvm::EmitDwarfUnwindType, 2,
+                llvm::EmitDwarfUnwindType::Default)
+
 ///< Set when -fxray-always-emit-customevents is enabled.
 CODEGENOPT(XRayAlwaysEmitCustomEvents , 1, 0)
 
@@ -136,6 +145,10 @@ VALUE_CODEGENOPT(XRaySelectedFunctionGroup, 32, 0)
 VALUE_CODEGENOPT(PatchableFunctionEntryCount , 32, 0) ///< Number of NOPs at function entry
 VALUE_CODEGENOPT(PatchableFunctionEntryOffset , 32, 0)
 
+CODEGENOPT(HotPatch, 1, 0) ///< Supports the Microsoft /HOTPATCH flag and
+                           ///< generates a 'patchable-function' attribute.
+
+CODEGENOPT(JMCInstrument, 1, 0) ///< Set when -fjmc is enabled.
 CODEGENOPT(InstrumentForProfiling , 1, 0) ///< Set when -pg is enabled.
 CODEGENOPT(CallFEntry , 1, 0) ///< Set when -mfentry is enabled.
 CODEGENOPT(MNopMCount , 1, 0) ///< Set when -mnop-mcount is enabled.
@@ -158,7 +171,6 @@ CODEGENOPT(IncrementalLinkerCompatible, 1, 0) ///< Emit an object file which can
                                               ///< linker.
 CODEGENOPT(MergeAllConstants , 1, 1) ///< Merge identical constants.
 CODEGENOPT(MergeFunctions    , 1, 0) ///< Set when -fmerge-functions is enabled.
-CODEGENOPT(MSVolatile        , 1, 0) ///< Set when /volatile:ms is enabled.
 CODEGENOPT(NoCommon          , 1, 0) ///< Set when -fno-common or C++ is enabled.
 CODEGENOPT(NoDwarfDirectoryAsm , 1, 0) ///< Set when -fno-dwarf-directory-asm is
                                        ///< enabled.
@@ -166,6 +178,8 @@ CODEGENOPT(NoExecStack       , 1, 0) ///< Set when -Wa,--noexecstack is enabled.
 CODEGENOPT(FatalWarnings     , 1, 0) ///< Set when -Wa,--fatal-warnings is
                                      ///< enabled.
 CODEGENOPT(NoWarn            , 1, 0) ///< Set when -Wa,--no-warn is enabled.
+CODEGENOPT(NoTypeCheck       , 1, 0) ///< Set when -Wa,--no-type-check is enabled.
+CODEGENOPT(MisExpect         , 1, 0) ///< Set when -Wmisexpect is enabled
 CODEGENOPT(EnableSegmentedStacks , 1, 0) ///< Set when -fsplit-stack is enabled.
 CODEGENOPT(NoInlineLineTables, 1, 0) ///< Whether debug info should contain
                                      ///< inline line tables.
@@ -174,6 +188,7 @@ CODEGENOPT(NoImplicitFloat   , 1, 0) ///< Set when -mno-implicit-float is enable
 CODEGENOPT(NullPointerIsValid , 1, 0) ///< Assume Null pointer deference is defined.
 CODEGENOPT(OpenCLCorrectlyRoundedDivSqrt, 1, 0) ///< -cl-fp32-correctly-rounded-divide-sqrt
 CODEGENOPT(HIPCorrectlyRoundedDivSqrt, 1, 1) ///< -fno-hip-fp32-correctly-rounded-divide-sqrt
+CODEGENOPT(HIPSaveKernelArgName, 1, 0) ///< Set when -fhip-kernel-arg-name is enabled.
 CODEGENOPT(UniqueInternalLinkageNames, 1, 0) ///< Internal Linkage symbols get unique names.
 CODEGENOPT(SplitMachineFunctions, 1, 0) ///< Split machine functions using profile information.
 
@@ -188,6 +203,7 @@ CODEGENOPT(NoZeroInitializedInBSS , 1, 0) ///< -fno-zero-initialized-in-bss.
 ENUM_CODEGENOPT(ObjCDispatchMethod, ObjCDispatchMethodKind, 2, Legacy)
 /// Replace certain message sends with calls to ObjC runtime entrypoints
 CODEGENOPT(ObjCConvertMessagesToRuntimeCalls , 1, 1)
+CODEGENOPT(ObjCAvoidHeapifyLocalBlocks, 1, 0)
 
 VALUE_CODEGENOPT(OptimizationLevel, 2, 0) ///< The -O[0-3] option specified.
 VALUE_CODEGENOPT(OptimizeSize, 2, 0) ///< If -Os (==1) or -Oz (==2) is specified.
@@ -197,6 +213,10 @@ CODEGENOPT(AtomicProfileUpdate , 1, 0) ///< Set -fprofile-update=atomic
 ENUM_CODEGENOPT(ProfileInstr, ProfileInstrKind, 2, ProfileNone)
 /// Choose profile kind for PGO use compilation.
 ENUM_CODEGENOPT(ProfileUse, ProfileInstrKind, 2, ProfileNone)
+/// Partition functions into N groups and select only functions in group i to be
+/// instrumented. Selected group numbers can be 0 to N-1 inclusive.
+VALUE_CODEGENOPT(ProfileTotalFunctionGroups, 32, 1)
+VALUE_CODEGENOPT(ProfileSelectedFunctionGroup, 32, 0)
 CODEGENOPT(CoverageMapping , 1, 0) ///< Generate coverage mapping regions to
                                    ///< enable code coverage analysis.
 CODEGENOPT(DumpCoverageMapping , 1, 0) ///< Dump the generated coverage mapping
@@ -227,6 +247,9 @@ CODEGENOPT(SanitizeMemoryTrackOrigins, 2, 0) ///< Enable tracking origins in
 ENUM_CODEGENOPT(SanitizeAddressDtor, llvm::AsanDtorKind, 2,
                 llvm::AsanDtorKind::Global)  ///< Set how ASan global
                                              ///< destructors are emitted.
+CODEGENOPT(SanitizeMemoryParamRetval, 1, 0) ///< Enable detection of uninitialized
+                                            ///< parameters and return values
+                                            ///< in MemorySanitizer
 CODEGENOPT(SanitizeMemoryUseAfterDtor, 1, 0) ///< Enable use-after-delete detection
                                              ///< in MemorySanitizer
 CODEGENOPT(SanitizeCfiCrossDso, 1, 0) ///< Enable cross-dso support in CFI.
@@ -257,8 +280,15 @@ CODEGENOPT(SanitizeCoverageTracePCGuard, 1, 0) ///< Enable PC tracing with guard
 CODEGENOPT(SanitizeCoverageInline8bitCounters, 1, 0) ///< Use inline 8bit counters.
 CODEGENOPT(SanitizeCoverageInlineBoolFlag, 1, 0) ///< Use inline bool flag.
 CODEGENOPT(SanitizeCoveragePCTable, 1, 0) ///< Create a PC Table.
+CODEGENOPT(SanitizeCoverageControlFlow, 1, 0) ///< Collect control flow
 CODEGENOPT(SanitizeCoverageNoPrune, 1, 0) ///< Disable coverage pruning.
 CODEGENOPT(SanitizeCoverageStackDepth, 1, 0) ///< Enable max stack depth tracing
+CODEGENOPT(SanitizeCoverageTraceLoads, 1, 0) ///< Enable tracing of loads.
+CODEGENOPT(SanitizeCoverageTraceStores, 1, 0) ///< Enable tracing of stores.
+CODEGENOPT(SanitizeBinaryMetadataCovered, 1, 0) ///< Emit PCs for covered functions.
+CODEGENOPT(SanitizeBinaryMetadataAtomics, 1, 0) ///< Emit PCs for atomic operations.
+CODEGENOPT(SanitizeBinaryMetadataUAR, 1, 0) ///< Emit PCs for start of functions
+                                            ///< that are subject for use-after-return checking.
 CODEGENOPT(SanitizeStats     , 1, 0) ///< Collect statistics for sanitizers.
 CODEGENOPT(SimplifyLibCalls  , 1, 1) ///< Set when -fbuiltin is enabled.
 CODEGENOPT(SoftFloat         , 1, 0) ///< -soft-float.
@@ -274,7 +304,7 @@ VALUE_CODEGENOPT(TimeTraceGranularity, 32, 500) ///< Minimum time granularity (i
 CODEGENOPT(UnrollLoops       , 1, 0) ///< Control whether loops are unrolled.
 CODEGENOPT(RerollLoops       , 1, 0) ///< Control whether loops are rerolled.
 CODEGENOPT(NoUseJumpTables   , 1, 0) ///< Set when -fno-jump-tables is enabled.
-CODEGENOPT(UnwindTables      , 1, 0) ///< Emit unwind tables.
+VALUE_CODEGENOPT(UnwindTables, 2, 0) ///< Unwind tables (1) or asynchronous unwind tables (2)
 CODEGENOPT(VectorizeLoop     , 1, 0) ///< Run loop vectorizer.
 CODEGENOPT(VectorizeSLP      , 1, 0) ///< Run SLP vectorizer.
 CODEGENOPT(ProfileSampleAccurate, 1, 0) ///< Sample profile is accurate.
@@ -293,6 +323,8 @@ CODEGENOPT(StackRealignment  , 1, 0) ///< Control whether to force stack
                                      ///< realignment.
 CODEGENOPT(UseInitArray      , 1, 0) ///< Control whether to use .init_array or
                                      ///< .ctors.
+VALUE_CODEGENOPT(LoopAlignment     , 32, 0) ///< Overrides default loop
+                                            ///< alignment, if not 0.
 VALUE_CODEGENOPT(StackAlignment    , 32, 0) ///< Overrides default stack
                                             ///< alignment, if not 0.
 VALUE_CODEGENOPT(StackProbeSize    , 32, 4096) ///< Overrides default stack
@@ -300,6 +332,10 @@ VALUE_CODEGENOPT(StackProbeSize    , 32, 4096) ///< Overrides default stack
 VALUE_CODEGENOPT(WarnStackSize     , 32, UINT_MAX) ///< Set via -fwarn-stack-size.
 CODEGENOPT(NoStackArgProbe, 1, 0) ///< Set when -mno-stack-arg-probe is used
 CODEGENOPT(DebugStrictDwarf, 1, 1) ///< Whether or not to use strict DWARF info.
+
+CODEGENOPT(EnableAssignmentTracking, 1,0) ///< Enable the Assignment Tracking
+                                          ///< debug info feature.
+
 CODEGENOPT(DebugColumnInfo, 1, 0) ///< Whether or not to use column information
                                   ///< in debug info.
 
@@ -310,6 +346,9 @@ CODEGENOPT(DebugExplicitImport, 1, 0)  ///< Whether or not debug info should
                                        ///< contain explicit imports for
                                        ///< anonymous namespaces
 
+/// Set debug info source file hashing algorithm.
+ENUM_CODEGENOPT(DebugSrcHash, DebugSrcHashKind, 2, DSH_MD5)
+
 CODEGENOPT(SplitDwarfInlining, 1, 1) ///< Whether to include inlining info in the
                                      ///< skeleton CU to allow for symbolication
                                      ///< of inline stack frames without .dwo files.
@@ -317,6 +356,12 @@ CODEGENOPT(DebugFwdTemplateParams, 1, 0) ///< Whether to emit complete
                                          ///< template parameter descriptions in
                                          ///< forward declarations (versus just
                                          ///< including them in the name).
+ENUM_CODEGENOPT(DebugSimpleTemplateNames, codegenoptions::DebugTemplateNamesKind, 2, codegenoptions::DebugTemplateNamesKind::Full) ///< Whether to emit template parameters
+                                           ///< in the textual names of template
+					   ///< specializations.
+					   ///< Implies DebugFwdTemplateNames to
+					   ///< allow decorated names to be
+					   ///< reconstructed when needed.
 CODEGENOPT(EmitLLVMUseLists, 1, 0) ///< Control whether to serialize use-lists.
 
 CODEGENOPT(WholeProgramVTables, 1, 0) ///< Whether to apply whole-program
@@ -357,9 +402,6 @@ ENUM_CODEGENOPT(DebuggerTuning, llvm::DebuggerKind, 3,
 /// emitted.
 VALUE_CODEGENOPT(DwarfVersion, 3, 0)
 
-/// Whether to use experimental new variable location tracking.
-CODEGENOPT(ValueTrackingVariableLocations, 1, 0)
-
 /// Whether we should emit CodeView debug information. It's possible to emit
 /// CodeView and DWARF into the same object.
 CODEGENOPT(EmitCodeView, 1, 0)
@@ -367,9 +409,15 @@ CODEGENOPT(EmitCodeView, 1, 0)
 /// Whether to emit the .debug$H section containing hashes of CodeView types.
 CODEGENOPT(CodeViewGHash, 1, 0)
 
+/// Whether to emit the compiler path and command line into the CodeView debug information.
+CODEGENOPT(CodeViewCommandLine, 1, 0)
+
 /// The kind of inlining to perform.
 ENUM_CODEGENOPT(Inlining, InliningMethod, 2, NormalInlining)
 
+/// The maximum stack size a function can have to be considered for inlining.
+VALUE_CODEGENOPT(InlineMaxStackSize, 32, UINT_MAX)
+
 // Vector functions library to use.
 ENUM_CODEGENOPT(VecLib, VectorLibrary, 3, NoLibrary)
 
@@ -440,6 +488,25 @@ CODEGENOPT(AAPCSBitfieldWidth, 1, 1)
 /// propagate signaling NaN inputs per IEEE 754-2008 (AMDGPU Only)
 CODEGENOPT(EmitIEEENaNCompliantInsts, 1, 1)
 
+// Whether to emit Swift Async function extended frame information: auto,
+// never, always.
+ENUM_CODEGENOPT(SwiftAsyncFramePointer, SwiftAsyncFramePointerKind, 2,
+                SwiftAsyncFramePointerKind::Always)
+
+/// Whether to skip RAX setup when passing variable arguments (x86 only).
+CODEGENOPT(SkipRaxSetup, 1, 0)
+
+/// Whether to zero out caller-used registers before returning.
+ENUM_CODEGENOPT(ZeroCallUsedRegs, llvm::ZeroCallUsedRegs::ZeroCallUsedRegsKind,
+                5, llvm::ZeroCallUsedRegs::ZeroCallUsedRegsKind::Skip)
+
+/// Whether to use opaque pointers.
+CODEGENOPT(OpaquePointers, 1, 0)
+
+/// Modify C++ ABI to returning `this` pointer from constructors and
+/// non-deleting destructors. (No effect on Microsoft ABI.)
+CODEGENOPT(CtorDtorReturnThis, 1, 0)
+
 #undef CODEGENOPT
 #undef ENUM_CODEGENOPT
 #undef VALUE_CODEGENOPT
diff --git a/gnu/llvm/clang/include/clang/Basic/DiagnosticFrontendKinds.td b/gnu/llvm/clang/include/clang/Basic/DiagnosticFrontendKinds.td
index 0f4ccec3855..d0f672ae5a1 100644
--- a/gnu/llvm/clang/include/clang/Basic/DiagnosticFrontendKinds.td
+++ b/gnu/llvm/clang/include/clang/Basic/DiagnosticFrontendKinds.td
@@ -22,10 +22,11 @@ def note_fe_inline_asm_here : Note<"instantiated into assembly here">;
 def err_fe_source_mgr : Error<"%0">, CatSourceMgr;
 def warn_fe_source_mgr : Warning<"%0">, CatSourceMgr, InGroup<BackendSourceMgr>;
 def note_fe_source_mgr : Note<"%0">, CatSourceMgr;
-def err_fe_cannot_link_module : Error<"cannot link module '%0': %1">,
-  DefaultFatal;
+def err_fe_linking_module : Error<"cannot link module '%0': %1">, DefaultFatal;
+def warn_fe_linking_module : Warning<"linking module '%0': %1">, InGroup<LinkerWarnings>;
+def note_fe_linking_module : Note<"linking module '%0': %1">;
 
-def warn_fe_frame_larger_than : Warning<"stack frame size (%0) exceeds limit (%1) in %q2">,
+def warn_fe_frame_larger_than : Warning<"stack frame size (%0) exceeds limit (%1) in '%2'">,
     BackendInfo, InGroup<BackendFrameLargerThan>;
 def warn_fe_backend_frame_larger_than: Warning<"%0">,
     BackendInfo, InGroup<BackendFrameLargerThan>;
@@ -34,6 +35,11 @@ def note_fe_backend_frame_larger_than: Note<"%0">, BackendInfo;
 
 def warn_fe_backend_plugin: Warning<"%0">, BackendInfo, InGroup<BackendPlugin>;
 def err_fe_backend_plugin: Error<"%0">, BackendInfo;
+
+def warn_fe_backend_resource_limit: Warning<"%0 (%1) exceeds limit (%2) in '%3'">, BackendInfo, InGroup<BackendPlugin>;
+def err_fe_backend_resource_limit: Error<"%0 (%1) exceeds limit (%2) in '%3'">, BackendInfo;
+def note_fe_backend_resource_limit: Note<"%0 (%1) exceeds limit (%2) in '%3'">, BackendInfo;
+
 def remark_fe_backend_plugin: Remark<"%0">, BackendInfo, InGroup<RemarkBackendPlugin>;
 def note_fe_backend_plugin: Note<"%0">, BackendInfo;
 
@@ -46,6 +52,13 @@ def warn_fe_backend_unsupported_fp_rounding : Warning<
 def warn_fe_backend_unsupported_fp_exceptions : Warning<
     "overriding currently unsupported use of floating point exceptions "
     "on this target">, InGroup<UnsupportedFPOpt>;
+def warn_fe_backend_invalid_feature_flag : Warning<
+    "feature flag '%0' must start with either '+' to enable the feature or '-'"
+    " to disable it; flag ignored">, InGroup<InvalidCommandLineArgument>;
+
+def err_incompatible_fp_eval_method_options : Error<
+    "option 'ffp-eval-method' cannot be used with option "
+    "%select{'fapprox-func'|'mreassociate'|'freciprocal'}0">;
 
 def remark_fe_backend_optimization_remark : Remark<"%0">, BackendInfo,
     InGroup<BackendOptimizationRemark>;
@@ -72,6 +85,12 @@ def note_fe_backend_invalid_loc : Note<"could "
 def err_fe_backend_unsupported : Error<"%0">, BackendInfo;
 def warn_fe_backend_unsupported : Warning<"%0">, BackendInfo;
 
+def err_fe_backend_error_attr :
+  Error<"call to '%0' declared with 'error' attribute: %1">, BackendInfo;
+def warn_fe_backend_warning_attr :
+  Warning<"call to '%0' declared with 'warning' attribute: %1">, BackendInfo,
+  InGroup<BackendWarningAttributes>;
+
 def err_fe_invalid_code_complete_file : Error<
     "cannot locate code-completion file %0">, DefaultFatal;
 def err_fe_dependency_file_requires_MT : Error<
@@ -113,9 +132,8 @@ def err_fe_invalid_alignment : Error<
     "invalid value '%1' in '%0'; alignment must be a power of 2">;
 def err_fe_invalid_exception_model
    : Error<"invalid exception model '%select{none|sjlj|seh|dwarf|wasm}0' for target '%1'">;
-def warn_fe_concepts_ts_flag : Warning<
-  "-fconcepts-ts is deprecated - use '-std=c++20' for Concepts support">,
-  InGroup<Deprecated>;
+def err_fe_invalid_source_date_epoch : Error<
+    "environment variable 'SOURCE_DATE_EPOCH' ('%0') must be a non-negative decimal integer <= %1">;
 
 def err_fe_unable_to_load_basic_block_sections_file : Error<
     "unable to load basic block sections function list: '%0'">;
@@ -192,9 +210,6 @@ def err_module_build_requires_fmodules : Error<
   "module compilation requires '-fmodules'">;
 def err_module_interface_requires_cpp_modules : Error<
   "module interface compilation requires '-std=c++20' or '-fmodules-ts'">;
-def err_header_module_requires_modules : Error<
-  "header module compilation requires '-fmodules', '-std=c++20', or "
-  "'-fmodules-ts'">;
 def warn_module_config_mismatch : Warning<
   "module file %0 cannot be loaded due to a configuration mismatch with the current "
   "compilation">, InGroup<DiagGroup<"module-file-config-mismatch">>, DefaultError;
@@ -229,6 +244,8 @@ def remark_module_build : Remark<"building module '%0' as '%1'">,
   InGroup<ModuleBuild>;
 def remark_module_build_done : Remark<"finished building module '%0'">,
   InGroup<ModuleBuild>;
+def remark_module_lock : Remark<"locking '%0' to build module '%1'">,
+  InGroup<ModuleLock>;
 def err_modules_embed_file_not_found :
   Error<"file '%0' specified by '-fmodules-embed-file=' not found">,
   DefaultFatal;
@@ -245,7 +262,7 @@ def err_invalid_vfs_overlay : Error<
   "invalid virtual filesystem overlay file '%0'">, DefaultFatal;
 
 def warn_option_invalid_ocl_version : Warning<
-  "OpenCL version %0 does not support the option '%1'">, InGroup<Deprecated>;
+  "%0 does not support the option '%1'">, InGroup<Deprecated>;
 
 def err_builtin_needs_feature : Error<"%0 needs target feature %1">;
 def err_function_needs_feature : Error<
@@ -256,7 +273,7 @@ def warn_avx_calling_convention
     : Warning<"AVX vector %select{return|argument}0 of type %1 without '%2' "
               "enabled changes the ABI">,
       InGroup<DiagGroup<"psabi">>;
-def err_avx_calling_convention : Error<warn_avx_calling_convention.Text>;
+def err_avx_calling_convention : Error<warn_avx_calling_convention.Summary>;
 
 def err_alias_to_undefined : Error<
   "%select{alias|ifunc}0 must point to a defined "
@@ -269,6 +286,10 @@ def err_duplicate_mangled_name : Error<
   "definition with same mangled name '%0' as another definition">;
 def err_cyclic_alias : Error<
   "%select{alias|ifunc}0 definition is part of a cycle">;
+def err_hidden_visibility_dllexport : Error<
+  "hidden visibility cannot be applied to 'dllexport' declaration">;
+def err_non_default_visibility_dllimport : Error<
+  "non-default visibility cannot be applied to 'dllimport' declaration">;
 def err_ifunc_resolver_return : Error<
   "ifunc resolver function must return a pointer">;
 
@@ -302,6 +323,14 @@ def warn_profile_data_missing : Warning<
 def warn_profile_data_unprofiled : Warning<
   "no profile data available for file \"%0\"">,
   InGroup<ProfileInstrUnprofiled>;
+def warn_profile_data_misexpect : Warning<
+  "Potential performance regression from use of __builtin_expect(): "
+  "Annotation was correct on %0 of profiled executions.">,
+  BackendInfo,
+  InGroup<MisExpect>;
 } // end of instrumentation issue category
 
+def err_extract_api_ignores_file_not_found :
+  Error<"file '%0' specified by '--extract-api-ignores=' not found">, DefaultFatal;
+
 }
diff --git a/gnu/llvm/clang/include/clang/Basic/DiagnosticGroups.td b/gnu/llvm/clang/include/clang/Basic/DiagnosticGroups.td
index 4b4928a7a00..6c997c37cc5 100644
--- a/gnu/llvm/clang/include/clang/Basic/DiagnosticGroups.td
+++ b/gnu/llvm/clang/include/clang/Basic/DiagnosticGroups.td
@@ -15,6 +15,8 @@ def Implicit : DiagGroup<"implicit", [
     ImplicitInt
 ]>;
 
+def DeprecatedStaticAnalyzerFlag : DiagGroup<"deprecated-static-analyzer-flag">;
+
 // Empty DiagGroups are recognized by clang but ignored.
 def ODR : DiagGroup<"odr">;
 def : DiagGroup<"abi">;
@@ -29,10 +31,11 @@ def GNUAnonymousStruct : DiagGroup<"gnu-anonymous-struct">;
 def GNUAutoType : DiagGroup<"gnu-auto-type">;
 def ArrayBounds : DiagGroup<"array-bounds">;
 def ArrayBoundsPointerArithmetic : DiagGroup<"array-bounds-pointer-arithmetic">;
+def ArrayParameter : DiagGroup<"array-parameter">;
 def AutoDisableVptrSanitizer : DiagGroup<"auto-disable-vptr-sanitizer">;
 def Availability : DiagGroup<"availability">;
 def Section : DiagGroup<"section">;
-def AutoImport : DiagGroup<"auto-import">;
+def : DiagGroup<"auto-import">;
 def FrameworkHdrQuotedInclude : DiagGroup<"quoted-include-in-framework-header">;
 def FrameworkIncludePrivateFromPublic :
   DiagGroup<"framework-include-private-from-public">;
@@ -44,7 +47,10 @@ def BinaryLiteral : DiagGroup<"binary-literal", [CXX14BinaryLiteral,
                                                  CXXPre14CompatBinaryLiteral,
                                                  GNUBinaryLiteral]>;
 def GNUCompoundLiteralInitializer : DiagGroup<"gnu-compound-literal-initializer">;
-def BitFieldConstantConversion : DiagGroup<"bitfield-constant-conversion">;
+def SingleBitBitFieldConstantConversion :
+  DiagGroup<"single-bit-bitfield-constant-conversion">;
+def BitFieldConstantConversion : DiagGroup<"bitfield-constant-conversion",
+                                           [SingleBitBitFieldConstantConversion]>;
 def BitFieldEnumConversion : DiagGroup<"bitfield-enum-conversion">;
 def BitFieldWidth : DiagGroup<"bitfield-width">;
 def CompoundTokenSplitByMacro : DiagGroup<"compound-token-split-by-macro">;
@@ -54,7 +60,16 @@ def CompoundTokenSplit : DiagGroup<"compound-token-split",
                                     CompoundTokenSplitBySpace]>;
 def CoroutineMissingUnhandledException :
   DiagGroup<"coroutine-missing-unhandled-exception">;
-def Coroutine : DiagGroup<"coroutine", [CoroutineMissingUnhandledException]>;
+def DeprecatedExperimentalCoroutine :
+  DiagGroup<"deprecated-experimental-coroutine">;
+def DeprecatedCoroutine :
+  DiagGroup<"deprecated-coroutine", [DeprecatedExperimentalCoroutine]>;
+def AlwaysInlineCoroutine :
+  DiagGroup<"always-inline-coroutine">;
+def CoroNonAlignedAllocationFunction :
+  DiagGroup<"coro-non-aligned-allocation-funciton">;
+def Coroutine : DiagGroup<"coroutine", [CoroutineMissingUnhandledException, DeprecatedCoroutine,
+                                        AlwaysInlineCoroutine, CoroNonAlignedAllocationFunction]>;
 def ObjCBoolConstantConversion : DiagGroup<"objc-bool-constant-conversion">;
 def ConstantConversion : DiagGroup<"constant-conversion",
                                    [BitFieldConstantConversion,
@@ -64,6 +79,8 @@ def StringConversion : DiagGroup<"string-conversion">;
 def SignConversion : DiagGroup<"sign-conversion">;
 def PointerBoolConversion : DiagGroup<"pointer-bool-conversion">;
 def UndefinedBoolConversion : DiagGroup<"undefined-bool-conversion">;
+def BitwiseInsteadOfLogical : DiagGroup<"bitwise-instead-of-logical">;
+def BoolOperation : DiagGroup<"bool-operation", [BitwiseInsteadOfLogical]>;
 def BoolConversion : DiagGroup<"bool-conversion", [PointerBoolConversion,
                                                    UndefinedBoolConversion]>;
 def IntConversion : DiagGroup<"int-conversion">;
@@ -128,6 +145,7 @@ def MacroRedefined : DiagGroup<"macro-redefined">;
 def BuiltinMacroRedefined : DiagGroup<"builtin-macro-redefined">;
 def BuiltinRequiresHeader : DiagGroup<"builtin-requires-header">;
 def C99Compat : DiagGroup<"c99-compat">;
+def C2xCompat : DiagGroup<"c2x-compat">;
 def CXXCompat: DiagGroup<"c++-compat">;
 def ExternCCompat : DiagGroup<"extern-c-compat">;
 def KeywordCompat : DiagGroup<"keyword-compat">;
@@ -155,6 +173,7 @@ def DeleteNonVirtualDtor : DiagGroup<"delete-non-virtual-dtor",
                                       DeleteAbstractNonVirtualDtor]>;
 def AbstractFinalClass : DiagGroup<"abstract-final-class">;
 def FinalDtorNonFinalClass : DiagGroup<"final-dtor-non-final-class">;
+def GNUOffsetofExtensions : DiagGroup<"gnu-offsetof-extensions">;
 
 def CXX11CompatDeprecatedWritableStr :
   DiagGroup<"c++11-compat-deprecated-writable-strings">;
@@ -177,6 +196,7 @@ def UnguardedAvailability : DiagGroup<"unguarded-availability",
 def : DiagGroup<"partial-availability", [UnguardedAvailability]>;
 def DeprecatedDynamicExceptionSpec
     : DiagGroup<"deprecated-dynamic-exception-spec">;
+def DeprecatedBuiltins : DiagGroup<"deprecated-builtins">;
 def DeprecatedImplementations :DiagGroup<"deprecated-implementations">;
 def DeprecatedIncrementBool : DiagGroup<"deprecated-increment-bool">;
 def DeprecatedRegister : DiagGroup<"deprecated-register">;
@@ -184,6 +204,8 @@ def DeprecatedThisCapture : DiagGroup<"deprecated-this-capture">;
 def DeprecatedVolatile : DiagGroup<"deprecated-volatile">;
 def DeprecatedWritableStr : DiagGroup<"deprecated-writable-strings",
                                       [CXX11CompatDeprecatedWritableStr]>;
+def DeprecatedPragma : DiagGroup<"deprecated-pragma">;
+def DeprecatedType : DiagGroup<"deprecated-type">;
 // FIXME: Why is DeprecatedImplementations not in this group?
 def Deprecated : DiagGroup<"deprecated", [DeprecatedAnonEnumEnumConversion,
                                           DeprecatedArrayCompare,
@@ -197,9 +219,12 @@ def Deprecated : DiagGroup<"deprecated", [DeprecatedAnonEnumEnumConversion,
                                           DeprecatedEnumCompareConditional,
                                           DeprecatedEnumEnumConversion,
                                           DeprecatedEnumFloatConversion,
+                                          DeprecatedBuiltins,
                                           DeprecatedIncrementBool,
+                                          DeprecatedPragma,
                                           DeprecatedRegister,
                                           DeprecatedThisCapture,
+                                          DeprecatedType,
                                           DeprecatedVolatile,
                                           DeprecatedWritableStr]>,
                  DiagCategory<"Deprecations">;
@@ -231,6 +256,7 @@ def Documentation : DiagGroup<"documentation",
 
 def EmptyBody : DiagGroup<"empty-body">;
 def Exceptions : DiagGroup<"exceptions">;
+def DeclarationAfterStatement : DiagGroup<"declaration-after-statement">;
 
 def GNUEmptyInitializer : DiagGroup<"gnu-empty-initializer">;
 def GNUEmptyStruct : DiagGroup<"gnu-empty-struct">;
@@ -388,11 +414,14 @@ def DanglingField : DiagGroup<"dangling-field">;
 def DanglingInitializerList : DiagGroup<"dangling-initializer-list">;
 def DanglingGsl : DiagGroup<"dangling-gsl">;
 def ReturnStackAddress : DiagGroup<"return-stack-address">;
+// Name of this warning in GCC
+def : DiagGroup<"return-local-addr", [ReturnStackAddress]>;
 def Dangling : DiagGroup<"dangling", [DanglingField,
                                       DanglingInitializerList,
                                       DanglingGsl,
                                       ReturnStackAddress]>;
 def DistributedObjectModifiers : DiagGroup<"distributed-object-modifiers">;
+def DllexportExplicitInstantiationDecl : DiagGroup<"dllexport-explicit-instantiation-decl">;
 def ExcessInitializers : DiagGroup<"excess-initializers">;
 def ExpansionToDefined : DiagGroup<"expansion-to-defined">;
 def FlagEnum : DiagGroup<"flag-enum">;
@@ -400,7 +429,8 @@ def IncrementBool : DiagGroup<"increment-bool", [DeprecatedIncrementBool]>;
 def InfiniteRecursion : DiagGroup<"infinite-recursion">;
 def PureVirtualCallFromCtorDtor: DiagGroup<"call-to-pure-virtual-from-ctor-dtor">;
 def GNUImaginaryConstant : DiagGroup<"gnu-imaginary-constant">;
-def IgnoredQualifiers : DiagGroup<"ignored-qualifiers">;
+def IgnoredReferenceQualifiers : DiagGroup<"ignored-reference-qualifiers">;
+def IgnoredQualifiers : DiagGroup<"ignored-qualifiers", [IgnoredReferenceQualifiers]>;
 def : DiagGroup<"import">;
 def GNUIncludeNext : DiagGroup<"gnu-include-next">;
 def IncompatibleMSStruct : DiagGroup<"incompatible-ms-struct">;
@@ -429,10 +459,13 @@ def InlineNamespaceReopenedNoninline
 def InvalidNoreturn : DiagGroup<"invalid-noreturn">;
 def InvalidSourceEncoding : DiagGroup<"invalid-source-encoding">;
 def KNRPromotedParameter : DiagGroup<"knr-promoted-parameter">;
+def DeprecatedNonPrototype : DiagGroup<"deprecated-non-prototype">;
+def StrictPrototypes : DiagGroup<"strict-prototypes", [DeprecatedNonPrototype]>;
 def : DiagGroup<"init-self">;
 def : DiagGroup<"inline">;
 def : DiagGroup<"invalid-pch">;
 def GNULabelsAsValue : DiagGroup<"gnu-label-as-value">;
+def GNULineMarker : DiagGroup<"gnu-line-marker">;
 def LiteralRange : DiagGroup<"literal-range">;
 def LocalTypeTemplateArgs : DiagGroup<"local-type-template-args",
                                       [CXX98CompatLocalTypeTemplateArgs]>;
@@ -462,10 +495,12 @@ def MismatchedParameterTypes : DiagGroup<"mismatched-parameter-types">;
 def MismatchedReturnTypes : DiagGroup<"mismatched-return-types">;
 def MismatchedTags : DiagGroup<"mismatched-tags">;
 def MissingFieldInitializers : DiagGroup<"missing-field-initializers">;
+def ModuleLock : DiagGroup<"module-lock">;
 def ModuleBuild : DiagGroup<"module-build">;
 def ModuleImport : DiagGroup<"module-import">;
 def ModuleConflict : DiagGroup<"module-conflict">;
 def ModuleFileExtension : DiagGroup<"module-file-extension">;
+def ModuleIncludeDirectiveTranslation : DiagGroup<"module-include-translation">;
 def RoundTripCC1Args : DiagGroup<"round-trip-cc1-args">;
 def NewlineEOF : DiagGroup<"newline-eof">;
 def Nullability : DiagGroup<"nullability">;
@@ -486,7 +521,9 @@ def NonPODVarargs : DiagGroup<"non-pod-varargs">;
 def ClassVarargs : DiagGroup<"class-varargs", [NonPODVarargs]>;
 def : DiagGroup<"nonportable-cfstrings">;
 def NonVirtualDtor : DiagGroup<"non-virtual-dtor">;
-def NullPointerArithmetic : DiagGroup<"null-pointer-arithmetic">;
+def GNUNullPointerArithmetic : DiagGroup<"gnu-null-pointer-arithmetic">;
+def NullPointerArithmetic
+    : DiagGroup<"null-pointer-arithmetic", [GNUNullPointerArithmetic]>;
 def NullPointerSubtraction : DiagGroup<"null-pointer-subtraction">;
 def : DiagGroup<"effc++", [NonVirtualDtor]>;
 def OveralignedType : DiagGroup<"over-aligned">;
@@ -504,7 +541,8 @@ def PrivateExtern : DiagGroup<"private-extern">;
 def SelTypeCast : DiagGroup<"cast-of-sel-type">;
 def FunctionDefInObjCContainer : DiagGroup<"function-def-in-objc-container">;
 def BadFunctionCast : DiagGroup<"bad-function-cast">;
-def CastFunctionType : DiagGroup<"cast-function-type">;
+def CastFunctionTypeStrict : DiagGroup<"cast-function-type-strict">;
+def CastFunctionType : DiagGroup<"cast-function-type", [CastFunctionTypeStrict]>;
 def ObjCPropertyImpl : DiagGroup<"objc-property-implementation">;
 def ObjCPropertyNoAttribute : DiagGroup<"objc-property-no-attribute">;
 def ObjCPropertyAssignOnObjectType : DiagGroup<"objc-property-assign-on-object-type">;
@@ -527,13 +565,17 @@ def UnderalignedExceptionObject : DiagGroup<"underaligned-exception-object">;
 def DeprecatedObjCIsaUsage : DiagGroup<"deprecated-objc-isa-usage">;
 def ExplicitInitializeCall : DiagGroup<"explicit-initialize-call">;
 def OrderedCompareFunctionPointers : DiagGroup<"ordered-compare-function-pointers">;
-def Packed : DiagGroup<"packed">;
+def PackedNonPod : DiagGroup<"packed-non-pod">;
+def Packed : DiagGroup<"packed", [PackedNonPod]>;
 def Padded : DiagGroup<"padded">;
+def UnalignedAccess : DiagGroup<"unaligned-access">;
 
 def PessimizingMove : DiagGroup<"pessimizing-move">;
 def ReturnStdMove : DiagGroup<"return-std-move">;
 
-def PointerArith : DiagGroup<"pointer-arith">;
+def GNUPointerArith : DiagGroup<"gnu-pointer-arith">;
+def PointerArith : DiagGroup<"pointer-arith", [GNUPointerArith]>;
+
 def PoundWarning : DiagGroup<"#warnings">;
 def PoundPragmaMessage : DiagGroup<"#pragma-messages">,
                          DiagCategory<"#pragma message Directive">;
@@ -587,7 +629,12 @@ def StaticInInline : DiagGroup<"static-in-inline">;
 def StaticLocalInInline : DiagGroup<"static-local-in-inline">;
 def GNUStaticFloatInit : DiagGroup<"gnu-static-float-init">;
 def StaticFloatInit : DiagGroup<"static-float-init", [GNUStaticFloatInit]>;
-def GNUStatementExpression : DiagGroup<"gnu-statement-expression">;
+// Allow differentiation between GNU statement expressions in a macro versus
+// written directly in source.
+def GNUStatementExpressionFromMacroExpansion :
+  DiagGroup<"gnu-statement-expression-from-macro-expansion">;
+def GNUStatementExpression : DiagGroup<"gnu-statement-expression",
+                                       [GNUStatementExpressionFromMacroExpansion]>;
 def StringConcatation : DiagGroup<"string-concatenation">;
 def StringCompare : DiagGroup<"string-compare">;
 def StringPlusInt : DiagGroup<"string-plus-int">;
@@ -642,6 +689,8 @@ def AmbiguousMacro : DiagGroup<"ambiguous-macro">;
 def KeywordAsMacro : DiagGroup<"keyword-macro">;
 def ReservedIdAsMacro : DiagGroup<"reserved-macro-identifier">;
 def ReservedIdAsMacroAlias : DiagGroup<"reserved-id-macro", [ReservedIdAsMacro]>;
+def RestrictExpansionMacro : DiagGroup<"restrict-expansion">;
+def FinalMacro : DiagGroup<"final-macro">;
 
 // Just silence warnings about -Wstrict-aliasing for now.
 def : DiagGroup<"strict-aliasing=0">;
@@ -742,6 +791,7 @@ def UnusedLocalTypedef : DiagGroup<"unused-local-typedef">;
 def UnusedPropertyIvar :  DiagGroup<"unused-property-ivar">;
 def UnusedGetterReturnValue : DiagGroup<"unused-getter-return-value">;
 def UsedButMarkedUnused : DiagGroup<"used-but-marked-unused">;
+def UsedSearchPath : DiagGroup<"search-path-usage">;
 def UserDefinedLiterals : DiagGroup<"user-defined-literals">;
 def UserDefinedWarnings : DiagGroup<"user-defined-warnings">;
 def ReorderCtor : DiagGroup<"reorder-ctor">;
@@ -816,8 +866,12 @@ def ReservedIdentifier : DiagGroup<"reserved-identifier",
 //  under separate flags.
 //
 def UnreachableCodeLoopIncrement : DiagGroup<"unreachable-code-loop-increment">;
+def UnreachableCodeFallthrough : DiagGroup<"unreachable-code-fallthrough">;
+def UnreachableCodeGenericAssoc : DiagGroup<"unreachable-code-generic-assoc">;
 def UnreachableCode : DiagGroup<"unreachable-code",
-                                [UnreachableCodeLoopIncrement]>;
+                                [UnreachableCodeLoopIncrement,
+                                 UnreachableCodeFallthrough,
+                                 UnreachableCodeGenericAssoc]>;
 def UnreachableCodeBreak : DiagGroup<"unreachable-code-break">;
 def UnreachableCodeReturn : DiagGroup<"unreachable-code-return">;
 def UnreachableCodeAggressive : DiagGroup<"unreachable-code-aggressive",
@@ -912,6 +966,7 @@ def PointerToEnumCast : DiagGroup<"pointer-to-enum-cast",
                                   [VoidPointerToEnumCast]>;
 def PointerToIntCast : DiagGroup<"pointer-to-int-cast",
                                  [PointerToEnumCast, VoidPointerToIntCast]>;
+def VoidPointerDeref : DiagGroup<"void-ptr-dereference">;
 
 def FUseLdPath : DiagGroup<"fuse-ld-path">;
 
@@ -940,6 +995,8 @@ def Extra : DiagGroup<"extra", [
   ]>;
 
 def Most : DiagGroup<"most", [
+    ArrayParameter,
+    BoolOperation,
     CharSubscript,
     Comment,
     DeleteNonVirtualDtor,
@@ -1027,6 +1084,13 @@ def : DiagGroup<"unused-local-typedefs", [UnusedLocalTypedef]>;
 def NonGCC : DiagGroup<"non-gcc",
     [SignCompare, Conversion, LiteralRange]>;
 
+def CXX14Attrs : DiagGroup<"c++14-attribute-extensions">;
+def CXX17Attrs : DiagGroup<"c++17-attribute-extensions">;
+def CXX20Attrs : DiagGroup<"c++20-attribute-extensions">;
+def FutureAttrs : DiagGroup<"future-attribute-extensions", [CXX14Attrs,
+                                                            CXX17Attrs,
+                                                            CXX20Attrs]>;
+
 // A warning group for warnings about using C++11 features as extensions in
 // earlier C++ versions.
 def CXX11 : DiagGroup<"c++11-extensions", [CXX11ExtraSemi, CXX11InlineNamespace,
@@ -1034,15 +1098,15 @@ def CXX11 : DiagGroup<"c++11-extensions", [CXX11ExtraSemi, CXX11InlineNamespace,
 
 // A warning group for warnings about using C++14 features as extensions in
 // earlier C++ versions.
-def CXX14 : DiagGroup<"c++14-extensions", [CXX14BinaryLiteral]>;
+def CXX14 : DiagGroup<"c++14-extensions", [CXX14BinaryLiteral, CXX14Attrs]>;
 
 // A warning group for warnings about using C++17 features as extensions in
 // earlier C++ versions.
-def CXX17 : DiagGroup<"c++17-extensions">;
+def CXX17 : DiagGroup<"c++17-extensions", [CXX17Attrs]>;
 
 // A warning group for warnings about using C++20 features as extensions in
 // earlier C++ versions.
-def CXX20 : DiagGroup<"c++20-extensions", [CXX20Designator]>;
+def CXX20 : DiagGroup<"c++20-extensions", [CXX20Designator, CXX20Attrs]>;
 
 // A warning group for warnings about using C++2b features as extensions in
 // earlier C++ versions.
@@ -1075,12 +1139,13 @@ def GNU : DiagGroup<"gnu", [GNUAlignofExpression, GNUAnonymousStruct,
                             VLAExtension, GNUFlexibleArrayInitializer,
                             GNUFlexibleArrayUnionMember, GNUFoldingConstant,
                             GNUImaginaryConstant, GNUIncludeNext,
-                            GNULabelsAsValue,
+                            GNULabelsAsValue, GNULineMarker, GNUNullPointerArithmetic,
+                            GNUOffsetofExtensions, GNUPointerArith,
                             RedeclaredClassMember, GNURedeclaredEnum,
                             GNUStatementExpression, GNUStaticFloatInit,
-                            GNUStringLiteralOperatorTemplate,
-                            GNUUnionCast, GNUVariableSizedTypeNotAtEnd,
-                            ZeroLengthArray, GNUZeroLineDirective,
+                            GNUStringLiteralOperatorTemplate, GNUUnionCast,
+                            GNUVariableSizedTypeNotAtEnd, ZeroLengthArray,
+                            GNUZeroLineDirective,
                             GNUZeroVariadicMacroArguments]>;
 // A warning group for warnings about code that clang accepts but gcc doesn't.
 def GccCompat : DiagGroup<"gcc-compat">;
@@ -1185,6 +1250,9 @@ def ASM : DiagGroup<"asm", [
     ASMOperandWidths
   ]>;
 
+// Linker warnings.
+def LinkerWarnings : DiagGroup<"linker-warnings">;
+
 // OpenMP warnings.
 def SourceUsesOpenMP : DiagGroup<"source-uses-openmp">;
 def OpenMPClauses : DiagGroup<"openmp-clauses">;
@@ -1201,7 +1269,25 @@ def OpenMP : DiagGroup<"openmp", [
 // Backend warnings.
 def BackendInlineAsm : DiagGroup<"inline-asm">;
 def BackendSourceMgr : DiagGroup<"source-mgr">;
-def BackendFrameLargerThan : DiagGroup<"frame-larger-than">;
+def BackendFrameLargerThan : DiagGroup<"frame-larger-than">{
+ code Documentation = [{
+More fine grained information about the stack layout is available by adding the
+`-Rpass-analysis=stack-frame-layout` command-line flag to the compiler
+invocation.
+
+The diagnostic information can be saved to a file in a machine readable format,
+like YAML by adding the `-foptimization-record-file=<file>` command-line flag.
+
+Results can be filtered by function name by passing 
+`-mllvm -filter-print-funcs=foo`, where `foo` is the target function's name.
+
+   .. code-block: console
+      clang -c a.cpp -Rpass-analysis=stack-frame-layout -mllvm -filter-print-funcs=foo
+
+   .. code-block: console
+      clang -c a.cpp -Rpass-analysis=stack-frame-layout -foptimization-record-file=<file>
+}];
+}
 // Compatibility flag name from old versions of Clang.
 def : DiagGroup<"frame-larger-than=", [BackendFrameLargerThan]>;
 def BackendPlugin : DiagGroup<"backend-plugin">;
@@ -1210,11 +1296,13 @@ def BackendOptimizationRemark : DiagGroup<"pass">;
 def BackendOptimizationRemarkMissed : DiagGroup<"pass-missed">;
 def BackendOptimizationRemarkAnalysis : DiagGroup<"pass-analysis">;
 def BackendOptimizationFailure : DiagGroup<"pass-failed">;
+def BackendWarningAttributes : DiagGroup<"attribute-warning">;
 
 // Instrumentation based profiling warnings.
 def ProfileInstrMissing : DiagGroup<"profile-instr-missing">;
 def ProfileInstrOutOfDate : DiagGroup<"profile-instr-out-of-date">;
 def ProfileInstrUnprofiled : DiagGroup<"profile-instr-unprofiled">;
+def MisExpect : DiagGroup<"misexpect">;
 
 // AddressSanitizer frontend instrumentation remarks.
 def SanitizeAddressRemarks : DiagGroup<"sanitize-address">;
@@ -1247,15 +1335,21 @@ def OptionIgnored : DiagGroup<"option-ignored">;
 def UnknownArgument : DiagGroup<"unknown-argument">;
 
 // A warning group for warnings about code that clang accepts when
-// compiling OpenCL C/C++ but which is not compatible with the SPIR spec.
+// compiling OpenCL C/C++ but which is not compatible with the SPIR(-V) spec.
 def SpirCompat : DiagGroup<"spir-compat">;
+def : DiagGroup<"spirv-compat", [SpirCompat]>; // Alias.
 
 // Warning for the GlobalISel options.
 def GlobalISel : DiagGroup<"global-isel">;
 
+// A warning group for the GNU extension to allow mixed specifier types for
+// target-clones multiversioning.
+def TargetClonesMixedSpecifiers : DiagGroup<"target-clones-mixed-specifiers">;
+
 // A warning group specifically for warnings related to function
 // multiversioning.
-def FunctionMultiVersioning : DiagGroup<"function-multiversion">;
+def FunctionMultiVersioning
+    : DiagGroup<"function-multiversion", [TargetClonesMixedSpecifiers]>;
 
 def NoDeref : DiagGroup<"noderef">;
 
@@ -1303,3 +1397,23 @@ def WebAssemblyExceptionSpec : DiagGroup<"wasm-exception-spec">;
 def RTTI : DiagGroup<"rtti">;
 
 def OpenCLCoreFeaturesDiagGroup : DiagGroup<"pedantic-core-features">;
+
+// Warnings and extensions to make preprocessor macro usage pedantic.
+def PedanticMacros : DiagGroup<"pedantic-macros",
+                    [DeprecatedPragma,
+                     MacroRedefined,
+                     BuiltinMacroRedefined,
+                     RestrictExpansionMacro,
+                     FinalMacro]>;
+
+def BranchProtection : DiagGroup<"branch-protection">;
+
+// HLSL diagnostic groups
+// Warnings for HLSL Clang extensions
+def HLSLExtension : DiagGroup<"hlsl-extensions">;
+
+// Warnings and notes related to const_var_decl_type attribute checks
+def ReadOnlyPlacementChecks : DiagGroup<"read-only-types">;
+
+// Warnings and fixes to support the "safe buffers" programming model.
+def UnsafeBufferUsage : DiagGroup<"unsafe-buffer-usage">;
diff --git a/gnu/llvm/clang/include/clang/Basic/DiagnosticSemaKinds.td b/gnu/llvm/clang/include/clang/Basic/DiagnosticSemaKinds.td
index f7ed458a2de..f09bce00567 100644
--- a/gnu/llvm/clang/include/clang/Basic/DiagnosticSemaKinds.td
+++ b/gnu/llvm/clang/include/clang/Basic/DiagnosticSemaKinds.td
@@ -66,6 +66,7 @@ def warn_infinite_recursive_function : Warning<
 def warn_comma_operator : Warning<"possible misuse of comma operator here">,
   InGroup<DiagGroup<"comma">>, DefaultIgnore;
 def note_cast_to_void : Note<"cast expression to void to silence warning">;
+def note_cast_operand_to_int : Note<"cast one or both operands to int to silence this warning">;
 
 // Constant expressions
 def err_expr_not_ice : Error<
@@ -82,11 +83,11 @@ def err_typecheck_converted_constant_expression_indirect : Error<
   "bind reference to a temporary">;
 def err_expr_not_cce : Error<
   "%select{case value|enumerator value|non-type template argument|"
-  "array size|explicit specifier argument}0 "
+  "array size|explicit specifier argument|noexcept specifier argument}0 "
   "is not a constant expression">;
 def ext_cce_narrowing : ExtWarn<
   "%select{case value|enumerator value|non-type template argument|"
-  "array size|explicit specifier argument}0 "
+  "array size|explicit specifier argument|noexcept specifier argument}0 "
   "%select{cannot be narrowed from type %2 to %3|"
   "evaluates to %2, which cannot be narrowed to type %3}1">,
   InGroup<CXX11Narrowing>, DefaultError, SFINAEFailure;
@@ -117,6 +118,10 @@ def warn_float_overflow : Warning<
 def warn_float_underflow : Warning<
   "magnitude of floating-point constant too small for type %0; minimum is %1">,
   InGroup<LiteralRange>;
+def warn_float_compare_literal : Warning<
+  "floating-point comparison is always %select{true|false}0; "
+  "constant cannot be represented exactly in type %1">,
+  InGroup<LiteralRange>;
 def warn_double_const_requires_fp64 : Warning<
   "double precision constant requires %select{cl_khr_fp64|cl_khr_fp64 and __opencl_c_fp64}0, "
   "casting to single precision">;
@@ -142,7 +147,7 @@ def ext_vla_folded_to_constant : ExtWarn<
   "variable length array folded to constant array as an extension">,
   InGroup<GNUFoldingConstant>;
 def err_vla_unsupported : Error<
-  "variable length arrays are not supported for the current target">;
+  "variable length arrays are not supported for %select{the current target|'%1'}0">;
 def note_vla_unsupported : Note<
   "variable length arrays are not supported for the current target">;
 
@@ -179,7 +184,7 @@ def err_designator_for_scalar_or_sizeless_init : Error<
 def warn_initializer_overrides : Warning<
   "initializer %select{partially |}0overrides prior initialization of "
   "this subobject">, InGroup<InitializerOverrides>;
-def ext_initializer_overrides : ExtWarn<warn_initializer_overrides.Text>,
+def ext_initializer_overrides : ExtWarn<warn_initializer_overrides.Summary>,
   InGroup<InitializerOverrides>, SFINAEFailure;
 def err_initializer_overrides_destructed : Error<
   "initializer would partially override prior initialization of object of "
@@ -196,7 +201,8 @@ def ext_flexible_array_init : Extension<
 
 // C++20 designated initializers
 def ext_cxx_designated_init : Extension<
-  "designated initializers are a C++20 extension">, InGroup<CXX20Designator>;
+  "designated initializers are a C++20 extension">, InGroup<CXX20Designator>,
+  SuppressInSystemMacro;
 def warn_cxx17_compat_designated_init : Warning<
   "designated initializers are incompatible with C++ standards before C++20">,
   InGroup<CXXPre20CompatPedantic>, DefaultIgnore;
@@ -245,7 +251,7 @@ def warn_deprecated_register : Warning<
   "and incompatible with C++17">, InGroup<DeprecatedRegister>;
 def ext_register_storage_class : ExtWarn<
   "ISO C++17 does not allow 'register' storage class specifier">,
-  DefaultError, InGroup<Register>;
+  InGroup<Register>;
 
 def err_invalid_decl_spec_combination : Error<
   "cannot combine with previous '%0' declaration specifier">;
@@ -267,10 +273,12 @@ def err_invalid_vector_double_decl_spec : Error <
 def err_invalid_vector_bool_int128_decl_spec : Error <
   "use of '__int128' with '__vector bool' requires VSX support enabled (on "
   "POWER10 or later)">;
+def err_invalid_vector_int128_decl_spec : Error<
+  "use of '__int128' with '__vector' requires extended Altivec support"
+  " (available on POWER8 or later)">;
 def err_invalid_vector_long_long_decl_spec : Error <
-  "use of 'long long' with '__vector bool' requires VSX support (available on "
-  "POWER7 or later) or extended Altivec support (available on POWER8 or later) "
-  "to be enabled">;
+  "use of 'long long' with '__vector' requires VSX support (available on "
+  "POWER7 or later) to be enabled">;
 def err_invalid_vector_long_double_decl_spec : Error<
   "cannot use 'long double' with '__vector'">;
 def warn_vector_long_decl_spec_combination : Warning<
@@ -388,6 +396,7 @@ def warn_reserved_extern_symbol: Warning<
   "identifier %0 is reserved because %select{"
   "<ERROR>|" // ReservedIdentifierStatus::NotReserved
   "it starts with '_' at global scope|"
+  "it starts with '_' and has C language linkage|"
   "it starts with '__'|"
   "it starts with '_' followed by a capital letter|"
   "it contains '__'}1">,
@@ -408,9 +417,9 @@ def warn_return_value_udt_incomplete: Warning<
 def warn_implicit_function_decl : Warning<
   "implicit declaration of function %0">,
   InGroup<ImplicitFunctionDeclare>, DefaultIgnore;
-def ext_implicit_function_decl : ExtWarn<
-  "implicit declaration of function %0 is invalid in C99">,
-  InGroup<ImplicitFunctionDeclare>;
+def ext_implicit_function_decl_c99 : ExtWarn<
+  "call to undeclared function %0; ISO C99 and later do not support implicit "
+  "function declarations">, InGroup<ImplicitFunctionDeclare>;
 def note_function_suggestion : Note<"did you mean %0?">;
 
 def err_ellipsis_first_param : Error<
@@ -445,9 +454,9 @@ def warn_decl_shadow :
           "typedef in %2|"
           "type alias in %2|"
           "structured binding}1">,
-  InGroup<Shadow>, DefaultIgnore;
+  InGroup<Shadow>, DefaultIgnore, SuppressInSystemMacro;
 def warn_decl_shadow_uncaptured_local :
-  Warning<warn_decl_shadow.Text>,
+  Warning<warn_decl_shadow.Summary>,
   InGroup<ShadowUncapturedLocal>, DefaultIgnore;
 def warn_ctor_parm_shadows_field:
   Warning<"constructor parameter %0 shadows the field %1 of %2">,
@@ -483,6 +492,8 @@ def warn_cxx17_compat_decomp_decl_spec : Warning<
 def err_decomp_decl_type : Error<
   "decomposition declaration cannot be declared with type %0; "
   "declared type must be 'auto' or reference to 'auto'">;
+def err_decomp_decl_constraint : Error<
+  "decomposition declaration cannot be declared with constrained 'auto'">;
 def err_decomp_decl_parens : Error<
   "decomposition declaration cannot be declared with parentheses">;
 def err_decomp_decl_template : Error<
@@ -551,11 +562,10 @@ def err_using_decl_can_not_refer_to_class_member : Error<
 def warn_cxx17_compat_using_decl_class_member_enumerator : Warning<
   "member using declaration naming a non-member enumerator is incompatible "
   "with C++ standards before C++20">, InGroup<CXXPre20Compat>, DefaultIgnore;
-def ext_using_decl_class_member_enumerator : ExtWarn<
-  "member using declaration naming a non-member enumerator is "
-  "a C++20 extension">, InGroup<CXX20>;
 def err_using_enum_is_dependent : Error<
   "using-enum cannot name a dependent type">;
+def err_using_enum_not_enum : Error<
+  "%0 is not an enumerated type">;
 def err_ambiguous_inherited_constructor : Error<
   "constructor of %0 inherited from multiple base class subobjects">;
 def note_ambiguous_inherited_constructor_using : Note<
@@ -682,13 +692,24 @@ def warn_unreachable_return : Warning<
 def warn_unreachable_loop_increment : Warning<
   "loop will run at most once (loop increment never executed)">,
   InGroup<UnreachableCodeLoopIncrement>, DefaultIgnore;
+def warn_unreachable_fallthrough_attr : Warning<
+  "fallthrough annotation in unreachable code">,
+  InGroup<UnreachableCodeFallthrough>, DefaultIgnore;
 def note_unreachable_silence : Note<
   "silence by adding parentheses to mark code as explicitly dead">;
+def warn_unreachable_association : Warning<
+  "due to lvalue conversion of the controlling expression, association of type "
+  "%0 will never be selected because it is %select{of array type|qualified}1">,
+  InGroup<UnreachableCodeGenericAssoc>;
 
 /// Built-in functions.
 def ext_implicit_lib_function_decl : ExtWarn<
   "implicitly declaring library function '%0' with type %1">,
   InGroup<ImplicitFunctionDeclare>;
+def ext_implicit_lib_function_decl_c99 : ExtWarn<
+  "call to undeclared library function '%0' with type %1; ISO C99 and later "
+  "do not support implicit function declarations">,
+  InGroup<ImplicitFunctionDeclare>;
 def note_include_header_or_declare : Note<
   "include the header <%0> or explicitly provide a declaration for '%1'">;
 def note_previous_builtin_declaration : Note<"%0 is a builtin with type %1">;
@@ -811,16 +832,28 @@ def warn_builtin_chk_overflow : Warning<
   InGroup<DiagGroup<"builtin-memcpy-chk-size">>;
 
 def warn_fortify_source_overflow
-  : Warning<warn_builtin_chk_overflow.Text>, InGroup<FortifySource>;
+  : Warning<warn_builtin_chk_overflow.Summary>, InGroup<FortifySource>;
 def warn_fortify_source_size_mismatch : Warning<
   "'%0' size argument is too large; destination buffer has size %1,"
   " but size argument is %2">, InGroup<FortifySource>;
 
+def warn_fortify_strlen_overflow: Warning<
+  "'%0' will always overflow; destination buffer has size %1,"
+  " but the source string has length %2 (including NUL byte)">,
+  InGroup<FortifySource>;
+
 def warn_fortify_source_format_overflow : Warning<
   "'%0' will always overflow; destination buffer has size %1,"
   " but format string expands to at least %2">,
   InGroup<FortifySource>;
 
+def warn_fortify_scanf_overflow : Warning<
+  "'%0' may overflow; destination buffer in argument %1 has size "
+  "%2, but the corresponding specifier may require size %3">,
+  InGroup<FortifySource>;
+
+def err_function_start_invalid_type: Error<
+  "argument must be a function">;
 
 /// main()
 // static main() is not an error in C, just in C++.
@@ -908,11 +941,14 @@ def warn_pragma_options_align_reset_failed : Warning<
   InGroup<IgnoredPragmas>;
 def err_pragma_options_align_mac68k_target_unsupported : Error<
   "mac68k alignment pragma is not supported on this target">;
+def warn_pragma_align_not_xl_compatible : Warning<
+  "#pragma align(packed) may not be compatible with objects generated with AIX XL C/C++">,
+  InGroup<AIXCompat>;
 def warn_pragma_pack_invalid_alignment : Warning<
   "expected #pragma pack parameter to be '1', '2', '4', '8', or '16'">,
   InGroup<IgnoredPragmas>;
 def err_pragma_pack_invalid_alignment : Error<
-  warn_pragma_pack_invalid_alignment.Text>;
+  warn_pragma_pack_invalid_alignment.Summary>;
 def warn_pragma_pack_non_default_at_include : Warning<
   "non-default #pragma pack value changes the alignment of struct or union "
   "members in the included file">, InGroup<PragmaPackSuspiciousInclude>,
@@ -933,7 +969,8 @@ def warn_pragma_pack_pop_identifier_and_alignment : Warning<
 def warn_pragma_pop_failed : Warning<"#pragma %0(pop, ...) failed: %1">,
   InGroup<IgnoredPragmas>;
 def err_pragma_fc_pp_scope : Error<
-  "'#pragma float_control push/pop' can only appear at file scope or namespace scope">;
+  "'#pragma float_control push/pop' can only appear at file or namespace scope "
+  "or within a language linkage specification">;
 def err_pragma_fc_noprecise_requires_nofenv : Error<
   "'#pragma float_control(precise, off)' is illegal when fenv_access is enabled">;
 def err_pragma_fc_except_requires_precise : Error<
@@ -955,6 +992,13 @@ def err_invalid_super_scope : Error<"invalid use of '__super', "
 def err_super_in_lambda_unsupported : Error<
   "use of '__super' inside a lambda is unsupported">;
 
+def err_pragma_expected_file_scope : Error<
+  "'#pragma %0' can only appear at file scope">;
+def err_pragma_alloc_text_c_linkage: Error<
+  "'#pragma alloc_text' is applicable only to functions with C linkage">;
+def err_pragma_alloc_text_not_function: Error<
+  "'#pragma alloc_text' is applicable only to functions">;
+
 def warn_pragma_unused_undeclared_var : Warning<
   "undeclared variable %0 used as an argument for '#pragma unused'">,
   InGroup<IgnoredPragmas>;
@@ -1041,7 +1085,7 @@ def warn_protocol_property_mismatch : Warning<
   "property %select{of type %1|with attribute '%1'|without attribute '%1'|with "
   "getter %1|with setter %1}0 was selected for synthesis">,
   InGroup<DiagGroup<"protocol-property-synthesis-ambiguity">>;
-def err_protocol_property_mismatch: Error<warn_protocol_property_mismatch.Text>;
+def err_protocol_property_mismatch: Error<warn_protocol_property_mismatch.Summary>;
 def err_undef_interface : Error<"cannot find interface declaration for %0">;
 def err_category_forward_interface : Error<
   "cannot define %select{category|class extension}0 for undefined class %1">;
@@ -1258,7 +1302,7 @@ def warn_objc_pointer_masking : Warning<
   "bitmasking for introspection of Objective-C object pointers is strongly "
   "discouraged">,
   InGroup<ObjCPointerIntrospect>;
-def warn_objc_pointer_masking_performSelector : Warning<warn_objc_pointer_masking.Text>,
+def warn_objc_pointer_masking_performSelector : Warning<warn_objc_pointer_masking.Summary>,
   InGroup<ObjCPointerIntrospectPerformSelector>;
 def warn_objc_property_default_assign_on_object : Warning<
   "default property attribute 'assign' not appropriate for object">,
@@ -1284,7 +1328,7 @@ def warn_atomic_property_rule : Warning<
   "with a user defined %select{getter|setter}2">,
   InGroup<DiagGroup<"atomic-property-with-user-defined-accessor">>;
 def note_atomic_property_fixup_suggest : Note<"setter and getter must both be "
-  "synthesized, or both be user defined,or the property must be nonatomic">;
+  "synthesized, or both be user defined, or the property must be nonatomic">;
 def err_atomic_property_nontrivial_assign_op : Error<
   "atomic property of reference type %0 cannot have non-trivial assignment"
   " operator">;
@@ -1462,7 +1506,7 @@ def warn_potentially_direct_selector_expression : Warning<
   "@selector expression formed with potentially direct selector %0">,
   InGroup<ObjCPotentiallyDirectSelector>;
 def warn_strict_potentially_direct_selector_expression : Warning<
-  warn_potentially_direct_selector_expression.Text>,
+  warn_potentially_direct_selector_expression.Summary>,
   InGroup<ObjCStrictPotentiallyDirectSelector>, DefaultIgnore;
 
 def err_objc_kindof_nonobject : Error<
@@ -1486,12 +1530,18 @@ def err_messaging_class_with_direct_method : Error<
 
 // C++ declarations
 def err_static_assert_expression_is_not_constant : Error<
-  "static_assert expression is not an integral constant expression">;
+  "static assertion expression is not an integral constant expression">;
 def err_constexpr_if_condition_expression_is_not_constant : Error<
   "constexpr if condition is not a constant expression">;
-def err_static_assert_failed : Error<"static_assert failed%select{ %1|}0">;
+def err_static_assert_failed : Error<"static assertion failed%select{: %1|}0">;
 def err_static_assert_requirement_failed : Error<
-  "static_assert failed due to requirement '%0'%select{ %2|}1">;
+  "static assertion failed due to requirement '%0'%select{: %2|}1">;
+def note_expr_evaluates_to : Note<
+  "expression evaluates to '%0 %1 %2'">;
+
+def warn_consteval_if_always_true : Warning<
+  "consteval if is always true in an %select{unevaluated|immediate}0 context">,
+  InGroup<DiagGroup<"redundant-consteval-if">>;
 
 def ext_inline_variable : ExtWarn<
   "inline variables are a C++17 extension">, InGroup<CXX17>;
@@ -1600,6 +1650,9 @@ def err_type_defined_in_condition : Error<
   "%0 cannot be defined in a condition">;
 def err_type_defined_in_enum : Error<
   "%0 cannot be defined in an enumeration">;
+def ext_type_defined_in_offsetof : Extension<
+  "defining a type within '%select{__builtin_offsetof|offsetof}0' is a Clang "
+  "extension">, InGroup<GNUOffsetofExtensions>;
 
 def note_pure_virtual_function : Note<
   "unimplemented pure virtual method %0 in %1">;
@@ -1624,8 +1677,7 @@ def warn_weak_vtable : Warning<
   "emitted in every translation unit">,
   InGroup<DiagGroup<"weak-vtables">>, DefaultIgnore;
 def warn_weak_template_vtable : Warning<
-  "explicit template instantiation %0 will emit a vtable in every "
-  "translation unit">,
+  "this warning is no longer in use and will be removed in the next release">,
   InGroup<DiagGroup<"weak-template-vtables">>, DefaultIgnore;
 
 def ext_using_undefined_std : ExtWarn<
@@ -1643,37 +1695,32 @@ def err_incomplete_in_exception_spec : Error<
 def err_sizeless_in_exception_spec : Error<
   "%select{|reference to }0sizeless type %1 is not allowed "
   "in exception specification">;
-def ext_incomplete_in_exception_spec : ExtWarn<err_incomplete_in_exception_spec.Text>,
+def ext_incomplete_in_exception_spec : ExtWarn<err_incomplete_in_exception_spec.Summary>,
   InGroup<MicrosoftExceptionSpec>;
 def err_rref_in_exception_spec : Error<
   "rvalue reference type %0 is not allowed in exception specification">;
 def err_mismatched_exception_spec : Error<
   "exception specification in declaration does not match previous declaration">;
-def ext_mismatched_exception_spec : ExtWarn<err_mismatched_exception_spec.Text>,
+def ext_mismatched_exception_spec : ExtWarn<err_mismatched_exception_spec.Summary>,
   InGroup<MicrosoftExceptionSpec>;
 def err_override_exception_spec : Error<
   "exception specification of overriding function is more lax than "
   "base version">;
-def ext_override_exception_spec : ExtWarn<err_override_exception_spec.Text>,
+def ext_override_exception_spec : ExtWarn<err_override_exception_spec.Summary>,
   InGroup<MicrosoftExceptionSpec>;
 def err_incompatible_exception_specs : Error<
   "target exception specification is not superset of source">;
 def warn_incompatible_exception_specs : Warning<
-  err_incompatible_exception_specs.Text>, InGroup<IncompatibleExceptionSpec>;
+  err_incompatible_exception_specs.Summary>, InGroup<IncompatibleExceptionSpec>;
 def err_deep_exception_specs_differ : Error<
   "exception specifications of %select{return|argument}0 types differ">;
 def warn_deep_exception_specs_differ : Warning<
-  err_deep_exception_specs_differ.Text>, InGroup<IncompatibleExceptionSpec>;
+  err_deep_exception_specs_differ.Summary>, InGroup<IncompatibleExceptionSpec>;
 def err_missing_exception_specification : Error<
   "%0 is missing exception specification '%1'">;
 def ext_missing_exception_specification : ExtWarn<
-  err_missing_exception_specification.Text>,
+  err_missing_exception_specification.Summary>,
   InGroup<DiagGroup<"missing-exception-spec">>;
-def ext_ms_missing_exception_specification : ExtWarn<
-  err_missing_exception_specification.Text>,
-  InGroup<MicrosoftExceptionSpec>;
-def err_noexcept_needs_constant_expression : Error<
-  "argument to noexcept specifier must be a constant expression">;
 def err_exception_spec_not_parsed : Error<
   "exception specification is not available until end of class definition">;
 def err_exception_spec_cycle : Error<
@@ -1833,7 +1880,7 @@ def err_static_not_bitfield : Error<"static member %0 cannot be a bit-field">;
 def err_static_out_of_line : Error<
   "'static' can only be specified inside the class definition">;
 def ext_static_out_of_line : ExtWarn<
-  err_static_out_of_line.Text>,
+  err_static_out_of_line.Summary>,
   InGroup<MicrosoftTemplate>;
 def err_storage_class_for_static_member : Error<
   "static data member definition cannot specify a storage class">;
@@ -2077,7 +2124,8 @@ def err_init_conversion_failed : Error<
   "exception object|a member subobject|an array element|a new value|a value|a "
   "base class|a constructor delegation|a vector element|a block element|a "
   "block element|a complex element|a lambda capture|a compound literal "
-  "initializer|a related result|a parameter of CF audited function}0 "
+  "initializer|a related result|a parameter of CF audited function|a "
+  "structured binding|a member subobject}0 "
   "%diff{of type $ with an %select{rvalue|lvalue}2 of type $|"
   "with an %select{rvalue|lvalue}2 of incompatible type}1,3"
   "%select{|: different classes%diff{ ($ vs $)|}5,6"
@@ -2120,6 +2168,9 @@ def err_init_list_bad_dest_type : Error<
 def warn_cxx20_compat_aggregate_init_with_ctors : Warning<
   "aggregate initialization of type %0 with user-declared constructors "
   "is incompatible with C++20">, DefaultIgnore, InGroup<CXX20Compat>;
+def warn_cxx17_compat_aggregate_init_paren_list : Warning<
+  "aggregate initialization of type %0 from a parenthesized list of values "
+  "is a C++20 extension">, DefaultIgnore, InGroup<CXX20>;
 
 def err_reference_bind_to_bitfield : Error<
   "%select{non-const|volatile}0 reference cannot bind to "
@@ -2301,13 +2352,23 @@ def ext_auto_new_list_init : Extension<
   "type %0 to use list-initialization">, InGroup<CXX17>;
 def err_auto_var_init_no_expression : Error<
   "initializer for variable %0 with type %1 is empty">;
+def err_auto_expr_init_no_expression : Error<
+  "initializer for functional-style cast to %0 is empty">;
 def err_auto_var_init_multiple_expressions : Error<
   "initializer for variable %0 with type %1 contains multiple expressions">;
+def err_auto_expr_init_multiple_expressions : Error<
+  "initializer for functional-style cast to %0 contains multiple expressions">;
 def err_auto_var_init_paren_braces : Error<
   "cannot deduce type for variable %1 with type %2 from "
   "%select{parenthesized|nested}0 initializer list">;
 def err_auto_new_ctor_multiple_expressions : Error<
   "new expression for type %0 contains multiple constructor arguments">;
+def err_auto_expr_init_paren_braces : Error<
+  "cannot deduce actual type for %1 from "
+  "%select{parenthesized|nested}0 initializer list">;
+def warn_cxx20_compat_auto_expr : Warning<
+  "'auto' as a functional-style cast is incompatible with C++ standards "
+  "before C++2b">, InGroup<CXXPre2bCompat>, DefaultIgnore;
 def err_auto_missing_trailing_return : Error<
   "'auto' return without trailing return type; deduced return types are a "
   "C++14 extension">;
@@ -2321,6 +2382,8 @@ def err_auto_var_deduction_failure : Error<
   "variable %0 with type %1 has incompatible initializer of type %2">;
 def err_auto_var_deduction_failure_from_init_list : Error<
   "cannot deduce actual type for variable %0 with type %1 from initializer list">;
+def err_auto_expr_deduction_failure : Error<
+  "functional-style cast to %0 has incompatible initializer of type %1">;
 def err_auto_new_deduction_failure : Error<
   "new expression for type %0 has incompatible constructor argument of type %1">;
 def err_auto_inconsistent_deduction : Error<
@@ -2590,6 +2653,10 @@ def err_invalid_consteval_take_address : Error<
   " of an immediate invocation">;
 def err_invalid_consteval_call : Error<
   "call to consteval function %q0 is not a constant expression">;
+def note_invalid_consteval_initializer : Note<
+  "in the default initalizer of %0">;
+def note_invalid_consteval_initializer_here : Note<
+  "initialized here %0">;
 def err_invalid_consteval_decl_kind : Error<
   "%0 cannot be declared consteval">;
 def err_invalid_constexpr : Error<
@@ -2658,6 +2725,13 @@ def warn_cxx17_compat_constexpr_body_invalid_stmt : Warning<
   "use of this statement in a constexpr %select{function|constructor}0 "
   "is incompatible with C++ standards before C++20">,
   InGroup<CXXPre20Compat>, DefaultIgnore;
+def ext_constexpr_body_invalid_stmt_cxx2b : ExtWarn<
+  "use of this statement in a constexpr %select{function|constructor}0 "
+  "is a C++2b extension">, InGroup<CXX2b>;
+def warn_cxx20_compat_constexpr_body_invalid_stmt : Warning<
+  "use of this statement in a constexpr %select{function|constructor}0 "
+  "is incompatible with C++ standards before C++2b">,
+  InGroup<CXXPre2bCompat>, DefaultIgnore;
 def ext_constexpr_type_definition : ExtWarn<
   "type definition in a constexpr %select{function|constructor}0 "
   "is a C++14 extension">, InGroup<CXX14>;
@@ -2675,12 +2749,18 @@ def warn_cxx11_compat_constexpr_local_var : Warning<
   "variable declaration in a constexpr %select{function|constructor}0 "
   "is incompatible with C++ standards before C++14">,
   InGroup<CXXPre14Compat>, DefaultIgnore;
-def err_constexpr_local_var_static : Error<
-  "%select{static|thread_local}1 variable not permitted in a constexpr "
-  "%select{function|constructor}0">;
+def ext_constexpr_static_var : ExtWarn<
+  "definition of a %select{static|thread_local}1 variable "
+  "in a constexpr %select{function|constructor}0 "
+  "is a C++2b extension">, InGroup<CXX2b>;
+def warn_cxx20_compat_constexpr_var : Warning<
+  "definition of a %select{static variable|thread_local variable|variable "
+  "of non-literal type}1 in a constexpr %select{function|constructor}0 "
+  "is incompatible with C++ standards before C++2b">,
+  InGroup<CXXPre2bCompat>, DefaultIgnore;
 def err_constexpr_local_var_non_literal_type : Error<
   "variable of non-literal type %1 cannot be defined in a constexpr "
-  "%select{function|constructor}0">;
+  "%select{function|constructor}0 before C++2b">;
 def ext_constexpr_local_var_no_init : ExtWarn<
   "uninitialized variable in a constexpr %select{function|constructor}0 "
   "is a C++20 extension">, InGroup<CXX20>;
@@ -2780,6 +2860,8 @@ def err_template_arg_list_constraints_not_satisfied : Error<
   "template template parameter|template}0 %1%2">;
 def note_substituted_constraint_expr_is_ill_formed : Note<
   "because substituted constraint expression is ill-formed%0">;
+def note_constraint_references_error
+    : Note<"constraint depends on a previously diagnosed expression">;
 def note_atomic_constraint_evaluated_to_false : Note<
   "%select{and|because}0 '%1' evaluated to false">;
 def note_concept_specialization_constraint_evaluated_to_false : Note<
@@ -2792,6 +2874,8 @@ def err_constrained_virtual_method : Error<
   "virtual function cannot have a requires clause">;
 def err_trailing_requires_clause_on_deduction_guide : Error<
   "deduction guide cannot have a requires clause">;
+def err_constrained_non_templated_function
+    : Error<"non-templated function cannot have a requires clause">;
 def err_reference_to_function_with_unsatisfied_constraints : Error<
   "invalid reference to function %0: constraints not satisfied">;
 def err_requires_expr_local_parameter_default_argument : Error<
@@ -2817,7 +2901,7 @@ def note_type_requirement_substitution_error : Note<
 def note_type_requirement_unknown_substitution_error : Note<
   "%select{and|because}0 '%1' would be invalid">;
 def note_nested_requirement_substitution_error : Note<
-  "%select{and|because}0 '%1' would be invalid: %2">;
+  "%select{and|because}0 '%1' would be invalid%2">;
 def note_nested_requirement_unknown_substitution_error : Note<
   "%select{and|because}0 '%1' would be invalid">;
 def note_ambiguous_atomic_constraints : Note<
@@ -2872,11 +2956,16 @@ def warn_auto_var_is_id : Warning<
   InGroup<DiagGroup<"auto-var-id">>;
 
 // Attributes
-def warn_nomerge_attribute_ignored_in_stmt: Warning<
+def warn_attribute_ignored_no_calls_in_stmt: Warning<
   "%0 attribute is ignored because there exists no call expression inside the "
   "statement">,
   InGroup<IgnoredAttributes>;
 
+def warn_function_attribute_ignored_in_stmt : Warning<
+  "attribute is ignored on this statement as it only applies to functions; "
+  "use '%0' on statements">,
+  InGroup<IgnoredAttributes>;
+
 def err_musttail_needs_trivial_args : Error<
   "tail call requires that the return value, all parameters, and any "
   "temporaries created by the expression are trivially destructible">;
@@ -2933,11 +3022,25 @@ def err_attribute_invalid_argument : Error<
 def err_attribute_wrong_number_arguments : Error<
   "%0 attribute %plural{0:takes no arguments|1:takes one argument|"
   ":requires exactly %1 arguments}1">;
+def err_attribute_wrong_number_arguments_for : Error <
+  "%0 attribute references function %1, which %plural{0:takes no arguments|1:takes one argument|"
+  ":takes exactly %2 arguments}2">;
+def err_attribute_bounds_for_function : Error<
+  "%0 attribute references parameter %1, but the function %2 has only %3 parameters">;
+def err_attribute_no_member_function : Error<
+  "%0 attribute cannot be applied to non-static member functions">;
+def err_attribute_parameter_types : Error<
+  "%0 attribute parameter types do not match: parameter %1 of function %2 has type %3, "
+  "but parameter %4 of function %5 has type %6">;
+
 def err_attribute_too_many_arguments : Error<
   "%0 attribute takes no more than %1 argument%s1">;
 def err_attribute_too_few_arguments : Error<
   "%0 attribute takes at least %1 argument%s1">;
 def err_attribute_invalid_vector_type : Error<"invalid vector element type %0">;
+def err_attribute_invalid_bitint_vector_type : Error<
+  "'_BitInt' vector element width must be %select{a power of 2|"
+  "at least as wide as 'CHAR_BIT'}0">;
 def err_attribute_invalid_matrix_type : Error<"invalid matrix element type %0">;
 def err_attribute_bad_neon_vector_size : Error<
   "Neon vector size must be 64 or 128 bits">;
@@ -2949,16 +3052,22 @@ def err_attribute_bad_sve_vector_size : Error<
 def err_attribute_arm_feature_sve_bits_unsupported : Error<
   "%0 is only supported when '-msve-vector-bits=<bits>' is specified with a "
   "value of 128, 256, 512, 1024 or 2048.">;
+def err_sve_vector_in_non_sve_target : Error<
+  "SVE vector type %0 cannot be used in a target without sve">;
 def err_attribute_requires_positive_integer : Error<
   "%0 attribute requires a %select{positive|non-negative}1 "
   "integral compile time constant expression">;
 def err_attribute_requires_opencl_version : Error<
-  "%0 attribute requires OpenCL version %1%select{| or above}2">;
+  "attribute %0 is supported in the OpenCL version %1%select{| onwards}2">;
 def err_invalid_branch_protection_spec : Error<
   "invalid or misplaced branch protection specification '%0'">;
+def warn_unsupported_branch_protection_spec : Warning<
+  "unsupported branch protection specification '%0'">, InGroup<BranchProtection>;
+
 def warn_unsupported_target_attribute
-    : Warning<"%select{unsupported|duplicate|unknown}0%select{| architecture|"
-              " tune CPU}1 '%2' in the 'target' attribute string; 'target' "
+    : Warning<"%select{unsupported|duplicate|unknown}0%select{| CPU|"
+              " tune CPU}1 '%2' in the '%select{target|target_clones|target_version}3' "
+              "attribute string; '%select{target|target_clones|target_version}3' "
               "attribute ignored">,
       InGroup<IgnoredAttributes>;
 def err_attribute_unsupported
@@ -2971,8 +3080,9 @@ def err_aligned_attribute_argument_not_int : Error<
 def err_align_value_attribute_argument_not_int : Error<
   "'align_value' attribute requires integer constant">;
 def err_alignas_attribute_wrong_decl_type : Error<
-  "%0 attribute cannot be applied to a %select{function parameter|"
-  "variable with 'register' storage class|'catch' variable|bit-field}1">;
+  "%0 attribute cannot be applied to %select{a function parameter|"
+  "a variable with 'register' storage class|a 'catch' variable|a bit-field|"
+  "an enumeration}1">;
 def err_alignas_missing_on_definition : Error<
   "%0 must be specified on definition if it is specified on any declaration">;
 def note_alignas_on_declaration : Note<"declared with %0 attribute here">;
@@ -2980,11 +3090,13 @@ def err_alignas_mismatch : Error<
   "redeclaration has different alignment requirement (%1 vs %0)">;
 def err_alignas_underaligned : Error<
   "requested alignment is less than minimum alignment of %1 for type %0">;
+def warn_aligned_attr_underaligned : Warning<err_alignas_underaligned.Summary>,
+  InGroup<IgnoredAttributes>;
 def err_attribute_sizeless_type : Error<
   "%0 attribute cannot be applied to sizeless type %1">;
 def err_attribute_argument_n_type : Error<
   "%0 attribute requires parameter %1 to be %select{int or bool|an integer "
-  "constant|a string|an identifier|a constant expression}2">;
+  "constant|a string|an identifier|a constant expression|a builtin function}2">;
 def err_attribute_argument_type : Error<
   "%0 attribute requires %select{int or bool|an integer "
   "constant|a string|an identifier}1">;
@@ -3002,7 +3114,7 @@ def note_previous_uuid : Note<"previous uuid specified here">;
 def warn_attribute_pointers_only : Warning<
   "%0 attribute only applies to%select{| constant}1 pointer arguments">,
   InGroup<IgnoredAttributes>;
-def err_attribute_pointers_only : Error<warn_attribute_pointers_only.Text>;
+def err_attribute_pointers_only : Error<warn_attribute_pointers_only.Summary>;
 def err_attribute_integers_only : Error<
   "%0 attribute argument may only refer to a function parameter of integer "
   "type">;
@@ -3027,9 +3139,7 @@ def note_ownership_returns_index_mismatch : Note<
   "declared with index %0 here">;
 def err_format_strftime_third_parameter : Error<
   "strftime format attribute requires 3rd parameter to be 0">;
-def err_format_attribute_requires_variadic : Error<
-  "format attribute requires variadic function">;
-def err_format_attribute_not : Error<"format argument not %0">;
+def err_format_attribute_not : Error<"format argument not a string type">;
 def err_format_attribute_result_not : Error<"function does not return %0">;
 def err_format_attribute_implicit_this_format_string : Error<
   "format attribute cannot specify the implicit this argument as the format "
@@ -3240,7 +3350,7 @@ def err_alignment_too_big : Error<
 def err_alignment_not_power_of_two : Error<
   "requested alignment is not a power of 2">;
 def warn_alignment_not_power_of_two : Warning<
-  err_alignment_not_power_of_two.Text>,
+  err_alignment_not_power_of_two.Summary>,
   InGroup<DiagGroup<"non-power-of-two-alignment">>;
 def err_alignment_dependent_typedef_name : Error<
   "requested alignment is dependent but declaration is not dependent">;
@@ -3255,9 +3365,11 @@ def warn_assume_aligned_too_great
               "alignment assumed">,
       InGroup<DiagGroup<"builtin-assume-aligned-alignment">>;
 def warn_not_xl_compatible
-    : Warning<"requesting an alignment of 16 bytes or greater for struct"
-              " members is not binary compatible with AIX XL 16.1 and older">,
+    : Warning<"alignment of 16 bytes for a struct member is not binary "
+              "compatible with IBM XL C/C++ for AIX 16.1.0 or older">,
       InGroup<AIXCompat>;
+def note_misaligned_member_used_here : Note<
+    "passing byval argument %0 with potentially incompatible alignment here">;
 def warn_redeclaration_without_attribute_prev_attribute_ignored : Warning<
   "%q0 redeclared without %1 attribute: previous %1 ignored">,
   InGroup<MicrosoftInconsistentDllImport>;
@@ -3267,8 +3379,6 @@ def warn_redeclaration_without_import_attribute : Warning<
 def warn_dllimport_dropped_from_inline_function : Warning<
   "%q0 redeclared inline; %1 attribute ignored">,
   InGroup<IgnoredAttributes>;
-def warn_attribute_ignored : Warning<"%0 attribute ignored">,
-  InGroup<IgnoredAttributes>;
 def warn_nothrow_attribute_ignored : Warning<"'nothrow' attribute conflicts with"
   " exception specification; attribute ignored">,
   InGroup<IgnoredAttributes>;
@@ -3298,15 +3408,18 @@ def warn_attribute_has_no_effect_on_infinite_loop : Warning<
    InGroup<IgnoredAttributes>;
 def note_attribute_has_no_effect_on_infinite_loop_here : Note<
   "annotating the infinite loop here">;
-def warn_attribute_has_no_effect_on_if_constexpr : Warning<
-  "attribute %0 has no effect when annotating an 'if constexpr' statement">,
+def warn_attribute_has_no_effect_on_compile_time_if : Warning<
+  "attribute %0 has no effect when annotating an 'if %select{constexpr|consteval}1' statement">,
    InGroup<IgnoredAttributes>;
-def note_attribute_has_no_effect_on_if_constexpr_here : Note<
-  "annotating the 'if constexpr' statement here">;
+def note_attribute_has_no_effect_on_compile_time_if_here : Note<
+  "annotating the 'if %select{constexpr|consteval}0' statement here">;
 def err_decl_attribute_invalid_on_stmt : Error<
   "%0 attribute cannot be applied to a statement">;
-def err_stmt_attribute_invalid_on_decl : Error<
+def err_attribute_invalid_on_decl : Error<
   "%0 attribute cannot be applied to a declaration">;
+def warn_type_attribute_deprecated_on_decl : Warning<
+  "applying attribute %0 to a declaration is deprecated; apply it to the type instead">,
+  InGroup<DeprecatedAttributes>;
 def warn_declspec_attribute_ignored : Warning<
   "attribute %0 is ignored, place it after "
   "\"%select{class|struct|interface|union|enum}1\" to apply attribute to "
@@ -3371,6 +3484,8 @@ def warn_attribute_dll_redeclaration : Warning<
   InGroup<DiagGroup<"dll-attribute-on-redeclaration">>;
 def err_attribute_dllimport_function_definition : Error<
   "dllimport cannot be applied to non-inline function definition">;
+def err_attribute_dllimport_function_specialization_definition : Error<
+  "cannot define non-inline dllimport template specialization">;
 def err_attribute_dll_deleted : Error<
   "attribute %q0 cannot be applied to a deleted function">;
 def err_attribute_dllimport_data_definition : Error<
@@ -3382,7 +3497,7 @@ def warn_attribute_dllimport_static_field_definition : Warning<
   InGroup<DiagGroup<"dllimport-static-field-def">>;
 def warn_attribute_dllexport_explicit_instantiation_decl : Warning<
   "explicit instantiation declaration should not be 'dllexport'">,
-  InGroup<DiagGroup<"dllexport-explicit-instantiation-decl">>;
+  InGroup<DllexportExplicitInstantiationDecl>;
 def warn_attribute_dllexport_explicit_instantiation_def : Warning<
   "'dllexport' attribute ignored on explicit instantiation definition">,
   InGroup<IgnoredAttributes>;
@@ -3409,7 +3524,7 @@ def err_alias_not_supported_on_darwin : Error <
 def warn_attribute_wrong_decl_type_str : Warning<
   "%0 attribute only applies to %1">, InGroup<IgnoredAttributes>;
 def err_attribute_wrong_decl_type_str : Error<
-  warn_attribute_wrong_decl_type_str.Text>;
+  warn_attribute_wrong_decl_type_str.Summary>;
 def warn_attribute_wrong_decl_type : Warning<
   "%0 attribute only applies to %select{"
   "functions"
@@ -3426,7 +3541,7 @@ def warn_attribute_wrong_decl_type : Warning<
   "|kernel functions"
   "|non-K&R-style functions}1">,
   InGroup<IgnoredAttributes>;
-def err_attribute_wrong_decl_type : Error<warn_attribute_wrong_decl_type.Text>;
+def err_attribute_wrong_decl_type : Error<warn_attribute_wrong_decl_type.Summary>;
 def warn_type_attribute_wrong_type : Warning<
   "'%0' only applies to %select{function|pointer|"
   "Objective-C object or block pointer}1 types; type here is %2">,
@@ -3458,11 +3573,11 @@ def warn_cconv_unsupported : Warning<
   "|on builtin function"
   "}1">,
   InGroup<IgnoredAttributes>;
-def error_cconv_unsupported : Error<warn_cconv_unsupported.Text>;
+def error_cconv_unsupported : Error<warn_cconv_unsupported.Summary>;
 def err_cconv_knr : Error<
   "function with no prototype cannot use the %0 calling convention">;
 def warn_cconv_knr : Warning<
-  err_cconv_knr.Text>,
+  err_cconv_knr.Summary>,
   InGroup<DiagGroup<"missing-prototype-for-cc">>;
 def err_cconv_varargs : Error<
   "variadic function cannot use %0 calling convention">;
@@ -3482,8 +3597,6 @@ def warn_attribute_not_on_decl : Warning<
   "%0 attribute ignored when parsing type">, InGroup<IgnoredAttributes>;
 def err_base_specifier_attribute : Error<
   "%0 attribute cannot be applied to a base specifier">;
-def err_invalid_attribute_on_virtual_function : Error<
-  "%0 attribute cannot be applied to virtual functions">;
 def warn_declspec_allocator_nonpointer : Warning<
   "ignoring __declspec(allocator) because the function return type %0 is not "
   "a pointer or reference type">, InGroup<IgnoredAttributes>;
@@ -3532,12 +3645,15 @@ def warn_availability_swift_unavailable_deprecated_only : Warning<
   InGroup<Availability>;
 def note_protocol_method : Note<
   "protocol method is here">;
+def warn_availability_fuchsia_unavailable_minor : Warning<
+  "Fuchsia API Level prohibits specifying a minor or sub-minor version">,
+  InGroup<Availability>;
 
 def warn_unguarded_availability :
   Warning<"%0 is only available on %1 %2 or newer">,
   InGroup<UnguardedAvailability>, DefaultIgnore;
 def warn_unguarded_availability_new :
-  Warning<warn_unguarded_availability.Text>,
+  Warning<warn_unguarded_availability.Summary>,
   InGroup<UnguardedAvailabilityNew>;
 def note_decl_unguarded_availability_silence : Note<
   "annotate %select{%1|anonymous %1}0 with an availability attribute to silence this warning">;
@@ -3666,13 +3782,13 @@ def warn_fun_requires_lock : Warning<
 
 // Precise thread safety warnings
 def warn_variable_requires_lock_precise :
-  Warning<warn_variable_requires_lock.Text>,
+  Warning<warn_variable_requires_lock.Summary>,
   InGroup<ThreadSafetyPrecise>, DefaultIgnore;
 def warn_var_deref_requires_lock_precise :
-  Warning<warn_var_deref_requires_lock.Text>,
+  Warning<warn_var_deref_requires_lock.Summary>,
   InGroup<ThreadSafetyPrecise>, DefaultIgnore;
 def warn_fun_requires_lock_precise :
-  Warning<warn_fun_requires_lock.Text>,
+  Warning<warn_fun_requires_lock.Summary>,
   InGroup<ThreadSafetyPrecise>, DefaultIgnore;
 def note_found_mutex_near_match : Note<"found near match '%0'">;
 
@@ -3754,6 +3870,9 @@ def warn_impcast_integer_64_32 : Warning<
 def warn_impcast_integer_precision_constant : Warning<
   "implicit conversion from %2 to %3 changes value from %0 to %1">,
   InGroup<ConstantConversion>;
+def warn_impcast_single_bit_bitield_precision_constant : Warning<
+  "implicit truncation from %2 to a one-bit wide bit-field changes value from "
+  "%0 to %1">, InGroup<SingleBitBitFieldConstantConversion>;
 def warn_impcast_bitfield_precision_constant : Warning<
   "implicit truncation from %2 to bit-field changes value from %0 to %1">,
   InGroup<BitFieldConstantConversion>;
@@ -3897,7 +4016,8 @@ def warn_cast_align : Warning<
   "cast from %0 to %1 increases required alignment from %2 to %3">,
   InGroup<CastAlign>, DefaultIgnore;
 def warn_old_style_cast : Warning<
-  "use of old-style cast">, InGroup<OldStyleCast>, DefaultIgnore;
+  "use of old-style cast">, InGroup<OldStyleCast>, DefaultIgnore,
+  SuppressInSystemMacro;
 
 // Separate between casts to void* and non-void* pointers.
 // Some APIs use (abuse) void* for something like a user context,
@@ -3914,13 +4034,13 @@ def warn_pointer_to_int_cast : Warning<
   "cast to smaller integer type %1 from %0">,
   InGroup<PointerToIntCast>;
 def warn_pointer_to_enum_cast : Warning<
-  warn_pointer_to_int_cast.Text>,
+  warn_pointer_to_int_cast.Summary>,
   InGroup<PointerToEnumCast>;
 def warn_void_pointer_to_int_cast : Warning<
   "cast to smaller integer type %1 from %0">,
   InGroup<VoidPointerToIntCast>;
 def warn_void_pointer_to_enum_cast : Warning<
-  warn_void_pointer_to_int_cast.Text>,
+  warn_void_pointer_to_int_cast.Summary>,
   InGroup<VoidPointerToEnumCast>;
 
 def warn_attribute_ignored_for_field_of_type : Warning<
@@ -3956,6 +4076,9 @@ def warn_transparent_union_attribute_zero_fields : Warning<
 def warn_attribute_type_not_supported : Warning<
   "%0 attribute argument not supported: %1">,
   InGroup<IgnoredAttributes>;
+def warn_attribute_type_not_supported_global : Warning<
+  "%0 attribute argument '%1' not supported on a global variable">,
+  InGroup<IgnoredAttributes>;
 def warn_attribute_unknown_visibility : Warning<"unknown visibility %0">,
   InGroup<IgnoredAttributes>;
 def warn_attribute_protected_visibility :
@@ -3981,6 +4104,9 @@ def warn_vector_mode_deprecated : Warning<
   "specifying vector types with the 'mode' attribute is deprecated; "
   "use the 'vector_size' attribute instead">,
   InGroup<DeprecatedAttributes>;
+def warn_deprecated_noreturn_spelling : Warning<
+  "the '[[_Noreturn]]' attribute spelling is deprecated in C2x; use "
+  "'[[noreturn]]' instead">, InGroup<DeprecatedAttributes>;
 def err_complex_mode_vector_type : Error<
   "type of machine mode does not support base vector types">;
 def err_enum_mode_vector_type : Error<
@@ -3991,6 +4117,10 @@ def warn_attribute_nonnull_no_pointers : Warning<
 def warn_attribute_nonnull_parm_no_args : Warning<
   "'nonnull' attribute when used on parameters takes no arguments">,
   InGroup<IgnoredAttributes>;
+def warn_function_stmt_attribute_precedence : Warning<
+  "statement attribute %0 has higher precedence than function attribute "
+  "'%select{always_inline|flatten|noinline}1'">,
+  InGroup<IgnoredAttributes>;
 def note_declared_nonnull : Note<
   "declared %select{'returns_nonnull'|'nonnull'}0 here">;
 def warn_attribute_sentinel_named_arguments : Warning<
@@ -4028,6 +4158,9 @@ def err_attribute_not_supported_on_arch
 def warn_gcc_ignores_type_attr : Warning<
   "GCC does not allow the %0 attribute to be written on a type">,
   InGroup<GccCompat>;
+def warn_gcc_requires_variadic_function : Warning<
+  "GCC requires a function with the %0 attribute to be variadic">,
+  InGroup<GccCompat>;
 
 // Clang-Specific Attributes
 def warn_attribute_iboutlet : Warning<
@@ -4084,7 +4217,7 @@ def err_attribute_preferred_name_arg_invalid : Error<
   "argument %0 to 'preferred_name' attribute is not a typedef for "
   "a specialization of %1">;
 def err_attribute_builtin_alias : Error<
-  "%0 attribute can only be applied to a ARM or RISC-V builtin">;
+  "%0 attribute can only be applied to a ARM, HLSL or RISC-V builtin">;
 
 // called-once attribute diagnostics.
 def err_called_once_attribute_wrong_type : Error<
@@ -4256,14 +4389,15 @@ def err_void_param_qualified : Error<
   "'void' as parameter must not have type qualifiers">;
 def err_ident_list_in_fn_declaration : Error<
   "a parameter list without types is only allowed in a function definition">;
-def ext_param_not_declared : Extension<
-  "parameter %0 was not declared, defaulting to type 'int'">;
+def ext_param_not_declared : ExtWarn<
+  "parameter %0 was not declared, defaults to 'int'; ISO C99 and later do not "
+  "support implicit int">, InGroup<ImplicitInt>;
 def err_param_default_argument : Error<
   "C does not support default arguments">;
 def err_param_default_argument_redefinition : Error<
   "redefinition of default argument">;
 def ext_param_default_argument_redefinition : ExtWarn<
-  err_param_default_argument_redefinition.Text>,
+  err_param_default_argument_redefinition.Summary>,
   InGroup<MicrosoftDefaultArgRedefinition>;
 def err_param_default_argument_missing : Error<
   "missing default argument on parameter">;
@@ -4299,6 +4433,9 @@ def err_uninitialized_member_in_ctor : Error<
 def err_default_arg_makes_ctor_special : Error<
   "addition of default argument on redeclaration makes this constructor a "
   "%select{default|copy|move}0 constructor">;
+def err_stmt_expr_in_default_arg : Error<
+  "default %select{argument|non-type template argument}0 may not use a GNU "
+  "statement expression">;
 
 def err_use_of_default_argument_to_function_declared_later : Error<
   "use of default argument to function %0 that is declared later in class %1">;
@@ -4472,7 +4609,8 @@ def note_ovl_candidate_bad_conv_incomplete : Note<
     "; remove &}7">;
 def note_ovl_candidate_bad_list_argument : Note<
     "candidate %sub{select_ovl_candidate_kind}0,1,2 not viable: "
-    "cannot convert initializer list argument to %4">;
+    "%select{cannot convert initializer list|too few initializers in list"
+    "|too many initializers in list}7 argument to %4">;
 def note_ovl_candidate_bad_overload : Note<
     "candidate %sub{select_ovl_candidate_kind}0,1,2 not viable: "
     "no overload of %4 matching %3 for %ordinal5 argument">;
@@ -4582,6 +4720,8 @@ def ext_ovl_ambiguous_oper_binary_reversed : ExtWarn<
 def note_ovl_ambiguous_oper_binary_reversed_self : Note<
   "ambiguity is between a regular call to this operator and a call with the "
   "argument order reversed">;
+def note_ovl_ambiguous_eqeq_reversed_self_non_const : Note<
+  "mark 'operator==' as const or add a matching 'operator!=' to resolve the ambiguity">;
 def note_ovl_ambiguous_oper_binary_selected_candidate : Note<
   "candidate function with non-reversed arguments">;
 def note_ovl_ambiguous_oper_binary_reversed_candidate : Note<
@@ -4614,11 +4754,17 @@ def err_bound_member_function : Error<
   "reference to non-static member function must be called"
   "%select{|; did you mean to call it with no arguments?}0">;
 def note_possible_target_of_call : Note<"possible target for call">;
+def err_no_viable_destructor : Error<
+  "no viable destructor found for class %0">;
+def err_ambiguous_destructor : Error<
+  "destructor of class %0 is ambiguous">;
 
 def err_ovl_no_viable_object_call : Error<
   "no matching function for call to object of type %0">;
 def err_ovl_ambiguous_object_call : Error<
   "call to object of type %0 is ambiguous">;
+def err_ovl_ambiguous_subscript_call : Error<
+  "call to subscript operator of type %0 is ambiguous">;
 def err_ovl_deleted_object_call : Error<
   "call to deleted function call operator in type %0">;
 def note_ovl_surrogate_cand : Note<"conversion candidate of type %0">;
@@ -4648,7 +4794,7 @@ def err_ovl_no_viable_literal_operator : Error<
 def err_template_param_shadow : Error<
   "declaration of %0 shadows template parameter">;
 def ext_template_param_shadow : ExtWarn<
-  err_template_param_shadow.Text>, InGroup<MicrosoftTemplateShadow>;
+  err_template_param_shadow.Summary>, InGroup<MicrosoftTemplateShadow>;
 def note_template_param_here : Note<"template parameter is declared here">;
 def warn_template_export_unsupported : Warning<
   "exported templates are unsupported">;
@@ -4719,8 +4865,12 @@ def warn_cxx14_compat_template_nontype_parm_auto_type : Warning<
   DefaultIgnore, InGroup<CXXPre17Compat>;
 def err_template_param_default_arg_redefinition : Error<
   "template parameter redefines default argument">;
+def err_template_param_default_arg_inconsistent_redefinition : Error<
+  "template parameter default argument is inconsistent with previous definition">;
 def note_template_param_prev_default_arg : Note<
   "previous default template argument defined here">;
+def note_template_param_prev_default_arg_in_other_module : Note<
+  "previous default template argument defined in module %0">;
 def err_template_param_default_arg_missing : Error<
   "template parameter missing a default argument">;
 def ext_template_parameter_default_in_function_template : ExtWarn<
@@ -4745,6 +4895,7 @@ def warn_cxx11_compat_variable_template : Warning<
 def err_template_variable_noparams : Error<
   "extraneous 'template<>' in declaration of variable %0">;
 def err_template_member : Error<"member %0 declared as a template">;
+def err_member_with_template_arguments : Error<"member %0 cannot have template arguments">;
 def err_template_member_noparams : Error<
   "extraneous 'template<>' in declaration of member %0">;
 def err_template_tag_noparams : Error<
@@ -4759,6 +4910,9 @@ def ext_adl_only_template_id : ExtWarn<
   "use of function template name with no prior declaration in function call "
   "with explicit template arguments is a C++20 extension">, InGroup<CXX20>;
 
+def warn_unqualified_call_to_std_cast_function : Warning<
+  "unqualified call to '%0'">, InGroup<DiagGroup<"unqualified-std-cast-call">>;
+
 // C++ Template Argument Lists
 def err_template_missing_args : Error<
   "use of "
@@ -4888,6 +5042,8 @@ def err_template_arg_not_pointer_to_member_form : Error<
 def err_template_arg_member_ptr_base_derived_not_supported : Error<
   "sorry, non-type template argument of pointer-to-member type %1 that refers "
   "to member %q0 of a different class is not supported yet">;
+def err_template_arg_invalid : Error<
+  "non-type template argument '%0' is invalid">;
 def ext_template_arg_extra_parens : ExtWarn<
   "address non-type template argument cannot be surrounded by parentheses">;
 def warn_cxx98_compat_template_arg_extra_parens : Warning<
@@ -4924,8 +5080,6 @@ def err_template_spec_unknown_kind : Error<
   "class template">;
 def note_specialized_entity : Note<
   "explicitly specialized declaration is here">;
-def note_explicit_specialization_declared_here : Note<
-  "explicit specialization declared here">;
 def err_template_spec_decl_function_scope : Error<
   "explicit specialization of %0 in function scope">;
 def err_template_spec_decl_friend : Error<
@@ -5034,8 +5188,6 @@ def err_partial_spec_ordering_ambiguous : Error<
 def note_partial_spec_match : Note<"partial specialization matches %0">;
 def err_partial_spec_redeclared : Error<
   "class template partial specialization %0 cannot be redeclared">;
-def note_partial_specialization_declared_here : Note<
-  "explicit specialization declared here">;
 def note_prev_partial_spec_here : Note<
   "previous declaration of class template partial specialization %0 is here">;
 def err_partial_spec_fully_specialized : Error<
@@ -5068,6 +5220,8 @@ def err_function_template_partial_spec : Error<
 def err_template_recursion_depth_exceeded : Error<
   "recursive template instantiation exceeded maximum depth of %0">,
   DefaultFatal, NoSFINAE;
+def err_constraint_depends_on_self : Error<
+  "satisfaction of constraint '%0' depends on itself">, NoSFINAE;
 def note_template_recursion_depth : Note<
   "use -ftemplate-depth=N to increase recursive template instantiation depth">;
 
@@ -5104,6 +5258,8 @@ def note_template_exception_spec_instantiation_here : Note<
   "in instantiation of exception specification for %0 requested here">;
 def note_template_requirement_instantiation_here : Note<
   "in instantiation of requirement here">;
+def note_template_requirement_params_instantiation_here : Note<
+  "in instantiation of requirement parameters here">;
 def warn_var_template_missing : Warning<"instantiation of variable %q0 "
   "required here, but no definition is available">,
   InGroup<UndefinedVarTemplate>;
@@ -5263,7 +5419,7 @@ def err_mismatched_exception_spec_explicit_instantiation : Error<
   "exception specification in explicit instantiation does not match "
   "instantiated one">;
 def ext_mismatched_exception_spec_explicit_instantiation : ExtWarn<
-  err_mismatched_exception_spec_explicit_instantiation.Text>,
+  err_mismatched_exception_spec_explicit_instantiation.Summary>,
   InGroup<MicrosoftExceptionSpec>;
 def err_explicit_instantiation_dependent : Error<
   "explicit instantiation has dependent template arguments">;
@@ -5301,6 +5457,12 @@ def err_typename_refers_to_using_value_decl : Error<
   "%0 in %1">;
 def note_using_value_decl_missing_typename : Note<
   "add 'typename' to treat this using declaration as a type">;
+def warn_cxx17_compat_implicit_typename : Warning<"use of implicit 'typename' is "
+  "incompatible with C++ standards before C++20">, InGroup<CXX20Compat>,
+  DefaultIgnore;
+def ext_implicit_typename : ExtWarn<"missing 'typename' prior to dependent "
+  "type name %0%1; implicit 'typename' is a C++20 extension">,
+  InGroup<CXX20>;
 
 def err_template_kw_refers_to_non_template : Error<
   "%0%select{| following the 'template' keyword}1 "
@@ -5417,6 +5579,9 @@ def err_found_later_in_class : Error<"member %0 used before its declaration">;
 def ext_found_later_in_class : ExtWarn<
   "use of member %0 before its declaration is a Microsoft extension">,
   InGroup<MicrosoftTemplate>;
+def ext_unqualified_base_class : ExtWarn<
+  "unqualified base initializer of class templates is a Microsoft extension">,
+  InGroup<MicrosoftTemplate>;
 def note_dependent_member_use : Note<
   "must qualify identifier to find this declaration in dependent base class">;
 def err_not_found_by_two_phase_lookup : Error<"call to function %0 that is neither "
@@ -5444,6 +5609,9 @@ def warn_deprecated_def : Warning<
 def warn_unavailable_def : Warning<
   "implementing unavailable method">,
   InGroup<DeprecatedImplementations>, DefaultIgnore;
+def warn_deprecated_builtin : Warning<
+  "builtin %0 is deprecated; use %1 instead">,
+  InGroup<DeprecatedBuiltins>;
 def err_unavailable : Error<"%0 is unavailable">;
 def err_property_method_unavailable :
     Error<"property access is using %0 method which is unavailable">;
@@ -5467,16 +5635,28 @@ def warn_missing_sentinel : Warning <
   InGroup<Sentinel>;
 def note_sentinel_here : Note<
   "%select{function|method|block}0 has been explicitly marked sentinel here">;
+def warn_strict_uses_without_prototype : Warning<
+  "passing arguments to %select{a function|%1}0 without a prototype is "
+  "deprecated in all versions of C and is not supported in C2x">,
+  InGroup<DeprecatedNonPrototype>;
 def warn_missing_prototype : Warning<
   "no previous prototype for function %0">,
   InGroup<DiagGroup<"missing-prototypes">>, DefaultIgnore;
 def note_declaration_not_a_prototype : Note<
   "this declaration is not a prototype; add %select{'void'|parameter declarations}0 "
   "to make it %select{a prototype for a zero-parameter function|one}0">;
-def warn_strict_prototypes : Warning<
-  "this %select{function declaration is not|block declaration is not|"
-  "old-style function definition is not preceded by}0 a prototype">,
-  InGroup<DiagGroup<"strict-prototypes">>, DefaultIgnore;
+// This is not actually an extension, but we only want it to be enabled in
+// -pedantic mode and this is the most direct way of accomplishing that.
+def warn_strict_prototypes : Extension<
+  "a %select{function|block}0 declaration without a prototype is deprecated "
+  "%select{in all versions of C|}0">, InGroup<StrictPrototypes>;
+def warn_non_prototype_changes_behavior : Warning<
+  "a function %select{declaration|definition}0 without a prototype is "
+  "deprecated in all versions of C %select{and is not supported in C2x|and is "
+  "treated as a zero-parameter prototype in C2x, conflicting with a "
+  "%select{previous|subsequent}2 %select{declaration|definition}3}1">,
+  InGroup<DeprecatedNonPrototype>;
+def note_conflicting_prototype : Note<"conflicting prototype is here">;
 def warn_missing_variable_declarations : Warning<
   "no previous extern declaration for non-static variable %0">,
   InGroup<DiagGroup<"missing-variable-declarations">>, DefaultIgnore;
@@ -5511,6 +5691,12 @@ def err_new_abi_tag_on_redeclaration : Error<
 def note_use_ifdef_guards : Note<
   "unguarded header; consider using #ifdef guards or #pragma once">;
 
+def warn_var_decl_not_read_only : Warning<
+  "object of type %0 cannot be placed in read-only memory">,
+  InGroup<ReadOnlyPlacementChecks>;
+def note_enforce_read_only_placement : Note<"type was declared read-only here">;
+
+
 def note_deleted_dtor_no_operator_delete : Note<
   "virtual destructor requires an unambiguous, accessible 'operator delete'">;
 def note_deleted_special_member_class_subobject : Note<
@@ -5563,8 +5749,8 @@ def warn_undefined_inline : Warning<"inline function %q0 is not defined">,
 def err_undefined_inline_var : Error<"inline variable %q0 is not defined">;
 def note_used_here : Note<"used here">;
 
-def err_internal_linkage_redeclaration : Error<
-  "'internal_linkage' attribute does not appear on the first declaration of %0">;
+def err_attribute_missing_on_first_decl : Error<
+  "%0 attribute does not appear on the first declaration">;
 def warn_internal_linkage_local_storage : Warning<
   "'internal_linkage' attribute on a non-static local variable is ignored">,
   InGroup<IgnoredAttributes>;
@@ -5640,6 +5826,8 @@ def warn_forward_class_redefinition : Warning<
 def err_redefinition_different_typedef : Error<
   "%select{typedef|type alias|type alias template}0 "
   "redefinition with different types%diff{ ($ vs $)|}1,2">;
+def err_redefinition_different_concept : Error<
+  "redefinition of concept %0 with different template parameters or requirements">;
 def err_tag_reference_non_tag : Error<
   "%select{non-struct type|non-class type|non-union type|non-enum "
   "type|typedef|type alias|template|type alias template|template "
@@ -5727,7 +5915,7 @@ def warn_typecheck_function_qualifiers_unspecified : Warning<
   "'%0' qualifier on function type %1 has unspecified behavior">;
 def warn_typecheck_reference_qualifiers : Warning<
   "'%0' qualifier on reference type %1 has no effect">,
-  InGroup<IgnoredQualifiers>;
+  InGroup<IgnoredReferenceQualifiers>;
 def err_typecheck_invalid_restrict_not_pointer : Error<
   "restrict requires a pointer or reference (%0 is invalid)">;
 def err_typecheck_invalid_restrict_not_pointer_noarg : Error<
@@ -5737,7 +5925,7 @@ def err_typecheck_invalid_restrict_invalid_pointee : Error<
 def ext_typecheck_zero_array_size : Extension<
   "zero size arrays are an extension">, InGroup<ZeroLengthArray>;
 def err_typecheck_zero_array_size : Error<
-  "zero-length arrays are not permitted in C++">;
+  "zero-length arrays are not permitted in %select{C++|SYCL device code}0">;
 def err_array_size_non_int : Error<"size of array has non-integer type %0">;
 def err_init_element_not_constant : Error<
   "initializer element is not a compile-time constant">;
@@ -5757,7 +5945,7 @@ def err_loader_uninitialized_extern_decl
     : Error<"variable %0 cannot be declared both 'extern' and with the "
             "'loader_uninitialized' attribute">;
 def err_block_extern_cant_init : Error<
-  "'extern' variable cannot have an initializer">;
+  "declaration of block scope identifier with linkage cannot have an initializer">;
 def warn_extern_init : Warning<"'extern' variable has an initializer">,
   InGroup<DiagGroup<"extern-initializer">>;
 def err_variable_object_no_init : Error<
@@ -5778,7 +5966,7 @@ def ext_excess_initializers_in_char_array_initializer : ExtWarn<
   "excess elements in char array initializer">,
   InGroup<ExcessInitializers>;
 def err_initializer_string_for_char_array_too_long : Error<
-  "initializer-string for char array is too long">;
+  "initializer-string for char array is too long, array size is %0 but initializer has size %1 (including the null terminating character)">;
 def ext_initializer_string_for_char_array_too_long : ExtWarn<
   "initializer-string for char array is too long">,
   InGroup<ExcessInitializers>;
@@ -5926,6 +6114,8 @@ def note_protected_by_vla_type_alias : Note<
   "jump bypasses initialization of VLA type alias">;
 def note_protected_by_constexpr_if : Note<
   "jump enters controlled statement of constexpr if">;
+def note_protected_by_consteval_if : Note<
+  "jump enters controlled statement of consteval if">;
 def note_protected_by_if_available : Note<
   "jump enters controlled statement of if available">;
 def note_protected_by_vla : Note<
@@ -6353,6 +6543,9 @@ def err_atomic_specifier_bad_type
             "%select{incomplete |array |function |reference |atomic |qualified "
             "|sizeless ||integer }0type "
             "%1 %select{|||||||which is not trivially copyable|}0">;
+def warn_atomic_member_access : Warning<
+  "accessing a member of an atomic structure or union is undefined behavior">,
+  InGroup<DiagGroup<"atomic-access">>, DefaultError;
 
 // Expressions.
 def ext_sizeof_alignof_function_type : Extension<
@@ -6368,7 +6561,8 @@ def err_sizeof_alignof_function_type : Error<
 def err_openmp_default_simd_align_expr : Error<
   "invalid application of '__builtin_omp_required_simd_align' to an expression, only type is allowed">;
 def err_sizeof_alignof_typeof_bitfield : Error<
-  "invalid application of '%select{sizeof|alignof|typeof}0' to bit-field">;
+  "invalid application of '%select{sizeof|alignof|typeof|typeof_unqual}0' to "
+  "bit-field">;
 def err_alignof_member_of_incomplete_type : Error<
   "invalid application of 'alignof' to a field of a class still being defined">;
 def err_vecstep_non_scalar_vector_type : Error<
@@ -6391,22 +6585,21 @@ def warn_sub_ptr_zero_size_types : Warning<
 def warn_pointer_arith_null_ptr : Warning<
   "performing pointer arithmetic on a null pointer has undefined behavior%select{| if the offset is nonzero}0">,
   InGroup<NullPointerArithmetic>, DefaultIgnore;
-def warn_gnu_null_ptr_arith : Warning<
+def warn_gnu_null_ptr_arith : Extension<
   "arithmetic on a null pointer treated as a cast from integer to pointer is a GNU extension">,
-  InGroup<NullPointerArithmetic>, DefaultIgnore;
+  InGroup<GNUNullPointerArithmetic>;
 def warn_pointer_sub_null_ptr : Warning<
   "performing pointer subtraction with a null pointer %select{has|may have}0 undefined behavior">,
   InGroup<NullPointerSubtraction>, DefaultIgnore;
-def err_kernel_invalidates_sycl_unique_stable_name
-    : Error<"kernel instantiation changes the result of an evaluated "
-            "'__builtin_sycl_unique_stable_name'">;
-def note_sycl_unique_stable_name_evaluated_here
-    : Note<"'__builtin_sycl_unique_stable_name' evaluated here">;
 
 def warn_floatingpoint_eq : Warning<
   "comparing floating point with == or != is unsafe">,
   InGroup<DiagGroup<"float-equal">>, DefaultIgnore;
 
+def err_setting_eval_method_used_in_unsafe_context : Error <
+  "%select{'#pragma clang fp eval_method'|option 'ffp-eval-method'}0 cannot be used with "
+  "%select{option 'fapprox-func'|option 'mreassociate'|option 'freciprocal'|option 'ffp-eval-method'|'#pragma clang fp reassociate'}1">;
+
 def warn_remainder_division_by_zero : Warning<
   "%select{remainder|division}0 by zero is undefined">,
   InGroup<DivZero>;
@@ -6476,15 +6669,27 @@ def warn_addition_in_bitshift : Warning<
   "'%1' will be evaluated first">, InGroup<ShiftOpParentheses>;
 
 def warn_self_assignment_builtin : Warning<
-  "explicitly assigning value of variable of type %0 to itself">,
+  "explicitly assigning value of variable of type %0 to itself%select{|; did "
+  "you mean to assign to member %2?}1">,
   InGroup<SelfAssignment>, DefaultIgnore;
 def warn_self_assignment_overloaded : Warning<
-  "explicitly assigning value of variable of type %0 to itself">,
+  "explicitly assigning value of variable of type %0 to itself%select{|; did "
+  "you mean to assign to member %2?}1">,
   InGroup<SelfAssignmentOverloaded>, DefaultIgnore;
 def warn_self_move : Warning<
-  "explicitly moving variable of type %0 to itself">,
+  "explicitly moving variable of type %0 to itself%select{|; did you mean to "
+  "move to member %2?}1">,
   InGroup<SelfMove>, DefaultIgnore;
 
+def err_builtin_move_forward_unsupported : Error<
+  "unsupported signature for %q0">;
+def err_use_of_unaddressable_function : Error<
+  "taking address of non-addressable standard library function">;
+// FIXME: This should also be in -Wc++23-compat once we have it.
+def warn_cxx20_compat_use_of_unaddressable_function : Warning<
+  "taking address of non-addressable standard library function "
+  "is incompatible with C++20">, InGroup<CXX20Compat>;
+
 def warn_redundant_move_on_return : Warning<
   "redundant move in return statement">,
   InGroup<RedundantMove>, DefaultIgnore;
@@ -6527,7 +6732,8 @@ def err_arithmetic_nonfragile_interface : Error<
   "this architecture and platform">;
 
 def warn_deprecated_comma_subscript : Warning<
-  "top-level comma expression in array subscript is deprecated">,
+  "top-level comma expression in array subscript is deprecated "
+  "in C++20 and unsupported in C++2b">,
   InGroup<DeprecatedCommaSubscript>;
 
 def ext_subscript_non_lvalue : Extension<
@@ -6540,10 +6746,13 @@ def err_subscript_function_type : Error<
   "subscript of pointer to function type %0">;
 def err_subscript_incomplete_or_sizeless_type : Error<
   "subscript of pointer to %select{incomplete|sizeless}0 type %1">;
+def err_subscript_svbool_t : Error<
+  "subscript of svbool_t is not allowed">;
 def err_dereference_incomplete_type : Error<
   "dereference of pointer to incomplete type %0">;
 def ext_gnu_subscript_void_type : Extension<
-  "subscript of a pointer to void is a GNU extension">, InGroup<PointerArith>;
+  "subscript of a pointer to void is a GNU extension">,
+  InGroup<GNUPointerArith>;
 def err_typecheck_member_reference_struct_union : Error<
   "member reference base type %0 is not a structure or union">;
 def err_typecheck_member_reference_ivar : Error<
@@ -6624,7 +6833,7 @@ def ext_out_of_line_declaration : ExtWarn<
 def err_member_extra_qualification : Error<
   "extra qualification on member %0">;
 def warn_member_extra_qualification : Warning<
-  err_member_extra_qualification.Text>, InGroup<MicrosoftExtraQualification>;
+  err_member_extra_qualification.Summary>, InGroup<MicrosoftExtraQualification>;
 def warn_namespace_member_extra_qualification : Warning<
   "extra qualification on member %0">,
   InGroup<DiagGroup<"extra-qualification">>;
@@ -6682,8 +6891,8 @@ def err_array_init_plain_string_into_char8_t : Error<
 def note_array_init_plain_string_into_char8_t : Note<
   "add 'u8' prefix to form a 'char8_t' string literal">;
 def err_array_init_utf8_string_into_char : Error<
-  "%select{|ISO C++20 does not permit }0initialization of char array with "
-  "UTF-8 string literal%select{ is not permitted by '-fchar8_t'|}0">;
+  "initialization of %select{|signed }0char array with "
+  "UTF-8 string literal is not permitted by %select{'-fchar8_t'|C++20}1">;
 def warn_cxx20_compat_utf8_string : Warning<
   "type of UTF-8 string literal will change from array of const char to "
   "array of const char8_t in C++20">, InGroup<CXX20Compat>, DefaultIgnore;
@@ -6752,8 +6961,11 @@ def err_typecheck_unary_expr : Error<
 def err_typecheck_indirection_requires_pointer : Error<
   "indirection requires pointer operand (%0 invalid)">;
 def ext_typecheck_indirection_through_void_pointer : ExtWarn<
-  "ISO C++ does not allow indirection on operand of type %0">,
-  InGroup<DiagGroup<"void-ptr-dereference">>;
+  "ISO C does not allow indirection on operand of type %0">,
+  InGroup<VoidPointerDeref>;
+def ext_typecheck_indirection_through_void_pointer_cpp
+    : ExtWarn<"ISO C++ does not allow indirection on operand of type %0">,
+      InGroup<VoidPointerDeref>, DefaultError, SFINAEFailure;
 def warn_indirection_through_null : Warning<
   "indirection of non-volatile null pointer will be deleted, not trap">,
   InGroup<NullDereference>;
@@ -6770,7 +6982,7 @@ def warn_taking_address_of_packed_member : Warning<
   "taking address of packed member %0 of class or structure %q1 may result in an unaligned pointer value">,
   InGroup<DiagGroup<"address-of-packed-member">>, DefaultIgnore;
 def warn_param_mismatched_alignment : Warning<
-  "passing %0-byte aligned argument to %1-byte aligned parameter %2 of %3 may result in an unaligned pointer access">,
+  "passing %0-byte aligned argument to %1-byte aligned parameter %2%select{| of %4}3 may result in an unaligned pointer access">,
   InGroup<DiagGroup<"align-mismatch">>;
 
 def err_objc_object_assignment : Error<
@@ -6857,22 +7069,22 @@ def warn_arith_conv_mixed_enum_types_cxx20 : Warning<
   "different enumeration types%diff{ ($ and $)|}1,2 is deprecated">,
   InGroup<DeprecatedEnumEnumConversion>;
 def warn_arith_conv_mixed_anon_enum_types : Warning<
-  warn_arith_conv_mixed_enum_types.Text>,
+  warn_arith_conv_mixed_enum_types.Summary>,
   InGroup<AnonEnumEnumConversion>, DefaultIgnore;
 def warn_arith_conv_mixed_anon_enum_types_cxx20 : Warning<
-  warn_arith_conv_mixed_enum_types_cxx20.Text>,
+  warn_arith_conv_mixed_enum_types_cxx20.Summary>,
   InGroup<DeprecatedAnonEnumEnumConversion>;
 def warn_conditional_mixed_enum_types : Warning<
-  warn_arith_conv_mixed_enum_types.Text>,
+  warn_arith_conv_mixed_enum_types.Summary>,
   InGroup<EnumCompareConditional>, DefaultIgnore;
 def warn_conditional_mixed_enum_types_cxx20 : Warning<
-  warn_arith_conv_mixed_enum_types_cxx20.Text>,
+  warn_arith_conv_mixed_enum_types_cxx20.Summary>,
   InGroup<DeprecatedEnumCompareConditional>;
 def warn_comparison_mixed_enum_types : Warning<
-  warn_arith_conv_mixed_enum_types.Text>,
+  warn_arith_conv_mixed_enum_types.Summary>,
   InGroup<EnumCompare>;
 def warn_comparison_mixed_enum_types_cxx20 : Warning<
-  warn_arith_conv_mixed_enum_types_cxx20.Text>,
+  warn_arith_conv_mixed_enum_types_cxx20.Summary>,
   InGroup<DeprecatedEnumCompare>;
 def warn_comparison_of_mixed_enum_types_switch : Warning<
   "comparison of different enumeration types in switch statement"
@@ -6932,7 +7144,7 @@ def warn_out_of_range_compare : Warning<
   "result of comparison of %select{constant %0|true|false}1 with "
   "%select{expression of type %2|boolean expression}3 is always %4">,
   InGroup<TautologicalOutOfRangeCompare>;
-def warn_tautological_bool_compare : Warning<warn_out_of_range_compare.Text>,
+def warn_tautological_bool_compare : Warning<warn_out_of_range_compare.Summary>,
   InGroup<TautologicalConstantCompare>;
 def warn_integer_constants_in_conditional_always_true : Warning<
   "converting the result of '?:' with integer constants to a boolean always "
@@ -7064,11 +7276,11 @@ def err_duplicate_property : Error<
   "property has a previous declaration">;
 def ext_gnu_void_ptr : Extension<
   "arithmetic on%select{ a|}0 pointer%select{|s}0 to void is a GNU extension">,
-  InGroup<PointerArith>;
+  InGroup<GNUPointerArith>;
 def ext_gnu_ptr_func_arith : Extension<
   "arithmetic on%select{ a|}0 pointer%select{|s}0 to%select{ the|}2 function "
   "type%select{|s}2 %1%select{| and %3}2 is a GNU extension">,
-  InGroup<PointerArith>;
+  InGroup<GNUPointerArith>;
 def err_readonly_message_assignment : Error<
   "assigning to 'readonly' return result of an Objective-C message not allowed">;
 def ext_integer_increment_complex : Extension<
@@ -7314,8 +7526,6 @@ def err_bad_dynamic_cast_not_polymorphic : Error<"%0 is not polymorphic">;
 // Other C++ expressions
 def err_need_header_before_typeid : Error<
   "you need to include <typeinfo> before using the 'typeid' operator">;
-def err_need_header_before_ms_uuidof : Error<
-  "you need to include <guiddef.h> before using the '__uuidof' operator">;
 def err_need_header_before_placement_new : Error<
   "no matching %0 function for non-allocating placement new expression; "
   "include <new>">;
@@ -7413,10 +7623,13 @@ def note_member_declared_here : Note<
   "member %0 declared here">;
 def note_member_first_declared_here : Note<
   "member %0 first declared here">;
+def warn_bitwise_instead_of_logical : Warning<
+  "use of bitwise '%0' with boolean operands">,
+  InGroup<BitwiseInsteadOfLogical>, DefaultIgnore;
 def warn_bitwise_negation_bool : Warning<
   "bitwise negation of a boolean expression%select{;| always evaluates to 'true';}0 "
   "did you mean logical negation?">,
-  InGroup<DiagGroup<"bool-operation">>;
+  InGroup<BoolOperation>, DefaultIgnore;
 def err_decrement_bool : Error<"cannot decrement expression of type bool">;
 def warn_increment_bool : Warning<
   "incrementing expression of type bool is deprecated and "
@@ -7433,9 +7646,6 @@ def warn_deprecated_increment_decrement_volatile : Warning<
 def warn_deprecated_simple_assign_volatile : Warning<
   "use of result of assignment to object of volatile-qualified type %0 "
   "is deprecated">, InGroup<DeprecatedVolatile>;
-def warn_deprecated_compound_assign_volatile : Warning<
-  "compound assignment to object of volatile-qualified type %0 is deprecated">,
-  InGroup<DeprecatedVolatile>;
 def warn_deprecated_volatile_return : Warning<
   "volatile-qualified return type %0 is deprecated">,
   InGroup<DeprecatedVolatile>;
@@ -7452,6 +7662,12 @@ def warn_deprecated_altivec_src_compat : Warning<
   "'-altivec-compat=xl' option">,
   InGroup<DiagGroup<"deprecated-altivec-src-compat">>;
 
+def warn_deprecated_lax_vec_conv_all : Warning<
+  "Implicit conversion between vector types ('%0' and '%1') is deprecated. "
+  "In the future, the behavior implied by '-fno-lax-vector-conversions' "
+  "will be the default.">,
+  InGroup<DiagGroup<"deprecate-lax-vec-conv-all">>;
+
 def err_catch_incomplete_ptr : Error<
   "cannot catch pointer to incomplete type %0">;
 def err_catch_incomplete_ref : Error<
@@ -7490,7 +7706,8 @@ def note_throw_in_function : Note<"function declared non-throwing here">;
 def err_seh_try_outside_functions : Error<
   "cannot use SEH '__try' in blocks, captured regions, or Obj-C method decls">;
 def err_mixing_cxx_try_seh_try : Error<
-  "cannot use C++ 'try' in the same function as SEH '__try'">;
+  "cannot use %select{C++ 'try'|Objective-C '@try'}0 "
+  "in the same function as SEH '__try'">;
 def err_seh_try_unsupported : Error<
   "SEH '__try' is not supported on this target">;
 def note_conflicting_try_here : Note<
@@ -7528,6 +7745,8 @@ def warn_overaligned_type : Warning<
   "type %0 requires %1 bytes of alignment and the default allocator only "
   "guarantees %2 bytes">,
   InGroup<OveralignedType>, DefaultIgnore;
+def err_array_element_alignment : Error<
+  "size of array element of type %0 (%1 bytes) isn't a multiple of its alignment (%2 bytes)">;
 def err_aligned_allocation_unavailable : Error<
   "aligned %select{allocation|deallocation}0 function of type '%1' is "
   "%select{only|not}4 available on %2%select{ %3 or newer|}4">;
@@ -7755,6 +7974,11 @@ def err_expected_class_or_namespace : Error<"%0 is not a class"
   "%select{ or namespace|, namespace, or enumeration}1">;
 def err_invalid_declarator_scope : Error<"cannot define or redeclare %0 here "
   "because namespace %1 does not enclose namespace %2">;
+def err_export_non_namespace_scope_name : Error<
+  "cannot export %0 as it is not at namespace scope">;
+def err_redeclaration_non_exported : Error <
+  "cannot export redeclaration %0 here since the previous declaration "
+  "%select{is not exported|has internal linkage|has module linkage}1">;
 def err_invalid_declarator_global_scope : Error<
   "definition or redeclaration of %0 cannot name the global scope">;
 def err_invalid_declarator_in_function : Error<
@@ -7870,24 +8094,6 @@ def err_incompatible_qualified_id : Error<
   "sending type to parameter of incompatible type}0,1"
   "|%diff{casting $ to incompatible type $|"
   "casting type to incompatible type}0,1}2">;
-def ext_typecheck_convert_pointer_int : ExtWarn<
-  "incompatible pointer to integer conversion "
-  "%select{%diff{assigning to $ from $|assigning to different types}0,1"
-  "|%diff{passing $ to parameter of type $|"
-  "passing to parameter of different type}0,1"
-  "|%diff{returning $ from a function with result type $|"
-  "returning from function with different return type}0,1"
-  "|%diff{converting $ to type $|converting between types}0,1"
-  "|%diff{initializing $ with an expression of type $|"
-  "initializing with expression of different type}0,1"
-  "|%diff{sending $ to parameter of type $|"
-  "sending to parameter of different type}0,1"
-  "|%diff{casting $ to type $|casting between types}0,1}2"
-  "%select{|; dereference with *|"
-  "; take the address with &|"
-  "; remove *|"
-  "; remove &}3">,
-  InGroup<IntConversion>;
 def err_typecheck_convert_pointer_int : Error<
   "incompatible pointer to integer conversion "
   "%select{%diff{assigning to $ from $|assigning to different types}0,1"
@@ -7905,24 +8111,9 @@ def err_typecheck_convert_pointer_int : Error<
   "; take the address with &|"
   "; remove *|"
   "; remove &}3">;
-def ext_typecheck_convert_int_pointer : ExtWarn<
-  "incompatible integer to pointer conversion "
-  "%select{%diff{assigning to $ from $|assigning to different types}0,1"
-  "|%diff{passing $ to parameter of type $|"
-  "passing to parameter of different type}0,1"
-  "|%diff{returning $ from a function with result type $|"
-  "returning from function with different return type}0,1"
-  "|%diff{converting $ to type $|converting between types}0,1"
-  "|%diff{initializing $ with an expression of type $|"
-  "initializing with expression of different type}0,1"
-  "|%diff{sending $ to parameter of type $|"
-  "sending to parameter of different type}0,1"
-  "|%diff{casting $ to type $|casting between types}0,1}2"
-  "%select{|; dereference with *|"
-  "; take the address with &|"
-  "; remove *|"
-  "; remove &}3">,
-  InGroup<IntConversion>, SFINAEFailure;
+def ext_typecheck_convert_pointer_int : ExtWarn<
+  err_typecheck_convert_pointer_int.Summary>,
+  InGroup<IntConversion>, DefaultError;
 def err_typecheck_convert_int_pointer : Error<
   "incompatible integer to pointer conversion "
   "%select{%diff{assigning to $ from $|assigning to different types}0,1"
@@ -7940,6 +8131,9 @@ def err_typecheck_convert_int_pointer : Error<
   "; take the address with &|"
   "; remove *|"
   "; remove &}3">;
+def ext_typecheck_convert_int_pointer : ExtWarn<
+  err_typecheck_convert_int_pointer.Summary>,
+  InGroup<IntConversion>, DefaultError;
 def ext_typecheck_convert_pointer_void_func : Extension<
   "%select{%diff{assigning to $ from $|assigning to different types}0,1"
   "|%diff{passing $ to parameter of type $|"
@@ -7982,7 +8176,7 @@ def ext_typecheck_convert_incompatible_pointer_sign : ExtWarn<
   "where one is of the unique plain 'char' type and the other is not}3">,
   InGroup<DiagGroup<"pointer-sign">>, DefaultIgnore;
 def err_typecheck_convert_incompatible_pointer_sign :
-  Error<ext_typecheck_convert_incompatible_pointer_sign.Text>;
+  Error<ext_typecheck_convert_incompatible_pointer_sign.Summary>;
 def ext_typecheck_convert_incompatible_pointer : ExtWarn<
   "incompatible pointer types "
   "%select{%diff{assigning to $ from $|assigning to different types}0,1"
@@ -8018,24 +8212,6 @@ def err_typecheck_convert_incompatible_pointer : Error<
   "; take the address with &|"
   "; remove *|"
   "; remove &}3">;
-def ext_typecheck_convert_incompatible_function_pointer : ExtWarn<
-  "incompatible function pointer types "
-  "%select{%diff{assigning to $ from $|assigning to different types}0,1"
-  "|%diff{passing $ to parameter of type $|"
-  "passing to parameter of different type}0,1"
-  "|%diff{returning $ from a function with result type $|"
-  "returning from function with different return type}0,1"
-  "|%diff{converting $ to type $|converting between types}0,1"
-  "|%diff{initializing $ with an expression of type $|"
-  "initializing with expression of different type}0,1"
-  "|%diff{sending $ to parameter of type $|"
-  "sending to parameter of different type}0,1"
-  "|%diff{casting $ to type $|casting between types}0,1}2"
-  "%select{|; dereference with *|"
-  "; take the address with &|"
-  "; remove *|"
-  "; remove &}3">,
-  InGroup<IncompatibleFunctionPointerTypes>;
 def err_typecheck_convert_incompatible_function_pointer : Error<
   "incompatible function pointer types "
   "%select{%diff{assigning to $ from $|assigning to different types}0,1"
@@ -8053,6 +8229,12 @@ def err_typecheck_convert_incompatible_function_pointer : Error<
   "; take the address with &|"
   "; remove *|"
   "; remove &}3">;
+def ext_typecheck_convert_incompatible_function_pointer : ExtWarn<
+  err_typecheck_convert_incompatible_function_pointer.Summary>,
+  InGroup<IncompatibleFunctionPointerTypes>;
+def warn_typecheck_convert_incompatible_function_pointer_strict : Warning<
+  err_typecheck_convert_incompatible_function_pointer.Summary>,
+  InGroup<DiagGroup<"incompatible-function-pointer-types-strict">>, DefaultIgnore;
 def ext_typecheck_convert_discards_qualifiers : ExtWarn<
   "%select{%diff{assigning to $ from $|assigning to different types}0,1"
   "|%diff{passing $ to parameter of type $|"
@@ -8302,8 +8484,8 @@ def err_atomic_exclusive_builtin_pointer_size : Error<
   " 1,2,4 or 8 byte type (%0 invalid)">;
 def err_atomic_builtin_ext_int_size : Error<
   "Atomic memory operand must have a power-of-two size">;
-def err_atomic_builtin_ext_int_prohibit : Error<
-  "argument to atomic builtin of type '_ExtInt' is not supported">;
+def err_atomic_builtin_bit_int_prohibit : Error<
+  "argument to atomic builtin of type '_BitInt' is not supported">;
 def err_atomic_op_needs_atomic : Error<
   "address argument to atomic operation must be a pointer to _Atomic "
   "type (%0 invalid)">;
@@ -8339,9 +8521,15 @@ def err_overflow_builtin_must_be_int : Error<
 def err_overflow_builtin_must_be_ptr_int : Error<
   "result argument to overflow builtin must be a pointer "
   "to a non-const integer (%0 invalid)">;
-def err_overflow_builtin_ext_int_max_size : Error<
-  "__builtin_mul_overflow does not support signed _ExtInt operands of more "
+def err_overflow_builtin_bit_int_max_size : Error<
+  "__builtin_mul_overflow does not support 'signed _BitInt' operands of more "
   "than %0 bits">;
+def err_expected_struct_pointer_argument : Error<
+  "expected pointer to struct as %ordinal0 argument to %1, found %2">;
+def err_expected_callable_argument : Error<
+  "expected a callable expression as %ordinal0 argument to %1, found %2">;
+def note_building_builtin_dump_struct_call : Note<
+  "in call to printing function with arguments '(%0)' while dumping struct">;
 
 def err_atomic_load_store_uses_lib : Error<
   "atomic %select{load|store}0 requires runtime support that is not "
@@ -8380,8 +8568,10 @@ def err_ref_bad_target_global_initializer : Error<
   "function %1 in global initializer">;
 def err_capture_bad_target : Error<
   "capture host variable %0 by reference in device or host device lambda function">;
-def err_capture_bad_target_this_ptr : Error<
-  "capture host side class data member by this pointer in device or host device lambda function">;
+def warn_maybe_capture_bad_target_this_ptr : Warning<
+  "capture host side class data member by this pointer in device or host device lambda function "
+  "may result in invalid memory access if this pointer is not accessible on device side">,
+  InGroup<DiagGroup<"gpu-maybe-wrong-side">>;
 def warn_kern_is_method : Extension<
   "kernel function %0 is a member function; this may not be accepted by nvcc">,
   InGroup<CudaCompat>;
@@ -8527,8 +8717,13 @@ def warn_bad_function_cast : Warning<
 def warn_cast_function_type : Warning<
   "cast %diff{from $ to $ |}0,1converts to incompatible function type">,
   InGroup<CastFunctionType>, DefaultIgnore;
+def warn_cast_function_type_strict : Warning<warn_cast_function_type.Summary>,
+  InGroup<CastFunctionTypeStrict>, DefaultIgnore;
 def err_cast_pointer_to_non_pointer_int : Error<
   "pointer cannot be cast to type %0">;
+def err_nullptr_cast : Error<
+  "cannot cast an object of type %select{'nullptr_t' to %1|%1 to 'nullptr_t'}0"
+>;
 def err_cast_to_bfloat16 : Error<"cannot type-cast to __bf16">;
 def err_cast_from_bfloat16 : Error<"cannot type-cast from __bf16">;
 def err_typecheck_expect_scalar_operand : Error<
@@ -8540,6 +8735,10 @@ def err_typecheck_expect_flt_or_vector : Error<
   "a vector of such types is required">;
 def err_cast_selector_expr : Error<
   "cannot type cast @selector expression">;
+def err_make_signed_integral_only : Error<
+  "'%select{make_unsigned|make_signed}0' is only compatible with "
+  "non-%select{bool|_BitInt(1)}1 integers and enum types, but was given "
+  "%2%select{| whose underlying type is %4}3">;
 def ext_typecheck_cond_incompatible_pointers : ExtWarn<
   "pointer type mismatch%diff{ ($ and $)|}0,1">,
   InGroup<DiagGroup<"pointer-type-mismatch">>;
@@ -8551,6 +8750,9 @@ def err_typecheck_choose_expr_requires_constant : Error<
   "'__builtin_choose_expr' requires a constant expression">;
 def warn_unused_expr : Warning<"expression result unused">,
   InGroup<UnusedValue>;
+def warn_unused_comma_left_operand : Warning<
+  "left operand of comma operator has no effect">,
+  InGroup<UnusedValue>;
 def warn_unused_voidptr : Warning<
   "expression result unused; should this cast be to 'void'?">,
   InGroup<UnusedValue>;
@@ -8581,16 +8783,20 @@ def warn_unused_result : Warning<
 def warn_unused_result_msg : Warning<
   "ignoring return value of function declared with %0 attribute: %1">,
   InGroup<UnusedResult>;
+def warn_unused_result_typedef_unsupported_spelling : Warning<
+  "'[[%select{nodiscard|gnu::warn_unused_result}0]]' attribute ignored when "
+  "applied to a typedef; consider using '__attribute__((warn_unused_result))' "
+  "or '[[clang::warn_unused_result]]' instead">, InGroup<IgnoredAttributes>;
 def warn_unused_volatile : Warning<
   "expression result unused; assign into a variable to force a volatile load">,
   InGroup<DiagGroup<"unused-volatile-lvalue">>;
 
 def ext_cxx14_attr : Extension<
-  "use of the %0 attribute is a C++14 extension">, InGroup<CXX14>;
+  "use of the %0 attribute is a C++14 extension">, InGroup<CXX14Attrs>;
 def ext_cxx17_attr : Extension<
-  "use of the %0 attribute is a C++17 extension">, InGroup<CXX17>;
+  "use of the %0 attribute is a C++17 extension">, InGroup<CXX17Attrs>;
 def ext_cxx20_attr : Extension<
-  "use of the %0 attribute is a C++20 extension">, InGroup<CXX20>;
+  "use of the %0 attribute is a C++20 extension">, InGroup<CXX20Attrs>;
 
 def warn_unused_comparison : Warning<
   "%select{equality|inequality|relational|three-way}0 comparison result unused">,
@@ -8654,6 +8860,9 @@ def warn_redefine_extname_not_applied : Warning<
 
 // inline asm.
 let CategoryName = "Inline Assembly Issue" in {
+  def err_asm_pmf_through_constraint_not_permitted
+    : Error<"cannot pass a pointer-to-member through register-constrained "
+            "inline assembly parameter">;
   def err_asm_invalid_lvalue_in_output : Error<"invalid lvalue in asm output">;
   def err_asm_invalid_output_constraint : Error<
     "invalid output constraint '%0' in asm">;
@@ -8688,6 +8897,8 @@ let CategoryName = "Inline Assembly Issue" in {
     " in asm %select{input|output}1 with a memory constraint '%2'">;
   def err_asm_input_duplicate_match : Error<
     "more than one input constraint matches the same output '%0'">;
+  def err_store_value_to_reg : Error<
+    "impossible constraint in asm: can't store value into a register">;
 
   def warn_asm_label_on_auto_decl : Warning<
     "ignored asm label '%0' on automatic variable">;
@@ -8857,6 +9068,14 @@ def ext_ms_anonymous_record : ExtWarn<
 def err_reference_to_local_in_enclosing_context : Error<
   "reference to local %select{variable|binding}1 %0 declared in enclosing "
   "%select{%3|block literal|lambda expression|context}2">;
+def err_capture_binding_openmp : Error<
+  "capturing a structured binding is not yet supported in OpenMP">;
+def ext_capture_binding : ExtWarn<
+  "captured structured bindings are a C++20 extension">, InGroup<CXX20>;
+def warn_cxx17_compat_capture_binding : Warning<
+  "captured structured bindings are incompatible with "
+  "C++ standards before C++20">,
+  InGroup<CXXPre20Compat>, DefaultIgnore;
 
 def err_static_data_member_not_allowed_in_local_class : Error<
   "static data member %0 not allowed in local %sub{select_tag_type_kind}2 %1">;
@@ -8910,10 +9129,22 @@ def err_operator_overload_needs_class_or_enum : Error<
   "or enumeration type">;
 
 def err_operator_overload_variadic : Error<"overloaded %0 cannot be variadic">;
+def warn_cxx20_compat_operator_overload_static : Warning<
+  "declaring overloaded %0 as 'static' is incompatible with C++ standards "
+  "before C++2b">, InGroup<CXXPre2bCompat>, DefaultIgnore;
+def ext_operator_overload_static : ExtWarn<
+  "declaring overloaded %0 as 'static' is a C++2b extension">, InGroup<CXX2b>;
 def err_operator_overload_static : Error<
   "overloaded %0 cannot be a static member function">;
 def err_operator_overload_default_arg : Error<
   "parameter of overloaded %0 cannot have a default argument">;
+
+def ext_subscript_overload : Warning<
+  "overloaded %0 with %select{no|a defaulted|more than one}1 parameter is a "
+  "C++2b extension">, InGroup<CXXPre2bCompat>, DefaultIgnore;
+def error_subscript_overload : Error<
+  "overloaded %0 cannot have %select{no|a defaulted|more than one}1 parameter before C++2b">;
+
 def err_operator_overload_must_be : Error<
   "overloaded %0 must be a %select{unary|binary|unary or binary}2 operator "
   "(has %1 parameter%s1)">;
@@ -9071,6 +9302,8 @@ def err_incorrect_defaulted_consteval : Error<
 def warn_defaulted_method_deleted : Warning<
   "explicitly defaulted %sub{select_special_member_kind}0 is implicitly "
   "deleted">, InGroup<DefaultedFunctionDeleted>;
+def note_replace_equals_default_to_delete : Note<
+  "replace 'default' with 'delete'">;
 def err_out_of_line_default_deletes : Error<
   "defaulting this %sub{select_special_member_kind}0 "
   "would delete it after its first declaration">;
@@ -9132,6 +9365,9 @@ def err_non_first_default_compare_deletes : Error<
   "defaulting %select{this %sub{select_defaulted_comparison_kind}1|"
   "the corresponding implicit 'operator==' for this defaulted 'operator<=>'}0 "
   "would delete it after its first declaration">;
+def err_non_first_default_compare_in_class : Error<
+  "defaulting this %sub{select_defaulted_comparison_kind}0 "
+  "is not allowed because it was already declared outside the class">;
 def note_defaulted_comparison_union : Note<
   "defaulted %0 is implicitly deleted because "
   "%2 is a %select{union-like class|union}1 with variant members">;
@@ -9149,14 +9385,18 @@ def note_defaulted_comparison_calls_deleted : Note<
   "defaulted %0 is implicitly deleted because it would invoke a deleted "
   "comparison function%select{| for member %2| for base class %2}1">;
 def note_defaulted_comparison_no_viable_function : Note<
-  "defaulted %0 is implicitly deleted because there is no viable three-way "
-  "comparison function for%select{| member| base class}1 %2">;
+  "defaulted %0 is implicitly deleted because there is no viable "
+  "%select{three-way comparison function|'operator=='}1 for "
+  "%select{|member |base class }2%3">;
 def note_defaulted_comparison_no_viable_function_synthesized : Note<
   "three-way comparison cannot be synthesized because there is no viable "
   "function for %select{'=='|'<'}0 comparison">;
 def note_defaulted_comparison_not_rewritten_callee : Note<
   "defaulted %0 is implicitly deleted because this non-rewritten comparison "
   "function would be the best match for the comparison">;
+def note_defaulted_comparison_not_rewritten_conversion : Note<
+  "defaulted %0 is implicitly deleted because a builtin comparison function "
+  "using this conversion would be the best match for the comparison">;
 def note_defaulted_comparison_cannot_deduce : Note<
   "return type of defaulted 'operator<=>' cannot be deduced because "
   "return type %2 of three-way comparison for %select{|member|base class}0 %1 "
@@ -9193,15 +9433,14 @@ def warn_ptr_arith_precedes_bounds : Warning<
   "the pointer decremented by %0 refers before the beginning of the array">,
   InGroup<ArrayBoundsPointerArithmetic>, DefaultIgnore;
 def warn_ptr_arith_exceeds_bounds : Warning<
-  "the pointer incremented by %0 refers past the end of the array (that "
-  "contains %1 element%s2)">,
+  "the pointer incremented by %0 refers past the end of the array (that has type %1)">,
   InGroup<ArrayBoundsPointerArithmetic>, DefaultIgnore;
 def warn_array_index_precedes_bounds : Warning<
   "array index %0 is before the beginning of the array">,
   InGroup<ArrayBounds>;
 def warn_array_index_exceeds_bounds : Warning<
-  "array index %0 is past the end of the array (which contains %1 "
-  "element%s2)">, InGroup<ArrayBounds>;
+  "array index %0 is past the end of the array (that has type %1%select{|, cast to %3}2)">,
+  InGroup<ArrayBounds>;
 def warn_ptr_arith_exceeds_max_addressable_bounds : Warning<
   "the pointer incremented by %0 refers past the last possible element for an array in %1-bit "
   "address space containing %2-bit (%3-byte) elements (max possible %4 element%s5)">,
@@ -9213,6 +9452,12 @@ def warn_array_index_exceeds_max_addressable_bounds : Warning<
 def note_array_declared_here : Note<
   "array %0 declared here">;
 
+def warn_inconsistent_array_form : Warning<
+  "argument %0 of type %1 with mismatched bound">,
+  InGroup<ArrayParameter>, DefaultIgnore;
+def note_previous_declaration_as : Note<
+  "previously declared as %0 here">;
+
 def warn_printf_insufficient_data_args : Warning<
   "more '%%' conversions than data arguments">, InGroup<FormatInsufficientArgs>;
 def warn_printf_data_arg_not_used : Warning<
@@ -9231,17 +9476,17 @@ def warn_format_conversion_argument_type_mismatch : Warning<
   "%select{type|underlying type}2 %1">,
   InGroup<Format>;
 def warn_format_conversion_argument_type_mismatch_pedantic : Extension<
-  warn_format_conversion_argument_type_mismatch.Text>,
+  warn_format_conversion_argument_type_mismatch.Summary>,
   InGroup<FormatPedantic>;
 def warn_format_conversion_argument_type_mismatch_confusion : Warning<
-  warn_format_conversion_argument_type_mismatch.Text>,
+  warn_format_conversion_argument_type_mismatch.Summary>,
   InGroup<FormatTypeConfusion>, DefaultIgnore;
 def warn_format_argument_needs_cast : Warning<
   "%select{values of type|enum values with underlying type}2 '%0' should not "
   "be used as format arguments; add an explicit cast to %1 instead">,
   InGroup<Format>;
 def warn_format_argument_needs_cast_pedantic : Warning<
-  warn_format_argument_needs_cast.Text>,
+  warn_format_argument_needs_cast.Summary>,
   InGroup<FormatPedantic>, DefaultIgnore;
 def warn_printf_positional_arg_exceeds_data_args : Warning <
   "data argument position '%0' exceeds the number of data arguments (%1)">,
@@ -9312,6 +9557,9 @@ def warn_printf_ObjCflags_without_ObjCConversion: Warning<
 def warn_printf_invalid_objc_flag: Warning<
     "'%0' is not a valid object format flag">,
     InGroup<Format>;
+def warn_printf_narg_not_supported : Warning<
+    "'%%n' specifier not supported on this platform">,
+    InGroup<Format>;
 def warn_scanf_scanlist_incomplete : Warning<
   "no closing ']' for '%%[' in scanf format string">,
   InGroup<Format>;
@@ -9491,7 +9739,8 @@ def err_generic_sel_multi_match : Error<
 
 // Blocks
 def err_blocks_disable : Error<"blocks support disabled - compile with -fblocks"
-  " or %select{pick a deployment target that supports them|for OpenCL 2.0}0">;
+  " or %select{pick a deployment target that supports them|for OpenCL C 2.0"
+  " or OpenCL C 3.0 with __opencl_c_device_enqueue feature}0">;
 def err_block_returning_array_function : Error<
   "block cannot return %select{array|function}0 type %1">;
 
@@ -9580,9 +9829,6 @@ def err_fallthrough_attr_outside_switch : Error<
   "fallthrough annotation is outside switch statement">;
 def err_fallthrough_attr_invalid_placement : Error<
   "fallthrough annotation does not directly precede switch label">;
-def warn_fallthrough_attr_unreachable : Warning<
-  "fallthrough annotation in unreachable code">,
-  InGroup<ImplicitFallthrough>, DefaultIgnore;
 
 def warn_unreachable_default : Warning<
   "default label in switch which covers all enumeration values">,
@@ -9633,6 +9879,9 @@ def err_ms_va_start_used_in_sysv_function : Error<
 def warn_second_arg_of_va_start_not_last_named_param : Warning<
   "second argument to 'va_start' is not the last named parameter">,
   InGroup<Varargs>;
+def warn_c17_compat_ellipsis_only_parameter : Warning<
+  "'...' as the only parameter of a function is incompatible with C standards "
+  "before C2x">, DefaultIgnore, InGroup<CPre2xCompat>;
 def warn_va_start_type_is_undefined : Warning<
   "passing %select{an object that undergoes default argument promotion|"
   "an object of reference type|a parameter declared with the 'register' "
@@ -9678,10 +9927,6 @@ def warn_falloff_noreturn_function : Warning<
   InGroup<InvalidNoreturn>;
 def err_noreturn_block_has_return_expr : Error<
   "block declared 'noreturn' should not return">;
-def err_noreturn_missing_on_first_decl : Error<
-  "function declared '[[noreturn]]' after its first declaration">;
-def note_noreturn_missing_first_decl : Note<
-  "declaration missing '[[noreturn]]' attribute is here">;
 def err_carries_dependency_missing_on_first_decl : Error<
   "%select{function|parameter}0 declared '[[carries_dependency]]' "
   "after its first declaration">;
@@ -9739,6 +9984,9 @@ def err_argument_invalid_range : Error<
 def warn_argument_invalid_range : Warning<
   "argument value %0 is outside the valid range [%1, %2]">, DefaultError,
   InGroup<DiagGroup<"argument-outside-range">>;
+def warn_argument_undefined_behaviour : Warning<
+  "argument value %0 will result in undefined behaviour">,
+  InGroup<DiagGroup<"argument-undefined-behaviour">>;
 def err_argument_not_multiple : Error<
   "argument should be a multiple of %0">;
 def err_argument_not_power_of_2 : Error<
@@ -9749,10 +9997,10 @@ def err_argument_not_shifted_byte_or_xxff : Error<
   "argument should be an 8-bit value shifted by a multiple of 8 bits, or in the form 0x??FF">;
 def err_argument_not_contiguous_bit_field : Error<
   "argument %0 value should represent a contiguous bit field">;
-def err_rotation_argument_to_cadd
-    : Error<"argument should be the value 90 or 270">;
-def err_rotation_argument_to_cmla
-    : Error<"argument should be the value 0, 90, 180 or 270">;
+def err_rotation_argument_to_cadd : Error<
+  "argument should be the value 90 or 270">;
+def err_rotation_argument_to_cmla : Error<
+  "argument should be the value 0, 90, 180 or 270">;
 def warn_neon_vector_initializer_non_portable : Warning<
   "vector initializers are not compatible with NEON intrinsics in big endian "
   "mode">, InGroup<DiagGroup<"nonportable-vector-initialization">>;
@@ -9779,8 +10027,16 @@ def err_mips_builtin_requires_msa : Error<
   "this builtin requires 'msa' ASE, please use -mmsa">;
 def err_ppc_builtin_only_on_arch : Error<
   "this builtin is only valid on POWER%0 or later CPUs">;
+def err_ppc_builtin_requires_vsx : Error<
+  "this builtin requires VSX to be enabled">;
+def err_ppc_builtin_requires_htm : Error<
+  "this builtin requires HTM to be enabled">;
+def err_ppc_builtin_requires_abi : Error<
+  "this builtin requires ABI -mabi=%0">;
 def err_ppc_invalid_use_mma_type : Error<
   "invalid use of PPC MMA type">;
+def err_ppc_invalid_test_data_class_type : Error<
+  "expected a 'float', 'double' or '__float128' for the first argument">;
 def err_x86_builtin_invalid_rounding : Error<
   "invalid rounding argument">;
 def err_x86_builtin_invalid_scale : Error<
@@ -9803,8 +10059,11 @@ def err_constant_integer_arg_type : Error<
   "argument to %0 must be a constant integer">;
 
 def ext_mixed_decls_code : Extension<
-  "ISO C90 forbids mixing declarations and code">,
-  InGroup<DiagGroup<"declaration-after-statement">>;
+  "mixing declarations and code is a C99 extension">,
+  InGroup<DeclarationAfterStatement>;
+def warn_mixed_decls_code : Warning<
+  "mixing declarations and code is incompatible with standards before C99">,
+  InGroup<DeclarationAfterStatement>, DefaultIgnore;
 
 def err_non_local_variable_decl_in_for : Error<
   "declaration of non-local variable in 'for' loop">;
@@ -9832,6 +10091,8 @@ def warn_duplicate_attribute_exact : Warning<
 def warn_duplicate_attribute : Warning<
   "attribute %0 is already applied with different arguments">,
   InGroup<IgnoredAttributes>;
+def err_disallowed_duplicate_attribute : Error<
+  "attribute %0 cannot appear more than once on a declaration">;
 
 def warn_sync_fetch_and_nand_semantics_change : Warning<
   "the semantics of this intrinsic changed with GCC "
@@ -9845,15 +10106,13 @@ def warn_receiver_forward_class : Warning<
   "receiver %0 is a forward class and corresponding @interface may not exist">,
   InGroup<ForwardClassReceiver>;
 def note_method_sent_forward_class : Note<"method %0 is used for the forward class">;
-def ext_missing_declspec : ExtWarn<
-  "declaration specifier missing, defaulting to 'int'">;
 def ext_missing_type_specifier : ExtWarn<
-  "type specifier missing, defaults to 'int'">,
-  InGroup<ImplicitInt>;
+  "type specifier missing, defaults to 'int'; ISO C99 and later do not support "
+  "implicit int">, InGroup<ImplicitInt>;
+def err_missing_type_specifier : Error<
+  "a type specifier is required for all declarations">;
 def err_decimal_unsupported : Error<
   "GNU decimal type extension not supported">;
-def err_missing_type_specifier : Error<
-  "C++ requires a type specifier for all declarations">;
 def err_objc_array_of_interfaces : Error<
   "array of interface %0 is invalid (probably should be an array of pointers)">;
 def ext_c99_array_usage : Extension<
@@ -9876,9 +10135,9 @@ def err_nserrordomain_wrong_type : Error<
   "domain argument %0 does not point to an NSString or CFString constant">;
 
 def warn_nsconsumed_attribute_mismatch : Warning<
-  err_nsconsumed_attribute_mismatch.Text>, InGroup<NSConsumedMismatch>;
+  err_nsconsumed_attribute_mismatch.Summary>, InGroup<NSConsumedMismatch>;
 def warn_nsreturns_retained_attribute_mismatch : Warning<
-  err_nsreturns_retained_attribute_mismatch.Text>, InGroup<NSReturnsMismatch>;
+  err_nsreturns_retained_attribute_mismatch.Summary>, InGroup<NSReturnsMismatch>;
 
 def note_getter_unavailable : Note<
   "or because setter is declared here, but no getter method %0 is found">;
@@ -10046,8 +10305,6 @@ def err_opencl_scalar_type_rank_greater_than_vector_type : Error<
     "element. (%0 and %1)">;
 def err_bad_kernel_param_type : Error<
   "%0 cannot be used as the type of a kernel parameter">;
-def err_opencl_implicit_function_decl : Error<
-  "implicit declaration of function %0 is invalid in OpenCL">;
 def err_record_with_pointers_kernel_param : Error<
   "%select{struct|union}0 kernel parameters may not contain pointers">;
 def note_within_field_of_type : Note<
@@ -10081,8 +10338,8 @@ def err_reference_pipe_type : Error <
 def err_opencl_no_main : Error<"%select{function|kernel}0 cannot be called 'main'">;
 def err_opencl_kernel_attr :
   Error<"attribute %0 can only be applied to an OpenCL kernel function">;
-def err_opencl_return_value_with_address_space : Error<
-  "return value cannot be qualified with address space">;
+def err_return_value_with_address_space : Error<
+  "return type cannot be qualified with address space">;
 def err_opencl_constant_no_init : Error<
   "variable in constant address space must be initialized">;
 def err_opencl_atomic_init: Error<
@@ -10101,8 +10358,7 @@ def err_opencl_type_can_only_be_used_as_function_parameter : Error <
 def err_opencl_type_not_found : Error<
   "%0 type %1 not found; include the base header with -finclude-default-header">;
 def warn_opencl_attr_deprecated_ignored : Warning <
-  "%0 attribute is deprecated and ignored in OpenCL version %1">,
-  InGroup<IgnoredAttributes>;
+  "%0 attribute is deprecated and ignored in %1">, InGroup<IgnoredAttributes>;
 def err_opencl_variadic_function : Error<
   "invalid prototype, variadic arguments are not allowed in OpenCL">;
 def err_opencl_requires_extension : Error<
@@ -10167,7 +10423,7 @@ def err_opencl_builtin_expected_type : Error<
 
 // OpenCL v3.0 s6.3.7 - Vector Components
 def ext_opencl_ext_vector_type_rgba_selector: ExtWarn<
-  "vector component name '%0' is an OpenCL C version 3.0 feature">,
+  "vector component name '%0' is a feature from OpenCL version 3.0 onwards">,
   InGroup<OpenCLUnsupportedRGBA>;
 
 def err_openclcxx_placement_new : Error<
@@ -10177,6 +10433,11 @@ def err_openclcxx_placement_new : Error<
 def warn_mig_server_routine_does_not_return_kern_return_t : Warning<
   "'mig_server_routine' attribute only applies to routines that return a kern_return_t">,
   InGroup<IgnoredAttributes>;
+
+def warn_imp_cast_drops_unaligned : Warning<
+  "implicit cast from type %0 to type %1 drops __unaligned qualifier">,
+  InGroup<DiagGroup<"unaligned-qualifier-implicit-cast">>;
+
 } // end of sema category
 
 let CategoryName = "OpenMP Issue" in {
@@ -10208,8 +10469,15 @@ def err_omp_reduction_incomplete_type : Error<
   "a reduction list item with incomplete type %0">;
 def err_omp_unexpected_clause_value : Error<
   "expected %0 in OpenMP clause '%1'">;
+def err_omp_unexpected_call_to_omp_runtime_api
+    : Error<"calls to OpenMP runtime API are not allowed within a region that "
+            "corresponds to a construct with an order clause that specifies "
+            "concurrent">;
 def err_omp_expected_var_name_member_expr : Error<
   "expected variable name%select{| or data member of current class}0">;
+def err_omp_expected_var_name_member_expr_with_type : Error<
+  "expected variable%select{| or static data member|, static data member, "
+  "or non-static data member of current class}0 of type '%1'">;
 def err_omp_expected_var_name_member_expr_or_array_item : Error<
   "expected variable name%select{|, data member of current class}0, array element or array section">;
 def err_omp_expected_addressable_lvalue_or_array_item : Error<
@@ -10399,6 +10667,9 @@ def err_omp_prohibited_region_simd : Error<
   "OpenMP constructs may not be nested inside a simd region%select{| except for ordered simd, simd, scan, or atomic directive}0">;
 def err_omp_prohibited_region_atomic : Error<
   "OpenMP constructs may not be nested inside an atomic region">;
+def err_omp_prohibited_region_order
+    : Error<"construct '%0' not allowed in a region associated with a "
+            "directive with 'order' clause">;
 def err_omp_prohibited_region_critical_same_name : Error<
   "cannot nest 'critical' regions having the same name %0">;
 def note_omp_previous_critical_region : Note<
@@ -10448,8 +10719,23 @@ def err_omp_atomic_capture_not_compound_statement : Error<
   " where x is an lvalue expression with scalar type">;
 def note_omp_atomic_capture: Note<
   "%select{expected assignment expression|expected compound statement|expected exactly two expression statements|expected in right hand side of the first expression}0">;
+def err_omp_atomic_compare : Error<
+  "the statement for 'atomic compare' must be a compound statement of form '{x = expr ordop x ? expr : x;}', '{x = x ordop expr? expr : x;}',"
+  " '{x = x == e ? d : x;}', '{x = e == x ? d : x;}', or 'if(expr ordop x) {x = expr;}', 'if(x ordop expr) {x = expr;}', 'if(x == e) {x = d;}',"
+  " 'if(e == x) {x = d;}' where 'x' is an lvalue expression with scalar type, 'expr', 'e', and 'd' are expressions with scalar type,"
+  " and 'ordop' is one of '<' or '>'.">;
+def err_omp_atomic_compare_capture : Error<
+  "the statement for 'atomic compare capture' must be a compound statement of form '{v = x; cond-up-stmt}', ''{cond-up-stmt v = x;}', '{if(x == e) {x = d;} else {v = x;}}',"
+  " '{r = x == e; if(r) {x = d;}}', or '{r = x == e; if(r) {x = d;} else {v = x;}}', where 'cond-update-stmt' can have one of the following forms: 'if(expr ordop x) {x = expr;}',"
+  " 'if(x ordop expr) {x = expr;}', 'if(x == e) {x = d;}', or 'if(e == x) {x = d;}' where 'x', 'r', and 'v' are lvalue expressions with scalar type, 'expr', 'e', and 'd' are expressions with scalar type,"
+  " and 'ordop' is one of '<' or '>'.">;
+def note_omp_atomic_compare: Note<
+  "%select{expected compound statement|expected exactly one expression statement|expected assignment statement|expected conditional operator|expect result value to be at false expression|"
+  "expect binary operator in conditional expression|expect '<', '>' or '==' as order operator|expect comparison in a form of 'x == e', 'e == x', 'x ordop expr', or 'expr ordop x'|"
+  "expect lvalue for result value|expect scalar value|expect integer value|unexpected 'else' statement|expect '==' operator|expect an assignment statement 'v = x'|"
+  "expect a 'if' statement|expect no more than two statements|expect a compound statement|expect 'else' statement|expect a form 'r = x == e; if (r) ...'}0">;
 def err_omp_atomic_several_clauses : Error<
-  "directive '#pragma omp atomic' cannot contain more than one 'read', 'write', 'update' or 'capture' clause">;
+  "directive '#pragma omp atomic' cannot contain more than one 'read', 'write', 'update', 'capture', or 'compare' clause">;
 def err_omp_several_mem_order_clauses : Error<
   "directive '#pragma omp %0' cannot contain more than one %select{'seq_cst', 'relaxed', |}1'acq_rel', 'acquire' or 'release' clause">;
 def err_omp_atomic_incompatible_mem_order_clause : Error<
@@ -10464,6 +10750,8 @@ def note_omp_nested_statement_here : Note<
   "%select{statement|directive}0 outside teams construct here">;
 def err_omp_single_copyprivate_with_nowait : Error<
   "the 'copyprivate' clause must not be used with the 'nowait' clause">;
+def err_omp_nowait_clause_without_depend: Error<
+  "directive '#pragma omp taskwait' cannot use 'nowait' clause without 'depend' clause">;
 def note_omp_nowait_clause_here : Note<
   "'nowait' clause is here">;
 def err_omp_single_decl_in_declare_simd_variant : Error<
@@ -10538,6 +10826,8 @@ def err_omp_map_shared_storage : Error<
   "variable already marked as mapped in current construct">;
 def err_omp_invalid_map_type_for_directive : Error<
   "%select{map type '%1' is not allowed|map type must be specified}0 for '#pragma omp %2'">;
+def err_omp_invalid_map_type_modifier_for_directive : Error<
+  "map type modifier '%0' is not allowed for '#pragma omp %1'">;
 def err_omp_no_clause_for_directive : Error<
   "expected at least one %0 clause for '#pragma omp %1'">;
 def err_omp_threadprivate_in_clause : Error<
@@ -10566,6 +10856,8 @@ def err_omp_depend_sink_unexpected_expr : Error<
   "unexpected expression: number of expressions is larger than the number of associated loops">;
 def err_omp_depend_sink_expected_plus_minus : Error<
   "expected '+' or '-' operation">;
+def err_omp_taskwait_depend_mutexinoutset_not_allowed : Error<
+  "'mutexinoutset' modifier not allowed in 'depend' clause on 'taskwait' directive">;
 def err_omp_depend_sink_source_not_allowed : Error<
   "'depend(%select{source|sink:vec}0)' clause%select{|s}0 cannot be mixed with 'depend(%select{sink:vec|source}0)' clause%select{s|}0">;
 def err_omp_depend_zero_length_array_section_not_allowed : Error<
@@ -10574,6 +10866,8 @@ def err_omp_depend_sink_source_with_modifier : Error<
   "depend modifier cannot be used with 'sink' or 'source' depend type">;
 def err_omp_depend_modifier_not_iterator : Error<
   "expected iterator specification as depend modifier">;
+def err_omp_map_modifier_not_iterator : Error<
+  "expected iterator specification as map modifier">;
 def err_omp_linear_ordered : Error<
   "'linear' clause cannot be specified along with 'ordered' clause with a parameter">;
 def err_omp_unexpected_schedule_modifier : Error<
@@ -10594,6 +10888,8 @@ def err_omp_expected_int_param : Error<
   "expected a reference to an integer-typed parameter">;
 def err_omp_at_least_one_motion_clause_required : Error<
   "expected at least one 'to' clause or 'from' clause specified to '#pragma omp target update'">;
+def err_omp_cannot_update_with_internal_linkage : Error<
+  "the host cannot update a declare target variable that is not externally visible.">;
 def err_omp_usedeviceptr_not_a_pointer : Error<
   "expected pointer or reference to pointer in 'use_device_ptr' clause">;
 def err_omp_argument_type_isdeviceptr : Error <
@@ -10624,6 +10920,8 @@ def err_omp_directive_before_requires : Error <
   "'%0' region encountered before requires directive with '%1' clause">;
 def note_omp_requires_encountered_directive : Note <
   "'%0' previously encountered here">;
+def err_omp_device_ancestor_without_requires_reverse_offload : Error <
+  "Device clause with ancestor device-modifier used without specifying 'requires reverse_offload'">;
 def err_omp_invalid_scope : Error <
   "'#pragma omp %0' directive must appear only in file scope">;
 def note_omp_invalid_length_on_this_ptr_mapping : Note <
@@ -10687,9 +10985,9 @@ def err_omp_invariant_or_linear_dependency : Error<
   "expected loop invariant expression or '<invariant1> * %0 + <invariant2>' kind of expression">;
 def err_omp_wrong_dependency_iterator_type : Error<
   "expected an integer or a pointer type of the outer loop counter '%0' for non-rectangular nests">;
-def err_device_unsupported_type
-    : Error<"%0 requires %select{|%2 bit size}1 %3 type support, but device "
-            "'%4' does not support it">;
+def err_target_unsupported_type
+    : Error<"%0 requires %select{|%2 bit size}1 %3 %select{|return }4type support,"
+            " but target '%5' does not support it">;
 def err_omp_lambda_capture_in_declare_target_not_to : Error<
   "variable captured in declare target region must appear in a to clause">;
 def err_omp_device_type_mismatch : Error<
@@ -10724,9 +11022,16 @@ def err_omp_declare_variant_diff : Error<
   "function with '#pragma omp declare variant' has a different %select{calling convention"
   "|return type|constexpr specification|inline specification|storage class|"
   "linkage}0">;
+def err_omp_declare_variant_prototype_required : Error<
+  "function with '#pragma omp declare variant' must have a prototype when "
+  "'append_args' is used">;
+def err_omp_interop_type_not_found : Error<
+  "'omp_interop_t' must be defined when 'append_args' clause is used; include <omp.h>">;
 def err_omp_declare_variant_incompat_types : Error<
-  "variant in '#pragma omp declare variant' with type %0 is incompatible with type %1"
-  >;
+  "variant in '#pragma omp declare variant' with type %0 is incompatible with"
+  " type %1%select{| with appended arguments}2">;
+def err_omp_declare_variant_same_base_function : Error<
+  "variant in '#pragma omp declare variant' is the same as the base function">;
 def warn_omp_declare_variant_marked_as_declare_variant : Warning<
   "variant function in '#pragma omp declare variant' is itself marked as '#pragma omp declare variant'"
   >, InGroup<SourceUsesOpenMP>;
@@ -10744,11 +11049,6 @@ def err_omp_non_lvalue_in_map_or_motion_clauses: Error<
   "expected addressable lvalue in '%0' clause">;
 def err_omp_var_expected : Error<
   "expected variable of the '%0' type%select{|, not %2}1">;
-def warn_unknown_declare_variant_isa_trait
-    : Warning<"isa trait '%0' is not known to the current target; verify the "
-              "spelling or consider restricting the context selector with the "
-              "'arch' selector further">,
-      InGroup<SourceUsesOpenMP>;
 def err_omp_non_pointer_type_array_shaping_base : Error<
   "expected expression with a pointer to a complete type as a base of an array "
   "shaping operation">;
@@ -10772,6 +11072,9 @@ def note_omp_protected_structured_block
     : Note<"jump bypasses OpenMP structured block">;
 def note_omp_exits_structured_block
     : Note<"jump exits scope of OpenMP structured block">;
+def err_omp_lastprivate_loop_var_non_loop_iteration : Error<
+  "only loop iteration variables are allowed in 'lastprivate' clause in "
+  "'omp %0' directives">;
 def err_omp_interop_variable_expected : Error<
   "expected%select{| non-const}0 variable of type 'omp_interop_t'">;
 def err_omp_interop_variable_wrong_type : Error<
@@ -10789,6 +11092,19 @@ def err_omp_dispatch_statement_call
 def err_omp_unroll_full_variable_trip_count : Error<
   "loop to be fully unrolled must have a constant trip count">;
 def note_omp_directive_here : Note<"'%0' directive found here">;
+def err_omp_instantiation_not_supported
+    : Error<"instantiation of '%0' not supported yet">;
+def err_omp_adjust_arg_multiple_clauses : Error<
+  "'adjust_arg' argument %0 used in multiple clauses">;
+def err_omp_clause_requires_dispatch_construct : Error<
+  "'%0' clause requires 'dispatch' context selector">;
+def err_omp_append_args_with_varargs : Error<
+  "'append_args' is not allowed with varargs functions">;
+def err_openmp_vla_in_task_untied : Error<
+  "variable length arrays are not supported in OpenMP tasking regions with 'untied' clause">;
+def warn_omp_unterminated_declare_target : Warning<
+  "expected '#pragma omp end declare target' at end of file to match '#pragma omp %0'">,
+  InGroup<SourceUsesOpenMP>;
 } // end of OpenMP category
 
 let CategoryName = "Related Result Type Issue" in {
@@ -10821,7 +11137,7 @@ def err_invalid_type_for_program_scope_var : Error<
 let CategoryName = "Modules Issue" in {
 def err_module_decl_in_module_map_module : Error<
   "'module' declaration found while building module from module map">;
-def err_module_decl_in_header_module : Error<
+def err_module_decl_in_header_unit : Error<
   "'module' declaration found while building header unit">;
 def err_module_interface_implementation_mismatch : Error<
   "missing 'export' specifier in module declaration while "
@@ -10882,6 +11198,8 @@ def ext_module_import_not_at_top_level_noop : ExtWarn<
 def note_module_import_not_at_top_level : Note<"%0 begins here">;
 def err_module_self_import : Error<
   "import of module '%0' appears within same top-level module '%1'">;
+def err_module_self_import_cxx20 : Error<
+  "import of module '%0' appears within its own %select{interface|implementation}1">;
 def err_module_import_in_implementation : Error<
   "@import of module '%0' in implementation of '%1'; use #import">;
 
@@ -10900,6 +11218,8 @@ def ext_export_no_name_block : ExtWarn<
 def ext_export_no_names : ExtWarn<
   "ISO C++20 does not permit a declaration that does not introduce any names "
   "to be exported">, InGroup<ExportUnnamed>;
+def introduces_no_names : Error<
+  "declaration does not introduce any names to be exported">;
 def note_export : Note<"export block begins here">;
 def err_export_no_name : Error<
   "%select{empty|static_assert|asm}0 declaration cannot be exported">;
@@ -10911,10 +11231,15 @@ def err_export_within_export : Error<
 def err_export_internal : Error<
   "declaration of %0 with internal linkage cannot be exported">;
 def err_export_using_internal : Error<
-  "using declaration referring to %0 with internal linkage cannot be exported">;
+  "using declaration referring to %1 with %select{internal|module|unknown}0 "
+  "linkage cannot be exported">;
 def err_export_not_in_module_interface : Error<
   "export declaration can only be used within a module interface unit"
   "%select{ after the module declaration|}0">;
+def err_export_inline_not_defined : Error<
+  "inline function not defined%select{| before the private module fragment}0">;
+def err_export_partition_impl : Error<
+  "module partition implementations cannot be exported">;
 def err_export_in_private_module_fragment : Error<
   "export declaration cannot be used in a private module fragment">;
 def note_private_module_fragment : Note<
@@ -10927,6 +11252,10 @@ def err_private_module_fragment_not_module_interface : Error<
   "private module fragment in module implementation unit">;
 def note_not_module_interface_add_export : Note<
   "add 'export' here if this is intended to be a module interface unit">;
+def err_invalid_module_name : Error<
+  "%0 is %select{an invalid|a reserved}1 name for a module">;
+def err_extern_def_in_header_unit : Error<
+  "non-inline external definitions are not permitted in C++ header units">;
 
 def ext_equivalent_internal_linkage_decl_in_modules : ExtWarn<
   "ambiguous use of internal linkage declaration %0 defined in multiple modules">,
@@ -10959,19 +11288,27 @@ def err_coroutine_invalid_func_context : Error<
   "|a function with a deduced return type|a varargs function"
   "|a consteval function}0">;
 def err_implied_coroutine_type_not_found : Error<
-  "%0 type was not found; include <experimental/coroutine> before defining "
-  "a coroutine">;
+  "%0 type was not found; include <coroutine> before defining "
+  "a coroutine; include <experimental/coroutine> if your version "
+  "of libcxx is less than 14.0">;
+def warn_deprecated_coroutine_namespace : Warning<
+  "support for 'std::experimental::%0' will be removed in Clang 17; "
+  "use 'std::%0' instead">,
+  InGroup<DeprecatedExperimentalCoroutine>;
+def err_mixed_use_std_and_experimental_namespace_for_coroutine : Error<
+  "conflicting mixed use of std and std::experimental namespaces for "
+  "coroutine components">;
 def err_implicit_coroutine_std_nothrow_type_not_found : Error<
   "std::nothrow was not found; include <new> before defining a coroutine which "
   "uses get_return_object_on_allocation_failure()">;
 def err_malformed_std_nothrow : Error<
   "std::nothrow must be a valid variable declaration">;
 def err_malformed_std_coroutine_handle : Error<
-  "std::experimental::coroutine_handle must be a class template">;
+  "std::coroutine_handle isn't a class template">;
 def err_coroutine_handle_missing_member : Error<
-  "std::experimental::coroutine_handle missing a member named '%0'">;
+  "std::coroutine_handle must have a member named '%0'">;
 def err_malformed_std_coroutine_traits : Error<
-  "'std::experimental::coroutine_traits' must be a class template">;
+  "std::coroutine_traits isn't a class template">;
 def err_implied_std_coroutine_traits_promise_type_not_found : Error<
   "this function cannot be a coroutine: %q0 has no member named 'promise_type'">;
 def err_implied_std_coroutine_traits_promise_type_not_class : Error<
@@ -10983,8 +11320,6 @@ def err_coroutine_type_missing_specialization : Error<
   "specialization %0">;
 def err_coroutine_promise_incompatible_return_functions : Error<
   "the coroutine promise type %0 declares both 'return_value' and 'return_void'">;
-def err_coroutine_promise_requires_return_function : Error<
-  "the coroutine promise type %0 must declare either 'return_value' or 'return_void'">;
 def note_coroutine_promise_implicit_await_transform_required_here : Note<
   "call to 'await_transform' implicitly required by 'co_await' here">;
 def note_coroutine_promise_suspend_implicitly_required : Note<
@@ -11019,6 +11354,28 @@ def err_coroutine_promise_final_suspend_requires_nothrow : Error<
 def note_coroutine_function_declare_noexcept : Note<
   "must be declared with 'noexcept'"
 >;
+def warn_always_inline_coroutine : Warning<
+  "this coroutine may be split into pieces; not every piece is guaranteed to be inlined"
+  >,
+  InGroup<AlwaysInlineCoroutine>;
+def err_coroutine_unusable_new : Error<
+  "'operator new' provided by %0 is not usable with the function signature of %1"
+>;
+def err_coroutine_unfound_nothrow_new : Error <
+  "unable to find %select{'::operator new(size_t, nothrow_t)'|"
+  "'::operator new(size_t, align_val_t, nothrow_t)'}1 for %0"
+>;
+def warn_non_aligned_allocation_function : Warning <
+  "under -fcoro-aligned-allocation, the non-aligned allocation function "
+  "for the promise type %0 has higher precedence than the global aligned "
+  "allocation function">,
+  InGroup<CoroNonAlignedAllocationFunction>;
+def err_conflicting_aligned_options : Error <
+  "conflicting option '-fcoro-aligned-allocation' and '-fno-aligned-allocation'"
+>;
+def err_coro_invalid_addr_of_label : Error<
+  "the GNU address of label extension is not allowed in coroutines."
+>;
 } // end of coroutines issue category
 
 let CategoryName = "Documentation Issue" in {
@@ -11180,7 +11537,7 @@ def note_shadow_field : Note<"declared here">;
 
 def err_multiversion_required_in_redecl : Error<
   "function declaration is missing %select{'target'|'cpu_specific' or "
-  "'cpu_dispatch'}0 attribute in a multiversioned function">;
+  "'cpu_dispatch'|'target_version'}0 attribute in a multiversioned function">;
 def note_multiversioning_caused_here : Note<
   "function multiversioning caused by this declaration">;
 def err_multiversion_after_used : Error<
@@ -11193,21 +11550,23 @@ def err_multiversion_duplicate : Error<
   "multiversioned function redeclarations require identical target attributes">;
 def err_multiversion_noproto : Error<
   "multiversioned function must have a prototype">;
-def err_multiversion_disallowed_other_attr : Error<
-  "attribute '%select{target|cpu_specific|cpu_dispatch}0' multiversioning cannot be combined"
-  " with attribute %1">;
-def err_multiversion_mismatched_attrs
-    : Error<"attributes on multiversioned functions must all match, attribute "
-            "%0 %select{is missing|has different arguments}1">;
+def err_multiversion_disallowed_other_attr
+    : Error<"attribute "
+            "'%select{|target|cpu_specific|cpu_dispatch|target_clones|target_version}0' "
+            "multiversioning cannot be combined"
+            " with attribute %1">;
 def err_multiversion_diff : Error<
   "multiversioned function declaration has a different %select{calling convention"
-  "|return type|constexpr specification|inline specification|storage class|"
-  "linkage}0">;
-def err_multiversion_doesnt_support : Error<
-  "attribute '%select{target|cpu_specific|cpu_dispatch}0' multiversioned functions do not "
-  "yet support %select{function templates|virtual functions|"
-  "deduced return types|constructors|destructors|deleted functions|"
-  "defaulted functions|constexpr functions|consteval function}1">;
+  "|return type|constexpr specification|inline specification|linkage|"
+  "language linkage}0">;
+def err_multiversion_doesnt_support
+    : Error<"attribute "
+            "'%select{|target|cpu_specific|cpu_dispatch|target_clones|target_version}0' "
+            "multiversioned functions do not "
+            "yet support %select{function templates|virtual functions|"
+            "deduced return types|constructors|destructors|deleted functions|"
+            "defaulted functions|constexpr functions|consteval "
+            "function|lambdas}1">;
 def err_multiversion_not_allowed_on_main : Error<
   "'main' cannot be a multiversioned function">;
 def err_multiversion_not_supported : Error<
@@ -11224,6 +11583,22 @@ def warn_multiversion_duplicate_entries : Warning<
 def warn_dispatch_body_ignored : Warning<
   "body of cpu_dispatch function will be ignored">,
   InGroup<FunctionMultiVersioning>;
+def err_target_clone_must_have_default
+    : Error<"'target_clones' multiversioning requires a default target">;
+def err_target_clone_doesnt_match
+    : Error<"'target_clones' attribute does not match previous declaration">;
+def warn_target_clone_mixed_values
+    : ExtWarn<
+          "mixing 'target_clones' specifier mechanisms is permitted for GCC "
+          "compatibility; use a comma separated sequence of string literals, "
+          "or a string literal containing a comma-separated list of versions">,
+      InGroup<TargetClonesMixedSpecifiers>;
+def warn_target_clone_duplicate_options
+    : Warning<"version list contains duplicate entries">,
+      InGroup<FunctionMultiVersioning>;
+def warn_target_clone_no_impact_options
+    : Warning<"version list contains entries that don't impact code generation">,
+      InGroup<FunctionMultiVersioning>;
 
 // three-way comparison operator diagnostics
 def err_implied_comparison_category_type_not_found : Error<
@@ -11267,6 +11642,14 @@ def err_builtin_launder_invalid_arg : Error<
   "%select{non-pointer|function pointer|void pointer}0 argument to "
   "'__builtin_launder' is not allowed">;
 
+def err_builtin_invalid_arg_type: Error <
+  "%ordinal0 argument must be a "
+  "%select{vector, integer or floating point type|matrix|"
+  "pointer to a valid matrix element type|"
+  "signed integer or floating point type|vector type|"
+  "floating point type|"
+  "vector of integers}1 (was %2)">;
+
 def err_builtin_matrix_disabled: Error<
   "matrix types extension is disabled. Pass -fenable-matrix to enable it">;
 def err_matrix_index_not_integer: Error<
@@ -11279,11 +11662,8 @@ def err_matrix_separate_incomplete_index: Error<
   "matrix row and column subscripts cannot be separated by any expression">;
 def err_matrix_subscript_comma: Error<
   "comma expressions are not allowed as indices in matrix subscript expressions">;
-def err_builtin_matrix_arg: Error<"1st argument must be a matrix">;
 def err_builtin_matrix_scalar_unsigned_arg: Error<
   "%0 argument must be a constant unsigned integer expression">;
-def err_builtin_matrix_pointer_arg: Error<
-  "%ordinal0 argument must be a pointer to a valid matrix element type">;
 def err_builtin_matrix_pointer_arg_mismatch: Error<
   "the pointee of the 2nd argument must match the element type of the 1st argument (%0 != %1)">;
 def err_builtin_matrix_store_to_const: Error<
@@ -11334,10 +11714,13 @@ def warn_sycl_kernel_num_of_function_params : Warning<
 def warn_sycl_kernel_return_type : Warning<
   "function template with 'sycl_kernel' attribute must have a 'void' return type">,
   InGroup<IgnoredAttributes>;
+def err_sycl_special_type_num_init_method : Error<
+  "types with 'sycl_special_class' attribute must have one and only one '__init' "
+  "method defined">;
 
-def err_ext_int_bad_size : Error<"%select{signed|unsigned}0 _ExtInt must "
+def err_bit_int_bad_size : Error<"%select{signed|unsigned}0 _BitInt must "
                                  "have a bit size of at least %select{2|1}0">;
-def err_ext_int_max_size : Error<"%select{signed|unsigned}0 _ExtInt of bit "
+def err_bit_int_max_size : Error<"%select{signed|unsigned}0 _BitInt of bit "
                                  "sizes greater than %1 not supported">;
 
 // errors of expect.with.probability
@@ -11357,7 +11740,61 @@ def warn_tcb_enforcement_violation : Warning<
 
 // RISC-V builtin required extension warning
 def err_riscv_builtin_requires_extension : Error<
-  "builtin requires '%0' extension support to be enabled">;
+  "builtin requires%select{| at least one of the following extensions to be enabled}0: %1">;
 def err_riscv_builtin_invalid_lmul : Error<
   "LMUL argument must be in the range [0,3] or [5,7]">;
+
+def err_std_source_location_impl_not_found : Error<
+  "'std::source_location::__impl' was not found; it must be defined before '__builtin_source_location' is called">;
+def err_std_source_location_impl_malformed : Error<
+  "'std::source_location::__impl' must be standard-layout and have only two 'const char *' fields '_M_file_name' and '_M_function_name', and two integral fields '_M_line' and '_M_column'">;
+
+// HLSL Diagnostics
+def err_hlsl_attr_unsupported_in_stage : Error<"attribute %0 is unsupported in %select{Pixel|Vertex|Geometry|Hull|Domain|Compute|Library|RayGeneration|Intersection|AnyHit|ClosestHit|Miss|Callable|Mesh|Amplification|Invalid}1 shaders, requires %2">;
+def err_hlsl_attr_invalid_type : Error<
+   "attribute %0 only applies to a field or parameter of type '%1'">;
+def err_hlsl_attr_invalid_ast_node : Error<
+   "attribute %0 only applies to %1">;
+def err_hlsl_numthreads_argument_oor : Error<"argument '%select{X|Y|Z}0' to numthreads attribute cannot exceed %1">;
+def err_hlsl_numthreads_invalid : Error<"total number of threads cannot exceed %0">;
+def err_hlsl_missing_numthreads : Error<"missing numthreads attribute for %0 shader entry">;
+def err_hlsl_attribute_param_mismatch : Error<"%0 attribute parameters do not match the previous declaration">;
+def err_hlsl_missing_semantic_annotation : Error<
+  "semantic annotations must be present for all parameters of an entry "
+  "function or patch constant function">;
+def err_hlsl_init_priority_unsupported : Error<
+  "initializer priorities are not supported in HLSL">;
+
+def err_hlsl_unsupported_register_type : Error<"invalid resource class specifier '%0' used; expected 'b', 's', 't', or 'u'">;
+def err_hlsl_unsupported_register_number : Error<"register number should be an integer">;
+def err_hlsl_expected_space : Error<"invalid space specifier '%0' used; expected 'space' followed by an integer, like space1">;
+def err_hlsl_pointers_unsupported : Error<
+  "%select{pointers|references}0 are unsupported in HLSL">;
+
+def err_hlsl_operator_unsupported : Error<
+  "the '%select{&|*|->}0' operator is unsupported in HLSL">;
+
+// Layout randomization diagnostics.
+def err_non_designated_init_used : Error<
+  "a randomized struct can only be initialized with a designated initializer">;
+def err_cast_from_randomized_struct : Error<
+  "casting from randomized structure pointer type %0 to %1">;
+
+// LoongArch-specific Diagnostics
+def err_loongarch_builtin_requires_la64 : Error<
+  "this builtin requires target: loongarch64">;
+
+// Unsafe buffer usage diagnostics.
+def warn_unsafe_buffer_variable : Warning<
+  "%0 is an %select{unsafe pointer used for buffer access|unsafe buffer that "
+  "does not perform bounds checks}1">,
+  InGroup<UnsafeBufferUsage>, DefaultIgnore;
+def warn_unsafe_buffer_operation : Warning<
+  "%select{unsafe pointer operation|unsafe pointer arithmetic|"
+  "unsafe buffer access}0">,
+  InGroup<UnsafeBufferUsage>, DefaultIgnore;
+def note_unsafe_buffer_operation : Note<
+  "used%select{| in pointer arithmetic| in buffer access}0 here">;
+def err_loongarch_builtin_requires_la32 : Error<
+  "this builtin requires target: loongarch32">;
 } // end of sema component.
diff --git a/gnu/llvm/clang/include/clang/Basic/LangOptions.def b/gnu/llvm/clang/include/clang/Basic/LangOptions.def
index 74deba6ef7f..d1cbe430643 100644
--- a/gnu/llvm/clang/include/clang/Basic/LangOptions.def
+++ b/gnu/llvm/clang/include/clang/Basic/LangOptions.def
@@ -7,7 +7,11 @@
 //===----------------------------------------------------------------------===//
 //
 // This file defines the language options. Users of this file must
-// define the LANGOPT macro to make use of this information.
+// define the LANGOPT macro to make use of this information. The arguments to
+// the macro are:
+//   LANGOPT(Name, Bits, DefaultValue, Description)
+// Note that the DefaultValue must be a constant value (literal or enumeration);
+// it cannot depend on the value of another language option.
 //
 // Optionally, the user may also define:
 //
@@ -84,6 +88,7 @@ LANGOPT(C11               , 1, 0, "C11")
 LANGOPT(C17               , 1, 0, "C17")
 LANGOPT(C2x               , 1, 0, "C2x")
 LANGOPT(MSVCCompat        , 1, 0, "Microsoft Visual C++ full compatibility mode")
+LANGOPT(Kernel            , 1, 0, "Kernel mode")
 LANGOPT(MicrosoftExt      , 1, 0, "Microsoft C++ extensions")
 LANGOPT(AsmBlocks         , 1, 0, "Microsoft inline asm blocks")
 LANGOPT(Borland           , 1, 0, "Borland extensions")
@@ -107,7 +112,7 @@ LANGOPT(Trigraphs         , 1, 0,"trigraphs")
 LANGOPT(LineComment       , 1, 0, "'//' comments")
 LANGOPT(Bool              , 1, 0, "bool, true, and false keywords")
 LANGOPT(Half              , 1, 0, "half keyword")
-LANGOPT(WChar             , 1, CPlusPlus, "wchar_t keyword")
+LANGOPT(WChar             , 1, 0, "wchar_t keyword")
 LANGOPT(Char8             , 1, 0, "char8_t keyword")
 LANGOPT(IEEE128           , 1, 0, "__ieee128 keyword")
 LANGOPT(DeclSpecKeyword   , 1, 0, "__declspec keyword")
@@ -116,9 +121,9 @@ BENIGN_LANGOPT(AsmPreprocessor, 1, 0, "preprocessor in asm mode")
 LANGOPT(GNUMode           , 1, 1, "GNU extensions")
 LANGOPT(GNUKeywords       , 1, 1, "GNU keywords")
 VALUE_LANGOPT(GNUCVersion , 32, 0, "GNU C compatibility version")
-BENIGN_LANGOPT(ImplicitInt, 1, !C99 && !CPlusPlus, "C89 implicit 'int'")
+LANGOPT(DisableKNRFunctions, 1, 0, "require function types to have a prototype")
 LANGOPT(Digraphs          , 1, 0, "digraphs")
-BENIGN_LANGOPT(HexFloats  , 1, C99, "C99 hexadecimal float constants")
+BENIGN_LANGOPT(HexFloats  , 1, 0, "C99 hexadecimal float constants")
 LANGOPT(CXXOperatorNames  , 1, 0, "C++ operator name keywords")
 LANGOPT(AppleKext         , 1, 0, "Apple kext support")
 BENIGN_LANGOPT(PascalStrings, 1, 0, "Pascal string support")
@@ -143,13 +148,16 @@ LANGOPT(TraditionalCPP    , 1, 0, "traditional CPP emulation")
 LANGOPT(RTTI              , 1, 1, "run-time type information")
 LANGOPT(RTTIData          , 1, 1, "emit run-time type information data")
 LANGOPT(MSBitfields       , 1, 0, "Microsoft-compatible structure layout")
+LANGOPT(MSVolatile        , 1, 0, "Microsoft-compatible volatile loads and stores")
 LANGOPT(Freestanding, 1, 0, "freestanding implementation")
 LANGOPT(NoBuiltin         , 1, 0, "disable builtin functions")
 LANGOPT(NoMathBuiltin     , 1, 0, "disable math builtin functions")
 LANGOPT(GNUAsm            , 1, 1, "GNU-style inline assembly")
 LANGOPT(Coroutines        , 1, 0, "C++20 coroutines")
+LANGOPT(CoroAlignedAllocation, 1, 0, "prefer Aligned Allocation according to P2014 Option 2")
 LANGOPT(DllExportInlines  , 1, 1, "dllexported classes dllexport inline methods")
 LANGOPT(RelaxedTemplateTemplateArgs, 1, 0, "C++17 relaxed matching of template template arguments")
+LANGOPT(ExperimentalLibrary, 1, 0, "enable unstable and experimental library features")
 
 LANGOPT(DoubleSquareBracketAttributes, 1, 0, "'[[]]' attributes extension for all language standard modes")
 
@@ -165,7 +173,7 @@ BENIGN_LANGOPT(HeinousExtensions , 1, 0, "extensions that we really don't like a
 LANGOPT(Modules           , 1, 0, "modules semantics")
 COMPATIBLE_LANGOPT(ModulesTS  , 1, 0, "C++ Modules TS syntax")
 COMPATIBLE_LANGOPT(CPlusPlusModules, 1, 0, "C++ modules syntax")
-BENIGN_ENUM_LANGOPT(CompilingModule, CompilingModuleKind, 2, CMK_None,
+BENIGN_ENUM_LANGOPT(CompilingModule, CompilingModuleKind, 3, CMK_None,
                     "compiling a module interface")
 BENIGN_LANGOPT(CompilingPCH, 1, 0, "building a pch")
 BENIGN_LANGOPT(BuildingPCHWithObjectFile, 1, 0, "building a pch which has a corresponding object file")
@@ -174,6 +182,7 @@ BENIGN_LANGOPT(PCHInstantiateTemplates, 1, 0, "instantiate templates while build
 COMPATIBLE_LANGOPT(ModulesDeclUse    , 1, 0, "require declaration of module uses")
 BENIGN_LANGOPT(ModulesSearchAll  , 1, 1, "searching even non-imported modules to find unresolved references")
 COMPATIBLE_LANGOPT(ModulesStrictDeclUse, 1, 0, "requiring declaration of module uses and all headers to be in modules")
+COMPATIBLE_LANGOPT(ModulesValidateTextualHeaderIncludes, 1, 1, "validation of textual header includes")
 BENIGN_LANGOPT(ModulesErrorRecovery, 1, 1, "automatically importing modules as needed when performing error recovery")
 BENIGN_LANGOPT(ImplicitModules, 1, 1, "building modules that are not specified via -fmodule-file")
 COMPATIBLE_LANGOPT(ModulesLocalVisibility, 1, 0, "local submodule visibility")
@@ -189,6 +198,7 @@ VALUE_LANGOPT(DoubleSize            , 32, 0, "width of double")
 VALUE_LANGOPT(LongDoubleSize        , 32, 0, "width of long double")
 LANGOPT(PPCIEEELongDouble            , 1, 0, "use IEEE 754 quadruple-precision for long double")
 LANGOPT(EnableAIXExtendedAltivecABI  , 1, 0, "__EXTABI__  predefined macro")
+LANGOPT(EnableAIXQuadwordAtomicsABI  , 1, 0, "Use 16-byte atomic lock free semantics")
 COMPATIBLE_VALUE_LANGOPT(PICLevel    , 2, 0, "__PIC__ level")
 COMPATIBLE_VALUE_LANGOPT(PIE         , 1, 0, "is pie")
 LANGOPT(ROPI                         , 1, 0, "Read-only position independence")
@@ -227,23 +237,31 @@ LANGOPT(OpenCLGenericAddressSpace, 1, 0, "OpenCL generic keyword")
 LANGOPT(OpenCLPipes              , 1, 0, "OpenCL pipes language constructs and built-ins")
 LANGOPT(NativeHalfType    , 1, 0, "Native half type support")
 LANGOPT(NativeHalfArgsAndReturns, 1, 0, "Native half args and returns")
-LANGOPT(HalfArgsAndReturns, 1, 0, "half args and returns")
 LANGOPT(CUDA              , 1, 0, "CUDA")
 LANGOPT(HIP               , 1, 0, "HIP")
 LANGOPT(OpenMP            , 32, 0, "OpenMP support and version of OpenMP (31, 40 or 45)")
+LANGOPT(OpenMPExtensions  , 1, 1, "Enable all Clang extensions for OpenMP directives and clauses")
 LANGOPT(OpenMPSimd        , 1, 0, "Use SIMD only OpenMP support.")
 LANGOPT(OpenMPUseTLS      , 1, 0, "Use TLS for threadprivates or runtime calls")
 LANGOPT(OpenMPIsDevice    , 1, 0, "Generate code only for OpenMP target device")
 LANGOPT(OpenMPCUDAMode    , 1, 0, "Generate code for OpenMP pragmas in SIMT/SPMD mode")
 LANGOPT(OpenMPIRBuilder   , 1, 0, "Use the experimental OpenMP-IR-Builder codegen path.")
-LANGOPT(OpenMPCUDAForceFullRuntime , 1, 0, "Force to use full runtime in all constructs when offloading to CUDA devices")
 LANGOPT(OpenMPCUDANumSMs  , 32, 0, "Number of SMs for CUDA devices.")
 LANGOPT(OpenMPCUDABlocksPerSM  , 32, 0, "Number of blocks per SM for CUDA devices.")
 LANGOPT(OpenMPCUDAReductionBufNum , 32, 1024, "Number of the reduction records in the intermediate reduction buffer used for the teams reductions.")
-LANGOPT(OpenMPTargetNewRuntime , 1, 0, "Use the new bitcode library for OpenMP offloading")
+LANGOPT(OpenMPTargetDebug , 32, 0, "Enable debugging in the OpenMP offloading device RTL")
 LANGOPT(OpenMPOptimisticCollapse  , 1, 0, "Use at most 32 bits to represent the collapsed loop nest counter.")
+LANGOPT(OpenMPThreadSubscription  , 1, 0, "Assume work-shared loops do not have more iterations than participating threads.")
+LANGOPT(OpenMPTeamSubscription  , 1, 0, "Assume distributed loops do not have more iterations than participating teams.")
+LANGOPT(OpenMPNoThreadState  , 1, 0, "Assume that no thread in a parallel region will modify an ICV.")
+LANGOPT(OpenMPNoNestedParallelism  , 1, 0, "Assume that no thread in a parallel region will encounter a parallel region")
+LANGOPT(OpenMPOffloadMandatory  , 1, 0, "Assert that offloading is mandatory and do not create a host fallback.")
+LANGOPT(NoGPULib  , 1, 0, "Indicate a build without the standard GPU libraries.")
 LANGOPT(RenderScript      , 1, 0, "RenderScript")
 
+LANGOPT(HLSL, 1, 0, "HLSL")
+ENUM_LANGOPT(HLSLVersion, HLSLLangStd, 16, HLSL_Unset, "HLSL Version")
+
 LANGOPT(CUDAIsDevice      , 1, 0, "compiling for CUDA device")
 LANGOPT(CUDAAllowVariadicFunctions, 1, 0, "allowing variadic functions in CUDA device code")
 LANGOPT(CUDAHostDeviceConstexpr, 1, 1, "treating unattributed constexpr functions as __host__ __device__")
@@ -253,6 +271,7 @@ LANGOPT(GPUAllowDeviceInit, 1, 0, "allowing device side global init functions fo
 LANGOPT(GPUMaxThreadsPerBlock, 32, 1024, "default max threads per block for kernel launch bounds for HIP")
 LANGOPT(GPUDeferDiag, 1, 0, "defer host/device related diagnostic messages for CUDA/HIP")
 LANGOPT(GPUExcludeWrongSideOverloads, 1, 0, "always exclude wrong side overloads in overloading resolution for CUDA/HIP")
+LANGOPT(OffloadingNewDriver, 1, 0, "use the new driver for generating offloading code.")
 
 LANGOPT(SYCLIsDevice      , 1, 0, "Generate code for SYCL device")
 LANGOPT(SYCLIsHost        , 1, 0, "SYCL host compilation")
@@ -264,7 +283,6 @@ LANGOPT(SizedDeallocation , 1, 0, "sized deallocation")
 LANGOPT(AlignedAllocation , 1, 0, "aligned allocation")
 LANGOPT(AlignedAllocationUnavailable, 1, 0, "aligned allocation functions are unavailable")
 LANGOPT(NewAlignOverride  , 32, 0, "maximum alignment guaranteed by '::operator new(size_t)'")
-LANGOPT(ConceptSatisfactionCaching , 1, 1, "enable satisfaction caching for C++20 Concepts")
 BENIGN_LANGOPT(ModulesCodegen , 1, 0, "Modules code generation")
 BENIGN_LANGOPT(ModulesDebugInfo , 1, 0, "Modules debug info")
 BENIGN_LANGOPT(ElideConstructors , 1, 1, "C++ copy constructor elision")
@@ -275,11 +293,13 @@ BENIGN_LANGOPT(DumpRecordLayoutsComplete , 1, 0, "dumping the AST layout of all
 BENIGN_LANGOPT(DumpVTableLayouts , 1, 0, "dumping the layouts of emitted vtables")
 LANGOPT(NoConstantCFStrings , 1, 0, "no constant CoreFoundation strings")
 BENIGN_LANGOPT(InlineVisibilityHidden , 1, 0, "hidden visibility for inline C++ methods")
+BENIGN_ENUM_LANGOPT(DefaultVisibilityExportMapping, DefaultVisiblityExportMapping, 2, DefaultVisiblityExportMapping::None, "controls mapping of default visibility to dllexport")
 BENIGN_LANGOPT(IgnoreXCOFFVisibility, 1, 0, "All the visibility attributes that are specified in the source code are ignored in aix XCOFF.")
 BENIGN_LANGOPT(VisibilityInlinesHiddenStaticLocalVar, 1, 0,
                "hidden visibility for static local variables in inline C++ "
                "methods when -fvisibility-inlines hidden is enabled")
 LANGOPT(GlobalAllocationFunctionVisibilityHidden , 1, 0, "hidden visibility for global operator new and delete declaration")
+LANGOPT(NewInfallible , 1, 0, "Treats throwing global C++ operator new as always returning valid memory (annotates with __attribute__((returns_nonnull)) and throw()). This is detectable in source.")
 BENIGN_LANGOPT(ParseUnknownAnytype, 1, 0, "__unknown_anytype")
 BENIGN_LANGOPT(DebuggerSupport , 1, 0, "debugger support")
 BENIGN_LANGOPT(DebuggerCastResultToId, 1, 0, "for 'po' in the debugger, cast the result to id if it is of unknown type")
@@ -294,8 +314,10 @@ COMPATIBLE_LANGOPT(CLFiniteMathOnly , 1, 0, "__FINITE_MATH_ONLY__ predefined mac
 /// FP_CONTRACT mode (on/off/fast).
 BENIGN_ENUM_LANGOPT(DefaultFPContractMode, FPModeKind, 2, FPM_Off, "FP contraction type")
 COMPATIBLE_LANGOPT(ExpStrictFP, 1, false, "Enable experimental strict floating point")
-BENIGN_ENUM_LANGOPT(FPRoundingMode, RoundingMode, 3, RoundingMode::NearestTiesToEven, "FP Rounding Mode type")
-BENIGN_ENUM_LANGOPT(FPExceptionMode, FPExceptionModeKind, 2, FPE_Ignore, "FP Exception Behavior Mode type")
+BENIGN_LANGOPT(RoundingMath, 1, false, "Do not assume default floating-point rounding behavior")
+BENIGN_ENUM_LANGOPT(FPExceptionMode, FPExceptionModeKind, 2, FPE_Default, "FP Exception Behavior Mode type")
+BENIGN_ENUM_LANGOPT(FPEvalMethod, FPEvalMethodKind, 2, FEM_UnsetOnCommandLine, "FP type used for floating point arithmetic")
+ENUM_LANGOPT(Float16ExcessPrecision, ExcessPrecisionKind, 2, FPP_Standard, "Intermediate truncation behavior for floating point arithmetic")
 LANGOPT(NoBitFieldTypeAlign , 1, 0, "bit-field type alignment")
 LANGOPT(HexagonQdsp6Compat , 1, 0, "hexagon-qdsp6 backward compatibility")
 LANGOPT(ObjCAutoRefCount , 1, 0, "Objective-C automated reference counting")
@@ -397,6 +419,7 @@ ENUM_LANGOPT(ClangABICompat, ClangABI, 4, ClangABI::Latest,
              "with")
 
 COMPATIBLE_VALUE_LANGOPT(FunctionAlignment, 5, 0, "Default alignment for functions")
+COMPATIBLE_VALUE_LANGOPT(LoopAlignment, 32, 0, "Default alignment for loops")
 
 LANGOPT(FixedPoint, 1, 0, "fixed point types")
 LANGOPT(PaddingOnUnsignedFixedPoint, 1, 0,
@@ -406,6 +429,10 @@ LANGOPT(RegisterStaticDestructors, 1, 1, "Register C++ static destructors")
 
 LANGOPT(MatrixTypes, 1, 0, "Enable or disable the builtin matrix type")
 
+ENUM_LANGOPT(StrictFlexArraysLevel, StrictFlexArraysLevelKind, 2,
+             StrictFlexArraysLevelKind::Default,
+             "Rely on strict definition of flexible arrays")
+
 COMPATIBLE_VALUE_LANGOPT(MaxTokens, 32, 0, "Max number of tokens per TU or 0")
 
 ENUM_LANGOPT(SignReturnAddressScope, SignReturnAddressScopeKind, 2, SignReturnAddressScopeKind::None,
@@ -419,12 +446,25 @@ LANGOPT(SpeculativeLoadHardening, 1, 0, "Speculative load hardening enabled")
 LANGOPT(RelativeCXXABIVTables, 1, 0,
         "Use an ABI-incompatible v-table layout that uses relative references")
 
-LANGOPT(ArmSveVectorBits, 32, 0, "SVE vector size in bits")
+LANGOPT(VScaleMin, 32, 0, "Minimum vscale value")
+LANGOPT(VScaleMax, 32, 0, "Maximum vscale value")
 
-ENUM_LANGOPT(ExtendIntArgs, ExtendArgsKind, 1, ExtendArgsKind::ExtendTo32, 
+ENUM_LANGOPT(ExtendIntArgs, ExtendArgsKind, 1, ExtendArgsKind::ExtendTo32,
              "Controls how scalar integer arguments are extended in calls "
              "to unprototyped and varargs functions")
 
+VALUE_LANGOPT(FuchsiaAPILevel, 32, 0, "Fuchsia API level")
+
+// This option will be removed in the future once the backend
+// supports all operations (like division or float-to-integer conversion)
+// on large _BitInts.
+BENIGN_VALUE_LANGOPT(MaxBitIntWidth, 32, 128, "Maximum width of a _BitInt")
+
+LANGOPT(IncrementalExtensions, 1, 0, " True if we want to process statements"
+        "on the global scope, ignore EOF token and continue later on (thus "
+        "avoid tearing the Lexer and etc. down). Controlled by "
+        "-fincremental-extensions.")
+
 #undef LANGOPT
 #undef COMPATIBLE_LANGOPT
 #undef BENIGN_LANGOPT
diff --git a/gnu/llvm/clang/include/clang/Basic/TargetInfo.h b/gnu/llvm/clang/include/clang/Basic/TargetInfo.h
index 4f0cbf986b3..bb2a453f465 100644
--- a/gnu/llvm/clang/include/clang/Basic/TargetInfo.h
+++ b/gnu/llvm/clang/include/clang/Basic/TargetInfo.h
@@ -15,6 +15,7 @@
 #define LLVM_CLANG_BASIC_TARGETINFO_H
 
 #include "clang/Basic/AddressSpaces.h"
+#include "clang/Basic/BitmaskEnum.h"
 #include "clang/Basic/CodeGenOptions.h"
 #include "clang/Basic/LLVM.h"
 #include "clang/Basic/LangOptions.h"
@@ -25,16 +26,17 @@
 #include "llvm/ADT/APInt.h"
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/IntrusiveRefCntPtr.h"
-#include "llvm/ADT/Optional.h"
 #include "llvm/ADT/SmallSet.h"
 #include "llvm/ADT/StringMap.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/ADT/Triple.h"
 #include "llvm/Frontend/OpenMP/OMPGridValues.h"
+#include "llvm/IR/DerivedTypes.h"
 #include "llvm/Support/DataTypes.h"
 #include "llvm/Support/Error.h"
 #include "llvm/Support/VersionTuple.h"
 #include <cassert>
+#include <optional>
 #include <string>
 #include <vector>
 
@@ -47,12 +49,34 @@ class DiagnosticsEngine;
 class LangOptions;
 class CodeGenOptions;
 class MacroBuilder;
-class QualType;
-class SourceLocation;
-class SourceManager;
+
+/// Contains information gathered from parsing the contents of TargetAttr.
+struct ParsedTargetAttr {
+  std::vector<std::string> Features;
+  StringRef CPU;
+  StringRef Tune;
+  StringRef BranchProtection;
+  StringRef Duplicate;
+  bool operator ==(const ParsedTargetAttr &Other) const {
+    return Duplicate == Other.Duplicate && CPU == Other.CPU &&
+           Tune == Other.Tune && BranchProtection == Other.BranchProtection &&
+           Features == Other.Features;
+  }
+};
 
 namespace Builtin { struct Info; }
 
+enum class FloatModeKind {
+  NoFloat = 0,
+  Half = 1 << 0,
+  Float = 1 << 1,
+  Double = 1 << 2,
+  LongDouble = 1 << 3,
+  Float128 = 1 << 4,
+  Ibm128 = 1 << 5,
+  LLVM_MARK_AS_BITMASK_ENUM(Ibm128)
+};
+
 /// Fields controlling how types are laid out in memory; these may need to
 /// be copied for targets like AMDGPU that base their ABIs on an auxiliary
 /// CPU target.
@@ -64,10 +88,11 @@ struct TransferrableTargetInfo {
   unsigned char BFloat16Width, BFloat16Align;
   unsigned char FloatWidth, FloatAlign;
   unsigned char DoubleWidth, DoubleAlign;
-  unsigned char LongDoubleWidth, LongDoubleAlign, Float128Align;
+  unsigned char LongDoubleWidth, LongDoubleAlign, Float128Align, Ibm128Align;
   unsigned char LargeArrayMinWidth, LargeArrayAlign;
   unsigned char LongWidth, LongAlign;
   unsigned char LongLongWidth, LongLongAlign;
+  unsigned char Int128Align;
 
   // Fixed point bit widths
   unsigned char ShortAccumWidth, ShortAccumAlign;
@@ -95,16 +120,16 @@ struct TransferrableTargetInfo {
   unsigned char AccumScale;
   unsigned char LongAccumScale;
 
-  unsigned char SuitableAlign;
   unsigned char DefaultAlignForAttributeAligned;
   unsigned char MinGlobalAlign;
 
+  unsigned short SuitableAlign;
   unsigned short NewAlign;
   unsigned MaxVectorAlign;
   unsigned MaxTLSAlign;
 
   const llvm::fltSemantics *HalfFormat, *BFloat16Format, *FloatFormat,
-    *DoubleFormat, *LongDoubleFormat, *Float128Format;
+      *DoubleFormat, *LongDoubleFormat, *Float128Format, *Ibm128Format;
 
   ///===---- Target Data Type Query Methods -------------------------------===//
   enum IntType {
@@ -121,13 +146,6 @@ struct TransferrableTargetInfo {
     UnsignedLongLong
   };
 
-  enum RealType {
-    NoFloat = 255,
-    Float = 0,
-    Double,
-    LongDouble,
-    Float128
-  };
 protected:
   IntType SizeType, IntMaxType, PtrDiffType, IntPtrType, WCharType, WIntType,
       Char16Type, Char32Type, Int64Type, Int16Type, SigAtomicType,
@@ -197,9 +215,13 @@ protected:
   bool NoAsmVariants;  // True if {|} are normal characters.
   bool HasLegalHalfType; // True if the backend supports operations on the half
                          // LLVM IR type.
+  bool HalfArgsAndReturns;
   bool HasFloat128;
   bool HasFloat16;
   bool HasBFloat16;
+  bool HasIbm128;
+  bool HasLongDouble;
+  bool HasFPReturn;
   bool HasStrictFP;
 
   unsigned char MaxAtomicPromoteWidth, MaxAtomicInlineWidth;
@@ -210,15 +232,12 @@ protected:
   unsigned char RegParmMax, SSERegParmMax;
   TargetCXXABI TheCXXABI;
   const LangASMap *AddrSpaceMap;
-  const unsigned *GridValues =
-      nullptr; // Array of target-specific GPU grid values that must be
-               // consistent between host RTL (plugin), device RTL, and clang.
 
   mutable StringRef PlatformName;
   mutable VersionTuple PlatformMinVersion;
 
   unsigned HasAlignMac68kSupport : 1;
-  unsigned RealTypeUsesObjCFPRet : 3;
+  unsigned RealTypeUsesObjCFPRetMask : llvm::BitWidth<FloatModeKind>;
   unsigned ComplexLongDoubleUsesFP2Ret : 1;
 
   unsigned HasBuiltinMSVaList : 1;
@@ -235,6 +254,10 @@ protected:
 
   unsigned MaxOpenCLWorkGroupSize;
 
+  std::optional<unsigned> MaxBitIntWidth;
+
+  std::optional<llvm::Triple> DarwinTargetVariantTriple;
+
   // TargetInfo Constructor.  Default initializes all fields.
   TargetInfo(const llvm::Triple &T);
 
@@ -333,10 +356,11 @@ public:
   IntType getUIntMaxType() const {
     return getCorrespondingUnsignedType(IntMaxType);
   }
-  IntType getPtrDiffType(unsigned AddrSpace) const {
-    return AddrSpace == 0 ? PtrDiffType : getPtrDiffTypeV(AddrSpace);
+  IntType getPtrDiffType(LangAS AddrSpace) const {
+    return AddrSpace == LangAS::Default ? PtrDiffType
+                                        : getPtrDiffTypeV(AddrSpace);
   }
-  IntType getUnsignedPtrDiffType(unsigned AddrSpace) const {
+  IntType getUnsignedPtrDiffType(LangAS AddrSpace) const {
     return getCorrespondingUnsignedType(getPtrDiffType(AddrSpace));
   }
   IntType getIntPtrType() const { return IntPtrType; }
@@ -401,7 +425,8 @@ public:
   /// is represented as one of those two). At this time, there is no support
   /// for an explicit "PPC double-double" type (i.e. __ibm128) so we only
   /// need to differentiate between "long double" and IEEE quad precision.
-  RealType getRealTypeByWidth(unsigned BitWidth, bool ExplicitIEEE) const;
+  FloatModeKind getRealTypeByWidth(unsigned BitWidth,
+                                   FloatModeKind ExplicitType) const;
 
   /// Return the alignment (in bits) of the specified integer type enum.
   ///
@@ -413,11 +438,13 @@ public:
 
   /// Return the width of pointers on this target, for the
   /// specified address space.
-  uint64_t getPointerWidth(unsigned AddrSpace) const {
-    return AddrSpace == 0 ? PointerWidth : getPointerWidthV(AddrSpace);
+  uint64_t getPointerWidth(LangAS AddrSpace) const {
+    return AddrSpace == LangAS::Default ? PointerWidth
+                                        : getPointerWidthV(AddrSpace);
   }
-  uint64_t getPointerAlign(unsigned AddrSpace) const {
-    return AddrSpace == 0 ? PointerAlign : getPointerAlignV(AddrSpace);
+  uint64_t getPointerAlign(LangAS AddrSpace) const {
+    return AddrSpace == LangAS::Default ? PointerAlign
+                                        : getPointerAlignV(AddrSpace);
   }
 
   /// Return the maximum width of pointers on this target.
@@ -461,6 +488,9 @@ public:
   unsigned getLongLongWidth() const { return LongLongWidth; }
   unsigned getLongLongAlign() const { return LongLongAlign; }
 
+  /// getInt128Align() - Returns the alignment of Int128.
+  unsigned getInt128Align() const { return Int128Align; }
+
   /// getShortAccumWidth/Align - Return the size of 'signed short _Accum' and
   /// 'unsigned short _Accum' for this target, in bits.
   unsigned getShortAccumWidth() const { return ShortAccumWidth; }
@@ -576,18 +606,42 @@ public:
 
   /// Determine whether the __int128 type is supported on this target.
   virtual bool hasInt128Type() const {
-    return (getPointerWidth(0) >= 64) || getTargetOpts().ForceEnableInt128;
+    return (getPointerWidth(LangAS::Default) >= 64) ||
+           getTargetOpts().ForceEnableInt128;
   } // FIXME
 
-  /// Determine whether the _ExtInt type is supported on this target. This
+  /// Determine whether the _BitInt type is supported on this target. This
   /// limitation is put into place for ABI reasons.
-  virtual bool hasExtIntType() const {
+  /// FIXME: _BitInt is a required type in C23, so there's not much utility in
+  /// asking whether the target supported it or not; I think this should be
+  /// removed once backends have been alerted to the type and have had the
+  /// chance to do implementation work if needed.
+  virtual bool hasBitIntType() const {
     return false;
   }
 
+  // Different targets may support a different maximum width for the _BitInt
+  // type, depending on what operations are supported.
+  virtual size_t getMaxBitIntWidth() const {
+    // Consider -fexperimental-max-bitint-width= first.
+    if (MaxBitIntWidth)
+      return std::min<size_t>(*MaxBitIntWidth, llvm::IntegerType::MAX_INT_BITS);
+
+    // FIXME: this value should be llvm::IntegerType::MAX_INT_BITS, which is
+    // maximum bit width that LLVM claims its IR can support. However, most
+    // backends currently have a bug where they only support float to int
+    // conversion (and vice versa) on types that are <= 128 bits and crash
+    // otherwise. We're setting the max supported value to 128 to be
+    // conservative.
+    return 128;
+  }
+
   /// Determine whether _Float16 is supported on this target.
   virtual bool hasLegalHalfType() const { return HasLegalHalfType; }
 
+  /// Whether half args and returns are supported.
+  virtual bool allowHalfArgsAndReturns() const { return HalfArgsAndReturns; }
+
   /// Determine whether the __float128 type is supported on this target.
   virtual bool hasFloat128Type() const { return HasFloat128; }
 
@@ -597,6 +651,16 @@ public:
   /// Determine whether the _BFloat16 type is supported on this target.
   virtual bool hasBFloat16Type() const { return HasBFloat16; }
 
+  /// Determine whether the __ibm128 type is supported on this target.
+  virtual bool hasIbm128Type() const { return HasIbm128; }
+
+  /// Determine whether the long double type is supported on this target.
+  virtual bool hasLongDoubleType() const { return HasLongDouble; }
+
+  /// Determine whether return of a floating point value is supported
+  /// on this target.
+  virtual bool hasFPReturn() const { return HasFPReturn; }
+
   /// Determine whether constrained floating point is supported on this target.
   virtual bool hasStrictFP() const { return HasStrictFP; }
 
@@ -618,8 +682,8 @@ public:
   }
 
   /// Return the largest alignment for which a suitably-sized allocation with
-  /// '::operator new(size_t)' or 'malloc' is guaranteed to produce a
-  /// correctly-aligned pointer.
+  /// '::operator new(size_t)' is guaranteed to produce a correctly-aligned
+  /// pointer.
   unsigned getNewAlign() const {
     return NewAlign ? NewAlign : std::max(LongDoubleAlign, LongLongAlign);
   }
@@ -675,19 +739,34 @@ public:
     return *Float128Format;
   }
 
+  /// getIbm128Width/Align/Format - Return the size/align/format of
+  /// '__ibm128'.
+  unsigned getIbm128Width() const { return 128; }
+  unsigned getIbm128Align() const { return Ibm128Align; }
+  const llvm::fltSemantics &getIbm128Format() const { return *Ibm128Format; }
+
   /// Return the mangled code of long double.
   virtual const char *getLongDoubleMangling() const { return "e"; }
 
   /// Return the mangled code of __float128.
   virtual const char *getFloat128Mangling() const { return "g"; }
 
+  /// Return the mangled code of __ibm128.
+  virtual const char *getIbm128Mangling() const {
+    llvm_unreachable("ibm128 not implemented on this target");
+  }
+
   /// Return the mangled code of bfloat.
   virtual const char *getBFloat16Mangling() const {
     llvm_unreachable("bfloat not implemented on this target");
   }
 
   /// Return the value for the C99 FLT_EVAL_METHOD macro.
-  virtual unsigned getFloatEvalMethod() const { return 0; }
+  virtual LangOptions::FPEvalMethodKind getFPEvalMethod() const {
+    return LangOptions::FPEvalMethodKind::FEM_Source;
+  }
+
+  virtual bool supportSourceEvalMethod() const { return true; }
 
   // getLargeArrayMinWidth/Align - Return the minimum array size that is
   // 'large' and its alignment.
@@ -743,7 +822,9 @@ public:
   }
 
   // Return the size of unwind_word for this target.
-  virtual unsigned getUnwindWordWidth() const { return getPointerWidth(0); }
+  virtual unsigned getUnwindWordWidth() const {
+    return getPointerWidth(LangAS::Default);
+  }
 
   /// Return the "preferred" register width on this target.
   virtual unsigned getRegisterWidth() const {
@@ -833,8 +914,8 @@ public:
 
   /// Check whether the given real type should use the "fpret" flavor of
   /// Objective-C message passing on this target.
-  bool useObjCFPRetForRealType(RealType T) const {
-    return RealTypeUsesObjCFPRet & (1 << T);
+  bool useObjCFPRetForRealType(FloatModeKind T) const {
+    return (int)((FloatModeKind)RealTypeUsesObjCFPRetMask & T);
   }
 
   /// Check whether _Complex long double should use the "fp2ret" flavor
@@ -870,6 +951,11 @@ public:
   /// across the current set of primary and secondary targets.
   virtual ArrayRef<Builtin::Info> getTargetBuiltins() const = 0;
 
+  /// Returns target-specific min and max values VScale_Range.
+  virtual std::optional<std::pair<unsigned, unsigned>>
+  getVScaleRange(const LangOptions &LangOpts) const {
+    return std::nullopt;
+  }
   /// The __builtin_clz* and __builtin_ctz* built-in
   /// functions are specified to have undefined results for zero inputs, but
   /// on targets that support these operations in a way that provides
@@ -993,8 +1079,7 @@ public:
     }
     bool isValidAsmImmediate(const llvm::APInt &Value) const {
       if (!ImmSet.empty())
-        return Value.isSignedIntN(32) &&
-               ImmSet.count(Value.getZExtValue()) != 0;
+        return Value.isSignedIntN(32) && ImmSet.contains(Value.getZExtValue());
       return !ImmRange.isConstrained ||
              (Value.sge(ImmRange.Min) && Value.sle(ImmRange.Max));
     }
@@ -1093,8 +1178,8 @@ public:
 
   /// Replace some escaped characters with another string based on
   /// target-specific rules
-  virtual llvm::Optional<std::string> handleAsmEscapedChar(char C) const {
-    return llvm::None;
+  virtual std::optional<std::string> handleAsmEscapedChar(char C) const {
+    return std::nullopt;
   }
 
   /// Returns a string of target-specific clobbers, in LLVM format.
@@ -1112,7 +1197,9 @@ public:
   }
 
   /// Returns the target ID if supported.
-  virtual llvm::Optional<std::string> getTargetID() const { return llvm::None; }
+  virtual std::optional<std::string> getTargetID() const {
+    return std::nullopt;
+  }
 
   const char *getDataLayoutString() const {
     assert(!DataLayoutString.empty() && "Uninitialized DataLayout!");
@@ -1145,12 +1232,12 @@ public:
   /// Microsoft C++ code using dllimport/export attributes?
   virtual bool shouldDLLImportComdatSymbols() const {
     return getTriple().isWindowsMSVCEnvironment() ||
-           getTriple().isWindowsItaniumEnvironment() || getTriple().isPS4CPU();
+           getTriple().isWindowsItaniumEnvironment() || getTriple().isPS();
   }
 
   // Does this target have PS4 specific dllimport/export handling?
   virtual bool hasPS4DLLImportExport() const {
-    return getTriple().isPS4CPU() ||
+    return getTriple().isPS() ||
            // Windows Itanium support allows for testing the SCEI flavour of
            // dllimport/export handling on a Windows system.
            (getTriple().isWindowsItaniumEnvironment() &&
@@ -1210,6 +1297,8 @@ public:
     return isValidCPUName(Name);
   }
 
+  virtual ParsedTargetAttr parseTargetAttr(StringRef Str) const;
+
   /// brief Determine whether this TargetInfo supports tune in target attribute.
   virtual bool supportsTargetAttributeTune() const {
     return false;
@@ -1248,6 +1337,13 @@ public:
     return true;
   }
 
+  /// Returns true if feature has an impact on target code
+  /// generation and get its dependent options in second argument.
+  virtual bool getFeatureDepOptions(StringRef Feature,
+                                    std::string &Options) const {
+    return true;
+  }
+
   struct BranchProtectionInfo {
     LangOptions::SignReturnAddressScopeKind SignReturnAddr =
         LangOptions::SignReturnAddressScopeKind::None;
@@ -1256,9 +1352,15 @@ public:
     bool BranchTargetEnforcement = false;
   };
 
+  /// Determine if the Architecture in this TargetInfo supports branch
+  /// protection
+  virtual bool isBranchProtectionSupportedArch(StringRef Arch) const {
+    return false;
+  }
+
   /// Determine if this TargetInfo supports the given branch protection
   /// specification
-  virtual bool validateBranchProtection(StringRef Spec,
+  virtual bool validateBranchProtection(StringRef Spec, StringRef Arch,
                                         BranchProtectionInfo &BPI,
                                         StringRef &Err) const {
     Err = "";
@@ -1288,10 +1390,14 @@ public:
 
   /// Identify whether this target supports multiversioning of functions,
   /// which requires support for cpu_supports and cpu_is functionality.
-  bool supportsMultiVersioning() const { return getTriple().isX86(); }
+  bool supportsMultiVersioning() const {
+    return getTriple().isX86() || getTriple().isAArch64();
+  }
 
   /// Identify whether this target supports IFuncs.
-  bool supportsIFunc() const { return getTriple().isOSBinFormatELF(); }
+  bool supportsIFunc() const {
+    return getTriple().isOSBinFormatELF() && !getTriple().isOSFuchsia();
+  }
 
   // Validate the contents of the __builtin_cpu_supports(const char*)
   // argument.
@@ -1303,6 +1409,10 @@ public:
     return 0;
   }
 
+  // Return the target-specific cost for feature
+  // that taken into account in priority sorting.
+  virtual unsigned multiVersionFeatureCost() const { return 0; }
+
   // Validate the contents of the __builtin_cpu_is(const char*)
   // argument.
   virtual bool validateCpuIs(StringRef Name) const { return false; }
@@ -1319,6 +1429,13 @@ public:
         "cpu_specific Multiversioning not implemented on this target");
   }
 
+  // Get the value for the 'tune-cpu' flag for a cpu_specific variant with the
+  // programmer-specified 'Name'.
+  virtual StringRef getCPUSpecificTuneName(StringRef Name) const {
+    llvm_unreachable(
+        "cpu_specific Multiversioning not implemented on this target");
+  }
+
   // Get a list of the features that make up the CPU option for
   // cpu_specific/cpu_dispatch so that it can be passed to llvm as optimization
   // options.
@@ -1329,8 +1446,10 @@ public:
   }
 
   // Get the cache line size of a given cpu. This method switches over
-  // the given cpu and returns "None" if the CPU is not found.
-  virtual Optional<unsigned> getCPUCacheLineSize() const { return None; }
+  // the given cpu and returns "std::nullopt" if the CPU is not found.
+  virtual std::optional<unsigned> getCPUCacheLineSize() const {
+    return std::nullopt;
+  }
 
   // Returns maximal number of args passed in registers.
   unsigned getRegParmMax() const {
@@ -1383,6 +1502,11 @@ public:
   }
 
   const LangASMap &getAddressSpaceMap() const { return *AddrSpaceMap; }
+  unsigned getTargetAddressSpace(LangAS AS) const {
+    if (isTargetAddressSpace(AS))
+      return toTargetAddressSpace(AS);
+    return getAddressSpaceMap()[(unsigned)AS];
+  }
 
   /// Map from the address space field in builtin description strings to the
   /// language address space.
@@ -1399,15 +1523,15 @@ public:
   /// Return an AST address space which can be used opportunistically
   /// for constant global memory. It must be possible to convert pointers into
   /// this address space to LangAS::Default. If no such address space exists,
-  /// this may return None, and such optimizations will be disabled.
-  virtual llvm::Optional<LangAS> getConstantAddressSpace() const {
+  /// this may return std::nullopt, and such optimizations will be disabled.
+  virtual std::optional<LangAS> getConstantAddressSpace() const {
     return LangAS::Default;
   }
 
-  /// Return a target-specific GPU grid value based on the GVIDX enum \p gv
-  unsigned getGridValue(llvm::omp::GVIDX gv) const {
-    assert(GridValues != nullptr && "GridValues not initialized");
-    return GridValues[gv];
+  // access target-specific GPU grid values that must be consistent between
+  // host RTL (plugin), deviceRTL and clang.
+  virtual const llvm::omp::GV &getGridValue() const {
+    llvm_unreachable("getGridValue not implemented on this target");
   }
 
   /// Retrieve the name of the platform as it is used in the
@@ -1464,6 +1588,14 @@ public:
 
   virtual CallingConvKind getCallingConvKind(bool ClangABICompat4) const;
 
+  /// Controls whether explicitly defaulted (`= default`) special member
+  /// functions disqualify something from being POD-for-the-purposes-of-layout.
+  /// Historically, Clang didn't consider these acceptable for POD, but GCC
+  /// does. So in newer Clang ABIs they are acceptable for POD to be compatible
+  /// with GCC/Itanium ABI, and remains disqualifying for targets that need
+  /// Clang backwards compatibility rather than GCC/Itanium ABI compatibility.
+  virtual bool areDefaultedSMFStillPOD(const LangOptions&) const;
+
   /// Controls if __builtin_longjmp / __builtin_setjmp can be lowered to
   /// llvm.eh.sjlj.longjmp / llvm.eh.sjlj.setjmp.
   virtual bool hasSjLjLowering() const {
@@ -1474,7 +1606,7 @@ public:
   virtual bool
   checkCFProtectionBranchSupported(DiagnosticsEngine &Diags) const;
 
-  /// Check if the target supports CFProtection branch.
+  /// Check if the target supports CFProtection return.
   virtual bool
   checkCFProtectionReturnSupported(DiagnosticsEngine &Diags) const;
 
@@ -1531,10 +1663,11 @@ public:
   /// space \p AddressSpace to be converted in order to be used, then return the
   /// corresponding target specific DWARF address space.
   ///
-  /// \returns Otherwise return None and no conversion will be emitted in the
-  /// DWARF.
-  virtual Optional<unsigned> getDWARFAddressSpace(unsigned AddressSpace) const {
-    return None;
+  /// \returns Otherwise return std::nullopt and no conversion will be emitted
+  /// in the DWARF.
+  virtual std::optional<unsigned> getDWARFAddressSpace(unsigned AddressSpace)
+      const {
+    return std::nullopt;
   }
 
   /// \returns The version of the SDK which was used during the compilation if
@@ -1558,22 +1691,36 @@ public:
   /// Whether target allows debuginfo types for decl only variables/functions.
   virtual bool allowDebugInfoForExternalRef() const { return false; }
 
+  /// Returns the darwin target variant triple, the variant of the deployment
+  /// target for which the code is being compiled.
+  const llvm::Triple *getDarwinTargetVariantTriple() const {
+    return DarwinTargetVariantTriple ? &*DarwinTargetVariantTriple : nullptr;
+  }
+
+  /// Returns the version of the darwin target variant SDK which was used during
+  /// the compilation if one was specified, or an empty version otherwise.
+  const std::optional<VersionTuple> getDarwinTargetVariantSDKVersion() const {
+    return !getTargetOpts().DarwinTargetVariantSDKVersion.empty()
+               ? getTargetOpts().DarwinTargetVariantSDKVersion
+               : std::optional<VersionTuple>();
+  }
+
 protected:
   /// Copy type and layout related info.
   void copyAuxTarget(const TargetInfo *Aux);
-  virtual uint64_t getPointerWidthV(unsigned AddrSpace) const {
+  virtual uint64_t getPointerWidthV(LangAS AddrSpace) const {
     return PointerWidth;
   }
-  virtual uint64_t getPointerAlignV(unsigned AddrSpace) const {
+  virtual uint64_t getPointerAlignV(LangAS AddrSpace) const {
     return PointerAlign;
   }
-  virtual enum IntType getPtrDiffTypeV(unsigned AddrSpace) const {
+  virtual enum IntType getPtrDiffTypeV(LangAS AddrSpace) const {
     return PtrDiffType;
   }
   virtual ArrayRef<const char *> getGCCRegNames() const = 0;
   virtual ArrayRef<GCCRegAlias> getGCCRegAliases() const = 0;
   virtual ArrayRef<AddlRegName> getGCCAddlRegNames() const {
-    return None;
+    return std::nullopt;
   }
 
  private:
diff --git a/gnu/llvm/clang/include/clang/Basic/X86Target.def b/gnu/llvm/clang/include/clang/Basic/X86Target.def
deleted file mode 100644
index 70f3879f33a..00000000000
--- a/gnu/llvm/clang/include/clang/Basic/X86Target.def
+++ /dev/null
@@ -1,110 +0,0 @@
-//===--- X86Target.def - X86 Feature/Processor Database ---------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file defines the X86-specific Features and Processors, as used by
-// the X86 Targets.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef FEATURE
-#define FEATURE(ENUM)
-#endif
-
-#ifndef CPU_SPECIFIC
-#define CPU_SPECIFIC(NAME, MANGLING, FEATURES)
-#endif
-
-#ifndef CPU_SPECIFIC_ALIAS
-#define CPU_SPECIFIC_ALIAS(NEW_NAME, NAME)
-#endif
-
-// List of CPU Supports features in order.  These need to remain in the order
-// required by attribute 'target' checking.  Note that not all are supported/
-// prioritized by GCC, so synchronization with GCC's implementation may require
-// changing some existing values.
-FEATURE(FEATURE_CMOV)
-FEATURE(FEATURE_MMX)
-FEATURE(FEATURE_SSE)
-FEATURE(FEATURE_SSE2)
-FEATURE(FEATURE_SSE3)
-FEATURE(FEATURE_SSSE3)
-FEATURE(FEATURE_SSE4_A)
-FEATURE(FEATURE_SSE4_1)
-FEATURE(FEATURE_SSE4_2)
-FEATURE(FEATURE_POPCNT)
-FEATURE(FEATURE_AES)
-FEATURE(FEATURE_PCLMUL)
-FEATURE(FEATURE_AVX)
-FEATURE(FEATURE_BMI)
-FEATURE(FEATURE_FMA4)
-FEATURE(FEATURE_XOP)
-FEATURE(FEATURE_FMA)
-FEATURE(FEATURE_BMI2)
-FEATURE(FEATURE_AVX2)
-FEATURE(FEATURE_AVX512F)
-FEATURE(FEATURE_AVX512VL)
-FEATURE(FEATURE_AVX512BW)
-FEATURE(FEATURE_AVX512DQ)
-FEATURE(FEATURE_AVX512CD)
-FEATURE(FEATURE_AVX512ER)
-FEATURE(FEATURE_AVX512PF)
-FEATURE(FEATURE_AVX512VBMI)
-FEATURE(FEATURE_AVX512IFMA)
-FEATURE(FEATURE_AVX5124VNNIW)
-FEATURE(FEATURE_AVX5124FMAPS)
-FEATURE(FEATURE_AVX512VPOPCNTDQ)
-FEATURE(FEATURE_AVX512VBMI2)
-FEATURE(FEATURE_GFNI)
-FEATURE(FEATURE_VPCLMULQDQ)
-FEATURE(FEATURE_AVX512VNNI)
-FEATURE(FEATURE_AVX512BITALG)
-FEATURE(FEATURE_AVX512BF16)
-FEATURE(FEATURE_AVX512VP2INTERSECT)
-
-
-// FIXME: When commented out features are supported in LLVM, enable them here.
-CPU_SPECIFIC("generic", 'A', "")
-CPU_SPECIFIC("pentium", 'B', "")
-CPU_SPECIFIC("pentium_pro", 'C', "+cmov")
-CPU_SPECIFIC("pentium_mmx", 'D', "+mmx")
-CPU_SPECIFIC("pentium_ii", 'E', "+cmov,+mmx")
-CPU_SPECIFIC("pentium_iii", 'H', "+cmov,+mmx,+sse")
-CPU_SPECIFIC_ALIAS("pentium_iii_no_xmm_regs", "pentium_iii")
-CPU_SPECIFIC("pentium_4", 'J', "+cmov,+mmx,+sse,+sse2")
-CPU_SPECIFIC("pentium_m", 'K', "+cmov,+mmx,+sse,+sse2")
-CPU_SPECIFIC("pentium_4_sse3", 'L', "+cmov,+mmx,+sse,+sse2,+sse3")
-CPU_SPECIFIC("core_2_duo_ssse3", 'M', "+cmov,+mmx,+sse,+sse2,+sse3,+ssse3")
-CPU_SPECIFIC("core_2_duo_sse4_1", 'N', "+cmov,+mmx,+sse,+sse2,+sse3,+ssse3,+sse4.1")
-CPU_SPECIFIC("atom", 'O', "+cmov,+mmx,+sse,+sse2,+sse3,+ssse3,+movbe")
-CPU_SPECIFIC("atom_sse4_2", 'c', "+cmov,+mmx,+sse,+sse2,+sse3,+ssse3,+sse4.1,+sse4.2,+popcnt")
-CPU_SPECIFIC("core_i7_sse4_2", 'P', "+cmov,+mmx,+sse,+sse2,+sse3,+ssse3,+sse4.1,+sse4.2,+popcnt")
-CPU_SPECIFIC("core_aes_pclmulqdq", 'Q', "+cmov,+mmx,+sse,+sse2,+sse3,+ssse3,+sse4.1,+sse4.2,+popcnt")
-CPU_SPECIFIC("atom_sse4_2_movbe", 'd', "+cmov,+mmx,+sse,+sse2,+sse3,+ssse3,+sse4.1,+sse4.2,+movbe,+popcnt")
-CPU_SPECIFIC("goldmont", 'i', "+cmov,+mmx,+sse,+sse2,+sse3,+ssse3,+sse4.1,+sse4.2,+movbe,+popcnt")
-CPU_SPECIFIC("sandybridge", 'R', "+cmov,+mmx,+sse,+sse2,+sse3,+ssse3,+sse4.1,+sse4.2,+popcnt,+avx")
-CPU_SPECIFIC_ALIAS("core_2nd_gen_avx", "sandybridge")
-CPU_SPECIFIC("ivybridge", 'S', "+cmov,+mmx,+sse,+sse2,+sse3,+ssse3,+sse4.1,+sse4.2,+popcnt,+f16c,+avx")
-CPU_SPECIFIC_ALIAS("core_3rd_gen_avx", "ivybridge")
-CPU_SPECIFIC("haswell", 'V', "+cmov,+mmx,+sse,+sse2,+sse3,+ssse3,+sse4.1,+sse4.2,+movbe,+popcnt,+f16c,+avx,+fma,+bmi,+lzcnt,+avx2")
-CPU_SPECIFIC_ALIAS("core_4th_gen_avx", "haswell")
-CPU_SPECIFIC("core_4th_gen_avx_tsx", 'W', "+cmov,+mmx,+sse,+sse2,+sse3,+ssse3,+sse4.1,+sse4.2,+movbe,+popcnt,+f16c,+avx,+fma,+bmi,+lzcnt,+avx2")
-CPU_SPECIFIC("broadwell", 'X', "+cmov,+mmx,+sse,+sse2,+sse3,+ssse3,+sse4.1,+sse4.2,+movbe,+popcnt,+f16c,+avx,+fma,+bmi,+lzcnt,+avx2,+adx")
-CPU_SPECIFIC_ALIAS("core_5th_gen_avx", "broadwell")
-CPU_SPECIFIC("core_5th_gen_avx_tsx", 'Y', "+cmov,+mmx,+sse,+sse2,+sse3,+ssse3,+sse4.1,+sse4.2,+movbe,+popcnt,+f16c,+avx,+fma,+bmi,+lzcnt,+avx2,+adx")
-CPU_SPECIFIC("knl", 'Z', "+cmov,+mmx,+sse,+sse2,+sse3,+ssse3,+sse4.1,+sse4.2,+movbe,+popcnt,+f16c,+avx,+fma,+bmi,+lzcnt,+avx2,+avx512f,+adx,+avx512er,+avx512pf,+avx512cd")
-CPU_SPECIFIC_ALIAS("mic_avx512", "knl")
-CPU_SPECIFIC("skylake", 'b', "+cmov,+mmx,+sse,+sse2,+sse3,+ssse3,+sse4.1,+sse4.2,+movbe,+popcnt,+f16c,+avx,+fma,+bmi,+lzcnt,+avx2,+adx,+mpx")
-CPU_SPECIFIC( "skylake_avx512", 'a', "+cmov,+mmx,+sse,+sse2,+sse3,+ssse3,+sse4.1,+sse4.2,+movbe,+popcnt,+f16c,+avx,+fma,+bmi,+lzcnt,+avx2,+avx512dq,+avx512f,+adx,+avx512cd,+avx512bw,+avx512vl,+clwb")
-CPU_SPECIFIC("cannonlake", 'e', "+cmov,+mmx,+sse,+sse2,+sse3,+ssse3,+sse4.1,+sse4.2,+movbe,+popcnt,+f16c,+avx,+fma,+bmi,+lzcnt,+avx2,+avx512dq,+avx512f,+adx,+avx512ifma,+avx512cd,+avx512bw,+avx512vl,+avx512vbmi")
-CPU_SPECIFIC("knm", 'j', "+cmov,+mmx,+sse,+sse2,+sse3,+ssse3,+sse4.1,+sse4.2,+movbe,+popcnt,+f16c,+avx,+fma,+bmi,+lzcnt,+avx2,+avx512f,+adx,+avx512er,+avx512pf,+avx512cd,+avx5124fmaps,+avx5124vnniw,+avx512vpopcntdq")
-
-#undef CPU_SPECIFIC_ALIAS
-#undef CPU_SPECIFIC
-#undef PROC_64_BIT
-#undef PROC_32_BIT
-#undef FEATURE
diff --git a/gnu/llvm/clang/include/clang/Driver/Options.td b/gnu/llvm/clang/include/clang/Driver/Options.td
index 6ef514b5f4b..7a299510905 100644
--- a/gnu/llvm/clang/include/clang/Driver/Options.td
+++ b/gnu/llvm/clang/include/clang/Driver/Options.td
@@ -49,6 +49,14 @@ def CC1Option : OptionFlag;
 // CC1AsOption - This option should be accepted by clang -cc1as.
 def CC1AsOption : OptionFlag;
 
+// DXCOption - This is a dxc.exe compatibility option. Options with this flag
+// are made available when the driver is running in DXC compatibility mode.
+def DXCOption : OptionFlag;
+
+// CLDXCOption - This is a cl.exe/dxc.exe compatibility option. Options with this flag
+// are made available when the driver is running in CL/DXC compatibility mode.
+def CLDXCOption : OptionFlag;
+
 // NoDriverOption - This option should not be accepted by the driver.
 def NoDriverOption : OptionFlag;
 
@@ -156,6 +164,8 @@ def m_arm_Features_Group : OptionGroup<"<arm features group>">,
                            Group<m_Group>, DocName<"ARM">;
 def m_hexagon_Features_Group : OptionGroup<"<hexagon features group>">,
                                Group<m_Group>, DocName<"Hexagon">;
+def m_sparc_Features_Group : OptionGroup<"<sparc features group>">,
+                               Group<m_Group>, DocName<"SPARC">;
 // The features added by this group will not be added to target features.
 // These are explicitly handled.
 def m_hexagon_Features_HVX_Group : OptionGroup<"<hexagon features group>">,
@@ -239,6 +249,12 @@ def : Flag<["-"], "fno-slp-vectorize-aggressive">, Group<clang_ignored_legacy_op
 def mmpx : Flag<["-"], "mmpx">, Group<clang_ignored_legacy_options_Group>;
 def mno_mpx : Flag<["-"], "mno-mpx">, Group<clang_ignored_legacy_options_Group>;
 
+// Retired with clang-16.0, to provide a deprecation period; it should
+// be removed in Clang 18 or later.
+def enable_trivial_var_init_zero : Flag<["-"], "enable-trivial-auto-var-init-zero-knowing-it-will-be-removed-from-clang">,
+  Flags<[CC1Option, CoreOption, NoArgumentUnused]>,
+  Group<clang_ignored_legacy_options_Group>;
+
 // Group that ignores all gcc optimizations that won't be implemented
 def clang_ignored_gcc_optimization_f_Group : OptionGroup<
   "<clang_ignored_gcc_optimization_f_Group>">, Group<f_Group>, Flags<[Ignored]>;
@@ -272,7 +288,7 @@ class MigratorOpts<string base>
 // Args.hasArg(OPT_ffoo) can be used to check that the flag is enabled.
 // This is useful if the option is usually disabled.
 // Use this only when the option cannot be declared via BoolFOption.
-multiclass OptInFFlag<string name, string pos_prefix, string neg_prefix="",
+multiclass OptInCC1FFlag<string name, string pos_prefix, string neg_prefix="",
                       string help="", list<OptionFlag> flags=[]> {
   def f#NAME : Flag<["-"], "f"#name>, Flags<[CC1Option] # flags>,
                Group<f_Group>, HelpText<pos_prefix # help>;
@@ -283,7 +299,7 @@ multiclass OptInFFlag<string name, string pos_prefix, string neg_prefix="",
 // A boolean option which is opt-out in CC1. The negative option exists in CC1 and
 // Args.hasArg(OPT_fno_foo) can be used to check that the flag is disabled.
 // Use this only when the option cannot be declared via BoolFOption.
-multiclass OptOutFFlag<string name, string pos_prefix, string neg_prefix,
+multiclass OptOutCC1FFlag<string name, string pos_prefix, string neg_prefix,
                        string help="", list<OptionFlag> flags=[]> {
   def f#NAME : Flag<["-"], "f"#name>, Flags<flags>,
                Group<f_Group>, HelpText<pos_prefix # help>;
@@ -291,6 +307,27 @@ multiclass OptOutFFlag<string name, string pos_prefix, string neg_prefix,
                   Group<f_Group>, HelpText<neg_prefix # help>;
 }
 
+// A boolean option which is opt-in in FC1. The positive option exists in FC1 and
+// Args.hasArg(OPT_ffoo) can be used to check that the flag is enabled.
+// This is useful if the option is usually disabled.
+multiclass OptInFC1FFlag<string name, string pos_prefix, string neg_prefix="",
+                      string help="", list<OptionFlag> flags=[]> {
+  def f#NAME : Flag<["-"], "f"#name>, Flags<[FC1Option] # flags>,
+               Group<f_Group>, HelpText<pos_prefix # help>;
+  def fno_#NAME : Flag<["-"], "fno-"#name>, Flags<flags>,
+                  Group<f_Group>, HelpText<neg_prefix # help>;
+}
+
+// A boolean option which is opt-out in FC1. The negative option exists in FC1 and
+// Args.hasArg(OPT_fno_foo) can be used to check that the flag is disabled.
+multiclass OptOutFC1FFlag<string name, string pos_prefix, string neg_prefix,
+                       string help="", list<OptionFlag> flags=[]> {
+  def f#NAME : Flag<["-"], "f"#name>, Flags<flags>,
+               Group<f_Group>, HelpText<pos_prefix # help>;
+  def fno_#NAME : Flag<["-"], "fno-"#name>, Flags<[FC1Option] # flags>,
+                  Group<f_Group>, HelpText<neg_prefix # help>;
+}
+
 // Creates a positive and negative flags where both of them are prefixed with
 // "m", have help text specified for positive and negative option, and a Group
 // optionally specified by the opt_group argument, otherwise Group<m_Group>.
@@ -386,8 +423,7 @@ class MarshalledFlagRec<FlagDefExpanded flag, FlagDefExpanded other,
                         Default default>
   : Flag<["-"], flag.Spelling>, Flags<flag.OptionFlags>, HelpText<flag.Help>,
     MarshallingInfoBooleanFlag<kpm, default.Value, flag.ValueAsCode,
-                               flag.RecordName, other.ValueAsCode,
-                               other.RecordName>,
+                               other.ValueAsCode, other.RecordName>,
     ImpliedByAnyOf<implied.ImpliedBy, implied.ValueAsCode> {}
 
 // Generates TableGen records for two command line flags that control the same
@@ -467,7 +503,7 @@ defvar render_script = LangOpts<"RenderScript">;
 defvar hip = LangOpts<"HIP">;
 defvar gnu_mode = LangOpts<"GNUMode">;
 defvar asm_preprocessor = LangOpts<"AsmPreprocessor">;
-defvar cpp_modules = LangOpts<"CPlusPlusModules">;
+defvar hlsl = LangOpts<"HLSL">;
 
 defvar std = !strconcat("LangStandard::getLangStandardForKind(", lang_std.KeyPath, ")");
 
@@ -535,7 +571,10 @@ def arcmt_migrate_report_output : Separate<["-"], "arcmt-migrate-report-output">
 def arcmt_migrate_emit_arc_errors : Flag<["-"], "arcmt-migrate-emit-errors">,
   HelpText<"Emit ARC errors even if the migrator can fix them">, Flags<[CC1Option]>,
   MarshallingInfoFlag<FrontendOpts<"ARCMTMigrateEmitARCErrors">>;
+def gen_reproducer_eq: Joined<["-"], "gen-reproducer=">, Flags<[NoArgumentUnused, CoreOption]>,
+  HelpText<"Emit reproducer on (option: off, crash (default), error, always)">;
 def gen_reproducer: Flag<["-"], "gen-reproducer">, InternalDebugOpt,
+  Alias<gen_reproducer_eq>, AliasArgs<["always"]>,
   HelpText<"Auto-generates preprocessed source files and a reproduction script">;
 def gen_cdb_fragment_path: Separate<["-"], "gen-cdb-fragment-path">, InternalDebugOpt,
   HelpText<"Emit a compilation database fragment to the specified directory">;
@@ -598,12 +637,15 @@ def objcmt_migrate_designated_init : Flag<["-"], "objcmt-migrate-designated-init
   HelpText<"Enable migration to infer NS_DESIGNATED_INITIALIZER for initializer methods">,
   MarshallingInfoBitfieldFlag<FrontendOpts<"ObjCMTAction">, "FrontendOptions::ObjCMT_DesignatedInitializer">;
 
-def objcmt_whitelist_dir_path: Joined<["-"], "objcmt-whitelist-dir-path=">, Flags<[CC1Option]>,
+def objcmt_allowlist_dir_path: Joined<["-"], "objcmt-allowlist-dir-path=">, Flags<[CC1Option]>,
   HelpText<"Only modify files with a filename contained in the provided directory path">,
-  MarshallingInfoString<FrontendOpts<"ObjCMTWhiteListPath">>;
+  MarshallingInfoString<FrontendOpts<"ObjCMTAllowListPath">>;
+def : Joined<["-"], "objcmt-whitelist-dir-path=">, Flags<[CC1Option]>,
+  HelpText<"Alias for -objcmt-allowlist-dir-path">,
+  Alias<objcmt_allowlist_dir_path>;
 // The misspelt "white-list" [sic] alias is due for removal.
 def : Joined<["-"], "objcmt-white-list-dir-path=">, Flags<[CC1Option]>,
-    Alias<objcmt_whitelist_dir_path>;
+  Alias<objcmt_allowlist_dir_path>;
 
 // Make sure all other -ccc- options are rejected.
 def ccc_ : Joined<["-"], "ccc-">, Group<internal_Group>, Flags<[Unsupported]>;
@@ -616,13 +658,14 @@ def _DASH_DASH : Option<["--"], "", KIND_REMAINING_ARGS>,
     Flags<[NoXarchOption, CoreOption]>;
 def A : JoinedOrSeparate<["-"], "A">, Flags<[RenderJoined]>, Group<gfortran_Group>;
 def B : JoinedOrSeparate<["-"], "B">, MetaVarName<"<prefix>">,
-    HelpText<"Search $prefix/$triple-$file and $prefix$file for executables, libraries, "
-    "includes, and data files used by the compiler. $prefix may or may not be a directory">;
+    HelpText<"Search $prefix$file for executables, libraries, and data files. "
+    "If $prefix is a directory, search $prefix/$file">;
+def gcc_install_dir_EQ : Joined<["--"], "gcc-install-dir=">,
+  HelpText<"Use GCC installation in the specified directory. The directory ends with path components like 'lib{,32,64}/gcc{,-cross}/$triple/$version'. "
+  "Note: executables (e.g. ld) used by the compiler are not overridden by the selected GCC installation">;
 def gcc_toolchain : Joined<["--"], "gcc-toolchain=">, Flags<[NoXarchOption]>,
-  HelpText<"Search for GCC installation in the specified directory on targets which commonly use GCC. "
-  "The directory usually contains 'lib{,32,64}/gcc{,-cross}/$triple' and 'include'. If specified, "
-  "sysroot is skipped for GCC detection. Note: executables (e.g. ld) used by the compiler are not "
-  "overridden by the selected GCC installation">;
+  HelpText<"Specify a directory where Clang can find 'include' and 'lib{,32,64}/gcc{,-cross}/$triple/$version'. "
+  "Clang will use the GCC installation with the largest version">;
 def CC : Flag<["-"], "CC">, Flags<[CC1Option]>, Group<Preprocessor_Group>,
     HelpText<"Include comments from within macros in preprocessed output">,
     MarshallingInfoFlag<PreprocessorOutputOpts<"ShowMacroComments">>;
@@ -692,16 +735,16 @@ def MV : Flag<["-"], "MV">, Group<M_Group>, Flags<[CC1Option]>,
     MarshallingInfoFlag<DependencyOutputOpts<"OutputFormat">, "DependencyOutputFormat::Make">,
     Normalizer<"makeFlagToValueNormalizer(DependencyOutputFormat::NMake)">;
 def Mach : Flag<["-"], "Mach">, Group<Link_Group>;
-def O0 : Flag<["-"], "O0">, Group<O_Group>, Flags<[CC1Option, HelpHidden]>;
-def O4 : Flag<["-"], "O4">, Group<O_Group>, Flags<[CC1Option, HelpHidden]>;
+def O0 : Flag<["-"], "O0">, Group<O_Group>, Flags<[CC1Option, FC1Option, HelpHidden]>;
+def O4 : Flag<["-"], "O4">, Group<O_Group>, Flags<[CC1Option, FC1Option, HelpHidden]>;
 def ObjCXX : Flag<["-"], "ObjC++">, Flags<[NoXarchOption]>,
   HelpText<"Treat source input files as Objective-C++ inputs">;
 def ObjC : Flag<["-"], "ObjC">, Flags<[NoXarchOption]>,
   HelpText<"Treat source input files as Objective-C inputs">;
-def O : Joined<["-"], "O">, Group<O_Group>, Flags<[CC1Option]>;
-def O_flag : Flag<["-"], "O">, Flags<[CC1Option]>, Alias<O>, AliasArgs<["1"]>;
-def Ofast : Joined<["-"], "Ofast">, Group<O_Group>, Flags<[CC1Option]>;
-def P : Flag<["-"], "P">, Flags<[CC1Option]>, Group<Preprocessor_Group>,
+def O : Joined<["-"], "O">, Group<O_Group>, Flags<[CC1Option,FC1Option]>;
+def O_flag : Flag<["-"], "O">, Flags<[CC1Option,FC1Option]>, Alias<O>, AliasArgs<["1"]>;
+def Ofast : Joined<["-"], "Ofast">, Group<O_Group>, Flags<[CC1Option, FlangOption]>;
+def P : Flag<["-"], "P">, Flags<[CC1Option,FlangOption,FC1Option]>, Group<Preprocessor_Group>,
   HelpText<"Disable linemarker output in -E mode">,
   MarshallingInfoNegativeFlag<PreprocessorOutputOpts<"ShowLineMarkers">>;
 def Qy : Flag<["-"], "Qy">, Flags<[CC1Option]>,
@@ -728,14 +771,8 @@ def Rpass_analysis_EQ : Joined<["-"], "Rpass-analysis=">, Group<R_value_Group>,
            "name matches the given POSIX regular expression">;
 def R_Joined : Joined<["-"], "R">, Group<R_Group>, Flags<[CC1Option, CoreOption]>,
   MetaVarName<"<remark>">, HelpText<"Enable the specified remark">;
-def S : Flag<["-"], "S">, Flags<[NoXarchOption,CC1Option]>, Group<Action_Group>,
+def S : Flag<["-"], "S">, Flags<[NoXarchOption,CC1Option,FlangOption,FC1Option]>, Group<Action_Group>,
   HelpText<"Only run preprocess and compilation steps">;
-def Tbss : JoinedOrSeparate<["-"], "Tbss">, Group<T_Group>,
-  MetaVarName<"<addr>">, HelpText<"Set starting address of BSS to <addr>">;
-def Tdata : JoinedOrSeparate<["-"], "Tdata">, Group<T_Group>,
-  MetaVarName<"<addr>">, HelpText<"Set starting address of DATA to <addr>">;
-def Ttext : JoinedOrSeparate<["-"], "Ttext">, Group<T_Group>,
-  MetaVarName<"<addr>">, HelpText<"Set starting address of TEXT to <addr>">;
 def T : JoinedOrSeparate<["-"], "T">, Group<T_Group>,
   MetaVarName<"<script>">, HelpText<"Specify <script> as linker script">;
 def U : JoinedOrSeparate<["-"], "U">, Group<Preprocessor_Group>,
@@ -746,6 +783,8 @@ def Wa_COMMA : CommaJoined<["-"], "Wa,">,
   MetaVarName<"<arg>">;
 def Wall : Flag<["-"], "Wall">, Group<W_Group>, Flags<[CC1Option, HelpHidden]>;
 def WCL4 : Flag<["-"], "WCL4">, Group<W_Group>, Flags<[CC1Option, HelpHidden]>;
+def Wsystem_headers : Flag<["-"], "Wsystem-headers">, Group<W_Group>, Flags<[CC1Option, HelpHidden]>;
+def Wno_system_headers : Flag<["-"], "Wno-system-headers">, Group<W_Group>, Flags<[CC1Option, HelpHidden]>;
 def Wdeprecated : Flag<["-"], "Wdeprecated">, Group<W_Group>, Flags<[CC1Option]>,
   HelpText<"Enable warnings for deprecated constructs and define __DEPRECATED">;
 def Wno_deprecated : Flag<["-"], "Wno-deprecated">, Group<W_Group>, Flags<[CC1Option]>;
@@ -780,42 +819,52 @@ def Xassembler : Separate<["-"], "Xassembler">,
   HelpText<"Pass <arg> to the assembler">, MetaVarName<"<arg>">,
   Group<CompileOnly_Group>;
 def Xclang : Separate<["-"], "Xclang">,
-  HelpText<"Pass <arg> to the clang compiler">, MetaVarName<"<arg>">,
+  HelpText<"Pass <arg> to clang -cc1">, MetaVarName<"<arg>">,
   Flags<[NoXarchOption, CoreOption]>, Group<CompileOnly_Group>;
+def : Joined<["-"], "Xclang=">, Group<CompileOnly_Group>, Flags<[NoXarchOption, CoreOption]>, Alias<Xclang>,
+  HelpText<"Alias for -Xclang">, MetaVarName<"<arg>">;
 def Xcuda_fatbinary : Separate<["-"], "Xcuda-fatbinary">,
   HelpText<"Pass <arg> to fatbinary invocation">, MetaVarName<"<arg>">;
 def Xcuda_ptxas : Separate<["-"], "Xcuda-ptxas">,
   HelpText<"Pass <arg> to the ptxas assembler">, MetaVarName<"<arg>">;
-def Xopenmp_target : Separate<["-"], "Xopenmp-target">,
+def Xopenmp_target : Separate<["-"], "Xopenmp-target">, Group<CompileOnly_Group>,
   HelpText<"Pass <arg> to the target offloading toolchain.">, MetaVarName<"<arg>">;
-def Xopenmp_target_EQ : JoinedAndSeparate<["-"], "Xopenmp-target=">,
+def Xopenmp_target_EQ : JoinedAndSeparate<["-"], "Xopenmp-target=">, Group<CompileOnly_Group>,
   HelpText<"Pass <arg> to the target offloading toolchain identified by <triple>.">,
   MetaVarName<"<triple> <arg>">;
-def z : Separate<["-"], "z">, Flags<[LinkerInput, RenderAsInput]>,
+def z : Separate<["-"], "z">, Flags<[LinkerInput]>,
   HelpText<"Pass -z <arg> to the linker">, MetaVarName<"<arg>">,
   Group<Link_Group>;
+def offload_link : Flag<["--"], "offload-link">, Group<Link_Group>,
+  HelpText<"Use the new offloading linker to perform the link job.">;
 def Xlinker : Separate<["-"], "Xlinker">, Flags<[LinkerInput, RenderAsInput]>,
   HelpText<"Pass <arg> to the linker">, MetaVarName<"<arg>">,
   Group<Link_Group>;
+def Xoffload_linker : JoinedAndSeparate<["-"], "Xoffload-linker">,
+  HelpText<"Pass <arg> to the offload linkers or the ones idenfied by -<triple>">,
+  MetaVarName<"<triple> <arg>">, Group<Link_Group>;
 def Xpreprocessor : Separate<["-"], "Xpreprocessor">, Group<Preprocessor_Group>,
   HelpText<"Pass <arg> to the preprocessor">, MetaVarName<"<arg>">;
 def X_Flag : Flag<["-"], "X">, Group<Link_Group>;
-def X_Joined : Joined<["-"], "X">, IgnoredGCCCompat;
+// Used by some macOS projects. IgnoredGCCCompat is a misnomer since GCC doesn't allow it.
+def : Flag<["-"], "Xparser">, IgnoredGCCCompat;
+// FIXME -Xcompiler is misused by some ChromeOS packages. Remove it after a while.
+def : Flag<["-"], "Xcompiler">, IgnoredGCCCompat;
 def Z_Flag : Flag<["-"], "Z">, Group<Link_Group>;
-// FIXME: All we do with this is reject it. Remove.
-def Z_Joined : Joined<["-"], "Z">;
 def all__load : Flag<["-"], "all_load">;
 def allowable__client : Separate<["-"], "allowable_client">;
 def ansi : Flag<["-", "--"], "ansi">, Group<CompileOnly_Group>;
 def arch__errors__fatal : Flag<["-"], "arch_errors_fatal">;
 def arch : Separate<["-"], "arch">, Flags<[NoXarchOption]>;
 def arch__only : Separate<["-"], "arch_only">;
-def a : Joined<["-"], "a">;
 def autocomplete : Joined<["--"], "autocomplete=">;
 def bind__at__load : Flag<["-"], "bind_at_load">;
 def bundle__loader : Separate<["-"], "bundle_loader">;
 def bundle : Flag<["-"], "bundle">;
-def b : JoinedOrSeparate<["-"], "b">, Flags<[Unsupported]>;
+def b : JoinedOrSeparate<["-"], "b">, Flags<[LinkerInput]>,
+  HelpText<"Pass -b <arg> to the linker on AIX">, MetaVarName<"<arg>">,
+  Group<Link_Group>;
+// OpenCL-only Options
 def cl_opt_disable : Flag<["-"], "cl-opt-disable">, Group<opencl_Group>, Flags<[CC1Option]>,
   HelpText<"OpenCL only. This option disables all optimizations. By default optimizations are enabled.">;
 def cl_strict_aliasing : Flag<["-"], "cl-strict-aliasing">, Group<opencl_Group>, Flags<[CC1Option]>,
@@ -843,7 +892,8 @@ def cl_no_signed_zeros : Flag<["-"], "cl-no-signed-zeros">, Group<opencl_Group>,
   HelpText<"OpenCL only. Allow use of less precise no signed zeros computations in the generated binary.">,
   MarshallingInfoFlag<LangOpts<"CLNoSignedZero">>;
 def cl_std_EQ : Joined<["-"], "cl-std=">, Group<opencl_Group>, Flags<[CC1Option]>,
-  HelpText<"OpenCL language standard to compile for.">, Values<"cl,CL,cl1.0,CL1.0,cl1.1,CL1.1,cl1.2,CL1.2,cl2.0,CL2.0,cl3.0,CL3.0,clc++,CLC++">;
+  HelpText<"OpenCL language standard to compile for.">,
+  Values<"cl,CL,cl1.0,CL1.0,cl1.1,CL1.1,cl1.2,CL1.2,cl2.0,CL2.0,cl3.0,CL3.0,clc++,CLC++,clc++1.0,CLC++1.0,clc++2021,CLC++2021">;
 def cl_denorms_are_zero : Flag<["-"], "cl-denorms-are-zero">, Group<opencl_Group>,
   HelpText<"OpenCL only. Allow denormals to be flushed to zero.">;
 def cl_fp32_correctly_rounded_divide_sqrt : Flag<["-"], "cl-fp32-correctly-rounded-divide-sqrt">, Group<opencl_Group>, Flags<[CC1Option]>,
@@ -854,14 +904,22 @@ def cl_uniform_work_group_size : Flag<["-"], "cl-uniform-work-group-size">, Grou
   MarshallingInfoFlag<CodeGenOpts<"UniformWGSize">>;
 def cl_no_stdinc : Flag<["-"], "cl-no-stdinc">, Group<opencl_Group>,
   HelpText<"OpenCL only. Disables all standard includes containing non-native compiler types and functions.">;
+def cl_ext_EQ : CommaJoined<["-"], "cl-ext=">, Group<opencl_Group>, Flags<[CC1Option]>,
+  HelpText<"OpenCL only. Enable or disable OpenCL extensions/optional features. The argument is a comma-separated "
+           "sequence of one or more extension names, each prefixed by '+' or '-'.">,
+  MarshallingInfoStringVector<TargetOpts<"OpenCLExtensionsAsWritten">>;
+
 def client__name : JoinedOrSeparate<["-"], "client_name">;
 def combine : Flag<["-", "--"], "combine">, Flags<[NoXarchOption, Unsupported]>;
 def compatibility__version : JoinedOrSeparate<["-"], "compatibility_version">;
-def config : Separate<["--"], "config">, Flags<[NoXarchOption]>,
-  HelpText<"Specifies configuration file">;
-def config_system_dir_EQ : Joined<["--"], "config-system-dir=">, Flags<[NoXarchOption, HelpHidden]>,
+def config : Joined<["--"], "config=">, Flags<[NoXarchOption, CoreOption]>, MetaVarName<"<file>">,
+  HelpText<"Specify configuration file">;
+def : Separate<["--"], "config">, Alias<config>;
+def no_default_config : Flag<["--"], "no-default-config">, Flags<[NoXarchOption, CoreOption]>,
+  HelpText<"Disable loading default configuration files">;
+def config_system_dir_EQ : Joined<["--"], "config-system-dir=">, Flags<[NoXarchOption, CoreOption, HelpHidden]>,
   HelpText<"System directory for configuration files">;
-def config_user_dir_EQ : Joined<["--"], "config-user-dir=">, Flags<[NoXarchOption, HelpHidden]>,
+def config_user_dir_EQ : Joined<["--"], "config-user-dir=">, Flags<[NoXarchOption, CoreOption, HelpHidden]>,
   HelpText<"User directory for configuration files">;
 def coverage : Flag<["-", "--"], "coverage">, Group<Link_Group>, Flags<[CoreOption]>;
 def cpp_precomp : Flag<["-"], "cpp-precomp">, Group<clang_ignored_f_Group>;
@@ -877,27 +935,22 @@ def fconvergent_functions : Flag<["-"], "fconvergent-functions">, Group<f_Group>
 def gpu_use_aux_triple_only : Flag<["--"], "gpu-use-aux-triple-only">,
   InternalDriverOpt, HelpText<"Prepare '-aux-triple' only without populating "
                               "'-aux-target-cpu' and '-aux-target-feature'.">;
-def cuda_device_only : Flag<["--"], "cuda-device-only">,
-  HelpText<"Compile CUDA code for device only">;
-def cuda_host_only : Flag<["--"], "cuda-host-only">,
-  HelpText<"Compile CUDA code for host only.  Has no effect on non-CUDA "
-           "compilations.">;
-def cuda_compile_host_device : Flag<["--"], "cuda-compile-host-device">,
-  HelpText<"Compile CUDA code for both host and device (default).  Has no "
-           "effect on non-CUDA compilations.">;
 def cuda_include_ptx_EQ : Joined<["--"], "cuda-include-ptx=">, Flags<[NoXarchOption]>,
   HelpText<"Include PTX for the following GPU architecture (e.g. sm_35) or 'all'. May be specified more than once.">;
 def no_cuda_include_ptx_EQ : Joined<["--"], "no-cuda-include-ptx=">, Flags<[NoXarchOption]>,
   HelpText<"Do not include PTX for the following GPU architecture (e.g. sm_35) or 'all'. May be specified more than once.">;
 def offload_arch_EQ : Joined<["--"], "offload-arch=">, Flags<[NoXarchOption]>,
-  HelpText<"CUDA offloading device architecture (e.g. sm_35), or HIP offloading target ID in the form of a "
-           "device architecture followed by target ID features delimited by a colon. Each target ID feature "
-           "is a pre-defined string followed by a plus or minus sign (e.g. gfx908:xnack+:sramecc-).  May be "
-           "specified more than once.">;
+  HelpText<"Specify an offloading device architecture for CUDA, HIP, or OpenMP. (e.g. sm_35). "
+           "If 'native' is used the compiler will detect locally installed architectures. "
+           "For HIP offloading, the device architecture can be followed by target ID features "
+           "delimited by a colon (e.g. gfx908:xnack+:sramecc-). May be specified more than once.">;
 def cuda_gpu_arch_EQ : Joined<["--"], "cuda-gpu-arch=">, Flags<[NoXarchOption]>,
   Alias<offload_arch_EQ>;
+def cuda_feature_EQ : Joined<["--"], "cuda-feature=">, HelpText<"Manually specify the CUDA feature to use">;
 def hip_link : Flag<["--"], "hip-link">,
   HelpText<"Link clang-offload-bundler bundles for HIP">;
+def no_hip_rt: Flag<["-"], "no-hip-rt">,
+  HelpText<"Do not link against HIP runtime libraries">;
 def no_offload_arch_EQ : Joined<["--"], "no-offload-arch=">, Flags<[NoXarchOption]>,
   HelpText<"Remove CUDA/HIP offloading device architecture (e.g. sm_35, gfx906) from the list of devices to compile for. "
            "'all' resets the list to its default value.">;
@@ -934,12 +987,21 @@ defm cuda_short_ptr : BoolFOption<"cuda-short-ptr",
   TargetOpts<"NVPTXUseShortPointers">, DefaultFalse,
   PosFlag<SetTrue, [CC1Option], "Use 32-bit pointers for accessing const/local/shared address spaces">,
   NegFlag<SetFalse>>;
+def fgpu_default_stream_EQ : Joined<["-"], "fgpu-default-stream=">,
+  HelpText<"Specify default stream. The default value is 'legacy'. (HIP only)">,
+  Flags<[CC1Option]>,
+  Values<"legacy,per-thread">,
+  NormalizedValuesScope<"LangOptions::GPUDefaultStreamKind">,
+  NormalizedValues<["Legacy", "PerThread"]>,
+  MarshallingInfoEnum<LangOpts<"GPUDefaultStream">, "Legacy">;
 def rocm_path_EQ : Joined<["--"], "rocm-path=">, Group<i_Group>,
   HelpText<"ROCm installation path, used for finding and automatically linking required bitcode libraries.">;
 def hip_path_EQ : Joined<["--"], "hip-path=">, Group<i_Group>,
   HelpText<"HIP runtime installation path, used for finding HIP version and adding HIP include path.">;
 def amdgpu_arch_tool_EQ : Joined<["--"], "amdgpu-arch-tool=">, Group<i_Group>,
   HelpText<"Tool used for detecting AMD GPU arch in the system.">;
+def nvptx_arch_tool_EQ : Joined<["--"], "nvptx-arch-tool=">, Group<i_Group>,
+  HelpText<"Tool used for detecting NVIDIA GPU arch in the system.">;
 def rocm_device_lib_path_EQ : Joined<["--"], "rocm-device-lib-path=">, Group<Link_Group>,
   HelpText<"ROCm device library path. Alternative to rocm-path.">;
 def : Joined<["--"], "hip-device-lib-path=">, Alias<rocm_device_lib_path_EQ>;
@@ -960,6 +1022,15 @@ defm hip_fp32_correctly_rounded_divide_sqrt : BoolFOption<"hip-fp32-correctly-ro
   BothFlags<[], " that single precision floating-point divide and sqrt used in "
   "the program source are correctly rounded (HIP device compilation only)">>,
   ShouldParseIf<hip.KeyPath>;
+defm hip_kernel_arg_name : BoolFOption<"hip-kernel-arg-name",
+  CodeGenOpts<"HIPSaveKernelArgName">, DefaultFalse,
+  PosFlag<SetTrue, [CC1Option], "Specify">,
+  NegFlag<SetFalse, [], "Don't specify">,
+  BothFlags<[], " that kernel argument names are preserved (HIP only)">>,
+  ShouldParseIf<hip.KeyPath>;
+def hipspv_pass_plugin_EQ : Joined<["--"], "hipspv-pass-plugin=">,
+  Group<Link_Group>, MetaVarName<"<dsopath>">,
+  HelpText<"path to a pass plugin for HIP to SPIR-V passes.">;
 defm gpu_allow_device_init : BoolFOption<"gpu-allow-device-init",
   LangOpts<"GPUAllowDeviceInit">, DefaultFalse,
   PosFlag<SetTrue, [CC1Option], "Allow">, NegFlag<SetFalse, [], "Don't allow">,
@@ -1004,9 +1075,11 @@ def fuse_cuid_EQ : Joined<["-"], "fuse-cuid=">,
            "offloading languages CUDA and HIP: 'hash' (ID's generated by hashing "
            "file path and command line options) | 'random' (ID's generated as "
            "random numbers) | 'none' (disabled). Default is 'hash'. This option "
-           "will be overriden by option '-cuid=[ID]' if it is specified." >;
-def libomptarget_amdgcn_bc_path_EQ : Joined<["--"], "libomptarget-amdgcn-bc-path=">, Group<i_Group>,
+           "will be overridden by option '-cuid=[ID]' if it is specified." >;
+def libomptarget_amdgpu_bc_path_EQ : Joined<["--"], "libomptarget-amdgpu-bc-path=">, Group<i_Group>,
   HelpText<"Path to libomptarget-amdgcn bitcode library">;
+def libomptarget_amdgcn_bc_path_EQ : Joined<["--"], "libomptarget-amdgcn-bc-path=">, Group<i_Group>,
+  HelpText<"Path to libomptarget-amdgcn bitcode library">, Alias<libomptarget_amdgpu_bc_path_EQ>;
 def libomptarget_nvptx_bc_path_EQ : Joined<["--"], "libomptarget-nvptx-bc-path=">, Group<i_Group>,
   HelpText<"Path to libomptarget-nvptx bitcode library">;
 def dD : Flag<["-"], "dD">, Group<d_Group>, Flags<[CC1Option]>,
@@ -1039,17 +1112,26 @@ def dynamiclib : Flag<["-"], "dynamiclib">;
 def dynamic : Flag<["-"], "dynamic">, Flags<[NoArgumentUnused]>;
 def d_Flag : Flag<["-"], "d">, Group<d_Group>;
 def d_Joined : Joined<["-"], "d">, Group<d_Group>;
-def emit_ast : Flag<["-"], "emit-ast">,
+def emit_ast : Flag<["-"], "emit-ast">, Flags<[CoreOption]>,
   HelpText<"Emit Clang AST files for source inputs">;
-def emit_llvm : Flag<["-"], "emit-llvm">, Flags<[CC1Option]>, Group<Action_Group>,
+def emit_llvm : Flag<["-"], "emit-llvm">, Flags<[CC1Option, FC1Option, FlangOption]>, Group<Action_Group>,
   HelpText<"Use the LLVM representation for assembler and object files">;
 def emit_interface_stubs : Flag<["-"], "emit-interface-stubs">, Flags<[CC1Option]>, Group<Action_Group>,
   HelpText<"Generate Interface Stub Files.">;
 def emit_merged_ifs : Flag<["-"], "emit-merged-ifs">,
   Flags<[CC1Option]>, Group<Action_Group>,
   HelpText<"Generate Interface Stub Files, emit merged text not binary.">;
+def end_no_unused_arguments : Flag<["--"], "end-no-unused-arguments">, Flags<[CoreOption]>,
+  HelpText<"Start emitting warnings for unused driver arguments">;
 def interface_stub_version_EQ : JoinedOrSeparate<["-"], "interface-stub-version=">, Flags<[CC1Option]>;
 def exported__symbols__list : Separate<["-"], "exported_symbols_list">;
+def extract_api : Flag<["-"], "extract-api">, Flags<[CC1Option]>, Group<Action_Group>,
+  HelpText<"Extract API information">;
+def product_name_EQ: Joined<["--"], "product-name=">, Flags<[CC1Option]>,
+  MarshallingInfoString<FrontendOpts<"ProductName">>;
+def extract_api_ignores_EQ: Joined<["--"], "extract-api-ignores=">, Flags<[CC1Option]>,
+    HelpText<"File containing a new line separated list of API symbols to ignore when extracting API information.">,
+    MarshallingInfoString<FrontendOpts<"ExtractAPIIgnoresFile">>;
 def e : JoinedOrSeparate<["-"], "e">, Flags<[LinkerInput]>, Group<Link_Group>;
 def fmax_tokens_EQ : Joined<["-"], "fmax-tokens=">, Group<f_Group>, Flags<[CC1Option]>,
   HelpText<"Max total number of preprocessed tokens for -Wmax-tokens.">,
@@ -1064,6 +1146,9 @@ defm access_control : BoolFOption<"access-control",
   PosFlag<SetTrue>>;
 def falign_functions : Flag<["-"], "falign-functions">, Group<f_Group>;
 def falign_functions_EQ : Joined<["-"], "falign-functions=">, Group<f_Group>;
+def falign_loops_EQ : Joined<["-"], "falign-loops=">, Group<f_Group>, Flags<[CC1Option]>, MetaVarName<"<N>">,
+  HelpText<"N must be a power of two. Align loops to the boundary">,
+  MarshallingInfoInt<CodeGenOpts<"LoopAlignment">>;
 def fno_align_functions: Flag<["-"], "fno-align-functions">, Group<f_Group>;
 defm allow_editor_placeholders : BoolFOption<"allow-editor-placeholders",
   LangOpts<"AllowEditorPlaceholders">, DefaultFalse,
@@ -1073,6 +1158,14 @@ def fallow_unsupported : Flag<["-"], "fallow-unsupported">, Group<f_Group>;
 def fapple_kext : Flag<["-"], "fapple-kext">, Group<f_Group>, Flags<[CC1Option]>,
   HelpText<"Use Apple's kernel extensions ABI">,
   MarshallingInfoFlag<LangOpts<"AppleKext">>;
+def fstrict_flex_arrays_EQ : Joined<["-"], "fstrict-flex-arrays=">, Group<f_Group>,
+  MetaVarName<"<n>">, Values<"0,1,2,3">,
+  LangOpts<"StrictFlexArraysLevel">,
+  Flags<[CC1Option]>,
+  NormalizedValuesScope<"LangOptions::StrictFlexArraysLevelKind">,
+  NormalizedValues<["Default", "OneZeroOrIncomplete", "ZeroOrIncomplete", "IncompleteOnly"]>,
+  HelpText<"Enable optimizations based on the strict definition of flexible arrays">,
+  MarshallingInfoEnum<LangOpts<"StrictFlexArraysLevel">, "Default">;
 defm apple_pragma_pack : BoolFOption<"apple-pragma-pack",
   LangOpts<"ApplePragmaPack">, DefaultFalse,
   PosFlag<SetTrue, [CC1Option], "Enable Apple gcc-compatible #pragma pack handling">,
@@ -1104,15 +1197,39 @@ defm autolink : BoolFOption<"autolink",
   NegFlag<SetFalse, [CC1Option], "Disable generation of linker directives for automatic library linking">,
   PosFlag<SetTrue>>;
 
+// In the future this option will be supported by other offloading
+// languages and accept other values such as CPU/GPU architectures,
+// offload kinds and target aliases.
+def offload_EQ : CommaJoined<["--"], "offload=">, Flags<[NoXarchOption]>,
+  HelpText<"Specify comma-separated list of offloading target triples (CUDA and HIP only)">;
+
 // C++ Coroutines TS
 defm coroutines_ts : BoolFOption<"coroutines-ts",
   LangOpts<"Coroutines">, Default<cpp20.KeyPath>,
   PosFlag<SetTrue, [CC1Option], "Enable support for the C++ Coroutines TS">,
   NegFlag<SetFalse>>;
 
+defm coro_aligned_allocation : BoolFOption<"coro-aligned-allocation",
+  LangOpts<"CoroAlignedAllocation">, DefaultFalse,
+  PosFlag<SetTrue, [CC1Option], "Prefer aligned allocation for C++ Coroutines">,
+  NegFlag<SetFalse>>;
+
+defm experimental_library : BoolFOption<"experimental-library",
+  LangOpts<"ExperimentalLibrary">, DefaultFalse,
+  PosFlag<SetTrue, [CC1Option, CoreOption], "Control whether unstable and experimental library features are enabled. "
+          "This option enables various library features that are either experimental (also known as TSes), or have been "
+          "but are not stable yet in the selected Standard Library implementation. It is not recommended to use this option "
+          "in production code, since neither ABI nor API stability are guaranteed. This is intended to provide a preview "
+          "of features that will ship in the future for experimentation purposes">,
+  NegFlag<SetFalse>>;
+
+def fembed_offload_object_EQ : Joined<["-"], "fembed-offload-object=">,
+  Group<f_Group>, Flags<[NoXarchOption, CC1Option]>,
+  HelpText<"Embed Offloading device-side binary into host object file as a section.">,
+  MarshallingInfoStringVector<CodeGenOpts<"OffloadObjects">>;
 def fembed_bitcode_EQ : Joined<["-"], "fembed-bitcode=">,
     Group<f_Group>, Flags<[NoXarchOption, CC1Option, CC1AsOption]>, MetaVarName<"<option>">,
-    HelpText<"Embed LLVM bitcode (option: off, all, bitcode, marker)">,
+    HelpText<"Embed LLVM bitcode">,
     Values<"off,all,bitcode,marker">, NormalizedValuesScope<"CodeGenOptions">,
     NormalizedValues<["Embed_Off", "Embed_All", "Embed_Bitcode", "Embed_Marker"]>,
     MarshallingInfoEnum<CodeGenOpts<"EmbedBitcode">, "Embed_Off">;
@@ -1142,6 +1259,13 @@ def fprofile_sample_accurate : Flag<["-"], "fprofile-sample-accurate">,
                as cold. Otherwise, treat callsites without profile samples as if
                we have no profile}]>,
    MarshallingInfoFlag<CodeGenOpts<"ProfileSampleAccurate">>;
+def fsample_profile_use_profi : Flag<["-"], "fsample-profile-use-profi">,
+    Flags<[NoXarchOption, CC1Option]>, Group<f_Group>,
+    HelpText<"Use profi to infer block and edge counts">,
+    DocBrief<[{Infer block and edge counts. If the profiles have errors or missing
+               blocks caused by sampling, profile inference (profi) can convert
+               basic block counts to branch probabilites to fix them by extended
+               and re-engineered classic MCMF (min-cost max-flow) approach.}]>;
 def fno_profile_sample_accurate : Flag<["-"], "fno-profile-sample-accurate">,
   Group<f_Group>, Flags<[NoXarchOption]>;
 def fauto_profile : Flag<["-"], "fauto-profile">, Group<f_Group>,
@@ -1204,9 +1328,10 @@ def fcs_profile_generate_EQ : Joined<["-"], "fcs-profile-generate=">,
     Group<f_Group>, Flags<[CoreOption]>, MetaVarName<"<directory>">,
     HelpText<"Generate instrumented code to collect context sensitive execution counts into <directory>/default.profraw (overridden by LLVM_PROFILE_FILE env var)">;
 def fprofile_use : Flag<["-"], "fprofile-use">, Group<f_Group>,
-    Alias<fprofile_instr_use>;
+    Flags<[CoreOption]>, Alias<fprofile_instr_use>;
 def fprofile_use_EQ : Joined<["-"], "fprofile-use=">,
-    Group<f_Group>, Flags<[NoXarchOption]>, MetaVarName<"<pathname>">,
+    Group<f_Group>, Flags<[NoXarchOption, CoreOption]>,
+    MetaVarName<"<pathname>">,
     HelpText<"Use instrumentation data for profile-guided optimization. If pathname is a directory, it reads from <pathname>/default.profdata. Otherwise, it reads from file <pathname>.">;
 def fno_profile_instr_generate : Flag<["-"], "fno-profile-instr-generate">,
     Group<f_Group>, Flags<[CoreOption]>,
@@ -1237,7 +1362,7 @@ def fprofile_exclude_files_EQ : Joined<["-"], "fprofile-exclude-files=">,
     ShouldParseIf<!strconcat(fprofile_arcs.KeyPath, "||", ftest_coverage.KeyPath)>;
 def fprofile_update_EQ : Joined<["-"], "fprofile-update=">,
     Group<f_Group>, Flags<[CC1Option, CoreOption]>, Values<"atomic,prefer-atomic,single">,
-    MetaVarName<"<method>">, HelpText<"Set update method of profile counters (atomic,prefer-atomic,single)">,
+    MetaVarName<"<method>">, HelpText<"Set update method of profile counters">,
     MarshallingInfoFlag<CodeGenOpts<"AtomicProfileUpdate">>;
 defm pseudo_probe_for_profiling : BoolFOption<"pseudo-probe-for-profiling",
   CodeGenOpts<"PseudoProbeForProfiling">, DefaultFalse,
@@ -1250,12 +1375,28 @@ def fprofile_list_EQ : Joined<["-"], "fprofile-list=">,
     Group<f_Group>, Flags<[CC1Option, CoreOption]>,
     HelpText<"Filename defining the list of functions/files to instrument">,
     MarshallingInfoStringVector<LangOpts<"ProfileListFiles">>;
+def fprofile_function_groups : Joined<["-"], "fprofile-function-groups=">,
+  Group<f_Group>, Flags<[CC1Option]>, MetaVarName<"<N>">,
+  HelpText<"Partition functions into N groups and select only functions in group i to be instrumented using -fprofile-selected-function-group">,
+  MarshallingInfoInt<CodeGenOpts<"ProfileTotalFunctionGroups">, "1">;
+def fprofile_selected_function_group :
+  Joined<["-"], "fprofile-selected-function-group=">, Group<f_Group>,
+  Flags<[CC1Option]>, MetaVarName<"<i>">,
+  HelpText<"Partition functions into N groups using -fprofile-function-groups and select only functions in group i to be instrumented. The valid range is 0 to N-1 inclusive">,
+  MarshallingInfoInt<CodeGenOpts<"ProfileSelectedFunctionGroup">>;
+def fswift_async_fp_EQ : Joined<["-"], "fswift-async-fp=">,
+    Group<f_Group>, Flags<[CC1Option, CC1AsOption, CoreOption]>, MetaVarName<"<option>">,
+    HelpText<"Control emission of Swift async extended frame info">,
+    Values<"auto,always,never">,
+    NormalizedValuesScope<"CodeGenOptions::SwiftAsyncFramePointerKind">,
+    NormalizedValues<["Auto", "Always", "Never"]>,
+    MarshallingInfoEnum<CodeGenOpts<"SwiftAsyncFramePointer">, "Always">;
 
 defm addrsig : BoolFOption<"addrsig",
   CodeGenOpts<"Addrsig">, DefaultFalse,
   PosFlag<SetTrue, [CC1Option], "Emit">, NegFlag<SetFalse, [], "Don't emit">,
   BothFlags<[CoreOption], " an address-significance table">>;
-defm blocks : OptInFFlag<"blocks", "Enable the 'blocks' language feature", "", "", [CoreOption]>;
+defm blocks : OptInCC1FFlag<"blocks", "Enable the 'blocks' language feature", "", "", [CoreOption]>;
 def fbootclasspath_EQ : Joined<["-"], "fbootclasspath=">, Group<f_Group>;
 defm borland_extensions : BoolFOption<"borland-extensions",
   LangOpts<"Borland">, DefaultFalse,
@@ -1271,10 +1412,13 @@ def fclang_abi_compat_EQ : Joined<["-"], "fclang-abi-compat=">, Group<f_clang_Gr
   Flags<[CC1Option]>, MetaVarName<"<version>">, Values<"<major>.<minor>,latest">,
   HelpText<"Attempt to match the ABI of Clang <version>">;
 def fclasspath_EQ : Joined<["-"], "fclasspath=">, Group<f_Group>;
-defm color_diagnostics : OptInFFlag<"color-diagnostics", "Enable", "Disable", " colors in diagnostics",
-  [CoreOption, FlangOption]>;
-def fdiagnostics_color : Flag<["-"], "fdiagnostics-color">, Group<f_Group>,
-  Flags<[CoreOption, NoXarchOption]>;
+def fcolor_diagnostics : Flag<["-"], "fcolor-diagnostics">, Group<f_Group>,
+  Flags<[CoreOption, CC1Option, FlangOption, FC1Option]>,
+  HelpText<"Enable colors in diagnostics">;
+def fno_color_diagnostics : Flag<["-"], "fno-color-diagnostics">, Group<f_Group>,
+  Flags<[CoreOption, FlangOption]>, HelpText<"Disable colors in diagnostics">;
+def : Flag<["-"], "fdiagnostics-color">, Group<f_Group>, Flags<[CoreOption]>, Alias<fcolor_diagnostics>;
+def : Flag<["-"], "fno-diagnostics-color">, Group<f_Group>, Flags<[CoreOption]>, Alias<fno_color_diagnostics>;
 def fdiagnostics_color_EQ : Joined<["-"], "fdiagnostics-color=">, Group<f_Group>;
 def fansi_escape_codes : Flag<["-"], "fansi-escape-codes">, Group<f_Group>,
   Flags<[CoreOption, CC1Option]>, HelpText<"Use ANSI escape codes for diagnostics">,
@@ -1317,7 +1461,12 @@ def fexperimental_new_constant_interpreter : Flag<["-"], "fexperimental-new-cons
   MarshallingInfoFlag<LangOpts<"EnableNewConstInterp">>;
 def fconstexpr_backtrace_limit_EQ : Joined<["-"], "fconstexpr-backtrace-limit=">,
                                     Group<f_Group>;
+def fcrash_diagnostics_EQ : Joined<["-"], "fcrash-diagnostics=">, Group<f_clang_Group>, Flags<[NoArgumentUnused, CoreOption]>,
+  HelpText<"Set level of crash diagnostic reporting, (option: off, compiler, all)">;
+def fcrash_diagnostics : Flag<["-"], "fcrash-diagnostics">, Group<f_clang_Group>, Flags<[NoArgumentUnused, CoreOption]>,
+  HelpText<"Enable crash diagnostic reporting (default)">, Alias<fcrash_diagnostics_EQ>, AliasArgs<["compiler"]>;
 def fno_crash_diagnostics : Flag<["-"], "fno-crash-diagnostics">, Group<f_clang_Group>, Flags<[NoArgumentUnused, CoreOption]>,
+  Alias<gen_reproducer_eq>, AliasArgs<["off"]>,
   HelpText<"Disable auto-generation of preprocessed source files and a script for reproduction during a clang crash">;
 def fcrash_diagnostics_dir : Joined<["-"], "fcrash-diagnostics-dir=">,
   Group<f_clang_Group>, Flags<[NoArgumentUnused, CoreOption]>,
@@ -1329,8 +1478,11 @@ defm cxx_exceptions: BoolFOption<"cxx-exceptions",
 defm async_exceptions: BoolFOption<"async-exceptions",
   LangOpts<"EHAsynch">, DefaultFalse,
   PosFlag<SetTrue, [CC1Option], "Enable EH Asynchronous exceptions">, NegFlag<SetFalse>>;
-def fcxx_modules : Flag <["-"], "fcxx-modules">, Group<f_Group>,
-  Flags<[NoXarchOption]>;
+defm cxx_modules : BoolFOption<"cxx-modules",
+  LangOpts<"CPlusPlusModules">, Default<cpp20.KeyPath>,
+  NegFlag<SetFalse, [CC1Option], "Disable">, PosFlag<SetTrue, [], "Enable">,
+  BothFlags<[NoXarchOption], " modules for C++">>,
+  ShouldParseIf<cplusplus.KeyPath>;
 def fdebug_pass_arguments : Flag<["-"], "fdebug-pass-arguments">, Group<f_Group>;
 def fdebug_pass_structure : Flag<["-"], "fdebug-pass-structure">, Group<f_Group>;
 def fdepfile_entry : Joined<["-"], "fdepfile-entry=">,
@@ -1354,6 +1506,9 @@ def fdiagnostics_hotness_threshold_EQ : Joined<["-"], "fdiagnostics-hotness-thre
     Group<f_Group>, Flags<[CC1Option]>, MetaVarName<"<value>">,
     HelpText<"Prevent optimization remarks from being output if they do not have at least this profile count. "
     "Use 'auto' to apply the threshold from profile summary">;
+def fdiagnostics_misexpect_tolerance_EQ : Joined<["-"], "fdiagnostics-misexpect-tolerance=">,
+    Group<f_Group>, Flags<[CC1Option]>, MetaVarName<"<value>">,
+    HelpText<"Prevent misexpect diagnostics from being output if the profile counts are within N% of the expected. ">;
 defm diagnostics_show_option : BoolFOption<"diagnostics-show-option",
     DiagnosticOpts<"ShowOptionNames">, DefaultTrue,
     NegFlag<SetFalse, [CC1Option]>, PosFlag<SetTrue, [], "Print option name with mappable diagnostics">>;
@@ -1389,7 +1544,7 @@ def fno_elide_type : Flag<["-"], "fno-elide-type">, Group<f_Group>,
     HelpText<"Do not elide types when printing diagnostics">,
     MarshallingInfoNegativeFlag<DiagnosticOpts<"ElideType">>;
 def feliminate_unused_debug_symbols : Flag<["-"], "feliminate-unused-debug-symbols">, Group<f_Group>;
-defm eliminate_unused_debug_types : OptOutFFlag<"eliminate-unused-debug-types",
+defm eliminate_unused_debug_types : OptOutCC1FFlag<"eliminate-unused-debug-types",
   "Do not emit ", "Emit ", " debug info for defined but unused types">;
 def femit_all_decls : Flag<["-"], "femit-all-decls">, Group<f_Group>, Flags<[CC1Option]>,
   HelpText<"Emit all declarations, even if unused">,
@@ -1413,7 +1568,7 @@ def fseh_exceptions : Flag<["-"], "fseh-exceptions">, Group<f_Group>,
 def fwasm_exceptions : Flag<["-"], "fwasm-exceptions">, Group<f_Group>,
   HelpText<"Use WebAssembly style exceptions">;
 def exception_model : Separate<["-"], "exception-model">,
-  Flags<[CC1Option, NoDriverOption]>, HelpText<"The exception model: dwarf|sjlj|seh|wasm">,
+  Flags<[CC1Option, NoDriverOption]>, HelpText<"The exception model">,
   Values<"dwarf,sjlj,seh,wasm">,
   NormalizedValuesScope<"LangOptions::ExceptionHandlingKind">,
   NormalizedValues<["DwarfCFI", "SjLj", "WinEH", "Wasm"]>,
@@ -1423,8 +1578,23 @@ def exception_model_EQ : Joined<["-"], "exception-model=">,
 def fignore_exceptions : Flag<["-"], "fignore-exceptions">, Group<f_Group>, Flags<[CC1Option]>,
   HelpText<"Enable support for ignoring exception handling constructs">,
   MarshallingInfoFlag<LangOpts<"IgnoreExceptions">>;
-def fexcess_precision_EQ : Joined<["-"], "fexcess-precision=">,
-    Group<clang_ignored_gcc_optimization_f_Group>;
+def fexcess_precision_EQ : Joined<["-"], "fexcess-precision=">, Group<f_Group>,
+  Flags<[CoreOption]>,
+  HelpText<"Allows control over excess precision on targets where native "
+  "support for the precision types is not available. By default, excess "
+  "precision is used to calculate intermediate results following the "
+  "rules specified in ISO C99.">,
+  Values<"standard,fast,none">, NormalizedValuesScope<"LangOptions">,
+  NormalizedValues<["FPP_Standard", "FPP_Fast", "FPP_None"]>;
+def ffloat16_excess_precision_EQ : Joined<["-"], "ffloat16-excess-precision=">,
+  Group<f_Group>, Flags<[CC1Option, NoDriverOption]>,
+  HelpText<"Allows control over excess precision on targets where native "
+  "support for Float16 precision types is not available. By default, excess "
+  "precision is used to calculate intermediate results following the "
+  "rules specified in ISO C99.">,
+  Values<"standard,fast,none">, NormalizedValuesScope<"LangOptions">,
+  NormalizedValues<["FPP_Standard", "FPP_Fast", "FPP_None"]>,
+  MarshallingInfoEnum<LangOpts<"Float16ExcessPrecision">, "FPP_Standard">;
 def : Flag<["-"], "fexpensive-optimizations">, Group<clang_ignored_gcc_optimization_f_Group>;
 def : Flag<["-"], "fno-expensive-optimizations">, Group<clang_ignored_gcc_optimization_f_Group>;
 def fextdirs_EQ : Joined<["-"], "fextdirs=">, Group<f_Group>;
@@ -1434,22 +1604,31 @@ def : Flag<["-"], "fextended-identifiers">, Group<clang_ignored_f_Group>;
 def : Flag<["-"], "fno-extended-identifiers">, Group<f_Group>, Flags<[Unsupported]>;
 def fhosted : Flag<["-"], "fhosted">, Group<f_Group>;
 def fdenormal_fp_math_EQ : Joined<["-"], "fdenormal-fp-math=">, Group<f_Group>, Flags<[CC1Option]>;
+def ffile_reproducible : Flag<["-"], "ffile-reproducible">, Group<f_Group>,
+  Flags<[CoreOption, CC1Option]>,
+  HelpText<"Use the target's platform-specific path separator character when "
+           "expanding the __FILE__ macro">;
+def fno_file_reproducible : Flag<["-"], "fno-file-reproducible">,
+  Group<f_Group>, Flags<[CoreOption, CC1Option]>,
+  HelpText<"Use the host's platform-specific path separator character when "
+           "expanding the __FILE__ macro">;
+def ffp_eval_method_EQ : Joined<["-"], "ffp-eval-method=">, Group<f_Group>, Flags<[CC1Option]>,
+  HelpText<"Specifies the evaluation method to use for floating-point arithmetic.">,
+  Values<"source,double,extended">, NormalizedValuesScope<"LangOptions">,
+  NormalizedValues<["FEM_Source", "FEM_Double", "FEM_Extended"]>,
+  MarshallingInfoEnum<LangOpts<"FPEvalMethod">, "FEM_UnsetOnCommandLine">;
 def ffp_model_EQ : Joined<["-"], "ffp-model=">, Group<f_Group>, Flags<[NoXarchOption]>,
   HelpText<"Controls the semantics of floating-point calculations.">;
 def ffp_exception_behavior_EQ : Joined<["-"], "ffp-exception-behavior=">, Group<f_Group>, Flags<[CC1Option]>,
   HelpText<"Specifies the exception behavior of floating-point operations.">,
   Values<"ignore,maytrap,strict">, NormalizedValuesScope<"LangOptions">,
   NormalizedValues<["FPE_Ignore", "FPE_MayTrap", "FPE_Strict"]>,
-  MarshallingInfoEnum<LangOpts<"FPExceptionMode">, "FPE_Ignore">;
+  MarshallingInfoEnum<LangOpts<"FPExceptionMode">, "FPE_Default">;
 defm fast_math : BoolFOption<"fast-math",
   LangOpts<"FastMath">, DefaultFalse,
-  PosFlag<SetTrue, [CC1Option], "Allow aggressive, lossy floating-point optimizations",
+  PosFlag<SetTrue, [CC1Option, FC1Option, FlangOption], "Allow aggressive, lossy floating-point optimizations",
           [cl_fast_relaxed_math.KeyPath]>,
   NegFlag<SetFalse>>;
-def menable_unsafe_fp_math : Flag<["-"], "menable-unsafe-fp-math">, Flags<[CC1Option]>,
-  HelpText<"Allow unsafe floating-point math optimizations which may decrease precision">,
-  MarshallingInfoFlag<LangOpts<"UnsafeFPMath">>,
-  ImpliedByAnyOf<[cl_unsafe_math_optimizations.KeyPath, ffast_math.KeyPath]>;
 defm math_errno : BoolFOption<"math-errno",
   LangOpts<"MathErrno">, DefaultFalse,
   PosFlag<SetTrue, [CC1Option], "Require math functions to indicate errors by setting errno">,
@@ -1489,7 +1668,7 @@ defm cxx_static_destructors : BoolFOption<"c++-static-destructors",
 def fsymbol_partition_EQ : Joined<["-"], "fsymbol-partition=">, Group<f_Group>,
   Flags<[CC1Option]>, MarshallingInfoString<CodeGenOpts<"SymbolPartition">>;
 
-defm memory_profile : OptInFFlag<"memory-profile", "Enable", "Disable", " heap memory profiling">;
+defm memory_profile : OptInCC1FFlag<"memory-profile", "Enable", "Disable", " heap memory profiling">;
 def fmemory_profile_EQ : Joined<["-"], "fmemory-profile=">,
     Group<f_Group>, Flags<[CC1Option]>, MetaVarName<"<directory>">,
     HelpText<"Enable heap memory profiling and dump results into <directory>">;
@@ -1535,24 +1714,24 @@ def fsanitize_coverage_allowlist : Joined<["-"], "fsanitize-coverage-allowlist="
     Group<f_clang_Group>, Flags<[CoreOption, NoXarchOption]>,
     HelpText<"Restrict sanitizer coverage instrumentation exclusively to modules and functions that match the provided special case list, except the blocked ones">,
     MarshallingInfoStringVector<CodeGenOpts<"SanitizeCoverageAllowlistFiles">>;
-def : Joined<["-"], "fsanitize-coverage-whitelist=">,
-  Group<f_clang_Group>, Flags<[CoreOption, HelpHidden]>, Alias<fsanitize_coverage_allowlist>,
-  HelpText<"Deprecated, use -fsanitize-coverage-allowlist= instead">;
 def fsanitize_coverage_ignorelist : Joined<["-"], "fsanitize-coverage-ignorelist=">,
     Group<f_clang_Group>, Flags<[CoreOption, NoXarchOption]>,
     HelpText<"Disable sanitizer coverage instrumentation for modules and functions "
              "that match the provided special case list, even the allowed ones">,
     MarshallingInfoStringVector<CodeGenOpts<"SanitizeCoverageIgnorelistFiles">>;
-def : Joined<["-"], "fsanitize-coverage-blacklist=">,
-  Group<f_clang_Group>, Flags<[CoreOption, HelpHidden]>,
-  Alias<fsanitize_coverage_ignorelist>,
-  HelpText<"Deprecated, use -fsanitize-coverage-ignorelist= instead">;
+def fexperimental_sanitize_metadata_EQ : CommaJoined<["-"], "fexperimental-sanitize-metadata=">,
+  Group<f_Group>,
+  HelpText<"Specify the type of metadata to emit for binary analysis sanitizers">;
+def fno_experimental_sanitize_metadata_EQ : CommaJoined<["-"], "fno-experimental-sanitize-metadata=">,
+  Group<f_Group>, Flags<[CoreOption]>,
+  HelpText<"Disable emitting metadata for binary analysis sanitizers">;
 def fsanitize_memory_track_origins_EQ : Joined<["-"], "fsanitize-memory-track-origins=">,
                                         Group<f_clang_Group>,
                                         HelpText<"Enable origins tracking in MemorySanitizer">,
                                         MarshallingInfoInt<CodeGenOpts<"SanitizeMemoryTrackOrigins">>;
 def fsanitize_memory_track_origins : Flag<["-"], "fsanitize-memory-track-origins">,
                                      Group<f_clang_Group>,
+                                     Alias<fsanitize_memory_track_origins_EQ>, AliasArgs<["2"]>,
                                      HelpText<"Enable origins tracking in MemorySanitizer">;
 def fno_sanitize_memory_track_origins : Flag<["-"], "fno-sanitize-memory-track-origins">,
                                         Group<f_clang_Group>,
@@ -1564,6 +1743,9 @@ def fsanitize_address_outline_instrumentation : Flag<["-"], "fsanitize-address-o
 def fno_sanitize_address_outline_instrumentation : Flag<["-"], "fno-sanitize-address-outline-instrumentation">,
                                                    Group<f_clang_Group>,
                                                    HelpText<"Use default code inlining logic for the address sanitizer">;
+def fsanitize_memtag_mode_EQ : Joined<["-"], "fsanitize-memtag-mode=">,
+                                        Group<f_clang_Group>,
+                                        HelpText<"Set default MTE mode to 'sync' (default) or 'async'">;
 def fsanitize_hwaddress_experimental_aliasing
   : Flag<["-"], "fsanitize-hwaddress-experimental-aliasing">,
     Group<f_clang_Group>,
@@ -1590,7 +1772,7 @@ def sanitize_address_use_after_return_EQ
   : Joined<["-"], "fsanitize-address-use-after-return=">,
     MetaVarName<"<mode>">,
     Flags<[CC1Option]>,
-    HelpText<"Select the mode of detecting stack use-after-return in AddressSanitizer: never | runtime (default) | always">,
+    HelpText<"Select the mode of detecting stack use-after-return in AddressSanitizer">,
     Group<f_clang_Group>,
     Values<"never,runtime,always">,
     NormalizedValuesScope<"llvm::AsanDetectStackUseAfterReturnMode">,
@@ -1601,11 +1783,13 @@ defm sanitize_address_poison_custom_array_cookie : BoolOption<"f", "sanitize-add
   PosFlag<SetTrue, [], "Enable">, NegFlag<SetFalse, [], "Disable">,
   BothFlags<[], " poisoning array cookies when using custom operator new[] in AddressSanitizer">>,
   Group<f_clang_Group>;
-def fsanitize_address_globals_dead_stripping : Flag<["-"], "fsanitize-address-globals-dead-stripping">,
-  Group<f_clang_Group>, HelpText<"Enable linker dead stripping of globals in AddressSanitizer">,
-  MarshallingInfoFlag<CodeGenOpts<"SanitizeAddressGlobalsDeadStripping">, "false">;
+defm sanitize_address_globals_dead_stripping : BoolOption<"f", "sanitize-address-globals-dead-stripping",
+  CodeGenOpts<"SanitizeAddressGlobalsDeadStripping">, DefaultFalse,
+  PosFlag<SetTrue, [], "Enable linker dead stripping of globals in AddressSanitizer">,
+  NegFlag<SetFalse, [], "Disable linker dead stripping of globals in AddressSanitizer">>,
+  Group<f_clang_Group>;
 defm sanitize_address_use_odr_indicator : BoolOption<"f", "sanitize-address-use-odr-indicator",
-  CodeGenOpts<"SanitizeAddressUseOdrIndicator">, DefaultFalse,
+  CodeGenOpts<"SanitizeAddressUseOdrIndicator">, DefaultTrue,
   PosFlag<SetTrue, [], "Enable ODR indicator globals to avoid false ODR violation"
             " reports in partially sanitized programs at the cost of an increase in binary size">,
   NegFlag<SetFalse, [], "Disable ODR indicator globals">>,
@@ -1619,7 +1803,13 @@ def sanitize_address_destructor_EQ
       NormalizedValuesScope<"llvm::AsanDtorKind">,
       NormalizedValues<["None", "Global"]>,
       MarshallingInfoEnum<CodeGenOpts<"SanitizeAddressDtor">, "Global">;
-// Note: This flag was introduced when it was necessary to distinguish between
+defm sanitize_memory_param_retval
+    : BoolFOption<"sanitize-memory-param-retval",
+        CodeGenOpts<"SanitizeMemoryParamRetval">,
+        DefaultTrue,
+        PosFlag<SetTrue, [CC1Option], "Enable">, NegFlag<SetFalse, [], "Disable">,
+        BothFlags<[], " detection of uninitialized parameters and return values">>;
+//// Note: This flag was introduced when it was necessary to distinguish between
 //       ABI for correct codegen.  This is no longer needed, but the flag is
 //       not removed since targeting either ABI will behave the same.
 //       This way we cause no disturbance to existing scripts & code, and if we
@@ -1719,26 +1909,32 @@ def fsanitize_undefined_strip_path_components_EQ : Joined<["-"], "fsanitize-unde
 } // end -f[no-]sanitize* flags
 
 def funsafe_math_optimizations : Flag<["-"], "funsafe-math-optimizations">,
-  Group<f_Group>;
+  Group<f_Group>, Flags<[CC1Option]>,
+  HelpText<"Allow unsafe floating-point math optimizations which may decrease precision">,
+  MarshallingInfoFlag<LangOpts<"UnsafeFPMath">>,
+  ImpliedByAnyOf<[cl_unsafe_math_optimizations.KeyPath, ffast_math.KeyPath]>;
 def fno_unsafe_math_optimizations : Flag<["-"], "fno-unsafe-math-optimizations">,
   Group<f_Group>;
 def fassociative_math : Flag<["-"], "fassociative-math">, Group<f_Group>;
 def fno_associative_math : Flag<["-"], "fno-associative-math">, Group<f_Group>;
 defm reciprocal_math : BoolFOption<"reciprocal-math",
   LangOpts<"AllowRecip">, DefaultFalse,
-  PosFlag<SetTrue, [CC1Option], "Allow division operations to be reassociated",
-          [menable_unsafe_fp_math.KeyPath]>,
+  PosFlag<SetTrue, [CC1Option, FC1Option, FlangOption], "Allow division operations to be reassociated",
+          [funsafe_math_optimizations.KeyPath]>,
   NegFlag<SetFalse>>;
-def fapprox_func : Flag<["-"], "fapprox-func">, Group<f_Group>, Flags<[CC1Option, NoDriverOption]>,
-  MarshallingInfoFlag<LangOpts<"ApproxFunc">>, ImpliedByAnyOf<[menable_unsafe_fp_math.KeyPath]>;
+defm approx_func : BoolFOption<"approx-func", LangOpts<"ApproxFunc">, DefaultFalse,
+   PosFlag<SetTrue, [CC1Option, FC1Option, FlangOption], "Allow certain math function calls to be replaced "
+           "with an approximately equivalent calculation",
+           [funsafe_math_optimizations.KeyPath]>,
+   NegFlag<SetFalse>>;
 defm finite_math_only : BoolFOption<"finite-math-only",
   LangOpts<"FiniteMathOnly">, DefaultFalse,
   PosFlag<SetTrue, [CC1Option], "", [cl_finite_math_only.KeyPath, ffast_math.KeyPath]>,
   NegFlag<SetFalse>>;
 defm signed_zeros : BoolFOption<"signed-zeros",
   LangOpts<"NoSignedZero">, DefaultFalse,
-  NegFlag<SetTrue, [CC1Option], "Allow optimizations that ignore the sign of floating point zeros",
-            [cl_no_signed_zeros.KeyPath, menable_unsafe_fp_math.KeyPath]>,
+  NegFlag<SetTrue, [CC1Option, FC1Option, FlangOption], "Allow optimizations that ignore the sign of floating point zeros",
+            [cl_no_signed_zeros.KeyPath, funsafe_math_optimizations.KeyPath]>,
   PosFlag<SetFalse>>;
 def fhonor_nans : Flag<["-"], "fhonor-nans">, Group<f_Group>;
 def fno_honor_nans : Flag<["-"], "fno-honor-nans">, Group<f_Group>;
@@ -1748,18 +1944,20 @@ def fno_honor_infinities : Flag<["-"], "fno-honor-infinities">, Group<f_Group>;
 def : Flag<["-"], "fhonor-infinites">, Alias<fhonor_infinities>;
 def : Flag<["-"], "fno-honor-infinites">, Alias<fno_honor_infinities>;
 def frounding_math : Flag<["-"], "frounding-math">, Group<f_Group>, Flags<[CC1Option]>,
-  MarshallingInfoFlag<LangOpts<"FPRoundingMode">, "llvm::RoundingMode::NearestTiesToEven">,
+  MarshallingInfoFlag<LangOpts<"RoundingMath">>,
   Normalizer<"makeFlagToValueNormalizer(llvm::RoundingMode::Dynamic)">;
 def fno_rounding_math : Flag<["-"], "fno-rounding-math">, Group<f_Group>, Flags<[CC1Option]>;
 def ftrapping_math : Flag<["-"], "ftrapping-math">, Group<f_Group>;
 def fno_trapping_math : Flag<["-"], "fno-trapping-math">, Group<f_Group>;
 def ffp_contract : Joined<["-"], "ffp-contract=">, Group<f_Group>,
-  Flags<[CC1Option]>, HelpText<"Form fused FP ops (e.g. FMAs):"
+  Flags<[CC1Option, FC1Option, FlangOption]>,
+  DocBrief<"Form fused FP ops (e.g. FMAs):"
   " fast (fuses across statements disregarding pragmas)"
   " | on (only fuses in the same statement unless dictated by pragmas)"
   " | off (never fuses)"
-  " | fast-honor-pragmas (fuses across statements unless diectated by pragmas)."
+  " | fast-honor-pragmas (fuses across statements unless dictated by pragmas)."
   " Default is 'fast' for CUDA, 'fast-honor-pragmas' for HIP, and 'on' otherwise.">,
+  HelpText<"Form fused FP ops (e.g. FMAs)">,
   Values<"fast,on,off,fast-honor-pragmas">;
 
 defm strict_float_cast_overflow : BoolFOption<"strict-float-cast-overflow",
@@ -1770,7 +1968,7 @@ defm strict_float_cast_overflow : BoolFOption<"strict-float-cast-overflow",
 
 defm protect_parens : BoolFOption<"protect-parens",
   LangOpts<"ProtectParens">, DefaultFalse,
-  PosFlag<SetTrue, [CoreOption, CC1Option], 
+  PosFlag<SetTrue, [CoreOption, CC1Option],
           "Determines whether the optimizer honors parentheses when "
           "floating-point expressions are evaluated">,
   NegFlag<SetFalse>>;
@@ -1785,6 +1983,8 @@ defm rewrite_includes : BoolFOption<"rewrite-includes",
   PreprocessorOutputOpts<"RewriteIncludes">, DefaultFalse,
   PosFlag<SetTrue, [CC1Option]>, NegFlag<SetFalse>>;
 
+defm directives_only : OptInCC1FFlag<"directives-only", "">;
+
 defm delete_null_pointer_checks : BoolFOption<"delete-null-pointer-checks",
   CodeGenOpts<"NullPointerIsValid">, DefaultFalse,
   NegFlag<SetTrue, [CC1Option], "Do not treat usage of null pointers as undefined behavior">,
@@ -1799,6 +1999,9 @@ def frewrite_map_file_EQ : Joined<["-"], "frewrite-map-file=">,
 defm use_line_directives : BoolFOption<"use-line-directives",
   PreprocessorOutputOpts<"UseLineDirectives">, DefaultFalse,
   PosFlag<SetTrue, [CC1Option], "Use #line in preprocessed output">, NegFlag<SetFalse>>;
+defm minimize_whitespace : BoolFOption<"minimize-whitespace",
+  PreprocessorOutputOpts<"MinimizeWhitespace">, DefaultFalse,
+  PosFlag<SetTrue, [CC1Option], "Minimize whitespace when emitting preprocessor output">, NegFlag<SetFalse>>;
 
 def ffreestanding : Flag<["-"], "ffreestanding">, Group<f_Group>, Flags<[CC1Option]>,
   HelpText<"Assert that the compilation takes place in a freestanding environment">,
@@ -1831,19 +2034,19 @@ def finline_functions : Flag<["-"], "finline-functions">, Group<f_clang_Group>,
 def finline_hint_functions: Flag<["-"], "finline-hint-functions">, Group<f_clang_Group>, Flags<[CC1Option]>,
   HelpText<"Inline functions which are (explicitly or implicitly) marked inline">;
 def finline : Flag<["-"], "finline">, Group<clang_ignored_f_Group>;
+def finline_max_stacksize_EQ
+    : Joined<["-"], "finline-max-stacksize=">,
+      Group<f_Group>, Flags<[CoreOption, CC1Option]>,
+      HelpText<"Suppress inlining of functions whose stack size exceeds the given value">,
+      MarshallingInfoInt<CodeGenOpts<"InlineMaxStackSize">, "UINT_MAX">;
+defm jmc : BoolFOption<"jmc",
+  CodeGenOpts<"JMCInstrument">, DefaultFalse,
+  PosFlag<SetTrue, [CC1Option], "Enable just-my-code debugging">,
+  NegFlag<SetFalse>>;
 def fglobal_isel : Flag<["-"], "fglobal-isel">, Group<f_clang_Group>,
   HelpText<"Enables the global instruction selector">;
 def fexperimental_isel : Flag<["-"], "fexperimental-isel">, Group<f_clang_Group>,
   Alias<fglobal_isel>;
-defm legacy_pass_manager : BoolOption<"f", "legacy-pass-manager",
-  CodeGenOpts<"LegacyPassManager">, Default<"!static_cast<unsigned>(LLVM_ENABLE_NEW_PASS_MANAGER)">,
-  PosFlag<SetTrue, [], "Use the legacy pass manager in LLVM">,
-  NegFlag<SetFalse, [], "Use the new pass manager in LLVM">,
-  BothFlags<[CC1Option]>>, Group<f_clang_Group>;
-def fexperimental_new_pass_manager : Flag<["-"], "fexperimental-new-pass-manager">,
-  Group<f_clang_Group>, Flags<[CC1Option]>, Alias<fno_legacy_pass_manager>;
-def fno_experimental_new_pass_manager : Flag<["-"], "fno-experimental-new-pass-manager">,
-  Group<f_clang_Group>, Flags<[CC1Option]>, Alias<flegacy_pass_manager>;
 def fexperimental_strict_floating_point : Flag<["-"], "fexperimental-strict-floating-point">,
   Group<f_clang_Group>, Flags<[CC1Option]>,
   HelpText<"Enables experimental strict floating point in LLVM.">,
@@ -1861,10 +2064,21 @@ def finstrument_function_entry_bare : Flag<["-"], "finstrument-function-entry-ba
   HelpText<"Instrument function entry only, after inlining, without arguments to the instrumentation call">,
   MarshallingInfoFlag<CodeGenOpts<"InstrumentFunctionEntryBare">>;
 def fcf_protection_EQ : Joined<["-"], "fcf-protection=">, Flags<[CoreOption, CC1Option]>, Group<f_Group>,
-  HelpText<"Instrument control-flow architecture protection. Options: return, branch, full, none.">, Values<"return,branch,full,none">;
+  HelpText<"Instrument control-flow architecture protection">, Values<"return,branch,full,none">;
 def fcf_protection : Flag<["-"], "fcf-protection">, Group<f_Group>, Flags<[CoreOption, CC1Option]>,
   Alias<fcf_protection_EQ>, AliasArgs<["full"]>,
   HelpText<"Enable cf-protection in 'full' mode">;
+def mfunction_return_EQ : Joined<["-"], "mfunction-return=">,
+  Group<m_Group>, Flags<[CoreOption, CC1Option]>,
+  HelpText<"Replace returns with jumps to ``__x86_return_thunk`` (x86 only, error otherwise)">,
+  Values<"keep,thunk-extern">,
+  NormalizedValues<["Keep", "Extern"]>,
+  NormalizedValuesScope<"llvm::FunctionReturnThunksKind">,
+  MarshallingInfoEnum<CodeGenOpts<"FunctionReturnThunks">, "Keep">;
+def mindirect_branch_cs_prefix : Flag<["-"], "mindirect-branch-cs-prefix">,
+  Group<m_Group>, Flags<[CoreOption, CC1Option]>,
+  HelpText<"Add cs prefix to call and jmp to indirect thunk">,
+  MarshallingInfoFlag<CodeGenOpts<"IndirectBranchCSPrefix">>;
 
 defm xray_instrument : BoolFOption<"xray-instrument",
   LangOpts<"XRayInstrument">, DefaultFalse,
@@ -1872,31 +2086,28 @@ defm xray_instrument : BoolFOption<"xray-instrument",
   NegFlag<SetFalse>>;
 
 def fxray_instruction_threshold_EQ :
-  JoinedOrSeparate<["-"], "fxray-instruction-threshold=">,
+  Joined<["-"], "fxray-instruction-threshold=">,
   Group<f_Group>, Flags<[CC1Option]>,
   HelpText<"Sets the minimum function size to instrument with XRay">,
   MarshallingInfoInt<CodeGenOpts<"XRayInstructionThreshold">, "200">;
-def fxray_instruction_threshold_ :
-  JoinedOrSeparate<["-"], "fxray-instruction-threshold">,
-  Group<f_Group>, Flags<[CC1Option]>;
 
 def fxray_always_instrument :
-  JoinedOrSeparate<["-"], "fxray-always-instrument=">,
+  Joined<["-"], "fxray-always-instrument=">,
   Group<f_Group>, Flags<[CC1Option]>,
   HelpText<"DEPRECATED: Filename defining the whitelist for imbuing the 'always instrument' XRay attribute.">,
   MarshallingInfoStringVector<LangOpts<"XRayAlwaysInstrumentFiles">>;
 def fxray_never_instrument :
-  JoinedOrSeparate<["-"], "fxray-never-instrument=">,
+  Joined<["-"], "fxray-never-instrument=">,
   Group<f_Group>, Flags<[CC1Option]>,
   HelpText<"DEPRECATED: Filename defining the whitelist for imbuing the 'never instrument' XRay attribute.">,
   MarshallingInfoStringVector<LangOpts<"XRayNeverInstrumentFiles">>;
 def fxray_attr_list :
-  JoinedOrSeparate<["-"], "fxray-attr-list=">,
+  Joined<["-"], "fxray-attr-list=">,
   Group<f_Group>, Flags<[CC1Option]>,
   HelpText<"Filename defining the list of functions/types for imbuing XRay attributes.">,
   MarshallingInfoStringVector<LangOpts<"XRayAttrListFiles">>;
 def fxray_modes :
-  JoinedOrSeparate<["-"], "fxray-modes=">,
+  Joined<["-"], "fxray-modes=">,
   Group<f_Group>, Flags<[CC1Option]>,
   HelpText<"List of modes to link in by default into XRay instrumented binaries.">;
 
@@ -1931,7 +2142,7 @@ def fnoxray_link_deps : Flag<["-"], "fnoxray-link-deps">, Group<f_Group>,
   Flags<[CC1Option]>;
 
 def fxray_instrumentation_bundle :
-  JoinedOrSeparate<["-"], "fxray-instrumentation-bundle=">,
+  Joined<["-"], "fxray-instrumentation-bundle=">,
   Group<f_Group>, Flags<[CC1Option]>,
   HelpText<"Select which XRay instrumentation points to emit. Options: all, none, function-entry, function-exit, function, custom. Default is 'all'.  'function' includes both 'function-entry' and 'function-exit'.">;
 
@@ -1984,17 +2195,19 @@ def flimited_precision_EQ : Joined<["-"], "flimited-precision=">, Group<f_Group>
 def fapple_link_rtlib : Flag<["-"], "fapple-link-rtlib">, Group<f_Group>,
   HelpText<"Force linking the clang builtins runtime library">;
 def flto_EQ : Joined<["-"], "flto=">, Flags<[CoreOption, CC1Option]>, Group<f_Group>,
-  HelpText<"Set LTO mode to either 'full' or 'thin'">, Values<"thin,full">;
-def flto_EQ_jobserver : Flag<["-"], "flto=jobserver">, Group<f_Group>;
-def flto_EQ_auto : Flag<["-"], "flto=auto">, Group<f_Group>;
+  HelpText<"Set LTO mode">, Values<"thin,full">;
+def flto_EQ_jobserver : Flag<["-"], "flto=jobserver">, Group<f_Group>,
+  Alias<flto_EQ>, AliasArgs<["full"]>, HelpText<"Enable LTO in 'full' mode">;
+def flto_EQ_auto : Flag<["-"], "flto=auto">, Group<f_Group>,
+  Alias<flto_EQ>, AliasArgs<["full"]>, HelpText<"Enable LTO in 'full' mode">;
 def flto : Flag<["-"], "flto">, Flags<[CoreOption, CC1Option]>, Group<f_Group>,
-  HelpText<"Enable LTO in 'full' mode">;
+  Alias<flto_EQ>, AliasArgs<["full"]>, HelpText<"Enable LTO in 'full' mode">;
 def fno_lto : Flag<["-"], "fno-lto">, Flags<[CoreOption, CC1Option]>, Group<f_Group>,
   HelpText<"Disable LTO mode (default)">;
 def foffload_lto_EQ : Joined<["-"], "foffload-lto=">, Flags<[CoreOption]>, Group<f_Group>,
-  HelpText<"Set LTO mode to either 'full' or 'thin' for offload compilation">, Values<"thin,full">;
+  HelpText<"Set LTO mode for offload compilation">, Values<"thin,full">;
 def foffload_lto : Flag<["-"], "foffload-lto">, Flags<[CoreOption]>, Group<f_Group>,
-  HelpText<"Enable LTO in 'full' mode for offload compilation">;
+  Alias<foffload_lto_EQ>, AliasArgs<["full"]>, HelpText<"Enable LTO in 'full' mode for offload compilation">;
 def fno_offload_lto : Flag<["-"], "fno-offload-lto">, Flags<[CoreOption]>, Group<f_Group>,
   HelpText<"Disable LTO mode (default) for offload compilation">;
 def flto_jobs_EQ : Joined<["-"], "flto-jobs=">,
@@ -2018,6 +2231,12 @@ defm merge_all_constants : BoolFOption<"merge-all-constants",
 def fmessage_length_EQ : Joined<["-"], "fmessage-length=">, Group<f_Group>, Flags<[CC1Option]>,
   HelpText<"Format message diagnostics so that they fit within N columns">,
   MarshallingInfoInt<DiagnosticOpts<"MessageLength">>;
+def frandomize_layout_seed_EQ : Joined<["-"], "frandomize-layout-seed=">,
+  MetaVarName<"<seed>">, Group<f_clang_Group>, Flags<[CC1Option]>,
+  HelpText<"The seed used by the randomize structure layout feature">;
+def frandomize_layout_seed_file_EQ : Joined<["-"], "frandomize-layout-seed-file=">,
+  MetaVarName<"<file>">, Group<f_clang_Group>, Flags<[CC1Option]>,
+  HelpText<"File holding the seed used by the randomize structure layout feature">;
 def fms_compatibility : Flag<["-"], "fms-compatibility">, Group<f_Group>, Flags<[CC1Option, CoreOption]>,
   HelpText<"Enable full Microsoft Visual C++ compatibility">,
   MarshallingInfoFlag<LangOpts<"MSVCCompat">>;
@@ -2028,7 +2247,7 @@ defm asm_blocks : BoolFOption<"asm-blocks",
   LangOpts<"AsmBlocks">, Default<fms_extensions.KeyPath>,
   PosFlag<SetTrue, [CC1Option]>, NegFlag<SetFalse>>;
 def fms_volatile : Flag<["-"], "fms-volatile">, Group<f_Group>, Flags<[CC1Option]>,
-  MarshallingInfoFlag<CodeGenOpts<"MSVolatile">>;
+  MarshallingInfoFlag<LangOpts<"MSVolatile">>;
 def fmsc_version : Joined<["-"], "fmsc-version=">, Group<f_Group>, Flags<[NoXarchOption, CoreOption]>,
   HelpText<"Microsoft compiler version number to report in _MSC_VER (0 = don't define it (default))">;
 def fms_compatibility_version
@@ -2038,6 +2257,16 @@ def fms_compatibility_version
       HelpText<"Dot-separated value representing the Microsoft compiler "
                "version number to report in _MSC_VER (0 = don't define it "
                "(default))">;
+def fms_runtime_lib_EQ : Joined<["-"], "fms-runtime-lib=">, Group<f_Group>,
+  Flags<[NoXarchOption, CoreOption]>, Values<"static,static_dbg,dll,dll_dbg">,
+  HelpText<"Select Windows run-time library">,
+  DocBrief<[{
+Specify Visual Studio C runtime library. "static" and "static_dbg" correspond
+to the cl flags /MT and /MTd which use the multithread, static version. "dll"
+and "dll_dbg" correspond to the cl flags /MD and /MDd which use the multithread,
+dll version.}]>;
+def fms_omit_default_lib : Joined<["-"], "fms-omit-default-lib">,
+  Group<f_Group>, Flags<[NoXarchOption, CoreOption]>;
 defm delayed_template_parsing : BoolFOption<"delayed-template-parsing",
   LangOpts<"DelayedTemplateParsing">, DefaultFalse,
   PosFlag<SetTrue, [CC1Option], "Parse templated function definitions at the end of the translation unit">,
@@ -2048,6 +2277,8 @@ def fms_memptr_rep_EQ : Joined<["-"], "fms-memptr-rep=">, Group<f_Group>, Flags<
   NormalizedValues<["PPTMK_FullGeneralitySingleInheritance", "PPTMK_FullGeneralityMultipleInheritance",
                     "PPTMK_FullGeneralityVirtualInheritance"]>,
   MarshallingInfoEnum<LangOpts<"MSPointerToMemberRepresentationMethod">, "PPTMK_BestCase">;
+def fms_kernel : Flag<["-"], "fms-kernel">, Group<f_Group>, Flags<[CC1Option, NoDriverOption]>,
+  MarshallingInfoFlag<LangOpts<"Kernel">>;
 // __declspec is enabled by default for the PS4 by the driver, and also
 // enabled for Microsoft Extensions or Borland Extensions, here.
 //
@@ -2076,6 +2307,11 @@ defm prebuilt_implicit_modules : BoolFOption<"prebuilt-implicit-modules",
   PosFlag<SetTrue, [], "Look up implicit modules in the prebuilt module path">,
   NegFlag<SetFalse>, BothFlags<[NoXarchOption, CC1Option]>>;
 
+def fmodule_output_EQ : Joined<["-"], "fmodule-output=">, Flags<[NoXarchOption, CC1Option]>,
+  HelpText<"Save intermediate module file results when compiling a standard C++ module unit.">;
+def fmodule_output : Flag<["-"], "fmodule-output">, Flags<[NoXarchOption, CC1Option]>,
+  HelpText<"Save intermediate module file results when compiling a standard C++ module unit.">;
+
 def fmodules_prune_interval : Joined<["-"], "fmodules-prune-interval=">, Group<i_Group>,
   Flags<[CC1Option]>, MetaVarName<"<seconds>">,
   HelpText<"Specify the interval (in seconds) between attempts to prune the module cache">,
@@ -2104,6 +2340,19 @@ defm modules_validate_system_headers : BoolOption<"f", "modules-validate-system-
   HeaderSearchOpts<"ModulesValidateSystemHeaders">, DefaultFalse,
   PosFlag<SetTrue, [CC1Option], "Validate the system headers that a module depends on when loading the module">,
   NegFlag<SetFalse, [NoXarchOption]>>, Group<i_Group>;
+def fno_modules_validate_textual_header_includes :
+  Flag<["-"], "fno-modules-validate-textual-header-includes">,
+  Group<f_Group>, Flags<[CC1Option, NoXarchOption]>,
+  MarshallingInfoNegativeFlag<LangOpts<"ModulesValidateTextualHeaderIncludes">>,
+  HelpText<"Do not enforce -fmodules-decluse and private header restrictions for textual headers. "
+           "This flag will be removed in a future Clang release.">;
+
+def fincremental_extensions :
+  Flag<["-"], "fincremental-extensions">,
+  Group<f_Group>, Flags<[CC1Option]>,
+  HelpText<"Enable incremental processing extensions such as processing"
+           "statements on the global scope.">,
+  MarshallingInfoFlag<LangOpts<"IncrementalExtensions">>;
 
 def fvalidate_ast_input_files_content:
   Flag <["-"], "fvalidate-ast-input-files-content">,
@@ -2130,9 +2379,9 @@ defm pch_instantiate_templates : BoolFOption<"pch-instantiate-templates",
   LangOpts<"PCHInstantiateTemplates">, DefaultFalse,
   PosFlag<SetTrue, [], "Instantiate templates already while building a PCH">,
   NegFlag<SetFalse>, BothFlags<[CC1Option, CoreOption]>>;
-defm pch_codegen: OptInFFlag<"pch-codegen", "Generate ", "Do not generate ",
+defm pch_codegen: OptInCC1FFlag<"pch-codegen", "Generate ", "Do not generate ",
   "code for uses of this PCH that assumes an explicit object file will be built for the PCH">;
-defm pch_debuginfo: OptInFFlag<"pch-debuginfo", "Generate ", "Do not generate ",
+defm pch_debuginfo: OptInCC1FFlag<"pch-debuginfo", "Generate ", "Do not generate ",
   "debug info for types in an object file built from this PCH and do not generate them elsewhere">;
 
 def fimplicit_module_maps : Flag <["-"], "fimplicit-module-maps">, Group<f_Group>,
@@ -2143,7 +2392,7 @@ def fmodules_ts : Flag <["-"], "fmodules-ts">, Group<f_Group>,
   Flags<[CC1Option]>, HelpText<"Enable support for the C++ Modules TS">,
   MarshallingInfoFlag<LangOpts<"ModulesTS">>;
 defm modules : BoolFOption<"modules",
-  LangOpts<"Modules">, Default<!strconcat(fmodules_ts.KeyPath, "||", cpp_modules.KeyPath)>,
+  LangOpts<"Modules">, Default<!strconcat(fmodules_ts.KeyPath, "||", fcxx_modules.KeyPath)>,
   PosFlag<SetTrue, [CC1Option], "Enable the 'modules' language feature">,
   NegFlag<SetFalse>, BothFlags<[NoXarchOption, CoreOption]>>;
 def fmodule_maps : Flag <["-"], "fmodule-maps">, Flags<[CoreOption]>, Alias<fimplicit_module_maps>;
@@ -2184,6 +2433,16 @@ defm implicit_modules : BoolFOption<"implicit-modules",
   NegFlag<SetFalse, [CC1Option]>, PosFlag<SetTrue>, BothFlags<[NoXarchOption,CoreOption]>>;
 def fretain_comments_from_system_headers : Flag<["-"], "fretain-comments-from-system-headers">, Group<f_Group>, Flags<[CC1Option]>,
   MarshallingInfoFlag<LangOpts<"RetainCommentsFromSystemHeaders">>;
+def fmodule_header : Flag <["-"], "fmodule-header">, Group<f_Group>,
+  Flags<[NoXarchOption]>, HelpText<"Build a C++20 Header Unit from a header.">;
+def fmodule_header_EQ : Joined<["-"], "fmodule-header=">, Group<f_Group>,
+  Flags<[NoXarchOption]>, MetaVarName<"<kind>">,
+  HelpText<"Build a C++20 Header Unit from a header that should be found in the user (fmodule-header=user) or system (fmodule-header=system) search path.">;
+
+def fno_knr_functions : Flag<["-"], "fno-knr-functions">, Group<f_Group>,
+  MarshallingInfoFlag<LangOpts<"DisableKNRFunctions">>,
+  HelpText<"Disable support for K&R C function declarations">,
+  Flags<[CC1Option, CoreOption]>;
 
 def fmudflapth : Flag<["-"], "fmudflapth">, Group<f_Group>;
 def fmudflap : Flag<["-"], "fmudflap">, Group<f_Group>;
@@ -2198,12 +2457,8 @@ def fno_builtin : Flag<["-"], "fno-builtin">, Group<f_Group>, Flags<[CC1Option,
   HelpText<"Disable implicit builtin knowledge of functions">;
 def fno_builtin_ : Joined<["-"], "fno-builtin-">, Group<f_Group>, Flags<[CC1Option, CoreOption]>,
   HelpText<"Disable implicit builtin knowledge of a specific function">;
-def fno_diagnostics_color : Flag<["-"], "fno-diagnostics-color">, Group<f_Group>,
-  Flags<[CoreOption, NoXarchOption]>;
 def fno_common : Flag<["-"], "fno-common">, Group<f_Group>, Flags<[CC1Option]>,
     HelpText<"Compile common globals like normal definitions">;
-def fno_cxx_modules : Flag <["-"], "fno-cxx-modules">, Group<f_Group>,
-  Flags<[NoXarchOption]>;
 defm digraphs : BoolFOption<"digraphs",
   LangOpts<"Digraphs">, Default<std#".hasDigraphs()">,
   PosFlag<SetTrue, [], "Enable alternative token representations '<:', ':>', '<%', '%>', '%:', '%:%:' (default)">,
@@ -2218,9 +2473,9 @@ def fno_experimental_isel : Flag<["-"], "fno-experimental-isel">, Group<f_clang_
   Alias<fno_global_isel>;
 def fveclib : Joined<["-"], "fveclib=">, Group<f_Group>, Flags<[CC1Option]>,
     HelpText<"Use the given vector functions library">,
-    Values<"Accelerate,libmvec,MASSV,SVML,Darwin_libsystem_m,none">,
+    Values<"Accelerate,libmvec,MASSV,SVML,SLEEF,Darwin_libsystem_m,none">,
     NormalizedValuesScope<"CodeGenOptions">,
-    NormalizedValues<["Accelerate", "LIBMVEC", "MASSV", "SVML",
+    NormalizedValues<["Accelerate", "LIBMVEC", "MASSV", "SVML", "SLEEF",
                       "Darwin_libsystem_m", "NoLibrary"]>,
     MarshallingInfoEnum<CodeGenOpts<"VecLib">, "NoLibrary">;
 def fno_lax_vector_conversions : Flag<["-"], "fno-lax-vector-conversions">, Group<f_Group>,
@@ -2264,7 +2519,6 @@ defm use_cxa_atexit : BoolFOption<"use-cxa-atexit",
   CodeGenOpts<"CXAAtExit">, DefaultTrue,
   NegFlag<SetFalse, [CC1Option], "Don't use __cxa_atexit for calling destructors">,
   PosFlag<SetTrue>>;
-def fno_unit_at_a_time : Flag<["-"], "fno-unit-at-a-time">, Group<f_Group>;
 def fno_unwind_tables : Flag<["-"], "fno-unwind-tables">, Group<f_Group>;
 def fno_verbose_asm : Flag<["-"], "fno-verbose-asm">, Group<f_Group>, Flags<[CC1Option]>,
   MarshallingInfoNegativeFlag<CodeGenOpts<"AsmVerbose">>;
@@ -2338,12 +2592,24 @@ def fobjc_disable_direct_methods_for_testing :
   Group<f_Group>, Flags<[CC1Option]>,
   HelpText<"Ignore attribute objc_direct so that direct methods can be tested">,
   MarshallingInfoFlag<LangOpts<"ObjCDisableDirectMethodsForTesting">>;
+defm objc_avoid_heapify_local_blocks : BoolFOption<"objc-avoid-heapify-local-blocks",
+  CodeGenOpts<"ObjCAvoidHeapifyLocalBlocks">, DefaultFalse,
+  PosFlag<SetTrue, [], "Try">,
+  NegFlag<SetFalse, [], "Don't try">,
+  BothFlags<[CC1Option, NoDriverOption], " to avoid heapifying local blocks">>;
 
 def fomit_frame_pointer : Flag<["-"], "fomit-frame-pointer">, Group<f_Group>;
 def fopenmp : Flag<["-"], "fopenmp">, Group<f_Group>, Flags<[CC1Option, NoArgumentUnused, FlangOption, FC1Option]>,
   HelpText<"Parse OpenMP pragmas and generate parallel code.">;
 def fno_openmp : Flag<["-"], "fno-openmp">, Group<f_Group>, Flags<[NoArgumentUnused]>;
-def fopenmp_version_EQ : Joined<["-"], "fopenmp-version=">, Group<f_Group>, Flags<[CC1Option, NoArgumentUnused]>;
+def fopenmp_version_EQ : Joined<["-"], "fopenmp-version=">, Group<f_Group>, Flags<[CC1Option, NoArgumentUnused]>,
+  HelpText<"Set OpenMP version (e.g. 45 for OpenMP 4.5, 50 for OpenMP 5.0). Default value is 50.">;
+defm openmp_extensions: BoolFOption<"openmp-extensions",
+  LangOpts<"OpenMPExtensions">, DefaultTrue,
+  PosFlag<SetTrue, [CC1Option, NoArgumentUnused],
+          "Enable all Clang extensions for OpenMP directives and clauses">,
+  NegFlag<SetFalse, [CC1Option, NoArgumentUnused],
+          "Disable all Clang extensions for OpenMP directives and clauses">>;
 def fopenmp_EQ : Joined<["-"], "fopenmp=">, Group<f_Group>;
 def fopenmp_use_tls : Flag<["-"], "fopenmp-use-tls">, Group<f_Group>,
   Flags<[NoArgumentUnused, HelpHidden]>;
@@ -2364,26 +2630,74 @@ def fopenmp_cuda_mode : Flag<["-"], "fopenmp-cuda-mode">, Group<f_Group>,
   Flags<[CC1Option, NoArgumentUnused, HelpHidden]>;
 def fno_openmp_cuda_mode : Flag<["-"], "fno-openmp-cuda-mode">, Group<f_Group>,
   Flags<[NoArgumentUnused, HelpHidden]>;
-def fopenmp_cuda_force_full_runtime : Flag<["-"], "fopenmp-cuda-force-full-runtime">, Group<f_Group>,
-  Flags<[CC1Option, NoArgumentUnused, HelpHidden]>;
-def fno_openmp_cuda_force_full_runtime : Flag<["-"], "fno-openmp-cuda-force-full-runtime">, Group<f_Group>,
-  Flags<[NoArgumentUnused, HelpHidden]>;
 def fopenmp_cuda_number_of_sm_EQ : Joined<["-"], "fopenmp-cuda-number-of-sm=">, Group<f_Group>,
   Flags<[CC1Option, NoArgumentUnused, HelpHidden]>;
 def fopenmp_cuda_blocks_per_sm_EQ : Joined<["-"], "fopenmp-cuda-blocks-per-sm=">, Group<f_Group>,
   Flags<[CC1Option, NoArgumentUnused, HelpHidden]>;
 def fopenmp_cuda_teams_reduction_recs_num_EQ : Joined<["-"], "fopenmp-cuda-teams-reduction-recs-num=">, Group<f_Group>,
   Flags<[CC1Option, NoArgumentUnused, HelpHidden]>;
-defm openmp_target_new_runtime: BoolFOption<"openmp-target-new-runtime",
-  LangOpts<"OpenMPTargetNewRuntime">, DefaultFalse,
-  PosFlag<SetTrue, [CC1Option], "Use the new bitcode library for OpenMP offloading">,
-  NegFlag<SetFalse>>;
+def fopenmp_target_debug : Flag<["-"], "fopenmp-target-debug">, Group<f_Group>, Flags<[CC1Option, NoArgumentUnused]>,
+  HelpText<"Enable debugging in the OpenMP offloading device RTL">;
+def fno_openmp_target_debug : Flag<["-"], "fno-openmp-target-debug">, Group<f_Group>, Flags<[NoArgumentUnused]>;
+def fopenmp_target_debug_EQ : Joined<["-"], "fopenmp-target-debug=">, Group<f_Group>, Flags<[CC1Option, NoArgumentUnused, HelpHidden]>;
+def fopenmp_assume_teams_oversubscription : Flag<["-"], "fopenmp-assume-teams-oversubscription">,
+  Group<f_Group>, Flags<[CC1Option, NoArgumentUnused, HelpHidden]>;
+def fopenmp_assume_threads_oversubscription : Flag<["-"], "fopenmp-assume-threads-oversubscription">,
+  Group<f_Group>, Flags<[CC1Option, NoArgumentUnused, HelpHidden]>;
+def fno_openmp_assume_teams_oversubscription : Flag<["-"], "fno-openmp-assume-teams-oversubscription">,
+  Group<f_Group>, Flags<[CC1Option, NoArgumentUnused, HelpHidden]>;
+def fno_openmp_assume_threads_oversubscription : Flag<["-"], "fno-openmp-assume-threads-oversubscription">,
+  Group<f_Group>, Flags<[CC1Option, NoArgumentUnused, HelpHidden]>;
+def fopenmp_assume_no_thread_state : Flag<["-"], "fopenmp-assume-no-thread-state">, Group<f_Group>,
+  Flags<[CC1Option, NoArgumentUnused, HelpHidden]>,
+  HelpText<"Assert no thread in a parallel region modifies an ICV">,
+  MarshallingInfoFlag<LangOpts<"OpenMPNoThreadState">>;
+def fopenmp_assume_no_nested_parallelism : Flag<["-"], "fopenmp-assume-no-nested-parallelism">, Group<f_Group>,
+  Flags<[CC1Option, NoArgumentUnused, HelpHidden]>,
+  HelpText<"Assert no nested parallel regions in the GPU">,
+  MarshallingInfoFlag<LangOpts<"OpenMPNoNestedParallelism">>;
+def fopenmp_offload_mandatory : Flag<["-"], "fopenmp-offload-mandatory">, Group<f_Group>,
+  Flags<[CC1Option, NoArgumentUnused]>,
+  HelpText<"Do not create a host fallback if offloading to the device fails.">,
+  MarshallingInfoFlag<LangOpts<"OpenMPOffloadMandatory">>;
+def fopenmp_target_jit : Flag<["-"], "fopenmp-target-jit">, Group<f_Group>,
+  Flags<[CoreOption, NoArgumentUnused]>,
+  HelpText<"Emit code that can be JIT compiled for OpenMP offloading. Implies -foffload-lto=full">;
+def fno_openmp_target_jit : Flag<["-"], "fno-openmp-target-jit">, Group<f_Group>,
+  Flags<[CoreOption, NoArgumentUnused, HelpHidden]>;
+def fopenmp_target_new_runtime : Flag<["-"], "fopenmp-target-new-runtime">,
+  Group<f_Group>, Flags<[CC1Option, HelpHidden]>;
+def fno_openmp_target_new_runtime : Flag<["-"], "fno-openmp-target-new-runtime">,
+  Group<f_Group>, Flags<[CC1Option, HelpHidden]>;
 defm openmp_optimistic_collapse : BoolFOption<"openmp-optimistic-collapse",
   LangOpts<"OpenMPOptimisticCollapse">, DefaultFalse,
   PosFlag<SetTrue, [CC1Option]>, NegFlag<SetFalse>, BothFlags<[NoArgumentUnused, HelpHidden]>>;
 def static_openmp: Flag<["-"], "static-openmp">,
   HelpText<"Use the static host OpenMP runtime while linking.">;
-def fno_optimize_sibling_calls : Flag<["-"], "fno-optimize-sibling-calls">, Group<f_Group>;
+def offload_new_driver : Flag<["--"], "offload-new-driver">, Flags<[CC1Option]>, Group<f_Group>,
+  MarshallingInfoFlag<LangOpts<"OffloadingNewDriver">>, HelpText<"Use the new driver for offloading compilation.">;
+def no_offload_new_driver : Flag<["--"], "no-offload-new-driver">, Flags<[CC1Option]>, Group<f_Group>,
+  HelpText<"Don't Use the new driver for offloading compilation.">;
+def offload_device_only : Flag<["--"], "offload-device-only">,
+  HelpText<"Only compile for the offloading device.">;
+def offload_host_only : Flag<["--"], "offload-host-only">,
+  HelpText<"Only compile for the offloading host.">;
+def offload_host_device : Flag<["--"], "offload-host-device">,
+  HelpText<"Only compile for the offloading host.">;
+def cuda_device_only : Flag<["--"], "cuda-device-only">, Alias<offload_device_only>,
+  HelpText<"Compile CUDA code for device only">;
+def cuda_host_only : Flag<["--"], "cuda-host-only">, Alias<offload_host_only>,
+  HelpText<"Compile CUDA code for host only. Has no effect on non-CUDA compilations.">;
+def cuda_compile_host_device : Flag<["--"], "cuda-compile-host-device">, Alias<offload_host_device>,
+  HelpText<"Compile CUDA code for both host and device (default). Has no "
+           "effect on non-CUDA compilations.">;
+def fopenmp_new_driver : Flag<["-"], "fopenmp-new-driver">, Flags<[HelpHidden]>,
+  HelpText<"Use the new driver for OpenMP offloading.">;
+def fno_openmp_new_driver : Flag<["-"], "fno-openmp-new-driver">, Flags<[HelpHidden]>,
+  HelpText<"Don't use the new driver for OpenMP offloading.">;
+def fno_optimize_sibling_calls : Flag<["-"], "fno-optimize-sibling-calls">, Group<f_Group>, Flags<[CC1Option]>,
+  HelpText<"Disable tail call optimization, keeping the call stack accurate">,
+  MarshallingInfoFlag<CodeGenOpts<"DisableTailCalls">>;
 def foptimize_sibling_calls : Flag<["-"], "foptimize-sibling-calls">, Group<f_Group>;
 defm escaping_block_tail_calls : BoolFOption<"escaping-block-tail-calls",
   CodeGenOpts<"NoEscapingBlockTailCalls">, DefaultFalse,
@@ -2412,6 +2726,9 @@ defm pascal_strings : BoolFOption<"pascal-strings",
 def fpatchable_function_entry_EQ : Joined<["-"], "fpatchable-function-entry=">, Group<f_Group>, Flags<[CC1Option]>,
   MetaVarName<"<N,M>">, HelpText<"Generate M NOPs before function entry and N-M NOPs after function entry">,
   MarshallingInfoInt<CodeGenOpts<"PatchableFunctionEntryCount">>;
+def fms_hotpatch : Flag<["-"], "fms-hotpatch">, Group<f_Group>, Flags<[CC1Option, CoreOption]>,
+  HelpText<"Ensure that all functions can be hotpatched at runtime">,
+  MarshallingInfoFlag<CodeGenOpts<"HotPatch">>;
 def fpcc_struct_return : Flag<["-"], "fpcc-struct-return">, Group<f_Group>, Flags<[CC1Option]>,
   HelpText<"Override the default ABI to return all structs on the stack">;
 def fpch_preprocess : Flag<["-"], "fpch-preprocess">, Group<f_Group>;
@@ -2419,6 +2736,8 @@ def fpic : Flag<["-"], "fpic">, Group<f_Group>;
 def fno_pic : Flag<["-"], "fno-pic">, Group<f_Group>;
 def fpie : Flag<["-"], "fpie">, Group<f_Group>;
 def fno_pie : Flag<["-"], "fno-pie">, Group<f_Group>;
+defm pic_data_is_text_relative : SimpleMFlag<"pic-data-is-text-relative",
+     "Assume", "Don't assume", " data segments are relative to text segment">;
 def fdirect_access_external_data : Flag<["-"], "fdirect-access-external-data">, Group<f_Group>, Flags<[CC1Option]>,
   HelpText<"Don't use GOT indirection to reference external data symbols">;
 def fno_direct_access_external_data : Flag<["-"], "fno-direct-access-external-data">, Group<f_Group>, Flags<[CC1Option]>,
@@ -2437,8 +2756,11 @@ defm rwpi : BoolFOption<"rwpi",
   NegFlag<SetFalse>>;
 def fplugin_EQ : Joined<["-"], "fplugin=">, Group<f_Group>, Flags<[NoXarchOption]>, MetaVarName<"<dsopath>">,
   HelpText<"Load the named plugin (dynamic shared object)">;
+def fplugin_arg : Joined<["-"], "fplugin-arg-">,
+  MetaVarName<"<name>-<arg>">,
+  HelpText<"Pass <arg> to plugin <name>">;
 def fpass_plugin_EQ : Joined<["-"], "fpass-plugin=">,
-  Group<f_Group>, Flags<[CC1Option]>, MetaVarName<"<dsopath>">,
+  Group<f_Group>, Flags<[CC1Option,FlangOption,FC1Option]>, MetaVarName<"<dsopath>">,
   HelpText<"Load pass plugin from a dynamic shared object file (only with new pass manager).">,
   MarshallingInfoStringVector<CodeGenOpts<"PassPlugins">>;
 defm preserve_as_comments : BoolFOption<"preserve-as-comments",
@@ -2472,8 +2794,8 @@ def fshort_wchar : Flag<["-"], "fshort-wchar">, Group<f_Group>,
 def fno_short_wchar : Flag<["-"], "fno-short-wchar">, Group<f_Group>,
   HelpText<"Force wchar_t to be an unsigned int">;
 def fshow_overloads_EQ : Joined<["-"], "fshow-overloads=">, Group<f_Group>, Flags<[CC1Option]>,
-  HelpText<"Which overload candidates to show when overload resolution fails: "
-           "best|all; defaults to all">, Values<"best,all">,
+  HelpText<"Which overload candidates to show when overload resolution fails. Defaults to 'all'">,
+  Values<"best,all">,
   NormalizedValues<["Ovl_Best", "Ovl_All"]>,
   MarshallingInfoEnum<DiagnosticOpts<"ShowOverloads">, "Ovl_All">;
 defm show_column : BoolFOption<"show-column",
@@ -2495,7 +2817,7 @@ defm signed_char : BoolFOption<"signed-char",
   ShouldParseIf<!strconcat("!", open_cl.KeyPath)>;
 defm split_stack : BoolFOption<"split-stack",
   CodeGenOpts<"EnableSegmentedStacks">, DefaultFalse,
-  NegFlag<SetFalse, [], "Wouldn't use segmented stack">, 
+  NegFlag<SetFalse, [], "Wouldn't use segmented stack">,
   PosFlag<SetTrue, [CC1Option], "Use segmented stack">>;
 def fstack_protector_all : Flag<["-"], "fstack-protector-all">, Group<f_Group>,
   HelpText<"Enable stack protectors for all functions">;
@@ -2520,14 +2842,11 @@ def fstack_protector : Flag<["-"], "fstack-protector">, Group<f_Group>,
            "overwrite the guard value before overwriting the function's return "
            "address. The reference stack guard value is stored in a global variable.">;
 def ftrivial_auto_var_init : Joined<["-"], "ftrivial-auto-var-init=">, Group<f_Group>,
-  Flags<[CC1Option, CoreOption]>, HelpText<"Initialize trivial automatic stack variables: uninitialized (default)"
-  " | pattern">, Values<"uninitialized,zero,pattern">,
+  Flags<[CC1Option, CoreOption]>, HelpText<"Initialize trivial automatic stack variables. Defaults to 'uninitialized'">,
+  Values<"uninitialized,zero,pattern">,
   NormalizedValuesScope<"LangOptions::TrivialAutoVarInitKind">,
   NormalizedValues<["Uninitialized", "Zero", "Pattern"]>,
   MarshallingInfoEnum<LangOpts<"TrivialAutoVarInit">, "Uninitialized">;
-def enable_trivial_var_init_zero : Flag<["-"], "enable-trivial-auto-var-init-zero-knowing-it-will-be-removed-from-clang">,
-  Flags<[CC1Option, CoreOption]>,
-  HelpText<"Trivial automatic variable initialization to zero is only here for benchmarks, it'll eventually be removed, and I'm OK with that because I'm only using it to benchmark">;
 def ret_protector : Flag<["-"], "ret-protector">, Flags<[CC1Option]>,
   HelpText<"Enable Return Protectors">;
 def fno_ret_protector : Flag<["-"], "fno-ret-protector">, Group<f_Group>, Flags<[CoreOption]>,
@@ -2563,8 +2882,11 @@ defm strict_vtable_pointers : BoolFOption<"strict-vtable-pointers",
             " overwriting polymorphic C++ objects">,
   NegFlag<SetFalse>>;
 def fstrict_overflow : Flag<["-"], "fstrict-overflow">, Group<f_Group>;
+def fdriver_only : Flag<["-"], "fdriver-only">, Flags<[NoXarchOption, CoreOption]>,
+  Group<Action_Group>, HelpText<"Only run the driver.">;
 def fsyntax_only : Flag<["-"], "fsyntax-only">,
-  Flags<[NoXarchOption,CoreOption,CC1Option,FC1Option]>, Group<Action_Group>;
+  Flags<[NoXarchOption,CoreOption,CC1Option,FC1Option,FlangOption]>, Group<Action_Group>,
+  HelpText<"Run the preprocessor, parser and semantic analysis stages">;
 def ftabstop_EQ : Joined<["-"], "ftabstop=">, Group<f_Group>;
 def ftemplate_depth_EQ : Joined<["-"], "ftemplate-depth=">, Group<f_Group>;
 def ftemplate_depth_ : Joined<["-"], "ftemplate-depth-">, Group<f_Group>;
@@ -2626,8 +2948,8 @@ def ftime_report : Flag<["-"], "ftime-report">, Group<f_Group>, Flags<[CC1Option
 def ftime_report_EQ: Joined<["-"], "ftime-report=">, Group<f_Group>,
   Flags<[CC1Option]>, Values<"per-pass,per-pass-run">,
   MarshallingInfoFlag<CodeGenOpts<"TimePassesPerRun">>,
-  HelpText<"(For new pass manager) \"per-pass\": one report for each pass; "
-           "\"per-pass-run\": one report for each pass invocation">;
+  HelpText<"(For new pass manager) 'per-pass': one report for each pass; "
+           "'per-pass-run': one report for each pass invocation">;
 def ftime_trace : Flag<["-"], "ftime-trace">, Group<f_Group>,
   HelpText<"Turn on time profiler. Generates JSON file based on output filename.">,
   DocBrief<[{
@@ -2640,6 +2962,10 @@ def ftime_trace_granularity_EQ : Joined<["-"], "ftime-trace-granularity=">, Grou
   HelpText<"Minimum time granularity (in microseconds) traced by time profiler">,
   Flags<[CC1Option, CoreOption]>,
   MarshallingInfoInt<FrontendOpts<"TimeTraceGranularity">, "500u">;
+def ftime_trace_EQ : Joined<["-"], "ftime-trace=">, Group<f_Group>,
+  HelpText<"Similar to -ftime-trace. Specify the JSON file or a directory which will contain the JSON file">,
+  Flags<[CC1Option, CoreOption]>,
+  MarshallingInfoString<FrontendOpts<"TimeTracePath">>;
 def fproc_stat_report : Joined<["-"], "fproc-stat-report">, Group<f_Group>,
   HelpText<"Print subprocess statistics">;
 def fproc_stat_report_EQ : Joined<["-"], "fproc-stat-report=">, Group<f_Group>,
@@ -2658,7 +2984,6 @@ def ftrapv_handler : Separate<["-"], "ftrapv-handler">, Group<f_Group>, Flags<[C
 def ftrap_function_EQ : Joined<["-"], "ftrap-function=">, Group<f_Group>, Flags<[CC1Option]>,
   HelpText<"Issue call to specified function rather than a trap instruction">,
   MarshallingInfoString<CodeGenOpts<"TrapFuncName">>;
-def funit_at_a_time : Flag<["-"], "funit-at-a-time">, Group<f_Group>;
 def funroll_loops : Flag<["-"], "funroll-loops">, Group<f_Group>,
   HelpText<"Turn on loop unroller">, Flags<[CC1Option]>;
 def fno_unroll_loops : Flag<["-"], "fno-unroll-loops">, Group<f_Group>,
@@ -2693,14 +3018,14 @@ def fverbose_asm : Flag<["-"], "fverbose-asm">, Group<f_Group>,
 def dA : Flag<["-"], "dA">, Alias<fverbose_asm>;
 defm visibility_from_dllstorageclass : BoolFOption<"visibility-from-dllstorageclass",
   LangOpts<"VisibilityFromDLLStorageClass">, DefaultFalse,
-  PosFlag<SetTrue, [CC1Option], "Set the visiblity of symbols in the generated code from their DLL storage class">,
+  PosFlag<SetTrue, [CC1Option], "Set the visibility of symbols in the generated code from their DLL storage class">,
   NegFlag<SetFalse>>;
 def fvisibility_dllexport_EQ : Joined<["-"], "fvisibility-dllexport=">, Group<f_Group>, Flags<[CC1Option]>,
-  HelpText<"The visibility for dllexport defintions [-fvisibility-from-dllstorageclass]">,
+  HelpText<"The visibility for dllexport definitions [-fvisibility-from-dllstorageclass]">,
   MarshallingInfoVisibility<LangOpts<"DLLExportVisibility">, "DefaultVisibility">,
   ShouldParseIf<fvisibility_from_dllstorageclass.KeyPath>;
 def fvisibility_nodllstorageclass_EQ : Joined<["-"], "fvisibility-nodllstorageclass=">, Group<f_Group>, Flags<[CC1Option]>,
-  HelpText<"The visibility for defintiions without an explicit DLL export class [-fvisibility-from-dllstorageclass]">,
+  HelpText<"The visibility for definitions without an explicit DLL export class [-fvisibility-from-dllstorageclass]">,
   MarshallingInfoVisibility<LangOpts<"NoDLLStorageClassVisibility">, "HiddenVisibility">,
   ShouldParseIf<fvisibility_from_dllstorageclass.KeyPath>;
 def fvisibility_externs_dllimport_EQ : Joined<["-"], "fvisibility-externs-dllimport=">, Group<f_Group>, Flags<[CC1Option]>,
@@ -2711,8 +3036,9 @@ def fvisibility_externs_nodllstorageclass_EQ : Joined<["-"], "fvisibility-extern
   HelpText<"The visibility for external declarations without an explicit DLL dllstorageclass [-fvisibility-from-dllstorageclass]">,
   MarshallingInfoVisibility<LangOpts<"ExternDeclNoDLLStorageClassVisibility">, "HiddenVisibility">,
   ShouldParseIf<fvisibility_from_dllstorageclass.KeyPath>;
-def fvisibility_EQ : Joined<["-"], "fvisibility=">, Group<f_Group>,
-  HelpText<"Set the default symbol visibility for all global declarations">, Values<"hidden,default">;
+def fvisibility_EQ : Joined<["-"], "fvisibility=">, Group<f_Group>, Flags<[CC1Option]>,
+  HelpText<"Set the default symbol visibility for all global definitions">,
+  MarshallingInfoVisibility<LangOpts<"ValueVisibilityMode">, "DefaultVisibility">;
 defm visibility_inlines_hidden : BoolFOption<"visibility-inlines-hidden",
   LangOpts<"InlineVisibilityHidden">, DefaultFalse,
   PosFlag<SetTrue, [CC1Option], "Give inline C++ member functions hidden visibility by default">,
@@ -2729,6 +3055,18 @@ def fvisibility_ms_compat : Flag<["-"], "fvisibility-ms-compat">, Group<f_Group>
 def fvisibility_global_new_delete_hidden : Flag<["-"], "fvisibility-global-new-delete-hidden">, Group<f_Group>,
   HelpText<"Give global C++ operator new and delete declarations hidden visibility">, Flags<[CC1Option]>,
   MarshallingInfoFlag<LangOpts<"GlobalAllocationFunctionVisibilityHidden">>;
+def mdefault_visibility_export_mapping_EQ : Joined<["-"], "mdefault-visibility-export-mapping=">,
+  Values<"none,explicit,all">,
+  NormalizedValuesScope<"LangOptions::DefaultVisiblityExportMapping">,
+  NormalizedValues<["None", "Explicit", "All"]>,
+  HelpText<"Mapping between default visibility and export">,
+  Group<m_Group>, Flags<[CC1Option]>,
+  MarshallingInfoEnum<LangOpts<"DefaultVisibilityExportMapping">,"None">;
+defm new_infallible : BoolFOption<"new-infallible",
+  LangOpts<"NewInfallible">, DefaultFalse,
+  PosFlag<SetTrue, [], "Enable">, NegFlag<SetFalse, [], "Disable">,
+  BothFlags<[CC1Option], " treating throwing global C++ operator new as always returning valid memory "
+  "(annotates with __attribute__((returns_nonnull)) and throw()). This is detectable in source.">>;
 defm whole_program_vtables : BoolFOption<"whole-program-vtables",
   CodeGenOpts<"WholeProgramVTables">, DefaultFalse,
   PosFlag<SetTrue, [CC1Option], "Enables whole-program vtable optimization. Requires -flto">,
@@ -2761,7 +3099,7 @@ defm function_sections : BoolFOption<"function-sections",
   NegFlag<SetFalse>>;
 def fbasic_block_sections_EQ : Joined<["-"], "fbasic-block-sections=">, Group<f_Group>,
   Flags<[CC1Option, CC1AsOption]>,
-  HelpText<"Place each function's basic blocks in unique sections (ELF Only) : all | labels | none | list=<file>">,
+  HelpText<"Place each function's basic blocks in unique sections (ELF Only)">,
   DocBrief<[{Generate labels for each basic block or place each basic block or a subset of basic blocks in its own section.}]>,
   Values<"all,labels,none,list=">,
   MarshallingInfoString<CodeGenOpts<"BBSections">, [{"none"}]>;
@@ -2809,6 +3147,14 @@ def fenable_matrix : Flag<["-"], "fenable-matrix">, Group<f_Group>,
     HelpText<"Enable matrix data type and related builtin functions">,
     MarshallingInfoFlag<LangOpts<"MatrixTypes">>;
 
+def fzero_call_used_regs_EQ
+    : Joined<["-"], "fzero-call-used-regs=">, Group<f_Group>, Flags<[CC1Option]>,
+      HelpText<"Clear call-used registers upon function return (AArch64/x86 only)">,
+      Values<"skip,used-gpr-arg,used-gpr,used-arg,used,all-gpr-arg,all-gpr,all-arg,all">,
+      NormalizedValues<["Skip", "UsedGPRArg", "UsedGPR", "UsedArg", "Used",
+                        "AllGPRArg", "AllGPR", "AllArg", "All"]>,
+      NormalizedValuesScope<"llvm::ZeroCallUsedRegs::ZeroCallUsedRegsKind">,
+      MarshallingInfoEnum<CodeGenOpts<"ZeroCallUsedRegs">, "Skip">;
 
 def fdebug_types_section: Flag <["-"], "fdebug-types-section">, Group<f_Group>,
   HelpText<"Place debug types in their own section (ELF Only)">;
@@ -2835,13 +3181,22 @@ def fcoverage_prefix_map_EQ
     HelpText<"remap file source paths in coverage mapping">;
 def ffile_prefix_map_EQ
   : Joined<["-"], "ffile-prefix-map=">, Group<f_Group>,
-    HelpText<"remap file source paths in debug info, predefined preprocessor macros and __builtin_FILE()">;
+    HelpText<"remap file source paths in debug info, predefined preprocessor "
+             "macros and __builtin_FILE(). Implies -ffile-reproducible.">;
 def fmacro_prefix_map_EQ
   : Joined<["-"], "fmacro-prefix-map=">, Group<f_Group>, Flags<[CC1Option]>,
-    HelpText<"remap file source paths in predefined preprocessor macros and __builtin_FILE()">;
+    HelpText<"remap file source paths in predefined preprocessor macros and "
+             "__builtin_FILE(). Implies -ffile-reproducible.">;
 defm force_dwarf_frame : BoolFOption<"force-dwarf-frame",
   CodeGenOpts<"ForceDwarfFrameSection">, DefaultFalse,
   PosFlag<SetTrue, [CC1Option], "Always emit a debug frame section">, NegFlag<SetFalse>>;
+def femit_dwarf_unwind_EQ : Joined<["-"], "femit-dwarf-unwind=">,
+  Group<f_Group>, Flags<[CC1Option, CC1AsOption]>,
+  HelpText<"When to emit DWARF unwind (EH frame) info">,
+  Values<"always,no-compact-unwind,default">,
+  NormalizedValues<["Always", "NoCompactUnwind", "Default"]>,
+  NormalizedValuesScope<"llvm::EmitDwarfUnwindType">,
+  MarshallingInfoEnum<CodeGenOpts<"EmitDwarfUnwind">, "Default">;
 def g_Flag : Flag<["-"], "g">, Group<g_Group>,
   HelpText<"Generate source-level debug information">;
 def gline_tables_only : Flag<["-"], "gline-tables-only">, Group<gN_Group>,
@@ -2889,6 +3244,11 @@ defm codeview_ghash : BoolOption<"g", "codeview-ghash",
   CodeGenOpts<"CodeViewGHash">, DefaultFalse,
   PosFlag<SetTrue, [CC1Option], "Emit type record hashes in a .debug$H section">,
   NegFlag<SetFalse>, BothFlags<[CoreOption]>>;
+defm codeview_command_line : BoolOption<"g", "codeview-command-line",
+  CodeGenOpts<"CodeViewCommandLine">, DefaultTrue,
+  PosFlag<SetTrue, [], "Emit compiler path and command line into CodeView debug information">,
+  NegFlag<SetFalse, [], "Don't emit compiler path and command line into CodeView debug information">,
+  BothFlags<[CoreOption, CC1Option]>>;
 defm inline_line_tables : BoolGOption<"inline-line-tables",
   CodeGenOpts<"NoInlineLineTables">, DefaultFalse,
   NegFlag<SetTrue, [CC1Option], "Don't emit inline line tables.">,
@@ -2917,9 +3277,23 @@ defm column_info : BoolOption<"g", "column-info",
   Group<g_flags_Group>;
 def gsplit_dwarf : Flag<["-"], "gsplit-dwarf">, Group<g_flags_Group>;
 def gsplit_dwarf_EQ : Joined<["-"], "gsplit-dwarf=">, Group<g_flags_Group>,
-  HelpText<"Set DWARF fission mode to either 'split' or 'single'">,
+  HelpText<"Set DWARF fission mode">,
   Values<"split,single">;
 def gno_split_dwarf : Flag<["-"], "gno-split-dwarf">, Group<g_flags_Group>;
+def gsimple_template_names : Flag<["-"], "gsimple-template-names">, Group<g_flags_Group>;
+def gsimple_template_names_EQ
+    : Joined<["-"], "gsimple-template-names=">,
+      HelpText<"Use simple template names in DWARF, or include the full "
+               "template name with a modified prefix for validation">,
+      Values<"simple,mangled">, Flags<[CC1Option, NoDriverOption]>;
+def gsrc_hash_EQ : Joined<["-"], "gsrc-hash=">,
+  Group<g_flags_Group>, Flags<[CC1Option, NoDriverOption]>,
+  Values<"md5,sha1,sha256">,
+  NormalizedValues<["DSH_MD5", "DSH_SHA1", "DSH_SHA256"]>,
+  NormalizedValuesScope<"CodeGenOptions">,
+  MarshallingInfoEnum<CodeGenOpts<"DebugSrcHash">, "DSH_MD5">;
+def gno_simple_template_names : Flag<["-"], "gno-simple-template-names">,
+                                Group<g_flags_Group>;
 def ggnu_pubnames : Flag<["-"], "ggnu-pubnames">, Group<g_flags_Group>, Flags<[CC1Option]>;
 def gno_gnu_pubnames : Flag<["-"], "gno-gnu-pubnames">, Group<g_flags_Group>;
 def gpubnames : Flag<["-"], "gpubnames">, Group<g_flags_Group>, Flags<[CC1Option]>;
@@ -2928,6 +3302,7 @@ def gdwarf_aranges : Flag<["-"], "gdwarf-aranges">, Group<g_flags_Group>;
 def gmodules : Flag <["-"], "gmodules">, Group<gN_Group>,
   HelpText<"Generate debug info with external references to clang modules"
            " or precompiled headers">;
+def gno_modules : Flag <["-"], "gno-modules">, Group<g_flags_Group>;
 def gz_EQ : Joined<["-"], "gz=">, Group<g_flags_Group>,
     HelpText<"DWARF debug sections compression type">;
 def gz : Flag<["-"], "gz">, Alias<gz_EQ>, AliasArgs<["zlib"]>, Group<g_flags_Group>;
@@ -3031,8 +3406,9 @@ def mbranches_within_32B_boundaries : Flag<["-"], "mbranches-within-32B-boundari
 def mfancy_math_387 : Flag<["-"], "mfancy-math-387">, Group<clang_ignored_m_Group>;
 def mlong_calls : Flag<["-"], "mlong-calls">, Group<m_Group>,
   HelpText<"Generate branches with extended addressability, usually via indirect jumps.">;
-def mdouble_EQ : Joined<["-"], "mdouble=">, Group<m_Group>, Values<"32,64">, Flags<[CC1Option]>,
-  HelpText<"Force double to be 32 bits or 64 bits">,
+def mdouble_EQ : Joined<["-"], "mdouble=">, Group<m_Group>,
+  MetaVarName<"<n">, Values<"32,64">, Flags<[CC1Option]>,
+  HelpText<"Force double to be <n> bits">,
   MarshallingInfoInt<LangOpts<"DoubleSize">, "0">;
 def LongDouble_Group : OptionGroup<"<LongDouble group>">, Group<m_Group>,
   DocName<"Long double flags">,
@@ -3062,6 +3438,10 @@ def mwatchos_simulator_version_min_EQ : Joined<["-"], "mwatchos-simulator-versio
 def mwatchsimulator_version_min_EQ : Joined<["-"], "mwatchsimulator-version-min=">, Alias<mwatchos_simulator_version_min_EQ>;
 def march_EQ : Joined<["-"], "march=">, Group<m_Group>, Flags<[CoreOption]>;
 def masm_EQ : Joined<["-"], "masm=">, Group<m_Group>, Flags<[NoXarchOption]>;
+def inline_asm_EQ : Joined<["-"], "inline-asm=">, Group<m_Group>, Flags<[CC1Option]>,
+  Values<"att,intel">,
+  NormalizedValuesScope<"CodeGenOptions">, NormalizedValues<["IAD_ATT", "IAD_Intel"]>,
+  MarshallingInfoEnum<CodeGenOpts<"InlineAsmDialect">, "IAD_ATT">;
 def mcmodel_EQ : Joined<["-"], "mcmodel=">, Group<m_Group>, Flags<[CC1Option]>,
   MarshallingInfoString<TargetOpts<"CodeModel">, [{"default"}]>;
 def mtls_size_EQ : Joined<["-"], "mtls-size=">, Group<m_Group>, Flags<[NoXarchOption, CC1Option]>,
@@ -3077,6 +3457,9 @@ def mwindows : Joined<["-"], "mwindows">, Group<m_Group>, Flags<[NoXarchOption]>
 def mdll : Joined<["-"], "mdll">, Group<m_Group>, Flags<[NoXarchOption]>;
 def municode : Joined<["-"], "municode">, Group<m_Group>, Flags<[NoXarchOption]>;
 def mthreads : Joined<["-"], "mthreads">, Group<m_Group>, Flags<[NoXarchOption]>;
+def mguard_EQ : Joined<["-"], "mguard=">, Group<m_Group>, Flags<[NoXarchOption]>,
+  HelpText<"Enable or disable Control Flow Guard checks and guard tables emission">,
+  Values<"none,cf,cf-nochecks">;
 def mcpu_EQ : Joined<["-"], "mcpu=">, Group<m_Group>;
 def mmcu_EQ : Joined<["-"], "mmcu=">, Group<m_Group>;
 def msim : Flag<["-"], "msim">, Group<m_Group>;
@@ -3096,21 +3479,27 @@ def mhwmult_EQ : Joined<["-"], "mhwmult=">, Group<m_Group>;
 def mglobal_merge : Flag<["-"], "mglobal-merge">, Group<m_Group>, Flags<[CC1Option]>,
   HelpText<"Enable merging of globals">;
 def mhard_float : Flag<["-"], "mhard-float">, Group<m_Group>;
-def miphoneos_version_min_EQ : Joined<["-"], "miphoneos-version-min=">, Group<m_Group>;
 def mios_version_min_EQ : Joined<["-"], "mios-version-min=">,
-  Alias<miphoneos_version_min_EQ>, HelpText<"Set iOS deployment target">;
+  Group<m_Group>, HelpText<"Set iOS deployment target">;
+def : Joined<["-"], "miphoneos-version-min=">,
+  Group<m_Group>, Alias<mios_version_min_EQ>;
 def mios_simulator_version_min_EQ : Joined<["-"], "mios-simulator-version-min=">;
-def miphonesimulator_version_min_EQ : Joined<["-"], "miphonesimulator-version-min=">, Alias<mios_simulator_version_min_EQ>;
+def : Joined<["-"], "miphonesimulator-version-min=">, Alias<mios_simulator_version_min_EQ>;
 def mkernel : Flag<["-"], "mkernel">, Group<m_Group>;
 def mlinker_version_EQ : Joined<["-"], "mlinker-version=">,
   Flags<[NoXarchOption]>;
-def mllvm : Separate<["-"], "mllvm">, Flags<[CC1Option,CC1AsOption,CoreOption]>,
+def mllvm : Separate<["-"], "mllvm">,Flags<[CC1Option,CC1AsOption,CoreOption,FC1Option,FlangOption]>,
   HelpText<"Additional arguments to forward to LLVM's option processing">,
   MarshallingInfoStringVector<FrontendOpts<"LLVMArgs">>;
-def mmacosx_version_min_EQ : Joined<["-"], "mmacosx-version-min=">,
-  Group<m_Group>, HelpText<"Set Mac OS X deployment target">;
+def mmlir : Separate<["-"], "mmlir">, Flags<[CoreOption,FC1Option,FlangOption]>,
+  HelpText<"Additional arguments to forward to MLIR's option processing">;
+def ffuchsia_api_level_EQ : Joined<["-"], "ffuchsia-api-level=">,
+  Group<m_Group>, Flags<[CC1Option]>, HelpText<"Set Fuchsia API level">,
+  MarshallingInfoInt<LangOpts<"FuchsiaAPILevel">>;
 def mmacos_version_min_EQ : Joined<["-"], "mmacos-version-min=">,
-  Group<m_Group>, Alias<mmacosx_version_min_EQ>;
+  Group<m_Group>, HelpText<"Set macOS deployment target">;
+def : Joined<["-"], "mmacosx-version-min=">,
+  Group<m_Group>, Alias<mmacos_version_min_EQ>;
 def mms_bitfields : Flag<["-"], "mms-bitfields">, Group<m_Group>, Flags<[CC1Option]>,
   HelpText<"Set the default structure layout to be compatible with the Microsoft compiler standard">,
   MarshallingInfoFlag<LangOpts<"MSBitfields">>;
@@ -3120,6 +3509,10 @@ def mno_outline : Flag<["-"], "mno-outline">, Group<f_clang_Group>, Flags<[CC1Op
     HelpText<"Disable function outlining (AArch64 only)">;
 def mno_ms_bitfields : Flag<["-"], "mno-ms-bitfields">, Group<m_Group>,
   HelpText<"Do not set the default structure layout to be compatible with the Microsoft compiler standard">;
+def mskip_rax_setup : Flag<["-"], "mskip-rax-setup">, Group<m_Group>, Flags<[CC1Option]>,
+  HelpText<"Skip setting up RAX register when passing variable arguments (x86 only)">,
+  MarshallingInfoFlag<CodeGenOpts<"SkipRaxSetup">>;
+def mno_skip_rax_setup : Flag<["-"], "mno-skip-rax-setup">, Group<m_Group>, Flags<[CC1Option]>;
 def mstackrealign : Flag<["-"], "mstackrealign">, Group<m_Group>, Flags<[CC1Option]>,
   HelpText<"Force realign the stack at entry to every function">,
   MarshallingInfoFlag<CodeGenOpts<"StackRealignment">>;
@@ -3135,14 +3528,16 @@ def mno_stack_arg_probe : Flag<["-"], "mno-stack-arg-probe">, Group<m_Group>, Fl
   HelpText<"Disable stack probes which are enabled by default">,
   MarshallingInfoFlag<CodeGenOpts<"NoStackArgProbe">>;
 def mthread_model : Separate<["-"], "mthread-model">, Group<m_Group>, Flags<[CC1Option]>,
-  HelpText<"The thread model to use, e.g. posix, single (posix by default)">, Values<"posix,single">,
+  HelpText<"The thread model to use. Defaults to 'posix')">, Values<"posix,single">,
   NormalizedValues<["POSIX", "Single"]>, NormalizedValuesScope<"LangOptions::ThreadModelKind">,
   MarshallingInfoEnum<LangOpts<"ThreadModel">, "POSIX">;
 def meabi : Separate<["-"], "meabi">, Group<m_Group>, Flags<[CC1Option]>,
-  HelpText<"Set EABI type, e.g. 4, 5 or gnu (default depends on triple)">, Values<"default,4,5,gnu">,
+  HelpText<"Set EABI type. Default depends on triple)">, Values<"default,4,5,gnu">,
   MarshallingInfoEnum<TargetOpts<"EABIVersion">, "Default">,
   NormalizedValuesScope<"llvm::EABI">,
   NormalizedValues<["Default", "EABI4", "EABI5", "GNU"]>;
+def mtargetos_EQ : Joined<["-"], "mtargetos=">, Group<m_Group>,
+  HelpText<"Set the deployment target to be the specified OS and OS version">;
 
 def mno_constant_cfstrings : Flag<["-"], "mno-constant-cfstrings">, Group<m_Group>;
 def mno_global_merge : Flag<["-"], "mno-global-merge">, Group<m_Group>, Flags<[CC1Option]>,
@@ -3189,10 +3584,10 @@ def msave_restore : Flag<["-"], "msave-restore">, Group<m_riscv_Features_Group>,
   HelpText<"Enable using library calls for save and restore">;
 def mno_save_restore : Flag<["-"], "mno-save-restore">, Group<m_riscv_Features_Group>,
   HelpText<"Disable using library calls for save and restore">;
-def mcmodel_EQ_medlow : Flag<["-"], "mcmodel=medlow">, Group<m_riscv_Features_Group>,
+def mcmodel_EQ_medlow : Flag<["-"], "mcmodel=medlow">, Group<m_Group>,
   Flags<[CC1Option]>, Alias<mcmodel_EQ>, AliasArgs<["small"]>,
   HelpText<"Equivalent to -mcmodel=small, compatible with RISC-V gcc.">;
-def mcmodel_EQ_medany : Flag<["-"], "mcmodel=medany">, Group<m_riscv_Features_Group>,
+def mcmodel_EQ_medany : Flag<["-"], "mcmodel=medany">, Group<m_Group>,
   Flags<[CC1Option]>, Alias<mcmodel_EQ>, AliasArgs<["medium"]>,
   HelpText<"Equivalent to -mcmodel=medium, compatible with RISC-V gcc.">;
 def menable_experimental_extensions : Flag<["-"], "menable-experimental-extensions">, Group<m_Group>,
@@ -3206,9 +3601,9 @@ def mstrict_align : Flag<["-"], "mstrict-align">, Alias<mno_unaligned_access>, F
   HelpText<"Force all memory accesses to be aligned (same as mno-unaligned-access)">;
 def mno_thumb : Flag<["-"], "mno-thumb">, Group<m_arm_Features_Group>;
 def mrestrict_it: Flag<["-"], "mrestrict-it">, Group<m_arm_Features_Group>,
-  HelpText<"Disallow generation of deprecated IT blocks for ARMv8. It is on by default for ARMv8 Thumb mode.">;
+  HelpText<"Disallow generation of complex IT blocks.">;
 def mno_restrict_it: Flag<["-"], "mno-restrict-it">, Group<m_arm_Features_Group>,
-  HelpText<"Allow generation of deprecated IT blocks for ARMv8. It is off by default for ARMv8 Thumb mode">;
+  HelpText<"Allow generation of complex IT blocks.">;
 def marm : Flag<["-"], "marm">, Alias<mno_thumb>;
 def ffixed_r9 : Flag<["-"], "ffixed-r9">, Group<m_arm_Features_Group>,
   HelpText<"Reserve the r9 register (ARM only)">;
@@ -3234,9 +3629,31 @@ defm aapcs_bitfield_width : BoolOption<"f", "aapcs-bitfield-width",
   BothFlags<[NoXarchOption, CC1Option], " the AAPCS standard requirement stating that"
             " volatile bit-field width is dictated by the field container type. (ARM only).">>,
   Group<m_arm_Features_Group>;
-
+def mframe_chain : Joined<["-"], "mframe-chain=">,
+  Group<m_arm_Features_Group>, Values<"none,aapcs,aapcs+leaf">,
+  HelpText<"Select the frame chain model used to emit frame records (Arm only).">;
 def mgeneral_regs_only : Flag<["-"], "mgeneral-regs-only">, Group<m_Group>,
   HelpText<"Generate code which only uses the general purpose registers (AArch64/x86 only)">;
+def mfix_cmse_cve_2021_35465 : Flag<["-"], "mfix-cmse-cve-2021-35465">,
+  Group<m_arm_Features_Group>,
+  HelpText<"Work around VLLDM erratum CVE-2021-35465 (ARM only)">;
+def mno_fix_cmse_cve_2021_35465 : Flag<["-"], "mno-fix-cmse-cve-2021-35465">,
+  Group<m_arm_Features_Group>,
+  HelpText<"Don't work around VLLDM erratum CVE-2021-35465 (ARM only)">;
+def mfix_cortex_a57_aes_1742098 : Flag<["-"], "mfix-cortex-a57-aes-1742098">,
+  Group<m_arm_Features_Group>,
+  HelpText<"Work around Cortex-A57 Erratum 1742098 (ARM only)">;
+def mno_fix_cortex_a57_aes_1742098 : Flag<["-"], "mno-fix-cortex-a57-aes-1742098">,
+  Group<m_arm_Features_Group>,
+  HelpText<"Don't work around Cortex-A57 Erratum 1742098 (ARM only)">;
+def mfix_cortex_a72_aes_1655431 : Flag<["-"], "mfix-cortex-a72-aes-1655431">,
+  Group<m_arm_Features_Group>,
+  HelpText<"Work around Cortex-A72 Erratum 1655431 (ARM only)">,
+  Alias<mfix_cortex_a57_aes_1742098>;
+def mno_fix_cortex_a72_aes_1655431 : Flag<["-"], "mno-fix-cortex-a72-aes-1655431">,
+  Group<m_arm_Features_Group>,
+  HelpText<"Don't work around Cortex-A72 Erratum 1655431 (ARM only)">,
+  Alias<mno_fix_cortex_a57_aes_1742098>;
 def mfix_cortex_a53_835769 : Flag<["-"], "mfix-cortex-a53-835769">,
   Group<m_aarch64_Features_Group>,
   HelpText<"Workaround Cortex-A53 erratum 835769 (AArch64 only)">;
@@ -3246,6 +3663,11 @@ def mno_fix_cortex_a53_835769 : Flag<["-"], "mno-fix-cortex-a53-835769">,
 def mmark_bti_property : Flag<["-"], "mmark-bti-property">,
   Group<m_aarch64_Features_Group>,
   HelpText<"Add .note.gnu.property with BTI to assembly files (AArch64 only)">;
+def mno_bti_at_return_twice : Flag<["-"], "mno-bti-at-return-twice">,
+  Group<m_arm_Features_Group>,
+  HelpText<"Do not add a BTI instruction after a setjmp or other"
+           " return-twice construct (Arm/AArch64 only)">;
+
 foreach i = {1-31} in
   def ffixed_x#i : Flag<["-"], "ffixed-x"#i>, Group<m_Group>,
     HelpText<"Reserve the x"#i#" register (AArch64/RISC-V only)">;
@@ -3254,25 +3676,37 @@ foreach i = {8-15,18} in
   def fcall_saved_x#i : Flag<["-"], "fcall-saved-x"#i>, Group<m_aarch64_Features_Group>,
     HelpText<"Make the x"#i#" register call-saved (AArch64 only)">;
 
-def msve_vector_bits_EQ : Joined<["-"], "msve-vector-bits=">,
-  Group<m_aarch64_Features_Group>, Flags<[NoXarchOption,CC1Option]>,
+def msve_vector_bits_EQ : Joined<["-"], "msve-vector-bits=">, Group<m_aarch64_Features_Group>,
   HelpText<"Specify the size in bits of an SVE vector register. Defaults to the"
-           " vector length agnostic value of \"scalable\". (AArch64 only)">,
-  Values<"128,256,512,1024,2048,scalable">,
-  NormalizedValues<["128", "256", "512", "1024", "2048", "0"]>,
-  MarshallingInfoEnum<LangOpts<"ArmSveVectorBits">, "0">;
+           " vector length agnostic value of \"scalable\". (AArch64 only)">;
+
+def mvscale_min_EQ : Joined<["-"], "mvscale-min=">,
+  Group<m_aarch64_Features_Group>, Flags<[NoXarchOption,CC1Option]>,
+  HelpText<"Specify the vscale minimum. Defaults to \"1\". (AArch64 only)">,
+  MarshallingInfoInt<LangOpts<"VScaleMin">>;
+def mvscale_max_EQ : Joined<["-"], "mvscale-max=">,
+  Group<m_aarch64_Features_Group>, Flags<[NoXarchOption,CC1Option]>,
+  HelpText<"Specify the vscale maximum. Defaults to the"
+           " vector length agnostic value of \"0\". (AArch64 only)">,
+  MarshallingInfoInt<LangOpts<"VScaleMax">>;
 
 def msign_return_address_EQ : Joined<["-"], "msign-return-address=">,
   Flags<[CC1Option]>, Group<m_Group>, Values<"none,all,non-leaf">,
   HelpText<"Select return address signing scope">;
 def mbranch_protection_EQ : Joined<["-"], "mbranch-protection=">,
+  Group<m_Group>,
   HelpText<"Enforce targets of indirect branches and function returns">;
 
 def mharden_sls_EQ : Joined<["-"], "mharden-sls=">,
-  HelpText<"Select straight-line speculation hardening scope">;
+  HelpText<"Select straight-line speculation hardening scope (ARM/AArch64/X86"
+           " only). <arg> must be: all, none, retbr(ARM/AArch64),"
+           " blr(ARM/AArch64), comdat(ARM/AArch64), nocomdat(ARM/AArch64),"
+           " return(X86), indirect-jmp(X86)">;
 
 def msimd128 : Flag<["-"], "msimd128">, Group<m_wasm_Features_Group>;
 def mno_simd128 : Flag<["-"], "mno-simd128">, Group<m_wasm_Features_Group>;
+def mrelaxed_simd : Flag<["-"], "mrelaxed-simd">, Group<m_wasm_Features_Group>;
+def mno_relaxed_simd : Flag<["-"], "mno-relaxed-simd">, Group<m_wasm_Features_Group>;
 def mnontrapping_fptoint : Flag<["-"], "mnontrapping-fptoint">, Group<m_wasm_Features_Group>;
 def mno_nontrapping_fptoint : Flag<["-"], "mno-nontrapping-fptoint">, Group<m_wasm_Features_Group>;
 def msign_ext : Flag<["-"], "msign-ext">, Group<m_wasm_Features_Group>;
@@ -3291,6 +3725,8 @@ def mtail_call : Flag<["-"], "mtail-call">, Group<m_wasm_Features_Group>;
 def mno_tail_call : Flag<["-"], "mno-tail-call">, Group<m_wasm_Features_Group>;
 def mreference_types : Flag<["-"], "mreference-types">, Group<m_wasm_Features_Group>;
 def mno_reference_types : Flag<["-"], "mno-reference-types">, Group<m_wasm_Features_Group>;
+def mextended_const : Flag<["-"], "mextended-const">, Group<m_wasm_Features_Group>;
+def mno_extended_const : Flag<["-"], "mno-extended-const">, Group<m_wasm_Features_Group>;
 def mexec_model_EQ : Joined<["-"], "mexec-model=">, Group<m_wasm_Features_Driver_Group>,
                      Values<"command,reactor">,
                      HelpText<"Execution model (WebAssembly only)">;
@@ -3304,8 +3740,12 @@ defm amdgpu_ieee : BoolOption<"m", "amdgpu-ieee",
   NegFlag<SetFalse, [CC1Option]>>, Group<m_Group>;
 
 def mcode_object_version_EQ : Joined<["-"], "mcode-object-version=">, Group<m_Group>,
-  HelpText<"Specify code object ABI version. Defaults to 3. (AMDGPU only)">,
-  MetaVarName<"<version>">, Values<"2,3,4">;
+  HelpText<"Specify code object ABI version. Defaults to 4. (AMDGPU only)">,
+  Flags<[CC1Option]>,
+  Values<"none,2,3,4,5">,
+  NormalizedValuesScope<"TargetOptions">,
+  NormalizedValues<["COV_None", "COV_2", "COV_3", "COV_4", "COV_5"]>,
+  MarshallingInfoEnum<TargetOpts<"CodeObjectVersion">, "COV_4">;
 
 defm code_object_v3_legacy : SimpleMFlag<"code-object-v3",
   "Legacy option to specify code object ABI V3",
@@ -3341,6 +3781,10 @@ def mabi_EQ_vec_extabi : Flag<["-"], "mabi=vec-extabi">, Group<m_Group>, Flags<[
   MarshallingInfoFlag<LangOpts<"EnableAIXExtendedAltivecABI">>;
 def mabi_EQ_vec_default : Flag<["-"], "mabi=vec-default">, Group<m_Group>, Flags<[CC1Option]>,
   HelpText<"Enable the default Altivec ABI on AIX (AIX only). Uses only volatile vector registers.">;
+def mabi_EQ_quadword_atomics : Flag<["-"], "mabi=quadword-atomics">,
+  Group<m_Group>, Flags<[CC1Option]>,
+  HelpText<"Enable quadword atomics ABI on AIX (AIX PPC64 only). Uses lqarx/stqcx. instructions.">,
+  MarshallingInfoFlag<LangOpts<"EnableAIXQuadwordAtomicsABI">>;
 def mvsx : Flag<["-"], "mvsx">, Group<m_ppc_Features_Group>;
 def mno_vsx : Flag<["-"], "mno-vsx">, Group<m_ppc_Features_Group>;
 def msecure_plt : Flag<["-"], "msecure-plt">, Group<m_ppc_Features_Group>;
@@ -3454,12 +3898,14 @@ def msmall_data_threshold_EQ : Joined <["-"], "msmall-data-threshold=">,
 def msoft_float : Flag<["-"], "msoft-float">, Group<m_Group>, Flags<[CC1Option]>,
   HelpText<"Use software floating point">,
   MarshallingInfoFlag<CodeGenOpts<"SoftFloat">>;
+def mno_fmv : Flag<["-"], "mno-fmv">, Group<f_clang_Group>, Flags<[CC1Option]>,
+  HelpText<"Disable function multiversioning">;
 def moutline_atomics : Flag<["-"], "moutline-atomics">, Group<f_clang_Group>, Flags<[CC1Option]>,
   HelpText<"Generate local calls to out-of-line atomic operations">;
 def mno_outline_atomics : Flag<["-"], "mno-outline-atomics">, Group<f_clang_Group>, Flags<[CC1Option]>,
   HelpText<"Don't generate local calls to out-of-line atomic operations">;
 def mno_implicit_float : Flag<["-"], "mno-implicit-float">, Group<m_Group>,
-  HelpText<"Don't generate implicit floating point instructions">;
+  HelpText<"Don't generate implicit floating point or vector instructions">;
 def mimplicit_float : Flag<["-"], "mimplicit-float">, Group<m_Group>;
 def mrecip : Flag<["-"], "mrecip">, Group<m_Group>;
 def mrecip_EQ : CommaJoined<["-"], "mrecip=">, Group<m_Group>, Flags<[CC1Option]>,
@@ -3473,6 +3919,9 @@ def mstack_protector_guard_EQ : Joined<["-"], "mstack-protector-guard=">, Group<
 def mstack_protector_guard_offset_EQ : Joined<["-"], "mstack-protector-guard-offset=">, Group<m_Group>, Flags<[CC1Option]>,
   HelpText<"Use the given offset for addressing the stack-protector guard">,
   MarshallingInfoInt<CodeGenOpts<"StackProtectorGuardOffset">, "INT_MAX", "int">;
+def mstack_protector_guard_symbol_EQ : Joined<["-"], "mstack-protector-guard-symbol=">, Group<m_Group>, Flags<[CC1Option]>,
+  HelpText<"Use the given symbol for addressing the stack-protector guard">,
+  MarshallingInfoString<CodeGenOpts<"StackProtectorGuardSymbol">>;
 def mstack_protector_guard_reg_EQ : Joined<["-"], "mstack-protector-guard-reg=">, Group<m_Group>, Flags<[CC1Option]>,
   HelpText<"Use the given reg for addressing the stack-protector guard">,
   MarshallingInfoString<CodeGenOpts<"StackProtectorGuardReg">>;
@@ -3501,6 +3950,7 @@ def mcheck_zero_division : Flag<["-"], "mcheck-zero-division">,
                            Group<m_mips_Features_Group>;
 def mno_check_zero_division : Flag<["-"], "mno-check-zero-division">,
                               Group<m_mips_Features_Group>;
+def mfix4300 : Flag<["-"], "mfix4300">, Group<m_mips_Features_Group>;
 def mcompact_branches_EQ : Joined<["-"], "mcompact-branches=">,
                            Group<m_mips_Features_Group>;
 def mfix_loongson2f_btb : Flag<["-"], "mfix-loongson2f-btb">,
@@ -3516,8 +3966,8 @@ def mdsp : Flag<["-"], "mdsp">, Group<m_mips_Features_Group>;
 def mno_dsp : Flag<["-"], "mno-dsp">, Group<m_mips_Features_Group>;
 def mdspr2 : Flag<["-"], "mdspr2">, Group<m_mips_Features_Group>;
 def mno_dspr2 : Flag<["-"], "mno-dspr2">, Group<m_mips_Features_Group>;
-def msingle_float : Flag<["-"], "msingle-float">, Group<m_mips_Features_Group>;
-def mdouble_float : Flag<["-"], "mdouble-float">, Group<m_mips_Features_Group>;
+def msingle_float : Flag<["-"], "msingle-float">, Group<m_Group>;
+def mdouble_float : Flag<["-"], "mdouble-float">, Group<m_Group>;
 def mmadd4 : Flag<["-"], "mmadd4">, Group<m_mips_Features_Group>,
   HelpText<"Enable the generation of 4-operand madd.s, madd.d and related instructions.">;
 def mno_madd4 : Flag<["-"], "mno-madd4">, Group<m_mips_Features_Group>,
@@ -3642,13 +4092,15 @@ def module_file_info : Flag<["-"], "module-file-info">, Flags<[NoXarchOption,CC1
   HelpText<"Provide information about a particular module file">;
 def mthumb : Flag<["-"], "mthumb">, Group<m_Group>;
 def mtune_EQ : Joined<["-"], "mtune=">, Group<m_Group>,
-  HelpText<"Only supported on X86 and RISC-V. Otherwise accepted for compatibility with GCC.">;
+  HelpText<"Only supported on AArch64, PowerPC, RISC-V, SystemZ, and X86">;
 def multi__module : Flag<["-"], "multi_module">;
 def multiply__defined__unused : Separate<["-"], "multiply_defined_unused">;
 def multiply__defined : Separate<["-"], "multiply_defined">;
 def mwarn_nonportable_cfstrings : Flag<["-"], "mwarn-nonportable-cfstrings">, Group<m_Group>;
+def canonical_prefixes : Flag<["-"], "canonical-prefixes">, Flags<[HelpHidden, CoreOption]>,
+  HelpText<"Use absolute paths for invoking subcommands (default)">;
 def no_canonical_prefixes : Flag<["-"], "no-canonical-prefixes">, Flags<[HelpHidden, CoreOption]>,
-  HelpText<"Use relative instead of canonical paths">;
+  HelpText<"Use relative paths for invoking subcommands">;
 def no_cpp_precomp : Flag<["-"], "no-cpp-precomp">, Group<clang_ignored_f_Group>;
 def no_integrated_cpp : Flag<["-", "--"], "no-integrated-cpp">, Flags<[NoXarchOption]>;
 def no_pedantic : Flag<["-", "--"], "no-pedantic">, Group<pedantic_Group>;
@@ -3658,11 +4110,14 @@ def nobuiltininc : Flag<["-"], "nobuiltininc">, Flags<[CC1Option, CoreOption]>,
   MarshallingInfoNegativeFlag<HeaderSearchOpts<"UseBuiltinIncludes">>;
 def nogpuinc : Flag<["-"], "nogpuinc">, HelpText<"Do not add include paths for CUDA/HIP and"
   " do not include the default CUDA/HIP wrapper headers">;
+def nohipwrapperinc : Flag<["-"], "nohipwrapperinc">,
+  HelpText<"Do not include the default HIP wrapper headers and include paths">;
 def : Flag<["-"], "nocudainc">, Alias<nogpuinc>;
-def nogpulib : Flag<["-"], "nogpulib">,
-  HelpText<"Do not link device library for CUDA/HIP device compilation">;
+def nogpulib : Flag<["-"], "nogpulib">, MarshallingInfoFlag<LangOpts<"NoGPULib">>,
+  Flags<[CC1Option]>, HelpText<"Do not link device library for CUDA/HIP device compilation">;
 def : Flag<["-"], "nocudalib">, Alias<nogpulib>;
 def nodefaultlibs : Flag<["-"], "nodefaultlibs">;
+def nodriverkitlib : Flag<["-"], "nodriverkitlib">;
 def nofixprebinding : Flag<["-"], "nofixprebinding">;
 def nolibc : Flag<["-"], "nolibc">;
 def nomultidefs : Flag<["-"], "nomultidefs">;
@@ -3680,10 +4135,15 @@ def nostdincxx : Flag<["-"], "nostdinc++">, Flags<[CC1Option]>,
 def nostdlib : Flag<["-"], "nostdlib">, Group<Link_Group>;
 def nostdlibxx : Flag<["-"], "nostdlib++">;
 def object : Flag<["-"], "object">;
-def o : JoinedOrSeparate<["-"], "o">, Flags<[NoXarchOption, RenderAsInput,
+def o : JoinedOrSeparate<["-"], "o">, Flags<[NoXarchOption,
   CC1Option, CC1AsOption, FC1Option, FlangOption]>,
   HelpText<"Write output to <file>">, MetaVarName<"<file>">,
   MarshallingInfoString<FrontendOpts<"OutputFile">>;
+def object_file_name_EQ : Joined<["-"], "object-file-name=">, Flags<[CC1Option, CC1AsOption, CoreOption]>,
+  HelpText<"Set the output <file> for debug infos">, MetaVarName<"<file>">,
+  MarshallingInfoString<CodeGenOpts<"ObjectFilenameForDebug">>;
+def object_file_name : Separate<["-"], "object-file-name">, Flags<[CC1Option, CC1AsOption, CoreOption]>,
+    Alias<object_file_name_EQ>;
 def pagezero__size : JoinedOrSeparate<["-"], "pagezero_size">;
 def pass_exit_codes : Flag<["-", "--"], "pass-exit-codes">, Flags<[Unsupported]>;
 def pedantic_errors : Flag<["-", "--"], "pedantic-errors">, Group<pedantic_Group>, Flags<[CC1Option]>,
@@ -3710,11 +4170,12 @@ def print_multi_lib : Flag<["-", "--"], "print-multi-lib">;
 def print_multi_os_directory : Flag<["-", "--"], "print-multi-os-directory">,
   Flags<[Unsupported]>;
 def print_target_triple : Flag<["-", "--"], "print-target-triple">,
-  HelpText<"Print the normalized target triple">;
+  HelpText<"Print the normalized target triple">, Flags<[FlangOption]>;
 def print_effective_triple : Flag<["-", "--"], "print-effective-triple">,
-  HelpText<"Print the effective target triple">;
-def print_multiarch : Flag<["-", "--"], "print-multiarch">,
-  HelpText<"Print the multiarch target triple">;
+  HelpText<"Print the effective target triple">, Flags<[FlangOption]>;
+// GCC --disable-multiarch, GCC --enable-multiarch (upstream and Debian
+// specific) have different behaviors. We choose not to support the option.
+def : Flag<["-", "--"], "print-multiarch">, Flags<[Unsupported]>;
 def print_prog_name_EQ : Joined<["-", "--"], "print-prog-name=">,
   HelpText<"Print the full program path of <name>">, MetaVarName<"<name>">;
 def print_resource_dir : Flag<["-", "--"], "print-resource-dir">,
@@ -3727,6 +4188,8 @@ def print_rocm_search_dirs : Flag<["-", "--"], "print-rocm-search-dirs">,
   HelpText<"Print the paths used for finding ROCm installation">;
 def print_runtime_dir : Flag<["-", "--"], "print-runtime-dir">,
   HelpText<"Print the directory pathname containing clangs runtime libraries">;
+def print_diagnostic_options : Flag<["-", "--"], "print-diagnostic-options">,
+  HelpText<"Print all of Clang's warning options">;
 def private__bundle : Flag<["-"], "private_bundle">;
 def pthreads : Flag<["-"], "pthreads">;
 defm pthread : BoolOption<"", "pthread",
@@ -3756,11 +4219,21 @@ def frtlib_add_rpath: Flag<["-"], "frtlib-add-rpath">, Flags<[NoArgumentUnused]>
   HelpText<"Add -rpath with architecture-specific resource directory to the linker flags">;
 def fno_rtlib_add_rpath: Flag<["-"], "fno-rtlib-add-rpath">, Flags<[NoArgumentUnused]>,
   HelpText<"Do not add -rpath with architecture-specific resource directory to the linker flags">;
+def offload_add_rpath: Flag<["--"], "offload-add-rpath">, Flags<[NoArgumentUnused]>,
+  HelpText<"Add -rpath with HIP runtime library directory to the linker flags">;
+def no_offload_add_rpath: Flag<["--"], "no-offload-add-rpath">, Flags<[NoArgumentUnused]>,
+  HelpText<"Do not add -rpath with HIP runtime library directory to the linker flags">;
+defm openmp_implicit_rpath: BoolFOption<"openmp-implicit-rpath",
+  LangOpts<"OpenMP">,
+  DefaultTrue,
+  PosFlag<SetTrue, [], "Set rpath on OpenMP executables">,
+  NegFlag<SetFalse>,
+  BothFlags<[NoArgumentUnused]>>;
 def r : Flag<["-"], "r">, Flags<[LinkerInput,NoArgumentUnused]>,
         Group<Link_Group>;
-def save_temps_EQ : Joined<["-", "--"], "save-temps=">, Flags<[CC1Option, NoXarchOption]>,
+def save_temps_EQ : Joined<["-", "--"], "save-temps=">, Flags<[CC1Option, FlangOption, NoXarchOption]>,
   HelpText<"Save intermediate compilation results.">;
-def save_temps : Flag<["-", "--"], "save-temps">, Flags<[NoXarchOption]>,
+def save_temps : Flag<["-", "--"], "save-temps">, Flags<[FlangOption, NoXarchOption]>,
   Alias<save_temps_EQ>, AliasArgs<["cwd"]>,
   HelpText<"Save intermediate compilation results">;
 def save_stats_EQ : Joined<["-", "--"], "save-stats=">, Flags<[NoXarchOption]>,
@@ -3789,6 +4262,8 @@ def shared : Flag<["-", "--"], "shared">, Group<Link_Group>;
 def single__module : Flag<["-"], "single_module">;
 def specs_EQ : Joined<["-", "--"], "specs=">, Group<Link_Group>;
 def specs : Separate<["-", "--"], "specs">, Flags<[Unsupported]>;
+def start_no_unused_arguments : Flag<["--"], "start-no-unused-arguments">, Flags<[CoreOption]>,
+  HelpText<"Don't emit warnings about unused arguments for the following arguments">;
 def static_libgcc : Flag<["-"], "static-libgcc">;
 def static_libstdcxx : Flag<["-"], "static-libstdc++">;
 def static : Flag<["-", "--"], "static">, Group<Link_Group>, Flags<[NoArgumentUnused]>;
@@ -3796,7 +4271,7 @@ def std_default_EQ : Joined<["-"], "std-default=">;
 def std_EQ : Joined<["-", "--"], "std=">, Flags<[CC1Option,FlangOption,FC1Option]>,
   Group<CompileOnly_Group>, HelpText<"Language standard to compile for">,
   ValuesCode<[{
-    const char *Values =
+    static constexpr const char VALUES_CODE [] =
     #define LANGSTANDARD(id, name, lang, desc, features) name ","
     #define LANGSTANDARD_ALIAS(id, alias) alias ","
     #include "clang/Basic/LangStandards.def"
@@ -3823,8 +4298,11 @@ def no_system_header_prefix : Joined<["--"], "no-system-header-prefix=">,
            "system header.">;
 def : Separate<["--"], "no-system-header-prefix">, Alias<no_system_header_prefix>;
 def s : Flag<["-"], "s">, Group<Link_Group>;
-def target : Joined<["--"], "target=">, Flags<[NoXarchOption, CoreOption]>,
+def target : Joined<["--"], "target=">, Flags<[NoXarchOption, CoreOption, FlangOption]>,
   HelpText<"Generate code for the given target">;
+def darwin_target_variant : Separate<["-"], "darwin-target-variant">,
+  Flags<[NoXarchOption, CoreOption]>,
+  HelpText<"Generate code for an additional runtime variant of the deployment target">;
 def print_supported_cpus : Flag<["-", "--"], "print-supported-cpus">,
   Group<CompileOnly_Group>, Flags<[CC1Option, CoreOption]>,
   HelpText<"Print supported cpu models for the given target (if target is not specified,"
@@ -3876,14 +4354,15 @@ def why_load : Flag<["-"], "why_load">;
 def whyload : Flag<["-"], "whyload">, Alias<why_load>;
 def w : Flag<["-"], "w">, HelpText<"Suppress all warnings">, Flags<[CC1Option]>,
   MarshallingInfoFlag<DiagnosticOpts<"IgnoreWarnings">>;
-def x : JoinedOrSeparate<["-"], "x">, Flags<[NoXarchOption,CC1Option]>,
+def x : JoinedOrSeparate<["-"], "x">,
+Flags<[NoXarchOption,CC1Option,FlangOption,FC1Option]>,
   HelpText<"Treat subsequent input files as having type <language>">,
   MetaVarName<"<language>">;
 def y : Joined<["-"], "y">;
 
 defm integrated_as : BoolFOption<"integrated-as",
   CodeGenOpts<"DisableIntegratedAS">, DefaultFalse,
-  NegFlag<SetTrue, [CC1Option], "Disable">, PosFlag<SetFalse, [], "Enable">,
+  NegFlag<SetTrue, [CC1Option, FlangOption], "Disable">, PosFlag<SetFalse, [], "Enable">,
   BothFlags<[], " the integrated assembler">>;
 
 def fintegrated_cc1 : Flag<["-"], "fintegrated-cc1">,
@@ -3893,11 +4372,18 @@ def fno_integrated_cc1 : Flag<["-"], "fno-integrated-cc1">,
                          Flags<[CoreOption, NoXarchOption]>, Group<f_Group>,
                          HelpText<"Spawn a separate process for each cc1">;
 
+def fintegrated_objemitter : Flag<["-"], "fintegrated-objemitter">,
+  Flags<[CoreOption, NoXarchOption]>, Group<f_Group>,
+  HelpText<"Use internal machine object code emitter.">;
+def fno_integrated_objemitter : Flag<["-"], "fno-integrated-objemitter">,
+  Flags<[CoreOption, NoXarchOption]>, Group<f_Group>,
+  HelpText<"Use external machine object code emitter.">;
+
 def : Flag<["-"], "integrated-as">, Alias<fintegrated_as>, Flags<[NoXarchOption]>;
 def : Flag<["-"], "no-integrated-as">, Alias<fno_integrated_as>,
-      Flags<[CC1Option, NoXarchOption]>;
+      Flags<[CC1Option, FlangOption, NoXarchOption]>;
 
-def working_directory : JoinedOrSeparate<["-"], "working-directory">, Flags<[CC1Option]>,
+def working_directory : Separate<["-"], "working-directory">, Flags<[CC1Option]>,
   HelpText<"Resolve file paths relative to the specified directory">,
   MarshallingInfoString<FileSystemOpts<"WorkingDir">>;
 def working_directory_EQ : Joined<["-"], "working-directory=">, Flags<[CC1Option]>,
@@ -3987,7 +4473,6 @@ def _print_diagnostic_categories : Flag<["--"], "print-diagnostic-categories">;
 def _print_file_name : Separate<["--"], "print-file-name">, Alias<print_file_name_EQ>;
 def _print_missing_file_dependencies : Flag<["--"], "print-missing-file-dependencies">, Alias<MG>;
 def _print_prog_name : Separate<["--"], "print-prog-name">, Alias<print_prog_name_EQ>;
-def _profile_blocks : Flag<["--"], "profile-blocks">, Alias<a>;
 def _profile : Flag<["--"], "profile">, Alias<p>;
 def _resource_EQ : Joined<["--"], "resource=">, Alias<fcompile_resource_EQ>;
 def _resource : Separate<["--"], "resource">, Alias<fcompile_resource_EQ>;
@@ -3996,7 +4481,7 @@ def _serialize_diags : Separate<["-", "--"], "serialize-diagnostics">, Flags<[No
   HelpText<"Serialize compiler diagnostics to a file">;
 // We give --version different semantics from -version.
 def _version : Flag<["--"], "version">,
-  Flags<[CoreOption, CC1Option, FC1Option, FlangOption]>,
+  Flags<[CoreOption, FlangOption]>,
   HelpText<"Print version information">;
 def _signed_char : Flag<["--"], "signed-char">, Alias<fsigned_char>;
 def _std : Separate<["--"], "std">, Alias<std_EQ>;
@@ -4037,6 +4522,14 @@ def mv67t : Flag<["-"], "mv67t">, Group<m_hexagon_Features_Group>,
   Alias<mcpu_EQ>, AliasArgs<["hexagonv67t"]>;
 def mv68 : Flag<["-"], "mv68">, Group<m_hexagon_Features_Group>,
   Alias<mcpu_EQ>, AliasArgs<["hexagonv68"]>;
+def mv69 : Flag<["-"], "mv69">, Group<m_hexagon_Features_Group>,
+  Alias<mcpu_EQ>, AliasArgs<["hexagonv69"]>;
+def mv71 : Flag<["-"], "mv71">, Group<m_hexagon_Features_Group>,
+  Alias<mcpu_EQ>, AliasArgs<["hexagonv71"]>;
+def mv71t : Flag<["-"], "mv71t">, Group<m_hexagon_Features_Group>,
+  Alias<mcpu_EQ>, AliasArgs<["hexagonv71t"]>;
+def mv73 : Flag<["-"], "mv73">, Group<m_hexagon_Features_Group>,
+  Alias<mcpu_EQ>, AliasArgs<["hexagonv73"]>;
 def mhexagon_hvx : Flag<["-"], "mhvx">, Group<m_hexagon_Features_HVX_Group>,
   HelpText<"Enable Hexagon Vector eXtensions">;
 def mhexagon_hvx_EQ : Joined<["-"], "mhvx=">,
@@ -4048,6 +4541,18 @@ def mno_hexagon_hvx : Flag<["-"], "mno-hvx">,
 def mhexagon_hvx_length_EQ : Joined<["-"], "mhvx-length=">,
   Group<m_hexagon_Features_HVX_Group>, HelpText<"Set Hexagon Vector Length">,
   Values<"64B,128B">;
+def mhexagon_hvx_qfloat : Flag<["-"], "mhvx-qfloat">,
+  Group<m_hexagon_Features_HVX_Group>,
+  HelpText<"Enable Hexagon HVX QFloat instructions">;
+def mno_hexagon_hvx_qfloat : Flag<["-"], "mno-hvx-qfloat">,
+  Group<m_hexagon_Features_HVX_Group>,
+  HelpText<"Disable Hexagon HVX QFloat instructions">;
+def mhexagon_hvx_ieee_fp : Flag<["-"], "mhvx-ieee-fp">,
+  Group<m_hexagon_Features_Group>,
+  HelpText<"Enable Hexagon HVX IEEE floating-point">;
+def mno_hexagon_hvx_ieee_fp : Flag<["-"], "mno-hvx-ieee-fp">,
+  Group<m_hexagon_Features_Group>,
+  HelpText<"Disable Hexagon HVX IEEE floating-point">;
 def ffixed_r19: Flag<["-"], "ffixed-r19">,
   HelpText<"Reserve register r19 (Hexagon only)">;
 def mmemops : Flag<["-"], "mmemops">, Group<m_hexagon_Features_Group>,
@@ -4066,6 +4571,24 @@ def mnvs : Flag<["-"], "mnvs">, Group<m_hexagon_Features_Group>,
   Flags<[CC1Option]>, HelpText<"Enable generation of new-value stores">;
 def mno_nvs : Flag<["-"], "mno-nvs">, Group<m_hexagon_Features_Group>,
   Flags<[CC1Option]>, HelpText<"Disable generation of new-value stores">;
+def mcabac: Flag<["-"], "mcabac">, Group<m_hexagon_Features_Group>,
+  HelpText<"Enable CABAC instructions">;
+
+// SPARC feature flags
+def mfpu : Flag<["-"], "mfpu">, Group<m_sparc_Features_Group>;
+def mno_fpu : Flag<["-"], "mno-fpu">, Group<m_sparc_Features_Group>;
+def mfsmuld : Flag<["-"], "mfsmuld">, Group<m_sparc_Features_Group>;
+def mno_fsmuld : Flag<["-"], "mno-fsmuld">, Group<m_sparc_Features_Group>;
+def mpopc : Flag<["-"], "mpopc">, Group<m_sparc_Features_Group>;
+def mno_popc : Flag<["-"], "mno-popc">, Group<m_sparc_Features_Group>;
+def mvis : Flag<["-"], "mvis">, Group<m_sparc_Features_Group>;
+def mno_vis : Flag<["-"], "mno-vis">, Group<m_sparc_Features_Group>;
+def mvis2 : Flag<["-"], "mvis2">, Group<m_sparc_Features_Group>;
+def mno_vis2 : Flag<["-"], "mno-vis2">, Group<m_sparc_Features_Group>;
+def mvis3 : Flag<["-"], "mvis3">, Group<m_sparc_Features_Group>;
+def mno_vis3 : Flag<["-"], "mno-vis3">, Group<m_sparc_Features_Group>;
+def mhard_quad_float : Flag<["-"], "mhard-quad-float">, Group<m_sparc_Features_Group>;
+def msoft_quad_float : Flag<["-"], "msoft-quad-float">, Group<m_sparc_Features_Group>;
 
 // M68k features flags
 def m68000 : Flag<["-"], "m68000">, Group<m_m68k_Features_Group>;
@@ -4087,6 +4610,7 @@ def mx87 : Flag<["-"], "mx87">, Group<m_x86_Features_Group>;
 def mno_x87 : Flag<["-"], "mno-x87">, Group<m_x86_Features_Group>;
 def m80387 : Flag<["-"], "m80387">, Alias<mx87>;
 def mno_80387 : Flag<["-"], "mno-80387">, Alias<mno_x87>;
+def mno_fp_ret_in_387 : Flag<["-"], "mno-fp-ret-in-387">, Alias<mno_x87>;
 def mmmx : Flag<["-"], "mmmx">, Group<m_x86_Features_Group>;
 def mno_mmx : Flag<["-"], "mno-mmx">, Group<m_x86_Features_Group>;
 def m3dnow : Flag<["-"], "m3dnow">, Group<m_x86_Features_Group>;
@@ -4095,10 +4619,14 @@ def m3dnowa : Flag<["-"], "m3dnowa">, Group<m_x86_Features_Group>;
 def mno_3dnowa : Flag<["-"], "mno-3dnowa">, Group<m_x86_Features_Group>;
 def mamx_bf16 : Flag<["-"], "mamx-bf16">, Group<m_x86_Features_Group>;
 def mno_amx_bf16 : Flag<["-"], "mno-amx-bf16">, Group<m_x86_Features_Group>;
-def mtamx_int8 : Flag<["-"], "mamx-int8">, Group<m_x86_Features_Group>;
+def mamx_fp16 : Flag<["-"], "mamx-fp16">, Group<m_x86_Features_Group>;
+def mno_amx_fp16 : Flag<["-"], "mno-amx-fp16">, Group<m_x86_Features_Group>;
+def mamx_int8 : Flag<["-"], "mamx-int8">, Group<m_x86_Features_Group>;
 def mno_amx_int8 : Flag<["-"], "mno-amx-int8">, Group<m_x86_Features_Group>;
 def mamx_tile : Flag<["-"], "mamx-tile">, Group<m_x86_Features_Group>;
 def mno_amx_tile : Flag<["-"], "mno-amx-tile">, Group<m_x86_Features_Group>;
+def mcmpccxadd : Flag<["-"], "mcmpccxadd">, Group<m_x86_Features_Group>;
+def mno_cmpccxadd : Flag<["-"], "mno-cmpccxadd">, Group<m_x86_Features_Group>;
 def msse : Flag<["-"], "msse">, Group<m_x86_Features_Group>;
 def mno_sse : Flag<["-"], "mno-sse">, Group<m_x86_Features_Group>;
 def msse2 : Flag<["-"], "msse2">, Group<m_x86_Features_Group>;
@@ -4136,6 +4664,8 @@ def mavx512dq : Flag<["-"], "mavx512dq">, Group<m_x86_Features_Group>;
 def mno_avx512dq : Flag<["-"], "mno-avx512dq">, Group<m_x86_Features_Group>;
 def mavx512er : Flag<["-"], "mavx512er">, Group<m_x86_Features_Group>;
 def mno_avx512er : Flag<["-"], "mno-avx512er">, Group<m_x86_Features_Group>;
+def mavx512fp16 : Flag<["-"], "mavx512fp16">, Group<m_x86_Features_Group>;
+def mno_avx512fp16 : Flag<["-"], "mno-avx512fp16">, Group<m_x86_Features_Group>;
 def mavx512ifma : Flag<["-"], "mavx512ifma">, Group<m_x86_Features_Group>;
 def mno_avx512ifma : Flag<["-"], "mno-avx512ifma">, Group<m_x86_Features_Group>;
 def mavx512pf : Flag<["-"], "mavx512pf">, Group<m_x86_Features_Group>;
@@ -4152,6 +4682,12 @@ def mavx512vpopcntdq : Flag<["-"], "mavx512vpopcntdq">, Group<m_x86_Features_Gro
 def mno_avx512vpopcntdq : Flag<["-"], "mno-avx512vpopcntdq">, Group<m_x86_Features_Group>;
 def mavx512vp2intersect : Flag<["-"], "mavx512vp2intersect">, Group<m_x86_Features_Group>;
 def mno_avx512vp2intersect : Flag<["-"], "mno-avx512vp2intersect">, Group<m_x86_Features_Group>;
+def mavxifma : Flag<["-"], "mavxifma">, Group<m_x86_Features_Group>;
+def mno_avxifma : Flag<["-"], "mno-avxifma">, Group<m_x86_Features_Group>;
+def mavxneconvert : Flag<["-"], "mavxneconvert">, Group<m_x86_Features_Group>;
+def mno_avxneconvert : Flag<["-"], "mno-avxneconvert">, Group<m_x86_Features_Group>;
+def mavxvnniint8 : Flag<["-"], "mavxvnniint8">, Group<m_x86_Features_Group>;
+def mno_avxvnniint8 : Flag<["-"], "mno-avxvnniint8">, Group<m_x86_Features_Group>;
 def mavxvnni : Flag<["-"], "mavxvnni">, Group<m_x86_Features_Group>;
 def mno_avxvnni : Flag<["-"], "mno-avxvnni">, Group<m_x86_Features_Group>;
 def madx : Flag<["-"], "madx">, Group<m_x86_Features_Group>;
@@ -4172,6 +4708,8 @@ def mwbnoinvd : Flag<["-"], "mwbnoinvd">, Group<m_x86_Features_Group>;
 def mno_wbnoinvd : Flag<["-"], "mno-wbnoinvd">, Group<m_x86_Features_Group>;
 def mclzero : Flag<["-"], "mclzero">, Group<m_x86_Features_Group>;
 def mno_clzero : Flag<["-"], "mno-clzero">, Group<m_x86_Features_Group>;
+def mcrc32 : Flag<["-"], "mcrc32">, Group<m_x86_Features_Group>;
+def mno_crc32 : Flag<["-"], "mno-crc32">, Group<m_x86_Features_Group>;
 def mcx16 : Flag<["-"], "mcx16">, Group<m_x86_Features_Group>;
 def mno_cx16 : Flag<["-"], "mno-cx16">, Group<m_x86_Features_Group>;
 def menqcmd : Flag<["-"], "menqcmd">, Group<m_x86_Features_Group>;
@@ -4216,14 +4754,20 @@ def mpconfig : Flag<["-"], "mpconfig">, Group<m_x86_Features_Group>;
 def mno_pconfig : Flag<["-"], "mno-pconfig">, Group<m_x86_Features_Group>;
 def mpopcnt : Flag<["-"], "mpopcnt">, Group<m_x86_Features_Group>;
 def mno_popcnt : Flag<["-"], "mno-popcnt">, Group<m_x86_Features_Group>;
+def mprefetchi : Flag<["-"], "mprefetchi">, Group<m_x86_Features_Group>;
+def mno_prefetchi : Flag<["-"], "mno-prefetchi">, Group<m_x86_Features_Group>;
 def mprefetchwt1 : Flag<["-"], "mprefetchwt1">, Group<m_x86_Features_Group>;
 def mno_prefetchwt1 : Flag<["-"], "mno-prefetchwt1">, Group<m_x86_Features_Group>;
 def mprfchw : Flag<["-"], "mprfchw">, Group<m_x86_Features_Group>;
 def mno_prfchw : Flag<["-"], "mno-prfchw">, Group<m_x86_Features_Group>;
 def mptwrite : Flag<["-"], "mptwrite">, Group<m_x86_Features_Group>;
 def mno_ptwrite : Flag<["-"], "mno-ptwrite">, Group<m_x86_Features_Group>;
+def mraoint : Flag<["-"], "mraoint">, Group<m_x86_Features_Group>;
+def mno_raoint : Flag<["-"], "mno-raoint">, Group<m_x86_Features_Group>;
 def mrdpid : Flag<["-"], "mrdpid">, Group<m_x86_Features_Group>;
 def mno_rdpid : Flag<["-"], "mno-rdpid">, Group<m_x86_Features_Group>;
+def mrdpru : Flag<["-"], "mrdpru">, Group<m_x86_Features_Group>;
+def mno_rdpru : Flag<["-"], "mno-rdpru">, Group<m_x86_Features_Group>;
 def mrdrnd : Flag<["-"], "mrdrnd">, Group<m_x86_Features_Group>;
 def mno_rdrnd : Flag<["-"], "mno-rdrnd">, Group<m_x86_Features_Group>;
 def mrtm : Flag<["-"], "mrtm">, Group<m_x86_Features_Group>;
@@ -4272,8 +4816,9 @@ def mno_vzeroupper : Flag<["-"], "mno-vzeroupper">, Group<m_x86_Features_Group>;
 // These are legacy user-facing driver-level option spellings. They are always
 // aliases for options that are spelled using the more common Unix / GNU flag
 // style of double-dash and equals-joined flags.
-def gcc_toolchain_legacy_spelling : Separate<["-"], "gcc-toolchain">, Alias<gcc_toolchain>;
-def target_legacy_spelling : Separate<["-"], "target">, Alias<target>;
+def target_legacy_spelling : Separate<["-"], "target">,
+                             Alias<target>,
+                             Flags<[CoreOption]>;
 
 // Special internal option to handle -Xlinker --no-demangle.
 def Z_Xlinker__no_demangle : Flag<["-"], "Z-Xlinker-no-demangle">,
@@ -4312,7 +4857,6 @@ def ld_path_EQ : Joined<["--"], "ld-path=">, Group<Link_Group>;
 defm align_labels : BooleanFFlag<"align-labels">, Group<clang_ignored_gcc_optimization_f_Group>;
 def falign_labels_EQ : Joined<["-"], "falign-labels=">, Group<clang_ignored_gcc_optimization_f_Group>;
 defm align_loops : BooleanFFlag<"align-loops">, Group<clang_ignored_gcc_optimization_f_Group>;
-def falign_loops_EQ : Joined<["-"], "falign-loops=">, Group<clang_ignored_gcc_optimization_f_Group>;
 defm align_jumps : BooleanFFlag<"align-jumps">, Group<clang_ignored_gcc_optimization_f_Group>;
 def falign_jumps_EQ : Joined<["-"], "falign-jumps=">, Group<clang_ignored_gcc_optimization_f_Group>;
 
@@ -4382,6 +4926,7 @@ defm tree_salias : BooleanFFlag<"tree-salias">, Group<clang_ignored_f_Group>;
 defm tree_ter : BooleanFFlag<"tree-ter">, Group<clang_ignored_gcc_optimization_f_Group>;
 defm tree_vectorizer_verbose : BooleanFFlag<"tree-vectorizer-verbose">, Group<clang_ignored_f_Group>;
 defm tree_vrp : BooleanFFlag<"tree-vrp">, Group<clang_ignored_gcc_optimization_f_Group>;
+defm : BooleanFFlag<"unit-at-a-time">, Group<clang_ignored_gcc_optimization_f_Group>;
 defm unroll_all_loops : BooleanFFlag<"unroll-all-loops">, Group<clang_ignored_gcc_optimization_f_Group>;
 defm unsafe_loop_optimizations : BooleanFFlag<"unsafe-loop-optimizations">,
     Group<clang_ignored_gcc_optimization_f_Group>;
@@ -4404,7 +4949,6 @@ def static_libgfortran : Flag<["-"], "static-libgfortran">, Group<gfortran_Group
 def fblas_matmul_limit_EQ : Joined<["-"], "fblas-matmul-limit=">, Group<gfortran_Group>;
 def fcheck_EQ : Joined<["-"], "fcheck=">, Group<gfortran_Group>;
 def fcoarray_EQ : Joined<["-"], "fcoarray=">, Group<gfortran_Group>;
-def fconvert_EQ : Joined<["-"], "fconvert=">, Group<gfortran_Group>;
 def ffpe_trap_EQ : Joined<["-"], "ffpe-trap=">, Group<gfortran_Group>;
 def ffree_line_length_VALUE : Joined<["-"], "ffree-line-length-">, Group<gfortran_Group>;
 def finit_character_EQ : Joined<["-"], "finit-character=">, Group<gfortran_Group>;
@@ -4421,7 +4965,7 @@ def frecord_marker_EQ : Joined<["-"], "frecord-marker=">, Group<gfortran_Group>;
 defm aggressive_function_elimination : BooleanFFlag<"aggressive-function-elimination">, Group<gfortran_Group>;
 defm align_commons : BooleanFFlag<"align-commons">, Group<gfortran_Group>;
 defm all_intrinsics : BooleanFFlag<"all-intrinsics">, Group<gfortran_Group>;
-defm automatic : BooleanFFlag<"automatic">, Group<gfortran_Group>;
+def fautomatic : Flag<["-"], "fautomatic">; // -fno-automatic is significant
 defm backtrace : BooleanFFlag<"backtrace">, Group<gfortran_Group>;
 defm bounds_check : BooleanFFlag<"bounds-check">, Group<gfortran_Group>;
 defm check_array_temporaries : BooleanFFlag<"check-array-temporaries">, Group<gfortran_Group>;
@@ -4463,25 +5007,34 @@ def fsycl : Flag<["-"], "fsycl">, Flags<[NoXarchOption, CoreOption]>,
 def fno_sycl : Flag<["-"], "fno-sycl">, Flags<[NoXarchOption, CoreOption]>,
   Group<sycl_Group>, HelpText<"Disables SYCL kernels compilation for device">;
 
+//===----------------------------------------------------------------------===//
+// FLangOption + NoXarchOption
+//===----------------------------------------------------------------------===//
+
+def flang_experimental_exec : Flag<["-"], "flang-experimental-exec">,
+  Flags<[FlangOption, FlangOnlyOption, NoXarchOption, HelpHidden]>,
+  HelpText<"Enable support for generating executables (experimental)">;
+
 //===----------------------------------------------------------------------===//
 // FLangOption + CoreOption + NoXarchOption
 //===----------------------------------------------------------------------===//
-let Flags = [FlangOption, FlangOnlyOption, NoXarchOption, CoreOption] in {
+
 def Xflang : Separate<["-"], "Xflang">,
   HelpText<"Pass <arg> to the flang compiler">, MetaVarName<"<arg>">,
-  Flags<[NoXarchOption, CoreOption]>, Group<CompileOnly_Group>;
-}
+  Flags<[FlangOption, FlangOnlyOption, NoXarchOption, CoreOption]>,
+  Group<CompileOnly_Group>;
 
 //===----------------------------------------------------------------------===//
 // FlangOption and FC1 Options
 //===----------------------------------------------------------------------===//
+
 let Flags = [FC1Option, FlangOption, FlangOnlyOption] in {
 
 def cpp : Flag<["-"], "cpp">, Group<f_Group>,
   HelpText<"Enable predefined and command line preprocessor macros">;
 def nocpp : Flag<["-"], "nocpp">, Group<f_Group>,
   HelpText<"Disable predefined and command line preprocessor macros">;
-def module_dir : Separate<["-"], "module-dir">, MetaVarName<"<dir>">,
+def module_dir : JoinedOrSeparate<["-"], "module-dir">, MetaVarName<"<dir>">,
   HelpText<"Put MODULE files in <dir>">,
   DocBrief<[{This option specifies where to put .mod files for compiled modules.
 It is also added to the list of directories to be searched by an USE statement.
@@ -4496,6 +5049,8 @@ def ffixed_line_length_EQ : Joined<["-"], "ffixed-line-length=">, Group<f_Group>
   DocBrief<[{Set column after which characters are ignored in typical fixed-form lines in the source
 file}]>;
 def ffixed_line_length_VALUE : Joined<["-"], "ffixed-line-length-">, Group<f_Group>, Alias<ffixed_line_length_EQ>;
+def fconvert_EQ : Joined<["-"], "fconvert=">, Group<f_Group>,
+  HelpText<"Set endian conversion of data for unformatted files">;
 def fopenacc : Flag<["-"], "fopenacc">, Group<f_Group>,
   HelpText<"Enable OpenACC">;
 def fdefault_double_8 : Flag<["-"],"fdefault-double-8">, Group<f_Group>,
@@ -4506,27 +5061,23 @@ def fdefault_real_8 : Flag<["-"],"fdefault-real-8">, Group<f_Group>,
   HelpText<"Set the default real kind to an 8 byte wide type">;
 def flarge_sizes : Flag<["-"],"flarge-sizes">, Group<f_Group>,
   HelpText<"Use INTEGER(KIND=8) for the result type in size-related intrinsics">;
-def fbackslash : Flag<["-"], "fbackslash">, Group<f_Group>,
-  HelpText<"Specify that backslash in string introduces an escape character">,
-  DocBrief<[{Change the interpretation of backslashes in string literals from
-a single backslash character to "C-style" escape characters.}]>;
-def fno_backslash : Flag<["-"], "fno-backslash">, Group<f_Group>;
-def fxor_operator : Flag<["-"], "fxor-operator">, Group<f_Group>,
-  HelpText<"Enable .XOR. as a synonym of .NEQV.">;
-def fno_xor_operator : Flag<["-"], "fno-xor-operator">, Group<f_Group>;
-def flogical_abbreviations : Flag<["-"], "flogical-abbreviations">, Group<f_Group>,
-  HelpText<"Enable logical abbreviations">;
-def fno_logical_abbreviations : Flag<["-"], "fno-logical-abbreviations">, Group<f_Group>;
-def fimplicit_none : Flag<["-"], "fimplicit-none">, Group<f_Group>,
-  HelpText<"No implicit typing allowed unless overridden by IMPLICIT statements">;
-def fno_implicit_none : Flag<["-"], "fno-implicit-none">, Group<f_Group>;
+
 def falternative_parameter_statement : Flag<["-"], "falternative-parameter-statement">, Group<f_Group>,
   HelpText<"Enable the old style PARAMETER statement">;
 def fintrinsic_modules_path : Separate<["-"], "fintrinsic-modules-path">,  Group<f_Group>, MetaVarName<"<dir>">,
   HelpText<"Specify where to find the compiled intrinsic modules">,
-  DocBrief<[{This option specifies the location of pre-compiled intrinsic modules, 
+  DocBrief<[{This option specifies the location of pre-compiled intrinsic modules,
   if they are not in the default location expected by the compiler.}]>;
-}
+
+defm backslash : OptInFC1FFlag<"backslash", "Specify that backslash in string introduces an escape character">;
+defm xor_operator : OptInFC1FFlag<"xor-operator", "Enable .XOR. as a synonym of .NEQV.">;
+defm logical_abbreviations : OptInFC1FFlag<"logical-abbreviations", "Enable logical abbreviations">;
+defm implicit_none : OptInFC1FFlag<"implicit-none", "No implicit typing allowed unless overridden by IMPLICIT statements">;
+
+def fno_automatic : Flag<["-"], "fno-automatic">, Group<f_Group>,
+  HelpText<"Implies the SAVE attribute for non-automatic local objects in subprograms unless RECURSIVE">;
+
+} // let Flags = [FC1Option, FlangOption, FlangOnlyOption]
 
 def J : JoinedOrSeparate<["-"], "J">,
   Flags<[RenderJoined, FlangOption, FC1Option, FlangOnlyOption]>,
@@ -4536,6 +5087,7 @@ def J : JoinedOrSeparate<["-"], "J">,
 //===----------------------------------------------------------------------===//
 // FC1 Options
 //===----------------------------------------------------------------------===//
+
 let Flags = [FC1Option, FlangOnlyOption] in {
 
 def fget_definition : MultiArg<["-"], "fget-definition", 3>,
@@ -4559,6 +5111,8 @@ def fdebug_dump_parse_tree : Flag<["-"], "fdebug-dump-parse-tree">, Group<Action
   HelpText<"Dump the parse tree">,
   DocBrief<[{Run the Parser and the semantic checks, and then output the
 parse tree.}]>;
+def fdebug_dump_pft : Flag<["-"], "fdebug-dump-pft">, Group<Action_Group>,
+  HelpText<"Dump the pre-fir parse tree">;
 def fdebug_dump_parse_tree_no_sema : Flag<["-"], "fdebug-dump-parse-tree-no-sema">, Group<Action_Group>,
   HelpText<"Dump the parse tree (skips the semantic checks)">,
   DocBrief<[{Run the Parser and then output the parse tree. Semantic
@@ -4573,39 +5127,61 @@ def fdebug_measure_parse_tree : Flag<["-"], "fdebug-measure-parse-tree">, Group<
   HelpText<"Measure the parse tree">;
 def fdebug_pre_fir_tree : Flag<["-"], "fdebug-pre-fir-tree">, Group<Action_Group>,
   HelpText<"Dump the pre-FIR tree">;
-def fdebug_module_writer : Flag<["-"],"fdebug-module-writer">, 
+def fdebug_module_writer : Flag<["-"],"fdebug-module-writer">,
   HelpText<"Enable debug messages while writing module files">;
 def fget_symbols_sources : Flag<["-"], "fget-symbols-sources">, Group<Action_Group>,
   HelpText<"Dump symbols and their source code locations">;
 
 def module_suffix : Separate<["-"], "module-suffix">,  Group<f_Group>, MetaVarName<"<suffix>">,
   HelpText<"Use <suffix> as the suffix for module files (the default value is `.mod`)">;
-def fanalyzed_objects_for_unparse : Flag<["-"],
-  "fanalyzed-objects-for-unparse">,  Group<f_Group>;
-def fno_analyzed_objects_for_unparse : Flag<["-"],
-  "fno-analyzed-objects-for-unparse">,  Group<f_Group>,
-  HelpText<"Do not use the analyzed objects when unparsing">;
+def fno_reformat : Flag<["-"], "fno-reformat">, Group<Preprocessor_Group>,
+  HelpText<"Dump the cooked character stream in -E mode">;
+defm analyzed_objects_for_unparse : OptOutFC1FFlag<"analyzed-objects-for-unparse", "", "Do not use the analyzed objects when unparsing">;
 
-}
+def emit_mlir : Flag<["-"], "emit-mlir">, Group<Action_Group>,
+  HelpText<"Build the parse tree, then lower it to MLIR">;
+def emit_fir : Flag<["-"], "emit-fir">, Alias<emit_mlir>;
+
+} // let Flags = [FC1Option, FlangOnlyOption]
 
 //===----------------------------------------------------------------------===//
-// CC1 Options
+// Target Options (cc1 + cc1as)
 //===----------------------------------------------------------------------===//
 
-let Flags = [CC1Option, NoDriverOption] in {
+let Flags = [CC1Option, CC1AsOption, NoDriverOption] in {
+
+def tune_cpu : Separate<["-"], "tune-cpu">,
+  HelpText<"Tune for a specific cpu type">,
+  MarshallingInfoString<TargetOpts<"TuneCPU">>;
+def target_abi : Separate<["-"], "target-abi">,
+  HelpText<"Target a particular ABI type">,
+  MarshallingInfoString<TargetOpts<"ABI">>;
+def target_sdk_version_EQ : Joined<["-"], "target-sdk-version=">,
+  HelpText<"The version of target SDK used for compilation">;
+def darwin_target_variant_sdk_version_EQ : Joined<["-"],
+  "darwin-target-variant-sdk-version=">,
+  HelpText<"The version of darwin target variant SDK used for compilation">;
+
+} // let Flags = [CC1Option, CC1AsOption, NoDriverOption]
+
+let Flags = [CC1Option, CC1AsOption] in {
+
+def darwin_target_variant_triple : Separate<["-"], "darwin-target-variant-triple">,
+  HelpText<"Specify the darwin target variant triple">,
+  MarshallingInfoString<TargetOpts<"DarwinTargetVariantTriple">>,
+  Normalizer<"normalizeTriple">;
+
+} // let Flags = [CC1Option, CC1AsOption]
 
 //===----------------------------------------------------------------------===//
-// Target Options
+// Target Options (cc1 + cc1as + fc1)
 //===----------------------------------------------------------------------===//
 
-let Flags = [CC1Option, CC1AsOption, NoDriverOption] in {
+let Flags = [CC1Option, CC1AsOption, FC1Option, NoDriverOption] in {
 
 def target_cpu : Separate<["-"], "target-cpu">,
   HelpText<"Target a specific cpu type">,
   MarshallingInfoString<TargetOpts<"CPU">>;
-def tune_cpu : Separate<["-"], "tune-cpu">,
-  HelpText<"Tune for a specific cpu type">,
-  MarshallingInfoString<TargetOpts<"TuneCPU">>;
 def target_feature : Separate<["-"], "target-feature">,
   HelpText<"Target specific attributes">,
   MarshallingInfoStringVector<TargetOpts<"FeaturesAsWritten">>;
@@ -4613,13 +5189,14 @@ def triple : Separate<["-"], "triple">,
   HelpText<"Specify target triple (e.g. i686-apple-darwin9)">,
   MarshallingInfoString<TargetOpts<"Triple">, "llvm::Triple::normalize(llvm::sys::getDefaultTargetTriple())">,
   AlwaysEmit, Normalizer<"normalizeTriple">;
-def target_abi : Separate<["-"], "target-abi">,
-  HelpText<"Target a particular ABI type">,
-  MarshallingInfoString<TargetOpts<"ABI">>;
-def target_sdk_version_EQ : Joined<["-"], "target-sdk-version=">,
-  HelpText<"The version of target SDK used for compilation">;
 
-}
+} // let Flags = [CC1Option, CC1ASOption, FC1Option, NoDriverOption]
+
+//===----------------------------------------------------------------------===//
+// Target Options (other)
+//===----------------------------------------------------------------------===//
+
+let Flags = [CC1Option, NoDriverOption] in {
 
 def target_linker_version : Separate<["-"], "target-linker-version">,
   HelpText<"Target linker version">,
@@ -4635,20 +5212,20 @@ defm padding_on_unsigned_fixed_point : BoolOption<"f", "padding-on-unsigned-fixe
   NegFlag<SetFalse>>,
   ShouldParseIf<ffixed_point.KeyPath>;
 
+} // let Flags = [CC1Option, NoDriverOption]
+
 //===----------------------------------------------------------------------===//
 // Analyzer Options
 //===----------------------------------------------------------------------===//
 
+let Flags = [CC1Option, NoDriverOption] in {
+
 def analysis_UnoptimizedCFG : Flag<["-"], "unoptimized-cfg">,
   HelpText<"Generate unoptimized CFGs for all analyses">,
   MarshallingInfoFlag<AnalyzerOpts<"UnoptimizedCFG">>;
 def analysis_CFGAddImplicitDtors : Flag<["-"], "cfg-add-implicit-dtors">,
   HelpText<"Add C++ implicit destructors to CFGs for all analyses">;
 
-def analyzer_store : Separate<["-"], "analyzer-store">,
-  HelpText<"Source Code Analysis - Abstract Memory Store Models">;
-def analyzer_store_EQ : Joined<["-"], "analyzer-store=">, Alias<analyzer_store>;
-
 def analyzer_constraints : Separate<["-"], "analyzer-constraints">,
   HelpText<"Source Code Analysis - Symbolic Constraint Engines">;
 def analyzer_constraints_EQ : Joined<["-"], "analyzer-constraints=">,
@@ -4666,9 +5243,6 @@ def analyzer_purge_EQ : Joined<["-"], "analyzer-purge=">, Alias<analyzer_purge>;
 def analyzer_opt_analyze_headers : Flag<["-"], "analyzer-opt-analyze-headers">,
   HelpText<"Force the static analyzer to analyze functions defined in header files">,
   MarshallingInfoFlag<AnalyzerOpts<"AnalyzeAll">>;
-def analyzer_opt_analyze_nested_blocks : Flag<["-"], "analyzer-opt-analyze-nested-blocks">,
-  HelpText<"Analyze the definitions of blocks in addition to functions">,
-  MarshallingInfoFlag<AnalyzerOpts<"AnalyzeNestedBlocks">>;
 def analyzer_display_progress : Flag<["-"], "analyzer-display-progress">,
   HelpText<"Emit verbose output about the analyzer's progress">,
   MarshallingInfoFlag<AnalyzerOpts<"AnalyzerDisplayProgress">>;
@@ -4712,7 +5286,7 @@ def analyzer_stats : Flag<["-"], "analyzer-stats">,
 def analyzer_checker : Separate<["-"], "analyzer-checker">,
   HelpText<"Choose analyzer checkers to enable">,
   ValuesCode<[{
-    const char *Values =
+    static constexpr const char VALUES_CODE [] =
     #define GET_CHECKERS
     #define CHECKER(FULLNAME, CLASS, HT, DOC_URI, IS_HIDDEN)  FULLNAME ","
     #include "clang/StaticAnalyzer/Checkers/Checkers.inc"
@@ -4789,22 +5363,38 @@ def analyzer_werror : Flag<["-"], "analyzer-werror">,
   HelpText<"Emit analyzer results as errors rather than warnings">,
   MarshallingInfoFlag<AnalyzerOpts<"AnalyzerWerror">>;
 
+} // let Flags = [CC1Option, NoDriverOption]
+
 //===----------------------------------------------------------------------===//
 // Migrator Options
 //===----------------------------------------------------------------------===//
+
 def migrator_no_nsalloc_error : Flag<["-"], "no-ns-alloc-error">,
   HelpText<"Do not error on use of NSAllocateCollectable/NSReallocateCollectable">,
+  Flags<[CC1Option, NoDriverOption]>,
   MarshallingInfoFlag<MigratorOpts<"NoNSAllocReallocError">>;
 
 def migrator_no_finalize_removal : Flag<["-"], "no-finalize-removal">,
   HelpText<"Do not remove finalize method in gc mode">,
+  Flags<[CC1Option, NoDriverOption]>,
   MarshallingInfoFlag<MigratorOpts<"NoFinalizeRemoval">>;
 
 //===----------------------------------------------------------------------===//
 // CodeGen Options
 //===----------------------------------------------------------------------===//
 
+let Flags = [CC1Option, CC1AsOption, FC1Option, NoDriverOption] in {
+
+def mrelocation_model : Separate<["-"], "mrelocation-model">,
+  HelpText<"The relocation model to use">, Values<"static,pic,ropi,rwpi,ropi-rwpi,dynamic-no-pic">,
+  NormalizedValuesScope<"llvm::Reloc">,
+  NormalizedValues<["Static", "PIC_", "ROPI", "RWPI", "ROPI_RWPI", "DynamicNoPIC"]>,
+  MarshallingInfoEnum<CodeGenOpts<"RelocationModel">, "PIC_">;
+
+} // let Flags = [CC1Option, CC1AsOption, FC1Option, NoDriverOption]
+
 let Flags = [CC1Option, CC1AsOption, NoDriverOption] in {
+
 def debug_info_kind_EQ : Joined<["-"], "debug-info-kind=">;
 def debug_info_macro : Flag<["-"], "debug-info-macro">,
   HelpText<"Emit macro debug information">,
@@ -4825,8 +5415,8 @@ def record_command_line : Separate<["-"], "record-command-line">,
   HelpText<"The string to embed in the .LLVM.command.line section.">,
   MarshallingInfoString<CodeGenOpts<"RecordCommandLine">>;
 def compress_debug_sections_EQ : Joined<["-", "--"], "compress-debug-sections=">,
-    HelpText<"DWARF debug sections compression type">, Values<"none,zlib,zlib-gnu">,
-    NormalizedValuesScope<"llvm::DebugCompressionType">, NormalizedValues<["None", "Z", "GNU"]>,
+    HelpText<"DWARF debug sections compression type">, Values<"none,zlib,zstd">,
+    NormalizedValuesScope<"llvm::DebugCompressionType">, NormalizedValues<["None", "Zlib", "Zstd"]>,
     MarshallingInfoEnum<CodeGenOpts<"CompressDebugSections">, "None">;
 def compress_debug_sections : Flag<["-", "--"], "compress-debug-sections">,
   Alias<compress_debug_sections_EQ>, AliasArgs<["zlib"]>;
@@ -4839,19 +5429,17 @@ def massembler_no_warn : Flag<["-"], "massembler-no-warn">,
 def massembler_fatal_warnings : Flag<["-"], "massembler-fatal-warnings">,
   HelpText<"Make assembler warnings fatal">,
   MarshallingInfoFlag<CodeGenOpts<"FatalWarnings">>;
-def mrelax_relocations : Flag<["--"], "mrelax-relocations">,
-    HelpText<"Use relaxable elf relocations">,
-    MarshallingInfoFlag<CodeGenOpts<"RelaxELFRelocations">>;
+def mrelax_relocations_no : Flag<["-"], "mrelax-relocations=no">,
+    HelpText<"Disable x86 relax relocations">,
+    MarshallingInfoNegativeFlag<CodeGenOpts<"RelaxELFRelocations">>;
 def msave_temp_labels : Flag<["-"], "msave-temp-labels">,
   HelpText<"Save temporary labels in the symbol table. "
            "Note this may change .s semantics and shouldn't generally be used "
            "on compiler-generated code.">,
   MarshallingInfoFlag<CodeGenOpts<"SaveTempLabels">>;
-def mrelocation_model : Separate<["-"], "mrelocation-model">,
-  HelpText<"The relocation model to use">, Values<"static,pic,ropi,rwpi,ropi-rwpi,dynamic-no-pic">,
-  NormalizedValuesScope<"llvm::Reloc">,
-  NormalizedValues<["Static", "PIC_", "ROPI", "RWPI", "ROPI_RWPI", "DynamicNoPIC"]>,
-  MarshallingInfoEnum<CodeGenOpts<"RelocationModel">, "PIC_">;
+def mno_type_check : Flag<["-"], "mno-type-check">,
+  HelpText<"Don't perform type checking of the assembly code (wasm only)">,
+  MarshallingInfoFlag<CodeGenOpts<"NoTypeCheck">>;
 def fno_math_builtin : Flag<["-"], "fno-math-builtin">,
   HelpText<"Disable implicit builtin knowledge of math functions">,
   MarshallingInfoFlag<LangOpts<"NoMathBuiltin">>;
@@ -4859,7 +5447,13 @@ def fno_use_ctor_homing: Flag<["-"], "fno-use-ctor-homing">,
     HelpText<"Don't use constructor homing for debug info">;
 def fuse_ctor_homing: Flag<["-"], "fuse-ctor-homing">,
     HelpText<"Use constructor homing if we are using limited debug info already">;
-}
+def as_secure_log_file : Separate<["-"], "as-secure-log-file">,
+  HelpText<"Emit .secure_log_unique directives to this filename.">,
+  MarshallingInfoString<CodeGenOpts<"AsSecureLogFile">>;
+
+} // let Flags = [CC1Option, CC1AsOption, NoDriverOption]
+
+let Flags = [CC1Option, NoDriverOption] in {
 
 def disable_llvm_verifier : Flag<["-"], "disable-llvm-verifier">,
   HelpText<"Don't run the LLVM IR verifier pass">,
@@ -4896,7 +5490,7 @@ def fforbid_guard_variables : Flag<["-"], "fforbid-guard-variables">,
   HelpText<"Emit an error if a C++ static local initializer would need a guard variable">,
   MarshallingInfoFlag<CodeGenOpts<"ForbidGuardVariables">>;
 def no_implicit_float : Flag<["-"], "no-implicit-float">,
-  HelpText<"Don't generate implicit floating point instructions">,
+  HelpText<"Don't generate implicit floating point or vector instructions">,
   MarshallingInfoFlag<CodeGenOpts<"NoImplicitFloat">>;
 def fdump_vtable_layouts : Flag<["-"], "fdump-vtable-layouts">,
   HelpText<"Dump the layouts of all vtables that will be emitted in a translation unit">,
@@ -4936,21 +5530,9 @@ def mdebug_pass : Separate<["-"], "mdebug-pass">,
   HelpText<"Enable additional debug output">,
   MarshallingInfoString<CodeGenOpts<"DebugPass">>;
 def mframe_pointer_EQ : Joined<["-"], "mframe-pointer=">,
-  HelpText<"Specify which frame pointers to retain (all, non-leaf, none).">, Values<"all,non-leaf,none">,
+  HelpText<"Specify which frame pointers to retain.">, Values<"all,non-leaf,none">,
   NormalizedValuesScope<"CodeGenOptions::FramePointerKind">, NormalizedValues<["All", "NonLeaf", "None"]>,
   MarshallingInfoEnum<CodeGenOpts<"FramePointer">, "None">;
-def mdisable_tail_calls : Flag<["-"], "mdisable-tail-calls">,
-  HelpText<"Disable tail call optimization, keeping the call stack accurate">,
-  MarshallingInfoFlag<CodeGenOpts<"DisableTailCalls">>;
-def menable_no_infinities : Flag<["-"], "menable-no-infs">,
-  HelpText<"Allow optimization to assume there are no infinities.">,
-  MarshallingInfoFlag<LangOpts<"NoHonorInfs">>, ImpliedByAnyOf<[ffinite_math_only.KeyPath]>;
-def menable_no_nans : Flag<["-"], "menable-no-nans">,
-  HelpText<"Allow optimization to assume there are no NaNs.">,
-  MarshallingInfoFlag<LangOpts<"NoHonorNaNs">>, ImpliedByAnyOf<[ffinite_math_only.KeyPath]>;
-def mreassociate : Flag<["-"], "mreassociate">,
-  HelpText<"Allow reassociation transformations for floating-point instructions">,
-  MarshallingInfoFlag<LangOpts<"AllowFPReassoc">>, ImpliedByAnyOf<[menable_unsafe_fp_math.KeyPath]>;
 def mabi_EQ_ieeelongdouble : Flag<["-"], "mabi=ieeelongdouble">,
   HelpText<"Use IEEE 754 quadruple-precision for long double">,
   MarshallingInfoFlag<LangOpts<"PPCIEEELongDouble">>;
@@ -4968,19 +5550,18 @@ def mregparm : Separate<["-"], "mregparm">,
 def msmall_data_limit : Separate<["-"], "msmall-data-limit">,
   HelpText<"Put global and static data smaller than the limit into a special section">,
   MarshallingInfoInt<CodeGenOpts<"SmallDataLimit">>;
-def munwind_tables : Flag<["-"], "munwind-tables">,
+def funwind_tables_EQ : Joined<["-"], "funwind-tables=">,
   HelpText<"Generate unwinding tables for all functions">,
-  MarshallingInfoFlag<CodeGenOpts<"UnwindTables">>;
-def mconstructor_aliases : Flag<["-"], "mconstructor-aliases">,
-  HelpText<"Emit complete constructors and destructors as aliases when possible">,
-  MarshallingInfoFlag<CodeGenOpts<"CXXCtorDtorAliases">>;
+  MarshallingInfoInt<CodeGenOpts<"UnwindTables">>;
+defm constructor_aliases : BoolOption<"m", "constructor-aliases",
+  CodeGenOpts<"CXXCtorDtorAliases">, DefaultFalse,
+  PosFlag<SetTrue, [], "Enable">, NegFlag<SetFalse, [], "Disable">,
+  BothFlags<[CC1Option], " emitting complete constructors and destructors as aliases when possible">>;
 def mlink_bitcode_file : Separate<["-"], "mlink-bitcode-file">,
   HelpText<"Link the given bitcode file before performing optimizations.">;
 def mlink_builtin_bitcode : Separate<["-"], "mlink-builtin-bitcode">,
   HelpText<"Link and internalize needed symbols from the given bitcode file "
            "before performing optimizations.">;
-def mlink_cuda_bitcode : Separate<["-"], "mlink-cuda-bitcode">,
-  Alias<mlink_builtin_bitcode>;
 def vectorize_loops : Flag<["-"], "vectorize-loops">,
   HelpText<"Run the Loop vectorization passes">,
   MarshallingInfoFlag<CodeGenOpts<"VectorizeLoop">>;
@@ -5032,6 +5613,10 @@ def fsanitize_coverage_pc_table
     : Flag<["-"], "fsanitize-coverage-pc-table">,
       HelpText<"Create a table of coverage-instrumented PCs">,
       MarshallingInfoFlag<CodeGenOpts<"SanitizeCoveragePCTable">>;
+def fsanitize_coverage_control_flow
+    : Flag<["-"], "fsanitize-coverage-control-flow">,
+      HelpText<"Collect control flow of function">,
+      MarshallingInfoFlag<CodeGenOpts<"SanitizeCoverageControlFlow">>;
 def fsanitize_coverage_trace_pc
     : Flag<["-"], "fsanitize-coverage-trace-pc">,
       HelpText<"Enable PC tracing in sanitizer coverage">,
@@ -5048,13 +5633,32 @@ def fsanitize_coverage_stack_depth
     : Flag<["-"], "fsanitize-coverage-stack-depth">,
       HelpText<"Enable max stack depth tracing">,
       MarshallingInfoFlag<CodeGenOpts<"SanitizeCoverageStackDepth">>;
+def fsanitize_coverage_trace_loads
+    : Flag<["-"], "fsanitize-coverage-trace-loads">,
+      HelpText<"Enable tracing of loads">,
+      MarshallingInfoFlag<CodeGenOpts<"SanitizeCoverageTraceLoads">>;
+def fsanitize_coverage_trace_stores
+    : Flag<["-"], "fsanitize-coverage-trace-stores">,
+      HelpText<"Enable tracing of stores">,
+      MarshallingInfoFlag<CodeGenOpts<"SanitizeCoverageTraceStores">>;
+def fexperimental_sanitize_metadata_EQ_covered
+    : Flag<["-"], "fexperimental-sanitize-metadata=covered">,
+      HelpText<"Emit PCs for code covered with binary analysis sanitizers">,
+      MarshallingInfoFlag<CodeGenOpts<"SanitizeBinaryMetadataCovered">>;
+def fexperimental_sanitize_metadata_EQ_atomics
+    : Flag<["-"], "fexperimental-sanitize-metadata=atomics">,
+      HelpText<"Emit PCs for atomic operations used by binary analysis sanitizers">,
+      MarshallingInfoFlag<CodeGenOpts<"SanitizeBinaryMetadataAtomics">>;
+def fexperimental_sanitize_metadata_EQ_uar
+    : Flag<["-"], "fexperimental-sanitize-metadata=uar">,
+      HelpText<"Emit PCs for start of functions that are subject for use-after-return checking.">,
+      MarshallingInfoFlag<CodeGenOpts<"SanitizeBinaryMetadataUAR">>;
 def fpatchable_function_entry_offset_EQ
     : Joined<["-"], "fpatchable-function-entry-offset=">, MetaVarName<"<M>">,
       HelpText<"Generate M NOPs before function entry">,
       MarshallingInfoInt<CodeGenOpts<"PatchableFunctionEntryOffset">>;
 def fprofile_instrument_EQ : Joined<["-"], "fprofile-instrument=">,
-    HelpText<"Enable PGO instrumentation. The accepted value is clang, llvm, "
-             "or none">, Values<"none,clang,llvm,csllvm">,
+    HelpText<"Enable PGO instrumentation">, Values<"none,clang,llvm,csllvm">,
     NormalizedValuesScope<"CodeGenOptions">,
     NormalizedValues<["ProfileNone", "ProfileClangInstr", "ProfileIRInstr", "ProfileCSIRInstr"]>,
     MarshallingInfoEnum<CodeGenOpts<"ProfileInstr">, "ProfileNone">;
@@ -5074,14 +5678,6 @@ defm lto_unit : BoolOption<"f", "lto-unit",
   CodeGenOpts<"LTOUnit">, DefaultFalse,
   PosFlag<SetTrue, [CC1Option], "Emit IR to support LTO unit features (CFI, whole program vtable opt)">,
   NegFlag<SetFalse>>;
-defm debug_pass_manager : BoolOption<"f", "debug-pass-manager",
-  CodeGenOpts<"DebugPassManager">, DefaultFalse,
-  PosFlag<SetTrue, [], "Prints debug information for the new pass manager">,
-  NegFlag<SetFalse, [], "Disables debug printing for the new pass manager">>;
-def fexperimental_debug_variable_locations : Flag<["-"],
-    "fexperimental-debug-variable-locations">,
-    HelpText<"Use experimental new value-tracking variable locations">,
-    MarshallingInfoFlag<CodeGenOpts<"ValueTrackingVariableLocations">>;
 def fverify_debuginfo_preserve
     : Flag<["-"], "fverify-debuginfo-preserve">,
       HelpText<"Enable Debug Info Metadata preservation testing in "
@@ -5119,10 +5715,25 @@ def ehcontguard : Flag<["-"], "ehcontguard">,
 def fdenormal_fp_math_f32_EQ : Joined<["-"], "fdenormal-fp-math-f32=">,
    Group<f_Group>;
 
+def fctor_dtor_return_this : Flag<["-"], "fctor-dtor-return-this">,
+  HelpText<"Change the C++ ABI to returning `this` pointer from constructors "
+           "and non-deleting destructors. (No effect on Microsoft ABI)">,
+  MarshallingInfoFlag<CodeGenOpts<"CtorDtorReturnThis">>;
+
+defm experimental_assignment_tracking :
+  BoolOption<"f", "experimental-assignment-tracking",
+  CodeGenOpts<"EnableAssignmentTracking">, DefaultFalse,
+  PosFlag<SetTrue, [CC1Option]>, NegFlag<SetFalse>, BothFlags<[CoreOption]>>,
+  Group<f_Group>;
+
+} // let Flags = [CC1Option, NoDriverOption]
+
 //===----------------------------------------------------------------------===//
 // Dependency Output Options
 //===----------------------------------------------------------------------===//
 
+let Flags = [CC1Option, NoDriverOption] in {
+
 def sys_header_deps : Flag<["-"], "sys-header-deps">,
   HelpText<"Include system headers in dependency output">,
   MarshallingInfoFlag<DependencyOutputOpts<"IncludeSystemHeaders">>;
@@ -5132,13 +5743,25 @@ def module_file_deps : Flag<["-"], "module-file-deps">,
 def header_include_file : Separate<["-"], "header-include-file">,
   HelpText<"Filename (or -) to write header include output to">,
   MarshallingInfoString<DependencyOutputOpts<"HeaderIncludeOutputFile">>;
+def header_include_format_EQ : Joined<["-"], "header-include-format=">,
+  HelpText<"set format in which header info is emitted">,
+  Values<"textual,json">, NormalizedValues<["HIFMT_Textual", "HIFMT_JSON"]>,
+  MarshallingInfoEnum<DependencyOutputOpts<"HeaderIncludeFormat">, "HIFMT_Textual">;
+def header_include_filtering_EQ : Joined<["-"], "header-include-filtering=">,
+  HelpText<"set the flag that enables filtering header information">,
+  Values<"none,only-direct-system">, NormalizedValues<["HIFIL_None", "HIFIL_Only_Direct_System"]>,
+  MarshallingInfoEnum<DependencyOutputOpts<"HeaderIncludeFiltering">, "HIFIL_None">;
 def show_includes : Flag<["--"], "show-includes">,
   HelpText<"Print cl.exe style /showIncludes to stdout">;
 
+} // let Flags = [CC1Option, NoDriverOption]
+
 //===----------------------------------------------------------------------===//
 // Diagnostic Options
 //===----------------------------------------------------------------------===//
 
+let Flags = [CC1Option, NoDriverOption] in {
+
 def diagnostic_log_file : Separate<["-"], "diagnostic-log-file">,
   HelpText<"Filename (or -) to log diagnostics to">,
   MarshallingInfoString<DiagnosticOpts<"DiagnosticLogFile">>;
@@ -5147,11 +5770,13 @@ def diagnostic_serialized_file : Separate<["-"], "serialize-diagnostic-file">,
   HelpText<"File for serializing diagnostics in a binary format">;
 
 def fdiagnostics_format : Separate<["-"], "fdiagnostics-format">,
-  HelpText<"Change diagnostic formatting to match IDE and command line tools">, Values<"clang,msvc,vi">,
-  NormalizedValuesScope<"DiagnosticOptions">, NormalizedValues<["Clang", "MSVC", "Vi"]>,
+  HelpText<"Change diagnostic formatting to match IDE and command line tools">,
+  Values<"clang,msvc,vi,sarif,SARIF">,
+  NormalizedValuesScope<"DiagnosticOptions">, NormalizedValues<["Clang", "MSVC", "Vi", "SARIF", "SARIF"]>,
   MarshallingInfoEnum<DiagnosticOpts<"Format">, "Clang">;
 def fdiagnostics_show_category : Separate<["-"], "fdiagnostics-show-category">,
-  HelpText<"Print diagnostic category">, Values<"none,id,name">,
+  HelpText<"Print diagnostic category">,
+  Values<"none,id,name">,
   NormalizedValues<["0", "1", "2"]>,
   MarshallingInfoEnum<DiagnosticOpts<"ShowCategories">, "0">;
 def fno_diagnostics_use_presumed_location : Flag<["-"], "fno-diagnostics-use-presumed-location">,
@@ -5193,10 +5818,14 @@ def Wno_rewrite_macros : Flag<["-"], "Wno-rewrite-macros">,
   HelpText<"Silence ObjC rewriting warnings">,
   MarshallingInfoFlag<DiagnosticOpts<"NoRewriteMacros">>;
 
+} // let Flags = [CC1Option, NoDriverOption]
+
 //===----------------------------------------------------------------------===//
 // Frontend Options
 //===----------------------------------------------------------------------===//
 
+let Flags = [CC1Option, NoDriverOption] in {
+
 // This isn't normally used, it is just here so we can parse a
 // CompilerInvocation out of a driver-derived argument vector.
 def cc1 : Flag<["-"], "cc1">;
@@ -5242,16 +5871,30 @@ def code_completion_with_fixits : Flag<["-"], "code-completion-with-fixits">,
 def disable_free : Flag<["-"], "disable-free">,
   HelpText<"Disable freeing of memory on exit">,
   MarshallingInfoFlag<FrontendOpts<"DisableFree">>;
-def enable_noundef_analysis : Flag<["-"], "enable-noundef-analysis">, Group<f_Group>,
-  HelpText<"Enable analyzing function argument and return types for mandatory definedness">,
-  MarshallingInfoFlag<CodeGenOpts<"EnableNoundefAttrs">>;
+defm clear_ast_before_backend : BoolOption<"",
+  "clear-ast-before-backend",
+  CodeGenOpts<"ClearASTBeforeBackend">,
+  DefaultFalse,
+  PosFlag<SetTrue, [], "Clear">,
+  NegFlag<SetFalse, [], "Don't clear">,
+  BothFlags<[], " the Clang AST before running backend code generation">>;
+defm enable_noundef_analysis : BoolOption<"",
+  "enable-noundef-analysis",
+  CodeGenOpts<"EnableNoundefAttrs">,
+  DefaultTrue,
+  PosFlag<SetTrue, [], "Enable">,
+  NegFlag<SetFalse, [], "Disable">,
+  BothFlags<[], " analyzing function argument and return types for mandatory definedness">>;
+defm opaque_pointers : BoolOption<"",
+  "opaque-pointers",
+  CodeGenOpts<"OpaquePointers">,
+  DefaultTrue,
+  PosFlag<SetTrue, [], "Enable">,
+  NegFlag<SetFalse, [], "Disable">,
+  BothFlags<[], " opaque pointers">>;
 def discard_value_names : Flag<["-"], "discard-value-names">,
   HelpText<"Discard value names in LLVM IR">,
   MarshallingInfoFlag<CodeGenOpts<"DiscardValueNames">>;
-def load : Separate<["-"], "load">, MetaVarName<"<dsopath>">,
-  HelpText<"Load the named plugin (dynamic shared object)">;
-def plugin : Separate<["-"], "plugin">, MetaVarName<"<name>">,
-  HelpText<"Use the named plugin action instead of the default action (use \"help\" to list available options)">;
 def plugin_arg : JoinedAndSeparate<["-"], "plugin-arg-">,
     MetaVarName<"<name> <arg>">,
     HelpText<"Pass <arg> to plugin <name>">;
@@ -5264,6 +5907,8 @@ def ast_dump_filter : Separate<["-"], "ast-dump-filter">,
            " nodes having a certain substring in a qualified name. Use"
            " -ast-list to list all filterable declaration node names.">,
   MarshallingInfoString<FrontendOpts<"ASTDumpFilter">>;
+def ast_dump_filter_EQ : Joined<["-"], "ast-dump-filter=">,
+  Alias<ast_dump_filter>;
 def fno_modules_global_index : Flag<["-"], "fno-modules-global-index">,
   HelpText<"Do not automatically generate or update the global module index">,
   MarshallingInfoNegativeFlag<FrontendOpts<"UseGlobalModuleIndex">>;
@@ -5274,6 +5919,10 @@ def fmodule_map_file_home_is_cwd : Flag<["-"], "fmodule-map-file-home-is-cwd">,
   HelpText<"Use the current working directory as the home directory of "
            "module maps specified by -fmodule-map-file=<FILE>">,
   MarshallingInfoFlag<HeaderSearchOpts<"ModuleMapFileHomeIsCwd">>;
+def fmodule_file_home_is_cwd : Flag<["-"], "fmodule-file-home-is-cwd">,
+  HelpText<"Use the current working directory as the base directory of "
+           "compiled module files.">,
+  MarshallingInfoFlag<HeaderSearchOpts<"ModuleFileHomeIsCwd">>;
 def fmodule_feature : Separate<["-"], "fmodule-feature">,
   MetaVarName<"<feature>">,
   HelpText<"Enable <feature> in module map requires declarations">,
@@ -5287,6 +5936,12 @@ def fmodules_embed_all_files : Joined<["-"], "fmodules-embed-all-files">,
   HelpText<"Embed the contents of all files read by this compilation into "
            "the produced module file.">,
   MarshallingInfoFlag<FrontendOpts<"ModulesEmbedAllFiles">>;
+defm fimplicit_modules_use_lock : BoolOption<"f", "implicit-modules-use-lock",
+  FrontendOpts<"BuildingImplicitModuleUsesLock">, DefaultTrue,
+  NegFlag<SetFalse>,
+  PosFlag<SetTrue, [],
+          "Use filesystem locks for implicit modules builds to avoid "
+          "duplicating work in competing clang invocations.">>;
 // FIXME: We only need this in C++ modules / Modules TS if we might textually
 // enter a different module (eg, when building a header unit).
 def fmodules_local_submodule_visibility :
@@ -5294,7 +5949,7 @@ def fmodules_local_submodule_visibility :
   HelpText<"Enforce name visibility rules across submodules of the same "
            "top-level module.">,
   MarshallingInfoFlag<LangOpts<"ModulesLocalVisibility">>,
-  ImpliedByAnyOf<[fmodules_ts.KeyPath, cpp_modules.KeyPath]>;
+  ImpliedByAnyOf<[fmodules_ts.KeyPath, fcxx_modules.KeyPath]>;
 def fmodules_codegen :
   Flag<["-"], "fmodules-codegen">,
   HelpText<"Generate code for uses of this module that assumes an explicit "
@@ -5313,12 +5968,6 @@ def ftest_module_file_extension_EQ :
   Joined<["-"], "ftest-module-file-extension=">,
   HelpText<"introduce a module file extension for testing purposes. "
            "The argument is parsed as blockname:major:minor:hashed:user info">;
-def fconcepts_ts : Flag<["-"], "fconcepts-ts">,
-  HelpText<"Enable C++ Extensions for Concepts. (deprecated - use -std=c++2a)">;
-def fno_concept_satisfaction_caching : Flag<["-"],
-                                            "fno-concept-satisfaction-caching">,
-  HelpText<"Disable satisfaction caching for C++2a Concepts.">,
-  MarshallingInfoNegativeFlag<LangOpts<"ConceptSatisfactionCaching">>;
 
 defm recovery_ast : BoolOption<"f", "recovery-ast",
   LangOpts<"RecoveryAST">, DefaultTrue,
@@ -5376,12 +6025,10 @@ def emit_module : Flag<["-"], "emit-module">,
   HelpText<"Generate pre-compiled module file from a module map">;
 def emit_module_interface : Flag<["-"], "emit-module-interface">,
   HelpText<"Generate pre-compiled module file from a C++ module interface">;
-def emit_header_module : Flag<["-"], "emit-header-module">,
-  HelpText<"Generate pre-compiled module file from a set of header files">;
+def emit_header_unit : Flag<["-"], "emit-header-unit">,
+  HelpText<"Generate C++20 header units from header files">;
 def emit_pch : Flag<["-"], "emit-pch">,
   HelpText<"Generate pre-compiled header file">;
-def emit_llvm_bc : Flag<["-"], "emit-llvm-bc">,
-  HelpText<"Build ASTs then convert to LLVM, emit .bc file">;
 def emit_llvm_only : Flag<["-"], "emit-llvm-only">,
   HelpText<"Build ASTs and convert to LLVM, discarding output">;
 def emit_codegen_only : Flag<["-"], "emit-codegen-only">,
@@ -5410,7 +6057,8 @@ def mt_migrate_directory : Separate<["-"], "mt-migrate-directory">,
   MarshallingInfoString<FrontendOpts<"MTMigrateDir">>;
 
 def arcmt_action_EQ : Joined<["-"], "arcmt-action=">, Flags<[CC1Option, NoDriverOption]>,
-  HelpText<"The ARC migration action to take">, Values<"check,modify,migrate">,
+  HelpText<"The ARC migration action to take">,
+  Values<"check,modify,migrate">,
   NormalizedValuesScope<"FrontendOptions">,
   NormalizedValues<["ARCMT_Check", "ARCMT_Modify", "ARCMT_Migrate"]>,
   MarshallingInfoEnum<FrontendOpts<"ARCMTAction">, "ARCMT_None">;
@@ -5479,23 +6127,48 @@ def aligned_alloc_unavailable : Flag<["-"], "faligned-alloc-unavailable">,
   MarshallingInfoFlag<LangOpts<"AlignedAllocationUnavailable">>,
   ShouldParseIf<faligned_allocation.KeyPath>;
 
+} // let Flags = [CC1Option, NoDriverOption]
+
 //===----------------------------------------------------------------------===//
 // Language Options
 //===----------------------------------------------------------------------===//
 
-let Flags = [CC1Option, CC1AsOption, NoDriverOption] in {
-
 def version : Flag<["-"], "version">,
   HelpText<"Print the compiler version">,
+  Flags<[CC1Option, CC1AsOption, FC1Option, NoDriverOption]>,
   MarshallingInfoFlag<FrontendOpts<"ShowVersion">>;
+
 def main_file_name : Separate<["-"], "main-file-name">,
   HelpText<"Main file name to use for debug info and source if missing">,
+  Flags<[CC1Option, CC1AsOption, NoDriverOption]>,
   MarshallingInfoString<CodeGenOpts<"MainFileName">>;
 def split_dwarf_output : Separate<["-"], "split-dwarf-output">,
   HelpText<"File name to use for split dwarf debug info output">,
+  Flags<[CC1Option, CC1AsOption, NoDriverOption]>,
   MarshallingInfoString<CodeGenOpts<"SplitDwarfOutput">>;
 
-}
+let Flags = [CC1Option, FC1Option, NoDriverOption] in {
+
+def mreassociate : Flag<["-"], "mreassociate">,
+  HelpText<"Allow reassociation transformations for floating-point instructions">,
+  MarshallingInfoFlag<LangOpts<"AllowFPReassoc">>, ImpliedByAnyOf<[funsafe_math_optimizations.KeyPath]>;
+def menable_no_nans : Flag<["-"], "menable-no-nans">,
+  HelpText<"Allow optimization to assume there are no NaNs.">,
+  MarshallingInfoFlag<LangOpts<"NoHonorNaNs">>, ImpliedByAnyOf<[ffinite_math_only.KeyPath]>;
+def menable_no_infinities : Flag<["-"], "menable-no-infs">,
+  HelpText<"Allow optimization to assume there are no infinities.">,
+  MarshallingInfoFlag<LangOpts<"NoHonorInfs">>, ImpliedByAnyOf<[ffinite_math_only.KeyPath]>;
+
+def pic_level : Separate<["-"], "pic-level">,
+  HelpText<"Value for __PIC__">,
+  MarshallingInfoInt<LangOpts<"PICLevel">>;
+def pic_is_pie : Flag<["-"], "pic-is-pie">,
+  HelpText<"File is for a position independent executable">,
+  MarshallingInfoFlag<LangOpts<"PIE">>;
+
+} // let Flags = [CC1Option, FC1Option, NoDriverOption]
+
+let Flags = [CC1Option, NoDriverOption] in {
 
 def fblocks_runtime_optional : Flag<["-"], "fblocks-runtime-optional">,
   HelpText<"Weakly link in the blocks runtime">,
@@ -5515,13 +6188,15 @@ def fconstant_string_class : Separate<["-"], "fconstant-string-class">,
   HelpText<"Specify the class to use for constant Objective-C string objects.">,
   MarshallingInfoString<LangOpts<"ObjCConstantStringClass">>;
 def fobjc_arc_cxxlib_EQ : Joined<["-"], "fobjc-arc-cxxlib=">,
-  HelpText<"Objective-C++ Automatic Reference Counting standard library kind">, Values<"libc++,libstdc++,none">,
+  HelpText<"Objective-C++ Automatic Reference Counting standard library kind">,
+  Values<"libc++,libstdc++,none">,
   NormalizedValues<["ARCXX_libcxx", "ARCXX_libstdcxx", "ARCXX_nolib"]>,
   MarshallingInfoEnum<PreprocessorOpts<"ObjCXXARCStandardLibrary">, "ARCXX_nolib">;
 def fobjc_runtime_has_weak : Flag<["-"], "fobjc-runtime-has-weak">,
   HelpText<"The target Objective-C runtime supports ARC weak operations">;
 def fobjc_dispatch_method_EQ : Joined<["-"], "fobjc-dispatch-method=">,
-  HelpText<"Objective-C dispatch method to use">, Values<"legacy,non-legacy,mixed">,
+  HelpText<"Objective-C dispatch method to use">,
+  Values<"legacy,non-legacy,mixed">,
   NormalizedValuesScope<"CodeGenOptions">, NormalizedValues<["Legacy", "NonLegacy", "Mixed"]>,
   MarshallingInfoEnum<CodeGenOpts<"ObjCDispatchMethod">, "Legacy">;
 def disable_objc_default_synthesize_properties : Flag<["-"], "disable-objc-default-synthesize-properties">,
@@ -5533,12 +6208,6 @@ def fencode_extended_block_signature : Flag<["-"], "fencode-extended-block-signa
 def function_alignment : Separate<["-"], "function-alignment">,
     HelpText<"default alignment for functions">,
     MarshallingInfoInt<LangOpts<"FunctionAlignment">>;
-def pic_level : Separate<["-"], "pic-level">,
-  HelpText<"Value for __PIC__">,
-  MarshallingInfoInt<LangOpts<"PICLevel">>;
-def pic_is_pie : Flag<["-"], "pic-is-pie">,
-  HelpText<"File is for a position independent executable">,
-  MarshallingInfoFlag<LangOpts<"PIE">>;
 def fhalf_no_semantic_interposition : Flag<["-"], "fhalf-no-semantic-interposition">,
   HelpText<"Like -fno-semantic-interposition but don't use local aliases">,
   MarshallingInfoFlag<LangOpts<"HalfNoSemanticInterposition">>;
@@ -5557,6 +6226,9 @@ def fallow_pch_with_different_modules_cache_path :
   Flag<["-"], "fallow-pch-with-different-modules-cache-path">,
   HelpText<"Accept a PCH file that was created with a different modules cache path">,
   MarshallingInfoFlag<PreprocessorOpts<"AllowPCHWithDifferentModulesCachePath">>;
+def fno_modules_share_filemanager : Flag<["-"], "fno-modules-share-filemanager">,
+  HelpText<"Disable sharing the FileManager when building a module implicitly">,
+  MarshallingInfoNegativeFlag<FrontendOpts<"ModulesShareFileManager">>;
 def dump_deserialized_pch_decls : Flag<["-"], "dump-deserialized-decls">,
   HelpText<"Dump declarations that are deserialized from PCH, for testing">,
   MarshallingInfoFlag<PreprocessorOpts<"DumpDeserializedPCHDecls">>;
@@ -5568,21 +6240,17 @@ def static_define : Flag<["-"], "static-define">,
   HelpText<"Should __STATIC__ be defined">,
   MarshallingInfoFlag<LangOpts<"Static">>;
 def stack_protector : Separate<["-"], "stack-protector">,
-  HelpText<"Enable stack protectors">, Values<"0,1,2,3">,
+  HelpText<"Enable stack protectors">,
+  Values<"0,1,2,3">,
   NormalizedValuesScope<"LangOptions">,
   NormalizedValues<["SSPOff", "SSPOn", "SSPStrong", "SSPReq"]>,
   MarshallingInfoEnum<LangOpts<"StackProtector">, "SSPOff">;
 def stack_protector_buffer_size : Separate<["-"], "stack-protector-buffer-size">,
   HelpText<"Lower bound for a buffer to be considered for stack protection">,
   MarshallingInfoInt<CodeGenOpts<"SSPBufferSize">, "8">;
-def fvisibility : Separate<["-"], "fvisibility">,
-  HelpText<"Default type and symbol visibility">,
-  MarshallingInfoVisibility<LangOpts<"ValueVisibilityMode">, "DefaultVisibility">,
-  // Always emitting because of the relation to `-mignore-xcoff-visibility`.
-  AlwaysEmit;
-def ftype_visibility : Separate<["-"], "ftype-visibility">,
+def ftype_visibility : Joined<["-"], "ftype-visibility=">,
   HelpText<"Default type visibility">,
-  MarshallingInfoVisibility<LangOpts<"TypeVisibilityMode">, fvisibility.KeyPath>;
+  MarshallingInfoVisibility<LangOpts<"TypeVisibilityMode">, fvisibility_EQ.KeyPath>;
 def fapply_global_visibility_to_externs : Flag<["-"], "fapply-global-visibility-to-externs">,
   HelpText<"Apply global symbol visibility to external declarations without an explicit visibility">,
   MarshallingInfoFlag<LangOpts<"SetVisibilityForExternDecls">>;
@@ -5611,9 +6279,10 @@ def fno_bitfield_type_align : Flag<["-"], "fno-bitfield-type-align">,
 def ffake_address_space_map : Flag<["-"], "ffake-address-space-map">,
   HelpText<"Use a fake address space map; OpenCL testing purposes only">,
   MarshallingInfoFlag<LangOpts<"FakeAddressSpaceMap">>;
-def faddress_space_map_mangling_EQ : Joined<["-"], "faddress-space-map-mangling=">, MetaVarName<"<yes|no|target>">,
+def faddress_space_map_mangling_EQ : Joined<["-"], "faddress-space-map-mangling=">,
   HelpText<"Set the mode for address space map based mangling; OpenCL testing purposes only">,
-  Values<"target,no,yes">, NormalizedValuesScope<"LangOptions">,
+  Values<"target,no,yes">,
+  NormalizedValuesScope<"LangOptions">,
   NormalizedValues<["ASMM_Target", "ASMM_Off", "ASMM_On"]>,
   MarshallingInfoEnum<LangOpts<"AddressSpaceMapMangling">, "ASMM_Target">;
 def funknown_anytype : Flag<["-"], "funknown-anytype">,
@@ -5645,28 +6314,27 @@ def fnative_half_type: Flag<["-"], "fnative-half-type">,
 def fnative_half_arguments_and_returns : Flag<["-"], "fnative-half-arguments-and-returns">,
   HelpText<"Use the native __fp16 type for arguments and returns (and skip ABI-specific lowering)">,
   MarshallingInfoFlag<LangOpts<"NativeHalfArgsAndReturns">>,
-  ImpliedByAnyOf<[open_cl.KeyPath, render_script.KeyPath]>;
-def fallow_half_arguments_and_returns : Flag<["-"], "fallow-half-arguments-and-returns">,
-  HelpText<"Allow function arguments and returns of type half">,
-  MarshallingInfoFlag<LangOpts<"HalfArgsAndReturns">>,
-  ImpliedByAnyOf<[fnative_half_arguments_and_returns.KeyPath]>;
+  ImpliedByAnyOf<[open_cl.KeyPath, render_script.KeyPath, hlsl.KeyPath]>;
 def fdefault_calling_conv_EQ : Joined<["-"], "fdefault-calling-conv=">,
-  HelpText<"Set default calling convention">, Values<"cdecl,fastcall,stdcall,vectorcall,regcall">,
+  HelpText<"Set default calling convention">,
+  Values<"cdecl,fastcall,stdcall,vectorcall,regcall">,
   NormalizedValuesScope<"LangOptions">,
   NormalizedValues<["DCC_CDecl", "DCC_FastCall", "DCC_StdCall", "DCC_VectorCall", "DCC_RegCall"]>,
   MarshallingInfoEnum<LangOpts<"DefaultCallingConv">, "DCC_None">;
 
 // These options cannot be marshalled, because they are used to set up the LangOptions defaults.
 def finclude_default_header : Flag<["-"], "finclude-default-header">,
-  HelpText<"Include default header file for OpenCL">;
+  HelpText<"Include default header file for OpenCL and HLSL">;
 def fdeclare_opencl_builtins : Flag<["-"], "fdeclare-opencl-builtins">,
   HelpText<"Add OpenCL builtin function declarations (experimental)">;
 
 def fpreserve_vec3_type : Flag<["-"], "fpreserve-vec3-type">,
   HelpText<"Preserve 3-component vector type">,
-  MarshallingInfoFlag<CodeGenOpts<"PreserveVec3Type">>;
+  MarshallingInfoFlag<CodeGenOpts<"PreserveVec3Type">>,
+  ImpliedByAnyOf<[hlsl.KeyPath]>;
 def fwchar_type_EQ : Joined<["-"], "fwchar-type=">,
-  HelpText<"Select underlying type for wchar_t">, Values<"char,short,int">,
+  HelpText<"Select underlying type for wchar_t">,
+  Values<"char,short,int">,
   NormalizedValues<["1", "2", "4"]>,
   MarshallingInfoEnum<LangOpts<"WCharSize">, "0">;
 defm signed_wchar : BoolOption<"f", "signed-wchar",
@@ -5688,10 +6356,20 @@ def fobjc_gc_only : Flag<["-"], "fobjc-gc-only">, Group<f_Group>,
 def fobjc_gc : Flag<["-"], "fobjc-gc">, Group<f_Group>,
   HelpText<"Enable Objective-C garbage collection">;
 
+def fexperimental_max_bitint_width_EQ:
+  Joined<["-"], "fexperimental-max-bitint-width=">, Group<f_Group>,
+  MetaVarName<"<N>">,
+  HelpText<"Set the maximum bitwidth for _BitInt (this option is expected to be removed in the future)">,
+  MarshallingInfoInt<LangOpts<"MaxBitIntWidth">>;
+
+} // let Flags = [CC1Option, NoDriverOption]
+
 //===----------------------------------------------------------------------===//
 // Header Search Options
 //===----------------------------------------------------------------------===//
 
+let Flags = [CC1Option, NoDriverOption] in {
+
 def nostdsysteminc : Flag<["-"], "nostdsysteminc">,
   HelpText<"Disable standard system #include directories">,
   MarshallingInfoNegativeFlag<HeaderSearchOpts<"UseStandardSystemIncludes">>;
@@ -5705,30 +6383,34 @@ def fmodules_strict_context_hash : Flag<["-"], "fmodules-strict-context-hash">,
   HelpText<"Enable hashing of all compiler options that could impact the "
            "semantics of a module in an implicit build">,
   MarshallingInfoFlag<HeaderSearchOpts<"ModulesStrictContextHash">>;
-def c_isystem : JoinedOrSeparate<["-"], "c-isystem">, MetaVarName<"<directory>">,
+def c_isystem : Separate<["-"], "c-isystem">, MetaVarName<"<directory>">,
   HelpText<"Add directory to the C SYSTEM include search path">;
-def objc_isystem : JoinedOrSeparate<["-"], "objc-isystem">,
+def objc_isystem : Separate<["-"], "objc-isystem">,
   MetaVarName<"<directory>">,
   HelpText<"Add directory to the ObjC SYSTEM include search path">;
-def objcxx_isystem : JoinedOrSeparate<["-"], "objcxx-isystem">,
+def objcxx_isystem : Separate<["-"], "objcxx-isystem">,
   MetaVarName<"<directory>">,
   HelpText<"Add directory to the ObjC++ SYSTEM include search path">;
-def internal_isystem : JoinedOrSeparate<["-"], "internal-isystem">,
+def internal_isystem : Separate<["-"], "internal-isystem">,
   MetaVarName<"<directory>">,
   HelpText<"Add directory to the internal system include search path; these "
            "are assumed to not be user-provided and are used to model system "
            "and standard headers' paths.">;
-def internal_externc_isystem : JoinedOrSeparate<["-"], "internal-externc-isystem">,
+def internal_externc_isystem : Separate<["-"], "internal-externc-isystem">,
   MetaVarName<"<directory>">,
   HelpText<"Add directory to the internal system include search path with "
            "implicit extern \"C\" semantics; these are assumed to not be "
            "user-provided and are used to model system and standard headers' "
            "paths.">;
 
+} // let Flags = [CC1Option, NoDriverOption]
+
 //===----------------------------------------------------------------------===//
 // Preprocessor Options
 //===----------------------------------------------------------------------===//
 
+let Flags = [CC1Option, NoDriverOption] in {
+
 def chain_include : Separate<["-"], "chain-include">, MetaVarName<"<file>">,
   HelpText<"Include and chain a header file after turning it into PCH">;
 def preamble_bytes_EQ : Joined<["-"], "preamble-bytes=">,
@@ -5743,19 +6425,18 @@ def setup_static_analyzer : Flag<["-"], "setup-static-analyzer">,
 def disable_pragma_debug_crash : Flag<["-"], "disable-pragma-debug-crash">,
   HelpText<"Disable any #pragma clang __debug that can lead to crashing behavior. This is meant for testing.">,
   MarshallingInfoFlag<PreprocessorOpts<"DisablePragmaDebugCrash">>;
+def source_date_epoch : Separate<["-"], "source-date-epoch">,
+  MetaVarName<"<time since Epoch in seconds>">,
+  HelpText<"Time to be used in __DATE__, __TIME__, and __TIMESTAMP__ macros">;
 
-//===----------------------------------------------------------------------===//
-// OpenCL Options
-//===----------------------------------------------------------------------===//
-
-def cl_ext_EQ : CommaJoined<["-"], "cl-ext=">,
-  HelpText<"OpenCL only. Enable or disable OpenCL extensions. The argument is a comma-separated sequence of one or more extension names, each prefixed by '+' or '-'.">,
-  MarshallingInfoStringVector<TargetOpts<"OpenCLExtensionsAsWritten">>;
+} // let Flags = [CC1Option, NoDriverOption]
 
 //===----------------------------------------------------------------------===//
 // CUDA Options
 //===----------------------------------------------------------------------===//
 
+let Flags = [CC1Option, NoDriverOption] in {
+
 def fcuda_is_device : Flag<["-"], "fcuda-is-device">,
   HelpText<"Generate code for CUDA device">,
   MarshallingInfoFlag<LangOpts<"CUDAIsDevice">>;
@@ -5769,14 +6450,18 @@ def fno_cuda_host_device_constexpr : Flag<["-"], "fno-cuda-host-device-constexpr
   HelpText<"Don't treat unattributed constexpr functions as __host__ __device__.">,
   MarshallingInfoNegativeFlag<LangOpts<"CUDAHostDeviceConstexpr">>;
 
+} // let Flags = [CC1Option, NoDriverOption]
+
 //===----------------------------------------------------------------------===//
 // OpenMP Options
 //===----------------------------------------------------------------------===//
 
 def fopenmp_is_device : Flag<["-"], "fopenmp-is-device">,
-  HelpText<"Generate code only for an OpenMP target device.">;
+  HelpText<"Generate code only for an OpenMP target device.">,
+  Flags<[CC1Option, NoDriverOption]>;
 def fopenmp_host_ir_file_path : Separate<["-"], "fopenmp-host-ir-file-path">,
-  HelpText<"Path to the IR file produced by the frontend for the host.">;
+  HelpText<"Path to the IR file produced by the frontend for the host.">,
+  Flags<[CC1Option, NoDriverOption]>;
 
 //===----------------------------------------------------------------------===//
 // SYCL Options
@@ -5784,13 +6469,13 @@ def fopenmp_host_ir_file_path : Separate<["-"], "fopenmp-host-ir-file-path">,
 
 def fsycl_is_device : Flag<["-"], "fsycl-is-device">,
   HelpText<"Generate code for SYCL device.">,
+  Flags<[CC1Option, NoDriverOption]>,
   MarshallingInfoFlag<LangOpts<"SYCLIsDevice">>;
 def fsycl_is_host : Flag<["-"], "fsycl-is-host">,
   HelpText<"SYCL host compilation">,
+  Flags<[CC1Option, NoDriverOption]>,
   MarshallingInfoFlag<LangOpts<"SYCLIsHost">>;
 
-} // let Flags = [CC1Option, NoDriverOption]
-
 def sycl_std_EQ : Joined<["-"], "sycl-std=">, Group<sycl_Group>,
   Flags<[CC1Option, NoArgumentUnused, CoreOption]>,
   HelpText<"SYCL language standard to compile for.">,
@@ -5809,6 +6494,7 @@ defm cuda_approx_transcendentals : BoolFOption<"cuda-approx-transcendentals",
 //===----------------------------------------------------------------------===//
 // Frontend Options - cc1 + fc1
 //===----------------------------------------------------------------------===//
+
 let Flags = [CC1Option, FC1Option, NoDriverOption] in {
 let Group = Action_Group in {
 
@@ -5816,8 +6502,20 @@ def emit_obj : Flag<["-"], "emit-obj">,
   HelpText<"Emit native object files">;
 def init_only : Flag<["-"], "init-only">,
   HelpText<"Only execute frontend initialization">;
+def emit_llvm_bc : Flag<["-"], "emit-llvm-bc">,
+  HelpText<"Build ASTs then convert to LLVM, emit .bc file">;
 
 } // let Group = Action_Group
+
+def load : Separate<["-"], "load">, MetaVarName<"<dsopath>">,
+  HelpText<"Load the named plugin (dynamic shared object)">;
+def plugin : Separate<["-"], "plugin">, MetaVarName<"<name>">,
+  HelpText<"Use the named plugin action instead of the default action (use \"help\" to list available options)">;
+defm debug_pass_manager : BoolOption<"f", "debug-pass-manager",
+  CodeGenOpts<"DebugPassManager">, DefaultFalse,
+  PosFlag<SetTrue, [], "Prints debug information for the new pass manager">,
+  NegFlag<SetFalse, [], "Disables debug printing for the new pass manager">>;
+
 } // let Flags = [CC1Option, FC1Option, NoDriverOption]
 
 //===----------------------------------------------------------------------===//
@@ -5855,7 +6553,7 @@ def defsym : Separate<["-"], "defsym">,
 // clang-cl Options
 //===----------------------------------------------------------------------===//
 
-def cl_Group : OptionGroup<"<clang-cl options>">, Flags<[CLOption]>,
+def cl_Group : OptionGroup<"<clang-cl options>">, Flags<[CLDXCOption]>,
   HelpText<"CL.EXE COMPATIBILITY OPTIONS">;
 
 def cl_compile_Group : OptionGroup<"<clang-cl compile-only options>">,
@@ -5867,6 +6565,9 @@ def cl_ignored_Group : OptionGroup<"<clang-cl ignored options>">,
 class CLFlag<string name> : Option<["/", "-"], name, KIND_FLAG>,
   Group<cl_Group>, Flags<[CLOption, NoXarchOption]>;
 
+class CLDXCFlag<string name> : Option<["/", "-"], name, KIND_FLAG>,
+  Group<cl_Group>, Flags<[CLDXCOption, NoXarchOption]>;
+
 class CLCompileFlag<string name> : Option<["/", "-"], name, KIND_FLAG>,
   Group<cl_compile_Group>, Flags<[CLOption, NoXarchOption]>;
 
@@ -5876,6 +6577,9 @@ class CLIgnoredFlag<string name> : Option<["/", "-"], name, KIND_FLAG>,
 class CLJoined<string name> : Option<["/", "-"], name, KIND_JOINED>,
   Group<cl_Group>, Flags<[CLOption, NoXarchOption]>;
 
+class CLDXCJoined<string name> : Option<["/", "-"], name, KIND_JOINED>,
+  Group<cl_Group>, Flags<[CLDXCOption, NoXarchOption]>;
+
 class CLCompileJoined<string name> : Option<["/", "-"], name, KIND_JOINED>,
   Group<cl_compile_Group>, Flags<[CLOption, NoXarchOption]>;
 
@@ -5885,6 +6589,9 @@ class CLIgnoredJoined<string name> : Option<["/", "-"], name, KIND_JOINED>,
 class CLJoinedOrSeparate<string name> : Option<["/", "-"], name,
   KIND_JOINED_OR_SEPARATE>, Group<cl_Group>, Flags<[CLOption, NoXarchOption]>;
 
+class CLDXCJoinedOrSeparate<string name> : Option<["/", "-"], name,
+  KIND_JOINED_OR_SEPARATE>, Group<cl_Group>, Flags<[CLDXCOption, NoXarchOption]>;
+
 class CLCompileJoinedOrSeparate<string name> : Option<["/", "-"], name,
   KIND_JOINED_OR_SEPARATE>, Group<cl_compile_Group>,
   Flags<[CLOption, NoXarchOption]>;
@@ -5922,13 +6629,12 @@ def _SLASH_E : CLFlag<"E">, HelpText<"Preprocess to stdout">, Alias<E>;
 def _SLASH_external_COLON_I : CLJoinedOrSeparate<"external:I">, Alias<isystem>,
   HelpText<"Add directory to include search path with warnings suppressed">,
   MetaVarName<"<dir>">;
-def _SLASH_fp_except : CLFlag<"fp:except">, HelpText<"">, Alias<ftrapping_math>;
-def _SLASH_fp_except_ : CLFlag<"fp:except-">,
-  HelpText<"">, Alias<fno_trapping_math>;
+def _SLASH_fp_contract : CLFlag<"fp:contract">, HelpText<"">, Alias<ffp_contract>, AliasArgs<["on"]>;
+def _SLASH_fp_except : CLFlag<"fp:except">, HelpText<"">, Alias<ffp_exception_behavior_EQ>, AliasArgs<["strict"]>;
+def _SLASH_fp_except_ : CLFlag<"fp:except-">, HelpText<"">, Alias<ffp_exception_behavior_EQ>, AliasArgs<["ignore"]>;
 def _SLASH_fp_fast : CLFlag<"fp:fast">, HelpText<"">, Alias<ffast_math>;
-def _SLASH_fp_precise : CLFlag<"fp:precise">,
-  HelpText<"">, Alias<fno_fast_math>;
-def _SLASH_fp_strict : CLFlag<"fp:strict">, HelpText<"">, Alias<fno_fast_math>;
+def _SLASH_fp_precise : CLFlag<"fp:precise">, HelpText<"">, Alias<ffp_model_EQ>, AliasArgs<["precise"]>;
+def _SLASH_fp_strict : CLFlag<"fp:strict">, HelpText<"">, Alias<ffp_model_EQ>, AliasArgs<["strict"]>;
 def _SLASH_fsanitize_EQ_address : CLFlag<"fsanitize=address">,
   HelpText<"Enable AddressSanitizer">,
   Alias<fsanitize_EQ>, AliasArgs<["address"]>;
@@ -5960,7 +6666,9 @@ def _SLASH_Gw_ : CLFlag<"Gw-">,
 def _SLASH_help : CLFlag<"help">, Alias<help>,
   HelpText<"Display available options">;
 def _SLASH_HELP : CLFlag<"HELP">, Alias<help>;
-def _SLASH_I : CLJoinedOrSeparate<"I">,
+def _SLASH_hotpatch : CLFlag<"hotpatch">, Alias<fms_hotpatch>,
+  HelpText<"Create hotpatchable image">;
+def _SLASH_I : CLDXCJoinedOrSeparate<"I">,
   HelpText<"Add directory to include search path">, MetaVarName<"<dir>">,
   Alias<I>;
 def _SLASH_J : CLFlag<"J">, HelpText<"Make char type unsigned">,
@@ -5968,7 +6676,7 @@ def _SLASH_J : CLFlag<"J">, HelpText<"Make char type unsigned">,
 
 // The _SLASH_O option handles all the /O flags, but we also provide separate
 // aliased options to provide separate help messages.
-def _SLASH_O : CLJoined<"O">,
+def _SLASH_O : CLDXCJoined<"O">,
   HelpText<"Set multiple /O flags at once; e.g. '/O2y-' for '/O2 /Oy-'">,
   MetaVarName<"<flags>">;
 def : CLFlag<"O1">, Alias<_SLASH_O>, AliasArgs<["1"]>,
@@ -5981,7 +6689,7 @@ def : CLFlag<"Ob1">, Alias<_SLASH_O>, AliasArgs<["b1"]>,
   HelpText<"Only inline functions explicitly or implicitly marked inline">;
 def : CLFlag<"Ob2">, Alias<_SLASH_O>, AliasArgs<["b2"]>,
   HelpText<"Inline functions as deemed beneficial by the compiler">;
-def : CLFlag<"Od">, Alias<_SLASH_O>, AliasArgs<["d"]>,
+def : CLDXCFlag<"Od">, Alias<_SLASH_O>, AliasArgs<["d"]>,
   HelpText<"Disable optimization">;
 def : CLFlag<"Og">, Alias<_SLASH_O>, AliasArgs<["g"]>,
   HelpText<"No effect">;
@@ -6028,6 +6736,11 @@ def _SLASH_validate_charset : CLFlag<"validate-charset">,
   Alias<W_Joined>, AliasArgs<["invalid-source-encoding"]>;
 def _SLASH_validate_charset_ : CLFlag<"validate-charset-">,
   Alias<W_Joined>, AliasArgs<["no-invalid-source-encoding"]>;
+def _SLASH_external_W0 : CLFlag<"external:W0">, HelpText<"Ignore warnings from system headers (default)">, Alias<Wno_system_headers>;
+def _SLASH_external_W1 : CLFlag<"external:W1">, HelpText<"Enable -Wsystem-headers">, Alias<Wsystem_headers>;
+def _SLASH_external_W2 : CLFlag<"external:W2">, HelpText<"Enable -Wsystem-headers">, Alias<Wsystem_headers>;
+def _SLASH_external_W3 : CLFlag<"external:W3">, HelpText<"Enable -Wsystem-headers">, Alias<Wsystem_headers>;
+def _SLASH_external_W4 : CLFlag<"external:W4">, HelpText<"Enable -Wsystem-headers">, Alias<Wsystem_headers>;
 def _SLASH_W0 : CLFlag<"W0">, HelpText<"Disable all warnings">, Alias<w>;
 def _SLASH_W1 : CLFlag<"W1">, HelpText<"Enable -Wall">, Alias<Wall>;
 def _SLASH_W2 : CLFlag<"W2">, HelpText<"Enable -Wall">, Alias<Wall>;
@@ -6041,16 +6754,7 @@ def _SLASH_WX_ : CLFlag<"WX-">,
   HelpText<"Do not treat warnings as errors (default)">,
   Alias<W_Joined>, AliasArgs<["no-error"]>;
 def _SLASH_w_flag : CLFlag<"w">, HelpText<"Disable all warnings">, Alias<w>;
-def _SLASH_wd4005 : CLFlag<"wd4005">, Alias<W_Joined>,
-  AliasArgs<["no-macro-redefined"]>;
-def _SLASH_wd4018 : CLFlag<"wd4018">, Alias<W_Joined>,
-  AliasArgs<["no-sign-compare"]>;
-def _SLASH_wd4100 : CLFlag<"wd4100">, Alias<W_Joined>,
-  AliasArgs<["no-unused-parameter"]>;
-def _SLASH_wd4910 : CLFlag<"wd4910">, Alias<W_Joined>,
-  AliasArgs<["no-dllexport-explicit-instantiation-decl"]>;
-def _SLASH_wd4996 : CLFlag<"wd4996">, Alias<W_Joined>,
-  AliasArgs<["no-deprecated-declarations"]>;
+def _SLASH_wd : CLCompileJoined<"wd">;
 def _SLASH_vd : CLJoined<"vd">, HelpText<"Control vtordisp placement">,
   Alias<vtordisp_mode_EQ>;
 def _SLASH_X : CLFlag<"X">,
@@ -6092,8 +6796,21 @@ def _SLASH_Zc_twoPhase : CLFlag<"Zc:twoPhase">,
 def _SLASH_Zc_twoPhase_ : CLFlag<"Zc:twoPhase-">,
   HelpText<"Disable two-phase name lookup in templates (default)">,
   Alias<fdelayed_template_parsing>;
+def _SLASH_Zc_wchar_t : CLFlag<"Zc:wchar_t">,
+  HelpText<"Enable C++ builtin type wchar_t (default)">;
+def _SLASH_Zc_wchar_t_ : CLFlag<"Zc:wchar_t-">,
+  HelpText<"Disable C++ builtin type wchar_t">;
 def _SLASH_Z7 : CLFlag<"Z7">,
   HelpText<"Enable CodeView debug information in object files">;
+def _SLASH_ZH_MD5 : CLFlag<"ZH:MD5">,
+  HelpText<"Use MD5 for file checksums in debug info (default)">,
+  Alias<gsrc_hash_EQ>, AliasArgs<["md5"]>;
+def _SLASH_ZH_SHA1 : CLFlag<"ZH:SHA1">,
+  HelpText<"Use SHA1 for file checksums in debug info">,
+  Alias<gsrc_hash_EQ>, AliasArgs<["sha1"]>;
+def _SLASH_ZH_SHA_256 : CLFlag<"ZH:SHA_256">,
+  HelpText<"Use SHA256 for file checksums in debug info">,
+  Alias<gsrc_hash_EQ>, AliasArgs<["sha256"]>;
 def _SLASH_Zi : CLFlag<"Zi">, Alias<_SLASH_Z7>,
   HelpText<"Like /Z7">;
 def _SLASH_Zp : CLJoined<"Zp">,
@@ -6102,7 +6819,7 @@ def _SLASH_Zp : CLJoined<"Zp">,
 def _SLASH_Zp_flag : CLFlag<"Zp">,
   HelpText<"Set default maximum struct packing alignment to 1">,
   Alias<fpack_struct_EQ>, AliasArgs<["1"]>;
-def _SLASH_Zs : CLFlag<"Zs">, HelpText<"Syntax-check only">,
+def _SLASH_Zs : CLFlag<"Zs">, HelpText<"Run the preprocessor, parser and semantic analysis stages">,
   Alias<fsyntax_only>;
 def _SLASH_openmp_ : CLFlag<"openmp-">,
   HelpText<"Disable OpenMP support">, Alias<fno_openmp>;
@@ -6117,6 +6834,8 @@ def _SLASH_tune : CLCompileJoined<"tune:">,
 def _SLASH_QIntel_jcc_erratum : CLFlag<"QIntel-jcc-erratum">,
   HelpText<"Align branches within 32-byte boundaries to mitigate the performance impact of the Intel JCC erratum.">,
   Alias<mbranches_within_32B_boundaries>;
+def _SLASH_arm64EC : CLFlag<"arm64EC">,
+  HelpText<"Set build target to arm64ec">;
 
 // Non-aliases:
 
@@ -6133,7 +6852,7 @@ def _SLASH_EP : CLFlag<"EP">,
 def _SLASH_external_env : CLJoined<"external:env:">,
   HelpText<"Add dirs in env var <var> to include search path with warnings suppressed">,
   MetaVarName<"<var>">;
-def _SLASH_FA : CLFlag<"FA">,
+def _SLASH_FA : CLJoined<"FA">,
   HelpText<"Output assembly code file during compilation">;
 def _SLASH_Fa : CLJoined<"Fa">,
   HelpText<"Set assembly output file name (with /FA)">,
@@ -6160,6 +6879,10 @@ def _SLASH_GX_ : CLFlag<"GX-">,
 def _SLASH_imsvc : CLJoinedOrSeparate<"imsvc">,
   HelpText<"Add <dir> to system include search path, as if in %INCLUDE%">,
   MetaVarName<"<dir>">;
+def _SLASH_JMC : CLFlag<"JMC">,
+  HelpText<"Enable just-my-code debugging">;
+def _SLASH_JMC_ : CLFlag<"JMC-">,
+  HelpText<"Disable just-my-code debugging (default)">;
 def _SLASH_LD : CLFlag<"LD">, HelpText<"Create DLL">;
 def _SLASH_LDd : CLFlag<"LDd">, HelpText<"Create debug DLL">;
 def _SLASH_link : CLRemainingArgsJoined<"link">,
@@ -6186,6 +6909,8 @@ def _SLASH_TC : CLCompileFlag<"TC">, HelpText<"Treat all source files as C">;
 def _SLASH_Tp : CLCompileJoinedOrSeparate<"Tp">,
   HelpText<"Treat <file> as C++ source file">, MetaVarName<"<file>">;
 def _SLASH_TP : CLCompileFlag<"TP">, HelpText<"Treat all source files as C++">;
+def _SLASH_diasdkdir : CLJoinedOrSeparate<"diasdkdir">,
+  HelpText<"Path to the DIA SDK">, MetaVarName<"<dir>">;
 def _SLASH_vctoolsdir : CLJoinedOrSeparate<"vctoolsdir">,
   HelpText<"Path to the VCToolChain">, MetaVarName<"<dir>">;
 def _SLASH_vctoolsversion : CLJoinedOrSeparate<"vctoolsversion">,
@@ -6195,7 +6920,7 @@ def _SLASH_winsdkdir : CLJoinedOrSeparate<"winsdkdir">,
 def _SLASH_winsdkversion : CLJoinedOrSeparate<"winsdkversion">,
   HelpText<"Full version of the Windows SDK, defaults to newest found">;
 def _SLASH_winsysroot : CLJoinedOrSeparate<"winsysroot">,
-  HelpText<"Same as /vctoolsdir <dir>/VC/Tools/MSVC/<vctoolsversion> /winsdkdir <dir>/Windows Kits/10">,
+  HelpText<"Same as \"/diasdkdir <dir>/DIA SDK\" /vctoolsdir <dir>/VC/Tools/MSVC/<vctoolsversion> \"/winsdkdir <dir>/Windows Kits/10\"">,
   MetaVarName<"<dir>">;
 def _SLASH_volatile_iso : Option<["/", "-"], "volatile:iso", KIND_FLAG>,
   Group<_SLASH_volatile_Group>, Flags<[CLOption, NoXarchOption]>,
@@ -6217,7 +6942,7 @@ def _SLASH_volatile_ms  : Option<["/", "-"], "volatile:ms", KIND_FLAG>,
   HelpText<"Volatile loads and stores have acquire and release semantics">;
 def _SLASH_clang : CLJoined<"clang:">,
   HelpText<"Pass <arg> to the clang driver">, MetaVarName<"<arg>">;
-def _SLASH_Zl : CLFlag<"Zl">,
+def _SLASH_Zl : CLFlag<"Zl">, Alias<fms_omit_default_lib>,
   HelpText<"Do not let object file auto-link default libraries">;
 
 def _SLASH_Yc : CLJoined<"Yc">,
@@ -6258,7 +6983,6 @@ def _SLASH_errorReport : CLIgnoredJoined<"errorReport">;
 def _SLASH_FC : CLIgnoredFlag<"FC">;
 def _SLASH_Fd : CLIgnoredJoined<"Fd">;
 def _SLASH_FS : CLIgnoredFlag<"FS">;
-def _SLASH_JMC : CLIgnoredFlag<"JMC">;
 def _SLASH_kernel_ : CLIgnoredFlag<"kernel-">;
 def _SLASH_nologo : CLIgnoredFlag<"nologo">;
 def _SLASH_RTC : CLIgnoredJoined<"RTC">;
@@ -6267,16 +6991,13 @@ def _SLASH_sdl_ : CLIgnoredFlag<"sdl-">;
 def _SLASH_utf8 : CLIgnoredFlag<"utf-8">,
   HelpText<"Set source and runtime encoding to UTF-8 (default)">;
 def _SLASH_w : CLIgnoredJoined<"w">;
+def _SLASH_Wv_ : CLIgnoredJoined<"Wv">;
 def _SLASH_Zc___cplusplus : CLIgnoredFlag<"Zc:__cplusplus">;
 def _SLASH_Zc_auto : CLIgnoredFlag<"Zc:auto">;
 def _SLASH_Zc_forScope : CLIgnoredFlag<"Zc:forScope">;
 def _SLASH_Zc_inline : CLIgnoredFlag<"Zc:inline">;
 def _SLASH_Zc_rvalueCast : CLIgnoredFlag<"Zc:rvalueCast">;
 def _SLASH_Zc_ternary : CLIgnoredFlag<"Zc:ternary">;
-def _SLASH_Zc_wchar_t : CLIgnoredFlag<"Zc:wchar_t">;
-def _SLASH_ZH_MD5 : CLIgnoredFlag<"ZH:MD5">;
-def _SLASH_ZH_SHA1 : CLIgnoredFlag<"ZH:SHA1">;
-def _SLASH_ZH_SHA_256 : CLIgnoredFlag<"ZH:SHA_256">;
 def _SLASH_Zm : CLIgnoredJoined<"Zm">;
 def _SLASH_Zo : CLIgnoredFlag<"Zo">;
 def _SLASH_Zo_ : CLIgnoredFlag<"Zo-">;
@@ -6291,12 +7012,12 @@ def _SLASH_AI : CLJoinedOrSeparate<"AI">;
 def _SLASH_Bt : CLFlag<"Bt">;
 def _SLASH_Bt_plus : CLFlag<"Bt+">;
 def _SLASH_clr : CLJoined<"clr">;
+def _SLASH_d1 : CLJoined<"d1">;
 def _SLASH_d2 : CLJoined<"d2">;
 def _SLASH_doc : CLJoined<"doc">;
 def _SLASH_experimental : CLJoined<"experimental:">;
 def _SLASH_exportHeader : CLFlag<"exportHeader">;
 def _SLASH_external : CLJoined<"external:">;
-def _SLASH_FA_joined : CLJoined<"FA">;
 def _SLASH_favor : CLJoined<"favor">;
 def _SLASH_fsanitize_address_use_after_return : CLJoined<"fsanitize-address-use-after-return">;
 def _SLASH_fno_sanitize_address_vcasan_lib : CLJoined<"fno-sanitize-address-vcasan-lib">;
@@ -6323,7 +7044,6 @@ def _SLASH_headerUnit : CLJoinedOrSeparate<"headerUnit">;
 def _SLASH_headerUnitAngle : CLJoinedOrSeparate<"headerUnit:angle">;
 def _SLASH_headerUnitQuote : CLJoinedOrSeparate<"headerUnit:quote">;
 def _SLASH_homeparams : CLFlag<"homeparams">;
-def _SLASH_hotpatch : CLFlag<"hotpatch">;
 def _SLASH_kernel : CLFlag<"kernel">;
 def _SLASH_LN : CLFlag<"LN">;
 def _SLASH_MP : CLJoined<"MP">;
@@ -6353,3 +7073,56 @@ def _SLASH_Ze : CLFlag<"Ze">;
 def _SLASH_Zg : CLFlag<"Zg">;
 def _SLASH_ZI : CLFlag<"ZI">;
 def _SLASH_ZW : CLJoined<"ZW">;
+
+//===----------------------------------------------------------------------===//
+// clang-dxc Options
+//===----------------------------------------------------------------------===//
+
+def dxc_Group : OptionGroup<"<clang-dxc options>">, Flags<[DXCOption]>,
+  HelpText<"dxc compatibility options">;
+class DXCFlag<string name> : Option<["/", "-"], name, KIND_FLAG>,
+  Group<dxc_Group>, Flags<[DXCOption, NoXarchOption]>;
+class DXCJoinedOrSeparate<string name> : Option<["/", "-"], name,
+  KIND_JOINED_OR_SEPARATE>, Group<dxc_Group>, Flags<[DXCOption, NoXarchOption]>;
+
+def dxc_help : Option<["/", "-", "--"], "help", KIND_JOINED>,
+  Group<dxc_Group>, Flags<[DXCOption, NoXarchOption]>, Alias<help>,
+  HelpText<"Display available options">;
+def dxc_no_stdinc : DXCFlag<"hlsl-no-stdinc">,
+  HelpText<"HLSL only. Disables all standard includes containing non-native compiler types and functions.">;
+def Fo : DXCJoinedOrSeparate<"Fo">, Alias<o>,
+  HelpText<"Output object file">;
+def dxil_validator_version : Option<["/", "-"], "validator-version", KIND_SEPARATE>,
+  Group<dxc_Group>, Flags<[DXCOption, NoXarchOption, CC1Option, HelpHidden]>,
+  HelpText<"Override validator version for module. Format: <major.minor>;"
+           "Default: DXIL.dll version or current internal version">,
+  MarshallingInfoString<TargetOpts<"DxilValidatorVersion">>;
+def target_profile : DXCJoinedOrSeparate<"T">, MetaVarName<"<profile>">,
+  HelpText<"Set target profile">,
+  Values<"ps_6_0, ps_6_1, ps_6_2, ps_6_3, ps_6_4, ps_6_5, ps_6_6, ps_6_7,"
+         "vs_6_0, vs_6_1, vs_6_2, vs_6_3, vs_6_4, vs_6_5, vs_6_6, vs_6_7,"
+         "gs_6_0, gs_6_1, gs_6_2, gs_6_3, gs_6_4, gs_6_5, gs_6_6, gs_6_7,"
+         "hs_6_0, hs_6_1, hs_6_2, hs_6_3, hs_6_4, hs_6_5, hs_6_6, hs_6_7,"
+         "ds_6_0, ds_6_1, ds_6_2, ds_6_3, ds_6_4, ds_6_5, ds_6_6, ds_6_7,"
+         "cs_6_0, cs_6_1, cs_6_2, cs_6_3, cs_6_4, cs_6_5, cs_6_6, cs_6_7,"
+         "lib_6_3, lib_6_4, lib_6_5, lib_6_6, lib_6_7, lib_6_x,"
+         "ms_6_5, ms_6_6, ms_6_7,"
+         "as_6_5, as_6_6, as_6_7">;
+def dxc_D : Option<["--", "/", "-"], "D", KIND_JOINED_OR_SEPARATE>,
+  Group<dxc_Group>, Flags<[DXCOption, NoXarchOption]>, Alias<D>;
+def emit_pristine_llvm : DXCFlag<"emit-pristine-llvm">,
+  HelpText<"Emit pristine LLVM IR from the frontend by not running any LLVM passes at all."
+           "Same as -S + -emit-llvm + -disable-llvm-passes.">;
+def fcgl : DXCFlag<"fcgl">, Alias<emit_pristine_llvm>;
+def enable_16bit_types : DXCFlag<"enable-16bit-types">, Alias<fnative_half_type>,
+  HelpText<"Enable 16-bit types and disable min precision types."
+           "Available in HLSL 2018 and shader model 6.2.">;
+def hlsl_entrypoint : Option<["-"], "hlsl-entry", KIND_SEPARATE>,
+                      Group<dxc_Group>,
+                      Flags<[CC1Option]>,
+                      MarshallingInfoString<TargetOpts<"HLSLEntry">, "\"main\"">,
+                      HelpText<"Entry point name for hlsl">;
+def dxc_entrypoint : Option<["--", "/", "-"], "E", KIND_JOINED_OR_SEPARATE>,
+                     Group<dxc_Group>,
+                     Flags<[DXCOption, NoXarchOption]>,
+                     HelpText<"Entry point name">;
diff --git a/gnu/llvm/clang/include/clang/Lex/DependencyDirectivesSourceMinimizer.h b/gnu/llvm/clang/include/clang/Lex/DependencyDirectivesSourceMinimizer.h
deleted file mode 100644
index 9bb820156c2..00000000000
--- a/gnu/llvm/clang/include/clang/Lex/DependencyDirectivesSourceMinimizer.h
+++ /dev/null
@@ -1,112 +0,0 @@
-//===- clang/Lex/DependencyDirectivesSourceMinimizer.h -  ----------*- C++ -*-//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-///
-/// \file
-/// This is the interface for minimizing header and source files to the
-/// minimum necessary preprocessor directives for evaluating includes. It
-/// reduces the source down to #define, #include, #import, @import, and any
-/// conditional preprocessor logic that contains one of those.
-///
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_CLANG_LEX_DEPENDENCY_DIRECTIVES_SOURCE_MINIMIZER_H
-#define LLVM_CLANG_LEX_DEPENDENCY_DIRECTIVES_SOURCE_MINIMIZER_H
-
-#include "clang/Basic/SourceLocation.h"
-#include "llvm/ADT/ArrayRef.h"
-#include "llvm/ADT/SmallVector.h"
-#include "llvm/ADT/StringRef.h"
-
-namespace clang {
-
-class DiagnosticsEngine;
-
-namespace minimize_source_to_dependency_directives {
-
-/// Represents the kind of preprocessor directive or a module declaration that
-/// is tracked by the source minimizer in its token output.
-enum TokenKind {
-  pp_none,
-  pp_include,
-  pp___include_macros,
-  pp_define,
-  pp_undef,
-  pp_import,
-  pp_pragma_import,
-  pp_pragma_once,
-  pp_include_next,
-  pp_if,
-  pp_ifdef,
-  pp_ifndef,
-  pp_elif,
-  pp_elifdef,
-  pp_elifndef,
-  pp_else,
-  pp_endif,
-  decl_at_import,
-  cxx_export_decl,
-  cxx_module_decl,
-  cxx_import_decl,
-  pp_eof,
-};
-
-/// Represents a simplified token that's lexed as part of the source
-/// minimization. It's used to track the location of various preprocessor
-/// directives that could potentially have an effect on the depedencies.
-struct Token {
-  /// The kind of token.
-  TokenKind K = pp_none;
-
-  /// Offset into the output byte stream of where the directive begins.
-  int Offset = -1;
-
-  Token(TokenKind K, int Offset) : K(K), Offset(Offset) {}
-};
-
-/// Simplified token range to track the range of a potentially skippable PP
-/// directive.
-struct SkippedRange {
-  /// Offset into the output byte stream of where the skipped directive begins.
-  int Offset;
-
-  /// The number of bytes that can be skipped before the preprocessing must
-  /// resume.
-  int Length;
-};
-
-/// Computes the potential source ranges that can be skipped by the preprocessor
-/// when skipping a directive like #if, #ifdef or #elsif.
-///
-/// \returns false on success, true on error.
-bool computeSkippedRanges(ArrayRef<Token> Input,
-                          llvm::SmallVectorImpl<SkippedRange> &Range);
-
-} // end namespace minimize_source_to_dependency_directives
-
-/// Minimize the input down to the preprocessor directives that might have
-/// an effect on the dependencies for a compilation unit.
-///
-/// This function deletes all non-preprocessor code, and strips anything that
-/// can't affect what gets included. It canonicalizes whitespace where
-/// convenient to stabilize the output against formatting changes in the input.
-///
-/// Clears the output vectors at the beginning of the call.
-///
-/// \returns false on success, true on error. If the diagnostic engine is not
-/// null, an appropriate error is reported using the given input location
-/// with the offset that corresponds to the minimizer's current buffer offset.
-bool minimizeSourceToDependencyDirectives(
-    llvm::StringRef Input, llvm::SmallVectorImpl<char> &Output,
-    llvm::SmallVectorImpl<minimize_source_to_dependency_directives::Token>
-        &Tokens,
-    DiagnosticsEngine *Diags = nullptr,
-    SourceLocation InputSourceLoc = SourceLocation());
-
-} // end namespace clang
-
-#endif // LLVM_CLANG_LEX_DEPENDENCY_DIRECTIVES_SOURCE_MINIMIZER_H
diff --git a/gnu/llvm/clang/include/clang/Lex/PreprocessorExcludedConditionalDirectiveSkipMapping.h b/gnu/llvm/clang/include/clang/Lex/PreprocessorExcludedConditionalDirectiveSkipMapping.h
deleted file mode 100644
index 1a0d5ed57b2..00000000000
--- a/gnu/llvm/clang/include/clang/Lex/PreprocessorExcludedConditionalDirectiveSkipMapping.h
+++ /dev/null
@@ -1,30 +0,0 @@
-//===- PreprocessorExcludedConditionalDirectiveSkipMapping.h - --*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_CLANG_LEX_PREPROCESSOR_EXCLUDED_COND_DIRECTIVE_SKIP_MAPPING_H
-#define LLVM_CLANG_LEX_PREPROCESSOR_EXCLUDED_COND_DIRECTIVE_SKIP_MAPPING_H
-
-#include "clang/Basic/LLVM.h"
-#include "llvm/ADT/DenseMap.h"
-#include "llvm/Support/MemoryBuffer.h"
-
-namespace clang {
-
-/// A mapping from an offset into a buffer to the number of bytes that can be
-/// skipped by the preprocessor when skipping over excluded conditional
-/// directive ranges.
-using PreprocessorSkippedRangeMapping = llvm::DenseMap<unsigned, unsigned>;
-
-/// The datastructure that holds the mapping between the active memory buffers
-/// and the individual skip mappings.
-using ExcludedPreprocessorDirectiveSkipMapping =
-    llvm::DenseMap<const char *, const PreprocessorSkippedRangeMapping *>;
-
-} // end namespace clang
-
-#endif // LLVM_CLANG_LEX_PREPROCESSOR_EXCLUDED_COND_DIRECTIVE_SKIP_MAPPING_H
diff --git a/gnu/llvm/clang/include/clang/Sema/Sema.h b/gnu/llvm/clang/include/clang/Sema/Sema.h
index 65b6c7541e5..4c2fa76a759 100644
--- a/gnu/llvm/clang/include/clang/Sema/Sema.h
+++ b/gnu/llvm/clang/include/clang/Sema/Sema.h
@@ -58,7 +58,6 @@
 #include "clang/Sema/TypoCorrection.h"
 #include "clang/Sema/Weak.h"
 #include "llvm/ADT/ArrayRef.h"
-#include "llvm/ADT/Optional.h"
 #include "llvm/ADT/SetVector.h"
 #include "llvm/ADT/SmallBitVector.h"
 #include "llvm/ADT/SmallPtrSet.h"
@@ -68,13 +67,13 @@
 #include "llvm/Frontend/OpenMP/OMPConstants.h"
 #include <deque>
 #include <memory>
+#include <optional>
 #include <string>
 #include <tuple>
 #include <vector>
 
 namespace llvm {
   class APSInt;
-  template <typename ValueT> struct DenseMapInfo;
   template <typename ValueT, typename ValueInfoT> class DenseSet;
   class SmallBitVector;
   struct InlineAsmIdentifierInfo;
@@ -227,6 +226,7 @@ namespace sema {
   class FunctionScopeInfo;
   class LambdaScopeInfo;
   class PossiblyUnreachableDiag;
+  class RISCVIntrinsicManager;
   class SemaPPCallbacks;
   class TemplateDeductionInfo;
 }
@@ -238,8 +238,9 @@ namespace threadSafety {
 
 // FIXME: No way to easily map from TemplateTypeParmTypes to
 // TemplateTypeParmDecls, so we have this horrible PointerUnion.
-typedef std::pair<llvm::PointerUnion<const TemplateTypeParmType*, NamedDecl*>,
-                  SourceLocation> UnexpandedParameterPack;
+typedef std::pair<llvm::PointerUnion<const TemplateTypeParmType *, NamedDecl *>,
+                  SourceLocation>
+    UnexpandedParameterPack;
 
 /// Describes whether we've seen any nullability information for the given
 /// file.
@@ -306,7 +307,7 @@ public:
   /// Computing a type for the function argument may require running
   /// overloading, so we postpone its computation until it is actually needed.
   ///
-  /// Clients should be very careful when using this funciton, as it stores a
+  /// Clients should be very careful when using this function, as it stores a
   /// function_ref, clients should make sure all calls to get() with the same
   /// location happen while function_ref is alive.
   ///
@@ -357,15 +358,10 @@ class Sema final {
   void operator=(const Sema &) = delete;
 
   ///Source of additional semantic information.
-  ExternalSemaSource *ExternalSource;
-
-  ///Whether Sema has generated a multiplexer and has to delete it.
-  bool isMultiplexExternalSource;
+  IntrusiveRefCntPtr<ExternalSemaSource> ExternalSource;
 
   static bool mightHaveNonExternalLinkage(const DeclaratorDecl *FD);
 
-  bool isVisibleSlow(const NamedDecl *D);
-
   /// Determine whether two declarations should be linked together, given that
   /// the old declaration might not be visible and the new declaration might
   /// not have external linkage.
@@ -396,8 +392,8 @@ public:
   ///
   /// This is the greatest alignment value supported by load, store, and alloca
   /// instructions, and global values.
-  static const unsigned MaxAlignmentExponent = 29;
-  static const unsigned MaximumAlignment = 1u << MaxAlignmentExponent;
+  static const unsigned MaxAlignmentExponent = 32;
+  static const uint64_t MaximumAlignment = 1ull << MaxAlignmentExponent;
 
   typedef OpaquePtr<DeclGroupRef> DeclGroupPtrTy;
   typedef OpaquePtr<TemplateName> TemplateTy;
@@ -693,6 +689,9 @@ public:
   PragmaStack<StringLiteral *> ConstSegStack;
   PragmaStack<StringLiteral *> CodeSegStack;
 
+  // #pragma strict_gs_check.
+  PragmaStack<bool> StrictGuardStackCheckStack;
+
   // This stack tracks the current state of Sema.CurFPFeatures.
   PragmaStack<FPOptionsOverride> FpPragmaStack;
   FPOptionsOverride CurFPFeatureOverrides() {
@@ -725,6 +724,9 @@ public:
   StringLiteral *CurInitSeg;
   SourceLocation CurInitSegLoc;
 
+  /// Sections used with #pragma alloc_text.
+  llvm::StringMap<std::tuple<StringRef, SourceLocation>> FunctionToSectionMap;
+
   /// VisContext - Manages the stack for \#pragma GCC visibility.
   void *VisContext; // Really a "PragmaVisStack*"
 
@@ -756,6 +758,16 @@ public:
   /// optimizations are currently "on", this is set to an invalid location.
   SourceLocation OptimizeOffPragmaLocation;
 
+  /// The "on" or "off" argument passed by \#pragma optimize, that denotes
+  /// whether the optimizations in the list passed to the pragma should be
+  /// turned off or on. This boolean is true by default because command line
+  /// options are honored when `#pragma optimize("", on)`.
+  /// (i.e. `ModifyFnAttributeMSPragmaOptimze()` does nothing)
+  bool MSPragmaOptimizeIsOn = true;
+
+  /// Set of no-builtin functions listed by \#pragma function.
+  llvm::SmallSetVector<StringRef, 4> MSFunctionNoBuiltins;
+
   /// Flag indicating if Sema is building a recovery call expression.
   ///
   /// This flag is used to avoid building recovery call expressions
@@ -789,8 +801,8 @@ public:
   unsigned FunctionScopesStart = 0;
 
   ArrayRef<sema::FunctionScopeInfo*> getFunctionScopes() const {
-    return llvm::makeArrayRef(FunctionScopes.begin() + FunctionScopesStart,
-                              FunctionScopes.end());
+    return llvm::ArrayRef(FunctionScopes.begin() + FunctionScopesStart,
+                          FunctionScopes.end());
   }
 
   /// Stack containing information needed when in C++2a an 'auto' is encountered
@@ -805,9 +817,9 @@ public:
   unsigned InventedParameterInfosStart = 0;
 
   ArrayRef<InventedTemplateParameterInfo> getInventedParameterInfos() const {
-    return llvm::makeArrayRef(InventedParameterInfos.begin() +
-                                  InventedParameterInfosStart,
-                              InventedParameterInfos.end());
+    return llvm::ArrayRef(InventedParameterInfos.begin() +
+                              InventedParameterInfosStart,
+                          InventedParameterInfos.end());
   }
 
   typedef LazyVector<TypedefNameDecl *, ExternalSemaSource,
@@ -914,10 +926,6 @@ public:
     OpaqueParser = P;
   }
 
-  // Does the work necessary to deal with a SYCL kernel lambda. At the moment,
-  // this just marks the list of lambdas required to name the kernel.
-  void AddSYCLKernelLambda(const FunctionDecl *FD);
-
   class DelayedDiagnostics;
 
   class DelayedDiagnosticsState {
@@ -1077,10 +1085,20 @@ public:
     }
   };
 
-  /// WeakUndeclaredIdentifiers - Identifiers contained in
-  /// \#pragma weak before declared. rare. may alias another
-  /// identifier, declared or undeclared
-  llvm::MapVector<IdentifierInfo *, WeakInfo> WeakUndeclaredIdentifiers;
+  /// WeakUndeclaredIdentifiers - Identifiers contained in \#pragma weak before
+  /// declared. Rare. May alias another identifier, declared or undeclared.
+  ///
+  /// For aliases, the target identifier is used as a key for eventual
+  /// processing when the target is declared. For the single-identifier form,
+  /// the sole identifier is used as the key. Each entry is a `SetVector`
+  /// (ordered by parse order) of aliases (identified by the alias name) in case
+  /// of multiple aliases to the same undeclared identifier.
+  llvm::MapVector<
+      IdentifierInfo *,
+      llvm::SetVector<
+          WeakInfo, llvm::SmallVector<WeakInfo, 1u>,
+          llvm::SmallDenseSet<WeakInfo, 2u, WeakInfo::DenseMapInfoByAliasOnly>>>
+      WeakUndeclaredIdentifiers;
 
   /// ExtnameUndeclaredIdentifiers - Identifiers contained in
   /// \#pragma redefine_extname before declared.  Used in Solaris system headers
@@ -1128,6 +1146,10 @@ public:
   /// The C++ "std::coroutine_traits" template, which is defined in
   /// \<coroutine_traits>
   ClassTemplateDecl *StdCoroutineTraitsCache;
+  /// The namespace where coroutine components are defined. In standard,
+  /// they are defined in std namespace. And in the previous implementation,
+  /// they are defined in std::experimental namespace.
+  NamespaceDecl *CoroTraitsNamespaceCache;
 
   /// The C++ "type_info" declaration, which is defined in \<typeinfo>.
   RecordDecl *CXXTypeInfoDecl;
@@ -1135,6 +1157,10 @@ public:
   /// The MSVC "_GUID" struct, which is defined in MSVC header files.
   RecordDecl *MSVCGuidDecl;
 
+  /// The C++ "std::source_location::__impl" struct, defined in
+  /// \<source_location>.
+  RecordDecl *StdSourceLocationImplDecl;
+
   /// Caches identifiers/selectors for NSFoundation APIs.
   std::unique_ptr<NSAPI> NSAPIObj;
 
@@ -1218,6 +1244,11 @@ public:
     /// cases in a switch statement).
     ConstantEvaluated,
 
+    /// In addition of being constant evaluated, the current expression
+    /// occurs in an immediate function context - either a consteval function
+    /// or a consteval if function.
+    ImmediateFunctionContext,
+
     /// The current expression is potentially evaluated at run time,
     /// which means that code may be generated to evaluate the value of the
     /// expression at run time.
@@ -1292,6 +1323,30 @@ public:
       EK_Decltype, EK_TemplateArgument, EK_Other
     } ExprContext;
 
+    // A context can be nested in both a discarded statement context and
+    // an immediate function context, so they need to be tracked independently.
+    bool InDiscardedStatement;
+    bool InImmediateFunctionContext;
+
+    bool IsCurrentlyCheckingDefaultArgumentOrInitializer = false;
+
+    // When evaluating immediate functions in the initializer of a default
+    // argument or default member initializer, this is the declaration whose
+    // default initializer is being evaluated and the location of the call
+    // or constructor definition.
+    struct InitializationContext {
+      InitializationContext(SourceLocation Loc, ValueDecl *Decl,
+                            DeclContext *Context)
+          : Loc(Loc), Decl(Decl), Context(Context) {
+        assert(Decl && Context && "invalid initialization context");
+      }
+
+      SourceLocation Loc;
+      ValueDecl *Decl = nullptr;
+      DeclContext *Context = nullptr;
+    };
+    std::optional<InitializationContext> DelayedDefaultInitializationContext;
+
     ExpressionEvaluationContextRecord(ExpressionEvaluationContext Context,
                                       unsigned NumCleanupObjects,
                                       CleanupInfo ParentCleanup,
@@ -1299,21 +1354,49 @@ public:
                                       ExpressionKind ExprContext)
         : Context(Context), ParentCleanup(ParentCleanup),
           NumCleanupObjects(NumCleanupObjects), NumTypos(0),
-          ManglingContextDecl(ManglingContextDecl), ExprContext(ExprContext) {}
+          ManglingContextDecl(ManglingContextDecl), ExprContext(ExprContext),
+          InDiscardedStatement(false), InImmediateFunctionContext(false) {}
 
     bool isUnevaluated() const {
       return Context == ExpressionEvaluationContext::Unevaluated ||
              Context == ExpressionEvaluationContext::UnevaluatedAbstract ||
              Context == ExpressionEvaluationContext::UnevaluatedList;
     }
+
     bool isConstantEvaluated() const {
-      return Context == ExpressionEvaluationContext::ConstantEvaluated;
+      return Context == ExpressionEvaluationContext::ConstantEvaluated ||
+             Context == ExpressionEvaluationContext::ImmediateFunctionContext;
+    }
+
+    bool isImmediateFunctionContext() const {
+      return Context == ExpressionEvaluationContext::ImmediateFunctionContext ||
+             (Context == ExpressionEvaluationContext::DiscardedStatement &&
+              InImmediateFunctionContext) ||
+             // C++2b [expr.const]p14:
+             // An expression or conversion is in an immediate function
+             // context if it is potentially evaluated and either:
+             //   * its innermost enclosing non-block scope is a function
+             //     parameter scope of an immediate function, or
+             //   * its enclosing statement is enclosed by the compound-
+             //     statement of a consteval if statement.
+             (Context == ExpressionEvaluationContext::PotentiallyEvaluated &&
+              InImmediateFunctionContext);
+    }
+
+    bool isDiscardedStatementContext() const {
+      return Context == ExpressionEvaluationContext::DiscardedStatement ||
+             (Context ==
+                  ExpressionEvaluationContext::ImmediateFunctionContext &&
+              InDiscardedStatement);
     }
   };
 
   /// A stack of expression evaluation contexts.
   SmallVector<ExpressionEvaluationContextRecord, 8> ExprEvalContexts;
 
+  // Set of failed immediate invocations to avoid double diagnosing.
+  llvm::SmallPtrSet<ConstantExpr *, 4> FailedImmediateInvocations;
+
   /// Emit a warning for all pending noderef expressions that we recorded.
   void WarnOnPendingNoDerefs(ExpressionEvaluationContextRecord &Rec);
 
@@ -1340,10 +1423,10 @@ public:
     };
 
   private:
-    llvm::PointerIntPair<CXXMethodDecl*, 2> Pair;
+    llvm::PointerIntPair<CXXMethodDecl *, 2> Pair;
 
   public:
-    SpecialMemberOverloadResult() : Pair() {}
+    SpecialMemberOverloadResult() {}
     SpecialMemberOverloadResult(CXXMethodDecl *MD)
         : Pair(MD, MD->isDeleted() ? NoMemberOrDeleted : Success) {}
 
@@ -1419,8 +1502,22 @@ public:
   const llvm::MapVector<FieldDecl *, DeleteLocs> &
   getMismatchingDeleteExpressions() const;
 
-  typedef std::pair<ObjCMethodList, ObjCMethodList> GlobalMethods;
-  typedef llvm::DenseMap<Selector, GlobalMethods> GlobalMethodPool;
+  class GlobalMethodPool {
+  public:
+    using Lists = std::pair<ObjCMethodList, ObjCMethodList>;
+    using iterator = llvm::DenseMap<Selector, Lists>::iterator;
+    iterator begin() { return Methods.begin(); }
+    iterator end() { return Methods.end(); }
+    iterator find(Selector Sel) { return Methods.find(Sel); }
+    std::pair<iterator, bool> insert(std::pair<Selector, Lists> &&Val) {
+      return Methods.insert(Val);
+    }
+    int count(Selector Sel) const { return Methods.count(Sel); }
+    bool empty() const { return Methods.empty(); }
+
+  private:
+    llvm::DenseMap<Selector, Lists> Methods;
+  };
 
   /// Method Pool - allows efficient lookup when typechecking messages to "id".
   /// We need to maintain a list, since selectors can have differing signatures
@@ -1502,19 +1599,16 @@ public:
   /// statements.
   class FPFeaturesStateRAII {
   public:
-    FPFeaturesStateRAII(Sema &S) : S(S), OldFPFeaturesState(S.CurFPFeatures) {
-      OldOverrides = S.FpPragmaStack.CurrentValue;
-    }
-    ~FPFeaturesStateRAII() {
-      S.CurFPFeatures = OldFPFeaturesState;
-      S.FpPragmaStack.CurrentValue = OldOverrides;
-    }
+    FPFeaturesStateRAII(Sema &S);
+    ~FPFeaturesStateRAII();
     FPOptionsOverride getOverrides() { return OldOverrides; }
 
   private:
     Sema& S;
     FPOptions OldFPFeaturesState;
     FPOptionsOverride OldOverrides;
+    LangOptions::FPEvalMethodKind OldEvalMethod;
+    SourceLocation OldFPPragmaLocation;
   };
 
   void addImplicitTypedef(StringRef Name, QualType T);
@@ -1526,7 +1620,15 @@ public:
   /// assignment.
   llvm::DenseMap<const VarDecl *, int> RefsMinusAssignments;
 
-  Optional<std::unique_ptr<DarwinSDKInfo>> CachedDarwinSDKInfo;
+  /// Indicate RISC-V vector builtin functions enabled or not.
+  bool DeclareRISCVVBuiltins = false;
+
+private:
+  std::unique_ptr<sema::RISCVIntrinsicManager> RVIntrinsicManager;
+
+  std::optional<std::unique_ptr<DarwinSDKInfo>> CachedDarwinSDKInfo;
+
+  bool WarnedDarwinSDKInfoMissing = false;
 
 public:
   Sema(Preprocessor &pp, ASTContext &ctxt, ASTConsumer &consumer,
@@ -1555,9 +1657,11 @@ public:
   ASTContext &getASTContext() const { return Context; }
   ASTConsumer &getASTConsumer() const { return Consumer; }
   ASTMutationListener *getASTMutationListener() const;
-  ExternalSemaSource* getExternalSource() const { return ExternalSource; }
+  ExternalSemaSource *getExternalSource() const { return ExternalSource.get(); }
+
   DarwinSDKInfo *getDarwinSDKInfoForAvailabilityChecking(SourceLocation Loc,
                                                          StringRef Platform);
+  DarwinSDKInfo *getDarwinSDKInfoForAvailabilityChecking();
 
   ///Registers an external source. If an external source already exists,
   /// creates a multiplex external source and appends to it.
@@ -1635,8 +1739,8 @@ public:
     // It is necessary to limit this to rvalue reference to avoid calling this
     // function with a bitfield lvalue argument since non-const reference to
     // bitfield is not allowed.
-    template <typename T, typename = typename std::enable_if<
-                              !std::is_lvalue_reference<T>::value>::type>
+    template <typename T,
+              typename = std::enable_if_t<!std::is_lvalue_reference<T>::value>>
     const ImmediateDiagBuilder &operator<<(T &&V) const {
       const DiagnosticBuilder &BaseDiag = *this;
       BaseDiag << std::move(V);
@@ -1681,7 +1785,7 @@ public:
     SemaDiagnosticBuilder(const SemaDiagnosticBuilder &) = default;
     ~SemaDiagnosticBuilder();
 
-    bool isImmediate() const { return ImmediateDiag.hasValue(); }
+    bool isImmediate() const { return ImmediateDiag.has_value(); }
 
     /// Convertible to bool: True if we immediately emitted an error, false if
     /// we didn't emit an error or we created a deferred error.
@@ -1698,9 +1802,9 @@ public:
     template <typename T>
     friend const SemaDiagnosticBuilder &
     operator<<(const SemaDiagnosticBuilder &Diag, const T &Value) {
-      if (Diag.ImmediateDiag.hasValue())
+      if (Diag.ImmediateDiag)
         *Diag.ImmediateDiag << Value;
-      else if (Diag.PartialDiagId.hasValue())
+      else if (Diag.PartialDiagId)
         Diag.S.DeviceDeferredDiags[Diag.Fn][*Diag.PartialDiagId].second
             << Value;
       return Diag;
@@ -1709,29 +1813,29 @@ public:
     // It is necessary to limit this to rvalue reference to avoid calling this
     // function with a bitfield lvalue argument since non-const reference to
     // bitfield is not allowed.
-    template <typename T, typename = typename std::enable_if<
-                              !std::is_lvalue_reference<T>::value>::type>
+    template <typename T,
+              typename = std::enable_if_t<!std::is_lvalue_reference<T>::value>>
     const SemaDiagnosticBuilder &operator<<(T &&V) const {
-      if (ImmediateDiag.hasValue())
+      if (ImmediateDiag)
         *ImmediateDiag << std::move(V);
-      else if (PartialDiagId.hasValue())
+      else if (PartialDiagId)
         S.DeviceDeferredDiags[Fn][*PartialDiagId].second << std::move(V);
       return *this;
     }
 
     friend const SemaDiagnosticBuilder &
     operator<<(const SemaDiagnosticBuilder &Diag, const PartialDiagnostic &PD) {
-      if (Diag.ImmediateDiag.hasValue())
+      if (Diag.ImmediateDiag)
         PD.Emit(*Diag.ImmediateDiag);
-      else if (Diag.PartialDiagId.hasValue())
+      else if (Diag.PartialDiagId)
         Diag.S.DeviceDeferredDiags[Diag.Fn][*Diag.PartialDiagId].second = PD;
       return Diag;
     }
 
     void AddFixItHint(const FixItHint &Hint) const {
-      if (ImmediateDiag.hasValue())
+      if (ImmediateDiag)
         ImmediateDiag->AddFixItHint(Hint);
-      else if (PartialDiagId.hasValue())
+      else if (PartialDiagId)
         S.DeviceDeferredDiags[Fn][*PartialDiagId].second.AddFixItHint(Hint);
     }
 
@@ -1756,8 +1860,8 @@ public:
 
     // Invariant: At most one of these Optionals has a value.
     // FIXME: Switch these to a Variant once that exists.
-    llvm::Optional<ImmediateDiagBuilder> ImmediateDiag;
-    llvm::Optional<unsigned> PartialDiagId;
+    std::optional<ImmediateDiagBuilder> ImmediateDiag;
+    std::optional<unsigned> PartialDiagId;
   };
 
   /// Is the last error level diagnostic immediate. This is used to determined
@@ -2007,7 +2111,7 @@ public:
                          SourceLocation Loc);
   QualType BuildWritePipeType(QualType T,
                          SourceLocation Loc);
-  QualType BuildExtIntType(bool IsUnsigned, Expr *BitWidth, SourceLocation Loc);
+  QualType BuildBitIntType(bool IsUnsigned, Expr *BitWidth, SourceLocation Loc);
 
   TypeSourceInfo *GetTypeForDeclarator(Declarator &D, Scope *S);
   TypeSourceInfo *GetTypeForDeclaratorCast(Declarator &D, QualType FromTy);
@@ -2150,6 +2254,8 @@ public:
     Default = AcceptSizeless
   };
 
+  enum class AcceptableKind { Visible, Reachable };
+
 private:
   /// Methods for marking which expressions involve dereferencing a pointer
   /// marked with the 'noderef' attribute. Expressions are checked bottom up as
@@ -2169,28 +2275,75 @@ private:
     SourceLocation BeginLoc;
     clang::Module *Module = nullptr;
     bool ModuleInterface = false;
+    bool IsPartition = false;
     bool ImplicitGlobalModuleFragment = false;
     VisibleModuleSet OuterVisibleModules;
   };
   /// The modules we're currently parsing.
   llvm::SmallVector<ModuleScope, 16> ModuleScopes;
+  /// The global module fragment of the current translation unit.
+  clang::Module *GlobalModuleFragment = nullptr;
+
+  /// The modules we imported directly.
+  llvm::SmallPtrSet<clang::Module *, 8> DirectModuleImports;
 
   /// Namespace definitions that we will export when they finish.
   llvm::SmallPtrSet<const NamespaceDecl*, 8> DeferredExportedNamespaces;
 
-  /// Get the module whose scope we are currently within.
-  Module *getCurrentModule() const {
-    return ModuleScopes.empty() ? nullptr : ModuleScopes.back().Module;
+  /// In a C++ standard module, inline declarations require a definition to be
+  /// present at the end of a definition domain.  This set holds the decls to
+  /// be checked at the end of the TU.
+  llvm::SmallPtrSet<const FunctionDecl *, 8> PendingInlineFuncDecls;
+
+  /// Helper function to judge if we are in module purview.
+  /// Return false if we are not in a module.
+  bool isCurrentModulePurview() const {
+    return getCurrentModule() ? getCurrentModule()->isModulePurview() : false;
   }
 
+  /// Enter the scope of the global module.
+  Module *PushGlobalModuleFragment(SourceLocation BeginLoc, bool IsImplicit);
+  /// Leave the scope of the global module.
+  void PopGlobalModuleFragment();
+
   VisibleModuleSet VisibleModules;
 
+  /// Cache for module units which is usable for current module.
+  llvm::DenseSet<const Module *> UsableModuleUnitsCache;
+
+  bool isUsableModule(const Module *M);
+
+  bool isAcceptableSlow(const NamedDecl *D, AcceptableKind Kind);
+
 public:
+  /// Get the module unit whose scope we are currently within.
+  Module *getCurrentModule() const {
+    return ModuleScopes.empty() ? nullptr : ModuleScopes.back().Module;
+  }
+
+  /// Is the module scope we are an interface?
+  bool currentModuleIsInterface() const {
+    return ModuleScopes.empty() ? false : ModuleScopes.back().ModuleInterface;
+  }
+
+  /// Is the module scope we are in a C++ Header Unit?
+  bool currentModuleIsHeaderUnit() const {
+    return ModuleScopes.empty() ? false
+                                : ModuleScopes.back().Module->isHeaderUnit();
+  }
+
   /// Get the module owning an entity.
   Module *getOwningModule(const Decl *Entity) {
     return Entity->getOwningModule();
   }
 
+  bool isModuleDirectlyImported(const Module *M) {
+    return DirectModuleImports.contains(M);
+  }
+
+  // Determine whether the module M belongs to the  current TU.
+  bool isModuleUnitOfCurrentTU(const Module *M) const;
+
   /// Make a merged definition of an existing hidden definition \p ND
   /// visible at the specified location.
   void makeMergedDefinitionVisible(NamedDecl *ND);
@@ -2205,7 +2358,20 @@ public:
 
   /// Determine whether a declaration is visible to name lookup.
   bool isVisible(const NamedDecl *D) {
-    return D->isUnconditionallyVisible() || isVisibleSlow(D);
+    return D->isUnconditionallyVisible() ||
+           isAcceptableSlow(D, AcceptableKind::Visible);
+  }
+
+  /// Determine whether a declaration is reachable.
+  bool isReachable(const NamedDecl *D) {
+    // All visible declarations are reachable.
+    return D->isUnconditionallyVisible() ||
+           isAcceptableSlow(D, AcceptableKind::Reachable);
+  }
+
+  /// Determine whether a declaration is acceptable (visible/reachable).
+  bool isAcceptable(const NamedDecl *D, AcceptableKind Kind) {
+    return Kind == AcceptableKind::Visible ? isVisible(D) : isReachable(D);
   }
 
   /// Determine whether any declaration of an entity is visible.
@@ -2214,8 +2380,17 @@ public:
                         llvm::SmallVectorImpl<Module *> *Modules = nullptr) {
     return isVisible(D) || hasVisibleDeclarationSlow(D, Modules);
   }
+
   bool hasVisibleDeclarationSlow(const NamedDecl *D,
                                  llvm::SmallVectorImpl<Module *> *Modules);
+  /// Determine whether any declaration of an entity is reachable.
+  bool
+  hasReachableDeclaration(const NamedDecl *D,
+                          llvm::SmallVectorImpl<Module *> *Modules = nullptr) {
+    return isReachable(D) || hasReachableDeclarationSlow(D, Modules);
+  }
+  bool hasReachableDeclarationSlow(
+      const NamedDecl *D, llvm::SmallVectorImpl<Module *> *Modules = nullptr);
 
   bool hasVisibleMergedDefinition(NamedDecl *Def);
   bool hasMergedDefinitionInCurrentModule(NamedDecl *Def);
@@ -2233,21 +2408,54 @@ public:
     return hasVisibleDefinition(const_cast<NamedDecl*>(D), &Hidden);
   }
 
+  /// Determine if \p D has a reachable definition. If not, suggest a
+  /// declaration that should be made reachable to expose the definition.
+  bool hasReachableDefinition(NamedDecl *D, NamedDecl **Suggested,
+                              bool OnlyNeedComplete = false);
+  bool hasReachableDefinition(NamedDecl *D) {
+    NamedDecl *Hidden;
+    return hasReachableDefinition(D, &Hidden);
+  }
+
+  bool hasAcceptableDefinition(NamedDecl *D, NamedDecl **Suggested,
+                               AcceptableKind Kind,
+                               bool OnlyNeedComplete = false);
+  bool hasAcceptableDefinition(NamedDecl *D, AcceptableKind Kind) {
+    NamedDecl *Hidden;
+    return hasAcceptableDefinition(D, &Hidden, Kind);
+  }
+
   /// Determine if the template parameter \p D has a visible default argument.
   bool
   hasVisibleDefaultArgument(const NamedDecl *D,
                             llvm::SmallVectorImpl<Module *> *Modules = nullptr);
+  /// Determine if the template parameter \p D has a reachable default argument.
+  bool hasReachableDefaultArgument(
+      const NamedDecl *D, llvm::SmallVectorImpl<Module *> *Modules = nullptr);
+  /// Determine if the template parameter \p D has a reachable default argument.
+  bool hasAcceptableDefaultArgument(const NamedDecl *D,
+                                    llvm::SmallVectorImpl<Module *> *Modules,
+                                    Sema::AcceptableKind Kind);
 
   /// Determine if there is a visible declaration of \p D that is an explicit
   /// specialization declaration for a specialization of a template. (For a
   /// member specialization, use hasVisibleMemberSpecialization.)
   bool hasVisibleExplicitSpecialization(
       const NamedDecl *D, llvm::SmallVectorImpl<Module *> *Modules = nullptr);
+  /// Determine if there is a reachable declaration of \p D that is an explicit
+  /// specialization declaration for a specialization of a template. (For a
+  /// member specialization, use hasReachableMemberSpecialization.)
+  bool hasReachableExplicitSpecialization(
+      const NamedDecl *D, llvm::SmallVectorImpl<Module *> *Modules = nullptr);
 
   /// Determine if there is a visible declaration of \p D that is a member
   /// specialization declaration (as opposed to an instantiated declaration).
   bool hasVisibleMemberSpecialization(
       const NamedDecl *D, llvm::SmallVectorImpl<Module *> *Modules = nullptr);
+  /// Determine if there is a reachable declaration of \p D that is a member
+  /// specialization declaration (as opposed to an instantiated declaration).
+  bool hasReachableMemberSpecialization(
+      const NamedDecl *D, llvm::SmallVectorImpl<Module *> *Modules = nullptr);
 
   /// Determine if \p A and \p B are equivalent internal linkage declarations
   /// from different modules, and thus an ambiguity error can be downgraded to
@@ -2260,6 +2468,10 @@ public:
 
   bool isUsualDeallocationFunction(const CXXMethodDecl *FD);
 
+  // Check whether the size of array element of type \p EltTy is a multiple of
+  // its alignment and return false if it isn't.
+  bool checkArrayElementAlignment(QualType EltTy, SourceLocation Loc);
+
   bool isCompleteType(SourceLocation Loc, QualType T,
                       CompleteTypeKind Kind = CompleteTypeKind::Default) {
     return !RequireCompleteTypeImpl(Loc, T, Kind, nullptr);
@@ -2334,14 +2546,30 @@ public:
                              const CXXScopeSpec &SS, QualType T,
                              TagDecl *OwnedTagDecl = nullptr);
 
-  QualType getDecltypeForParenthesizedExpr(Expr *E);
-  QualType BuildTypeofExprType(Expr *E, SourceLocation Loc);
+  // Returns the underlying type of a decltype with the given expression.
+  QualType getDecltypeForExpr(Expr *E);
+
+  QualType BuildTypeofExprType(Expr *E, TypeOfKind Kind);
   /// If AsUnevaluated is false, E is treated as though it were an evaluated
   /// context, such as when building a type for decltype(auto).
-  QualType BuildDecltypeType(Expr *E, SourceLocation Loc,
-                             bool AsUnevaluated = true);
-  QualType BuildUnaryTransformType(QualType BaseType,
-                                   UnaryTransformType::UTTKind UKind,
+  QualType BuildDecltypeType(Expr *E, bool AsUnevaluated = true);
+
+  using UTTKind = UnaryTransformType::UTTKind;
+  QualType BuildUnaryTransformType(QualType BaseType, UTTKind UKind,
+                                   SourceLocation Loc);
+  QualType BuiltinEnumUnderlyingType(QualType BaseType, SourceLocation Loc);
+  QualType BuiltinAddPointer(QualType BaseType, SourceLocation Loc);
+  QualType BuiltinRemovePointer(QualType BaseType, SourceLocation Loc);
+  QualType BuiltinDecay(QualType BaseType, SourceLocation Loc);
+  QualType BuiltinAddReference(QualType BaseType, UTTKind UKind,
+                               SourceLocation Loc);
+  QualType BuiltinRemoveExtent(QualType BaseType, UTTKind UKind,
+                               SourceLocation Loc);
+  QualType BuiltinRemoveReference(QualType BaseType, UTTKind UKind,
+                                  SourceLocation Loc);
+  QualType BuiltinChangeCVRQualifiers(QualType BaseType, UTTKind UKind,
+                                      SourceLocation Loc);
+  QualType BuiltinChangeSignedness(QualType BaseType, UTTKind UKind,
                                    SourceLocation Loc);
 
   //===--------------------------------------------------------------------===//
@@ -2371,6 +2599,8 @@ public:
                          bool IsCtorOrDtorName = false,
                          bool WantNontrivialTypeSourceInfo = false,
                          bool IsClassTemplateDeductionContext = true,
+                         ImplicitTypenameContext AllowImplicitTypename =
+                             ImplicitTypenameContext::No,
                          IdentifierInfo **CorrectedII = nullptr);
   TypeSpecifierType isTagName(IdentifierInfo &II, Scope *S);
   bool isMicrosoftMissingTypename(const CXXScopeSpec *SS, Scope *S);
@@ -2682,12 +2912,10 @@ public:
                                     LookupResult &Previous);
   NamedDecl* ActOnTypedefNameDecl(Scope* S, DeclContext* DC, TypedefNameDecl *D,
                                   LookupResult &Previous, bool &Redeclaration);
-  NamedDecl *ActOnVariableDeclarator(Scope *S, Declarator &D, DeclContext *DC,
-                                     TypeSourceInfo *TInfo,
-                                     LookupResult &Previous,
-                                     MultiTemplateParamsArg TemplateParamLists,
-                                     bool &AddToScope,
-                                     ArrayRef<BindingDecl *> Bindings = None);
+  NamedDecl *ActOnVariableDeclarator(
+      Scope *S, Declarator &D, DeclContext *DC, TypeSourceInfo *TInfo,
+      LookupResult &Previous, MultiTemplateParamsArg TemplateParamLists,
+      bool &AddToScope, ArrayRef<BindingDecl *> Bindings = std::nullopt);
   NamedDecl *
   ActOnDecompositionDeclarator(Scope *S, Declarator &D,
                                MultiTemplateParamsArg TemplateParamLists);
@@ -2726,12 +2954,13 @@ public:
   // Returns true if the function declaration is a redeclaration
   bool CheckFunctionDeclaration(Scope *S,
                                 FunctionDecl *NewFD, LookupResult &Previous,
-                                bool IsMemberSpecialization);
+                                bool IsMemberSpecialization, bool DeclIsDefn);
   bool shouldLinkDependentDeclWithPrevious(Decl *D, Decl *OldDecl);
   bool canFullyTypeCheckRedeclaration(ValueDecl *NewD, ValueDecl *OldD,
                                       QualType NewT, QualType OldT);
   void CheckMain(FunctionDecl *FD, const DeclSpec &D);
   void CheckMSVCRTEntryPoint(FunctionDecl *FD);
+  void CheckHLSLEntryPoint(FunctionDecl *FD);
   Attr *getImplicitCodeSegOrSectionAttrForFunction(const FunctionDecl *FD,
                                                    bool IsDefinition);
   void CheckFunctionOrTemplateParamDeclarator(Scope *S, Declarator &D);
@@ -2804,11 +3033,11 @@ public:
   void ActOnCXXForRangeDecl(Decl *D);
   StmtResult ActOnCXXForRangeIdentifier(Scope *S, SourceLocation IdentLoc,
                                         IdentifierInfo *Ident,
-                                        ParsedAttributes &Attrs,
-                                        SourceLocation AttrEnd);
+                                        ParsedAttributes &Attrs);
   void SetDeclDeleted(Decl *dcl, SourceLocation DelLoc);
   void SetDeclDefaulted(Decl *dcl, SourceLocation DefaultLoc);
   void CheckStaticLocalForDllExport(VarDecl *VD);
+  void CheckThreadLocalForLargeAlignment(VarDecl *VD);
   void FinalizeDeclaration(Decl *D);
   DeclGroupPtrTy FinalizeDeclaratorGroup(Scope *S, const DeclSpec &DS,
                                          ArrayRef<Decl *> Group);
@@ -2819,6 +3048,18 @@ public:
   void ActOnDocumentableDecl(Decl *D);
   void ActOnDocumentableDecls(ArrayRef<Decl *> Group);
 
+  enum class FnBodyKind {
+    /// C++ [dcl.fct.def.general]p1
+    /// function-body:
+    ///   ctor-initializer[opt] compound-statement
+    ///   function-try-block
+    Other,
+    ///   = default ;
+    Default,
+    ///   = delete ;
+    Delete
+  };
+
   void ActOnFinishKNRParamDeclarations(Scope *S, Declarator &D,
                                        SourceLocation LocAfterDecls);
   void CheckForFunctionRedefinition(
@@ -2826,9 +3067,12 @@ public:
       SkipBodyInfo *SkipBody = nullptr);
   Decl *ActOnStartOfFunctionDef(Scope *S, Declarator &D,
                                 MultiTemplateParamsArg TemplateParamLists,
-                                SkipBodyInfo *SkipBody = nullptr);
+                                SkipBodyInfo *SkipBody = nullptr,
+                                FnBodyKind BodyKind = FnBodyKind::Other);
   Decl *ActOnStartOfFunctionDef(Scope *S, Decl *D,
-                                SkipBodyInfo *SkipBody = nullptr);
+                                SkipBodyInfo *SkipBody = nullptr,
+                                FnBodyKind BodyKind = FnBodyKind::Other);
+  void SetFunctionBodyKind(Decl *D, SourceLocation Loc, FnBodyKind BodyKind);
   void ActOnStartTrailingRequiresClause(Scope *S, Declarator &D);
   ExprResult ActOnFinishTrailingRequiresClause(ExprResult ConstraintExpr);
   ExprResult ActOnRequiresClause(ExprResult ConstraintExpr);
@@ -2856,6 +3100,10 @@ public:
   /// \c constexpr in C++11 or has an 'auto' return type in C++14).
   bool canSkipFunctionBody(Decl *D);
 
+  /// Determine whether \param D is function like (function or function
+  /// template) for parsing.
+  bool isDeclaratorFunctionLike(Declarator &D);
+
   void computeNRVO(Stmt *Body, sema::FunctionScopeInfo *Scope);
   Decl *ActOnFinishFunctionBody(Decl *Decl, Stmt *Body);
   Decl *ActOnFinishFunctionBody(Decl *Decl, Stmt *Body, bool IsInstantiation);
@@ -2882,20 +3130,46 @@ public:
                               SourceLocation AsmLoc,
                               SourceLocation RParenLoc);
 
+  Decl *ActOnTopLevelStmtDecl(Stmt *Statement);
+
   /// Handle a C++11 empty-declaration and attribute-declaration.
   Decl *ActOnEmptyDeclaration(Scope *S, const ParsedAttributesView &AttrList,
                               SourceLocation SemiLoc);
 
   enum class ModuleDeclKind {
-    Interface,      ///< 'export module X;'
-    Implementation, ///< 'module X;'
+    Interface,               ///< 'export module X;'
+    Implementation,          ///< 'module X;'
+    PartitionInterface,      ///< 'export module X:Y;'
+    PartitionImplementation, ///< 'module X:Y;'
+  };
+
+  /// An enumeration to represent the transition of states in parsing module
+  /// fragments and imports.  If we are not parsing a C++20 TU, or we find
+  /// an error in state transition, the state is set to NotACXX20Module.
+  enum class ModuleImportState {
+    FirstDecl,      ///< Parsing the first decl in a TU.
+    GlobalFragment, ///< after 'module;' but before 'module X;'
+    ImportAllowed,  ///< after 'module X;' but before any non-import decl.
+    ImportFinished, ///< after any non-import decl.
+    PrivateFragmentImportAllowed,  ///< after 'module :private;' but before any
+                                   ///< non-import decl.
+    PrivateFragmentImportFinished, ///< after 'module :private;' but a
+                                   ///< non-import decl has already been seen.
+    NotACXX20Module ///< Not a C++20 TU, or an invalid state was found.
   };
 
+private:
+  /// The parser has begun a translation unit to be compiled as a C++20
+  /// Header Unit, helper for ActOnStartOfTranslationUnit() only.
+  void HandleStartOfHeaderUnit();
+
+public:
   /// The parser has processed a module-declaration that begins the definition
   /// of a module interface or implementation.
   DeclGroupPtrTy ActOnModuleDecl(SourceLocation StartLoc,
                                  SourceLocation ModuleLoc, ModuleDeclKind MDK,
-                                 ModuleIdPath Path, bool IsFirstDecl);
+                                 ModuleIdPath Path, ModuleIdPath Partition,
+                                 ModuleImportState &ImportState);
 
   /// The parser has processed a global-module-fragment declaration that begins
   /// the definition of the global module fragment of the current module unit.
@@ -2915,10 +3189,12 @@ public:
   ///        could be the location of an '@', 'export', or 'import'.
   /// \param ExportLoc The location of the 'export' keyword, if any.
   /// \param ImportLoc The location of the 'import' keyword.
-  /// \param Path The module access path.
+  /// \param Path The module toplevel name as an access path.
+  /// \param IsPartition If the name is for a partition.
   DeclResult ActOnModuleImport(SourceLocation StartLoc,
                                SourceLocation ExportLoc,
-                               SourceLocation ImportLoc, ModuleIdPath Path);
+                               SourceLocation ImportLoc, ModuleIdPath Path,
+                               bool IsPartition = false);
   DeclResult ActOnModuleImport(SourceLocation StartLoc,
                                SourceLocation ExportLoc,
                                SourceLocation ImportLoc, Module *M,
@@ -2968,8 +3244,9 @@ public:
 
   /// We've found a use of a templated declaration that would trigger an
   /// implicit instantiation. Check that any relevant explicit specializations
-  /// and partial specializations are visible, and diagnose if not.
+  /// and partial specializations are visible/reachable, and diagnose if not.
   void checkSpecializationVisibility(SourceLocation Loc, NamedDecl *Spec);
+  void checkSpecializationReachability(SourceLocation Loc, NamedDecl *Spec);
 
   /// Retrieve a suitable printing policy for diagnostics.
   PrintingPolicy getPrintingPolicy() const {
@@ -2985,8 +3262,10 @@ public:
   void ActOnTranslationUnitScope(Scope *S);
 
   Decl *ParsedFreeStandingDeclSpec(Scope *S, AccessSpecifier AS, DeclSpec &DS,
+                                   const ParsedAttributesView &DeclAttrs,
                                    RecordDecl *&AnonRecord);
   Decl *ParsedFreeStandingDeclSpec(Scope *S, AccessSpecifier AS, DeclSpec &DS,
+                                   const ParsedAttributesView &DeclAttrs,
                                    MultiTemplateParamsArg TemplateParams,
                                    bool IsExplicitInstantiation,
                                    RecordDecl *&AnonRecord);
@@ -3029,22 +3308,34 @@ public:
     TUK_Friend       // Friend declaration:  'friend struct foo;'
   };
 
-  Decl *ActOnTag(Scope *S, unsigned TagSpec, TagUseKind TUK,
-                 SourceLocation KWLoc, CXXScopeSpec &SS, IdentifierInfo *Name,
-                 SourceLocation NameLoc, const ParsedAttributesView &Attr,
-                 AccessSpecifier AS, SourceLocation ModulePrivateLoc,
-                 MultiTemplateParamsArg TemplateParameterLists, bool &OwnedDecl,
-                 bool &IsDependent, SourceLocation ScopedEnumKWLoc,
-                 bool ScopedEnumUsesClassTag, TypeResult UnderlyingType,
-                 bool IsTypeSpecifier, bool IsTemplateParamOrArg,
-                 SkipBodyInfo *SkipBody = nullptr);
-
-  Decl *ActOnTemplatedFriendTag(Scope *S, SourceLocation FriendLoc,
-                                unsigned TagSpec, SourceLocation TagLoc,
-                                CXXScopeSpec &SS, IdentifierInfo *Name,
-                                SourceLocation NameLoc,
-                                const ParsedAttributesView &Attr,
-                                MultiTemplateParamsArg TempParamLists);
+  enum OffsetOfKind {
+    // Not parsing a type within __builtin_offsetof.
+    OOK_Outside,
+    // Parsing a type within __builtin_offsetof.
+    OOK_Builtin,
+    // Parsing a type within macro "offsetof", defined in __buitin_offsetof
+    // To improve our diagnostic message.
+    OOK_Macro,
+  };
+
+  DeclResult ActOnTag(Scope *S, unsigned TagSpec, TagUseKind TUK,
+                      SourceLocation KWLoc, CXXScopeSpec &SS,
+                      IdentifierInfo *Name, SourceLocation NameLoc,
+                      const ParsedAttributesView &Attr, AccessSpecifier AS,
+                      SourceLocation ModulePrivateLoc,
+                      MultiTemplateParamsArg TemplateParameterLists,
+                      bool &OwnedDecl, bool &IsDependent,
+                      SourceLocation ScopedEnumKWLoc,
+                      bool ScopedEnumUsesClassTag, TypeResult UnderlyingType,
+                      bool IsTypeSpecifier, bool IsTemplateParamOrArg,
+                      OffsetOfKind OOK, SkipBodyInfo *SkipBody = nullptr);
+
+  DeclResult ActOnTemplatedFriendTag(Scope *S, SourceLocation FriendLoc,
+                                     unsigned TagSpec, SourceLocation TagLoc,
+                                     CXXScopeSpec &SS, IdentifierInfo *Name,
+                                     SourceLocation NameLoc,
+                                     const ParsedAttributesView &Attr,
+                                     MultiTemplateParamsArg TempParamLists);
 
   TypeResult ActOnDependentTag(Scope *S,
                                unsigned TagSpec,
@@ -3159,15 +3450,28 @@ public:
   /// Perform ODR-like check for C/ObjC when merging tag types from modules.
   /// Differently from C++, actually parse the body and reject / error out
   /// in case of a structural mismatch.
-  bool ActOnDuplicateDefinition(DeclSpec &DS, Decl *Prev,
-                                SkipBodyInfo &SkipBody);
+  bool ActOnDuplicateDefinition(Decl *Prev, SkipBodyInfo &SkipBody);
+
+  /// Check ODR hashes for C/ObjC when merging types from modules.
+  /// Differently from C++, actually parse the body and reject in case
+  /// of a mismatch.
+  template <typename T,
+            typename = std::enable_if_t<std::is_base_of<NamedDecl, T>::value>>
+  bool ActOnDuplicateODRHashDefinition(T *Duplicate, T *Previous) {
+    if (Duplicate->getODRHash() != Previous->getODRHash())
+      return false;
+
+    // Make the previous decl visible.
+    makeMergedDefinitionVisible(Previous);
+    return true;
+  }
 
   typedef void *SkippedDefinitionContext;
 
   /// Invoked when we enter a tag definition that we're skipping.
   SkippedDefinitionContext ActOnTagStartSkippedDefinition(Scope *S, Decl *TD);
 
-  Decl *ActOnObjCContainerStartDefinition(Decl *IDecl);
+  void ActOnObjCContainerStartDefinition(ObjCContainerDecl *IDecl);
 
   /// ActOnStartCXXMemberDeclarations - Invoked when we have parsed a
   /// C++ record definition's base-specifiers clause and are starting its
@@ -3191,8 +3495,8 @@ public:
   /// scope for parsing/looking-up C constructs.
   ///
   /// Must be followed by a call to \see ActOnObjCReenterContainerContext
-  void ActOnObjCTemporaryExitContainerContext(DeclContext *DC);
-  void ActOnObjCReenterContainerContext(DeclContext *DC);
+  void ActOnObjCTemporaryExitContainerContext(ObjCContainerDecl *ObjCCtx);
+  void ActOnObjCReenterContainerContext(ObjCContainerDecl *ObjCCtx);
 
   /// ActOnTagDefinitionError - Invoked when there was an unrecoverable
   /// error parsing the definition of a tag.
@@ -3239,12 +3543,14 @@ public:
   void ActOnReenterFunctionContext(Scope* S, Decl* D);
   void ActOnExitFunctionContext();
 
-  DeclContext *getFunctionLevelDeclContext();
+  /// If \p AllowLambda is true, treat lambda as function.
+  DeclContext *getFunctionLevelDeclContext(bool AllowLambda = false);
 
-  /// getCurFunctionDecl - If inside of a function body, this returns a pointer
-  /// to the function decl for the function being parsed.  If we're currently
-  /// in a 'block', this returns the containing context.
-  FunctionDecl *getCurFunctionDecl();
+  /// Returns a pointer to the innermost enclosing function, or nullptr if the
+  /// current context is not inside a function. If \p AllowLambda is true,
+  /// this can return the call operator of an enclosing lambda, otherwise
+  /// lambdas are skipped when looking for an enclosing function.
+  FunctionDecl *getCurFunctionDecl(bool AllowLambda = false);
 
   /// getCurMethodDecl - If inside of a method body, this returns a pointer to
   /// the method decl for the method being parsed.  If we're currently
@@ -3343,6 +3649,8 @@ public:
                                             const AttributeCommonInfo &CI,
                                             bool BestCase,
                                             MSInheritanceModel Model);
+  ErrorAttr *mergeErrorAttr(Decl *D, const AttributeCommonInfo &CI,
+                            StringRef NewUserDiagnostic);
   FormatAttr *mergeFormatAttr(Decl *D, const AttributeCommonInfo &CI,
                               IdentifierInfo *Format, int FormatIdx,
                               int FirstArg);
@@ -3368,13 +3676,19 @@ public:
   EnforceTCBAttr *mergeEnforceTCBAttr(Decl *D, const EnforceTCBAttr &AL);
   EnforceTCBLeafAttr *mergeEnforceTCBLeafAttr(Decl *D,
                                               const EnforceTCBLeafAttr &AL);
+  BTFDeclTagAttr *mergeBTFDeclTagAttr(Decl *D, const BTFDeclTagAttr &AL);
+  HLSLNumThreadsAttr *mergeHLSLNumThreadsAttr(Decl *D,
+                                              const AttributeCommonInfo &AL,
+                                              int X, int Y, int Z);
+  HLSLShaderAttr *mergeHLSLShaderAttr(Decl *D, const AttributeCommonInfo &AL,
+                                      HLSLShaderAttr::ShaderType ShaderType);
 
   void mergeDeclAttributes(NamedDecl *New, Decl *Old,
                            AvailabilityMergeKind AMK = AMK_Redeclaration);
   void MergeTypedefNameDecl(Scope *S, TypedefNameDecl *New,
                             LookupResult &OldDecls);
   bool MergeFunctionDecl(FunctionDecl *New, NamedDecl *&Old, Scope *S,
-                         bool MergeTypeWithOld);
+                         bool MergeTypeWithOld, bool NewDeclIsDefn);
   bool MergeCompatibleFunctionDecls(FunctionDecl *New, FunctionDecl *Old,
                                     Scope *S, bool MergeTypeWithOld);
   void mergeObjCMethodDecls(ObjCMethodDecl *New, ObjCMethodDecl *Old);
@@ -3416,11 +3730,38 @@ public:
                              FunctionDecl *New,
                              const LookupResult &OldDecls,
                              NamedDecl *&OldDecl,
-                             bool IsForUsingDecl);
-  bool IsOverload(FunctionDecl *New, FunctionDecl *Old, bool IsForUsingDecl,
-                  bool ConsiderCudaAttrs = true,
+                             bool UseMemberUsingDeclRules);
+  bool IsOverload(FunctionDecl *New, FunctionDecl *Old,
+                  bool UseMemberUsingDeclRules, bool ConsiderCudaAttrs = true,
                   bool ConsiderRequiresClauses = true);
 
+  // Calculates whether the expression Constraint depends on an enclosing
+  // template, for the purposes of [temp.friend] p9.
+  // TemplateDepth is the 'depth' of the friend function, which is used to
+  // compare whether a declaration reference is referring to a containing
+  // template, or just the current friend function. A 'lower' TemplateDepth in
+  // the AST refers to a 'containing' template. As the constraint is
+  // uninstantiated, this is relative to the 'top' of the TU.
+  bool
+  ConstraintExpressionDependsOnEnclosingTemplate(const FunctionDecl *Friend,
+                                                 unsigned TemplateDepth,
+                                                 const Expr *Constraint);
+
+  // Calculates whether the friend function depends on an enclosing template for
+  // the purposes of [temp.friend] p9.
+  bool FriendConstraintsDependOnEnclosingTemplate(const FunctionDecl *FD);
+
+  // Calculates whether two constraint expressions are equal irrespective of a
+  // difference in 'depth'. This takes a pair of optional 'NamedDecl's 'Old' and
+  // 'New', which are the "source" of the constraint, since this is necessary
+  // for figuring out the relative 'depth' of the constraint. The depth of the
+  // 'primary template' and the 'instantiated from' templates aren't necessarily
+  // the same, such as a case when one is a 'friend' defined in a class.
+  bool AreConstraintExpressionsEqual(const NamedDecl *Old,
+                                     const Expr *OldConstr,
+                                     const NamedDecl *New,
+                                     const Expr *NewConstr);
+
   enum class AllowedExplicit {
     /// Allow no explicit functions to be used.
     None,
@@ -3452,7 +3793,8 @@ public:
                                 QualType& ConvertedType);
   bool FunctionParamTypesAreEqual(const FunctionProtoType *OldType,
                                   const FunctionProtoType *NewType,
-                                  unsigned *ArgPos = nullptr);
+                                  unsigned *ArgPos = nullptr,
+                                  bool Reversed = false);
   void HandleFunctionTypeMismatch(PartialDiagnostic &PDiag,
                                   QualType FromType, QualType ToType);
 
@@ -3475,7 +3817,7 @@ public:
   bool IsFunctionConversion(QualType FromType, QualType ToType,
                             QualType &ResultTy);
   bool DiagnoseMultipleUserDefinedConversion(Expr *From, QualType ToType);
-  bool isSameOrCompatibleFunctionType(CanQualType Param, CanQualType Arg);
+  bool isSameOrCompatibleFunctionType(QualType Param, QualType Arg);
 
   bool CanPerformAggregateInitializationForOverloadResolution(
       const InitializedEntity &Entity, InitListExpr *From);
@@ -3504,11 +3846,12 @@ public:
 
   /// Contexts in which a converted constant expression is required.
   enum CCEKind {
-    CCEK_CaseValue,   ///< Expression in a case label.
-    CCEK_Enumerator,  ///< Enumerator value with fixed underlying type.
-    CCEK_TemplateArg, ///< Value of a non-type template parameter.
-    CCEK_ArrayBound,  ///< Array bound in array declarator or new-expression.
-    CCEK_ExplicitBool ///< Condition in an explicit(bool) specifier.
+    CCEK_CaseValue,    ///< Expression in a case label.
+    CCEK_Enumerator,   ///< Enumerator value with fixed underlying type.
+    CCEK_TemplateArg,  ///< Value of a non-type template parameter.
+    CCEK_ArrayBound,   ///< Array bound in array declarator or new-expression.
+    CCEK_ExplicitBool, ///< Condition in an explicit(bool) specifier.
+    CCEK_Noexcept      ///< Condition in a noexcept(bool) specifier.
   };
   ExprResult CheckConvertedConstantExpression(Expr *From, QualType T,
                                               llvm::APSInt &Value, CCEKind CCE);
@@ -3626,16 +3969,14 @@ public:
 
   using ADLCallKind = CallExpr::ADLCallKind;
 
-  void AddOverloadCandidate(FunctionDecl *Function, DeclAccessPair FoundDecl,
-                            ArrayRef<Expr *> Args,
-                            OverloadCandidateSet &CandidateSet,
-                            bool SuppressUserConversions = false,
-                            bool PartialOverloading = false,
-                            bool AllowExplicit = true,
-                            bool AllowExplicitConversion = false,
-                            ADLCallKind IsADLCandidate = ADLCallKind::NotADL,
-                            ConversionSequenceList EarlyConversions = None,
-                            OverloadCandidateParamOrder PO = {});
+  void AddOverloadCandidate(
+      FunctionDecl *Function, DeclAccessPair FoundDecl, ArrayRef<Expr *> Args,
+      OverloadCandidateSet &CandidateSet, bool SuppressUserConversions = false,
+      bool PartialOverloading = false, bool AllowExplicit = true,
+      bool AllowExplicitConversion = false,
+      ADLCallKind IsADLCandidate = ADLCallKind::NotADL,
+      ConversionSequenceList EarlyConversions = std::nullopt,
+      OverloadCandidateParamOrder PO = {});
   void AddFunctionCandidates(const UnresolvedSetImpl &Functions,
                       ArrayRef<Expr *> Args,
                       OverloadCandidateSet &CandidateSet,
@@ -3650,16 +3991,15 @@ public:
                           OverloadCandidateSet& CandidateSet,
                           bool SuppressUserConversion = false,
                           OverloadCandidateParamOrder PO = {});
-  void AddMethodCandidate(CXXMethodDecl *Method,
-                          DeclAccessPair FoundDecl,
-                          CXXRecordDecl *ActingContext, QualType ObjectType,
-                          Expr::Classification ObjectClassification,
-                          ArrayRef<Expr *> Args,
-                          OverloadCandidateSet& CandidateSet,
-                          bool SuppressUserConversions = false,
-                          bool PartialOverloading = false,
-                          ConversionSequenceList EarlyConversions = None,
-                          OverloadCandidateParamOrder PO = {});
+  void
+  AddMethodCandidate(CXXMethodDecl *Method, DeclAccessPair FoundDecl,
+                     CXXRecordDecl *ActingContext, QualType ObjectType,
+                     Expr::Classification ObjectClassification,
+                     ArrayRef<Expr *> Args, OverloadCandidateSet &CandidateSet,
+                     bool SuppressUserConversions = false,
+                     bool PartialOverloading = false,
+                     ConversionSequenceList EarlyConversions = std::nullopt,
+                     OverloadCandidateParamOrder PO = {});
   void AddMethodTemplateCandidate(FunctionTemplateDecl *MethodTmpl,
                                   DeclAccessPair FoundDecl,
                                   CXXRecordDecl *ActingContext,
@@ -3801,13 +4141,10 @@ public:
                                               DeclAccessPair *Found = nullptr);
 
   bool ResolveAndFixSingleFunctionTemplateSpecialization(
-                      ExprResult &SrcExpr,
-                      bool DoFunctionPointerConverion = false,
-                      bool Complain = false,
-                      SourceRange OpRangeForComplaining = SourceRange(),
-                      QualType DestTypeForComplaining = QualType(),
-                      unsigned DiagIDForComplaining = 0);
-
+      ExprResult &SrcExpr, bool DoFunctionPointerConversion = false,
+      bool Complain = false, SourceRange OpRangeForComplaining = SourceRange(),
+      QualType DestTypeForComplaining = QualType(),
+      unsigned DiagIDForComplaining = 0);
 
   Expr *FixOverloadedFunctionReference(Expr *E,
                                        DeclAccessPair FoundDecl,
@@ -3881,13 +4218,15 @@ public:
                                                 FunctionDecl *DefaultedFn);
 
   ExprResult CreateOverloadedArraySubscriptExpr(SourceLocation LLoc,
-                                                SourceLocation RLoc,
-                                                Expr *Base,Expr *Idx);
+                                                SourceLocation RLoc, Expr *Base,
+                                                MultiExprArg Args);
 
   ExprResult BuildCallToMemberFunction(Scope *S, Expr *MemExpr,
                                        SourceLocation LParenLoc,
                                        MultiExprArg Args,
                                        SourceLocation RParenLoc,
+                                       Expr *ExecConfig = nullptr,
+                                       bool IsExecConfig = false,
                                        bool AllowRecovery = false);
   ExprResult
   BuildCallToObjectOfClassType(Scope *S, Expr *Object, SourceLocation LParenLoc,
@@ -4111,8 +4450,8 @@ public:
                                 = NotForRedeclaration);
   bool LookupBuiltin(LookupResult &R);
   void LookupNecessaryTypesForBuiltin(Scope *S, unsigned ID);
-  bool LookupName(LookupResult &R, Scope *S,
-                  bool AllowBuiltinCreation = false);
+  bool LookupName(LookupResult &R, Scope *S, bool AllowBuiltinCreation = false,
+                  bool ForceNoCPlusPlus = false);
   bool LookupQualifiedName(LookupResult &R, DeclContext *LookupCtx,
                            bool InUnqualifiedLookup = false);
   bool LookupQualifiedName(LookupResult &R, DeclContext *LookupCtx,
@@ -4258,6 +4597,10 @@ public:
                             bool ConsiderLinkage, bool AllowInlineNamespace);
 
   bool CheckRedeclarationModuleOwnership(NamedDecl *New, NamedDecl *Old);
+  bool CheckRedeclarationExported(NamedDecl *New, NamedDecl *Old);
+  bool CheckRedeclarationInModule(NamedDecl *New, NamedDecl *Old);
+  bool IsRedefinitionInModule(const NamedDecl *New,
+                                 const NamedDecl *Old) const;
 
   void DiagnoseAmbiguousLookup(LookupResult &Result);
   //@}
@@ -4289,8 +4632,38 @@ public:
   // Helper for delayed processing of attributes.
   void ProcessDeclAttributeDelayed(Decl *D,
                                    const ParsedAttributesView &AttrList);
-  void ProcessDeclAttributeList(Scope *S, Decl *D, const ParsedAttributesView &AL,
-                             bool IncludeCXX11Attributes = true);
+
+  // Options for ProcessDeclAttributeList().
+  struct ProcessDeclAttributeOptions {
+    ProcessDeclAttributeOptions()
+        : IncludeCXX11Attributes(true), IgnoreTypeAttributes(false) {}
+
+    ProcessDeclAttributeOptions WithIncludeCXX11Attributes(bool Val) {
+      ProcessDeclAttributeOptions Result = *this;
+      Result.IncludeCXX11Attributes = Val;
+      return Result;
+    }
+
+    ProcessDeclAttributeOptions WithIgnoreTypeAttributes(bool Val) {
+      ProcessDeclAttributeOptions Result = *this;
+      Result.IgnoreTypeAttributes = Val;
+      return Result;
+    }
+
+    // Should C++11 attributes be processed?
+    bool IncludeCXX11Attributes;
+
+    // Should any type attributes encountered be ignored?
+    // If this option is false, a diagnostic will be emitted for any type
+    // attributes of a kind that does not "slide" from the declaration to
+    // the decl-specifier-seq.
+    bool IgnoreTypeAttributes;
+  };
+
+  void ProcessDeclAttributeList(Scope *S, Decl *D,
+                                const ParsedAttributesView &AttrList,
+                                const ProcessDeclAttributeOptions &Options =
+                                    ProcessDeclAttributeOptions());
   bool ProcessAccessDeclAttributeList(AccessSpecDecl *ASDecl,
                                    const ParsedAttributesView &AttrList);
 
@@ -4300,8 +4673,10 @@ public:
   /// such as checking whether a parameter was properly specified, or the
   /// correct number of arguments were passed, etc. Returns true if the
   /// attribute has been diagnosed.
-  bool checkCommonAttributeFeatures(const Decl *D, const ParsedAttr &A);
-  bool checkCommonAttributeFeatures(const Stmt *S, const ParsedAttr &A);
+  bool checkCommonAttributeFeatures(const Decl *D, const ParsedAttr &A,
+                                    bool SkipArgCountCheck = false);
+  bool checkCommonAttributeFeatures(const Stmt *S, const ParsedAttr &A,
+                                    bool SkipArgCountCheck = false);
 
   /// Determine if type T is a valid subject for a nonnull and similar
   /// attributes. By default, we look through references (the behavior used by
@@ -4314,12 +4689,22 @@ public:
                             const FunctionDecl *FD = nullptr);
   bool CheckAttrTarget(const ParsedAttr &CurrAttr);
   bool CheckAttrNoArgs(const ParsedAttr &CurrAttr);
+  bool checkStringLiteralArgumentAttr(const AttributeCommonInfo &CI,
+                                      const Expr *E, StringRef &Str,
+                                      SourceLocation *ArgLocation = nullptr);
   bool checkStringLiteralArgumentAttr(const ParsedAttr &Attr, unsigned ArgNum,
                                       StringRef &Str,
                                       SourceLocation *ArgLocation = nullptr);
   llvm::Error isValidSectionSpecifier(StringRef Str);
   bool checkSectionName(SourceLocation LiteralLoc, StringRef Str);
   bool checkTargetAttr(SourceLocation LiteralLoc, StringRef Str);
+  bool checkTargetVersionAttr(SourceLocation LiteralLoc, StringRef &Str,
+                              bool &isDefault);
+  bool
+  checkTargetClonesAttrString(SourceLocation LiteralLoc, StringRef Str,
+                              const StringLiteral *Literal, bool &HasDefault,
+                              bool &HasCommas, bool &HasNotDefault,
+                              SmallVectorImpl<SmallString<64>> &StringsBuffer);
   bool checkMSInheritanceAttrOnDefinition(
       CXXRecordDecl *RD, SourceRange Range, bool BestCase,
       MSInheritanceModel SemanticSpelling);
@@ -4343,8 +4728,7 @@ public:
 
   /// Process the attributes before creating an attributed statement. Returns
   /// the semantic attributes that have been processed.
-  void ProcessStmtAttributes(Stmt *Stmt,
-                             const ParsedAttributesWithRange &InAttrs,
+  void ProcessStmtAttributes(Stmt *Stmt, const ParsedAttributes &InAttrs,
                              SmallVectorImpl<const Attr *> &OutAttrs);
 
   void WarnConflictingTypedMethods(ObjCMethodDecl *Method,
@@ -4686,15 +5070,16 @@ public:
 
   StmtResult BuildAttributedStmt(SourceLocation AttrsLoc,
                                  ArrayRef<const Attr *> Attrs, Stmt *SubStmt);
-  StmtResult ActOnAttributedStmt(const ParsedAttributesWithRange &AttrList,
+  StmtResult ActOnAttributedStmt(const ParsedAttributes &AttrList,
                                  Stmt *SubStmt);
 
   class ConditionResult;
-  StmtResult ActOnIfStmt(SourceLocation IfLoc, bool IsConstexpr,
+
+  StmtResult ActOnIfStmt(SourceLocation IfLoc, IfStatementKind StatementKind,
                          SourceLocation LParenLoc, Stmt *InitStmt,
                          ConditionResult Cond, SourceLocation RParenLoc,
                          Stmt *ThenVal, SourceLocation ElseLoc, Stmt *ElseVal);
-  StmtResult BuildIfStmt(SourceLocation IfLoc, bool IsConstexpr,
+  StmtResult BuildIfStmt(SourceLocation IfLoc, IfStatementKind StatementKind,
                          SourceLocation LParenLoc, Stmt *InitStmt,
                          ConditionResult Cond, SourceLocation RParenLoc,
                          Stmt *ThenVal, SourceLocation ElseLoc, Stmt *ElseVal);
@@ -4799,7 +5184,8 @@ public:
 
   StmtResult ActOnReturnStmt(SourceLocation ReturnLoc, Expr *RetValExp,
                              Scope *CurScope);
-  StmtResult BuildReturnStmt(SourceLocation ReturnLoc, Expr *RetValExp);
+  StmtResult BuildReturnStmt(SourceLocation ReturnLoc, Expr *RetValExp,
+                             bool AllowRecovery = false);
   StmtResult ActOnCapScopeReturnStmt(SourceLocation ReturnLoc, Expr *RetValExp,
                                      NamedReturnInfo &NRInfo,
                                      bool SupressSimplerImplicitMoves);
@@ -4891,15 +5277,21 @@ public:
   /// of it.
   void MarkUnusedFileScopedDecl(const DeclaratorDecl *D);
 
+  typedef llvm::function_ref<void(SourceLocation Loc, PartialDiagnostic PD)>
+      DiagReceiverTy;
+
   /// DiagnoseUnusedExprResult - If the statement passed in is an expression
   /// whose result is unused, warn.
-  void DiagnoseUnusedExprResult(const Stmt *S);
+  void DiagnoseUnusedExprResult(const Stmt *S, unsigned DiagID);
   void DiagnoseUnusedNestedTypedefs(const RecordDecl *D);
+  void DiagnoseUnusedNestedTypedefs(const RecordDecl *D,
+                                    DiagReceiverTy DiagReceiver);
   void DiagnoseUnusedDecl(const NamedDecl *ND);
+  void DiagnoseUnusedDecl(const NamedDecl *ND, DiagReceiverTy DiagReceiver);
 
   /// If VD is set but not otherwise used, diagnose, for a parameter or a
   /// variable.
-  void DiagnoseUnusedButSetDecl(const VarDecl *VD);
+  void DiagnoseUnusedButSetDecl(const VarDecl *VD, DiagReceiverTy DiagReceiver);
 
   /// Emit \p DiagID if statement located on \p StmtLoc has a suspicious null
   /// statement as a \p Body, and it is located on the same line.
@@ -4920,6 +5312,11 @@ public:
   void DiagnoseSelfMove(const Expr *LHSExpr, const Expr *RHSExpr,
                         SourceLocation OpLoc);
 
+  /// Returns a field in a CXXRecordDecl that has the same name as the decl \p
+  /// SelfAssigned when inside a CXXMethodDecl.
+  const FieldDecl *
+  getSelfAssignmentClassMemberCandidate(const ValueDecl *SelfAssigned);
+
   /// Warn if we're implicitly casting from a _Nullable pointer type to a
   /// _Nonnull one.
   void diagnoseNullableToNonnullConversion(QualType DstType, QualType SrcType,
@@ -4963,11 +5360,22 @@ public:
   // Expression Parsing Callbacks: SemaExpr.cpp.
 
   bool CanUseDecl(NamedDecl *D, bool TreatUnavailableAsInvalid);
+  // A version of DiagnoseUseOfDecl that should be used if overload resolution
+  // has been used to find this declaration, which means we don't have to bother
+  // checking the trailing requires clause.
+  bool DiagnoseUseOfOverloadedDecl(NamedDecl *D, SourceLocation Loc) {
+    return DiagnoseUseOfDecl(
+        D, Loc, /*UnknownObjCClass=*/nullptr, /*ObjCPropertyAccess=*/false,
+        /*AvoidPartialAvailabilityChecks=*/false, /*ClassReceiver=*/nullptr,
+        /*SkipTrailingRequiresClause=*/true);
+  }
+
   bool DiagnoseUseOfDecl(NamedDecl *D, ArrayRef<SourceLocation> Locs,
                          const ObjCInterfaceDecl *UnknownObjCClass = nullptr,
                          bool ObjCPropertyAccess = false,
                          bool AvoidPartialAvailabilityChecks = false,
-                         ObjCInterfaceDecl *ClassReciever = nullptr);
+                         ObjCInterfaceDecl *ClassReciever = nullptr,
+                         bool SkipTrailingRequiresClause = false);
   void NoteDeletedFunction(FunctionDecl *FD);
   void NoteDeletedInheritingConstructor(CXXConstructorDecl *CD);
   bool DiagnosePropertyAccessorMismatch(ObjCPropertyDecl *PD,
@@ -4990,6 +5398,7 @@ public:
   void DiscardCleanupsInEvaluationContext();
 
   ExprResult TransformToPotentiallyEvaluated(Expr *E);
+  TypeSourceInfo *TransformToPotentiallyEvaluated(TypeSourceInfo *TInfo);
   ExprResult HandleExprEvaluationContextForTypeof(Expr *E);
 
   ExprResult CheckUnevaluatedOperand(Expr *E);
@@ -5016,7 +5425,7 @@ public:
   void MarkDeclRefReferenced(DeclRefExpr *E, const Expr *Base = nullptr);
   void MarkMemberReferenced(MemberExpr *E);
   void MarkFunctionParmPackReferenced(FunctionParmPackExpr *E);
-  void MarkCaptureUsedInEnclosingContext(VarDecl *Capture, SourceLocation Loc,
+  void MarkCaptureUsedInEnclosingContext(ValueDecl *Capture, SourceLocation Loc,
                                          unsigned CapturingScopeIndex);
 
   ExprResult CheckLValueToRValueConversionOperand(Expr *E);
@@ -5059,30 +5468,31 @@ public:
   ///
   /// \returns true if an error occurred (i.e., the variable cannot be
   /// captured) and false if the capture succeeded.
-  bool tryCaptureVariable(VarDecl *Var, SourceLocation Loc, TryCaptureKind Kind,
-                          SourceLocation EllipsisLoc, bool BuildAndDiagnose,
-                          QualType &CaptureType,
+  bool tryCaptureVariable(ValueDecl *Var, SourceLocation Loc,
+                          TryCaptureKind Kind, SourceLocation EllipsisLoc,
+                          bool BuildAndDiagnose, QualType &CaptureType,
                           QualType &DeclRefType,
                           const unsigned *const FunctionScopeIndexToStopAt);
 
   /// Try to capture the given variable.
-  bool tryCaptureVariable(VarDecl *Var, SourceLocation Loc,
+  bool tryCaptureVariable(ValueDecl *Var, SourceLocation Loc,
                           TryCaptureKind Kind = TryCapture_Implicit,
                           SourceLocation EllipsisLoc = SourceLocation());
 
   /// Checks if the variable must be captured.
-  bool NeedToCaptureVariable(VarDecl *Var, SourceLocation Loc);
+  bool NeedToCaptureVariable(ValueDecl *Var, SourceLocation Loc);
 
   /// Given a variable, determine the type that a reference to that
   /// variable will have in the given scope.
-  QualType getCapturedDeclRefType(VarDecl *Var, SourceLocation Loc);
+  QualType getCapturedDeclRefType(ValueDecl *Var, SourceLocation Loc);
 
   /// Mark all of the declarations referenced within a particular AST node as
   /// referenced. Used when template instantiation instantiates a non-dependent
   /// type -- entities referenced by the type are now referenced.
   void MarkDeclarationsReferencedInType(SourceLocation Loc, QualType T);
-  void MarkDeclarationsReferencedInExpr(Expr *E,
-                                        bool SkipLocalVariables = false);
+  void MarkDeclarationsReferencedInExpr(
+      Expr *E, bool SkipLocalVariables = false,
+      ArrayRef<const Expr *> StopAt = std::nullopt);
 
   /// Try to recover by turning the given expression into a
   /// call.  Returns true if recovery was attempted or an error was
@@ -5099,6 +5509,16 @@ public:
   /// conversion.
   ExprResult tryConvertExprToType(Expr *E, QualType Ty);
 
+  /// Conditionally issue a diagnostic based on the statements's reachability
+  /// analysis.
+  ///
+  /// \param Stmts If Stmts is non-empty, delay reporting the diagnostic until
+  /// the function body is parsed, and then do a basic reachability analysis to
+  /// determine if the statement is reachable. If it is unreachable, the
+  /// diagnostic will not be emitted.
+  bool DiagIfReachable(SourceLocation Loc, ArrayRef<const Stmt *> Stmts,
+                       const PartialDiagnostic &PD);
+
   /// Conditionally issue a diagnostic based on the current
   /// evaluation context.
   ///
@@ -5133,7 +5553,8 @@ public:
   DiagnoseEmptyLookup(Scope *S, CXXScopeSpec &SS, LookupResult &R,
                       CorrectionCandidateCallback &CCC,
                       TemplateArgumentListInfo *ExplicitTemplateArgs = nullptr,
-                      ArrayRef<Expr *> Args = None, TypoExpr **Out = nullptr);
+                      ArrayRef<Expr *> Args = std::nullopt,
+                      TypoExpr **Out = nullptr);
 
   DeclResult LookupIvarInObjCMethod(LookupResult &Lookup, Scope *S,
                                     IdentifierInfo *II);
@@ -5265,15 +5686,17 @@ public:
 
   // Binary/Unary Operators.  'Tok' is the token for the operator.
   ExprResult CreateBuiltinUnaryOp(SourceLocation OpLoc, UnaryOperatorKind Opc,
-                                  Expr *InputExpr);
-  ExprResult BuildUnaryOp(Scope *S, SourceLocation OpLoc,
-                          UnaryOperatorKind Opc, Expr *Input);
-  ExprResult ActOnUnaryOp(Scope *S, SourceLocation OpLoc,
-                          tok::TokenKind Op, Expr *Input);
+                                  Expr *InputExpr, bool IsAfterAmp = false);
+  ExprResult BuildUnaryOp(Scope *S, SourceLocation OpLoc, UnaryOperatorKind Opc,
+                          Expr *Input, bool IsAfterAmp = false);
+  ExprResult ActOnUnaryOp(Scope *S, SourceLocation OpLoc, tok::TokenKind Op,
+                          Expr *Input, bool IsAfterAmp = false);
 
   bool isQualifiedMemberAccess(Expr *E);
   QualType CheckAddressOfOperand(ExprResult &Operand, SourceLocation OpLoc);
 
+  bool CheckTypeTraitArity(unsigned Arity, SourceLocation Loc, size_t N);
+
   ExprResult CreateUnaryExprOrTypeTraitExpr(TypeSourceInfo *TInfo,
                                             SourceLocation OpLoc,
                                             UnaryExprOrTypeTrait ExprKind,
@@ -5302,7 +5725,8 @@ public:
                                  tok::TokenKind Kind, Expr *Input);
 
   ExprResult ActOnArraySubscriptExpr(Scope *S, Expr *Base, SourceLocation LLoc,
-                                     Expr *Idx, SourceLocation RLoc);
+                                     MultiExprArg ArgExprs,
+                                     SourceLocation RLoc);
   ExprResult CreateBuiltinArraySubscriptExpr(Expr *Base, SourceLocation LLoc,
                                              Expr *Idx, SourceLocation RLoc);
 
@@ -5557,14 +5981,15 @@ public:
                             TypeSourceInfo *TInfo, SourceLocation RPLoc);
 
   // __builtin_LINE(), __builtin_FUNCTION(), __builtin_FILE(),
-  // __builtin_COLUMN()
+  // __builtin_COLUMN(), __builtin_source_location()
   ExprResult ActOnSourceLocExpr(SourceLocExpr::IdentKind Kind,
                                 SourceLocation BuiltinLoc,
                                 SourceLocation RPLoc);
 
   // Build a potentially resolved SourceLocExpr.
   ExprResult BuildSourceLocExpr(SourceLocExpr::IdentKind Kind,
-                                SourceLocation BuiltinLoc, SourceLocation RPLoc,
+                                QualType ResultTy, SourceLocation BuiltinLoc,
+                                SourceLocation RPLoc,
                                 DeclContext *ParentContext);
 
   // __null
@@ -5644,6 +6069,12 @@ public:
                              SourceLocation BuiltinLoc,
                              SourceLocation RParenLoc);
 
+  //===---------------------------- HLSL Features -------------------------===//
+  Decl *ActOnStartHLSLBuffer(Scope *BufferScope, bool CBuffer,
+                             SourceLocation KwLoc, IdentifierInfo *Ident,
+                             SourceLocation IdentLoc, SourceLocation LBrace);
+  void ActOnFinishHLSLBuffer(Decl *Dcl, SourceLocation RBrace);
+
   //===---------------------------- C++ Features --------------------------===//
 
   // Act on C++ namespaces
@@ -5652,13 +6083,14 @@ public:
                                SourceLocation IdentLoc, IdentifierInfo *Ident,
                                SourceLocation LBrace,
                                const ParsedAttributesView &AttrList,
-                               UsingDirectiveDecl *&UsingDecl);
+                               UsingDirectiveDecl *&UsingDecl, bool IsNested);
   void ActOnFinishNamespaceDef(Decl *Dcl, SourceLocation RBrace);
 
   NamespaceDecl *getStdNamespace() const;
   NamespaceDecl *getOrCreateStdNamespace();
 
   NamespaceDecl *lookupStdExperimentalNamespace();
+  NamespaceDecl *getCachedCoroNamespace() { return CoroTraitsNamespaceCache; }
 
   CXXRecordDecl *getStdBadAlloc() const;
   EnumDecl *getStdAlignValT() const;
@@ -5755,7 +6187,8 @@ public:
   NamedDecl *BuildUsingEnumDeclaration(Scope *S, AccessSpecifier AS,
                                        SourceLocation UsingLoc,
                                        SourceLocation EnumLoc,
-                                       SourceLocation NameLoc, EnumDecl *ED);
+                                       SourceLocation NameLoc,
+                                       TypeSourceInfo *EnumType, EnumDecl *ED);
   NamedDecl *BuildUsingPackDecl(NamedDecl *InstantiatedFrom,
                                 ArrayRef<NamedDecl *> Expansions);
 
@@ -5775,7 +6208,9 @@ public:
                               const ParsedAttributesView &AttrList);
   Decl *ActOnUsingEnumDeclaration(Scope *CurScope, AccessSpecifier AS,
                                   SourceLocation UsingLoc,
-                                  SourceLocation EnumLoc, const DeclSpec &);
+                                  SourceLocation EnumLoc,
+                                  SourceLocation IdentLoc, IdentifierInfo &II,
+                                  CXXScopeSpec *SS = nullptr);
   Decl *ActOnAliasDeclaration(Scope *CurScope, AccessSpecifier AS,
                               MultiTemplateParamsArg TemplateParams,
                               SourceLocation UsingLoc, UnqualifiedId &Name,
@@ -5817,19 +6252,22 @@ public:
                         bool IsStdInitListInitialization, bool RequiresZeroInit,
                         unsigned ConstructKind, SourceRange ParenRange);
 
+  ExprResult ConvertMemberDefaultInitExpression(FieldDecl *FD, Expr *InitExpr,
+                                                SourceLocation InitLoc);
+
   ExprResult BuildCXXDefaultInitExpr(SourceLocation Loc, FieldDecl *Field);
 
 
   /// Instantiate or parse a C++ default argument expression as necessary.
   /// Return true on error.
   bool CheckCXXDefaultArgExpr(SourceLocation CallLoc, FunctionDecl *FD,
-                              ParmVarDecl *Param);
+                              ParmVarDecl *Param, Expr *Init = nullptr,
+                              bool SkipImmediateInvocations = true);
 
   /// BuildCXXDefaultArgExpr - Creates a CXXDefaultArgExpr, instantiating
   /// the default expr if needed.
-  ExprResult BuildCXXDefaultArgExpr(SourceLocation CallLoc,
-                                    FunctionDecl *FD,
-                                    ParmVarDecl *Param);
+  ExprResult BuildCXXDefaultArgExpr(SourceLocation CallLoc, FunctionDecl *FD,
+                                    ParmVarDecl *Param, Expr *Init = nullptr);
 
   /// FinalizeVarWithDestructor - Prepare for calling destructor on the
   /// constructed variable.
@@ -5909,7 +6347,7 @@ public:
 
   /// Check the given noexcept-specifier, convert its expression, and compute
   /// the appropriate ExceptionSpecificationType.
-  ExprResult ActOnNoexceptSpec(SourceLocation NoexceptLoc, Expr *NoexceptExpr,
+  ExprResult ActOnNoexceptSpec(Expr *NoexceptExpr,
                                ExceptionSpecificationType &EST);
 
   /// Check the given exception-specification and update the
@@ -6105,6 +6543,13 @@ public:
   // AltiVecPixel and AltiVecBool when -faltivec-src-compat=xl is specified.
   bool ShouldSplatAltivecScalarInCast(const VectorType *VecTy);
 
+  // Checks if the -faltivec-src-compat=gcc option is specified.
+  // If so, AltiVecVector, AltiVecBool and AltiVecPixel types are
+  // treated the same way as they are when trying to initialize
+  // these vectors on gcc (an error is emitted).
+  bool CheckAltivecInitFromScalar(SourceRange R, QualType VecTy,
+                                  QualType SrcTy);
+
   /// ActOnCXXNamedCast - Parse
   /// {dynamic,static,reinterpret,const,addrspace}_cast's.
   ExprResult ActOnCXXNamedCast(SourceLocation OpLoc,
@@ -6170,7 +6615,7 @@ public:
                               BinaryOperatorKind Operator,
                               SourceLocation EllipsisLoc, Expr *RHS,
                               SourceLocation RParenLoc,
-                              Optional<unsigned> NumExpansions);
+                              std::optional<unsigned> NumExpansions);
   ExprResult BuildEmptyCXXFoldExpr(SourceLocation EllipsisLoc,
                                    BinaryOperatorKind Operator);
 
@@ -6277,16 +6722,12 @@ public:
                          SourceLocation PlacementRParen,
                          SourceRange TypeIdParens, Declarator &D,
                          Expr *Initializer);
-  ExprResult BuildCXXNew(SourceRange Range, bool UseGlobal,
-                         SourceLocation PlacementLParen,
-                         MultiExprArg PlacementArgs,
-                         SourceLocation PlacementRParen,
-                         SourceRange TypeIdParens,
-                         QualType AllocType,
-                         TypeSourceInfo *AllocTypeInfo,
-                         Optional<Expr *> ArraySize,
-                         SourceRange DirectInitRange,
-                         Expr *Initializer);
+  ExprResult
+  BuildCXXNew(SourceRange Range, bool UseGlobal, SourceLocation PlacementLParen,
+              MultiExprArg PlacementArgs, SourceLocation PlacementRParen,
+              SourceRange TypeIdParens, QualType AllocType,
+              TypeSourceInfo *AllocTypeInfo, std::optional<Expr *> ArraySize,
+              SourceRange DirectInitRange, Expr *Initializer);
 
   /// Determine whether \p FD is an aligned allocation or deallocation
   /// function that is unavailable.
@@ -6327,8 +6768,9 @@ public:
                                        ArrayRef<QualType> Params);
 
   bool FindDeallocationFunction(SourceLocation StartLoc, CXXRecordDecl *RD,
-                                DeclarationName Name, FunctionDecl* &Operator,
-                                bool Diagnose = true);
+                                DeclarationName Name, FunctionDecl *&Operator,
+                                bool Diagnose = true, bool WantSize = false,
+                                bool WantAligned = false);
   FunctionDecl *FindUsualDeallocationFunction(SourceLocation StartLoc,
                                               bool CanProvideSize,
                                               bool Overaligned,
@@ -6431,7 +6873,8 @@ public:
         Expr, Expr ? Expr->getExprLoc() : SourceLocation(), DiscardedValue);
   }
   ExprResult ActOnFinishFullExpr(Expr *Expr, SourceLocation CC,
-                                 bool DiscardedValue, bool IsConstexpr = false);
+                                 bool DiscardedValue, bool IsConstexpr = false,
+                                 bool IsTemplateArgument = false);
   StmtResult ActOnFinishFullStmt(Stmt *Stmt);
 
   // Marks SS invalid if it represents an incomplete type.
@@ -6530,9 +6973,6 @@ public:
   /// output parameter (containing the full nested-name-specifier,
   /// including this new type).
   ///
-  /// \param ErrorRecoveryLookup If true, then this method is called to improve
-  /// error recovery. In this case do not emit error message.
-  ///
   /// \param IsCorrectedToColon If not null, suggestions to replace '::' -> ':'
   /// are allowed.  The bool value pointed by this parameter is set to 'true'
   /// if the identifier is treated as if it was followed by ':', not '::'.
@@ -6544,7 +6984,6 @@ public:
                                    NestedNameSpecInfo &IdInfo,
                                    bool EnteringContext,
                                    CXXScopeSpec &SS,
-                                   bool ErrorRecoveryLookup = false,
                                    bool *IsCorrectedToColon = nullptr,
                                    bool OnlyNamespace = false);
 
@@ -6647,22 +7086,22 @@ public:
   /// Create a new lambda closure type.
   CXXRecordDecl *createLambdaClosureType(SourceRange IntroducerRange,
                                          TypeSourceInfo *Info,
-                                         bool KnownDependent,
+                                         unsigned LambdaDependencyKind,
                                          LambdaCaptureDefault CaptureDefault);
 
   /// Start the definition of a lambda expression.
-  CXXMethodDecl *startLambdaDefinition(CXXRecordDecl *Class,
-                                       SourceRange IntroducerRange,
-                                       TypeSourceInfo *MethodType,
-                                       SourceLocation EndLoc,
-                                       ArrayRef<ParmVarDecl *> Params,
-                                       ConstexprSpecKind ConstexprKind,
-                                       Expr *TrailingRequiresClause);
+  CXXMethodDecl *
+  startLambdaDefinition(CXXRecordDecl *Class, SourceRange IntroducerRange,
+                        TypeSourceInfo *MethodType, SourceLocation EndLoc,
+                        ArrayRef<ParmVarDecl *> Params,
+                        ConstexprSpecKind ConstexprKind, StorageClass SC,
+                        Expr *TrailingRequiresClause);
 
   /// Number lambda for linkage purposes if necessary.
   void handleLambdaNumbering(
       CXXRecordDecl *Class, CXXMethodDecl *Method,
-      Optional<std::tuple<bool, unsigned, unsigned, Decl *>> Mangling = None);
+      std::optional<std::tuple<bool, unsigned, unsigned, Decl *>> Mangling =
+          std::nullopt);
 
   /// Endow the lambda scope info with the relevant properties.
   void buildLambdaScope(sema::LambdaScopeInfo *LSI,
@@ -6681,13 +7120,13 @@ public:
       SourceLocation Loc, bool ByRef, SourceLocation EllipsisLoc,
       IdentifierInfo *Id, LambdaCaptureInitKind InitKind, Expr *&Init) {
     return ParsedType::make(buildLambdaInitCaptureInitialization(
-        Loc, ByRef, EllipsisLoc, None, Id,
+        Loc, ByRef, EllipsisLoc, std::nullopt, Id,
         InitKind != LambdaCaptureInitKind::CopyInit, Init));
   }
   QualType buildLambdaInitCaptureInitialization(
       SourceLocation Loc, bool ByRef, SourceLocation EllipsisLoc,
-      Optional<unsigned> NumExpansions, IdentifierInfo *Id, bool DirectInit,
-      Expr *&Init);
+      std::optional<unsigned> NumExpansions, IdentifierInfo *Id,
+      bool DirectInit, Expr *&Init);
 
   /// Create a dummy variable within the declcontext of the lambda's
   ///  call operator, for name lookup purposes for a lambda init capture.
@@ -6701,7 +7140,8 @@ public:
                                           unsigned InitStyle, Expr *Init);
 
   /// Add an init-capture to a lambda scope.
-  void addInitCapture(sema::LambdaScopeInfo *LSI, VarDecl *Var);
+  void addInitCapture(sema::LambdaScopeInfo *LSI, VarDecl *Var,
+                      bool isReferenceType);
 
   /// Note that we have finished the explicit captures for the
   /// given lambda.
@@ -6815,7 +7255,76 @@ private:
   llvm::ContextualFoldingSet<ConstraintSatisfaction, const ASTContext &>
       SatisfactionCache;
 
+  /// Introduce the instantiated function parameters into the local
+  /// instantiation scope, and set the parameter names to those used
+  /// in the template.
+  bool addInstantiatedParametersToScope(
+      FunctionDecl *Function, const FunctionDecl *PatternDecl,
+      LocalInstantiationScope &Scope,
+      const MultiLevelTemplateArgumentList &TemplateArgs);
+
+  /// used by SetupConstraintCheckingTemplateArgumentsAndScope to recursively(in
+  /// the case of lambdas) set up the LocalInstantiationScope of the current
+  /// function.
+  bool SetupConstraintScope(
+      FunctionDecl *FD, std::optional<ArrayRef<TemplateArgument>> TemplateArgs,
+      MultiLevelTemplateArgumentList MLTAL, LocalInstantiationScope &Scope);
+
+  /// Used during constraint checking, sets up the constraint template argument
+  /// lists, and calls SetupConstraintScope to set up the
+  /// LocalInstantiationScope to have the proper set of ParVarDecls configured.
+  std::optional<MultiLevelTemplateArgumentList>
+  SetupConstraintCheckingTemplateArgumentsAndScope(
+      FunctionDecl *FD, std::optional<ArrayRef<TemplateArgument>> TemplateArgs,
+      LocalInstantiationScope &Scope);
+
+private:
+  // The current stack of constraint satisfactions, so we can exit-early.
+  using SatisfactionStackEntryTy =
+      std::pair<const NamedDecl *, llvm::FoldingSetNodeID>;
+  llvm::SmallVector<SatisfactionStackEntryTy, 10>
+      SatisfactionStack;
+
 public:
+  void PushSatisfactionStackEntry(const NamedDecl *D,
+                                  const llvm::FoldingSetNodeID &ID) {
+    const NamedDecl *Can = cast<NamedDecl>(D->getCanonicalDecl());
+    SatisfactionStack.emplace_back(Can, ID);
+  }
+
+  void PopSatisfactionStackEntry() { SatisfactionStack.pop_back(); }
+
+  bool SatisfactionStackContains(const NamedDecl *D,
+                                 const llvm::FoldingSetNodeID &ID) const {
+    const NamedDecl *Can = cast<NamedDecl>(D->getCanonicalDecl());
+    return llvm::find(SatisfactionStack,
+                      SatisfactionStackEntryTy{Can, ID}) !=
+           SatisfactionStack.end();
+  }
+
+  // Resets the current SatisfactionStack for cases where we are instantiating
+  // constraints as a 'side effect' of normal instantiation in a way that is not
+  // indicative of recursive definition.
+  class SatisfactionStackResetRAII {
+    llvm::SmallVector<SatisfactionStackEntryTy, 10>
+        BackupSatisfactionStack;
+    Sema &SemaRef;
+
+  public:
+    SatisfactionStackResetRAII(Sema &S) : SemaRef(S) {
+      SemaRef.SwapSatisfactionStack(BackupSatisfactionStack);
+    }
+
+    ~SatisfactionStackResetRAII() {
+      SemaRef.SwapSatisfactionStack(BackupSatisfactionStack);
+    }
+  };
+
+  void SwapSatisfactionStack(
+      llvm::SmallVectorImpl<SatisfactionStackEntryTy> &NewSS) {
+    SatisfactionStack.swap(NewSS);
+  }
+
   const NormalizedConstraint *
   getNormalizedAssociatedConstraints(
       NamedDecl *ConstrainedDecl, ArrayRef<const Expr *> AssociatedConstraints);
@@ -6828,8 +7337,8 @@ public:
   /// at least constrained than D2, and false otherwise.
   ///
   /// \returns true if an error occurred, false otherwise.
-  bool IsAtLeastAsConstrained(NamedDecl *D1, ArrayRef<const Expr *> AC1,
-                              NamedDecl *D2, ArrayRef<const Expr *> AC2,
+  bool IsAtLeastAsConstrained(NamedDecl *D1, MutableArrayRef<const Expr *> AC1,
+                              NamedDecl *D2, MutableArrayRef<const Expr *> AC2,
                               bool &Result);
 
   /// If D1 was not at least as constrained as D2, but would've been if a pair
@@ -6845,8 +7354,8 @@ public:
   /// check (either a concept or a constrained entity).
   /// \param ConstraintExprs a list of constraint expressions, treated as if
   /// they were 'AND'ed together.
-  /// \param TemplateArgs the list of template arguments to substitute into the
-  /// constraint expression.
+  /// \param TemplateArgLists the list of template arguments to substitute into
+  /// the constraint expression.
   /// \param TemplateIDRange The source range of the template id that
   /// caused the constraints check.
   /// \param Satisfaction if true is returned, will contain details of the
@@ -6856,13 +7365,46 @@ public:
   /// false otherwise.
   bool CheckConstraintSatisfaction(
       const NamedDecl *Template, ArrayRef<const Expr *> ConstraintExprs,
-      ArrayRef<TemplateArgument> TemplateArgs,
+      const MultiLevelTemplateArgumentList &TemplateArgLists,
+      SourceRange TemplateIDRange, ConstraintSatisfaction &Satisfaction) {
+    llvm::SmallVector<Expr *, 4> Converted;
+    return CheckConstraintSatisfaction(Template, ConstraintExprs, Converted,
+                                       TemplateArgLists, TemplateIDRange,
+                                       Satisfaction);
+  }
+
+  /// \brief Check whether the given list of constraint expressions are
+  /// satisfied (as if in a 'conjunction') given template arguments.
+  /// Additionally, takes an empty list of Expressions which is populated with
+  /// the instantiated versions of the ConstraintExprs.
+  /// \param Template the template-like entity that triggered the constraints
+  /// check (either a concept or a constrained entity).
+  /// \param ConstraintExprs a list of constraint expressions, treated as if
+  /// they were 'AND'ed together.
+  /// \param ConvertedConstraints a out parameter that will get populated with
+  /// the instantiated version of the ConstraintExprs if we successfully checked
+  /// satisfaction.
+  /// \param TemplateArgList the multi-level list of template arguments to
+  /// substitute into the constraint expression. This should be relative to the
+  /// top-level (hence multi-level), since we need to instantiate fully at the
+  /// time of checking.
+  /// \param TemplateIDRange The source range of the template id that
+  /// caused the constraints check.
+  /// \param Satisfaction if true is returned, will contain details of the
+  /// satisfaction, with enough information to diagnose an unsatisfied
+  /// expression.
+  /// \returns true if an error occurred and satisfaction could not be checked,
+  /// false otherwise.
+  bool CheckConstraintSatisfaction(
+      const NamedDecl *Template, ArrayRef<const Expr *> ConstraintExprs,
+      llvm::SmallVectorImpl<Expr *> &ConvertedConstraints,
+      const MultiLevelTemplateArgumentList &TemplateArgList,
       SourceRange TemplateIDRange, ConstraintSatisfaction &Satisfaction);
 
   /// \brief Check whether the given non-dependent constraint expression is
   /// satisfied. Returns false and updates Satisfaction with the satisfaction
   /// verdict if successful, emits a diagnostic and returns true if an error
-  /// occured and satisfaction could not be determined.
+  /// occurred and satisfaction could not be determined.
   ///
   /// \returns true if an error occurred, false otherwise.
   bool CheckConstraintSatisfaction(const Expr *ConstraintExpr,
@@ -6871,13 +7413,13 @@ public:
   /// Check whether the given function decl's trailing requires clause is
   /// satisfied, if any. Returns false and updates Satisfaction with the
   /// satisfaction verdict if successful, emits a diagnostic and returns true if
-  /// an error occured and satisfaction could not be determined.
+  /// an error occurred and satisfaction could not be determined.
   ///
   /// \returns true if an error occurred, false otherwise.
   bool CheckFunctionConstraints(const FunctionDecl *FD,
                                 ConstraintSatisfaction &Satisfaction,
-                                SourceLocation UsageLoc = SourceLocation());
-
+                                SourceLocation UsageLoc = SourceLocation(),
+                                bool ForOverloadResolution = false);
 
   /// \brief Ensure that the given template arguments satisfy the constraints
   /// associated with the given template, emitting a diagnostic if they do not.
@@ -6892,9 +7434,10 @@ public:
   ///
   /// \returns true if the constrains are not satisfied or could not be checked
   /// for satisfaction, false if the constraints are satisfied.
-  bool EnsureTemplateArgumentListConstraints(TemplateDecl *Template,
-                                       ArrayRef<TemplateArgument> TemplateArgs,
-                                             SourceRange TemplateIDRange);
+  bool EnsureTemplateArgumentListConstraints(
+      TemplateDecl *Template,
+      const MultiLevelTemplateArgumentList &TemplateArgs,
+      SourceRange TemplateIDRange);
 
   /// \brief Emit diagnostics explaining why a constraint expression was deemed
   /// unsatisfied.
@@ -7052,8 +7595,9 @@ public:
   bool SetDelegatingInitializer(CXXConstructorDecl *Constructor,
                                 CXXCtorInitializer *Initializer);
 
-  bool SetCtorInitializers(CXXConstructorDecl *Constructor, bool AnyErrors,
-                           ArrayRef<CXXCtorInitializer *> Initializers = None);
+  bool SetCtorInitializers(
+      CXXConstructorDecl *Constructor, bool AnyErrors,
+      ArrayRef<CXXCtorInitializer *> Initializers = std::nullopt);
 
   void SetIvarInitializers(ObjCImplementationDecl *ObjCImplementation);
 
@@ -7187,6 +7731,7 @@ public:
                                      StringLiteral *AssertMessageExpr,
                                      SourceLocation RParenLoc,
                                      bool Failed);
+  void DiagnoseStaticAssertDetails(const Expr *E);
 
   FriendDecl *CheckFriendTypeDecl(SourceLocation LocStart,
                                   SourceLocation FriendLoc,
@@ -7212,7 +7757,8 @@ public:
   void CheckExplicitlyDefaultedFunction(Scope *S, FunctionDecl *MD);
 
   bool CheckExplicitlyDefaultedSpecialMember(CXXMethodDecl *MD,
-                                             CXXSpecialMember CSM);
+                                             CXXSpecialMember CSM,
+                                             SourceLocation DefaultLoc);
   void CheckDelayedMemberExceptionSpecs();
 
   bool CheckExplicitlyDefaultedComparison(Scope *S, FunctionDecl *MD,
@@ -7233,11 +7779,9 @@ public:
                                        TypeSourceInfo *TInfo,
                                        SourceLocation EllipsisLoc);
 
-  BaseResult ActOnBaseSpecifier(Decl *classdecl,
-                                SourceRange SpecifierRange,
-                                ParsedAttributes &Attrs,
-                                bool Virtual, AccessSpecifier Access,
-                                ParsedType basetype,
+  BaseResult ActOnBaseSpecifier(Decl *classdecl, SourceRange SpecifierRange,
+                                const ParsedAttributesView &Attrs, bool Virtual,
+                                AccessSpecifier Access, ParsedType basetype,
                                 SourceLocation BaseLoc,
                                 SourceLocation EllipsisLoc);
 
@@ -7342,10 +7886,16 @@ public:
   CheckStructuredBindingMemberAccess(SourceLocation UseLoc,
                                      CXXRecordDecl *DecomposedClass,
                                      DeclAccessPair Field);
+  AccessResult CheckMemberOperatorAccess(SourceLocation Loc, Expr *ObjectExpr,
+                                         const SourceRange &,
+                                         DeclAccessPair FoundDecl);
   AccessResult CheckMemberOperatorAccess(SourceLocation Loc,
                                          Expr *ObjectExpr,
                                          Expr *ArgExpr,
                                          DeclAccessPair FoundDecl);
+  AccessResult CheckMemberOperatorAccess(SourceLocation Loc, Expr *ObjectExpr,
+                                         ArrayRef<Expr *> ArgExprs,
+                                         DeclAccessPair FoundDecl);
   AccessResult CheckAddressOfMemberAccess(Expr *OvlExpr,
                                           DeclAccessPair FoundDecl);
   AccessResult CheckBaseClassAccess(SourceLocation AccessLoc,
@@ -7439,17 +7989,17 @@ public:
     RequiredTemplateKind(SourceLocation TemplateKWLoc = SourceLocation())
         : TemplateKW(TemplateKWLoc) {}
     /// Template name is unconditionally required.
-    RequiredTemplateKind(TemplateNameIsRequiredTag) : TemplateKW() {}
+    RequiredTemplateKind(TemplateNameIsRequiredTag) {}
 
     SourceLocation getTemplateKeywordLoc() const {
-      return TemplateKW.getValueOr(SourceLocation());
+      return TemplateKW.value_or(SourceLocation());
     }
     bool hasTemplateKeyword() const { return getTemplateKeywordLoc().isValid(); }
     bool isRequired() const { return TemplateKW != SourceLocation(); }
     explicit operator bool() const { return isRequired(); }
 
   private:
-    llvm::Optional<SourceLocation> TemplateKW;
+    std::optional<SourceLocation> TemplateKW;
   };
 
   enum class AssumedTemplateKind {
@@ -7634,7 +8184,9 @@ public:
                       TemplateTy Template, IdentifierInfo *TemplateII,
                       SourceLocation TemplateIILoc, SourceLocation LAngleLoc,
                       ASTTemplateArgsPtr TemplateArgs, SourceLocation RAngleLoc,
-                      bool IsCtorOrDtorName = false, bool IsClassName = false);
+                      bool IsCtorOrDtorName = false, bool IsClassName = false,
+                      ImplicitTypenameContext AllowImplicitTypename =
+                          ImplicitTypenameContext::No);
 
   /// Parsed an elaborated-type-specifier that refers to a template-id,
   /// such as \c class T::template apply<U>.
@@ -7753,14 +8305,11 @@ public:
                                         SourceLocation TemplateLoc,
                                         Declarator &D);
 
-  TemplateArgumentLoc
-  SubstDefaultTemplateArgumentIfAvailable(TemplateDecl *Template,
-                                          SourceLocation TemplateLoc,
-                                          SourceLocation RAngleLoc,
-                                          Decl *Param,
-                                          SmallVectorImpl<TemplateArgument>
-                                            &Converted,
-                                          bool &HasDefaultArg);
+  TemplateArgumentLoc SubstDefaultTemplateArgumentIfAvailable(
+      TemplateDecl *Template, SourceLocation TemplateLoc,
+      SourceLocation RAngleLoc, Decl *Param,
+      ArrayRef<TemplateArgument> SugaredConverted,
+      ArrayRef<TemplateArgument> CanonicalConverted, bool &HasDefaultArg);
 
   /// Specifies the context in which a particular template
   /// argument is being checked.
@@ -7778,16 +8327,15 @@ public:
     CTAK_DeducedFromArrayBound
   };
 
-  bool CheckTemplateArgument(NamedDecl *Param,
-                             TemplateArgumentLoc &Arg,
-                             NamedDecl *Template,
-                             SourceLocation TemplateLoc,
-                             SourceLocation RAngleLoc,
-                             unsigned ArgumentPackIndex,
-                           SmallVectorImpl<TemplateArgument> &Converted,
-                             CheckTemplateArgumentKind CTAK = CTAK_Specified);
-
-  /// Check that the given template arguments can be be provided to
+  bool
+  CheckTemplateArgument(NamedDecl *Param, TemplateArgumentLoc &Arg,
+                        NamedDecl *Template, SourceLocation TemplateLoc,
+                        SourceLocation RAngleLoc, unsigned ArgumentPackIndex,
+                        SmallVectorImpl<TemplateArgument> &SugaredConverted,
+                        SmallVectorImpl<TemplateArgument> &CanonicalConverted,
+                        CheckTemplateArgumentKind CTAK);
+
+  /// Check that the given template arguments can be provided to
   /// the given template, converting the arguments along the way.
   ///
   /// \param Template The template to which the template arguments are being
@@ -7811,28 +8359,30 @@ public:
   /// contain the converted forms of the template arguments as written.
   /// Otherwise, \p TemplateArgs will not be modified.
   ///
-  /// \param ConstraintsNotSatisfied If provided, and an error occured, will
+  /// \param ConstraintsNotSatisfied If provided, and an error occurred, will
   /// receive true if the cause for the error is the associated constraints of
   /// the template not being satisfied by the template arguments.
   ///
   /// \returns true if an error occurred, false otherwise.
-  bool CheckTemplateArgumentList(TemplateDecl *Template,
-                                 SourceLocation TemplateLoc,
-                                 TemplateArgumentListInfo &TemplateArgs,
-                                 bool PartialTemplateArgs,
-                                 SmallVectorImpl<TemplateArgument> &Converted,
-                                 bool UpdateArgsWithConversions = true,
-                                 bool *ConstraintsNotSatisfied = nullptr);
-
-  bool CheckTemplateTypeArgument(TemplateTypeParmDecl *Param,
-                                 TemplateArgumentLoc &Arg,
-                           SmallVectorImpl<TemplateArgument> &Converted);
+  bool CheckTemplateArgumentList(
+      TemplateDecl *Template, SourceLocation TemplateLoc,
+      TemplateArgumentListInfo &TemplateArgs, bool PartialTemplateArgs,
+      SmallVectorImpl<TemplateArgument> &SugaredConverted,
+      SmallVectorImpl<TemplateArgument> &CanonicalConverted,
+      bool UpdateArgsWithConversions = true,
+      bool *ConstraintsNotSatisfied = nullptr);
+
+  bool CheckTemplateTypeArgument(
+      TemplateTypeParmDecl *Param, TemplateArgumentLoc &Arg,
+      SmallVectorImpl<TemplateArgument> &SugaredConverted,
+      SmallVectorImpl<TemplateArgument> &CanonicalConverted);
 
   bool CheckTemplateArgument(TypeSourceInfo *Arg);
   ExprResult CheckTemplateArgument(NonTypeTemplateParmDecl *Param,
                                    QualType InstantiatedParamType, Expr *Arg,
-                                   TemplateArgument &Converted,
-                               CheckTemplateArgumentKind CTAK = CTAK_Specified);
+                                   TemplateArgument &SugaredConverted,
+                                   TemplateArgument &CanonicalConverted,
+                                   CheckTemplateArgumentKind CTAK);
   bool CheckTemplateTemplateArgument(TemplateTemplateParmDecl *Param,
                                      TemplateParameterList *Params,
                                      TemplateArgumentLoc &Arg);
@@ -7879,12 +8429,22 @@ public:
     TPL_TemplateTemplateArgumentMatch
   };
 
-  bool TemplateParameterListsAreEqual(TemplateParameterList *New,
-                                      TemplateParameterList *Old,
-                                      bool Complain,
-                                      TemplateParameterListEqualKind Kind,
-                                      SourceLocation TemplateArgLoc
-                                        = SourceLocation());
+  bool TemplateParameterListsAreEqual(
+      const NamedDecl *NewInstFrom, TemplateParameterList *New,
+      const NamedDecl *OldInstFrom, TemplateParameterList *Old, bool Complain,
+      TemplateParameterListEqualKind Kind,
+      SourceLocation TemplateArgLoc = SourceLocation(),
+      bool PartialOrdering = false);
+
+  bool TemplateParameterListsAreEqual(
+      TemplateParameterList *New, TemplateParameterList *Old, bool Complain,
+      TemplateParameterListEqualKind Kind,
+      SourceLocation TemplateArgLoc = SourceLocation(),
+      bool PartialOrdering = false) {
+    return TemplateParameterListsAreEqual(nullptr, New, nullptr, Old, Complain,
+                                          Kind, TemplateArgLoc,
+                                          PartialOrdering);
+  }
 
   bool CheckTemplateDeclScope(Scope *S, TemplateParameterList *TemplateParams);
 
@@ -7896,10 +8456,11 @@ public:
   /// \param SS the nested-name-specifier following the typename (e.g., 'T::').
   /// \param II the identifier we're retrieving (e.g., 'type' in the example).
   /// \param IdLoc the location of the identifier.
-  TypeResult
-  ActOnTypenameType(Scope *S, SourceLocation TypenameLoc,
-                    const CXXScopeSpec &SS, const IdentifierInfo &II,
-                    SourceLocation IdLoc);
+  /// \param IsImplicitTypename context where T::type refers to a type.
+  TypeResult ActOnTypenameType(
+      Scope *S, SourceLocation TypenameLoc, const CXXScopeSpec &SS,
+      const IdentifierInfo &II, SourceLocation IdLoc,
+      ImplicitTypenameContext IsImplicitTypename = ImplicitTypenameContext::No);
 
   /// Called when the parser has parsed a C++ typename
   /// specifier that ends in a template-id, e.g.,
@@ -7967,6 +8528,9 @@ public:
       Scope *S, MultiTemplateParamsArg TemplateParameterLists,
       IdentifierInfo *Name, SourceLocation NameLoc, Expr *ConstraintExpr);
 
+  void CheckConceptRedefinition(ConceptDecl *NewDecl, LookupResult &Previous,
+                                bool &AddToScope);
+
   RequiresExprBodyDecl *
   ActOnStartRequiresExpr(SourceLocation RequiresKWLoc,
                          ArrayRef<ParmVarDecl *> LocalParameters,
@@ -7998,8 +8562,8 @@ public:
       concepts::Requirement::SubstitutionDiagnostic *SubstDiag);
   concepts::NestedRequirement *BuildNestedRequirement(Expr *E);
   concepts::NestedRequirement *
-  BuildNestedRequirement(
-      concepts::Requirement::SubstitutionDiagnostic *SubstDiag);
+  BuildNestedRequirement(StringRef InvalidConstraintEntity,
+                         const ASTConstraintSatisfaction &Satisfaction);
   ExprResult ActOnRequiresExpr(SourceLocation RequiresKWLoc,
                                RequiresExprBodyDecl *Body,
                                ArrayRef<ParmVarDecl *> LocalParameters,
@@ -8249,14 +8813,13 @@ public:
   /// expansion.
   TypeSourceInfo *CheckPackExpansion(TypeSourceInfo *Pattern,
                                      SourceLocation EllipsisLoc,
-                                     Optional<unsigned> NumExpansions);
+                                     std::optional<unsigned> NumExpansions);
 
   /// Construct a pack expansion type from the pattern of the pack
   /// expansion.
-  QualType CheckPackExpansion(QualType Pattern,
-                              SourceRange PatternRange,
+  QualType CheckPackExpansion(QualType Pattern, SourceRange PatternRange,
                               SourceLocation EllipsisLoc,
-                              Optional<unsigned> NumExpansions);
+                              std::optional<unsigned> NumExpansions);
 
   /// Invoked when parsing an expression followed by an ellipsis, which
   /// creates a pack expansion.
@@ -8275,7 +8838,7 @@ public:
   ///
   /// \param EllipsisLoc The location of the ellipsis.
   ExprResult CheckPackExpansion(Expr *Pattern, SourceLocation EllipsisLoc,
-                                Optional<unsigned> NumExpansions);
+                                std::optional<unsigned> NumExpansions);
 
   /// Determine whether we could expand a pack expansion with the
   /// given set of parameter packs into separate arguments by repeatedly
@@ -8311,13 +8874,11 @@ public:
   /// are to be instantiated with arguments of different lengths), false
   /// otherwise. If false, \c ShouldExpand (and possibly \c NumExpansions)
   /// must be set.
-  bool CheckParameterPacksForExpansion(SourceLocation EllipsisLoc,
-                                       SourceRange PatternRange,
-                             ArrayRef<UnexpandedParameterPack> Unexpanded,
-                             const MultiLevelTemplateArgumentList &TemplateArgs,
-                                       bool &ShouldExpand,
-                                       bool &RetainExpansion,
-                                       Optional<unsigned> &NumExpansions);
+  bool CheckParameterPacksForExpansion(
+      SourceLocation EllipsisLoc, SourceRange PatternRange,
+      ArrayRef<UnexpandedParameterPack> Unexpanded,
+      const MultiLevelTemplateArgumentList &TemplateArgs, bool &ShouldExpand,
+      bool &RetainExpansion, std::optional<unsigned> &NumExpansions);
 
   /// Determine the number of arguments in the given pack expansion
   /// type.
@@ -8326,8 +8887,8 @@ public:
   /// consistent across all of the unexpanded parameter packs in its pattern.
   ///
   /// Returns an empty Optional if the type can't be expanded.
-  Optional<unsigned> getNumArgumentsInExpansion(QualType T,
-      const MultiLevelTemplateArgumentList &TemplateArgs);
+  std::optional<unsigned> getNumArgumentsInExpansion(
+      QualType T, const MultiLevelTemplateArgumentList &TemplateArgs);
 
   /// Determine whether the given declarator contains any unexpanded
   /// parameter packs.
@@ -8355,9 +8916,8 @@ public:
   /// \param NumExpansions Will be set to the number of expansions that will
   /// be generated from this pack expansion, if known a priori.
   TemplateArgumentLoc getTemplateArgumentPackExpansionPattern(
-      TemplateArgumentLoc OrigLoc,
-      SourceLocation &Ellipsis,
-      Optional<unsigned> &NumExpansions) const;
+      TemplateArgumentLoc OrigLoc, SourceLocation &Ellipsis,
+      std::optional<unsigned> &NumExpansions) const;
 
   /// Given a template argument that contains an unexpanded parameter pack, but
   /// which has already been substituted, attempt to determine the number of
@@ -8365,7 +8925,7 @@ public:
   ///
   /// This is intended for use when transforming 'sizeof...(Arg)' in order to
   /// avoid actually expanding the pack where possible.
-  Optional<unsigned> getFullyPackExpandedSize(TemplateArgument Arg);
+  std::optional<unsigned> getFullyPackExpandedSize(TemplateArgument Arg);
 
   //===--------------------------------------------------------------------===//
   // C++ Template Argument Deduction (C++ [temp.deduct])
@@ -8439,7 +8999,9 @@ public:
     /// Deduction failed; that's all we know.
     TDK_MiscellaneousDeductionFailure,
     /// CUDA Target attributes do not match.
-    TDK_CUDATargetMismatch
+    TDK_CUDATargetMismatch,
+    /// Some error which was already diagnosed.
+    TDK_AlreadyDiagnosed
   };
 
   TemplateDeductionResult
@@ -8516,27 +9078,25 @@ public:
   /// Substitute Replacement for auto in TypeWithAuto
   TypeSourceInfo* SubstAutoTypeSourceInfo(TypeSourceInfo *TypeWithAuto,
                                           QualType Replacement);
+
+  // Substitute auto in TypeWithAuto for a Dependent auto type
+  QualType SubstAutoTypeDependent(QualType TypeWithAuto);
+
+  // Substitute auto in TypeWithAuto for a Dependent auto type
+  TypeSourceInfo *
+  SubstAutoTypeSourceInfoDependent(TypeSourceInfo *TypeWithAuto);
+
   /// Completely replace the \c auto in \p TypeWithAuto by
   /// \p Replacement. This does not retain any \c auto type sugar.
   QualType ReplaceAutoType(QualType TypeWithAuto, QualType Replacement);
   TypeSourceInfo *ReplaceAutoTypeSourceInfo(TypeSourceInfo *TypeWithAuto,
                                             QualType Replacement);
 
-  /// Result type of DeduceAutoType.
-  enum DeduceAutoResult {
-    DAR_Succeeded,
-    DAR_Failed,
-    DAR_FailedAlreadyDiagnosed
-  };
-
-  DeduceAutoResult
-  DeduceAutoType(TypeSourceInfo *AutoType, Expr *&Initializer, QualType &Result,
-                 Optional<unsigned> DependentDeductionDepth = None,
-                 bool IgnoreConstraints = false);
-  DeduceAutoResult
-  DeduceAutoType(TypeLoc AutoTypeLoc, Expr *&Initializer, QualType &Result,
-                 Optional<unsigned> DependentDeductionDepth = None,
-                 bool IgnoreConstraints = false);
+  TemplateDeductionResult DeduceAutoType(TypeLoc AutoTypeLoc, Expr *Initializer,
+                                         QualType &Result,
+                                         sema::TemplateDeductionInfo &Info,
+                                         bool DependentDeduction = false,
+                                         bool IgnoreConstraints = false);
   void DiagnoseAutoDeductionFailure(VarDecl *VDecl, Expr *Init);
   bool DeduceReturnType(FunctionDecl *FD, SourceLocation Loc,
                         bool Diagnose = true);
@@ -8558,8 +9118,8 @@ public:
   TypeLoc getReturnTypeLoc(FunctionDecl *FD) const;
 
   bool DeduceFunctionTypeFromReturnExpr(FunctionDecl *FD,
-                                        SourceLocation ReturnLoc,
-                                        Expr *&RetExpr, AutoType *AT);
+                                        SourceLocation ReturnLoc, Expr *RetExpr,
+                                        const AutoType *AT);
 
   FunctionTemplateDecl *getMoreSpecializedTemplate(
       FunctionTemplateDecl *FT1, FunctionTemplateDecl *FT2, SourceLocation Loc,
@@ -8614,10 +9174,12 @@ public:
   //
 
   MultiLevelTemplateArgumentList
-  getTemplateInstantiationArgs(NamedDecl *D,
+  getTemplateInstantiationArgs(const NamedDecl *D, bool Final = false,
                                const TemplateArgumentList *Innermost = nullptr,
                                bool RelativeToPrimary = false,
-                               const FunctionDecl *Pattern = nullptr);
+                               const FunctionDecl *Pattern = nullptr,
+                               bool ForConstraintInstantiation = false,
+                               bool SkipForSpecialization = false);
 
   /// A context in which code is being synthesized (where a source location
   /// alone is not sufficient to identify the context). This covers template
@@ -8699,6 +9261,9 @@ public:
       // We are normalizing a constraint expression.
       ConstraintNormalization,
 
+      // Instantiating a Requires Expression parameter clause.
+      RequirementParameterInstantiation,
+
       // We are substituting into the parameter mapping of an atomic constraint
       // during normalization.
       ParameterMappingSubstitution,
@@ -8712,6 +9277,10 @@ public:
       /// We are marking a class as __dllexport.
       MarkingClassDllexported,
 
+      /// We are building an implied call from __builtin_dump_struct. The
+      /// arguments are in CallArgs.
+      BuildingBuiltinDumpStructCall,
+
       /// Added for Template instantiation observation.
       /// Memoization means we are _not_ instantiating a template because
       /// it is already instantiated (but we entered a context where we
@@ -8733,9 +9302,14 @@ public:
     /// arguments.
     NamedDecl *Template;
 
-    /// The list of template arguments we are substituting, if they
-    /// are not part of the entity.
-    const TemplateArgument *TemplateArgs;
+    union {
+      /// The list of template arguments we are substituting, if they
+      /// are not part of the entity.
+      const TemplateArgument *TemplateArgs;
+
+      /// The list of argument expressions in a synthesized call.
+      const Expr *const *CallArgs;
+    };
 
     // FIXME: Wrap this union around more members, or perhaps store the
     // kind-specific members in the RAII object owning the context.
@@ -8743,6 +9317,9 @@ public:
       /// The number of template arguments in TemplateArgs.
       unsigned NumTemplateArgs;
 
+      /// The number of expressions in CallArgs.
+      unsigned NumCallArgs;
+
       /// The special member being declared or defined.
       CXXSpecialMember SpecialMember;
     };
@@ -9016,6 +9593,11 @@ public:
                           concepts::NestedRequirement *Req, ConstraintsCheck,
                           SourceRange InstantiationRange = SourceRange());
 
+    /// \brief Note that we are checking a requires clause.
+    InstantiatingTemplate(Sema &SemaRef, SourceLocation PointOfInstantiation,
+                          const RequiresExpr *E,
+                          sema::TemplateDeductionInfo &DeductionInfo,
+                          SourceRange InstantiationRange);
     /// Note that we have finished instantiating this template.
     void Clear();
 
@@ -9040,7 +9622,7 @@ public:
         Sema &SemaRef, CodeSynthesisContext::SynthesisKind Kind,
         SourceLocation PointOfInstantiation, SourceRange InstantiationRange,
         Decl *Entity, NamedDecl *Template = nullptr,
-        ArrayRef<TemplateArgument> TemplateArgs = None,
+        ArrayRef<TemplateArgument> TemplateArgs = std::nullopt,
         sema::TemplateDeductionInfo *DeductionInfo = nullptr);
 
     InstantiatingTemplate(const InstantiatingTemplate&) = delete;
@@ -9078,7 +9660,7 @@ public:
   /// Otherwise, contains a pointer that, if non-NULL, contains the nearest
   /// template-deduction context object, which can be used to capture
   /// diagnostics that will be suppressed.
-  Optional<sema::TemplateDeductionInfo *> isSFINAEContext() const;
+  std::optional<sema::TemplateDeductionInfo *> isSFINAEContext() const;
 
   /// Determines whether we are currently in a context that
   /// is not evaluated as per C++ [expr] p5.
@@ -9088,6 +9670,59 @@ public:
     return ExprEvalContexts.back().isUnevaluated();
   }
 
+  bool isConstantEvaluatedContext() const {
+    assert(!ExprEvalContexts.empty() &&
+           "Must be in an expression evaluation context");
+    return ExprEvalContexts.back().isConstantEvaluated();
+  }
+
+  bool isImmediateFunctionContext() const {
+    assert(!ExprEvalContexts.empty() &&
+           "Must be in an expression evaluation context");
+    return ExprEvalContexts.back().isImmediateFunctionContext();
+  }
+
+  bool isCheckingDefaultArgumentOrInitializer() const {
+    assert(!ExprEvalContexts.empty() &&
+           "Must be in an expression evaluation context");
+    const ExpressionEvaluationContextRecord &Ctx = ExprEvalContexts.back();
+    return (Ctx.Context ==
+            ExpressionEvaluationContext::PotentiallyEvaluatedIfUsed) ||
+           Ctx.IsCurrentlyCheckingDefaultArgumentOrInitializer;
+  }
+
+  std::optional<ExpressionEvaluationContextRecord::InitializationContext>
+  InnermostDeclarationWithDelayedImmediateInvocations() const {
+    assert(!ExprEvalContexts.empty() &&
+           "Must be in an expression evaluation context");
+    for (const auto &Ctx : llvm::reverse(ExprEvalContexts)) {
+      if (Ctx.Context == ExpressionEvaluationContext::PotentiallyEvaluated &&
+          Ctx.DelayedDefaultInitializationContext)
+        return Ctx.DelayedDefaultInitializationContext;
+      if (Ctx.isConstantEvaluated() || Ctx.isImmediateFunctionContext() ||
+          Ctx.isUnevaluated())
+        break;
+    }
+    return std::nullopt;
+  }
+
+  std::optional<ExpressionEvaluationContextRecord::InitializationContext>
+  OutermostDeclarationWithDelayedImmediateInvocations() const {
+    assert(!ExprEvalContexts.empty() &&
+           "Must be in an expression evaluation context");
+    std::optional<ExpressionEvaluationContextRecord::InitializationContext> Res;
+    for (auto &Ctx : llvm::reverse(ExprEvalContexts)) {
+      if (Ctx.Context == ExpressionEvaluationContext::PotentiallyEvaluated &&
+          !Ctx.DelayedDefaultInitializationContext && Res)
+        break;
+      if (Ctx.isConstantEvaluated() || Ctx.isImmediateFunctionContext() ||
+          Ctx.isUnevaluated())
+        break;
+      Res = Ctx.DelayedDefaultInitializationContext;
+    }
+    return Res;
+  }
+
   /// RAII class used to determine whether SFINAE has
   /// trapped any errors that occur during template argument
   /// deduction.
@@ -9307,32 +9942,52 @@ public:
                             const MultiLevelTemplateArgumentList &TemplateArgs,
                             SourceLocation Loc, DeclarationName Entity);
 
-  TypeSourceInfo *SubstFunctionDeclType(TypeSourceInfo *T,
-                            const MultiLevelTemplateArgumentList &TemplateArgs,
-                                        SourceLocation Loc,
-                                        DeclarationName Entity,
-                                        CXXRecordDecl *ThisContext,
-                                        Qualifiers ThisTypeQuals);
+  TypeSourceInfo *SubstFunctionDeclType(
+      TypeSourceInfo *T, const MultiLevelTemplateArgumentList &TemplateArgs,
+      SourceLocation Loc, DeclarationName Entity, CXXRecordDecl *ThisContext,
+      Qualifiers ThisTypeQuals, bool EvaluateConstraints = true);
   void SubstExceptionSpec(FunctionDecl *New, const FunctionProtoType *Proto,
                           const MultiLevelTemplateArgumentList &Args);
   bool SubstExceptionSpec(SourceLocation Loc,
                           FunctionProtoType::ExceptionSpecInfo &ESI,
                           SmallVectorImpl<QualType> &ExceptionStorage,
                           const MultiLevelTemplateArgumentList &Args);
-  ParmVarDecl *SubstParmVarDecl(ParmVarDecl *D,
-                            const MultiLevelTemplateArgumentList &TemplateArgs,
-                                int indexAdjustment,
-                                Optional<unsigned> NumExpansions,
-                                bool ExpectParameterPack);
+  ParmVarDecl *
+  SubstParmVarDecl(ParmVarDecl *D,
+                   const MultiLevelTemplateArgumentList &TemplateArgs,
+                   int indexAdjustment, std::optional<unsigned> NumExpansions,
+                   bool ExpectParameterPack, bool EvaluateConstraints = true);
   bool SubstParmTypes(SourceLocation Loc, ArrayRef<ParmVarDecl *> Params,
                       const FunctionProtoType::ExtParameterInfo *ExtParamInfos,
                       const MultiLevelTemplateArgumentList &TemplateArgs,
                       SmallVectorImpl<QualType> &ParamTypes,
                       SmallVectorImpl<ParmVarDecl *> *OutParams,
                       ExtParameterInfoBuilder &ParamInfos);
+  bool SubstDefaultArgument(SourceLocation Loc, ParmVarDecl *Param,
+                            const MultiLevelTemplateArgumentList &TemplateArgs,
+                            bool ForCallExpr = false);
   ExprResult SubstExpr(Expr *E,
                        const MultiLevelTemplateArgumentList &TemplateArgs);
 
+  // A RAII type used by the TemplateDeclInstantiator and TemplateInstantiator
+  // to disable constraint evaluation, then restore the state.
+  template <typename InstTy> struct ConstraintEvalRAII {
+    InstTy &TI;
+    bool OldValue;
+
+    ConstraintEvalRAII(InstTy &TI)
+        : TI(TI), OldValue(TI.getEvaluateConstraints()) {
+      TI.setEvaluateConstraints(false);
+    }
+    ~ConstraintEvalRAII() { TI.setEvaluateConstraints(OldValue); }
+  };
+
+  // Unlike the above, this evaluates constraints, which should only happen at
+  // 'constraint checking' time.
+  ExprResult
+  SubstConstraintExpr(Expr *E,
+                      const MultiLevelTemplateArgumentList &TemplateArgs);
+
   /// Substitute the given template arguments into a list of
   /// expressions, expanding pack expansions if required.
   ///
@@ -9355,14 +10010,14 @@ public:
 
   TemplateParameterList *
   SubstTemplateParams(TemplateParameterList *Params, DeclContext *Owner,
-                      const MultiLevelTemplateArgumentList &TemplateArgs);
+                      const MultiLevelTemplateArgumentList &TemplateArgs,
+                      bool EvaluateConstraints = true);
 
   bool
   SubstTemplateArguments(ArrayRef<TemplateArgumentLoc> Args,
                          const MultiLevelTemplateArgumentList &TemplateArgs,
                          TemplateArgumentListInfo &Outputs);
 
-
   Decl *SubstDecl(Decl *D, DeclContext *Owner,
                   const MultiLevelTemplateArgumentList &TemplateArgs);
 
@@ -9451,9 +10106,10 @@ public:
   SubstTemplateName(NestedNameSpecifierLoc QualifierLoc, TemplateName Name,
                     SourceLocation Loc,
                     const MultiLevelTemplateArgumentList &TemplateArgs);
-  bool Subst(const TemplateArgumentLoc *Args, unsigned NumArgs,
-             TemplateArgumentListInfo &Result,
-             const MultiLevelTemplateArgumentList &TemplateArgs);
+
+  bool SubstTypeConstraint(TemplateTypeParmDecl *Inst, const TypeConstraint *TC,
+                           const MultiLevelTemplateArgumentList &TemplateArgs,
+                           bool EvaluateConstraint);
 
   bool InstantiateDefaultArgument(SourceLocation CallLoc, FunctionDecl *FD,
                                   ParmVarDecl *Param);
@@ -9535,14 +10191,14 @@ public:
                                             SourceLocation rAngleLoc);
   void popObjCTypeParamList(Scope *S, ObjCTypeParamList *typeParamList);
 
-  Decl *ActOnStartClassInterface(
+  ObjCInterfaceDecl *ActOnStartClassInterface(
       Scope *S, SourceLocation AtInterfaceLoc, IdentifierInfo *ClassName,
       SourceLocation ClassLoc, ObjCTypeParamList *typeParamList,
       IdentifierInfo *SuperName, SourceLocation SuperLoc,
       ArrayRef<ParsedType> SuperTypeArgs, SourceRange SuperTypeArgsRange,
       Decl *const *ProtoRefs, unsigned NumProtoRefs,
       const SourceLocation *ProtoLocs, SourceLocation EndProtoLoc,
-      const ParsedAttributesView &AttrList);
+      const ParsedAttributesView &AttrList, SkipBodyInfo *SkipBody);
 
   void ActOnSuperClassOfClassInterface(Scope *S,
                                        SourceLocation AtInterfaceLoc,
@@ -9569,13 +10225,14 @@ public:
     SourceLocation &PLoc, SourceLocation PrevLoc,
     const ObjCList<ObjCProtocolDecl> &PList);
 
-  Decl *ActOnStartProtocolInterface(
+  ObjCProtocolDecl *ActOnStartProtocolInterface(
       SourceLocation AtProtoInterfaceLoc, IdentifierInfo *ProtocolName,
       SourceLocation ProtocolLoc, Decl *const *ProtoRefNames,
       unsigned NumProtoRefs, const SourceLocation *ProtoLocs,
-      SourceLocation EndProtoLoc, const ParsedAttributesView &AttrList);
+      SourceLocation EndProtoLoc, const ParsedAttributesView &AttrList,
+      SkipBodyInfo *SkipBody);
 
-  Decl *ActOnStartCategoryInterface(
+  ObjCCategoryDecl *ActOnStartCategoryInterface(
       SourceLocation AtInterfaceLoc, IdentifierInfo *ClassName,
       SourceLocation ClassLoc, ObjCTypeParamList *typeParamList,
       IdentifierInfo *CategoryName, SourceLocation CategoryLoc,
@@ -9583,19 +10240,15 @@ public:
       const SourceLocation *ProtoLocs, SourceLocation EndProtoLoc,
       const ParsedAttributesView &AttrList);
 
-  Decl *ActOnStartClassImplementation(SourceLocation AtClassImplLoc,
-                                      IdentifierInfo *ClassName,
-                                      SourceLocation ClassLoc,
-                                      IdentifierInfo *SuperClassname,
-                                      SourceLocation SuperClassLoc,
-                                      const ParsedAttributesView &AttrList);
+  ObjCImplementationDecl *ActOnStartClassImplementation(
+      SourceLocation AtClassImplLoc, IdentifierInfo *ClassName,
+      SourceLocation ClassLoc, IdentifierInfo *SuperClassname,
+      SourceLocation SuperClassLoc, const ParsedAttributesView &AttrList);
 
-  Decl *ActOnStartCategoryImplementation(SourceLocation AtCatImplLoc,
-                                         IdentifierInfo *ClassName,
-                                         SourceLocation ClassLoc,
-                                         IdentifierInfo *CatName,
-                                         SourceLocation CatLoc,
-                                         const ParsedAttributesView &AttrList);
+  ObjCCategoryImplDecl *ActOnStartCategoryImplementation(
+      SourceLocation AtCatImplLoc, IdentifierInfo *ClassName,
+      SourceLocation ClassLoc, IdentifierInfo *CatName, SourceLocation CatLoc,
+      const ParsedAttributesView &AttrList);
 
   DeclGroupPtrTy ActOnFinishObjCImplementation(Decl *ObjCImpDecl,
                                                ArrayRef<Decl *> Decls);
@@ -9669,16 +10322,12 @@ public:
                                   bool FailOnError = false);
 
   /// Build an Objective-C object pointer type.
-  QualType BuildObjCObjectType(QualType BaseType,
-                               SourceLocation Loc,
-                               SourceLocation TypeArgsLAngleLoc,
-                               ArrayRef<TypeSourceInfo *> TypeArgs,
-                               SourceLocation TypeArgsRAngleLoc,
-                               SourceLocation ProtocolLAngleLoc,
-                               ArrayRef<ObjCProtocolDecl *> Protocols,
-                               ArrayRef<SourceLocation> ProtocolLocs,
-                               SourceLocation ProtocolRAngleLoc,
-                               bool FailOnError = false);
+  QualType BuildObjCObjectType(
+      QualType BaseType, SourceLocation Loc, SourceLocation TypeArgsLAngleLoc,
+      ArrayRef<TypeSourceInfo *> TypeArgs, SourceLocation TypeArgsRAngleLoc,
+      SourceLocation ProtocolLAngleLoc, ArrayRef<ObjCProtocolDecl *> Protocols,
+      ArrayRef<SourceLocation> ProtocolLocs, SourceLocation ProtocolRAngleLoc,
+      bool FailOnError, bool Rebuilding);
 
   /// Ensure attributes are consistent with type.
   /// \param [in, out] Attributes The attributes to check; they will
@@ -9703,8 +10352,8 @@ public:
                                         ObjCInterfaceDecl *ID);
 
   Decl *ActOnAtEnd(Scope *S, SourceRange AtEnd,
-                   ArrayRef<Decl *> allMethods = None,
-                   ArrayRef<DeclGroupPtrTy> allTUVars = None);
+                   ArrayRef<Decl *> allMethods = std::nullopt,
+                   ArrayRef<DeclGroupPtrTy> allTUVars = std::nullopt);
 
   Decl *ActOnProperty(Scope *S, SourceLocation AtLoc,
                       SourceLocation LParenLoc,
@@ -9950,6 +10599,12 @@ public:
                                          SourceLocation IncludeLoc);
   void DiagnoseUnterminatedPragmaAlignPack();
 
+  /// ActOnPragmaMSStrictGuardStackCheck - Called on well formed \#pragma
+  /// strict_gs_check.
+  void ActOnPragmaMSStrictGuardStackCheck(SourceLocation PragmaLocation,
+                                          PragmaMsStackAction Action,
+                                          bool Value);
+
   /// ActOnPragmaMSStruct - Called on well formed \#pragma ms_struct [on|off].
   void ActOnPragmaMSStruct(PragmaMSStructKind Kind);
 
@@ -9998,6 +10653,12 @@ public:
   void ActOnPragmaMSInitSeg(SourceLocation PragmaLocation,
                             StringLiteral *SegmentName);
 
+  /// Called on well-formed \#pragma alloc_text().
+  void ActOnPragmaMSAllocText(
+      SourceLocation PragmaLocation, StringRef Section,
+      const SmallVector<std::tuple<IdentifierInfo *, SourceLocation>>
+          &Functions);
+
   /// Called on #pragma clang __debug dump II
   void ActOnPragmaDump(Scope *S, SourceLocation Loc, IdentifierInfo *II);
 
@@ -10013,6 +10674,9 @@ public:
            !CurFPFeatures.getAllowApproxFunc();
   }
 
+  void ActOnPragmaFPEvalMethod(SourceLocation Loc,
+                               LangOptions::FPEvalMethodKind Value);
+
   /// ActOnPragmaFloatControl - Call on well-formed \#pragma float_control
   void ActOnPragmaFloatControl(SourceLocation Loc, PragmaMsStackAction Action,
                                PragmaFloatControlKind Value);
@@ -10026,9 +10690,9 @@ public:
   void ActOnPragmaVisibility(const IdentifierInfo* VisType,
                              SourceLocation PragmaLoc);
 
-  NamedDecl *DeclClonePragmaWeak(NamedDecl *ND, IdentifierInfo *II,
+  NamedDecl *DeclClonePragmaWeak(NamedDecl *ND, const IdentifierInfo *II,
                                  SourceLocation Loc);
-  void DeclApplyPragmaWeak(Scope *S, NamedDecl *ND, WeakInfo &W);
+  void DeclApplyPragmaWeak(Scope *S, NamedDecl *ND, const WeakInfo &W);
 
   /// ActOnPragmaWeakID - Called on well formed \#pragma weak ident.
   void ActOnPragmaWeakID(IdentifierInfo* WeakName,
@@ -10068,7 +10732,7 @@ public:
                                LangOptions::FPExceptionModeKind);
 
   /// Called to set constant rounding mode for floating point operations.
-  void setRoundingMode(SourceLocation Loc, llvm::RoundingMode);
+  void ActOnPragmaFEnvRound(SourceLocation Loc, llvm::RoundingMode);
 
   /// Called to set exception behavior for floating point operations.
   void setExceptionMode(SourceLocation Loc, LangOptions::FPExceptionModeKind);
@@ -10120,6 +10784,14 @@ public:
   /// Called on well formed \#pragma clang optimize.
   void ActOnPragmaOptimize(bool On, SourceLocation PragmaLoc);
 
+  /// #pragma optimize("[optimization-list]", on | off).
+  void ActOnPragmaMSOptimize(SourceLocation Loc, bool IsOn);
+
+  /// Call on well formed \#pragma function.
+  void
+  ActOnPragmaMSFunction(SourceLocation Loc,
+                        const llvm::SmallVectorImpl<StringRef> &NoBuiltins);
+
   /// Get the location for the currently active "\#pragma clang optimize
   /// off". If this location is invalid, then the state of the pragma is "on".
   SourceLocation getOptimizeOffPragmaLocation() const {
@@ -10131,11 +10803,26 @@ public:
   /// with attribute optnone.
   void AddRangeBasedOptnone(FunctionDecl *FD);
 
+  /// Only called on function definitions; if there is a `#pragma alloc_text`
+  /// that decides which code section the function should be in, add
+  /// attribute section to the function.
+  void AddSectionMSAllocText(FunctionDecl *FD);
+
   /// Adds the 'optnone' attribute to the function declaration if there
   /// are no conflicts; Loc represents the location causing the 'optnone'
   /// attribute to be added (usually because of a pragma).
   void AddOptnoneAttributeIfNoConflicts(FunctionDecl *FD, SourceLocation Loc);
 
+  /// Only called on function definitions; if there is a MSVC #pragma optimize
+  /// in scope, consider changing the function's attributes based on the
+  /// optimization list passed to the pragma.
+  void ModifyFnAttributesMSPragmaOptimize(FunctionDecl *FD);
+
+  /// Only called on function definitions; if there is a pragma in scope
+  /// with the effect of a range-based no_builtin, consider marking the function
+  /// with attribute no_builtin.
+  void AddImplicitMSFunctionNoBuiltinAttr(FunctionDecl *FD);
+
   /// AddAlignedAttr - Adds an aligned attribute to a particular declaration.
   void AddAlignedAttr(Decl *D, const AttributeCommonInfo &CI, Expr *E,
                       bool IsPackExpansion);
@@ -10160,6 +10847,13 @@ public:
   void AddAnnotationAttr(Decl *D, const AttributeCommonInfo &CI,
                          StringRef Annot, MutableArrayRef<Expr *> Args);
 
+  /// ConstantFoldAttrArgs - Folds attribute arguments into ConstantExprs
+  /// (unless they are value dependent or type dependent). Returns false
+  /// and emits a diagnostic if one or more of the arguments could not be
+  /// folded into a constant.
+  bool ConstantFoldAttrArgs(const AttributeCommonInfo &CI,
+                            MutableArrayRef<Expr *> Args);
+
   /// AddLaunchBoundsAttr - Adds a launch_bounds attribute to a particular
   /// declaration.
   void AddLaunchBoundsAttr(Decl *D, const AttributeCommonInfo &CI,
@@ -10197,10 +10891,13 @@ public:
   ExprResult ActOnCoyieldExpr(Scope *S, SourceLocation KwLoc, Expr *E);
   StmtResult ActOnCoreturnStmt(Scope *S, SourceLocation KwLoc, Expr *E);
 
-  ExprResult BuildResolvedCoawaitExpr(SourceLocation KwLoc, Expr *E,
-                                      bool IsImplicit = false);
-  ExprResult BuildUnresolvedCoawaitExpr(SourceLocation KwLoc, Expr *E,
-                                        UnresolvedLookupExpr* Lookup);
+  ExprResult BuildOperatorCoawaitLookupExpr(Scope *S, SourceLocation Loc);
+  ExprResult BuildOperatorCoawaitCall(SourceLocation Loc, Expr *E,
+                                      UnresolvedLookupExpr *Lookup);
+  ExprResult BuildResolvedCoawaitExpr(SourceLocation KwLoc, Expr *Operand,
+                                      Expr *Awaiter, bool IsImplicit = false);
+  ExprResult BuildUnresolvedCoawaitExpr(SourceLocation KwLoc, Expr *Operand,
+                                        UnresolvedLookupExpr *Lookup);
   ExprResult BuildCoyieldExpr(SourceLocation KwLoc, Expr *E);
   StmtResult BuildCoreturnStmt(SourceLocation KwLoc, Expr *E,
                                bool IsImplicit = false);
@@ -10208,8 +10905,11 @@ public:
   bool buildCoroutineParameterMoves(SourceLocation Loc);
   VarDecl *buildCoroutinePromise(SourceLocation Loc);
   void CheckCompletedCoroutineBody(FunctionDecl *FD, Stmt *&Body);
+  /// Lookup 'coroutine_traits' in std namespace and std::experimental
+  /// namespace. The namespace found is recorded in Namespace.
   ClassTemplateDecl *lookupCoroutineTraits(SourceLocation KwLoc,
-                                           SourceLocation FuncLoc);
+                                           SourceLocation FuncLoc,
+                                           NamespaceDecl *&Namespace);
   /// Check that the expression co_await promise.final_suspend() shall not be
   /// potentially-throwing.
   bool checkFinalSuspendNoThrow(const Stmt *FinalSuspend);
@@ -10234,6 +10934,9 @@ private:
     /// The directive kind, `begin declare target` or `declare target`.
     OpenMPDirectiveKind Kind;
 
+    /// The directive with indirect clause.
+    std::optional<Expr *> Indirect;
+
     /// The directive location.
     SourceLocation Loc;
 
@@ -10376,6 +11079,13 @@ public:
   /// constructs.
   VarDecl *isOpenMPCapturedDecl(ValueDecl *D, bool CheckScopeInfo = false,
                                 unsigned StopAt = 0);
+
+  /// The member expression(this->fd) needs to be rebuilt in the template
+  /// instantiation to generate private copy for OpenMP when default
+  /// clause is used. The function will return true if default
+  /// cluse is used.
+  bool isOpenMPRebuildMemberExpr(ValueDecl *D);
+
   ExprResult getOpenMPCapturedExpr(VarDecl *Capture, ExprValueKind VK,
                                    ExprObjectKind OK, SourceLocation Loc);
 
@@ -10430,6 +11140,12 @@ public:
   /// \param Init First part of the for loop.
   void ActOnOpenMPLoopInitialization(SourceLocation ForLoc, Stmt *Init);
 
+  /// Called on well-formed '\#pragma omp metadirective' after parsing
+  /// of the  associated statement.
+  StmtResult ActOnOpenMPMetaDirective(ArrayRef<OMPClause *> Clauses,
+                                      Stmt *AStmt, SourceLocation StartLoc,
+                                      SourceLocation EndLoc);
+
   // OpenMP directives and clauses.
   /// Called on correct id-expression from the '#pragma omp
   /// threadprivate'.
@@ -10452,7 +11168,7 @@ public:
   /// Called on well-formed '#pragma omp [begin] assume[s]'.
   void ActOnOpenMPAssumesDirective(SourceLocation Loc,
                                    OpenMPDirectiveKind DKind,
-                                   ArrayRef<StringRef> Assumptions,
+                                   ArrayRef<std::string> Assumptions,
                                    bool SkippedClauses);
 
   /// Check if there is an active global `omp begin assumes` directive.
@@ -10510,6 +11226,7 @@ public:
                                                       QualType MapperType,
                                                       SourceLocation StartLoc,
                                                       DeclarationName VN);
+  void ActOnOpenMPIteratorVarDecl(VarDecl *VD);
   bool isOpenMPDeclareMapperVarDeclAllowed(const VarDecl *VD) const;
   const ValueDecl *getOpenMPDeclareMapperVarName() const;
 
@@ -10525,6 +11242,10 @@ public:
   /// encountered.
   void ActOnFinishedOpenMPDeclareTargetContext(DeclareTargetContextInfo &DTCI);
 
+  /// Report unterminated 'omp declare target' or 'omp begin declare target' at
+  /// the end of a compilation unit.
+  void DiagnoseUnterminatedOpenMPDeclareTarget();
+
   /// Searches for the provided declaration name for OpenMP declare target
   /// directive.
   NamedDecl *lookupOpenMPDeclareTargetName(Scope *CurScope,
@@ -10534,7 +11255,7 @@ public:
   /// Called on correct id-expression from the '#pragma omp declare target'.
   void ActOnOpenMPDeclareTargetName(NamedDecl *ND, SourceLocation Loc,
                                     OMPDeclareTargetDeclAttr::MapTypeTy MT,
-                                    OMPDeclareTargetDeclAttr::DevTypeTy DT);
+                                    DeclareTargetContextInfo &DTCI);
 
   /// Check declaration inside target region.
   void
@@ -10545,6 +11266,10 @@ public:
   void finalizeOpenMPDelayedAnalysis(const FunctionDecl *Caller,
                                      const FunctionDecl *Callee,
                                      SourceLocation Loc);
+
+  /// Return true if currently in OpenMP task with untied clause context.
+  bool isInOpenMPTaskUntiedContext() const;
+
   /// Return true inside OpenMP declare target region.
   bool isInOpenMPDeclareTargetContext() const {
     return !DeclareTargetNesting.empty();
@@ -10562,6 +11287,11 @@ public:
   /// an OpenMP loop directive.
   StmtResult ActOnOpenMPCanonicalLoop(Stmt *AStmt);
 
+  /// Process a canonical OpenMP loop nest that can either be a canonical
+  /// literal loop (ForStmt or CXXForRangeStmt), or the generated loop of an
+  /// OpenMP loop transformation construct.
+  StmtResult ActOnOpenMPLoopnest(Stmt *AStmt);
+
   /// End of OpenMP region.
   ///
   /// \param S Statement associated with the current OpenMP region.
@@ -10649,6 +11379,12 @@ public:
                                                 Stmt *AStmt,
                                                 SourceLocation StartLoc,
                                                 SourceLocation EndLoc);
+  /// Called on well-formed '\#pragma omp parallel masked' after
+  /// parsing of the associated statement.
+  StmtResult ActOnOpenMPParallelMaskedDirective(ArrayRef<OMPClause *> Clauses,
+                                                Stmt *AStmt,
+                                                SourceLocation StartLoc,
+                                                SourceLocation EndLoc);
   /// Called on well-formed '\#pragma omp parallel sections' after
   /// parsing of the  associated statement.
   StmtResult ActOnOpenMPParallelSectionsDirective(ArrayRef<OMPClause *> Clauses,
@@ -10663,11 +11399,19 @@ public:
   /// Called on well-formed '\#pragma omp taskyield'.
   StmtResult ActOnOpenMPTaskyieldDirective(SourceLocation StartLoc,
                                            SourceLocation EndLoc);
+  /// Called on well-formed '\#pragma omp error'.
+  /// Error direcitive is allowed in both declared and excutable contexts.
+  /// Adding InExContext to identify which context is called from.
+  StmtResult ActOnOpenMPErrorDirective(ArrayRef<OMPClause *> Clauses,
+                                       SourceLocation StartLoc,
+                                       SourceLocation EndLoc,
+                                       bool InExContext = true);
   /// Called on well-formed '\#pragma omp barrier'.
   StmtResult ActOnOpenMPBarrierDirective(SourceLocation StartLoc,
                                          SourceLocation EndLoc);
   /// Called on well-formed '\#pragma omp taskwait'.
-  StmtResult ActOnOpenMPTaskwaitDirective(SourceLocation StartLoc,
+  StmtResult ActOnOpenMPTaskwaitDirective(ArrayRef<OMPClause *> Clauses,
+                                          SourceLocation StartLoc,
                                           SourceLocation EndLoc);
   /// Called on well-formed '\#pragma omp taskgroup'.
   StmtResult ActOnOpenMPTaskgroupDirective(ArrayRef<OMPClause *> Clauses,
@@ -10733,6 +11477,26 @@ public:
   StmtResult ActOnOpenMPTeamsDirective(ArrayRef<OMPClause *> Clauses,
                                        Stmt *AStmt, SourceLocation StartLoc,
                                        SourceLocation EndLoc);
+  /// Called on well-formed '\#pragma omp teams loop' after parsing of the
+  /// associated statement.
+  StmtResult ActOnOpenMPTeamsGenericLoopDirective(
+      ArrayRef<OMPClause *> Clauses, Stmt *AStmt, SourceLocation StartLoc,
+      SourceLocation EndLoc, VarsWithInheritedDSAType &VarsWithImplicitDSA);
+  /// Called on well-formed '\#pragma omp target teams loop' after parsing of
+  /// the associated statement.
+  StmtResult ActOnOpenMPTargetTeamsGenericLoopDirective(
+      ArrayRef<OMPClause *> Clauses, Stmt *AStmt, SourceLocation StartLoc,
+      SourceLocation EndLoc, VarsWithInheritedDSAType &VarsWithImplicitDSA);
+  /// Called on well-formed '\#pragma omp parallel loop' after parsing of the
+  /// associated statement.
+  StmtResult ActOnOpenMPParallelGenericLoopDirective(
+      ArrayRef<OMPClause *> Clauses, Stmt *AStmt, SourceLocation StartLoc,
+      SourceLocation EndLoc, VarsWithInheritedDSAType &VarsWithImplicitDSA);
+  /// Called on well-formed '\#pragma omp target parallel loop' after parsing
+  /// of the associated statement.
+  StmtResult ActOnOpenMPTargetParallelGenericLoopDirective(
+      ArrayRef<OMPClause *> Clauses, Stmt *AStmt, SourceLocation StartLoc,
+      SourceLocation EndLoc, VarsWithInheritedDSAType &VarsWithImplicitDSA);
   /// Called on well-formed '\#pragma omp cancellation point'.
   StmtResult
   ActOnOpenMPCancellationPointDirective(SourceLocation StartLoc,
@@ -10774,6 +11538,26 @@ public:
   StmtResult ActOnOpenMPParallelMasterTaskLoopSimdDirective(
       ArrayRef<OMPClause *> Clauses, Stmt *AStmt, SourceLocation StartLoc,
       SourceLocation EndLoc, VarsWithInheritedDSAType &VarsWithImplicitDSA);
+  /// Called on well-formed '\#pragma omp masked taskloop' after parsing of the
+  /// associated statement.
+  StmtResult ActOnOpenMPMaskedTaskLoopDirective(
+      ArrayRef<OMPClause *> Clauses, Stmt *AStmt, SourceLocation StartLoc,
+      SourceLocation EndLoc, VarsWithInheritedDSAType &VarsWithImplicitDSA);
+  /// Called on well-formed '\#pragma omp masked taskloop simd' after parsing of
+  /// the associated statement.
+  StmtResult ActOnOpenMPMaskedTaskLoopSimdDirective(
+      ArrayRef<OMPClause *> Clauses, Stmt *AStmt, SourceLocation StartLoc,
+      SourceLocation EndLoc, VarsWithInheritedDSAType &VarsWithImplicitDSA);
+  /// Called on well-formed '\#pragma omp parallel masked taskloop' after
+  /// parsing of the associated statement.
+  StmtResult ActOnOpenMPParallelMaskedTaskLoopDirective(
+      ArrayRef<OMPClause *> Clauses, Stmt *AStmt, SourceLocation StartLoc,
+      SourceLocation EndLoc, VarsWithInheritedDSAType &VarsWithImplicitDSA);
+  /// Called on well-formed '\#pragma omp parallel masked taskloop simd' after
+  /// parsing of the associated statement.
+  StmtResult ActOnOpenMPParallelMaskedTaskLoopSimdDirective(
+      ArrayRef<OMPClause *> Clauses, Stmt *AStmt, SourceLocation StartLoc,
+      SourceLocation EndLoc, VarsWithInheritedDSAType &VarsWithImplicitDSA);
   /// Called on well-formed '\#pragma omp distribute' after parsing
   /// of the associated statement.
   StmtResult
@@ -10872,6 +11656,12 @@ public:
                                         Stmt *AStmt, SourceLocation StartLoc,
                                         SourceLocation EndLoc);
 
+  /// Called on well-formed '\#pragma omp loop' after parsing of the
+  /// associated statement.
+  StmtResult ActOnOpenMPGenericLoopDirective(
+      ArrayRef<OMPClause *> Clauses, Stmt *AStmt, SourceLocation StartLoc,
+      SourceLocation EndLoc, VarsWithInheritedDSAType &VarsWithImplicitDSA);
+
   /// Checks correctness of linear modifiers.
   bool CheckOpenMPLinearModifier(OpenMPLinearClauseKind LinKind,
                                  SourceLocation LinLoc);
@@ -10896,11 +11686,15 @@ public:
   /// \param VariantRef Expression that references the variant function, which
   /// must be used instead of the original one, specified in \p DG.
   /// \param TI The trait info object representing the match clause.
-  /// \returns None, if the function/variant function are not compatible with
-  /// the pragma, pair of original function/variant ref expression otherwise.
-  Optional<std::pair<FunctionDecl *, Expr *>>
+  /// \param NumAppendArgs The number of omp_interop_t arguments to account for
+  /// in checking.
+  /// \returns std::nullopt, if the function/variant function are not compatible
+  /// with the pragma, pair of original function/variant ref expression
+  /// otherwise.
+  std::optional<std::pair<FunctionDecl *, Expr *>>
   checkOpenMPDeclareVariantFunction(DeclGroupPtrTy DG, Expr *VariantRef,
-                                    OMPTraitInfo &TI, SourceRange SR);
+                                    OMPTraitInfo &TI, unsigned NumAppendArgs,
+                                    SourceRange SR);
 
   /// Called on well-formed '\#pragma omp declare variant' after parsing of
   /// the associated method/function.
@@ -10909,8 +11703,18 @@ public:
   /// \param VariantRef Expression that references the variant function, which
   /// must be used instead of the original one, specified in \p DG.
   /// \param TI The context traits associated with the function variant.
-  void ActOnOpenMPDeclareVariantDirective(FunctionDecl *FD, Expr *VariantRef,
-                                          OMPTraitInfo &TI, SourceRange SR);
+  /// \param AdjustArgsNothing The list of 'nothing' arguments.
+  /// \param AdjustArgsNeedDevicePtr The list of 'need_device_ptr' arguments.
+  /// \param AppendArgs The list of 'append_args' arguments.
+  /// \param AdjustArgsLoc The Location of an 'adjust_args' clause.
+  /// \param AppendArgsLoc The Location of an 'append_args' clause.
+  /// \param SR The SourceRange of the 'declare variant' directive.
+  void ActOnOpenMPDeclareVariantDirective(
+      FunctionDecl *FD, Expr *VariantRef, OMPTraitInfo &TI,
+      ArrayRef<Expr *> AdjustArgsNothing,
+      ArrayRef<Expr *> AdjustArgsNeedDevicePtr,
+      ArrayRef<OMPInteropInfo> AppendArgs, SourceLocation AdjustArgsLoc,
+      SourceLocation AppendArgsLoc, SourceRange SR);
 
   OMPClause *ActOnOpenMPSingleExprClause(OpenMPClauseKind Kind,
                                          Expr *Expr,
@@ -10938,6 +11742,10 @@ public:
                                          SourceLocation StartLoc,
                                          SourceLocation LParenLoc,
                                          SourceLocation EndLoc);
+  /// Called on well-formed 'align' clause.
+  OMPClause *ActOnOpenMPAlignClause(Expr *Alignment, SourceLocation StartLoc,
+                                    SourceLocation LParenLoc,
+                                    SourceLocation EndLoc);
   /// Called on well-formed 'safelen' clause.
   OMPClause *ActOnOpenMPSafelenClause(Expr *Length,
                                       SourceLocation StartLoc,
@@ -10970,12 +11778,16 @@ public:
                            SourceLocation LParenLoc = SourceLocation(),
                            Expr *NumForLoops = nullptr);
   /// Called on well-formed 'grainsize' clause.
-  OMPClause *ActOnOpenMPGrainsizeClause(Expr *Size, SourceLocation StartLoc,
+  OMPClause *ActOnOpenMPGrainsizeClause(OpenMPGrainsizeClauseModifier Modifier,
+                                        Expr *Size, SourceLocation StartLoc,
                                         SourceLocation LParenLoc,
+                                        SourceLocation ModifierLoc,
                                         SourceLocation EndLoc);
   /// Called on well-formed 'num_tasks' clause.
-  OMPClause *ActOnOpenMPNumTasksClause(Expr *NumTasks, SourceLocation StartLoc,
+  OMPClause *ActOnOpenMPNumTasksClause(OpenMPNumTasksClauseModifier Modifier,
+                                       Expr *NumTasks, SourceLocation StartLoc,
                                        SourceLocation LParenLoc,
+                                       SourceLocation ModifierLoc,
                                        SourceLocation EndLoc);
   /// Called on well-formed 'hint' clause.
   OMPClause *ActOnOpenMPHintClause(Expr *Hint, SourceLocation StartLoc,
@@ -10992,6 +11804,10 @@ public:
                                      SourceLocation StartLoc,
                                      SourceLocation LParenLoc,
                                      SourceLocation EndLoc);
+  /// Called on well-formed 'when' clause.
+  OMPClause *ActOnOpenMPWhenClause(OMPTraitInfo &TI, SourceLocation StartLoc,
+                                   SourceLocation LParenLoc,
+                                   SourceLocation EndLoc);
   /// Called on well-formed 'default' clause.
   OMPClause *ActOnOpenMPDefaultClause(llvm::omp::DefaultKind Kind,
                                       SourceLocation KindLoc,
@@ -11005,10 +11821,11 @@ public:
                                        SourceLocation LParenLoc,
                                        SourceLocation EndLoc);
   /// Called on well-formed 'order' clause.
-  OMPClause *ActOnOpenMPOrderClause(OpenMPOrderClauseKind Kind,
-                                    SourceLocation KindLoc,
+  OMPClause *ActOnOpenMPOrderClause(OpenMPOrderClauseModifier Modifier,
+                                    OpenMPOrderClauseKind Kind,
                                     SourceLocation StartLoc,
                                     SourceLocation LParenLoc,
+                                    SourceLocation MLoc, SourceLocation KindLoc,
                                     SourceLocation EndLoc);
   /// Called on well-formed 'update' clause.
   OMPClause *ActOnOpenMPUpdateClause(OpenMPDependClauseKind Kind,
@@ -11052,6 +11869,9 @@ public:
   /// Called on well-formed 'capture' clause.
   OMPClause *ActOnOpenMPCaptureClause(SourceLocation StartLoc,
                                       SourceLocation EndLoc);
+  /// Called on well-formed 'compare' clause.
+  OMPClause *ActOnOpenMPCompareClause(SourceLocation StartLoc,
+                                      SourceLocation EndLoc);
   /// Called on well-formed 'seq_cst' clause.
   OMPClause *ActOnOpenMPSeqCstClause(SourceLocation StartLoc,
                                      SourceLocation EndLoc);
@@ -11069,12 +11889,10 @@ public:
                                       SourceLocation EndLoc);
 
   /// Called on well-formed 'init' clause.
-  OMPClause *ActOnOpenMPInitClause(Expr *InteropVar, ArrayRef<Expr *> PrefExprs,
-                                   bool IsTarget, bool IsTargetSync,
-                                   SourceLocation StartLoc,
-                                   SourceLocation LParenLoc,
-                                   SourceLocation VarLoc,
-                                   SourceLocation EndLoc);
+  OMPClause *
+  ActOnOpenMPInitClause(Expr *InteropVar, OMPInteropInfo &InteropInfo,
+                        SourceLocation StartLoc, SourceLocation LParenLoc,
+                        SourceLocation VarLoc, SourceLocation EndLoc);
 
   /// Called on well-formed 'use' clause.
   OMPClause *ActOnOpenMPUseClause(Expr *InteropVar, SourceLocation StartLoc,
@@ -11130,16 +11948,52 @@ public:
       OpenMPAtomicDefaultMemOrderClauseKind Kind, SourceLocation KindLoc,
       SourceLocation StartLoc, SourceLocation LParenLoc, SourceLocation EndLoc);
 
-  OMPClause *ActOnOpenMPVarListClause(
-      OpenMPClauseKind Kind, ArrayRef<Expr *> Vars, Expr *DepModOrTailExpr,
-      const OMPVarListLocTy &Locs, SourceLocation ColonLoc,
-      CXXScopeSpec &ReductionOrMapperIdScopeSpec,
-      DeclarationNameInfo &ReductionOrMapperId, int ExtraModifier,
-      ArrayRef<OpenMPMapModifierKind> MapTypeModifiers,
-      ArrayRef<SourceLocation> MapTypeModifiersLoc, bool IsMapTypeImplicit,
-      SourceLocation ExtraModifierLoc,
-      ArrayRef<OpenMPMotionModifierKind> MotionModifiers,
-      ArrayRef<SourceLocation> MotionModifiersLoc);
+  /// Called on well-formed 'at' clause.
+  OMPClause *ActOnOpenMPAtClause(OpenMPAtClauseKind Kind,
+                                 SourceLocation KindLoc,
+                                 SourceLocation StartLoc,
+                                 SourceLocation LParenLoc,
+                                 SourceLocation EndLoc);
+
+  /// Called on well-formed 'severity' clause.
+  OMPClause *ActOnOpenMPSeverityClause(OpenMPSeverityClauseKind Kind,
+                                       SourceLocation KindLoc,
+                                       SourceLocation StartLoc,
+                                       SourceLocation LParenLoc,
+                                       SourceLocation EndLoc);
+
+  /// Called on well-formed 'message' clause.
+  /// passing string for message.
+  OMPClause *ActOnOpenMPMessageClause(Expr *MS, SourceLocation StartLoc,
+                                      SourceLocation LParenLoc,
+                                      SourceLocation EndLoc);
+
+  /// Data used for processing a list of variables in OpenMP clauses.
+  struct OpenMPVarListDataTy final {
+    Expr *DepModOrTailExpr = nullptr;
+    Expr *IteratorExpr = nullptr;
+    SourceLocation ColonLoc;
+    SourceLocation RLoc;
+    CXXScopeSpec ReductionOrMapperIdScopeSpec;
+    DeclarationNameInfo ReductionOrMapperId;
+    int ExtraModifier = -1; ///< Additional modifier for linear, map, depend or
+                            ///< lastprivate clause.
+    SmallVector<OpenMPMapModifierKind, NumberOfOMPMapClauseModifiers>
+        MapTypeModifiers;
+    SmallVector<SourceLocation, NumberOfOMPMapClauseModifiers>
+        MapTypeModifiersLoc;
+    SmallVector<OpenMPMotionModifierKind, NumberOfOMPMotionModifiers>
+        MotionModifiers;
+    SmallVector<SourceLocation, NumberOfOMPMotionModifiers> MotionModifiersLoc;
+    bool IsMapTypeImplicit = false;
+    SourceLocation ExtraModifierLoc;
+    SourceLocation OmpAllMemoryLoc;
+  };
+
+  OMPClause *ActOnOpenMPVarListClause(OpenMPClauseKind Kind,
+                                      ArrayRef<Expr *> Vars,
+                                      const OMPVarListLocTy &Locs,
+                                      OpenMPVarListDataTy &Data);
   /// Called on well-formed 'inclusive' clause.
   OMPClause *ActOnOpenMPInclusiveClause(ArrayRef<Expr *> VarList,
                                         SourceLocation StartLoc,
@@ -11182,21 +12036,21 @@ public:
       SourceLocation ModifierLoc, SourceLocation ColonLoc,
       SourceLocation EndLoc, CXXScopeSpec &ReductionIdScopeSpec,
       const DeclarationNameInfo &ReductionId,
-      ArrayRef<Expr *> UnresolvedReductions = llvm::None);
+      ArrayRef<Expr *> UnresolvedReductions = std::nullopt);
   /// Called on well-formed 'task_reduction' clause.
   OMPClause *ActOnOpenMPTaskReductionClause(
       ArrayRef<Expr *> VarList, SourceLocation StartLoc,
       SourceLocation LParenLoc, SourceLocation ColonLoc, SourceLocation EndLoc,
       CXXScopeSpec &ReductionIdScopeSpec,
       const DeclarationNameInfo &ReductionId,
-      ArrayRef<Expr *> UnresolvedReductions = llvm::None);
+      ArrayRef<Expr *> UnresolvedReductions = std::nullopt);
   /// Called on well-formed 'in_reduction' clause.
   OMPClause *ActOnOpenMPInReductionClause(
       ArrayRef<Expr *> VarList, SourceLocation StartLoc,
       SourceLocation LParenLoc, SourceLocation ColonLoc, SourceLocation EndLoc,
       CXXScopeSpec &ReductionIdScopeSpec,
       const DeclarationNameInfo &ReductionId,
-      ArrayRef<Expr *> UnresolvedReductions = llvm::None);
+      ArrayRef<Expr *> UnresolvedReductions = std::nullopt);
   /// Called on well-formed 'linear' clause.
   OMPClause *
   ActOnOpenMPLinearClause(ArrayRef<Expr *> VarList, Expr *Step,
@@ -11230,11 +12084,12 @@ public:
                                      SourceLocation LParenLoc,
                                      SourceLocation EndLoc);
   /// Called on well-formed 'depend' clause.
-  OMPClause *
-  ActOnOpenMPDependClause(Expr *DepModifier, OpenMPDependClauseKind DepKind,
-                          SourceLocation DepLoc, SourceLocation ColonLoc,
-                          ArrayRef<Expr *> VarList, SourceLocation StartLoc,
-                          SourceLocation LParenLoc, SourceLocation EndLoc);
+  OMPClause *ActOnOpenMPDependClause(const OMPDependClause::DependDataTy &Data,
+                                     Expr *DepModifier,
+                                     ArrayRef<Expr *> VarList,
+                                     SourceLocation StartLoc,
+                                     SourceLocation LParenLoc,
+                                     SourceLocation EndLoc);
   /// Called on well-formed 'device' clause.
   OMPClause *ActOnOpenMPDeviceClause(OpenMPDeviceClauseModifier Modifier,
                                      Expr *Device, SourceLocation StartLoc,
@@ -11242,15 +12097,14 @@ public:
                                      SourceLocation ModifierLoc,
                                      SourceLocation EndLoc);
   /// Called on well-formed 'map' clause.
-  OMPClause *
-  ActOnOpenMPMapClause(ArrayRef<OpenMPMapModifierKind> MapTypeModifiers,
-                       ArrayRef<SourceLocation> MapTypeModifiersLoc,
-                       CXXScopeSpec &MapperIdScopeSpec,
-                       DeclarationNameInfo &MapperId,
-                       OpenMPMapClauseKind MapType, bool IsMapTypeImplicit,
-                       SourceLocation MapLoc, SourceLocation ColonLoc,
-                       ArrayRef<Expr *> VarList, const OMPVarListLocTy &Locs,
-                       ArrayRef<Expr *> UnresolvedMappers = llvm::None);
+  OMPClause *ActOnOpenMPMapClause(
+      Expr *IteratorModifier, ArrayRef<OpenMPMapModifierKind> MapTypeModifiers,
+      ArrayRef<SourceLocation> MapTypeModifiersLoc,
+      CXXScopeSpec &MapperIdScopeSpec, DeclarationNameInfo &MapperId,
+      OpenMPMapClauseKind MapType, bool IsMapTypeImplicit,
+      SourceLocation MapLoc, SourceLocation ColonLoc, ArrayRef<Expr *> VarList,
+      const OMPVarListLocTy &Locs, bool NoDiagnose = false,
+      ArrayRef<Expr *> UnresolvedMappers = std::nullopt);
   /// Called on well-formed 'num_teams' clause.
   OMPClause *ActOnOpenMPNumTeamsClause(Expr *NumTeams, SourceLocation StartLoc,
                                        SourceLocation LParenLoc,
@@ -11281,7 +12135,7 @@ public:
                       CXXScopeSpec &MapperIdScopeSpec,
                       DeclarationNameInfo &MapperId, SourceLocation ColonLoc,
                       ArrayRef<Expr *> VarList, const OMPVarListLocTy &Locs,
-                      ArrayRef<Expr *> UnresolvedMappers = llvm::None);
+                      ArrayRef<Expr *> UnresolvedMappers = std::nullopt);
   /// Called on well-formed 'from' clause.
   OMPClause *
   ActOnOpenMPFromClause(ArrayRef<OpenMPMotionModifierKind> MotionModifiers,
@@ -11289,7 +12143,7 @@ public:
                         CXXScopeSpec &MapperIdScopeSpec,
                         DeclarationNameInfo &MapperId, SourceLocation ColonLoc,
                         ArrayRef<Expr *> VarList, const OMPVarListLocTy &Locs,
-                        ArrayRef<Expr *> UnresolvedMappers = llvm::None);
+                        ArrayRef<Expr *> UnresolvedMappers = std::nullopt);
   /// Called on well-formed 'use_device_ptr' clause.
   OMPClause *ActOnOpenMPUseDevicePtrClause(ArrayRef<Expr *> VarList,
                                            const OMPVarListLocTy &Locs);
@@ -11299,6 +12153,9 @@ public:
   /// Called on well-formed 'is_device_ptr' clause.
   OMPClause *ActOnOpenMPIsDevicePtrClause(ArrayRef<Expr *> VarList,
                                           const OMPVarListLocTy &Locs);
+  /// Called on well-formed 'has_device_addr' clause.
+  OMPClause *ActOnOpenMPHasDeviceAddrClause(ArrayRef<Expr *> VarList,
+                                            const OMPVarListLocTy &Locs);
   /// Called on well-formed 'nontemporal' clause.
   OMPClause *ActOnOpenMPNontemporalClause(ArrayRef<Expr *> VarList,
                                           SourceLocation StartLoc,
@@ -11325,6 +12182,17 @@ public:
                                        SourceLocation ColonLoc,
                                        SourceLocation EndLoc, Expr *Modifier,
                                        ArrayRef<Expr *> Locators);
+  /// Called on a well-formed 'bind' clause.
+  OMPClause *ActOnOpenMPBindClause(OpenMPBindClauseKind Kind,
+                                   SourceLocation KindLoc,
+                                   SourceLocation StartLoc,
+                                   SourceLocation LParenLoc,
+                                   SourceLocation EndLoc);
+
+  /// Called on a well-formed 'ompx_dyn_cgroup_mem' clause.
+  OMPClause *ActOnOpenMPXDynCGroupMemClause(Expr *Size, SourceLocation StartLoc,
+                                            SourceLocation LParenLoc,
+                                            SourceLocation EndLoc);
 
   /// The kind of conversion being performed.
   enum CheckedConversionKind {
@@ -11508,6 +12376,12 @@ public:
     /// extension.
     IncompatibleFunctionPointer,
 
+    /// IncompatibleFunctionPointerStrict - The assignment is between two
+    /// function pointer types that are not identical, but are compatible,
+    /// unless compiled with -fsanitize=cfi, in which case the type mismatch
+    /// may trip an indirect call runtime check.
+    IncompatibleFunctionPointerStrict,
+
     /// IncompatiblePointerSign - The assignment is between two pointers types
     /// which point to integers which have a different sign, but are otherwise
     /// identical. This is a subset of the above, but broken out because it's by
@@ -11680,7 +12554,8 @@ public:
   // For simple assignment, pass both expressions and a null converted type.
   // For compound assignment, pass both expressions and the converted type.
   QualType CheckAssignmentOperands( // C99 6.5.16.[1,2]
-    Expr *LHSExpr, ExprResult &RHS, SourceLocation Loc, QualType CompoundType);
+      Expr *LHSExpr, ExprResult &RHS, SourceLocation Loc, QualType CompoundType,
+      BinaryOperatorKind Opc);
 
   ExprResult checkPseudoObjectIncDec(Scope *S, SourceLocation OpLoc,
                                      UnaryOperatorKind Opcode, Expr *Op);
@@ -11699,6 +12574,10 @@ public:
   QualType CheckVectorConditionalTypes(ExprResult &Cond, ExprResult &LHS,
                                        ExprResult &RHS,
                                        SourceLocation QuestionLoc);
+
+  QualType CheckSizelessVectorConditionalTypes(ExprResult &Cond,
+                                               ExprResult &LHS, ExprResult &RHS,
+                                               SourceLocation QuestionLoc);
   QualType FindCompositePointerType(SourceLocation Loc, Expr *&E1, Expr *&E2,
                                     bool ConvertArgs = true);
   QualType FindCompositePointerType(SourceLocation Loc,
@@ -11725,14 +12604,24 @@ public:
   /// type checking for vector binary operators.
   QualType CheckVectorOperands(ExprResult &LHS, ExprResult &RHS,
                                SourceLocation Loc, bool IsCompAssign,
-                               bool AllowBothBool, bool AllowBoolConversion);
+                               bool AllowBothBool, bool AllowBoolConversion,
+                               bool AllowBoolOperation, bool ReportInvalid);
   QualType GetSignedVectorType(QualType V);
+  QualType GetSignedSizelessVectorType(QualType V);
   QualType CheckVectorCompareOperands(ExprResult &LHS, ExprResult &RHS,
                                       SourceLocation Loc,
                                       BinaryOperatorKind Opc);
+  QualType CheckSizelessVectorCompareOperands(ExprResult &LHS, ExprResult &RHS,
+                                              SourceLocation Loc,
+                                              BinaryOperatorKind Opc);
   QualType CheckVectorLogicalOperands(ExprResult &LHS, ExprResult &RHS,
                                       SourceLocation Loc);
 
+  // type checking for sizeless vector binary operators.
+  QualType CheckSizelessVectorOperands(ExprResult &LHS, ExprResult &RHS,
+                                       SourceLocation Loc, bool IsCompAssign,
+                                       ArithConvKind OperationKind);
+
   /// Type checking for matrix binary operators.
   QualType CheckMatrixElementwiseOperands(ExprResult &LHS, ExprResult &RHS,
                                           SourceLocation Loc,
@@ -11747,6 +12636,8 @@ public:
   bool areVectorTypesSameSize(QualType srcType, QualType destType);
   bool areLaxCompatibleVectorTypes(QualType srcType, QualType destType);
   bool isLaxVectorConversion(QualType srcType, QualType destType);
+  bool areSameVectorElemTypes(QualType srcType, QualType destType);
+  bool anyAltivecTypes(QualType srcType, QualType destType);
 
   /// type checking declaration initializers (C99 6.7.8)
   bool CheckForConstantInitializer(Expr *e, QualType t);
@@ -11920,9 +12811,9 @@ public:
       return std::make_pair(cast_or_null<VarDecl>(ConditionVar),
                             Condition.get());
     }
-    llvm::Optional<bool> getKnownValue() const {
+    std::optional<bool> getKnownValue() const {
       if (!HasKnownValue)
-        return None;
+        return std::nullopt;
       return KnownValue;
     }
   };
@@ -11933,9 +12824,12 @@ public:
     ConstexprIf, ///< A constant boolean condition from 'if constexpr'.
     Switch       ///< An integral condition for a 'switch' statement.
   };
+  QualType PreferredConditionType(ConditionKind K) const {
+    return K == ConditionKind::Switch ? Context.IntTy : Context.BoolTy;
+  }
 
-  ConditionResult ActOnCondition(Scope *S, SourceLocation Loc,
-                                 Expr *SubExpr, ConditionKind CK);
+  ConditionResult ActOnCondition(Scope *S, SourceLocation Loc, Expr *SubExpr,
+                                 ConditionKind CK, bool MissingOK = false);
 
   ConditionResult ActOnConditionVariable(Decl *ConditionVar,
                                          SourceLocation StmtLoc,
@@ -12031,10 +12925,8 @@ public:
   /// VerifyBitField - verifies that a bit field expression is an ICE and has
   /// the correct width, and that the field type is valid.
   /// Returns false on success.
-  /// Can optionally return whether the bit-field is of width 0
   ExprResult VerifyBitField(SourceLocation FieldLoc, IdentifierInfo *FieldName,
-                            QualType FieldTy, bool IsMsStruct,
-                            Expr *BitWidth, bool *ZeroWidth = nullptr);
+                            QualType FieldTy, bool IsMsStruct, Expr *BitWidth);
 
 private:
   unsigned ForceCUDAHostDeviceDepth = 0;
@@ -12146,9 +13038,9 @@ public:
     return targetDiag(Loc, PD.getDiagID(), FD) << PD;
   }
 
-  /// Check if the expression is allowed to be used in expressions for the
-  /// offloading devices.
-  void checkDeviceDecl(ValueDecl *D, SourceLocation Loc);
+  /// Check if the type is allowed to be used for the current target.
+  void checkTypeSupport(QualType Ty, SourceLocation Loc,
+                        ValueDecl *D = nullptr);
 
   enum CUDAFunctionTarget {
     CFT_Device,
@@ -12374,6 +13266,15 @@ public:
                                       const VirtSpecifiers *VS = nullptr);
   void CodeCompleteBracketDeclarator(Scope *S);
   void CodeCompleteCase(Scope *S);
+  enum class AttributeCompletion {
+    Attribute,
+    Scope,
+    None,
+  };
+  void CodeCompleteAttribute(
+      AttributeCommonInfo::Syntax Syntax,
+      AttributeCompletion Completion = AttributeCompletion::Attribute,
+      const IdentifierInfo *Scope = nullptr);
   /// Determines the preferred type of the current function argument, by
   /// examining the signatures of all possible overloads.
   /// Returns null if unknown or ambiguous, or if code completion is off.
@@ -12382,18 +13283,18 @@ public:
   /// signatures that were considered.
   ///
   /// FIXME: rename to GuessCallArgumentType to reduce confusion.
-  QualType ProduceCallSignatureHelp(Scope *S, Expr *Fn, ArrayRef<Expr *> Args,
+  QualType ProduceCallSignatureHelp(Expr *Fn, ArrayRef<Expr *> Args,
                                     SourceLocation OpenParLoc);
-  QualType ProduceConstructorSignatureHelp(Scope *S, QualType Type,
-                                           SourceLocation Loc,
+  QualType ProduceConstructorSignatureHelp(QualType Type, SourceLocation Loc,
                                            ArrayRef<Expr *> Args,
-                                           SourceLocation OpenParLoc);
-  QualType ProduceCtorInitMemberSignatureHelp(Scope *S, Decl *ConstructorDecl,
-                                              CXXScopeSpec SS,
-                                              ParsedType TemplateTypeTy,
-                                              ArrayRef<Expr *> ArgExprs,
-                                              IdentifierInfo *II,
-                                              SourceLocation OpenParLoc);
+                                           SourceLocation OpenParLoc,
+                                           bool Braced);
+  QualType ProduceCtorInitMemberSignatureHelp(
+      Decl *ConstructorDecl, CXXScopeSpec SS, ParsedType TemplateTypeTy,
+      ArrayRef<Expr *> ArgExprs, IdentifierInfo *II, SourceLocation OpenParLoc,
+      bool Braced);
+  QualType ProduceTemplateArgumentSignatureHelp(
+      TemplateTy, ArrayRef<ParsedTemplateArgument>, SourceLocation LAngleLoc);
   void CodeCompleteInitializer(Scope *S, Decl *D);
   /// Trigger code completion for a record of \p BaseType. \p InitExprs are
   /// expressions in the initializer list seen so far and \p D is the current
@@ -12461,7 +13362,8 @@ public:
   void CodeCompleteObjCPropertyDefinition(Scope *S);
   void CodeCompleteObjCPropertySynthesizeIvar(Scope *S,
                                               IdentifierInfo *PropertyName);
-  void CodeCompleteObjCMethodDecl(Scope *S, Optional<bool> IsInstanceMethod,
+  void CodeCompleteObjCMethodDecl(Scope *S,
+                                  std::optional<bool> IsInstanceMethod,
                                   ParsedType ReturnType);
   void CodeCompleteObjCMethodDeclSelector(Scope *S,
                                           bool IsInstanceMethod,
@@ -12494,21 +13396,29 @@ public:
   SourceLocation getLocationOfStringLiteralByte(const StringLiteral *SL,
                                                 unsigned ByteNo) const;
 
-private:
-  void CheckArrayAccess(const Expr *BaseExpr, const Expr *IndexExpr,
-                        const ArraySubscriptExpr *ASE=nullptr,
-                        bool AllowOnePastEnd=true, bool IndexNegated=false);
-  void CheckArrayAccess(const Expr *E);
+  enum FormatArgumentPassingKind {
+    FAPK_Fixed,    // values to format are fixed (no C-style variadic arguments)
+    FAPK_Variadic, // values to format are passed as variadic arguments
+    FAPK_VAList,   // values to format are passed in a va_list
+  };
+
   // Used to grab the relevant information from a FormatAttr and a
   // FunctionDeclaration.
   struct FormatStringInfo {
     unsigned FormatIdx;
     unsigned FirstDataArg;
-    bool HasVAListArg;
+    FormatArgumentPassingKind ArgPassingKind;
   };
 
   static bool getFormatStringInfo(const FormatAttr *Format, bool IsCXXMember,
-                                  FormatStringInfo *FSI);
+                                  bool IsVariadic, FormatStringInfo *FSI);
+
+private:
+  void CheckArrayAccess(const Expr *BaseExpr, const Expr *IndexExpr,
+                        const ArraySubscriptExpr *ASE = nullptr,
+                        bool AllowOnePastEnd = true, bool IndexNegated = false);
+  void CheckArrayAccess(const Expr *E);
+
   bool CheckFunctionCall(FunctionDecl *FDecl, CallExpr *TheCall,
                          const FunctionProtoType *Proto);
   bool CheckObjCMethodCall(ObjCMethodDecl *Method, SourceLocation loc,
@@ -12520,6 +13430,8 @@ private:
                             ArrayRef<const Expr *> Args,
                             const FunctionProtoType *Proto, SourceLocation Loc);
 
+  void checkAIXMemberAlignment(SourceLocation Loc, const Expr *Arg);
+
   void CheckArgAlignment(SourceLocation Loc, NamedDecl *FDecl,
                          StringRef ParamName, QualType ArgTy, QualType ParamTy);
 
@@ -12579,6 +13491,8 @@ private:
   bool CheckRISCVLMUL(CallExpr *TheCall, unsigned ArgNum);
   bool CheckRISCVBuiltinFunctionCall(const TargetInfo &TI, unsigned BuiltinID,
                                      CallExpr *TheCall);
+  bool CheckLoongArchBuiltinFunctionCall(const TargetInfo &TI,
+                                         unsigned BuiltinID, CallExpr *TheCall);
 
   bool SemaBuiltinVAStart(unsigned BuiltinID, CallExpr *TheCall);
   bool SemaBuiltinVAStartARMMicrosoft(CallExpr *Call);
@@ -12625,10 +13539,15 @@ private:
                                 int ArgNum, unsigned ExpectedFieldNum,
                                 bool AllowName);
   bool SemaBuiltinARMMemoryTaggingCall(unsigned BuiltinID, CallExpr *TheCall);
-  bool SemaBuiltinPPCMMACall(CallExpr *TheCall, const char *TypeDesc);
+  bool SemaBuiltinPPCMMACall(CallExpr *TheCall, unsigned BuiltinID,
+                             const char *TypeDesc);
 
   bool CheckPPCMMAType(QualType Type, SourceLocation TypeLoc);
 
+  bool SemaBuiltinElementwiseMath(CallExpr *TheCall);
+  bool PrepareBuiltinElementwiseMathOneArgCall(CallExpr *TheCall);
+  bool PrepareBuiltinReduceMathOneArgCall(CallExpr *TheCall);
+
   // Matrix builtin handling.
   ExprResult SemaBuiltinMatrixTranspose(CallExpr *TheCall,
                                         ExprResult CallResult);
@@ -12659,16 +13578,15 @@ public:
 
 private:
   bool CheckFormatArguments(const FormatAttr *Format,
-                            ArrayRef<const Expr *> Args,
-                            bool IsCXXMember,
-                            VariadicCallType CallType,
-                            SourceLocation Loc, SourceRange Range,
+                            ArrayRef<const Expr *> Args, bool IsCXXMember,
+                            VariadicCallType CallType, SourceLocation Loc,
+                            SourceRange Range,
                             llvm::SmallBitVector &CheckedVarArgs);
   bool CheckFormatArguments(ArrayRef<const Expr *> Args,
-                            bool HasVAListArg, unsigned format_idx,
+                            FormatArgumentPassingKind FAPK, unsigned format_idx,
                             unsigned firstDataArg, FormatStringType Type,
-                            VariadicCallType CallType,
-                            SourceLocation Loc, SourceRange range,
+                            VariadicCallType CallType, SourceLocation Loc,
+                            SourceRange range,
                             llvm::SmallBitVector &CheckedVarArgs);
 
   void CheckAbsoluteValueFunction(const CallExpr *Call,
@@ -12695,7 +13613,8 @@ private:
                           const FunctionDecl *FD = nullptr);
 
 public:
-  void CheckFloatComparison(SourceLocation Loc, Expr *LHS, Expr *RHS);
+  void CheckFloatComparison(SourceLocation Loc, Expr *LHS, Expr *RHS,
+                            BinaryOperatorKind Opcode);
 
 private:
   void CheckImplicitConversions(Expr *E, SourceLocation CC = SourceLocation());
@@ -12725,7 +13644,8 @@ private:
   /// attempts to add itself into the container
   void CheckObjCCircularContainer(ObjCMessageExpr *Message);
 
-  void CheckTCBEnforcement(const CallExpr *TheCall, const FunctionDecl *Callee);
+  void CheckTCBEnforcement(const SourceLocation CallExprLoc,
+                           const NamedDecl *Callee);
 
   void AnalyzeDeleteExprMismatch(const CXXDeleteExpr *DE);
   void AnalyzeDeleteExprMismatch(FieldDecl *Field, SourceLocation DeleteLoc,
@@ -12828,7 +13748,7 @@ public:
   IdentifierInfo *getSuperIdentifier() const;
   IdentifierInfo *getFloat128Identifier() const;
 
-  Decl *getObjCDeclContext() const;
+  ObjCContainerDecl *getObjCDeclContext() const;
 
   DeclContext *getCurLexicalContext() const {
     return OriginalLexicalContext ? OriginalLexicalContext : CurContext;
@@ -12902,7 +13822,7 @@ private:
     ValueDecl *MD;
     CharUnits Alignment;
 
-    MisalignedMember() : E(), RD(), MD(), Alignment() {}
+    MisalignedMember() : E(), RD(), MD() {}
     MisalignedMember(Expr *E, RecordDecl *RD, ValueDecl *MD,
                      CharUnits Alignment)
         : E(E), RD(RD), MD(MD), Alignment(Alignment) {}
@@ -12983,6 +13903,9 @@ public:
   /// Adds Callee to DeviceCallGraph if we don't know if its caller will be
   /// codegen'ed yet.
   bool checkSYCLDeviceFunction(SourceLocation Loc, FunctionDecl *Callee);
+  void deepTypeCheckForSYCLDevice(SourceLocation UsedAt,
+                                  llvm::DenseSet<QualType> Visited,
+                                  ValueDecl *DeclToCheck);
 };
 
 /// RAII object that enters a new expression evaluation context.
@@ -13052,6 +13975,8 @@ void Sema::PragmaStack<Sema::AlignPackInfo>::Act(SourceLocation PragmaLocation,
                                                  llvm::StringRef StackSlotLabel,
                                                  AlignPackInfo Value);
 
+std::unique_ptr<sema::RISCVIntrinsicManager>
+CreateRISCVIntrinsicManager(Sema &S);
 } // end namespace clang
 
 namespace llvm {
diff --git a/gnu/llvm/clang/include/clang/StaticAnalyzer/Checkers/LocalCheckers.h b/gnu/llvm/clang/include/clang/StaticAnalyzer/Checkers/LocalCheckers.h
deleted file mode 100644
index 8f7148fde19..00000000000
--- a/gnu/llvm/clang/include/clang/StaticAnalyzer/Checkers/LocalCheckers.h
+++ /dev/null
@@ -1,27 +0,0 @@
-//==- LocalCheckers.h - Intra-Procedural+Flow-Sensitive Checkers -*- C++ -*-==//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-//  This file defines the interface to call a set of intra-procedural (local)
-//  checkers that use flow/path-sensitive analyses to find bugs.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_CLANG_STATICANALYZER_CHECKERS_LOCALCHECKERS_H
-#define LLVM_CLANG_STATICANALYZER_CHECKERS_LOCALCHECKERS_H
-
-namespace clang {
-namespace ento {
-
-class ExprEngine;
-
-void RegisterCallInliner(ExprEngine &Eng);
-
-} // end namespace ento
-} // end namespace clang
-
-#endif
diff --git a/gnu/llvm/clang/lib/AST/FormatString.cpp b/gnu/llvm/clang/lib/AST/FormatString.cpp
index 6c85304156b..21f456b4e26 100644
--- a/gnu/llvm/clang/lib/AST/FormatString.cpp
+++ b/gnu/llvm/clang/lib/AST/FormatString.cpp
@@ -15,13 +15,13 @@
 #include "clang/Basic/LangOptions.h"
 #include "clang/Basic/TargetInfo.h"
 #include "llvm/Support/ConvertUTF.h"
+#include <optional>
 
 using clang::analyze_format_string::ArgType;
 using clang::analyze_format_string::FormatStringHandler;
 using clang::analyze_format_string::FormatSpecifier;
 using clang::analyze_format_string::LengthModifier;
 using clang::analyze_format_string::OptionalAmount;
-using clang::analyze_format_string::PositionContext;
 using clang::analyze_format_string::ConversionSpecifier;
 using namespace clang;
 
@@ -322,6 +322,12 @@ bool clang::analyze_format_string::ParseUTF8InvalidSpecifier(
 
 clang::analyze_format_string::ArgType::MatchKind
 ArgType::matchesType(ASTContext &C, QualType argTy) const {
+  // When using the format attribute in C++, you can receive a function or an
+  // array that will necessarily decay to a pointer when passed to the final
+  // format consumer. Apply decay before type comparison.
+  if (argTy->canDecayToPointerType())
+    argTy = C.getDecayedType(argTy);
+
   if (Ptr) {
     // It has to be a pointer.
     const PointerType *PT = argTy->getAs<PointerType>();
@@ -343,7 +349,7 @@ ArgType::matchesType(ASTContext &C, QualType argTy) const {
       return Match;
 
     case AnyCharTy: {
-      if (const EnumType *ETy = argTy->getAs<EnumType>()) {
+      if (const auto *ETy = argTy->getAs<EnumType>()) {
         // If the enum is incomplete we know nothing about the underlying type.
         // Assume that it's 'int'.
         if (!ETy->getDecl()->isComplete())
@@ -351,17 +357,34 @@ ArgType::matchesType(ASTContext &C, QualType argTy) const {
         argTy = ETy->getDecl()->getIntegerType();
       }
 
-      if (const BuiltinType *BT = argTy->getAs<BuiltinType>())
+      if (const auto *BT = argTy->getAs<BuiltinType>()) {
+        // The types are perfectly matched?
         switch (BT->getKind()) {
+        default:
+          break;
+        case BuiltinType::Char_S:
+        case BuiltinType::SChar:
+        case BuiltinType::UChar:
+        case BuiltinType::Char_U:
+        case BuiltinType::Bool:
+          return Match;
+        }
+        // "Partially matched" because of promotions?
+        if (!Ptr) {
+          switch (BT->getKind()) {
           default:
             break;
-          case BuiltinType::Char_S:
-          case BuiltinType::SChar:
-          case BuiltinType::UChar:
-          case BuiltinType::Char_U:
-          case BuiltinType::Bool:
-            return Match;
+          case BuiltinType::Int:
+          case BuiltinType::UInt:
+            return MatchPromotion;
+          case BuiltinType::Short:
+          case BuiltinType::UShort:
+          case BuiltinType::WChar_S:
+          case BuiltinType::WChar_U:
+            return NoMatchPromotionTypeConfusion;
+          }
         }
+      }
       return NoMatch;
     }
 
@@ -378,8 +401,9 @@ ArgType::matchesType(ASTContext &C, QualType argTy) const {
 
       if (T == argTy)
         return Match;
-      // Check for "compatible types".
-      if (const BuiltinType *BT = argTy->getAs<BuiltinType>())
+      if (const auto *BT = argTy->getAs<BuiltinType>()) {
+        // Check if the only difference between them is signed vs unsigned
+        // if true, we consider they are compatible.
         switch (BT->getKind()) {
           default:
             break;
@@ -390,25 +414,66 @@ ArgType::matchesType(ASTContext &C, QualType argTy) const {
           case BuiltinType::Bool:
             if (T == C.UnsignedShortTy || T == C.ShortTy)
               return NoMatchTypeConfusion;
-            return T == C.UnsignedCharTy || T == C.SignedCharTy ? Match
-                                                                : NoMatch;
+            if (T == C.UnsignedCharTy || T == C.SignedCharTy)
+              return Match;
+            break;
           case BuiltinType::Short:
-            return T == C.UnsignedShortTy ? Match : NoMatch;
+            if (T == C.UnsignedShortTy)
+              return Match;
+            break;
           case BuiltinType::UShort:
-            return T == C.ShortTy ? Match : NoMatch;
+            if (T == C.ShortTy)
+              return Match;
+            break;
           case BuiltinType::Int:
-            return T == C.UnsignedIntTy ? Match : NoMatch;
+            if (T == C.UnsignedIntTy)
+              return Match;
+            break;
           case BuiltinType::UInt:
-            return T == C.IntTy ? Match : NoMatch;
+            if (T == C.IntTy)
+              return Match;
+            break;
           case BuiltinType::Long:
-            return T == C.UnsignedLongTy ? Match : NoMatch;
+            if (T == C.UnsignedLongTy)
+              return Match;
+            break;
           case BuiltinType::ULong:
-            return T == C.LongTy ? Match : NoMatch;
+            if (T == C.LongTy)
+              return Match;
+            break;
           case BuiltinType::LongLong:
-            return T == C.UnsignedLongLongTy ? Match : NoMatch;
+            if (T == C.UnsignedLongLongTy)
+              return Match;
+            break;
           case BuiltinType::ULongLong:
-            return T == C.LongLongTy ? Match : NoMatch;
-        }
+            if (T == C.LongLongTy)
+              return Match;
+            break;
+          }
+          // "Partially matched" because of promotions?
+          if (!Ptr) {
+            switch (BT->getKind()) {
+            default:
+              break;
+            case BuiltinType::Int:
+            case BuiltinType::UInt:
+              if (T == C.SignedCharTy || T == C.UnsignedCharTy ||
+                  T == C.ShortTy || T == C.UnsignedShortTy || T == C.WCharTy ||
+                  T == C.WideCharTy)
+                return MatchPromotion;
+              break;
+            case BuiltinType::Short:
+            case BuiltinType::UShort:
+              if (T == C.SignedCharTy || T == C.UnsignedCharTy)
+                return NoMatchPromotionTypeConfusion;
+              break;
+            case BuiltinType::WChar_U:
+            case BuiltinType::WChar_S:
+              if (T != C.WCharTy && T != C.WideCharTy)
+                return NoMatchPromotionTypeConfusion;
+            }
+          }
+      }
       return NoMatch;
     }
 
@@ -446,7 +511,7 @@ ArgType::matchesType(ASTContext &C, QualType argTy) const {
       if (C.getCanonicalType(argTy).getUnqualifiedType() == WInt)
         return Match;
 
-      QualType PromoArg = argTy->isPromotableIntegerType()
+      QualType PromoArg = C.isPromotableIntegerType(argTy)
                               ? C.getPromotedIntegerType(argTy)
                               : argTy;
       PromoArg = C.getCanonicalType(PromoArg).getUnqualifiedType();
@@ -619,6 +684,8 @@ analyze_format_string::LengthModifier::toString() const {
 
 const char *ConversionSpecifier::toString() const {
   switch (kind) {
+  case bArg: return "b";
+  case BArg: return "B";
   case dArg: return "d";
   case DArg: return "D";
   case iArg: return "i";
@@ -668,13 +735,13 @@ const char *ConversionSpecifier::toString() const {
   return nullptr;
 }
 
-Optional<ConversionSpecifier>
+std::optional<ConversionSpecifier>
 ConversionSpecifier::getStandardSpecifier() const {
   ConversionSpecifier::Kind NewKind;
 
   switch (getKind()) {
   default:
-    return None;
+    return std::nullopt;
   case DArg:
     NewKind = dArg;
     break;
@@ -740,7 +807,7 @@ bool FormatSpecifier::hasValidLengthModifier(const TargetInfo &Target,
             break;
         }
       }
-      LLVM_FALLTHROUGH;
+      [[fallthrough]];
     case LengthModifier::AsChar:
     case LengthModifier::AsLongLong:
     case LengthModifier::AsQuad:
@@ -748,6 +815,8 @@ bool FormatSpecifier::hasValidLengthModifier(const TargetInfo &Target,
     case LengthModifier::AsSizeT:
     case LengthModifier::AsPtrDiff:
       switch (CS.getKind()) {
+        case ConversionSpecifier::bArg:
+        case ConversionSpecifier::BArg:
         case ConversionSpecifier::dArg:
         case ConversionSpecifier::DArg:
         case ConversionSpecifier::iArg:
@@ -765,7 +834,7 @@ bool FormatSpecifier::hasValidLengthModifier(const TargetInfo &Target,
                  Target.getTriple().isOSOpenBSD();
         case ConversionSpecifier::FreeBSDrArg:
         case ConversionSpecifier::FreeBSDyArg:
-          return Target.getTriple().isOSFreeBSD() || Target.getTriple().isPS4();
+          return Target.getTriple().isOSFreeBSD() || Target.getTriple().isPS();
         default:
           return false;
       }
@@ -804,7 +873,7 @@ bool FormatSpecifier::hasValidLengthModifier(const TargetInfo &Target,
                  Target.getTriple().isOSOpenBSD();
         case ConversionSpecifier::FreeBSDrArg:
         case ConversionSpecifier::FreeBSDyArg:
-          return Target.getTriple().isOSFreeBSD() || Target.getTriple().isPS4();
+          return Target.getTriple().isOSFreeBSD() || Target.getTriple().isPS();
         default:
           return false;
       }
@@ -911,6 +980,8 @@ bool FormatSpecifier::hasStandardLengthModifier() const {
 bool FormatSpecifier::hasStandardConversionSpecifier(
     const LangOptions &LangOpt) const {
   switch (CS.getKind()) {
+    case ConversionSpecifier::bArg:
+    case ConversionSpecifier::BArg:
     case ConversionSpecifier::cArg:
     case ConversionSpecifier::dArg:
     case ConversionSpecifier::iArg:
@@ -970,7 +1041,8 @@ bool FormatSpecifier::hasStandardLengthConversionCombination() const {
   return true;
 }
 
-Optional<LengthModifier> FormatSpecifier::getCorrectedLengthModifier() const {
+std::optional<LengthModifier>
+FormatSpecifier::getCorrectedLengthModifier() const {
   if (CS.isAnyIntArg() || CS.getKind() == ConversionSpecifier::nArg) {
     if (LM.getKind() == LengthModifier::AsLongDouble ||
         LM.getKind() == LengthModifier::AsQuad) {
@@ -980,15 +1052,14 @@ Optional<LengthModifier> FormatSpecifier::getCorrectedLengthModifier() const {
     }
   }
 
-  return None;
+  return std::nullopt;
 }
 
 bool FormatSpecifier::namedTypeToLengthModifier(QualType QT,
                                                 LengthModifier &LM) {
-  assert(isa<TypedefType>(QT) && "Expected a TypedefType");
-  const TypedefNameDecl *Typedef = cast<TypedefType>(QT)->getDecl();
-
-  for (;;) {
+  for (/**/; const auto *TT = QT->getAs<TypedefType>();
+       QT = TT->getDecl()->getUnderlyingType()) {
+    const TypedefNameDecl *Typedef = TT->getDecl();
     const IdentifierInfo *Identifier = Typedef->getIdentifier();
     if (Identifier->getName() == "size_t") {
       LM.setKind(LengthModifier::AsSizeT);
@@ -1007,12 +1078,6 @@ bool FormatSpecifier::namedTypeToLengthModifier(QualType QT,
       LM.setKind(LengthModifier::AsPtrDiff);
       return true;
     }
-
-    QualType T = Typedef->getUnderlyingType();
-    if (!isa<TypedefType>(T))
-      break;
-
-    Typedef = cast<TypedefType>(T)->getDecl();
   }
   return false;
 }
diff --git a/gnu/llvm/clang/lib/Basic/TargetInfo.cpp b/gnu/llvm/clang/lib/Basic/TargetInfo.cpp
index 2a7157ddb7a..8ee43261fc1 100644
--- a/gnu/llvm/clang/lib/Basic/TargetInfo.cpp
+++ b/gnu/llvm/clang/lib/Basic/TargetInfo.cpp
@@ -14,6 +14,7 @@
 #include "clang/Basic/AddressSpaces.h"
 #include "clang/Basic/CharInfo.h"
 #include "clang/Basic/Diagnostic.h"
+#include "clang/Basic/DiagnosticFrontend.h"
 #include "clang/Basic/LangOptions.h"
 #include "llvm/ADT/APFloat.h"
 #include "llvm/ADT/STLExtras.h"
@@ -23,9 +24,33 @@
 using namespace clang;
 
 static const LangASMap DefaultAddrSpaceMap = {0};
+// The fake address space map must have a distinct entry for each
+// language-specific address space.
+static const LangASMap FakeAddrSpaceMap = {
+    0,  // Default
+    1,  // opencl_global
+    3,  // opencl_local
+    2,  // opencl_constant
+    0,  // opencl_private
+    4,  // opencl_generic
+    5,  // opencl_global_device
+    6,  // opencl_global_host
+    7,  // cuda_device
+    8,  // cuda_constant
+    9,  // cuda_shared
+    1,  // sycl_global
+    5,  // sycl_global_device
+    6,  // sycl_global_host
+    3,  // sycl_local
+    0,  // sycl_private
+    10, // ptr32_sptr
+    11, // ptr32_uptr
+    12, // ptr64
+    13, // hlsl_groupshared
+};
 
 // TargetInfo Constructor.
-TargetInfo::TargetInfo(const llvm::Triple &T) : TargetOpts(), Triple(T) {
+TargetInfo::TargetInfo(const llvm::Triple &T) : Triple(T) {
   // Set defaults.  Defaults are set for a 32-bit RISC platform, like PPC or
   // SPARC.  These should be overridden by concrete targets as needed.
   BigEndian = !T.isLittleEndian();
@@ -33,15 +58,20 @@ TargetInfo::TargetInfo(const llvm::Triple &T) : TargetOpts(), Triple(T) {
   VLASupported = true;
   NoAsmVariants = false;
   HasLegalHalfType = false;
+  HalfArgsAndReturns = false;
   HasFloat128 = false;
+  HasIbm128 = false;
   HasFloat16 = false;
   HasBFloat16 = false;
+  HasLongDouble = true;
+  HasFPReturn = true;
   HasStrictFP = false;
   PointerWidth = PointerAlign = 32;
   BoolWidth = BoolAlign = 8;
   IntWidth = IntAlign = 32;
   LongWidth = LongAlign = 32;
   LongLongWidth = LongLongAlign = 64;
+  Int128Align = 128;
 
   // Fixed point default bit widths
   ShortAccumWidth = ShortAccumAlign = 16;
@@ -66,8 +96,8 @@ TargetInfo::TargetInfo(const llvm::Triple &T) : TargetOpts(), Triple(T) {
   // From the glibc documentation, on GNU systems, malloc guarantees 16-byte
   // alignment on 64-bit systems and 8-byte alignment on 32-bit systems. See
   // https://www.gnu.org/software/libc/manual/html_node/Malloc-Examples.html.
-  // This alignment guarantee also applies to Windows and Android. On Darwin,
-  // the alignment is 16 bytes on both 64-bit and 32-bit systems.
+  // This alignment guarantee also applies to Windows and Android. On Darwin
+  // and OpenBSD, the alignment is 16 bytes on both 64-bit and 32-bit systems.
   if (T.isGNUEnvironment() || T.isWindowsMSVCEnvironment() || T.isAndroid())
     NewAlign = Triple.isArch64Bit() ? 128 : Triple.isArch32Bit() ? 64 : 0;
   else if (T.isOSDarwin() || T.isOSOpenBSD())
@@ -83,6 +113,7 @@ TargetInfo::TargetInfo(const llvm::Triple &T) : TargetOpts(), Triple(T) {
   LongDoubleWidth = 64;
   LongDoubleAlign = 64;
   Float128Align = 128;
+  Ibm128Align = 128;
   LargeArrayMinWidth = 0;
   LargeArrayAlign = 0;
   MaxAtomicPromoteWidth = MaxAtomicInlineWidth = 0;
@@ -113,6 +144,7 @@ TargetInfo::TargetInfo(const llvm::Triple &T) : TargetOpts(), Triple(T) {
   DoubleFormat = &llvm::APFloat::IEEEdouble();
   LongDoubleFormat = &llvm::APFloat::IEEEdouble();
   Float128Format = &llvm::APFloat::IEEEquad();
+  Ibm128Format = &llvm::APFloat::PPCDoubleDouble();
   MCountName = "mcount";
   UserLabelPrefix = "_";
   RegParmMax = 0;
@@ -126,7 +158,7 @@ TargetInfo::TargetInfo(const llvm::Triple &T) : TargetOpts(), Triple(T) {
   ARMCDECoprocMask = 0;
 
   // Default to no types using fpret.
-  RealTypeUsesObjCFPRet = 0;
+  RealTypeUsesObjCFPRetMask = 0;
 
   // Default to not using fp2ret for __Complex long double
   ComplexLongDoubleUsesFP2Ret = false;
@@ -145,6 +177,8 @@ TargetInfo::TargetInfo(const llvm::Triple &T) : TargetOpts(), Triple(T) {
   PlatformMinVersion = VersionTuple();
 
   MaxOpenCLWorkGroupSize = 1024;
+
+  MaxBitIntWidth.reset();
 }
 
 // Out of line virtual dtor for TargetInfo.
@@ -198,11 +232,11 @@ const char *TargetInfo::getTypeConstantSuffix(IntType T) const {
   case UnsignedChar:
     if (getCharWidth() < getIntWidth())
       return "";
-    LLVM_FALLTHROUGH;
+    [[fallthrough]];
   case UnsignedShort:
     if (getShortWidth() < getIntWidth())
       return "";
-    LLVM_FALLTHROUGH;
+    [[fallthrough]];
   case UnsignedInt:      return "U";
   case UnsignedLong:     return "UL";
   case UnsignedLongLong: return "ULL";
@@ -276,32 +310,38 @@ TargetInfo::IntType TargetInfo::getLeastIntTypeByWidth(unsigned BitWidth,
   return NoInt;
 }
 
-TargetInfo::RealType TargetInfo::getRealTypeByWidth(unsigned BitWidth,
-                                                    bool ExplicitIEEE) const {
+FloatModeKind TargetInfo::getRealTypeByWidth(unsigned BitWidth,
+                                             FloatModeKind ExplicitType) const {
+  if (getHalfWidth() == BitWidth)
+    return FloatModeKind::Half;
   if (getFloatWidth() == BitWidth)
-    return Float;
+    return FloatModeKind::Float;
   if (getDoubleWidth() == BitWidth)
-    return Double;
+    return FloatModeKind::Double;
 
   switch (BitWidth) {
   case 96:
     if (&getLongDoubleFormat() == &llvm::APFloat::x87DoubleExtended())
-      return LongDouble;
+      return FloatModeKind::LongDouble;
     break;
   case 128:
     // The caller explicitly asked for an IEEE compliant type but we still
     // have to check if the target supports it.
-    if (ExplicitIEEE)
-      return hasFloat128Type() ? Float128 : NoFloat;
+    if (ExplicitType == FloatModeKind::Float128)
+      return hasFloat128Type() ? FloatModeKind::Float128
+                               : FloatModeKind::NoFloat;
+    if (ExplicitType == FloatModeKind::Ibm128)
+      return hasIbm128Type() ? FloatModeKind::Ibm128
+                             : FloatModeKind::NoFloat;
     if (&getLongDoubleFormat() == &llvm::APFloat::PPCDoubleDouble() ||
         &getLongDoubleFormat() == &llvm::APFloat::IEEEquad())
-      return LongDouble;
+      return FloatModeKind::LongDouble;
     if (hasFloat128Type())
-      return Float128;
+      return FloatModeKind::Float128;
     break;
   }
 
-  return NoFloat;
+  return FloatModeKind::NoFloat;
 }
 
 /// getTypeAlign - Return the alignment (in bits) of the specified integer type
@@ -406,12 +446,14 @@ void TargetInfo::adjust(DiagnosticsEngine &Diags, LangOptions &Opts) {
     // for OpenCL C 2.0 but with no access to target capabilities. Target
     // should be immutable once created and thus these language options need
     // to be defined only once.
-    if (Opts.OpenCLVersion == 300) {
+    if (Opts.getOpenCLCompatibleVersion() == 300) {
       const auto &OpenCLFeaturesMap = getSupportedOpenCLOpts();
       Opts.OpenCLGenericAddressSpace = hasFeatureEnabled(
           OpenCLFeaturesMap, "__opencl_c_generic_address_space");
       Opts.OpenCLPipes =
           hasFeatureEnabled(OpenCLFeaturesMap, "__opencl_c_pipes");
+      Opts.Blocks =
+          hasFeatureEnabled(OpenCLFeaturesMap, "__opencl_c_device_enqueue");
     }
   }
 
@@ -437,6 +479,20 @@ void TargetInfo::adjust(DiagnosticsEngine &Diags, LangOptions &Opts) {
     } else if (Opts.LongDoubleSize == 128) {
       LongDoubleWidth = LongDoubleAlign = 128;
       LongDoubleFormat = &llvm::APFloat::IEEEquad();
+    } else if (Opts.LongDoubleSize == 80) {
+      LongDoubleFormat = &llvm::APFloat::x87DoubleExtended();
+      if (getTriple().isWindowsMSVCEnvironment()) {
+        LongDoubleWidth = 128;
+        LongDoubleAlign = 128;
+      } else { // Linux
+        if (getTriple().getArch() == llvm::Triple::x86) {
+          LongDoubleWidth = 96;
+          LongDoubleAlign = 32;
+        } else {
+          LongDoubleWidth = 128;
+          LongDoubleAlign = 128;
+        }
+      }
     }
   }
 
@@ -452,6 +508,12 @@ void TargetInfo::adjust(DiagnosticsEngine &Diags, LangOptions &Opts) {
     Diags.Report(diag::err_opt_not_valid_on_target) << "-fprotect-parens";
     Opts.ProtectParens = false;
   }
+
+  if (Opts.MaxBitIntWidth)
+    MaxBitIntWidth = static_cast<unsigned>(Opts.MaxBitIntWidth);
+
+  if (Opts.FakeAddressSpaceMap)
+    AddrSpaceMap = &FakeAddrSpaceMap;
 }
 
 bool TargetInfo::initFeatureMap(
@@ -459,21 +521,73 @@ bool TargetInfo::initFeatureMap(
     const std::vector<std::string> &FeatureVec) const {
   for (const auto &F : FeatureVec) {
     StringRef Name = F;
+    if (Name.empty())
+      continue;
     // Apply the feature via the target.
-    bool Enabled = Name[0] == '+';
-    setFeatureEnabled(Features, Name.substr(1), Enabled);
+    if (Name[0] != '+' && Name[0] != '-')
+      Diags.Report(diag::warn_fe_backend_invalid_feature_flag) << Name;
+    else
+      setFeatureEnabled(Features, Name.substr(1), Name[0] == '+');
   }
   return true;
 }
 
+ParsedTargetAttr TargetInfo::parseTargetAttr(StringRef Features) const {
+  ParsedTargetAttr Ret;
+  if (Features == "default")
+    return Ret;
+  SmallVector<StringRef, 1> AttrFeatures;
+  Features.split(AttrFeatures, ",");
+
+  // Grab the various features and prepend a "+" to turn on the feature to
+  // the backend and add them to our existing set of features.
+  for (auto &Feature : AttrFeatures) {
+    // Go ahead and trim whitespace rather than either erroring or
+    // accepting it weirdly.
+    Feature = Feature.trim();
+
+    // TODO: Support the fpmath option. It will require checking
+    // overall feature validity for the function with the rest of the
+    // attributes on the function.
+    if (Feature.startswith("fpmath="))
+      continue;
+
+    if (Feature.startswith("branch-protection=")) {
+      Ret.BranchProtection = Feature.split('=').second.trim();
+      continue;
+    }
+
+    // While we're here iterating check for a different target cpu.
+    if (Feature.startswith("arch=")) {
+      if (!Ret.CPU.empty())
+        Ret.Duplicate = "arch=";
+      else
+        Ret.CPU = Feature.split("=").second.trim();
+    } else if (Feature.startswith("tune=")) {
+      if (!Ret.Tune.empty())
+        Ret.Duplicate = "tune=";
+      else
+        Ret.Tune = Feature.split("=").second.trim();
+    } else if (Feature.startswith("no-"))
+      Ret.Features.push_back("-" + Feature.split("-").second.str());
+    else
+      Ret.Features.push_back("+" + Feature.str());
+  }
+  return Ret;
+}
+
 TargetInfo::CallingConvKind
 TargetInfo::getCallingConvKind(bool ClangABICompat4) const {
   if (getCXXABI() != TargetCXXABI::Microsoft &&
-      (ClangABICompat4 || getTriple().getOS() == llvm::Triple::PS4))
+      (ClangABICompat4 || getTriple().isPS4()))
     return CCK_ClangABI4OrPS4;
   return CCK_Default;
 }
 
+bool TargetInfo::areDefaultedSMFStillPOD(const LangOptions &LangOpts) const {
+  return LangOpts.getClangABICompat() > LangOptions::ClangABI::Ver15;
+}
+
 LangAS TargetInfo::getOpenCLTypeAddrSpace(OpenCLTypeKind TK) const {
   switch (TK) {
   case OCLTK_Image:
diff --git a/gnu/llvm/clang/lib/Basic/Targets/Mips.h b/gnu/llvm/clang/lib/Basic/Targets/Mips.h
index 2389f559a12..6b443c8b544 100644
--- a/gnu/llvm/clang/lib/Basic/Targets/Mips.h
+++ b/gnu/llvm/clang/lib/Basic/Targets/Mips.h
@@ -40,7 +40,6 @@ class LLVM_LIBRARY_VISIBILITY MipsTargetInfo : public TargetInfo {
       resetDataLayout(("e-" + Layout).str());
   }
 
-  static const Builtin::Info BuiltinInfo[];
   std::string CPU;
   bool IsMips16;
   bool IsMicromips;
@@ -226,7 +225,7 @@ public:
         "$msair", "$msacsr", "$msaaccess", "$msasave", "$msamodify",
         "$msarequest", "$msamap", "$msaunmap"
     };
-    return llvm::makeArrayRef(GCCRegNames);
+    return llvm::ArrayRef(GCCRegNames);
   }
 
   bool validateAsmConstraint(const char *&Name,
@@ -396,8 +395,8 @@ public:
         {{"ra"}, "$31"}
     };
     if (ABI == "o32")
-      return llvm::makeArrayRef(O32RegAliases);
-    return llvm::makeArrayRef(NewABIRegAliases);
+      return llvm::ArrayRef(O32RegAliases);
+    return llvm::ArrayRef(NewABIRegAliases);
   }
 
   bool hasInt128Type() const override {
@@ -407,7 +406,7 @@ public:
   unsigned getUnwindWordWidth() const override;
 
   bool validateTarget(DiagnosticsEngine &Diags) const override;
-  bool hasExtIntType() const override { return true; }
+  bool hasBitIntType() const override { return true; }
 };
 } // namespace targets
 } // namespace clang
diff --git a/gnu/llvm/clang/lib/Basic/Targets/OSTargets.h b/gnu/llvm/clang/lib/Basic/Targets/OSTargets.h
index 12df95c19f3..fd372cb12df 100644
--- a/gnu/llvm/clang/lib/Basic/Targets/OSTargets.h
+++ b/gnu/llvm/clang/lib/Basic/Targets/OSTargets.h
@@ -50,8 +50,7 @@ protected:
   }
 
 public:
-  CloudABITargetInfo(const llvm::Triple &Triple, const TargetOptions &Opts)
-      : OSTargetInfo<Target>(Triple, Opts) {}
+  using OSTargetInfo<Target>::OSTargetInfo;
 };
 
 // Ananas target
@@ -66,8 +65,7 @@ protected:
   }
 
 public:
-  AnanasTargetInfo(const llvm::Triple &Triple, const TargetOptions &Opts)
-      : OSTargetInfo<Target>(Triple, Opts) {}
+  using OSTargetInfo<Target>::OSTargetInfo;
 };
 
 void getDarwinDefines(MacroBuilder &Builder, const LangOptions &Opts,
@@ -108,6 +106,8 @@ public:
         this->TLSSupported = !Triple.isOSVersionLT(2);
       else
         this->TLSSupported = !Triple.isOSVersionLT(3);
+    } else if (Triple.isDriverKit()) {
+      // No TLS on DriverKit.
     }
 
     this->MCountName = "\01mcount";
@@ -148,9 +148,7 @@ public:
       return 64;
     }
 
-    unsigned Major, Minor, Micro;
-    T.getOSVersion(Major, Minor, Micro);
-    if (llvm::VersionTuple(Major, Minor, Micro) < MinVersion)
+    if (T.getOSVersion() < MinVersion)
       return 64;
     return OSTargetInfo<Target>::getExnObjectAlignment();
   }
@@ -163,6 +161,10 @@ public:
                            : TargetInfo::UnsignedLongLong)
                : TargetInfo::getLeastIntTypeByWidth(BitWidth, IsSigned);
   }
+
+  bool areDefaultedSMFStillPOD(const LangOptions &) const override {
+    return false;
+  }
 };
 
 // DragonFlyBSD Target
@@ -179,6 +181,8 @@ protected:
     Builder.defineMacro("__KPRINTF_ATTRIBUTE__");
     Builder.defineMacro("__tune_i386__");
     DefineStd(Builder, "unix", Opts);
+    if (this->HasFloat128)
+      Builder.defineMacro("__FLOAT128__");
   }
 
 public:
@@ -188,6 +192,7 @@ public:
     default:
     case llvm::Triple::x86:
     case llvm::Triple::x86_64:
+      this->HasFloat128 = true;
       this->MCountName = ".mcount";
       break;
     }
@@ -277,8 +282,7 @@ protected:
   }
 
 public:
-  KFreeBSDTargetInfo(const llvm::Triple &Triple, const TargetOptions &Opts)
-      : OSTargetInfo<Target>(Triple, Opts) {}
+  using OSTargetInfo<Target>::OSTargetInfo;
 };
 
 // Haiku Target
@@ -291,7 +295,7 @@ protected:
     Builder.defineMacro("__HAIKU__");
     Builder.defineMacro("__ELF__");
     DefineStd(Builder, "unix", Opts);
-    if (this->HasFloat128) 
+    if (this->HasFloat128)
       Builder.defineMacro("__FLOAT128__");
   }
 
@@ -333,8 +337,7 @@ protected:
       Builder.defineMacro("_GNU_SOURCE");
   }
 public:
-  HurdTargetInfo(const llvm::Triple &Triple, const TargetOptions &Opts)
-      : OSTargetInfo<Target>(Triple, Opts) {}
+  using OSTargetInfo<Target>::OSTargetInfo;
 };
 
 // Minix Target
@@ -357,8 +360,7 @@ protected:
   }
 
 public:
-  MinixTargetInfo(const llvm::Triple &Triple, const TargetOptions &Opts)
-      : OSTargetInfo<Target>(Triple, Opts) {}
+  using OSTargetInfo<Target>::OSTargetInfo;
 };
 
 // Linux target
@@ -373,10 +375,9 @@ protected:
     Builder.defineMacro("__ELF__");
     if (Triple.isAndroid()) {
       Builder.defineMacro("__ANDROID__", "1");
-      unsigned Maj, Min, Rev;
-      Triple.getEnvironmentVersion(Maj, Min, Rev);
       this->PlatformName = "android";
-      this->PlatformMinVersion = VersionTuple(Maj, Min, Rev);
+      this->PlatformMinVersion = Triple.getEnvironmentVersion();
+      const unsigned Maj = this->PlatformMinVersion.getMajor();
       if (Maj) {
         Builder.defineMacro("__ANDROID_MIN_SDK_VERSION__", Twine(Maj));
         // This historical but ambiguous name for the minSdkVersion macro. Keep
@@ -475,7 +476,7 @@ public:
     case llvm::Triple::x86:
     case llvm::Triple::x86_64:
       this->HasFloat128 = true;
-      LLVM_FALLTHROUGH;
+      [[fallthrough]];
     default:
       this->MCountName = "__mcount";
       break;
@@ -494,23 +495,6 @@ public:
   }
 };
 
-// PSP Target
-template <typename Target>
-class LLVM_LIBRARY_VISIBILITY PSPTargetInfo : public OSTargetInfo<Target> {
-protected:
-  void getOSDefines(const LangOptions &Opts, const llvm::Triple &Triple,
-                    MacroBuilder &Builder) const override {
-    // PSP defines; list based on the output of the pspdev gcc toolchain.
-    Builder.defineMacro("PSP");
-    Builder.defineMacro("_PSP");
-    Builder.defineMacro("__psp__");
-    Builder.defineMacro("__ELF__");
-  }
-
-public:
-  PSPTargetInfo(const llvm::Triple &Triple) : OSTargetInfo<Target>(Triple) {}
-};
-
 // PS3 PPU Target
 template <typename Target>
 class LLVM_LIBRARY_VISIBILITY PS3PPUTargetInfo : public OSTargetInfo<Target> {
@@ -539,8 +523,9 @@ public:
   }
 };
 
+// Common base class for PS4/PS5 targets.
 template <typename Target>
-class LLVM_LIBRARY_VISIBILITY PS4OSTargetInfo : public OSTargetInfo<Target> {
+class LLVM_LIBRARY_VISIBILITY PSOSTargetInfo : public OSTargetInfo<Target> {
 protected:
   void getOSDefines(const LangOptions &Opts, const llvm::Triple &Triple,
                     MacroBuilder &Builder) const override {
@@ -550,33 +535,66 @@ protected:
     DefineStd(Builder, "unix", Opts);
     Builder.defineMacro("__ELF__");
     Builder.defineMacro("__SCE__");
-    Builder.defineMacro("__ORBIS__");
   }
 
 public:
-  PS4OSTargetInfo(const llvm::Triple &Triple, const TargetOptions &Opts)
+  PSOSTargetInfo(const llvm::Triple &Triple, const TargetOptions &Opts)
       : OSTargetInfo<Target>(Triple, Opts) {
     this->WCharType = TargetInfo::UnsignedShort;
 
-    // On PS4, TLS variable cannot be aligned to more than 32 bytes (256 bits).
+    // On PS4/PS5, TLS variable cannot be aligned to more than 32 bytes (256
+    // bits).
     this->MaxTLSAlign = 256;
 
-    // On PS4, do not honor explicit bit field alignment,
+    // On PS4/PS5, do not honor explicit bit field alignment,
     // as in "__attribute__((aligned(2))) int b : 1;".
     this->UseExplicitBitFieldAlignment = false;
 
-    switch (Triple.getArch()) {
-    default:
-    case llvm::Triple::x86_64:
-      this->MCountName = ".mcount";
-      this->NewAlign = 256;
-      break;
-    }
+    this->MCountName = ".mcount";
+    this->NewAlign = 256;
+    this->SuitableAlign = 256;
   }
+
   TargetInfo::CallingConvCheckResult
   checkCallingConvention(CallingConv CC) const override {
     return (CC == CC_C) ? TargetInfo::CCCR_OK : TargetInfo::CCCR_Error;
   }
+
+  bool areDefaultedSMFStillPOD(const LangOptions &) const override {
+    return false;
+  }
+};
+
+// PS4 Target
+template <typename Target>
+class LLVM_LIBRARY_VISIBILITY PS4OSTargetInfo : public PSOSTargetInfo<Target> {
+protected:
+  void getOSDefines(const LangOptions &Opts, const llvm::Triple &Triple,
+                    MacroBuilder &Builder) const override {
+    // Start with base class defines.
+    PSOSTargetInfo<Target>::getOSDefines(Opts, Triple, Builder);
+
+    Builder.defineMacro("__ORBIS__");
+  }
+
+public:
+  using PSOSTargetInfo<Target>::PSOSTargetInfo;
+};
+
+// PS5 Target
+template <typename Target>
+class LLVM_LIBRARY_VISIBILITY PS5OSTargetInfo : public PSOSTargetInfo<Target> {
+protected:
+  void getOSDefines(const LangOptions &Opts, const llvm::Triple &Triple,
+                    MacroBuilder &Builder) const override {
+    // Start with base class defines.
+    PSOSTargetInfo<Target>::getOSDefines(Opts, Triple, Builder);
+
+    Builder.defineMacro("__PROSPERO__");
+  }
+
+public:
+  using PSOSTargetInfo<Target>::PSOSTargetInfo;
 };
 
 // RTEMS Target
@@ -676,9 +694,11 @@ protected:
     DefineStd(Builder, "unix", Opts);
     Builder.defineMacro("_IBMR2");
     Builder.defineMacro("_POWER");
+    Builder.defineMacro("__THW_BIG_ENDIAN__");
 
     Builder.defineMacro("_AIX");
     Builder.defineMacro("__TOS_AIX__");
+    Builder.defineMacro("__HOS_AIX__");
 
     if (Opts.C11) {
       Builder.defineMacro("__STDC_NO_ATOMICS__");
@@ -688,23 +708,32 @@ protected:
     if (Opts.EnableAIXExtendedAltivecABI)
       Builder.defineMacro("__EXTABI__");
 
-    unsigned Major, Minor, Micro;
-    Triple.getOSVersion(Major, Minor, Micro);
+    VersionTuple OsVersion = Triple.getOSVersion();
 
     // Define AIX OS-Version Macros.
     // Includes logic for legacy versions of AIX; no specific intent to support.
-    std::pair<int, int> OsVersion = {Major, Minor};
-    if (OsVersion >= std::make_pair(3, 2)) Builder.defineMacro("_AIX32");
-    if (OsVersion >= std::make_pair(4, 1)) Builder.defineMacro("_AIX41");
-    if (OsVersion >= std::make_pair(4, 3)) Builder.defineMacro("_AIX43");
-    if (OsVersion >= std::make_pair(5, 0)) Builder.defineMacro("_AIX50");
-    if (OsVersion >= std::make_pair(5, 1)) Builder.defineMacro("_AIX51");
-    if (OsVersion >= std::make_pair(5, 2)) Builder.defineMacro("_AIX52");
-    if (OsVersion >= std::make_pair(5, 3)) Builder.defineMacro("_AIX53");
-    if (OsVersion >= std::make_pair(6, 1)) Builder.defineMacro("_AIX61");
-    if (OsVersion >= std::make_pair(7, 1)) Builder.defineMacro("_AIX71");
-    if (OsVersion >= std::make_pair(7, 2)) Builder.defineMacro("_AIX72");
-    if (OsVersion >= std::make_pair(7, 3)) Builder.defineMacro("_AIX73");
+    if (OsVersion >= VersionTuple(3, 2))
+      Builder.defineMacro("_AIX32");
+    if (OsVersion >= VersionTuple(4, 1))
+      Builder.defineMacro("_AIX41");
+    if (OsVersion >= VersionTuple(4, 3))
+      Builder.defineMacro("_AIX43");
+    if (OsVersion >= VersionTuple(5, 0))
+      Builder.defineMacro("_AIX50");
+    if (OsVersion >= VersionTuple(5, 1))
+      Builder.defineMacro("_AIX51");
+    if (OsVersion >= VersionTuple(5, 2))
+      Builder.defineMacro("_AIX52");
+    if (OsVersion >= VersionTuple(5, 3))
+      Builder.defineMacro("_AIX53");
+    if (OsVersion >= VersionTuple(6, 1))
+      Builder.defineMacro("_AIX61");
+    if (OsVersion >= VersionTuple(7, 1))
+      Builder.defineMacro("_AIX71");
+    if (OsVersion >= VersionTuple(7, 2))
+      Builder.defineMacro("_AIX72");
+    if (OsVersion >= VersionTuple(7, 3))
+      Builder.defineMacro("_AIX73");
 
     // FIXME: Do not define _LONG_LONG when -fno-long-long is specified.
     Builder.defineMacro("_LONG_LONG");
@@ -727,6 +756,7 @@ protected:
 public:
   AIXTargetInfo(const llvm::Triple &Triple, const TargetOptions &Opts)
       : OSTargetInfo<Target>(Triple, Opts) {
+    this->MCountName = "__mcount";
     this->TheCXXABI.set(TargetCXXABI::XL);
 
     if (this->PointerWidth == 64) {
@@ -738,10 +768,15 @@ public:
   }
 
   // AIX sets FLT_EVAL_METHOD to be 1.
-  unsigned getFloatEvalMethod() const override { return 1; }
-  bool hasInt128Type() const override { return false; }
+  LangOptions::FPEvalMethodKind getFPEvalMethod() const override {
+    return LangOptions::FPEvalMethodKind::FEM_Double;
+  }
 
   bool defaultsToAIXPowerAlignment() const override { return true; }
+
+  bool areDefaultedSMFStillPOD(const LangOptions &) const override {
+    return false;
+  }
 };
 
 // z/OS target
@@ -799,7 +834,10 @@ public:
     this->UseZeroLengthBitfieldAlignment = true;
     this->UseLeadingZeroLengthBitfield = false;
     this->ZeroLengthBitfieldBoundary = 32;
-    this->DefaultAlignForAttributeAligned = 128;
+  }
+
+  bool areDefaultedSMFStillPOD(const LangOptions &) const override {
+    return false;
   }
 };
 
@@ -887,6 +925,9 @@ protected:
     // Required by the libc++ locale support.
     if (Opts.CPlusPlus)
       Builder.defineMacro("_GNU_SOURCE");
+    Builder.defineMacro("__Fuchsia_API_level__", Twine(Opts.FuchsiaAPILevel));
+    this->PlatformName = "fuchsia";
+    this->PlatformMinVersion = VersionTuple(Opts.FuchsiaAPILevel);
   }
 
 public:
@@ -935,8 +976,7 @@ class LLVM_LIBRARY_VISIBILITY WASITargetInfo
   }
 
 public:
-  explicit WASITargetInfo(const llvm::Triple &Triple, const TargetOptions &Opts)
-      : WebAssemblyOSTargetInfo<Target>(Triple, Opts) {}
+  using WebAssemblyOSTargetInfo<Target>::WebAssemblyOSTargetInfo;
 };
 
 // Emscripten target
@@ -946,6 +986,7 @@ class LLVM_LIBRARY_VISIBILITY EmscriptenTargetInfo
   void getOSDefines(const LangOptions &Opts, const llvm::Triple &Triple,
                     MacroBuilder &Builder) const final {
     WebAssemblyOSTargetInfo<Target>::getOSDefines(Opts, Triple, Builder);
+    DefineStd(Builder, "unix", Opts);
     Builder.defineMacro("__EMSCRIPTEN__");
     if (Opts.POSIXThreads)
       Builder.defineMacro("__EMSCRIPTEN_PTHREADS__");
diff --git a/gnu/llvm/clang/lib/Basic/Targets/RISCV.cpp b/gnu/llvm/clang/lib/Basic/Targets/RISCV.cpp
index 9705129b39d..7c801657b6a 100644
--- a/gnu/llvm/clang/lib/Basic/Targets/RISCV.cpp
+++ b/gnu/llvm/clang/lib/Basic/Targets/RISCV.cpp
@@ -11,10 +11,13 @@
 //===----------------------------------------------------------------------===//
 
 #include "RISCV.h"
+#include "clang/Basic/Diagnostic.h"
 #include "clang/Basic/MacroBuilder.h"
 #include "clang/Basic/TargetBuiltins.h"
 #include "llvm/ADT/StringSwitch.h"
-#include "llvm/Support/TargetParser.h"
+#include "llvm/Support/raw_ostream.h"
+#include "llvm/TargetParser/RISCVTargetParser.h"
+#include <optional>
 
 using namespace clang;
 using namespace clang::targets;
@@ -38,7 +41,7 @@ ArrayRef<const char *> RISCVTargetInfo::getGCCRegNames() const {
       "v8",  "v9",  "v10", "v11", "v12", "v13", "v14", "v15",
       "v16", "v17", "v18", "v19", "v20", "v21", "v22", "v23",
       "v24", "v25", "v26", "v27", "v28", "v29", "v30", "v31"};
-  return llvm::makeArrayRef(GCCRegNames);
+  return llvm::ArrayRef(GCCRegNames);
 }
 
 ArrayRef<TargetInfo::GCCRegAlias> RISCVTargetInfo::getGCCRegAliases() const {
@@ -59,7 +62,7 @@ ArrayRef<TargetInfo::GCCRegAlias> RISCVTargetInfo::getGCCRegAliases() const {
       {{"fs4"}, "f20"}, {{"fs5"}, "f21"}, {{"fs6"}, "f22"},  {{"fs7"}, "f23"},
       {{"fs8"}, "f24"}, {{"fs9"}, "f25"}, {{"fs10"}, "f26"}, {{"fs11"}, "f27"},
       {{"ft8"}, "f28"}, {{"ft9"}, "f29"}, {{"ft10"}, "f30"}, {{"ft11"}, "f31"}};
-  return llvm::makeArrayRef(GCCRegAliases);
+  return llvm::ArrayRef(GCCRegAliases);
 }
 
 bool RISCVTargetInfo::validateAsmConstraint(
@@ -105,7 +108,7 @@ std::string RISCVTargetInfo::convertConstraint(const char *&Constraint) const {
   std::string R;
   switch (*Constraint) {
   case 'v':
-    R = std::string("v");
+    R = std::string("^") + std::string(Constraint, 2);
     Constraint += 1;
     break;
   default:
@@ -115,6 +118,10 @@ std::string RISCVTargetInfo::convertConstraint(const char *&Constraint) const {
   return R;
 }
 
+static unsigned getVersionValue(unsigned MajorVersion, unsigned MinorVersion) {
+  return MajorVersion * 1000000 + MinorVersion * 1000;
+}
+
 void RISCVTargetInfo::getTargetDefines(const LangOptions &Opts,
                                        MacroBuilder &Builder) const {
   Builder.defineMacro("__ELF__");
@@ -122,6 +129,10 @@ void RISCVTargetInfo::getTargetDefines(const LangOptions &Opts,
   bool Is64Bit = getTriple().getArch() == llvm::Triple::riscv64;
   Builder.defineMacro("__riscv_xlen", Is64Bit ? "64" : "32");
   StringRef CodeModel = getTargetOpts().CodeModel;
+  unsigned FLen = ISAInfo->getFLen();
+  unsigned MinVLen = ISAInfo->getMinVLen();
+  unsigned MaxELen = ISAInfo->getMaxELen();
+  unsigned MaxELenFp = ISAInfo->getMaxELenFp();
   if (CodeModel == "default")
     CodeModel = "small";
 
@@ -142,17 +153,25 @@ void RISCVTargetInfo::getTargetDefines(const LangOptions &Opts,
     Builder.defineMacro("__riscv_abi_rve");
 
   Builder.defineMacro("__riscv_arch_test");
-  Builder.defineMacro("__riscv_i", "2000000");
 
-  if (HasM) {
-    Builder.defineMacro("__riscv_m", "2000000");
+  for (auto &Extension : ISAInfo->getExtensions()) {
+    auto ExtName = Extension.first;
+    auto ExtInfo = Extension.second;
+
+    Builder.defineMacro(
+        Twine("__riscv_", ExtName),
+        Twine(getVersionValue(ExtInfo.MajorVersion, ExtInfo.MinorVersion)));
+  }
+
+  if (ISAInfo->hasExtension("m") || ISAInfo->hasExtension("zmmul"))
     Builder.defineMacro("__riscv_mul");
+
+  if (ISAInfo->hasExtension("m")) {
     Builder.defineMacro("__riscv_div");
     Builder.defineMacro("__riscv_muldiv");
   }
 
-  if (HasA) {
-    Builder.defineMacro("__riscv_a", "2000000");
+  if (ISAInfo->hasExtension("a")) {
     Builder.defineMacro("__riscv_atomic");
     Builder.defineMacro("__GCC_HAVE_SYNC_COMPARE_AND_SWAP_1");
     Builder.defineMacro("__GCC_HAVE_SYNC_COMPARE_AND_SWAP_2");
@@ -161,218 +180,163 @@ void RISCVTargetInfo::getTargetDefines(const LangOptions &Opts,
       Builder.defineMacro("__GCC_HAVE_SYNC_COMPARE_AND_SWAP_8");
   }
 
-  if (HasF || HasD) {
-    Builder.defineMacro("__riscv_f", "2000000");
-    Builder.defineMacro("__riscv_flen", HasD ? "64" : "32");
+  if (FLen) {
+    Builder.defineMacro("__riscv_flen", Twine(FLen));
     Builder.defineMacro("__riscv_fdiv");
     Builder.defineMacro("__riscv_fsqrt");
   }
 
-  if (HasD)
-    Builder.defineMacro("__riscv_d", "2000000");
-
-  if (HasC) {
-    Builder.defineMacro("__riscv_c", "2000000");
-    Builder.defineMacro("__riscv_compressed");
+  if (MinVLen) {
+    Builder.defineMacro("__riscv_v_min_vlen", Twine(MinVLen));
+    Builder.defineMacro("__riscv_v_elen", Twine(MaxELen));
+    Builder.defineMacro("__riscv_v_elen_fp", Twine(MaxELenFp));
   }
 
-  if (HasB) {
-    Builder.defineMacro("__riscv_b", "93000");
-    Builder.defineMacro("__riscv_bitmanip");
-  }
+  if (ISAInfo->hasExtension("c"))
+    Builder.defineMacro("__riscv_compressed");
 
-  if (HasV) {
-    Builder.defineMacro("__riscv_v", "10000");
+  if (ISAInfo->hasExtension("zve32x")) {
     Builder.defineMacro("__riscv_vector");
+    // Currently we support the v0.11 RISC-V V intrinsics.
+    Builder.defineMacro("__riscv_v_intrinsic", Twine(getVersionValue(0, 11)));
   }
-
-  if (HasZba)
-    Builder.defineMacro("__riscv_zba", "93000");
-
-  if (HasZbb)
-    Builder.defineMacro("__riscv_zbb", "93000");
-
-  if (HasZbc)
-    Builder.defineMacro("__riscv_zbc", "93000");
-
-  if (HasZbe)
-    Builder.defineMacro("__riscv_zbe", "93000");
-
-  if (HasZbf)
-    Builder.defineMacro("__riscv_zbf", "93000");
-
-  if (HasZbm)
-    Builder.defineMacro("__riscv_zbm", "93000");
-
-  if (HasZbp)
-    Builder.defineMacro("__riscv_zbp", "93000");
-
-  if (HasZbproposedc)
-    Builder.defineMacro("__riscv_zbproposedc", "93000");
-
-  if (HasZbr)
-    Builder.defineMacro("__riscv_zbr", "93000");
-
-  if (HasZbs)
-    Builder.defineMacro("__riscv_zbs", "93000");
-
-  if (HasZbt)
-    Builder.defineMacro("__riscv_zbt", "93000");
-
-  if (HasZfh)
-    Builder.defineMacro("__riscv_zfh", "1000");
-
-  if (HasZvamo)
-    Builder.defineMacro("__riscv_zvamo", "10000");
-
-  if (HasZvlsseg)
-    Builder.defineMacro("__riscv_zvlsseg", "10000");
 }
 
-const Builtin::Info RISCVTargetInfo::BuiltinInfo[] = {
+static constexpr Builtin::Info BuiltinInfo[] = {
+#define BUILTIN(ID, TYPE, ATTRS)                                               \
+  {#ID, TYPE, ATTRS, nullptr, HeaderDesc::NO_HEADER, ALL_LANGUAGES},
+#define TARGET_BUILTIN(ID, TYPE, ATTRS, FEATURE)                               \
+  {#ID, TYPE, ATTRS, FEATURE, HeaderDesc::NO_HEADER, ALL_LANGUAGES},
+#include "clang/Basic/BuiltinsRISCVVector.def"
 #define BUILTIN(ID, TYPE, ATTRS)                                               \
-  {#ID, TYPE, ATTRS, nullptr, ALL_LANGUAGES, nullptr},
+  {#ID, TYPE, ATTRS, nullptr, HeaderDesc::NO_HEADER, ALL_LANGUAGES},
 #define TARGET_BUILTIN(ID, TYPE, ATTRS, FEATURE)                               \
-    {#ID, TYPE, ATTRS, nullptr, ALL_LANGUAGES, FEATURE},
+  {#ID, TYPE, ATTRS, FEATURE, HeaderDesc::NO_HEADER, ALL_LANGUAGES},
 #include "clang/Basic/BuiltinsRISCV.def"
 };
 
 ArrayRef<Builtin::Info> RISCVTargetInfo::getTargetBuiltins() const {
-  return llvm::makeArrayRef(BuiltinInfo, clang::RISCV::LastTSBuiltin -
-                                             Builtin::FirstTSBuiltin);
+  return llvm::ArrayRef(BuiltinInfo,
+                        clang::RISCV::LastTSBuiltin - Builtin::FirstTSBuiltin);
 }
 
 bool RISCVTargetInfo::initFeatureMap(
     llvm::StringMap<bool> &Features, DiagnosticsEngine &Diags, StringRef CPU,
     const std::vector<std::string> &FeaturesVec) const {
 
-  if (getTriple().getArch() == llvm::Triple::riscv64)
+  unsigned XLen = 32;
+
+  if (getTriple().getArch() == llvm::Triple::riscv64) {
     Features["64bit"] = true;
+    XLen = 64;
+  } else {
+    Features["32bit"] = true;
+  }
 
-  return TargetInfo::initFeatureMap(Features, Diags, CPU, FeaturesVec);
+  auto ParseResult = llvm::RISCVISAInfo::parseFeatures(XLen, FeaturesVec);
+  if (!ParseResult) {
+    std::string Buffer;
+    llvm::raw_string_ostream OutputErrMsg(Buffer);
+    handleAllErrors(ParseResult.takeError(), [&](llvm::StringError &ErrMsg) {
+      OutputErrMsg << ErrMsg.getMessage();
+    });
+    Diags.Report(diag::err_invalid_feature_combination) << OutputErrMsg.str();
+    return false;
+  }
+
+  // RISCVISAInfo makes implications for ISA features
+  std::vector<std::string> ImpliedFeatures = (*ParseResult)->toFeatureVector();
+  // Add non-ISA features like `relax` and `save-restore` back
+  for (const std::string &Feature : FeaturesVec)
+    if (!llvm::is_contained(ImpliedFeatures, Feature))
+      ImpliedFeatures.push_back(Feature);
+
+  return TargetInfo::initFeatureMap(Features, Diags, CPU, ImpliedFeatures);
+}
+
+std::optional<std::pair<unsigned, unsigned>>
+RISCVTargetInfo::getVScaleRange(const LangOptions &LangOpts) const {
+  // RISCV::RVVBitsPerBlock is 64.
+  unsigned VScaleMin = ISAInfo->getMinVLen() / llvm::RISCV::RVVBitsPerBlock;
+
+  if (LangOpts.VScaleMin || LangOpts.VScaleMax) {
+    // Treat Zvl*b as a lower bound on vscale.
+    VScaleMin = std::max(VScaleMin, LangOpts.VScaleMin);
+    unsigned VScaleMax = LangOpts.VScaleMax;
+    if (VScaleMax != 0 && VScaleMax < VScaleMin)
+      VScaleMax = VScaleMin;
+    return std::pair<unsigned, unsigned>(VScaleMin ? VScaleMin : 1, VScaleMax);
+  }
+
+  if (VScaleMin > 0) {
+    unsigned VScaleMax = ISAInfo->getMaxVLen() / llvm::RISCV::RVVBitsPerBlock;
+    return std::make_pair(VScaleMin, VScaleMax);
+  }
+
+  return std::nullopt;
 }
 
 /// Return true if has this feature, need to sync with handleTargetFeatures.
 bool RISCVTargetInfo::hasFeature(StringRef Feature) const {
   bool Is64Bit = getTriple().getArch() == llvm::Triple::riscv64;
-  return llvm::StringSwitch<bool>(Feature)
-      .Case("riscv", true)
-      .Case("riscv32", !Is64Bit)
-      .Case("riscv64", Is64Bit)
-      .Case("64bit", Is64Bit)
-      .Case("m", HasM)
-      .Case("a", HasA)
-      .Case("f", HasF)
-      .Case("d", HasD)
-      .Case("c", HasC)
-      .Case("experimental-b", HasB)
-      .Case("experimental-v", HasV)
-      .Case("experimental-zba", HasZba)
-      .Case("experimental-zbb", HasZbb)
-      .Case("experimental-zbc", HasZbc)
-      .Case("experimental-zbe", HasZbe)
-      .Case("experimental-zbf", HasZbf)
-      .Case("experimental-zbm", HasZbm)
-      .Case("experimental-zbp", HasZbp)
-      .Case("experimental-zbproposedc", HasZbproposedc)
-      .Case("experimental-zbr", HasZbr)
-      .Case("experimental-zbs", HasZbs)
-      .Case("experimental-zbt", HasZbt)
-      .Case("experimental-zfh", HasZfh)
-      .Case("experimental-zvamo", HasZvamo)
-      .Case("experimental-zvlsseg", HasZvlsseg)
-      .Default(false);
+  auto Result = llvm::StringSwitch<std::optional<bool>>(Feature)
+                    .Case("riscv", true)
+                    .Case("riscv32", !Is64Bit)
+                    .Case("riscv64", Is64Bit)
+                    .Case("32bit", !Is64Bit)
+                    .Case("64bit", Is64Bit)
+                    .Default(std::nullopt);
+  if (Result)
+    return *Result;
+
+  if (ISAInfo->isSupportedExtensionFeature(Feature))
+    return ISAInfo->hasExtension(Feature);
+
+  return false;
 }
 
 /// Perform initialization based on the user configured set of features.
 bool RISCVTargetInfo::handleTargetFeatures(std::vector<std::string> &Features,
                                            DiagnosticsEngine &Diags) {
-  for (const auto &Feature : Features) {
-    if (Feature == "+m")
-      HasM = true;
-    else if (Feature == "+a")
-      HasA = true;
-    else if (Feature == "+f")
-      HasF = true;
-    else if (Feature == "+d")
-      HasD = true;
-    else if (Feature == "+c")
-      HasC = true;
-    else if (Feature == "+experimental-b")
-      HasB = true;
-    else if (Feature == "+experimental-v")
-      HasV = true;
-    else if (Feature == "+experimental-zba")
-      HasZba = true;
-    else if (Feature == "+experimental-zbb")
-      HasZbb = true;
-    else if (Feature == "+experimental-zbc")
-      HasZbc = true;
-    else if (Feature == "+experimental-zbe")
-      HasZbe = true;
-    else if (Feature == "+experimental-zbf")
-      HasZbf = true;
-    else if (Feature == "+experimental-zbm")
-      HasZbm = true;
-    else if (Feature == "+experimental-zbp")
-      HasZbp = true;
-    else if (Feature == "+experimental-zbproposedc")
-      HasZbproposedc = true;
-    else if (Feature == "+experimental-zbr")
-      HasZbr = true;
-    else if (Feature == "+experimental-zbs")
-      HasZbs = true;
-    else if (Feature == "+experimental-zbt")
-      HasZbt = true;
-    else if (Feature == "+experimental-zfh")
-      HasZfh = true;
-    else if (Feature == "+experimental-zvamo")
-      HasZvamo = true;
-    else if (Feature == "+experimental-zvlsseg")
-      HasZvlsseg = true;
+  unsigned XLen = getTriple().isArch64Bit() ? 64 : 32;
+  auto ParseResult = llvm::RISCVISAInfo::parseFeatures(XLen, Features);
+  if (!ParseResult) {
+    std::string Buffer;
+    llvm::raw_string_ostream OutputErrMsg(Buffer);
+    handleAllErrors(ParseResult.takeError(), [&](llvm::StringError &ErrMsg) {
+      OutputErrMsg << ErrMsg.getMessage();
+    });
+    Diags.Report(diag::err_invalid_feature_combination) << OutputErrMsg.str();
+    return false;
+  } else {
+    ISAInfo = std::move(*ParseResult);
   }
 
-  return true;
-}
-
-bool RISCV32TargetInfo::isValidCPUName(StringRef Name) const {
-  return llvm::RISCV::checkCPUKind(llvm::RISCV::parseCPUKind(Name),
-                                   /*Is64Bit=*/false);
-}
-
-void RISCV32TargetInfo::fillValidCPUList(
-    SmallVectorImpl<StringRef> &Values) const {
-  llvm::RISCV::fillValidCPUArchList(Values, false);
-}
-
-bool RISCV32TargetInfo::isValidTuneCPUName(StringRef Name) const {
-  return llvm::RISCV::checkTuneCPUKind(
-      llvm::RISCV::parseTuneCPUKind(Name, false),
-      /*Is64Bit=*/false);
-}
+  if (ABI.empty())
+    ABI = ISAInfo->computeDefaultABI().str();
 
-void RISCV32TargetInfo::fillValidTuneCPUList(
-    SmallVectorImpl<StringRef> &Values) const {
-  llvm::RISCV::fillValidTuneCPUArchList(Values, false);
+  return true;
 }
 
-bool RISCV64TargetInfo::isValidCPUName(StringRef Name) const {
-  return llvm::RISCV::checkCPUKind(llvm::RISCV::parseCPUKind(Name),
-                                   /*Is64Bit=*/true);
+bool RISCVTargetInfo::isValidCPUName(StringRef Name) const {
+  bool Is64Bit = getTriple().isArch64Bit();
+  return llvm::RISCV::checkCPUKind(llvm::RISCV::parseCPUKind(Name), Is64Bit);
 }
 
-void RISCV64TargetInfo::fillValidCPUList(
+void RISCVTargetInfo::fillValidCPUList(
     SmallVectorImpl<StringRef> &Values) const {
-  llvm::RISCV::fillValidCPUArchList(Values, true);
+  bool Is64Bit = getTriple().isArch64Bit();
+  llvm::RISCV::fillValidCPUArchList(Values, Is64Bit);
 }
 
-bool RISCV64TargetInfo::isValidTuneCPUName(StringRef Name) const {
+bool RISCVTargetInfo::isValidTuneCPUName(StringRef Name) const {
+  bool Is64Bit = getTriple().isArch64Bit();
   return llvm::RISCV::checkTuneCPUKind(
-      llvm::RISCV::parseTuneCPUKind(Name, true),
-      /*Is64Bit=*/true);
+      llvm::RISCV::parseTuneCPUKind(Name, Is64Bit), Is64Bit);
 }
 
-void RISCV64TargetInfo::fillValidTuneCPUList(
+void RISCVTargetInfo::fillValidTuneCPUList(
     SmallVectorImpl<StringRef> &Values) const {
-  llvm::RISCV::fillValidTuneCPUArchList(Values, true);
+  bool Is64Bit = getTriple().isArch64Bit();
+  llvm::RISCV::fillValidTuneCPUArchList(Values, Is64Bit);
 }
diff --git a/gnu/llvm/clang/lib/Basic/Targets/SystemZ.h b/gnu/llvm/clang/lib/Basic/Targets/SystemZ.h
index b749c3f75d1..030f5ec7d69 100644
--- a/gnu/llvm/clang/lib/Basic/Targets/SystemZ.h
+++ b/gnu/llvm/clang/lib/Basic/Targets/SystemZ.h
@@ -23,7 +23,6 @@ namespace targets {
 
 class LLVM_LIBRARY_VISIBILITY SystemZTargetInfo : public TargetInfo {
 
-  static const Builtin::Info BuiltinInfo[];
   static const char *const GCCRegNames[];
   std::string CPU;
   int ISARevision;
@@ -40,13 +39,24 @@ public:
     TLSSupported = true;
     IntWidth = IntAlign = 32;
     LongWidth = LongLongWidth = LongAlign = LongLongAlign = 64;
+    Int128Align = 64;
     PointerWidth = PointerAlign = 64;
     LongDoubleWidth = 128;
     LongDoubleAlign = 64;
     LongDoubleFormat = &llvm::APFloat::IEEEquad();
     DefaultAlignForAttributeAligned = 64;
     MinGlobalAlign = 16;
-    resetDataLayout("E-m:e-i1:8:16-i8:8:16-i64:64-f128:64-a:8:16-n32:64");
+    if (Triple.isOSzOS()) {
+      // All vector types are default aligned on an 8-byte boundary, even if the
+      // vector facility is not available. That is different from Linux.
+      MaxVectorAlign = 64;
+      // Compared to Linux/ELF, the data layout differs only in that name
+      // mangling is GOFF.
+      resetDataLayout(
+          "E-m:l-i1:8:16-i8:8:16-i64:64-f128:64-v128:64-a:8:16-n32:64");
+    } else
+      resetDataLayout("E-m:e-i1:8:16-i8:8:16-i64:64-f128:64"
+                      "-v128:64-a:8:16-n32:64");
     MaxAtomicPromoteWidth = MaxAtomicInlineWidth = 64;
     HasStrictFP = true;
   }
@@ -60,7 +70,7 @@ public:
 
   ArrayRef<TargetInfo::GCCRegAlias> getGCCRegAliases() const override {
     // No aliases.
-    return None;
+    return std::nullopt;
   }
 
   ArrayRef<TargetInfo::AddlRegName> getGCCAddlRegNames() const override;
@@ -72,6 +82,30 @@ public:
   bool validateAsmConstraint(const char *&Name,
                              TargetInfo::ConstraintInfo &info) const override;
 
+  std::string convertConstraint(const char *&Constraint) const override {
+    switch (Constraint[0]) {
+    case 'p': // Keep 'p' constraint.
+      return std::string("p");
+    case 'Z':
+      switch (Constraint[1]) {
+      case 'Q': // Address with base and unsigned 12-bit displacement
+      case 'R': // Likewise, plus an index
+      case 'S': // Address with base and signed 20-bit displacement
+      case 'T': // Likewise, plus an index
+        // "^" hints llvm that this is a 2 letter constraint.
+        // "Constraint++" is used to promote the string iterator
+        // to the next constraint.
+        return std::string("^") + std::string(Constraint++, 2);
+      default:
+        break;
+      }
+      break;
+    default:
+      break;
+    }
+    return TargetInfo::convertConstraint(Constraint);
+  }
+
   const char *getClobbers() const override {
     // FIXME: Is this really right?
     return "";
@@ -89,6 +123,14 @@ public:
 
   void fillValidCPUList(SmallVectorImpl<StringRef> &Values) const override;
 
+  bool isValidTuneCPUName(StringRef Name) const override {
+    return isValidCPUName(Name);
+  }
+
+  void fillValidTuneCPUList(SmallVectorImpl<StringRef> &Values) const override {
+    fillValidCPUList(Values);
+  }
+
   bool setCPU(const std::string &Name) override {
     CPU = Name;
     ISARevision = getISARevision(CPU);
@@ -128,12 +170,14 @@ public:
     }
     HasVector &= !SoftFloat;
 
-    // If we use the vector ABI, vector types are 64-bit aligned.
-    if (HasVector) {
+    // If we use the vector ABI, vector types are 64-bit aligned. The
+    // DataLayout string is always set to this alignment as it is not a
+    // requirement that it follows the alignment emitted by the front end. It
+    // is assumed generally that the Datalayout should reflect only the
+    // target triple and not any specific feature.
+    if (HasVector && !getTriple().isOSzOS())
       MaxVectorAlign = 64;
-      resetDataLayout("E-m:e-i1:8:16-i8:8:16-i64:64-f128:64"
-                      "-v128:64-a:8:16-n32:64");
-    }
+
     return true;
   }
 
@@ -160,7 +204,7 @@ public:
 
   const char *getLongDoubleMangling() const override { return "g"; }
 
-  bool hasExtIntType() const override { return true; }
+  bool hasBitIntType() const override { return true; }
 
   int getEHDataRegisterNumber(unsigned RegNo) const override {
     return RegNo < 4 ? 6 + RegNo : -1;
diff --git a/gnu/llvm/clang/lib/Basic/Targets/X86.cpp b/gnu/llvm/clang/lib/Basic/Targets/X86.cpp
index ac3f2729e35..af4da2e687e 100644
--- a/gnu/llvm/clang/lib/Basic/Targets/X86.cpp
+++ b/gnu/llvm/clang/lib/Basic/Targets/X86.cpp
@@ -18,25 +18,26 @@
 #include "llvm/ADT/StringRef.h"
 #include "llvm/ADT/StringSwitch.h"
 #include "llvm/Support/X86TargetParser.h"
+#include <optional>
 
 namespace clang {
 namespace targets {
 
-const Builtin::Info BuiltinInfoX86[] = {
+static constexpr Builtin::Info BuiltinInfoX86[] = {
 #define BUILTIN(ID, TYPE, ATTRS)                                               \
-  {#ID, TYPE, ATTRS, nullptr, ALL_LANGUAGES, nullptr},
+  {#ID, TYPE, ATTRS, nullptr, HeaderDesc::NO_HEADER, ALL_LANGUAGES},
 #define TARGET_BUILTIN(ID, TYPE, ATTRS, FEATURE)                               \
-  {#ID, TYPE, ATTRS, nullptr, ALL_LANGUAGES, FEATURE},
+  {#ID, TYPE, ATTRS, FEATURE, HeaderDesc::NO_HEADER, ALL_LANGUAGES},
 #define TARGET_HEADER_BUILTIN(ID, TYPE, ATTRS, HEADER, LANGS, FEATURE)         \
-  {#ID, TYPE, ATTRS, HEADER, LANGS, FEATURE},
+  {#ID, TYPE, ATTRS, FEATURE, HeaderDesc::HEADER, LANGS},
 #include "clang/Basic/BuiltinsX86.def"
 
 #define BUILTIN(ID, TYPE, ATTRS)                                               \
-  {#ID, TYPE, ATTRS, nullptr, ALL_LANGUAGES, nullptr},
+  {#ID, TYPE, ATTRS, nullptr, HeaderDesc::NO_HEADER, ALL_LANGUAGES},
 #define TARGET_BUILTIN(ID, TYPE, ATTRS, FEATURE)                               \
-  {#ID, TYPE, ATTRS, nullptr, ALL_LANGUAGES, FEATURE},
+  {#ID, TYPE, ATTRS, FEATURE, HeaderDesc::NO_HEADER, ALL_LANGUAGES},
 #define TARGET_HEADER_BUILTIN(ID, TYPE, ATTRS, HEADER, LANGS, FEATURE)         \
-  {#ID, TYPE, ATTRS, HEADER, LANGS, FEATURE},
+  {#ID, TYPE, ATTRS, FEATURE, HeaderDesc::HEADER, LANGS},
 #include "clang/Basic/BuiltinsX86_64.def"
 };
 
@@ -139,22 +140,28 @@ bool X86TargetInfo::initFeatureMap(
   // Enable popcnt if sse4.2 is enabled and popcnt is not explicitly disabled.
   auto I = Features.find("sse4.2");
   if (I != Features.end() && I->getValue() &&
-      llvm::find(UpdatedFeaturesVec, "-popcnt") == UpdatedFeaturesVec.end())
+      !llvm::is_contained(UpdatedFeaturesVec, "-popcnt"))
     Features["popcnt"] = true;
 
   // Additionally, if SSE is enabled and mmx is not explicitly disabled,
   // then enable MMX.
   I = Features.find("sse");
   if (I != Features.end() && I->getValue() &&
-      llvm::find(UpdatedFeaturesVec, "-mmx") == UpdatedFeaturesVec.end())
+      !llvm::is_contained(UpdatedFeaturesVec, "-mmx"))
     Features["mmx"] = true;
 
   // Enable xsave if avx is enabled and xsave is not explicitly disabled.
   I = Features.find("avx");
   if (I != Features.end() && I->getValue() &&
-      llvm::find(UpdatedFeaturesVec, "-xsave") == UpdatedFeaturesVec.end())
+      !llvm::is_contained(UpdatedFeaturesVec, "-xsave"))
     Features["xsave"] = true;
 
+  // Enable CRC32 if SSE4.2 is enabled and CRC32 is not explicitly disabled.
+  I = Features.find("sse4.2");
+  if (I != Features.end() && I->getValue() &&
+      !llvm::is_contained(UpdatedFeaturesVec, "-crc32"))
+    Features["crc32"] = true;
+
   return true;
 }
 
@@ -231,6 +238,9 @@ bool X86TargetInfo::handleTargetFeatures(std::vector<std::string> &Features,
       HasAVX512BF16 = true;
     } else if (Feature == "+avx512er") {
       HasAVX512ER = true;
+    } else if (Feature == "+avx512fp16") {
+      HasAVX512FP16 = true;
+      HasLegalHalfType = true;
     } else if (Feature == "+avx512pf") {
       HasAVX512PF = true;
     } else if (Feature == "+avx512dq") {
@@ -281,6 +291,8 @@ bool X86TargetInfo::handleTargetFeatures(std::vector<std::string> &Features,
       HasCLWB = true;
     } else if (Feature == "+wbnoinvd") {
       HasWBNOINVD = true;
+    } else if (Feature == "+prefetchi") {
+      HasPREFETCHI = true;
     } else if (Feature == "+prefetchwt1") {
       HasPREFETCHWT1 = true;
     } else if (Feature == "+clzero") {
@@ -289,6 +301,8 @@ bool X86TargetInfo::handleTargetFeatures(std::vector<std::string> &Features,
       HasCLDEMOTE = true;
     } else if (Feature == "+rdpid") {
       HasRDPID = true;
+    } else if (Feature == "+rdpru") {
+      HasRDPRU = true;
     } else if (Feature == "+kl") {
       HasKL = true;
     } else if (Feature == "+widekl") {
@@ -317,18 +331,34 @@ bool X86TargetInfo::handleTargetFeatures(std::vector<std::string> &Features,
       HasHRESET = true;
     } else if (Feature == "+amx-bf16") {
       HasAMXBF16 = true;
+    } else if (Feature == "+amx-fp16") {
+      HasAMXFP16 = true;
     } else if (Feature == "+amx-int8") {
       HasAMXINT8 = true;
     } else if (Feature == "+amx-tile") {
       HasAMXTILE = true;
+    } else if (Feature == "+cmpccxadd") {
+      HasCMPCCXADD = true;
+    } else if (Feature == "+raoint") {
+      HasRAOINT = true;
+    } else if (Feature == "+avxifma") {
+      HasAVXIFMA = true;
+    } else if (Feature == "+avxneconvert") {
+      HasAVXNECONVERT= true;
     } else if (Feature == "+avxvnni") {
       HasAVXVNNI = true;
+    } else if (Feature == "+avxvnniint8") {
+      HasAVXVNNIINT8 = true;
     } else if (Feature == "+serialize") {
       HasSERIALIZE = true;
     } else if (Feature == "+tsxldtrk") {
       HasTSXLDTRK = true;
     } else if (Feature == "+uintr") {
       HasUINTR = true;
+    } else if (Feature == "+crc32") {
+      HasCRC32 = true;
+    } else if (Feature == "+x87") {
+      HasX87 = true;
     }
 
     X86SSEEnum Level = llvm::StringSwitch<X86SSEEnum>(Feature)
@@ -344,6 +374,10 @@ bool X86TargetInfo::handleTargetFeatures(std::vector<std::string> &Features,
                            .Default(NoSSE);
     SSELevel = std::max(SSELevel, Level);
 
+    HasFloat16 = SSELevel >= SSE2;
+
+    HasBFloat16 = SSELevel >= SSE2;
+
     MMX3DNowEnum ThreeDNowLevel = llvm::StringSwitch<MMX3DNowEnum>(Feature)
                                       .Case("+3dnowa", AMD3DNowAthlon)
                                       .Case("+3dnow", AMD3DNow)
@@ -370,6 +404,12 @@ bool X86TargetInfo::handleTargetFeatures(std::vector<std::string> &Features,
 
   SimdDefaultAlign =
       hasFeature("avx512f") ? 512 : hasFeature("avx") ? 256 : 128;
+
+  // FIXME: We should allow long double type on 32-bits to match with GCC.
+  // This requires backend to be able to lower f80 without x87 first.
+  if (!HasX87 && LongDoubleFormat == &llvm::APFloat::x87DoubleExtended())
+    HasLongDouble = false;
+
   return true;
 }
 
@@ -424,7 +464,7 @@ void X86TargetInfo::getTargetDefines(const LangOptions &Opts,
   case CK_PentiumMMX:
     Builder.defineMacro("__pentium_mmx__");
     Builder.defineMacro("__tune_pentium_mmx__");
-    LLVM_FALLTHROUGH;
+    [[fallthrough]];
   case CK_i586:
   case CK_Pentium:
     defineCPUMacros(Builder, "i586");
@@ -433,11 +473,11 @@ void X86TargetInfo::getTargetDefines(const LangOptions &Opts,
   case CK_Pentium3:
   case CK_PentiumM:
     Builder.defineMacro("__tune_pentium3__");
-    LLVM_FALLTHROUGH;
+    [[fallthrough]];
   case CK_Pentium2:
   case CK_C3_2:
     Builder.defineMacro("__tune_pentium2__");
-    LLVM_FALLTHROUGH;
+    [[fallthrough]];
   case CK_PentiumPro:
   case CK_i686:
     defineCPUMacros(Builder, "i686");
@@ -487,6 +527,12 @@ void X86TargetInfo::getTargetDefines(const LangOptions &Opts,
   case CK_Tigerlake:
   case CK_SapphireRapids:
   case CK_Alderlake:
+  case CK_Raptorlake:
+  case CK_Meteorlake:
+  case CK_Sierraforest:
+  case CK_Grandridge:
+  case CK_Graniterapids:
+  case CK_Emeraldrapids:
     // FIXME: Historically, we defined this legacy name, it would be nice to
     // remove it at some point. We've never exposed fine-grained names for
     // recent primary x86 CPUs, and we should keep it that way.
@@ -505,7 +551,7 @@ void X86TargetInfo::getTargetDefines(const LangOptions &Opts,
   case CK_K6_2:
     Builder.defineMacro("__k6_2__");
     Builder.defineMacro("__tune_k6_2__");
-    LLVM_FALLTHROUGH;
+    [[fallthrough]];
   case CK_K6_3:
     if (CPU != CK_K6_2) { // In case of fallthrough
       // FIXME: GCC may be enabling these in cases where some other k6
@@ -514,7 +560,7 @@ void X86TargetInfo::getTargetDefines(const LangOptions &Opts,
       Builder.defineMacro("__k6_3__");
       Builder.defineMacro("__tune_k6_3__");
     }
-    LLVM_FALLTHROUGH;
+    [[fallthrough]];
   case CK_K6:
     defineCPUMacros(Builder, "k6");
     break;
@@ -565,6 +611,9 @@ void X86TargetInfo::getTargetDefines(const LangOptions &Opts,
   case CK_ZNVER3:
     defineCPUMacros(Builder, "znver3");
     break;
+  case CK_ZNVER4:
+    defineCPUMacros(Builder, "znver4");
+    break;
   case CK_Geode:
     defineCPUMacros(Builder, "geode");
     break;
@@ -640,13 +689,13 @@ void X86TargetInfo::getTargetDefines(const LangOptions &Opts,
   switch (XOPLevel) {
   case XOP:
     Builder.defineMacro("__XOP__");
-    LLVM_FALLTHROUGH;
+    [[fallthrough]];
   case FMA4:
     Builder.defineMacro("__FMA4__");
-    LLVM_FALLTHROUGH;
+    [[fallthrough]];
   case SSE4A:
     Builder.defineMacro("__SSE4A__");
-    LLVM_FALLTHROUGH;
+    [[fallthrough]];
   case NoXOP:
     break;
   }
@@ -670,6 +719,8 @@ void X86TargetInfo::getTargetDefines(const LangOptions &Opts,
     Builder.defineMacro("__AVX512BF16__");
   if (HasAVX512ER)
     Builder.defineMacro("__AVX512ER__");
+  if (HasAVX512FP16)
+    Builder.defineMacro("__AVX512FP16__");
   if (HasAVX512PF)
     Builder.defineMacro("__AVX512PF__");
   if (HasAVX512DQ)
@@ -713,6 +764,8 @@ void X86TargetInfo::getTargetDefines(const LangOptions &Opts,
     Builder.defineMacro("__SHSTK__");
   if (HasSGX)
     Builder.defineMacro("__SGX__");
+  if (HasPREFETCHI)
+    Builder.defineMacro("__PREFETCHI__");
   if (HasPREFETCHWT1)
     Builder.defineMacro("__PREFETCHWT1__");
   if (HasCLZERO)
@@ -723,6 +776,8 @@ void X86TargetInfo::getTargetDefines(const LangOptions &Opts,
     Builder.defineMacro("__WIDEKL__");
   if (HasRDPID)
     Builder.defineMacro("__RDPID__");
+  if (HasRDPRU)
+    Builder.defineMacro("__RDPRU__");
   if (HasCLDEMOTE)
     Builder.defineMacro("__CLDEMOTE__");
   if (HasWAITPKG)
@@ -742,51 +797,65 @@ void X86TargetInfo::getTargetDefines(const LangOptions &Opts,
   if (HasHRESET)
     Builder.defineMacro("__HRESET__");
   if (HasAMXTILE)
-    Builder.defineMacro("__AMXTILE__");
+    Builder.defineMacro("__AMX_TILE__");
   if (HasAMXINT8)
-    Builder.defineMacro("__AMXINT8__");
+    Builder.defineMacro("__AMX_INT8__");
   if (HasAMXBF16)
-    Builder.defineMacro("__AMXBF16__");
+    Builder.defineMacro("__AMX_BF16__");
+  if (HasAMXFP16)
+    Builder.defineMacro("__AMX_FP16__");
+  if (HasCMPCCXADD)
+    Builder.defineMacro("__CMPCCXADD__");
+  if (HasRAOINT)
+    Builder.defineMacro("__RAOINT__");
+  if (HasAVXIFMA)
+    Builder.defineMacro("__AVXIFMA__");
+  if (HasAVXNECONVERT)
+    Builder.defineMacro("__AVXNECONVERT__");
   if (HasAVXVNNI)
     Builder.defineMacro("__AVXVNNI__");
+  if (HasAVXVNNIINT8)
+    Builder.defineMacro("__AVXVNNIINT8__");
   if (HasSERIALIZE)
     Builder.defineMacro("__SERIALIZE__");
   if (HasTSXLDTRK)
     Builder.defineMacro("__TSXLDTRK__");
   if (HasUINTR)
     Builder.defineMacro("__UINTR__");
+  if (HasCRC32)
+    Builder.defineMacro("__CRC32__");
 
   // Each case falls through to the previous one here.
   switch (SSELevel) {
   case AVX512F:
     Builder.defineMacro("__AVX512F__");
-    LLVM_FALLTHROUGH;
+    [[fallthrough]];
   case AVX2:
     Builder.defineMacro("__AVX2__");
-    LLVM_FALLTHROUGH;
+    [[fallthrough]];
   case AVX:
     Builder.defineMacro("__AVX__");
-    LLVM_FALLTHROUGH;
+    [[fallthrough]];
   case SSE42:
     Builder.defineMacro("__SSE4_2__");
-    LLVM_FALLTHROUGH;
+    [[fallthrough]];
   case SSE41:
     Builder.defineMacro("__SSE4_1__");
-    LLVM_FALLTHROUGH;
+    [[fallthrough]];
   case SSSE3:
     Builder.defineMacro("__SSSE3__");
-    LLVM_FALLTHROUGH;
+    [[fallthrough]];
   case SSE3:
     Builder.defineMacro("__SSE3__");
-    LLVM_FALLTHROUGH;
+    [[fallthrough]];
   case SSE2:
     Builder.defineMacro("__SSE2__");
     Builder.defineMacro("__SSE2_MATH__"); // -mfp-math=sse always implied.
-    LLVM_FALLTHROUGH;
+    [[fallthrough]];
   case SSE1:
     Builder.defineMacro("__SSE__");
     Builder.defineMacro("__SSE_MATH__"); // -mfp-math=sse always implied.
-    LLVM_FALLTHROUGH;
+    [[fallthrough]];
   case NoSSE:
     break;
   }
@@ -816,13 +885,13 @@ void X86TargetInfo::getTargetDefines(const LangOptions &Opts,
   switch (MMX3DNowLevel) {
   case AMD3DNowAthlon:
     Builder.defineMacro("__3dNOW_A__");
-    LLVM_FALLTHROUGH;
+    [[fallthrough]];
   case AMD3DNow:
     Builder.defineMacro("__3dNOW__");
-    LLVM_FALLTHROUGH;
+    [[fallthrough]];
   case MMX:
     Builder.defineMacro("__MMX__");
-    LLVM_FALLTHROUGH;
+    [[fallthrough]];
   case NoMMX3DNow:
     break;
   }
@@ -848,6 +917,7 @@ bool X86TargetInfo::isValidFeatureName(StringRef Name) const {
       .Case("adx", true)
       .Case("aes", true)
       .Case("amx-bf16", true)
+      .Case("amx-fp16", true)
       .Case("amx-int8", true)
       .Case("amx-tile", true)
       .Case("avx", true)
@@ -858,6 +928,7 @@ bool X86TargetInfo::isValidFeatureName(StringRef Name) const {
       .Case("avx512vnni", true)
       .Case("avx512bf16", true)
       .Case("avx512er", true)
+      .Case("avx512fp16", true)
       .Case("avx512pf", true)
       .Case("avx512dq", true)
       .Case("avx512bitalg", true)
@@ -867,13 +938,18 @@ bool X86TargetInfo::isValidFeatureName(StringRef Name) const {
       .Case("avx512vbmi2", true)
       .Case("avx512ifma", true)
       .Case("avx512vp2intersect", true)
+      .Case("avxifma", true)
+      .Case("avxneconvert", true)
       .Case("avxvnni", true)
+      .Case("avxvnniint8", true)
       .Case("bmi", true)
       .Case("bmi2", true)
       .Case("cldemote", true)
       .Case("clflushopt", true)
       .Case("clwb", true)
       .Case("clzero", true)
+      .Case("cmpccxadd", true)
+      .Case("crc32", true)
       .Case("cx16", true)
       .Case("enqcmd", true)
       .Case("f16c", true)
@@ -898,10 +974,13 @@ bool X86TargetInfo::isValidFeatureName(StringRef Name) const {
       .Case("pconfig", true)
       .Case("pku", true)
       .Case("popcnt", true)
+      .Case("prefetchi", true)
       .Case("prefetchwt1", true)
       .Case("prfchw", true)
       .Case("ptwrite", true)
+      .Case("raoint", true)
       .Case("rdpid", true)
+      .Case("rdpru", true)
       .Case("rdrnd", true)
       .Case("rdseed", true)
       .Case("rtm", true)
@@ -939,9 +1018,9 @@ bool X86TargetInfo::hasFeature(StringRef Feature) const {
       .Case("adx", HasADX)
       .Case("aes", HasAES)
       .Case("amx-bf16", HasAMXBF16)
+      .Case("amx-fp16", HasAMXFP16)
       .Case("amx-int8", HasAMXINT8)
       .Case("amx-tile", HasAMXTILE)
-      .Case("avxvnni", HasAVXVNNI)
       .Case("avx", SSELevel >= AVX)
       .Case("avx2", SSELevel >= AVX2)
       .Case("avx512f", SSELevel >= AVX512F)
@@ -950,6 +1029,7 @@ bool X86TargetInfo::hasFeature(StringRef Feature) const {
       .Case("avx512vnni", HasAVX512VNNI)
       .Case("avx512bf16", HasAVX512BF16)
       .Case("avx512er", HasAVX512ER)
+      .Case("avx512fp16", HasAVX512FP16)
       .Case("avx512pf", HasAVX512PF)
       .Case("avx512dq", HasAVX512DQ)
       .Case("avx512bitalg", HasAVX512BITALG)
@@ -959,12 +1039,18 @@ bool X86TargetInfo::hasFeature(StringRef Feature) const {
       .Case("avx512vbmi2", HasAVX512VBMI2)
       .Case("avx512ifma", HasAVX512IFMA)
       .Case("avx512vp2intersect", HasAVX512VP2INTERSECT)
+      .Case("avxifma", HasAVXIFMA)
+      .Case("avxneconvert", HasAVXNECONVERT)
+      .Case("avxvnni", HasAVXVNNI)
+      .Case("avxvnniint8", HasAVXVNNIINT8)
       .Case("bmi", HasBMI)
       .Case("bmi2", HasBMI2)
       .Case("cldemote", HasCLDEMOTE)
       .Case("clflushopt", HasCLFLUSHOPT)
       .Case("clwb", HasCLWB)
       .Case("clzero", HasCLZERO)
+      .Case("cmpccxadd", HasCMPCCXADD)
+      .Case("crc32", HasCRC32)
       .Case("cx8", HasCX8)
       .Case("cx16", HasCX16)
       .Case("enqcmd", HasENQCMD)
@@ -992,10 +1078,13 @@ bool X86TargetInfo::hasFeature(StringRef Feature) const {
       .Case("pconfig", HasPCONFIG)
       .Case("pku", HasPKU)
       .Case("popcnt", HasPOPCNT)
+      .Case("prefetchi", HasPREFETCHI)
       .Case("prefetchwt1", HasPREFETCHWT1)
       .Case("prfchw", HasPRFCHW)
       .Case("ptwrite", HasPTWRITE)
+      .Case("raoint", HasRAOINT)
       .Case("rdpid", HasRDPID)
+      .Case("rdpru", HasRDPRU)
       .Case("rdrnd", HasRDRND)
       .Case("rdseed", HasRDSEED)
       .Case("retpoline-external-thunk", HasRetpolineExternalThunk)
@@ -1022,6 +1111,7 @@ bool X86TargetInfo::hasFeature(StringRef Feature) const {
       .Case("x86", true)
       .Case("x86_32", getTriple().getArch() == llvm::Triple::x86)
       .Case("x86_64", getTriple().getArch() == llvm::Triple::x86_64)
+      .Case("x87", HasX87)
       .Case("xop", XOPLevel >= XOP)
       .Case("xsave", HasXSAVE)
       .Case("xsavec", HasXSAVEC)
@@ -1037,35 +1127,22 @@ bool X86TargetInfo::hasFeature(StringRef Feature) const {
 // X86TargetInfo::hasFeature for a somewhat comprehensive list).
 bool X86TargetInfo::validateCpuSupports(StringRef FeatureStr) const {
   return llvm::StringSwitch<bool>(FeatureStr)
-#define X86_FEATURE_COMPAT(ENUM, STR) .Case(STR, true)
-#include "llvm/Support/X86TargetParser.def"
+#define X86_FEATURE_COMPAT(ENUM, STR, PRIORITY) .Case(STR, true)
+#include "llvm/TargetParser/X86TargetParser.def"
       .Default(false);
 }
 
 static llvm::X86::ProcessorFeatures getFeature(StringRef Name) {
   return llvm::StringSwitch<llvm::X86::ProcessorFeatures>(Name)
-#define X86_FEATURE_COMPAT(ENUM, STR) .Case(STR, llvm::X86::FEATURE_##ENUM)
-#include "llvm/Support/X86TargetParser.def"
+#define X86_FEATURE_COMPAT(ENUM, STR, PRIORITY)                                \
+  .Case(STR, llvm::X86::FEATURE_##ENUM)
+
+#include "llvm/TargetParser/X86TargetParser.def"
       ;
   // Note, this function should only be used after ensuring the value is
   // correct, so it asserts if the value is out of range.
 }
 
-static unsigned getFeaturePriority(llvm::X86::ProcessorFeatures Feat) {
-  enum class FeatPriority {
-#define FEATURE(FEAT) FEAT,
-#include "clang/Basic/X86Target.def"
-  };
-  switch (Feat) {
-#define FEATURE(FEAT)                                                          \
-  case llvm::X86::FEAT:                                                        \
-    return static_cast<unsigned>(FeatPriority::FEAT);
-#include "clang/Basic/X86Target.def"
-  default:
-    llvm_unreachable("No Feature Priority for non-CPUSupports Features");
-  }
-}
-
 unsigned X86TargetInfo::multiVersionSortPriority(StringRef Name) const {
   // Valid CPUs have a 'key feature' that compares just better than its key
   // feature.
@@ -1083,23 +1160,23 @@ unsigned X86TargetInfo::multiVersionSortPriority(StringRef Name) const {
 
 bool X86TargetInfo::validateCPUSpecificCPUDispatch(StringRef Name) const {
   return llvm::StringSwitch<bool>(Name)
-#define CPU_SPECIFIC(NAME, MANGLING, FEATURES) .Case(NAME, true)
-#define CPU_SPECIFIC_ALIAS(NEW_NAME, NAME) .Case(NEW_NAME, true)
-#include "clang/Basic/X86Target.def"
+#define CPU_SPECIFIC(NAME, TUNE_NAME, MANGLING, FEATURES) .Case(NAME, true)
+#define CPU_SPECIFIC_ALIAS(NEW_NAME, TUNE_NAME, NAME) .Case(NEW_NAME, true)
+#include "llvm/TargetParser/X86TargetParser.def"
       .Default(false);
 }
 
 static StringRef CPUSpecificCPUDispatchNameDealias(StringRef Name) {
   return llvm::StringSwitch<StringRef>(Name)
-#define CPU_SPECIFIC_ALIAS(NEW_NAME, NAME) .Case(NEW_NAME, NAME)
-#include "clang/Basic/X86Target.def"
+#define CPU_SPECIFIC_ALIAS(NEW_NAME, TUNE_NAME, NAME) .Case(NEW_NAME, NAME)
+#include "llvm/TargetParser/X86TargetParser.def"
       .Default(Name);
 }
 
 char X86TargetInfo::CPUSpecificManglingCharacter(StringRef Name) const {
   return llvm::StringSwitch<char>(CPUSpecificCPUDispatchNameDealias(Name))
-#define CPU_SPECIFIC(NAME, MANGLING, FEATURES) .Case(NAME, MANGLING)
-#include "clang/Basic/X86Target.def"
+#define CPU_SPECIFIC(NAME, TUNE_NAME, MANGLING, FEATURES) .Case(NAME, MANGLING)
+#include "llvm/TargetParser/X86TargetParser.def"
       .Default(0);
 }
 
@@ -1107,12 +1184,20 @@ void X86TargetInfo::getCPUSpecificCPUDispatchFeatures(
     StringRef Name, llvm::SmallVectorImpl<StringRef> &Features) const {
   StringRef WholeList =
       llvm::StringSwitch<StringRef>(CPUSpecificCPUDispatchNameDealias(Name))
-#define CPU_SPECIFIC(NAME, MANGLING, FEATURES) .Case(NAME, FEATURES)
-#include "clang/Basic/X86Target.def"
+#define CPU_SPECIFIC(NAME, TUNE_NAME, MANGLING, FEATURES) .Case(NAME, FEATURES)
+#include "llvm/TargetParser/X86TargetParser.def"
           .Default("");
   WholeList.split(Features, ',', /*MaxSplit=*/-1, /*KeepEmpty=*/false);
 }
 
+StringRef X86TargetInfo::getCPUSpecificTuneName(StringRef Name) const {
+  return llvm::StringSwitch<StringRef>(Name)
+#define CPU_SPECIFIC(NAME, TUNE_NAME, MANGLING, FEATURES) .Case(NAME, TUNE_NAME)
+#define CPU_SPECIFIC_ALIAS(NEW_NAME, TUNE_NAME, NAME) .Case(NEW_NAME, TUNE_NAME)
+#include "llvm/TargetParser/X86TargetParser.def"
+      .Default("");
+}
+
 // We can't use a generic validation scheme for the cpus accepted here
 // versus subtarget cpus accepted in the target attribute because the
 // variables intitialized by the runtime only support the below currently
@@ -1122,8 +1207,9 @@ bool X86TargetInfo::validateCpuIs(StringRef FeatureStr) const {
 #define X86_VENDOR(ENUM, STRING) .Case(STRING, true)
 #define X86_CPU_TYPE_ALIAS(ENUM, ALIAS) .Case(ALIAS, true)
 #define X86_CPU_TYPE(ENUM, STR) .Case(STR, true)
+#define X86_CPU_SUBTYPE_ALIAS(ENUM, ALIAS) .Case(ALIAS, true)
 #define X86_CPU_SUBTYPE(ENUM, STR) .Case(STR, true)
-#include "llvm/Support/X86TargetParser.def"
+#include "llvm/TargetParser/X86TargetParser.def"
       .Default(false);
 }
 
@@ -1275,7 +1361,7 @@ bool X86TargetInfo::validateAsmConstraint(
 // | Knights Landing                    |                      64 | https://software.intel.com/en-us/articles/intel-xeon-phi-processor-7200-family-memory-management-optimizations "The Intel® Xeon Phi™ Processor Architecture" |
 // | Knights Mill                       |                      64 | https://software.intel.com/sites/default/files/managed/9e/bc/64-ia-32-architectures-optimization-manual.pdf?countrylabel=Colombia "2.5.5.2 L1 DCache "       |
 // +------------------------------------+-------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------+
-Optional<unsigned> X86TargetInfo::getCPUCacheLineSize() const {
+std::optional<unsigned> X86TargetInfo::getCPUCacheLineSize() const {
   using namespace llvm::X86;
   switch (CPU) {
     // i386
@@ -1336,6 +1422,12 @@ Optional<unsigned> X86TargetInfo::getCPUCacheLineSize() const {
     case CK_Rocketlake:
     case CK_IcelakeServer:
     case CK_Alderlake:
+    case CK_Raptorlake:
+    case CK_Meteorlake:
+    case CK_Sierraforest:
+    case CK_Grandridge:
+    case CK_Graniterapids:
+    case CK_Emeraldrapids:
     case CK_KNL:
     case CK_KNM:
     // K7
@@ -1357,6 +1449,7 @@ Optional<unsigned> X86TargetInfo::getCPUCacheLineSize() const {
     case CK_ZNVER1:
     case CK_ZNVER2:
     case CK_ZNVER3:
+    case CK_ZNVER4:
     // Deprecated
     case CK_x86_64:
     case CK_x86_64_v2:
@@ -1370,7 +1463,7 @@ Optional<unsigned> X86TargetInfo::getCPUCacheLineSize() const {
     // The following currently have unknown cache line sizes (but they are probably all 64):
     // Core
     case CK_None:
-      return None;
+      return std::nullopt;
   }
   llvm_unreachable("Unknown CPU kind");
 }
@@ -1470,8 +1563,8 @@ std::string X86TargetInfo::convertConstraint(const char *&Constraint) const {
     return std::string("{si}");
   case 'D':
     return std::string("{di}");
-  case 'p': // address
-    return std::string("im");
+  case 'p': // Keep 'p' constraint (address).
+    return std::string("p");
   case 't': // top of floating point stack.
     return std::string("{st}");
   case 'u':                        // second from top of floating point stack.
@@ -1494,7 +1587,7 @@ std::string X86TargetInfo::convertConstraint(const char *&Constraint) const {
       // to the next constraint.
       return std::string("^") + std::string(Constraint++, 2);
     }
-    LLVM_FALLTHROUGH;
+    [[fallthrough]];
   default:
     return std::string(1, *Constraint);
   }
@@ -1510,19 +1603,19 @@ void X86TargetInfo::fillValidTuneCPUList(SmallVectorImpl<StringRef> &Values) con
 }
 
 ArrayRef<const char *> X86TargetInfo::getGCCRegNames() const {
-  return llvm::makeArrayRef(GCCRegNames);
+  return llvm::ArrayRef(GCCRegNames);
 }
 
 ArrayRef<TargetInfo::AddlRegName> X86TargetInfo::getGCCAddlRegNames() const {
-  return llvm::makeArrayRef(AddlRegNames);
+  return llvm::ArrayRef(AddlRegNames);
 }
 
 ArrayRef<Builtin::Info> X86_32TargetInfo::getTargetBuiltins() const {
-  return llvm::makeArrayRef(BuiltinInfoX86, clang::X86::LastX86CommonBuiltin -
-                                                Builtin::FirstTSBuiltin + 1);
+  return llvm::ArrayRef(BuiltinInfoX86, clang::X86::LastX86CommonBuiltin -
+                                            Builtin::FirstTSBuiltin + 1);
 }
 
 ArrayRef<Builtin::Info> X86_64TargetInfo::getTargetBuiltins() const {
-  return llvm::makeArrayRef(BuiltinInfoX86,
-                            X86::LastTSBuiltin - Builtin::FirstTSBuiltin);
+  return llvm::ArrayRef(BuiltinInfoX86,
+                        X86::LastTSBuiltin - Builtin::FirstTSBuiltin);
 }
diff --git a/gnu/llvm/clang/lib/Basic/Targets/X86.h b/gnu/llvm/clang/lib/Basic/Targets/X86.h
index a21dae80600..0bb3398ff5d 100644
--- a/gnu/llvm/clang/lib/Basic/Targets/X86.h
+++ b/gnu/llvm/clang/lib/Basic/Targets/X86.h
@@ -14,11 +14,13 @@
 #define LLVM_CLANG_LIB_BASIC_TARGETS_X86_H
 
 #include "OSTargets.h"
+#include "clang/Basic/BitmaskEnum.h"
 #include "clang/Basic/TargetInfo.h"
 #include "clang/Basic/TargetOptions.h"
 #include "llvm/ADT/Triple.h"
 #include "llvm/Support/Compiler.h"
 #include "llvm/Support/X86TargetParser.h"
+#include <optional>
 
 namespace clang {
 namespace targets {
@@ -42,7 +44,8 @@ static const unsigned X86AddrSpaceMap[] = {
     0,   // sycl_private
     270, // ptr32_sptr
     271, // ptr32_uptr
-    272  // ptr64
+    272, // ptr64
+    0,   // hlsl_groupshared
 };
 
 // X86 target abstract base class; x86-32 and x86-64 are very close, so
@@ -92,6 +95,7 @@ class LLVM_LIBRARY_VISIBILITY X86TargetInfo : public TargetInfo {
   bool HasAVX512CD = false;
   bool HasAVX512VPOPCNTDQ = false;
   bool HasAVX512VNNI = false;
+  bool HasAVX512FP16 = false;
   bool HasAVX512BF16 = false;
   bool HasAVX512ER = false;
   bool HasAVX512PF = false;
@@ -101,6 +105,7 @@ class LLVM_LIBRARY_VISIBILITY X86TargetInfo : public TargetInfo {
   bool HasAVX512VL = false;
   bool HasAVX512VBMI = false;
   bool HasAVX512VBMI2 = false;
+  bool HasAVXIFMA = false;
   bool HasAVX512IFMA = false;
   bool HasAVX512VP2INTERSECT = false;
   bool HasSHA = false;
@@ -121,8 +126,10 @@ class LLVM_LIBRARY_VISIBILITY X86TargetInfo : public TargetInfo {
   bool HasCLFLUSHOPT = false;
   bool HasCLWB = false;
   bool HasMOVBE = false;
+  bool HasPREFETCHI = false;
   bool HasPREFETCHWT1 = false;
   bool HasRDPID = false;
+  bool HasRDPRU = false;
   bool HasRetpolineExternalThunk = false;
   bool HasLAHFSAHF = false;
   bool HasWBNOINVD = false;
@@ -133,6 +140,11 @@ class LLVM_LIBRARY_VISIBILITY X86TargetInfo : public TargetInfo {
   bool HasINVPCID = false;
   bool HasSaveArgs = false;
   bool HasENQCMD = false;
+  bool HasAMXFP16 = false;
+  bool HasCMPCCXADD = false;
+  bool HasRAOINT = false;
+  bool HasAVXVNNIINT8 = false;
+  bool HasAVXNECONVERT = false;
   bool HasKL = false;      // For key locker
   bool HasWIDEKL = false; // For wide key locker
   bool HasHRESET = false;
@@ -143,6 +155,8 @@ class LLVM_LIBRARY_VISIBILITY X86TargetInfo : public TargetInfo {
   bool HasSERIALIZE = false;
   bool HasTSXLDTRK = false;
   bool HasUINTR = false;
+  bool HasCRC32 = false;
+  bool HasX87 = false;
 
 protected:
   llvm::X86::CPUKind CPU = llvm::X86::CK_None;
@@ -152,6 +166,8 @@ protected:
 public:
   X86TargetInfo(const llvm::Triple &Triple, const TargetOptions &)
       : TargetInfo(Triple) {
+    BFloat16Width = BFloat16Align = 16;
+    BFloat16Format = &llvm::APFloat::BFloat();
     LongDoubleFormat = &llvm::APFloat::x87DoubleExtended();
     AddrSpaceMap = &X86AddrSpaceMap;
     HasStrictFP = true;
@@ -166,15 +182,19 @@ public:
     return LongDoubleFormat == &llvm::APFloat::IEEEquad() ? "g" : "e";
   }
 
-  unsigned getFloatEvalMethod() const override {
+  LangOptions::FPEvalMethodKind getFPEvalMethod() const override {
     // X87 evaluates with 80 bits "long double" precision.
-    return SSELevel == NoSSE ? 2 : 0;
+    return SSELevel == NoSSE ? LangOptions::FPEvalMethodKind::FEM_Extended
+                             : LangOptions::FPEvalMethodKind::FEM_Source;
   }
 
+  // EvalMethod `source` is not supported for targets with `NoSSE` feature.
+  bool supportSourceEvalMethod() const override { return SSELevel > NoSSE; }
+
   ArrayRef<const char *> getGCCRegNames() const override;
 
   ArrayRef<TargetInfo::GCCRegAlias> getGCCRegAliases() const override {
-    return None;
+    return std::nullopt;
   }
 
   ArrayRef<TargetInfo::AddlRegName> getGCCAddlRegNames() const override;
@@ -195,7 +215,9 @@ public:
       StringRef Name,
       llvm::SmallVectorImpl<StringRef> &Features) const override;
 
-  Optional<unsigned> getCPUCacheLineSize() const override;
+  StringRef getCPUSpecificTuneName(StringRef Name) const override;
+
+  std::optional<unsigned> getCPUCacheLineSize() const override;
 
   bool validateAsmConstraint(const char *&Name,
                              TargetInfo::ConstraintInfo &info) const override;
@@ -219,14 +241,18 @@ public:
   bool validateInputSize(const llvm::StringMap<bool> &FeatureMap,
                          StringRef Constraint, unsigned Size) const override;
 
-  virtual bool
+  bool
   checkCFProtectionReturnSupported(DiagnosticsEngine &Diags) const override {
-    return true;
+    if (CPU == llvm::X86::CK_None || CPU >= llvm::X86::CK_PentiumPro)
+      return true;
+    return TargetInfo::checkCFProtectionReturnSupported(Diags);
   };
 
-  virtual bool
+  bool
   checkCFProtectionBranchSupported(DiagnosticsEngine &Diags) const override {
-    return true;
+    if (CPU == llvm::X86::CK_None || CPU >= llvm::X86::CK_PentiumPro)
+      return true;
+    return TargetInfo::checkCFProtectionBranchSupported(Diags);
   };
 
   virtual bool validateOperandSize(const llvm::StringMap<bool> &FeatureMap,
@@ -375,17 +401,20 @@ public:
 
   void setSupportedOpenCLOpts() override { supportAllOpenCLOpts(); }
 
-  uint64_t getPointerWidthV(unsigned AddrSpace) const override {
-    if (AddrSpace == ptr32_sptr || AddrSpace == ptr32_uptr)
+  uint64_t getPointerWidthV(LangAS AS) const override {
+    unsigned TargetAddrSpace = getTargetAddressSpace(AS);
+    if (TargetAddrSpace == ptr32_sptr || TargetAddrSpace == ptr32_uptr)
       return 32;
-    if (AddrSpace == ptr64)
+    if (TargetAddrSpace == ptr64)
       return 64;
     return PointerWidth;
   }
 
-  uint64_t getPointerAlignV(unsigned AddrSpace) const override {
+  uint64_t getPointerAlignV(LangAS AddrSpace) const override {
     return getPointerWidthV(AddrSpace);
   }
+
+  const char *getBFloat16Mangling() const override { return "u6__bf16"; };
 };
 
 // X86-32 generic target
@@ -410,9 +439,9 @@ public:
     RegParmMax = 3;
 
     // Use fpret for all types.
-    RealTypeUsesObjCFPRet =
-        ((1 << TargetInfo::Float) | (1 << TargetInfo::Double) |
-         (1 << TargetInfo::LongDouble));
+    RealTypeUsesObjCFPRetMask =
+        (unsigned)(FloatModeKind::Float | FloatModeKind::Double |
+                   FloatModeKind::LongDouble);
 
     // x86-32 has atomics up to 8 bytes
     MaxAtomicPromoteWidth = 64;
@@ -460,7 +489,10 @@ public:
 
   ArrayRef<Builtin::Info> getTargetBuiltins() const override;
 
-  bool hasExtIntType() const override { return true; }
+  bool hasBitIntType() const override { return true; }
+  size_t getMaxBitIntWidth() const override {
+    return llvm::IntegerType::MAX_INT_BITS;
+  }
 };
 
 class LLVM_LIBRARY_VISIBILITY NetBSDI386TargetInfo
@@ -469,14 +501,13 @@ public:
   NetBSDI386TargetInfo(const llvm::Triple &Triple, const TargetOptions &Opts)
       : NetBSDTargetInfo<X86_32TargetInfo>(Triple, Opts) {}
 
-  unsigned getFloatEvalMethod() const override {
-    unsigned Major, Minor, Micro;
-    getTriple().getOSVersion(Major, Minor, Micro);
+  LangOptions::FPEvalMethodKind getFPEvalMethod() const override {
+    VersionTuple OsVersion = getTriple().getOSVersion();
     // New NetBSD uses the default rounding mode.
-    if (Major >= 7 || (Major == 6 && Minor == 99 && Micro >= 26) || Major == 0)
-      return X86_32TargetInfo::getFloatEvalMethod();
+    if (OsVersion >= VersionTuple(6, 99, 26) || OsVersion.getMajor() == 0)
+      return X86_32TargetInfo::getFPEvalMethod();
     // NetBSD before 6.99.26 defaults to "double" rounding.
-    return 1;
+    return LangOptions::FPEvalMethodKind::FEM_Double;
   }
 };
 
@@ -532,11 +563,12 @@ public:
     DoubleAlign = LongLongAlign = 64;
     bool IsWinCOFF =
         getTriple().isOSWindows() && getTriple().isOSBinFormatCOFF();
-    resetDataLayout(IsWinCOFF ? "e-m:x-p:32:32-p270:32:32-p271:32:32-p272:64:"
-                                "64-i64:64-f80:32-n8:16:32-a:0:32-S32"
-                              : "e-m:e-p:32:32-p270:32:32-p271:32:32-p272:64:"
-                                "64-i64:64-f80:32-n8:16:32-a:0:32-S32",
-                    IsWinCOFF ? "_" : "");
+    bool IsMSVC = getTriple().isWindowsMSVCEnvironment();
+    std::string Layout = IsWinCOFF ? "e-m:x" : "e-m:e";
+    Layout += "-p:32:32-p270:32:32-p271:32:32-p272:64:64-i64:64-";
+    Layout += IsMSVC ? "f80:128" : "f80:32";
+    Layout += "-n8:16:32-a:0:32-S32";
+    resetDataLayout(Layout, IsWinCOFF ? "_" : "");
   }
 };
 
@@ -691,7 +723,7 @@ public:
                                         "64-i64:64-f80:128-n8:16:32:64-S128");
 
     // Use fpret only for long double.
-    RealTypeUsesObjCFPRet = (1 << TargetInfo::LongDouble);
+    RealTypeUsesObjCFPRetMask = (unsigned)FloatModeKind::LongDouble;
 
     // Use fp2ret for _Complex long double.
     ComplexLongDoubleUsesFP2Ret = true;
@@ -767,7 +799,10 @@ public:
 
   ArrayRef<Builtin::Info> getTargetBuiltins() const override;
 
-  bool hasExtIntType() const override { return true; }
+  bool hasBitIntType() const override { return true; }
+  size_t getMaxBitIntWidth() const override {
+    return llvm::IntegerType::MAX_INT_BITS;
+  }
 };
 
 // x86-64 Windows target
diff --git a/gnu/llvm/clang/lib/CodeGen/CGCall.cpp b/gnu/llvm/clang/lib/CodeGen/CGCall.cpp
index 5ddc2aa1ca4..ae13a381a63 100644
--- a/gnu/llvm/clang/lib/CodeGen/CGCall.cpp
+++ b/gnu/llvm/clang/lib/CodeGen/CGCall.cpp
@@ -38,7 +38,9 @@
 #include "llvm/IR/InlineAsm.h"
 #include "llvm/IR/IntrinsicInst.h"
 #include "llvm/IR/Intrinsics.h"
+#include "llvm/IR/Type.h"
 #include "llvm/Transforms/Utils/Local.h"
+#include <optional>
 using namespace clang;
 using namespace CodeGen;
 
@@ -61,6 +63,8 @@ unsigned CodeGenTypes::ClangCallConvToLLVMCallConv(CallingConv CC) {
   // TODO: Add support for __vectorcall to LLVM.
   case CC_X86VectorCall: return llvm::CallingConv::X86_VectorCall;
   case CC_AArch64VectorCall: return llvm::CallingConv::AArch64_VectorCall;
+  case CC_AArch64SVEPCS: return llvm::CallingConv::AArch64_SVE_VectorCall;
+  case CC_AMDGPUKernelCall: return llvm::CallingConv::AMDGPU_KERNEL;
   case CC_SpirFunction: return llvm::CallingConv::SPIR_FUNC;
   case CC_OpenCLKernel: return CGM.getTargetCodeGenInfo().getOpenCLKernelCallingConv();
   case CC_PreserveMost: return llvm::CallingConv::PreserveMost;
@@ -109,7 +113,7 @@ CodeGenTypes::arrangeFreeFunctionType(CanQual<FunctionNoProtoType> FTNP) {
   // variadic type.
   return arrangeLLVMFunctionInfo(FTNP->getReturnType().getUnqualifiedType(),
                                  /*instanceMethod=*/false,
-                                 /*chainCall=*/false, None,
+                                 /*chainCall=*/false, std::nullopt,
                                  FTNP->getExtInfo(), {}, RequiredArgs(0));
 }
 
@@ -227,6 +231,12 @@ static CallingConv getCallingConventionForDecl(const ObjCMethodDecl *D,
   if (D->hasAttr<AArch64VectorPcsAttr>())
     return CC_AArch64VectorCall;
 
+  if (D->hasAttr<AArch64SVEPcsAttr>())
+    return CC_AArch64SVEPCS;
+
+  if (D->hasAttr<AMDGPUKernelCallAttr>())
+    return CC_AMDGPUKernelCall;
+
   if (D->hasAttr<IntelOclBiccAttr>())
     return CC_IntelOclBicc;
 
@@ -312,7 +322,9 @@ CodeGenTypes::arrangeCXXStructorDeclaration(GlobalDecl GD) {
 
   SmallVector<CanQualType, 16> argTypes;
   SmallVector<FunctionProtoType::ExtParameterInfo, 16> paramInfos;
-  argTypes.push_back(DeriveThisType(MD->getParent(), MD));
+
+  const CXXRecordDecl *ThisType = TheCXXABI.getThisArgumentTypeForMethod(GD);
+  argTypes.push_back(DeriveThisType(ThisType, MD));
 
   bool PassParams = true;
 
@@ -450,7 +462,8 @@ CodeGenTypes::arrangeFunctionDeclaration(const FunctionDecl *FD) {
   if (CanQual<FunctionNoProtoType> noProto = FTy.getAs<FunctionNoProtoType>()) {
     return arrangeLLVMFunctionInfo(
         noProto->getReturnType(), /*instanceMethod=*/false,
-        /*chainCall=*/false, None, noProto->getExtInfo(), {},RequiredArgs::All);
+        /*chainCall=*/false, std::nullopt, noProto->getExtInfo(), {},
+        RequiredArgs::All);
   }
 
   return arrangeFreeFunctionType(FTy.castAs<FunctionProtoType>());
@@ -475,9 +488,11 @@ const CGFunctionInfo &
 CodeGenTypes::arrangeObjCMessageSendSignature(const ObjCMethodDecl *MD,
                                               QualType receiverType) {
   SmallVector<CanQualType, 16> argTys;
-  SmallVector<FunctionProtoType::ExtParameterInfo, 4> extParamInfos(2);
+  SmallVector<FunctionProtoType::ExtParameterInfo, 4> extParamInfos(
+      MD->isDirectMethod() ? 1 : 2);
   argTys.push_back(Context.getCanonicalParamType(receiverType));
-  argTys.push_back(Context.getCanonicalParamType(Context.getObjCSelType()));
+  if (!MD->isDirectMethod())
+    argTys.push_back(Context.getCanonicalParamType(Context.getObjCSelType()));
   // FIXME: Kill copy?
   for (const auto *I : MD->parameters()) {
     argTys.push_back(Context.getCanonicalParamType(I->getType()));
@@ -699,7 +714,7 @@ CodeGenTypes::arrangeCXXMethodCall(const CallArgList &args,
 const CGFunctionInfo &CodeGenTypes::arrangeNullaryFunction() {
   return arrangeLLVMFunctionInfo(
       getContext().VoidTy, /*instanceMethod=*/false, /*chainCall=*/false,
-      None, FunctionType::ExtInfo(), {}, RequiredArgs::All);
+      std::nullopt, FunctionType::ExtInfo(), {}, RequiredArgs::All);
 }
 
 const CGFunctionInfo &
@@ -832,6 +847,7 @@ CGFunctionInfo *CGFunctionInfo::create(unsigned llvmCC,
   FI->NumArgs = argTypes.size();
   FI->HasExtParameterInfos = !paramInfos.empty();
   FI->getArgsBuffer()[0].type = resultType;
+  FI->MaxVectorWidth = 0;
   for (unsigned i = 0, e = argTypes.size(); i != e; ++i)
     FI->getArgsBuffer()[i + 1].type = argTypes[i];
   for (unsigned i = 0, e = paramInfos.size(); i != e; ++i)
@@ -941,8 +957,7 @@ getTypeExpansion(QualType Ty, const ASTContext &Context) {
       if (const auto *CXXRD = dyn_cast<CXXRecordDecl>(RD)) {
         assert(!CXXRD->isDynamicClass() &&
                "cannot expand vtable pointers in dynamic classes");
-        for (const CXXBaseSpecifier &BS : CXXRD->bases())
-          Bases.push_back(&BS);
+        llvm::append_range(Bases, llvm::make_pointer_range(CXXRD->bases()));
       }
 
       for (const auto *FD : RD->fields()) {
@@ -1011,11 +1026,12 @@ static void forConstantArrayExpansion(CodeGenFunction &CGF,
   CharUnits EltSize = CGF.getContext().getTypeSizeInChars(CAE->EltTy);
   CharUnits EltAlign =
     BaseAddr.getAlignment().alignmentOfArrayElement(EltSize);
+  llvm::Type *EltTy = CGF.ConvertTypeForMem(CAE->EltTy);
 
   for (int i = 0, n = CAE->NumElts; i < n; i++) {
     llvm::Value *EltAddr = CGF.Builder.CreateConstGEP2_32(
         BaseAddr.getElementType(), BaseAddr.getPointer(), 0, i);
-    Fn(Address(EltAddr, EltAlign));
+    Fn(Address(EltAddr, EltTy, EltAlign));
   }
 }
 
@@ -1056,10 +1072,19 @@ void CodeGenFunction::ExpandTypeFromArgs(QualType Ty, LValue LV,
     // Call EmitStoreOfScalar except when the lvalue is a bitfield to emit a
     // primitive store.
     assert(isa<NoExpansion>(Exp.get()));
-    if (LV.isBitField())
-      EmitStoreThroughLValue(RValue::get(&*AI++), LV);
-    else
-      EmitStoreOfScalar(&*AI++, LV);
+    llvm::Value *Arg = &*AI++;
+    if (LV.isBitField()) {
+      EmitStoreThroughLValue(RValue::get(Arg), LV);
+    } else {
+      // TODO: currently there are some places are inconsistent in what LLVM
+      // pointer type they use (see D118744). Once clang uses opaque pointers
+      // all LLVM pointer types will be the same and we can remove this check.
+      if (Arg->getType()->isPointerTy()) {
+        Address Addr = LV.getAddress(*this);
+        Arg = Builder.CreateBitCast(Arg, Addr.getElementType());
+      }
+      EmitStoreOfScalar(Arg, LV);
+    }
   }
 }
 
@@ -1125,7 +1150,7 @@ static Address CreateTempAllocaForCoercion(CodeGenFunction &CGF, llvm::Type *Ty,
                                            CharUnits MinAlign,
                                            const Twine &Name = "tmp") {
   // Don't use an alignment that's worse than what LLVM would prefer.
-  auto PrefAlign = CGF.CGM.getDataLayout().getPrefTypeAlignment(Ty);
+  auto PrefAlign = CGF.CGM.getDataLayout().getPrefTypeAlign(Ty);
   CharUnits Align = std::max(MinAlign, CharUnits::fromQuantity(PrefAlign));
 
   return CGF.CreateTempAlloca(Ty, Align, Name + ".coerce");
@@ -1238,7 +1263,7 @@ static llvm::Value *CreateCoercedLoad(Address Src, llvm::Type *Ty,
 
   if (llvm::StructType *SrcSTy = dyn_cast<llvm::StructType>(SrcTy)) {
     Src = EnterStructPointerForCoercedAccess(Src, SrcSTy,
-                                             DstSize.getFixedSize(), CGF);
+                                             DstSize.getFixedValue(), CGF);
     SrcTy = Src.getElementType();
   }
 
@@ -1254,29 +1279,42 @@ static llvm::Value *CreateCoercedLoad(Address Src, llvm::Type *Ty,
 
   // If load is legal, just bitcast the src pointer.
   if (!SrcSize.isScalable() && !DstSize.isScalable() &&
-      SrcSize.getFixedSize() >= DstSize.getFixedSize()) {
+      SrcSize.getFixedValue() >= DstSize.getFixedValue()) {
     // Generally SrcSize is never greater than DstSize, since this means we are
     // losing bits. However, this can happen in cases where the structure has
     // additional padding, for example due to a user specified alignment.
     //
     // FIXME: Assert that we aren't truncating non-padding bits when have access
     // to that information.
-    Src = CGF.Builder.CreateBitCast(Src,
-                                    Ty->getPointerTo(Src.getAddressSpace()));
+    Src = CGF.Builder.CreateElementBitCast(Src, Ty);
     return CGF.Builder.CreateLoad(Src);
   }
 
   // If coercing a fixed vector to a scalable vector for ABI compatibility, and
-  // the types match, use the llvm.experimental.vector.insert intrinsic to
-  // perform the conversion.
+  // the types match, use the llvm.vector.insert intrinsic to perform the
+  // conversion.
   if (auto *ScalableDst = dyn_cast<llvm::ScalableVectorType>(Ty)) {
     if (auto *FixedSrc = dyn_cast<llvm::FixedVectorType>(SrcTy)) {
+      // If we are casting a fixed i8 vector to a scalable 16 x i1 predicate
+      // vector, use a vector insert and bitcast the result.
+      bool NeedsBitcast = false;
+      auto PredType =
+          llvm::ScalableVectorType::get(CGF.Builder.getInt1Ty(), 16);
+      llvm::Type *OrigType = Ty;
+      if (ScalableDst == PredType &&
+          FixedSrc->getElementType() == CGF.Builder.getInt8Ty()) {
+        ScalableDst = llvm::ScalableVectorType::get(CGF.Builder.getInt8Ty(), 2);
+        NeedsBitcast = true;
+      }
       if (ScalableDst->getElementType() == FixedSrc->getElementType()) {
         auto *Load = CGF.Builder.CreateLoad(Src);
         auto *UndefVec = llvm::UndefValue::get(ScalableDst);
         auto *Zero = llvm::Constant::getNullValue(CGF.CGM.Int64Ty);
-        return CGF.Builder.CreateInsertVector(ScalableDst, UndefVec, Load, Zero,
-                                              "castScalableSve");
+        llvm::Value *Result = CGF.Builder.CreateInsertVector(
+            ScalableDst, UndefVec, Load, Zero, "castScalableSve");
+        if (NeedsBitcast)
+          Result = CGF.Builder.CreateBitCast(Result, OrigType);
+        return Result;
       }
     }
   }
@@ -1287,7 +1325,7 @@ static llvm::Value *CreateCoercedLoad(Address Src, llvm::Type *Ty,
   CGF.Builder.CreateMemCpy(
       Tmp.getPointer(), Tmp.getAlignment().getAsAlign(), Src.getPointer(),
       Src.getAlignment().getAsAlign(),
-      llvm::ConstantInt::get(CGF.IntPtrTy, SrcSize.getKnownMinSize()));
+      llvm::ConstantInt::get(CGF.IntPtrTy, SrcSize.getKnownMinValue()));
   return CGF.Builder.CreateLoad(Tmp);
 }
 
@@ -1330,7 +1368,7 @@ static void CreateCoercedStore(llvm::Value *Src,
 
   if (llvm::StructType *DstSTy = dyn_cast<llvm::StructType>(DstTy)) {
     Dst = EnterStructPointerForCoercedAccess(Dst, DstSTy,
-                                             SrcSize.getFixedSize(), CGF);
+                                             SrcSize.getFixedValue(), CGF);
     DstTy = Dst.getElementType();
   }
 
@@ -1357,7 +1395,7 @@ static void CreateCoercedStore(llvm::Value *Src,
   // If store is legal, just bitcast the src pointer.
   if (isa<llvm::ScalableVectorType>(SrcTy) ||
       isa<llvm::ScalableVectorType>(DstTy) ||
-      SrcSize.getFixedSize() <= DstSize.getFixedSize()) {
+      SrcSize.getFixedValue() <= DstSize.getFixedValue()) {
     Dst = CGF.Builder.CreateElementBitCast(Dst, SrcTy);
     CGF.EmitAggregateStore(Src, Dst, DstIsVolatile);
   } else {
@@ -1375,7 +1413,7 @@ static void CreateCoercedStore(llvm::Value *Src,
     CGF.Builder.CreateMemCpy(
         Dst.getPointer(), Dst.getAlignment().getAsAlign(), Tmp.getPointer(),
         Tmp.getAlignment().getAsAlign(),
-        llvm::ConstantInt::get(CGF.IntPtrTy, DstSize.getFixedSize()));
+        llvm::ConstantInt::get(CGF.IntPtrTy, DstSize.getFixedValue()));
   }
 }
 
@@ -1550,11 +1588,11 @@ bool CodeGenModule::ReturnTypeUsesFPRet(QualType ResultType) {
     default:
       return false;
     case BuiltinType::Float:
-      return getTarget().useObjCFPRetForRealType(TargetInfo::Float);
+      return getTarget().useObjCFPRetForRealType(FloatModeKind::Float);
     case BuiltinType::Double:
-      return getTarget().useObjCFPRetForRealType(TargetInfo::Double);
+      return getTarget().useObjCFPRetForRealType(FloatModeKind::Double);
     case BuiltinType::LongDouble:
-      return getTarget().useObjCFPRetForRealType(TargetInfo::LongDouble);
+      return getTarget().useObjCFPRetForRealType(FloatModeKind::LongDouble);
     }
   }
 
@@ -1601,7 +1639,7 @@ CodeGenTypes::GetFunctionType(const CGFunctionInfo &FI) {
       // sret things on win32 aren't void, they return the sret pointer.
       QualType ret = FI.getReturnType();
       llvm::Type *ty = ConvertType(ret);
-      unsigned addressSpace = Context.getTargetAddressSpace(ret);
+      unsigned addressSpace = CGM.getTypes().getTargetAddressSpace(ret);
       resultType = llvm::PointerType::get(ty, addressSpace);
     } else {
       resultType = llvm::Type::getVoidTy(getLLVMContext());
@@ -1625,7 +1663,7 @@ CodeGenTypes::GetFunctionType(const CGFunctionInfo &FI) {
   if (IRFunctionArgs.hasSRetArg()) {
     QualType Ret = FI.getReturnType();
     llvm::Type *Ty = ConvertType(Ret);
-    unsigned AddressSpace = Context.getTargetAddressSpace(Ret);
+    unsigned AddressSpace = CGM.getTypes().getTargetAddressSpace(Ret);
     ArgTypes[IRFunctionArgs.getSRetArgNo()] =
         llvm::PointerType::get(Ty, AddressSpace);
   }
@@ -1691,7 +1729,7 @@ CodeGenTypes::GetFunctionType(const CGFunctionInfo &FI) {
 
     case ABIArgInfo::CoerceAndExpand: {
       auto ArgTypesIter = ArgTypes.begin() + FirstIRArg;
-      for (auto EltTy : ArgInfo.getCoerceAndExpandTypeSequence()) {
+      for (auto *EltTy : ArgInfo.getCoerceAndExpandTypeSequence()) {
         *ArgTypesIter++ = EltTy;
       }
       assert(ArgTypesIter == ArgTypes.begin() + FirstIRArg + NumIRArgs);
@@ -1733,8 +1771,23 @@ static void AddAttributesFromFunctionProtoType(ASTContext &Ctx,
     FuncAttrs.addAttribute(llvm::Attribute::NoUnwind);
 }
 
+static void AddAttributesFromAssumes(llvm::AttrBuilder &FuncAttrs,
+                                     const Decl *Callee) {
+  if (!Callee)
+    return;
+
+  SmallVector<StringRef, 4> Attrs;
+
+  for (const AssumptionAttr *AA : Callee->specific_attrs<AssumptionAttr>())
+    AA->getAssumption().split(Attrs, ",");
+
+  if (!Attrs.empty())
+    FuncAttrs.addAttribute(llvm::AssumptionAttrKey,
+                           llvm::join(Attrs.begin(), Attrs.end(), ","));
+}
+
 bool CodeGenModule::MayDropFunctionReturn(const ASTContext &Context,
-                                          QualType ReturnType) {
+                                          QualType ReturnType) const {
   // We can't just discard the return value for a record type with a
   // complex destructor or a non-trivially copyable type.
   if (const RecordType *RT =
@@ -1745,6 +1798,38 @@ bool CodeGenModule::MayDropFunctionReturn(const ASTContext &Context,
   return ReturnType.isTriviallyCopyableType(Context);
 }
 
+static bool HasStrictReturn(const CodeGenModule &Module, QualType RetTy,
+                            const Decl *TargetDecl) {
+  // As-is msan can not tolerate noundef mismatch between caller and
+  // implementation. Mismatch is possible for e.g. indirect calls from C-caller
+  // into C++. Such mismatches lead to confusing false reports. To avoid
+  // expensive workaround on msan we enforce initialization event in uncommon
+  // cases where it's allowed.
+  if (Module.getLangOpts().Sanitize.has(SanitizerKind::Memory))
+    return true;
+  // C++ explicitly makes returning undefined values UB. C's rule only applies
+  // to used values, so we never mark them noundef for now.
+  if (!Module.getLangOpts().CPlusPlus)
+    return false;
+  if (TargetDecl) {
+    if (const FunctionDecl *FDecl = dyn_cast<FunctionDecl>(TargetDecl)) {
+      if (FDecl->isExternC())
+        return false;
+    } else if (const VarDecl *VDecl = dyn_cast<VarDecl>(TargetDecl)) {
+      // Function pointer.
+      if (VDecl->isExternC())
+        return false;
+    }
+  }
+
+  // We don't want to be too aggressive with the return checking, unless
+  // it's explicit in the code opts or we're using an appropriate sanitizer.
+  // Try to respect what the programmer intended.
+  return Module.getCodeGenOpts().StrictReturn ||
+         !Module.MayDropFunctionReturn(Module.getContext(), RetTy) ||
+         Module.getLangOpts().Sanitize.has(SanitizerKind::Return);
+}
+
 void CodeGenModule::getDefaultFunctionAttributes(StringRef Name,
                                                  bool HasOptnone,
                                                  bool AttrOnCallSite,
@@ -1766,24 +1851,23 @@ void CodeGenModule::getDefaultFunctionAttributes(StringRef Name,
 
   if (AttrOnCallSite) {
     // Attributes that should go on the call site only.
+    // FIXME: Look for 'BuiltinAttr' on the function rather than re-checking
+    // the -fno-builtin-foo list.
     if (!CodeGenOpts.SimplifyLibCalls || LangOpts.isNoBuiltinFunc(Name))
       FuncAttrs.addAttribute(llvm::Attribute::NoBuiltin);
     if (!CodeGenOpts.TrapFuncName.empty())
       FuncAttrs.addAttribute("trap-func-name", CodeGenOpts.TrapFuncName);
   } else {
-    StringRef FpKind;
     switch (CodeGenOpts.getFramePointer()) {
     case CodeGenOptions::FramePointerKind::None:
-      FpKind = "none";
+      // This is the default behavior.
       break;
     case CodeGenOptions::FramePointerKind::NonLeaf:
-      FpKind = "non-leaf";
-      break;
     case CodeGenOptions::FramePointerKind::All:
-      FpKind = "all";
-      break;
+      FuncAttrs.addAttribute("frame-pointer",
+                             CodeGenOptions::getFramePointerKindName(
+                                 CodeGenOpts.getFramePointer()));
     }
-    FuncAttrs.addAttribute("frame-pointer", FpKind);
 
     if (CodeGenOpts.LessPreciseFPMAD)
       FuncAttrs.addAttribute("less-precise-fpmad", "true");
@@ -1800,21 +1884,23 @@ void CodeGenModule::getDefaultFunctionAttributes(StringRef Name,
           CodeGenOpts.FP32DenormalMode.str());
     }
 
-    if (LangOpts.getFPExceptionMode() == LangOptions::FPE_Ignore)
+    if (LangOpts.getDefaultExceptionMode() == LangOptions::FPE_Ignore)
       FuncAttrs.addAttribute("no-trapping-math", "true");
 
-    // Strict (compliant) code is the default, so only add this attribute to
-    // indicate that we are trying to workaround a problem case.
-    if (!CodeGenOpts.StrictFloatCastOverflow)
-      FuncAttrs.addAttribute("strict-float-cast-overflow", "false");
-
     // TODO: Are these all needed?
     // unsafe/inf/nan/nsz are handled by instruction-level FastMathFlags.
     if (LangOpts.NoHonorInfs)
       FuncAttrs.addAttribute("no-infs-fp-math", "true");
     if (LangOpts.NoHonorNaNs)
       FuncAttrs.addAttribute("no-nans-fp-math", "true");
-    if (LangOpts.UnsafeFPMath)
+    if (LangOpts.ApproxFunc)
+      FuncAttrs.addAttribute("approx-func-fp-math", "true");
+    if (LangOpts.AllowFPReassoc && LangOpts.AllowRecip &&
+        LangOpts.NoSignedZero && LangOpts.ApproxFunc &&
+        (LangOpts.getDefaultFPContractMode() ==
+             LangOptions::FPModeKind::FPM_Fast ||
+         LangOpts.getDefaultFPContractMode() ==
+             LangOptions::FPModeKind::FPM_FastHonorPragmas))
       FuncAttrs.addAttribute("unsafe-fp-math", "true");
     if (CodeGenOpts.SoftFloat)
       FuncAttrs.addAttribute("use-soft-float", "true");
@@ -1843,6 +1929,37 @@ void CodeGenModule::getDefaultFunctionAttributes(StringRef Name,
 
     if (CodeGenOpts.SpeculativeLoadHardening)
       FuncAttrs.addAttribute(llvm::Attribute::SpeculativeLoadHardening);
+
+    // Add zero-call-used-regs attribute.
+    switch (CodeGenOpts.getZeroCallUsedRegs()) {
+    case llvm::ZeroCallUsedRegs::ZeroCallUsedRegsKind::Skip:
+      FuncAttrs.removeAttribute("zero-call-used-regs");
+      break;
+    case llvm::ZeroCallUsedRegs::ZeroCallUsedRegsKind::UsedGPRArg:
+      FuncAttrs.addAttribute("zero-call-used-regs", "used-gpr-arg");
+      break;
+    case llvm::ZeroCallUsedRegs::ZeroCallUsedRegsKind::UsedGPR:
+      FuncAttrs.addAttribute("zero-call-used-regs", "used-gpr");
+      break;
+    case llvm::ZeroCallUsedRegs::ZeroCallUsedRegsKind::UsedArg:
+      FuncAttrs.addAttribute("zero-call-used-regs", "used-arg");
+      break;
+    case llvm::ZeroCallUsedRegs::ZeroCallUsedRegsKind::Used:
+      FuncAttrs.addAttribute("zero-call-used-regs", "used");
+      break;
+    case llvm::ZeroCallUsedRegs::ZeroCallUsedRegsKind::AllGPRArg:
+      FuncAttrs.addAttribute("zero-call-used-regs", "all-gpr-arg");
+      break;
+    case llvm::ZeroCallUsedRegs::ZeroCallUsedRegsKind::AllGPR:
+      FuncAttrs.addAttribute("zero-call-used-regs", "all-gpr");
+      break;
+    case llvm::ZeroCallUsedRegs::ZeroCallUsedRegsKind::AllArg:
+      FuncAttrs.addAttribute("zero-call-used-regs", "all-arg");
+      break;
+    case llvm::ZeroCallUsedRegs::ZeroCallUsedRegsKind::All:
+      FuncAttrs.addAttribute("zero-call-used-regs", "all");
+      break;
+    }
   }
 
   if (getLangOpts().assumeFunctionsAreConvergent()) {
@@ -1854,8 +1971,11 @@ void CodeGenModule::getDefaultFunctionAttributes(StringRef Name,
     FuncAttrs.addAttribute(llvm::Attribute::Convergent);
   }
 
-  if (getLangOpts().CUDA && getLangOpts().CUDAIsDevice) {
-    // Exceptions aren't supported in CUDA device code.
+  // TODO: NoUnwind attribute should be added for other GPU modes HIP,
+  // SYCL, OpenMP offload. AFAIK, none of them support exceptions in device
+  // code.
+  if ((getLangOpts().CUDA && getLangOpts().CUDAIsDevice) ||
+      getLangOpts().OpenCL) {
     FuncAttrs.addAttribute(llvm::Attribute::NoUnwind);
   }
 
@@ -1867,11 +1987,11 @@ void CodeGenModule::getDefaultFunctionAttributes(StringRef Name,
 }
 
 void CodeGenModule::addDefaultFunctionDefinitionAttributes(llvm::Function &F) {
-  llvm::AttrBuilder FuncAttrs;
+  llvm::AttrBuilder FuncAttrs(F.getContext());
   getDefaultFunctionAttributes(F.getName(), F.hasOptNone(),
                                /* AttrOnCallSite = */ false, FuncAttrs);
   // TODO: call GetCPUAndFeaturesAttributes?
-  F.addAttributes(llvm::AttributeList::FunctionIndex, FuncAttrs);
+  F.addFnAttrs(FuncAttrs);
 }
 
 void CodeGenModule::addDefaultFunctionDefinitionAttributes(
@@ -1940,7 +2060,7 @@ static bool DetermineNoUndef(QualType QTy, CodeGenTypes &Types,
       // there's no internal padding (typeSizeEqualsStoreSize).
       return false;
   }
-  if (QTy->isExtIntType())
+  if (QTy->isBitIntType())
     return true;
   if (QTy->isReferenceType())
     return true;
@@ -1966,6 +2086,27 @@ static bool DetermineNoUndef(QualType QTy, CodeGenTypes &Types,
   return false;
 }
 
+/// Check if the argument of a function has maybe_undef attribute.
+static bool IsArgumentMaybeUndef(const Decl *TargetDecl,
+                                 unsigned NumRequiredArgs, unsigned ArgNo) {
+  const auto *FD = dyn_cast_or_null<FunctionDecl>(TargetDecl);
+  if (!FD)
+    return false;
+
+  // Assume variadic arguments do not have maybe_undef attribute.
+  if (ArgNo >= NumRequiredArgs)
+    return false;
+
+  // Check if argument has maybe_undef attribute.
+  if (ArgNo < FD->getNumParams()) {
+    const ParmVarDecl *Param = FD->getParamDecl(ArgNo);
+    if (Param && Param->hasAttr<MaybeUndefAttr>())
+      return true;
+  }
+
+  return false;
+}
+
 /// Construct the IR attribute list of a function or call.
 ///
 /// When adding an attribute, please consider where it should be handled:
@@ -1989,8 +2130,8 @@ void CodeGenModule::ConstructAttributeList(StringRef Name,
                                            llvm::AttributeList &AttrList,
                                            unsigned &CallingConv,
                                            bool AttrOnCallSite, bool IsThunk) {
-  llvm::AttrBuilder FuncAttrs;
-  llvm::AttrBuilder RetAttrs;
+  llvm::AttrBuilder FuncAttrs(getLLVMContext());
+  llvm::AttrBuilder RetAttrs(getLLVMContext());
 
   // Collect function IR attributes from the CC lowering.
   // We'll collect the paramete and result attributes later.
@@ -2006,10 +2147,23 @@ void CodeGenModule::ConstructAttributeList(StringRef Name,
 
   const Decl *TargetDecl = CalleeInfo.getCalleeDecl().getDecl();
 
+  // Attach assumption attributes to the declaration. If this is a call
+  // site, attach assumptions from the caller to the call as well.
+  AddAttributesFromAssumes(FuncAttrs, TargetDecl);
+
   bool HasOptnone = false;
   // The NoBuiltinAttr attached to the target FunctionDecl.
   const NoBuiltinAttr *NBA = nullptr;
 
+  // Some ABIs may result in additional accesses to arguments that may
+  // otherwise not be present.
+  auto AddPotentialArgAccess = [&]() {
+    llvm::Attribute A = FuncAttrs.getAttribute(llvm::Attribute::Memory);
+    if (A.isValid())
+      FuncAttrs.addMemoryAttr(A.getMemoryEffects() |
+                              llvm::MemoryEffects::argMemOnly());
+  };
+
   // Collect function IR attributes based on declaration-specific
   // information.
   // FIXME: handle sseregparm someday...
@@ -2052,40 +2206,22 @@ void CodeGenModule::ConstructAttributeList(StringRef Name,
       // allows it to work on indirect virtual function calls.
       if (AttrOnCallSite && TargetDecl->hasAttr<NoMergeAttr>())
         FuncAttrs.addAttribute(llvm::Attribute::NoMerge);
-
-      // Add known guaranteed alignment for allocation functions.
-      if (unsigned BuiltinID = Fn->getBuiltinID()) {
-        switch (BuiltinID) {
-        case Builtin::BIaligned_alloc:
-        case Builtin::BIcalloc:
-        case Builtin::BImalloc:
-        case Builtin::BImemalign:
-        case Builtin::BIrealloc:
-        case Builtin::BIstrdup:
-        case Builtin::BIstrndup:
-          RetAttrs.addAlignmentAttr(Context.getTargetInfo().getNewAlign() /
-                                    Context.getTargetInfo().getCharWidth());
-          break;
-        default:
-          break;
-        }
-      }
     }
 
     // 'const', 'pure' and 'noalias' attributed functions are also nounwind.
     if (TargetDecl->hasAttr<ConstAttr>()) {
-      FuncAttrs.addAttribute(llvm::Attribute::ReadNone);
+      FuncAttrs.addMemoryAttr(llvm::MemoryEffects::none());
       FuncAttrs.addAttribute(llvm::Attribute::NoUnwind);
       // gcc specifies that 'const' functions have greater restrictions than
       // 'pure' functions, so they also cannot have infinite loops.
       FuncAttrs.addAttribute(llvm::Attribute::WillReturn);
     } else if (TargetDecl->hasAttr<PureAttr>()) {
-      FuncAttrs.addAttribute(llvm::Attribute::ReadOnly);
+      FuncAttrs.addMemoryAttr(llvm::MemoryEffects::readOnly());
       FuncAttrs.addAttribute(llvm::Attribute::NoUnwind);
       // gcc specifies that 'pure' functions cannot have infinite loops.
       FuncAttrs.addAttribute(llvm::Attribute::WillReturn);
     } else if (TargetDecl->hasAttr<NoAliasAttr>()) {
-      FuncAttrs.addAttribute(llvm::Attribute::ArgMemOnly);
+      FuncAttrs.addMemoryAttr(llvm::MemoryEffects::argMemOnly());
       FuncAttrs.addAttribute(llvm::Attribute::NoUnwind);
     }
     if (TargetDecl->hasAttr<RestrictAttr>())
@@ -2102,7 +2238,7 @@ void CodeGenModule::ConstructAttributeList(StringRef Name,
 
     HasOptnone = TargetDecl->hasAttr<OptimizeNoneAttr>();
     if (auto *AllocSize = TargetDecl->getAttr<AllocSizeAttr>()) {
-      Optional<unsigned> NumElemsParam;
+      std::optional<unsigned> NumElemsParam;
       if (AllocSize->getNumElemsParam().isValid())
         NumElemsParam = AllocSize->getNumElemsParam().getLLVMIndex();
       FuncAttrs.addAllocSizeAttr(AllocSize->getElemSizeParam().getLLVMIndex(),
@@ -2123,18 +2259,6 @@ void CodeGenModule::ConstructAttributeList(StringRef Name,
                                llvm::toStringRef(CodeGenOpts.UniformWGSize));
       }
     }
-
-    std::string AssumptionValueStr;
-    for (AssumptionAttr *AssumptionA :
-         TargetDecl->specific_attrs<AssumptionAttr>()) {
-      std::string AS = AssumptionA->getAssumption().str();
-      if (!AS.empty() && !AssumptionValueStr.empty())
-        AssumptionValueStr += ",";
-      AssumptionValueStr += AS;
-    }
-
-    if (!AssumptionValueStr.empty())
-      FuncAttrs.addAttribute(llvm::AssumptionAttrKey, AssumptionValueStr);
   }
 
   // Attach "no-builtins" attributes to:
@@ -2157,6 +2281,15 @@ void CodeGenModule::ConstructAttributeList(StringRef Name,
       FuncAttrs.addAttribute(llvm::Attribute::SpeculativeLoadHardening);
     if (TargetDecl->hasAttr<NoSplitStackAttr>())
       FuncAttrs.removeAttribute("split-stack");
+    if (TargetDecl->hasAttr<ZeroCallUsedRegsAttr>()) {
+      // A function "__attribute__((...))" overrides the command-line flag.
+      auto Kind =
+          TargetDecl->getAttr<ZeroCallUsedRegsAttr>()->getZeroCallUsedRegs();
+      FuncAttrs.removeAttribute("zero-call-used-regs");
+      FuncAttrs.addAttribute(
+          "zero-call-used-regs",
+          ZeroCallUsedRegsAttr::ConvertZeroCallUsedRegsKindToStr(Kind));
+    }
 
     // Add NonLazyBind attribute to function declarations when -fno-plt
     // is used.
@@ -2174,9 +2307,8 @@ void CodeGenModule::ConstructAttributeList(StringRef Name,
   // Add "sample-profile-suffix-elision-policy" attribute for internal linkage
   // functions with -funique-internal-linkage-names.
   if (TargetDecl && CodeGenOpts.UniqueInternalLinkageNames) {
-    if (isa<FunctionDecl>(TargetDecl)) {
-      if (this->getFunctionLinkage(CalleeInfo.getCalleeDecl()) ==
-          llvm::GlobalValue::InternalLinkage)
+    if (const auto *FD = dyn_cast_or_null<FunctionDecl>(TargetDecl)) {
+      if (!FD->isExternallyVisible())
         FuncAttrs.addAttribute("sample-profile-suffix-elision-policy",
                                "selected");
     }
@@ -2227,27 +2359,9 @@ void CodeGenModule::ConstructAttributeList(StringRef Name,
   const ABIArgInfo &RetAI = FI.getReturnInfo();
   const llvm::DataLayout &DL = getDataLayout();
 
-  // C++ explicitly makes returning undefined values UB. C's rule only applies
-  // to used values, so we never mark them noundef for now.
-  bool HasStrictReturn = getLangOpts().CPlusPlus;
-  if (TargetDecl) {
-    if (const FunctionDecl *FDecl = dyn_cast<FunctionDecl>(TargetDecl))
-      HasStrictReturn &= !FDecl->isExternC();
-    else if (const VarDecl *VDecl = dyn_cast<VarDecl>(TargetDecl))
-      // Function pointer
-      HasStrictReturn &= !VDecl->isExternC();
-  }
-
-  // We don't want to be too aggressive with the return checking, unless
-  // it's explicit in the code opts or we're using an appropriate sanitizer.
-  // Try to respect what the programmer intended.
-  HasStrictReturn &= getCodeGenOpts().StrictReturn ||
-                     !MayDropFunctionReturn(getContext(), RetTy) ||
-                     getLangOpts().Sanitize.has(SanitizerKind::Memory) ||
-                     getLangOpts().Sanitize.has(SanitizerKind::Return);
-
   // Determine if the return type could be partially undef
-  if (CodeGenOpts.EnableNoundefAttrs && HasStrictReturn) {
+  if (CodeGenOpts.EnableNoundefAttrs &&
+      HasStrictReturn(*this, RetTy, TargetDecl)) {
     if (!RetTy->isVoidType() && RetAI.getKind() != ABIArgInfo::Indirect &&
         DetermineNoUndef(RetTy, getTypes(), DL, RetAI))
       RetAttrs.addAttribute(llvm::Attribute::NoUndef);
@@ -2259,7 +2373,7 @@ void CodeGenModule::ConstructAttributeList(StringRef Name,
       RetAttrs.addAttribute(llvm::Attribute::SExt);
     else
       RetAttrs.addAttribute(llvm::Attribute::ZExt);
-    LLVM_FALLTHROUGH;
+    [[fallthrough]];
   case ABIArgInfo::Direct:
     if (RetAI.getInReg())
       RetAttrs.addAttribute(llvm::Attribute::InReg);
@@ -2270,8 +2384,7 @@ void CodeGenModule::ConstructAttributeList(StringRef Name,
   case ABIArgInfo::InAlloca:
   case ABIArgInfo::Indirect: {
     // inalloca and sret disable readnone and readonly
-    FuncAttrs.removeAttribute(llvm::Attribute::ReadOnly)
-      .removeAttribute(llvm::Attribute::ReadNone);
+    AddPotentialArgAccess();
     break;
   }
 
@@ -2290,7 +2403,7 @@ void CodeGenModule::ConstructAttributeList(StringRef Name,
       if (!PTy->isIncompleteType() && PTy->isConstantSizeType())
         RetAttrs.addDereferenceableAttr(
             getMinimumObjectSize(PTy).getQuantity());
-      if (getContext().getTargetAddressSpace(PTy) == 0 &&
+      if (getTypes().getTargetAddressSpace(PTy) == 0 &&
           !CodeGenOpts.NullPointerIsValid)
         RetAttrs.addAttribute(llvm::Attribute::NonNull);
       if (PTy->isObjectType()) {
@@ -2306,7 +2419,7 @@ void CodeGenModule::ConstructAttributeList(StringRef Name,
 
   // Attach attributes to sret.
   if (IRFunctionArgs.hasSRetArg()) {
-    llvm::AttrBuilder SRETAttrs;
+    llvm::AttrBuilder SRETAttrs(getLLVMContext());
     SRETAttrs.addStructRetAttr(getTypes().ConvertTypeForMem(RetTy));
     hasUsedSRet = true;
     if (RetAI.getInReg())
@@ -2318,7 +2431,7 @@ void CodeGenModule::ConstructAttributeList(StringRef Name,
 
   // Attach attributes to inalloca argument.
   if (IRFunctionArgs.hasInallocaArg()) {
-    llvm::AttrBuilder Attrs;
+    llvm::AttrBuilder Attrs(getLLVMContext());
     Attrs.addInAllocaAttr(FI.getArgStruct());
     ArgAttrs[IRFunctionArgs.getInallocaArgNo()] =
         llvm::AttributeSet::get(getLLVMContext(), Attrs);
@@ -2333,13 +2446,13 @@ void CodeGenModule::ConstructAttributeList(StringRef Name,
 
     assert(IRArgs.second == 1 && "Expected only a single `this` pointer.");
 
-    llvm::AttrBuilder Attrs;
+    llvm::AttrBuilder Attrs(getLLVMContext());
 
     QualType ThisTy =
         FI.arg_begin()->type.castAs<PointerType>()->getPointeeType();
 
     if (!CodeGenOpts.NullPointerIsValid &&
-        getContext().getTargetAddressSpace(FI.arg_begin()->type) == 0) {
+        getTypes().getTargetAddressSpace(FI.arg_begin()->type) == 0) {
       Attrs.addAttribute(llvm::Attribute::NonNull);
       Attrs.addDereferenceableAttr(getMinimumObjectSize(ThisTy).getQuantity());
     } else {
@@ -2368,7 +2481,7 @@ void CodeGenModule::ConstructAttributeList(StringRef Name,
        I != E; ++I, ++ArgNo) {
     QualType ParamType = I->type;
     const ABIArgInfo &AI = I->info;
-    llvm::AttrBuilder Attrs;
+    llvm::AttrBuilder Attrs(getLLVMContext());
 
     // Add attribute for padding argument, if necessary.
     if (IRFunctionArgs.hasPaddingArg(ArgNo)) {
@@ -2376,14 +2489,15 @@ void CodeGenModule::ConstructAttributeList(StringRef Name,
         ArgAttrs[IRFunctionArgs.getPaddingArgNo(ArgNo)] =
             llvm::AttributeSet::get(
                 getLLVMContext(),
-                llvm::AttrBuilder().addAttribute(llvm::Attribute::InReg));
+                llvm::AttrBuilder(getLLVMContext()).addAttribute(llvm::Attribute::InReg));
       }
     }
 
     // Decide whether the argument we're handling could be partially undef
-    bool ArgNoUndef = DetermineNoUndef(ParamType, getTypes(), DL, AI);
-    if (CodeGenOpts.EnableNoundefAttrs && ArgNoUndef)
+    if (CodeGenOpts.EnableNoundefAttrs &&
+        DetermineNoUndef(ParamType, getTypes(), DL, AI)) {
       Attrs.addAttribute(llvm::Attribute::NoUndef);
+    }
 
     // 'restrict' -> 'noalias' is done in EmitFunctionProlog when we
     // have the corresponding parameter variable.  It doesn't make
@@ -2394,7 +2508,7 @@ void CodeGenModule::ConstructAttributeList(StringRef Name,
         Attrs.addAttribute(llvm::Attribute::SExt);
       else
         Attrs.addAttribute(llvm::Attribute::ZExt);
-      LLVM_FALLTHROUGH;
+      [[fallthrough]];
     case ABIArgInfo::Direct:
       if (ArgNo == 0 && FI.isChainCall())
         Attrs.addAttribute(llvm::Attribute::Nest);
@@ -2440,9 +2554,7 @@ void CodeGenModule::ConstructAttributeList(StringRef Name,
         Attrs.addAlignmentAttr(Align.getQuantity());
 
       // byval disables readnone and readonly.
-      FuncAttrs.removeAttribute(llvm::Attribute::ReadOnly)
-        .removeAttribute(llvm::Attribute::ReadNone);
-
+      AddPotentialArgAccess();
       break;
     }
     case ABIArgInfo::IndirectAliased: {
@@ -2458,8 +2570,7 @@ void CodeGenModule::ConstructAttributeList(StringRef Name,
 
     case ABIArgInfo::InAlloca:
       // inalloca disables readnone and readonly.
-      FuncAttrs.removeAttribute(llvm::Attribute::ReadOnly)
-          .removeAttribute(llvm::Attribute::ReadNone);
+      AddPotentialArgAccess();
       continue;
     }
 
@@ -2468,7 +2579,7 @@ void CodeGenModule::ConstructAttributeList(StringRef Name,
       if (!PTy->isIncompleteType() && PTy->isConstantSizeType())
         Attrs.addDereferenceableAttr(
             getMinimumObjectSize(PTy).getQuantity());
-      if (getContext().getTargetAddressSpace(PTy) == 0 &&
+      if (getTypes().getTargetAddressSpace(PTy) == 0 &&
           !CodeGenOpts.NullPointerIsValid)
         Attrs.addAttribute(llvm::Attribute::NonNull);
       if (PTy->isObjectType()) {
@@ -2478,6 +2589,20 @@ void CodeGenModule::ConstructAttributeList(StringRef Name,
       }
     }
 
+    // From OpenCL spec v3.0.10 section 6.3.5 Alignment of Types:
+    // > For arguments to a __kernel function declared to be a pointer to a
+    // > data type, the OpenCL compiler can assume that the pointee is always
+    // > appropriately aligned as required by the data type.
+    if (TargetDecl && TargetDecl->hasAttr<OpenCLKernelAttr>() &&
+        ParamType->isPointerType()) {
+      QualType PTy = ParamType->getPointeeType();
+      if (!PTy->isIncompleteType() && PTy->isConstantSizeType()) {
+        llvm::Align Alignment =
+            getNaturalPointeeTypeAlignment(ParamType).getAsAlign();
+        Attrs.addAlignmentAttr(Alignment);
+      }
+    }
+
     switch (FI.getExtParameterInfo(ArgNo).getABI()) {
     case ParameterABI::Ordinary:
       break;
@@ -2523,8 +2648,8 @@ void CodeGenModule::ConstructAttributeList(StringRef Name,
       unsigned FirstIRArg, NumIRArgs;
       std::tie(FirstIRArg, NumIRArgs) = IRFunctionArgs.getIRArgs(ArgNo);
       for (unsigned i = 0; i < NumIRArgs; i++)
-        ArgAttrs[FirstIRArg + i] =
-            llvm::AttributeSet::get(getLLVMContext(), Attrs);
+        ArgAttrs[FirstIRArg + i] = ArgAttrs[FirstIRArg + i].addAttributes(
+            getLLVMContext(), llvm::AttributeSet::get(getLLVMContext(), Attrs));
     }
   }
   assert(ArgNo == FI.arg_size());
@@ -2625,7 +2750,7 @@ void CodeGenFunction::EmitFunctionProlog(const CGFunctionInfo &FI,
   Address ArgStruct = Address::invalid();
   if (IRFunctionArgs.hasInallocaArg()) {
     ArgStruct = Address(Fn->getArg(IRFunctionArgs.getInallocaArgNo()),
-                        FI.getArgStructAlignment());
+                        FI.getArgStruct(), FI.getArgStructAlignment());
 
     assert(ArgStruct.getType() == FI.getArgStruct()->getPointerTo());
   }
@@ -2675,7 +2800,7 @@ void CodeGenFunction::EmitFunctionProlog(const CGFunctionInfo &FI,
       Address V =
           Builder.CreateStructGEP(ArgStruct, FieldIndex, Arg->getName());
       if (ArgI.getInAllocaIndirect())
-        V = Address(Builder.CreateLoad(V),
+        V = Address(Builder.CreateLoad(V), ConvertTypeForMem(Ty),
                     getContext().getTypeAlignInChars(Ty));
       ArgVals.push_back(ParamValue::forIndirect(V));
       break;
@@ -2684,8 +2809,8 @@ void CodeGenFunction::EmitFunctionProlog(const CGFunctionInfo &FI,
     case ABIArgInfo::Indirect:
     case ABIArgInfo::IndirectAliased: {
       assert(NumIRArgs == 1);
-      Address ParamAddr =
-          Address(Fn->getArg(FirstIRArg), ArgI.getIndirectAlign());
+      Address ParamAddr = Address(Fn->getArg(FirstIRArg), ConvertTypeForMem(Ty),
+                                  ArgI.getIndirectAlign());
 
       if (!hasScalarEvaluationKind(Ty)) {
         // Aggregates and complex variables are accessed by reference. All we
@@ -2751,11 +2876,11 @@ void CodeGenFunction::EmitFunctionProlog(const CGFunctionInfo &FI,
               QualType ETy = ArrTy->getElementType();
               llvm::Align Alignment =
                   CGM.getNaturalTypeAlignment(ETy).getAsAlign();
-              AI->addAttrs(llvm::AttrBuilder().addAlignmentAttr(Alignment));
+              AI->addAttrs(llvm::AttrBuilder(getLLVMContext()).addAlignmentAttr(Alignment));
               uint64_t ArrSize = ArrTy->getSize().getZExtValue();
               if (!ETy->isIncompleteType() && ETy->isConstantSizeType() &&
                   ArrSize) {
-                llvm::AttrBuilder Attrs;
+                llvm::AttrBuilder Attrs(getLLVMContext());
                 Attrs.addDereferenceableAttr(
                     getContext().getTypeSizeInChars(ETy).getQuantity() *
                     ArrSize);
@@ -2775,8 +2900,8 @@ void CodeGenFunction::EmitFunctionProlog(const CGFunctionInfo &FI,
               QualType ETy = ArrTy->getElementType();
               llvm::Align Alignment =
                   CGM.getNaturalTypeAlignment(ETy).getAsAlign();
-              AI->addAttrs(llvm::AttrBuilder().addAlignmentAttr(Alignment));
-              if (!getContext().getTargetAddressSpace(ETy) &&
+              AI->addAttrs(llvm::AttrBuilder(getLLVMContext()).addAlignmentAttr(Alignment));
+              if (!getTypes().getTargetAddressSpace(ETy) &&
                   !CGM.getCodeGenOpts().NullPointerIsValid)
                 AI->addAttr(llvm::Attribute::NonNull);
             }
@@ -2785,7 +2910,7 @@ void CodeGenFunction::EmitFunctionProlog(const CGFunctionInfo &FI,
           // Set `align` attribute if any.
           const auto *AVAttr = PVD->getAttr<AlignValueAttr>();
           if (!AVAttr)
-            if (const auto *TOTy = dyn_cast<TypedefType>(OTy))
+            if (const auto *TOTy = OTy->getAs<TypedefType>())
               AVAttr = TOTy->getDecl()->getAttr<AlignValueAttr>();
           if (AVAttr && !SanOpts.has(SanitizerKind::Alignment)) {
             // If alignment-assumption sanitizer is enabled, we do *not* add
@@ -2793,11 +2918,11 @@ void CodeGenFunction::EmitFunctionProlog(const CGFunctionInfo &FI,
             // so the UBSAN check could function.
             llvm::ConstantInt *AlignmentCI =
                 cast<llvm::ConstantInt>(EmitScalarExpr(AVAttr->getAlignment()));
-            unsigned AlignmentInt =
+            uint64_t AlignmentInt =
                 AlignmentCI->getLimitedValue(llvm::Value::MaximumAlignment);
             if (AI->getParamAlign().valueOrOne() < AlignmentInt) {
               AI->removeAttr(llvm::Attribute::AttrKind::Alignment);
-              AI->addAttrs(llvm::AttrBuilder().addAlignmentAttr(
+              AI->addAttrs(llvm::AttrBuilder(getLLVMContext()).addAlignmentAttr(
                   llvm::Align(AlignmentInt)));
             }
           }
@@ -2824,7 +2949,8 @@ void CodeGenFunction::EmitFunctionProlog(const CGFunctionInfo &FI,
           assert(pointeeTy->isPointerType());
           Address temp =
             CreateMemTemp(pointeeTy, getPointerAlign(), "swifterror.temp");
-          Address arg = Address(V, getContext().getTypeAlignInChars(pointeeTy));
+          Address arg(V, ConvertTypeForMem(pointeeTy),
+                      getContext().getTypeAlignInChars(pointeeTy));
           llvm::Value *incomingErrorValue = Builder.CreateLoad(arg);
           Builder.CreateStore(incomingErrorValue, temp);
           V = temp.getPointer();
@@ -2857,12 +2983,20 @@ void CodeGenFunction::EmitFunctionProlog(const CGFunctionInfo &FI,
       // VLST arguments are coerced to VLATs at the function boundary for
       // ABI consistency. If this is a VLST that was coerced to
       // a VLAT at the function boundary and the types match up, use
-      // llvm.experimental.vector.extract to convert back to the original
-      // VLST.
+      // llvm.vector.extract to convert back to the original VLST.
       if (auto *VecTyTo = dyn_cast<llvm::FixedVectorType>(ConvertType(Ty))) {
-        auto *Coerced = Fn->getArg(FirstIRArg);
+        llvm::Value *Coerced = Fn->getArg(FirstIRArg);
         if (auto *VecTyFrom =
                 dyn_cast<llvm::ScalableVectorType>(Coerced->getType())) {
+          // If we are casting a scalable 16 x i1 predicate vector to a fixed i8
+          // vector, bitcast the source and use a vector extract.
+          auto PredType =
+              llvm::ScalableVectorType::get(Builder.getInt1Ty(), 16);
+          if (VecTyFrom == PredType &&
+              VecTyTo->getElementType() == Builder.getInt8Ty()) {
+            VecTyFrom = llvm::ScalableVectorType::get(Builder.getInt8Ty(), 2);
+            Coerced = Builder.CreateBitCast(Coerced, VecTyFrom);
+          }
           if (VecTyFrom->getElementType() == VecTyTo->getElementType()) {
             llvm::Value *Zero = llvm::Constant::getNullValue(CGM.Int64Ty);
 
@@ -3156,7 +3290,8 @@ static llvm::StoreInst *findDominatingStoreToReturnValue(CodeGenFunction &CGF) {
   // ReturnValue to some other location.
   auto GetStoreIfValid = [&CGF](llvm::User *U) -> llvm::StoreInst * {
     auto *SI = dyn_cast<llvm::StoreInst>(U);
-    if (!SI || SI->getPointerOperand() != CGF.ReturnValue.getPointer())
+    if (!SI || SI->getPointerOperand() != CGF.ReturnValue.getPointer() ||
+        SI->getValueOperand()->getType() != CGF.ReturnValue.getElementType())
       return nullptr;
     // These aren't actually possible for non-coerced returns, and we
     // only care about non-coerced returns on this code path.
@@ -3170,28 +3305,19 @@ static llvm::StoreInst *findDominatingStoreToReturnValue(CodeGenFunction &CGF) {
   if (!CGF.ReturnValue.getPointer()->hasOneUse()) {
     llvm::BasicBlock *IP = CGF.Builder.GetInsertBlock();
     if (IP->empty()) return nullptr;
-    llvm::Instruction *I = &IP->back();
-
-    // Skip lifetime markers
-    for (llvm::BasicBlock::reverse_iterator II = IP->rbegin(),
-                                            IE = IP->rend();
-         II != IE; ++II) {
-      if (llvm::IntrinsicInst *Intrinsic =
-              dyn_cast<llvm::IntrinsicInst>(&*II)) {
-        if (Intrinsic->getIntrinsicID() == llvm::Intrinsic::lifetime_end) {
-          const llvm::Value *CastAddr = Intrinsic->getArgOperand(1);
-          ++II;
-          if (II == IE)
-            break;
-          if (isa<llvm::BitCastInst>(&*II) && (CastAddr == &*II))
-            continue;
-        }
-      }
-      I = &*II;
-      break;
-    }
 
-    return GetStoreIfValid(I);
+    // Look at directly preceding instruction, skipping bitcasts and lifetime
+    // markers.
+    for (llvm::Instruction &I : make_range(IP->rbegin(), IP->rend())) {
+      if (isa<llvm::BitCastInst>(&I))
+        continue;
+      if (auto *II = dyn_cast<llvm::IntrinsicInst>(&I))
+        if (II->getIntrinsicID() == llvm::Intrinsic::lifetime_end)
+          continue;
+
+      return GetStoreIfValid(&I);
+    }
+    return nullptr;
   }
 
   llvm::StoreInst *store =
@@ -3392,7 +3518,7 @@ llvm::Value *CodeGenFunction::EmitCMSEClearRecord(llvm::Value *Src,
   int CharsPerElt =
       ATy->getArrayElementType()->getScalarSizeInBits() / CharWidth;
   int MaskIndex = 0;
-  llvm::Value *R = llvm::UndefValue::get(ATy);
+  llvm::Value *R = llvm::PoisonValue::get(ATy);
   for (int I = 0, N = ATy->getArrayNumElements(); I != N; ++I) {
     uint64_t Mask = buildMultiCharMask(Bits, MaskIndex, CharsPerElt, CharWidth,
                                        DataLayout.isBigEndian());
@@ -3433,7 +3559,7 @@ void CodeGenFunction::EmitFunctionEpilog(const CGFunctionInfo &FI,
 
   switch (RetAI.getKind()) {
   case ABIArgInfo::InAlloca:
-    // Aggregrates get evaluated directly into the destination.  Sometimes we
+    // Aggregates get evaluated directly into the destination.  Sometimes we
     // need to return the sret value in a register, though.
     assert(hasAggregateEvaluationKind(RetTy));
     if (RetAI.getInAllocaSRet()) {
@@ -3441,8 +3567,7 @@ void CodeGenFunction::EmitFunctionEpilog(const CGFunctionInfo &FI,
       --EI;
       llvm::Value *ArgStruct = &*EI;
       llvm::Value *SRet = Builder.CreateStructGEP(
-          EI->getType()->getPointerElementType(), ArgStruct,
-          RetAI.getInAllocaFieldIndex());
+          FI.getArgStruct(), ArgStruct, RetAI.getInAllocaFieldIndex());
       llvm::Type *Ty =
           cast<llvm::GetElementPtrInst>(SRet)->getResultElementType();
       RV = Builder.CreateAlignedLoad(Ty, SRet, getPointerAlign(), "sret");
@@ -3462,14 +3587,21 @@ void CodeGenFunction::EmitFunctionEpilog(const CGFunctionInfo &FI,
       break;
     }
     case TEK_Aggregate:
-      // Do nothing; aggregrates get evaluated directly into the destination.
+      // Do nothing; aggregates get evaluated directly into the destination.
       break;
-    case TEK_Scalar:
-      EmitStoreOfScalar(Builder.CreateLoad(ReturnValue),
-                        MakeNaturalAlignAddrLValue(&*AI, RetTy),
-                        /*isInit*/ true);
+    case TEK_Scalar: {
+      LValueBaseInfo BaseInfo;
+      TBAAAccessInfo TBAAInfo;
+      CharUnits Alignment =
+          CGM.getNaturalTypeAlignment(RetTy, &BaseInfo, &TBAAInfo);
+      Address ArgAddr(&*AI, ConvertType(RetTy), Alignment);
+      LValue ArgVal =
+          LValue::MakeAddr(ArgAddr, RetTy, getContext(), BaseInfo, TBAAInfo);
+      EmitStoreOfScalar(
+          Builder.CreateLoad(ReturnValue), ArgVal, /*isInit*/ true);
       break;
     }
+    }
     break;
   }
 
@@ -3560,7 +3692,7 @@ void CodeGenFunction::EmitFunctionEpilog(const CGFunctionInfo &FI,
       // Construct a return type that lacks padding elements.
       llvm::Type *returnType = RetAI.getUnpaddedCoerceAndExpandType();
 
-      RV = llvm::UndefValue::get(returnType);
+      RV = llvm::PoisonValue::get(returnType);
       for (unsigned i = 0, e = results.size(); i != e; ++i) {
         RV = Builder.CreateInsertValue(RV, results[i], i);
       }
@@ -3667,14 +3799,14 @@ static AggValueSlot createPlaceholderSlot(CodeGenFunction &CGF,
   // placeholders.
   llvm::Type *IRTy = CGF.ConvertTypeForMem(Ty);
   llvm::Type *IRPtrTy = IRTy->getPointerTo();
-  llvm::Value *Placeholder = llvm::UndefValue::get(IRPtrTy->getPointerTo());
+  llvm::Value *Placeholder = llvm::PoisonValue::get(IRPtrTy->getPointerTo());
 
   // FIXME: When we generate this IR in one pass, we shouldn't need
   // this win32-specific alignment hack.
   CharUnits Align = CharUnits::fromQuantity(4);
   Placeholder = CGF.Builder.CreateAlignedLoad(IRPtrTy, Placeholder, Align);
 
-  return AggValueSlot::forAddr(Address(Placeholder, Align),
+  return AggValueSlot::forAddr(Address(Placeholder, IRTy, Align),
                                Ty.getQualifiers(),
                                AggValueSlot::IsNotDestructed,
                                AggValueSlot::DoesNotNeedGCBarriers,
@@ -3857,7 +3989,9 @@ static void emitWritebackArg(CodeGenFunction &CGF, CallArgList &args,
   // because of the crazy ObjC compatibility rules.
 
   llvm::PointerType *destType =
-    cast<llvm::PointerType>(CGF.ConvertType(CRE->getType()));
+      cast<llvm::PointerType>(CGF.ConvertType(CRE->getType()));
+  llvm::Type *destElemType =
+      CGF.ConvertTypeForMem(CRE->getType()->getPointeeType());
 
   // If the address is a constant null, just pass the appropriate null.
   if (isProvablyNull(srcAddr.getPointer())) {
@@ -3867,9 +4001,8 @@ static void emitWritebackArg(CodeGenFunction &CGF, CallArgList &args,
   }
 
   // Create the temporary.
-  Address temp = CGF.CreateTempAlloca(destType->getElementType(),
-                                      CGF.getPointerAlign(),
-                                      "icr.temp");
+  Address temp =
+      CGF.CreateTempAlloca(destElemType, CGF.getPointerAlign(), "icr.temp");
   // Loading an l-value can introduce a cleanup if the l-value is __weak,
   // and that cleanup will be conditional if we can't prove that the l-value
   // isn't null, so we need to register a dominating point so that the cleanups
@@ -3880,8 +4013,7 @@ static void emitWritebackArg(CodeGenFunction &CGF, CallArgList &args,
   bool shouldCopy = CRE->shouldCopy();
   if (!shouldCopy) {
     llvm::Value *null =
-      llvm::ConstantPointerNull::get(
-        cast<llvm::PointerType>(destType->getElementType()));
+        llvm::ConstantPointerNull::get(cast<llvm::PointerType>(destElemType));
     CGF.Builder.CreateStore(null, temp);
   }
 
@@ -3923,8 +4055,7 @@ static void emitWritebackArg(CodeGenFunction &CGF, CallArgList &args,
     assert(srcRV.isScalar());
 
     llvm::Value *src = srcRV.getScalarVal();
-    src = CGF.Builder.CreateBitCast(src, destType->getElementType(),
-                                    "icr.cast");
+    src = CGF.Builder.CreateBitCast(src, destElemType, "icr.cast");
 
     // Use an ordinary store, not a store-to-lvalue.
     CGF.Builder.CreateStore(src, temp);
@@ -3997,7 +4128,7 @@ void CodeGenFunction::EmitNonNullArgCheck(RValue RV, QualType ArgType,
 
   bool CanCheckNullability = false;
   if (SanOpts.has(SanitizerKind::NullabilityArg) && !NNAttr && PVD) {
-    auto Nullability = PVD->getType()->getNullability(getContext());
+    auto Nullability = PVD->getType()->getNullability();
     CanCheckNullability = Nullability &&
                           *Nullability == NullabilityKind::NonNull &&
                           PVD->getTypeSourceInfo();
@@ -4025,7 +4156,7 @@ void CodeGenFunction::EmitNonNullArgCheck(RValue RV, QualType ArgType,
       EmitCheckSourceLocation(ArgLoc), EmitCheckSourceLocation(AttrLoc),
       llvm::ConstantInt::get(Int32Ty, ArgNo + 1),
   };
-  EmitCheck(std::make_pair(Cond, CheckKind), Handler, StaticData, None);
+  EmitCheck(std::make_pair(Cond, CheckKind), Handler, StaticData, std::nullopt);
 }
 
 // Check if the call is going to use the inalloca convention. This needs to
@@ -4123,8 +4254,7 @@ void CodeGenFunction::EmitCallArgs(
   }
 
   // If we still have any arguments, emit them using the type of the argument.
-  for (auto *A : llvm::make_range(std::next(ArgRange.begin(), ArgTypes.size()),
-                                  ArgRange.end()))
+  for (auto *A : llvm::drop_begin(ArgRange, ArgTypes.size()))
     ArgTypes.push_back(IsVariadic ? getVarArgType(A) : A->getType());
   assert((int)ArgTypes.size() == (ArgRange.end() - ArgRange.begin()));
 
@@ -4297,11 +4427,8 @@ void CodeGenFunction::EmitCallArg(CallArgList &args, const Expr *E,
       type->castAs<RecordType>()->getDecl()->isParamDestroyedInCallee()) {
     // If we're using inalloca, use the argument memory.  Otherwise, use a
     // temporary.
-    AggValueSlot Slot;
-    if (args.isUsingInAlloca())
-      Slot = createPlaceholderSlot(*this, type);
-    else
-      Slot = CreateAggTemp(type, "agg.tmp");
+    AggValueSlot Slot = args.isUsingInAlloca()
+        ? createPlaceholderSlot(*this, type) : CreateAggTemp(type, "agg.tmp");
 
     bool DestroyedInCallee = true, NeedsEHCleanup = true;
     if (const auto *RD = type->getAsCXXRecordDecl())
@@ -4324,7 +4451,7 @@ void CodeGenFunction::EmitCallArg(CallArgList &args, const Expr *E,
                                               type);
       // This unreachable is a temporary marker which will be removed later.
       llvm::Instruction *IsActive = Builder.CreateUnreachable();
-      args.addArgCleanupDeactivation(EHStack.getInnermostEHScope(), IsActive);
+      args.addArgCleanupDeactivation(EHStack.stable_begin(), IsActive);
     }
     return;
   }
@@ -4349,7 +4476,7 @@ QualType CodeGenFunction::getVarArgType(const Expr *Arg) {
 
   if (Arg->getType()->isIntegerType() &&
       getContext().getTypeSize(Arg->getType()) <
-          getContext().getTargetInfo().getPointerWidth(0) &&
+          getContext().getTargetInfo().getPointerWidth(LangAS::Default) &&
       Arg->isNullPointerConstant(getContext(),
                                  Expr::NPC_ValueDependentIsNotNull)) {
     return getContext().getIntPtrType();
@@ -4372,7 +4499,7 @@ CodeGenFunction::AddObjCARCExceptionMetadata(llvm::Instruction *Inst) {
 llvm::CallInst *
 CodeGenFunction::EmitNounwindRuntimeCall(llvm::FunctionCallee callee,
                                          const llvm::Twine &name) {
-  return EmitNounwindRuntimeCall(callee, None, name);
+  return EmitNounwindRuntimeCall(callee, std::nullopt, name);
 }
 
 /// Emits a call to the given nounwind runtime function.
@@ -4389,24 +4516,29 @@ CodeGenFunction::EmitNounwindRuntimeCall(llvm::FunctionCallee callee,
 /// runtime function.
 llvm::CallInst *CodeGenFunction::EmitRuntimeCall(llvm::FunctionCallee callee,
                                                  const llvm::Twine &name) {
-  return EmitRuntimeCall(callee, None, name);
+  return EmitRuntimeCall(callee, std::nullopt, name);
 }
 
 // Calls which may throw must have operand bundles indicating which funclet
 // they are nested within.
 SmallVector<llvm::OperandBundleDef, 1>
 CodeGenFunction::getBundlesForFunclet(llvm::Value *Callee) {
-  SmallVector<llvm::OperandBundleDef, 1> BundleList;
   // There is no need for a funclet operand bundle if we aren't inside a
   // funclet.
   if (!CurrentFuncletPad)
-    return BundleList;
-
-  // Skip intrinsics which cannot throw.
-  auto *CalleeFn = dyn_cast<llvm::Function>(Callee->stripPointerCasts());
-  if (CalleeFn && CalleeFn->isIntrinsic() && CalleeFn->doesNotThrow())
-    return BundleList;
+    return (SmallVector<llvm::OperandBundleDef, 1>());
+
+  // Skip intrinsics which cannot throw (as long as they don't lower into
+  // regular function calls in the course of IR transformations).
+  if (auto *CalleeFn = dyn_cast<llvm::Function>(Callee->stripPointerCasts())) {
+    if (CalleeFn->isIntrinsic() && CalleeFn->doesNotThrow()) {
+      auto IID = CalleeFn->getIntrinsicID();
+      if (!llvm::IntrinsicInst::mayLowerToFunctionCall(IID))
+        return (SmallVector<llvm::OperandBundleDef, 1>());
+    }
+  }
 
+  SmallVector<llvm::OperandBundleDef, 1> BundleList;
   BundleList.emplace_back("funclet", CurrentFuncletPad);
   return BundleList;
 }
@@ -4448,7 +4580,7 @@ void CodeGenFunction::EmitNoreturnRuntimeCallOrInvoke(
 llvm::CallBase *
 CodeGenFunction::EmitRuntimeCallOrInvoke(llvm::FunctionCallee callee,
                                          const Twine &name) {
-  return EmitRuntimeCallOrInvoke(callee, None, name);
+  return EmitRuntimeCallOrInvoke(callee, std::nullopt, name);
 }
 
 /// Emits a call or invoke instruction to the given runtime function.
@@ -4498,7 +4630,7 @@ namespace {
 
 /// Specify given \p NewAlign as the alignment of return value attribute. If
 /// such attribute already exists, re-set it to the maximal one of two options.
-LLVM_NODISCARD llvm::AttributeList
+[[nodiscard]] llvm::AttributeList
 maybeRaiseRetAlignmentAttribute(llvm::LLVMContext &Ctx,
                                 const llvm::AttributeList &Attrs,
                                 llvm::Align NewAlign) {
@@ -4506,10 +4638,8 @@ maybeRaiseRetAlignmentAttribute(llvm::LLVMContext &Ctx,
   if (CurAlign >= NewAlign)
     return Attrs;
   llvm::Attribute AlignAttr = llvm::Attribute::getWithAlignment(Ctx, NewAlign);
-  return Attrs
-      .removeAttribute(Ctx, llvm::AttributeList::ReturnIndex,
-                       llvm::Attribute::AttrKind::Alignment)
-      .addAttribute(Ctx, llvm::AttributeList::ReturnIndex, AlignAttr);
+  return Attrs.removeRetAttribute(Ctx, llvm::Attribute::AttrKind::Alignment)
+      .addRetAttribute(Ctx, AlignAttr);
 }
 
 template <typename AlignedAttrTy> class AbstractAssumeAlignedAttrEmitter {
@@ -4531,7 +4661,7 @@ protected:
 
 public:
   /// If we can, materialize the alignment as an attribute on return value.
-  LLVM_NODISCARD llvm::AttributeList
+  [[nodiscard]] llvm::AttributeList
   TryEmitAsCallSiteAttribute(const llvm::AttributeList &Attrs) {
     if (!AA || OffsetCI || CGF.SanOpts.has(SanitizerKind::Alignment))
       return Attrs;
@@ -4598,6 +4728,19 @@ public:
 
 } // namespace
 
+static unsigned getMaxVectorWidth(const llvm::Type *Ty) {
+  if (auto *VT = dyn_cast<llvm::VectorType>(Ty))
+    return VT->getPrimitiveSizeInBits().getKnownMinValue();
+  if (auto *AT = dyn_cast<llvm::ArrayType>(Ty))
+    return getMaxVectorWidth(AT->getElementType());
+
+  unsigned MaxVectorWidth = 0;
+  if (auto *ST = dyn_cast<llvm::StructType>(Ty))
+    for (auto *I : ST->elements())
+      MaxVectorWidth = std::max(MaxVectorWidth, getMaxVectorWidth(I));
+  return MaxVectorWidth;
+}
+
 RValue CodeGenFunction::EmitCall(const CGFunctionInfo &CallInfo,
                                  const CGCallee &Callee,
                                  ReturnValueSlot ReturnValue,
@@ -4642,13 +4785,13 @@ RValue CodeGenFunction::EmitCall(const CGFunctionInfo &CallInfo,
     //
     // In other cases, we assert that the types match up (until pointers stop
     // having pointee types).
-    llvm::Type *TypeFromVal;
     if (Callee.isVirtual())
-      TypeFromVal = Callee.getVirtualFunctionType();
-    else
-      TypeFromVal =
-          Callee.getFunctionPointer()->getType()->getPointerElementType();
-    assert(IRFuncTy == TypeFromVal);
+      assert(IRFuncTy == Callee.getVirtualFunctionType());
+    else {
+      llvm::PointerType *PtrTy =
+          llvm::cast<llvm::PointerType>(Callee.getFunctionPointer()->getType());
+      assert(PtrTy->isOpaqueOrPointeeTypeMatches(IRFuncTy));
+    }
   }
 #endif
 
@@ -4672,7 +4815,7 @@ RValue CodeGenFunction::EmitCall(const CGFunctionInfo &CallInfo,
     AI->setAlignment(Align.getAsAlign());
     AI->setUsedWithInAlloca(true);
     assert(AI->isUsedWithInAlloca() && !AI->isStaticAlloca());
-    ArgMemory = Address(AI, Align);
+    ArgMemory = Address(AI, ArgStruct, Align);
   }
 
   ClangToLLVMArgMapping IRFunctionArgs(CGM.getContext(), CallInfo);
@@ -4728,6 +4871,9 @@ RValue CodeGenFunction::EmitCall(const CGFunctionInfo &CallInfo,
     unsigned FirstIRArg, NumIRArgs;
     std::tie(FirstIRArg, NumIRArgs) = IRFunctionArgs.getIRArgs(ArgNo);
 
+    bool ArgHasMaybeUndefAttr =
+        IsArgumentMaybeUndef(TargetDecl, CallInfo.getNumRequiredArgs(), ArgNo);
+
     switch (ArgInfo.getKind()) {
     case ABIArgInfo::InAlloca: {
       assert(NumIRArgs == 0);
@@ -4770,13 +4916,10 @@ RValue CodeGenFunction::EmitCall(const CGFunctionInfo &CallInfo,
         // Store the RValue into the argument struct.
         Address Addr =
             Builder.CreateStructGEP(ArgMemory, ArgInfo.getInAllocaFieldIndex());
-        unsigned AS = Addr.getType()->getPointerAddressSpace();
-        llvm::Type *MemType = ConvertTypeForMem(I->Ty)->getPointerTo(AS);
         // There are some cases where a trivial bitcast is not avoidable.  The
         // definition of a type later in a translation unit may change it's type
         // from {}* to (%struct.foo*)*.
-        if (Addr.getType() != MemType)
-          Addr = Builder.CreateBitCast(Addr, MemType);
+        Addr = Builder.CreateElementBitCast(Addr, ConvertTypeForMem(I->Ty));
         I->copyInto(*this, Addr);
       }
       break;
@@ -4789,7 +4932,11 @@ RValue CodeGenFunction::EmitCall(const CGFunctionInfo &CallInfo,
         // Make a temporary alloca to pass the argument.
         Address Addr = CreateMemTempWithoutCast(
             I->Ty, ArgInfo.getIndirectAlign(), "indirect-arg-temp");
-        IRCallArgs[FirstIRArg] = Addr.getPointer();
+
+        llvm::Value *Val = Addr.getPointer();
+        if (ArgHasMaybeUndefAttr)
+          Val = Builder.CreateFreeze(Addr.getPointer());
+        IRCallArgs[FirstIRArg] = Val;
 
         I->copyInto(*this, Addr);
       } else {
@@ -4847,7 +4994,10 @@ RValue CodeGenFunction::EmitCall(const CGFunctionInfo &CallInfo,
           // Create an aligned temporary, and copy to it.
           Address AI = CreateMemTempWithoutCast(
               I->Ty, ArgInfo.getIndirectAlign(), "byval-temp");
-          IRCallArgs[FirstIRArg] = AI.getPointer();
+          llvm::Value *Val = AI.getPointer();
+          if (ArgHasMaybeUndefAttr)
+            Val = Builder.CreateFreeze(AI.getPointer());
+          IRCallArgs[FirstIRArg] = Val;
 
           // Emit lifetime markers for the temporary alloca.
           llvm::TypeSize ByvalTempElementSize =
@@ -4863,11 +5013,16 @@ RValue CodeGenFunction::EmitCall(const CGFunctionInfo &CallInfo,
           I->copyInto(*this, AI);
         } else {
           // Skip the extra memcpy call.
-          auto *T = V->getType()->getPointerElementType()->getPointerTo(
+          auto *T = llvm::PointerType::getWithSamePointeeType(
+              cast<llvm::PointerType>(V->getType()),
               CGM.getDataLayout().getAllocaAddrSpace());
-          IRCallArgs[FirstIRArg] = getTargetHooks().performAddrSpaceCast(
+
+          llvm::Value *Val = getTargetHooks().performAddrSpaceCast(
               *this, V, LangAS::Default, CGM.getASTAllocaAddressSpace(), T,
               true);
+          if (ArgHasMaybeUndefAttr)
+            Val = Builder.CreateFreeze(Val);
+          IRCallArgs[FirstIRArg] = Val;
         }
       }
       break;
@@ -4898,8 +5053,8 @@ RValue CodeGenFunction::EmitCall(const CGFunctionInfo &CallInfo,
           assert(!swiftErrorTemp.isValid() && "multiple swifterror args");
 
           QualType pointeeTy = I->Ty->getPointeeType();
-          swiftErrorArg =
-            Address(V, getContext().getTypeAlignInChars(pointeeTy));
+          swiftErrorArg = Address(V, ConvertTypeForMem(pointeeTy),
+                                  getContext().getTypeAlignInChars(pointeeTy));
 
           swiftErrorTemp =
             CreateMemTemp(pointeeTy, getPointerAlign(), "swifterror.temp");
@@ -4921,6 +5076,8 @@ RValue CodeGenFunction::EmitCall(const CGFunctionInfo &CallInfo,
             V->getType() != IRFuncTy->getParamType(FirstIRArg))
           V = Builder.CreateBitCast(V, IRFuncTy->getParamType(FirstIRArg));
 
+        if (ArgHasMaybeUndefAttr)
+          V = Builder.CreateFreeze(V);
         IRCallArgs[FirstIRArg] = V;
         break;
       }
@@ -4958,14 +5115,15 @@ RValue CodeGenFunction::EmitCall(const CGFunctionInfo &CallInfo,
           Builder.CreateMemCpy(TempAlloca, Src, SrcSize);
           Src = TempAlloca;
         } else {
-          Src = Builder.CreateBitCast(Src,
-                                      STy->getPointerTo(Src.getAddressSpace()));
+          Src = Builder.CreateElementBitCast(Src, STy);
         }
 
         assert(NumIRArgs == STy->getNumElements());
         for (unsigned i = 0, e = STy->getNumElements(); i != e; ++i) {
           Address EltPtr = Builder.CreateStructGEP(Src, i);
           llvm::Value *LI = Builder.CreateLoad(EltPtr);
+          if (ArgHasMaybeUndefAttr)
+            LI = Builder.CreateFreeze(LI);
           IRCallArgs[FirstIRArg + i] = LI;
         }
       } else {
@@ -4982,6 +5140,9 @@ RValue CodeGenFunction::EmitCall(const CGFunctionInfo &CallInfo,
           if (ATy != nullptr && isa<RecordType>(I->Ty.getCanonicalType()))
             Load = EmitCMSEClearRecord(Load, ATy, I->Ty);
         }
+
+        if (ArgHasMaybeUndefAttr)
+          Load = Builder.CreateFreeze(Load);
         IRCallArgs[FirstIRArg] = Load;
       }
 
@@ -5005,13 +5166,12 @@ RValue CodeGenFunction::EmitCall(const CGFunctionInfo &CallInfo,
 
         llvm::Type *scalarType = RV.getScalarVal()->getType();
         auto scalarSize = CGM.getDataLayout().getTypeAllocSize(scalarType);
-        auto scalarAlign = CGM.getDataLayout().getPrefTypeAlignment(scalarType);
+        auto scalarAlign = CGM.getDataLayout().getPrefTypeAlign(scalarType);
 
         // Materialize to a temporary.
         addr = CreateTempAlloca(
             RV.getScalarVal()->getType(),
-            CharUnits::fromQuantity(std::max(
-                (unsigned)layout->getAlignment().value(), scalarAlign)),
+            CharUnits::fromQuantity(std::max(layout->getAlignment(), scalarAlign)),
             "tmp",
             /*ArraySize=*/nullptr, &AllocaAddr);
         tempSize = EmitLifetimeStart(scalarSize, AllocaAddr.getPointer());
@@ -5027,6 +5187,8 @@ RValue CodeGenFunction::EmitCall(const CGFunctionInfo &CallInfo,
         if (ABIArgInfo::isPaddingForCoerceAndExpand(eltType)) continue;
         Address eltAddr = Builder.CreateStructGEP(addr, i);
         llvm::Value *elt = Builder.CreateLoad(eltAddr);
+        if (ArgHasMaybeUndefAttr)
+          elt = Builder.CreateFreeze(elt);
         IRCallArgs[IRArgPos++] = elt;
       }
       assert(IRArgPos == FirstIRArg + NumIRArgs);
@@ -5068,14 +5230,16 @@ RValue CodeGenFunction::EmitCall(const CGFunctionInfo &CallInfo,
 #ifndef NDEBUG
         // Assert that these structs have equivalent element types.
         llvm::StructType *FullTy = CallInfo.getArgStruct();
-        llvm::StructType *DeclaredTy = cast<llvm::StructType>(
-            cast<llvm::PointerType>(LastParamTy)->getElementType());
-        assert(DeclaredTy->getNumElements() == FullTy->getNumElements());
-        for (llvm::StructType::element_iterator DI = DeclaredTy->element_begin(),
-                                                DE = DeclaredTy->element_end(),
-                                                FI = FullTy->element_begin();
-             DI != DE; ++DI, ++FI)
-          assert(*DI == *FI);
+        if (!LastParamTy->isOpaquePointerTy()) {
+          llvm::StructType *DeclaredTy = cast<llvm::StructType>(
+              LastParamTy->getNonOpaquePointerElementType());
+          assert(DeclaredTy->getNumElements() == FullTy->getNumElements());
+          for (auto DI = DeclaredTy->element_begin(),
+                    DE = DeclaredTy->element_end(),
+                    FI = FullTy->element_begin();
+               DI != DE; ++DI, ++FI)
+            assert(*DI == *FI);
+        }
 #endif
         Arg = Builder.CreateBitCast(Arg, LastParamTy);
       }
@@ -5152,12 +5316,9 @@ RValue CodeGenFunction::EmitCall(const CGFunctionInfo &CallInfo,
 #endif
 
   // Update the largest vector width if any arguments have vector types.
-  for (unsigned i = 0; i < IRCallArgs.size(); ++i) {
-    if (auto *VT = dyn_cast<llvm::VectorType>(IRCallArgs[i]->getType()))
-      LargestVectorWidth =
-          std::max((uint64_t)LargestVectorWidth,
-                   VT->getPrimitiveSizeInBits().getKnownMinSize());
-  }
+  for (unsigned i = 0; i < IRCallArgs.size(); ++i)
+    LargestVectorWidth = std::max(LargestVectorWidth,
+                                  getMaxVectorWidth(IRCallArgs[i]->getType()));
 
   // Compute the calling convention and attributes.
   unsigned CallingConv;
@@ -5170,15 +5331,20 @@ RValue CodeGenFunction::EmitCall(const CGFunctionInfo &CallInfo,
   if (const FunctionDecl *FD = dyn_cast_or_null<FunctionDecl>(CurFuncDecl))
     if (FD->hasAttr<StrictFPAttr>())
       // All calls within a strictfp function are marked strictfp
-      Attrs =
-        Attrs.addAttribute(getLLVMContext(), llvm::AttributeList::FunctionIndex,
-                           llvm::Attribute::StrictFP);
+      Attrs = Attrs.addFnAttribute(getLLVMContext(), llvm::Attribute::StrictFP);
 
   // Add call-site nomerge attribute if exists.
   if (InNoMergeAttributedStmt)
+    Attrs = Attrs.addFnAttribute(getLLVMContext(), llvm::Attribute::NoMerge);
+
+  // Add call-site noinline attribute if exists.
+  if (InNoInlineAttributedStmt)
+    Attrs = Attrs.addFnAttribute(getLLVMContext(), llvm::Attribute::NoInline);
+
+  // Add call-site always_inline attribute if exists.
+  if (InAlwaysInlineAttributedStmt)
     Attrs =
-        Attrs.addAttribute(getLLVMContext(), llvm::AttributeList::FunctionIndex,
-                           llvm::Attribute::NoMerge);
+        Attrs.addFnAttribute(getLLVMContext(), llvm::Attribute::AlwaysInline);
 
   // Apply some call-site-specific attributes.
   // TODO: work this into building the attribute set.
@@ -5186,17 +5352,15 @@ RValue CodeGenFunction::EmitCall(const CGFunctionInfo &CallInfo,
   // Apply always_inline to all calls within flatten functions.
   // FIXME: should this really take priority over __try, below?
   if (CurCodeDecl && CurCodeDecl->hasAttr<FlattenAttr>() &&
+      !InNoInlineAttributedStmt &&
       !(TargetDecl && TargetDecl->hasAttr<NoInlineAttr>())) {
     Attrs =
-        Attrs.addAttribute(getLLVMContext(), llvm::AttributeList::FunctionIndex,
-                           llvm::Attribute::AlwaysInline);
+        Attrs.addFnAttribute(getLLVMContext(), llvm::Attribute::AlwaysInline);
   }
 
   // Disable inlining inside SEH __try blocks.
   if (isSEHTryScope()) {
-    Attrs =
-        Attrs.addAttribute(getLLVMContext(), llvm::AttributeList::FunctionIndex,
-                           llvm::Attribute::NoInline);
+    Attrs = Attrs.addFnAttribute(getLLVMContext(), llvm::Attribute::NoInline);
   }
 
   // Decide whether to use a call or an invoke.
@@ -5212,7 +5376,7 @@ RValue CodeGenFunction::EmitCall(const CGFunctionInfo &CallInfo,
     CannotThrow = true;
   } else {
     // Otherwise, nounwind call sites will never throw.
-    CannotThrow = Attrs.hasFnAttribute(llvm::Attribute::NoUnwind);
+    CannotThrow = Attrs.hasFnAttr(llvm::Attribute::NoUnwind);
 
     if (auto *FPtr = dyn_cast<llvm::Function>(CalleePtr))
       if (FPtr->hasFnAttribute(llvm::Attribute::NoUnwind))
@@ -5232,12 +5396,14 @@ RValue CodeGenFunction::EmitCall(const CGFunctionInfo &CallInfo,
   SmallVector<llvm::OperandBundleDef, 1> BundleList =
       getBundlesForFunclet(CalleePtr);
 
+  if (SanOpts.has(SanitizerKind::KCFI) &&
+      !isa_and_nonnull<FunctionDecl>(TargetDecl))
+    EmitKCFIOperandBundle(ConcreteCallee, BundleList);
+
   if (const FunctionDecl *FD = dyn_cast_or_null<FunctionDecl>(CurFuncDecl))
     if (FD->hasAttr<StrictFPAttr>())
       // All calls within a strictfp function are marked strictfp
-      Attrs =
-        Attrs.addAttribute(getLLVMContext(), llvm::AttributeList::FunctionIndex,
-                           llvm::Attribute::StrictFP);
+      Attrs = Attrs.addFnAttribute(getLLVMContext(), llvm::Attribute::StrictFP);
 
   AssumeAlignedAttrEmitter AssumeAlignedAttrEmitter(*this, TargetDecl);
   Attrs = AssumeAlignedAttrEmitter.TryEmitAsCallSiteAttribute(Attrs);
@@ -5264,8 +5430,7 @@ RValue CodeGenFunction::EmitCall(const CGFunctionInfo &CallInfo,
   if (const auto *FD = dyn_cast_or_null<FunctionDecl>(CurFuncDecl)) {
     if (const auto *A = FD->getAttr<CFGuardAttr>()) {
       if (A->getGuard() == CFGuardAttr::GuardArg::nocf && !CI->getCalledFunction())
-        Attrs = Attrs.addAttribute(
-            getLLVMContext(), llvm::AttributeList::FunctionIndex, "guard_nocf");
+        Attrs = Attrs.addFnAttribute(getLLVMContext(), "guard_nocf");
     }
   }
 
@@ -5279,10 +5444,8 @@ RValue CodeGenFunction::EmitCall(const CGFunctionInfo &CallInfo,
     CI->setName("call");
 
   // Update largest vector width from the return type.
-  if (auto *VT = dyn_cast<llvm::VectorType>(CI->getType()))
-    LargestVectorWidth =
-        std::max((uint64_t)LargestVectorWidth,
-                 VT->getPrimitiveSizeInBits().getKnownMinSize());
+  LargestVectorWidth =
+      std::max(LargestVectorWidth, getMaxVectorWidth(CI->getType()));
 
   // Insert instrumentation or attach profile metadata at indirect call sites.
   // For more details, see the comment before the definition of
@@ -5309,6 +5472,15 @@ RValue CodeGenFunction::EmitCall(const CGFunctionInfo &CallInfo,
       TargetDecl->hasAttr<MSAllocatorAttr>())
     getDebugInfo()->addHeapAllocSiteMetadata(CI, RetTy->getPointeeType(), Loc);
 
+  // Add metadata if calling an __attribute__((error(""))) or warning fn.
+  if (TargetDecl && TargetDecl->hasAttr<ErrorAttr>()) {
+    llvm::ConstantInt *Line =
+        llvm::ConstantInt::get(Int32Ty, Loc.getRawEncoding());
+    llvm::ConstantAsMetadata *MD = llvm::ConstantAsMetadata::get(Line);
+    llvm::MDTuple *MDT = llvm::MDNode::get(getLLVMContext(), {MD});
+    CI->setMetadata("srcloc", MDT);
+  }
+
   // 4. Finish the call.
 
   // If the call doesn't return, finish the basic block and clear the
@@ -5324,8 +5496,7 @@ RValue CodeGenFunction::EmitCall(const CGFunctionInfo &CallInfo,
       // attributes of the called function.
       if (auto *F = CI->getCalledFunction())
         F->removeFnAttr(llvm::Attribute::NoReturn);
-      CI->removeAttribute(llvm::AttributeList::FunctionIndex,
-                          llvm::Attribute::NoReturn);
+      CI->removeFnAttr(llvm::Attribute::NoReturn);
 
       // Avoid incompatibility with ASan which relies on the `noreturn`
       // attribute to insert handler calls.
@@ -5411,7 +5582,7 @@ RValue CodeGenFunction::EmitCall(const CGFunctionInfo &CallInfo,
         Builder.CreateStore(elt, eltAddr);
       }
       // FALLTHROUGH
-      LLVM_FALLTHROUGH;
+      [[fallthrough]];
     }
 
     case ABIArgInfo::InAlloca:
diff --git a/gnu/llvm/clang/lib/CodeGen/CGOpenMPRuntimeAMDGCN.cpp b/gnu/llvm/clang/lib/CodeGen/CGOpenMPRuntimeAMDGCN.cpp
deleted file mode 100644
index 33d4ab838af..00000000000
--- a/gnu/llvm/clang/lib/CodeGen/CGOpenMPRuntimeAMDGCN.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-//===-- CGOpenMPRuntimeAMDGCN.cpp - Interface to OpenMP AMDGCN Runtimes --===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This provides a class for OpenMP runtime code generation specialized to
-// AMDGCN targets from generalized CGOpenMPRuntimeGPU class.
-//
-//===----------------------------------------------------------------------===//
-
-#include "CGOpenMPRuntimeAMDGCN.h"
-#include "CGOpenMPRuntimeGPU.h"
-#include "CodeGenFunction.h"
-#include "clang/AST/Attr.h"
-#include "clang/AST/DeclOpenMP.h"
-#include "clang/AST/StmtOpenMP.h"
-#include "clang/AST/StmtVisitor.h"
-#include "clang/Basic/Cuda.h"
-#include "llvm/ADT/SmallPtrSet.h"
-#include "llvm/IR/IntrinsicsAMDGPU.h"
-
-using namespace clang;
-using namespace CodeGen;
-using namespace llvm::omp;
-
-CGOpenMPRuntimeAMDGCN::CGOpenMPRuntimeAMDGCN(CodeGenModule &CGM)
-    : CGOpenMPRuntimeGPU(CGM) {
-  if (!CGM.getLangOpts().OpenMPIsDevice)
-    llvm_unreachable("OpenMP AMDGCN can only handle device code.");
-}
-
-llvm::Value *CGOpenMPRuntimeAMDGCN::getGPUWarpSize(CodeGenFunction &CGF) {
-  CGBuilderTy &Bld = CGF.Builder;
-  // return constant compile-time target-specific warp size
-  unsigned WarpSize = CGF.getTarget().getGridValue(llvm::omp::GV_Warp_Size);
-  return Bld.getInt32(WarpSize);
-}
-
-llvm::Value *CGOpenMPRuntimeAMDGCN::getGPUThreadID(CodeGenFunction &CGF) {
-  CGBuilderTy &Bld = CGF.Builder;
-  llvm::Function *F =
-      CGF.CGM.getIntrinsic(llvm::Intrinsic::amdgcn_workitem_id_x);
-  return Bld.CreateCall(F, llvm::None, "nvptx_tid");
-}
-
-llvm::Value *CGOpenMPRuntimeAMDGCN::getGPUNumThreads(CodeGenFunction &CGF) {
-  CGBuilderTy &Bld = CGF.Builder;
-  llvm::Module *M = &CGF.CGM.getModule();
-  const char *LocSize = "__kmpc_amdgcn_gpu_num_threads";
-  llvm::Function *F = M->getFunction(LocSize);
-  if (!F) {
-    F = llvm::Function::Create(
-        llvm::FunctionType::get(CGF.Int32Ty, llvm::None, false),
-        llvm::GlobalVariable::ExternalLinkage, LocSize, &CGF.CGM.getModule());
-  }
-  return Bld.CreateCall(F, llvm::None, "nvptx_num_threads");
-}
diff --git a/gnu/llvm/clang/lib/CodeGen/CGOpenMPRuntimeAMDGCN.h b/gnu/llvm/clang/lib/CodeGen/CGOpenMPRuntimeAMDGCN.h
deleted file mode 100644
index c1421261bfc..00000000000
--- a/gnu/llvm/clang/lib/CodeGen/CGOpenMPRuntimeAMDGCN.h
+++ /dev/null
@@ -1,43 +0,0 @@
-//===--- CGOpenMPRuntimeAMDGCN.h - Interface to OpenMP AMDGCN Runtimes ---===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This provides a class for OpenMP runtime code generation specialized to
-// AMDGCN targets from generalized CGOpenMPRuntimeGPU class.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_CLANG_LIB_CODEGEN_CGOPENMPRUNTIMEAMDGCN_H
-#define LLVM_CLANG_LIB_CODEGEN_CGOPENMPRUNTIMEAMDGCN_H
-
-#include "CGOpenMPRuntime.h"
-#include "CGOpenMPRuntimeGPU.h"
-#include "CodeGenFunction.h"
-#include "clang/AST/StmtOpenMP.h"
-
-namespace clang {
-namespace CodeGen {
-
-class CGOpenMPRuntimeAMDGCN final : public CGOpenMPRuntimeGPU {
-
-public:
-  explicit CGOpenMPRuntimeAMDGCN(CodeGenModule &CGM);
-
-  /// Get the GPU warp size.
-  llvm::Value *getGPUWarpSize(CodeGenFunction &CGF) override;
-
-  /// Get the id of the current thread on the GPU.
-  llvm::Value *getGPUThreadID(CodeGenFunction &CGF) override;
-
-  /// Get the maximum number of threads in a block of the GPU.
-  llvm::Value *getGPUNumThreads(CodeGenFunction &CGF) override;
-};
-
-} // namespace CodeGen
-} // namespace clang
-
-#endif // LLVM_CLANG_LIB_CODEGEN_CGOPENMPRUNTIMEAMDGCN_H
diff --git a/gnu/llvm/clang/lib/CodeGen/CGOpenMPRuntimeNVPTX.cpp b/gnu/llvm/clang/lib/CodeGen/CGOpenMPRuntimeNVPTX.cpp
deleted file mode 100644
index 1688d07b90b..00000000000
--- a/gnu/llvm/clang/lib/CodeGen/CGOpenMPRuntimeNVPTX.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-//===---- CGOpenMPRuntimeNVPTX.cpp - Interface to OpenMP NVPTX Runtimes ---===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This provides a class for OpenMP runtime code generation specialized to NVPTX
-// targets from generalized CGOpenMPRuntimeGPU class.
-//
-//===----------------------------------------------------------------------===//
-
-#include "CGOpenMPRuntimeNVPTX.h"
-#include "CGOpenMPRuntimeGPU.h"
-#include "CodeGenFunction.h"
-#include "clang/AST/Attr.h"
-#include "clang/AST/DeclOpenMP.h"
-#include "clang/AST/StmtOpenMP.h"
-#include "clang/AST/StmtVisitor.h"
-#include "clang/Basic/Cuda.h"
-#include "llvm/ADT/SmallPtrSet.h"
-#include "llvm/IR/IntrinsicsNVPTX.h"
-
-using namespace clang;
-using namespace CodeGen;
-using namespace llvm::omp;
-
-CGOpenMPRuntimeNVPTX::CGOpenMPRuntimeNVPTX(CodeGenModule &CGM)
-    : CGOpenMPRuntimeGPU(CGM) {
-  if (!CGM.getLangOpts().OpenMPIsDevice)
-    llvm_unreachable("OpenMP NVPTX can only handle device code.");
-}
-
-llvm::Value *CGOpenMPRuntimeNVPTX::getGPUWarpSize(CodeGenFunction &CGF) {
-  return CGF.EmitRuntimeCall(
-      llvm::Intrinsic::getDeclaration(
-          &CGF.CGM.getModule(), llvm::Intrinsic::nvvm_read_ptx_sreg_warpsize),
-      "nvptx_warp_size");
-}
-
-llvm::Value *CGOpenMPRuntimeNVPTX::getGPUThreadID(CodeGenFunction &CGF) {
-  CGBuilderTy &Bld = CGF.Builder;
-  llvm::Function *F;
-  F = llvm::Intrinsic::getDeclaration(
-      &CGF.CGM.getModule(), llvm::Intrinsic::nvvm_read_ptx_sreg_tid_x);
-  return Bld.CreateCall(F, llvm::None, "nvptx_tid");
-}
-
-llvm::Value *CGOpenMPRuntimeNVPTX::getGPUNumThreads(CodeGenFunction &CGF) {
-  CGBuilderTy &Bld = CGF.Builder;
-  llvm::Function *F;
-  F = llvm::Intrinsic::getDeclaration(
-      &CGF.CGM.getModule(), llvm::Intrinsic::nvvm_read_ptx_sreg_ntid_x);
-  return Bld.CreateCall(F, llvm::None, "nvptx_num_threads");
-}
diff --git a/gnu/llvm/clang/lib/CodeGen/CGOpenMPRuntimeNVPTX.h b/gnu/llvm/clang/lib/CodeGen/CGOpenMPRuntimeNVPTX.h
deleted file mode 100644
index 5f160295926..00000000000
--- a/gnu/llvm/clang/lib/CodeGen/CGOpenMPRuntimeNVPTX.h
+++ /dev/null
@@ -1,43 +0,0 @@
-//===----- CGOpenMPRuntimeNVPTX.h - Interface to OpenMP NVPTX Runtimes ----===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This provides a class for OpenMP runtime code generation specialized to NVPTX
-// targets from generalized CGOpenMPRuntimeGPU class.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_CLANG_LIB_CODEGEN_CGOPENMPRUNTIMENVPTX_H
-#define LLVM_CLANG_LIB_CODEGEN_CGOPENMPRUNTIMENVPTX_H
-
-#include "CGOpenMPRuntime.h"
-#include "CGOpenMPRuntimeGPU.h"
-#include "CodeGenFunction.h"
-#include "clang/AST/StmtOpenMP.h"
-
-namespace clang {
-namespace CodeGen {
-
-class CGOpenMPRuntimeNVPTX final : public CGOpenMPRuntimeGPU {
-
-public:
-  explicit CGOpenMPRuntimeNVPTX(CodeGenModule &CGM);
-
-  /// Get the GPU warp size.
-  llvm::Value *getGPUWarpSize(CodeGenFunction &CGF) override;
-
-  /// Get the id of the current thread on the GPU.
-  llvm::Value *getGPUThreadID(CodeGenFunction &CGF) override;
-
-  /// Get the maximum number of threads in a block of the GPU.
-  llvm::Value *getGPUNumThreads(CodeGenFunction &CGF) override;
-};
-
-} // CodeGen namespace.
-} // clang namespace.
-
-#endif // LLVM_CLANG_LIB_CODEGEN_CGOPENMPRUNTIMENVPTX_H
diff --git a/gnu/llvm/clang/lib/CodeGen/CodeGenModule.cpp b/gnu/llvm/clang/lib/CodeGen/CodeGenModule.cpp
index 22a7edcf675..45d790954ec 100644
--- a/gnu/llvm/clang/lib/CodeGen/CodeGenModule.cpp
+++ b/gnu/llvm/clang/lib/CodeGen/CodeGenModule.cpp
@@ -11,16 +11,17 @@
 //===----------------------------------------------------------------------===//
 
 #include "CodeGenModule.h"
+#include "ABIInfo.h"
 #include "CGBlocks.h"
 #include "CGCUDARuntime.h"
 #include "CGCXXABI.h"
 #include "CGCall.h"
 #include "CGDebugInfo.h"
+#include "CGHLSLRuntime.h"
 #include "CGObjCRuntime.h"
 #include "CGOpenCLRuntime.h"
 #include "CGOpenMPRuntime.h"
-#include "CGOpenMPRuntimeAMDGCN.h"
-#include "CGOpenMPRuntimeNVPTX.h"
+#include "CGOpenMPRuntimeGPU.h"
 #include "CodeGenFunction.h"
 #include "CodeGenPGO.h"
 #include "ConstantEmitter.h"
@@ -32,7 +33,6 @@
 #include "clang/AST/DeclObjC.h"
 #include "clang/AST/DeclTemplate.h"
 #include "clang/AST/Mangle.h"
-#include "clang/AST/RecordLayout.h"
 #include "clang/AST/RecursiveASTVisitor.h"
 #include "clang/AST/StmtVisitor.h"
 #include "clang/Basic/Builtins.h"
@@ -44,8 +44,11 @@
 #include "clang/Basic/SourceManager.h"
 #include "clang/Basic/TargetInfo.h"
 #include "clang/Basic/Version.h"
+#include "clang/CodeGen/BackendUtil.h"
 #include "clang/CodeGen/ConstantInitBuilder.h"
 #include "clang/Frontend/FrontendDiagnostic.h"
+#include "llvm/ADT/STLExtras.h"
+#include "llvm/ADT/StringExtras.h"
 #include "llvm/ADT/StringSwitch.h"
 #include "llvm/ADT/Triple.h"
 #include "llvm/Analysis/TargetLibraryInfo.h"
@@ -57,20 +60,23 @@
 #include "llvm/IR/Module.h"
 #include "llvm/IR/ProfileSummary.h"
 #include "llvm/ProfileData/InstrProfReader.h"
+#include "llvm/ProfileData/SampleProf.h"
+#include "llvm/Support/CRC.h"
 #include "llvm/Support/CodeGen.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/ConvertUTF.h"
 #include "llvm/Support/ErrorHandling.h"
-#include "llvm/Support/MD5.h"
 #include "llvm/Support/TimeProfiler.h"
+#include "llvm/Support/X86TargetParser.h"
+#include "llvm/Support/xxhash.h"
+#include <optional>
 
 using namespace clang;
 using namespace CodeGen;
 
 static llvm::cl::opt<bool> LimitedCoverage(
-    "limited-coverage-experimental", llvm::cl::ZeroOrMore, llvm::cl::Hidden,
-    llvm::cl::desc("Emit limited coverage mapping information (experimental)"),
-    llvm::cl::init(false));
+    "limited-coverage-experimental", llvm::cl::Hidden,
+    llvm::cl::desc("Emit limited coverage mapping information (experimental)"));
 
 static const char AnnotationSection[] = "llvm.metadata";
 
@@ -94,16 +100,18 @@ static CGCXXABI *createCXXABI(CodeGenModule &CGM) {
   llvm_unreachable("invalid C++ ABI kind");
 }
 
-CodeGenModule::CodeGenModule(ASTContext &C, const HeaderSearchOptions &HSO,
+CodeGenModule::CodeGenModule(ASTContext &C,
+                             IntrusiveRefCntPtr<llvm::vfs::FileSystem> FS,
+                             const HeaderSearchOptions &HSO,
                              const PreprocessorOptions &PPO,
                              const CodeGenOptions &CGO, llvm::Module &M,
                              DiagnosticsEngine &diags,
                              CoverageSourceInfo *CoverageInfo)
-    : Context(C), LangOpts(C.getLangOpts()), HeaderSearchOpts(HSO),
-      PreprocessorOpts(PPO), CodeGenOpts(CGO), TheModule(M), Diags(diags),
-      Target(C.getTargetInfo()), ABI(createCXXABI(*this)),
-      VMContext(M.getContext()), Types(*this), VTables(*this),
-      SanitizerMD(new SanitizerMetadata(*this)) {
+    : Context(C), LangOpts(C.getLangOpts()), FS(std::move(FS)),
+      HeaderSearchOpts(HSO), PreprocessorOpts(PPO), CodeGenOpts(CGO),
+      TheModule(M), Diags(diags), Target(C.getTargetInfo()),
+      ABI(createCXXABI(*this)), VMContext(M.getContext()), Types(*this),
+      VTables(*this), SanitizerMD(new SanitizerMetadata(*this)) {
 
   // Initialize the type cache.
   llvm::LLVMContext &LLVMContext = M.getContext();
@@ -116,9 +124,10 @@ CodeGenModule::CodeGenModule(ASTContext &C, const HeaderSearchOptions &HSO,
   BFloatTy = llvm::Type::getBFloatTy(LLVMContext);
   FloatTy = llvm::Type::getFloatTy(LLVMContext);
   DoubleTy = llvm::Type::getDoubleTy(LLVMContext);
-  PointerWidthInBits = C.getTargetInfo().getPointerWidth(0);
+  PointerWidthInBits = C.getTargetInfo().getPointerWidth(LangAS::Default);
   PointerAlignInBytes =
-    C.toCharUnitsFromBits(C.getTargetInfo().getPointerAlign(0)).getQuantity();
+      C.toCharUnitsFromBits(C.getTargetInfo().getPointerAlign(LangAS::Default))
+          .getQuantity();
   SizeSizeInBytes =
     C.toCharUnitsFromBits(C.getTargetInfo().getMaxPointerWidth()).getQuantity();
   IntAlignInBytes =
@@ -130,10 +139,20 @@ CodeGenModule::CodeGenModule(ASTContext &C, const HeaderSearchOptions &HSO,
     C.getTargetInfo().getMaxPointerWidth());
   Int8PtrTy = Int8Ty->getPointerTo(0);
   Int8PtrPtrTy = Int8PtrTy->getPointerTo(0);
-  AllocaInt8PtrTy = Int8Ty->getPointerTo(
-      M.getDataLayout().getAllocaAddrSpace());
+  const llvm::DataLayout &DL = M.getDataLayout();
+  AllocaInt8PtrTy = Int8Ty->getPointerTo(DL.getAllocaAddrSpace());
+  GlobalsInt8PtrTy = Int8Ty->getPointerTo(DL.getDefaultGlobalsAddressSpace());
+  ConstGlobalsPtrTy = Int8Ty->getPointerTo(
+      C.getTargetAddressSpace(GetGlobalConstantAddressSpace()));
   ASTAllocaAddressSpace = getTargetCodeGenInfo().getASTAllocaAddressSpace();
 
+  // Build C++20 Module initializers.
+  // TODO: Add Microsoft here once we know the mangling required for the
+  // initializers.
+  CXX20ModuleInits =
+      LangOpts.CPlusPlusModules && getCXXABI().getMangleContext().getKind() ==
+                                       ItaniumMangleContext::MK_Itanium;
+
   RuntimeCC = getTargetCodeGenInfo().getABIInfo().getRuntimeCC();
 
   if (LangOpts.ObjC)
@@ -144,6 +163,8 @@ CodeGenModule::CodeGenModule(ASTContext &C, const HeaderSearchOptions &HSO,
     createOpenMPRuntime();
   if (LangOpts.CUDA)
     createCUDARuntime();
+  if (LangOpts.HLSL)
+    createHLSLRuntime();
 
   // Enable TBAA unless it's suppressed. ThreadSanitizer needs TBAA even at O0.
   if (LangOpts.Sanitize.has(SanitizerKind::Thread) ||
@@ -165,15 +186,11 @@ CodeGenModule::CodeGenModule(ASTContext &C, const HeaderSearchOptions &HSO,
   if (CodeGenOpts.hasProfileClangUse()) {
     auto ReaderOrErr = llvm::IndexedInstrProfReader::create(
         CodeGenOpts.ProfileInstrumentUsePath, CodeGenOpts.ProfileRemappingFile);
-    if (auto E = ReaderOrErr.takeError()) {
-      unsigned DiagID = Diags.getCustomDiagID(DiagnosticsEngine::Error,
-                                              "Could not read profile %0: %1");
-      llvm::handleAllErrors(std::move(E), [&](const llvm::ErrorInfoBase &EI) {
-        getDiags().Report(DiagID) << CodeGenOpts.ProfileInstrumentUsePath
-                                  << EI.message();
-      });
-    } else
-      PGOReader = std::move(ReaderOrErr.get());
+    // We're checking for profile read errors in CompilerInvocation, so if
+    // there was an error it should've already been caught. If it hasn't been
+    // somehow, trip an assertion.
+    assert(ReaderOrErr);
+    PGOReader = std::move(ReaderOrErr.get());
   }
 
   // If coverage mapping generation is enabled, create the
@@ -191,22 +208,7 @@ CodeGenModule::CodeGenModule(ASTContext &C, const HeaderSearchOptions &HSO,
         Path = Entry.second + Path.substr(Entry.first.size());
         break;
       }
-    llvm::MD5 Md5;
-    Md5.update(Path);
-    llvm::MD5::MD5Result R;
-    Md5.final(R);
-    SmallString<32> Str;
-    llvm::MD5::stringifyResult(R, Str);
-    // Convert MD5hash to Decimal. Demangler suffixes can either contain
-    // numbers or characters but not both.
-    llvm::APInt IntHash(128, Str.str(), 16);
-    // Prepend "__uniq" before the hash for tools like profilers to understand
-    // that this symbol is of internal linkage type.  The "__uniq" is the
-    // pre-determined prefix that is used to tell tools that this symbol was
-    // created with -funique-internal-linakge-symbols and the tools can strip or
-    // keep the prefix as needed.
-    ModuleNameHash = (Twine(".__uniq.") +
-        Twine(toString(IntHash, /* Radix = */ 10, /* Signed = */false))).str();
+    ModuleNameHash = llvm::getUniqueInternalLinkagePostfix(Path);
   }
 }
 
@@ -242,14 +244,10 @@ void CodeGenModule::createOpenMPRuntime() {
   switch (getTriple().getArch()) {
   case llvm::Triple::nvptx:
   case llvm::Triple::nvptx64:
-    assert(getLangOpts().OpenMPIsDevice &&
-           "OpenMP NVPTX is only prepared to deal with device code.");
-    OpenMPRuntime.reset(new CGOpenMPRuntimeNVPTX(*this));
-    break;
   case llvm::Triple::amdgcn:
     assert(getLangOpts().OpenMPIsDevice &&
-           "OpenMP AMDGCN is only prepared to deal with device code.");
-    OpenMPRuntime.reset(new CGOpenMPRuntimeAMDGCN(*this));
+           "OpenMP AMDGPU/NVPTX is only prepared to deal with device code.");
+    OpenMPRuntime.reset(new CGOpenMPRuntimeGPU(*this));
     break;
   default:
     if (LangOpts.OpenMPSimd)
@@ -264,6 +262,10 @@ void CodeGenModule::createCUDARuntime() {
   CUDARuntime.reset(CreateNVCUDARuntime(*this));
 }
 
+void CodeGenModule::createHLSLRuntime() {
+  HLSLRuntime.reset(new CGHLSLRuntime(*this));
+}
+
 void CodeGenModule::addReplacement(StringRef Name, llvm::Constant *C) {
   Replacements[Name] = C;
 }
@@ -315,22 +317,58 @@ void CodeGenModule::applyGlobalValReplacements() {
 
 // This is only used in aliases that we created and we know they have a
 // linear structure.
-static const llvm::GlobalObject *getAliasedGlobal(
-    const llvm::GlobalIndirectSymbol &GIS) {
-  llvm::SmallPtrSet<const llvm::GlobalIndirectSymbol*, 4> Visited;
-  const llvm::Constant *C = &GIS;
-  for (;;) {
-    C = C->stripPointerCasts();
-    if (auto *GO = dyn_cast<llvm::GlobalObject>(C))
-      return GO;
-    // stripPointerCasts will not walk over weak aliases.
-    auto *GIS2 = dyn_cast<llvm::GlobalIndirectSymbol>(C);
-    if (!GIS2)
-      return nullptr;
-    if (!Visited.insert(GIS2).second)
-      return nullptr;
-    C = GIS2->getIndirectSymbol();
+static const llvm::GlobalValue *getAliasedGlobal(const llvm::GlobalValue *GV) {
+  const llvm::Constant *C;
+  if (auto *GA = dyn_cast<llvm::GlobalAlias>(GV))
+    C = GA->getAliasee();
+  else if (auto *GI = dyn_cast<llvm::GlobalIFunc>(GV))
+    C = GI->getResolver();
+  else
+    return GV;
+
+  const auto *AliaseeGV = dyn_cast<llvm::GlobalValue>(C->stripPointerCasts());
+  if (!AliaseeGV)
+    return nullptr;
+
+  const llvm::GlobalValue *FinalGV = AliaseeGV->getAliaseeObject();
+  if (FinalGV == GV)
+    return nullptr;
+
+  return FinalGV;
+}
+
+static bool checkAliasedGlobal(DiagnosticsEngine &Diags,
+                               SourceLocation Location, bool IsIFunc,
+                               const llvm::GlobalValue *Alias,
+                               const llvm::GlobalValue *&GV) {
+  GV = getAliasedGlobal(Alias);
+  if (!GV) {
+    Diags.Report(Location, diag::err_cyclic_alias) << IsIFunc;
+    return false;
+  }
+
+  if (GV->isDeclaration()) {
+    Diags.Report(Location, diag::err_alias_to_undefined) << IsIFunc << IsIFunc;
+    return false;
   }
+
+  if (IsIFunc) {
+    // Check resolver function type.
+    const auto *F = dyn_cast<llvm::Function>(GV);
+    if (!F) {
+      Diags.Report(Location, diag::err_alias_to_undefined)
+          << IsIFunc << IsIFunc;
+      return false;
+    }
+
+    llvm::FunctionType *FTy = F->getFunctionType();
+    if (!FTy->getReturnType()->isPointerTy()) {
+      Diags.Report(Location, diag::err_ifunc_resolver_return);
+      return false;
+    }
+  }
+
+  return true;
 }
 
 void CodeGenModule::checkAliases() {
@@ -347,27 +385,19 @@ void CodeGenModule::checkAliases() {
       Location = A->getLocation();
     else
       llvm_unreachable("Not an alias or ifunc?");
+
     StringRef MangledName = getMangledName(GD);
-    llvm::GlobalValue *Entry = GetGlobalValue(MangledName);
-    auto *Alias  = cast<llvm::GlobalIndirectSymbol>(Entry);
-    const llvm::GlobalValue *GV = getAliasedGlobal(*Alias);
-    if (!GV) {
+    llvm::GlobalValue *Alias = GetGlobalValue(MangledName);
+    const llvm::GlobalValue *GV = nullptr;
+    if (!checkAliasedGlobal(Diags, Location, IsIFunc, Alias, GV)) {
       Error = true;
-      Diags.Report(Location, diag::err_cyclic_alias) << IsIFunc;
-    } else if (GV->isDeclaration()) {
-      Error = true;
-      Diags.Report(Location, diag::err_alias_to_undefined)
-          << IsIFunc << IsIFunc;
-    } else if (IsIFunc) {
-      // Check resolver function type.
-      llvm::FunctionType *FTy = dyn_cast<llvm::FunctionType>(
-          GV->getType()->getPointerElementType());
-      assert(FTy);
-      if (!FTy->getReturnType()->isPointerTy())
-        Diags.Report(Location, diag::err_ifunc_resolver_return);
+      continue;
     }
 
-    llvm::Constant *Aliasee = Alias->getIndirectSymbol();
+    llvm::Constant *Aliasee =
+        IsIFunc ? cast<llvm::GlobalIFunc>(Alias)->getResolver()
+                : cast<llvm::GlobalAlias>(Alias)->getAliasee();
+
     llvm::GlobalValue *AliaseeGV;
     if (auto CE = dyn_cast<llvm::ConstantExpr>(Aliasee))
       AliaseeGV = cast<llvm::GlobalValue>(CE->getOperand(0));
@@ -386,13 +416,17 @@ void CodeGenModule::checkAliases() {
     // compatibility with gcc we implement it by just pointing the alias
     // to its aliasee's aliasee. We also warn, since the user is probably
     // expecting the link to be weak.
-    if (auto GA = dyn_cast<llvm::GlobalIndirectSymbol>(AliaseeGV)) {
+    if (auto *GA = dyn_cast<llvm::GlobalAlias>(AliaseeGV)) {
       if (GA->isInterposable()) {
         Diags.Report(Location, diag::warn_alias_to_weak_alias)
             << GV->getName() << GA->getName() << IsIFunc;
         Aliasee = llvm::ConstantExpr::getPointerBitCastOrAddrSpaceCast(
-            GA->getIndirectSymbol(), Alias->getType());
-        Alias->setIndirectSymbol(Aliasee);
+            GA->getAliasee(), Alias->getType());
+
+        if (IsIFunc)
+          cast<llvm::GlobalIFunc>(Alias)->setResolver(Aliasee);
+        else
+          cast<llvm::GlobalAlias>(Alias)->setAliasee(Aliasee);
       }
     }
   }
@@ -401,8 +435,7 @@ void CodeGenModule::checkAliases() {
 
   for (const GlobalDecl &GD : Aliases) {
     StringRef MangledName = getMangledName(GD);
-    llvm::GlobalValue *Entry = GetGlobalValue(MangledName);
-    auto *Alias = cast<llvm::GlobalIndirectSymbol>(Entry);
+    llvm::GlobalValue *Alias = GetGlobalValue(MangledName);
     Alias->replaceAllUsesWith(llvm::UndefValue::get(Alias->getType()));
     Alias->eraseFromParent();
   }
@@ -410,6 +443,7 @@ void CodeGenModule::checkAliases() {
 
 void CodeGenModule::clear() {
   DeferredDeclsToEmit.clear();
+  EmittedDeferredDecls.clear();
   if (OpenMPRuntime)
     OpenMPRuntime->clear();
 }
@@ -474,13 +508,29 @@ static void setVisibilityFromDLLStorageClass(const clang::LangOptions &LO,
 }
 
 void CodeGenModule::Release() {
+  Module *Primary = getContext().getModuleForCodeGen();
+  if (CXX20ModuleInits && Primary && !Primary->isHeaderLikeModule())
+    EmitModuleInitializers(Primary);
   EmitDeferred();
+  DeferredDecls.insert(EmittedDeferredDecls.begin(),
+                       EmittedDeferredDecls.end());
+  EmittedDeferredDecls.clear();
   EmitVTablesOpportunistically();
   applyGlobalValReplacements();
   applyReplacements();
-  checkAliases();
   emitMultiVersionFunctions();
-  EmitCXXGlobalInitFunc();
+
+  if (Context.getLangOpts().IncrementalExtensions &&
+      GlobalTopLevelStmtBlockInFlight.first) {
+    const TopLevelStmtDecl *TLSD = GlobalTopLevelStmtBlockInFlight.second;
+    GlobalTopLevelStmtBlockInFlight.first->FinishFunction(TLSD->getEndLoc());
+    GlobalTopLevelStmtBlockInFlight = {nullptr, nullptr};
+  }
+
+  if (CXX20ModuleInits && Primary && Primary->isInterfaceOrPartition())
+    EmitCXXModuleInitFunc(Primary);
+  else
+    EmitCXXGlobalInitFunc();
   EmitCXXGlobalCleanUpFunc();
   registerGlobalDtorsWithAtExit();
   EmitCXXThreadLocalInitFunc();
@@ -506,10 +556,14 @@ void CodeGenModule::Release() {
     if (PGOStats.hasDiagnostics())
       PGOStats.reportDiagnostics(getDiags(), getCodeGenOpts().MainFileName);
   }
+  llvm::stable_sort(GlobalCtors, [](const Structor &L, const Structor &R) {
+    return L.LexOrder < R.LexOrder;
+  });
   EmitCtorList(GlobalCtors, "llvm.global_ctors");
   EmitCtorList(GlobalDtors, "llvm.global_dtors");
   EmitGlobalAnnotations();
   EmitStaticExternCAliases();
+  checkAliases();
   EmitDeferredUnusedCoverageMappings();
   CodeGenPGO(*this).setValueProfilingFlag(getModule());
   if (CoverageMapping)
@@ -518,25 +572,59 @@ void CodeGenModule::Release() {
     CodeGenFunction(*this).EmitCfiCheckFail();
     CodeGenFunction(*this).EmitCfiCheckStub();
   }
+  if (LangOpts.Sanitize.has(SanitizerKind::KCFI))
+    finalizeKCFITypes();
   emitAtAvailableLinkGuard();
-  if (Context.getTargetInfo().getTriple().isWasm() &&
-      !Context.getTargetInfo().getTriple().isOSEmscripten()) {
+  if (Context.getTargetInfo().getTriple().isWasm())
     EmitMainVoidAlias();
+
+  if (getTriple().isAMDGPU()) {
+    // Emit reference of __amdgpu_device_library_preserve_asan_functions to
+    // preserve ASAN functions in bitcode libraries.
+    if (LangOpts.Sanitize.has(SanitizerKind::Address)) {
+      auto *FT = llvm::FunctionType::get(VoidTy, {});
+      auto *F = llvm::Function::Create(
+          FT, llvm::GlobalValue::ExternalLinkage,
+          "__amdgpu_device_library_preserve_asan_functions", &getModule());
+      auto *Var = new llvm::GlobalVariable(
+          getModule(), FT->getPointerTo(),
+          /*isConstant=*/true, llvm::GlobalValue::WeakAnyLinkage, F,
+          "__amdgpu_device_library_preserve_asan_functions_ptr", nullptr,
+          llvm::GlobalVariable::NotThreadLocal);
+      addCompilerUsedGlobal(Var);
+    }
+    // Emit amdgpu_code_object_version module flag, which is code object version
+    // times 100.
+    if (getTarget().getTargetOpts().CodeObjectVersion !=
+        TargetOptions::COV_None) {
+      getModule().addModuleFlag(llvm::Module::Error,
+                                "amdgpu_code_object_version",
+                                getTarget().getTargetOpts().CodeObjectVersion);
+    }
   }
 
-  // Emit reference of __amdgpu_device_library_preserve_asan_functions to
-  // preserve ASAN functions in bitcode libraries.
-  if (LangOpts.Sanitize.has(SanitizerKind::Address) && getTriple().isAMDGPU()) {
-    auto *FT = llvm::FunctionType::get(VoidTy, {});
-    auto *F = llvm::Function::Create(
-        FT, llvm::GlobalValue::ExternalLinkage,
-        "__amdgpu_device_library_preserve_asan_functions", &getModule());
-    auto *Var = new llvm::GlobalVariable(
-        getModule(), FT->getPointerTo(),
-        /*isConstant=*/true, llvm::GlobalValue::WeakAnyLinkage, F,
-        "__amdgpu_device_library_preserve_asan_functions_ptr", nullptr,
-        llvm::GlobalVariable::NotThreadLocal);
-    addCompilerUsedGlobal(Var);
+  // Emit a global array containing all external kernels or device variables
+  // used by host functions and mark it as used for CUDA/HIP. This is necessary
+  // to get kernels or device variables in archives linked in even if these
+  // kernels or device variables are only used in host functions.
+  if (!Context.CUDAExternalDeviceDeclODRUsedByHost.empty()) {
+    SmallVector<llvm::Constant *, 8> UsedArray;
+    for (auto D : Context.CUDAExternalDeviceDeclODRUsedByHost) {
+      GlobalDecl GD;
+      if (auto *FD = dyn_cast<FunctionDecl>(D))
+        GD = GlobalDecl(FD, KernelReferenceKind::Kernel);
+      else
+        GD = GlobalDecl(D);
+      UsedArray.push_back(llvm::ConstantExpr::getPointerBitCastOrAddrSpaceCast(
+          GetAddrOfGlobal(GD), Int8PtrTy));
+    }
+
+    llvm::ArrayType *ATy = llvm::ArrayType::get(Int8PtrTy, UsedArray.size());
+
+    auto *GV = new llvm::GlobalVariable(
+        getModule(), ATy, false, llvm::GlobalValue::InternalLinkage,
+        llvm::ConstantArray::get(ATy, UsedArray), "__clang_gpu_used_external");
+    addCompilerUsedGlobal(GV);
   }
 
   emitLLVMUsed();
@@ -581,7 +669,7 @@ void CodeGenModule::Release() {
 
   if (Context.getLangOpts().SemanticInterposition)
     // Require various optimization to respect semantic interposition.
-    getModule().setSemanticInterposition(1);
+    getModule().setSemanticInterposition(true);
 
   if (CodeGenOpts.EmitCodeView) {
     // Indicate that we want CodeView in the metadata.
@@ -601,6 +689,10 @@ void CodeGenModule::Release() {
     // Function ID tables for EH Continuation Guard.
     getModule().addModuleFlag(llvm::Module::Warning, "ehcontguard", 1);
   }
+  if (Context.getLangOpts().Kernel) {
+    // Note if we are compiling with /kernel.
+    getModule().addModuleFlag(llvm::Module::Warning, "ms-kernel", 1);
+  }
   if (CodeGenOpts.OptimizationLevel > 0 && CodeGenOpts.StrictVTablePointers) {
     // We don't support LTO with 2 with different StrictVTablePointers
     // FIXME: we could support it by stripping all the information introduced
@@ -667,35 +759,68 @@ void CodeGenModule::Release() {
                               CodeGenOpts.SanitizeCfiCanonicalJumpTables);
   }
 
+  if (LangOpts.Sanitize.has(SanitizerKind::KCFI)) {
+    getModule().addModuleFlag(llvm::Module::Override, "kcfi", 1);
+    // KCFI assumes patchable-function-prefix is the same for all indirectly
+    // called functions. Store the expected offset for code generation.
+    if (CodeGenOpts.PatchableFunctionEntryOffset)
+      getModule().addModuleFlag(llvm::Module::Override, "kcfi-offset",
+                                CodeGenOpts.PatchableFunctionEntryOffset);
+  }
+
   if (CodeGenOpts.CFProtectionReturn &&
       Target.checkCFProtectionReturnSupported(getDiags())) {
     // Indicate that we want to instrument return control flow protection.
-    getModule().addModuleFlag(llvm::Module::Override, "cf-protection-return",
+    getModule().addModuleFlag(llvm::Module::Min, "cf-protection-return",
                               1);
   }
 
   if (CodeGenOpts.CFProtectionBranch &&
       Target.checkCFProtectionBranchSupported(getDiags())) {
     // Indicate that we want to instrument branch control flow protection.
-    getModule().addModuleFlag(llvm::Module::Override, "cf-protection-branch",
+    getModule().addModuleFlag(llvm::Module::Min, "cf-protection-branch",
                               1);
   }
 
-  if (Arch == llvm::Triple::aarch64 || Arch == llvm::Triple::aarch64_32 ||
-      Arch == llvm::Triple::aarch64_be) {
-    getModule().addModuleFlag(llvm::Module::Error,
-                              "branch-target-enforcement",
-                              LangOpts.BranchTargetEnforcement);
-
-    getModule().addModuleFlag(llvm::Module::Error, "sign-return-address",
-                              LangOpts.hasSignReturnAddress());
-
-    getModule().addModuleFlag(llvm::Module::Error, "sign-return-address-all",
-                              LangOpts.isSignReturnAddressScopeAll());
+  if (CodeGenOpts.FunctionReturnThunks)
+    getModule().addModuleFlag(llvm::Module::Override, "function_return_thunk_extern", 1);
+
+  if (CodeGenOpts.IndirectBranchCSPrefix)
+    getModule().addModuleFlag(llvm::Module::Override, "indirect_branch_cs_prefix", 1);
+
+  // Add module metadata for return address signing (ignoring
+  // non-leaf/all) and stack tagging. These are actually turned on by function
+  // attributes, but we use module metadata to emit build attributes. This is
+  // needed for LTO, where the function attributes are inside bitcode
+  // serialised into a global variable by the time build attributes are
+  // emitted, so we can't access them. LTO objects could be compiled with
+  // different flags therefore module flags are set to "Min" behavior to achieve
+  // the same end result of the normal build where e.g BTI is off if any object
+  // doesn't support it.
+  if (Context.getTargetInfo().hasFeature("ptrauth") &&
+      LangOpts.getSignReturnAddressScope() !=
+          LangOptions::SignReturnAddressScopeKind::None)
+    getModule().addModuleFlag(llvm::Module::Override,
+                              "sign-return-address-buildattr", 1);
+  if (LangOpts.Sanitize.has(SanitizerKind::MemtagStack))
+    getModule().addModuleFlag(llvm::Module::Override,
+                              "tag-stack-memory-buildattr", 1);
 
-    getModule().addModuleFlag(llvm::Module::Error,
-                              "sign-return-address-with-bkey",
-                              !LangOpts.isSignReturnAddressWithAKey());
+  if (Arch == llvm::Triple::thumb || Arch == llvm::Triple::thumbeb ||
+      Arch == llvm::Triple::arm || Arch == llvm::Triple::armeb ||
+      Arch == llvm::Triple::aarch64 || Arch == llvm::Triple::aarch64_32 ||
+      Arch == llvm::Triple::aarch64_be) {
+    if (LangOpts.BranchTargetEnforcement)
+      getModule().addModuleFlag(llvm::Module::Min, "branch-target-enforcement",
+                                1);
+    if (LangOpts.hasSignReturnAddress())
+      getModule().addModuleFlag(llvm::Module::Min, "sign-return-address", 1);
+    if (LangOpts.isSignReturnAddressScopeAll())
+      getModule().addModuleFlag(llvm::Module::Min, "sign-return-address-all",
+                                1);
+    if (!LangOpts.isSignReturnAddressWithAKey())
+      getModule().addModuleFlag(llvm::Module::Min,
+                                "sign-return-address-with-bkey", 1);
   }
 
   if (!CodeGenOpts.MemoryProfileOutput.empty()) {
@@ -725,14 +850,15 @@ void CodeGenModule::Release() {
                               LangOpts.OpenMP);
 
   // Emit OpenCL specific module metadata: OpenCL/SPIR version.
-  if (LangOpts.OpenCL) {
+  if (LangOpts.OpenCL || (LangOpts.CUDAIsDevice && getTriple().isSPIRV())) {
     EmitOpenCLMetadata();
     // Emit SPIR version.
     if (getTriple().isSPIR()) {
       // SPIR v2.0 s2.12 - The SPIR version used by the module is stored in the
       // opencl.spir.version named metadata.
-      // C++ is backwards compatible with OpenCL v2.0.
-      auto Version = LangOpts.OpenCLCPlusPlus ? 200 : LangOpts.OpenCLVersion;
+      // C++ for OpenCL has a distinct mapping for version compatibility with
+      // OpenCL.
+      auto Version = LangOpts.getOpenCLCompatibleVersion();
       llvm::Metadata *SPIRVerElts[] = {
           llvm::ConstantAsMetadata::get(llvm::ConstantInt::get(
               Int32Ty, Version / 100)),
@@ -745,6 +871,10 @@ void CodeGenModule::Release() {
     }
   }
 
+  // HLSL related end of code gen work items.
+  if (LangOpts.HLSL)
+    getHLSLRuntime().finishCodeGen();
+
   if (uint32_t PLevel = Context.getLangOpts().PICLevel) {
     assert(PLevel < 3 && "Invalid PIC Level");
     getModule().setPICLevel(static_cast<llvm::PICLevel::Level>(PLevel));
@@ -769,7 +899,7 @@ void CodeGenModule::Release() {
   if (CodeGenOpts.NoPLT)
     getModule().setRtLibUseGOT();
   if (CodeGenOpts.UnwindTables)
-    getModule().setUwtable();
+    getModule().setUwtable(llvm::UWTableKind(CodeGenOpts.UnwindTables));
 
   switch (CodeGenOpts.getFramePointer()) {
   case CodeGenOptions::FramePointerKind::None:
@@ -805,16 +935,24 @@ void CodeGenModule::Release() {
   if (!getCodeGenOpts().StackProtectorGuardReg.empty())
     getModule().setStackProtectorGuardReg(
         getCodeGenOpts().StackProtectorGuardReg);
+  if (!getCodeGenOpts().StackProtectorGuardSymbol.empty())
+    getModule().setStackProtectorGuardSymbol(
+        getCodeGenOpts().StackProtectorGuardSymbol);
   if (getCodeGenOpts().StackProtectorGuardOffset != INT_MAX)
     getModule().setStackProtectorGuardOffset(
         getCodeGenOpts().StackProtectorGuardOffset);
   if (getCodeGenOpts().StackAlignment)
     getModule().setOverrideStackAlignment(getCodeGenOpts().StackAlignment);
+  if (getCodeGenOpts().SkipRaxSetup)
+    getModule().addModuleFlag(llvm::Module::Override, "SkipRaxSetup", 1);
 
   getTargetCodeGenInfo().emitTargetMetadata(*this, MangledDeclNames);
 
   EmitBackendOptionsMetadata(getCodeGenOpts());
 
+  // If there is device offloading code embed it in the host now.
+  EmbedObject(&getModule(), CodeGenOpts, getDiags());
+
   // Set visibility from DLL storage class
   // We do this at the end of LLVM IR generation; after any operation
   // that might affect the DLL storage class or the visibility, and
@@ -825,9 +963,8 @@ void CodeGenModule::Release() {
 void CodeGenModule::EmitOpenCLMetadata() {
   // SPIR v2.0 s2.13 - The OpenCL version used by the module is stored in the
   // opencl.ocl.version named metadata node.
-  // C++ is backwards compatible with OpenCL v2.0.
-  // FIXME: We might need to add CXX version at some point too?
-  auto Version = LangOpts.OpenCLCPlusPlus ? 200 : LangOpts.OpenCLVersion;
+  // C++ for OpenCL has a distinct mapping for versions compatibile with OpenCL.
+  auto Version = LangOpts.getOpenCLCompatibleVersion();
   llvm::Metadata *OCLVerElts[] = {
       llvm::ConstantAsMetadata::get(llvm::ConstantInt::get(
           Int32Ty, Version / 100)),
@@ -841,14 +978,9 @@ void CodeGenModule::EmitOpenCLMetadata() {
 
 void CodeGenModule::EmitBackendOptionsMetadata(
     const CodeGenOptions CodeGenOpts) {
-  switch (getTriple().getArch()) {
-  default:
-    break;
-  case llvm::Triple::riscv32:
-  case llvm::Triple::riscv64:
+  if (getTriple().isRISCV()) {
     getModule().addModuleFlag(llvm::Module::Warning, "SmallDataLimit",
                               CodeGenOpts.SmallDataLimit);
-    break;
   }
 }
 
@@ -977,8 +1109,6 @@ llvm::ConstantInt *CodeGenModule::getSize(CharUnits size) {
 
 void CodeGenModule::setGlobalVisibility(llvm::GlobalValue *GV,
                                         const NamedDecl *D) const {
-  if (GV->hasDLLImportStorageClass())
-    return;
   // Internal definitions always have default visibility.
   if (GV->hasLocalLinkage()) {
     GV->setVisibility(llvm::GlobalValue::DefaultVisibility);
@@ -989,6 +1119,21 @@ void CodeGenModule::setGlobalVisibility(llvm::GlobalValue *GV,
   // Set visibility for definitions, and for declarations if requested globally
   // or set explicitly.
   LinkageInfo LV = D->getLinkageAndVisibility();
+  if (GV->hasDLLExportStorageClass() || GV->hasDLLImportStorageClass()) {
+    // Reject incompatible dlllstorage and visibility annotations.
+    if (!LV.isVisibilityExplicit())
+      return;
+    if (GV->hasDLLExportStorageClass()) {
+      if (LV.getVisibility() == HiddenVisibility)
+        getDiags().Report(D->getLocation(),
+                          diag::err_hidden_visibility_dllexport);
+    } else if (LV.getVisibility() != DefaultVisibility) {
+      getDiags().Report(D->getLocation(),
+                        diag::err_non_default_visibility_dllimport);
+    }
+    return;
+  }
+
   if (LV.isVisibilityExplicit() || getLangOpts().SetVisibilityForExternDecls ||
       !GV->isDeclarationForLinker())
     GV->setVisibility(GetLLVMVisibility(LV.getVisibility()));
@@ -1115,7 +1260,9 @@ void CodeGenModule::setDLLImportDLLExport(llvm::GlobalValue *GV,
   if (D && D->isExternallyVisible()) {
     if (D->hasAttr<DLLImportAttr>())
       GV->setDLLStorageClass(llvm::GlobalVariable::DLLImportStorageClass);
-    else if (D->hasAttr<DLLExportAttr>() && !GV->isDeclarationForLinker())
+    else if ((D->hasAttr<DLLExportAttr>() ||
+              shouldMapVisibilityToDLLExport(D)) &&
+             !GV->isDeclarationForLinker())
       GV->setDLLStorageClass(llvm::GlobalVariable::DLLExportStorageClass);
   }
 }
@@ -1194,6 +1341,20 @@ static void AppendCPUSpecificCPUDispatchMangling(const CodeGenModule &CGM,
     Out << ".resolver";
 }
 
+static void AppendTargetVersionMangling(const CodeGenModule &CGM,
+                                        const TargetVersionAttr *Attr,
+                                        raw_ostream &Out) {
+  if (Attr->isDefaultVersion())
+    return;
+  Out << "._";
+  llvm::SmallVector<StringRef, 8> Feats;
+  Attr->getFeatures(Feats);
+  for (const auto &Feat : Feats) {
+    Out << 'M';
+    Out << Feat;
+  }
+}
+
 static void AppendTargetMangling(const CodeGenModule &CGM,
                                  const TargetAttr *Attr, raw_ostream &Out) {
   if (Attr->isDefaultVersion())
@@ -1201,21 +1362,21 @@ static void AppendTargetMangling(const CodeGenModule &CGM,
 
   Out << '.';
   const TargetInfo &Target = CGM.getTarget();
-  ParsedTargetAttr Info =
-      Attr->parse([&Target](StringRef LHS, StringRef RHS) {
-        // Multiversioning doesn't allow "no-${feature}", so we can
-        // only have "+" prefixes here.
-        assert(LHS.startswith("+") && RHS.startswith("+") &&
-               "Features should always have a prefix.");
-        return Target.multiVersionSortPriority(LHS.substr(1)) >
-               Target.multiVersionSortPriority(RHS.substr(1));
-      });
+  ParsedTargetAttr Info = Target.parseTargetAttr(Attr->getFeaturesStr());
+  llvm::sort(Info.Features, [&Target](StringRef LHS, StringRef RHS) {
+    // Multiversioning doesn't allow "no-${feature}", so we can
+    // only have "+" prefixes here.
+    assert(LHS.startswith("+") && RHS.startswith("+") &&
+           "Features should always have a prefix.");
+    return Target.multiVersionSortPriority(LHS.substr(1)) >
+           Target.multiVersionSortPriority(RHS.substr(1));
+  });
 
   bool IsFirst = true;
 
-  if (!Info.Architecture.empty()) {
+  if (!Info.CPU.empty()) {
     IsFirst = false;
-    Out << "arch_" << Info.Architecture;
+    Out << "arch_" << Info.CPU;
   }
 
   for (StringRef Feat : Info.Features) {
@@ -1235,6 +1396,33 @@ static bool isUniqueInternalLinkageDecl(GlobalDecl GD,
          (CGM.getFunctionLinkage(GD) == llvm::GlobalValue::InternalLinkage);
 }
 
+static void AppendTargetClonesMangling(const CodeGenModule &CGM,
+                                       const TargetClonesAttr *Attr,
+                                       unsigned VersionIndex,
+                                       raw_ostream &Out) {
+  if (CGM.getTarget().getTriple().isAArch64()) {
+    StringRef FeatureStr = Attr->getFeatureStr(VersionIndex);
+    if (FeatureStr == "default")
+      return;
+    Out << "._";
+    SmallVector<StringRef, 8> Features;
+    FeatureStr.split(Features, "+");
+    for (auto &Feat : Features) {
+      Out << 'M';
+      Out << Feat;
+    }
+  } else {
+    Out << '.';
+    StringRef FeatureStr = Attr->getFeatureStr(VersionIndex);
+    if (FeatureStr.startswith("arch="))
+      Out << "arch_" << FeatureStr.substr(sizeof("arch=") - 1);
+    else
+      Out << FeatureStr;
+
+    Out << '.' << Attr->getMangledIndex(VersionIndex);
+  }
+}
+
 static std::string getMangledNameImpl(CodeGenModule &CGM, GlobalDecl GD,
                                       const NamedDecl *ND,
                                       bool OmitMultiVersionMangling = false) {
@@ -1288,21 +1476,30 @@ static std::string getMangledNameImpl(CodeGenModule &CGM, GlobalDecl GD,
       case MultiVersionKind::Target:
         AppendTargetMangling(CGM, FD->getAttr<TargetAttr>(), Out);
         break;
+      case MultiVersionKind::TargetVersion:
+        AppendTargetVersionMangling(CGM, FD->getAttr<TargetVersionAttr>(), Out);
+        break;
+      case MultiVersionKind::TargetClones:
+        AppendTargetClonesMangling(CGM, FD->getAttr<TargetClonesAttr>(),
+                                   GD.getMultiVersionIndex(), Out);
+        break;
       case MultiVersionKind::None:
         llvm_unreachable("None multiversion type isn't valid here");
       }
     }
 
   // Make unique name for device side static file-scope variable for HIP.
-  if (CGM.getContext().shouldExternalizeStaticVar(ND) &&
+  if (CGM.getContext().shouldExternalize(ND) &&
       CGM.getLangOpts().GPURelocatableDeviceCode &&
-      CGM.getLangOpts().CUDAIsDevice && !CGM.getLangOpts().CUID.empty())
-    CGM.printPostfixForExternalizedStaticVar(Out);
+      CGM.getLangOpts().CUDAIsDevice)
+    CGM.printPostfixForExternalizedDecl(Out, ND);
+
   return std::string(Out.str());
 }
 
 void CodeGenModule::UpdateMultiVersionNames(GlobalDecl GD,
-                                            const FunctionDecl *FD) {
+                                            const FunctionDecl *FD,
+                                            StringRef &CurName) {
   if (!FD->isMultiVersion())
     return;
 
@@ -1334,7 +1531,11 @@ void CodeGenModule::UpdateMultiVersionNames(GlobalDecl GD,
       if (ExistingRecord != std::end(Manglings))
         Manglings.remove(&(*ExistingRecord));
       auto Result = Manglings.insert(std::make_pair(OtherName, OtherGD));
-      MangledDeclNames[OtherGD.getCanonicalDecl()] = Result.first->first();
+      StringRef OtherNameRef = MangledDeclNames[OtherGD.getCanonicalDecl()] =
+          Result.first->first();
+      // If this is the current decl is being created, make sure we update the name.
+      if (GD.getCanonicalDecl() == OtherGD.getCanonicalDecl())
+        CurName = OtherNameRef;
       if (llvm::GlobalValue *Entry = GetGlobalValue(NonTargetName))
         Entry->setName(OtherName);
     }
@@ -1359,8 +1560,7 @@ StringRef CodeGenModule::getMangledName(GlobalDecl GD) {
   // static device variable depends on whether the variable is referenced by
   // a host or device host function. Therefore the mangled name cannot be
   // cached.
-  if (!LangOpts.CUDAIsDevice ||
-      !getContext().mayExternalizeStaticVar(GD.getDecl())) {
+  if (!LangOpts.CUDAIsDevice || !getContext().mayExternalize(GD.getDecl())) {
     auto FoundName = MangledDeclNames.find(CanonicalGD);
     if (FoundName != MangledDeclNames.end())
       return FoundName->second;
@@ -1380,7 +1580,7 @@ StringRef CodeGenModule::getMangledName(GlobalDecl GD) {
   // directly between host- and device-compilations, the host- and
   // device-mangling in host compilation could help catching certain ones.
   assert(!isa<FunctionDecl>(ND) || !ND->hasAttr<CUDAGlobalAttr>() ||
-         getLangOpts().CUDAIsDevice ||
+         getContext().shouldExternalize(ND) || getLangOpts().CUDAIsDevice ||
          (getContext().getAuxTargetInfo() &&
           (getContext().getAuxTargetInfo()->getCXXABI() !=
            getContext().getTargetInfo().getCXXABI())) ||
@@ -1415,6 +1615,16 @@ StringRef CodeGenModule::getBlockMangledName(GlobalDecl GD,
   return Result.first->first();
 }
 
+const GlobalDecl CodeGenModule::getMangledNameDecl(StringRef Name) {
+  auto it = MangledDeclNames.begin();
+  while (it != MangledDeclNames.end()) {
+    if (it->second == Name)
+      return it->first;
+    it++;
+  }
+  return GlobalDecl();
+}
+
 llvm::GlobalValue *CodeGenModule::GetGlobalValue(StringRef Name) {
   return getModule().getNamedValue(Name);
 }
@@ -1422,9 +1632,10 @@ llvm::GlobalValue *CodeGenModule::GetGlobalValue(StringRef Name) {
 /// AddGlobalCtor - Add a function to the list that will be called before
 /// main() runs.
 void CodeGenModule::AddGlobalCtor(llvm::Function *Ctor, int Priority,
+                                  unsigned LexOrder,
                                   llvm::Constant *AssociatedData) {
   // FIXME: Type coercion of void()* types.
-  GlobalCtors.push_back(Structor(Priority, Ctor, AssociatedData));
+  GlobalCtors.push_back(Structor(Priority, LexOrder, Ctor, AssociatedData));
 }
 
 /// AddGlobalDtor - Add a function to the list that will be called
@@ -1438,7 +1649,7 @@ void CodeGenModule::AddGlobalDtor(llvm::Function *Dtor, int Priority,
   }
 
   // FIXME: Type coercion of void()* types.
-  GlobalDtors.push_back(Structor(Priority, Dtor, nullptr));
+  GlobalDtors.push_back(Structor(Priority, ~0U, Dtor, nullptr));
 }
 
 void CodeGenModule::EmitCtorList(CtorList &Fns, const char *GlobalName) {
@@ -1474,7 +1685,7 @@ void CodeGenModule::EmitCtorList(CtorList &Fns, const char *GlobalName) {
 
   // The LTO linker doesn't seem to like it when we set an alignment
   // on appending variables.  Take it off as a workaround.
-  list->setAlignment(llvm::None);
+  list->setAlignment(std::nullopt);
 
   Fns.clear();
 }
@@ -1507,6 +1718,20 @@ llvm::ConstantInt *CodeGenModule::CreateCrossDsoCfiTypeId(llvm::Metadata *MD) {
   return llvm::ConstantInt::get(Int64Ty, llvm::MD5Hash(MDS->getString()));
 }
 
+llvm::ConstantInt *CodeGenModule::CreateKCFITypeId(QualType T) {
+  if (auto *FnType = T->getAs<FunctionProtoType>())
+    T = getContext().getFunctionType(
+        FnType->getReturnType(), FnType->getParamTypes(),
+        FnType->getExtProtoInfo().withExceptionSpec(EST_None));
+
+  std::string OutName;
+  llvm::raw_string_ostream Out(OutName);
+  getCXXABI().getMangleContext().mangleTypeName(T, Out);
+
+  return llvm::ConstantInt::get(Int32Ty,
+                                static_cast<uint32_t>(llvm::xxHash64(OutName)));
+}
+
 void CodeGenModule::SetLLVMFunctionAttributes(GlobalDecl GD,
                                               const CGFunctionInfo &Info,
                                               llvm::Function *F, bool IsThunk) {
@@ -1563,7 +1788,7 @@ static unsigned ArgInfoAddressSpace(LangAS AS) {
   }
 }
 
-void CodeGenModule::GenOpenCLArgMetadata(llvm::Function *Fn,
+void CodeGenModule::GenKernelArgMetadata(llvm::Function *Fn,
                                          const FunctionDecl *FD,
                                          CodeGenFunction *CGF) {
   assert(((FD && CGF) || (!FD && !CGF)) &&
@@ -1595,13 +1820,18 @@ void CodeGenModule::GenOpenCLArgMetadata(llvm::Function *Fn,
   if (FD && CGF)
     for (unsigned i = 0, e = FD->getNumParams(); i != e; ++i) {
       const ParmVarDecl *parm = FD->getParamDecl(i);
+      // Get argument name.
+      argNames.push_back(llvm::MDString::get(VMContext, parm->getName()));
+
+      if (!getLangOpts().OpenCL)
+        continue;
       QualType ty = parm->getType();
       std::string typeQuals;
 
       // Get image and pipe access qualifier:
       if (ty->isImageType() || ty->isPipeType()) {
         const Decl *PDecl = parm;
-        if (auto *TD = dyn_cast<TypedefType>(ty))
+        if (const auto *TD = ty->getAs<TypedefType>())
           PDecl = TD->getDecl();
         const OpenCLAccessAttr *A = PDecl->getAttr<OpenCLAccessAttr>();
         if (A && A->isWriteOnly())
@@ -1613,9 +1843,6 @@ void CodeGenModule::GenOpenCLArgMetadata(llvm::Function *Fn,
       } else
         accessQuals.push_back(llvm::MDString::get(VMContext, "none"));
 
-      // Get argument name.
-      argNames.push_back(llvm::MDString::get(VMContext, parm->getName()));
-
       auto getTypeSpelling = [&](QualType Ty) {
         auto typeName = Ty.getUnqualifiedType().getAsString(Policy);
 
@@ -1688,17 +1915,20 @@ void CodeGenModule::GenOpenCLArgMetadata(llvm::Function *Fn,
       argTypeQuals.push_back(llvm::MDString::get(VMContext, typeQuals));
     }
 
-  Fn->setMetadata("kernel_arg_addr_space",
-                  llvm::MDNode::get(VMContext, addressQuals));
-  Fn->setMetadata("kernel_arg_access_qual",
-                  llvm::MDNode::get(VMContext, accessQuals));
-  Fn->setMetadata("kernel_arg_type",
-                  llvm::MDNode::get(VMContext, argTypeNames));
-  Fn->setMetadata("kernel_arg_base_type",
-                  llvm::MDNode::get(VMContext, argBaseTypeNames));
-  Fn->setMetadata("kernel_arg_type_qual",
-                  llvm::MDNode::get(VMContext, argTypeQuals));
-  if (getCodeGenOpts().EmitOpenCLArgMetadata)
+  if (getLangOpts().OpenCL) {
+    Fn->setMetadata("kernel_arg_addr_space",
+                    llvm::MDNode::get(VMContext, addressQuals));
+    Fn->setMetadata("kernel_arg_access_qual",
+                    llvm::MDNode::get(VMContext, accessQuals));
+    Fn->setMetadata("kernel_arg_type",
+                    llvm::MDNode::get(VMContext, argTypeNames));
+    Fn->setMetadata("kernel_arg_base_type",
+                    llvm::MDNode::get(VMContext, argBaseTypeNames));
+    Fn->setMetadata("kernel_arg_type_qual",
+                    llvm::MDNode::get(VMContext, argTypeQuals));
+  }
+  if (getCodeGenOpts().EmitOpenCLArgMetadata ||
+      getCodeGenOpts().HIPSaveKernelArgName)
     Fn->setMetadata("kernel_arg_name",
                     llvm::MDNode::get(VMContext, argNames));
 }
@@ -1751,12 +1981,28 @@ CodeGenModule::getMostBaseClasses(const CXXRecordDecl *RD) {
   return MostBases.takeVector();
 }
 
+llvm::GlobalVariable *
+CodeGenModule::GetOrCreateRTTIProxyGlobalVariable(llvm::Constant *Addr) {
+  auto It = RTTIProxyMap.find(Addr);
+  if (It != RTTIProxyMap.end())
+    return It->second;
+
+  auto *FTRTTIProxy = new llvm::GlobalVariable(
+      TheModule, Addr->getType(),
+      /*isConstant=*/true, llvm::GlobalValue::PrivateLinkage, Addr,
+      "__llvm_rtti_proxy");
+  FTRTTIProxy->setUnnamedAddr(llvm::GlobalValue::UnnamedAddr::Global);
+
+  RTTIProxyMap[Addr] = FTRTTIProxy;
+  return FTRTTIProxy;
+}
+
 void CodeGenModule::SetLLVMFunctionAttributesForDefinition(const Decl *D,
                                                            llvm::Function *F) {
-  llvm::AttrBuilder B;
+  llvm::AttrBuilder B(F->getContext());
 
-  if (CodeGenOpts.UnwindTables)
-    B.addAttribute(llvm::Attribute::UWTable);
+  if ((!D || !D->hasAttr<NoUwtableAttr>()) && CodeGenOpts.UnwindTables)
+    B.addUWTableAttr(llvm::UWTableKind(CodeGenOpts.UnwindTables));
 
   if (CodeGenOpts.StackClashProtector)
     B.addAttribute("probe-stack", "inline-asm");
@@ -1764,14 +2010,17 @@ void CodeGenModule::SetLLVMFunctionAttributesForDefinition(const Decl *D,
   if (!hasUnwindExceptions(LangOpts))
     B.addAttribute(llvm::Attribute::NoUnwind);
 
-  if (!D || !D->hasAttr<NoStackProtectorAttr>()) {
-    if (LangOpts.getStackProtector() == LangOptions::SSPOn)
-      B.addAttribute(llvm::Attribute::StackProtect);
-    else if (LangOpts.getStackProtector() == LangOptions::SSPStrong)
-      B.addAttribute(llvm::Attribute::StackProtectStrong);
-    else if (LangOpts.getStackProtector() == LangOptions::SSPReq)
-      B.addAttribute(llvm::Attribute::StackProtectReq);
-  }
+  if (D && D->hasAttr<NoStackProtectorAttr>())
+    ; // Do nothing.
+  else if (D && D->hasAttr<StrictGuardStackCheckAttr>() &&
+           LangOpts.getStackProtector() == LangOptions::SSPOn)
+    B.addAttribute(llvm::Attribute::StackProtectStrong);
+  else if (LangOpts.getStackProtector() == LangOptions::SSPOn)
+    B.addAttribute(llvm::Attribute::StackProtect);
+  else if (LangOpts.getStackProtector() == LangOptions::SSPStrong)
+    B.addAttribute(llvm::Attribute::StackProtectStrong);
+  else if (LangOpts.getStackProtector() == LangOptions::SSPReq)
+    B.addAttribute(llvm::Attribute::StackProtectReq);
 
   if (!D) {
     // If we don't have a declaration to control inlining, the function isn't
@@ -1781,7 +2030,7 @@ void CodeGenModule::SetLLVMFunctionAttributesForDefinition(const Decl *D,
         CodeGenOpts.getInlining() == CodeGenOptions::OnlyAlwaysInlining)
       B.addAttribute(llvm::Attribute::NoInline);
 
-    F->addAttributes(llvm::AttributeList::FunctionIndex, B);
+    F->addFnAttrs(B);
     return;
   }
 
@@ -1868,7 +2117,7 @@ void CodeGenModule::SetLLVMFunctionAttributesForDefinition(const Decl *D,
       B.addAttribute(llvm::Attribute::MinSize);
   }
 
-  F->addAttributes(llvm::AttributeList::FunctionIndex, B);
+  F->addFnAttrs(B);
 
   unsigned alignment = D->getMaxAlignment() / Context.getCharWidth();
   if (alignment)
@@ -1916,15 +2165,15 @@ void CodeGenModule::SetLLVMFunctionAttributesForDefinition(const Decl *D,
 void CodeGenModule::setLLVMFunctionFEnvAttributes(const FunctionDecl *D,
                                                   llvm::Function *F) {
   if (D->hasAttr<StrictFPAttr>()) {
-    llvm::AttrBuilder FuncAttrs;
+    llvm::AttrBuilder FuncAttrs(F->getContext());
     FuncAttrs.addAttribute("strictfp");
-    F->addAttributes(llvm::AttributeList::FunctionIndex, FuncAttrs);
+    F->addFnAttrs(FuncAttrs);
   }
 }
 
 void CodeGenModule::SetCommonAttributes(GlobalDecl GD, llvm::GlobalValue *GV) {
   const Decl *D = GD.getDecl();
-  if (dyn_cast_or_null<NamedDecl>(D))
+  if (isa_and_nonnull<NamedDecl>(D))
     setGVProperties(GV, GD);
   else
     GV->setVisibility(llvm::GlobalValue::DefaultVisibility);
@@ -1951,9 +2200,12 @@ bool CodeGenModule::GetCPUAndFeaturesAttributes(GlobalDecl GD,
   const auto *FD = dyn_cast_or_null<FunctionDecl>(GD.getDecl());
   FD = FD ? FD->getMostRecentDecl() : FD;
   const auto *TD = FD ? FD->getAttr<TargetAttr>() : nullptr;
+  const auto *TV = FD ? FD->getAttr<TargetVersionAttr>() : nullptr;
+  assert((!TD || !TV) && "both target_version and target specified");
   const auto *SD = FD ? FD->getAttr<CPUSpecificAttr>() : nullptr;
+  const auto *TC = FD ? FD->getAttr<TargetClonesAttr>() : nullptr;
   bool AddedAttr = false;
-  if (TD || SD) {
+  if (TD || TV || SD || TC) {
     llvm::StringMap<bool> FeatureMap;
     getContext().getFunctionFeatureMap(FeatureMap, GD);
 
@@ -1966,16 +2218,24 @@ bool CodeGenModule::GetCPUAndFeaturesAttributes(GlobalDecl GD,
     // get and parse the target attribute so we can get the cpu for
     // the function.
     if (TD) {
-      ParsedTargetAttr ParsedAttr = TD->parse();
-      if (!ParsedAttr.Architecture.empty() &&
-          getTarget().isValidCPUName(ParsedAttr.Architecture)) {
-        TargetCPU = ParsedAttr.Architecture;
+      ParsedTargetAttr ParsedAttr =
+          Target.parseTargetAttr(TD->getFeaturesStr());
+      if (!ParsedAttr.CPU.empty() &&
+          getTarget().isValidCPUName(ParsedAttr.CPU)) {
+        TargetCPU = ParsedAttr.CPU;
         TuneCPU = ""; // Clear the tune CPU.
       }
       if (!ParsedAttr.Tune.empty() &&
           getTarget().isValidCPUName(ParsedAttr.Tune))
         TuneCPU = ParsedAttr.Tune;
     }
+
+    if (SD) {
+      // Apply the given CPU name as the 'tune-cpu' so that the optimizer can
+      // favor this processor.
+      TuneCPU = getTarget().getCPUSpecificTuneName(
+          SD->getCPUName(GD.getMultiVersionIndex())->getName());
+    }
   } else {
     // Otherwise just add the existing target cpu and target features to the
     // function.
@@ -2025,17 +2285,17 @@ void CodeGenModule::setNonAliasAttributes(GlobalDecl GD,
         if (!D->getAttr<SectionAttr>())
           F->addFnAttr("implicit-section-name", SA->getName());
 
-      llvm::AttrBuilder Attrs;
+      llvm::AttrBuilder Attrs(F->getContext());
       if (GetCPUAndFeaturesAttributes(GD, Attrs)) {
         // We know that GetCPUAndFeaturesAttributes will always have the
         // newest set, since it has the newest possible FunctionDecl, so the
         // new ones should replace the old.
-        llvm::AttrBuilder RemoveAttrs;
+        llvm::AttributeMask RemoveAttrs;
         RemoveAttrs.addAttribute("target-cpu");
         RemoveAttrs.addAttribute("target-features");
         RemoveAttrs.addAttribute("tune-cpu");
-        F->removeAttributes(llvm::AttributeList::FunctionIndex, RemoveAttrs);
-        F->addAttributes(llvm::AttributeList::FunctionIndex, Attrs);
+        F->removeFnAttrs(RemoveAttrs);
+        F->addFnAttrs(Attrs);
       }
     }
 
@@ -2092,6 +2352,57 @@ void CodeGenModule::CreateFunctionTypeMetadataForIcall(const FunctionDecl *FD,
       F->addTypeMetadata(0, llvm::ConstantAsMetadata::get(CrossDsoTypeId));
 }
 
+void CodeGenModule::setKCFIType(const FunctionDecl *FD, llvm::Function *F) {
+  if (isa<CXXMethodDecl>(FD) && !cast<CXXMethodDecl>(FD)->isStatic())
+    return;
+
+  llvm::LLVMContext &Ctx = F->getContext();
+  llvm::MDBuilder MDB(Ctx);
+  F->setMetadata(llvm::LLVMContext::MD_kcfi_type,
+                 llvm::MDNode::get(
+                     Ctx, MDB.createConstant(CreateKCFITypeId(FD->getType()))));
+}
+
+static bool allowKCFIIdentifier(StringRef Name) {
+  // KCFI type identifier constants are only necessary for external assembly
+  // functions, which means it's safe to skip unusual names. Subset of
+  // MCAsmInfo::isAcceptableChar() and MCAsmInfoXCOFF::isAcceptableChar().
+  return llvm::all_of(Name, [](const char &C) {
+    return llvm::isAlnum(C) || C == '_' || C == '.';
+  });
+}
+
+void CodeGenModule::finalizeKCFITypes() {
+  llvm::Module &M = getModule();
+  for (auto &F : M.functions()) {
+    // Remove KCFI type metadata from non-address-taken local functions.
+    bool AddressTaken = F.hasAddressTaken();
+    if (!AddressTaken && F.hasLocalLinkage())
+      F.eraseMetadata(llvm::LLVMContext::MD_kcfi_type);
+
+    // Generate a constant with the expected KCFI type identifier for all
+    // address-taken function declarations to support annotating indirectly
+    // called assembly functions.
+    if (!AddressTaken || !F.isDeclaration())
+      continue;
+
+    const llvm::ConstantInt *Type;
+    if (const llvm::MDNode *MD = F.getMetadata(llvm::LLVMContext::MD_kcfi_type))
+      Type = llvm::mdconst::extract<llvm::ConstantInt>(MD->getOperand(0));
+    else
+      continue;
+
+    StringRef Name = F.getName();
+    if (!allowKCFIIdentifier(Name))
+      continue;
+
+    std::string Asm = (".weak __kcfi_typeid_" + Name + "\n.set __kcfi_typeid_" +
+                       Name + ", " + Twine(Type->getZExtValue()) + "\n")
+                          .str();
+    M.appendModuleInlineAsm(Asm);
+  }
+}
+
 void CodeGenModule::SetFunctionAttributes(GlobalDecl GD, llvm::Function *F,
                                           bool IsIncompleteFunction,
                                           bool IsThunk) {
@@ -2118,7 +2429,7 @@ void CodeGenModule::SetFunctionAttributes(GlobalDecl GD, llvm::Function *F,
            F->arg_begin()->getType()
              ->canLosslesslyBitCastTo(F->getReturnType()) &&
            "unexpected this return");
-    F->addAttribute(1, llvm::Attribute::Returned);
+    F->addParamAttr(0, llvm::Attribute::Returned);
   }
 
   // Only a few attributes are set on declarations; these may later be
@@ -2136,6 +2447,13 @@ void CodeGenModule::SetFunctionAttributes(GlobalDecl GD, llvm::Function *F,
   else if (const auto *SA = FD->getAttr<SectionAttr>())
      F->setSection(SA->getName());
 
+  if (const auto *EA = FD->getAttr<ErrorAttr>()) {
+    if (EA->isError())
+      F->addFnAttr("dontcall-error", EA->getUserDiagnostic());
+    else if (EA->isWarning())
+      F->addFnAttr("dontcall-warn", EA->getUserDiagnostic());
+  }
+
   // If we plan on emitting this inline builtin, we can't treat it as a builtin.
   if (FD->isInlineBuiltinDeclaration()) {
     const FunctionDecl *FDBody;
@@ -2144,15 +2462,13 @@ void CodeGenModule::SetFunctionAttributes(GlobalDecl GD, llvm::Function *F,
     assert(HasBody && "Inline builtin declarations should always have an "
                       "available body!");
     if (shouldEmitFunction(FDBody))
-      F->addAttribute(llvm::AttributeList::FunctionIndex,
-                      llvm::Attribute::NoBuiltin);
+      F->addFnAttr(llvm::Attribute::NoBuiltin);
   }
 
   if (FD->isReplaceableGlobalAllocationFunction()) {
     // A replaceable global allocation function does not act like a builtin by
     // default, only if it is invoked by a new-expression or delete-expression.
-    F->addAttribute(llvm::AttributeList::FunctionIndex,
-                    llvm::Attribute::NoBuiltin);
+    F->addFnAttr(llvm::Attribute::NoBuiltin);
   }
 
   if (isa<CXXConstructorDecl>(FD) || isa<CXXDestructorDecl>(FD))
@@ -2169,9 +2485,15 @@ void CodeGenModule::SetFunctionAttributes(GlobalDecl GD, llvm::Function *F,
       !CodeGenOpts.SanitizeCfiCanonicalJumpTables)
     CreateFunctionTypeMetadataForIcall(FD, F);
 
+  if (LangOpts.Sanitize.has(SanitizerKind::KCFI))
+    setKCFIType(FD, F);
+
   if (getLangOpts().OpenMP && FD->hasAttr<OMPDeclareSimdDeclAttr>())
     getOpenMPRuntime().emitDeclareSimdFunction(FD, F);
 
+  if (CodeGenOpts.InlineMaxStackSize != UINT_MAX)
+    F->addFnAttr("inline-max-stacksize", llvm::utostr(CodeGenOpts.InlineMaxStackSize));
+
   if (const auto *CB = FD->getAttr<CallbackAttr>()) {
     // Annotate the callback behavior as metadata:
     //  - The callback callee (as argument number).
@@ -2281,9 +2603,9 @@ static void addLinkOptionsPostorder(CodeGenModule &CGM, Module *Mod,
   }
 
   // Import this module's dependencies.
-  for (unsigned I = Mod->Imports.size(); I > 0; --I) {
-    if (Visited.insert(Mod->Imports[I - 1]).second)
-      addLinkOptionsPostorder(CGM, Mod->Imports[I-1], Metadata, Visited);
+  for (Module *Import : llvm::reverse(Mod->Imports)) {
+    if (Visited.insert(Import).second)
+      addLinkOptionsPostorder(CGM, Import, Metadata, Visited);
   }
 
   // Add linker options to link against the libraries/frameworks
@@ -2296,13 +2618,12 @@ static void addLinkOptionsPostorder(CodeGenModule &CGM, Module *Mod,
   if (Mod->UseExportAsModuleLinkName)
     return;
 
-  for (unsigned I = Mod->LinkLibraries.size(); I > 0; --I) {
+  for (const Module::LinkLibrary &LL : llvm::reverse(Mod->LinkLibraries)) {
     // Link against a framework.  Frameworks are currently Darwin only, so we
     // don't to ask TargetCodeGenInfo for the spelling of the linker option.
-    if (Mod->LinkLibraries[I-1].IsFramework) {
-      llvm::Metadata *Args[2] = {
-          llvm::MDString::get(Context, "-framework"),
-          llvm::MDString::get(Context, Mod->LinkLibraries[I - 1].Library)};
+    if (LL.IsFramework) {
+      llvm::Metadata *Args[2] = {llvm::MDString::get(Context, "-framework"),
+                                 llvm::MDString::get(Context, LL.Library)};
 
       Metadata.push_back(llvm::MDNode::get(Context, Args));
       continue;
@@ -2312,19 +2633,45 @@ static void addLinkOptionsPostorder(CodeGenModule &CGM, Module *Mod,
     if (IsELF) {
       llvm::Metadata *Args[2] = {
           llvm::MDString::get(Context, "lib"),
-          llvm::MDString::get(Context, Mod->LinkLibraries[I - 1].Library),
+          llvm::MDString::get(Context, LL.Library),
       };
       Metadata.push_back(llvm::MDNode::get(Context, Args));
     } else {
       llvm::SmallString<24> Opt;
-      CGM.getTargetCodeGenInfo().getDependentLibraryOption(
-          Mod->LinkLibraries[I - 1].Library, Opt);
+      CGM.getTargetCodeGenInfo().getDependentLibraryOption(LL.Library, Opt);
       auto *OptString = llvm::MDString::get(Context, Opt);
       Metadata.push_back(llvm::MDNode::get(Context, OptString));
     }
   }
 }
 
+void CodeGenModule::EmitModuleInitializers(clang::Module *Primary) {
+  // Emit the initializers in the order that sub-modules appear in the
+  // source, first Global Module Fragments, if present.
+  if (auto GMF = Primary->getGlobalModuleFragment()) {
+    for (Decl *D : getContext().getModuleInitializers(GMF)) {
+      if (isa<ImportDecl>(D))
+        continue;
+      assert(isa<VarDecl>(D) && "GMF initializer decl is not a var?");
+      EmitTopLevelDecl(D);
+    }
+  }
+  // Second any associated with the module, itself.
+  for (Decl *D : getContext().getModuleInitializers(Primary)) {
+    // Skip import decls, the inits for those are called explicitly.
+    if (isa<ImportDecl>(D))
+      continue;
+    EmitTopLevelDecl(D);
+  }
+  // Third any associated with the Privat eMOdule Fragment, if present.
+  if (auto PMF = Primary->getPrivateModuleFragment()) {
+    for (Decl *D : getContext().getModuleInitializers(PMF)) {
+      assert(isa<VarDecl>(D) && "PMF initializer decl is not a var?");
+      EmitTopLevelDecl(D);
+    }
+  }
+}
+
 void CodeGenModule::EmitModuleLinkOptions() {
   // Collect the set of all of the modules we want to visit to emit link
   // options, which is essentially the imported modules and all of their
@@ -2410,8 +2757,8 @@ void CodeGenModule::EmitDeferred() {
   // Note we should not clear CUDADeviceVarODRUsedByHost since it is still
   // needed for further handling.
   if (getLangOpts().CUDA && getLangOpts().CUDAIsDevice)
-    for (const auto *V : getContext().CUDADeviceVarODRUsedByHost)
-      DeferredDeclsToEmit.push_back(V);
+    llvm::append_range(DeferredDeclsToEmit,
+                       getContext().CUDADeviceVarODRUsedByHost);
 
   // Stop if we're out of both deferred vtables and deferred declarations.
   if (DeferredDeclsToEmit.empty())
@@ -2503,9 +2850,10 @@ llvm::Constant *CodeGenModule::EmitAnnotationString(StringRef Str) {
 
   // Not found yet, create a new global.
   llvm::Constant *s = llvm::ConstantDataArray::getString(getLLVMContext(), Str);
-  auto *gv =
-      new llvm::GlobalVariable(getModule(), s->getType(), true,
-                               llvm::GlobalValue::PrivateLinkage, s, ".str");
+  auto *gv = new llvm::GlobalVariable(
+      getModule(), s->getType(), true, llvm::GlobalValue::PrivateLinkage, s,
+      ".str", nullptr, llvm::GlobalValue::NotThreadLocal,
+      ConstGlobalsPtrTy->getAddressSpace());
   gv->setSection(AnnotationSection);
   gv->setUnnamedAddr(llvm::GlobalValue::UnnamedAddr::Global);
   AStr = gv;
@@ -2531,7 +2879,7 @@ llvm::Constant *CodeGenModule::EmitAnnotationLineNo(SourceLocation L) {
 llvm::Constant *CodeGenModule::EmitAnnotationArgs(const AnnotateAttr *Attr) {
   ArrayRef<Expr *> Exprs = {Attr->args_begin(), Attr->args_size()};
   if (Exprs.empty())
-    return llvm::ConstantPointerNull::get(Int8PtrTy);
+    return llvm::ConstantPointerNull::get(ConstGlobalsPtrTy);
 
   llvm::FoldingSetNodeID ID;
   for (Expr *E : Exprs) {
@@ -2555,7 +2903,7 @@ llvm::Constant *CodeGenModule::EmitAnnotationArgs(const AnnotateAttr *Attr) {
                                       ".args");
   GV->setSection(AnnotationSection);
   GV->setUnnamedAddr(llvm::GlobalValue::UnnamedAddr::Global);
-  auto *Bitcasted = llvm::ConstantExpr::getBitCast(GV, Int8PtrTy);
+  auto *Bitcasted = llvm::ConstantExpr::getBitCast(GV, GlobalsInt8PtrTy);
 
   Lookup = Bitcasted;
   return Bitcasted;
@@ -2570,17 +2918,19 @@ llvm::Constant *CodeGenModule::EmitAnnotateAttr(llvm::GlobalValue *GV,
                  *LineNoCst = EmitAnnotationLineNo(L),
                  *Args = EmitAnnotationArgs(AA);
 
-  llvm::Constant *ASZeroGV = GV;
-  if (GV->getAddressSpace() != 0) {
-    ASZeroGV = llvm::ConstantExpr::getAddrSpaceCast(
-                   GV, GV->getValueType()->getPointerTo(0));
+  llvm::Constant *GVInGlobalsAS = GV;
+  if (GV->getAddressSpace() !=
+      getDataLayout().getDefaultGlobalsAddressSpace()) {
+    GVInGlobalsAS = llvm::ConstantExpr::getAddrSpaceCast(
+        GV, GV->getValueType()->getPointerTo(
+                getDataLayout().getDefaultGlobalsAddressSpace()));
   }
 
   // Create the ConstantStruct for the global annotation.
   llvm::Constant *Fields[] = {
-      llvm::ConstantExpr::getBitCast(ASZeroGV, Int8PtrTy),
-      llvm::ConstantExpr::getBitCast(AnnoGV, Int8PtrTy),
-      llvm::ConstantExpr::getBitCast(UnitGV, Int8PtrTy),
+      llvm::ConstantExpr::getBitCast(GVInGlobalsAS, GlobalsInt8PtrTy),
+      llvm::ConstantExpr::getBitCast(AnnoGV, ConstGlobalsPtrTy),
+      llvm::ConstantExpr::getBitCast(UnitGV, ConstGlobalsPtrTy),
       LineNoCst,
       Args,
   };
@@ -2601,34 +2951,34 @@ bool CodeGenModule::isInNoSanitizeList(SanitizerMask Kind, llvm::Function *Fn,
   // NoSanitize by function name.
   if (NoSanitizeL.containsFunction(Kind, Fn->getName()))
     return true;
-  // NoSanitize by location.
+  // NoSanitize by location. Check "mainfile" prefix.
+  auto &SM = Context.getSourceManager();
+  const FileEntry &MainFile = *SM.getFileEntryForID(SM.getMainFileID());
+  if (NoSanitizeL.containsMainFile(Kind, MainFile.getName()))
+    return true;
+
+  // Check "src" prefix.
   if (Loc.isValid())
     return NoSanitizeL.containsLocation(Kind, Loc);
   // If location is unknown, this may be a compiler-generated function. Assume
   // it's located in the main file.
-  auto &SM = Context.getSourceManager();
-  if (const auto *MainFile = SM.getFileEntryForID(SM.getMainFileID())) {
-    return NoSanitizeL.containsFile(Kind, MainFile->getName());
-  }
-  return false;
+  return NoSanitizeL.containsFile(Kind, MainFile.getName());
 }
 
-bool CodeGenModule::isInNoSanitizeList(llvm::GlobalVariable *GV,
+bool CodeGenModule::isInNoSanitizeList(SanitizerMask Kind,
+                                       llvm::GlobalVariable *GV,
                                        SourceLocation Loc, QualType Ty,
                                        StringRef Category) const {
-  // For now globals can be ignored only in ASan and KASan.
-  const SanitizerMask EnabledAsanMask =
-      LangOpts.Sanitize.Mask &
-      (SanitizerKind::Address | SanitizerKind::KernelAddress |
-       SanitizerKind::HWAddress | SanitizerKind::KernelHWAddress |
-       SanitizerKind::MemTag);
-  if (!EnabledAsanMask)
-    return false;
   const auto &NoSanitizeL = getContext().getNoSanitizeList();
-  if (NoSanitizeL.containsGlobal(EnabledAsanMask, GV->getName(), Category))
+  if (NoSanitizeL.containsGlobal(Kind, GV->getName(), Category))
+    return true;
+  auto &SM = Context.getSourceManager();
+  if (NoSanitizeL.containsMainFile(
+          Kind, SM.getFileEntryForID(SM.getMainFileID())->getName(), Category))
     return true;
-  if (NoSanitizeL.containsLocation(EnabledAsanMask, Loc, Category))
+  if (NoSanitizeL.containsLocation(Kind, Loc, Category))
     return true;
+
   // Check global type.
   if (!Ty.isNull()) {
     // Drill down the array types: if global variable of a fixed type is
@@ -2639,7 +2989,7 @@ bool CodeGenModule::isInNoSanitizeList(llvm::GlobalVariable *GV,
     // Only record types (classes, structs etc.) are ignored.
     if (Ty->isRecordType()) {
       std::string TypeStr = Ty.getAsString(getContext().getPrintingPolicy());
-      if (NoSanitizeL.containsType(EnabledAsanMask, TypeStr, Category))
+      if (NoSanitizeL.containsType(Kind, TypeStr, Category))
         return true;
     }
   }
@@ -2672,32 +3022,44 @@ bool CodeGenModule::imbueXRayAttrs(llvm::Function *Fn, SourceLocation Loc,
   return true;
 }
 
-bool CodeGenModule::isProfileInstrExcluded(llvm::Function *Fn,
-                                           SourceLocation Loc) const {
+ProfileList::ExclusionType
+CodeGenModule::isFunctionBlockedByProfileList(llvm::Function *Fn,
+                                              SourceLocation Loc) const {
   const auto &ProfileList = getContext().getProfileList();
   // If the profile list is empty, then instrument everything.
   if (ProfileList.isEmpty())
-    return false;
+    return ProfileList::Allow;
   CodeGenOptions::ProfileInstrKind Kind = getCodeGenOpts().getProfileInstr();
   // First, check the function name.
-  Optional<bool> V = ProfileList.isFunctionExcluded(Fn->getName(), Kind);
-  if (V.hasValue())
+  if (auto V = ProfileList.isFunctionExcluded(Fn->getName(), Kind))
     return *V;
   // Next, check the source location.
-  if (Loc.isValid()) {
-    Optional<bool> V = ProfileList.isLocationExcluded(Loc, Kind);
-    if (V.hasValue())
+  if (Loc.isValid())
+    if (auto V = ProfileList.isLocationExcluded(Loc, Kind))
       return *V;
-  }
   // If location is unknown, this may be a compiler-generated function. Assume
   // it's located in the main file.
   auto &SM = Context.getSourceManager();
-  if (const auto *MainFile = SM.getFileEntryForID(SM.getMainFileID())) {
-    Optional<bool> V = ProfileList.isFileExcluded(MainFile->getName(), Kind);
-    if (V.hasValue())
+  if (const auto *MainFile = SM.getFileEntryForID(SM.getMainFileID()))
+    if (auto V = ProfileList.isFileExcluded(MainFile->getName(), Kind))
       return *V;
+  return ProfileList.getDefault(Kind);
+}
+
+ProfileList::ExclusionType
+CodeGenModule::isFunctionBlockedFromProfileInstr(llvm::Function *Fn,
+                                                 SourceLocation Loc) const {
+  auto V = isFunctionBlockedByProfileList(Fn, Loc);
+  if (V != ProfileList::Allow)
+    return V;
+
+  auto NumGroups = getCodeGenOpts().ProfileTotalFunctionGroups;
+  if (NumGroups > 1) {
+    auto Group = llvm::crc32(arrayRefFromStringRef(Fn->getName())) % NumGroups;
+    if (Group != getCodeGenOpts().ProfileSelectedFunctionGroup)
+      return ProfileList::Skip;
   }
-  return ProfileList.getDefault();
+  return ProfileList::Allow;
 }
 
 bool CodeGenModule::MustBeEmitted(const ValueDecl *Global) {
@@ -2723,7 +3085,7 @@ bool CodeGenModule::MayBeEmittedEagerly(const ValueDecl *Global) {
   // we have if the level of the declare target attribute is -1. Note that we
   // check somewhere else if we should emit this at all.
   if (LangOpts.OpenMP >= 50 && !LangOpts.OpenMPSimd) {
-    llvm::Optional<OMPDeclareTargetDeclAttr *> ActiveAttr =
+    std::optional<OMPDeclareTargetDeclAttr *> ActiveAttr =
         OMPDeclareTargetDeclAttr::getActiveAttr(Global);
     if (!ActiveAttr || (*ActiveAttr)->getLevel() != (unsigned)-1)
       return false;
@@ -2735,12 +3097,20 @@ bool CodeGenModule::MayBeEmittedEagerly(const ValueDecl *Global) {
       // explicitly instantiated, so they should not be emitted eagerly.
       return false;
   }
-  if (const auto *VD = dyn_cast<VarDecl>(Global))
+  if (const auto *VD = dyn_cast<VarDecl>(Global)) {
     if (Context.getInlineVariableDefinitionKind(VD) ==
         ASTContext::InlineVariableDefinitionKind::WeakUnknown)
       // A definition of an inline constexpr static data member may change
       // linkage later if it's redeclared outside the class.
       return false;
+    if (CXX20ModuleInits && VD->getOwningModule() &&
+        !VD->getOwningModule()->isModuleMapModule()) {
+      // For CXX20, module-owned initializers need to be deferred, since it is
+      // not known at this point if they will be run for the current module or
+      // as part of the initializer for an imported one.
+      return false;
+    }
+  }
   // If OpenMP is enabled and threadprivates must be generated like TLS, delay
   // codegen for global variables, because they may be marked as threadprivate.
   if (LangOpts.OpenMP && LangOpts.OpenMPUseTLS &&
@@ -2760,7 +3130,7 @@ ConstantAddress CodeGenModule::GetAddrOfMSGuidDecl(const MSGuidDecl *GD) {
 
   // Look for an existing global.
   if (llvm::GlobalVariable *GV = getModule().getNamedGlobal(Name))
-    return ConstantAddress(GV, Alignment);
+    return ConstantAddress(GV, GV->getValueType(), Alignment);
 
   ConstantEmitter Emitter(*this);
   llvm::Constant *Init;
@@ -2794,15 +3164,46 @@ ConstantAddress CodeGenModule::GetAddrOfMSGuidDecl(const MSGuidDecl *GD) {
     GV->setComdat(TheModule.getOrInsertComdat(GV->getName()));
   setDSOLocal(GV);
 
-  llvm::Constant *Addr = GV;
   if (!V.isAbsent()) {
     Emitter.finalize(GV);
-  } else {
-    llvm::Type *Ty = getTypes().ConvertTypeForMem(GD->getType());
-    Addr = llvm::ConstantExpr::getBitCast(
-        GV, Ty->getPointerTo(GV->getAddressSpace()));
+    return ConstantAddress(GV, GV->getValueType(), Alignment);
   }
-  return ConstantAddress(Addr, Alignment);
+
+  llvm::Type *Ty = getTypes().ConvertTypeForMem(GD->getType());
+  llvm::Constant *Addr = llvm::ConstantExpr::getBitCast(
+      GV, Ty->getPointerTo(GV->getAddressSpace()));
+  return ConstantAddress(Addr, Ty, Alignment);
+}
+
+ConstantAddress CodeGenModule::GetAddrOfUnnamedGlobalConstantDecl(
+    const UnnamedGlobalConstantDecl *GCD) {
+  CharUnits Alignment = getContext().getTypeAlignInChars(GCD->getType());
+
+  llvm::GlobalVariable **Entry = nullptr;
+  Entry = &UnnamedGlobalConstantDeclMap[GCD];
+  if (*Entry)
+    return ConstantAddress(*Entry, (*Entry)->getValueType(), Alignment);
+
+  ConstantEmitter Emitter(*this);
+  llvm::Constant *Init;
+
+  const APValue &V = GCD->getValue();
+
+  assert(!V.isAbsent());
+  Init = Emitter.emitForInitializer(V, GCD->getType().getAddressSpace(),
+                                    GCD->getType());
+
+  auto *GV = new llvm::GlobalVariable(getModule(), Init->getType(),
+                                      /*isConstant=*/true,
+                                      llvm::GlobalValue::PrivateLinkage, Init,
+                                      ".constant");
+  GV->setUnnamedAddr(llvm::GlobalValue::UnnamedAddr::Global);
+  GV->setAlignment(Alignment.getAsAlign());
+
+  Emitter.finalize(GV);
+
+  *Entry = GV;
+  return ConstantAddress(GV, GV->getValueType(), Alignment);
 }
 
 ConstantAddress CodeGenModule::GetAddrOfTemplateParamObject(
@@ -2811,7 +3212,7 @@ ConstantAddress CodeGenModule::GetAddrOfTemplateParamObject(
   CharUnits Alignment = getNaturalTypeAlignment(TPO->getType());
 
   if (llvm::GlobalVariable *GV = getModule().getNamedGlobal(Name))
-    return ConstantAddress(GV, Alignment);
+    return ConstantAddress(GV, GV->getValueType(), Alignment);
 
   ConstantEmitter Emitter(*this);
   llvm::Constant *Init = Emitter.emitForInitializer(
@@ -2829,7 +3230,7 @@ ConstantAddress CodeGenModule::GetAddrOfTemplateParamObject(
     GV->setComdat(TheModule.getOrInsertComdat(GV->getName()));
   Emitter.finalize(GV);
 
-  return ConstantAddress(GV, Alignment);
+  return ConstantAddress(GV, GV->getValueType(), Alignment);
 }
 
 ConstantAddress CodeGenModule::GetWeakRefReference(const ValueDecl *VD) {
@@ -2842,9 +3243,9 @@ ConstantAddress CodeGenModule::GetWeakRefReference(const ValueDecl *VD) {
   // See if there is already something with the target's name in the module.
   llvm::GlobalValue *Entry = GetGlobalValue(AA->getAliasee());
   if (Entry) {
-    unsigned AS = getContext().getTargetAddressSpace(VD->getType());
+    unsigned AS = getTypes().getTargetAddressSpace(VD->getType());
     auto Ptr = llvm::ConstantExpr::getBitCast(Entry, DeclTy->getPointerTo(AS));
-    return ConstantAddress(Ptr, Alignment);
+    return ConstantAddress(Ptr, DeclTy, Alignment);
   }
 
   llvm::Constant *Aliasee;
@@ -2853,13 +3254,14 @@ ConstantAddress CodeGenModule::GetWeakRefReference(const ValueDecl *VD) {
                                       GlobalDecl(cast<FunctionDecl>(VD)),
                                       /*ForVTable=*/false);
   else
-    Aliasee = GetOrCreateLLVMGlobal(AA->getAliasee(), DeclTy, 0, nullptr);
+    Aliasee = GetOrCreateLLVMGlobal(AA->getAliasee(), DeclTy, LangAS::Default,
+                                    nullptr);
 
   auto *F = cast<llvm::GlobalValue>(Aliasee);
   F->setLinkage(llvm::Function::ExternalWeakLinkage);
   WeakRefReferences.insert(F);
 
-  return ConstantAddress(Aliasee, Alignment);
+  return ConstantAddress(Aliasee, DeclTy, Alignment);
 }
 
 void CodeGenModule::EmitGlobal(GlobalDecl GD) {
@@ -2947,16 +3349,18 @@ void CodeGenModule::EmitGlobal(GlobalDecl GD) {
         !Context.isMSStaticDataMemberInlineDefinition(VD)) {
       if (LangOpts.OpenMP) {
         // Emit declaration of the must-be-emitted declare target variable.
-        if (llvm::Optional<OMPDeclareTargetDeclAttr::MapTypeTy> Res =
+        if (std::optional<OMPDeclareTargetDeclAttr::MapTypeTy> Res =
                 OMPDeclareTargetDeclAttr::isDeclareTargetDeclaration(VD)) {
           bool UnifiedMemoryEnabled =
               getOpenMPRuntime().hasRequiresUnifiedSharedMemory();
-          if (*Res == OMPDeclareTargetDeclAttr::MT_To &&
+          if ((*Res == OMPDeclareTargetDeclAttr::MT_To ||
+               *Res == OMPDeclareTargetDeclAttr::MT_Enter) &&
               !UnifiedMemoryEnabled) {
             (void)GetAddrOfGlobalVar(VD);
           } else {
             assert(((*Res == OMPDeclareTargetDeclAttr::MT_Link) ||
-                    (*Res == OMPDeclareTargetDeclAttr::MT_To &&
+                    ((*Res == OMPDeclareTargetDeclAttr::MT_To ||
+                      *Res == OMPDeclareTargetDeclAttr::MT_Enter) &&
                      UnifiedMemoryEnabled)) &&
                    "Link clause or to clause with unified memory expected.");
             (void)getOpenMPRuntime().getAddrOfDeclareTargetVar(VD);
@@ -2999,6 +3403,7 @@ void CodeGenModule::EmitGlobal(GlobalDecl GD) {
     // The value must be emitted, but cannot be emitted eagerly.
     assert(!MayBeEmittedEagerly(Global));
     addDeferredDeclToEmit(GD);
+    EmittedDeferredDecls[MangledName] = GD;
   } else {
     // Otherwise, remember that we saw a deferred decl with this name.  The
     // first use of the mangled name will cause it to move into
@@ -3163,6 +3568,11 @@ bool CodeGenModule::shouldEmitFunction(GlobalDecl GD) {
     }
   }
 
+  // Inline builtins declaration must be emitted. They often are fortified
+  // functions.
+  if (F->isInlineBuiltinDeclaration())
+    return true;
+
   // PR9614. Avoid cases where the source code is lying to us. An available
   // externally function should have an equivalent function somewhere else,
   // but a function that calls itself through asm label/`__builtin_` trickery is
@@ -3183,7 +3593,13 @@ void CodeGenModule::EmitMultiVersionFunctionDefinition(GlobalDecl GD,
     auto *Spec = FD->getAttr<CPUSpecificAttr>();
     for (unsigned I = 0; I < Spec->cpus_size(); ++I)
       EmitGlobalFunctionDefinition(GD.getWithMultiVersionIndex(I), nullptr);
-    // Requires multiple emits.
+  } else if (FD->isTargetClonesMultiVersion()) {
+    auto *Clone = FD->getAttr<TargetClonesAttr>();
+    for (unsigned I = 0; I < Clone->featuresStrs_size(); ++I)
+      if (Clone->isFirstOfVersion(I))
+        EmitGlobalFunctionDefinition(GD.getWithMultiVersionIndex(I), nullptr);
+    // Ensure that the resolver function is also emitted.
+    GetOrCreateMultiVersionResolver(GD);
   } else
     EmitGlobalFunctionDefinition(GD, GV);
 }
@@ -3243,64 +3659,137 @@ static unsigned
 TargetMVPriority(const TargetInfo &TI,
                  const CodeGenFunction::MultiVersionResolverOption &RO) {
   unsigned Priority = 0;
-  for (StringRef Feat : RO.Conditions.Features)
+  unsigned NumFeatures = 0;
+  for (StringRef Feat : RO.Conditions.Features) {
     Priority = std::max(Priority, TI.multiVersionSortPriority(Feat));
+    NumFeatures++;
+  }
 
   if (!RO.Conditions.Architecture.empty())
     Priority = std::max(
         Priority, TI.multiVersionSortPriority(RO.Conditions.Architecture));
+
+  Priority += TI.multiVersionFeatureCost() * NumFeatures;
+
   return Priority;
 }
 
+// Multiversion functions should be at most 'WeakODRLinkage' so that a different
+// TU can forward declare the function without causing problems.  Particularly
+// in the cases of CPUDispatch, this causes issues. This also makes sure we
+// work with internal linkage functions, so that the same function name can be
+// used with internal linkage in multiple TUs.
+llvm::GlobalValue::LinkageTypes getMultiversionLinkage(CodeGenModule &CGM,
+                                                       GlobalDecl GD) {
+  const FunctionDecl *FD = cast<FunctionDecl>(GD.getDecl());
+  if (FD->getFormalLinkage() == InternalLinkage)
+    return llvm::GlobalValue::InternalLinkage;
+  return llvm::GlobalValue::WeakODRLinkage;
+}
+
 void CodeGenModule::emitMultiVersionFunctions() {
   std::vector<GlobalDecl> MVFuncsToEmit;
   MultiVersionFuncs.swap(MVFuncsToEmit);
   for (GlobalDecl GD : MVFuncsToEmit) {
+    const auto *FD = cast<FunctionDecl>(GD.getDecl());
+    assert(FD && "Expected a FunctionDecl");
+
     SmallVector<CodeGenFunction::MultiVersionResolverOption, 10> Options;
-    const FunctionDecl *FD = cast<FunctionDecl>(GD.getDecl());
-    getContext().forEachMultiversionedFunctionVersion(
-        FD, [this, &GD, &Options](const FunctionDecl *CurFD) {
-          GlobalDecl CurGD{
-              (CurFD->isDefined() ? CurFD->getDefinition() : CurFD)};
-          StringRef MangledName = getMangledName(CurGD);
-          llvm::Constant *Func = GetGlobalValue(MangledName);
-          if (!Func) {
-            if (CurFD->isDefined()) {
-              EmitGlobalFunctionDefinition(CurGD, nullptr);
-              Func = GetGlobalValue(MangledName);
+    if (FD->isTargetMultiVersion()) {
+      getContext().forEachMultiversionedFunctionVersion(
+          FD, [this, &GD, &Options](const FunctionDecl *CurFD) {
+            GlobalDecl CurGD{
+                (CurFD->isDefined() ? CurFD->getDefinition() : CurFD)};
+            StringRef MangledName = getMangledName(CurGD);
+            llvm::Constant *Func = GetGlobalValue(MangledName);
+            if (!Func) {
+              if (CurFD->isDefined()) {
+                EmitGlobalFunctionDefinition(CurGD, nullptr);
+                Func = GetGlobalValue(MangledName);
+              } else {
+                const CGFunctionInfo &FI =
+                    getTypes().arrangeGlobalDeclaration(GD);
+                llvm::FunctionType *Ty = getTypes().GetFunctionType(FI);
+                Func = GetAddrOfFunction(CurGD, Ty, /*ForVTable=*/false,
+                                         /*DontDefer=*/false, ForDefinition);
+              }
+              assert(Func && "This should have just been created");
+            }
+            if (CurFD->getMultiVersionKind() == MultiVersionKind::Target) {
+              const auto *TA = CurFD->getAttr<TargetAttr>();
+              llvm::SmallVector<StringRef, 8> Feats;
+              TA->getAddedFeatures(Feats);
+              Options.emplace_back(cast<llvm::Function>(Func),
+                                   TA->getArchitecture(), Feats);
             } else {
-              const CGFunctionInfo &FI =
-                  getTypes().arrangeGlobalDeclaration(GD);
-              llvm::FunctionType *Ty = getTypes().GetFunctionType(FI);
-              Func = GetAddrOfFunction(CurGD, Ty, /*ForVTable=*/false,
-                                       /*DontDefer=*/false, ForDefinition);
+              const auto *TVA = CurFD->getAttr<TargetVersionAttr>();
+              llvm::SmallVector<StringRef, 8> Feats;
+              TVA->getFeatures(Feats);
+              Options.emplace_back(cast<llvm::Function>(Func),
+                                   /*Architecture*/ "", Feats);
             }
-            assert(Func && "This should have just been created");
+          });
+    } else if (FD->isTargetClonesMultiVersion()) {
+      const auto *TC = FD->getAttr<TargetClonesAttr>();
+      for (unsigned VersionIndex = 0; VersionIndex < TC->featuresStrs_size();
+           ++VersionIndex) {
+        if (!TC->isFirstOfVersion(VersionIndex))
+          continue;
+        GlobalDecl CurGD{(FD->isDefined() ? FD->getDefinition() : FD),
+                         VersionIndex};
+        StringRef Version = TC->getFeatureStr(VersionIndex);
+        StringRef MangledName = getMangledName(CurGD);
+        llvm::Constant *Func = GetGlobalValue(MangledName);
+        if (!Func) {
+          if (FD->isDefined()) {
+            EmitGlobalFunctionDefinition(CurGD, nullptr);
+            Func = GetGlobalValue(MangledName);
+          } else {
+            const CGFunctionInfo &FI =
+                getTypes().arrangeGlobalDeclaration(CurGD);
+            llvm::FunctionType *Ty = getTypes().GetFunctionType(FI);
+            Func = GetAddrOfFunction(CurGD, Ty, /*ForVTable=*/false,
+                                     /*DontDefer=*/false, ForDefinition);
           }
+          assert(Func && "This should have just been created");
+        }
 
-          const auto *TA = CurFD->getAttr<TargetAttr>();
-          llvm::SmallVector<StringRef, 8> Feats;
-          TA->getAddedFeatures(Feats);
+        StringRef Architecture;
+        llvm::SmallVector<StringRef, 1> Feature;
 
-          Options.emplace_back(cast<llvm::Function>(Func),
-                               TA->getArchitecture(), Feats);
-        });
-
-    llvm::Function *ResolverFunc;
-    const TargetInfo &TI = getTarget();
+        if (getTarget().getTriple().isAArch64()) {
+          if (Version != "default") {
+            llvm::SmallVector<StringRef, 8> VerFeats;
+            Version.split(VerFeats, "+");
+            for (auto &CurFeat : VerFeats)
+              Feature.push_back(CurFeat.trim());
+          }
+        } else {
+          if (Version.startswith("arch="))
+            Architecture = Version.drop_front(sizeof("arch=") - 1);
+          else if (Version != "default")
+            Feature.push_back(Version);
+        }
 
-    if (TI.supportsIFunc() || FD->isTargetMultiVersion()) {
-      ResolverFunc = cast<llvm::Function>(
-          GetGlobalValue((getMangledName(GD) + ".resolver").str()));
-      ResolverFunc->setLinkage(llvm::Function::WeakODRLinkage);
+        Options.emplace_back(cast<llvm::Function>(Func), Architecture, Feature);
+      }
     } else {
-      ResolverFunc = cast<llvm::Function>(GetGlobalValue(getMangledName(GD)));
+      assert(0 && "Expected a target or target_clones multiversion function");
+      continue;
     }
 
+    llvm::Constant *ResolverConstant = GetOrCreateMultiVersionResolver(GD);
+    if (auto *IFunc = dyn_cast<llvm::GlobalIFunc>(ResolverConstant))
+      ResolverConstant = IFunc->getResolver();
+    llvm::Function *ResolverFunc = cast<llvm::Function>(ResolverConstant);
+
+    ResolverFunc->setLinkage(getMultiversionLinkage(*this, GD));
+
     if (supportsCOMDAT())
       ResolverFunc->setComdat(
           getModule().getOrInsertComdat(ResolverFunc->getName()));
 
+    const TargetInfo &TI = getTarget();
     llvm::stable_sort(
         Options, [&TI](const CodeGenFunction::MultiVersionResolverOption &LHS,
                        const CodeGenFunction::MultiVersionResolverOption &RHS) {
@@ -3325,24 +3814,24 @@ void CodeGenModule::emitMultiVersionFunctions() {
 void CodeGenModule::emitCPUDispatchDefinition(GlobalDecl GD) {
   const auto *FD = cast<FunctionDecl>(GD.getDecl());
   assert(FD && "Not a FunctionDecl?");
+  assert(FD->isCPUDispatchMultiVersion() && "Not a multiversion function?");
   const auto *DD = FD->getAttr<CPUDispatchAttr>();
   assert(DD && "Not a cpu_dispatch Function?");
-  llvm::Type *DeclTy = getTypes().ConvertType(FD->getType());
 
-  if (const auto *CXXFD = dyn_cast<CXXMethodDecl>(FD)) {
-    const CGFunctionInfo &FInfo = getTypes().arrangeCXXMethodDeclaration(CXXFD);
-    DeclTy = getTypes().GetFunctionType(FInfo);
-  }
+  const CGFunctionInfo &FI = getTypes().arrangeGlobalDeclaration(GD);
+  llvm::FunctionType *DeclTy = getTypes().GetFunctionType(FI);
 
   StringRef ResolverName = getMangledName(GD);
+  UpdateMultiVersionNames(GD, FD, ResolverName);
 
   llvm::Type *ResolverType;
   GlobalDecl ResolverGD;
-  if (getTarget().supportsIFunc())
+  if (getTarget().supportsIFunc()) {
     ResolverType = llvm::FunctionType::get(
         llvm::PointerType::get(DeclTy,
-                               Context.getTargetAddressSpace(FD->getType())),
+                               getTypes().getTargetAddressSpace(FD->getType())),
         false);
+  }
   else {
     ResolverType = DeclTy;
     ResolverGD = GD;
@@ -3350,7 +3839,7 @@ void CodeGenModule::emitCPUDispatchDefinition(GlobalDecl GD) {
 
   auto *ResolverFunc = cast<llvm::Function>(GetOrCreateLLVMFunction(
       ResolverName, ResolverType, ResolverGD, /*ForVTable=*/false));
-  ResolverFunc->setLinkage(llvm::Function::WeakODRLinkage);
+  ResolverFunc->setLinkage(getMultiversionLinkage(*this, GD));
   if (supportsCOMDAT())
     ResolverFunc->setComdat(
         getModule().getOrInsertComdat(ResolverFunc->getName()));
@@ -3386,10 +3875,9 @@ void CodeGenModule::emitCPUDispatchDefinition(GlobalDecl GD) {
     Target.getCPUSpecificCPUDispatchFeatures(II->getName(), Features);
     llvm::transform(Features, Features.begin(),
                     [](StringRef Str) { return Str.substr(1); });
-    Features.erase(std::remove_if(
-        Features.begin(), Features.end(), [&Target](StringRef Feat) {
-          return !Target.validateCpuSupports(Feat);
-        }), Features.end());
+    llvm::erase_if(Features, [&Target](StringRef Feat) {
+      return !Target.validateCpuSupports(Feat);
+    });
     Options.emplace_back(cast<llvm::Function>(Func), StringRef{}, Features);
     ++Index;
   }
@@ -3397,8 +3885,8 @@ void CodeGenModule::emitCPUDispatchDefinition(GlobalDecl GD) {
   llvm::stable_sort(
       Options, [](const CodeGenFunction::MultiVersionResolverOption &LHS,
                   const CodeGenFunction::MultiVersionResolverOption &RHS) {
-        return CodeGenFunction::GetX86CpuSupportsMask(LHS.Conditions.Features) >
-               CodeGenFunction::GetX86CpuSupportsMask(RHS.Conditions.Features);
+        return llvm::X86::getCpuSupportsMask(LHS.Conditions.Features) >
+               llvm::X86::getCpuSupportsMask(RHS.Conditions.Features);
       });
 
   // If the list contains multiple 'default' versions, such as when it contains
@@ -3406,7 +3894,7 @@ void CodeGenModule::emitCPUDispatchDefinition(GlobalDecl GD) {
   // always run on at least a 'pentium'). We do this by deleting the 'least
   // advanced' (read, lowest mangling letter).
   while (Options.size() > 1 &&
-         CodeGenFunction::GetX86CpuSupportsMask(
+         llvm::X86::getCpuSupportsMask(
              (Options.end() - 2)->Conditions.Features) == 0) {
     StringRef LHSName = (Options.end() - 2)->Function->getName();
     StringRef RHSName = (Options.end() - 1)->Function->getName();
@@ -3420,16 +3908,27 @@ void CodeGenModule::emitCPUDispatchDefinition(GlobalDecl GD) {
   CGF.EmitMultiVersionResolver(ResolverFunc, Options);
 
   if (getTarget().supportsIFunc()) {
+    llvm::GlobalValue::LinkageTypes Linkage = getMultiversionLinkage(*this, GD);
+    auto *IFunc = cast<llvm::GlobalValue>(GetOrCreateMultiVersionResolver(GD));
+
+    // Fix up function declarations that were created for cpu_specific before
+    // cpu_dispatch was known
+    if (!isa<llvm::GlobalIFunc>(IFunc)) {
+      assert(cast<llvm::Function>(IFunc)->isDeclaration());
+      auto *GI = llvm::GlobalIFunc::create(DeclTy, 0, Linkage, "", ResolverFunc,
+                                           &getModule());
+      GI->takeName(IFunc);
+      IFunc->replaceAllUsesWith(GI);
+      IFunc->eraseFromParent();
+      IFunc = GI;
+    }
+
     std::string AliasName = getMangledNameImpl(
         *this, GD, FD, /*OmitMultiVersionMangling=*/true);
     llvm::Constant *AliasFunc = GetGlobalValue(AliasName);
     if (!AliasFunc) {
-      auto *IFunc = cast<llvm::GlobalIFunc>(GetOrCreateLLVMFunction(
-          AliasName, DeclTy, GD, /*ForVTable=*/false, /*DontDefer=*/true,
-          /*IsThunk=*/false, llvm::AttributeList(), NotForDefinition));
-      auto *GA = llvm::GlobalAlias::create(
-         DeclTy, 0, getFunctionLinkage(GD), AliasName, IFunc, &getModule());
-      GA->setLinkage(llvm::Function::WeakODRLinkage);
+      auto *GA = llvm::GlobalAlias::create(DeclTy, 0, Linkage, AliasName, IFunc,
+                                           &getModule());
       SetCommonAttributes(GD, GA);
     }
   }
@@ -3437,8 +3936,10 @@ void CodeGenModule::emitCPUDispatchDefinition(GlobalDecl GD) {
 
 /// If a dispatcher for the specified mangled name is not in the module, create
 /// and return an llvm Function with the specified type.
-llvm::Constant *CodeGenModule::GetOrCreateMultiVersionResolver(
-    GlobalDecl GD, llvm::Type *DeclTy, const FunctionDecl *FD) {
+llvm::Constant *CodeGenModule::GetOrCreateMultiVersionResolver(GlobalDecl GD) {
+  const auto *FD = cast<FunctionDecl>(GD.getDecl());
+  assert(FD && "Not a FunctionDecl?");
+
   std::string MangledName =
       getMangledNameImpl(*this, GD, FD, /*OmitMultiVersionMangling=*/true);
 
@@ -3450,26 +3951,31 @@ llvm::Constant *CodeGenModule::GetOrCreateMultiVersionResolver(
   else if (FD->isTargetMultiVersion())
     ResolverName += ".resolver";
 
-  // If this already exists, just return that one.
+  // If the resolver has already been created, just return it.
   if (llvm::GlobalValue *ResolverGV = GetGlobalValue(ResolverName))
     return ResolverGV;
 
-  // Since this is the first time we've created this IFunc, make sure
-  // that we put this multiversioned function into the list to be
-  // replaced later if necessary (target multiversioning only).
-  if (!FD->isCPUDispatchMultiVersion() && !FD->isCPUSpecificMultiVersion())
+  const CGFunctionInfo &FI = getTypes().arrangeGlobalDeclaration(GD);
+  llvm::FunctionType *DeclTy = getTypes().GetFunctionType(FI);
+
+  // The resolver needs to be created. For target and target_clones, defer
+  // creation until the end of the TU.
+  if (FD->isTargetMultiVersion() || FD->isTargetClonesMultiVersion())
     MultiVersionFuncs.push_back(GD);
 
-  if (getTarget().supportsIFunc()) {
+  // For cpu_specific, don't create an ifunc yet because we don't know if the
+  // cpu_dispatch will be emitted in this translation unit.
+  if (getTarget().supportsIFunc() && !FD->isCPUSpecificMultiVersion()) {
     llvm::Type *ResolverType = llvm::FunctionType::get(
-        llvm::PointerType::get(
-            DeclTy, getContext().getTargetAddressSpace(FD->getType())),
+        llvm::PointerType::get(DeclTy,
+                               getTypes().getTargetAddressSpace(FD->getType())),
         false);
     llvm::Constant *Resolver = GetOrCreateLLVMFunction(
         MangledName + ".resolver", ResolverType, GlobalDecl{},
         /*ForVTable=*/false);
-    llvm::GlobalIFunc *GIF = llvm::GlobalIFunc::create(
-        DeclTy, 0, llvm::Function::WeakODRLinkage, "", Resolver, &getModule());
+    llvm::GlobalIFunc *GIF =
+        llvm::GlobalIFunc::create(DeclTy, 0, getMultiversionLinkage(*this, GD),
+                                  "", Resolver, &getModule());
     GIF->setName(ResolverName);
     SetCommonAttributes(FD, GIF);
 
@@ -3517,10 +4023,9 @@ llvm::Constant *CodeGenModule::GetOrCreateLLVMFunction(
     }
 
     if (FD->isMultiVersion()) {
-      if (FD->hasAttr<TargetAttr>())
-        UpdateMultiVersionNames(GD, FD);
+      UpdateMultiVersionNames(GD, FD, MangledName);
       if (!IsForDefinition)
-        return GetOrCreateMultiVersionResolver(GD, Ty, FD);
+        return GetOrCreateMultiVersionResolver(GD);
     }
   }
 
@@ -3534,7 +4039,8 @@ llvm::Constant *CodeGenModule::GetOrCreateLLVMFunction(
     }
 
     // Handle dropped DLL attributes.
-    if (D && !D->hasAttr<DLLImportAttr>() && !D->hasAttr<DLLExportAttr>()) {
+    if (D && !D->hasAttr<DLLImportAttr>() && !D->hasAttr<DLLExportAttr>() &&
+        !shouldMapVisibilityToDLLExport(cast_or_null<NamedDecl>(D))) {
       Entry->setDLLStorageClass(llvm::GlobalValue::DefaultStorageClass);
       setDSOLocal(Entry);
     }
@@ -3565,7 +4071,8 @@ llvm::Constant *CodeGenModule::GetOrCreateLLVMFunction(
     // (If function is requested for a definition, we always need to create a new
     // function, not just return a bitcast.)
     if (!IsForDefinition)
-      return llvm::ConstantExpr::getBitCast(Entry, Ty->getPointerTo());
+      return llvm::ConstantExpr::getBitCast(
+          Entry, Ty->getPointerTo(Entry->getAddressSpace()));
   }
 
   // This function doesn't have a complete type (for example, the return
@@ -3606,23 +4113,23 @@ llvm::Constant *CodeGenModule::GetOrCreateLLVMFunction(
     }
 
     llvm::Constant *BC = llvm::ConstantExpr::getBitCast(
-        F, Entry->getValueType()->getPointerTo());
+        F, Entry->getValueType()->getPointerTo(Entry->getAddressSpace()));
     addGlobalValReplacement(Entry, BC);
   }
 
   assert(F->getName() == MangledName && "name was uniqued!");
   if (D)
     SetFunctionAttributes(GD, F, IsIncompleteFunction, IsThunk);
-  if (ExtraAttrs.hasAttributes(llvm::AttributeList::FunctionIndex)) {
-    llvm::AttrBuilder B(ExtraAttrs, llvm::AttributeList::FunctionIndex);
-    F->addAttributes(llvm::AttributeList::FunctionIndex, B);
+  if (ExtraAttrs.hasFnAttrs()) {
+    llvm::AttrBuilder B(F->getContext(), ExtraAttrs.getFnAttrs());
+    F->addFnAttrs(B);
   }
 
   if (!DontDefer) {
     // All MSVC dtors other than the base dtor are linkonce_odr and delegate to
     // each other bottoming out with the base dtor.  Therefore we emit non-base
     // dtors on usage, even if there is no dtor definition in the TU.
-    if (D && isa<CXXDestructorDecl>(D) &&
+    if (isa_and_nonnull<CXXDestructorDecl>(D) &&
         getCXXABI().useThunkForDtorVariant(cast<CXXDestructorDecl>(D),
                                            GD.getDtorType()))
       addDeferredDeclToEmit(GD);
@@ -3636,6 +4143,7 @@ llvm::Constant *CodeGenModule::GetOrCreateLLVMFunction(
       // DeferredDeclsToEmit list, and remove it from DeferredDecls (since we
       // don't need it anymore).
       addDeferredDeclToEmit(DDI->second);
+      EmittedDeferredDecls[DDI->first] = DDI->second;
       DeferredDecls.erase(DDI);
 
       // Otherwise, there are cases we have to worry about where we're
@@ -3669,8 +4177,8 @@ llvm::Constant *CodeGenModule::GetOrCreateLLVMFunction(
     return F;
   }
 
-  llvm::Type *PTy = llvm::PointerType::getUnqual(Ty);
-  return llvm::ConstantExpr::getBitCast(F, PTy);
+  return llvm::ConstantExpr::getBitCast(F,
+                                        Ty->getPointerTo(F->getAddressSpace()));
 }
 
 /// GetAddrOfFunction - Return the address of the given function.  If Ty is
@@ -3715,6 +4223,15 @@ llvm::Constant *CodeGenModule::GetAddrOfFunction(GlobalDecl GD,
   return F;
 }
 
+llvm::Constant *CodeGenModule::GetFunctionStart(const ValueDecl *Decl) {
+  llvm::GlobalValue *F =
+      cast<llvm::GlobalValue>(GetAddrOfFunction(Decl)->stripPointerCasts());
+
+  return llvm::ConstantExpr::getBitCast(
+      llvm::NoCFIValue::get(F),
+      llvm::Type::getInt8PtrTy(VMContext, F->getAddressSpace()));
+}
+
 static const FunctionDecl *
 GetRuntimeFunctionDecl(ASTContext &C, StringRef Name) {
   TranslationUnitDecl *TUDecl = C.getTranslationUnitDecl();
@@ -3761,8 +4278,7 @@ CodeGenModule::CreateRuntimeFunction(llvm::FunctionType *FTy, StringRef Name,
                                      bool AssumeConvergent) {
   if (AssumeConvergent) {
     ExtraAttrs =
-        ExtraAttrs.addAttribute(VMContext, llvm::AttributeList::FunctionIndex,
-                                llvm::Attribute::Convergent);
+        ExtraAttrs.addFnAttribute(VMContext, llvm::Attribute::Convergent);
   }
 
   llvm::Constant *C =
@@ -3827,10 +4343,11 @@ bool CodeGenModule::isTypeConstant(QualType Ty, bool ExcludeCtor) {
 /// mangled name but some other type.
 llvm::Constant *
 CodeGenModule::GetOrCreateLLVMGlobal(StringRef MangledName, llvm::Type *Ty,
-                                     unsigned AddrSpace, const VarDecl *D,
+                                     LangAS AddrSpace, const VarDecl *D,
                                      ForDefinition_t IsForDefinition) {
   // Lookup the entry, lazily creating it if necessary.
   llvm::GlobalValue *Entry = GetGlobalValue(MangledName);
+  unsigned TargetAS = getContext().getTargetAddressSpace(AddrSpace);
   if (Entry) {
     if (WeakRefReferences.erase(Entry)) {
       if (D && !D->hasAttr<WeakAttr>())
@@ -3838,13 +4355,14 @@ CodeGenModule::GetOrCreateLLVMGlobal(StringRef MangledName, llvm::Type *Ty,
     }
 
     // Handle dropped DLL attributes.
-    if (D && !D->hasAttr<DLLImportAttr>() && !D->hasAttr<DLLExportAttr>())
+    if (D && !D->hasAttr<DLLImportAttr>() && !D->hasAttr<DLLExportAttr>() &&
+        !shouldMapVisibilityToDLLExport(D))
       Entry->setDLLStorageClass(llvm::GlobalValue::DefaultStorageClass);
 
     if (LangOpts.OpenMP && !LangOpts.OpenMPSimd && D)
       getOpenMPRuntime().registerTargetGlobalVariable(D, Entry);
 
-    if (Entry->getValueType() == Ty && Entry->getAddressSpace() == AddrSpace)
+    if (Entry->getValueType() == Ty && Entry->getAddressSpace() == TargetAS)
       return Entry;
 
     // If there are two attempts to define the same mangled name, issue an
@@ -3868,24 +4386,23 @@ CodeGenModule::GetOrCreateLLVMGlobal(StringRef MangledName, llvm::Type *Ty,
     }
 
     // Make sure the result is of the correct type.
-    if (Entry->getType()->getAddressSpace() != AddrSpace) {
+    if (Entry->getType()->getAddressSpace() != TargetAS) {
       return llvm::ConstantExpr::getAddrSpaceCast(Entry,
-                                                  Ty->getPointerTo(AddrSpace));
+                                                  Ty->getPointerTo(TargetAS));
     }
 
     // (If global is requested for a definition, we always need to create a new
     // global, not just return a bitcast.)
     if (!IsForDefinition)
-      return llvm::ConstantExpr::getBitCast(Entry, Ty->getPointerTo(AddrSpace));
+      return llvm::ConstantExpr::getBitCast(Entry, Ty->getPointerTo(TargetAS));
   }
 
   auto DAddrSpace = GetGlobalVarAddressSpace(D);
-  auto TargetAddrSpace = getContext().getTargetAddressSpace(DAddrSpace);
 
   auto *GV = new llvm::GlobalVariable(
       getModule(), Ty, false, llvm::GlobalValue::ExternalLinkage, nullptr,
       MangledName, nullptr, llvm::GlobalVariable::NotThreadLocal,
-      TargetAddrSpace);
+      getContext().getTargetAddressSpace(DAddrSpace));
 
   // If we already created a global with the same mangled name (but different
   // type) before, take its name and remove it from its parent.
@@ -3909,6 +4426,7 @@ CodeGenModule::GetOrCreateLLVMGlobal(StringRef MangledName, llvm::Type *Ty,
     // Move the potentially referenced deferred decl to the DeferredDeclsToEmit
     // list, and remove it from DeferredDecls (since we don't need it anymore).
     addDeferredDeclToEmit(DDI->second);
+    EmittedDeferredDecls[DDI->first] = DDI->second;
     DeferredDecls.erase(DDI);
   }
 
@@ -4005,13 +4523,16 @@ CodeGenModule::GetOrCreateLLVMGlobal(StringRef MangledName, llvm::Type *Ty,
       getCUDARuntime().handleVarRegistration(D, *GV);
   }
 
+  if (D)
+    SanitizerMD->reportGlobal(GV, *D);
+
   LangAS ExpectedAS =
       D ? D->getType().getAddressSpace()
         : (LangOpts.OpenCL ? LangAS::opencl_global : LangAS::Default);
-  assert(getContext().getTargetAddressSpace(ExpectedAS) == AddrSpace);
+  assert(getContext().getTargetAddressSpace(ExpectedAS) == TargetAS);
   if (DAddrSpace != ExpectedAS) {
     return getTargetCodeGenInfo().performAddrSpaceCast(
-        *this, GV, DAddrSpace, ExpectedAS, Ty->getPointerTo(AddrSpace));
+        *this, GV, DAddrSpace, ExpectedAS, Ty->getPointerTo(TargetAS));
   }
 
   return GV;
@@ -4045,7 +4566,7 @@ CodeGenModule::GetAddrOfGlobal(GlobalDecl GD, ForDefinition_t IsForDefinition) {
 
 llvm::GlobalVariable *CodeGenModule::CreateOrReplaceCXXRuntimeVariable(
     StringRef Name, llvm::Type *Ty, llvm::GlobalValue::LinkageTypes Linkage,
-    unsigned Alignment) {
+    llvm::Align Alignment) {
   llvm::GlobalVariable *GV = getModule().getNamedGlobal(Name);
   llvm::GlobalVariable *OldGV = nullptr;
 
@@ -4081,7 +4602,7 @@ llvm::GlobalVariable *CodeGenModule::CreateOrReplaceCXXRuntimeVariable(
       !GV->hasAvailableExternallyLinkage())
     GV->setComdat(TheModule.getOrInsertComdat(GV->getName()));
 
-  GV->setAlignment(llvm::MaybeAlign(Alignment));
+  GV->setAlignment(Alignment);
 
   return GV;
 }
@@ -4101,8 +4622,7 @@ llvm::Constant *CodeGenModule::GetAddrOfGlobalVar(const VarDecl *D,
     Ty = getTypes().ConvertTypeForMem(ASTTy);
 
   StringRef MangledName = getMangledName(D);
-  return GetOrCreateLLVMGlobal(MangledName, Ty,
-                               getContext().getTargetAddressSpace(ASTTy), D,
+  return GetOrCreateLLVMGlobal(MangledName, Ty, ASTTy.getAddressSpace(), D,
                                IsForDefinition);
 }
 
@@ -4111,10 +4631,8 @@ llvm::Constant *CodeGenModule::GetAddrOfGlobalVar(const VarDecl *D,
 llvm::Constant *
 CodeGenModule::CreateRuntimeVariable(llvm::Type *Ty,
                                      StringRef Name) {
-  auto AddrSpace =
-      getContext().getLangOpts().OpenCL
-          ? getContext().getTargetAddressSpace(LangAS::opencl_global)
-          : 0;
+  LangAS AddrSpace = getContext().getLangOpts().OpenCL ? LangAS::opencl_global
+                                                       : LangAS::Default;
   auto *Ret = GetOrCreateLLVMGlobal(Name, Ty, AddrSpace, nullptr);
   setDSOLocal(cast<llvm::GlobalValue>(Ret->stripPointerCasts()));
   return Ret;
@@ -4153,16 +4671,15 @@ CharUnits CodeGenModule::GetTargetTypeStoreSize(llvm::Type *Ty) const {
 }
 
 LangAS CodeGenModule::GetGlobalVarAddressSpace(const VarDecl *D) {
-  LangAS AddrSpace = LangAS::Default;
   if (LangOpts.OpenCL) {
-    AddrSpace = D ? D->getType().getAddressSpace() : LangAS::opencl_global;
-    assert(AddrSpace == LangAS::opencl_global ||
-           AddrSpace == LangAS::opencl_global_device ||
-           AddrSpace == LangAS::opencl_global_host ||
-           AddrSpace == LangAS::opencl_constant ||
-           AddrSpace == LangAS::opencl_local ||
-           AddrSpace >= LangAS::FirstTargetAddressSpace);
-    return AddrSpace;
+    LangAS AS = D ? D->getType().getAddressSpace() : LangAS::opencl_global;
+    assert(AS == LangAS::opencl_global ||
+           AS == LangAS::opencl_global_device ||
+           AS == LangAS::opencl_global_host ||
+           AS == LangAS::opencl_constant ||
+           AS == LangAS::opencl_local ||
+           AS >= LangAS::FirstTargetAddressSpace);
+    return AS;
   }
 
   if (LangOpts.SYCLIsDevice &&
@@ -4196,8 +4713,16 @@ LangAS CodeGenModule::GetGlobalConstantAddressSpace() const {
     return LangAS::opencl_constant;
   if (LangOpts.SYCLIsDevice)
     return LangAS::sycl_global;
+  if (LangOpts.HIP && LangOpts.CUDAIsDevice && getTriple().isSPIRV())
+    // For HIPSPV map literals to cuda_device (maps to CrossWorkGroup in SPIR-V)
+    // instead of default AS (maps to Generic in SPIR-V). Otherwise, we end up
+    // with OpVariable instructions with Generic storage class which is not
+    // allowed (SPIR-V V1.6 s3.42.8). Also, mapping literals to SPIR-V
+    // UniformConstant storage class is not viable as pointers to it may not be
+    // casted to Generic pointers which are used to model HIP's "flat" pointers.
+    return LangAS::cuda_device;
   if (auto AS = getTarget().getConstantAddressSpace())
-    return AS.getValue();
+    return *AS;
   return LangAS::Default;
 }
 
@@ -4261,11 +4786,6 @@ static bool shouldBeInCOMDAT(CodeGenModule &CGM, const Decl &D) {
   if (!CGM.supportsCOMDAT())
     return false;
 
-  // Do not set COMDAT attribute for CUDA/HIP stub functions to prevent
-  // them being "merged" by the COMDAT Folding linker optimization.
-  if (D.hasAttr<CUDAGlobalAttr>())
-    return false;
-
   if (D.hasAttr<SelectAnyAttr>())
     return true;
 
@@ -4311,13 +4831,19 @@ void CodeGenModule::EmitGlobalVarDefinition(const VarDecl *D,
 
   llvm::TrackingVH<llvm::Constant> Init;
   bool NeedsGlobalCtor = false;
+  // Whether the definition of the variable is available externally.
+  // If yes, we shouldn't emit the GloablCtor and GlobalDtor for the variable
+  // since this is the job for its original source.
+  bool IsDefinitionAvailableExternally =
+      getContext().GetGVALinkageForVariable(D) == GVA_AvailableExternally;
   bool NeedsGlobalDtor =
+      !IsDefinitionAvailableExternally &&
       D->needsDestruction(getContext()) == QualType::DK_cxx_destructor;
 
   const VarDecl *InitDecl;
   const Expr *InitExpr = D->getAnyInitializer(InitDecl);
 
-  Optional<ConstantEmitter> emitter;
+  std::optional<ConstantEmitter> emitter;
 
   // CUDA E.2.4.1 "__shared__ variables cannot have an initialization
   // as part of their declaration."  Sema has already checked for
@@ -4362,8 +4888,12 @@ void CodeGenModule::EmitGlobalVarDefinition(const VarDecl *D,
         T = D->getType();
 
       if (getLangOpts().CPlusPlus) {
+        if (InitDecl->hasFlexibleArrayInit(getContext()))
+          ErrorUnsupported(D, "flexible array initializer");
         Init = EmitNullConstant(T);
-        NeedsGlobalCtor = true;
+
+        if (!IsDefinitionAvailableExternally)
+          NeedsGlobalCtor = true;
       } else {
         ErrorUnsupported(D, "static initializer");
         Init = llvm::UndefValue::get(getTypes().ConvertType(T));
@@ -4375,6 +4905,14 @@ void CodeGenModule::EmitGlobalVarDefinition(const VarDecl *D,
       // also don't need to register a destructor.
       if (getLangOpts().CPlusPlus && !NeedsGlobalDtor)
         DelayedCXXInitPosition.erase(D);
+
+#ifndef NDEBUG
+      CharUnits VarSize = getContext().getTypeSizeInChars(ASTTy) +
+                          InitDecl->getFlexibleArrayInitChars(getContext());
+      CharUnits CstSize = CharUnits::fromQuantity(
+          getDataLayout().getTypeAllocSize(Init->getType()));
+      assert(VarSize == CstSize && "Emitted constant has unexpected size");
+#endif
     }
   }
 
@@ -4438,7 +4976,9 @@ void CodeGenModule::EmitGlobalVarDefinition(const VarDecl *D,
   if (GV && LangOpts.CUDA) {
     if (LangOpts.CUDAIsDevice) {
       if (Linkage != llvm::GlobalValue::InternalLinkage &&
-          (D->hasAttr<CUDADeviceAttr>() || D->hasAttr<CUDAConstantAttr>()))
+          (D->hasAttr<CUDADeviceAttr>() || D->hasAttr<CUDAConstantAttr>() ||
+           D->getType()->isCUDADeviceBuiltinSurfaceType() ||
+           D->getType()->isCUDADeviceBuiltinTextureType()))
         GV->setExternallyInitialized(true);
     } else {
       getCUDARuntime().internalizeDeviceSideVar(D, Linkage);
@@ -4461,7 +5001,12 @@ void CodeGenModule::EmitGlobalVarDefinition(const VarDecl *D,
       GV->setConstant(true);
   }
 
-  GV->setAlignment(getContext().getDeclAlign(D).getAsAlign());
+  CharUnits AlignVal = getContext().getDeclAlign(D);
+  // Check for alignment specifed in an 'omp allocate' directive.
+  if (std::optional<CharUnits> AlignValFromAllocate =
+          getOMPAllocateAlignment(D))
+    AlignVal = *AlignValFromAllocate;
+  GV->setAlignment(AlignVal.getAsAlign());
 
   // On Darwin, unlike other Itanium C++ ABI platforms, the thread-wrapper
   // function is only defined alongside the variable, not also alongside
@@ -4516,7 +5061,7 @@ void CodeGenModule::EmitGlobalVarDefinition(const VarDecl *D,
   if (NeedsGlobalCtor || NeedsGlobalDtor)
     EmitCXXGlobalVarDeclInitFunc(D, GV, NeedsGlobalCtor);
 
-  SanitizerMD->reportGlobalToASan(GV, *D, NeedsGlobalCtor);
+  SanitizerMD->reportGlobal(GV, *D, NeedsGlobalCtor);
 
   // Emit global variable debug information.
   if (CGDebugInfo *DI = getModuleDebugInfo())
@@ -4529,8 +5074,8 @@ void CodeGenModule::EmitExternalVarDeclaration(const VarDecl *D) {
     if (getCodeGenOpts().hasReducedDebugInfo()) {
       QualType ASTTy = D->getType();
       llvm::Type *Ty = getTypes().ConvertTypeForMem(D->getType());
-      llvm::Constant *GV = GetOrCreateLLVMGlobal(
-          D->getName(), Ty, getContext().getTargetAddressSpace(ASTTy), D);
+      llvm::Constant *GV =
+          GetOrCreateLLVMGlobal(D->getName(), Ty, ASTTy.getAddressSpace(), D);
       DI->EmitExternalVariable(
           cast<llvm::GlobalVariable>(GV->stripPointerCasts()), D);
     }
@@ -4617,12 +5162,8 @@ llvm::GlobalValue::LinkageTypes CodeGenModule::getLLVMLinkageForDeclarator(
   if (Linkage == GVA_Internal)
     return llvm::Function::InternalLinkage;
 
-  if (D->hasAttr<WeakAttr>()) {
-    if (IsConstantVariable)
-      return llvm::GlobalVariable::WeakODRLinkage;
-    else
-      return llvm::GlobalVariable::WeakAnyLinkage;
-  }
+  if (D->hasAttr<WeakAttr>())
+    return llvm::GlobalVariable::WeakAnyLinkage;
 
   if (const auto *FD = D->getAsFunction())
     if (FD->isMultiVersion() && Linkage == GVA_AvailableExternally)
@@ -4747,7 +5288,7 @@ static void replaceUsesOfNonProtoConstant(llvm::Constant *old,
       }
 
       // Add any parameter attributes.
-      newArgAttrs.push_back(oldAttrs.getParamAttributes(argNo));
+      newArgAttrs.push_back(oldAttrs.getParamAttrs(argNo));
       argNo++;
     }
     if (dontTransform)
@@ -4762,7 +5303,7 @@ static void replaceUsesOfNonProtoConstant(llvm::Constant *old,
     callSite->getOperandBundlesAsDefs(newBundles);
 
     llvm::CallBase *newCall;
-    if (dyn_cast<llvm::CallInst>(callSite)) {
+    if (isa<llvm::CallInst>(callSite)) {
       newCall =
           llvm::CallInst::Create(newFn, newArgs, newBundles, "", callSite);
     } else {
@@ -4775,9 +5316,9 @@ static void replaceUsesOfNonProtoConstant(llvm::Constant *old,
 
     if (!newCall->getType()->isVoidTy())
       newCall->takeName(callSite);
-    newCall->setAttributes(llvm::AttributeList::get(
-        newFn->getContext(), oldAttrs.getFnAttributes(),
-        oldAttrs.getRetAttributes(), newArgAttrs));
+    newCall->setAttributes(
+        llvm::AttributeList::get(newFn->getContext(), oldAttrs.getFnAttrs(),
+                                 oldAttrs.getRetAttrs(), newArgAttrs));
     newCall->setCallingConv(callSite->getCallingConv());
 
     // Finally, remove the old call, replacing any uses with the new one.
@@ -4902,7 +5443,7 @@ void CodeGenModule::EmitAliasDefinition(GlobalDecl GD) {
                                       /*ForVTable=*/false);
     LT = getFunctionLinkage(GD);
   } else {
-    Aliasee = GetOrCreateLLVMGlobal(AA->getAliasee(), DeclTy, 0,
+    Aliasee = GetOrCreateLLVMGlobal(AA->getAliasee(), DeclTy, LangAS::Default,
                                     /*D=*/nullptr);
     if (const auto *VD = dyn_cast<VarDecl>(GD.getDecl()))
       LT = getLLVMLinkageVarDefinition(VD, D->getType().isConstQualified());
@@ -4952,6 +5493,11 @@ void CodeGenModule::EmitAliasDefinition(GlobalDecl GD) {
       setTLSMode(GA, *VD);
 
   SetCommonAttributes(GD, GA);
+
+  // Emit global alias debug information.
+  if (isa<VarDecl>(D))
+    if (CGDebugInfo *DI = getModuleDebugInfo())
+      DI->EmitGlobalAlias(cast<llvm::GlobalValue>(GA->getAliasee()->stripPointerCasts()), GD);
 }
 
 void CodeGenModule::emitIFuncDefinition(GlobalDecl GD) {
@@ -4983,8 +5529,9 @@ void CodeGenModule::emitIFuncDefinition(GlobalDecl GD) {
   Aliases.push_back(GD);
 
   llvm::Type *DeclTy = getTypes().ConvertTypeForMem(D->getType());
+  llvm::Type *ResolverTy = llvm::GlobalIFunc::getResolverFunctionType(DeclTy);
   llvm::Constant *Resolver =
-      GetOrCreateLLVMFunction(IFA->getResolver(), DeclTy, GD,
+      GetOrCreateLLVMFunction(IFA->getResolver(), ResolverTy, {},
                               /*ForVTable=*/false);
   llvm::GlobalIFunc *GIF =
       llvm::GlobalIFunc::create(DeclTy, 0, llvm::Function::ExternalLinkage,
@@ -5064,7 +5611,8 @@ CodeGenModule::GetAddrOfConstantCFString(const StringLiteral *Literal) {
                                StringLength);
 
   if (auto *C = Entry.second)
-    return ConstantAddress(C, CharUnits::fromQuantity(C->getAlignment()));
+    return ConstantAddress(
+        C, C->getValueType(), CharUnits::fromQuantity(C->getAlignment()));
 
   llvm::Constant *Zero = llvm::Constant::getNullValue(Int32Ty);
   llvm::Constant *Zeros[] = { Zero, Zero };
@@ -5086,7 +5634,7 @@ CodeGenModule::GetAddrOfConstantCFString(const StringLiteral *Literal) {
 
     switch (CFRuntime) {
     default: break;
-    case LangOptions::CoreFoundationABI::Swift: LLVM_FALLTHROUGH;
+    case LangOptions::CoreFoundationABI::Swift: [[fallthrough]];
     case LangOptions::CoreFoundationABI::Swift5_0:
       CFConstantStringClassName =
           Triple.isOSDarwin() ? "$s15SwiftFoundation19_NSCFConstantStringCN"
@@ -5151,7 +5699,7 @@ CodeGenModule::GetAddrOfConstantCFString(const StringLiteral *Literal) {
   auto Fields = Builder.beginStruct(STy);
 
   // Class pointer.
-  Fields.add(cast<llvm::ConstantExpr>(CFConstantStringClassRef));
+  Fields.add(cast<llvm::Constant>(CFConstantStringClassRef));
 
   // Flags.
   if (IsSwiftABI) {
@@ -5164,7 +5712,7 @@ CodeGenModule::GetAddrOfConstantCFString(const StringLiteral *Literal) {
   // String pointer.
   llvm::Constant *C = nullptr;
   if (isUTF16) {
-    auto Arr = llvm::makeArrayRef(
+    auto Arr = llvm::ArrayRef(
         reinterpret_cast<uint16_t *>(const_cast<char *>(Entry.first().data())),
         Entry.first().size() / 2);
     C = llvm::ConstantDataArray::get(VMContext, Arr);
@@ -5230,10 +5778,11 @@ CodeGenModule::GetAddrOfConstantCFString(const StringLiteral *Literal) {
   switch (Triple.getObjectFormat()) {
   case llvm::Triple::UnknownObjectFormat:
     llvm_unreachable("unknown file format");
+  case llvm::Triple::DXContainer:
   case llvm::Triple::GOFF:
-    llvm_unreachable("GOFF is not yet implemented");
+  case llvm::Triple::SPIRV:
   case llvm::Triple::XCOFF:
-    llvm_unreachable("XCOFF is not yet implemented");
+    llvm_unreachable("unimplemented");
   case llvm::Triple::COFF:
   case llvm::Triple::ELF:
   case llvm::Triple::Wasm:
@@ -5245,7 +5794,7 @@ CodeGenModule::GetAddrOfConstantCFString(const StringLiteral *Literal) {
   }
   Entry.second = GV;
 
-  return ConstantAddress(GV, Alignment);
+  return ConstantAddress(GV, GV->getValueType(), Alignment);
 }
 
 bool CodeGenModule::getExpressionLocationsEnabled() const {
@@ -5360,10 +5909,10 @@ CodeGenModule::GetAddrOfConstantStringFromLiteral(const StringLiteral *S,
   if (!LangOpts.WritableStrings) {
     Entry = &ConstantStringMap[C];
     if (auto GV = *Entry) {
-      if (Alignment.getQuantity() > GV->getAlignment())
+      if (uint64_t(Alignment.getQuantity()) > GV->getAlignment())
         GV->setAlignment(Alignment.getAsAlign());
       return ConstantAddress(castStringLiteralToDefaultAddressSpace(*this, GV),
-                             Alignment);
+                             GV->getValueType(), Alignment);
     }
   }
 
@@ -5386,14 +5935,18 @@ CodeGenModule::GetAddrOfConstantStringFromLiteral(const StringLiteral *S,
   }
 
   auto GV = GenerateStringLiteral(C, LT, *this, GlobalVariableName, Alignment);
+
+  CGDebugInfo *DI = getModuleDebugInfo();
+  if (DI && getCodeGenOpts().hasReducedDebugInfo())
+    DI->AddStringLiteralDebugInfo(GV, S);
+
   if (Entry)
     *Entry = GV;
 
-  SanitizerMD->reportGlobalToASan(GV, S->getStrTokenLoc(0), "<string literal>",
-                                  QualType());
+  SanitizerMD->reportGlobal(GV, S->getStrTokenLoc(0), "<string literal>");
 
   return ConstantAddress(castStringLiteralToDefaultAddressSpace(*this, GV),
-                         Alignment);
+                         GV->getValueType(), Alignment);
 }
 
 /// GetAddrOfConstantStringFromObjCEncode - Return a pointer to a constant
@@ -5423,10 +5976,10 @@ ConstantAddress CodeGenModule::GetAddrOfConstantCString(
   if (!LangOpts.WritableStrings) {
     Entry = &ConstantStringMap[C];
     if (auto GV = *Entry) {
-      if (Alignment.getQuantity() > GV->getAlignment())
+      if (uint64_t(Alignment.getQuantity()) > GV->getAlignment())
         GV->setAlignment(Alignment.getAsAlign());
       return ConstantAddress(castStringLiteralToDefaultAddressSpace(*this, GV),
-                             Alignment);
+                             GV->getValueType(), Alignment);
     }
   }
 
@@ -5440,7 +5993,7 @@ ConstantAddress CodeGenModule::GetAddrOfConstantCString(
     *Entry = GV;
 
   return ConstantAddress(castStringLiteralToDefaultAddressSpace(*this, GV),
-                         Alignment);
+                         GV->getValueType(), Alignment);
 }
 
 ConstantAddress CodeGenModule::GetAddrOfGlobalTemporary(
@@ -5470,7 +6023,11 @@ ConstantAddress CodeGenModule::GetAddrOfGlobalTemporary(
           getModule(), Type, false, llvm::GlobalVariable::InternalLinkage,
           nullptr);
     }
-    return ConstantAddress(InsertResult.first->second, Align);
+    return ConstantAddress(InsertResult.first->second,
+                           llvm::cast<llvm::GlobalVariable>(
+                               InsertResult.first->second->stripPointerCasts())
+                               ->getValueType(),
+                           Align);
   }
 
   // FIXME: If an externally-visible declaration extends multiple temporaries,
@@ -5500,7 +6057,7 @@ ConstantAddress CodeGenModule::GetAddrOfGlobalTemporary(
   LangAS AddrSpace =
       VD ? GetGlobalVarAddressSpace(VD) : MaterializedType.getAddressSpace();
 
-  Optional<ConstantEmitter> emitter;
+  std::optional<ConstantEmitter> emitter;
   llvm::Constant *InitialValue = nullptr;
   bool Constant = false;
   llvm::Type *Type;
@@ -5538,7 +6095,13 @@ ConstantAddress CodeGenModule::GetAddrOfGlobalTemporary(
       getModule(), Type, Constant, Linkage, InitialValue, Name.c_str(),
       /*InsertBefore=*/nullptr, llvm::GlobalVariable::NotThreadLocal, TargetAS);
   if (emitter) emitter->finalize(GV);
-  setGVProperties(GV, VD);
+  // Don't assign dllimport or dllexport to local linkage globals.
+  if (!llvm::GlobalValue::isLocalLinkage(Linkage)) {
+    setGVProperties(GV, VD);
+    if (GV->getDLLStorageClass() == llvm::GlobalVariable::DLLExportStorageClass)
+      // The reference temporary should never be dllexport.
+      GV->setDLLStorageClass(llvm::GlobalVariable::DefaultStorageClass);
+  }
   GV->setAlignment(Align.getAsAlign());
   if (supportsCOMDAT() && GV->isWeakForLinker())
     GV->setComdat(TheModule.getOrInsertComdat(GV->getName()));
@@ -5561,7 +6124,7 @@ ConstantAddress CodeGenModule::GetAddrOfGlobalTemporary(
   }
   Entry = CV;
 
-  return ConstantAddress(CV, Align);
+  return ConstantAddress(CV, Type, Align);
 }
 
 /// EmitObjCPropertyImplementations - Emit information for synthesized
@@ -5664,6 +6227,39 @@ void CodeGenModule::EmitLinkageSpec(const LinkageSpecDecl *LSD) {
   EmitDeclContext(LSD);
 }
 
+void CodeGenModule::EmitTopLevelStmt(const TopLevelStmtDecl *D) {
+  std::unique_ptr<CodeGenFunction> &CurCGF =
+      GlobalTopLevelStmtBlockInFlight.first;
+
+  // We emitted a top-level stmt but after it there is initialization.
+  // Stop squashing the top-level stmts into a single function.
+  if (CurCGF && CXXGlobalInits.back() != CurCGF->CurFn) {
+    CurCGF->FinishFunction(D->getEndLoc());
+    CurCGF = nullptr;
+  }
+
+  if (!CurCGF) {
+    // void __stmts__N(void)
+    // FIXME: Ask the ABI name mangler to pick a name.
+    std::string Name = "__stmts__" + llvm::utostr(CXXGlobalInits.size());
+    FunctionArgList Args;
+    QualType RetTy = getContext().VoidTy;
+    const CGFunctionInfo &FnInfo =
+        getTypes().arrangeBuiltinFunctionDeclaration(RetTy, Args);
+    llvm::FunctionType *FnTy = getTypes().GetFunctionType(FnInfo);
+    llvm::Function *Fn = llvm::Function::Create(
+        FnTy, llvm::GlobalValue::InternalLinkage, Name, &getModule());
+
+    CurCGF.reset(new CodeGenFunction(*this));
+    GlobalTopLevelStmtBlockInFlight.second = D;
+    CurCGF->StartFunction(GlobalDecl(), RetTy, Fn, FnInfo, Args,
+                          D->getBeginLoc(), D->getBeginLoc());
+    CXXGlobalInits.push_back(Fn);
+  }
+
+  CurCGF->EmitStmt(D->getStmt());
+}
+
 void CodeGenModule::EmitDeclContext(const DeclContext *DC) {
   for (auto *I : DC->decls()) {
     // Unlike other DeclContexts, the contents of an ObjCImplDecl at TU scope
@@ -5731,7 +6327,7 @@ void CodeGenModule::EmitTopLevelDecl(Decl *D) {
               TSK_ExplicitInstantiationDefinition &&
           Spec->hasDefinition())
         DI->completeTemplateDefinition(*Spec);
-  } LLVM_FALLTHROUGH;
+  } [[fallthrough]];
   case Decl::CXXRecord: {
     CXXRecordDecl *CRD = cast<CXXRecordDecl>(D);
     if (CGDebugInfo *DI = getModuleDebugInfo()) {
@@ -5873,6 +6469,10 @@ void CodeGenModule::EmitTopLevelDecl(Decl *D) {
     break;
   }
 
+  case Decl::TopLevelStmt:
+    EmitTopLevelStmt(cast<TopLevelStmtDecl>(D));
+    break;
+
   case Decl::Import: {
     auto *Import = cast<ImportDecl>(D);
 
@@ -5886,6 +6486,16 @@ void CodeGenModule::EmitTopLevelDecl(Decl *D) {
         DI->EmitImportDecl(*Import);
     }
 
+    // For C++ standard modules we are done - we will call the module
+    // initializer for imported modules, and that will likewise call those for
+    // any imports it has.
+    if (CXX20ModuleInits && Import->getImportedOwningModule() &&
+        !Import->getImportedOwningModule()->isModuleMapModule())
+      break;
+
+    // For clang C++ module map modules the initializers for sub-modules are
+    // emitted here.
+
     // Find all of the submodules and emit the module initializers.
     llvm::SmallPtrSet<clang::Module *, 16> Visited;
     SmallVector<clang::Module *, 16> Stack;
@@ -5959,6 +6569,10 @@ void CodeGenModule::EmitTopLevelDecl(Decl *D) {
         DI->EmitAndRetainType(getContext().getEnumType(cast<EnumDecl>(D)));
     break;
 
+  case Decl::HLSLBuffer:
+    getHLSLRuntime().addBuffer(cast<HLSLBufferDecl>(D));
+    break;
+
   default:
     // Make sure we handled everything we should, every other kind is a
     // non-top-level decl.  FIXME: Would be nice to have an isTopLevelDeclKind
@@ -6055,8 +6669,10 @@ void CodeGenModule::EmitMainVoidAlias() {
   // new-style no-argument main is in used.
   if (llvm::Function *F = getModule().getFunction("main")) {
     if (!F->isDeclaration() && F->arg_size() == 0 && !F->isVarArg() &&
-        F->getReturnType()->isIntegerTy(Context.getTargetInfo().getIntWidth()))
-      addUsedGlobal(llvm::GlobalAlias::create("__main_void", F));
+        F->getReturnType()->isIntegerTy(Context.getTargetInfo().getIntWidth())) {
+      auto *GA = llvm::GlobalAlias::create("__main_void", F);
+      GA->setVisibility(llvm::GlobalValue::HiddenVisibility);
+    }
   }
 }
 
@@ -6083,6 +6699,72 @@ static void EmitGlobalDeclMetadata(CodeGenModule &CGM,
   GlobalMetadata->addOperand(llvm::MDNode::get(CGM.getLLVMContext(), Ops));
 }
 
+bool CodeGenModule::CheckAndReplaceExternCIFuncs(llvm::GlobalValue *Elem,
+                                                 llvm::GlobalValue *CppFunc) {
+  // Store the list of ifuncs we need to replace uses in.
+  llvm::SmallVector<llvm::GlobalIFunc *> IFuncs;
+  // List of ConstantExprs that we should be able to delete when we're done
+  // here.
+  llvm::SmallVector<llvm::ConstantExpr *> CEs;
+
+  // It isn't valid to replace the extern-C ifuncs if all we find is itself!
+  if (Elem == CppFunc)
+    return false;
+
+  // First make sure that all users of this are ifuncs (or ifuncs via a
+  // bitcast), and collect the list of ifuncs and CEs so we can work on them
+  // later.
+  for (llvm::User *User : Elem->users()) {
+    // Users can either be a bitcast ConstExpr that is used by the ifuncs, OR an
+    // ifunc directly. In any other case, just give up, as we don't know what we
+    // could break by changing those.
+    if (auto *ConstExpr = dyn_cast<llvm::ConstantExpr>(User)) {
+      if (ConstExpr->getOpcode() != llvm::Instruction::BitCast)
+        return false;
+
+      for (llvm::User *CEUser : ConstExpr->users()) {
+        if (auto *IFunc = dyn_cast<llvm::GlobalIFunc>(CEUser)) {
+          IFuncs.push_back(IFunc);
+        } else {
+          return false;
+        }
+      }
+      CEs.push_back(ConstExpr);
+    } else if (auto *IFunc = dyn_cast<llvm::GlobalIFunc>(User)) {
+      IFuncs.push_back(IFunc);
+    } else {
+      // This user is one we don't know how to handle, so fail redirection. This
+      // will result in an ifunc retaining a resolver name that will ultimately
+      // fail to be resolved to a defined function.
+      return false;
+    }
+  }
+
+  // Now we know this is a valid case where we can do this alias replacement, we
+  // need to remove all of the references to Elem (and the bitcasts!) so we can
+  // delete it.
+  for (llvm::GlobalIFunc *IFunc : IFuncs)
+    IFunc->setResolver(nullptr);
+  for (llvm::ConstantExpr *ConstExpr : CEs)
+    ConstExpr->destroyConstant();
+
+  // We should now be out of uses for the 'old' version of this function, so we
+  // can erase it as well.
+  Elem->eraseFromParent();
+
+  for (llvm::GlobalIFunc *IFunc : IFuncs) {
+    // The type of the resolver is always just a function-type that returns the
+    // type of the IFunc, so create that here. If the type of the actual
+    // resolver doesn't match, it just gets bitcast to the right thing.
+    auto *ResolverTy =
+        llvm::FunctionType::get(IFunc->getType(), /*isVarArg*/ false);
+    llvm::Constant *Resolver = GetOrCreateLLVMFunction(
+        CppFunc->getName(), ResolverTy, {}, /*ForVTable*/ false);
+    IFunc->setResolver(Resolver);
+  }
+  return true;
+}
+
 /// For each function which is declared within an extern "C" region and marked
 /// as 'used', but has internal linkage, create an alias from the unmangled
 /// name to the mangled name if possible. People expect to be able to refer
@@ -6094,7 +6776,19 @@ void CodeGenModule::EmitStaticExternCAliases() {
   for (auto &I : StaticExternCValues) {
     IdentifierInfo *Name = I.first;
     llvm::GlobalValue *Val = I.second;
-    if (Val && !getModule().getNamedValue(Name->getName()))
+
+    // If Val is null, that implies there were multiple declarations that each
+    // had a claim to the unmangled name. In this case, generation of the alias
+    // is suppressed. See CodeGenModule::MaybeHandleStaticInExternC.
+    if (!Val)
+      break;
+
+    llvm::GlobalValue *ExistingElem =
+        getModule().getNamedValue(Name->getName());
+
+    // If there is either not something already by this name, or we were able to
+    // replace all uses from IFuncs, create the alias.
+    if (!ExistingElem || CheckAndReplaceExternCIFuncs(ExistingElem, Val))
       addCompilerUsedGlobal(llvm::GlobalAlias::create(Name->getName(), Val));
   }
 }
@@ -6224,7 +6918,9 @@ void CodeGenModule::EmitOMPThreadPrivateDecl(const OMPThreadPrivateDecl *D) {
         !VD->getAnyInitializer()->isConstantInitializer(getContext(),
                                                         /*ForRef=*/false);
 
-    Address Addr(GetAddrOfGlobalVar(VD), getContext().getDeclAlign(VD));
+    Address Addr(GetAddrOfGlobalVar(VD),
+                 getTypes().ConvertTypeForMem(VD->getType()),
+                 getContext().getDeclAlign(VD));
     if (auto InitFunction = getOpenMPRuntime().emitThreadPrivateVarDefinition(
             VD, Addr, RefExpr->getBeginLoc(), PerformInit))
       CXXGlobalInits.push_back(InitFunction);
@@ -6234,6 +6930,11 @@ void CodeGenModule::EmitOMPThreadPrivateDecl(const OMPThreadPrivateDecl *D) {
 llvm::Metadata *
 CodeGenModule::CreateMetadataIdentifierImpl(QualType T, MetadataTypeMap &Map,
                                             StringRef Suffix) {
+  if (auto *FnType = T->getAs<FunctionProtoType>())
+    T = getContext().getFunctionType(
+        FnType->getReturnType(), FnType->getParamTypes(),
+        FnType->getExtProtoInfo().withExceptionSpec(EST_None));
+
   llvm::Metadata *&InternalId = Map[T.getCanonicalType()];
   if (InternalId)
     return InternalId;
@@ -6446,7 +7147,70 @@ bool CodeGenModule::stopAutoInit() {
   return false;
 }
 
-void CodeGenModule::printPostfixForExternalizedStaticVar(
-    llvm::raw_ostream &OS) const {
-  OS << ".static." << getContext().getCUIDHash();
+void CodeGenModule::printPostfixForExternalizedDecl(llvm::raw_ostream &OS,
+                                                    const Decl *D) const {
+  // ptxas does not allow '.' in symbol names. On the other hand, HIP prefers
+  // postfix beginning with '.' since the symbol name can be demangled.
+  if (LangOpts.HIP)
+    OS << (isa<VarDecl>(D) ? ".static." : ".intern.");
+  else
+    OS << (isa<VarDecl>(D) ? "__static__" : "__intern__");
+
+  // If the CUID is not specified we try to generate a unique postfix.
+  if (getLangOpts().CUID.empty()) {
+    SourceManager &SM = getContext().getSourceManager();
+    PresumedLoc PLoc = SM.getPresumedLoc(D->getLocation());
+    assert(PLoc.isValid() && "Source location is expected to be valid.");
+
+    // Get the hash of the user defined macros.
+    llvm::MD5 Hash;
+    llvm::MD5::MD5Result Result;
+    for (const auto &Arg : PreprocessorOpts.Macros)
+      Hash.update(Arg.first);
+    Hash.final(Result);
+
+    // Get the UniqueID for the file containing the decl.
+    llvm::sys::fs::UniqueID ID;
+    if (auto EC = llvm::sys::fs::getUniqueID(PLoc.getFilename(), ID)) {
+      PLoc = SM.getPresumedLoc(D->getLocation(), /*UseLineDirectives=*/false);
+      assert(PLoc.isValid() && "Source location is expected to be valid.");
+      if (auto EC = llvm::sys::fs::getUniqueID(PLoc.getFilename(), ID))
+        SM.getDiagnostics().Report(diag::err_cannot_open_file)
+            << PLoc.getFilename() << EC.message();
+    }
+    OS << llvm::format("%x", ID.getFile()) << llvm::format("%x", ID.getDevice())
+       << "_" << llvm::utohexstr(Result.low(), /*LowerCase=*/true, /*Width=*/8);
+  } else {
+    OS << getContext().getCUIDHash();
+  }
+}
+
+void CodeGenModule::moveLazyEmissionStates(CodeGenModule *NewBuilder) {
+  assert(DeferredDeclsToEmit.empty() &&
+         "Should have emitted all decls deferred to emit.");
+  assert(NewBuilder->DeferredDecls.empty() &&
+         "Newly created module should not have deferred decls");
+  NewBuilder->DeferredDecls = std::move(DeferredDecls);
+
+  assert(NewBuilder->DeferredVTables.empty() &&
+         "Newly created module should not have deferred vtables");
+  NewBuilder->DeferredVTables = std::move(DeferredVTables);
+
+  assert(NewBuilder->MangledDeclNames.empty() &&
+         "Newly created module should not have mangled decl names");
+  assert(NewBuilder->Manglings.empty() &&
+         "Newly created module should not have manglings");
+  NewBuilder->Manglings = std::move(Manglings);
+
+  assert(WeakRefReferences.empty() && "Not all WeakRefRefs have been applied");
+  NewBuilder->WeakRefReferences = std::move(WeakRefReferences);
+
+  NewBuilder->TBAA = std::move(TBAA);
+
+  assert(NewBuilder->EmittedDeferredDecls.empty() &&
+         "Still have (unmerged) EmittedDeferredDecls deferred decls");
+
+  NewBuilder->EmittedDeferredDecls = std::move(EmittedDeferredDecls);
+
+  NewBuilder->ABI->MangleCtx = std::move(ABI->MangleCtx);
 }
diff --git a/gnu/llvm/clang/lib/CodeGen/TargetInfo.cpp b/gnu/llvm/clang/lib/CodeGen/TargetInfo.cpp
index d2cc0a699f4..9e2d7a85d10 100644
--- a/gnu/llvm/clang/lib/CodeGen/TargetInfo.cpp
+++ b/gnu/llvm/clang/lib/CodeGen/TargetInfo.cpp
@@ -19,11 +19,10 @@
 #include "CodeGenFunction.h"
 #include "clang/AST/Attr.h"
 #include "clang/AST/RecordLayout.h"
+#include "clang/Basic/Builtins.h"
 #include "clang/Basic/CodeGenOptions.h"
 #include "clang/Basic/DiagnosticFrontend.h"
-#include "clang/Basic/Builtins.h"
 #include "clang/CodeGen/CGFunctionInfo.h"
-#include "clang/CodeGen/SwiftCallingConv.h"
 #include "llvm/ADT/SmallBitVector.h"
 #include "llvm/ADT/StringExtras.h"
 #include "llvm/ADT/StringSwitch.h"
@@ -33,8 +32,9 @@
 #include "llvm/IR/IntrinsicsNVPTX.h"
 #include "llvm/IR/IntrinsicsS390.h"
 #include "llvm/IR/Type.h"
+#include "llvm/Support/MathExtras.h"
 #include "llvm/Support/raw_ostream.h"
-#include <algorithm> // std::sort
+#include <algorithm>
 
 using namespace clang;
 using namespace CodeGen;
@@ -100,18 +100,25 @@ Address ABIInfo::EmitMSVAArg(CodeGenFunction &CGF, Address VAListAddr,
   return Address::invalid();
 }
 
+static llvm::Type *getVAListElementType(CodeGenFunction &CGF) {
+  return CGF.ConvertTypeForMem(
+      CGF.getContext().getBuiltinVaListType()->getPointeeType());
+}
+
 bool ABIInfo::isPromotableIntegerTypeForABI(QualType Ty) const {
-  if (Ty->isPromotableIntegerType())
+  if (getContext().isPromotableIntegerType(Ty))
     return true;
 
-  if (const auto *EIT = Ty->getAs<ExtIntType>())
+  if (const auto *EIT = Ty->getAs<BitIntType>())
     if (EIT->getNumBits() < getContext().getTypeSize(getContext().IntTy))
       return true;
 
   return false;
 }
 
-ABIInfo::~ABIInfo() {}
+ABIInfo::~ABIInfo() = default;
+
+SwiftABIInfo::~SwiftABIInfo() = default;
 
 /// Does the given lowering require more than the given number of
 /// registers when expanded?
@@ -134,7 +141,7 @@ static bool occupiesMoreThan(CodeGenTypes &cgt,
     if (type->isPointerTy()) {
       intCount++;
     } else if (auto intTy = dyn_cast<llvm::IntegerType>(type)) {
-      auto ptrWidth = cgt.getTarget().getPointerWidth(0);
+      auto ptrWidth = cgt.getTarget().getPointerWidth(LangAS::Default);
       intCount += (intTy->getBitWidth() + ptrWidth - 1) / ptrWidth;
     } else {
       assert(type->isVectorTy() || type->isFloatingPointTy());
@@ -145,12 +152,16 @@ static bool occupiesMoreThan(CodeGenTypes &cgt,
   return (intCount + fpCount > maxAllRegisters);
 }
 
-bool SwiftABIInfo::isLegalVectorTypeForSwift(CharUnits vectorSize,
-                                             llvm::Type *eltTy,
-                                             unsigned numElts) const {
+bool SwiftABIInfo::shouldPassIndirectly(ArrayRef<llvm::Type *> ComponentTys,
+                                        bool AsReturnValue) const {
+  return occupiesMoreThan(CGT, ComponentTys, /*total=*/4);
+}
+
+bool SwiftABIInfo::isLegalVectorType(CharUnits VectorSize, llvm::Type *EltTy,
+                                     unsigned NumElts) const {
   // The default implementation of this assumes that the target guarantees
   // 128-bit SIMD support but nothing more.
-  return (vectorSize.getQuantity() > 8 && vectorSize.getQuantity() <= 16);
+  return (VectorSize.getQuantity() > 8 && VectorSize.getQuantity() <= 16);
 }
 
 static CGCXXABI::RecordArgABI getRecordArgABI(const RecordType *RT,
@@ -234,6 +245,11 @@ bool ABIInfo::isHomogeneousAggregateSmallEnough(const Type *Base,
   return false;
 }
 
+bool ABIInfo::isZeroLengthBitfieldPermittedInHomogeneousAggregate() const {
+  // For compatibility with GCC, ignore empty bitfields in C++ mode.
+  return getContext().getLangOpts().CPlusPlus;
+}
+
 LLVM_DUMP_METHOD void ABIArgInfo::dump() const {
   raw_ostream &OS = llvm::errs();
   OS << "(ABIArgInfo Kind=";
@@ -306,13 +322,17 @@ static llvm::Value *emitRoundPointerUpToAlignment(CodeGenFunction &CGF,
 ///   leaving one or more empty slots behind as padding.  If this
 ///   is false, the returned address might be less-aligned than
 ///   DirectAlign.
+/// \param ForceRightAdjust - Default is false. On big-endian platform and
+///   if the argument is smaller than a slot, set this flag will force
+///   right-adjust the argument in its slot irrespective of the type.
 static Address emitVoidPtrDirectVAArg(CodeGenFunction &CGF,
                                       Address VAListAddr,
                                       llvm::Type *DirectTy,
                                       CharUnits DirectSize,
                                       CharUnits DirectAlign,
                                       CharUnits SlotSize,
-                                      bool AllowHigherAlign) {
+                                      bool AllowHigherAlign,
+                                      bool ForceRightAdjust = false) {
   // Cast the element type to i8* if necessary.  Some platforms define
   // va_list as a struct containing an i8* instead of just an i8*.
   if (VAListAddr.getElementType() != CGF.Int8PtrTy)
@@ -324,9 +344,9 @@ static Address emitVoidPtrDirectVAArg(CodeGenFunction &CGF,
   Address Addr = Address::invalid();
   if (AllowHigherAlign && DirectAlign > SlotSize) {
     Addr = Address(emitRoundPointerUpToAlignment(CGF, Ptr, DirectAlign),
-                                                 DirectAlign);
+                   CGF.Int8Ty, DirectAlign);
   } else {
-    Addr = Address(Ptr, SlotSize);
+    Addr = Address(Ptr, CGF.Int8Ty, SlotSize);
   }
 
   // Advance the pointer past the argument, then store that back.
@@ -338,7 +358,7 @@ static Address emitVoidPtrDirectVAArg(CodeGenFunction &CGF,
   // If the argument is smaller than a slot, and this is a big-endian
   // target, the argument will be right-adjusted in its slot.
   if (DirectSize < SlotSize && CGF.CGM.getDataLayout().isBigEndian() &&
-      !DirectTy->isStructTy()) {
+      (!DirectTy->isStructTy() || ForceRightAdjust)) {
     Addr = CGF.Builder.CreateConstInBoundsByteGEP(Addr, SlotSize - DirectSize);
   }
 
@@ -359,11 +379,15 @@ static Address emitVoidPtrDirectVAArg(CodeGenFunction &CGF,
 ///   an argument type with an alignment greater than the slot size
 ///   will be emitted on a higher-alignment address, potentially
 ///   leaving one or more empty slots behind as padding.
+/// \param ForceRightAdjust - Default is false. On big-endian platform and
+///   if the argument is smaller than a slot, set this flag will force
+///   right-adjust the argument in its slot irrespective of the type.
 static Address emitVoidPtrVAArg(CodeGenFunction &CGF, Address VAListAddr,
                                 QualType ValueTy, bool IsIndirect,
                                 TypeInfoChars ValueInfo,
                                 CharUnits SlotSizeAndAlign,
-                                bool AllowHigherAlign) {
+                                bool AllowHigherAlign,
+                                bool ForceRightAdjust = false) {
   // The size and alignment of the value that was passed directly.
   CharUnits DirectSize, DirectAlign;
   if (IsIndirect) {
@@ -375,21 +399,49 @@ static Address emitVoidPtrVAArg(CodeGenFunction &CGF, Address VAListAddr,
   }
 
   // Cast the address we've calculated to the right type.
-  llvm::Type *DirectTy = CGF.ConvertTypeForMem(ValueTy);
+  llvm::Type *DirectTy = CGF.ConvertTypeForMem(ValueTy), *ElementTy = DirectTy;
   if (IsIndirect)
     DirectTy = DirectTy->getPointerTo(0);
 
-  Address Addr = emitVoidPtrDirectVAArg(CGF, VAListAddr, DirectTy,
-                                        DirectSize, DirectAlign,
-                                        SlotSizeAndAlign,
-                                        AllowHigherAlign);
+  Address Addr = emitVoidPtrDirectVAArg(CGF, VAListAddr, DirectTy, DirectSize,
+                                        DirectAlign, SlotSizeAndAlign,
+                                        AllowHigherAlign, ForceRightAdjust);
 
   if (IsIndirect) {
-    Addr = Address(CGF.Builder.CreateLoad(Addr), ValueInfo.Align);
+    Addr = Address(CGF.Builder.CreateLoad(Addr), ElementTy, ValueInfo.Align);
   }
 
   return Addr;
+}
+
+static Address complexTempStructure(CodeGenFunction &CGF, Address VAListAddr,
+                                    QualType Ty, CharUnits SlotSize,
+                                    CharUnits EltSize, const ComplexType *CTy) {
+  Address Addr =
+      emitVoidPtrDirectVAArg(CGF, VAListAddr, CGF.Int8Ty, SlotSize * 2,
+                             SlotSize, SlotSize, /*AllowHigher*/ true);
+
+  Address RealAddr = Addr;
+  Address ImagAddr = RealAddr;
+  if (CGF.CGM.getDataLayout().isBigEndian()) {
+    RealAddr =
+        CGF.Builder.CreateConstInBoundsByteGEP(RealAddr, SlotSize - EltSize);
+    ImagAddr = CGF.Builder.CreateConstInBoundsByteGEP(ImagAddr,
+                                                      2 * SlotSize - EltSize);
+  } else {
+    ImagAddr = CGF.Builder.CreateConstInBoundsByteGEP(RealAddr, SlotSize);
+  }
+
+  llvm::Type *EltTy = CGF.ConvertTypeForMem(CTy->getElementType());
+  RealAddr = CGF.Builder.CreateElementBitCast(RealAddr, EltTy);
+  ImagAddr = CGF.Builder.CreateElementBitCast(ImagAddr, EltTy);
+  llvm::Value *Real = CGF.Builder.CreateLoad(RealAddr, ".vareal");
+  llvm::Value *Imag = CGF.Builder.CreateLoad(ImagAddr, ".vaimag");
 
+  Address Temp = CGF.CreateMemTemp(Ty, "vacplx");
+  CGF.EmitStoreOfComplex({Real, Imag}, CGF.MakeAddrLValue(Temp, Ty),
+                         /*init*/ true);
+  return Temp;
 }
 
 static Address emitMergePHI(CodeGenFunction &CGF,
@@ -401,9 +453,12 @@ static Address emitMergePHI(CodeGenFunction &CGF,
   PHI->addIncoming(Addr1.getPointer(), Block1);
   PHI->addIncoming(Addr2.getPointer(), Block2);
   CharUnits Align = std::min(Addr1.getAlignment(), Addr2.getAlignment());
-  return Address(PHI, Align);
+  return Address(PHI, Addr1.getElementType(), Align);
 }
 
+TargetCodeGenInfo::TargetCodeGenInfo(std::unique_ptr<ABIInfo> Info)
+    : Info(std::move(Info)) {}
+
 TargetCodeGenInfo::~TargetCodeGenInfo() = default;
 
 // If someone can figure out a general rule for this, that would be great.
@@ -660,11 +715,11 @@ Address EmitVAArgInstr(CodeGenFunction &CGF, Address VAListAddr, QualType Ty,
     auto TyInfo = CGF.getContext().getTypeInfoInChars(Ty);
     CharUnits TyAlignForABI = TyInfo.Align;
 
-    llvm::Type *BaseTy =
-        llvm::PointerType::getUnqual(CGF.ConvertTypeForMem(Ty));
+    llvm::Type *ElementTy = CGF.ConvertTypeForMem(Ty);
+    llvm::Type *BaseTy = llvm::PointerType::getUnqual(ElementTy);
     llvm::Value *Addr =
         CGF.Builder.CreateVAArg(VAListAddr.getPointer(), BaseTy);
-    return Address(Addr, TyAlignForABI);
+    return Address(Addr, ElementTy, TyAlignForABI);
   } else {
     assert((AI.isDirect() || AI.isExtend()) &&
            "Unexpected ArgInfo Kind in generic VAArg emitter!");
@@ -679,7 +734,8 @@ Address EmitVAArgInstr(CodeGenFunction &CGF, Address VAListAddr, QualType Ty,
            "Unexpected CoerceToType seen in arginfo in generic VAArg emitter!");
 
     Address Temp = CGF.CreateMemTemp(Ty, "varet");
-    Val = CGF.Builder.CreateVAArg(VAListAddr.getPointer(), CGF.ConvertType(Ty));
+    Val = CGF.Builder.CreateVAArg(VAListAddr.getPointer(),
+                                  CGF.ConvertTypeForMem(Ty));
     CGF.Builder.CreateStore(Val, Temp);
     return Temp;
   }
@@ -732,7 +788,7 @@ ABIArgInfo DefaultABIInfo::classifyArgumentType(QualType Ty) const {
     Ty = EnumTy->getDecl()->getIntegerType();
 
   ASTContext &Context = getContext();
-  if (const auto *EIT = Ty->getAs<ExtIntType>())
+  if (const auto *EIT = Ty->getAs<BitIntType>())
     if (EIT->getNumBits() >
         Context.getTypeSize(Context.getTargetInfo().hasInt128Type()
                                 ? Context.Int128Ty
@@ -754,7 +810,7 @@ ABIArgInfo DefaultABIInfo::classifyReturnType(QualType RetTy) const {
   if (const EnumType *EnumTy = RetTy->getAs<EnumType>())
     RetTy = EnumTy->getDecl()->getIntegerType();
 
-  if (const auto *EIT = RetTy->getAs<ExtIntType>())
+  if (const auto *EIT = RetTy->getAs<BitIntType>())
     if (EIT->getNumBits() >
         getContext().getTypeSize(getContext().getTargetInfo().hasInt128Type()
                                      ? getContext().Int128Ty
@@ -771,7 +827,7 @@ ABIArgInfo DefaultABIInfo::classifyReturnType(QualType RetTy) const {
 // This is a very simple ABI that relies a lot on DefaultABIInfo.
 //===----------------------------------------------------------------------===//
 
-class WebAssemblyABIInfo final : public SwiftABIInfo {
+class WebAssemblyABIInfo final : public ABIInfo {
 public:
   enum ABIKind {
     MVP = 0,
@@ -784,7 +840,7 @@ private:
 
 public:
   explicit WebAssemblyABIInfo(CodeGen::CodeGenTypes &CGT, ABIKind Kind)
-      : SwiftABIInfo(CGT), defaultInfo(CGT), Kind(Kind) {}
+      : ABIInfo(CGT), defaultInfo(CGT), Kind(Kind) {}
 
 private:
   ABIArgInfo classifyReturnType(QualType RetTy) const;
@@ -802,22 +858,16 @@ private:
 
   Address EmitVAArg(CodeGenFunction &CGF, Address VAListAddr,
                     QualType Ty) const override;
-
-  bool shouldPassIndirectlyForSwift(ArrayRef<llvm::Type*> scalars,
-                                    bool asReturnValue) const override {
-    return occupiesMoreThan(CGT, scalars, /*total*/ 4);
-  }
-
-  bool isSwiftErrorInRegister() const override {
-    return false;
-  }
 };
 
 class WebAssemblyTargetCodeGenInfo final : public TargetCodeGenInfo {
 public:
   explicit WebAssemblyTargetCodeGenInfo(CodeGen::CodeGenTypes &CGT,
                                         WebAssemblyABIInfo::ABIKind K)
-      : TargetCodeGenInfo(std::make_unique<WebAssemblyABIInfo>(CGT, K)) {}
+      : TargetCodeGenInfo(std::make_unique<WebAssemblyABIInfo>(CGT, K)) {
+    SwiftInfo =
+        std::make_unique<SwiftABIInfo>(CGT, /*SwiftErrorInRegister=*/false);
+  }
 
   void setTargetAttributes(const Decl *D, llvm::GlobalValue *GV,
                            CodeGen::CodeGenModule &CGM) const override {
@@ -825,21 +875,21 @@ public:
     if (const auto *FD = dyn_cast_or_null<FunctionDecl>(D)) {
       if (const auto *Attr = FD->getAttr<WebAssemblyImportModuleAttr>()) {
         llvm::Function *Fn = cast<llvm::Function>(GV);
-        llvm::AttrBuilder B;
+        llvm::AttrBuilder B(GV->getContext());
         B.addAttribute("wasm-import-module", Attr->getImportModule());
-        Fn->addAttributes(llvm::AttributeList::FunctionIndex, B);
+        Fn->addFnAttrs(B);
       }
       if (const auto *Attr = FD->getAttr<WebAssemblyImportNameAttr>()) {
         llvm::Function *Fn = cast<llvm::Function>(GV);
-        llvm::AttrBuilder B;
+        llvm::AttrBuilder B(GV->getContext());
         B.addAttribute("wasm-import-name", Attr->getImportName());
-        Fn->addAttributes(llvm::AttributeList::FunctionIndex, B);
+        Fn->addFnAttrs(B);
       }
       if (const auto *Attr = FD->getAttr<WebAssemblyExportNameAttr>()) {
         llvm::Function *Fn = cast<llvm::Function>(GV);
-        llvm::AttrBuilder B;
+        llvm::AttrBuilder B(GV->getContext());
         B.addAttribute("wasm-export-name", Attr->getExportName());
-        Fn->addAttributes(llvm::AttributeList::FunctionIndex, B);
+        Fn->addFnAttrs(B);
       }
     }
 
@@ -978,8 +1028,9 @@ ABIArgInfo PNaClABIInfo::classifyArgumentType(QualType Ty) const {
   } else if (Ty->isFloatingType()) {
     // Floating-point types don't go inreg.
     return ABIArgInfo::getDirect();
-  } else if (const auto *EIT = Ty->getAs<ExtIntType>()) {
-    // Treat extended integers as integers if <=64, otherwise pass indirectly.
+  } else if (const auto *EIT = Ty->getAs<BitIntType>()) {
+    // Treat bit-precise integers as integers if <= 64, otherwise pass
+    // indirectly.
     if (EIT->getNumBits() > 64)
       return getNaturalAlignIndirect(Ty);
     return ABIArgInfo::getDirect();
@@ -997,8 +1048,8 @@ ABIArgInfo PNaClABIInfo::classifyReturnType(QualType RetTy) const {
   if (isAggregateTypeForABI(RetTy))
     return getNaturalAlignIndirect(RetTy);
 
-  // Treat extended integers as integers if <=64, otherwise pass indirectly.
-  if (const auto *EIT = RetTy->getAs<ExtIntType>()) {
+  // Treat bit-precise integers as integers if <= 64, otherwise pass indirectly.
+  if (const auto *EIT = RetTy->getAs<BitIntType>()) {
     if (EIT->getNumBits() > 64)
       return getNaturalAlignIndirect(RetTy);
     return ABIArgInfo::getDirect();
@@ -1027,7 +1078,7 @@ static llvm::Type* X86AdjustInlineAsmType(CodeGen::CodeGenFunction &CGF,
                      .Cases("y", "&y", "^Ym", true)
                      .Default(false);
   if (IsMMXCons && Ty->isVectorTy()) {
-    if (cast<llvm::VectorType>(Ty)->getPrimitiveSizeInBits().getFixedSize() !=
+    if (cast<llvm::VectorType>(Ty)->getPrimitiveSizeInBits().getFixedValue() !=
         64) {
       // Invalid MMX constraint
       return nullptr;
@@ -1092,7 +1143,7 @@ struct CCState {
 };
 
 /// X86_32ABIInfo - The X86-32 ABI information.
-class X86_32ABIInfo : public SwiftABIInfo {
+class X86_32ABIInfo : public ABIInfo {
   enum Class {
     Integer,
     Float
@@ -1166,25 +1217,27 @@ public:
   X86_32ABIInfo(CodeGen::CodeGenTypes &CGT, bool DarwinVectorABI,
                 bool RetSmallStructInRegABI, bool Win32StructABI,
                 unsigned NumRegisterParameters, bool SoftFloatABI)
-    : SwiftABIInfo(CGT), IsDarwinVectorABI(DarwinVectorABI),
-      IsRetSmallStructInRegABI(RetSmallStructInRegABI),
-      IsWin32StructABI(Win32StructABI), IsSoftFloatABI(SoftFloatABI),
-      IsMCUABI(CGT.getTarget().getTriple().isOSIAMCU()),
-      IsLinuxABI(CGT.getTarget().getTriple().isOSLinux()),
-      DefaultNumRegisterParameters(NumRegisterParameters) {}
-
-  bool shouldPassIndirectlyForSwift(ArrayRef<llvm::Type*> scalars,
-                                    bool asReturnValue) const override {
+      : ABIInfo(CGT), IsDarwinVectorABI(DarwinVectorABI),
+        IsRetSmallStructInRegABI(RetSmallStructInRegABI),
+        IsWin32StructABI(Win32StructABI), IsSoftFloatABI(SoftFloatABI),
+        IsMCUABI(CGT.getTarget().getTriple().isOSIAMCU()),
+        IsLinuxABI(CGT.getTarget().getTriple().isOSLinux() ||
+                   CGT.getTarget().getTriple().isOSCygMing()),
+        DefaultNumRegisterParameters(NumRegisterParameters) {}
+};
+
+class X86_32SwiftABIInfo : public SwiftABIInfo {
+public:
+  explicit X86_32SwiftABIInfo(CodeGenTypes &CGT)
+      : SwiftABIInfo(CGT, /*SwiftErrorInRegister=*/false) {}
+
+  bool shouldPassIndirectly(ArrayRef<llvm::Type *> ComponentTys,
+                            bool AsReturnValue) const override {
     // LLVM's x86-32 lowering currently only assigns up to three
     // integer registers and three fp registers.  Oddly, it'll use up to
     // four vector registers for vectors, but those can overlap with the
     // scalar registers.
-    return occupiesMoreThan(CGT, scalars, /*total*/ 3);
-  }
-
-  bool isSwiftErrorInRegister() const override {
-    // x86-32 lowering does not support passing swifterror in a register.
-    return false;
+    return occupiesMoreThan(CGT, ComponentTys, /*total=*/3);
   }
 };
 
@@ -1195,7 +1248,9 @@ public:
                           unsigned NumRegisterParameters, bool SoftFloatABI)
       : TargetCodeGenInfo(std::make_unique<X86_32ABIInfo>(
             CGT, DarwinVectorABI, RetSmallStructInRegABI, Win32StructABI,
-            NumRegisterParameters, SoftFloatABI)) {}
+            NumRegisterParameters, SoftFloatABI)) {
+    SwiftInfo = std::make_unique<X86_32SwiftABIInfo>(CGT);
+  }
 
   static bool isStructReturnInRegABI(
       const llvm::Triple &Triple, const CodeGenOptions &Opts);
@@ -1319,8 +1374,8 @@ void X86_32TargetCodeGenInfo::addReturnRegisterOutputs(
   ResultTruncRegTypes.push_back(CoerceTy);
 
   // Coerce the integer by bitcasting the return slot pointer.
-  ReturnSlot.setAddress(CGF.Builder.CreateBitCast(ReturnSlot.getAddress(CGF),
-                                                  CoerceTy->getPointerTo()));
+  ReturnSlot.setAddress(
+      CGF.Builder.CreateElementBitCast(ReturnSlot.getAddress(CGF), CoerceTy));
   ResultRegDests.push_back(ReturnSlot);
 
   rewriteInputConstraintReferences(NumOutputs, 1, AsmString);
@@ -1524,6 +1579,14 @@ ABIArgInfo X86_32ABIInfo::classifyReturnType(QualType RetTy,
     if (isEmptyRecord(getContext(), RetTy, true))
       return ABIArgInfo::getIgnore();
 
+    // Return complex of _Float16 as <2 x half> so the backend will use xmm0.
+    if (const ComplexType *CT = RetTy->getAs<ComplexType>()) {
+      QualType ET = getContext().getCanonicalType(CT->getElementType());
+      if (ET->isFloat16Type())
+        return ABIArgInfo::getDirect(llvm::FixedVectorType::get(
+            llvm::Type::getHalfTy(getVMContext()), 2));
+    }
+
     // Small structures which are register sized are generally returned
     // in a register.
     if (shouldReturnTypeInRegister(RetTy, getContext())) {
@@ -1551,7 +1614,7 @@ ABIArgInfo X86_32ABIInfo::classifyReturnType(QualType RetTy,
   if (const EnumType *EnumTy = RetTy->getAs<EnumType>())
     RetTy = EnumTy->getDecl()->getIntegerType();
 
-  if (const auto *EIT = RetTy->getAs<ExtIntType>())
+  if (const auto *EIT = RetTy->getAs<BitIntType>())
     if (EIT->getNumBits() > 64)
       return getIndirectReturnResult(RetTy, State);
 
@@ -1566,7 +1629,7 @@ static bool isSIMDVectorType(ASTContext &Context, QualType Ty) {
 static bool isRecordWithSIMDVectorType(ASTContext &Context, QualType Ty) {
   const RecordType *RT = Ty->getAs<RecordType>();
   if (!RT)
-    return 0;
+    return false;
   const RecordDecl *RD = RT->getDecl();
 
   // If this is a C++ record, check the bases first.
@@ -1716,23 +1779,22 @@ bool X86_32ABIInfo::shouldAggregateUseDirect(QualType Ty, CCState &State,
 }
 
 bool X86_32ABIInfo::shouldPrimitiveUseInReg(QualType Ty, CCState &State) const {
-  if (!updateFreeRegs(Ty, State))
-    return false;
+  bool IsPtrOrInt = (getContext().getTypeSize(Ty) <= 32) &&
+                    (Ty->isIntegralOrEnumerationType() || Ty->isPointerType() ||
+                     Ty->isReferenceType());
 
-  if (IsMCUABI)
+  if (!IsPtrOrInt && (State.CC == llvm::CallingConv::X86_FastCall ||
+                      State.CC == llvm::CallingConv::X86_VectorCall))
     return false;
 
-  if (State.CC == llvm::CallingConv::X86_FastCall ||
-      State.CC == llvm::CallingConv::X86_VectorCall ||
-      State.CC == llvm::CallingConv::X86_RegCall) {
-    if (getContext().getTypeSize(Ty) > 32)
-      return false;
+  if (!updateFreeRegs(Ty, State))
+    return false;
 
-    return (Ty->isIntegralOrEnumerationType() || Ty->isPointerType() ||
-        Ty->isReferenceType());
-  }
+  if (!IsPtrOrInt && State.CC == llvm::CallingConv::X86_RegCall)
+    return false;
 
-  return true;
+  // Return true to apply inreg to all legal parameters except for MCU targets.
+  return !IsMCUABI;
 }
 
 void X86_32ABIInfo::runVectorCallFirstPass(CGFunctionInfo &FI, CCState &State) const {
@@ -1831,7 +1893,7 @@ ABIArgInfo X86_32ABIInfo::classifyArgumentType(QualType Ty,
 
     // Pass over-aligned aggregates on Windows indirectly. This behavior was
     // added in MSVC 2015.
-    if (IsWin32StructABI && TI.AlignIsRequired && TI.Align > 32)
+    if (IsWin32StructABI && TI.isAlignRequired() && TI.Align > 32)
       return getIndirectResult(Ty, /*ByVal=*/false, State);
 
     // Expand small (<= 128-bit) record types when we know that the stack layout
@@ -1887,7 +1949,7 @@ ABIArgInfo X86_32ABIInfo::classifyArgumentType(QualType Ty,
     return ABIArgInfo::getExtend(Ty);
   }
 
-  if (const auto * EIT = Ty->getAs<ExtIntType>()) {
+  if (const auto *EIT = Ty->getAs<BitIntType>()) {
     if (EIT->getNumBits() <= 64) {
       if (InReg)
         return ABIArgInfo::getDirectInReg();
@@ -2197,7 +2259,7 @@ static unsigned getNativeVectorSizeForAVXABI(X86AVXABILevel AVXLevel) {
 }
 
 /// X86_64ABIInfo - The X86_64 ABI information.
-class X86_64ABIInfo : public SwiftABIInfo {
+class X86_64ABIInfo : public ABIInfo {
   enum Class {
     Integer = 0,
     SSE,
@@ -2252,6 +2314,8 @@ class X86_64ABIInfo : public SwiftABIInfo {
   /// \param isNamedArg - Whether the argument in question is a "named"
   /// argument, as used in AMD64-ABI 3.5.7.
   ///
+  /// \param IsRegCall - Whether the calling conversion is regcall.
+  ///
   /// If a word is unused its result will be NoClass; if a type should
   /// be passed in Memory then at least the classification of \arg Lo
   /// will be Memory.
@@ -2261,7 +2325,7 @@ class X86_64ABIInfo : public SwiftABIInfo {
   /// If the \arg Lo class is ComplexX87, then the \arg Hi class will
   /// also be ComplexX87.
   void classify(QualType T, uint64_t OffsetBase, Class &Lo, Class &Hi,
-                bool isNamedArg) const;
+                bool isNamedArg, bool IsRegCall = false) const;
 
   llvm::Type *GetByteVectorType(QualType Ty) const;
   llvm::Type *GetSSETypeAtOffset(llvm::Type *IRType,
@@ -2286,13 +2350,16 @@ class X86_64ABIInfo : public SwiftABIInfo {
 
   ABIArgInfo classifyArgumentType(QualType Ty, unsigned freeIntRegs,
                                   unsigned &neededInt, unsigned &neededSSE,
-                                  bool isNamedArg) const;
+                                  bool isNamedArg,
+                                  bool IsRegCall = false) const;
 
   ABIArgInfo classifyRegCallStructType(QualType Ty, unsigned &NeededInt,
-                                       unsigned &NeededSSE) const;
+                                       unsigned &NeededSSE,
+                                       unsigned &MaxVectorWidth) const;
 
   ABIArgInfo classifyRegCallStructTypeImpl(QualType Ty, unsigned &NeededInt,
-                                           unsigned &NeededSSE) const;
+                                           unsigned &NeededSSE,
+                                           unsigned &MaxVectorWidth) const;
 
   bool IsIllegalVectorType(QualType Ty) const;
 
@@ -2314,9 +2381,7 @@ class X86_64ABIInfo : public SwiftABIInfo {
       return false;
 
     const llvm::Triple &Triple = getTarget().getTriple();
-    if (Triple.isOSDarwin() || Triple.getOS() == llvm::Triple::PS4)
-      return false;
-    if (Triple.isOSFreeBSD() && Triple.getOSMajorVersion() >= 10)
+    if (Triple.isOSDarwin() || Triple.isPS() || Triple.isOSFreeBSD())
       return false;
     return true;
   }
@@ -2338,10 +2403,9 @@ class X86_64ABIInfo : public SwiftABIInfo {
   bool Has64BitPointers;
 
 public:
-  X86_64ABIInfo(CodeGen::CodeGenTypes &CGT, X86AVXABILevel AVXLevel) :
-      SwiftABIInfo(CGT), AVXLevel(AVXLevel),
-      Has64BitPointers(CGT.getDataLayout().getPointerSize(0) == 8) {
-  }
+  X86_64ABIInfo(CodeGen::CodeGenTypes &CGT, X86AVXABILevel AVXLevel)
+      : ABIInfo(CGT), AVXLevel(AVXLevel),
+        Has64BitPointers(CGT.getDataLayout().getPointerSize(0) == 8) {}
 
   bool isPassedUsingAVXType(QualType type) const {
     unsigned neededInt, neededSSE;
@@ -2351,7 +2415,7 @@ public:
     if (info.isDirect()) {
       llvm::Type *ty = info.getCoerceToType();
       if (llvm::VectorType *vectorTy = dyn_cast_or_null<llvm::VectorType>(ty))
-        return vectorTy->getPrimitiveSizeInBits().getFixedSize() > 128;
+        return vectorTy->getPrimitiveSizeInBits().getFixedValue() > 128;
     }
     return false;
   }
@@ -2366,21 +2430,13 @@ public:
   bool has64BitPointers() const {
     return Has64BitPointers;
   }
-
-  bool shouldPassIndirectlyForSwift(ArrayRef<llvm::Type*> scalars,
-                                    bool asReturnValue) const override {
-    return occupiesMoreThan(CGT, scalars, /*total*/ 4);
-  }
-  bool isSwiftErrorInRegister() const override {
-    return true;
-  }
 };
 
 /// WinX86_64ABIInfo - The Windows X86_64 ABI information.
-class WinX86_64ABIInfo : public SwiftABIInfo {
+class WinX86_64ABIInfo : public ABIInfo {
 public:
   WinX86_64ABIInfo(CodeGen::CodeGenTypes &CGT, X86AVXABILevel AVXLevel)
-      : SwiftABIInfo(CGT), AVXLevel(AVXLevel),
+      : ABIInfo(CGT), AVXLevel(AVXLevel),
         IsMingw64(getTarget().getTriple().isWindowsGNUEnvironment()) {}
 
   void computeInfo(CGFunctionInfo &FI) const override;
@@ -2399,15 +2455,6 @@ public:
     return isX86VectorCallAggregateSmallEnough(NumMembers);
   }
 
-  bool shouldPassIndirectlyForSwift(ArrayRef<llvm::Type *> scalars,
-                                    bool asReturnValue) const override {
-    return occupiesMoreThan(CGT, scalars, /*total*/ 4);
-  }
-
-  bool isSwiftErrorInRegister() const override {
-    return true;
-  }
-
 private:
   ABIArgInfo classify(QualType Ty, unsigned &FreeSSERegs, bool IsReturnType,
                       bool IsVectorCall, bool IsRegCall) const;
@@ -2422,7 +2469,10 @@ private:
 class X86_64TargetCodeGenInfo : public TargetCodeGenInfo {
 public:
   X86_64TargetCodeGenInfo(CodeGen::CodeGenTypes &CGT, X86AVXABILevel AVXLevel)
-      : TargetCodeGenInfo(std::make_unique<X86_64ABIInfo>(CGT, AVXLevel)) {}
+      : TargetCodeGenInfo(std::make_unique<X86_64ABIInfo>(CGT, AVXLevel)) {
+    SwiftInfo =
+        std::make_unique<SwiftABIInfo>(CGT, /*SwiftErrorInRegister=*/true);
+  }
 
   const X86_64ABIInfo &getABIInfo() const {
     return static_cast<const X86_64ABIInfo&>(TargetCodeGenInfo::getABIInfo());
@@ -2566,7 +2616,7 @@ void X86_64TargetCodeGenInfo::checkFunctionCallABI(
   llvm::StringMap<bool> CalleeMap;
   unsigned ArgIndex = 0;
 
-  // We need to loop through the actual call arguments rather than the the
+  // We need to loop through the actual call arguments rather than the
   // function's parameters, in case this variadic.
   for (const CallArg &Arg : Args) {
     // The "avx" feature changes how vectors >128 in size are passed. "avx512f"
@@ -2607,7 +2657,7 @@ static std::string qualifyWindowsLibrary(llvm::StringRef Lib) {
   // If the argument does not end in .lib, automatically add the suffix.
   // If the argument contains a space, enclose it in quotes.
   // This matches the behavior of MSVC.
-  bool Quote = (Lib.find(' ') != StringRef::npos);
+  bool Quote = Lib.contains(' ');
   std::string ArgStr = Quote ? "\"" : "";
   ArgStr += Lib;
   if (!Lib.endswith_insensitive(".lib") && !Lib.endswith_insensitive(".a"))
@@ -2664,7 +2714,10 @@ class WinX86_64TargetCodeGenInfo : public TargetCodeGenInfo {
 public:
   WinX86_64TargetCodeGenInfo(CodeGen::CodeGenTypes &CGT,
                              X86AVXABILevel AVXLevel)
-      : TargetCodeGenInfo(std::make_unique<WinX86_64ABIInfo>(CGT, AVXLevel)) {}
+      : TargetCodeGenInfo(std::make_unique<WinX86_64ABIInfo>(CGT, AVXLevel)) {
+    SwiftInfo =
+        std::make_unique<SwiftABIInfo>(CGT, /*SwiftErrorInRegister=*/true);
+  }
 
   void setTargetAttributes(const Decl *D, llvm::GlobalValue *GV,
                            CodeGen::CodeGenModule &CGM) const override;
@@ -2787,8 +2840,8 @@ X86_64ABIInfo::Class X86_64ABIInfo::merge(Class Accum, Class Field) {
   return SSE;
 }
 
-void X86_64ABIInfo::classify(QualType Ty, uint64_t OffsetBase,
-                             Class &Lo, Class &Hi, bool isNamedArg) const {
+void X86_64ABIInfo::classify(QualType Ty, uint64_t OffsetBase, Class &Lo,
+                             Class &Hi, bool isNamedArg, bool IsRegCall) const {
   // FIXME: This code can be simplified by introducing a simple value class for
   // Class pairs with appropriate constructor methods for the various
   // situations.
@@ -2812,7 +2865,8 @@ void X86_64ABIInfo::classify(QualType Ty, uint64_t OffsetBase,
       Hi = Integer;
     } else if (k >= BuiltinType::Bool && k <= BuiltinType::LongLong) {
       Current = Integer;
-    } else if (k == BuiltinType::Float || k == BuiltinType::Double) {
+    } else if (k == BuiltinType::Float || k == BuiltinType::Double ||
+               k == BuiltinType::Float16 || k == BuiltinType::BFloat16) {
       Current = SSE;
     } else if (k == BuiltinType::LongDouble) {
       const llvm::fltSemantics *LDF = &getTarget().getLongDoubleFormat();
@@ -2943,7 +2997,8 @@ void X86_64ABIInfo::classify(QualType Ty, uint64_t OffsetBase,
         Current = Integer;
       else if (Size <= 128)
         Lo = Hi = Integer;
-    } else if (ET == getContext().FloatTy) {
+    } else if (ET->isFloat16Type() || ET == getContext().FloatTy ||
+               ET->isBFloat16Type()) {
       Current = SSE;
     } else if (ET == getContext().DoubleTy) {
       Lo = Hi = SSE;
@@ -2969,7 +3024,7 @@ void X86_64ABIInfo::classify(QualType Ty, uint64_t OffsetBase,
     return;
   }
 
-  if (const auto *EITy = Ty->getAs<ExtIntType>()) {
+  if (const auto *EITy = Ty->getAs<BitIntType>()) {
     if (EITy->getNumBits() <= 64)
       Current = Integer;
     else if (EITy->getNumBits() <= 128)
@@ -2985,7 +3040,9 @@ void X86_64ABIInfo::classify(QualType Ty, uint64_t OffsetBase,
 
     // AMD64-ABI 3.2.3p2: Rule 1. If the size of an object is larger
     // than eight eightbytes, ..., it has class MEMORY.
-    if (Size > 512)
+    // regcall ABI doesn't have limitation to an object. The only limitation
+    // is the free registers, which will be checked in computeInfo.
+    if (!IsRegCall && Size > 512)
       return;
 
     // AMD64-ABI 3.2.3p2: Rule 1. If ..., or it contains unaligned
@@ -3078,7 +3135,7 @@ void X86_64ABIInfo::classify(QualType Ty, uint64_t OffsetBase,
     unsigned idx = 0;
     bool UseClang11Compat = getContext().getLangOpts().getClangABICompat() <=
                                 LangOptions::ClangABI::Ver11 ||
-                            getContext().getTargetInfo().getTriple().isPS4();
+                            getContext().getTargetInfo().getTriple().isPS();
     bool IsUnion = RT->isUnionType() && !UseClang11Compat;
 
     for (RecordDecl::field_iterator i = RD->field_begin(), e = RD->field_end();
@@ -3160,7 +3217,7 @@ ABIArgInfo X86_64ABIInfo::getIndirectReturnResult(QualType Ty) const {
     if (const EnumType *EnumTy = Ty->getAs<EnumType>())
       Ty = EnumTy->getDecl()->getIntegerType();
 
-    if (Ty->isExtIntType())
+    if (Ty->isBitIntType())
       return getNaturalAlignIndirect(Ty);
 
     return (isPromotableIntegerTypeForABI(Ty) ? ABIArgInfo::getExtend(Ty)
@@ -3197,7 +3254,7 @@ ABIArgInfo X86_64ABIInfo::getIndirectResult(QualType Ty,
   // but this code would be much safer if we could mark the argument with
   // 'onstack'. See PR12193.
   if (!isAggregateTypeForABI(Ty) && !IsIllegalVectorType(Ty) &&
-      !Ty->isExtIntType()) {
+      !Ty->isBitIntType()) {
     // Treat an enum type as its underlying type.
     if (const EnumType *EnumTy = Ty->getAs<EnumType>())
       Ty = EnumTy->getDecl()->getIntegerType();
@@ -3367,55 +3424,77 @@ static bool BitsContainNoUserData(QualType Ty, unsigned StartBit,
   return false;
 }
 
-/// ContainsFloatAtOffset - Return true if the specified LLVM IR type has a
-/// float member at the specified offset.  For example, {int,{float}} has a
-/// float at offset 4.  It is conservatively correct for this routine to return
-/// false.
-static bool ContainsFloatAtOffset(llvm::Type *IRType, unsigned IROffset,
-                                  const llvm::DataLayout &TD) {
-  // Base case if we find a float.
-  if (IROffset == 0 && IRType->isFloatTy())
-    return true;
+/// getFPTypeAtOffset - Return a floating point type at the specified offset.
+static llvm::Type *getFPTypeAtOffset(llvm::Type *IRType, unsigned IROffset,
+                                     const llvm::DataLayout &TD) {
+  if (IROffset == 0 && IRType->isFloatingPointTy())
+    return IRType;
 
   // If this is a struct, recurse into the field at the specified offset.
   if (llvm::StructType *STy = dyn_cast<llvm::StructType>(IRType)) {
+    if (!STy->getNumContainedTypes())
+      return nullptr;
+
     const llvm::StructLayout *SL = TD.getStructLayout(STy);
     unsigned Elt = SL->getElementContainingOffset(IROffset);
     IROffset -= SL->getElementOffset(Elt);
-    return ContainsFloatAtOffset(STy->getElementType(Elt), IROffset, TD);
+    return getFPTypeAtOffset(STy->getElementType(Elt), IROffset, TD);
   }
 
   // If this is an array, recurse into the field at the specified offset.
   if (llvm::ArrayType *ATy = dyn_cast<llvm::ArrayType>(IRType)) {
     llvm::Type *EltTy = ATy->getElementType();
     unsigned EltSize = TD.getTypeAllocSize(EltTy);
-    IROffset -= IROffset/EltSize*EltSize;
-    return ContainsFloatAtOffset(EltTy, IROffset, TD);
+    IROffset -= IROffset / EltSize * EltSize;
+    return getFPTypeAtOffset(EltTy, IROffset, TD);
   }
 
-  return false;
+  return nullptr;
 }
 
-
 /// GetSSETypeAtOffset - Return a type that will be passed by the backend in the
 /// low 8 bytes of an XMM register, corresponding to the SSE class.
 llvm::Type *X86_64ABIInfo::
 GetSSETypeAtOffset(llvm::Type *IRType, unsigned IROffset,
                    QualType SourceTy, unsigned SourceOffset) const {
-  // The only three choices we have are either double, <2 x float>, or float. We
-  // pass as float if the last 4 bytes is just padding.  This happens for
-  // structs that contain 3 floats.
-  if (BitsContainNoUserData(SourceTy, SourceOffset*8+32,
-                            SourceOffset*8+64, getContext()))
-    return llvm::Type::getFloatTy(getVMContext());
-
-  // We want to pass as <2 x float> if the LLVM IR type contains a float at
-  // offset+0 and offset+4.  Walk the LLVM IR type to find out if this is the
-  // case.
-  if (ContainsFloatAtOffset(IRType, IROffset, getDataLayout()) &&
-      ContainsFloatAtOffset(IRType, IROffset+4, getDataLayout()))
-    return llvm::FixedVectorType::get(llvm::Type::getFloatTy(getVMContext()),
-                                      2);
+  const llvm::DataLayout &TD = getDataLayout();
+  unsigned SourceSize =
+      (unsigned)getContext().getTypeSize(SourceTy) / 8 - SourceOffset;
+  llvm::Type *T0 = getFPTypeAtOffset(IRType, IROffset, TD);
+  if (!T0 || T0->isDoubleTy())
+    return llvm::Type::getDoubleTy(getVMContext());
+
+  // Get the adjacent FP type.
+  llvm::Type *T1 = nullptr;
+  unsigned T0Size = TD.getTypeAllocSize(T0);
+  if (SourceSize > T0Size)
+      T1 = getFPTypeAtOffset(IRType, IROffset + T0Size, TD);
+  if (T1 == nullptr) {
+    // Check if IRType is a half/bfloat + float. float type will be in IROffset+4 due
+    // to its alignment.
+    if (T0->is16bitFPTy() && SourceSize > 4)
+      T1 = getFPTypeAtOffset(IRType, IROffset + 4, TD);
+    // If we can't get a second FP type, return a simple half or float.
+    // avx512fp16-abi.c:pr51813_2 shows it works to return float for
+    // {float, i8} too.
+    if (T1 == nullptr)
+      return T0;
+  }
+
+  if (T0->isFloatTy() && T1->isFloatTy())
+    return llvm::FixedVectorType::get(T0, 2);
+
+  if (T0->is16bitFPTy() && T1->is16bitFPTy()) {
+    llvm::Type *T2 = nullptr;
+    if (SourceSize > 4)
+      T2 = getFPTypeAtOffset(IRType, IROffset + 4, TD);
+    if (T2 == nullptr)
+      return llvm::FixedVectorType::get(T0, 2);
+    return llvm::FixedVectorType::get(T0, 4);
+  }
+
+  if (T0->is16bitFPTy() || T1->is16bitFPTy())
+    return llvm::FixedVectorType::get(llvm::Type::getHalfTy(getVMContext()), 4);
 
   return llvm::Type::getDoubleTy(getVMContext());
 }
@@ -3511,7 +3590,7 @@ GetX86_64ByValArgumentPair(llvm::Type *Lo, llvm::Type *Hi,
   // (e.g. i32 and i32) then the resultant struct type ({i32,i32}) won't have
   // the second element at offset 8.  Check for this:
   unsigned LoSize = (unsigned)TD.getTypeAllocSize(Lo);
-  unsigned HiAlign = TD.getABITypeAlignment(Hi);
+  llvm::Align HiAlign = TD.getABITypeAlign(Hi);
   unsigned HiStart = llvm::alignTo(LoSize, HiAlign);
   assert(HiStart != 0 && HiStart <= 8 && "Invalid x86-64 argument pair!");
 
@@ -3521,11 +3600,11 @@ GetX86_64ByValArgumentPair(llvm::Type *Lo, llvm::Type *Hi,
   // struct.
   if (HiStart != 8) {
     // There are usually two sorts of types the ABI generation code can produce
-    // for the low part of a pair that aren't 8 bytes in size: float or
+    // for the low part of a pair that aren't 8 bytes in size: half, float or
     // i8/i16/i32.  This can also include pointers when they are 32-bit (X32 and
     // NaCl).
     // Promote these to a larger type.
-    if (Lo->isFloatTy())
+    if (Lo->isHalfTy() || Lo->isFloatTy())
       Lo = llvm::Type::getDoubleTy(Lo->getContext());
     else {
       assert((Lo->isIntegerTy() || Lo->isPointerTy())
@@ -3670,15 +3749,14 @@ classifyReturnType(QualType RetTy) const {
   return ABIArgInfo::getDirect(ResType);
 }
 
-ABIArgInfo X86_64ABIInfo::classifyArgumentType(
-  QualType Ty, unsigned freeIntRegs, unsigned &neededInt, unsigned &neededSSE,
-  bool isNamedArg)
-  const
-{
+ABIArgInfo
+X86_64ABIInfo::classifyArgumentType(QualType Ty, unsigned freeIntRegs,
+                                    unsigned &neededInt, unsigned &neededSSE,
+                                    bool isNamedArg, bool IsRegCall) const {
   Ty = useFirstFieldIfTransparentUnion(Ty);
 
   X86_64ABIInfo::Class Lo, Hi;
-  classify(Ty, 0, Lo, Hi, isNamedArg);
+  classify(Ty, 0, Lo, Hi, isNamedArg, IsRegCall);
 
   // Check some invariants.
   // FIXME: Enforce these by construction.
@@ -3801,7 +3879,8 @@ ABIArgInfo X86_64ABIInfo::classifyArgumentType(
 
 ABIArgInfo
 X86_64ABIInfo::classifyRegCallStructTypeImpl(QualType Ty, unsigned &NeededInt,
-                                             unsigned &NeededSSE) const {
+                                             unsigned &NeededSSE,
+                                             unsigned &MaxVectorWidth) const {
   auto RT = Ty->getAs<RecordType>();
   assert(RT && "classifyRegCallStructType only valid with struct types");
 
@@ -3816,7 +3895,8 @@ X86_64ABIInfo::classifyRegCallStructTypeImpl(QualType Ty, unsigned &NeededInt,
     }
 
     for (const auto &I : CXXRD->bases())
-      if (classifyRegCallStructTypeImpl(I.getType(), NeededInt, NeededSSE)
+      if (classifyRegCallStructTypeImpl(I.getType(), NeededInt, NeededSSE,
+                                        MaxVectorWidth)
               .isIndirect()) {
         NeededInt = NeededSSE = 0;
         return getIndirectReturnResult(Ty);
@@ -3825,20 +3905,27 @@ X86_64ABIInfo::classifyRegCallStructTypeImpl(QualType Ty, unsigned &NeededInt,
 
   // Sum up members
   for (const auto *FD : RT->getDecl()->fields()) {
-    if (FD->getType()->isRecordType() && !FD->getType()->isUnionType()) {
-      if (classifyRegCallStructTypeImpl(FD->getType(), NeededInt, NeededSSE)
+    QualType MTy = FD->getType();
+    if (MTy->isRecordType() && !MTy->isUnionType()) {
+      if (classifyRegCallStructTypeImpl(MTy, NeededInt, NeededSSE,
+                                        MaxVectorWidth)
               .isIndirect()) {
         NeededInt = NeededSSE = 0;
         return getIndirectReturnResult(Ty);
       }
     } else {
       unsigned LocalNeededInt, LocalNeededSSE;
-      if (classifyArgumentType(FD->getType(), UINT_MAX, LocalNeededInt,
-                               LocalNeededSSE, true)
+      if (classifyArgumentType(MTy, UINT_MAX, LocalNeededInt, LocalNeededSSE,
+                               true, true)
               .isIndirect()) {
         NeededInt = NeededSSE = 0;
         return getIndirectReturnResult(Ty);
       }
+      if (const auto *AT = getContext().getAsConstantArrayType(MTy))
+        MTy = AT->getElementType();
+      if (const auto *VT = MTy->getAs<VectorType>())
+        if (getContext().getTypeSize(VT) > MaxVectorWidth)
+          MaxVectorWidth = getContext().getTypeSize(VT);
       NeededInt += LocalNeededInt;
       NeededSSE += LocalNeededSSE;
     }
@@ -3847,14 +3934,17 @@ X86_64ABIInfo::classifyRegCallStructTypeImpl(QualType Ty, unsigned &NeededInt,
   return ABIArgInfo::getDirect();
 }
 
-ABIArgInfo X86_64ABIInfo::classifyRegCallStructType(QualType Ty,
-                                                    unsigned &NeededInt,
-                                                    unsigned &NeededSSE) const {
+ABIArgInfo
+X86_64ABIInfo::classifyRegCallStructType(QualType Ty, unsigned &NeededInt,
+                                         unsigned &NeededSSE,
+                                         unsigned &MaxVectorWidth) const {
 
   NeededInt = 0;
   NeededSSE = 0;
+  MaxVectorWidth = 0;
 
-  return classifyRegCallStructTypeImpl(Ty, NeededInt, NeededSSE);
+  return classifyRegCallStructTypeImpl(Ty, NeededInt, NeededSSE,
+                                       MaxVectorWidth);
 }
 
 void X86_64ABIInfo::computeInfo(CGFunctionInfo &FI) const {
@@ -3874,13 +3964,13 @@ void X86_64ABIInfo::computeInfo(CGFunctionInfo &FI) const {
   // Keep track of the number of assigned registers.
   unsigned FreeIntRegs = IsRegCall ? 11 : 6;
   unsigned FreeSSERegs = IsRegCall ? 16 : 8;
-  unsigned NeededInt, NeededSSE;
+  unsigned NeededInt = 0, NeededSSE = 0, MaxVectorWidth = 0;
 
   if (!::classifyReturnType(getCXXABI(), FI, *this)) {
     if (IsRegCall && FI.getReturnType()->getTypePtr()->isRecordType() &&
         !FI.getReturnType()->getTypePtr()->isUnionType()) {
-      FI.getReturnInfo() =
-          classifyRegCallStructType(FI.getReturnType(), NeededInt, NeededSSE);
+      FI.getReturnInfo() = classifyRegCallStructType(
+          FI.getReturnType(), NeededInt, NeededSSE, MaxVectorWidth);
       if (FreeIntRegs >= NeededInt && FreeSSERegs >= NeededSSE) {
         FreeIntRegs -= NeededInt;
         FreeSSERegs -= NeededSSE;
@@ -3903,6 +3993,8 @@ void X86_64ABIInfo::computeInfo(CGFunctionInfo &FI) const {
   // integer register.
   if (FI.getReturnInfo().isIndirect())
     --FreeIntRegs;
+  else if (NeededSSE && MaxVectorWidth > 0)
+    FI.setMaxVectorWidth(MaxVectorWidth);
 
   // The chain argument effectively gives us another free register.
   if (FI.isChainCall())
@@ -3917,7 +4009,8 @@ void X86_64ABIInfo::computeInfo(CGFunctionInfo &FI) const {
     bool IsNamedArg = ArgNo < NumRequiredArgs;
 
     if (IsRegCall && it->type->isStructureOrClassType())
-      it->info = classifyRegCallStructType(it->type, NeededInt, NeededSSE);
+      it->info = classifyRegCallStructType(it->type, NeededInt, NeededSSE,
+                                           MaxVectorWidth);
     else
       it->info = classifyArgumentType(it->type, FreeIntRegs, NeededInt,
                                       NeededSSE, IsNamedArg);
@@ -3929,6 +4022,8 @@ void X86_64ABIInfo::computeInfo(CGFunctionInfo &FI) const {
     if (FreeIntRegs >= NeededInt && FreeSSERegs >= NeededSSE) {
       FreeIntRegs -= NeededInt;
       FreeSSERegs -= NeededSSE;
+      if (MaxVectorWidth > FI.getMaxVectorWidth())
+        FI.setMaxVectorWidth(MaxVectorWidth);
     } else {
       it->info = getIndirectResult(it->type, FreeIntRegs);
     }
@@ -3971,7 +4066,7 @@ static Address EmitX86_64VAArgFromMemory(CodeGenFunction &CGF,
   CGF.Builder.CreateStore(overflow_arg_area, overflow_arg_area_p);
 
   // AMD64-ABI 3.5.7p5: Step 11. Return the fetched type.
-  return Address(Res, Align);
+  return Address(Res, LTy, Align);
 }
 
 Address X86_64ABIInfo::EmitVAArg(CodeGenFunction &CGF, Address VAListAddr,
@@ -4072,19 +4167,19 @@ Address X86_64ABIInfo::EmitVAArg(CodeGenFunction &CGF, Address VAListAddr,
     // FIXME: Our choice of alignment here and below is probably pessimistic.
     llvm::Value *V = CGF.Builder.CreateAlignedLoad(
         TyLo, CGF.Builder.CreateBitCast(RegLoAddr, PTyLo),
-        CharUnits::fromQuantity(getDataLayout().getABITypeAlignment(TyLo)));
+        CharUnits::fromQuantity(getDataLayout().getABITypeAlign(TyLo)));
     CGF.Builder.CreateStore(V, CGF.Builder.CreateStructGEP(Tmp, 0));
 
     // Copy the second element.
     V = CGF.Builder.CreateAlignedLoad(
         TyHi, CGF.Builder.CreateBitCast(RegHiAddr, PTyHi),
-        CharUnits::fromQuantity(getDataLayout().getABITypeAlignment(TyHi)));
+        CharUnits::fromQuantity(getDataLayout().getABITypeAlign(TyHi)));
     CGF.Builder.CreateStore(V, CGF.Builder.CreateStructGEP(Tmp, 1));
 
     RegAddr = CGF.Builder.CreateElementBitCast(Tmp, LTy);
   } else if (neededInt) {
     RegAddr = Address(CGF.Builder.CreateGEP(CGF.Int8Ty, RegSaveArea, gp_offset),
-                      CharUnits::fromQuantity(8));
+                      CGF.Int8Ty, CharUnits::fromQuantity(8));
     RegAddr = CGF.Builder.CreateElementBitCast(RegAddr, LTy);
 
     // Copy to a temporary if necessary to ensure the appropriate alignment.
@@ -4102,7 +4197,7 @@ Address X86_64ABIInfo::EmitVAArg(CodeGenFunction &CGF, Address VAListAddr,
 
   } else if (neededSSE == 1) {
     RegAddr = Address(CGF.Builder.CreateGEP(CGF.Int8Ty, RegSaveArea, fp_offset),
-                      CharUnits::fromQuantity(16));
+                      CGF.Int8Ty, CharUnits::fromQuantity(16));
     RegAddr = CGF.Builder.CreateElementBitCast(RegAddr, LTy);
   } else {
     assert(neededSSE == 2 && "Invalid number of needed registers!");
@@ -4114,7 +4209,7 @@ Address X86_64ABIInfo::EmitVAArg(CodeGenFunction &CGF, Address VAListAddr,
     // all the SSE registers to the RSA.
     Address RegAddrLo = Address(CGF.Builder.CreateGEP(CGF.Int8Ty, RegSaveArea,
                                                       fp_offset),
-                                CharUnits::fromQuantity(16));
+                                CGF.Int8Ty, CharUnits::fromQuantity(16));
     Address RegAddrHi =
       CGF.Builder.CreateConstInBoundsByteGEP(RegAddrLo,
                                              CharUnits::fromQuantity(16));
@@ -4295,12 +4390,12 @@ ABIArgInfo WinX86_64ABIInfo::classify(QualType Ty, unsigned &FreeSSERegs,
     }
   }
 
-  if (Ty->isExtIntType()) {
+  if (Ty->isBitIntType()) {
     // MS x64 ABI requirement: "Any argument that doesn't fit in 8 bytes, or is
     // not 1, 2, 4, or 8 bytes, must be passed by reference."
-    // However, non-power-of-two _ExtInts will be passed as 1,2,4 or 8 bytes
-    // anyway as long is it fits in them, so we don't have to check the power of
-    // 2.
+    // However, non-power-of-two bit-precise integers will be passed as 1, 2, 4,
+    // or 8 bytes anyway as long is it fits in them, so we don't have to check
+    // the power of 2.
     if (Width <= 64)
       return ABIArgInfo::getDirect();
     return ABIArgInfo::getIndirect(Align, /*ByVal=*/false);
@@ -4491,7 +4586,7 @@ bool AIXABIInfo::isPromotableTypeForABI(QualType Ty) const {
     Ty = EnumTy->getDecl()->getIntegerType();
 
   // Promotable integer types are required to be promoted by the ABI.
-  if (Ty->isPromotableIntegerType())
+  if (getContext().isPromotableIntegerType(Ty))
     return true;
 
   if (!Is64Bit)
@@ -4572,14 +4667,25 @@ CharUnits AIXABIInfo::getParamTypeAlignment(QualType Ty) const {
 
 Address AIXABIInfo::EmitVAArg(CodeGenFunction &CGF, Address VAListAddr,
                               QualType Ty) const {
-  if (Ty->isAnyComplexType())
-    llvm::report_fatal_error("complex type is not supported on AIX yet");
 
   auto TypeInfo = getContext().getTypeInfoInChars(Ty);
   TypeInfo.Align = getParamTypeAlignment(Ty);
 
   CharUnits SlotSize = CharUnits::fromQuantity(PtrByteSize);
 
+  // If we have a complex type and the base type is smaller than the register
+  // size, the ABI calls for the real and imaginary parts to be right-adjusted
+  // in separate words in 32bit mode or doublewords in 64bit mode. However,
+  // Clang expects us to produce a pointer to a structure with the two parts
+  // packed tightly. So generate loads of the real and imaginary parts relative
+  // to the va_list pointer, and store them to a temporary structure. We do the
+  // same as the PPC64ABI here.
+  if (const ComplexType *CTy = Ty->getAs<ComplexType>()) {
+    CharUnits EltSize = TypeInfo.Width / 2;
+    if (EltSize < SlotSize)
+      return complexTempStructure(CGF, VAListAddr, Ty, SlotSize, EltSize, CTy);
+  }
+
   return emitVoidPtrVAArg(CGF, VAListAddr, Ty, /*Indirect*/ false, TypeInfo,
                           SlotSize, /*AllowHigher*/ true);
 }
@@ -4753,7 +4859,7 @@ Address PPC32_SVR4_ABIInfo::EmitVAArg(CodeGenFunction &CGF, Address VAList,
 
   Builder.CreateCondBr(CC, UsingRegs, UsingOverflow);
 
-  llvm::Type *DirectTy = CGF.ConvertType(Ty);
+  llvm::Type *DirectTy = CGF.ConvertType(Ty), *ElementTy = DirectTy;
   if (isIndirect) DirectTy = DirectTy->getPointerTo(0);
 
   // Case 1: consume registers.
@@ -4762,7 +4868,7 @@ Address PPC32_SVR4_ABIInfo::EmitVAArg(CodeGenFunction &CGF, Address VAList,
     CGF.EmitBlock(UsingRegs);
 
     Address RegSaveAreaPtr = Builder.CreateStructGEP(VAList, 4);
-    RegAddr = Address(Builder.CreateLoad(RegSaveAreaPtr),
+    RegAddr = Address(Builder.CreateLoad(RegSaveAreaPtr), CGF.Int8Ty,
                       CharUnits::fromQuantity(8));
     assert(RegAddr.getElementType() == CGF.Int8Ty);
 
@@ -4776,10 +4882,10 @@ Address PPC32_SVR4_ABIInfo::EmitVAArg(CodeGenFunction &CGF, Address VAList,
     // registers we've used by the number of
     CharUnits RegSize = CharUnits::fromQuantity((isInt || IsSoftFloatABI) ? 4 : 8);
     llvm::Value *RegOffset =
-      Builder.CreateMul(NumRegs, Builder.getInt8(RegSize.getQuantity()));
-    RegAddr = Address(Builder.CreateInBoundsGEP(CGF.Int8Ty,
-                                            RegAddr.getPointer(), RegOffset),
-                      RegAddr.getAlignment().alignmentOfArrayElement(RegSize));
+        Builder.CreateMul(NumRegs, Builder.getInt8(RegSize.getQuantity()));
+    RegAddr = Address(
+        Builder.CreateInBoundsGEP(CGF.Int8Ty, RegAddr.getPointer(), RegOffset),
+        CGF.Int8Ty, RegAddr.getAlignment().alignmentOfArrayElement(RegSize));
     RegAddr = Builder.CreateElementBitCast(RegAddr, DirectTy);
 
     // Increase the used-register count.
@@ -4810,14 +4916,15 @@ Address PPC32_SVR4_ABIInfo::EmitVAArg(CodeGenFunction &CGF, Address VAList,
     }
 
     Address OverflowAreaAddr = Builder.CreateStructGEP(VAList, 3);
-    Address OverflowArea(Builder.CreateLoad(OverflowAreaAddr, "argp.cur"),
-                         OverflowAreaAlign);
+    Address OverflowArea =
+        Address(Builder.CreateLoad(OverflowAreaAddr, "argp.cur"), CGF.Int8Ty,
+                OverflowAreaAlign);
     // Round up address of argument to alignment
     CharUnits Align = CGF.getContext().getTypeAlignInChars(Ty);
     if (Align > OverflowAreaAlign) {
       llvm::Value *Ptr = OverflowArea.getPointer();
       OverflowArea = Address(emitRoundPointerUpToAlignment(CGF, Ptr, Align),
-                                                           Align);
+                             OverflowArea.getElementType(), Align);
     }
 
     MemAddr = Builder.CreateElementBitCast(OverflowArea, DirectTy);
@@ -4836,7 +4943,7 @@ Address PPC32_SVR4_ABIInfo::EmitVAArg(CodeGenFunction &CGF, Address VAList,
 
   // Load the pointer if the argument was passed indirectly.
   if (isIndirect) {
-    Result = Address(Builder.CreateLoad(Result, "aggr"),
+    Result = Address(Builder.CreateLoad(Result, "aggr"), ElementTy,
                      getContext().getTypeAlignInChars(Ty));
   }
 
@@ -4873,7 +4980,7 @@ PPC32TargetCodeGenInfo::initDwarfEHRegSizeTable(CodeGen::CodeGenFunction &CGF,
 
 namespace {
 /// PPC64_SVR4_ABIInfo - The 64-bit PowerPC ELF (SVR4) ABI information.
-class PPC64_SVR4_ABIInfo : public SwiftABIInfo {
+class PPC64_SVR4_ABIInfo : public ABIInfo {
 public:
   enum ABIKind {
     ELFv1 = 0,
@@ -4888,7 +4995,7 @@ private:
 public:
   PPC64_SVR4_ABIInfo(CodeGen::CodeGenTypes &CGT, ABIKind Kind,
                      bool SoftFloatABI)
-      : SwiftABIInfo(CGT), Kind(Kind), IsSoftFloatABI(SoftFloatABI) {}
+      : ABIInfo(CGT), Kind(Kind), IsSoftFloatABI(SoftFloatABI) {}
 
   bool isPromotableTypeForABI(QualType Ty) const;
   CharUnits getParamTypeAlignment(QualType Ty) const;
@@ -4929,15 +5036,6 @@ public:
 
   Address EmitVAArg(CodeGenFunction &CGF, Address VAListAddr,
                     QualType Ty) const override;
-
-  bool shouldPassIndirectlyForSwift(ArrayRef<llvm::Type*> scalars,
-                                    bool asReturnValue) const override {
-    return occupiesMoreThan(CGT, scalars, /*total*/ 4);
-  }
-
-  bool isSwiftErrorInRegister() const override {
-    return false;
-  }
 };
 
 class PPC64_SVR4_TargetCodeGenInfo : public TargetCodeGenInfo {
@@ -4947,7 +5045,10 @@ public:
                                PPC64_SVR4_ABIInfo::ABIKind Kind,
                                bool SoftFloatABI)
       : TargetCodeGenInfo(
-            std::make_unique<PPC64_SVR4_ABIInfo>(CGT, Kind, SoftFloatABI)) {}
+            std::make_unique<PPC64_SVR4_ABIInfo>(CGT, Kind, SoftFloatABI)) {
+    SwiftInfo =
+        std::make_unique<SwiftABIInfo>(CGT, /*SwiftErrorInRegister=*/false);
+  }
 
   int getDwarfEHStackPointer(CodeGen::CodeGenModule &M) const override {
     // This is recovered from gcc output.
@@ -4996,7 +5097,7 @@ PPC64_SVR4_ABIInfo::isPromotableTypeForABI(QualType Ty) const {
       break;
     }
 
-  if (const auto *EIT = Ty->getAs<ExtIntType>())
+  if (const auto *EIT = Ty->getAs<BitIntType>())
     if (EIT->getNumBits() < 64)
       return true;
 
@@ -5010,13 +5111,16 @@ CharUnits PPC64_SVR4_ABIInfo::getParamTypeAlignment(QualType Ty) const {
   if (const ComplexType *CTy = Ty->getAs<ComplexType>())
     Ty = CTy->getElementType();
 
+  auto FloatUsesVector = [this](QualType Ty){
+    return Ty->isRealFloatingType() && &getContext().getFloatTypeSemantics(
+                                           Ty) == &llvm::APFloat::IEEEquad();
+  };
+
   // Only vector types of size 16 bytes need alignment (larger types are
   // passed via reference, smaller types are not aligned).
   if (Ty->isVectorType()) {
     return CharUnits::fromQuantity(getContext().getTypeSize(Ty) == 128 ? 16 : 8);
-  } else if (Ty->isRealFloatingType() &&
-             &getContext().getFloatTypeSemantics(Ty) ==
-                 &llvm::APFloat::IEEEquad()) {
+  } else if (FloatUsesVector(Ty)) {
     // According to ABI document section 'Optional Save Areas': If extended
     // precision floating-point values in IEEE BINARY 128 QUADRUPLE PRECISION
     // format are supported, map them to a single quadword, quadword aligned.
@@ -5043,7 +5147,9 @@ CharUnits PPC64_SVR4_ABIInfo::getParamTypeAlignment(QualType Ty) const {
 
   // With special case aggregates, only vector base types need alignment.
   if (AlignAsType) {
-    return CharUnits::fromQuantity(AlignAsType->isVectorType() ? 16 : 8);
+    bool UsesVector = AlignAsType->isVectorType() ||
+                      FloatUsesVector(QualType(AlignAsType, 0));
+    return CharUnits::fromQuantity(UsesVector ? 16 : 8);
   }
 
   // Otherwise, we only need alignment for any aggregate type that
@@ -5105,8 +5211,7 @@ bool ABIInfo::isHomogeneousAggregate(QualType Ty, const Type *&Base,
       if (isEmptyRecord(getContext(), FT, true))
         continue;
 
-      // For compatibility with GCC, ignore empty bitfields in C++ mode.
-      if (getContext().getLangOpts().CPlusPlus &&
+      if (isZeroLengthBitfieldPermittedInHomogeneousAggregate() &&
           FD->isZeroLengthBitField(getContext()))
         continue;
 
@@ -5168,8 +5273,9 @@ bool PPC64_SVR4_ABIInfo::isHomogeneousAggregateBaseType(QualType Ty) const {
     if (BT->getKind() == BuiltinType::Float ||
         BT->getKind() == BuiltinType::Double ||
         BT->getKind() == BuiltinType::LongDouble ||
+        BT->getKind() == BuiltinType::Ibm128 ||
         (getContext().getTargetInfo().hasFloat128Type() &&
-          (BT->getKind() == BuiltinType::Float128))) {
+         (BT->getKind() == BuiltinType::Float128))) {
       if (IsSoftFloatABI)
         return false;
       return true;
@@ -5215,7 +5321,7 @@ PPC64_SVR4_ABIInfo::classifyArgumentType(QualType Ty) const {
     }
   }
 
-  if (const auto *EIT = Ty->getAs<ExtIntType>())
+  if (const auto *EIT = Ty->getAs<BitIntType>())
     if (EIT->getNumBits() > 128)
       return getNaturalAlignIndirect(Ty, /*ByVal=*/true);
 
@@ -5291,7 +5397,7 @@ PPC64_SVR4_ABIInfo::classifyReturnType(QualType RetTy) const {
     }
   }
 
-  if (const auto *EIT = RetTy->getAs<ExtIntType>())
+  if (const auto *EIT = RetTy->getAs<BitIntType>())
     if (EIT->getNumBits() > 128)
       return getNaturalAlignIndirect(RetTy, /*ByVal=*/false);
 
@@ -5346,38 +5452,26 @@ Address PPC64_SVR4_ABIInfo::EmitVAArg(CodeGenFunction &CGF, Address VAListAddr,
   // and store them to a temporary structure.
   if (const ComplexType *CTy = Ty->getAs<ComplexType>()) {
     CharUnits EltSize = TypeInfo.Width / 2;
-    if (EltSize < SlotSize) {
-      Address Addr = emitVoidPtrDirectVAArg(CGF, VAListAddr, CGF.Int8Ty,
-                                            SlotSize * 2, SlotSize,
-                                            SlotSize, /*AllowHigher*/ true);
-
-      Address RealAddr = Addr;
-      Address ImagAddr = RealAddr;
-      if (CGF.CGM.getDataLayout().isBigEndian()) {
-        RealAddr = CGF.Builder.CreateConstInBoundsByteGEP(RealAddr,
-                                                          SlotSize - EltSize);
-        ImagAddr = CGF.Builder.CreateConstInBoundsByteGEP(ImagAddr,
-                                                      2 * SlotSize - EltSize);
-      } else {
-        ImagAddr = CGF.Builder.CreateConstInBoundsByteGEP(RealAddr, SlotSize);
-      }
-
-      llvm::Type *EltTy = CGF.ConvertTypeForMem(CTy->getElementType());
-      RealAddr = CGF.Builder.CreateElementBitCast(RealAddr, EltTy);
-      ImagAddr = CGF.Builder.CreateElementBitCast(ImagAddr, EltTy);
-      llvm::Value *Real = CGF.Builder.CreateLoad(RealAddr, ".vareal");
-      llvm::Value *Imag = CGF.Builder.CreateLoad(ImagAddr, ".vaimag");
-
-      Address Temp = CGF.CreateMemTemp(Ty, "vacplx");
-      CGF.EmitStoreOfComplex({Real, Imag}, CGF.MakeAddrLValue(Temp, Ty),
-                             /*init*/ true);
-      return Temp;
-    }
+    if (EltSize < SlotSize)
+      return complexTempStructure(CGF, VAListAddr, Ty, SlotSize, EltSize, CTy);
   }
 
   // Otherwise, just use the general rule.
-  return emitVoidPtrVAArg(CGF, VAListAddr, Ty, /*Indirect*/ false,
-                          TypeInfo, SlotSize, /*AllowHigher*/ true);
+  //
+  // The PPC64 ABI passes some arguments in integer registers, even to variadic
+  // functions. To allow va_list to use the simple "void*" representation,
+  // variadic calls allocate space in the argument area for the integer argument
+  // registers, and variadic functions spill their integer argument registers to
+  // this area in their prologues. When aggregates smaller than a register are
+  // passed this way, they are passed in the least significant bits of the
+  // register, which means that after spilling on big-endian targets they will
+  // be right-aligned in their argument slot. This is uncommon; for a variety of
+  // reasons, other big-endian targets don't end up right-aligning aggregate
+  // types this way, and so right-alignment only applies to fundamental types.
+  // So on PPC64, we must force the use of right-alignment even for aggregates.
+  return emitVoidPtrVAArg(CGF, VAListAddr, Ty, /*Indirect*/ false, TypeInfo,
+                          SlotSize, /*AllowHigher*/ true,
+                          /*ForceRightAdjust*/ true);
 }
 
 bool
@@ -5401,7 +5495,7 @@ PPC64TargetCodeGenInfo::initDwarfEHRegSizeTable(CodeGen::CodeGenFunction &CGF,
 
 namespace {
 
-class AArch64ABIInfo : public SwiftABIInfo {
+class AArch64ABIInfo : public ABIInfo {
 public:
   enum ABIKind {
     AAPCS = 0,
@@ -5413,8 +5507,7 @@ private:
   ABIKind Kind;
 
 public:
-  AArch64ABIInfo(CodeGenTypes &CGT, ABIKind Kind)
-    : SwiftABIInfo(CGT), Kind(Kind) {}
+  AArch64ABIInfo(CodeGenTypes &CGT, ABIKind Kind) : ABIInfo(CGT), Kind(Kind) {}
 
 private:
   ABIKind getABIKind() const { return Kind; }
@@ -5427,6 +5520,7 @@ private:
   bool isHomogeneousAggregateBaseType(QualType Ty) const override;
   bool isHomogeneousAggregateSmallEnough(const Type *Ty,
                                          uint64_t Members) const override;
+  bool isZeroLengthBitfieldPermittedInHomogeneousAggregate() const override;
 
   bool isIllegalVectorType(QualType Ty) const;
 
@@ -5461,26 +5555,26 @@ private:
   Address EmitMSVAArg(CodeGenFunction &CGF, Address VAListAddr,
                       QualType Ty) const override;
 
-  bool shouldPassIndirectlyForSwift(ArrayRef<llvm::Type*> scalars,
-                                    bool asReturnValue) const override {
-    return occupiesMoreThan(CGT, scalars, /*total*/ 4);
-  }
-  bool isSwiftErrorInRegister() const override {
-    return true;
-  }
-
-  bool isLegalVectorTypeForSwift(CharUnits totalSize, llvm::Type *eltTy,
-                                 unsigned elts) const override;
-
   bool allowBFloatArgsAndRet() const override {
     return getTarget().hasBFloat16Type();
   }
 };
 
+class AArch64SwiftABIInfo : public SwiftABIInfo {
+public:
+  explicit AArch64SwiftABIInfo(CodeGenTypes &CGT)
+      : SwiftABIInfo(CGT, /*SwiftErrorInRegister=*/true) {}
+
+  bool isLegalVectorType(CharUnits VectorSize, llvm::Type *EltTy,
+                         unsigned NumElts) const override;
+};
+
 class AArch64TargetCodeGenInfo : public TargetCodeGenInfo {
 public:
   AArch64TargetCodeGenInfo(CodeGenTypes &CGT, AArch64ABIInfo::ABIKind Kind)
-      : TargetCodeGenInfo(std::make_unique<AArch64ABIInfo>(CGT, Kind)) {}
+      : TargetCodeGenInfo(std::make_unique<AArch64ABIInfo>(CGT, Kind)) {
+    SwiftInfo = std::make_unique<AArch64SwiftABIInfo>(CGT);
+  }
 
   StringRef getARCRetainAutoreleasedReturnValueMarker() const override {
     return "mov\tfp, fp\t\t// marker for objc_retainAutoreleaseReturnValue";
@@ -5502,14 +5596,15 @@ public:
     if (TA == nullptr)
       return;
 
-    ParsedTargetAttr Attr = TA->parse();
+    ParsedTargetAttr Attr =
+        CGM.getTarget().parseTargetAttr(TA->getFeaturesStr());
     if (Attr.BranchProtection.empty())
       return;
 
     TargetInfo::BranchProtectionInfo BPI;
     StringRef Error;
     (void)CGM.getTarget().validateBranchProtection(Attr.BranchProtection,
-                                                   BPI, Error);
+                                                   Attr.CPU, BPI, Error);
     assert(Error.empty());
 
     auto *Fn = cast<llvm::Function>(GV);
@@ -5668,7 +5763,7 @@ AArch64ABIInfo::classifyArgumentType(QualType Ty, bool IsVariadic,
     if (const EnumType *EnumTy = Ty->getAs<EnumType>())
       Ty = EnumTy->getDecl()->getIntegerType();
 
-    if (const auto *EIT = Ty->getAs<ExtIntType>())
+    if (const auto *EIT = Ty->getAs<BitIntType>())
       if (EIT->getNumBits() > 128)
         return getNaturalAlignIndirect(Ty);
 
@@ -5734,8 +5829,9 @@ AArch64ABIInfo::classifyArgumentType(QualType Ty, bool IsVariadic,
       Alignment = getContext().getTypeUnadjustedAlign(Ty);
       Alignment = Alignment < 128 ? 64 : 128;
     } else {
-      Alignment = std::max(getContext().getTypeAlign(Ty),
-                           (unsigned)getTarget().getPointerWidth(0));
+      Alignment =
+          std::max(getContext().getTypeAlign(Ty),
+                   (unsigned)getTarget().getPointerWidth(LangAS::Default));
     }
     Size = llvm::alignTo(Size, Alignment);
 
@@ -5770,7 +5866,7 @@ ABIArgInfo AArch64ABIInfo::classifyReturnType(QualType RetTy,
     if (const EnumType *EnumTy = RetTy->getAs<EnumType>())
       RetTy = EnumTy->getDecl()->getIntegerType();
 
-    if (const auto *EIT = RetTy->getAs<ExtIntType>())
+    if (const auto *EIT = RetTy->getAs<BitIntType>())
       if (EIT->getNumBits() > 128)
         return getNaturalAlignIndirect(RetTy);
 
@@ -5854,13 +5950,13 @@ bool AArch64ABIInfo::isIllegalVectorType(QualType Ty) const {
   return false;
 }
 
-bool AArch64ABIInfo::isLegalVectorTypeForSwift(CharUnits totalSize,
-                                               llvm::Type *eltTy,
-                                               unsigned elts) const {
-  if (!llvm::isPowerOf2_32(elts))
+bool AArch64SwiftABIInfo::isLegalVectorType(CharUnits VectorSize,
+                                            llvm::Type *EltTy,
+                                            unsigned NumElts) const {
+  if (!llvm::isPowerOf2_32(NumElts))
     return false;
-  if (totalSize.getQuantity() != 8 &&
-      (totalSize.getQuantity() != 16 || elts == 1))
+  if (VectorSize.getQuantity() != 8 &&
+      (VectorSize.getQuantity() != 16 || NumElts == 1))
     return false;
   return true;
 }
@@ -5886,10 +5982,30 @@ bool AArch64ABIInfo::isHomogeneousAggregateSmallEnough(const Type *Base,
   return Members <= 4;
 }
 
+bool AArch64ABIInfo::isZeroLengthBitfieldPermittedInHomogeneousAggregate()
+    const {
+  // AAPCS64 says that the rule for whether something is a homogeneous
+  // aggregate is applied to the output of the data layout decision. So
+  // anything that doesn't affect the data layout also does not affect
+  // homogeneity. In particular, zero-length bitfields don't stop a struct
+  // being homogeneous.
+  return true;
+}
+
 Address AArch64ABIInfo::EmitAAPCSVAArg(Address VAListAddr, QualType Ty,
                                        CodeGenFunction &CGF) const {
   ABIArgInfo AI = classifyArgumentType(Ty, /*IsVariadic=*/true,
                                        CGF.CurFnInfo->getCallingConvention());
+  // Empty records are ignored for parameter passing purposes.
+  if (AI.isIgnore()) {
+    uint64_t PointerSize = getTarget().getPointerWidth(LangAS::Default) / 8;
+    CharUnits SlotSize = CharUnits::fromQuantity(PointerSize);
+    VAListAddr = CGF.Builder.CreateElementBitCast(VAListAddr, CGF.Int8PtrTy);
+    auto *Load = CGF.Builder.CreateLoad(VAListAddr);
+    Address Addr = Address(Load, CGF.Int8Ty, SlotSize);
+    return CGF.Builder.CreateElementBitCast(Addr, CGF.ConvertTypeForMem(Ty));
+  }
+
   bool IsIndirect = AI.isIndirect();
 
   llvm::Type *BaseTy = CGF.ConvertType(Ty);
@@ -6004,9 +6120,9 @@ Address AArch64ABIInfo::EmitAAPCSVAArg(Address VAListAddr, QualType Ty,
       CGF.Builder.CreateStructGEP(VAListAddr, reg_top_index, "reg_top_p");
   reg_top = CGF.Builder.CreateLoad(reg_top_p, "reg_top");
   Address BaseAddr(CGF.Builder.CreateInBoundsGEP(CGF.Int8Ty, reg_top, reg_offs),
-                   CharUnits::fromQuantity(IsFPR ? 16 : 8));
+                   CGF.Int8Ty, CharUnits::fromQuantity(IsFPR ? 16 : 8));
   Address RegAddr = Address::invalid();
-  llvm::Type *MemTy = CGF.ConvertTypeForMem(Ty);
+  llvm::Type *MemTy = CGF.ConvertTypeForMem(Ty), *ElementTy = MemTy;
 
   if (IsIndirect) {
     // If it's been passed indirectly (actually a struct), whatever we find from
@@ -6089,8 +6205,8 @@ Address AArch64ABIInfo::EmitAAPCSVAArg(Address VAListAddr, QualType Ty,
 
     OnStackPtr = CGF.Builder.CreateIntToPtr(OnStackPtr, CGF.Int8PtrTy);
   }
-  Address OnStackAddr(OnStackPtr,
-                      std::max(CharUnits::fromQuantity(8), TyAlign));
+  Address OnStackAddr = Address(OnStackPtr, CGF.Int8Ty,
+                                std::max(CharUnits::fromQuantity(8), TyAlign));
 
   // All stack slots are multiples of 8 bytes.
   CharUnits StackSlotSize = CharUnits::fromQuantity(8);
@@ -6122,11 +6238,11 @@ Address AArch64ABIInfo::EmitAAPCSVAArg(Address VAListAddr, QualType Ty,
   //=======================================
   CGF.EmitBlock(ContBlock);
 
-  Address ResAddr = emitMergePHI(CGF, RegAddr, InRegBlock,
-                                 OnStackAddr, OnStackBlock, "vaargs.addr");
+  Address ResAddr = emitMergePHI(CGF, RegAddr, InRegBlock, OnStackAddr,
+                                 OnStackBlock, "vaargs.addr");
 
   if (IsIndirect)
-    return Address(CGF.Builder.CreateLoad(ResAddr, "vaarg.addr"),
+    return Address(CGF.Builder.CreateLoad(ResAddr, "vaarg.addr"), ElementTy,
                    TyAlign);
 
   return ResAddr;
@@ -6140,12 +6256,13 @@ Address AArch64ABIInfo::EmitDarwinVAArg(Address VAListAddr, QualType Ty,
   if (!isAggregateTypeForABI(Ty) && !isIllegalVectorType(Ty))
     return EmitVAArgInstr(CGF, VAListAddr, Ty, ABIArgInfo::getDirect());
 
-  uint64_t PointerSize = getTarget().getPointerWidth(0) / 8;
+  uint64_t PointerSize = getTarget().getPointerWidth(LangAS::Default) / 8;
   CharUnits SlotSize = CharUnits::fromQuantity(PointerSize);
 
   // Empty records are ignored for parameter passing purposes.
   if (isEmptyRecord(getContext(), Ty, true)) {
-    Address Addr(CGF.Builder.CreateLoad(VAListAddr, "ap.cur"), SlotSize);
+    Address Addr = Address(CGF.Builder.CreateLoad(VAListAddr, "ap.cur"),
+                           getVAListElementType(CGF), SlotSize);
     Addr = CGF.Builder.CreateElementBitCast(Addr, CGF.ConvertTypeForMem(Ty));
     return Addr;
   }
@@ -6187,7 +6304,7 @@ Address AArch64ABIInfo::EmitMSVAArg(CodeGenFunction &CGF, Address VAListAddr,
 
 namespace {
 
-class ARMABIInfo : public SwiftABIInfo {
+class ARMABIInfo : public ABIInfo {
 public:
   enum ABIKind {
     APCS = 0,
@@ -6201,8 +6318,7 @@ private:
   bool IsFloatABISoftFP;
 
 public:
-  ARMABIInfo(CodeGenTypes &CGT, ABIKind _Kind)
-      : SwiftABIInfo(CGT), Kind(_Kind) {
+  ARMABIInfo(CodeGenTypes &CGT, ABIKind Kind) : ABIInfo(CGT), Kind(Kind) {
     setCCs();
     IsFloatABISoftFP = CGT.getCodeGenOpts().FloatABI == "softfp" ||
         CGT.getCodeGenOpts().FloatABI == ""; // default
@@ -6254,6 +6370,7 @@ private:
   bool isHomogeneousAggregateBaseType(QualType Ty) const override;
   bool isHomogeneousAggregateSmallEnough(const Type *Ty,
                                          uint64_t Members) const override;
+  bool isZeroLengthBitfieldPermittedInHomogeneousAggregate() const override;
 
   bool isEffectivelyAAPCS_VFP(unsigned callConvention, bool acceptHalf) const;
 
@@ -6265,22 +6382,23 @@ private:
   llvm::CallingConv::ID getLLVMDefaultCC() const;
   llvm::CallingConv::ID getABIDefaultCC() const;
   void setCCs();
+};
 
-  bool shouldPassIndirectlyForSwift(ArrayRef<llvm::Type*> scalars,
-                                    bool asReturnValue) const override {
-    return occupiesMoreThan(CGT, scalars, /*total*/ 4);
-  }
-  bool isSwiftErrorInRegister() const override {
-    return true;
-  }
-  bool isLegalVectorTypeForSwift(CharUnits totalSize, llvm::Type *eltTy,
-                                 unsigned elts) const override;
+class ARMSwiftABIInfo : public SwiftABIInfo {
+public:
+  explicit ARMSwiftABIInfo(CodeGenTypes &CGT)
+      : SwiftABIInfo(CGT, /*SwiftErrorInRegister=*/true) {}
+
+  bool isLegalVectorType(CharUnits VectorSize, llvm::Type *EltTy,
+                         unsigned NumElts) const override;
 };
 
 class ARMTargetCodeGenInfo : public TargetCodeGenInfo {
 public:
   ARMTargetCodeGenInfo(CodeGenTypes &CGT, ARMABIInfo::ABIKind K)
-      : TargetCodeGenInfo(std::make_unique<ARMABIInfo>(CGT, K)) {}
+      : TargetCodeGenInfo(std::make_unique<ARMABIInfo>(CGT, K)) {
+    SwiftInfo = std::make_unique<ARMSwiftABIInfo>(CGT);
+  }
 
   const ARMABIInfo &getABIInfo() const {
     return static_cast<const ARMABIInfo&>(TargetCodeGenInfo::getABIInfo());
@@ -6315,6 +6433,45 @@ public:
     const FunctionDecl *FD = dyn_cast_or_null<FunctionDecl>(D);
     if (!FD)
       return;
+    auto *Fn = cast<llvm::Function>(GV);
+
+    if (const auto *TA = FD->getAttr<TargetAttr>()) {
+      ParsedTargetAttr Attr =
+          CGM.getTarget().parseTargetAttr(TA->getFeaturesStr());
+      if (!Attr.BranchProtection.empty()) {
+        TargetInfo::BranchProtectionInfo BPI;
+        StringRef DiagMsg;
+        StringRef Arch =
+            Attr.CPU.empty() ? CGM.getTarget().getTargetOpts().CPU : Attr.CPU;
+        if (!CGM.getTarget().validateBranchProtection(Attr.BranchProtection,
+                                                      Arch, BPI, DiagMsg)) {
+          CGM.getDiags().Report(
+              D->getLocation(),
+              diag::warn_target_unsupported_branch_protection_attribute)
+              << Arch;
+        } else {
+          static const char *SignReturnAddrStr[] = {"none", "non-leaf", "all"};
+          assert(static_cast<unsigned>(BPI.SignReturnAddr) <= 2 &&
+                 "Unexpected SignReturnAddressScopeKind");
+          Fn->addFnAttr(
+              "sign-return-address",
+              SignReturnAddrStr[static_cast<int>(BPI.SignReturnAddr)]);
+
+          Fn->addFnAttr("branch-target-enforcement",
+                        BPI.BranchTargetEnforcement ? "true" : "false");
+        }
+      } else if (CGM.getLangOpts().BranchTargetEnforcement ||
+                 CGM.getLangOpts().hasSignReturnAddress()) {
+        // If the Branch Protection attribute is missing, validate the target
+        // Architecture attribute against Branch Protection command line
+        // settings.
+        if (!CGM.getTarget().isBranchProtectionSupportedArch(Attr.CPU))
+          CGM.getDiags().Report(
+              D->getLocation(),
+              diag::warn_target_unsupported_branch_protection_attribute)
+              << Attr.CPU;
+      }
+    }
 
     const ARMInterruptAttr *Attr = FD->getAttr<ARMInterruptAttr>();
     if (!Attr)
@@ -6330,8 +6487,6 @@ public:
     case ARMInterruptAttr::UNDEF:   Kind = "UNDEF"; break;
     }
 
-    llvm::Function *Fn = cast<llvm::Function>(GV);
-
     Fn->addFnAttr("interrupt", Kind);
 
     ARMABIInfo::ABIKind ABI = cast<ARMABIInfo>(getABIInfo()).getABIKind();
@@ -6341,9 +6496,9 @@ public:
     // AAPCS guarantees that sp will be 8-byte aligned on any public interface,
     // however this is not necessarily true on taking any interrupt. Instruct
     // the backend to perform a realignment as part of the function prologue.
-    llvm::AttrBuilder B;
+    llvm::AttrBuilder B(Fn->getContext());
     B.addStackAlignmentAttr(8);
-    Fn->addAttributes(llvm::AttributeList::FunctionIndex, B);
+    Fn->addFnAttrs(B);
   }
 };
 
@@ -6494,7 +6649,7 @@ ABIArgInfo ARMABIInfo::classifyArgumentType(QualType Ty, bool isVariadic,
       Ty = EnumTy->getDecl()->getIntegerType();
     }
 
-    if (const auto *EIT = Ty->getAs<ExtIntType>())
+    if (const auto *EIT = Ty->getAs<BitIntType>())
       if (EIT->getNumBits() > 64)
         return getNaturalAlignIndirect(Ty, /*ByVal=*/true);
 
@@ -6549,7 +6704,7 @@ ABIArgInfo ARMABIInfo::classifyArgumentType(QualType Ty, bool isVariadic,
   if (getABIKind() == ARMABIInfo::AAPCS_VFP ||
       getABIKind() == ARMABIInfo::AAPCS) {
     TyAlign = getContext().getTypeUnadjustedAlignInChars(Ty).getQuantity();
-    ABIAlign = std::min(std::max(TyAlign, (uint64_t)4), (uint64_t)8);
+    ABIAlign = std::clamp(TyAlign, (uint64_t)4, (uint64_t)8);
   } else {
     TyAlign = getContext().getTypeAlignInChars(Ty).getQuantity();
   }
@@ -6696,7 +6851,7 @@ ABIArgInfo ARMABIInfo::classifyReturnType(QualType RetTy, bool isVariadic,
     if (const EnumType *EnumTy = RetTy->getAs<EnumType>())
       RetTy = EnumTy->getDecl()->getIntegerType();
 
-    if (const auto *EIT = RetTy->getAs<ExtIntType>())
+    if (const auto *EIT = RetTy->getAs<BitIntType>())
       if (EIT->getNumBits() > 64)
         return getNaturalAlignIndirect(RetTy, /*ByVal=*/false);
 
@@ -6845,16 +7000,15 @@ bool ARMABIInfo::containsAnyFP16Vectors(QualType Ty) const {
   }
 }
 
-bool ARMABIInfo::isLegalVectorTypeForSwift(CharUnits vectorSize,
-                                           llvm::Type *eltTy,
-                                           unsigned numElts) const {
-  if (!llvm::isPowerOf2_32(numElts))
+bool ARMSwiftABIInfo::isLegalVectorType(CharUnits VectorSize, llvm::Type *EltTy,
+                                        unsigned NumElts) const {
+  if (!llvm::isPowerOf2_32(NumElts))
     return false;
-  unsigned size = getDataLayout().getTypeStoreSizeInBits(eltTy);
+  unsigned size = CGT.getDataLayout().getTypeStoreSizeInBits(EltTy);
   if (size > 64)
     return false;
-  if (vectorSize.getQuantity() != 8 &&
-      (vectorSize.getQuantity() != 16 || numElts == 1))
+  if (VectorSize.getQuantity() != 8 &&
+      (VectorSize.getQuantity() != 16 || NumElts == 1))
     return false;
   return true;
 }
@@ -6880,6 +7034,15 @@ bool ARMABIInfo::isHomogeneousAggregateSmallEnough(const Type *Base,
   return Members <= 4;
 }
 
+bool ARMABIInfo::isZeroLengthBitfieldPermittedInHomogeneousAggregate() const {
+  // AAPCS32 says that the rule for whether something is a homogeneous
+  // aggregate is applied to the output of the data layout decision. So
+  // anything that doesn't affect the data layout also does not affect
+  // homogeneity. In particular, zero-length bitfields don't stop a struct
+  // being homogeneous.
+  return true;
+}
+
 bool ARMABIInfo::isEffectivelyAAPCS_VFP(unsigned callConvention,
                                         bool acceptHalf) const {
   // Give precedence to user-specified calling conventions.
@@ -6896,9 +7059,10 @@ Address ARMABIInfo::EmitVAArg(CodeGenFunction &CGF, Address VAListAddr,
 
   // Empty records are ignored for parameter passing purposes.
   if (isEmptyRecord(getContext(), Ty, true)) {
-    Address Addr(CGF.Builder.CreateLoad(VAListAddr), SlotSize);
-    Addr = CGF.Builder.CreateElementBitCast(Addr, CGF.ConvertTypeForMem(Ty));
-    return Addr;
+    VAListAddr = CGF.Builder.CreateElementBitCast(VAListAddr, CGF.Int8PtrTy);
+    auto *Load = CGF.Builder.CreateLoad(VAListAddr);
+    Address Addr = Address(Load, CGF.Int8Ty, SlotSize);
+    return CGF.Builder.CreateElementBitCast(Addr, CGF.ConvertTypeForMem(Ty));
   }
 
   CharUnits TySize = getContext().getTypeSizeInChars(Ty);
@@ -6934,7 +7098,7 @@ Address ARMABIInfo::EmitVAArg(CodeGenFunction &CGF, Address VAListAddr,
     TyAlignForABI = CharUnits::fromQuantity(4);
   }
 
-  TypeInfoChars TyInfo(TySize, TyAlignForABI, false);
+  TypeInfoChars TyInfo(TySize, TyAlignForABI, AlignRequirementKind::None);
   return emitVoidPtrVAArg(CGF, VAListAddr, Ty, IsIndirect, TyInfo,
                           SlotSize, /*AllowHigherAlign*/ true);
 }
@@ -7033,7 +7197,7 @@ bool NVPTXABIInfo::isUnsupportedType(QualType T) const {
       (T->isFloat128Type() ||
        (T->isRealFloatingType() && Context.getTypeSize(T) == 128)))
     return true;
-  if (const auto *EIT = T->getAs<ExtIntType>())
+  if (const auto *EIT = T->getAs<BitIntType>())
     return EIT->getNumBits() >
            (Context.getTargetInfo().hasInt128Type() ? 128U : 64U);
   if (!Context.getTargetInfo().hasInt128Type() && T->isIntegerType() &&
@@ -7110,7 +7274,7 @@ ABIArgInfo NVPTXABIInfo::classifyArgumentType(QualType Ty) const {
     return getNaturalAlignIndirect(Ty, /* byval */ true);
   }
 
-  if (const auto *EIT = Ty->getAs<ExtIntType>()) {
+  if (const auto *EIT = Ty->getAs<BitIntType>()) {
     if ((EIT->getNumBits() > 128) ||
         (!getContext().getTargetInfo().hasInt128Type() &&
          EIT->getNumBits() > 64))
@@ -7229,13 +7393,13 @@ bool NVPTXTargetCodeGenInfo::shouldEmitStaticExternCAliases() const {
 
 namespace {
 
-class SystemZABIInfo : public SwiftABIInfo {
+class SystemZABIInfo : public ABIInfo {
   bool HasVector;
   bool IsSoftFloatABI;
 
 public:
   SystemZABIInfo(CodeGenTypes &CGT, bool HV, bool SF)
-    : SwiftABIInfo(CGT), HasVector(HV), IsSoftFloatABI(SF) {}
+      : ABIInfo(CGT), HasVector(HV), IsSoftFloatABI(SF) {}
 
   bool isPromotableIntegerTypeForABI(QualType Ty) const;
   bool isCompoundType(QualType Ty) const;
@@ -7246,30 +7410,70 @@ public:
   ABIArgInfo classifyReturnType(QualType RetTy) const;
   ABIArgInfo classifyArgumentType(QualType ArgTy) const;
 
-  void computeInfo(CGFunctionInfo &FI) const override {
-    if (!getCXXABI().classifyReturnType(FI))
-      FI.getReturnInfo() = classifyReturnType(FI.getReturnType());
-    for (auto &I : FI.arguments())
-      I.info = classifyArgumentType(I.type);
-  }
-
+  void computeInfo(CGFunctionInfo &FI) const override;
   Address EmitVAArg(CodeGenFunction &CGF, Address VAListAddr,
                     QualType Ty) const override;
-
-  bool shouldPassIndirectlyForSwift(ArrayRef<llvm::Type*> scalars,
-                                    bool asReturnValue) const override {
-    return occupiesMoreThan(CGT, scalars, /*total*/ 4);
-  }
-  bool isSwiftErrorInRegister() const override {
-    return false;
-  }
 };
 
 class SystemZTargetCodeGenInfo : public TargetCodeGenInfo {
+  ASTContext &Ctx;
+
+  const SystemZABIInfo &getABIInfo() const {
+    return static_cast<const SystemZABIInfo&>(TargetCodeGenInfo::getABIInfo());
+  }
+
+  // These are used for speeding up the search for a visible vector ABI.
+  mutable bool HasVisibleVecABIFlag = false;
+  mutable std::set<const Type *> SeenTypes;
+
+  // Returns true (the first time) if Ty is, or is found to include, a vector
+  // type that exposes the vector ABI. This is any vector >=16 bytes which
+  // with vector support are aligned to only 8 bytes. When IsParam is true,
+  // the type belongs to a value as passed between functions. If it is a
+  // vector <=16 bytes it will be passed in a vector register (if supported).
+  bool isVectorTypeBased(const Type *Ty, bool IsParam) const;
+
 public:
   SystemZTargetCodeGenInfo(CodeGenTypes &CGT, bool HasVector, bool SoftFloatABI)
       : TargetCodeGenInfo(
-            std::make_unique<SystemZABIInfo>(CGT, HasVector, SoftFloatABI)) {}
+            std::make_unique<SystemZABIInfo>(CGT, HasVector, SoftFloatABI)),
+            Ctx(CGT.getContext()) {
+    SwiftInfo =
+        std::make_unique<SwiftABIInfo>(CGT, /*SwiftErrorInRegister=*/false);
+  }
+
+  // The vector ABI is different when the vector facility is present and when
+  // a module e.g. defines an externally visible vector variable, a flag
+  // indicating a visible vector ABI is added. Eventually this will result in
+  // a GNU attribute indicating the vector ABI of the module.  Ty is the type
+  // of a variable or function parameter that is globally visible.
+  void handleExternallyVisibleObjABI(const Type *Ty, CodeGen::CodeGenModule &M,
+                                     bool IsParam) const {
+    if (!HasVisibleVecABIFlag && isVectorTypeBased(Ty, IsParam)) {
+      M.getModule().addModuleFlag(llvm::Module::Warning,
+                                  "s390x-visible-vector-ABI", 1);
+      HasVisibleVecABIFlag = true;
+    }
+  }
+
+  void setTargetAttributes(const Decl *D, llvm::GlobalValue *GV,
+                           CodeGen::CodeGenModule &M) const override {
+    if (!D)
+      return;
+
+    // Check if the vector ABI becomes visible by an externally visible
+    // variable or function.
+    if (const auto *VD = dyn_cast<VarDecl>(D)) {
+      if (VD->isExternallyVisible())
+        handleExternallyVisibleObjABI(VD->getType().getTypePtr(), M,
+                                      /*IsParam*/false);
+    }
+    else if (const FunctionDecl *FD = dyn_cast<FunctionDecl>(D)) {
+      if (FD->isExternallyVisible())
+        handleExternallyVisibleObjABI(FD->getType().getTypePtr(), M,
+                                      /*IsParam*/false);
+    }
+  }
 
   llvm::Value *testFPKind(llvm::Value *V, unsigned BuiltinID,
                           CGBuilderTy &Builder,
@@ -7324,7 +7528,7 @@ bool SystemZABIInfo::isPromotableIntegerTypeForABI(QualType Ty) const {
   if (ABIInfo::isPromotableIntegerTypeForABI(Ty))
     return true;
 
-  if (const auto *EIT = Ty->getAs<ExtIntType>())
+  if (const auto *EIT = Ty->getAs<BitIntType>())
     if (EIT->getNumBits() < 64)
       return true;
 
@@ -7377,26 +7581,24 @@ QualType SystemZABIInfo::GetSingleElementType(QualType Ty) const {
 
     // If this is a C++ record, check the bases first.
     if (const CXXRecordDecl *CXXRD = dyn_cast<CXXRecordDecl>(RD))
-      for (const auto &I : CXXRD->bases()) {
-        QualType Base = I.getType();
+      if (CXXRD->hasDefinition())
+        for (const auto &I : CXXRD->bases()) {
+          QualType Base = I.getType();
 
-        // Empty bases don't affect things either way.
-        if (isEmptyRecord(getContext(), Base, true))
-          continue;
+          // Empty bases don't affect things either way.
+          if (isEmptyRecord(getContext(), Base, true))
+            continue;
 
-        if (!Found.isNull())
-          return Ty;
-        Found = GetSingleElementType(Base);
-      }
+          if (!Found.isNull())
+            return Ty;
+          Found = GetSingleElementType(Base);
+        }
 
     // Check the fields.
     for (const auto *FD : RD->fields()) {
-      // For compatibility with GCC, ignore empty bitfields in C++ mode.
       // Unlike isSingleElementStruct(), empty structure and array fields
       // do count.  So do anonymous bitfields that aren't zero-sized.
-      if (getContext().getLangOpts().CPlusPlus &&
-          FD->isZeroLengthBitField(getContext()))
-        continue;
+
       // Like isSingleElementStruct(), ignore C++20 empty data members.
       if (FD->hasAttr<NoUniqueAddressAttr>() &&
           isEmptyRecord(getContext(), FD->getType(), true))
@@ -7431,6 +7633,9 @@ Address SystemZABIInfo::EmitVAArg(CodeGenFunction &CGF, Address VAListAddr,
   // Every non-vector argument occupies 8 bytes and is passed by preference
   // in either GPRs or FPRs.  Vector arguments occupy 8 or 16 bytes and are
   // always passed on the stack.
+  const SystemZTargetCodeGenInfo &SZCGI =
+      static_cast<const SystemZTargetCodeGenInfo &>(
+          CGT.getCGM().getTargetCodeGenInfo());
   Ty = getContext().getCanonicalType(Ty);
   auto TyInfo = getContext().getTypeInfoInChars(Ty);
   llvm::Type *ArgTy = CGF.ConvertTypeForMem(Ty);
@@ -7441,6 +7646,8 @@ Address SystemZABIInfo::EmitVAArg(CodeGenFunction &CGF, Address VAListAddr,
   bool IsVector = false;
   CharUnits UnpaddedSize;
   CharUnits DirectAlign;
+  SZCGI.handleExternallyVisibleObjABI(Ty.getTypePtr(), CGT.getCGM(),
+                                      /*IsParam*/true);
   if (IsIndirect) {
     DirectTy = llvm::PointerType::getUnqual(DirectTy);
     UnpaddedSize = DirectAlign = CharUnits::fromQuantity(8);
@@ -7470,16 +7677,15 @@ Address SystemZABIInfo::EmitVAArg(CodeGenFunction &CGF, Address VAListAddr,
     Address OverflowArgAreaPtr =
         CGF.Builder.CreateStructGEP(VAListAddr, 2, "overflow_arg_area_ptr");
     Address OverflowArgArea =
-      Address(CGF.Builder.CreateLoad(OverflowArgAreaPtr, "overflow_arg_area"),
-              TyInfo.Align);
+        Address(CGF.Builder.CreateLoad(OverflowArgAreaPtr, "overflow_arg_area"),
+                CGF.Int8Ty, TyInfo.Align);
     Address MemAddr =
-      CGF.Builder.CreateElementBitCast(OverflowArgArea, DirectTy, "mem_addr");
+        CGF.Builder.CreateElementBitCast(OverflowArgArea, DirectTy, "mem_addr");
 
     // Update overflow_arg_area_ptr pointer
-    llvm::Value *NewOverflowArgArea =
-      CGF.Builder.CreateGEP(OverflowArgArea.getElementType(),
-                            OverflowArgArea.getPointer(), PaddedSizeV,
-                            "overflow_arg_area");
+    llvm::Value *NewOverflowArgArea = CGF.Builder.CreateGEP(
+        OverflowArgArea.getElementType(), OverflowArgArea.getPointer(),
+        PaddedSizeV, "overflow_arg_area");
     CGF.Builder.CreateStore(NewOverflowArgArea, OverflowArgAreaPtr);
 
     return MemAddr;
@@ -7527,12 +7733,12 @@ Address SystemZABIInfo::EmitVAArg(CodeGenFunction &CGF, Address VAListAddr,
   Address RegSaveAreaPtr =
       CGF.Builder.CreateStructGEP(VAListAddr, 3, "reg_save_area_ptr");
   llvm::Value *RegSaveArea =
-    CGF.Builder.CreateLoad(RegSaveAreaPtr, "reg_save_area");
-  Address RawRegAddr(CGF.Builder.CreateGEP(CGF.Int8Ty, RegSaveArea, RegOffset,
-                                           "raw_reg_addr"),
-                     PaddedSize);
+      CGF.Builder.CreateLoad(RegSaveAreaPtr, "reg_save_area");
+  Address RawRegAddr(
+      CGF.Builder.CreateGEP(CGF.Int8Ty, RegSaveArea, RegOffset, "raw_reg_addr"),
+      CGF.Int8Ty, PaddedSize);
   Address RegAddr =
-    CGF.Builder.CreateElementBitCast(RawRegAddr, DirectTy, "reg_addr");
+      CGF.Builder.CreateElementBitCast(RawRegAddr, DirectTy, "reg_addr");
 
   // Update the register count
   llvm::Value *One = llvm::ConstantInt::get(IndexTy, 1);
@@ -7548,10 +7754,10 @@ Address SystemZABIInfo::EmitVAArg(CodeGenFunction &CGF, Address VAListAddr,
   Address OverflowArgAreaPtr =
       CGF.Builder.CreateStructGEP(VAListAddr, 2, "overflow_arg_area_ptr");
   Address OverflowArgArea =
-    Address(CGF.Builder.CreateLoad(OverflowArgAreaPtr, "overflow_arg_area"),
-            PaddedSize);
+      Address(CGF.Builder.CreateLoad(OverflowArgAreaPtr, "overflow_arg_area"),
+              CGF.Int8Ty, PaddedSize);
   Address RawMemAddr =
-    CGF.Builder.CreateConstByteGEP(OverflowArgArea, Padding, "raw_mem_addr");
+      CGF.Builder.CreateConstByteGEP(OverflowArgArea, Padding, "raw_mem_addr");
   Address MemAddr =
     CGF.Builder.CreateElementBitCast(RawMemAddr, DirectTy, "mem_addr");
 
@@ -7565,11 +7771,11 @@ Address SystemZABIInfo::EmitVAArg(CodeGenFunction &CGF, Address VAListAddr,
 
   // Return the appropriate result.
   CGF.EmitBlock(ContBlock);
-  Address ResAddr = emitMergePHI(CGF, RegAddr, InRegBlock,
-                                 MemAddr, InMemBlock, "va_arg.addr");
+  Address ResAddr = emitMergePHI(CGF, RegAddr, InRegBlock, MemAddr, InMemBlock,
+                                 "va_arg.addr");
 
   if (IsIndirect)
-    ResAddr = Address(CGF.Builder.CreateLoad(ResAddr, "indirect_arg"),
+    ResAddr = Address(CGF.Builder.CreateLoad(ResAddr, "indirect_arg"), ArgTy,
                       TyInfo.Align);
 
   return ResAddr;
@@ -7636,6 +7842,73 @@ ABIArgInfo SystemZABIInfo::classifyArgumentType(QualType Ty) const {
   return ABIArgInfo::getDirect(nullptr);
 }
 
+void SystemZABIInfo::computeInfo(CGFunctionInfo &FI) const {
+  const SystemZTargetCodeGenInfo &SZCGI =
+      static_cast<const SystemZTargetCodeGenInfo &>(
+          CGT.getCGM().getTargetCodeGenInfo());
+  if (!getCXXABI().classifyReturnType(FI))
+    FI.getReturnInfo() = classifyReturnType(FI.getReturnType());
+  unsigned Idx = 0;
+  for (auto &I : FI.arguments()) {
+    I.info = classifyArgumentType(I.type);
+    if (FI.isVariadic() && Idx++ >= FI.getNumRequiredArgs())
+      // Check if a vararg vector argument is passed, in which case the
+      // vector ABI becomes visible as the va_list could be passed on to
+      // other functions.
+      SZCGI.handleExternallyVisibleObjABI(I.type.getTypePtr(), CGT.getCGM(),
+                                          /*IsParam*/true);
+  }
+}
+
+bool SystemZTargetCodeGenInfo::isVectorTypeBased(const Type *Ty,
+                                                 bool IsParam) const {
+  if (!SeenTypes.insert(Ty).second)
+    return false;
+
+  if (IsParam) {
+    // A narrow (<16 bytes) vector will as a parameter also expose the ABI as
+    // it will be passed in a vector register. A wide (>16 bytes) vector will
+    // be passed via "hidden" pointer where any extra alignment is not
+    // required (per GCC).
+    const Type *SingleEltTy =
+      getABIInfo().GetSingleElementType(QualType(Ty, 0)).getTypePtr();
+    bool SingleVecEltStruct = SingleEltTy != Ty && SingleEltTy->isVectorType() &&
+      Ctx.getTypeSize(SingleEltTy) == Ctx.getTypeSize(Ty);
+    if (Ty->isVectorType() || SingleVecEltStruct)
+      return Ctx.getTypeSize(Ty) / 8 <= 16;
+  }
+
+  // Assume pointers are dereferenced.
+  while (Ty->isPointerType() || Ty->isArrayType())
+    Ty = Ty->getPointeeOrArrayElementType();
+
+  // Vectors >= 16 bytes expose the ABI through alignment requirements.
+  if (Ty->isVectorType() && Ctx.getTypeSize(Ty) / 8 >= 16)
+      return true;
+
+  if (const auto *RecordTy = Ty->getAs<RecordType>()) {
+    const RecordDecl *RD = RecordTy->getDecl();
+    if (const CXXRecordDecl *CXXRD = dyn_cast<CXXRecordDecl>(RD))
+      if (CXXRD->hasDefinition())
+        for (const auto &I : CXXRD->bases())
+          if (isVectorTypeBased(I.getType().getTypePtr(), /*IsParam*/false))
+            return true;
+    for (const auto *FD : RD->fields())
+      if (isVectorTypeBased(FD->getType().getTypePtr(), /*IsParam*/false))
+        return true;
+  }
+
+  if (const auto *FT = Ty->getAs<FunctionType>())
+    if (isVectorTypeBased(FT->getReturnType().getTypePtr(), /*IsParam*/true))
+      return true;
+  if (const FunctionProtoType *Proto = Ty->getAs<FunctionProtoType>())
+    for (auto ParamType : Proto->getParamTypes())
+      if (isVectorTypeBased(ParamType.getTypePtr(), /*IsParam*/true))
+        return true;
+
+  return false;
+}
+
 //===----------------------------------------------------------------------===//
 // MSP430 ABI Implementation
 //===----------------------------------------------------------------------===//
@@ -7720,7 +7993,7 @@ void MSP430TargetCodeGenInfo::setTargetAttributes(
 namespace {
 class MipsABIInfo : public ABIInfo {
   bool IsO32;
-  unsigned MinABIStackAlignInBytes, StackAlignInBytes;
+  const unsigned MinABIStackAlignInBytes, StackAlignInBytes;
   void CoerceToIntArgs(uint64_t TySize,
                        SmallVectorImpl<llvm::Type *> &ArgList) const;
   llvm::Type* HandleAggregates(QualType Ty, uint64_t TySize) const;
@@ -7897,8 +8170,8 @@ MipsABIInfo::classifyArgumentType(QualType Ty, uint64_t &Offset) const {
   uint64_t TySize = getContext().getTypeSize(Ty);
   uint64_t Align = getContext().getTypeAlign(Ty) / 8;
 
-  Align = std::min(std::max(Align, (uint64_t)MinABIStackAlignInBytes),
-                   (uint64_t)StackAlignInBytes);
+  Align = std::clamp(Align, (uint64_t)MinABIStackAlignInBytes,
+                     (uint64_t)StackAlignInBytes);
   unsigned CurrOffset = llvm::alignTo(Offset, Align);
   Offset = CurrOffset + llvm::alignTo(TySize, Align * 8) / 8;
 
@@ -7927,7 +8200,7 @@ MipsABIInfo::classifyArgumentType(QualType Ty, uint64_t &Offset) const {
     Ty = EnumTy->getDecl()->getIntegerType();
 
   // Make sure we pass indirectly things that are too large.
-  if (const auto *EIT = Ty->getAs<ExtIntType>())
+  if (const auto *EIT = Ty->getAs<BitIntType>())
     if (EIT->getNumBits() > 128 ||
         (EIT->getNumBits() > 64 &&
          !getContext().getTargetInfo().hasInt128Type()))
@@ -8018,7 +8291,7 @@ ABIArgInfo MipsABIInfo::classifyReturnType(QualType RetTy) const {
     RetTy = EnumTy->getDecl()->getIntegerType();
 
   // Make sure we pass indirectly things that are too large.
-  if (const auto *EIT = RetTy->getAs<ExtIntType>())
+  if (const auto *EIT = RetTy->getAs<BitIntType>())
     if (EIT->getNumBits() > 128 ||
         (EIT->getNumBits() > 64 &&
          !getContext().getTargetInfo().hasInt128Type()))
@@ -8053,7 +8326,7 @@ Address MipsABIInfo::EmitVAArg(CodeGenFunction &CGF, Address VAListAddr,
   // Integer arguments are promoted to 32-bit on O32 and 64-bit on N32/N64.
   // Pointers are also promoted in the same way but this only matters for N32.
   unsigned SlotSizeInBits = IsO32 ? 32 : 64;
-  unsigned PtrWidth = getTarget().getPointerWidth(0);
+  unsigned PtrWidth = getTarget().getPointerWidth(LangAS::Default);
   bool DidPromote = false;
   if ((Ty->isIntegerType() &&
           getContext().getIntWidth(Ty) < SlotSizeInBits) ||
@@ -8180,43 +8453,112 @@ void M68kTargetCodeGenInfo::setTargetAttributes(
 
 namespace {
 class AVRABIInfo : public DefaultABIInfo {
+private:
+  // The total amount of registers can be used to pass parameters. It is 18 on
+  // AVR, or 6 on AVRTiny.
+  const unsigned ParamRegs;
+  // The total amount of registers can be used to pass return value. It is 8 on
+  // AVR, or 4 on AVRTiny.
+  const unsigned RetRegs;
+
 public:
-  AVRABIInfo(CodeGenTypes &CGT) : DefaultABIInfo(CGT) {}
+  AVRABIInfo(CodeGenTypes &CGT, unsigned NPR, unsigned NRR)
+      : DefaultABIInfo(CGT), ParamRegs(NPR), RetRegs(NRR) {}
+
+  ABIArgInfo classifyReturnType(QualType Ty, bool &LargeRet) const {
+    // On AVR, a return struct with size less than or equals to 8 bytes is
+    // returned directly via registers R18-R25. On AVRTiny, a return struct
+    // with size less than or equals to 4 bytes is returned directly via
+    // registers R22-R25.
+    if (isAggregateTypeForABI(Ty) &&
+        getContext().getTypeSize(Ty) <= RetRegs * 8)
+      return ABIArgInfo::getDirect();
+    // A return value (struct or scalar) with larger size is returned via a
+    // stack slot, along with a pointer as the function's implicit argument.
+    if (getContext().getTypeSize(Ty) > RetRegs * 8) {
+      LargeRet = true;
+      return getNaturalAlignIndirect(Ty);
+    }
+    // An i8 return value should not be extended to i16, since AVR has 8-bit
+    // registers.
+    if (Ty->isIntegralOrEnumerationType() && getContext().getTypeSize(Ty) <= 8)
+      return ABIArgInfo::getDirect();
+    // Otherwise we follow the default way which is compatible.
+    return DefaultABIInfo::classifyReturnType(Ty);
+  }
+
+  ABIArgInfo classifyArgumentType(QualType Ty, unsigned &NumRegs) const {
+    unsigned TySize = getContext().getTypeSize(Ty);
+
+    // An int8 type argument always costs two registers like an int16.
+    if (TySize == 8 && NumRegs >= 2) {
+      NumRegs -= 2;
+      return ABIArgInfo::getExtend(Ty);
+    }
+
+    // If the argument size is an odd number of bytes, round up the size
+    // to the next even number.
+    TySize = llvm::alignTo(TySize, 16);
 
-  ABIArgInfo classifyReturnType(QualType Ty) const {
-    // A return struct with size less than or equal to 8 bytes is returned
-    // directly via registers R18-R25.
-    if (isAggregateTypeForABI(Ty) && getContext().getTypeSize(Ty) <= 64)
+    // Any type including an array/struct type can be passed in rgisters,
+    // if there are enough registers left.
+    if (TySize <= NumRegs * 8) {
+      NumRegs -= TySize / 8;
       return ABIArgInfo::getDirect();
-    else
-      return DefaultABIInfo::classifyReturnType(Ty);
+    }
+
+    // An argument is passed either completely in registers or completely in
+    // memory. Since there are not enough registers left, current argument
+    // and all other unprocessed arguments should be passed in memory.
+    // However we still need to return `ABIArgInfo::getDirect()` other than
+    // `ABIInfo::getNaturalAlignIndirect(Ty)`, otherwise an extra stack slot
+    // will be allocated, so the stack frame layout will be incompatible with
+    // avr-gcc.
+    NumRegs = 0;
+    return ABIArgInfo::getDirect();
   }
 
-  // Just copy the original implementation of DefaultABIInfo::computeInfo(),
-  // since DefaultABIInfo::classify{Return,Argument}Type() are not virtual.
   void computeInfo(CGFunctionInfo &FI) const override {
+    // Decide the return type.
+    bool LargeRet = false;
     if (!getCXXABI().classifyReturnType(FI))
-      FI.getReturnInfo() = classifyReturnType(FI.getReturnType());
+      FI.getReturnInfo() = classifyReturnType(FI.getReturnType(), LargeRet);
+
+    // Decide each argument type. The total number of registers can be used for
+    // arguments depends on several factors:
+    // 1. Arguments of varargs functions are passed on the stack. This applies
+    //    even to the named arguments. So no register can be used.
+    // 2. Total 18 registers can be used on avr and 6 ones on avrtiny.
+    // 3. If the return type is a struct with too large size, two registers
+    //    (out of 18/6) will be cost as an implicit pointer argument.
+    unsigned NumRegs = ParamRegs;
+    if (FI.isVariadic())
+      NumRegs = 0;
+    else if (LargeRet)
+      NumRegs -= 2;
     for (auto &I : FI.arguments())
-      I.info = classifyArgumentType(I.type);
+      I.info = classifyArgumentType(I.type, NumRegs);
   }
 };
 
 class AVRTargetCodeGenInfo : public TargetCodeGenInfo {
 public:
-  AVRTargetCodeGenInfo(CodeGenTypes &CGT)
-      : TargetCodeGenInfo(std::make_unique<AVRABIInfo>(CGT)) {}
+  AVRTargetCodeGenInfo(CodeGenTypes &CGT, unsigned NPR, unsigned NRR)
+      : TargetCodeGenInfo(std::make_unique<AVRABIInfo>(CGT, NPR, NRR)) {}
 
   LangAS getGlobalVarAddressSpace(CodeGenModule &CGM,
                                   const VarDecl *D) const override {
-    // Check if a global/static variable is defined within address space 1
+    // Check if global/static variable is defined in address space
+    // 1~6 (__flash, __flash1, __flash2, __flash3, __flash4, __flash5)
     // but not constant.
-    LangAS AS = D->getType().getAddressSpace();
-    if (isTargetAddressSpace(AS) && toTargetAddressSpace(AS) == 1 &&
-        !D->getType().isConstQualified())
-      CGM.getDiags().Report(D->getLocation(),
-                            diag::err_verify_nonconst_addrspace)
-          << "__flash";
+    if (D) {
+      LangAS AS = D->getType().getAddressSpace();
+      if (isTargetAddressSpace(AS) && 1 <= toTargetAddressSpace(AS) &&
+          toTargetAddressSpace(AS) <= 6 && !D->getType().isConstQualified())
+        CGM.getDiags().Report(D->getLocation(),
+                              diag::err_verify_nonconst_addrspace)
+            << "__flash*";
+    }
     return TargetCodeGenInfo::getGlobalVarAddressSpace(CGM, D);
   }
 
@@ -8393,7 +8735,7 @@ ABIArgInfo HexagonABIInfo::classifyArgumentType(QualType Ty,
     if (Size <= 64)
       HexagonAdjustRegsLeft(Size, RegsLeft);
 
-    if (Size > 64 && Ty->isExtIntType())
+    if (Size > 64 && Ty->isBitIntType())
       return getNaturalAlignIndirect(Ty, /*ByVal=*/true);
 
     return isPromotableIntegerTypeForABI(Ty) ? ABIArgInfo::getExtend(Ty)
@@ -8449,7 +8791,7 @@ ABIArgInfo HexagonABIInfo::classifyReturnType(QualType RetTy) const {
     if (const EnumType *EnumTy = RetTy->getAs<EnumType>())
       RetTy = EnumTy->getDecl()->getIntegerType();
 
-    if (Size > 64 && RetTy->isExtIntType())
+    if (Size > 64 && RetTy->isBitIntType())
       return getNaturalAlignIndirect(RetTy, /*ByVal=*/false);
 
     return isPromotableIntegerTypeForABI(RetTy) ? ABIArgInfo::getExtend(RetTy)
@@ -8504,9 +8846,10 @@ Address HexagonABIInfo::EmitVAArgFromMemory(CodeGenFunction &CGF,
   // Get the type of the argument from memory and bitcast
   // overflow area pointer to the argument type.
   llvm::Type *PTy = CGF.ConvertTypeForMem(Ty);
-  Address AddrTyped = CGF.Builder.CreateBitCast(
-      Address(__overflow_area_pointer, CharUnits::fromQuantity(Align)),
-      llvm::PointerType::getUnqual(PTy));
+  Address AddrTyped = CGF.Builder.CreateElementBitCast(
+      Address(__overflow_area_pointer, CGF.Int8Ty,
+              CharUnits::fromQuantity(Align)),
+      PTy);
 
   // Round up to the minimum stack alignment for varargs which is 4 bytes.
   uint64_t Offset = llvm::alignTo(CGF.getContext().getTypeSize(Ty) / 8, 4);
@@ -8525,9 +8868,8 @@ Address HexagonABIInfo::EmitVAArgForHexagon(CodeGenFunction &CGF,
                                             QualType Ty) const {
   // FIXME: Need to handle alignment
   llvm::Type *BP = CGF.Int8PtrTy;
-  llvm::Type *BPP = CGF.Int8PtrPtrTy;
   CGBuilderTy &Builder = CGF.Builder;
-  Address VAListAddrAsBPP = Builder.CreateBitCast(VAListAddr, BPP, "ap");
+  Address VAListAddrAsBPP = Builder.CreateElementBitCast(VAListAddr, BP, "ap");
   llvm::Value *Addr = Builder.CreateLoad(VAListAddrAsBPP, "ap.cur");
   // Handle address alignment for type alignment > 32 bits
   uint64_t TyAlign = CGF.getContext().getTypeAlign(Ty) / 8;
@@ -8538,9 +8880,9 @@ Address HexagonABIInfo::EmitVAArgForHexagon(CodeGenFunction &CGF,
     AddrAsInt = Builder.CreateAnd(AddrAsInt, Builder.getInt32(~(TyAlign - 1)));
     Addr = Builder.CreateIntToPtr(AddrAsInt, BP);
   }
-  llvm::Type *PTy = llvm::PointerType::getUnqual(CGF.ConvertType(Ty));
-  Address AddrTyped = Builder.CreateBitCast(
-      Address(Addr, CharUnits::fromQuantity(TyAlign)), PTy);
+  Address AddrTyped = Builder.CreateElementBitCast(
+      Address(Addr, CGF.Int8Ty, CharUnits::fromQuantity(TyAlign)),
+      CGF.ConvertType(Ty));
 
   uint64_t Offset = llvm::alignTo(CGF.getContext().getTypeSize(Ty) / 8, 4);
   llvm::Value *NextAddr = Builder.CreateGEP(
@@ -8620,7 +8962,7 @@ Address HexagonABIInfo::EmitVAArgForHexagonLinux(CodeGenFunction &CGF,
                             llvm::ConstantInt::get(CGF.Int32Ty, ArgSize),
                             "__new_saved_reg_area_pointer");
 
-  llvm::Value *UsingStack = 0;
+  llvm::Value *UsingStack = nullptr;
   UsingStack = CGF.Builder.CreateICmpSGT(__new_saved_reg_area_pointer,
                                          __saved_reg_area_end_pointer);
 
@@ -8693,12 +9035,13 @@ Address HexagonABIInfo::EmitVAArgForHexagonLinux(CodeGenFunction &CGF,
   // Implement the ContBlock
   CGF.EmitBlock(ContBlock);
 
-  llvm::Type *MemPTy = llvm::PointerType::getUnqual(CGF.ConvertTypeForMem(Ty));
+  llvm::Type *MemTy = CGF.ConvertTypeForMem(Ty);
+  llvm::Type *MemPTy = llvm::PointerType::getUnqual(MemTy);
   llvm::PHINode *ArgAddr = CGF.Builder.CreatePHI(MemPTy, 2, "vaarg.addr");
   ArgAddr->addIncoming(__saved_reg_area_p, InRegBlock);
   ArgAddr->addIncoming(__overflow_area_p, OnStackBlock);
 
-  return Address(ArgAddr, CharUnits::fromQuantity(ArgAlign));
+  return Address(ArgAddr, MemTy, CharUnits::fromQuantity(ArgAlign));
 }
 
 Address HexagonABIInfo::EmitVAArg(CodeGenFunction &CGF, Address VAListAddr,
@@ -8820,7 +9163,7 @@ ABIArgInfo LanaiABIInfo::classifyArgumentType(QualType Ty,
   bool InReg = shouldUseInReg(Ty, State);
 
   // Don't pass >64 bit integers in registers.
-  if (const auto *EIT = Ty->getAs<ExtIntType>())
+  if (const auto *EIT = Ty->getAs<BitIntType>())
     if (EIT->getNumBits() > 64)
       return getIndirectResult(Ty, /*ByVal=*/true, State);
 
@@ -8862,9 +9205,9 @@ private:
   llvm::Type *coerceKernelArgumentType(llvm::Type *Ty, unsigned FromAS,
                                        unsigned ToAS) const {
     // Single value types.
-    if (Ty->isPointerTy() && Ty->getPointerAddressSpace() == FromAS)
-      return llvm::PointerType::get(
-          cast<llvm::PointerType>(Ty)->getElementType(), ToAS);
+    auto *PtrTy = llvm::dyn_cast<llvm::PointerType>(Ty);
+    if (PtrTy && PtrTy->getAddressSpace() == FromAS)
+      return llvm::PointerType::getWithSamePointeeType(PtrTy, ToAS);
     return Ty;
   }
 
@@ -9094,6 +9437,10 @@ class AMDGPUTargetCodeGenInfo : public TargetCodeGenInfo {
 public:
   AMDGPUTargetCodeGenInfo(CodeGenTypes &CGT)
       : TargetCodeGenInfo(std::make_unique<AMDGPUABIInfo>(CGT)) {}
+
+  void setFunctionDeclAttributes(const FunctionDecl *FD, llvm::Function *F,
+                                 CodeGenModule &CGM) const;
+
   void setTargetAttributes(const Decl *D, llvm::GlobalValue *GV,
                            CodeGen::CodeGenModule &M) const override;
   unsigned getOpenCLKernelCallingConv() const override;
@@ -9114,7 +9461,7 @@ public:
   llvm::Function *
   createEnqueuedBlockKernel(CodeGenFunction &CGF,
                             llvm::Function *BlockInvokeFunc,
-                            llvm::Value *BlockLiteral) const override;
+                            llvm::Type *BlockTy) const override;
   bool shouldEmitStaticExternCAliases() const override;
   void setCUDAKernelCallingConvention(const FunctionType *&FT) const override;
 };
@@ -9133,36 +9480,13 @@ static bool requiresAMDGPUProtectedVisibility(const Decl *D,
            cast<VarDecl>(D)->getType()->isCUDADeviceBuiltinTextureType()));
 }
 
-void AMDGPUTargetCodeGenInfo::setTargetAttributes(
-    const Decl *D, llvm::GlobalValue *GV, CodeGen::CodeGenModule &M) const {
-  if (requiresAMDGPUProtectedVisibility(D, GV)) {
-    GV->setVisibility(llvm::GlobalValue::ProtectedVisibility);
-    GV->setDSOLocal(true);
-  }
-
-  if (GV->isDeclaration())
-    return;
-  const FunctionDecl *FD = dyn_cast_or_null<FunctionDecl>(D);
-  if (!FD)
-    return;
-
-  llvm::Function *F = cast<llvm::Function>(GV);
-
-  const auto *ReqdWGS = M.getLangOpts().OpenCL ?
-    FD->getAttr<ReqdWorkGroupSizeAttr>() : nullptr;
-
-
-  const bool IsOpenCLKernel = M.getLangOpts().OpenCL &&
-                              FD->hasAttr<OpenCLKernelAttr>();
-  const bool IsHIPKernel = M.getLangOpts().HIP &&
-                           FD->hasAttr<CUDAGlobalAttr>();
-  if ((IsOpenCLKernel || IsHIPKernel) &&
-      (M.getTriple().getOS() == llvm::Triple::AMDHSA))
-    F->addFnAttr("amdgpu-implicitarg-num-bytes", "56");
-
-  if (IsHIPKernel)
-    F->addFnAttr("uniform-work-group-size", "true");
-
+void AMDGPUTargetCodeGenInfo::setFunctionDeclAttributes(
+    const FunctionDecl *FD, llvm::Function *F, CodeGenModule &M) const {
+  const auto *ReqdWGS =
+      M.getLangOpts().OpenCL ? FD->getAttr<ReqdWorkGroupSizeAttr>() : nullptr;
+  const bool IsOpenCLKernel =
+      M.getLangOpts().OpenCL && FD->hasAttr<OpenCLKernelAttr>();
+  const bool IsHIPKernel = M.getLangOpts().HIP && FD->hasAttr<CUDAGlobalAttr>();
 
   const auto *FlatWGS = FD->getAttr<AMDGPUFlatWorkGroupSizeAttr>();
   if (ReqdWGS || FlatWGS) {
@@ -9230,6 +9554,35 @@ void AMDGPUTargetCodeGenInfo::setTargetAttributes(
     if (NumVGPR != 0)
       F->addFnAttr("amdgpu-num-vgpr", llvm::utostr(NumVGPR));
   }
+}
+
+void AMDGPUTargetCodeGenInfo::setTargetAttributes(
+    const Decl *D, llvm::GlobalValue *GV, CodeGen::CodeGenModule &M) const {
+  if (requiresAMDGPUProtectedVisibility(D, GV)) {
+    GV->setVisibility(llvm::GlobalValue::ProtectedVisibility);
+    GV->setDSOLocal(true);
+  }
+
+  if (GV->isDeclaration())
+    return;
+
+  llvm::Function *F = dyn_cast<llvm::Function>(GV);
+  if (!F)
+    return;
+
+  const FunctionDecl *FD = dyn_cast_or_null<FunctionDecl>(D);
+  if (FD)
+    setFunctionDeclAttributes(FD, F, M);
+
+  const bool IsHIPKernel =
+      M.getLangOpts().HIP && FD && FD->hasAttr<CUDAGlobalAttr>();
+  const bool IsOpenMPkernel =
+      M.getLangOpts().OpenMPIsDevice &&
+      (F->getCallingConv() == llvm::CallingConv::AMDGPU_KERNEL);
+
+  // TODO: This should be moved to language specific attributes instead.
+  if (IsHIPKernel || IsOpenMPkernel)
+    F->addFnAttr("uniform-work-group-size", "true");
 
   if (M.getContext().getTargetInfo().allowAMDGPUUnsafeFPAtomics())
     F->addFnAttr("amdgpu-unsafe-fp-atomics", "true");
@@ -9254,8 +9607,8 @@ llvm::Constant *AMDGPUTargetCodeGenInfo::getNullPointer(
     return llvm::ConstantPointerNull::get(PT);
 
   auto &Ctx = CGM.getContext();
-  auto NPT = llvm::PointerType::get(PT->getElementType(),
-      Ctx.getTargetAddressSpace(LangAS::opencl_generic));
+  auto NPT = llvm::PointerType::getWithSamePointeeType(
+      PT, Ctx.getTargetAddressSpace(LangAS::opencl_generic));
   return llvm::ConstantExpr::getAddrSpaceCast(
       llvm::ConstantPointerNull::get(NPT), PT);
 }
@@ -9276,9 +9629,11 @@ AMDGPUTargetCodeGenInfo::getGlobalVarAddressSpace(CodeGenModule &CGM,
   if (AddrSpace != LangAS::Default)
     return AddrSpace;
 
-  if (CGM.isTypeConstant(D->getType(), false)) {
+  // Only promote to address space 4 if VarDecl has constant initialization.
+  if (CGM.isTypeConstant(D->getType(), false) &&
+      D->hasConstantInitialization()) {
     if (auto ConstAS = CGM.getTarget().getConstantAddressSpace())
-      return ConstAS.getValue();
+      return *ConstAS;
   }
   return DefaultGlobalAS;
 }
@@ -9290,17 +9645,25 @@ AMDGPUTargetCodeGenInfo::getLLVMSyncScopeID(const LangOptions &LangOpts,
                                             llvm::LLVMContext &Ctx) const {
   std::string Name;
   switch (Scope) {
-  case SyncScope::OpenCLWorkGroup:
-    Name = "workgroup";
+  case SyncScope::HIPSingleThread:
+    Name = "singlethread";
     break;
+  case SyncScope::HIPWavefront:
+  case SyncScope::OpenCLSubGroup:
+    Name = "wavefront";
+    break;
+  case SyncScope::HIPWorkgroup:
+  case SyncScope::OpenCLWorkGroup:
+    Name = "workgroup";
+    break;
+  case SyncScope::HIPAgent:
   case SyncScope::OpenCLDevice:
     Name = "agent";
     break;
+  case SyncScope::HIPSystem:
   case SyncScope::OpenCLAllSVMDevices:
     Name = "";
     break;
-  case SyncScope::OpenCLSubGroup:
-    Name = "wavefront";
   }
 
   if (Ordering != llvm::AtomicOrdering::SequentiallyConsistent) {
@@ -9363,6 +9726,28 @@ class SparcV8TargetCodeGenInfo : public TargetCodeGenInfo {
 public:
   SparcV8TargetCodeGenInfo(CodeGenTypes &CGT)
       : TargetCodeGenInfo(std::make_unique<SparcV8ABIInfo>(CGT)) {}
+
+  llvm::Value *decodeReturnAddress(CodeGen::CodeGenFunction &CGF,
+                                   llvm::Value *Address) const override {
+    int Offset;
+    if (isAggregateTypeForABI(CGF.CurFnInfo->getReturnType()))
+      Offset = 12;
+    else
+      Offset = 8;
+    return CGF.Builder.CreateGEP(CGF.Int8Ty, Address,
+                                 llvm::ConstantInt::get(CGF.Int32Ty, Offset));
+  }
+
+  llvm::Value *encodeReturnAddress(CodeGen::CodeGenFunction &CGF,
+                                   llvm::Value *Address) const override {
+    int Offset;
+    if (isAggregateTypeForABI(CGF.CurFnInfo->getReturnType()))
+      Offset = -12;
+    else
+      Offset = -8;
+    return CGF.Builder.CreateGEP(CGF.Int8Ty, Address,
+                                 llvm::ConstantInt::get(CGF.Int32Ty, Offset));
+  }
 };
 } // end anonymous namespace
 
@@ -9497,7 +9882,7 @@ private:
 
     // Check if Ty is a usable substitute for the coercion type.
     bool isUsableType(llvm::StructType *Ty) const {
-      return llvm::makeArrayRef(Elems) == Ty->elements();
+      return llvm::ArrayRef(Elems) == Ty->elements();
     }
 
     // Get the coercion type as a literal struct type.
@@ -9531,7 +9916,7 @@ SparcV9ABIInfo::classifyType(QualType Ty, unsigned SizeLimit) const {
   if (Size < 64 && Ty->isIntegerType())
     return ABIArgInfo::getExtend(Ty);
 
-  if (const auto *EIT = Ty->getAs<ExtIntType>())
+  if (const auto *EIT = Ty->getAs<BitIntType>())
     if (EIT->getNumBits() < 64)
       return ABIArgInfo::getExtend(Ty);
 
@@ -9573,7 +9958,8 @@ Address SparcV9ABIInfo::EmitVAArg(CodeGenFunction &CGF, Address VAListAddr,
   CharUnits SlotSize = CharUnits::fromQuantity(8);
 
   CGBuilderTy &Builder = CGF.Builder;
-  Address Addr(Builder.CreateLoad(VAListAddr, "ap.cur"), SlotSize);
+  Address Addr = Address(Builder.CreateLoad(VAListAddr, "ap.cur"),
+                         getVAListElementType(CGF), SlotSize);
   llvm::Type *ArgPtrTy = llvm::PointerType::getUnqual(ArgTy);
 
   auto TypeInfo = getContext().getTypeInfoInChars(Ty);
@@ -9604,19 +9990,19 @@ Address SparcV9ABIInfo::EmitVAArg(CodeGenFunction &CGF, Address VAListAddr,
   case ABIArgInfo::IndirectAliased:
     Stride = SlotSize;
     ArgAddr = Builder.CreateElementBitCast(Addr, ArgPtrTy, "indirect");
-    ArgAddr = Address(Builder.CreateLoad(ArgAddr, "indirect.arg"),
+    ArgAddr = Address(Builder.CreateLoad(ArgAddr, "indirect.arg"), ArgTy,
                       TypeInfo.Align);
     break;
 
   case ABIArgInfo::Ignore:
-    return Address(llvm::UndefValue::get(ArgPtrTy), TypeInfo.Align);
+    return Address(llvm::UndefValue::get(ArgPtrTy), ArgTy, TypeInfo.Align);
   }
 
   // Update VAList.
   Address NextPtr = Builder.CreateConstInBoundsByteGEP(Addr, Stride, "ap.next");
   Builder.CreateStore(NextPtr.getPointer(), VAListAddr);
 
-  return Builder.CreateBitCast(ArgAddr, ArgPtrTy, "arg.addr");
+  return Builder.CreateElementBitCast(ArgAddr, ArgTy, "arg.addr");
 }
 
 void SparcV9ABIInfo::computeInfo(CGFunctionInfo &FI) const {
@@ -9637,6 +10023,18 @@ public:
 
   bool initDwarfEHRegSizeTable(CodeGen::CodeGenFunction &CGF,
                                llvm::Value *Address) const override;
+
+  llvm::Value *decodeReturnAddress(CodeGen::CodeGenFunction &CGF,
+                                   llvm::Value *Address) const override {
+    return CGF.Builder.CreateGEP(CGF.Int8Ty, Address,
+                                 llvm::ConstantInt::get(CGF.Int32Ty, 8));
+  }
+
+  llvm::Value *encodeReturnAddress(CodeGen::CodeGenFunction &CGF,
+                                   llvm::Value *Address) const override {
+    return CGF.Builder.CreateGEP(CGF.Int8Ty, Address,
+                                 llvm::ConstantInt::get(CGF.Int32Ty, -8));
+  }
 };
 } // end anonymous namespace
 
@@ -9785,7 +10183,7 @@ ABIArgInfo ARCABIInfo::classifyArgumentType(QualType Ty,
         ABIArgInfo::getDirect(Result, 0, nullptr, false);
   }
 
-  if (const auto *EIT = Ty->getAs<ExtIntType>())
+  if (const auto *EIT = Ty->getAs<BitIntType>())
     if (EIT->getNumBits() > 64)
       return getIndirectByValue(Ty);
 
@@ -9938,7 +10336,8 @@ Address XCoreABIInfo::EmitVAArg(CodeGenFunction &CGF, Address VAListAddr,
 
   // Get the VAList.
   CharUnits SlotSize = CharUnits::fromQuantity(4);
-  Address AP(Builder.CreateLoad(VAListAddr), SlotSize);
+  Address AP = Address(Builder.CreateLoad(VAListAddr),
+                       getVAListElementType(CGF), SlotSize);
 
   // Handle the argument.
   ABIArgInfo AI = classifyArgumentType(Ty);
@@ -9956,20 +10355,20 @@ Address XCoreABIInfo::EmitVAArg(CodeGenFunction &CGF, Address VAListAddr,
   case ABIArgInfo::InAlloca:
     llvm_unreachable("Unsupported ABI kind for va_arg");
   case ABIArgInfo::Ignore:
-    Val = Address(llvm::UndefValue::get(ArgPtrTy), TypeAlign);
+    Val = Address(llvm::UndefValue::get(ArgPtrTy), ArgTy, TypeAlign);
     ArgSize = CharUnits::Zero();
     break;
   case ABIArgInfo::Extend:
   case ABIArgInfo::Direct:
-    Val = Builder.CreateBitCast(AP, ArgPtrTy);
+    Val = Builder.CreateElementBitCast(AP, ArgTy);
     ArgSize = CharUnits::fromQuantity(
-                       getDataLayout().getTypeAllocSize(AI.getCoerceToType()));
+        getDataLayout().getTypeAllocSize(AI.getCoerceToType()));
     ArgSize = ArgSize.alignTo(SlotSize);
     break;
   case ABIArgInfo::Indirect:
   case ABIArgInfo::IndirectAliased:
     Val = Builder.CreateElementBitCast(AP, ArgPtrTy);
-    Val = Address(Builder.CreateLoad(Val), TypeAlign);
+    Val = Address(Builder.CreateLoad(Val), ArgTy, TypeAlign);
     ArgSize = SlotSize;
     break;
   }
@@ -10038,7 +10437,7 @@ bool TypeStringCache::removeIncomplete(const IdentifierInfo *ID) {
 void TypeStringCache::addIfComplete(const IdentifierInfo *ID, StringRef Str,
                                     bool IsRecursive) {
   if (!ID || IncompleteUsedCount)
-    return; // No key or it is is an incomplete sub-type so don't add.
+    return; // No key or it is an incomplete sub-type so don't add.
   Entry &E = Map[ID];
   if (IsRecursive && !E.Str.empty()) {
     assert(E.State==Recursive && E.Str.size() == Str.size() &&
@@ -10120,24 +10519,37 @@ void XCoreTargetCodeGenInfo::emitTargetMetadata(
     }
   }
 }
+
 //===----------------------------------------------------------------------===//
-// SPIR ABI Implementation
+// Base ABI and target codegen info implementation common between SPIR and
+// SPIR-V.
 //===----------------------------------------------------------------------===//
 
 namespace {
-class SPIRABIInfo : public DefaultABIInfo {
+class CommonSPIRABIInfo : public DefaultABIInfo {
 public:
-  SPIRABIInfo(CodeGenTypes &CGT) : DefaultABIInfo(CGT) { setCCs(); }
+  CommonSPIRABIInfo(CodeGenTypes &CGT) : DefaultABIInfo(CGT) { setCCs(); }
 
 private:
   void setCCs();
 };
+
+class SPIRVABIInfo : public CommonSPIRABIInfo {
+public:
+  SPIRVABIInfo(CodeGenTypes &CGT) : CommonSPIRABIInfo(CGT) {}
+  void computeInfo(CGFunctionInfo &FI) const override;
+
+private:
+  ABIArgInfo classifyKernelArgumentType(QualType Ty) const;
+};
 } // end anonymous namespace
 namespace {
-class SPIRTargetCodeGenInfo : public TargetCodeGenInfo {
+class CommonSPIRTargetCodeGenInfo : public TargetCodeGenInfo {
 public:
-  SPIRTargetCodeGenInfo(CodeGen::CodeGenTypes &CGT)
-      : TargetCodeGenInfo(std::make_unique<SPIRABIInfo>(CGT)) {}
+  CommonSPIRTargetCodeGenInfo(CodeGen::CodeGenTypes &CGT)
+      : TargetCodeGenInfo(std::make_unique<CommonSPIRABIInfo>(CGT)) {}
+  CommonSPIRTargetCodeGenInfo(std::unique_ptr<ABIInfo> ABIInfo)
+      : TargetCodeGenInfo(std::move(ABIInfo)) {}
 
   LangAS getASTAllocaAddressSpace() const override {
     return getLangASFromTargetAS(
@@ -10146,26 +10558,87 @@ public:
 
   unsigned getOpenCLKernelCallingConv() const override;
 };
-
+class SPIRVTargetCodeGenInfo : public CommonSPIRTargetCodeGenInfo {
+public:
+  SPIRVTargetCodeGenInfo(CodeGen::CodeGenTypes &CGT)
+      : CommonSPIRTargetCodeGenInfo(std::make_unique<SPIRVABIInfo>(CGT)) {}
+  void setCUDAKernelCallingConvention(const FunctionType *&FT) const override;
+};
 } // End anonymous namespace.
-void SPIRABIInfo::setCCs() {
+
+void CommonSPIRABIInfo::setCCs() {
   assert(getRuntimeCC() == llvm::CallingConv::C);
   RuntimeCC = llvm::CallingConv::SPIR_FUNC;
 }
 
+ABIArgInfo SPIRVABIInfo::classifyKernelArgumentType(QualType Ty) const {
+  if (getContext().getLangOpts().CUDAIsDevice) {
+    // Coerce pointer arguments with default address space to CrossWorkGroup
+    // pointers for HIPSPV/CUDASPV. When the language mode is HIP/CUDA, the
+    // SPIRTargetInfo maps cuda_device to SPIR-V's CrossWorkGroup address space.
+    llvm::Type *LTy = CGT.ConvertType(Ty);
+    auto DefaultAS = getContext().getTargetAddressSpace(LangAS::Default);
+    auto GlobalAS = getContext().getTargetAddressSpace(LangAS::cuda_device);
+    auto *PtrTy = llvm::dyn_cast<llvm::PointerType>(LTy);
+    if (PtrTy && PtrTy->getAddressSpace() == DefaultAS) {
+      LTy = llvm::PointerType::getWithSamePointeeType(PtrTy, GlobalAS);
+      return ABIArgInfo::getDirect(LTy, 0, nullptr, false);
+    }
+
+    // Force copying aggregate type in kernel arguments by value when
+    // compiling CUDA targeting SPIR-V. This is required for the object
+    // copied to be valid on the device.
+    // This behavior follows the CUDA spec
+    // https://docs.nvidia.com/cuda/cuda-c-programming-guide/index.html#global-function-argument-processing,
+    // and matches the NVPTX implementation.
+    if (isAggregateTypeForABI(Ty))
+      return getNaturalAlignIndirect(Ty, /* byval */ true);
+  }
+  return classifyArgumentType(Ty);
+}
+
+void SPIRVABIInfo::computeInfo(CGFunctionInfo &FI) const {
+  // The logic is same as in DefaultABIInfo with an exception on the kernel
+  // arguments handling.
+  llvm::CallingConv::ID CC = FI.getCallingConvention();
+
+  if (!getCXXABI().classifyReturnType(FI))
+    FI.getReturnInfo() = classifyReturnType(FI.getReturnType());
+
+  for (auto &I : FI.arguments()) {
+    if (CC == llvm::CallingConv::SPIR_KERNEL) {
+      I.info = classifyKernelArgumentType(I.type);
+    } else {
+      I.info = classifyArgumentType(I.type);
+    }
+  }
+}
+
 namespace clang {
 namespace CodeGen {
 void computeSPIRKernelABIInfo(CodeGenModule &CGM, CGFunctionInfo &FI) {
-  DefaultABIInfo SPIRABI(CGM.getTypes());
-  SPIRABI.computeInfo(FI);
+  if (CGM.getTarget().getTriple().isSPIRV())
+    SPIRVABIInfo(CGM.getTypes()).computeInfo(FI);
+  else
+    CommonSPIRABIInfo(CGM.getTypes()).computeInfo(FI);
 }
 }
 }
 
-unsigned SPIRTargetCodeGenInfo::getOpenCLKernelCallingConv() const {
+unsigned CommonSPIRTargetCodeGenInfo::getOpenCLKernelCallingConv() const {
   return llvm::CallingConv::SPIR_KERNEL;
 }
 
+void SPIRVTargetCodeGenInfo::setCUDAKernelCallingConvention(
+    const FunctionType *&FT) const {
+  // Convert HIP kernels to SPIR-V kernels.
+  if (getABIInfo().getContext().getLangOpts().HIP) {
+    FT = getABIInfo().getContext().adjustFunctionType(
+        FT, FT->getExtInfo().withCallingConv(CC_OpenCLKernel));
+    return;
+  }
+}
+
 static bool appendType(SmallStringEnc &Enc, QualType QType,
                        const CodeGen::CodeGenModule &CGM,
                        TypeStringCache &TSC);
@@ -10569,11 +11042,6 @@ void RISCVABIInfo::computeInfo(CGFunctionInfo &FI) const {
     }
   }
 
-  // We must track the number of GPRs used in order to conform to the RISC-V
-  // ABI, as integer scalars passed in registers should have signext/zeroext
-  // when promoted, but are anyext if passed on the stack. As GPR usage is
-  // different for variadic arguments, we must also track whether we are
-  // examining a vararg or not.
   int ArgGPRsLeft = IsRetIndirect ? NumArgGPRs - 1 : NumArgGPRs;
   int ArgFPRsLeft = FLen ? NumArgFPRs : 0;
   int NumFixedArgs = FI.getNumRequiredArgs();
@@ -10663,9 +11131,22 @@ bool RISCVABIInfo::detectFPCCEligibleStructHelper(QualType Ty, CharUnits CurOff,
     // Unions aren't eligible unless they're empty (which is caught above).
     if (RD->isUnion())
       return false;
+    const ASTRecordLayout &Layout = getContext().getASTRecordLayout(RD);
+    // If this is a C++ record, check the bases first.
+    if (const CXXRecordDecl *CXXRD = dyn_cast<CXXRecordDecl>(RD)) {
+      for (const CXXBaseSpecifier &B : CXXRD->bases()) {
+        const auto *BDecl =
+            cast<CXXRecordDecl>(B.getType()->castAs<RecordType>()->getDecl());
+        CharUnits BaseOff = Layout.getBaseClassOffset(BDecl);
+        bool Ret = detectFPCCEligibleStructHelper(B.getType(), CurOff + BaseOff,
+                                                  Field1Ty, Field1Off, Field2Ty,
+                                                  Field2Off);
+        if (!Ret)
+          return false;
+      }
+    }
     int ZeroWidthBitFieldCount = 0;
     for (const FieldDecl *FD : RD->fields()) {
-      const ASTRecordLayout &Layout = getContext().getASTRecordLayout(RD);
       uint64_t FieldOffInBits = Layout.getFieldOffset(FD->getFieldIndex());
       QualType QTy = FD->getType();
       if (FD->isBitField()) {
@@ -10752,7 +11233,7 @@ ABIArgInfo RISCVABIInfo::coerceAndExpandFPCCEligibleStruct(
   }
 
   CharUnits Field2Align =
-      CharUnits::fromQuantity(getDataLayout().getABITypeAlignment(Field2Ty));
+      CharUnits::fromQuantity(getDataLayout().getABITypeAlign(Field2Ty));
   CharUnits Field1End = Field1Off +
       CharUnits::fromQuantity(getDataLayout().getTypeStoreSize(Field1Ty));
   CharUnits Field2OffNoPadNoPack = Field1End.alignTo(Field2Align);
@@ -10838,7 +11319,6 @@ ABIArgInfo RISCVABIInfo::classifyArgumentType(QualType Ty, bool IsFixed,
   }
 
   uint64_t NeededAlign = getContext().getTypeAlign(Ty);
-  bool MustUseStack = false;
   // Determine the number of GPRs needed to pass the current argument
   // according to the ABI. 2*XLen-aligned varargs are passed in "aligned"
   // register pairs, so may consume 3 registers.
@@ -10849,7 +11329,6 @@ ABIArgInfo RISCVABIInfo::classifyArgumentType(QualType Ty, bool IsFixed,
     NeededArgGPRs = 2;
 
   if (NeededArgGPRs > ArgGPRsLeft) {
-    MustUseStack = true;
     NeededArgGPRs = ArgGPRsLeft;
   }
 
@@ -10860,14 +11339,13 @@ ABIArgInfo RISCVABIInfo::classifyArgumentType(QualType Ty, bool IsFixed,
     if (const EnumType *EnumTy = Ty->getAs<EnumType>())
       Ty = EnumTy->getDecl()->getIntegerType();
 
-    // All integral types are promoted to XLen width, unless passed on the
-    // stack.
-    if (Size < XLen && Ty->isIntegralOrEnumerationType() && !MustUseStack) {
+    // All integral types are promoted to XLen width
+    if (Size < XLen && Ty->isIntegralOrEnumerationType()) {
       return extendType(Ty);
     }
 
-    if (const auto *EIT = Ty->getAs<ExtIntType>()) {
-      if (EIT->getNumBits() < XLen && !MustUseStack)
+    if (const auto *EIT = Ty->getAs<BitIntType>()) {
+      if (EIT->getNumBits() < XLen)
         return extendType(Ty);
       if (EIT->getNumBits() > 128 ||
           (!getContext().getTargetInfo().hasInt128Type() &&
@@ -10918,7 +11396,8 @@ Address RISCVABIInfo::EmitVAArg(CodeGenFunction &CGF, Address VAListAddr,
 
   // Empty records are ignored for parameter passing purposes.
   if (isEmptyRecord(getContext(), Ty, true)) {
-    Address Addr(CGF.Builder.CreateLoad(VAListAddr), SlotSize);
+    Address Addr = Address(CGF.Builder.CreateLoad(VAListAddr),
+                           getVAListElementType(CGF), SlotSize);
     Addr = CGF.Builder.CreateElementBitCast(Addr, CGF.ConvertTypeForMem(Ty));
     return Addr;
   }
@@ -11024,161 +11503,844 @@ public:
 } // end anonymous namespace
 
 //===----------------------------------------------------------------------===//
-// Driver code
+// CSKY ABI Implementation
 //===----------------------------------------------------------------------===//
+namespace {
+class CSKYABIInfo : public DefaultABIInfo {
+  static const int NumArgGPRs = 4;
+  static const int NumArgFPRs = 4;
 
-bool CodeGenModule::supportsCOMDAT() const {
-  return getTriple().supportsCOMDAT();
-}
+  static const unsigned XLen = 32;
+  unsigned FLen;
 
-const TargetCodeGenInfo &CodeGenModule::getTargetCodeGenInfo() {
-  if (TheTargetCodeGenInfo)
-    return *TheTargetCodeGenInfo;
+public:
+  CSKYABIInfo(CodeGen::CodeGenTypes &CGT, unsigned FLen)
+      : DefaultABIInfo(CGT), FLen(FLen) {}
 
-  // Helper to set the unique_ptr while still keeping the return value.
-  auto SetCGInfo = [&](TargetCodeGenInfo *P) -> const TargetCodeGenInfo & {
-    this->TheTargetCodeGenInfo.reset(P);
-    return *P;
-  };
+  void computeInfo(CGFunctionInfo &FI) const override;
+  ABIArgInfo classifyArgumentType(QualType Ty, int &ArgGPRsLeft,
+                                  int &ArgFPRsLeft,
+                                  bool isReturnType = false) const;
+  ABIArgInfo classifyReturnType(QualType RetTy) const;
 
-  const llvm::Triple &Triple = getTarget().getTriple();
-  switch (Triple.getArch()) {
-  default:
-    return SetCGInfo(new DefaultTargetCodeGenInfo(Types));
+  Address EmitVAArg(CodeGenFunction &CGF, Address VAListAddr,
+                    QualType Ty) const override;
+};
 
-  case llvm::Triple::le32:
-    return SetCGInfo(new PNaClTargetCodeGenInfo(Types));
-  case llvm::Triple::m68k:
-    return SetCGInfo(new M68kTargetCodeGenInfo(Types));
-  case llvm::Triple::mips:
-  case llvm::Triple::mipsel:
-    if (Triple.getOS() == llvm::Triple::NaCl)
-      return SetCGInfo(new PNaClTargetCodeGenInfo(Types));
-    return SetCGInfo(new MIPSTargetCodeGenInfo(Types, true));
+} // end anonymous namespace
 
-  case llvm::Triple::mips64:
-  case llvm::Triple::mips64el:
-    return SetCGInfo(new MIPSTargetCodeGenInfo(Types, false));
+void CSKYABIInfo::computeInfo(CGFunctionInfo &FI) const {
+  QualType RetTy = FI.getReturnType();
+  if (!getCXXABI().classifyReturnType(FI))
+    FI.getReturnInfo() = classifyReturnType(RetTy);
 
-  case llvm::Triple::avr:
-    return SetCGInfo(new AVRTargetCodeGenInfo(Types));
+  bool IsRetIndirect = FI.getReturnInfo().getKind() == ABIArgInfo::Indirect;
 
-  case llvm::Triple::aarch64:
-  case llvm::Triple::aarch64_32:
-  case llvm::Triple::aarch64_be: {
-    AArch64ABIInfo::ABIKind Kind = AArch64ABIInfo::AAPCS;
-    if (getTarget().getABI() == "darwinpcs")
-      Kind = AArch64ABIInfo::DarwinPCS;
-    else if (Triple.isOSWindows())
-      return SetCGInfo(
-          new WindowsAArch64TargetCodeGenInfo(Types, AArch64ABIInfo::Win64));
+  // We must track the number of GPRs used in order to conform to the CSKY
+  // ABI, as integer scalars passed in registers should have signext/zeroext
+  // when promoted.
+  int ArgGPRsLeft = IsRetIndirect ? NumArgGPRs - 1 : NumArgGPRs;
+  int ArgFPRsLeft = FLen ? NumArgFPRs : 0;
 
-    return SetCGInfo(new AArch64TargetCodeGenInfo(Types, Kind));
+  for (auto &ArgInfo : FI.arguments()) {
+    ArgInfo.info = classifyArgumentType(ArgInfo.type, ArgGPRsLeft, ArgFPRsLeft);
   }
+}
 
-  case llvm::Triple::wasm32:
-  case llvm::Triple::wasm64: {
-    WebAssemblyABIInfo::ABIKind Kind = WebAssemblyABIInfo::MVP;
-    if (getTarget().getABI() == "experimental-mv")
-      Kind = WebAssemblyABIInfo::ExperimentalMV;
-    return SetCGInfo(new WebAssemblyTargetCodeGenInfo(Types, Kind));
+Address CSKYABIInfo::EmitVAArg(CodeGenFunction &CGF, Address VAListAddr,
+                               QualType Ty) const {
+  CharUnits SlotSize = CharUnits::fromQuantity(XLen / 8);
+
+  // Empty records are ignored for parameter passing purposes.
+  if (isEmptyRecord(getContext(), Ty, true)) {
+    Address Addr = Address(CGF.Builder.CreateLoad(VAListAddr),
+                           getVAListElementType(CGF), SlotSize);
+    Addr = CGF.Builder.CreateElementBitCast(Addr, CGF.ConvertTypeForMem(Ty));
+    return Addr;
   }
 
-  case llvm::Triple::arm:
-  case llvm::Triple::armeb:
-  case llvm::Triple::thumb:
-  case llvm::Triple::thumbeb: {
-    if (Triple.getOS() == llvm::Triple::Win32) {
-      return SetCGInfo(
-          new WindowsARMTargetCodeGenInfo(Types, ARMABIInfo::AAPCS_VFP));
-    }
+  auto TInfo = getContext().getTypeInfoInChars(Ty);
 
-    ARMABIInfo::ABIKind Kind = ARMABIInfo::AAPCS;
-    StringRef ABIStr = getTarget().getABI();
-    if (ABIStr == "apcs-gnu")
-      Kind = ARMABIInfo::APCS;
-    else if (ABIStr == "aapcs16")
-      Kind = ARMABIInfo::AAPCS16_VFP;
-    else if (CodeGenOpts.FloatABI == "hard" ||
-             (CodeGenOpts.FloatABI != "soft" &&
-              (Triple.getEnvironment() == llvm::Triple::GNUEABIHF ||
-               Triple.getEnvironment() == llvm::Triple::MuslEABIHF ||
-               Triple.getEnvironment() == llvm::Triple::EABIHF)))
-      Kind = ARMABIInfo::AAPCS_VFP;
+  return emitVoidPtrVAArg(CGF, VAListAddr, Ty, false, TInfo, SlotSize,
+                          /*AllowHigherAlign=*/true);
+}
 
-    return SetCGInfo(new ARMTargetCodeGenInfo(Types, Kind));
+ABIArgInfo CSKYABIInfo::classifyArgumentType(QualType Ty, int &ArgGPRsLeft,
+                                             int &ArgFPRsLeft,
+                                             bool isReturnType) const {
+  assert(ArgGPRsLeft <= NumArgGPRs && "Arg GPR tracking underflow");
+  Ty = useFirstFieldIfTransparentUnion(Ty);
+
+  // Structures with either a non-trivial destructor or a non-trivial
+  // copy constructor are always passed indirectly.
+  if (CGCXXABI::RecordArgABI RAA = getRecordArgABI(Ty, getCXXABI())) {
+    if (ArgGPRsLeft)
+      ArgGPRsLeft -= 1;
+    return getNaturalAlignIndirect(Ty, /*ByVal=*/RAA ==
+                                           CGCXXABI::RAA_DirectInMemory);
   }
 
-  case llvm::Triple::ppc: {
-    if (Triple.isOSAIX())
-      return SetCGInfo(new AIXTargetCodeGenInfo(Types, /*Is64Bit*/ false));
+  // Ignore empty structs/unions.
+  if (isEmptyRecord(getContext(), Ty, true))
+    return ABIArgInfo::getIgnore();
 
-    bool IsSoftFloat =
-        CodeGenOpts.FloatABI == "soft" || getTarget().hasFeature("spe");
-    bool RetSmallStructInRegABI =
-        PPC32TargetCodeGenInfo::isStructReturnInRegABI(Triple, CodeGenOpts);
-    return SetCGInfo(
-        new PPC32TargetCodeGenInfo(Types, IsSoftFloat, RetSmallStructInRegABI));
-  }
-  case llvm::Triple::ppcle: {
-    bool IsSoftFloat = CodeGenOpts.FloatABI == "soft";
-    bool RetSmallStructInRegABI =
-        PPC32TargetCodeGenInfo::isStructReturnInRegABI(Triple, CodeGenOpts);
-    return SetCGInfo(
-        new PPC32TargetCodeGenInfo(Types, IsSoftFloat, RetSmallStructInRegABI));
-  }
-  case llvm::Triple::ppc64:
-    if (Triple.isOSAIX())
-      return SetCGInfo(new AIXTargetCodeGenInfo(Types, /*Is64Bit*/ true));
+  if (!Ty->getAsUnionType())
+    if (const Type *SeltTy = isSingleElementStruct(Ty, getContext()))
+      return ABIArgInfo::getDirect(CGT.ConvertType(QualType(SeltTy, 0)));
 
-    if (Triple.isOSBinFormatELF()) {
-      PPC64_SVR4_ABIInfo::ABIKind Kind = PPC64_SVR4_ABIInfo::ELFv1;
-      if (getTarget().getABI() == "elfv2")
-        Kind = PPC64_SVR4_ABIInfo::ELFv2;
-      bool IsSoftFloat = CodeGenOpts.FloatABI == "soft";
+  uint64_t Size = getContext().getTypeSize(Ty);
+  // Pass floating point values via FPRs if possible.
+  if (Ty->isFloatingType() && !Ty->isComplexType() && FLen >= Size &&
+      ArgFPRsLeft) {
+    ArgFPRsLeft--;
+    return ABIArgInfo::getDirect();
+  }
 
-      return SetCGInfo(
-          new PPC64_SVR4_TargetCodeGenInfo(Types, Kind, IsSoftFloat));
+  // Complex types for the hard float ABI must be passed direct rather than
+  // using CoerceAndExpand.
+  if (Ty->isComplexType() && FLen && !isReturnType) {
+    QualType EltTy = Ty->castAs<ComplexType>()->getElementType();
+    if (getContext().getTypeSize(EltTy) <= FLen) {
+      ArgFPRsLeft -= 2;
+      return ABIArgInfo::getDirect();
     }
-    return SetCGInfo(new PPC64TargetCodeGenInfo(Types));
-  case llvm::Triple::ppc64le: {
-    assert(Triple.isOSBinFormatELF() && "PPC64 LE non-ELF not supported!");
-    PPC64_SVR4_ABIInfo::ABIKind Kind = PPC64_SVR4_ABIInfo::ELFv2;
-    if (getTarget().getABI() == "elfv1")
-      Kind = PPC64_SVR4_ABIInfo::ELFv1;
-    bool IsSoftFloat = CodeGenOpts.FloatABI == "soft";
-
-    return SetCGInfo(
-        new PPC64_SVR4_TargetCodeGenInfo(Types, Kind, IsSoftFloat));
   }
 
-  case llvm::Triple::nvptx:
-  case llvm::Triple::nvptx64:
-    return SetCGInfo(new NVPTXTargetCodeGenInfo(Types));
+  if (!isAggregateTypeForABI(Ty)) {
+    // Treat an enum type as its underlying type.
+    if (const EnumType *EnumTy = Ty->getAs<EnumType>())
+      Ty = EnumTy->getDecl()->getIntegerType();
 
-  case llvm::Triple::msp430:
-    return SetCGInfo(new MSP430TargetCodeGenInfo(Types));
+    // All integral types are promoted to XLen width, unless passed on the
+    // stack.
+    if (Size < XLen && Ty->isIntegralOrEnumerationType())
+      return ABIArgInfo::getExtend(Ty);
 
-  case llvm::Triple::riscv32:
-  case llvm::Triple::riscv64: {
-    StringRef ABIStr = getTarget().getABI();
-    unsigned XLen = getTarget().getPointerWidth(0);
-    unsigned ABIFLen = 0;
-    if (ABIStr.endswith("f"))
-      ABIFLen = 32;
-    else if (ABIStr.endswith("d"))
-      ABIFLen = 64;
-    return SetCGInfo(new RISCVTargetCodeGenInfo(Types, XLen, ABIFLen));
+    if (const auto *EIT = Ty->getAs<BitIntType>()) {
+      if (EIT->getNumBits() < XLen)
+        return ABIArgInfo::getExtend(Ty);
+    }
+
+    return ABIArgInfo::getDirect();
   }
 
-  case llvm::Triple::systemz: {
-    bool SoftFloat = CodeGenOpts.FloatABI == "soft";
-    bool HasVector = !SoftFloat && getTarget().getABI() == "vector";
-    return SetCGInfo(new SystemZTargetCodeGenInfo(Types, HasVector, SoftFloat));
+  // For argument type, the first 4*XLen parts of aggregate will be passed
+  // in registers, and the rest will be passed in stack.
+  // So we can coerce to integers directly and let backend handle it correctly.
+  // For return type, aggregate which <= 2*XLen will be returned in registers.
+  // Otherwise, aggregate will be returned indirectly.
+  if (!isReturnType || (isReturnType && Size <= 2 * XLen)) {
+    if (Size <= XLen) {
+      return ABIArgInfo::getDirect(
+          llvm::IntegerType::get(getVMContext(), XLen));
+    } else {
+      return ABIArgInfo::getDirect(llvm::ArrayType::get(
+          llvm::IntegerType::get(getVMContext(), XLen), (Size + 31) / XLen));
+    }
   }
+  return getNaturalAlignIndirect(Ty, /*ByVal=*/false);
+}
 
-  case llvm::Triple::tce:
-  case llvm::Triple::tcele:
+ABIArgInfo CSKYABIInfo::classifyReturnType(QualType RetTy) const {
+  if (RetTy->isVoidType())
+    return ABIArgInfo::getIgnore();
+
+  int ArgGPRsLeft = 2;
+  int ArgFPRsLeft = FLen ? 1 : 0;
+
+  // The rules for return and argument types are the same, so defer to
+  // classifyArgumentType.
+  return classifyArgumentType(RetTy, ArgGPRsLeft, ArgFPRsLeft, true);
+}
+
+namespace {
+class CSKYTargetCodeGenInfo : public TargetCodeGenInfo {
+public:
+  CSKYTargetCodeGenInfo(CodeGen::CodeGenTypes &CGT, unsigned FLen)
+      : TargetCodeGenInfo(std::make_unique<CSKYABIInfo>(CGT, FLen)) {}
+};
+} // end anonymous namespace
+
+//===----------------------------------------------------------------------===//
+// BPF ABI Implementation
+//===----------------------------------------------------------------------===//
+
+namespace {
+
+class BPFABIInfo : public DefaultABIInfo {
+public:
+  BPFABIInfo(CodeGenTypes &CGT) : DefaultABIInfo(CGT) {}
+
+  ABIArgInfo classifyArgumentType(QualType Ty) const {
+    Ty = useFirstFieldIfTransparentUnion(Ty);
+
+    if (isAggregateTypeForABI(Ty)) {
+      uint64_t Bits = getContext().getTypeSize(Ty);
+      if (Bits == 0)
+        return ABIArgInfo::getIgnore();
+
+      // If the aggregate needs 1 or 2 registers, do not use reference.
+      if (Bits <= 128) {
+        llvm::Type *CoerceTy;
+        if (Bits <= 64) {
+          CoerceTy =
+              llvm::IntegerType::get(getVMContext(), llvm::alignTo(Bits, 8));
+        } else {
+          llvm::Type *RegTy = llvm::IntegerType::get(getVMContext(), 64);
+          CoerceTy = llvm::ArrayType::get(RegTy, 2);
+        }
+        return ABIArgInfo::getDirect(CoerceTy);
+      } else {
+        return getNaturalAlignIndirect(Ty);
+      }
+    }
+
+    if (const EnumType *EnumTy = Ty->getAs<EnumType>())
+      Ty = EnumTy->getDecl()->getIntegerType();
+
+    ASTContext &Context = getContext();
+    if (const auto *EIT = Ty->getAs<BitIntType>())
+      if (EIT->getNumBits() > Context.getTypeSize(Context.Int128Ty))
+        return getNaturalAlignIndirect(Ty);
+
+    return (isPromotableIntegerTypeForABI(Ty) ? ABIArgInfo::getExtend(Ty)
+                                              : ABIArgInfo::getDirect());
+  }
+
+  ABIArgInfo classifyReturnType(QualType RetTy) const {
+    if (RetTy->isVoidType())
+      return ABIArgInfo::getIgnore();
+
+    if (isAggregateTypeForABI(RetTy))
+      return getNaturalAlignIndirect(RetTy);
+
+    // Treat an enum type as its underlying type.
+    if (const EnumType *EnumTy = RetTy->getAs<EnumType>())
+      RetTy = EnumTy->getDecl()->getIntegerType();
+
+    ASTContext &Context = getContext();
+    if (const auto *EIT = RetTy->getAs<BitIntType>())
+      if (EIT->getNumBits() > Context.getTypeSize(Context.Int128Ty))
+        return getNaturalAlignIndirect(RetTy);
+
+    // Caller will do necessary sign/zero extension.
+    return ABIArgInfo::getDirect();
+  }
+
+  void computeInfo(CGFunctionInfo &FI) const override {
+    FI.getReturnInfo() = classifyReturnType(FI.getReturnType());
+    for (auto &I : FI.arguments())
+      I.info = classifyArgumentType(I.type);
+  }
+
+};
+
+class BPFTargetCodeGenInfo : public TargetCodeGenInfo {
+public:
+  BPFTargetCodeGenInfo(CodeGenTypes &CGT)
+      : TargetCodeGenInfo(std::make_unique<BPFABIInfo>(CGT)) {}
+
+  const BPFABIInfo &getABIInfo() const {
+    return static_cast<const BPFABIInfo&>(TargetCodeGenInfo::getABIInfo());
+  }
+};
+
+}
+
+// LoongArch ABI Implementation. Documented at
+// https://loongson.github.io/LoongArch-Documentation/LoongArch-ELF-ABI-EN.html
+//
+//===----------------------------------------------------------------------===//
+
+namespace {
+class LoongArchABIInfo : public DefaultABIInfo {
+private:
+  // Size of the integer ('r') registers in bits.
+  unsigned GRLen;
+  // Size of the floating point ('f') registers in bits.
+  unsigned FRLen;
+  // Number of general-purpose argument registers.
+  static const int NumGARs = 8;
+  // Number of floating-point argument registers.
+  static const int NumFARs = 8;
+  bool detectFARsEligibleStructHelper(QualType Ty, CharUnits CurOff,
+                                      llvm::Type *&Field1Ty,
+                                      CharUnits &Field1Off,
+                                      llvm::Type *&Field2Ty,
+                                      CharUnits &Field2Off) const;
+
+public:
+  LoongArchABIInfo(CodeGen::CodeGenTypes &CGT, unsigned GRLen, unsigned FRLen)
+      : DefaultABIInfo(CGT), GRLen(GRLen), FRLen(FRLen) {}
+
+  void computeInfo(CGFunctionInfo &FI) const override;
+
+  ABIArgInfo classifyArgumentType(QualType Ty, bool IsFixed, int &GARsLeft,
+                                  int &FARsLeft) const;
+  ABIArgInfo classifyReturnType(QualType RetTy) const;
+
+  Address EmitVAArg(CodeGenFunction &CGF, Address VAListAddr,
+                    QualType Ty) const override;
+
+  ABIArgInfo extendType(QualType Ty) const;
+
+  bool detectFARsEligibleStruct(QualType Ty, llvm::Type *&Field1Ty,
+                                CharUnits &Field1Off, llvm::Type *&Field2Ty,
+                                CharUnits &Field2Off, int &NeededArgGPRs,
+                                int &NeededArgFPRs) const;
+  ABIArgInfo coerceAndExpandFARsEligibleStruct(llvm::Type *Field1Ty,
+                                               CharUnits Field1Off,
+                                               llvm::Type *Field2Ty,
+                                               CharUnits Field2Off) const;
+};
+} // end anonymous namespace
+
+void LoongArchABIInfo::computeInfo(CGFunctionInfo &FI) const {
+  QualType RetTy = FI.getReturnType();
+  if (!getCXXABI().classifyReturnType(FI))
+    FI.getReturnInfo() = classifyReturnType(RetTy);
+
+  // IsRetIndirect is true if classifyArgumentType indicated the value should
+  // be passed indirect, or if the type size is a scalar greater than 2*GRLen
+  // and not a complex type with elements <= FRLen. e.g. fp128 is passed direct
+  // in LLVM IR, relying on the backend lowering code to rewrite the argument
+  // list and pass indirectly on LA32.
+  bool IsRetIndirect = FI.getReturnInfo().getKind() == ABIArgInfo::Indirect;
+  if (!IsRetIndirect && RetTy->isScalarType() &&
+      getContext().getTypeSize(RetTy) > (2 * GRLen)) {
+    if (RetTy->isComplexType() && FRLen) {
+      QualType EltTy = RetTy->castAs<ComplexType>()->getElementType();
+      IsRetIndirect = getContext().getTypeSize(EltTy) > FRLen;
+    } else {
+      // This is a normal scalar > 2*GRLen, such as fp128 on LA32.
+      IsRetIndirect = true;
+    }
+  }
+
+  // We must track the number of GARs and FARs used in order to conform to the
+  // LoongArch ABI. As GAR usage is different for variadic arguments, we must
+  // also track whether we are examining a vararg or not.
+  int GARsLeft = IsRetIndirect ? NumGARs - 1 : NumGARs;
+  int FARsLeft = FRLen ? NumFARs : 0;
+  int NumFixedArgs = FI.getNumRequiredArgs();
+
+  int ArgNum = 0;
+  for (auto &ArgInfo : FI.arguments()) {
+    ArgInfo.info = classifyArgumentType(
+        ArgInfo.type, /*IsFixed=*/ArgNum < NumFixedArgs, GARsLeft, FARsLeft);
+    ArgNum++;
+  }
+}
+
+// Returns true if the struct is a potential candidate to be passed in FARs (and
+// GARs). If this function returns true, the caller is responsible for checking
+// that if there is only a single field then that field is a float.
+bool LoongArchABIInfo::detectFARsEligibleStructHelper(
+    QualType Ty, CharUnits CurOff, llvm::Type *&Field1Ty, CharUnits &Field1Off,
+    llvm::Type *&Field2Ty, CharUnits &Field2Off) const {
+  bool IsInt = Ty->isIntegralOrEnumerationType();
+  bool IsFloat = Ty->isRealFloatingType();
+
+  if (IsInt || IsFloat) {
+    uint64_t Size = getContext().getTypeSize(Ty);
+    if (IsInt && Size > GRLen)
+      return false;
+    // Can't be eligible if larger than the FP registers. Half precision isn't
+    // currently supported on LoongArch and the ABI hasn't been confirmed, so
+    // default to the integer ABI in that case.
+    if (IsFloat && (Size > FRLen || Size < 32))
+      return false;
+    // Can't be eligible if an integer type was already found (int+int pairs
+    // are not eligible).
+    if (IsInt && Field1Ty && Field1Ty->isIntegerTy())
+      return false;
+    if (!Field1Ty) {
+      Field1Ty = CGT.ConvertType(Ty);
+      Field1Off = CurOff;
+      return true;
+    }
+    if (!Field2Ty) {
+      Field2Ty = CGT.ConvertType(Ty);
+      Field2Off = CurOff;
+      return true;
+    }
+    return false;
+  }
+
+  if (auto CTy = Ty->getAs<ComplexType>()) {
+    if (Field1Ty)
+      return false;
+    QualType EltTy = CTy->getElementType();
+    if (getContext().getTypeSize(EltTy) > FRLen)
+      return false;
+    Field1Ty = CGT.ConvertType(EltTy);
+    Field1Off = CurOff;
+    Field2Ty = Field1Ty;
+    Field2Off = Field1Off + getContext().getTypeSizeInChars(EltTy);
+    return true;
+  }
+
+  if (const ConstantArrayType *ATy = getContext().getAsConstantArrayType(Ty)) {
+    uint64_t ArraySize = ATy->getSize().getZExtValue();
+    QualType EltTy = ATy->getElementType();
+    CharUnits EltSize = getContext().getTypeSizeInChars(EltTy);
+    for (uint64_t i = 0; i < ArraySize; ++i) {
+      if (!detectFARsEligibleStructHelper(EltTy, CurOff, Field1Ty, Field1Off,
+                                          Field2Ty, Field2Off))
+        return false;
+      CurOff += EltSize;
+    }
+    return true;
+  }
+
+  if (const auto *RTy = Ty->getAs<RecordType>()) {
+    // Structures with either a non-trivial destructor or a non-trivial
+    // copy constructor are not eligible for the FP calling convention.
+    if (getRecordArgABI(Ty, CGT.getCXXABI()))
+      return false;
+    if (isEmptyRecord(getContext(), Ty, true))
+      return true;
+    const RecordDecl *RD = RTy->getDecl();
+    // Unions aren't eligible unless they're empty (which is caught above).
+    if (RD->isUnion())
+      return false;
+    const ASTRecordLayout &Layout = getContext().getASTRecordLayout(RD);
+    // If this is a C++ record, check the bases first.
+    if (const CXXRecordDecl *CXXRD = dyn_cast<CXXRecordDecl>(RD)) {
+      for (const CXXBaseSpecifier &B : CXXRD->bases()) {
+        const auto *BDecl =
+            cast<CXXRecordDecl>(B.getType()->castAs<RecordType>()->getDecl());
+        if (!detectFARsEligibleStructHelper(
+                B.getType(), CurOff + Layout.getBaseClassOffset(BDecl),
+                Field1Ty, Field1Off, Field2Ty, Field2Off))
+          return false;
+      }
+    }
+    for (const FieldDecl *FD : RD->fields()) {
+      QualType QTy = FD->getType();
+      if (FD->isBitField()) {
+        unsigned BitWidth = FD->getBitWidthValue(getContext());
+        // Zero-width bitfields are ignored.
+        if (BitWidth == 0)
+          continue;
+        // Allow a bitfield with a type greater than GRLen as long as the
+        // bitwidth is GRLen or less.
+        if (getContext().getTypeSize(QTy) > GRLen && BitWidth <= GRLen) {
+          QTy = getContext().getIntTypeForBitwidth(GRLen, false);
+        }
+      }
+
+      if (!detectFARsEligibleStructHelper(
+              QTy,
+              CurOff + getContext().toCharUnitsFromBits(
+                           Layout.getFieldOffset(FD->getFieldIndex())),
+              Field1Ty, Field1Off, Field2Ty, Field2Off))
+        return false;
+    }
+    return Field1Ty != nullptr;
+  }
+
+  return false;
+}
+
+// Determine if a struct is eligible to be passed in FARs (and GARs) (i.e., when
+// flattened it contains a single fp value, fp+fp, or int+fp of appropriate
+// size). If so, NeededFARs and NeededGARs are incremented appropriately.
+bool LoongArchABIInfo::detectFARsEligibleStruct(
+    QualType Ty, llvm::Type *&Field1Ty, CharUnits &Field1Off,
+    llvm::Type *&Field2Ty, CharUnits &Field2Off, int &NeededGARs,
+    int &NeededFARs) const {
+  Field1Ty = nullptr;
+  Field2Ty = nullptr;
+  NeededGARs = 0;
+  NeededFARs = 0;
+  if (!detectFARsEligibleStructHelper(Ty, CharUnits::Zero(), Field1Ty,
+                                      Field1Off, Field2Ty, Field2Off))
+    return false;
+  // Not really a candidate if we have a single int but no float.
+  if (Field1Ty && !Field2Ty && !Field1Ty->isFloatingPointTy())
+    return false;
+  if (Field1Ty && Field1Ty->isFloatingPointTy())
+    NeededFARs++;
+  else if (Field1Ty)
+    NeededGARs++;
+  if (Field2Ty && Field2Ty->isFloatingPointTy())
+    NeededFARs++;
+  else if (Field2Ty)
+    NeededGARs++;
+  return true;
+}
+
+// Call getCoerceAndExpand for the two-element flattened struct described by
+// Field1Ty, Field1Off, Field2Ty, Field2Off. This method will create an
+// appropriate coerceToType and unpaddedCoerceToType.
+ABIArgInfo LoongArchABIInfo::coerceAndExpandFARsEligibleStruct(
+    llvm::Type *Field1Ty, CharUnits Field1Off, llvm::Type *Field2Ty,
+    CharUnits Field2Off) const {
+  SmallVector<llvm::Type *, 3> CoerceElts;
+  SmallVector<llvm::Type *, 2> UnpaddedCoerceElts;
+  if (!Field1Off.isZero())
+    CoerceElts.push_back(llvm::ArrayType::get(
+        llvm::Type::getInt8Ty(getVMContext()), Field1Off.getQuantity()));
+
+  CoerceElts.push_back(Field1Ty);
+  UnpaddedCoerceElts.push_back(Field1Ty);
+
+  if (!Field2Ty) {
+    return ABIArgInfo::getCoerceAndExpand(
+        llvm::StructType::get(getVMContext(), CoerceElts, !Field1Off.isZero()),
+        UnpaddedCoerceElts[0]);
+  }
+
+  CharUnits Field2Align =
+      CharUnits::fromQuantity(getDataLayout().getABITypeAlign(Field2Ty));
+  CharUnits Field1End =
+      Field1Off +
+      CharUnits::fromQuantity(getDataLayout().getTypeStoreSize(Field1Ty));
+  CharUnits Field2OffNoPadNoPack = Field1End.alignTo(Field2Align);
+
+  CharUnits Padding = CharUnits::Zero();
+  if (Field2Off > Field2OffNoPadNoPack)
+    Padding = Field2Off - Field2OffNoPadNoPack;
+  else if (Field2Off != Field2Align && Field2Off > Field1End)
+    Padding = Field2Off - Field1End;
+
+  bool IsPacked = !Field2Off.isMultipleOf(Field2Align);
+
+  if (!Padding.isZero())
+    CoerceElts.push_back(llvm::ArrayType::get(
+        llvm::Type::getInt8Ty(getVMContext()), Padding.getQuantity()));
+
+  CoerceElts.push_back(Field2Ty);
+  UnpaddedCoerceElts.push_back(Field2Ty);
+
+  return ABIArgInfo::getCoerceAndExpand(
+      llvm::StructType::get(getVMContext(), CoerceElts, IsPacked),
+      llvm::StructType::get(getVMContext(), UnpaddedCoerceElts, IsPacked));
+}
+
+ABIArgInfo LoongArchABIInfo::classifyArgumentType(QualType Ty, bool IsFixed,
+                                                  int &GARsLeft,
+                                                  int &FARsLeft) const {
+  assert(GARsLeft <= NumGARs && "GAR tracking underflow");
+  Ty = useFirstFieldIfTransparentUnion(Ty);
+
+  // Structures with either a non-trivial destructor or a non-trivial
+  // copy constructor are always passed indirectly.
+  if (CGCXXABI::RecordArgABI RAA = getRecordArgABI(Ty, getCXXABI())) {
+    if (GARsLeft)
+      GARsLeft -= 1;
+    return getNaturalAlignIndirect(Ty, /*ByVal=*/RAA ==
+                                           CGCXXABI::RAA_DirectInMemory);
+  }
+
+  // Ignore empty structs/unions.
+  if (isEmptyRecord(getContext(), Ty, true))
+    return ABIArgInfo::getIgnore();
+
+  uint64_t Size = getContext().getTypeSize(Ty);
+
+  // Pass floating point values via FARs if possible.
+  if (IsFixed && Ty->isFloatingType() && !Ty->isComplexType() &&
+      FRLen >= Size && FARsLeft) {
+    FARsLeft--;
+    return ABIArgInfo::getDirect();
+  }
+
+  // Complex types for the *f or *d ABI must be passed directly rather than
+  // using CoerceAndExpand.
+  if (IsFixed && Ty->isComplexType() && FRLen && FARsLeft >= 2) {
+    QualType EltTy = Ty->castAs<ComplexType>()->getElementType();
+    if (getContext().getTypeSize(EltTy) <= FRLen) {
+      FARsLeft -= 2;
+      return ABIArgInfo::getDirect();
+    }
+  }
+
+  if (IsFixed && FRLen && Ty->isStructureOrClassType()) {
+    llvm::Type *Field1Ty = nullptr;
+    llvm::Type *Field2Ty = nullptr;
+    CharUnits Field1Off = CharUnits::Zero();
+    CharUnits Field2Off = CharUnits::Zero();
+    int NeededGARs = 0;
+    int NeededFARs = 0;
+    bool IsCandidate = detectFARsEligibleStruct(
+        Ty, Field1Ty, Field1Off, Field2Ty, Field2Off, NeededGARs, NeededFARs);
+    if (IsCandidate && NeededGARs <= GARsLeft && NeededFARs <= FARsLeft) {
+      GARsLeft -= NeededGARs;
+      FARsLeft -= NeededFARs;
+      return coerceAndExpandFARsEligibleStruct(Field1Ty, Field1Off, Field2Ty,
+                                               Field2Off);
+    }
+  }
+
+  uint64_t NeededAlign = getContext().getTypeAlign(Ty);
+  // Determine the number of GARs needed to pass the current argument
+  // according to the ABI. 2*GRLen-aligned varargs are passed in "aligned"
+  // register pairs, so may consume 3 registers.
+  int NeededGARs = 1;
+  if (!IsFixed && NeededAlign == 2 * GRLen)
+    NeededGARs = 2 + (GARsLeft % 2);
+  else if (Size > GRLen && Size <= 2 * GRLen)
+    NeededGARs = 2;
+
+  if (NeededGARs > GARsLeft)
+    NeededGARs = GARsLeft;
+
+  GARsLeft -= NeededGARs;
+
+  if (!isAggregateTypeForABI(Ty) && !Ty->isVectorType()) {
+    // Treat an enum type as its underlying type.
+    if (const EnumType *EnumTy = Ty->getAs<EnumType>())
+      Ty = EnumTy->getDecl()->getIntegerType();
+
+    // All integral types are promoted to GRLen width.
+    if (Size < GRLen && Ty->isIntegralOrEnumerationType())
+      return extendType(Ty);
+
+    if (const auto *EIT = Ty->getAs<BitIntType>()) {
+      if (EIT->getNumBits() < GRLen)
+        return extendType(Ty);
+      if (EIT->getNumBits() > 128 ||
+          (!getContext().getTargetInfo().hasInt128Type() &&
+           EIT->getNumBits() > 64))
+        return getNaturalAlignIndirect(Ty, /*ByVal=*/false);
+    }
+
+    return ABIArgInfo::getDirect();
+  }
+
+  // Aggregates which are <= 2*GRLen will be passed in registers if possible,
+  // so coerce to integers.
+  if (Size <= 2 * GRLen) {
+    // Use a single GRLen int if possible, 2*GRLen if 2*GRLen alignment is
+    // required, and a 2-element GRLen array if only GRLen alignment is
+    // required.
+    if (Size <= GRLen) {
+      return ABIArgInfo::getDirect(
+          llvm::IntegerType::get(getVMContext(), GRLen));
+    }
+    if (getContext().getTypeAlign(Ty) == 2 * GRLen) {
+      return ABIArgInfo::getDirect(
+          llvm::IntegerType::get(getVMContext(), 2 * GRLen));
+    }
+    return ABIArgInfo::getDirect(
+        llvm::ArrayType::get(llvm::IntegerType::get(getVMContext(), GRLen), 2));
+  }
+  return getNaturalAlignIndirect(Ty, /*ByVal=*/false);
+}
+
+ABIArgInfo LoongArchABIInfo::classifyReturnType(QualType RetTy) const {
+  if (RetTy->isVoidType())
+    return ABIArgInfo::getIgnore();
+  // The rules for return and argument types are the same, so defer to
+  // classifyArgumentType.
+  int GARsLeft = 2;
+  int FARsLeft = FRLen ? 2 : 0;
+  return classifyArgumentType(RetTy, /*IsFixed=*/true, GARsLeft, FARsLeft);
+}
+
+Address LoongArchABIInfo::EmitVAArg(CodeGenFunction &CGF, Address VAListAddr,
+                                    QualType Ty) const {
+  CharUnits SlotSize = CharUnits::fromQuantity(GRLen / 8);
+
+  // Empty records are ignored for parameter passing purposes.
+  if (isEmptyRecord(getContext(), Ty, true)) {
+    Address Addr = Address(CGF.Builder.CreateLoad(VAListAddr),
+                           getVAListElementType(CGF), SlotSize);
+    Addr = CGF.Builder.CreateElementBitCast(Addr, CGF.ConvertTypeForMem(Ty));
+    return Addr;
+  }
+
+  auto TInfo = getContext().getTypeInfoInChars(Ty);
+
+  // Arguments bigger than 2*GRLen bytes are passed indirectly.
+  return emitVoidPtrVAArg(CGF, VAListAddr, Ty,
+                          /*IsIndirect=*/TInfo.Width > 2 * SlotSize, TInfo,
+                          SlotSize,
+                          /*AllowHigherAlign=*/true);
+}
+
+ABIArgInfo LoongArchABIInfo::extendType(QualType Ty) const {
+  int TySize = getContext().getTypeSize(Ty);
+  // LA64 ABI requires unsigned 32 bit integers to be sign extended.
+  if (GRLen == 64 && Ty->isUnsignedIntegerOrEnumerationType() && TySize == 32)
+    return ABIArgInfo::getSignExtend(Ty);
+  return ABIArgInfo::getExtend(Ty);
+}
+
+namespace {
+class LoongArchTargetCodeGenInfo : public TargetCodeGenInfo {
+public:
+  LoongArchTargetCodeGenInfo(CodeGen::CodeGenTypes &CGT, unsigned GRLen,
+                             unsigned FRLen)
+      : TargetCodeGenInfo(
+            std::make_unique<LoongArchABIInfo>(CGT, GRLen, FRLen)) {}
+};
+} // namespace
+
+//===----------------------------------------------------------------------===//
+// Driver code
+//===----------------------------------------------------------------------===//
+
+bool CodeGenModule::supportsCOMDAT() const {
+  return getTriple().supportsCOMDAT();
+}
+
+const TargetCodeGenInfo &CodeGenModule::getTargetCodeGenInfo() {
+  if (TheTargetCodeGenInfo)
+    return *TheTargetCodeGenInfo;
+
+  // Helper to set the unique_ptr while still keeping the return value.
+  auto SetCGInfo = [&](TargetCodeGenInfo *P) -> const TargetCodeGenInfo & {
+    this->TheTargetCodeGenInfo.reset(P);
+    return *P;
+  };
+
+  const llvm::Triple &Triple = getTarget().getTriple();
+  switch (Triple.getArch()) {
+  default:
+    return SetCGInfo(new DefaultTargetCodeGenInfo(Types));
+
+  case llvm::Triple::le32:
+    return SetCGInfo(new PNaClTargetCodeGenInfo(Types));
+  case llvm::Triple::m68k:
+    return SetCGInfo(new M68kTargetCodeGenInfo(Types));
+  case llvm::Triple::mips:
+  case llvm::Triple::mipsel:
+    if (Triple.getOS() == llvm::Triple::NaCl)
+      return SetCGInfo(new PNaClTargetCodeGenInfo(Types));
+    return SetCGInfo(new MIPSTargetCodeGenInfo(Types, true));
+
+  case llvm::Triple::mips64:
+  case llvm::Triple::mips64el:
+    return SetCGInfo(new MIPSTargetCodeGenInfo(Types, false));
+
+  case llvm::Triple::avr: {
+    // For passing parameters, R8~R25 are used on avr, and R18~R25 are used
+    // on avrtiny. For passing return value, R18~R25 are used on avr, and
+    // R22~R25 are used on avrtiny.
+    unsigned NPR = getTarget().getABI() == "avrtiny" ? 6 : 18;
+    unsigned NRR = getTarget().getABI() == "avrtiny" ? 4 : 8;
+    return SetCGInfo(new AVRTargetCodeGenInfo(Types, NPR, NRR));
+  }
+
+  case llvm::Triple::aarch64:
+  case llvm::Triple::aarch64_32:
+  case llvm::Triple::aarch64_be: {
+    AArch64ABIInfo::ABIKind Kind = AArch64ABIInfo::AAPCS;
+    if (getTarget().getABI() == "darwinpcs")
+      Kind = AArch64ABIInfo::DarwinPCS;
+    else if (Triple.isOSWindows())
+      return SetCGInfo(
+          new WindowsAArch64TargetCodeGenInfo(Types, AArch64ABIInfo::Win64));
+
+    return SetCGInfo(new AArch64TargetCodeGenInfo(Types, Kind));
+  }
+
+  case llvm::Triple::wasm32:
+  case llvm::Triple::wasm64: {
+    WebAssemblyABIInfo::ABIKind Kind = WebAssemblyABIInfo::MVP;
+    if (getTarget().getABI() == "experimental-mv")
+      Kind = WebAssemblyABIInfo::ExperimentalMV;
+    return SetCGInfo(new WebAssemblyTargetCodeGenInfo(Types, Kind));
+  }
+
+  case llvm::Triple::arm:
+  case llvm::Triple::armeb:
+  case llvm::Triple::thumb:
+  case llvm::Triple::thumbeb: {
+    if (Triple.getOS() == llvm::Triple::Win32) {
+      return SetCGInfo(
+          new WindowsARMTargetCodeGenInfo(Types, ARMABIInfo::AAPCS_VFP));
+    }
+
+    ARMABIInfo::ABIKind Kind = ARMABIInfo::AAPCS;
+    StringRef ABIStr = getTarget().getABI();
+    if (ABIStr == "apcs-gnu")
+      Kind = ARMABIInfo::APCS;
+    else if (ABIStr == "aapcs16")
+      Kind = ARMABIInfo::AAPCS16_VFP;
+    else if (CodeGenOpts.FloatABI == "hard" ||
+             (CodeGenOpts.FloatABI != "soft" &&
+              (Triple.getEnvironment() == llvm::Triple::GNUEABIHF ||
+               Triple.getEnvironment() == llvm::Triple::MuslEABIHF ||
+               Triple.getEnvironment() == llvm::Triple::EABIHF)))
+      Kind = ARMABIInfo::AAPCS_VFP;
+
+    return SetCGInfo(new ARMTargetCodeGenInfo(Types, Kind));
+  }
+
+  case llvm::Triple::ppc: {
+    if (Triple.isOSAIX())
+      return SetCGInfo(new AIXTargetCodeGenInfo(Types, /*Is64Bit*/ false));
+
+    bool IsSoftFloat =
+        CodeGenOpts.FloatABI == "soft" || getTarget().hasFeature("spe");
+    bool RetSmallStructInRegABI =
+        PPC32TargetCodeGenInfo::isStructReturnInRegABI(Triple, CodeGenOpts);
+    return SetCGInfo(
+        new PPC32TargetCodeGenInfo(Types, IsSoftFloat, RetSmallStructInRegABI));
+  }
+  case llvm::Triple::ppcle: {
+    bool IsSoftFloat = CodeGenOpts.FloatABI == "soft";
+    bool RetSmallStructInRegABI =
+        PPC32TargetCodeGenInfo::isStructReturnInRegABI(Triple, CodeGenOpts);
+    return SetCGInfo(
+        new PPC32TargetCodeGenInfo(Types, IsSoftFloat, RetSmallStructInRegABI));
+  }
+  case llvm::Triple::ppc64:
+    if (Triple.isOSAIX())
+      return SetCGInfo(new AIXTargetCodeGenInfo(Types, /*Is64Bit*/ true));
+
+    if (Triple.isOSBinFormatELF()) {
+      PPC64_SVR4_ABIInfo::ABIKind Kind = PPC64_SVR4_ABIInfo::ELFv1;
+      if (getTarget().getABI() == "elfv2")
+        Kind = PPC64_SVR4_ABIInfo::ELFv2;
+      bool IsSoftFloat = CodeGenOpts.FloatABI == "soft";
+
+      return SetCGInfo(
+          new PPC64_SVR4_TargetCodeGenInfo(Types, Kind, IsSoftFloat));
+    }
+    return SetCGInfo(new PPC64TargetCodeGenInfo(Types));
+  case llvm::Triple::ppc64le: {
+    assert(Triple.isOSBinFormatELF() && "PPC64 LE non-ELF not supported!");
+    PPC64_SVR4_ABIInfo::ABIKind Kind = PPC64_SVR4_ABIInfo::ELFv2;
+    if (getTarget().getABI() == "elfv1")
+      Kind = PPC64_SVR4_ABIInfo::ELFv1;
+    bool IsSoftFloat = CodeGenOpts.FloatABI == "soft";
+
+    return SetCGInfo(
+        new PPC64_SVR4_TargetCodeGenInfo(Types, Kind, IsSoftFloat));
+  }
+
+  case llvm::Triple::nvptx:
+  case llvm::Triple::nvptx64:
+    return SetCGInfo(new NVPTXTargetCodeGenInfo(Types));
+
+  case llvm::Triple::msp430:
+    return SetCGInfo(new MSP430TargetCodeGenInfo(Types));
+
+  case llvm::Triple::riscv32:
+  case llvm::Triple::riscv64: {
+    StringRef ABIStr = getTarget().getABI();
+    unsigned XLen = getTarget().getPointerWidth(LangAS::Default);
+    unsigned ABIFLen = 0;
+    if (ABIStr.endswith("f"))
+      ABIFLen = 32;
+    else if (ABIStr.endswith("d"))
+      ABIFLen = 64;
+    return SetCGInfo(new RISCVTargetCodeGenInfo(Types, XLen, ABIFLen));
+  }
+
+  case llvm::Triple::systemz: {
+    bool SoftFloat = CodeGenOpts.FloatABI == "soft";
+    bool HasVector = !SoftFloat && getTarget().getABI() == "vector";
+    return SetCGInfo(new SystemZTargetCodeGenInfo(Types, HasVector, SoftFloat));
+  }
+
+  case llvm::Triple::tce:
+  case llvm::Triple::tcele:
     return SetCGInfo(new TCETargetCodeGenInfo(Types));
 
   case llvm::Triple::x86: {
@@ -11231,9 +12393,34 @@ const TargetCodeGenInfo &CodeGenModule::getTargetCodeGenInfo() {
     return SetCGInfo(new ARCTargetCodeGenInfo(Types));
   case llvm::Triple::spir:
   case llvm::Triple::spir64:
-    return SetCGInfo(new SPIRTargetCodeGenInfo(Types));
+    return SetCGInfo(new CommonSPIRTargetCodeGenInfo(Types));
+  case llvm::Triple::spirv32:
+  case llvm::Triple::spirv64:
+    return SetCGInfo(new SPIRVTargetCodeGenInfo(Types));
   case llvm::Triple::ve:
     return SetCGInfo(new VETargetCodeGenInfo(Types));
+  case llvm::Triple::csky: {
+    bool IsSoftFloat = !getTarget().hasFeature("hard-float-abi");
+    bool hasFP64 = getTarget().hasFeature("fpuv2_df") ||
+                   getTarget().hasFeature("fpuv3_df");
+    return SetCGInfo(new CSKYTargetCodeGenInfo(Types, IsSoftFloat ? 0
+                                                      : hasFP64   ? 64
+                                                                  : 32));
+  }
+  case llvm::Triple::bpfeb:
+  case llvm::Triple::bpfel:
+    return SetCGInfo(new BPFTargetCodeGenInfo(Types));
+  case llvm::Triple::loongarch32:
+  case llvm::Triple::loongarch64: {
+    StringRef ABIStr = getTarget().getABI();
+    unsigned ABIFRLen = 0;
+    if (ABIStr.endswith("f"))
+      ABIFRLen = 32;
+    else if (ABIStr.endswith("d"))
+      ABIFRLen = 64;
+    return SetCGInfo(new LoongArchTargetCodeGenInfo(
+        Types, getTarget().getPointerWidth(LangAS::Default), ABIFRLen));
+  }
   }
 }
 
@@ -11245,23 +12432,19 @@ const TargetCodeGenInfo &CodeGenModule::getTargetCodeGenInfo() {
 llvm::Function *
 TargetCodeGenInfo::createEnqueuedBlockKernel(CodeGenFunction &CGF,
                                              llvm::Function *Invoke,
-                                             llvm::Value *BlockLiteral) const {
+                                             llvm::Type *BlockTy) const {
   auto *InvokeFT = Invoke->getFunctionType();
-  llvm::SmallVector<llvm::Type *, 2> ArgTys;
-  for (auto &P : InvokeFT->params())
-    ArgTys.push_back(P);
   auto &C = CGF.getLLVMContext();
   std::string Name = Invoke->getName().str() + "_kernel";
-  auto *FT = llvm::FunctionType::get(llvm::Type::getVoidTy(C), ArgTys, false);
-  auto *F = llvm::Function::Create(FT, llvm::GlobalValue::InternalLinkage, Name,
+  auto *FT = llvm::FunctionType::get(llvm::Type::getVoidTy(C),
+                                     InvokeFT->params(), false);
+  auto *F = llvm::Function::Create(FT, llvm::GlobalValue::ExternalLinkage, Name,
                                    &CGF.CGM.getModule());
   auto IP = CGF.Builder.saveIP();
   auto *BB = llvm::BasicBlock::Create(C, "entry", F);
   auto &Builder = CGF.Builder;
   Builder.SetInsertPoint(BB);
-  llvm::SmallVector<llvm::Value *, 2> Args;
-  for (auto &A : F->args())
-    Args.push_back(&A);
+  llvm::SmallVector<llvm::Value *, 2> Args(llvm::make_pointer_range(F->args()));
   llvm::CallInst *call = Builder.CreateCall(Invoke, Args);
   call->setCallingConv(Invoke->getCallingConv());
   Builder.CreateRetVoid();
@@ -11279,11 +12462,10 @@ TargetCodeGenInfo::createEnqueuedBlockKernel(CodeGenFunction &CGF,
 /// has "enqueued-block" function attribute and kernel argument metadata.
 llvm::Function *AMDGPUTargetCodeGenInfo::createEnqueuedBlockKernel(
     CodeGenFunction &CGF, llvm::Function *Invoke,
-    llvm::Value *BlockLiteral) const {
+    llvm::Type *BlockTy) const {
   auto &Builder = CGF.Builder;
   auto &C = CGF.getLLVMContext();
 
-  auto *BlockTy = BlockLiteral->getType()->getPointerElementType();
   auto *InvokeFT = Invoke->getFunctionType();
   llvm::SmallVector<llvm::Type *, 2> ArgTys;
   llvm::SmallVector<llvm::Metadata *, 8> AddressQuals;
@@ -11325,8 +12507,8 @@ llvm::Function *AMDGPUTargetCodeGenInfo::createEnqueuedBlockKernel(
   auto *Cast = Builder.CreatePointerCast(BlockPtr, InvokeFT->getParamType(0));
   llvm::SmallVector<llvm::Value *, 2> Args;
   Args.push_back(Cast);
-  for (auto I = F->arg_begin() + 1, E = F->arg_end(); I != E; ++I)
-    Args.push_back(I);
+  for (llvm::Argument &A : llvm::drop_begin(F->args()))
+    Args.push_back(&A);
   llvm::CallInst *call = Builder.CreateCall(Invoke, Args);
   call->setCallingConv(Invoke->getCallingConv());
   Builder.CreateRetVoid();
diff --git a/gnu/llvm/clang/lib/Driver/Driver.cpp b/gnu/llvm/clang/lib/Driver/Driver.cpp
index 399c37d15ab..3e73d25a50a 100644
--- a/gnu/llvm/clang/lib/Driver/Driver.cpp
+++ b/gnu/llvm/clang/lib/Driver/Driver.cpp
@@ -13,6 +13,7 @@
 #include "ToolChains/AVR.h"
 #include "ToolChains/Ananas.h"
 #include "ToolChains/BareMetal.h"
+#include "ToolChains/CSKYToolChain.h"
 #include "ToolChains/Clang.h"
 #include "ToolChains/CloudABI.h"
 #include "ToolChains/Contiki.h"
@@ -23,7 +24,9 @@
 #include "ToolChains/FreeBSD.h"
 #include "ToolChains/Fuchsia.h"
 #include "ToolChains/Gnu.h"
-#include "ToolChains/HIP.h"
+#include "ToolChains/HIPAMD.h"
+#include "ToolChains/HIPSPV.h"
+#include "ToolChains/HLSL.h"
 #include "ToolChains/Haiku.h"
 #include "ToolChains/Hexagon.h"
 #include "ToolChains/Hurd.h"
@@ -38,9 +41,11 @@
 #include "ToolChains/NaCl.h"
 #include "ToolChains/NetBSD.h"
 #include "ToolChains/OpenBSD.h"
+#include "ToolChains/PPCFreeBSD.h"
 #include "ToolChains/PPCLinux.h"
 #include "ToolChains/PS4CPU.h"
 #include "ToolChains/RISCVToolchain.h"
+#include "ToolChains/SPIRV.h"
 #include "ToolChains/Solaris.h"
 #include "ToolChains/TCE.h"
 #include "ToolChains/VEToolchain.h"
@@ -56,9 +61,11 @@
 #include "clang/Driver/InputInfo.h"
 #include "clang/Driver/Job.h"
 #include "clang/Driver/Options.h"
+#include "clang/Driver/Phases.h"
 #include "clang/Driver/SanitizerArgs.h"
 #include "clang/Driver/Tool.h"
 #include "clang/Driver/ToolChain.h"
+#include "clang/Driver/Types.h"
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/SmallSet.h"
@@ -67,6 +74,7 @@
 #include "llvm/ADT/StringSet.h"
 #include "llvm/ADT/StringSwitch.h"
 #include "llvm/Config/llvm-config.h"
+#include "llvm/MC/TargetRegistry.h"
 #include "llvm/Option/Arg.h"
 #include "llvm/Option/ArgList.h"
 #include "llvm/Option/OptSpecifier.h"
@@ -84,11 +92,12 @@
 #include "llvm/Support/Process.h"
 #include "llvm/Support/Program.h"
 #include "llvm/Support/StringSaver.h"
-#include "llvm/Support/TargetRegistry.h"
 #include "llvm/Support/VirtualFileSystem.h"
 #include "llvm/Support/raw_ostream.h"
+#include <cstdlib> // ::getenv
 #include <map>
 #include <memory>
+#include <optional>
 #include <utility>
 #if LLVM_ON_UNIX
 #include <unistd.h> // getpid
@@ -98,9 +107,59 @@ using namespace clang::driver;
 using namespace clang;
 using namespace llvm::opt;
 
-static llvm::Triple getHIPOffloadTargetTriple() {
-  static const llvm::Triple T("amdgcn-amd-amdhsa");
-  return T;
+static std::optional<llvm::Triple> getOffloadTargetTriple(const Driver &D,
+                                                          const ArgList &Args) {
+  auto OffloadTargets = Args.getAllArgValues(options::OPT_offload_EQ);
+  // Offload compilation flow does not support multiple targets for now. We
+  // need the HIPActionBuilder (and possibly the CudaActionBuilder{,Base}too)
+  // to support multiple tool chains first.
+  switch (OffloadTargets.size()) {
+  default:
+    D.Diag(diag::err_drv_only_one_offload_target_supported);
+    return std::nullopt;
+  case 0:
+    D.Diag(diag::err_drv_invalid_or_unsupported_offload_target) << "";
+    return std::nullopt;
+  case 1:
+    break;
+  }
+  return llvm::Triple(OffloadTargets[0]);
+}
+
+static std::optional<llvm::Triple>
+getNVIDIAOffloadTargetTriple(const Driver &D, const ArgList &Args,
+                             const llvm::Triple &HostTriple) {
+  if (!Args.hasArg(options::OPT_offload_EQ)) {
+    return llvm::Triple(HostTriple.isArch64Bit() ? "nvptx64-nvidia-cuda"
+                                                 : "nvptx-nvidia-cuda");
+  }
+  auto TT = getOffloadTargetTriple(D, Args);
+  if (TT && (TT->getArch() == llvm::Triple::spirv32 ||
+             TT->getArch() == llvm::Triple::spirv64)) {
+    if (Args.hasArg(options::OPT_emit_llvm))
+      return TT;
+    D.Diag(diag::err_drv_cuda_offload_only_emit_bc);
+    return std::nullopt;
+  }
+  D.Diag(diag::err_drv_invalid_or_unsupported_offload_target) << TT->str();
+  return std::nullopt;
+}
+static std::optional<llvm::Triple>
+getHIPOffloadTargetTriple(const Driver &D, const ArgList &Args) {
+  if (!Args.hasArg(options::OPT_offload_EQ)) {
+    return llvm::Triple("amdgcn-amd-amdhsa"); // Default HIP triple.
+  }
+  auto TT = getOffloadTargetTriple(D, Args);
+  if (!TT)
+    return std::nullopt;
+  if (TT->getArch() == llvm::Triple::amdgcn &&
+      TT->getVendor() == llvm::Triple::AMD &&
+      TT->getOS() == llvm::Triple::AMDHSA)
+    return TT;
+  if (TT->getArch() == llvm::Triple::spirv64)
+    return TT;
+  D.Diag(diag::err_drv_invalid_or_unsupported_offload_target) << TT->str();
+  return std::nullopt;
 }
 
 // static
@@ -123,8 +182,8 @@ std::string Driver::GetResourcesPath(StringRef BinaryPath,
     // path of the embedding binary, which for LLVM binaries will be in bin/.
     // ../lib gets us to lib/ in both cases.
     P = llvm::sys::path::parent_path(Dir);
-    llvm::sys::path::append(P, Twine("lib") + CLANG_LIBDIR_SUFFIX, "clang",
-                            CLANG_VERSION_STRING);
+    llvm::sys::path::append(P, CLANG_INSTALL_LIBDIR_BASENAME, "clang",
+                            CLANG_VERSION_MAJOR_STRING);
   }
 
   return std::string(P.str());
@@ -134,15 +193,15 @@ Driver::Driver(StringRef ClangExecutable, StringRef TargetTriple,
                DiagnosticsEngine &Diags, std::string Title,
                IntrusiveRefCntPtr<llvm::vfs::FileSystem> VFS)
     : Diags(Diags), VFS(std::move(VFS)), Mode(GCCMode),
-      SaveTemps(SaveTempsNone), BitcodeEmbed(EmbedNone), LTOMode(LTOK_None),
+      SaveTemps(SaveTempsNone), BitcodeEmbed(EmbedNone),
+      Offload(OffloadHostDevice), CXX20HeaderType(HeaderMode_None),
+      ModulesModeCXX20(false), LTOMode(LTOK_None),
       ClangExecutable(ClangExecutable), SysRoot(DEFAULT_SYSROOT),
-      DriverTitle(Title), CCPrintStatReportFilename(), CCPrintOptionsFilename(),
-      CCPrintHeadersFilename(), CCLogDiagnosticsFilename(),
-      CCCPrintBindings(false), CCPrintOptions(false), CCPrintHeaders(false),
+      DriverTitle(Title), CCCPrintBindings(false), CCPrintOptions(false),
       CCLogDiagnostics(false), CCGenDiagnostics(false),
-      CCPrintProcessStats(false), TargetTriple(TargetTriple),
-      CCCGenericGCCName(""), Saver(Alloc), CheckInputsExist(true),
-      GenReproducer(false), SuppressMissingInputWarning(false) {
+      CCPrintProcessStats(false), TargetTriple(TargetTriple), Saver(Alloc),
+      CheckInputsExist(true), ProbePrecompiled(true),
+      SuppressMissingInputWarning(false) {
   // Provide a sane fallback if no VFS is specified.
   if (!this->VFS)
     this->VFS = llvm::vfs::getRealFileSystem();
@@ -162,7 +221,11 @@ Driver::Driver(StringRef ClangExecutable, StringRef TargetTriple,
   SystemConfigDir = CLANG_CONFIG_FILE_SYSTEM_DIR;
 #endif
 #if defined(CLANG_CONFIG_FILE_USER_DIR)
-  UserConfigDir = CLANG_CONFIG_FILE_USER_DIR;
+  {
+    SmallString<128> P;
+    llvm::sys::fs::expand_tilde(CLANG_CONFIG_FILE_USER_DIR, P);
+    UserConfigDir = static_cast<std::string>(P);
+  }
 #endif
 
   // Compute the path to the resource directory.
@@ -172,13 +235,14 @@ Driver::Driver(StringRef ClangExecutable, StringRef TargetTriple,
 void Driver::setDriverMode(StringRef Value) {
   static const std::string OptName =
       getOpts().getOption(options::OPT_driver_mode).getPrefixedName();
-  if (auto M = llvm::StringSwitch<llvm::Optional<DriverMode>>(Value)
+  if (auto M = llvm::StringSwitch<std::optional<DriverMode>>(Value)
                    .Case("gcc", GCCMode)
                    .Case("g++", GXXMode)
                    .Case("cpp", CPPMode)
                    .Case("cl", CLMode)
                    .Case("flang", FlangMode)
-                   .Default(None))
+                   .Case("dxc", DXCMode)
+                   .Default(std::nullopt))
     Mode = *M;
   else
     Diag(diag::err_drv_unsupported_option_argument) << OptName << Value;
@@ -247,11 +311,17 @@ InputArgList Driver::ParseArgStrings(ArrayRef<const char *> ArgStrings,
     unsigned DiagID;
     auto ArgString = A->getAsString(Args);
     std::string Nearest;
-    if (getOpts().findNearest(
-          ArgString, Nearest, IncludedFlagsBitmask, ExcludedFlagsBitmask) > 1) {
-      DiagID = IsCLMode() ? diag::warn_drv_unknown_argument_clang_cl
-                          : diag::err_drv_unknown_argument;
-      Diags.Report(DiagID) << ArgString;
+    if (getOpts().findNearest(ArgString, Nearest, IncludedFlagsBitmask,
+                              ExcludedFlagsBitmask) > 1) {
+      if (!IsCLMode() &&
+          getOpts().findExact(ArgString, Nearest, options::CC1Option)) {
+        DiagID = diag::err_drv_unknown_argument_with_suggestion;
+        Diags.Report(DiagID) << ArgString << "-Xclang " + Nearest;
+      } else {
+        DiagID = IsCLMode() ? diag::warn_drv_unknown_argument_clang_cl
+                            : diag::err_drv_unknown_argument;
+        Diags.Report(DiagID) << ArgString;
+      }
     } else {
       DiagID = IsCLMode()
                    ? diag::warn_drv_unknown_argument_clang_cl_with_suggestion
@@ -262,6 +332,19 @@ InputArgList Driver::ParseArgStrings(ArrayRef<const char *> ArgStrings,
                      DiagnosticsEngine::Warning;
   }
 
+  for (const Arg *A : Args.filtered(options::OPT_o)) {
+    if (ArgStrings[A->getIndex()] == A->getSpelling())
+      continue;
+
+    // Warn on joined arguments that are similar to a long argument.
+    std::string ArgString = ArgStrings[A->getIndex()];
+    std::string Nearest;
+    if (getOpts().findExact("-" + ArgString, Nearest, IncludedFlagsBitmask,
+                            ExcludedFlagsBitmask))
+      Diags.Report(diag::warn_drv_potentially_misspelled_joined_argument)
+          << A->getAsString(Args) << Nearest;
+  }
+
   return Args;
 }
 
@@ -277,14 +360,19 @@ phases::ID Driver::getFinalPhase(const DerivedArgList &DAL,
   if (CCCIsCPP() || (PhaseArg = DAL.getLastArg(options::OPT_E)) ||
       (PhaseArg = DAL.getLastArg(options::OPT__SLASH_EP)) ||
       (PhaseArg = DAL.getLastArg(options::OPT_M, options::OPT_MM)) ||
-      (PhaseArg = DAL.getLastArg(options::OPT__SLASH_P))) {
+      (PhaseArg = DAL.getLastArg(options::OPT__SLASH_P)) ||
+      CCGenDiagnostics) {
     FinalPhase = phases::Preprocess;
 
-  // --precompile only runs up to precompilation.
-  } else if ((PhaseArg = DAL.getLastArg(options::OPT__precompile))) {
+    // --precompile only runs up to precompilation.
+    // Options that cause the output of C++20 compiled module interfaces or
+    // header units have the same effect.
+  } else if ((PhaseArg = DAL.getLastArg(options::OPT__precompile)) ||
+             (PhaseArg = DAL.getLastArg(options::OPT_extract_api)) ||
+             (PhaseArg = DAL.getLastArg(options::OPT_fmodule_header,
+                                        options::OPT_fmodule_header_EQ))) {
     FinalPhase = phases::Precompile;
-
-  // -{fsyntax-only,-analyze,emit-ast} only run up to the compiler.
+    // -{fsyntax-only,-analyze,emit-ast} only run up to the compiler.
   } else if ((PhaseArg = DAL.getLastArg(options::OPT_fsyntax_only)) ||
              (PhaseArg = DAL.getLastArg(options::OPT_print_supported_cpus)) ||
              (PhaseArg = DAL.getLastArg(options::OPT_module_file_info)) ||
@@ -304,6 +392,9 @@ phases::ID Driver::getFinalPhase(const DerivedArgList &DAL,
   } else if ((PhaseArg = DAL.getLastArg(options::OPT_c))) {
     FinalPhase = phases::Assemble;
 
+  } else if ((PhaseArg = DAL.getLastArg(options::OPT_emit_interface_stubs))) {
+    FinalPhase = phases::IfsMerge;
+
   // Otherwise do everything.
   } else
     FinalPhase = phases::Link;
@@ -331,7 +422,20 @@ DerivedArgList *Driver::TranslateInputArgs(const InputArgList &Args) const {
   bool HasNostdlib = Args.hasArg(options::OPT_nostdlib);
   bool HasNostdlibxx = Args.hasArg(options::OPT_nostdlibxx);
   bool HasNodefaultlib = Args.hasArg(options::OPT_nodefaultlibs);
+  bool IgnoreUnused = false;
   for (Arg *A : Args) {
+    if (IgnoreUnused)
+      A->claim();
+
+    if (A->getOption().matches(options::OPT_start_no_unused_arguments)) {
+      IgnoreUnused = true;
+      continue;
+    }
+    if (A->getOption().matches(options::OPT_end_no_unused_arguments)) {
+      IgnoreUnused = false;
+      continue;
+    }
+
     // Unfortunately, we have to parse some forwarding options (-Xassembler,
     // -Xlinker, -Xpreprocessor) because we either integrate their functionality
     // (assembler and preprocessor), or bypass a previous driver ('collect2').
@@ -399,7 +503,7 @@ DerivedArgList *Driver::TranslateInputArgs(const InputArgList &Args) const {
 
   // Enforce -static if -miamcu is present.
   if (Args.hasFlag(options::OPT_miamcu, options::OPT_mno_iamcu, false))
-    DAL->AddFlagArg(0, Opts.getOption(options::OPT_static));
+    DAL->AddFlagArg(nullptr, Opts.getOption(options::OPT_static));
 
 // Add a default value of -mlinker-version=, if one was given and the user
 // didn't specify one.
@@ -432,8 +536,7 @@ static llvm::Triple computeTargetTriple(const Driver &D,
   // GNU/Hurd's triples should have been -hurd-gnu*, but were historically made
   // -gnu* only, and we can not change this, so we have to detect that case as
   // being the Hurd OS.
-  if (TargetTriple.find("-unknown-gnu") != StringRef::npos ||
-      TargetTriple.find("-pc-gnu") != StringRef::npos)
+  if (TargetTriple.contains("-unknown-gnu") || TargetTriple.contains("-pc-gnu"))
     Target.setOSName("hurd");
 
   // Handle Apple-specific options available here.
@@ -473,7 +576,7 @@ static llvm::Triple computeTargetTriple(const Driver &D,
 
   // On AIX, the env OBJECT_MODE may affect the resulting arch variant.
   if (Target.isOSAIX()) {
-    if (Optional<std::string> ObjectModeValue =
+    if (std::optional<std::string> ObjectModeValue =
             llvm::sys::Process::GetEnv("OBJECT_MODE")) {
       StringRef ObjectMode = *ObjectModeValue;
       llvm::Triple::ArchType AT = llvm::Triple::UnknownArch;
@@ -522,8 +625,11 @@ static llvm::Triple computeTargetTriple(const Driver &D,
       Target.setEnvironment(llvm::Triple::CODE16);
     }
 
-    if (AT != llvm::Triple::UnknownArch && AT != Target.getArch())
+    if (AT != llvm::Triple::UnknownArch && AT != Target.getArch()) {
       Target.setArch(AT);
+      if (Target.isWindowsGNUEnvironment())
+        toolchains::MinGW::fixTripleArch(D, Target, Args);
+    }
   }
 
   // Handle -miamcu flag.
@@ -547,36 +653,38 @@ static llvm::Triple computeTargetTriple(const Driver &D,
 
   // If target is MIPS adjust the target triple
   // accordingly to provided ABI name.
-  A = Args.getLastArg(options::OPT_mabi_EQ);
-  if (A && Target.isMIPS()) {
-    StringRef ABIName = A->getValue();
-    if (ABIName == "32") {
-      Target = Target.get32BitArchVariant();
-      if (Target.getEnvironment() == llvm::Triple::GNUABI64 ||
-          Target.getEnvironment() == llvm::Triple::GNUABIN32)
-        Target.setEnvironment(llvm::Triple::GNU);
-    } else if (ABIName == "n32") {
-      Target = Target.get64BitArchVariant();
-      if (Target.getEnvironment() == llvm::Triple::GNU ||
-          Target.getEnvironment() == llvm::Triple::GNUABI64)
-        Target.setEnvironment(llvm::Triple::GNUABIN32);
-    } else if (ABIName == "64") {
-      Target = Target.get64BitArchVariant();
-      if (Target.getEnvironment() == llvm::Triple::GNU ||
-          Target.getEnvironment() == llvm::Triple::GNUABIN32)
-        Target.setEnvironment(llvm::Triple::GNUABI64);
+  if (Target.isMIPS()) {
+    if ((A = Args.getLastArg(options::OPT_mabi_EQ))) {
+      StringRef ABIName = A->getValue();
+      if (ABIName == "32") {
+        Target = Target.get32BitArchVariant();
+        if (Target.getEnvironment() == llvm::Triple::GNUABI64 ||
+            Target.getEnvironment() == llvm::Triple::GNUABIN32)
+          Target.setEnvironment(llvm::Triple::GNU);
+      } else if (ABIName == "n32") {
+        Target = Target.get64BitArchVariant();
+        if (Target.getEnvironment() == llvm::Triple::GNU ||
+            Target.getEnvironment() == llvm::Triple::GNUABI64)
+          Target.setEnvironment(llvm::Triple::GNUABIN32);
+      } else if (ABIName == "64") {
+        Target = Target.get64BitArchVariant();
+        if (Target.getEnvironment() == llvm::Triple::GNU ||
+            Target.getEnvironment() == llvm::Triple::GNUABIN32)
+          Target.setEnvironment(llvm::Triple::GNUABI64);
+      }
     }
   }
 
   // If target is RISC-V adjust the target triple according to
   // provided architecture name
-  A = Args.getLastArg(options::OPT_march_EQ);
-  if (A && Target.isRISCV()) {
-    StringRef ArchName = A->getValue();
-    if (ArchName.startswith_insensitive("rv32"))
-      Target.setArch(llvm::Triple::riscv32);
-    else if (ArchName.startswith_insensitive("rv64"))
-      Target.setArch(llvm::Triple::riscv64);
+  if (Target.isRISCV()) {
+    if ((A = Args.getLastArg(options::OPT_march_EQ))) {
+      StringRef ArchName = A->getValue();
+      if (ArchName.startswith_insensitive("rv32"))
+        Target.setArch(llvm::Triple::riscv32);
+      else if (ArchName.startswith_insensitive("rv64"))
+        Target.setArch(llvm::Triple::riscv64);
+    }
   }
 
   return Target;
@@ -585,53 +693,45 @@ static llvm::Triple computeTargetTriple(const Driver &D,
 // Parse the LTO options and record the type of LTO compilation
 // based on which -f(no-)?lto(=.*)? or -f(no-)?offload-lto(=.*)?
 // option occurs last.
-static llvm::Optional<driver::LTOKind>
-parseLTOMode(Driver &D, const llvm::opt::ArgList &Args, OptSpecifier OptPos,
-             OptSpecifier OptNeg, OptSpecifier OptEq, bool IsOffload) {
-  driver::LTOKind LTOMode = LTOK_None;
-  // Non-offload LTO allows -flto=auto and -flto=jobserver. Offload LTO does
-  // not support those options.
-  if (!Args.hasFlag(OptPos, OptEq, OptNeg, false) &&
-      (IsOffload ||
-       (!Args.hasFlag(options::OPT_flto_EQ_auto, options::OPT_fno_lto, false) &&
-        !Args.hasFlag(options::OPT_flto_EQ_jobserver, options::OPT_fno_lto,
-                      false))))
-    return None;
-
-  StringRef LTOName("full");
+static driver::LTOKind parseLTOMode(Driver &D, const llvm::opt::ArgList &Args,
+                                    OptSpecifier OptEq, OptSpecifier OptNeg) {
+  if (!Args.hasFlag(OptEq, OptNeg, false))
+    return LTOK_None;
 
   const Arg *A = Args.getLastArg(OptEq);
-  if (A)
-    LTOName = A->getValue();
+  StringRef LTOName = A->getValue();
 
-  LTOMode = llvm::StringSwitch<LTOKind>(LTOName)
-                .Case("full", LTOK_Full)
-                .Case("thin", LTOK_Thin)
-                .Default(LTOK_Unknown);
+  driver::LTOKind LTOMode = llvm::StringSwitch<LTOKind>(LTOName)
+                                .Case("full", LTOK_Full)
+                                .Case("thin", LTOK_Thin)
+                                .Default(LTOK_Unknown);
 
   if (LTOMode == LTOK_Unknown) {
-    assert(A);
     D.Diag(diag::err_drv_unsupported_option_argument)
-        << A->getOption().getName() << A->getValue();
-    return None;
+        << A->getSpelling() << A->getValue();
+    return LTOK_None;
   }
   return LTOMode;
 }
 
 // Parse the LTO options.
 void Driver::setLTOMode(const llvm::opt::ArgList &Args) {
-  LTOMode = LTOK_None;
-  if (auto M = parseLTOMode(*this, Args, options::OPT_flto,
-                            options::OPT_fno_lto, options::OPT_flto_EQ,
-                            /*IsOffload=*/false))
-    LTOMode = M.getValue();
-
-  OffloadLTOMode = LTOK_None;
-  if (auto M = parseLTOMode(*this, Args, options::OPT_foffload_lto,
-                            options::OPT_fno_offload_lto,
-                            options::OPT_foffload_lto_EQ,
-                            /*IsOffload=*/true))
-    OffloadLTOMode = M.getValue();
+  LTOMode =
+      parseLTOMode(*this, Args, options::OPT_flto_EQ, options::OPT_fno_lto);
+
+  OffloadLTOMode = parseLTOMode(*this, Args, options::OPT_foffload_lto_EQ,
+                                options::OPT_fno_offload_lto);
+
+  // Try to enable `-foffload-lto=full` if `-fopenmp-target-jit` is on.
+  if (Args.hasFlag(options::OPT_fopenmp_target_jit,
+                   options::OPT_fno_openmp_target_jit, false)) {
+    if (Arg *A = Args.getLastArg(options::OPT_foffload_lto_EQ,
+                                 options::OPT_fno_offload_lto))
+      if (OffloadLTOMode != LTOK_Full)
+        Diag(diag::err_drv_incompatible_options)
+            << A->getSpelling() << "-fopenmp-target-jit";
+    OffloadLTOMode = LTOK_Full;
+  }
 }
 
 /// Compute the desired OpenMP runtime from the flags provided.
@@ -651,7 +751,7 @@ Driver::OpenMPRuntimeKind Driver::getOpenMPRuntime(const ArgList &Args) const {
   if (RT == OMPRT_Unknown) {
     if (A)
       Diag(diag::err_drv_unsupported_option_argument)
-          << A->getOption().getName() << A->getValue();
+          << A->getSpelling() << A->getValue();
     else
       // FIXME: We could use a nicer diagnostic here.
       Diag(diag::err_drv_unsupported_opt) << "-fopenmp";
@@ -685,108 +785,180 @@ void Driver::CreateOffloadingDeviceToolChains(Compilation &C,
   if (IsCuda) {
     const ToolChain *HostTC = C.getSingleOffloadToolChain<Action::OFK_Host>();
     const llvm::Triple &HostTriple = HostTC->getTriple();
-    StringRef DeviceTripleStr;
     auto OFK = Action::OFK_Cuda;
-    DeviceTripleStr =
-        HostTriple.isArch64Bit() ? "nvptx64-nvidia-cuda" : "nvptx-nvidia-cuda";
-    llvm::Triple CudaTriple(DeviceTripleStr);
+    auto CudaTriple =
+        getNVIDIAOffloadTargetTriple(*this, C.getInputArgs(), HostTriple);
+    if (!CudaTriple)
+      return;
     // Use the CUDA and host triples as the key into the ToolChains map,
     // because the device toolchain we create depends on both.
-    auto &CudaTC = ToolChains[CudaTriple.str() + "/" + HostTriple.str()];
+    auto &CudaTC = ToolChains[CudaTriple->str() + "/" + HostTriple.str()];
     if (!CudaTC) {
       CudaTC = std::make_unique<toolchains::CudaToolChain>(
-          *this, CudaTriple, *HostTC, C.getInputArgs(), OFK);
+          *this, *CudaTriple, *HostTC, C.getInputArgs());
     }
     C.addOffloadDeviceToolChain(CudaTC.get(), OFK);
   } else if (IsHIP) {
+    if (auto *OMPTargetArg =
+            C.getInputArgs().getLastArg(options::OPT_fopenmp_targets_EQ)) {
+      Diag(clang::diag::err_drv_unsupported_opt_for_language_mode)
+          << OMPTargetArg->getSpelling() << "HIP";
+      return;
+    }
     const ToolChain *HostTC = C.getSingleOffloadToolChain<Action::OFK_Host>();
-    const llvm::Triple &HostTriple = HostTC->getTriple();
     auto OFK = Action::OFK_HIP;
-    llvm::Triple HIPTriple = getHIPOffloadTargetTriple();
-    // Use the HIP and host triples as the key into the ToolChains map,
-    // because the device toolchain we create depends on both.
-    auto &HIPTC = ToolChains[HIPTriple.str() + "/" + HostTriple.str()];
-    if (!HIPTC) {
-      HIPTC = std::make_unique<toolchains::HIPToolChain>(
-          *this, HIPTriple, *HostTC, C.getInputArgs());
-    }
-    C.addOffloadDeviceToolChain(HIPTC.get(), OFK);
+    auto HIPTriple = getHIPOffloadTargetTriple(*this, C.getInputArgs());
+    if (!HIPTriple)
+      return;
+    auto *HIPTC = &getOffloadingDeviceToolChain(C.getInputArgs(), *HIPTriple,
+                                                *HostTC, OFK);
+    assert(HIPTC && "Could not create offloading device tool chain.");
+    C.addOffloadDeviceToolChain(HIPTC, OFK);
   }
 
   //
   // OpenMP
   //
   // We need to generate an OpenMP toolchain if the user specified targets with
-  // the -fopenmp-targets option.
-  if (Arg *OpenMPTargets =
-          C.getInputArgs().getLastArg(options::OPT_fopenmp_targets_EQ)) {
-    if (OpenMPTargets->getNumValues()) {
-      // We expect that -fopenmp-targets is always used in conjunction with the
-      // option -fopenmp specifying a valid runtime with offloading support,
-      // i.e. libomp or libiomp.
-      bool HasValidOpenMPRuntime = C.getInputArgs().hasFlag(
-          options::OPT_fopenmp, options::OPT_fopenmp_EQ,
-          options::OPT_fno_openmp, false);
-      if (HasValidOpenMPRuntime) {
-        OpenMPRuntimeKind OpenMPKind = getOpenMPRuntime(C.getInputArgs());
-        HasValidOpenMPRuntime =
-            OpenMPKind == OMPRT_OMP || OpenMPKind == OMPRT_IOMP5;
+  // the -fopenmp-targets option or used --offload-arch with OpenMP enabled.
+  bool IsOpenMPOffloading =
+      C.getInputArgs().hasFlag(options::OPT_fopenmp, options::OPT_fopenmp_EQ,
+                               options::OPT_fno_openmp, false) &&
+      (C.getInputArgs().hasArg(options::OPT_fopenmp_targets_EQ) ||
+       C.getInputArgs().hasArg(options::OPT_offload_arch_EQ));
+  if (IsOpenMPOffloading) {
+    // We expect that -fopenmp-targets is always used in conjunction with the
+    // option -fopenmp specifying a valid runtime with offloading support, i.e.
+    // libomp or libiomp.
+    OpenMPRuntimeKind RuntimeKind = getOpenMPRuntime(C.getInputArgs());
+    if (RuntimeKind != OMPRT_OMP && RuntimeKind != OMPRT_IOMP5) {
+      Diag(clang::diag::err_drv_expecting_fopenmp_with_fopenmp_targets);
+      return;
+    }
+
+    llvm::StringMap<llvm::DenseSet<StringRef>> DerivedArchs;
+    llvm::StringMap<StringRef> FoundNormalizedTriples;
+    llvm::SmallVector<StringRef, 4> OpenMPTriples;
+
+    // If the user specified -fopenmp-targets= we create a toolchain for each
+    // valid triple. Otherwise, if only --offload-arch= was specified we instead
+    // attempt to derive the appropriate toolchains from the arguments.
+    if (Arg *OpenMPTargets =
+            C.getInputArgs().getLastArg(options::OPT_fopenmp_targets_EQ)) {
+      if (OpenMPTargets && !OpenMPTargets->getNumValues()) {
+        Diag(clang::diag::warn_drv_empty_joined_argument)
+            << OpenMPTargets->getAsString(C.getInputArgs());
+        return;
+      }
+      llvm::copy(OpenMPTargets->getValues(), std::back_inserter(OpenMPTriples));
+    } else if (C.getInputArgs().hasArg(options::OPT_offload_arch_EQ) &&
+               !IsHIP && !IsCuda) {
+      const ToolChain *HostTC = C.getSingleOffloadToolChain<Action::OFK_Host>();
+      auto AMDTriple = getHIPOffloadTargetTriple(*this, C.getInputArgs());
+      auto NVPTXTriple = getNVIDIAOffloadTargetTriple(*this, C.getInputArgs(),
+                                                      HostTC->getTriple());
+
+      // Attempt to deduce the offloading triple from the set of architectures.
+      // We can only correctly deduce NVPTX / AMDGPU triples currently. We need
+      // to temporarily create these toolchains so that we can access tools for
+      // inferring architectures.
+      llvm::DenseSet<StringRef> Archs;
+      if (NVPTXTriple) {
+        auto TempTC = std::make_unique<toolchains::CudaToolChain>(
+            *this, *NVPTXTriple, *HostTC, C.getInputArgs());
+        for (StringRef Arch : getOffloadArchs(
+                 C, C.getArgs(), Action::OFK_OpenMP, &*TempTC, true))
+          Archs.insert(Arch);
+      }
+      if (AMDTriple) {
+        auto TempTC = std::make_unique<toolchains::AMDGPUOpenMPToolChain>(
+            *this, *AMDTriple, *HostTC, C.getInputArgs());
+        for (StringRef Arch : getOffloadArchs(
+                 C, C.getArgs(), Action::OFK_OpenMP, &*TempTC, true))
+          Archs.insert(Arch);
+      }
+      if (!AMDTriple && !NVPTXTriple) {
+        for (StringRef Arch :
+             getOffloadArchs(C, C.getArgs(), Action::OFK_OpenMP, nullptr, true))
+          Archs.insert(Arch);
       }
 
-      if (HasValidOpenMPRuntime) {
-        llvm::StringMap<const char *> FoundNormalizedTriples;
-        for (const char *Val : OpenMPTargets->getValues()) {
-          llvm::Triple TT(Val);
-          std::string NormalizedName = TT.normalize();
-
-          // Make sure we don't have a duplicate triple.
-          auto Duplicate = FoundNormalizedTriples.find(NormalizedName);
-          if (Duplicate != FoundNormalizedTriples.end()) {
-            Diag(clang::diag::warn_drv_omp_offload_target_duplicate)
-                << Val << Duplicate->second;
-            continue;
-          }
+      for (StringRef Arch : Archs) {
+        if (NVPTXTriple && IsNVIDIAGpuArch(StringToCudaArch(
+                               getProcessorFromTargetID(*NVPTXTriple, Arch)))) {
+          DerivedArchs[NVPTXTriple->getTriple()].insert(Arch);
+        } else if (AMDTriple &&
+                   IsAMDGpuArch(StringToCudaArch(
+                       getProcessorFromTargetID(*AMDTriple, Arch)))) {
+          DerivedArchs[AMDTriple->getTriple()].insert(Arch);
+        } else {
+          Diag(clang::diag::err_drv_failed_to_deduce_target_from_arch) << Arch;
+          return;
+        }
+      }
 
-          // Store the current triple so that we can check for duplicates in the
-          // following iterations.
-          FoundNormalizedTriples[NormalizedName] = Val;
-
-          // If the specified target is invalid, emit a diagnostic.
-          if (TT.getArch() == llvm::Triple::UnknownArch)
-            Diag(clang::diag::err_drv_invalid_omp_target) << Val;
-          else {
-            const ToolChain *TC;
-            // Device toolchains have to be selected differently. They pair host
-            // and device in their implementation.
-            if (TT.isNVPTX() || TT.isAMDGCN()) {
-              const ToolChain *HostTC =
-                  C.getSingleOffloadToolChain<Action::OFK_Host>();
-              assert(HostTC && "Host toolchain should be always defined.");
-              auto &DeviceTC =
-                  ToolChains[TT.str() + "/" + HostTC->getTriple().normalize()];
-              if (!DeviceTC) {
-                if (TT.isNVPTX())
-                  DeviceTC = std::make_unique<toolchains::CudaToolChain>(
-                      *this, TT, *HostTC, C.getInputArgs(), Action::OFK_OpenMP);
-                else if (TT.isAMDGCN())
-                  DeviceTC =
-                      std::make_unique<toolchains::AMDGPUOpenMPToolChain>(
-                          *this, TT, *HostTC, C.getInputArgs());
-                else
-                  assert(DeviceTC && "Device toolchain not defined.");
-              }
-
-              TC = DeviceTC.get();
-            } else
-              TC = &getToolChain(C.getInputArgs(), TT);
-            C.addOffloadDeviceToolChain(TC, Action::OFK_OpenMP);
+      // If the set is empty then we failed to find a native architecture.
+      if (Archs.empty()) {
+        Diag(clang::diag::err_drv_failed_to_deduce_target_from_arch)
+            << "native";
+        return;
+      }
+
+      for (const auto &TripleAndArchs : DerivedArchs)
+        OpenMPTriples.push_back(TripleAndArchs.first());
+    }
+
+    for (StringRef Val : OpenMPTriples) {
+      llvm::Triple TT(ToolChain::getOpenMPTriple(Val));
+      std::string NormalizedName = TT.normalize();
+
+      // Make sure we don't have a duplicate triple.
+      auto Duplicate = FoundNormalizedTriples.find(NormalizedName);
+      if (Duplicate != FoundNormalizedTriples.end()) {
+        Diag(clang::diag::warn_drv_omp_offload_target_duplicate)
+            << Val << Duplicate->second;
+        continue;
+      }
+
+      // Store the current triple so that we can check for duplicates in the
+      // following iterations.
+      FoundNormalizedTriples[NormalizedName] = Val;
+
+      // If the specified target is invalid, emit a diagnostic.
+      if (TT.getArch() == llvm::Triple::UnknownArch)
+        Diag(clang::diag::err_drv_invalid_omp_target) << Val;
+      else {
+        const ToolChain *TC;
+        // Device toolchains have to be selected differently. They pair host
+        // and device in their implementation.
+        if (TT.isNVPTX() || TT.isAMDGCN()) {
+          const ToolChain *HostTC =
+              C.getSingleOffloadToolChain<Action::OFK_Host>();
+          assert(HostTC && "Host toolchain should be always defined.");
+          auto &DeviceTC =
+              ToolChains[TT.str() + "/" + HostTC->getTriple().normalize()];
+          if (!DeviceTC) {
+            if (TT.isNVPTX())
+              DeviceTC = std::make_unique<toolchains::CudaToolChain>(
+                  *this, TT, *HostTC, C.getInputArgs());
+            else if (TT.isAMDGCN())
+              DeviceTC = std::make_unique<toolchains::AMDGPUOpenMPToolChain>(
+                  *this, TT, *HostTC, C.getInputArgs());
+            else
+              assert(DeviceTC && "Device toolchain not defined.");
           }
-        }
-      } else
-        Diag(clang::diag::err_drv_expecting_fopenmp_with_fopenmp_targets);
-    } else
-      Diag(clang::diag::warn_drv_empty_joined_argument)
-          << OpenMPTargets->getAsString(C.getInputArgs());
+
+          TC = DeviceTC.get();
+        } else
+          TC = &getToolChain(C.getInputArgs(), TT);
+        C.addOffloadDeviceToolChain(TC, Action::OFK_OpenMP);
+        if (DerivedArchs.find(TT.getTriple()) != DerivedArchs.end())
+          KnownArchs[TC] = DerivedArchs[TT.getTriple()];
+      }
+    }
+  } else if (C.getInputArgs().hasArg(options::OPT_fopenmp_targets_EQ)) {
+    Diag(clang::diag::err_drv_expecting_fopenmp_with_fopenmp_targets);
+    return;
   }
 
   //
@@ -794,69 +966,78 @@ void Driver::CreateOffloadingDeviceToolChains(Compilation &C,
   //
 }
 
-/// Looks the given directories for the specified file.
-///
-/// \param[out] FilePath File path, if the file was found.
-/// \param[in]  Dirs Directories used for the search.
-/// \param[in]  FileName Name of the file to search for.
-/// \return True if file was found.
-///
-/// Looks for file specified by FileName sequentially in directories specified
-/// by Dirs.
-///
-static bool searchForFile(SmallVectorImpl<char> &FilePath,
-                          ArrayRef<StringRef> Dirs, StringRef FileName) {
-  SmallString<128> WPath;
-  for (const StringRef &Dir : Dirs) {
-    if (Dir.empty())
-      continue;
-    WPath.clear();
-    llvm::sys::path::append(WPath, Dir, FileName);
-    llvm::sys::path::native(WPath);
-    if (llvm::sys::fs::is_regular_file(WPath)) {
-      FilePath = std::move(WPath);
-      return true;
-    }
-  }
-  return false;
+static void appendOneArg(InputArgList &Args, const Arg *Opt,
+                         const Arg *BaseArg) {
+  // The args for config files or /clang: flags belong to different InputArgList
+  // objects than Args. This copies an Arg from one of those other InputArgLists
+  // to the ownership of Args.
+  unsigned Index = Args.MakeIndex(Opt->getSpelling());
+  Arg *Copy = new llvm::opt::Arg(Opt->getOption(), Args.getArgString(Index),
+                                 Index, BaseArg);
+  Copy->getValues() = Opt->getValues();
+  if (Opt->isClaimed())
+    Copy->claim();
+  Copy->setOwnsValues(Opt->getOwnsValues());
+  Opt->setOwnsValues(false);
+  Args.append(Copy);
 }
 
-bool Driver::readConfigFile(StringRef FileName) {
+bool Driver::readConfigFile(StringRef FileName,
+                            llvm::cl::ExpansionContext &ExpCtx) {
+  // Try opening the given file.
+  auto Status = getVFS().status(FileName);
+  if (!Status) {
+    Diag(diag::err_drv_cannot_open_config_file)
+        << FileName << Status.getError().message();
+    return true;
+  }
+  if (Status->getType() != llvm::sys::fs::file_type::regular_file) {
+    Diag(diag::err_drv_cannot_open_config_file)
+        << FileName << "not a regular file";
+    return true;
+  }
+
   // Try reading the given file.
   SmallVector<const char *, 32> NewCfgArgs;
-  if (!llvm::cl::readConfigFile(FileName, Saver, NewCfgArgs)) {
-    Diag(diag::err_drv_cannot_read_config_file) << FileName;
+  if (llvm::Error Err = ExpCtx.readConfigFile(FileName, NewCfgArgs)) {
+    Diag(diag::err_drv_cannot_read_config_file)
+        << FileName << toString(std::move(Err));
     return true;
   }
 
   // Read options from config file.
   llvm::SmallString<128> CfgFileName(FileName);
   llvm::sys::path::native(CfgFileName);
-  ConfigFile = std::string(CfgFileName);
   bool ContainErrors;
-  CfgOptions = std::make_unique<InputArgList>(
+  std::unique_ptr<InputArgList> NewOptions = std::make_unique<InputArgList>(
       ParseArgStrings(NewCfgArgs, IsCLMode(), ContainErrors));
-  if (ContainErrors) {
-    CfgOptions.reset();
+  if (ContainErrors)
     return true;
-  }
-
-  if (CfgOptions->hasArg(options::OPT_config)) {
-    CfgOptions.reset();
-    Diag(diag::err_drv_nested_config_file);
-    return true;
-  }
 
   // Claim all arguments that come from a configuration file so that the driver
   // does not warn on any that is unused.
-  for (Arg *A : *CfgOptions)
+  for (Arg *A : *NewOptions)
     A->claim();
+
+  if (!CfgOptions)
+    CfgOptions = std::move(NewOptions);
+  else {
+    // If this is a subsequent config file, append options to the previous one.
+    for (auto *Opt : *NewOptions) {
+      const Arg *BaseArg = &Opt->getBaseArg();
+      if (BaseArg == Opt)
+        BaseArg = nullptr;
+      appendOneArg(*CfgOptions, Opt, BaseArg);
+    }
+  }
+  ConfigFiles.push_back(std::string(CfgFileName));
   return false;
 }
 
-bool Driver::loadConfigFile() {
-  std::string CfgFileName;
-  bool FileSpecifiedExplicitly = false;
+bool Driver::loadConfigFiles() {
+  llvm::cl::ExpansionContext ExpCtx(Saver.getAllocator(),
+                                    llvm::cl::tokenizeConfigFile);
+  ExpCtx.setVFS(&getVFS());
 
   // Process options that change search path for config files.
   if (CLOptions) {
@@ -864,144 +1045,141 @@ bool Driver::loadConfigFile() {
       SmallString<128> CfgDir;
       CfgDir.append(
           CLOptions->getLastArgValue(options::OPT_config_system_dir_EQ));
-      if (!CfgDir.empty()) {
-        if (llvm::sys::fs::make_absolute(CfgDir).value() != 0)
-          SystemConfigDir.clear();
-        else
-          SystemConfigDir = std::string(CfgDir.begin(), CfgDir.end());
-      }
+      if (CfgDir.empty() || getVFS().makeAbsolute(CfgDir))
+        SystemConfigDir.clear();
+      else
+        SystemConfigDir = static_cast<std::string>(CfgDir);
     }
     if (CLOptions->hasArg(options::OPT_config_user_dir_EQ)) {
       SmallString<128> CfgDir;
-      CfgDir.append(
-          CLOptions->getLastArgValue(options::OPT_config_user_dir_EQ));
-      if (!CfgDir.empty()) {
-        if (llvm::sys::fs::make_absolute(CfgDir).value() != 0)
-          UserConfigDir.clear();
-        else
-          UserConfigDir = std::string(CfgDir.begin(), CfgDir.end());
-      }
+      llvm::sys::fs::expand_tilde(
+          CLOptions->getLastArgValue(options::OPT_config_user_dir_EQ), CfgDir);
+      if (CfgDir.empty() || getVFS().makeAbsolute(CfgDir))
+        UserConfigDir.clear();
+      else
+        UserConfigDir = static_cast<std::string>(CfgDir);
     }
   }
 
-  // First try to find config file specified in command line.
-  if (CLOptions) {
-    std::vector<std::string> ConfigFiles =
-        CLOptions->getAllArgValues(options::OPT_config);
-    if (ConfigFiles.size() > 1) {
-      if (!std::all_of(ConfigFiles.begin(), ConfigFiles.end(),
-                       [ConfigFiles](const std::string &s) {
-                         return s == ConfigFiles[0];
-                       })) {
-        Diag(diag::err_drv_duplicate_config);
-        return true;
-      }
-    }
+  // Prepare list of directories where config file is searched for.
+  StringRef CfgFileSearchDirs[] = {UserConfigDir, SystemConfigDir, Dir};
+  ExpCtx.setSearchDirs(CfgFileSearchDirs);
 
-    if (!ConfigFiles.empty()) {
-      CfgFileName = ConfigFiles.front();
-      assert(!CfgFileName.empty());
+  // First try to load configuration from the default files, return on error.
+  if (loadDefaultConfigFiles(ExpCtx))
+    return true;
 
+  // Then load configuration files specified explicitly.
+  SmallString<128> CfgFilePath;
+  if (CLOptions) {
+    for (auto CfgFileName : CLOptions->getAllArgValues(options::OPT_config)) {
       // If argument contains directory separator, treat it as a path to
       // configuration file.
       if (llvm::sys::path::has_parent_path(CfgFileName)) {
-        SmallString<128> CfgFilePath;
-        if (llvm::sys::path::is_relative(CfgFileName))
-          llvm::sys::fs::current_path(CfgFilePath);
-        llvm::sys::path::append(CfgFilePath, CfgFileName);
-        if (!llvm::sys::fs::is_regular_file(CfgFilePath)) {
-          Diag(diag::err_drv_config_file_not_exist) << CfgFilePath;
-          return true;
+        CfgFilePath.assign(CfgFileName);
+        if (llvm::sys::path::is_relative(CfgFilePath)) {
+          if (getVFS().makeAbsolute(CfgFilePath)) {
+            Diag(diag::err_drv_cannot_open_config_file)
+                << CfgFilePath << "cannot get absolute path";
+            return true;
+          }
         }
-        return readConfigFile(CfgFilePath);
+      } else if (!ExpCtx.findConfigFile(CfgFileName, CfgFilePath)) {
+        // Report an error that the config file could not be found.
+        Diag(diag::err_drv_config_file_not_found) << CfgFileName;
+        for (const StringRef &SearchDir : CfgFileSearchDirs)
+          if (!SearchDir.empty())
+            Diag(diag::note_drv_config_file_searched_in) << SearchDir;
+        return true;
       }
 
-      FileSpecifiedExplicitly = true;
+      // Try to read the config file, return on error.
+      if (readConfigFile(CfgFilePath, ExpCtx))
+        return true;
     }
   }
 
-  // If config file is not specified explicitly, try to deduce configuration
-  // from executable name. For instance, an executable 'armv7l-clang' will
-  // search for config file 'armv7l-clang.cfg'.
-  if (CfgFileName.empty() && !ClangNameParts.TargetPrefix.empty())
-    CfgFileName = ClangNameParts.TargetPrefix + '-' + ClangNameParts.ModeSuffix;
+  // No error occurred.
+  return false;
+}
 
-  if (CfgFileName.empty())
+bool Driver::loadDefaultConfigFiles(llvm::cl::ExpansionContext &ExpCtx) {
+  // Disable default config if CLANG_NO_DEFAULT_CONFIG is set to a non-empty
+  // value.
+  if (const char *NoConfigEnv = ::getenv("CLANG_NO_DEFAULT_CONFIG")) {
+    if (*NoConfigEnv)
+      return false;
+  }
+  if (CLOptions && CLOptions->hasArg(options::OPT_no_default_config))
     return false;
 
-  // Determine architecture part of the file name, if it is present.
-  StringRef CfgFileArch = CfgFileName;
-  size_t ArchPrefixLen = CfgFileArch.find('-');
-  if (ArchPrefixLen == StringRef::npos)
-    ArchPrefixLen = CfgFileArch.size();
-  llvm::Triple CfgTriple;
-  CfgFileArch = CfgFileArch.take_front(ArchPrefixLen);
-  CfgTriple = llvm::Triple(llvm::Triple::normalize(CfgFileArch));
-  if (CfgTriple.getArch() == llvm::Triple::ArchType::UnknownArch)
-    ArchPrefixLen = 0;
-
-  if (!StringRef(CfgFileName).endswith(".cfg"))
-    CfgFileName += ".cfg";
-
-  // If config file starts with architecture name and command line options
-  // redefine architecture (with options like -m32 -LE etc), try finding new
-  // config file with that architecture.
-  SmallString<128> FixedConfigFile;
-  size_t FixedArchPrefixLen = 0;
-  if (ArchPrefixLen) {
-    // Get architecture name from config file name like 'i386.cfg' or
-    // 'armv7l-clang.cfg'.
-    // Check if command line options changes effective triple.
-    llvm::Triple EffectiveTriple = computeTargetTriple(*this,
-                                             CfgTriple.getTriple(), *CLOptions);
-    if (CfgTriple.getArch() != EffectiveTriple.getArch()) {
-      FixedConfigFile = EffectiveTriple.getArchName();
-      FixedArchPrefixLen = FixedConfigFile.size();
-      // Append the rest of original file name so that file name transforms
-      // like: i386-clang.cfg -> x86_64-clang.cfg.
-      if (ArchPrefixLen < CfgFileName.size())
-        FixedConfigFile += CfgFileName.substr(ArchPrefixLen);
-    }
+  std::string RealMode = getExecutableForDriverMode(Mode);
+  std::string Triple;
+
+  // If name prefix is present, no --target= override was passed via CLOptions
+  // and the name prefix is not a valid triple, force it for backwards
+  // compatibility.
+  if (!ClangNameParts.TargetPrefix.empty() &&
+      computeTargetTriple(*this, "/invalid/", *CLOptions).str() ==
+          "/invalid/") {
+    llvm::Triple PrefixTriple{ClangNameParts.TargetPrefix};
+    if (PrefixTriple.getArch() == llvm::Triple::UnknownArch ||
+        PrefixTriple.isOSUnknown())
+      Triple = PrefixTriple.str();
+  }
+
+  // Otherwise, use the real triple as used by the driver.
+  if (Triple.empty()) {
+    llvm::Triple RealTriple =
+        computeTargetTriple(*this, TargetTriple, *CLOptions);
+    Triple = RealTriple.str();
+    assert(!Triple.empty());
+  }
+
+  // Search for config files in the following order:
+  // 1. <triple>-<mode>.cfg using real driver mode
+  //    (e.g. i386-pc-linux-gnu-clang++.cfg).
+  // 2. <triple>-<mode>.cfg using executable suffix
+  //    (e.g. i386-pc-linux-gnu-clang-g++.cfg for *clang-g++).
+  // 3. <triple>.cfg + <mode>.cfg using real driver mode
+  //    (e.g. i386-pc-linux-gnu.cfg + clang++.cfg).
+  // 4. <triple>.cfg + <mode>.cfg using executable suffix
+  //    (e.g. i386-pc-linux-gnu.cfg + clang-g++.cfg for *clang-g++).
+
+  // Try loading <triple>-<mode>.cfg, and return if we find a match.
+  SmallString<128> CfgFilePath;
+  std::string CfgFileName = Triple + '-' + RealMode + ".cfg";
+  if (ExpCtx.findConfigFile(CfgFileName, CfgFilePath))
+    return readConfigFile(CfgFilePath, ExpCtx);
+
+  bool TryModeSuffix = !ClangNameParts.ModeSuffix.empty() &&
+                       ClangNameParts.ModeSuffix != RealMode;
+  if (TryModeSuffix) {
+    CfgFileName = Triple + '-' + ClangNameParts.ModeSuffix + ".cfg";
+    if (ExpCtx.findConfigFile(CfgFileName, CfgFilePath))
+      return readConfigFile(CfgFilePath, ExpCtx);
+  }
+
+  // Try loading <mode>.cfg, and return if loading failed.  If a matching file
+  // was not found, still proceed on to try <triple>.cfg.
+  CfgFileName = RealMode + ".cfg";
+  if (ExpCtx.findConfigFile(CfgFileName, CfgFilePath)) {
+    if (readConfigFile(CfgFilePath, ExpCtx))
+      return true;
+  } else if (TryModeSuffix) {
+    CfgFileName = ClangNameParts.ModeSuffix + ".cfg";
+    if (ExpCtx.findConfigFile(CfgFileName, CfgFilePath) &&
+        readConfigFile(CfgFilePath, ExpCtx))
+      return true;
   }
 
-  // Prepare list of directories where config file is searched for.
-  StringRef CfgFileSearchDirs[] = {UserConfigDir, SystemConfigDir, Dir};
-
-  // Try to find config file. First try file with corrected architecture.
-  llvm::SmallString<128> CfgFilePath;
-  if (!FixedConfigFile.empty()) {
-    if (searchForFile(CfgFilePath, CfgFileSearchDirs, FixedConfigFile))
-      return readConfigFile(CfgFilePath);
-    // If 'x86_64-clang.cfg' was not found, try 'x86_64.cfg'.
-    FixedConfigFile.resize(FixedArchPrefixLen);
-    FixedConfigFile.append(".cfg");
-    if (searchForFile(CfgFilePath, CfgFileSearchDirs, FixedConfigFile))
-      return readConfigFile(CfgFilePath);
-  }
-
-  // Then try original file name.
-  if (searchForFile(CfgFilePath, CfgFileSearchDirs, CfgFileName))
-    return readConfigFile(CfgFilePath);
-
-  // Finally try removing driver mode part: 'x86_64-clang.cfg' -> 'x86_64.cfg'.
-  if (!ClangNameParts.ModeSuffix.empty() &&
-      !ClangNameParts.TargetPrefix.empty()) {
-    CfgFileName.assign(ClangNameParts.TargetPrefix);
-    CfgFileName.append(".cfg");
-    if (searchForFile(CfgFilePath, CfgFileSearchDirs, CfgFileName))
-      return readConfigFile(CfgFilePath);
-  }
-
-  // Report error but only if config file was specified explicitly, by option
-  // --config. If it was deduced from executable name, it is not an error.
-  if (FileSpecifiedExplicitly) {
-    Diag(diag::err_drv_config_file_not_found) << CfgFileName;
-    for (const StringRef &SearchDir : CfgFileSearchDirs)
-      if (!SearchDir.empty())
-        Diag(diag::note_drv_config_file_searched_in) << SearchDir;
-    return true;
-  }
+  // Try loading <triple>.cfg and return if we find a match.
+  CfgFileName = Triple + ".cfg";
+  if (ExpCtx.findConfigFile(CfgFileName, CfgFilePath))
+    return readConfigFile(CfgFilePath, ExpCtx);
 
+  // If we were unable to find a config file deduced from executable name,
+  // that is not an error.
   return false;
 }
 
@@ -1027,28 +1205,13 @@ Compilation *Driver::BuildCompilation(ArrayRef<const char *> ArgList) {
 
   // Try parsing configuration file.
   if (!ContainsError)
-    ContainsError = loadConfigFile();
+    ContainsError = loadConfigFiles();
   bool HasConfigFile = !ContainsError && (CfgOptions.get() != nullptr);
 
   // All arguments, from both config file and command line.
   InputArgList Args = std::move(HasConfigFile ? std::move(*CfgOptions)
                                               : std::move(*CLOptions));
 
-  // The args for config files or /clang: flags belong to different InputArgList
-  // objects than Args. This copies an Arg from one of those other InputArgLists
-  // to the ownership of Args.
-  auto appendOneArg = [&Args](const Arg *Opt, const Arg *BaseArg) {
-    unsigned Index = Args.MakeIndex(Opt->getSpelling());
-    Arg *Copy = new llvm::opt::Arg(Opt->getOption(), Args.getArgString(Index),
-                                   Index, BaseArg);
-    Copy->getValues() = Opt->getValues();
-    if (Opt->isClaimed())
-      Copy->claim();
-    Copy->setOwnsValues(Opt->getOwnsValues());
-    Opt->setOwnsValues(false);
-    Args.append(Copy);
-  };
-
   if (HasConfigFile)
     for (auto *Opt : *CLOptions) {
       if (Opt->getOption().matches(options::OPT_config))
@@ -1056,7 +1219,7 @@ Compilation *Driver::BuildCompilation(ArrayRef<const char *> ArgList) {
       const Arg *BaseArg = &Opt->getBaseArg();
       if (BaseArg == Opt)
         BaseArg = nullptr;
-      appendOneArg(Opt, BaseArg);
+      appendOneArg(Args, Opt, BaseArg);
     }
 
   // In CL mode, look for any pass-through arguments
@@ -1075,7 +1238,7 @@ Compilation *Driver::BuildCompilation(ArrayRef<const char *> ArgList) {
 
       if (!ContainsError)
         for (auto *Opt : *CLModePassThroughOptions) {
-          appendOneArg(Opt, nullptr);
+          appendOneArg(Args, Opt, nullptr);
         }
     }
   }
@@ -1088,10 +1251,8 @@ Compilation *Driver::BuildCompilation(ArrayRef<const char *> ArgList) {
   // FIXME: This stuff needs to go into the Compilation, not the driver.
   bool CCCPrintPhases;
 
-  // Silence driver warnings if requested
-  Diags.setIgnoreAllWarnings(Args.hasArg(options::OPT_w));
-
-  // -no-canonical-prefixes is used very early in main.
+  // -canonical-prefixes, -no-canonical-prefixes are used very early in main.
+  Args.ClaimAllArgs(options::OPT_canonical_prefixes);
   Args.ClaimAllArgs(options::OPT_no_canonical_prefixes);
 
   // f(no-)integated-cc1 is also used very early in main.
@@ -1111,9 +1272,6 @@ Compilation *Driver::BuildCompilation(ArrayRef<const char *> ArgList) {
   CCCPrintBindings = Args.hasArg(options::OPT_ccc_print_bindings);
   if (const Arg *A = Args.getLastArg(options::OPT_ccc_gcc_name))
     CCCGenericGCCName = A->getValue();
-  GenReproducer = Args.hasFlag(options::OPT_gen_reproducer,
-                               options::OPT_fno_crash_diagnostics,
-                               !!::getenv("FORCE_CLANG_DIAGNOSTICS_CRASH"));
 
   // Process -fproc-stat-report options.
   if (const Arg *A = Args.getLastArg(options::OPT_fproc_stat_report_EQ)) {
@@ -1132,8 +1290,25 @@ Compilation *Driver::BuildCompilation(ArrayRef<const char *> ArgList) {
     T.setVendor(llvm::Triple::PC);
     T.setEnvironment(llvm::Triple::MSVC);
     T.setObjectFormat(llvm::Triple::COFF);
+    if (Args.hasArg(options::OPT__SLASH_arm64EC))
+      T.setArch(llvm::Triple::aarch64, llvm::Triple::AArch64SubArch_arm64ec);
     TargetTriple = T.str();
+  } else if (IsDXCMode()) {
+    // Build TargetTriple from target_profile option for clang-dxc.
+    if (const Arg *A = Args.getLastArg(options::OPT_target_profile)) {
+      StringRef TargetProfile = A->getValue();
+      if (auto Triple =
+              toolchains::HLSLToolChain::parseTargetProfile(TargetProfile))
+        TargetTriple = *Triple;
+      else
+        Diag(diag::err_drv_invalid_directx_shader_module) << TargetProfile;
+
+      A->claim();
+    } else {
+      Diag(diag::err_drv_dxc_missing_target_profile);
+    }
   }
+
   if (const Arg *A = Args.getLastArg(options::OPT_target))
     TargetTriple = A->getValue();
   if (const Arg *A = Args.getLastArg(options::OPT_ccc_install_dir))
@@ -1142,7 +1317,7 @@ Compilation *Driver::BuildCompilation(ArrayRef<const char *> ArgList) {
     A->claim();
     PrefixDirs.push_back(A->getValue(0));
   }
-  if (Optional<std::string> CompilerPathValue =
+  if (std::optional<std::string> CompilerPathValue =
           llvm::sys::Process::GetEnv("COMPILER_PATH")) {
     StringRef CompilerPath = *CompilerPathValue;
     while (!CompilerPath.empty()) {
@@ -1167,6 +1342,17 @@ Compilation *Driver::BuildCompilation(ArrayRef<const char *> ArgList) {
                     .Default(SaveTempsCwd);
   }
 
+  if (const Arg *A = Args.getLastArg(options::OPT_offload_host_only,
+                                     options::OPT_offload_device_only,
+                                     options::OPT_offload_host_device)) {
+    if (A->getOption().matches(options::OPT_offload_host_only))
+      Offload = OffloadHost;
+    else if (A->getOption().matches(options::OPT_offload_device_only))
+      Offload = OffloadDevice;
+    else
+      Offload = OffloadHostDevice;
+  }
+
   setLTOMode(Args);
 
   // Process -fembed-bitcode= flags.
@@ -1185,6 +1371,41 @@ Compilation *Driver::BuildCompilation(ArrayRef<const char *> ArgList) {
       BitcodeEmbed = static_cast<BitcodeEmbedMode>(Model);
   }
 
+  // Remove existing compilation database so that each job can append to it.
+  if (Arg *A = Args.getLastArg(options::OPT_MJ))
+    llvm::sys::fs::remove(A->getValue());
+
+  // Setting up the jobs for some precompile cases depends on whether we are
+  // treating them as PCH, implicit modules or C++20 ones.
+  // TODO: inferring the mode like this seems fragile (it meets the objective
+  // of not requiring anything new for operation, however).
+  const Arg *Std = Args.getLastArg(options::OPT_std_EQ);
+  ModulesModeCXX20 =
+      !Args.hasArg(options::OPT_fmodules) && Std &&
+      (Std->containsValue("c++20") || Std->containsValue("c++2b") ||
+       Std->containsValue("c++2a") || Std->containsValue("c++latest"));
+
+  // Process -fmodule-header{=} flags.
+  if (Arg *A = Args.getLastArg(options::OPT_fmodule_header_EQ,
+                               options::OPT_fmodule_header)) {
+    // These flags force C++20 handling of headers.
+    ModulesModeCXX20 = true;
+    if (A->getOption().matches(options::OPT_fmodule_header))
+      CXX20HeaderType = HeaderMode_Default;
+    else {
+      StringRef ArgName = A->getValue();
+      unsigned Kind = llvm::StringSwitch<unsigned>(ArgName)
+                          .Case("user", HeaderMode_User)
+                          .Case("system", HeaderMode_System)
+                          .Default(~0U);
+      if (Kind == ~0U) {
+        Diags.Report(diag::err_drv_invalid_value)
+            << A->getAsString(Args) << ArgName;
+      } else
+        CXX20HeaderType = static_cast<ModuleHeaderMode>(Kind);
+    }
+  }
+
   std::unique_ptr<llvm::opt::InputArgList> UArgs =
       std::make_unique<InputArgList>(std::move(Args));
 
@@ -1195,6 +1416,14 @@ Compilation *Driver::BuildCompilation(ArrayRef<const char *> ArgList) {
   const ToolChain &TC = getToolChain(
       *UArgs, computeTargetTriple(*this, TargetTriple, *UArgs));
 
+  // Report warning when arm64EC option is overridden by specified target
+  if ((TC.getTriple().getArch() != llvm::Triple::aarch64 ||
+       TC.getTriple().getSubArch() != llvm::Triple::AArch64SubArch_arm64ec) &&
+      UArgs->hasArg(options::OPT__SLASH_arm64EC)) {
+    getDiags().Report(clang::diag::warn_target_override_arm64ec)
+        << TC.getTriple().str();
+  }
+
   // The compilation takes ownership of Args.
   Compilation *C = new Compilation(*this, TC, UArgs.release(), TranslatedArgs,
                                    ContainsError);
@@ -1228,8 +1457,14 @@ Compilation *Driver::BuildCompilation(ArrayRef<const char *> ArgList) {
 
 static void printArgList(raw_ostream &OS, const llvm::opt::ArgList &Args) {
   llvm::opt::ArgStringList ASL;
-  for (const auto *A : Args)
+  for (const auto *A : Args) {
+    // Use user's original spelling of flags. For example, use
+    // `/source-charset:utf-8` instead of `-finput-charset=utf-8` if the user
+    // wrote the former.
+    while (A->getAlias())
+      A = A->getAlias();
     A->render(Args, ASL);
+  }
 
   for (auto I = ASL.begin(), E = ASL.end(); I != E; ++I) {
     if (I != ASL.begin())
@@ -1328,6 +1563,11 @@ bool Driver::getCrashDiagnosticFile(StringRef ReproCrashFilename,
   return false;
 }
 
+static const char BugReporMsg[] =
+    "\n********************\n\n"
+    "PLEASE ATTACH THE FOLLOWING FILES TO THE BUG REPORT:\n"
+    "Preprocessed source(s) and associated run script(s) are located at:";
+
 // When clang crashes, produce diagnostic information including the fully
 // preprocessed source file(s).  Request that the developer attach the
 // diagnostic information to a bug report.
@@ -1337,16 +1577,40 @@ void Driver::generateCompilationDiagnostics(
   if (C.getArgs().hasArg(options::OPT_fno_crash_diagnostics))
     return;
 
-  // Don't try to generate diagnostics for link or dsymutil jobs.
-  if (FailingCommand.getCreator().isLinkJob() ||
-      FailingCommand.getCreator().isDsymutilJob())
+  unsigned Level = 1;
+  if (Arg *A = C.getArgs().getLastArg(options::OPT_fcrash_diagnostics_EQ)) {
+    Level = llvm::StringSwitch<unsigned>(A->getValue())
+                .Case("off", 0)
+                .Case("compiler", 1)
+                .Case("all", 2)
+                .Default(1);
+  }
+  if (!Level)
+    return;
+
+  // Don't try to generate diagnostics for dsymutil jobs.
+  if (FailingCommand.getCreator().isDsymutilJob())
     return;
 
+  bool IsLLD = false;
+  ArgStringList SavedTemps;
+  if (FailingCommand.getCreator().isLinkJob()) {
+    C.getDefaultToolChain().GetLinkerPath(&IsLLD);
+    if (!IsLLD || Level < 2)
+      return;
+
+    // If lld crashed, we will re-run the same command with the input it used
+    // to have. In that case we should not remove temp files in
+    // initCompilationForDiagnostics yet. They will be added back and removed
+    // later.
+    SavedTemps = std::move(C.getTempFiles());
+    assert(!C.getTempFiles().size());
+  }
+
   // Print the version of the compiler.
   PrintVersion(C, llvm::errs());
 
   // Suppress driver output and emit preprocessor output to temp file.
-  Mode = CPPMode;
   CCGenDiagnostics = true;
 
   // Save the original job command(s).
@@ -1359,6 +1623,29 @@ void Driver::generateCompilationDiagnostics(
   // Suppress tool output.
   C.initCompilationForDiagnostics();
 
+  // If lld failed, rerun it again with --reproduce.
+  if (IsLLD) {
+    const char *TmpName = CreateTempFile(C, "linker-crash", "tar");
+    Command NewLLDInvocation = Cmd;
+    llvm::opt::ArgStringList ArgList = NewLLDInvocation.getArguments();
+    StringRef ReproduceOption =
+        C.getDefaultToolChain().getTriple().isWindowsMSVCEnvironment()
+            ? "/reproduce:"
+            : "--reproduce=";
+    ArgList.push_back(Saver.save(Twine(ReproduceOption) + TmpName).data());
+    NewLLDInvocation.replaceArguments(std::move(ArgList));
+
+    // Redirect stdout/stderr to /dev/null.
+    NewLLDInvocation.Execute({std::nullopt, {""}, {""}}, nullptr, nullptr);
+    Diag(clang::diag::note_drv_command_failed_diag_msg) << BugReporMsg;
+    Diag(clang::diag::note_drv_command_failed_diag_msg) << TmpName;
+    Diag(clang::diag::note_drv_command_failed_diag_msg)
+        << "\n\n********************";
+    if (Report)
+      Report->TemporaryFiles.push_back(TmpName);
+    return;
+  }
+
   // Construct the list of inputs.
   InputList Inputs;
   BuildInputs(C.getDefaultToolChain(), C.getArgs(), Inputs);
@@ -1443,10 +1730,7 @@ void Driver::generateCompilationDiagnostics(
     return;
   }
 
-  Diag(clang::diag::note_drv_command_failed_diag_msg)
-      << "\n********************\n\n"
-         "PLEASE ATTACH THE FOLLOWING FILES TO THE BUG REPORT:\n"
-         "Preprocessed source(s) and associated run script(s) are located at:";
+  Diag(clang::diag::note_drv_command_failed_diag_msg) << BugReporMsg;
 
   SmallString<128> VFS;
   SmallString<128> ReproCrashFilename;
@@ -1466,6 +1750,9 @@ void Driver::generateCompilationDiagnostics(
     }
   }
 
+  for (const char *TempFile : SavedTemps)
+    C.addTempFile(TempFile);
+
   // Assume associated files are based off of the first temporary file.
   CrashReportInfo CrashInfo(TempFiles[0], VFS);
 
@@ -1536,6 +1823,19 @@ void Driver::setUpResponseFiles(Compilation &C, Command &Cmd) {
 int Driver::ExecuteCompilation(
     Compilation &C,
     SmallVectorImpl<std::pair<int, const Command *>> &FailingCommands) {
+  if (C.getArgs().hasArg(options::OPT_fdriver_only)) {
+    if (C.getArgs().hasArg(options::OPT_v))
+      C.getJobs().Print(llvm::errs(), "\n", true);
+
+    C.ExecuteJobs(C.getJobs(), FailingCommands, /*LogOnly=*/true);
+
+    // If there were errors building the compilation, quit now.
+    if (!FailingCommands.empty() || Diags.hasErrorOccurred())
+      return 1;
+
+    return 0;
+  }
+
   // Just print if -### was present.
   if (C.getArgs().hasArg(options::OPT__HASH_HASH_HASH)) {
     C.getJobs().Print(llvm::errs(), "\n", true);
@@ -1546,7 +1846,7 @@ int Driver::ExecuteCompilation(
   if (Diags.hasErrorOccurred())
     return 1;
 
-  // Set up response file names for each command, if necessary
+  // Set up response file names for each command, if necessary.
   for (auto &Job : C.getJobs())
     setUpResponseFiles(C, Job);
 
@@ -1573,14 +1873,12 @@ int Driver::ExecuteCompilation(
         C.CleanupFileMap(C.getFailureResultFiles(), JA, true);
     }
 
-#if LLVM_ON_UNIX
-    // llvm/lib/Support/Unix/Signals.inc will exit with a special return code
+    // llvm/lib/Support/*/Signals.inc will exit with a special return code
     // for SIGPIPE. Do not print diagnostics for this case.
     if (CommandRes == EX_IOERR) {
       Res = CommandRes;
       continue;
     }
-#endif
 
     // Print extra information about abnormal failures, if possible.
     //
@@ -1648,8 +1946,8 @@ void Driver::PrintVersion(const Compilation &C, raw_ostream &OS) const {
   // Print out the install directory.
   OS << "InstalledDir: " << InstalledDir << '\n';
 
-  // If configuration file was used, print its path.
-  if (!ConfigFile.empty())
+  // If configuration files were used, print their paths.
+  for (auto ConfigFile : ConfigFiles)
     OS << "Configuration file: " << ConfigFile << '\n';
 }
 
@@ -1842,14 +2140,28 @@ bool Driver::HandleImmediateArgs(const Compilation &C) {
   }
 
   if (C.getArgs().hasArg(options::OPT_print_runtime_dir)) {
-    std::string CandidateRuntimePath = TC.getRuntimePath();
-    if (getVFS().exists(CandidateRuntimePath))
-      llvm::outs() << CandidateRuntimePath << '\n';
+    std::string RuntimePath;
+    // Get the first existing path, if any.
+    for (auto Path : TC.getRuntimePaths()) {
+      if (getVFS().exists(Path)) {
+        RuntimePath = Path;
+        break;
+      }
+    }
+    if (!RuntimePath.empty())
+      llvm::outs() << RuntimePath << '\n';
     else
       llvm::outs() << TC.getCompilerRTPath() << '\n';
     return false;
   }
 
+  if (C.getArgs().hasArg(options::OPT_print_diagnostic_options)) {
+    std::vector<std::string> Flags = DiagnosticIDs::getDiagnosticFlags();
+    for (std::size_t I = 0; I != Flags.size(); I += 2)
+      llvm::outs() << "  " << Flags[I] << "\n  " << Flags[I + 1] << "\n\n";
+    return false;
+  }
+
   // FIXME: The following handlers should use a callback mechanism, we don't
   // know what the client would like to do.
   if (Arg *A = C.getArgs().getLastArg(options::OPT_print_file_name_EQ)) {
@@ -1918,12 +2230,6 @@ bool Driver::HandleImmediateArgs(const Compilation &C) {
     return false;
   }
 
-  if (C.getArgs().hasArg(options::OPT_print_multiarch)) {
-    llvm::outs() << TC.getMultiarchTriple(*this, TC.getTriple(), SysRoot)
-                 << "\n";
-    return false;
-  }
-
   if (C.getArgs().hasArg(options::OPT_print_targets)) {
     llvm::TargetRegistry::printRegisteredTargetsForVersion(llvm::outs());
     return false;
@@ -2041,11 +2347,7 @@ static bool ContainsCompileOrAssembleAction(const Action *A) {
       isa<AssembleJobAction>(A))
     return true;
 
-  for (const Action *Input : A->inputs())
-    if (ContainsCompileOrAssembleAction(Input))
-      return true;
-
-  return false;
+  return llvm::any_of(A->inputs(), ContainsCompileOrAssembleAction);
 }
 
 void Driver::BuildUniversalActions(Compilation &C, const ToolChain &TC,
@@ -2145,21 +2447,16 @@ bool Driver::DiagnoseInputExistence(const DerivedArgList &Args, StringRef Value,
   if (Value == "-")
     return true;
 
-  if (getVFS().exists(Value))
+  // If it's a header to be found in the system or user search path, then defer
+  // complaints about its absence until those searches can be done.  When we
+  // are definitely processing headers for C++20 header units, extend this to
+  // allow the user to put "-fmodule-header -xc++-header vector" for example.
+  if (Ty == types::TY_CXXSHeader || Ty == types::TY_CXXUHeader ||
+      (ModulesModeCXX20 && Ty == types::TY_CXXHeader))
     return true;
 
-  if (IsCLMode()) {
-    if (!llvm::sys::path::is_absolute(Twine(Value)) &&
-        llvm::sys::Process::FindInEnvPath("LIB", Value, ';'))
-      return true;
-
-    if (Args.hasArg(options::OPT__SLASH_link) && Ty == types::TY_Object) {
-      // Arguments to the /link flag might cause the linker to search for object
-      // and library files in paths we don't know about. Don't error in such
-      // cases.
-      return true;
-    }
-  }
+  if (getVFS().exists(Value))
+    return true;
 
   if (TypoCorrect) {
     // Check if the filename is a typo for an option flag. OptTable thinks
@@ -2180,10 +2477,62 @@ bool Driver::DiagnoseInputExistence(const DerivedArgList &Args, StringRef Value,
     }
   }
 
+  // In CL mode, don't error on apparently non-existent linker inputs, because
+  // they can be influenced by linker flags the clang driver might not
+  // understand.
+  // Examples:
+  // - `clang-cl main.cc ole32.lib` in a non-MSVC shell will make the driver
+  //   module look for an MSVC installation in the registry. (We could ask
+  //   the MSVCToolChain object if it can find `ole32.lib`, but the logic to
+  //   look in the registry might move into lld-link in the future so that
+  //   lld-link invocations in non-MSVC shells just work too.)
+  // - `clang-cl ... /link ...` can pass arbitrary flags to the linker,
+  //   including /libpath:, which is used to find .lib and .obj files.
+  // So do not diagnose this on the driver level. Rely on the linker diagnosing
+  // it. (If we don't end up invoking the linker, this means we'll emit a
+  // "'linker' input unused [-Wunused-command-line-argument]" warning instead
+  // of an error.)
+  //
+  // Only do this skip after the typo correction step above. `/Brepo` is treated
+  // as TY_Object, but it's clearly a typo for `/Brepro`. It seems fine to emit
+  // an error if we have a flag that's within an edit distance of 1 from a
+  // flag. (Users can use `-Wl,` or `/linker` to launder the flag past the
+  // driver in the unlikely case they run into this.)
+  //
+  // Don't do this for inputs that start with a '/', else we'd pass options
+  // like /libpath: through to the linker silently.
+  //
+  // Emitting an error for linker inputs can also cause incorrect diagnostics
+  // with the gcc driver. The command
+  //     clang -fuse-ld=lld -Wl,--chroot,some/dir /file.o
+  // will make lld look for some/dir/file.o, while we will diagnose here that
+  // `/file.o` does not exist. However, configure scripts check if
+  // `clang /GR-` compiles without error to see if the compiler is cl.exe,
+  // so we can't downgrade diagnostics for `/GR-` from an error to a warning
+  // in cc mode. (We can in cl mode because cl.exe itself only warns on
+  // unknown flags.)
+  if (IsCLMode() && Ty == types::TY_Object && !Value.startswith("/"))
+    return true;
+
   Diag(clang::diag::err_drv_no_such_file) << Value;
   return false;
 }
 
+// Get the C++20 Header Unit type corresponding to the input type.
+static types::ID CXXHeaderUnitType(ModuleHeaderMode HM) {
+  switch (HM) {
+  case HeaderMode_User:
+    return types::TY_CXXUHeader;
+  case HeaderMode_System:
+    return types::TY_CXXSHeader;
+  case HeaderMode_Default:
+    break;
+  case HeaderMode_None:
+    llvm_unreachable("should not be called in this case");
+  }
+  return types::TY_CXXHUHeader;
+}
+
 // Construct a the list of inputs and their types.
 void Driver::BuildInputs(const ToolChain &TC, DerivedArgList &Args,
                          InputList &Inputs) const {
@@ -2220,6 +2569,14 @@ void Driver::BuildInputs(const ToolChain &TC, DerivedArgList &Args,
     assert(!Args.hasArg(options::OPT_x) && "-x and /TC or /TP is not allowed");
   }
 
+  // Warn -x after last input file has no effect
+  {
+    Arg *LastXArg = Args.getLastArgNoClaim(options::OPT_x);
+    Arg *LastInputArg = Args.getLastArgNoClaim(options::OPT_INPUT);
+    if (LastXArg && LastInputArg && LastInputArg->getIndex() < LastXArg->getIndex())
+      Diag(clang::diag::warn_drv_unused_x) << LastXArg->getValue();
+  }
+
   for (Arg *A : Args) {
     if (A->getOption().getKind() == Option::InputClass) {
       const char *Value = A->getValue();
@@ -2242,6 +2599,7 @@ void Driver::BuildInputs(const ToolChain &TC, DerivedArgList &Args,
             //
             // Otherwise emit an error but still use a valid type to avoid
             // spurious errors (e.g., no inputs).
+            assert(!CCGenDiagnostics && "stdin produces no crash reproducer");
             if (!Args.hasArgNoClaim(options::OPT_E) && !CCCIsCPP())
               Diag(IsCLMode() ? clang::diag::err_drv_unknown_stdin_type_clang_cl
                               : clang::diag::err_drv_unknown_stdin_type);
@@ -2257,10 +2615,10 @@ void Driver::BuildInputs(const ToolChain &TC, DerivedArgList &Args,
             Ty = TC.LookupTypeForExtension(Ext + 1);
 
           if (Ty == types::TY_INVALID) {
-            if (CCCIsCPP())
-              Ty = types::TY_C;
-            else if (IsCLMode() && Args.hasArgNoClaim(options::OPT_E))
+            if (IsCLMode() && (Args.hasArgNoClaim(options::OPT_E) || CCGenDiagnostics))
               Ty = types::TY_CXX;
+            else if (CCCIsCPP() || CCGenDiagnostics)
+              Ty = types::TY_C;
             else
               Ty = types::TY_Object;
           }
@@ -2271,7 +2629,9 @@ void Driver::BuildInputs(const ToolChain &TC, DerivedArgList &Args,
             types::ID OldTy = Ty;
             Ty = types::lookupCXXTypeForCType(Ty);
 
-            if (Ty != OldTy)
+            // Do not complain about foo.h, when we are known to be processing
+            // it as a C++20 header unit.
+            if (Ty != OldTy && !(OldTy == types::TY_CHeader && hasHeaderMode()))
               Diag(clang::diag::warn_drv_treating_input_as_cxx)
                   << getTypeName(OldTy) << getTypeName(Ty);
           }
@@ -2294,6 +2654,14 @@ void Driver::BuildInputs(const ToolChain &TC, DerivedArgList &Args,
           else if (Args.hasArg(options::OPT_ObjCXX))
             Ty = types::TY_ObjCXX;
         }
+
+        // Disambiguate headers that are meant to be header units from those
+        // intended to be PCH.  Avoid missing '.h' cases that are counted as
+        // C headers by default - we know we are in C++ mode and we do not
+        // want to issue a complaint about compiling things in the wrong mode.
+        if ((Ty == types::TY_CXXHeader || Ty == types::TY_CHeader) &&
+            hasHeaderMode())
+          Ty = CXXHeaderUnitType(CXX20HeaderType);
       } else {
         assert(InputTypeArg && "InputType set w/o InputTypeArg");
         if (!InputTypeArg->getOption().matches(options::OPT_x)) {
@@ -2345,6 +2713,11 @@ void Driver::BuildInputs(const ToolChain &TC, DerivedArgList &Args,
         Diag(clang::diag::err_drv_unknown_language) << A->getValue();
         InputType = types::TY_Object;
       }
+
+      // If the user has put -fmodule-header{,=} then we treat C++ headers as
+      // header unit inputs.  So we 'promote' -xc++-header appropriately.
+      if (InputType == types::TY_CXXHeader && hasHeaderMode())
+        InputType = CXXHeaderUnitType(CXX20HeaderType);
     } else if (A->getOption().getID() == options::OPT_U) {
       assert(A->getNumValues() == 1 && "The /U option has one value.");
       StringRef Val = A->getValue(0);
@@ -2376,6 +2749,9 @@ class OffloadingActionBuilder final {
   /// Map between an input argument and the offload kinds used to process it.
   std::map<const Arg *, unsigned> InputArgToOffloadKindMap;
 
+  /// Map between a host action and its originating input argument.
+  std::map<Action *, const Arg *> HostActionToInputArgMap;
+
   /// Builder interface. It doesn't build anything or keep any state.
   class DeviceActionBuilder {
   public:
@@ -2428,7 +2804,7 @@ class OffloadingActionBuilder final {
 
     /// Update the state to include the provided host action \a HostAction as a
     /// dependency of the current device action. By default it is inactive.
-    virtual ActionBuilderReturnCode addDeviceDepences(Action *HostAction) {
+    virtual ActionBuilderReturnCode addDeviceDependences(Action *HostAction) {
       return ABRT_Inactive;
     }
 
@@ -2516,7 +2892,7 @@ class OffloadingActionBuilder final {
                           Action::OffloadKind OFKind)
         : DeviceActionBuilder(C, Args, Inputs, OFKind) {}
 
-    ActionBuilderReturnCode addDeviceDepences(Action *HostAction) override {
+    ActionBuilderReturnCode addDeviceDependences(Action *HostAction) override {
       // While generating code for CUDA, we only depend on the host input action
       // to trigger the creation of all the CUDA device actions.
 
@@ -2590,12 +2966,16 @@ class OffloadingActionBuilder final {
         std::string FileName = IA->getInputArg().getAsString(Args);
         // Check if the type of the file is the same as the action. Do not
         // unbundle it if it is not. Do not unbundle .so files, for example,
-        // which are not object files.
+        // which are not object files. Files with extension ".lib" is classified
+        // as TY_Object but they are actually archives, therefore should not be
+        // unbundled here as objects. They will be handled at other places.
+        const StringRef LibFileExt = ".lib";
         if (IA->getType() == types::TY_Object &&
             (!llvm::sys::path::has_extension(FileName) ||
              types::lookupTypeForExtension(
                  llvm::sys::path::extension(FileName).drop_front()) !=
-                 types::TY_Object))
+                 types::TY_Object ||
+             llvm::sys::path::extension(FileName) == LibFileExt))
           return ABRT_Inactive;
 
         for (auto Arch : GpuArchList) {
@@ -2603,6 +2983,7 @@ class OffloadingActionBuilder final {
           UA->registerDependentActionInfo(ToolChains[0], Arch,
                                           AssociatedOffloadKind);
         }
+        IsActive = true;
         return ABRT_Success;
       }
 
@@ -2634,7 +3015,7 @@ class OffloadingActionBuilder final {
       assert(CudaDeviceActions.size() == GpuArchList.size() &&
              "Expecting one action per GPU architecture.");
       assert(ToolChains.size() == 1 &&
-             "Expecting to have a sing CUDA toolchain.");
+             "Expecting to have a single CUDA toolchain.");
       for (unsigned I = 0, E = GpuArchList.size(); I != E; ++I)
         AddTopLevel(CudaDeviceActions[I], GpuArchList[I]);
 
@@ -2645,7 +3026,7 @@ class OffloadingActionBuilder final {
     /// option is invalid.
     virtual StringRef getCanonicalOffloadArch(StringRef Arch) = 0;
 
-    virtual llvm::Optional<std::pair<llvm::StringRef, llvm::StringRef>>
+    virtual std::optional<std::pair<llvm::StringRef, llvm::StringRef>>
     getConflictOffloadArchCombination(const std::set<StringRef> &GpuArchs) = 0;
 
     bool initialize() override {
@@ -2663,7 +3044,7 @@ class OffloadingActionBuilder final {
         return false;
 
       Relocatable = Args.hasFlag(options::OPT_fgpu_rdc,
-          options::OPT_fno_gpu_rdc, /*Default=*/false);
+                                 options::OPT_fno_gpu_rdc, /*Default=*/false);
 
       const ToolChain *HostTC = C.getSingleOffloadToolChain<Action::OFK_Host>();
       assert(HostTC && "No toolchain for host compilation.");
@@ -2682,15 +3063,8 @@ class OffloadingActionBuilder final {
               ? C.getSingleOffloadToolChain<Action::OFK_Cuda>()
               : C.getSingleOffloadToolChain<Action::OFK_HIP>());
 
-      Arg *PartialCompilationArg = Args.getLastArg(
-          options::OPT_cuda_host_only, options::OPT_cuda_device_only,
-          options::OPT_cuda_compile_host_device);
-      CompileHostOnly = PartialCompilationArg &&
-                        PartialCompilationArg->getOption().matches(
-                            options::OPT_cuda_host_only);
-      CompileDeviceOnly = PartialCompilationArg &&
-                          PartialCompilationArg->getOption().matches(
-                              options::OPT_cuda_device_only);
+      CompileHostOnly = C.getDriver().offloadHostOnly();
+      CompileDeviceOnly = C.getDriver().offloadDeviceOnly();
       EmitLLVM = Args.getLastArg(options::OPT_emit_llvm);
       EmitAsm = Args.getLastArg(options::OPT_S);
       FixedCUID = Args.getLastArgValue(options::OPT_cuid_EQ);
@@ -2709,7 +3083,15 @@ class OffloadingActionBuilder final {
         }
       }
 
-      // Collect all cuda_gpu_arch parameters, removing duplicates.
+      // --offload and --offload-arch options are mutually exclusive.
+      if (Args.hasArgNoClaim(options::OPT_offload_EQ) &&
+          Args.hasArgNoClaim(options::OPT_offload_arch_EQ,
+                             options::OPT_no_offload_arch_EQ)) {
+        C.getDriver().Diag(diag::err_opt_not_valid_with_opt) << "--offload-arch"
+                                                             << "--offload";
+      }
+
+      // Collect all offload arch parameters, removing duplicates.
       std::set<StringRef> GpuArchs;
       bool Error = false;
       for (Arg *A : Args) {
@@ -2718,28 +3100,41 @@ class OffloadingActionBuilder final {
           continue;
         A->claim();
 
-        StringRef ArchStr = A->getValue();
-        if (A->getOption().matches(options::OPT_no_offload_arch_EQ) &&
-            ArchStr == "all") {
-          GpuArchs.clear();
-          continue;
+        for (StringRef ArchStr : llvm::split(A->getValue(), ",")) {
+          if (A->getOption().matches(options::OPT_no_offload_arch_EQ) &&
+              ArchStr == "all") {
+            GpuArchs.clear();
+          } else if (ArchStr == "native") {
+            const ToolChain &TC = *ToolChains.front();
+            auto GPUsOrErr = ToolChains.front()->getSystemGPUArchs(Args);
+            if (!GPUsOrErr) {
+              TC.getDriver().Diag(diag::err_drv_undetermined_gpu_arch)
+                  << llvm::Triple::getArchTypeName(TC.getArch())
+                  << llvm::toString(GPUsOrErr.takeError()) << "--offload-arch";
+              continue;
+            }
+
+            for (auto GPU : *GPUsOrErr) {
+              GpuArchs.insert(Args.MakeArgString(GPU));
+            }
+          } else {
+            ArchStr = getCanonicalOffloadArch(ArchStr);
+            if (ArchStr.empty()) {
+              Error = true;
+            } else if (A->getOption().matches(options::OPT_offload_arch_EQ))
+              GpuArchs.insert(ArchStr);
+            else if (A->getOption().matches(options::OPT_no_offload_arch_EQ))
+              GpuArchs.erase(ArchStr);
+            else
+              llvm_unreachable("Unexpected option.");
+          }
         }
-        ArchStr = getCanonicalOffloadArch(ArchStr);
-        if (ArchStr.empty()) {
-          Error = true;
-        } else if (A->getOption().matches(options::OPT_offload_arch_EQ))
-          GpuArchs.insert(ArchStr);
-        else if (A->getOption().matches(options::OPT_no_offload_arch_EQ))
-          GpuArchs.erase(ArchStr);
-        else
-          llvm_unreachable("Unexpected option.");
       }
 
       auto &&ConflictingArchs = getConflictOffloadArchCombination(GpuArchs);
       if (ConflictingArchs) {
         C.getDriver().Diag(clang::diag::err_drv_bad_offload_arch_combo)
-            << ConflictingArchs.getValue().first
-            << ConflictingArchs.getValue().second;
+            << ConflictingArchs->first << ConflictingArchs->second;
         C.setContainsError();
         return true;
       }
@@ -2751,8 +3146,12 @@ class OffloadingActionBuilder final {
       // Default to sm_20 which is the lowest common denominator for
       // supported GPUs.  sm_20 code should work correctly, if
       // suboptimally, on all newer GPUs.
-      if (GpuArchList.empty())
-        GpuArchList.push_back(DefaultCudaArch);
+      if (GpuArchList.empty()) {
+        if (ToolChains.front()->getTriple().isSPIRV())
+          GpuArchList.push_back(CudaArch::Generic);
+        else
+          GpuArchList.push_back(DefaultCudaArch);
+      }
 
       return Error;
     }
@@ -2765,7 +3164,7 @@ class OffloadingActionBuilder final {
     CudaActionBuilder(Compilation &C, DerivedArgList &Args,
                       const Driver::InputList &Inputs)
         : CudaActionBuilderBase(C, Args, Inputs, Action::OFK_Cuda) {
-      DefaultCudaArch = CudaArch::SM_20;
+      DefaultCudaArch = CudaArch::SM_35;
     }
 
     StringRef getCanonicalOffloadArch(StringRef ArchStr) override {
@@ -2777,10 +3176,10 @@ class OffloadingActionBuilder final {
       return CudaArchToString(Arch);
     }
 
-    llvm::Optional<std::pair<llvm::StringRef, llvm::StringRef>>
+    std::optional<std::pair<llvm::StringRef, llvm::StringRef>>
     getConflictOffloadArchCombination(
         const std::set<StringRef> &GpuArchs) override {
-      return llvm::None;
+      return std::nullopt;
     }
 
     ActionBuilderReturnCode
@@ -2891,43 +3290,43 @@ class OffloadingActionBuilder final {
   class HIPActionBuilder final : public CudaActionBuilderBase {
     /// The linker inputs obtained for each device arch.
     SmallVector<ActionList, 8> DeviceLinkerInputs;
-    bool GPUSanitize;
     // The default bundling behavior depends on the type of output, therefore
     // BundleOutput needs to be tri-value: None, true, or false.
     // Bundle code objects except --no-gpu-output is specified for device
     // only compilation. Bundle other type of output files only if
     // --gpu-bundle-output is specified for device only compilation.
-    Optional<bool> BundleOutput;
+    std::optional<bool> BundleOutput;
 
   public:
     HIPActionBuilder(Compilation &C, DerivedArgList &Args,
                      const Driver::InputList &Inputs)
         : CudaActionBuilderBase(C, Args, Inputs, Action::OFK_HIP) {
-      DefaultCudaArch = CudaArch::GFX803;
-      GPUSanitize = Args.hasFlag(options::OPT_fgpu_sanitize,
-                                 options::OPT_fno_gpu_sanitize, false);
+      DefaultCudaArch = CudaArch::GFX906;
       if (Args.hasArg(options::OPT_gpu_bundle_output,
                       options::OPT_no_gpu_bundle_output))
         BundleOutput = Args.hasFlag(options::OPT_gpu_bundle_output,
-                                    options::OPT_no_gpu_bundle_output);
+                                    options::OPT_no_gpu_bundle_output, true);
     }
 
     bool canUseBundlerUnbundler() const override { return true; }
 
     StringRef getCanonicalOffloadArch(StringRef IdStr) override {
       llvm::StringMap<bool> Features;
-      auto ArchStr =
-          parseTargetID(getHIPOffloadTargetTriple(), IdStr, &Features);
+      // getHIPOffloadTargetTriple() is known to return valid value as it has
+      // been called successfully in the CreateOffloadingDeviceToolChains().
+      auto ArchStr = parseTargetID(
+          *getHIPOffloadTargetTriple(C.getDriver(), C.getInputArgs()), IdStr,
+          &Features);
       if (!ArchStr) {
         C.getDriver().Diag(clang::diag::err_drv_bad_target_id) << IdStr;
         C.setContainsError();
         return StringRef();
       }
-      auto CanId = getCanonicalTargetID(ArchStr.getValue(), Features);
+      auto CanId = getCanonicalTargetID(*ArchStr, Features);
       return Args.MakeArgStringRef(CanId);
     };
 
-    llvm::Optional<std::pair<llvm::StringRef, llvm::StringRef>>
+    std::optional<std::pair<llvm::StringRef, llvm::StringRef>>
     getConflictOffloadArchCombination(
         const std::set<StringRef> &GpuArchs) override {
       return getConflictTargetIDCombination(GpuArchs);
@@ -2937,9 +3336,12 @@ class OffloadingActionBuilder final {
     getDeviceDependences(OffloadAction::DeviceDependences &DA,
                          phases::ID CurPhase, phases::ID FinalPhase,
                          PhasesTy &Phases) override {
+      if (!IsActive)
+        return ABRT_Inactive;
+
       // amdgcn does not support linking of object files, therefore we skip
       // backend and assemble phases to output LLVM IR. Except for generating
-      // non-relocatable device coee, where we generate fat binary for device
+      // non-relocatable device code, where we generate fat binary for device
       // code and pass to host in Backend phase.
       if (CudaDeviceActions.empty())
         return ABRT_Success;
@@ -2948,7 +3350,7 @@ class OffloadingActionBuilder final {
               CudaDeviceActions.size() == GpuArchList.size()) &&
              "Expecting one action per GPU architecture.");
       assert(!CompileHostOnly &&
-             "Not expecting CUDA actions in host-only compilation.");
+             "Not expecting HIP actions in host-only compilation.");
 
       if (!Relocatable && CurPhase == phases::Backend && !EmitLLVM &&
           !EmitAsm) {
@@ -2971,9 +3373,19 @@ class OffloadingActionBuilder final {
             // When LTO is not enabled, we follow the conventional
             // compiler phases, including backend and assemble phases.
             ActionList AL;
-            auto BackendAction = C.getDriver().ConstructPhaseAction(
-                C, Args, phases::Backend, CudaDeviceActions[I],
-                AssociatedOffloadKind);
+            Action *BackendAction = nullptr;
+            if (ToolChains.front()->getTriple().isSPIRV()) {
+              // Emit LLVM bitcode for SPIR-V targets. SPIR-V device tool chain
+              // (HIPSPVToolChain) runs post-link LLVM IR passes.
+              types::ID Output = Args.hasArg(options::OPT_S)
+                                     ? types::TY_LLVM_IR
+                                     : types::TY_LLVM_BC;
+              BackendAction =
+                  C.MakeAction<BackendJobAction>(CudaDeviceActions[I], Output);
+            } else
+              BackendAction = C.getDriver().ConstructPhaseAction(
+                  C, Args, phases::Backend, CudaDeviceActions[I],
+                  AssociatedOffloadKind);
             auto AssembleAction = C.getDriver().ConstructPhaseAction(
                 C, Args, phases::Assemble, BackendAction,
                 AssociatedOffloadKind);
@@ -2997,8 +3409,7 @@ class OffloadingActionBuilder final {
               DDep, CudaDeviceActions[I]->getType());
         }
 
-        if (!CompileDeviceOnly || !BundleOutput.hasValue() ||
-            BundleOutput.getValue()) {
+        if (!CompileDeviceOnly || !BundleOutput || *BundleOutput) {
           // Create HIP fat binary with a special "link" action.
           CudaFatBinary = C.MakeAction<LinkJobAction>(CudaDeviceActions,
                                                       types::TY_HIP_FATBIN);
@@ -3033,7 +3444,7 @@ class OffloadingActionBuilder final {
         // We will pass the device action as a host dependence, so we don't
         // need to do anything else with them.
         CudaDeviceActions.clear();
-        return ABRT_Success;
+        return CompileDeviceOnly ? ABRT_Ignore_Host : ABRT_Success;
       }
 
       // By default, we produce an action for each device arch.
@@ -3041,8 +3452,8 @@ class OffloadingActionBuilder final {
         A = C.getDriver().ConstructPhaseAction(C, Args, CurPhase, A,
                                                AssociatedOffloadKind);
 
-      if (CompileDeviceOnly && CurPhase == FinalPhase &&
-          BundleOutput.hasValue() && BundleOutput.getValue()) {
+      if (CompileDeviceOnly && CurPhase == FinalPhase && BundleOutput &&
+          *BundleOutput) {
         for (unsigned I = 0, E = GpuArchList.size(); I != E; ++I) {
           OffloadAction::DeviceDependences DDep;
           DDep.add(*CudaDeviceActions[I], *ToolChains.front(), GpuArchList[I],
@@ -3066,210 +3477,55 @@ class OffloadingActionBuilder final {
       assert(DeviceLinkerInputs.size() == GpuArchList.size() &&
              "Linker inputs and GPU arch list sizes do not match.");
 
-      // Append a new link action for each device.
+      ActionList Actions;
       unsigned I = 0;
+      // Append a new link action for each device.
+      // Each entry in DeviceLinkerInputs corresponds to a GPU arch.
       for (auto &LI : DeviceLinkerInputs) {
-        // Each entry in DeviceLinkerInputs corresponds to a GPU arch.
-        auto *DeviceLinkAction =
-            C.MakeAction<LinkJobAction>(LI, types::TY_Image);
+
+        types::ID Output = Args.hasArg(options::OPT_emit_llvm)
+                                   ? types::TY_LLVM_BC
+                                   : types::TY_Image;
+
+        auto *DeviceLinkAction = C.MakeAction<LinkJobAction>(LI, Output);
         // Linking all inputs for the current GPU arch.
         // LI contains all the inputs for the linker.
         OffloadAction::DeviceDependences DeviceLinkDeps;
         DeviceLinkDeps.add(*DeviceLinkAction, *ToolChains[0],
             GpuArchList[I], AssociatedOffloadKind);
-        AL.push_back(C.MakeAction<OffloadAction>(DeviceLinkDeps,
-            DeviceLinkAction->getType()));
+        Actions.push_back(C.MakeAction<OffloadAction>(
+            DeviceLinkDeps, DeviceLinkAction->getType()));
         ++I;
       }
       DeviceLinkerInputs.clear();
 
-      // Create a host object from all the device images by embedding them
-      // in a fat binary.
-      OffloadAction::DeviceDependences DDeps;
-      auto *TopDeviceLinkAction =
-          C.MakeAction<LinkJobAction>(AL, types::TY_Object);
-      DDeps.add(*TopDeviceLinkAction, *ToolChains[0],
-          nullptr, AssociatedOffloadKind);
-
-      // Offload the host object to the host linker.
-      AL.push_back(C.MakeAction<OffloadAction>(DDeps, TopDeviceLinkAction->getType()));
-    }
-
-    Action* appendLinkHostActions(ActionList &AL) override { return AL.back(); }
-
-    void appendLinkDependences(OffloadAction::DeviceDependences &DA) override {}
-  };
-
-  /// OpenMP action builder. The host bitcode is passed to the device frontend
-  /// and all the device linked images are passed to the host link phase.
-  class OpenMPActionBuilder final : public DeviceActionBuilder {
-    /// The OpenMP actions for the current input.
-    ActionList OpenMPDeviceActions;
-
-    /// The linker inputs obtained for each toolchain.
-    SmallVector<ActionList, 8> DeviceLinkerInputs;
-
-  public:
-    OpenMPActionBuilder(Compilation &C, DerivedArgList &Args,
-                        const Driver::InputList &Inputs)
-        : DeviceActionBuilder(C, Args, Inputs, Action::OFK_OpenMP) {}
-
-    ActionBuilderReturnCode
-    getDeviceDependences(OffloadAction::DeviceDependences &DA,
-                         phases::ID CurPhase, phases::ID FinalPhase,
-                         PhasesTy &Phases) override {
-      if (OpenMPDeviceActions.empty())
-        return ABRT_Inactive;
-
-      // We should always have an action for each input.
-      assert(OpenMPDeviceActions.size() == ToolChains.size() &&
-             "Number of OpenMP actions and toolchains do not match.");
-
-      // The host only depends on device action in the linking phase, when all
-      // the device images have to be embedded in the host image.
-      if (CurPhase == phases::Link) {
-        assert(ToolChains.size() == DeviceLinkerInputs.size() &&
-               "Toolchains and linker inputs sizes do not match.");
-        auto LI = DeviceLinkerInputs.begin();
-        for (auto *A : OpenMPDeviceActions) {
-          LI->push_back(A);
-          ++LI;
-        }
-
-        // We passed the device action as a host dependence, so we don't need to
-        // do anything else with them.
-        OpenMPDeviceActions.clear();
-        return ABRT_Success;
-      }
-
-      // By default, we produce an action for each device arch.
-      for (Action *&A : OpenMPDeviceActions)
-        A = C.getDriver().ConstructPhaseAction(C, Args, CurPhase, A);
-
-      return ABRT_Success;
-    }
-
-    ActionBuilderReturnCode addDeviceDepences(Action *HostAction) override {
-
-      // If this is an input action replicate it for each OpenMP toolchain.
-      if (auto *IA = dyn_cast<InputAction>(HostAction)) {
-        OpenMPDeviceActions.clear();
-        for (unsigned I = 0; I < ToolChains.size(); ++I)
-          OpenMPDeviceActions.push_back(
-              C.MakeAction<InputAction>(IA->getInputArg(), IA->getType()));
-        return ABRT_Success;
-      }
-
-      // If this is an unbundling action use it as is for each OpenMP toolchain.
-      if (auto *UA = dyn_cast<OffloadUnbundlingJobAction>(HostAction)) {
-        OpenMPDeviceActions.clear();
-        auto *IA = cast<InputAction>(UA->getInputs().back());
-        std::string FileName = IA->getInputArg().getAsString(Args);
-        // Check if the type of the file is the same as the action. Do not
-        // unbundle it if it is not. Do not unbundle .so files, for example,
-        // which are not object files.
-        if (IA->getType() == types::TY_Object &&
-            (!llvm::sys::path::has_extension(FileName) ||
-             types::lookupTypeForExtension(
-                 llvm::sys::path::extension(FileName).drop_front()) !=
-                 types::TY_Object))
-          return ABRT_Inactive;
-        for (unsigned I = 0; I < ToolChains.size(); ++I) {
-          OpenMPDeviceActions.push_back(UA);
-          UA->registerDependentActionInfo(
-              ToolChains[I], /*BoundArch=*/StringRef(), Action::OFK_OpenMP);
-        }
-        return ABRT_Success;
-      }
-
-      // When generating code for OpenMP we use the host compile phase result as
-      // a dependence to the device compile phase so that it can learn what
-      // declarations should be emitted. However, this is not the only use for
-      // the host action, so we prevent it from being collapsed.
-      if (isa<CompileJobAction>(HostAction)) {
-        HostAction->setCannotBeCollapsedWithNextDependentAction();
-        assert(ToolChains.size() == OpenMPDeviceActions.size() &&
-               "Toolchains and device action sizes do not match.");
-        OffloadAction::HostDependence HDep(
-            *HostAction, *C.getSingleOffloadToolChain<Action::OFK_Host>(),
-            /*BoundArch=*/nullptr, Action::OFK_OpenMP);
-        auto TC = ToolChains.begin();
-        for (Action *&A : OpenMPDeviceActions) {
-          assert(isa<CompileJobAction>(A));
-          OffloadAction::DeviceDependences DDep;
-          DDep.add(*A, **TC, /*BoundArch=*/nullptr, Action::OFK_OpenMP);
-          A = C.MakeAction<OffloadAction>(HDep, DDep);
-          ++TC;
-        }
-      }
-      return ABRT_Success;
-    }
-
-    void appendTopLevelActions(ActionList &AL) override {
-      if (OpenMPDeviceActions.empty())
-        return;
-
-      // We should always have an action for each input.
-      assert(OpenMPDeviceActions.size() == ToolChains.size() &&
-             "Number of OpenMP actions and toolchains do not match.");
-
-      // Append all device actions followed by the proper offload action.
-      auto TI = ToolChains.begin();
-      for (auto *A : OpenMPDeviceActions) {
-        OffloadAction::DeviceDependences Dep;
-        Dep.add(*A, **TI, /*BoundArch=*/nullptr, Action::OFK_OpenMP);
-        AL.push_back(C.MakeAction<OffloadAction>(Dep, A->getType()));
-        ++TI;
+      // If emitting LLVM, do not generate final host/device compilation action
+      if (Args.hasArg(options::OPT_emit_llvm)) {
+          AL.append(Actions);
+          return;
       }
-      // We no longer need the action stored in this builder.
-      OpenMPDeviceActions.clear();
-    }
 
-    void appendLinkDeviceActions(ActionList &AL) override {
-      assert(ToolChains.size() == DeviceLinkerInputs.size() &&
-             "Toolchains and linker inputs sizes do not match.");
-
-      // Append a new link action for each device.
-      auto TC = ToolChains.begin();
-      for (auto &LI : DeviceLinkerInputs) {
-        auto *DeviceLinkAction =
-            C.MakeAction<LinkJobAction>(LI, types::TY_Image);
-        OffloadAction::DeviceDependences DeviceLinkDeps;
-        DeviceLinkDeps.add(*DeviceLinkAction, **TC, /*BoundArch=*/nullptr,
-		        Action::OFK_OpenMP);
-        AL.push_back(C.MakeAction<OffloadAction>(DeviceLinkDeps,
-            DeviceLinkAction->getType()));
-        ++TC;
+      // Create a host object from all the device images by embedding them
+      // in a fat binary for mixed host-device compilation. For device-only
+      // compilation, creates a fat binary.
+      OffloadAction::DeviceDependences DDeps;
+      if (!CompileDeviceOnly || !BundleOutput || *BundleOutput) {
+        auto *TopDeviceLinkAction = C.MakeAction<LinkJobAction>(
+            Actions,
+            CompileDeviceOnly ? types::TY_HIP_FATBIN : types::TY_Object);
+        DDeps.add(*TopDeviceLinkAction, *ToolChains[0], nullptr,
+                  AssociatedOffloadKind);
+        // Offload the host object to the host linker.
+        AL.push_back(
+            C.MakeAction<OffloadAction>(DDeps, TopDeviceLinkAction->getType()));
+      } else {
+        AL.append(Actions);
       }
-      DeviceLinkerInputs.clear();
     }
 
-    Action* appendLinkHostActions(ActionList &AL) override {
-      // Create wrapper bitcode from the result of device link actions and compile
-      // it to an object which will be added to the host link command.
-      auto *BC = C.MakeAction<OffloadWrapperJobAction>(AL, types::TY_LLVM_BC);
-      auto *ASM = C.MakeAction<BackendJobAction>(BC, types::TY_PP_Asm);
-      return C.MakeAction<AssembleJobAction>(ASM, types::TY_Object);
-    }
+    Action* appendLinkHostActions(ActionList &AL) override { return AL.back(); }
 
     void appendLinkDependences(OffloadAction::DeviceDependences &DA) override {}
-
-    bool initialize() override {
-      // Get the OpenMP toolchains. If we don't get any, the action builder will
-      // know there is nothing to do related to OpenMP offloading.
-      auto OpenMPTCRange = C.getOffloadToolChains<Action::OFK_OpenMP>();
-      for (auto TI = OpenMPTCRange.first, TE = OpenMPTCRange.second; TI != TE;
-           ++TI)
-        ToolChains.push_back(TI->second);
-
-      DeviceLinkerInputs.resize(ToolChains.size());
-      return false;
-    }
-
-    bool canUseBundlerUnbundler() const override {
-      // OpenMP should use bundled files whenever possible.
-      return true;
-    }
   };
 
   ///
@@ -3296,9 +3552,6 @@ public:
     // Create a specialized builder for HIP.
     SpecializedBuilders.push_back(new HIPActionBuilder(C, Args, Inputs));
 
-    // Create a specialized builder for OpenMP.
-    SpecializedBuilders.push_back(new OpenMPActionBuilder(C, Args, Inputs));
-
     //
     // TODO: Build other specialized builders here.
     //
@@ -3326,6 +3579,17 @@ public:
       delete SB;
   }
 
+  /// Record a host action and its originating input argument.
+  void recordHostAction(Action *HostAction, const Arg *InputArg) {
+    assert(HostAction && "Invalid host action");
+    assert(InputArg && "Invalid input argument");
+    auto Loc = HostActionToInputArgMap.find(HostAction);
+    if (Loc == HostActionToInputArgMap.end())
+      HostActionToInputArgMap[HostAction] = InputArg;
+    assert(HostActionToInputArgMap[HostAction] == InputArg &&
+           "host action mapped to multiple input arguments");
+  }
+
   /// Generate an action that adds device dependences (if any) to a host action.
   /// If no device dependence actions exist, just return the host action \a
   /// HostAction. If an error is found or if no builder requires the host action
@@ -3341,6 +3605,7 @@ public:
       return HostAction;
 
     assert(HostAction && "Invalid host action!");
+    recordHostAction(HostAction, InputArg);
 
     OffloadAction::DeviceDependences DDeps;
     // Check if all the programming models agree we should not emit the host
@@ -3394,6 +3659,8 @@ public:
     if (!IsValid)
       return true;
 
+    recordHostAction(HostAction, InputArg);
+
     // If we are supporting bundling/unbundling and the current action is an
     // input action of non-source file, we replace the host action by the
     // unbundling action. The bundler tool has the logic to detect if an input
@@ -3410,6 +3677,7 @@ public:
           C.getSingleOffloadToolChain<Action::OFK_Host>(),
           /*BoundArch=*/StringRef(), Action::OFK_Host);
       HostAction = UnbundlingHostAction;
+      recordHostAction(HostAction, InputArg);
     }
 
     assert(HostAction && "Invalid host action!");
@@ -3420,7 +3688,7 @@ public:
       if (!SB->isValid())
         continue;
 
-      auto RetCode = SB->addDeviceDepences(HostAction);
+      auto RetCode = SB->addDeviceDependences(HostAction);
 
       // Host dependences for device actions are not compatible with that same
       // action being ignored.
@@ -3446,6 +3714,9 @@ public:
   /// programming models allow it.
   bool appendTopLevelActions(ActionList &AL, Action *HostAction,
                              const Arg *InputArg) {
+    if (HostAction)
+      recordHostAction(HostAction, InputArg);
+
     // Get the device actions to be appended.
     ActionList OffloadAL;
     for (auto *SB : SpecializedBuilders) {
@@ -3467,6 +3738,7 @@ public:
       // before this method was called.
       assert(HostAction == AL.back() && "Host action not in the list??");
       HostAction = C.MakeAction<OffloadBundlingJobAction>(OffloadAL);
+      recordHostAction(HostAction, InputArg);
       AL.back() = HostAction;
     } else
       AL.append(OffloadAL.begin(), OffloadAL.end());
@@ -3479,15 +3751,18 @@ public:
     return false;
   }
 
-  Action* makeHostLinkAction() {
-    // Build a list of device linking actions.
-    ActionList DeviceAL;
+  void appendDeviceLinkActions(ActionList &AL) {
     for (DeviceActionBuilder *SB : SpecializedBuilders) {
       if (!SB->isValid())
         continue;
-      SB->appendLinkDeviceActions(DeviceAL);
+      SB->appendLinkDeviceActions(AL);
     }
+  }
 
+  Action *makeHostLinkAction() {
+    // Build a list of device linking actions.
+    ActionList DeviceAL;
+    appendDeviceLinkActions(DeviceAL);
     if (DeviceAL.empty())
       return nullptr;
 
@@ -3497,6 +3772,11 @@ public:
       if (!SB->isValid())
         continue;
       HA = SB->appendLinkHostActions(DeviceAL);
+      // This created host action has no originating input argument, therefore
+      // needs to set its offloading kind directly.
+      if (HA)
+        HA->propagateHostOffloadInfo(SB->getAssociatedOffloadKind(),
+                                     /*BoundArch=*/nullptr);
     }
     return HA;
   }
@@ -3523,10 +3803,22 @@ public:
     // If we don't have device dependencies, we don't have to create an offload
     // action.
     if (DDeps.getActions().empty()) {
-      // Propagate all the active kinds to host action. Given that it is a link
-      // action it is assumed to depend on all actions generated so far.
-      HostAction->propagateHostOffloadInfo(ActiveOffloadKinds,
-                                           /*BoundArch=*/nullptr);
+      // Set all the active offloading kinds to the link action. Given that it
+      // is a link action it is assumed to depend on all actions generated so
+      // far.
+      HostAction->setHostOffloadInfo(ActiveOffloadKinds,
+                                     /*BoundArch=*/nullptr);
+      // Propagate active offloading kinds for each input to the link action.
+      // Each input may have different active offloading kind.
+      for (auto *A : HostAction->inputs()) {
+        auto ArgLoc = HostActionToInputArgMap.find(A);
+        if (ArgLoc == HostActionToInputArgMap.end())
+          continue;
+        auto OFKLoc = InputArgToOffloadKindMap.find(ArgLoc->second);
+        if (OFKLoc == InputArgToOffloadKindMap.end())
+          continue;
+        A->propagateHostOffloadInfo(OFKLoc->second, /*BoundArch=*/nullptr);
+      }
       return HostAction;
     }
 
@@ -3564,7 +3856,8 @@ void Driver::handleArguments(Compilation &C, DerivedArgList &Args,
   phases::ID FinalPhase = getFinalPhase(Args, &FinalPhaseArg);
 
   if (FinalPhase == phases::Link) {
-    if (Args.hasArg(options::OPT_emit_llvm))
+    // Emitting LLVM while linking disabled except in HIPAMD Toolchain
+    if (Args.hasArg(options::OPT_emit_llvm) && !Args.hasArg(options::OPT_hip_link))
       Diag(clang::diag::err_drv_emit_llvm_link);
     if (IsCLMode() && LTOMode != LTOK_None &&
         !Args.getLastArgValue(options::OPT_fuse_ld_EQ)
@@ -3665,11 +3958,6 @@ void Driver::BuildActions(Compilation &C, DerivedArgList &Args,
     return;
   }
 
-  // Reject -Z* at the top level, these options should never have been exposed
-  // by gcc.
-  if (Arg *A = Args.getLastArg(options::OPT_Z_Joined))
-    Diag(clang::diag::err_drv_use_of_Z_option) << A->getAsString(Args);
-
   // Diagnose misuse of /Fo.
   if (Arg *A = Args.getLastArg(options::OPT__SLASH_Fo)) {
     StringRef V = A->getValue();
@@ -3705,11 +3993,19 @@ void Driver::BuildActions(Compilation &C, DerivedArgList &Args,
 
   handleArguments(C, Args, Inputs, Actions);
 
+  bool UseNewOffloadingDriver =
+      C.isOffloadingHostKind(Action::OFK_OpenMP) ||
+      Args.hasFlag(options::OPT_offload_new_driver,
+                   options::OPT_no_offload_new_driver, false);
+
   // Builder to be used to build offloading actions.
-  OffloadingActionBuilder OffloadBuilder(C, Args, Inputs);
+  std::unique_ptr<OffloadingActionBuilder> OffloadBuilder =
+      !UseNewOffloadingDriver
+          ? std::make_unique<OffloadingActionBuilder>(C, Args, Inputs)
+          : nullptr;
 
   // Construct the actions to perform.
-  HeaderModulePrecompileJobAction *HeaderModuleAction = nullptr;
+  ExtractAPIJobAction *ExtractAPIAction = nullptr;
   ActionList LinkerInputs;
   ActionList MergerInputs;
 
@@ -3728,21 +4024,26 @@ void Driver::BuildActions(Compilation &C, DerivedArgList &Args,
 
     // Use the current host action in any of the offloading actions, if
     // required.
-    if (OffloadBuilder.addHostDependenceToDeviceActions(Current, InputArg))
-      break;
+    if (!UseNewOffloadingDriver)
+      if (OffloadBuilder->addHostDependenceToDeviceActions(Current, InputArg))
+        break;
 
     for (phases::ID Phase : PL) {
 
       // Add any offload action the host action depends on.
-      Current = OffloadBuilder.addDeviceDependencesToHostAction(
-          Current, InputArg, Phase, PL.back(), FullPL);
+      if (!UseNewOffloadingDriver)
+        Current = OffloadBuilder->addDeviceDependencesToHostAction(
+            Current, InputArg, Phase, PL.back(), FullPL);
       if (!Current)
         break;
 
       // Queue linker inputs.
       if (Phase == phases::Link) {
         assert(Phase == PL.back() && "linking must be final compilation step.");
-        LinkerInputs.push_back(Current);
+        // We don't need to generate additional link commands if emitting AMD bitcode
+        if (!(C.getInputArgs().hasArg(options::OPT_hip_link) &&
+             (C.getInputArgs().hasArg(options::OPT_emit_llvm))))
+          LinkerInputs.push_back(Current);
         Current = nullptr;
         break;
       }
@@ -3758,12 +4059,8 @@ void Driver::BuildActions(Compilation &C, DerivedArgList &Args,
         break;
       }
 
-      // Each precompiled header file after a module file action is a module
-      // header of that same module file, rather than being compiled to a
-      // separate PCH.
-      if (Phase == phases::Precompile && HeaderModuleAction &&
-          getPrecompiledType(InputType) == types::TY_PCH) {
-        HeaderModuleAction->addModuleHeaderInput(Current);
+      if (Phase == phases::Precompile && ExtractAPIAction) {
+        ExtractAPIAction->addHeaderInput(Current);
         Current = nullptr;
         break;
       }
@@ -3778,15 +4075,21 @@ void Driver::BuildActions(Compilation &C, DerivedArgList &Args,
       if (NewCurrent == Current)
         continue;
 
-      if (auto *HMA = dyn_cast<HeaderModulePrecompileJobAction>(NewCurrent))
-        HeaderModuleAction = HMA;
+      if (auto *EAA = dyn_cast<ExtractAPIJobAction>(NewCurrent))
+        ExtractAPIAction = EAA;
 
       Current = NewCurrent;
 
       // Use the current host action in any of the offloading actions, if
       // required.
-      if (OffloadBuilder.addHostDependenceToDeviceActions(Current, InputArg))
-        break;
+      if (!UseNewOffloadingDriver)
+        if (OffloadBuilder->addHostDependenceToDeviceActions(Current, InputArg))
+          break;
+
+      // Try to build the offloading actions and add the result as a dependency
+      // to the host.
+      if (UseNewOffloadingDriver)
+        Current = BuildOffloadingActions(C, Args, I, Current);
 
       if (Current->getType() == types::TY_Nothing)
         break;
@@ -3797,21 +4100,40 @@ void Driver::BuildActions(Compilation &C, DerivedArgList &Args,
       Actions.push_back(Current);
 
     // Add any top level actions generated for offloading.
-    OffloadBuilder.appendTopLevelActions(Actions, Current, InputArg);
+    if (!UseNewOffloadingDriver)
+      OffloadBuilder->appendTopLevelActions(Actions, Current, InputArg);
+    else if (Current)
+      Current->propagateHostOffloadInfo(C.getActiveOffloadKinds(),
+                                        /*BoundArch=*/nullptr);
   }
 
   // Add a link action if necessary.
+
+  if (LinkerInputs.empty()) {
+    Arg *FinalPhaseArg;
+    if (getFinalPhase(Args, &FinalPhaseArg) == phases::Link)
+      if (!UseNewOffloadingDriver)
+        OffloadBuilder->appendDeviceLinkActions(Actions);
+  }
+
   if (!LinkerInputs.empty()) {
-    if (Action *Wrapper = OffloadBuilder.makeHostLinkAction())
-      LinkerInputs.push_back(Wrapper);
+    if (!UseNewOffloadingDriver)
+      if (Action *Wrapper = OffloadBuilder->makeHostLinkAction())
+        LinkerInputs.push_back(Wrapper);
     Action *LA;
     // Check if this Linker Job should emit a static library.
     if (ShouldEmitStaticLibrary(Args)) {
       LA = C.MakeAction<StaticLibJobAction>(LinkerInputs, types::TY_Image);
+    } else if (UseNewOffloadingDriver ||
+               Args.hasArg(options::OPT_offload_link)) {
+      LA = C.MakeAction<LinkerWrapperJobAction>(LinkerInputs, types::TY_Image);
+      LA->propagateHostOffloadInfo(C.getActiveOffloadKinds(),
+                                   /*BoundArch=*/nullptr);
     } else {
       LA = C.MakeAction<LinkJobAction>(LinkerInputs, types::TY_Image);
     }
-    LA = OffloadBuilder.processHostLinkAction(LA);
+    if (!UseNewOffloadingDriver)
+      LA = OffloadBuilder->processHostLinkAction(LA);
     Actions.push_back(LA);
   }
 
@@ -3823,7 +4145,7 @@ void Driver::BuildActions(Compilation &C, DerivedArgList &Args,
   if (Args.hasArg(options::OPT_emit_interface_stubs)) {
     auto PhaseList = types::getCompilationPhases(
         types::TY_IFS_CPP,
-        Args.hasArg(options::OPT_c) ? phases::Compile : phases::LastPhase);
+        Args.hasArg(options::OPT_c) ? phases::Compile : phases::IfsMerge);
 
     ActionList MergerInputs;
 
@@ -3890,11 +4212,315 @@ void Driver::BuildActions(Compilation &C, DerivedArgList &Args,
 
   // Claim ignored clang-cl options.
   Args.ClaimAllArgs(options::OPT_cl_ignored_Group);
+}
+
+/// Returns the canonical name for the offloading architecture when using a HIP
+/// or CUDA architecture.
+static StringRef getCanonicalArchString(Compilation &C,
+                                        const llvm::opt::DerivedArgList &Args,
+                                        StringRef ArchStr,
+                                        const llvm::Triple &Triple,
+                                        bool SuppressError = false) {
+  // Lookup the CUDA / HIP architecture string. Only report an error if we were
+  // expecting the triple to be only NVPTX / AMDGPU.
+  CudaArch Arch = StringToCudaArch(getProcessorFromTargetID(Triple, ArchStr));
+  if (!SuppressError && Triple.isNVPTX() &&
+      (Arch == CudaArch::UNKNOWN || !IsNVIDIAGpuArch(Arch))) {
+    C.getDriver().Diag(clang::diag::err_drv_offload_bad_gpu_arch)
+        << "CUDA" << ArchStr;
+    return StringRef();
+  } else if (!SuppressError && Triple.isAMDGPU() &&
+             (Arch == CudaArch::UNKNOWN || !IsAMDGpuArch(Arch))) {
+    C.getDriver().Diag(clang::diag::err_drv_offload_bad_gpu_arch)
+        << "HIP" << ArchStr;
+    return StringRef();
+  }
+
+  if (IsNVIDIAGpuArch(Arch))
+    return Args.MakeArgStringRef(CudaArchToString(Arch));
+
+  if (IsAMDGpuArch(Arch)) {
+    llvm::StringMap<bool> Features;
+    auto HIPTriple = getHIPOffloadTargetTriple(C.getDriver(), C.getInputArgs());
+    if (!HIPTriple)
+      return StringRef();
+    auto Arch = parseTargetID(*HIPTriple, ArchStr, &Features);
+    if (!Arch) {
+      C.getDriver().Diag(clang::diag::err_drv_bad_target_id) << ArchStr;
+      C.setContainsError();
+      return StringRef();
+    }
+    return Args.MakeArgStringRef(getCanonicalTargetID(*Arch, Features));
+  }
+
+  // If the input isn't CUDA or HIP just return the architecture.
+  return ArchStr;
+}
+
+/// Checks if the set offloading architectures does not conflict. Returns the
+/// incompatible pair if a conflict occurs.
+static std::optional<std::pair<llvm::StringRef, llvm::StringRef>>
+getConflictOffloadArchCombination(const llvm::DenseSet<StringRef> &Archs,
+                                  Action::OffloadKind Kind) {
+  if (Kind != Action::OFK_HIP)
+    return std::nullopt;
+
+  std::set<StringRef> ArchSet;
+  llvm::copy(Archs, std::inserter(ArchSet, ArchSet.begin()));
+  return getConflictTargetIDCombination(ArchSet);
+}
+
+llvm::DenseSet<StringRef>
+Driver::getOffloadArchs(Compilation &C, const llvm::opt::DerivedArgList &Args,
+                        Action::OffloadKind Kind, const ToolChain *TC,
+                        bool SuppressError) const {
+  if (!TC)
+    TC = &C.getDefaultToolChain();
+
+  // --offload and --offload-arch options are mutually exclusive.
+  if (Args.hasArgNoClaim(options::OPT_offload_EQ) &&
+      Args.hasArgNoClaim(options::OPT_offload_arch_EQ,
+                         options::OPT_no_offload_arch_EQ)) {
+    C.getDriver().Diag(diag::err_opt_not_valid_with_opt)
+        << "--offload"
+        << (Args.hasArgNoClaim(options::OPT_offload_arch_EQ)
+                ? "--offload-arch"
+                : "--no-offload-arch");
+  }
+
+  if (KnownArchs.find(TC) != KnownArchs.end())
+    return KnownArchs.lookup(TC);
+
+  llvm::DenseSet<StringRef> Archs;
+  for (auto *Arg : Args) {
+    // Extract any '--[no-]offload-arch' arguments intended for this toolchain.
+    std::unique_ptr<llvm::opt::Arg> ExtractedArg = nullptr;
+    if (Arg->getOption().matches(options::OPT_Xopenmp_target_EQ) &&
+        ToolChain::getOpenMPTriple(Arg->getValue(0)) == TC->getTriple()) {
+      Arg->claim();
+      unsigned Index = Args.getBaseArgs().MakeIndex(Arg->getValue(1));
+      ExtractedArg = getOpts().ParseOneArg(Args, Index);
+      Arg = ExtractedArg.get();
+    }
+
+    // Add or remove the seen architectures in order of appearance. If an
+    // invalid architecture is given we simply exit.
+    if (Arg->getOption().matches(options::OPT_offload_arch_EQ)) {
+      for (StringRef Arch : llvm::split(Arg->getValue(), ",")) {
+        if (Arch == "native" || Arch.empty()) {
+          auto GPUsOrErr = TC->getSystemGPUArchs(Args);
+          if (!GPUsOrErr) {
+            if (SuppressError)
+              llvm::consumeError(GPUsOrErr.takeError());
+            else
+              TC->getDriver().Diag(diag::err_drv_undetermined_gpu_arch)
+                  << llvm::Triple::getArchTypeName(TC->getArch())
+                  << llvm::toString(GPUsOrErr.takeError()) << "--offload-arch";
+            continue;
+          }
+
+          for (auto ArchStr : *GPUsOrErr) {
+            Archs.insert(
+                getCanonicalArchString(C, Args, Args.MakeArgString(ArchStr),
+                                       TC->getTriple(), SuppressError));
+          }
+        } else {
+          StringRef ArchStr = getCanonicalArchString(
+              C, Args, Arch, TC->getTriple(), SuppressError);
+          if (ArchStr.empty())
+            return Archs;
+          Archs.insert(ArchStr);
+        }
+      }
+    } else if (Arg->getOption().matches(options::OPT_no_offload_arch_EQ)) {
+      for (StringRef Arch : llvm::split(Arg->getValue(), ",")) {
+        if (Arch == "all") {
+          Archs.clear();
+        } else {
+          StringRef ArchStr = getCanonicalArchString(
+              C, Args, Arch, TC->getTriple(), SuppressError);
+          if (ArchStr.empty())
+            return Archs;
+          Archs.erase(ArchStr);
+        }
+      }
+    }
+  }
+
+  if (auto ConflictingArchs = getConflictOffloadArchCombination(Archs, Kind)) {
+    C.getDriver().Diag(clang::diag::err_drv_bad_offload_arch_combo)
+        << ConflictingArchs->first << ConflictingArchs->second;
+    C.setContainsError();
+  }
+
+  // Skip filling defaults if we're just querying what is availible.
+  if (SuppressError)
+    return Archs;
+
+  if (Archs.empty()) {
+    if (Kind == Action::OFK_Cuda)
+      Archs.insert(CudaArchToString(CudaArch::CudaDefault));
+    else if (Kind == Action::OFK_HIP)
+      Archs.insert(CudaArchToString(CudaArch::HIPDefault));
+    else if (Kind == Action::OFK_OpenMP)
+      Archs.insert(StringRef());
+  } else {
+    Args.ClaimAllArgs(options::OPT_offload_arch_EQ);
+    Args.ClaimAllArgs(options::OPT_no_offload_arch_EQ);
+  }
+
+  return Archs;
+}
+
+Action *Driver::BuildOffloadingActions(Compilation &C,
+                                       llvm::opt::DerivedArgList &Args,
+                                       const InputTy &Input,
+                                       Action *HostAction) const {
+  // Don't build offloading actions if explicitly disabled or we do not have a
+  // valid source input and compile action to embed it in. If preprocessing only
+  // ignore embedding.
+  if (offloadHostOnly() || !types::isSrcFile(Input.first) ||
+      !(isa<CompileJobAction>(HostAction) ||
+        getFinalPhase(Args) == phases::Preprocess))
+    return HostAction;
+
+  ActionList OffloadActions;
+  OffloadAction::DeviceDependences DDeps;
+
+  const Action::OffloadKind OffloadKinds[] = {
+      Action::OFK_OpenMP, Action::OFK_Cuda, Action::OFK_HIP};
+
+  for (Action::OffloadKind Kind : OffloadKinds) {
+    SmallVector<const ToolChain *, 2> ToolChains;
+    ActionList DeviceActions;
+
+    auto TCRange = C.getOffloadToolChains(Kind);
+    for (auto TI = TCRange.first, TE = TCRange.second; TI != TE; ++TI)
+      ToolChains.push_back(TI->second);
+
+    if (ToolChains.empty())
+      continue;
+
+    types::ID InputType = Input.first;
+    const Arg *InputArg = Input.second;
+
+    // The toolchain can be active for unsupported file types.
+    if ((Kind == Action::OFK_Cuda && !types::isCuda(InputType)) ||
+        (Kind == Action::OFK_HIP && !types::isHIP(InputType)))
+      continue;
+
+    // Get the product of all bound architectures and toolchains.
+    SmallVector<std::pair<const ToolChain *, StringRef>> TCAndArchs;
+    for (const ToolChain *TC : ToolChains)
+      for (StringRef Arch : getOffloadArchs(C, Args, Kind, TC))
+        TCAndArchs.push_back(std::make_pair(TC, Arch));
+
+    for (unsigned I = 0, E = TCAndArchs.size(); I != E; ++I)
+      DeviceActions.push_back(C.MakeAction<InputAction>(*InputArg, InputType));
+
+    if (DeviceActions.empty())
+      return HostAction;
+
+    auto PL = types::getCompilationPhases(*this, Args, InputType);
+
+    for (phases::ID Phase : PL) {
+      if (Phase == phases::Link) {
+        assert(Phase == PL.back() && "linking must be final compilation step.");
+        break;
+      }
+
+      auto TCAndArch = TCAndArchs.begin();
+      for (Action *&A : DeviceActions) {
+        if (A->getType() == types::TY_Nothing)
+          continue;
+
+        // Propagate the ToolChain so we can use it in ConstructPhaseAction.
+        A->propagateDeviceOffloadInfo(Kind, TCAndArch->second.data(),
+                                      TCAndArch->first);
+        A = ConstructPhaseAction(C, Args, Phase, A, Kind);
+
+        if (isa<CompileJobAction>(A) && isa<CompileJobAction>(HostAction) &&
+            Kind == Action::OFK_OpenMP &&
+            HostAction->getType() != types::TY_Nothing) {
+          // OpenMP offloading has a dependency on the host compile action to
+          // identify which declarations need to be emitted. This shouldn't be
+          // collapsed with any other actions so we can use it in the device.
+          HostAction->setCannotBeCollapsedWithNextDependentAction();
+          OffloadAction::HostDependence HDep(
+              *HostAction, *C.getSingleOffloadToolChain<Action::OFK_Host>(),
+              TCAndArch->second.data(), Kind);
+          OffloadAction::DeviceDependences DDep;
+          DDep.add(*A, *TCAndArch->first, TCAndArch->second.data(), Kind);
+          A = C.MakeAction<OffloadAction>(HDep, DDep);
+        }
+
+        ++TCAndArch;
+      }
+    }
+
+    // Compiling HIP in non-RDC mode requires linking each action individually.
+    for (Action *&A : DeviceActions) {
+      if ((A->getType() != types::TY_Object &&
+           A->getType() != types::TY_LTO_BC) ||
+          Kind != Action::OFK_HIP ||
+          Args.hasFlag(options::OPT_fgpu_rdc, options::OPT_fno_gpu_rdc, false))
+        continue;
+      ActionList LinkerInput = {A};
+      A = C.MakeAction<LinkJobAction>(LinkerInput, types::TY_Image);
+    }
+
+    auto TCAndArch = TCAndArchs.begin();
+    for (Action *A : DeviceActions) {
+      DDeps.add(*A, *TCAndArch->first, TCAndArch->second.data(), Kind);
+      OffloadAction::DeviceDependences DDep;
+      DDep.add(*A, *TCAndArch->first, TCAndArch->second.data(), Kind);
+      OffloadActions.push_back(C.MakeAction<OffloadAction>(DDep, A->getType()));
+      ++TCAndArch;
+    }
+  }
 
-  // Claim --cuda-host-only and --cuda-compile-host-device, which may be passed
-  // to non-CUDA compilations and should not trigger warnings there.
-  Args.ClaimAllArgs(options::OPT_cuda_host_only);
-  Args.ClaimAllArgs(options::OPT_cuda_compile_host_device);
+  if (offloadDeviceOnly())
+    return C.MakeAction<OffloadAction>(DDeps, types::TY_Nothing);
+
+  if (OffloadActions.empty())
+    return HostAction;
+
+  OffloadAction::DeviceDependences DDep;
+  if (C.isOffloadingHostKind(Action::OFK_Cuda) &&
+      !Args.hasFlag(options::OPT_fgpu_rdc, options::OPT_fno_gpu_rdc, false)) {
+    // If we are not in RDC-mode we just emit the final CUDA fatbinary for
+    // each translation unit without requiring any linking.
+    Action *FatbinAction =
+        C.MakeAction<LinkJobAction>(OffloadActions, types::TY_CUDA_FATBIN);
+    DDep.add(*FatbinAction, *C.getSingleOffloadToolChain<Action::OFK_Cuda>(),
+             nullptr, Action::OFK_Cuda);
+  } else if (C.isOffloadingHostKind(Action::OFK_HIP) &&
+             !Args.hasFlag(options::OPT_fgpu_rdc, options::OPT_fno_gpu_rdc,
+                           false)) {
+    // If we are not in RDC-mode we just emit the final HIP fatbinary for each
+    // translation unit, linking each input individually.
+    Action *FatbinAction =
+        C.MakeAction<LinkJobAction>(OffloadActions, types::TY_HIP_FATBIN);
+    DDep.add(*FatbinAction, *C.getSingleOffloadToolChain<Action::OFK_HIP>(),
+             nullptr, Action::OFK_HIP);
+  } else {
+    // Package all the offloading actions into a single output that can be
+    // embedded in the host and linked.
+    Action *PackagerAction =
+        C.MakeAction<OffloadPackagerJobAction>(OffloadActions, types::TY_Image);
+    DDep.add(*PackagerAction, *C.getSingleOffloadToolChain<Action::OFK_Host>(),
+             nullptr, C.getActiveOffloadKinds());
+  }
+
+  // If we are unable to embed a single device output into the host, we need to
+  // add each device output as a host dependency to ensure they are still built.
+  bool SingleDeviceOutput = !llvm::any_of(OffloadActions, [](Action *A) {
+    return A->getType() == types::TY_Nothing;
+  }) && isa<CompileJobAction>(HostAction);
+  OffloadAction::HostDependence HDep(
+      *HostAction, *C.getSingleOffloadToolChain<Action::OFK_Host>(),
+      /*BoundArch=*/nullptr, SingleDeviceOutput ? DDep : DDeps);
+  return C.MakeAction<OffloadAction>(HDep, SingleDeviceOutput ? DDep : DDeps);
 }
 
 Action *Driver::ConstructPhaseAction(
@@ -3923,10 +4549,14 @@ Action *Driver::ConstructPhaseAction(
       OutputTy = types::TY_Dependencies;
     } else {
       OutputTy = Input->getType();
+      // For these cases, the preprocessor is only translating forms, the Output
+      // still needs preprocessing.
       if (!Args.hasFlag(options::OPT_frewrite_includes,
                         options::OPT_fno_rewrite_includes, false) &&
           !Args.hasFlag(options::OPT_frewrite_imports,
                         options::OPT_fno_rewrite_imports, false) &&
+          !Args.hasFlag(options::OPT_fdirectives_only,
+                        options::OPT_fno_directives_only, false) &&
           !CCGenDiagnostics)
         OutputTy = types::getPreprocessedType(OutputTy);
       assert(OutputTy != types::TY_INVALID &&
@@ -3935,6 +4565,10 @@ Action *Driver::ConstructPhaseAction(
     return C.MakeAction<PreprocessJobAction>(Input, OutputTy);
   }
   case phases::Precompile: {
+    // API extraction should not generate an actual precompilation action.
+    if (Args.hasArg(options::OPT_extract_api))
+      return C.MakeAction<ExtractAPIJobAction>(Input, types::TY_API_INFO);
+
     types::ID OutputTy = getPrecompiledType(Input->getType());
     assert(OutputTy != types::TY_INVALID &&
            "Cannot precompile this input type!");
@@ -3954,9 +4588,6 @@ Action *Driver::ConstructPhaseAction(
       OutputTy = types::TY_Nothing;
     }
 
-    if (ModName)
-      return C.MakeAction<HeaderModulePrecompileJobAction>(Input, OutputTy,
-                                                           ModName);
     return C.MakeAction<PrecompileJobAction>(Input, OutputTy);
   }
   case phases::Compile: {
@@ -3977,6 +4608,8 @@ Action *Driver::ConstructPhaseAction(
       return C.MakeAction<CompileJobAction>(Input, types::TY_ModuleFile);
     if (Args.hasArg(options::OPT_verify_pch))
       return C.MakeAction<VerifyPCHJobAction>(Input, types::TY_Nothing);
+    if (Args.hasArg(options::OPT_extract_api))
+      return C.MakeAction<ExtractAPIJobAction>(Input, types::TY_API_INFO);
     return C.MakeAction<CompileJobAction>(Input, types::TY_LLVM_BC);
   }
   case phases::Backend: {
@@ -3985,12 +4618,28 @@ Action *Driver::ConstructPhaseAction(
           Args.hasArg(options::OPT_S) ? types::TY_LTO_IR : types::TY_LTO_BC;
       return C.MakeAction<BackendJobAction>(Input, Output);
     }
+    if (isUsingLTO(/* IsOffload */ true) &&
+        TargetDeviceOffloadKind != Action::OFK_None) {
+      types::ID Output =
+          Args.hasArg(options::OPT_S) ? types::TY_LTO_IR : types::TY_LTO_BC;
+      return C.MakeAction<BackendJobAction>(Input, Output);
+    }
     if (Args.hasArg(options::OPT_emit_llvm) ||
-        (TargetDeviceOffloadKind == Action::OFK_HIP &&
-         Args.hasFlag(options::OPT_fgpu_rdc, options::OPT_fno_gpu_rdc,
-                      false))) {
+        (((Input->getOffloadingToolChain() &&
+           Input->getOffloadingToolChain()->getTriple().isAMDGPU()) ||
+          TargetDeviceOffloadKind == Action::OFK_HIP) &&
+         (Args.hasFlag(options::OPT_fgpu_rdc, options::OPT_fno_gpu_rdc,
+                       false) ||
+          TargetDeviceOffloadKind == Action::OFK_OpenMP))) {
       types::ID Output =
-          Args.hasArg(options::OPT_S) ? types::TY_LLVM_IR : types::TY_LLVM_BC;
+          Args.hasArg(options::OPT_S) &&
+                  (TargetDeviceOffloadKind == Action::OFK_None ||
+                   offloadDeviceOnly() ||
+                   (TargetDeviceOffloadKind == Action::OFK_HIP &&
+                    !Args.hasFlag(options::OPT_offload_new_driver,
+                                  options::OPT_no_offload_new_driver, false)))
+              ? types::TY_LLVM_IR
+              : types::TY_LLVM_BC;
       return C.MakeAction<BackendJobAction>(Input, Output);
     }
     return C.MakeAction<BackendJobAction>(Input, types::TY_PP_Asm);
@@ -4020,10 +4669,14 @@ void Driver::BuildJobs(Compilation &C) const {
   // we are also generating .o files. So we allow more than one output file in
   // this case as well.
   //
+  // OffloadClass of type TY_Nothing: device-only output will place many outputs
+  // into a single offloading action. We should count all inputs to the action
+  // as outputs. Also ignore device-only outputs if we're compiling with
+  // -fsyntax-only.
   if (FinalOutput) {
     unsigned NumOutputs = 0;
     unsigned NumIfsOutputs = 0;
-    for (const Action *A : C.getActions())
+    for (const Action *A : C.getActions()) {
       if (A->getType() != types::TY_Nothing &&
           !(A->getKind() == Action::IfsMergeJobClass ||
             (A->getType() == clang::driver::types::TY_IFS_CPP &&
@@ -4032,6 +4685,11 @@ void Driver::BuildJobs(Compilation &C) const {
             (A->getKind() == Action::BindArchClass && A->getInputs().size() &&
              A->getInputs().front()->getKind() == Action::IfsMergeJobClass)))
         ++NumOutputs;
+      else if (A->getKind() == Action::OffloadClass &&
+               A->getType() == types::TY_Nothing &&
+               !C.getArgs().hasArg(options::OPT_fsyntax_only))
+        NumOutputs += A->size();
+    }
 
     if (NumOutputs > 1) {
       Diag(clang::diag::err_drv_output_argument_with_multiple_files);
@@ -4056,7 +4714,7 @@ void Driver::BuildJobs(Compilation &C) const {
         ArchNames.insert(A->getValue());
 
   // Set of (Action, canonical ToolChain triple) pairs we've built jobs for.
-  std::map<std::pair<const Action *, std::string>, InputInfo> CachedResults;
+  std::map<std::pair<const Action *, std::string>, InputInfoList> CachedResults;
   for (Action *A : C.getActions()) {
     // If we are linking an image for multiple archs then the linker wants
     // -arch_multiple and -final_output <final image name>. Unfortunately, this
@@ -4088,7 +4746,7 @@ void Driver::BuildJobs(Compilation &C) const {
 
   if (CCPrintProcessStats) {
     C.setPostCallback([=](const Command &Cmd, int Res) {
-      Optional<llvm::sys::ProcessStatistics> ProcStat =
+      std::optional<llvm::sys::ProcessStatistics> ProcStat =
           Cmd.getProcessStatistics();
       if (!ProcStat)
         return;
@@ -4124,7 +4782,7 @@ void Driver::BuildJobs(Compilation &C) const {
             << '\n';
         Out.flush();
         std::error_code EC;
-        llvm::raw_fd_ostream OS(CCPrintStatReportFilename.c_str(), EC,
+        llvm::raw_fd_ostream OS(CCPrintStatReportFilename, EC,
                                 llvm::sys::fs::OF_Append |
                                     llvm::sys::fs::OF_Text);
         if (EC)
@@ -4148,6 +4806,8 @@ void Driver::BuildJobs(Compilation &C) const {
       C.getArgs().hasArg(options::OPT_Qunused_arguments))
     return;
 
+  // Claim -fdriver-only here.
+  (void)C.getArgs().hasArg(options::OPT_fdriver_only);
   // Claim -### here.
   (void)C.getArgs().hasArg(options::OPT__HASH_HASH_HASH);
 
@@ -4316,6 +4976,12 @@ class ToolSelector final {
     if (!T)
       return nullptr;
 
+    // Can't collapse if we don't have codegen support unless we are
+    // emitting LLVM IR.
+    bool OutputIsLLVM = types::isLLVMIR(ActionInfo[0].JA->getType());
+    if (!T->hasIntegratedBackend() && !(OutputIsLLVM && T->canEmitIR()))
+      return nullptr;
+
     // When using -fembed-bitcode, it is required to have the same tool (clang)
     // for both CompilerJA and BackendJA. Otherwise, combine two stages.
     if (EmbedBitcode) {
@@ -4385,6 +5051,12 @@ class ToolSelector final {
     if (!T)
       return nullptr;
 
+    // Can't collapse if we don't have codegen support unless we are
+    // emitting LLVM IR.
+    bool OutputIsLLVM = types::isLLVMIR(ActionInfo[0].JA->getType());
+    if (!T->hasIntegratedBackend() && !(OutputIsLLVM && T->canEmitIR()))
+      return nullptr;
+
     if (T->canEmitIR() && ((SaveTemps && !InputIsBitcode) || EmbedBitcode))
       return nullptr;
 
@@ -4501,10 +5173,11 @@ static std::string GetTriplePlusArchString(const ToolChain *TC,
   return TriplePlusArch;
 }
 
-InputInfo Driver::BuildJobsForAction(
+InputInfoList Driver::BuildJobsForAction(
     Compilation &C, const Action *A, const ToolChain *TC, StringRef BoundArch,
     bool AtTopLevel, bool MultipleArchs, const char *LinkingOutput,
-    std::map<std::pair<const Action *, std::string>, InputInfo> &CachedResults,
+    std::map<std::pair<const Action *, std::string>, InputInfoList>
+        &CachedResults,
     Action::OffloadKind TargetDeviceOffloadKind) const {
   std::pair<const Action *, std::string> ActionTC = {
       A, GetTriplePlusArchString(TC, BoundArch, TargetDeviceOffloadKind)};
@@ -4512,17 +5185,18 @@ InputInfo Driver::BuildJobsForAction(
   if (CachedResult != CachedResults.end()) {
     return CachedResult->second;
   }
-  InputInfo Result = BuildJobsForActionNoCache(
+  InputInfoList Result = BuildJobsForActionNoCache(
       C, A, TC, BoundArch, AtTopLevel, MultipleArchs, LinkingOutput,
       CachedResults, TargetDeviceOffloadKind);
   CachedResults[ActionTC] = Result;
   return Result;
 }
 
-InputInfo Driver::BuildJobsForActionNoCache(
+InputInfoList Driver::BuildJobsForActionNoCache(
     Compilation &C, const Action *A, const ToolChain *TC, StringRef BoundArch,
     bool AtTopLevel, bool MultipleArchs, const char *LinkingOutput,
-    std::map<std::pair<const Action *, std::string>, InputInfo> &CachedResults,
+    std::map<std::pair<const Action *, std::string>, InputInfoList>
+        &CachedResults,
     Action::OffloadKind TargetDeviceOffloadKind) const {
   llvm::PrettyStackTraceString CrashInfo("Building compilation jobs");
 
@@ -4553,20 +5227,21 @@ InputInfo Driver::BuildJobsForActionNoCache(
     //                      \
     //    Device Action 1  ---> OffloadAction -> Device Action 2
     //
-    // For a) and b), we just return the job generated for the dependence. For
+    // For a) and b), we just return the job generated for the dependences. For
     // c) and d) we override the current action with the host/device dependence
     // if the current toolchain is host/device and set the offload dependences
     // info with the jobs obtained from the device/host dependence(s).
 
-    // If there is a single device option, just generate the job for it.
-    if (OA->hasSingleDeviceDependence()) {
-      InputInfo DevA;
+    // If there is a single device option or has no host action, just generate
+    // the job for it.
+    if (OA->hasSingleDeviceDependence() || !OA->hasHostDependence()) {
+      InputInfoList DevA;
       OA->doOnEachDeviceDependence([&](Action *DepA, const ToolChain *DepTC,
                                        const char *DepBoundArch) {
-        DevA =
-            BuildJobsForAction(C, DepA, DepTC, DepBoundArch, AtTopLevel,
-                               /*MultipleArchs*/ !!DepBoundArch, LinkingOutput,
-                               CachedResults, DepA->getOffloadingDeviceKind());
+        DevA.append(BuildJobsForAction(C, DepA, DepTC, DepBoundArch, AtTopLevel,
+                                       /*MultipleArchs*/ !!DepBoundArch,
+                                       LinkingOutput, CachedResults,
+                                       DepA->getOffloadingDeviceKind()));
       });
       return DevA;
     }
@@ -4578,7 +5253,7 @@ InputInfo Driver::BuildJobsForActionNoCache(
     OA->doOnEachDependence(
         /*IsHostDependence=*/BuildingForOffloadDevice,
         [&](Action *DepA, const ToolChain *DepTC, const char *DepBoundArch) {
-          OffloadDependencesInputInfo.push_back(BuildJobsForAction(
+          OffloadDependencesInputInfo.append(BuildJobsForAction(
               C, DepA, DepTC, DepBoundArch, /*AtTopLevel=*/false,
               /*MultipleArchs*/ !!DepBoundArch, LinkingOutput, CachedResults,
               DepA->getOffloadingDeviceKind()));
@@ -4587,6 +5262,17 @@ InputInfo Driver::BuildJobsForActionNoCache(
     A = BuildingForOffloadDevice
             ? OA->getSingleDeviceDependence(/*DoNotConsiderHostActions=*/true)
             : OA->getHostDependence();
+
+    // We may have already built this action as a part of the offloading
+    // toolchain, return the cached input if so.
+    std::pair<const Action *, std::string> ActionTC = {
+        OA->getHostDependence(),
+        GetTriplePlusArchString(TC, BoundArch, TargetDeviceOffloadKind)};
+    if (CachedResults.find(ActionTC) != CachedResults.end()) {
+      InputInfoList Inputs = CachedResults[ActionTC];
+      Inputs.append(OffloadDependencesInputInfo);
+      return Inputs;
+    }
   }
 
   if (const InputAction *IA = dyn_cast<InputAction>(A)) {
@@ -4596,9 +5282,9 @@ InputInfo Driver::BuildJobsForActionNoCache(
     Input.claim();
     if (Input.getOption().matches(options::OPT_INPUT)) {
       const char *Name = Input.getValue();
-      return InputInfo(A, Name, /* _BaseInput = */ Name);
+      return {InputInfo(A, Name, /* _BaseInput = */ Name)};
     }
-    return InputInfo(A, &Input, /* _BaseInput = */ "");
+    return {InputInfo(A, &Input, /* _BaseInput = */ "")};
   }
 
   if (const BindArchAction *BAA = dyn_cast<BindArchAction>(A)) {
@@ -4628,26 +5314,7 @@ InputInfo Driver::BuildJobsForActionNoCache(
   const Tool *T = TS.getTool(Inputs, CollapsedOffloadActions);
 
   if (!T)
-    return InputInfo();
-
-  if (BuildingForOffloadDevice &&
-      A->getOffloadingDeviceKind() == Action::OFK_OpenMP) {
-    if (TC->getTriple().isAMDGCN()) {
-      // AMDGCN treats backend and assemble actions as no-op because
-      // linker does not support object files.
-      if (const BackendJobAction *BA = dyn_cast<BackendJobAction>(A)) {
-        return BuildJobsForAction(C, *BA->input_begin(), TC, BoundArch,
-                                  AtTopLevel, MultipleArchs, LinkingOutput,
-                                  CachedResults, TargetDeviceOffloadKind);
-      }
-
-      if (const AssembleJobAction *AA = dyn_cast<AssembleJobAction>(A)) {
-        return BuildJobsForAction(C, *AA->input_begin(), TC, BoundArch,
-                                  AtTopLevel, MultipleArchs, LinkingOutput,
-                                  CachedResults, TargetDeviceOffloadKind);
-      }
-    }
-  }
+    return {InputInfo()};
 
   // If we've collapsed action list that contained OffloadAction we
   // need to build jobs for host/device-side inputs it may have held.
@@ -4655,7 +5322,7 @@ InputInfo Driver::BuildJobsForActionNoCache(
     cast<OffloadAction>(OA)->doOnEachDependence(
         /*IsHostDependence=*/BuildingForOffloadDevice,
         [&](Action *DepA, const ToolChain *DepTC, const char *DepBoundArch) {
-          OffloadDependencesInputInfo.push_back(BuildJobsForAction(
+          OffloadDependencesInputInfo.append(BuildJobsForAction(
               C, DepA, DepTC, DepBoundArch, /* AtTopLevel */ false,
               /*MultipleArchs=*/!!DepBoundArch, LinkingOutput, CachedResults,
               DepA->getOffloadingDeviceKind()));
@@ -4669,23 +5336,25 @@ InputInfo Driver::BuildJobsForActionNoCache(
     // FIXME: Clean this up.
     bool SubJobAtTopLevel =
         AtTopLevel && (isa<DsymutilJobAction>(A) || isa<VerifyJobAction>(A));
-    InputInfos.push_back(BuildJobsForAction(
+    InputInfos.append(BuildJobsForAction(
         C, Input, TC, BoundArch, SubJobAtTopLevel, MultipleArchs, LinkingOutput,
         CachedResults, A->getOffloadingDeviceKind()));
   }
 
-  // Always use the first input as the base input.
+  // Always use the first file input as the base input.
   const char *BaseInput = InputInfos[0].getBaseInput();
+  for (auto &Info : InputInfos) {
+    if (Info.isFilename()) {
+      BaseInput = Info.getBaseInput();
+      break;
+    }
+  }
 
   // ... except dsymutil actions, which use their actual input as the base
   // input.
   if (JA->getType() == types::TY_dSYM)
     BaseInput = InputInfos[0].getFilename();
 
-  // ... and in header module compilations, which use the module name.
-  if (auto *ModuleJA = dyn_cast<HeaderModulePrecompileJobAction>(JA))
-    BaseInput = ModuleJA->getModuleName();
-
   // Append outputs of offload device jobs to the input list
   if (!OffloadDependencesInputInfo.empty())
     InputInfos.append(OffloadDependencesInputInfo.begin(),
@@ -4747,8 +5416,8 @@ InputInfo Driver::BuildJobsForActionNoCache(
         Arch = BoundArch;
 
       CachedResults[{A, GetTriplePlusArchString(UI.DependentToolChain, Arch,
-                                                UI.DependentOffloadKind)}] =
-          CurI;
+                                                UI.DependentOffloadKind)}] = {
+          CurI};
     }
 
     // Now that we have all the results generated, select the one that should be
@@ -4757,24 +5426,17 @@ InputInfo Driver::BuildJobsForActionNoCache(
         A, GetTriplePlusArchString(TC, BoundArch, TargetDeviceOffloadKind)};
     assert(CachedResults.find(ActionTC) != CachedResults.end() &&
            "Result does not exist??");
-    Result = CachedResults[ActionTC];
+    Result = CachedResults[ActionTC].front();
   } else if (JA->getType() == types::TY_Nothing)
-    Result = InputInfo(A, BaseInput);
+    Result = {InputInfo(A, BaseInput)};
   else {
     // We only have to generate a prefix for the host if this is not a top-level
     // action.
     std::string OffloadingPrefix = Action::GetOffloadingFileNamePrefix(
         A->getOffloadingDeviceKind(), TC->getTriple().normalize(),
-        /*CreatePrefixForHost=*/!!A->getOffloadingHostActiveKinds() &&
-            !AtTopLevel);
-    if (isa<OffloadWrapperJobAction>(JA)) {
-      if (Arg *FinalOutput = C.getArgs().getLastArg(options::OPT_o))
-        BaseInput = FinalOutput->getValue();
-      else
-        BaseInput = getDefaultImageName();
-      BaseInput =
-          C.getArgs().MakeArgString(std::string(BaseInput) + "-wrapper");
-    }
+        /*CreatePrefixForHost=*/isa<OffloadPackagerJobAction>(A) ||
+            !(A->getOffloadingHostActiveKinds() == Action::OFK_None ||
+              AtTopLevel));
     Result = InputInfo(A, GetNamedOutputPath(C, *JA, BaseInput, BoundArch,
                                              AtTopLevel, MultipleArchs,
                                              OffloadingPrefix),
@@ -4812,7 +5474,7 @@ InputInfo Driver::BuildJobsForActionNoCache(
           C.getArgsForToolChain(TC, BoundArch, JA->getOffloadingDeviceKind()),
           LinkingOutput);
   }
-  return Result;
+  return {Result};
 }
 
 const char *Driver::getDefaultImageName() const {
@@ -4864,17 +5526,82 @@ static bool HasPreprocessOutput(const Action &JA) {
   return false;
 }
 
+const char *Driver::CreateTempFile(Compilation &C, StringRef Prefix,
+                                   StringRef Suffix, bool MultipleArchs,
+                                   StringRef BoundArch) const {
+  SmallString<128> TmpName;
+  Arg *A = C.getArgs().getLastArg(options::OPT_fcrash_diagnostics_dir);
+  std::optional<std::string> CrashDirectory =
+      CCGenDiagnostics && A
+          ? std::string(A->getValue())
+          : llvm::sys::Process::GetEnv("CLANG_CRASH_DIAGNOSTICS_DIR");
+  if (CrashDirectory) {
+    if (!getVFS().exists(*CrashDirectory))
+      llvm::sys::fs::create_directories(*CrashDirectory);
+    SmallString<128> Path(*CrashDirectory);
+    llvm::sys::path::append(Path, Prefix);
+    const char *Middle = !Suffix.empty() ? "-%%%%%%." : "-%%%%%%";
+    if (std::error_code EC =
+            llvm::sys::fs::createUniqueFile(Path + Middle + Suffix, TmpName)) {
+      Diag(clang::diag::err_unable_to_make_temp) << EC.message();
+      return "";
+    }
+  } else {
+    if (MultipleArchs && !BoundArch.empty()) {
+      TmpName = GetTemporaryDirectory(Prefix);
+      llvm::sys::path::append(TmpName,
+                              Twine(Prefix) + "-" + BoundArch + "." + Suffix);
+    } else {
+      TmpName = GetTemporaryPath(Prefix, Suffix);
+    }
+  }
+  return C.addTempFile(C.getArgs().MakeArgString(TmpName));
+}
+
+// Calculate the output path of the module file when compiling a module unit
+// with the `-fmodule-output` option or `-fmodule-output=` option specified.
+// The behavior is:
+// - If `-fmodule-output=` is specfied, then the module file is
+//   writing to the value.
+// - Otherwise if the output object file of the module unit is specified, the
+// output path
+//   of the module file should be the same with the output object file except
+//   the corresponding suffix. This requires both `-o` and `-c` are specified.
+// - Otherwise, the output path of the module file will be the same with the
+//   input with the corresponding suffix.
+static const char *GetModuleOutputPath(Compilation &C, const JobAction &JA,
+                                       const char *BaseInput) {
+  assert(isa<PrecompileJobAction>(JA) && JA.getType() == types::TY_ModuleFile &&
+         (C.getArgs().hasArg(options::OPT_fmodule_output) ||
+          C.getArgs().hasArg(options::OPT_fmodule_output_EQ)));
+
+  if (Arg *ModuleOutputEQ =
+          C.getArgs().getLastArg(options::OPT_fmodule_output_EQ))
+    return C.addResultFile(ModuleOutputEQ->getValue(), &JA);
+
+  SmallString<64> OutputPath;
+  Arg *FinalOutput = C.getArgs().getLastArg(options::OPT_o);
+  if (FinalOutput && C.getArgs().hasArg(options::OPT_c))
+    OutputPath = FinalOutput->getValue();
+  else
+    OutputPath = BaseInput;
+
+  const char *Extension = types::getTypeTempSuffix(JA.getType());
+  llvm::sys::path::replace_extension(OutputPath, Extension);
+  return C.addResultFile(C.getArgs().MakeArgString(OutputPath.c_str()), &JA);
+}
+
 const char *Driver::GetNamedOutputPath(Compilation &C, const JobAction &JA,
                                        const char *BaseInput,
                                        StringRef OrigBoundArch, bool AtTopLevel,
                                        bool MultipleArchs,
                                        StringRef OffloadingPrefix) const {
   std::string BoundArch = OrigBoundArch.str();
-#if defined(_WIN32)
-  // BoundArch may contains ':', which is invalid in file names on Windows,
-  // therefore replace it with '%'.
-  std::replace(BoundArch.begin(), BoundArch.end(), ':', '@');
-#endif
+  if (is_style_windows(llvm::sys::path::Style::native)) {
+    // BoundArch may contains ':', which is invalid in file names on Windows,
+    // therefore replace it with '%'.
+    std::replace(BoundArch.begin(), BoundArch.end(), ':', '@');
+  }
 
   llvm::PrettyStackTraceString CrashInfo("Computing output path");
   // Output to a user requested destination?
@@ -4905,6 +5632,9 @@ const char *Driver::GetNamedOutputPath(Compilation &C, const JobAction &JA,
     return "-";
   }
 
+  if (IsDXCMode() && !C.getArgs().hasArg(options::OPT_o))
+    return "-";
+
   // Is this the assembly listing for /FA?
   if (JA.getType() == types::TY_PP_Asm &&
       (C.getArgs().hasArg(options::OPT__SLASH_FA) ||
@@ -4917,31 +5647,26 @@ const char *Driver::GetNamedOutputPath(Compilation &C, const JobAction &JA,
         &JA);
   }
 
+  bool SpecifiedModuleOutput =
+      C.getArgs().hasArg(options::OPT_fmodule_output) ||
+      C.getArgs().hasArg(options::OPT_fmodule_output_EQ);
+  if (MultipleArchs && SpecifiedModuleOutput)
+    Diag(clang::diag::err_drv_module_output_with_multiple_arch);
+
+  // If we're emitting a module output with the specified option
+  // `-fmodule-output`.
+  if (!AtTopLevel && isa<PrecompileJobAction>(JA) &&
+      JA.getType() == types::TY_ModuleFile && SpecifiedModuleOutput)
+    return GetModuleOutputPath(C, JA, BaseInput);
+
   // Output to a temporary file?
   if ((!AtTopLevel && !isSaveTempsEnabled() &&
        !C.getArgs().hasArg(options::OPT__SLASH_Fo)) ||
       CCGenDiagnostics) {
     StringRef Name = llvm::sys::path::filename(BaseInput);
     std::pair<StringRef, StringRef> Split = Name.split('.');
-    SmallString<128> TmpName;
     const char *Suffix = types::getTypeTempSuffix(JA.getType(), IsCLMode());
-    Arg *A = C.getArgs().getLastArg(options::OPT_fcrash_diagnostics_dir);
-    if (CCGenDiagnostics && A) {
-      SmallString<128> CrashDirectory(A->getValue());
-      if (!getVFS().exists(CrashDirectory))
-        llvm::sys::fs::create_directories(CrashDirectory);
-      llvm::sys::path::append(CrashDirectory, Split.first);
-      const char *Middle = Suffix ? "-%%%%%%." : "-%%%%%%";
-      std::error_code EC = llvm::sys::fs::createUniqueFile(
-          CrashDirectory + Middle + Suffix, TmpName);
-      if (EC) {
-        Diag(clang::diag::err_unable_to_make_temp) << EC.message();
-        return "";
-      }
-    } else {
-      TmpName = GetTemporaryPath(Split.first, Suffix);
-    }
-    return C.addTempFile(C.getArgs().MakeArgString(TmpName));
+    return CreateTempFile(C, Split.first, Suffix, MultipleArchs, BoundArch);
   }
 
   SmallString<128> BasePath(BaseInput);
@@ -4997,7 +5722,8 @@ const char *Driver::GetNamedOutputPath(Compilation &C, const JobAction &JA,
       bool IsHIPNoRDC = JA.getOffloadingDeviceKind() == Action::OFK_HIP &&
                         !C.getArgs().hasFlag(options::OPT_fgpu_rdc,
                                              options::OPT_fno_gpu_rdc, false);
-      if (IsHIPNoRDC) {
+      bool UseOutExtension = IsHIPNoRDC || isa<OffloadPackagerJobAction>(JA);
+      if (UseOutExtension) {
         Output = BaseName;
         llvm::sys::path::replace_extension(Output, "");
       }
@@ -5006,12 +5732,20 @@ const char *Driver::GetNamedOutputPath(Compilation &C, const JobAction &JA,
         Output += "-";
         Output.append(BoundArch);
       }
-      if (IsHIPNoRDC)
+      if (UseOutExtension)
         Output += ".out";
       NamedOutput = C.getArgs().MakeArgString(Output.c_str());
     }
   } else if (JA.getType() == types::TY_PCH && IsCLMode()) {
     NamedOutput = C.getArgs().MakeArgString(GetClPchPath(C, BaseName));
+  } else if ((JA.getType() == types::TY_Plist || JA.getType() == types::TY_AST) &&
+             C.getArgs().hasArg(options::OPT__SLASH_o)) {
+    StringRef Val =
+        C.getArgs()
+            .getLastArg(options::OPT__SLASH_o)
+            ->getValue();
+    NamedOutput =
+        MakeCLOutputFilename(C.getArgs(), Val, BaseName, types::TY_Object);
   } else {
     const char *Suffix = types::getTypeTempSuffix(JA.getType(), IsCLMode());
     assert(Suffix && "All types used for output should have a suffix.");
@@ -5028,19 +5762,22 @@ const char *Driver::GetNamedOutputPath(Compilation &C, const JobAction &JA,
     // When using both -save-temps and -emit-llvm, use a ".tmp.bc" suffix for
     // the unoptimized bitcode so that it does not get overwritten by the ".bc"
     // optimized bitcode output.
-    auto IsHIPRDCInCompilePhase = [](const JobAction &JA,
+    auto IsAMDRDCInCompilePhase = [](const JobAction &JA,
                                      const llvm::opt::DerivedArgList &Args) {
-      // The relocatable compilation in HIP implies -emit-llvm. Similarly, use a
-      // ".tmp.bc" suffix for the unoptimized bitcode (generated in the compile
-      // phase.)
+      // The relocatable compilation in HIP and OpenMP implies -emit-llvm.
+      // Similarly, use a ".tmp.bc" suffix for the unoptimized bitcode
+      // (generated in the compile phase.)
+      const ToolChain *TC = JA.getOffloadingToolChain();
       return isa<CompileJobAction>(JA) &&
-             JA.getOffloadingDeviceKind() == Action::OFK_HIP &&
-             Args.hasFlag(options::OPT_fgpu_rdc, options::OPT_fno_gpu_rdc,
-                          false);
+             ((JA.getOffloadingDeviceKind() == Action::OFK_HIP &&
+               Args.hasFlag(options::OPT_fgpu_rdc, options::OPT_fno_gpu_rdc,
+                            false)) ||
+              (JA.getOffloadingDeviceKind() == Action::OFK_OpenMP && TC &&
+               TC->getTriple().isAMDGPU()));
     };
     if (!AtTopLevel && JA.getType() == types::TY_LLVM_BC &&
         (C.getArgs().hasArg(options::OPT_emit_llvm) ||
-         IsHIPRDCInCompilePhase(JA, C.getArgs())))
+         IsAMDRDCInCompilePhase(JA, C.getArgs())))
       Suffixed += ".tmp";
     Suffixed += '.';
     Suffixed += Suffix;
@@ -5084,9 +5821,9 @@ const char *Driver::GetNamedOutputPath(Compilation &C, const JobAction &JA,
     else
       llvm::sys::path::append(BasePath, NamedOutput);
     return C.addResultFile(C.getArgs().MakeArgString(BasePath.c_str()), &JA);
-  } else {
-    return C.addResultFile(NamedOutput, &JA);
   }
+
+  return C.addResultFile(NamedOutput, &JA);
 }
 
 
@@ -5097,7 +5834,7 @@ static Optional<std::string> findFile(StringRef path1, const Twine &path2) {
 
   if (llvm::sys::fs::exists(s))
     return std::string(s);
-  return None;
+  return std::nullopt;
 }
 
 // Must be in sync with findMajMinShlib in lld/ELF/DriverUtils.cpp.
@@ -5127,7 +5864,7 @@ llvm::Optional<std::string> findMajMinShlib(StringRef dir, const Twine& libNameS
   }
   if (MaxMaj >= 0)
     return findFile(dir, LibName + Twine(MaxMaj) + "." + Twine(MaxMin));
-  return None;
+  return std::nullopt;
 }
 }  // namespace
 
@@ -5135,7 +5872,7 @@ std::string Driver::GetFilePath(StringRef Name, const ToolChain &TC) const {
   const bool lookForLibDotSo = Name.startswith("lib") && Name.endswith(".so");
   // Search for Name in a list of paths.
   auto SearchPaths = [&](const llvm::SmallVectorImpl<std::string> &P)
-      -> llvm::Optional<std::string> {
+      -> std::optional<std::string> {
     // Respect a limited subset of the '-Bprefix' functionality in GCC by
     // attempting to use this prefix when looking for file paths.
     for (const auto &Dir : P) {
@@ -5151,7 +5888,7 @@ std::string Driver::GetFilePath(StringRef Name, const ToolChain &TC) const {
 	  return std::string(*s);
       }
     }
-    return None;
+    return std::nullopt;
   };
 
   if (auto P = SearchPaths(PrefixDirs))
@@ -5306,6 +6043,7 @@ const ToolChain &Driver::getToolChain(const ArgList &Args,
     case llvm::Triple::IOS:
     case llvm::Triple::TvOS:
     case llvm::Triple::WatchOS:
+    case llvm::Triple::DriverKit:
       TC = std::make_unique<toolchains::DarwinClang>(*this, Target, Args);
       break;
     case llvm::Triple::DragonFly:
@@ -5318,7 +6056,11 @@ const ToolChain &Driver::getToolChain(const ArgList &Args,
       TC = std::make_unique<toolchains::NetBSD>(*this, Target, Args);
       break;
     case llvm::Triple::FreeBSD:
-      TC = std::make_unique<toolchains::FreeBSD>(*this, Target, Args);
+      if (Target.isPPC())
+        TC = std::make_unique<toolchains::PPCFreeBSDToolChain>(*this, Target,
+                                                               Args);
+      else
+        TC = std::make_unique<toolchains::FreeBSD>(*this, Target, Args);
       break;
     case llvm::Triple::Minix:
       TC = std::make_unique<toolchains::Minix>(*this, Target, Args);
@@ -5350,6 +6092,9 @@ const ToolChain &Driver::getToolChain(const ArgList &Args,
     case llvm::Triple::Solaris:
       TC = std::make_unique<toolchains::Solaris>(*this, Target, Args);
       break;
+    case llvm::Triple::CUDA:
+      TC = std::make_unique<toolchains::NVPTXToolChain>(*this, Target, Args);
+      break;
     case llvm::Triple::AMDHSA:
       TC = std::make_unique<toolchains::ROCMToolChain>(*this, Target, Args);
       break;
@@ -5389,6 +6134,9 @@ const ToolChain &Driver::getToolChain(const ArgList &Args,
     case llvm::Triple::PS4:
       TC = std::make_unique<toolchains::PS4CPU>(*this, Target, Args);
       break;
+    case llvm::Triple::PS5:
+      TC = std::make_unique<toolchains::PS5CPU>(*this, Target, Args);
+      break;
     case llvm::Triple::Contiki:
       TC = std::make_unique<toolchains::Contiki>(*this, Target, Args);
       break;
@@ -5398,6 +6146,9 @@ const ToolChain &Driver::getToolChain(const ArgList &Args,
     case llvm::Triple::ZOS:
       TC = std::make_unique<toolchains::ZOS>(*this, Target, Args);
       break;
+    case llvm::Triple::ShaderModel:
+      TC = std::make_unique<toolchains::HLSLToolChain>(*this, Target, Args);
+      break;
     default:
       // Of these targets, Hexagon is the only one that might have
       // an OS of Linux, in which case it got handled above already.
@@ -5440,6 +6191,13 @@ const ToolChain &Driver::getToolChain(const ArgList &Args,
       case llvm::Triple::ve:
         TC = std::make_unique<toolchains::VEToolChain>(*this, Target, Args);
         break;
+      case llvm::Triple::spirv32:
+      case llvm::Triple::spirv64:
+        TC = std::make_unique<toolchains::SPIRVToolChain>(*this, Target, Args);
+        break;
+      case llvm::Triple::csky:
+        TC = std::make_unique<toolchains::CSKYToolChain>(*this, Target, Args);
+        break;
       default:
         if (Target.getVendor() == llvm::Triple::Myriad)
           TC = std::make_unique<toolchains::MyriadToolChain>(*this, Target,
@@ -5456,10 +6214,37 @@ const ToolChain &Driver::getToolChain(const ArgList &Args,
     }
   }
 
-  // Intentionally omitted from the switch above: llvm::Triple::CUDA.  CUDA
-  // compiles always need two toolchains, the CUDA toolchain and the host
-  // toolchain.  So the only valid way to create a CUDA toolchain is via
-  // CreateOffloadingDeviceToolChains.
+  return *TC;
+}
+
+const ToolChain &Driver::getOffloadingDeviceToolChain(
+    const ArgList &Args, const llvm::Triple &Target, const ToolChain &HostTC,
+    const Action::OffloadKind &TargetDeviceOffloadKind) const {
+  // Use device / host triples as the key into the ToolChains map because the
+  // device ToolChain we create depends on both.
+  auto &TC = ToolChains[Target.str() + "/" + HostTC.getTriple().str()];
+  if (!TC) {
+    // Categorized by offload kind > arch rather than OS > arch like
+    // the normal getToolChain call, as it seems a reasonable way to categorize
+    // things.
+    switch (TargetDeviceOffloadKind) {
+    case Action::OFK_HIP: {
+      if (Target.getArch() == llvm::Triple::amdgcn &&
+          Target.getVendor() == llvm::Triple::AMD &&
+          Target.getOS() == llvm::Triple::AMDHSA)
+        TC = std::make_unique<toolchains::HIPAMDToolChain>(*this, Target,
+                                                           HostTC, Args);
+      else if (Target.getArch() == llvm::Triple::spirv64 &&
+               Target.getVendor() == llvm::Triple::UnknownVendor &&
+               Target.getOS() == llvm::Triple::UnknownOS)
+        TC = std::make_unique<toolchains::HIPSPVToolChain>(*this, Target,
+                                                           HostTC, Args);
+      break;
+    }
+    default:
+      break;
+    }
+  }
 
   return *TC;
 }
@@ -5472,7 +6257,8 @@ bool Driver::ShouldUseClangCompiler(const JobAction &JA) const {
 
   // And say "no" if this is not a kind of action clang understands.
   if (!isa<PreprocessJobAction>(JA) && !isa<PrecompileJobAction>(JA) &&
-      !isa<CompileJobAction>(JA) && !isa<BackendJobAction>(JA))
+      !isa<CompileJobAction>(JA) && !isa<BackendJobAction>(JA) &&
+      !isa<ExtractAPIJobAction>(JA))
     return false;
 
   return true;
@@ -5481,11 +6267,12 @@ bool Driver::ShouldUseClangCompiler(const JobAction &JA) const {
 bool Driver::ShouldUseFlangCompiler(const JobAction &JA) const {
   // Say "no" if there is not exactly one input of a type flang understands.
   if (JA.size() != 1 ||
-      !types::isFortran((*JA.input_begin())->getType()))
+      !types::isAcceptedByFlang((*JA.input_begin())->getType()))
     return false;
 
   // And say "no" if this is not a kind of action flang understands.
-  if (!isa<PreprocessJobAction>(JA) && !isa<CompileJobAction>(JA) && !isa<BackendJobAction>(JA))
+  if (!isa<PreprocessJobAction>(JA) && !isa<CompileJobAction>(JA) &&
+      !isa<BackendJobAction>(JA))
     return false;
 
   return true;
@@ -5572,14 +6359,44 @@ Driver::getIncludeExcludeOptionFlagMasks(bool IsClCompatMode) const {
   if (IsClCompatMode) {
     // Include CL and Core options.
     IncludedFlagsBitmask |= options::CLOption;
+    IncludedFlagsBitmask |= options::CLDXCOption;
     IncludedFlagsBitmask |= options::CoreOption;
   } else {
     ExcludedFlagsBitmask |= options::CLOption;
   }
+  if (IsDXCMode()) {
+    // Include DXC and Core options.
+    IncludedFlagsBitmask |= options::DXCOption;
+    IncludedFlagsBitmask |= options::CLDXCOption;
+    IncludedFlagsBitmask |= options::CoreOption;
+  } else {
+    ExcludedFlagsBitmask |= options::DXCOption;
+  }
+  if (!IsClCompatMode && !IsDXCMode())
+    ExcludedFlagsBitmask |= options::CLDXCOption;
 
   return std::make_pair(IncludedFlagsBitmask, ExcludedFlagsBitmask);
 }
 
+const char *Driver::getExecutableForDriverMode(DriverMode Mode) {
+  switch (Mode) {
+  case GCCMode:
+    return "clang";
+  case GXXMode:
+    return "clang++";
+  case CPPMode:
+    return "clang-cpp";
+  case CLMode:
+    return "clang-cl";
+  case FlangMode:
+    return "flang";
+  case DXCMode:
+    return "clang-dxc";
+  }
+
+  llvm_unreachable("Unhandled Mode");
+}
+
 bool clang::driver::isOptimizationLevelFast(const ArgList &Args) {
   return Args.hasFlag(options::OPT_Ofast, options::OPT_O_Group, false);
 }
diff --git a/gnu/llvm/clang/lib/Driver/ToolChains/Arch/RISCV.cpp b/gnu/llvm/clang/lib/Driver/ToolChains/Arch/RISCV.cpp
index d78b6611334..8ee0a03a399 100644
--- a/gnu/llvm/clang/lib/Driver/ToolChains/Arch/RISCV.cpp
+++ b/gnu/llvm/clang/lib/Driver/ToolChains/Arch/RISCV.cpp
@@ -7,476 +7,54 @@
 //===----------------------------------------------------------------------===//
 
 #include "RISCV.h"
+#include "../Clang.h"
+#include "ToolChains/CommonArgs.h"
 #include "clang/Basic/CharInfo.h"
 #include "clang/Driver/Driver.h"
 #include "clang/Driver/DriverDiagnostic.h"
 #include "clang/Driver/Options.h"
 #include "llvm/Option/ArgList.h"
-#include "llvm/ADT/Optional.h"
-#include "llvm/Support/TargetParser.h"
+#include "llvm/Support/Error.h"
+#include "llvm/Support/Host.h"
+#include "llvm/Support/RISCVISAInfo.h"
 #include "llvm/Support/raw_ostream.h"
-#include "ToolChains/CommonArgs.h"
+#include "llvm/TargetParser/RISCVTargetParser.h"
 
 using namespace clang::driver;
 using namespace clang::driver::tools;
 using namespace clang;
 using namespace llvm::opt;
 
-namespace {
-// Represents the major and version number components of a RISC-V extension
-struct RISCVExtensionVersion {
-  StringRef Major;
-  StringRef Minor;
-};
-} // end anonymous namespace
-
-static StringRef getExtensionTypeDesc(StringRef Ext) {
-  if (Ext.startswith("sx"))
-    return "non-standard supervisor-level extension";
-  if (Ext.startswith("s"))
-    return "standard supervisor-level extension";
-  if (Ext.startswith("x"))
-    return "non-standard user-level extension";
-  if (Ext.startswith("z"))
-    return "standard user-level extension";
-  return StringRef();
-}
-
-static StringRef getExtensionType(StringRef Ext) {
-  if (Ext.startswith("sx"))
-    return "sx";
-  if (Ext.startswith("s"))
-    return "s";
-  if (Ext.startswith("x"))
-    return "x";
-  if (Ext.startswith("z"))
-    return "z";
-  return StringRef();
-}
-
-// If the extension is supported as experimental, return the version of that
-// extension that the compiler currently supports.
-static Optional<RISCVExtensionVersion>
-isExperimentalExtension(StringRef Ext) {
-  if (Ext == "b" || Ext == "zba" || Ext == "zbb" || Ext == "zbc" ||
-      Ext == "zbe" || Ext == "zbf" || Ext == "zbm" || Ext == "zbp" ||
-      Ext == "zbr" || Ext == "zbs" || Ext == "zbt" || Ext == "zbproposedc")
-    return RISCVExtensionVersion{"0", "93"};
-  if (Ext == "v" || Ext == "zvamo" || Ext == "zvlsseg")
-    return RISCVExtensionVersion{"0", "10"};
-  if (Ext == "zfh")
-    return RISCVExtensionVersion{"0", "1"};
-  return None;
-}
-
-static bool isSupportedExtension(StringRef Ext) {
-  // LLVM supports "z" extensions which are marked as experimental.
-  if (isExperimentalExtension(Ext))
-    return true;
-
-  // LLVM does not support "sx", "s" nor "x" extensions.
-  return false;
-}
-
-// Extensions may have a version number, and may be separated by
-// an underscore '_' e.g.: rv32i2_m2.
-// Version number is divided into major and minor version numbers,
-// separated by a 'p'. If the minor version is 0 then 'p0' can be
-// omitted from the version string. E.g., rv32i2p0, rv32i2, rv32i2p1.
-static bool getExtensionVersion(const Driver &D, const ArgList &Args,
-                                StringRef MArch, StringRef Ext, StringRef In,
-                                std::string &Major, std::string &Minor) {
-  Major = std::string(In.take_while(isDigit));
-  In = In.substr(Major.size());
-
-  if (Major.size() && In.consume_front("p")) {
-    Minor = std::string(In.take_while(isDigit));
-    In = In.substr(Major.size() + 1);
-
-    // Expected 'p' to be followed by minor version number.
-    if (Minor.empty()) {
-      std::string Error =
-        "minor version number missing after 'p' for extension";
-      D.Diag(diag::err_drv_invalid_riscv_ext_arch_name)
-        << MArch << Error << Ext;
-      return false;
-    }
-  }
-
-  // Expected multi-character extension with version number to have no
-  // subsequent characters (i.e. must either end string or be followed by
-  // an underscore).
-  if (Ext.size() > 1 && In.size()) {
-    std::string Error =
-        "multi-character extensions must be separated by underscores";
-    D.Diag(diag::err_drv_invalid_riscv_ext_arch_name) << MArch << Error << In;
-    return false;
-  }
-
-  // If experimental extension, require use of current version number number
-  if (auto ExperimentalExtension = isExperimentalExtension(Ext)) {
-    if (!Args.hasArg(options::OPT_menable_experimental_extensions)) {
-      std::string Error =
-          "requires '-menable-experimental-extensions' for experimental extension";
-      D.Diag(diag::err_drv_invalid_riscv_ext_arch_name)
-          << MArch << Error << Ext;
-      return false;
-    } else if (Major.empty() && Minor.empty()) {
-      std::string Error =
-          "experimental extension requires explicit version number";
-      D.Diag(diag::err_drv_invalid_riscv_ext_arch_name)
-          << MArch << Error << Ext;
-      return false;
-    }
-    auto SupportedVers = *ExperimentalExtension;
-    if (Major != SupportedVers.Major || Minor != SupportedVers.Minor) {
-      std::string Error =
-          "unsupported version number " + Major;
-      if (!Minor.empty())
-        Error += "." + Minor;
-      Error += " for experimental extension (this compiler supports "
-            + SupportedVers.Major.str() + "."
-            + SupportedVers.Minor.str() + ")";
-
-      D.Diag(diag::err_drv_invalid_riscv_ext_arch_name)
-          << MArch << Error << Ext;
-      return false;
-    }
-    return true;
-  }
-
-  // Allow extensions to declare no version number
-  if (Major.empty() && Minor.empty())
-    return true;
-
-  // TODO: Handle supported extensions with version number.
-  std::string Error = "unsupported version number " + Major;
-  if (!Minor.empty())
-    Error += "." + Minor;
-  Error += " for extension";
-  D.Diag(diag::err_drv_invalid_riscv_ext_arch_name) << MArch << Error << Ext;
-
-  return false;
-}
-
-// Handle other types of extensions other than the standard
-// general purpose and standard user-level extensions.
-// Parse the ISA string containing non-standard user-level
-// extensions, standard supervisor-level extensions and
-// non-standard supervisor-level extensions.
-// These extensions start with 'z', 'x', 's', 'sx' prefixes, follow a
-// canonical order, might have a version number (major, minor)
-// and are separated by a single underscore '_'.
-// Set the hardware features for the extensions that are supported.
-static void getExtensionFeatures(const Driver &D,
-                                 const ArgList &Args,
-                                 std::vector<StringRef> &Features,
-                                 StringRef &MArch, StringRef &Exts) {
-  if (Exts.empty())
-    return;
-
-  // Multi-letter extensions are seperated by a single underscore
-  // as described in RISC-V User-Level ISA V2.2.
-  SmallVector<StringRef, 8> Split;
-  Exts.split(Split, StringRef("_"));
-
-  SmallVector<StringRef, 4> Prefix{"z", "x", "s", "sx"};
-  auto I = Prefix.begin();
-  auto E = Prefix.end();
-
-  SmallVector<StringRef, 8> AllExts;
-
-  for (StringRef Ext : Split) {
-    if (Ext.empty()) {
-      D.Diag(diag::err_drv_invalid_riscv_arch_name) << MArch
-        << "extension name missing after separator '_'";
-      return;
-    }
-
-    StringRef Type = getExtensionType(Ext);
-    StringRef Desc = getExtensionTypeDesc(Ext);
-    auto Pos = Ext.find_if(isDigit);
-    StringRef Name(Ext.substr(0, Pos));
-    StringRef Vers(Ext.substr(Pos));
-
-    if (Type.empty()) {
-      D.Diag(diag::err_drv_invalid_riscv_ext_arch_name)
-        << MArch << "invalid extension prefix" << Ext;
-      return;
-    }
-
-    // Check ISA extensions are specified in the canonical order.
-    while (I != E && *I != Type)
-      ++I;
-
-    if (I == E) {
-      std::string Error = std::string(Desc);
-      Error += " not given in canonical order";
-      D.Diag(diag::err_drv_invalid_riscv_ext_arch_name)
-        << MArch <<  Error << Ext;
-      return;
-    }
-
-    // The order is OK, do not advance I to the next prefix
-    // to allow repeated extension type, e.g.: rv32ixabc_xdef.
-
-    if (Name.size() == Type.size()) {
-      std::string Error = std::string(Desc);
-      Error += " name missing after";
-      D.Diag(diag::err_drv_invalid_riscv_ext_arch_name)
-        << MArch << Error << Type;
-      return;
-    }
-
-    std::string Major, Minor;
-    if (!getExtensionVersion(D, Args, MArch, Name, Vers, Major, Minor))
-      return;
-
-    // Check if duplicated extension.
-    if (llvm::is_contained(AllExts, Name)) {
-      std::string Error = "duplicated ";
-      Error += Desc;
-      D.Diag(diag::err_drv_invalid_riscv_ext_arch_name)
-        << MArch << Error << Name;
-      return;
-    }
-
-    // Extension format is correct, keep parsing the extensions.
-    // TODO: Save Type, Name, Major, Minor to avoid parsing them later.
-    AllExts.push_back(Name);
-  }
-
-  // Set target features.
-  // TODO: Hardware features to be handled in Support/TargetParser.cpp.
-  // TODO: Use version number when setting target features.
-  for (auto Ext : AllExts) {
-    if (!isSupportedExtension(Ext)) {
-      StringRef Desc = getExtensionTypeDesc(getExtensionType(Ext));
-      std::string Error = "unsupported ";
-      Error += Desc;
-      D.Diag(diag::err_drv_invalid_riscv_ext_arch_name)
-        << MArch << Error << Ext;
-      return;
-    }
-    if (Ext == "zvlsseg") {
-      Features.push_back("+experimental-v");
-      Features.push_back("+experimental-zvlsseg");
-    } else if (Ext == "zvamo") {
-      Features.push_back("+experimental-v");
-      Features.push_back("+experimental-zvlsseg");
-      Features.push_back("+experimental-zvamo");
-    } else if (isExperimentalExtension(Ext))
-      Features.push_back(Args.MakeArgString("+experimental-" + Ext));
-    else
-      Features.push_back(Args.MakeArgString("+" + Ext));
-  }
-}
-
 // Returns false if an error is diagnosed.
-static bool getArchFeatures(const Driver &D, StringRef MArch,
+static bool getArchFeatures(const Driver &D, StringRef Arch,
                             std::vector<StringRef> &Features,
                             const ArgList &Args) {
-  // RISC-V ISA strings must be lowercase.
-  if (llvm::any_of(MArch, [](char c) { return isupper(c); })) {
-    D.Diag(diag::err_drv_invalid_riscv_arch_name)
-        << MArch << "string must be lowercase";
-    return false;
-  }
+  bool EnableExperimentalExtensions =
+      Args.hasArg(options::OPT_menable_experimental_extensions);
+  auto ISAInfo =
+      llvm::RISCVISAInfo::parseArchString(Arch, EnableExperimentalExtensions);
+  if (!ISAInfo) {
+    handleAllErrors(ISAInfo.takeError(), [&](llvm::StringError &ErrMsg) {
+      D.Diag(diag::err_drv_invalid_riscv_arch_name)
+          << Arch << ErrMsg.getMessage();
+    });
 
-  // ISA string must begin with rv32 or rv64.
-  if (!(MArch.startswith("rv32") || MArch.startswith("rv64")) ||
-      (MArch.size() < 5)) {
-    D.Diag(diag::err_drv_invalid_riscv_arch_name)
-        << MArch << "string must begin with rv32{i,e,g} or rv64{i,g}";
     return false;
   }
 
-  bool HasRV64 = MArch.startswith("rv64");
-
-  // The canonical order specified in ISA manual.
-  // Ref: Table 22.1 in RISC-V User-Level ISA V2.2
-  StringRef StdExts = "mafdqlcbjtpvn";
-  bool HasF = false, HasD = false;
-  char Baseline = MArch[4];
-
-  // First letter should be 'e', 'i' or 'g'.
-  switch (Baseline) {
-  default:
-    D.Diag(diag::err_drv_invalid_riscv_arch_name)
-        << MArch << "first letter should be 'e', 'i' or 'g'";
-    return false;
-  case 'e': {
-    StringRef Error;
-    // Currently LLVM does not support 'e'.
-    // Extension 'e' is not allowed in rv64.
-    if (HasRV64)
-      Error = "standard user-level extension 'e' requires 'rv32'";
-    else
-      Error = "unsupported standard user-level extension 'e'";
-    D.Diag(diag::err_drv_invalid_riscv_arch_name) << MArch << Error;
-    return false;
-  }
-  case 'i':
-    break;
-  case 'g':
-    // g = imafd
-    StdExts = StdExts.drop_front(4);
-    Features.push_back("+m");
-    Features.push_back("+a");
-    Features.push_back("+f");
-    Features.push_back("+d");
-    HasF = true;
-    HasD = true;
-    break;
-  }
-
-  // Skip rvxxx
-  StringRef Exts = MArch.substr(5);
-
-  // Remove multi-letter standard extensions, non-standard extensions and
-  // supervisor-level extensions. They have 'z', 'x', 's', 'sx' prefixes.
-  // Parse them at the end.
-  // Find the very first occurrence of 's', 'x' or 'z'.
-  StringRef OtherExts;
-  size_t Pos = Exts.find_first_of("zsx");
-  if (Pos != StringRef::npos) {
-    OtherExts = Exts.substr(Pos);
-    Exts = Exts.substr(0, Pos);
-  }
-
-  std::string Major, Minor;
-  if (!getExtensionVersion(D, Args, MArch, std::string(1, Baseline), Exts,
-                           Major, Minor))
-    return false;
-
-  // Consume the base ISA version number and any '_' between rvxxx and the
-  // first extension
-  Exts = Exts.drop_front(Major.size());
-  if (!Minor.empty())
-    Exts = Exts.drop_front(Minor.size() + 1 /*'p'*/);
-  Exts.consume_front("_");
-
-  // TODO: Use version number when setting target features
-
-  auto StdExtsItr = StdExts.begin();
-  auto StdExtsEnd = StdExts.end();
-
-  for (auto I = Exts.begin(), E = Exts.end(); I != E; ) {
-    char c = *I;
-
-    // Check ISA extensions are specified in the canonical order.
-    while (StdExtsItr != StdExtsEnd && *StdExtsItr != c)
-      ++StdExtsItr;
-
-    if (StdExtsItr == StdExtsEnd) {
-      // Either c contains a valid extension but it was not given in
-      // canonical order or it is an invalid extension.
-      StringRef Error;
-      if (StdExts.contains(c))
-        Error = "standard user-level extension not given in canonical order";
-      else
-        Error = "invalid standard user-level extension";
-      D.Diag(diag::err_drv_invalid_riscv_ext_arch_name)
-          << MArch << Error << std::string(1, c);
-      return false;
-    }
-
-    // Move to next char to prevent repeated letter.
-    ++StdExtsItr;
-
-    std::string Next, Major, Minor;
-    if (std::next(I) != E)
-      Next = std::string(std::next(I), E);
-    if (!getExtensionVersion(D, Args, MArch, std::string(1, c), Next, Major,
-                             Minor))
-      return false;
-
-    // The order is OK, then push it into features.
-    // TODO: Use version number when setting target features
-    switch (c) {
-    default:
-      // Currently LLVM supports only "mafdc".
-      D.Diag(diag::err_drv_invalid_riscv_ext_arch_name)
-          << MArch << "unsupported standard user-level extension"
-          << std::string(1, c);
-      return false;
-    case 'm':
-      Features.push_back("+m");
-      break;
-    case 'a':
-      Features.push_back("+a");
-      break;
-    case 'f':
-      Features.push_back("+f");
-      HasF = true;
-      break;
-    case 'd':
-      Features.push_back("+d");
-      HasD = true;
-      break;
-    case 'c':
-      Features.push_back("+c");
-      break;
-    case 'b':
-      Features.push_back("+experimental-b");
-      Features.push_back("+experimental-zba");
-      Features.push_back("+experimental-zbb");
-      Features.push_back("+experimental-zbc");
-      Features.push_back("+experimental-zbe");
-      Features.push_back("+experimental-zbf");
-      Features.push_back("+experimental-zbm");
-      Features.push_back("+experimental-zbp");
-      Features.push_back("+experimental-zbr");
-      Features.push_back("+experimental-zbs");
-      Features.push_back("+experimental-zbt");
-      break;
-    case 'v':
-      Features.push_back("+experimental-v");
-      Features.push_back("+experimental-zvlsseg");
-      break;
-    }
-
-    // Consume full extension name and version, including any optional '_'
-    // between this extension and the next
-    ++I;
-    I += Major.size();
-    if (Minor.size())
-      I += Minor.size() + 1 /*'p'*/;
-    if (*I == '_')
-      ++I;
-  }
-
-  // Dependency check.
-  // It's illegal to specify the 'd' (double-precision floating point)
-  // extension without also specifying the 'f' (single precision
-  // floating-point) extension.
-  if (HasD && !HasF) {
-    D.Diag(diag::err_drv_invalid_riscv_arch_name)
-        << MArch << "d requires f extension to also be specified";
-    return false;
-  }
-
-  // Additional dependency checks.
-  // TODO: The 'q' extension requires rv64.
-  // TODO: It is illegal to specify 'e' extensions with 'f' and 'd'.
-
-  // Handle all other types of extensions.
-  getExtensionFeatures(D, Args, Features, MArch, OtherExts);
-
+  (*ISAInfo)->toFeatures(
+      Features, [&Args](const Twine &Str) { return Args.MakeArgString(Str); },
+      /*AddAllExtensions=*/true);
   return true;
 }
 
 // Get features except standard extension feature
-static void getRISCFeaturesFromMcpu(const Driver &D, const llvm::Triple &Triple,
-                                    const llvm::opt::ArgList &Args,
-                                    const llvm::opt::Arg *A, StringRef Mcpu,
+static bool getRISCFeaturesFromMcpu(const llvm::Triple &Triple, StringRef Mcpu,
                                     std::vector<StringRef> &Features) {
-  bool Is64Bit = (Triple.getArch() == llvm::Triple::riscv64);
+  bool Is64Bit = Triple.isRISCV64();
   llvm::RISCV::CPUKind CPUKind = llvm::RISCV::parseCPUKind(Mcpu);
-  if (!llvm::RISCV::checkCPUKind(CPUKind, Is64Bit) ||
-      !llvm::RISCV::getCPUFeaturesExceptStdExt(CPUKind, Features)) {
-    D.Diag(clang::diag::err_drv_clang_unsupported) << A->getAsString(Args);
-  }
+  return llvm::RISCV::checkCPUKind(CPUKind, Is64Bit) &&
+         llvm::RISCV::getCPUFeaturesExceptStdExt(CPUKind, Features);
 }
 
 void riscv::getRISCVTargetFeatures(const Driver &D, const llvm::Triple &Triple,
@@ -489,8 +67,14 @@ void riscv::getRISCVTargetFeatures(const Driver &D, const llvm::Triple &Triple,
 
   // If users give march and mcpu, get std extension feature from MArch
   // and other features (ex. mirco architecture feature) from mcpu
-  if (Arg *A = Args.getLastArg(options::OPT_mcpu_EQ))
-    getRISCFeaturesFromMcpu(D, Triple, Args, A, A->getValue(), Features);
+  if (Arg *A = Args.getLastArg(options::OPT_mcpu_EQ)) {
+    StringRef CPU = A->getValue();
+    if (CPU == "native")
+      CPU = llvm::sys::getHostCPUName();
+    if (!getRISCFeaturesFromMcpu(Triple, CPU, Features))
+      D.Diag(clang::diag::err_drv_unsupported_option_argument)
+          << A->getSpelling() << CPU;
+  }
 
   // Handle features corresponding to "-ffixed-X" options
   if (Args.hasArg(options::OPT_ffixed_x1))
@@ -564,10 +148,17 @@ void riscv::getRISCVTargetFeatures(const Driver &D, const llvm::Triple &Triple,
     Features.push_back("-relax");
 #else
   // -mrelax is default, unless -mno-relax is specified.
-  if (Args.hasFlag(options::OPT_mrelax, options::OPT_mno_relax, true))
+  if (Args.hasFlag(options::OPT_mrelax, options::OPT_mno_relax, true)) {
     Features.push_back("+relax");
-  else
+    // -gsplit-dwarf -mrelax requires DW_AT_high_pc/DW_AT_ranges/... indexing
+    // into .debug_addr, which is currently not implemented.
+    Arg *A;
+    if (getDebugFissionKind(D, Args, A) != DwarfFissionKind::None)
+      D.Diag(clang::diag::err_drv_riscv_unsupported_with_linker_relaxation)
+          << A->getAsString(Args);
+  } else {
     Features.push_back("-relax");
+  }
 #endif
 
   // GCC Compatibility: -mno-save-restore is default, unless -msave-restore is
@@ -583,9 +174,7 @@ void riscv::getRISCVTargetFeatures(const Driver &D, const llvm::Triple &Triple,
 }
 
 StringRef riscv::getRISCVABI(const ArgList &Args, const llvm::Triple &Triple) {
-  assert((Triple.getArch() == llvm::Triple::riscv32 ||
-          Triple.getArch() == llvm::Triple::riscv64) &&
-         "Unexpected triple");
+  assert(Triple.isRISCV() && "Unexpected triple");
 
   // GCC's logic around choosing a default `-mabi=` is complex. If GCC is not
   // configured using `--with-abi=`, then the logic for the default choice is
@@ -618,32 +207,22 @@ StringRef riscv::getRISCVABI(const ArgList &Args, const llvm::Triple &Triple) {
   // rv32* -> ilp32
   // rv64g | rv64*d -> lp64d
   // rv64* -> lp64
-  StringRef MArch = getRISCVArch(Args, Triple);
+  StringRef Arch = getRISCVArch(Args, Triple);
 
-  if (MArch.startswith_insensitive("rv32")) {
-    // FIXME: parse `March` to find `D` extension properly
-    if (MArch.substr(4).contains_insensitive("d") ||
-        MArch.startswith_insensitive("rv32g"))
-      return "ilp32d";
-    else if (MArch.startswith_insensitive("rv32e"))
-      return "ilp32e";
-    else
-      return "ilp32";
-  } else if (MArch.startswith_insensitive("rv64")) {
-    // FIXME: parse `March` to find `D` extension properly
-    if (MArch.substr(4).contains_insensitive("d") ||
-        MArch.startswith_insensitive("rv64g"))
-      return "lp64d";
-    else
-      return "lp64";
-  }
+  auto ParseResult = llvm::RISCVISAInfo::parseArchString(
+      Arch, /* EnableExperimentalExtension */ true);
+  if (!ParseResult)
+    // Ignore parsing error, just go 3rd step.
+    consumeError(ParseResult.takeError());
+  else
+    return (*ParseResult)->computeDefaultABI();
 
   // 3. Choose a default based on the triple
   //
   // We deviate from GCC's defaults here:
   // - On `riscv{XLEN}-unknown-elf` we use the integer calling convention only.
   // - On all other OSs we use the double floating point calling convention.
-  if (Triple.getArch() == llvm::Triple::riscv32) {
+  if (Triple.isRISCV32()) {
     if (Triple.getOS() == llvm::Triple::UnknownOS)
       return "ilp32";
     else
@@ -658,9 +237,7 @@ StringRef riscv::getRISCVABI(const ArgList &Args, const llvm::Triple &Triple) {
 
 StringRef riscv::getRISCVArch(const llvm::opt::ArgList &Args,
                               const llvm::Triple &Triple) {
-  assert((Triple.getArch() == llvm::Triple::riscv32 ||
-          Triple.getArch() == llvm::Triple::riscv64) &&
-         "Unexpected triple");
+  assert(Triple.isRISCV() && "Unexpected triple");
 
   // GCC's logic around choosing a default `-march=` is complex. If GCC is not
   // configured using `--with-arch=`, then the logic for the default choice is
@@ -694,7 +271,10 @@ StringRef riscv::getRISCVArch(const llvm::opt::ArgList &Args,
 
   // 2. Get march (isa string) based on `-mcpu=`
   if (const Arg *A = Args.getLastArg(options::OPT_mcpu_EQ)) {
-    StringRef MArch = llvm::RISCV::getMArchFromMcpu(A->getValue());
+    StringRef CPU = A->getValue();
+    if (CPU == "native")
+      CPU = llvm::sys::getHostCPUName();
+    StringRef MArch = llvm::RISCV::getMArchFromMcpu(CPU);
     // Bypass if target cpu's default march is empty.
     if (MArch != "")
       return MArch;
@@ -721,7 +301,7 @@ StringRef riscv::getRISCVArch(const llvm::opt::ArgList &Args,
   // We deviate from GCC's defaults here:
   // - On `riscv{XLEN}-unknown-elf` we default to `rv{XLEN}imac`
   // - On all other OSs we use `rv{XLEN}imafdc` (equivalent to `rv{XLEN}gc`)
-  if (Triple.getArch() == llvm::Triple::riscv32) {
+  if (Triple.isRISCV32()) {
     if (Triple.getOS() == llvm::Triple::UnknownOS)
       return "rv32imac";
     else
@@ -733,3 +313,20 @@ StringRef riscv::getRISCVArch(const llvm::opt::ArgList &Args,
       return "rv64imafdc";
   }
 }
+
+std::string riscv::getRISCVTargetCPU(const llvm::opt::ArgList &Args,
+                                     const llvm::Triple &Triple) {
+  std::string CPU;
+  // If we have -mcpu, use that.
+  if (const Arg *A = Args.getLastArg(options::OPT_mcpu_EQ))
+    CPU = A->getValue();
+
+  // Handle CPU name is 'native'.
+  if (CPU == "native")
+    CPU = llvm::sys::getHostCPUName();
+
+  if (!CPU.empty())
+    return CPU;
+
+  return Triple.isRISCV64() ? "generic-rv64" : "generic-rv32";
+}
diff --git a/gnu/llvm/clang/lib/Driver/ToolChains/Arch/X86.cpp b/gnu/llvm/clang/lib/Driver/ToolChains/Arch/X86.cpp
index f09c88a23a1..c7de29996ae 100644
--- a/gnu/llvm/clang/lib/Driver/ToolChains/Arch/X86.cpp
+++ b/gnu/llvm/clang/lib/Driver/ToolChains/Arch/X86.cpp
@@ -11,7 +11,8 @@
 #include "clang/Driver/Driver.h"
 #include "clang/Driver/DriverDiagnostic.h"
 #include "clang/Driver/Options.h"
-#include "llvm/ADT/StringSwitch.h"
+#include "llvm/ADT/StringExtras.h"
+#include "llvm/ADT/StringMap.h"
 #include "llvm/Option/ArgList.h"
 #include "llvm/Support/Host.h"
 
@@ -20,7 +21,7 @@ using namespace clang::driver::tools;
 using namespace clang;
 using namespace llvm::opt;
 
-std::string x86::getX86TargetCPU(const ArgList &Args,
+std::string x86::getX86TargetCPU(const Driver &D, const ArgList &Args,
                                  const llvm::Triple &Triple) {
   if (const Arg *A = Args.getLastArg(clang::driver::options::OPT_march_EQ)) {
     StringRef CPU = A->getValue();
@@ -29,37 +30,39 @@ std::string x86::getX86TargetCPU(const ArgList &Args,
 
     // FIXME: Reject attempts to use -march=native unless the target matches
     // the host.
-    //
-    // FIXME: We should also incorporate the detected target features for use
-    // with -native.
     CPU = llvm::sys::getHostCPUName();
     if (!CPU.empty() && CPU != "generic")
       return std::string(CPU);
   }
 
-  if (const Arg *A = Args.getLastArgNoClaim(options::OPT__SLASH_arch)) {
+  if (const Arg *A = Args.getLastArg(options::OPT__SLASH_arch)) {
     // Mapping built by looking at lib/Basic's X86TargetInfo::initFeatureMap().
-    StringRef Arch = A->getValue();
-    StringRef CPU;
-    if (Triple.getArch() == llvm::Triple::x86) {  // 32-bit-only /arch: flags.
-      CPU = llvm::StringSwitch<StringRef>(Arch)
-                .Case("IA32", "i386")
-                .Case("SSE", "pentium3")
-                .Case("SSE2", "pentium4")
-                .Default("");
+    // The keys are case-sensitive; this matches link.exe.
+    // 32-bit and 64-bit /arch: flags.
+    llvm::StringMap<StringRef> ArchMap({
+        {"AVX", "sandybridge"},
+        {"AVX2", "haswell"},
+        {"AVX512F", "knl"},
+        {"AVX512", "skylake-avx512"},
+    });
+    if (Triple.getArch() == llvm::Triple::x86) {
+      // 32-bit-only /arch: flags.
+      ArchMap.insert({
+          {"IA32", "i386"},
+          {"SSE", "pentium3"},
+          {"SSE2", "pentium4"},
+      });
     }
-    if (CPU.empty()) {  // 32-bit and 64-bit /arch: flags.
-      CPU = llvm::StringSwitch<StringRef>(Arch)
-                .Case("AVX", "sandybridge")
-                .Case("AVX2", "haswell")
-                .Case("AVX512F", "knl")
-                .Case("AVX512", "skylake-avx512")
-                .Default("");
-    }
-    if (!CPU.empty()) {
-      A->claim();
-      return std::string(CPU);
+    StringRef CPU = ArchMap.lookup(A->getValue());
+    if (CPU.empty()) {
+      std::vector<StringRef> ValidArchs{ArchMap.keys().begin(),
+                                        ArchMap.keys().end()};
+      sort(ValidArchs);
+      D.Diag(diag::warn_drv_invalid_arch_name_with_suggestion)
+          << A->getValue() << (Triple.getArch() == llvm::Triple::x86)
+          << join(ValidArchs, ", ");
     }
+    return std::string(CPU);
   }
 
   // Select the default CPU if none was given (or detection failed).
@@ -77,13 +80,19 @@ std::string x86::getX86TargetCPU(const ArgList &Args,
     // Simulators can still run on 10.11 though, like Xcode.
     if (Triple.isMacOSX() && !Triple.isOSVersionLT(10, 12))
       return "penryn";
+
+    if (Triple.isDriverKit())
+      return "nehalem";
+
     // The oldest x86_64 Macs have core2/Merom; the oldest x86 Macs have Yonah.
     return Is64Bit ? "core2" : "yonah";
   }
 
-  // Set up default CPU name for PS4 compilers.
-  if (Triple.isPS4CPU())
+  // Set up default CPU name for PS4/PS5 compilers.
+  if (Triple.isPS4())
     return "btver2";
+  if (Triple.isPS5())
+    return "znver2";
 
   // On Android use targets compatible with gcc
   if (Triple.isAndroid())
@@ -239,4 +248,20 @@ void x86::getX86TargetFeatures(const Driver &D, const llvm::Triple &Triple,
       Name = Name.substr(3);
     Features.push_back(Args.MakeArgString((IsNegative ? "-" : "+") + Name));
   }
+
+  // Enable/disable straight line speculation hardening.
+  if (Arg *A = Args.getLastArg(options::OPT_mharden_sls_EQ)) {
+    StringRef Scope = A->getValue();
+    if (Scope == "all") {
+      Features.push_back("+harden-sls-ijmp");
+      Features.push_back("+harden-sls-ret");
+    } else if (Scope == "return") {
+      Features.push_back("+harden-sls-ret");
+    } else if (Scope == "indirect-jmp") {
+      Features.push_back("+harden-sls-ijmp");
+    } else if (Scope != "none") {
+      D.Diag(diag::err_drv_unsupported_option_argument)
+          << A->getSpelling() << Scope;
+    }
+  }
 }
diff --git a/gnu/llvm/clang/lib/Driver/ToolChains/Clang.cpp b/gnu/llvm/clang/lib/Driver/ToolChains/Clang.cpp
index 7d448c0ff14..1300c5667bc 100644
--- a/gnu/llvm/clang/lib/Driver/ToolChains/Clang.cpp
+++ b/gnu/llvm/clang/lib/Driver/ToolChains/Clang.cpp
@@ -10,6 +10,8 @@
 #include "AMDGPU.h"
 #include "Arch/AArch64.h"
 #include "Arch/ARM.h"
+#include "Arch/CSKY.h"
+#include "Arch/LoongArch.h"
 #include "Arch/M68k.h"
 #include "Arch/Mips.h"
 #include "Arch/PPC.h"
@@ -22,20 +24,28 @@
 #include "Hexagon.h"
 #include "MSP430.h"
 #include "PS4CPU.h"
+#include "clang/Basic/CLWarnings.h"
 #include "clang/Basic/CharInfo.h"
 #include "clang/Basic/CodeGenOptions.h"
+#include "clang/Basic/HeaderInclude.h"
 #include "clang/Basic/LangOptions.h"
+#include "clang/Basic/MakeSupport.h"
 #include "clang/Basic/ObjCRuntime.h"
 #include "clang/Basic/Version.h"
+#include "clang/Config/config.h"
+#include "clang/Driver/Action.h"
 #include "clang/Driver/Distro.h"
 #include "clang/Driver/DriverDiagnostic.h"
 #include "clang/Driver/InputInfo.h"
 #include "clang/Driver/Options.h"
 #include "clang/Driver/SanitizerArgs.h"
+#include "clang/Driver/Types.h"
 #include "clang/Driver/XRayArgs.h"
+#include "llvm/ADT/SmallSet.h"
 #include "llvm/ADT/StringExtras.h"
 #include "llvm/Config/llvm-config.h"
 #include "llvm/Option/ArgList.h"
+#include "llvm/Support/ARMTargetParserCommon.h"
 #include "llvm/Support/CodeGen.h"
 #include "llvm/Support/Compiler.h"
 #include "llvm/Support/Compression.h"
@@ -43,8 +53,8 @@
 #include "llvm/Support/Host.h"
 #include "llvm/Support/Path.h"
 #include "llvm/Support/Process.h"
-#include "llvm/Support/TargetParser.h"
 #include "llvm/Support/YAMLParser.h"
+#include <cctype>
 
 using namespace clang::driver;
 using namespace clang::driver::tools;
@@ -52,8 +62,9 @@ using namespace clang;
 using namespace llvm::opt;
 
 static void CheckPreprocessingOptions(const Driver &D, const ArgList &Args) {
-  if (Arg *A =
-          Args.getLastArg(clang::driver::options::OPT_C, options::OPT_CC)) {
+  if (Arg *A = Args.getLastArg(clang::driver::options::OPT_C, options::OPT_CC,
+                               options::OPT_fminimize_whitespace,
+                               options::OPT_fno_minimize_whitespace)) {
     if (!Args.hasArg(options::OPT_E) && !Args.hasArg(options::OPT__SLASH_P) &&
         !Args.hasArg(options::OPT__SLASH_EP) && !D.CCCIsCPP()) {
       D.Diag(clang::diag::err_drv_argument_only_allowed_with)
@@ -90,34 +101,6 @@ static void EscapeSpacesAndBackslashes(const char *Arg,
   }
 }
 
-// Quote target names for inclusion in GNU Make dependency files.
-// Only the characters '$', '#', ' ', '\t' are quoted.
-static void QuoteTarget(StringRef Target, SmallVectorImpl<char> &Res) {
-  for (unsigned i = 0, e = Target.size(); i != e; ++i) {
-    switch (Target[i]) {
-    case ' ':
-    case '\t':
-      // Escape the preceding backslashes
-      for (int j = i - 1; j >= 0 && Target[j] == '\\'; --j)
-        Res.push_back('\\');
-
-      // Escape the space/tab
-      Res.push_back('\\');
-      break;
-    case '$':
-      Res.push_back('$');
-      break;
-    case '#':
-      Res.push_back('\\');
-      break;
-    default:
-      break;
-    }
-
-    Res.push_back(Target[i]);
-  }
-}
-
 /// Apply \a Work on the current tool chain \a RegularToolChain and any other
 /// offloading tool chain that is associated with the current action \a JA.
 static void
@@ -220,12 +203,16 @@ static void ParseMRecip(const Driver &D, const ArgList &Args,
   llvm::StringMap<bool> OptionStrings;
   OptionStrings.insert(std::make_pair("divd", false));
   OptionStrings.insert(std::make_pair("divf", false));
+  OptionStrings.insert(std::make_pair("divh", false));
   OptionStrings.insert(std::make_pair("vec-divd", false));
   OptionStrings.insert(std::make_pair("vec-divf", false));
+  OptionStrings.insert(std::make_pair("vec-divh", false));
   OptionStrings.insert(std::make_pair("sqrtd", false));
   OptionStrings.insert(std::make_pair("sqrtf", false));
+  OptionStrings.insert(std::make_pair("sqrth", false));
   OptionStrings.insert(std::make_pair("vec-sqrtd", false));
   OptionStrings.insert(std::make_pair("vec-sqrtf", false));
+  OptionStrings.insert(std::make_pair("vec-sqrth", false));
 
   for (unsigned i = 0; i != NumOptions; ++i) {
     StringRef Val = A->getValue(i);
@@ -249,10 +236,11 @@ static void ParseMRecip(const Driver &D, const ArgList &Args,
         D.Diag(diag::err_drv_unknown_argument) << Val;
         return;
       }
-      // The option was specified without a float or double suffix.
-      // Make sure that the double entry was not already specified.
+      // The option was specified without a half or float or double suffix.
+      // Make sure that the double or half entry was not already specified.
       // The float entry will be checked below.
-      if (OptionStrings[ValBase.str() + 'd']) {
+      if (OptionStrings[ValBase.str() + 'd'] ||
+          OptionStrings[ValBase.str() + 'h']) {
         D.Diag(diag::err_drv_invalid_value) << A->getOption().getName() << Val;
         return;
       }
@@ -267,9 +255,12 @@ static void ParseMRecip(const Driver &D, const ArgList &Args,
     // Mark the matched option as found. Do not allow duplicate specifiers.
     OptionIter->second = true;
 
-    // If the precision was not specified, also mark the double entry as found.
-    if (ValBase.back() != 'f' && ValBase.back() != 'd')
+    // If the precision was not specified, also mark the double and half entry
+    // as found.
+    if (ValBase.back() != 'f' && ValBase.back() != 'd' && ValBase.back() != 'h') {
       OptionStrings[ValBase.str() + 'd'] = true;
+      OptionStrings[ValBase.str() + 'h'] = true;
+    }
 
     // Build the output string.
     StringRef Prefix = IsDisabled ? DisabledPrefixOut : EnabledPrefixOut;
@@ -302,87 +293,6 @@ static void ParseMPreferVectorWidth(const Driver &D, const ArgList &Args,
   }
 }
 
-static void getWebAssemblyTargetFeatures(const ArgList &Args,
-                                         std::vector<StringRef> &Features) {
-  handleTargetFeaturesGroup(Args, Features, options::OPT_m_wasm_Features_Group);
-}
-
-static void getTargetFeatures(const Driver &D, const llvm::Triple &Triple,
-                              const ArgList &Args, ArgStringList &CmdArgs,
-                              bool ForAS, bool IsAux = false) {
-  std::vector<StringRef> Features;
-  switch (Triple.getArch()) {
-  default:
-    break;
-  case llvm::Triple::mips:
-  case llvm::Triple::mipsel:
-  case llvm::Triple::mips64:
-  case llvm::Triple::mips64el:
-    mips::getMIPSTargetFeatures(D, Triple, Args, Features);
-    break;
-
-  case llvm::Triple::arm:
-  case llvm::Triple::armeb:
-  case llvm::Triple::thumb:
-  case llvm::Triple::thumbeb:
-    arm::getARMTargetFeatures(D, Triple, Args, CmdArgs, Features, ForAS);
-    break;
-
-  case llvm::Triple::ppc:
-  case llvm::Triple::ppcle:
-  case llvm::Triple::ppc64:
-  case llvm::Triple::ppc64le:
-    ppc::getPPCTargetFeatures(D, Triple, Args, Features);
-    break;
-  case llvm::Triple::riscv32:
-  case llvm::Triple::riscv64:
-    riscv::getRISCVTargetFeatures(D, Triple, Args, Features);
-    break;
-  case llvm::Triple::systemz:
-    systemz::getSystemZTargetFeatures(D, Args, Features);
-    break;
-  case llvm::Triple::aarch64:
-  case llvm::Triple::aarch64_32:
-  case llvm::Triple::aarch64_be:
-    aarch64::getAArch64TargetFeatures(D, Triple, Args, Features, ForAS);
-    break;
-  case llvm::Triple::x86:
-  case llvm::Triple::x86_64:
-    x86::getX86TargetFeatures(D, Triple, Args, Features);
-    break;
-  case llvm::Triple::hexagon:
-    hexagon::getHexagonTargetFeatures(D, Args, Features);
-    break;
-  case llvm::Triple::wasm32:
-  case llvm::Triple::wasm64:
-    getWebAssemblyTargetFeatures(Args, Features);
-    break;
-  case llvm::Triple::sparc:
-  case llvm::Triple::sparcel:
-  case llvm::Triple::sparcv9:
-    sparc::getSparcTargetFeatures(D, Args, Features);
-    break;
-  case llvm::Triple::r600:
-  case llvm::Triple::amdgcn:
-    amdgpu::getAMDGPUTargetFeatures(D, Triple, Args, Features);
-    break;
-  case llvm::Triple::m68k:
-    m68k::getM68kTargetFeatures(D, Triple, Args, Features);
-    break;
-  case llvm::Triple::msp430:
-    msp430::getMSP430TargetFeatures(D, Args, Features);
-    break;
-  case llvm::Triple::ve:
-    ve::getVETargetFeatures(D, Args, Features);
-    break;
-  }
-
-  for (auto Feature : unifyTargetFeatures(Features)) {
-    CmdArgs.push_back(IsAux ? "-aux-target-feature" : "-target-feature");
-    CmdArgs.push_back(Feature.data());
-  }
-}
-
 static bool
 shouldUseExceptionTablesForObjCExceptions(const ObjCRuntime &runtime,
                                           const llvm::Triple &Triple) {
@@ -401,7 +311,7 @@ shouldUseExceptionTablesForObjCExceptions(const ObjCRuntime &runtime,
 }
 
 /// Adds exception related arguments to the driver command arguments. There's a
-/// master flag, -fexceptions and also language specific flags to enable/disable
+/// main flag, -fexceptions and also language specific flags to enable/disable
 /// C++ and Objective-C exceptions. This makes it possible to for example
 /// disable C++ exceptions but enable Objective-C exceptions.
 static bool addExceptionArgs(const ArgList &Args, types::ID InputType,
@@ -446,9 +356,9 @@ static bool addExceptionArgs(const ArgList &Args, types::ID InputType,
   }
 
   if (types::isCXX(InputType)) {
-    // Disable C++ EH by default on XCore and PS4.
-    bool CXXExceptionsEnabled =
-        Triple.getArch() != llvm::Triple::xcore && !Triple.isPS4CPU();
+    // Disable C++ EH by default on XCore and PS4/PS5.
+    bool CXXExceptionsEnabled = Triple.getArch() != llvm::Triple::xcore &&
+                                !Triple.isPS() && !Triple.isDriverKit();
     Arg *ExceptionArg = Args.getLastArg(
         options::OPT_fcxx_exceptions, options::OPT_fno_cxx_exceptions,
         options::OPT_fexceptions, options::OPT_fno_exceptions);
@@ -537,14 +447,20 @@ static bool useFramePointerForTargetByDefault(const ArgList &Args,
   case llvm::Triple::ppc64le:
   case llvm::Triple::riscv32:
   case llvm::Triple::riscv64:
+  case llvm::Triple::sparc:
+  case llvm::Triple::sparcel:
+  case llvm::Triple::sparcv9:
   case llvm::Triple::amdgcn:
   case llvm::Triple::r600:
+  case llvm::Triple::csky:
+  case llvm::Triple::loongarch32:
+  case llvm::Triple::loongarch64:
     return !areOptimizationsEnabled(Args);
   default:
     break;
   }
 
-  if (Triple.isOSNetBSD()) {
+  if (Triple.isOSFuchsia() || Triple.isOSNetBSD()) {
     return !areOptimizationsEnabled(Args);
   }
 
@@ -558,7 +474,7 @@ static bool useFramePointerForTargetByDefault(const ArgList &Args,
     case llvm::Triple::thumbeb:
       if (Triple.isAndroid())
         return true;
-      LLVM_FALLTHROUGH;
+      [[fallthrough]];
     case llvm::Triple::mips64:
     case llvm::Triple::mips64el:
     case llvm::Triple::mips:
@@ -609,9 +525,10 @@ getFramePointerKind(const ArgList &Args, const llvm::Triple &Triple) {
   bool OmitFP = A && A->getOption().matches(options::OPT_fomit_frame_pointer);
   bool NoOmitFP =
       A && A->getOption().matches(options::OPT_fno_omit_frame_pointer);
-  bool OmitLeafFP = Args.hasFlag(options::OPT_momit_leaf_frame_pointer,
-                                 options::OPT_mno_omit_leaf_frame_pointer,
-                                 Triple.isAArch64() || Triple.isPS4CPU());
+  bool OmitLeafFP =
+      Args.hasFlag(options::OPT_momit_leaf_frame_pointer,
+                   options::OPT_mno_omit_leaf_frame_pointer,
+                   Triple.isAArch64() || Triple.isPS() || Triple.isVE());
   if (NoOmitFP || mustUseNonLeafFramePointerForTarget(Triple) ||
       (!OmitFP && useFramePointerForTargetByDefault(Args, Triple))) {
     if (OmitLeafFP)
@@ -622,8 +539,9 @@ getFramePointerKind(const ArgList &Args, const llvm::Triple &Triple) {
 }
 
 /// Add a CC1 option to specify the debug compilation directory.
-static void addDebugCompDirArg(const ArgList &Args, ArgStringList &CmdArgs,
-                               const llvm::vfs::FileSystem &VFS) {
+static const char *addDebugCompDirArg(const ArgList &Args,
+                                      ArgStringList &CmdArgs,
+                                      const llvm::vfs::FileSystem &VFS) {
   if (Arg *A = Args.getLastArg(options::OPT_ffile_compilation_dir_EQ,
                                options::OPT_fdebug_compilation_dir_EQ)) {
     if (A->getOption().matches(options::OPT_ffile_compilation_dir_EQ))
@@ -635,20 +553,52 @@ static void addDebugCompDirArg(const ArgList &Args, ArgStringList &CmdArgs,
                  VFS.getCurrentWorkingDirectory()) {
     CmdArgs.push_back(Args.MakeArgString("-fdebug-compilation-dir=" + *CWD));
   }
+  StringRef Path(CmdArgs.back());
+  return Path.substr(Path.find('=') + 1).data();
+}
+
+static void addDebugObjectName(const ArgList &Args, ArgStringList &CmdArgs,
+                               const char *DebugCompilationDir,
+                               const char *OutputFileName) {
+  // No need to generate a value for -object-file-name if it was provided.
+  for (auto *Arg : Args.filtered(options::OPT_Xclang))
+    if (StringRef(Arg->getValue()).startswith("-object-file-name"))
+      return;
+
+  if (Args.hasArg(options::OPT_object_file_name_EQ))
+    return;
+
+  SmallString<128> ObjFileNameForDebug(OutputFileName);
+  if (ObjFileNameForDebug != "-" &&
+      !llvm::sys::path::is_absolute(ObjFileNameForDebug) &&
+      (!DebugCompilationDir ||
+       llvm::sys::path::is_absolute(DebugCompilationDir))) {
+    // Make the path absolute in the debug infos like MSVC does.
+    llvm::sys::fs::make_absolute(ObjFileNameForDebug);
+  }
+  CmdArgs.push_back(
+      Args.MakeArgString(Twine("-object-file-name=") + ObjFileNameForDebug));
 }
 
 /// Add a CC1 and CC1AS option to specify the debug file path prefix map.
-static void addDebugPrefixMapArg(const Driver &D, const ArgList &Args, ArgStringList &CmdArgs) {
-  for (const Arg *A : Args.filtered(options::OPT_ffile_prefix_map_EQ,
-                                    options::OPT_fdebug_prefix_map_EQ)) {
-    StringRef Map = A->getValue();
-    if (Map.find('=') == StringRef::npos)
-      D.Diag(diag::err_drv_invalid_argument_to_option)
-          << Map << A->getOption().getName();
+static void addDebugPrefixMapArg(const Driver &D, const ToolChain &TC,
+                                 const ArgList &Args, ArgStringList &CmdArgs) {
+  auto AddOneArg = [&](StringRef Map, StringRef Name) {
+    if (!Map.contains('='))
+      D.Diag(diag::err_drv_invalid_argument_to_option) << Map << Name;
     else
       CmdArgs.push_back(Args.MakeArgString("-fdebug-prefix-map=" + Map));
+  };
+
+  for (const Arg *A : Args.filtered(options::OPT_ffile_prefix_map_EQ,
+                                    options::OPT_fdebug_prefix_map_EQ)) {
+    AddOneArg(A->getValue(), A->getOption().getName());
     A->claim();
   }
+  std::string GlobalRemapEntry = TC.GetGlobalDebugPathRemapping();
+  if (GlobalRemapEntry.empty())
+    return;
+  AddOneArg(GlobalRemapEntry, "environment");
 }
 
 /// Add a CC1 and CC1AS option to specify the macro file path prefix map.
@@ -657,7 +607,7 @@ static void addMacroPrefixMapArg(const Driver &D, const ArgList &Args,
   for (const Arg *A : Args.filtered(options::OPT_ffile_prefix_map_EQ,
                                     options::OPT_fmacro_prefix_map_EQ)) {
     StringRef Map = A->getValue();
-    if (Map.find('=') == StringRef::npos)
+    if (!Map.contains('='))
       D.Diag(diag::err_drv_invalid_argument_to_option)
           << Map << A->getOption().getName();
     else
@@ -672,7 +622,7 @@ static void addCoveragePrefixMapArg(const Driver &D, const ArgList &Args,
   for (const Arg *A : Args.filtered(options::OPT_ffile_prefix_map_EQ,
                                     options::OPT_fcoverage_prefix_map_EQ)) {
     StringRef Map = A->getValue();
-    if (Map.find('=') == StringRef::npos)
+    if (!Map.contains('='))
       D.Diag(diag::err_drv_invalid_argument_to_option)
           << Map << A->getOption().getName();
     else
@@ -747,7 +697,7 @@ static void addDashXForInput(const ArgList &Args, const InputInfo &Input,
 
 static void addPGOAndCoverageFlags(const ToolChain &TC, Compilation &C,
                                    const Driver &D, const InputInfo &Output,
-                                   const ArgList &Args,
+                                   const ArgList &Args, SanitizerArgs &SanArgs,
                                    ArgStringList &CmdArgs) {
 
   auto *PGOGenerateArg = Args.getLastArg(options::OPT_fprofile_generate,
@@ -794,11 +744,6 @@ static void addPGOAndCoverageFlags(const ToolChain &TC, Compilation &C,
   }
 
   if (TC.getTriple().isOSAIX()) {
-    if (PGOGenerateArg)
-      if (!D.isUsingLTO(false /*IsDeviceOffloadAction */) ||
-          D.getLTOMode() != LTOK_Full)
-        D.Diag(clang::diag::err_drv_argument_only_allowed_with)
-            << PGOGenerateArg->getSpelling() << "-flto";
     if (ProfileGenerateArg)
       D.Diag(diag::err_drv_unsupported_opt_for_target)
           << ProfileGenerateArg->getSpelling() << TC.getTriple().str();
@@ -925,11 +870,32 @@ static void addPGOAndCoverageFlags(const ToolChain &TC, Compilation &C,
       CmdArgs.push_back("-fprofile-update=atomic");
     else if (Val != "single")
       D.Diag(diag::err_drv_unsupported_option_argument)
-          << A->getOption().getName() << Val;
-  } else if (TC.getSanitizerArgs().needsTsanRt()) {
+          << A->getSpelling() << Val;
+  } else if (SanArgs.needsTsanRt()) {
     CmdArgs.push_back("-fprofile-update=atomic");
   }
 
+  int FunctionGroups = 1;
+  int SelectedFunctionGroup = 0;
+  if (const auto *A = Args.getLastArg(options::OPT_fprofile_function_groups)) {
+    StringRef Val = A->getValue();
+    if (Val.getAsInteger(0, FunctionGroups) || FunctionGroups < 1)
+      D.Diag(diag::err_drv_invalid_int_value) << A->getAsString(Args) << Val;
+  }
+  if (const auto *A =
+          Args.getLastArg(options::OPT_fprofile_selected_function_group)) {
+    StringRef Val = A->getValue();
+    if (Val.getAsInteger(0, SelectedFunctionGroup) ||
+        SelectedFunctionGroup < 0 || SelectedFunctionGroup >= FunctionGroups)
+      D.Diag(diag::err_drv_invalid_int_value) << A->getAsString(Args) << Val;
+  }
+  if (FunctionGroups != 1)
+    CmdArgs.push_back(Args.MakeArgString("-fprofile-function-groups=" +
+                                         Twine(FunctionGroups)));
+  if (SelectedFunctionGroup != 0)
+    CmdArgs.push_back(Args.MakeArgString("-fprofile-selected-function-group=" +
+                                         Twine(SelectedFunctionGroup)));
+
   // Leave -fprofile-dir= an unused argument unless .gcda emission is
   // enabled. To be polite, with '-fprofile-arcs -fno-profile-arcs' consider
   // the flag used. There is no -fno-profile-dir, so the user has no
@@ -978,11 +944,7 @@ static bool ContainsCompileAction(const Action *A) {
   if (isa<CompileJobAction>(A) || isa<BackendJobAction>(A))
     return true;
 
-  for (const auto &AI : A->inputs())
-    if (ContainsCompileAction(AI))
-      return true;
-
-  return false;
+  return llvm::any_of(A->inputs(), ContainsCompileAction);
 }
 
 /// Check if -relax-all should be passed to the internal assembler.
@@ -1007,26 +969,6 @@ static bool UseRelaxAll(Compilation &C, const ArgList &Args) {
                       RelaxDefault);
 }
 
-// Extract the integer N from a string spelled "-dwarf-N", returning 0
-// on mismatch. The StringRef input (rather than an Arg) allows
-// for use by the "-Xassembler" option parser.
-static unsigned DwarfVersionNum(StringRef ArgValue) {
-  return llvm::StringSwitch<unsigned>(ArgValue)
-      .Case("-gdwarf-2", 2)
-      .Case("-gdwarf-3", 3)
-      .Case("-gdwarf-4", 4)
-      .Case("-gdwarf-5", 5)
-      .Default(0);
-}
-
-// Find a DWARF format version option.
-// This function is a complementary for DwarfVersionNum().
-static const Arg *getDwarfNArg(const ArgList &Args) {
-  return Args.getLastArg(options::OPT_gdwarf_2, options::OPT_gdwarf_3,
-                         options::OPT_gdwarf_4, options::OPT_gdwarf_5,
-                         options::OPT_gdwarf);
-}
-
 static void RenderDebugEnablingArgs(const ArgList &Args, ArgStringList &CmdArgs,
                                     codegenoptions::DebugInfoKind DebugInfoKind,
                                     unsigned DwarfVersion,
@@ -1095,40 +1037,31 @@ static void RenderDebugInfoCompressionArgs(const ArgList &Args,
     StringRef Value = A->getValue();
     if (Value == "none") {
       CmdArgs.push_back("--compress-debug-sections=none");
-    } else if (Value == "zlib" || Value == "zlib-gnu") {
-      if (llvm::zlib::isAvailable()) {
+    } else if (Value == "zlib") {
+      if (llvm::compression::zlib::isAvailable()) {
+        CmdArgs.push_back(
+            Args.MakeArgString("--compress-debug-sections=" + Twine(Value)));
+      } else {
+        D.Diag(diag::warn_debug_compression_unavailable) << "zlib";
+      }
+    } else if (Value == "zstd") {
+      if (llvm::compression::zstd::isAvailable()) {
         CmdArgs.push_back(
             Args.MakeArgString("--compress-debug-sections=" + Twine(Value)));
       } else {
-        D.Diag(diag::warn_debug_compression_unavailable);
+        D.Diag(diag::warn_debug_compression_unavailable) << "zstd";
       }
     } else {
       D.Diag(diag::err_drv_unsupported_option_argument)
-          << A->getOption().getName() << Value;
+          << A->getSpelling() << Value;
     }
   }
 }
 
-static const char *RelocationModelName(llvm::Reloc::Model Model) {
-  switch (Model) {
-  case llvm::Reloc::Static:
-    return "static";
-  case llvm::Reloc::PIC_:
-    return "pic";
-  case llvm::Reloc::DynamicNoPIC:
-    return "dynamic-no-pic";
-  case llvm::Reloc::ROPI:
-    return "ropi";
-  case llvm::Reloc::RWPI:
-    return "rwpi";
-  case llvm::Reloc::ROPI_RWPI:
-    return "ropi-rwpi";
-  }
-  llvm_unreachable("Unknown Reloc::Model kind");
-}
 static void handleAMDGPUCodeObjectVersionOptions(const Driver &D,
                                                  const ArgList &Args,
-                                                 ArgStringList &CmdArgs) {
+                                                 ArgStringList &CmdArgs,
+                                                 bool IsCC1As = false) {
   // If no version was requested by the user, use the default value from the
   // back end. This is consistent with the value returned from
   // getAMDGPUCodeObjectVersion. This lets clang emit IR for amdgpu without
@@ -1140,6 +1073,11 @@ static void handleAMDGPUCodeObjectVersionOptions(const Driver &D,
                    Args.MakeArgString(Twine("--amdhsa-code-object-version=") +
                                       Twine(CodeObjVer)));
     CmdArgs.insert(CmdArgs.begin() + 1, "-mllvm");
+    // -cc1as does not accept -mcode-object-version option.
+    if (!IsCC1As)
+      CmdArgs.insert(CmdArgs.begin() + 1,
+                     Args.MakeArgString(Twine("-mcode-object-version=") +
+                                        Twine(CodeObjVer)));
   }
 }
 
@@ -1195,7 +1133,7 @@ void Clang::AddPreprocessingOptions(Compilation &C, const JobAction &JA,
       } else {
         CmdArgs.push_back("-MT");
         SmallString<128> Quoted;
-        QuoteTarget(A->getValue(), Quoted);
+        quoteMakeTarget(A->getValue(), Quoted);
         CmdArgs.push_back(Args.MakeArgString(Quoted));
       }
     }
@@ -1220,7 +1158,7 @@ void Clang::AddPreprocessingOptions(Compilation &C, const JobAction &JA,
 
       CmdArgs.push_back("-MT");
       SmallString<128> Quoted;
-      QuoteTarget(DepTarget, Quoted);
+      quoteMakeTarget(DepTarget, Quoted);
       CmdArgs.push_back(Args.MakeArgString(Quoted));
     }
 
@@ -1255,6 +1193,8 @@ void Clang::AddPreprocessingOptions(Compilation &C, const JobAction &JA,
   // If we are offloading to a target via OpenMP we need to include the
   // openmp_wrappers folder which contains alternative system headers.
   if (JA.isDeviceOffloading(Action::OFK_OpenMP) &&
+      !Args.hasArg(options::OPT_nostdinc) &&
+      !Args.hasArg(options::OPT_nogpuinc) &&
       (getToolChain().getTriple().isNVPTX() ||
        getToolChain().getTriple().isAMDGCN())) {
     if (!Args.hasArg(options::OPT_nobuiltininc)) {
@@ -1311,7 +1251,8 @@ void Clang::AddPreprocessingOptions(Compilation &C, const JobAction &JA,
 
   bool RenderedImplicitInclude = false;
   for (const Arg *A : Args.filtered(options::OPT_clang_i_Group)) {
-    if (A->getOption().matches(options::OPT_include)) {
+    if (A->getOption().matches(options::OPT_include) &&
+        D.getProbePrecompiled()) {
       // Handling of gcc-style gch precompiled headers.
       bool IsFirstImplicitInclude = !RenderedImplicitInclude;
       RenderedImplicitInclude = true;
@@ -1322,12 +1263,12 @@ void Clang::AddPreprocessingOptions(Compilation &C, const JobAction &JA,
       // so that replace_extension does the right thing.
       P += ".dummy";
       llvm::sys::path::replace_extension(P, "pch");
-      if (llvm::sys::fs::exists(P))
+      if (D.getVFS().exists(P))
         FoundPCH = true;
 
       if (!FoundPCH) {
         llvm::sys::path::replace_extension(P, "gch");
-        if (llvm::sys::fs::exists(P)) {
+        if (D.getVFS().exists(P)) {
           FoundPCH = true;
         }
       }
@@ -1431,6 +1372,14 @@ void Clang::AddPreprocessingOptions(Compilation &C, const JobAction &JA,
 
   addMacroPrefixMapArg(D, Args, CmdArgs);
   addCoveragePrefixMapArg(D, Args, CmdArgs);
+
+  Args.AddLastArg(CmdArgs, options::OPT_ffile_reproducible,
+                  options::OPT_fno_file_reproducible);
+
+  if (const char *Epoch = std::getenv("SOURCE_DATE_EPOCH")) {
+    CmdArgs.push_back("-source-date-epoch");
+    CmdArgs.push_back(Args.MakeArgString(Epoch));
+  }
 }
 
 // FIXME: Move to target hook.
@@ -1587,8 +1536,8 @@ void AddAAPCSVolatileBitfieldArgs(const ArgList &Args, ArgStringList &CmdArgs) {
 }
 
 namespace {
-void RenderARMABI(const llvm::Triple &Triple, const ArgList &Args,
-                  ArgStringList &CmdArgs) {
+void RenderARMABI(const Driver &D, const llvm::Triple &Triple,
+                  const ArgList &Args, ArgStringList &CmdArgs) {
   // Select the ABI to use.
   // FIXME: Support -meabi.
   // FIXME: Parts of this are duplicated in the backend, unify this somehow.
@@ -1596,18 +1545,86 @@ void RenderARMABI(const llvm::Triple &Triple, const ArgList &Args,
   if (Arg *A = Args.getLastArg(options::OPT_mabi_EQ)) {
     ABIName = A->getValue();
   } else {
-    std::string CPU = getCPUName(Args, Triple, /*FromAs*/ false);
+    std::string CPU = getCPUName(D, Args, Triple, /*FromAs*/ false);
     ABIName = llvm::ARM::computeDefaultTargetABI(Triple, CPU).data();
   }
 
   CmdArgs.push_back("-target-abi");
   CmdArgs.push_back(ABIName);
 }
+
+void AddUnalignedAccessWarning(ArgStringList &CmdArgs) {
+  auto StrictAlignIter =
+      llvm::find_if(llvm::reverse(CmdArgs), [](StringRef Arg) {
+        return Arg == "+strict-align" || Arg == "-strict-align";
+      });
+  if (StrictAlignIter != CmdArgs.rend() &&
+      StringRef(*StrictAlignIter) == "+strict-align")
+    CmdArgs.push_back("-Wunaligned-access");
+}
+}
+
+static void CollectARMPACBTIOptions(const ToolChain &TC, const ArgList &Args,
+                                    ArgStringList &CmdArgs, bool isAArch64) {
+  const Arg *A = isAArch64
+                     ? Args.getLastArg(options::OPT_msign_return_address_EQ,
+                                       options::OPT_mbranch_protection_EQ)
+                     : Args.getLastArg(options::OPT_mbranch_protection_EQ);
+  if (!A)
+    return;
+
+  const Driver &D = TC.getDriver();
+  const llvm::Triple &Triple = TC.getEffectiveTriple();
+  if (!(isAArch64 || (Triple.isArmT32() && Triple.isArmMClass())))
+    D.Diag(diag::warn_incompatible_branch_protection_option)
+        << Triple.getArchName();
+
+  StringRef Scope, Key;
+  bool IndirectBranches;
+
+  if (A->getOption().matches(options::OPT_msign_return_address_EQ)) {
+    Scope = A->getValue();
+    if (Scope != "none" && Scope != "non-leaf" && Scope != "all")
+      D.Diag(diag::err_drv_unsupported_option_argument)
+          << A->getSpelling() << Scope;
+    Key = "a_key";
+    if (Triple.isOSOpenBSD())
+      IndirectBranches = true;
+    else
+      IndirectBranches = false;
+  } else {
+    StringRef DiagMsg;
+    llvm::ARM::ParsedBranchProtection PBP;
+    if (!llvm::ARM::parseBranchProtection(A->getValue(), PBP, DiagMsg))
+      D.Diag(diag::err_drv_unsupported_option_argument)
+          << A->getSpelling() << DiagMsg;
+    if (!isAArch64 && PBP.Key == "b_key")
+      D.Diag(diag::warn_unsupported_branch_protection)
+          << "b-key" << A->getAsString(Args);
+    Scope = PBP.Scope;
+    Key = PBP.Key;
+    IndirectBranches = PBP.BranchTargetEnforcement;
+  }
+
+  CmdArgs.push_back(
+      Args.MakeArgString(Twine("-msign-return-address=") + Scope));
+  if (!Scope.equals("none"))
+    CmdArgs.push_back(
+        Args.MakeArgString(Twine("-msign-return-address-key=") + Key));
+  if (IndirectBranches)
+    CmdArgs.push_back("-mbranch-target-enforce");
+  else {
+    if (Triple.isOSOpenBSD()) {
+      CmdArgs.push_back("-msign-return-address=non-leaf");
+      CmdArgs.push_back("-msign-return-address-key=a_key");
+      CmdArgs.push_back("-mbranch-target-enforce");
+    }
+  }
 }
 
 void Clang::AddARMTargetArgs(const llvm::Triple &Triple, const ArgList &Args,
                              ArgStringList &CmdArgs, bool KernelOrKext) const {
-  RenderARMABI(Triple, Args, CmdArgs);
+  RenderARMABI(getToolChain().getDriver(), Triple, Args, CmdArgs);
 
   // Determine floating point ABI from the options & target defaults.
   arm::FloatABI ABI = arm::getARMFloatABI(getToolChain(), Args);
@@ -1646,6 +1663,11 @@ void Clang::AddARMTargetArgs(const llvm::Triple &Triple, const ArgList &Args,
     CmdArgs.push_back("-mcmse");
 
   AddAAPCSVolatileBitfieldArgs(Args, CmdArgs);
+
+  // Enable/disable return address signing and indirect branch targets.
+  CollectARMPACBTIOptions(getToolChain(), Args, CmdArgs, false /*isAArch64*/);
+
+  AddUnalignedAccessWarning(CmdArgs);
 }
 
 void Clang::RenderTargetOptions(const llvm::Triple &EffectiveTriple,
@@ -1667,14 +1689,17 @@ void Clang::RenderTargetOptions(const llvm::Triple &EffectiveTriple,
   case llvm::Triple::thumbeb:
     // Use the effective triple, which takes into account the deployment target.
     AddARMTargetArgs(EffectiveTriple, Args, CmdArgs, KernelOrKext);
-    CmdArgs.push_back("-fallow-half-arguments-and-returns");
     break;
 
   case llvm::Triple::aarch64:
   case llvm::Triple::aarch64_32:
   case llvm::Triple::aarch64_be:
     AddAArch64TargetArgs(Args, CmdArgs);
-    CmdArgs.push_back("-fallow-half-arguments-and-returns");
+    break;
+
+  case llvm::Triple::loongarch32:
+  case llvm::Triple::loongarch64:
+    AddLoongArchTargetArgs(Args, CmdArgs);
     break;
 
   case llvm::Triple::mips:
@@ -1761,19 +1786,6 @@ void Clang::AddAArch64TargetArgs(const ArgList &Args,
 
   RenderAArch64ABI(Triple, Args, CmdArgs);
 
-  if (Arg *A = Args.getLastArg(options::OPT_mfix_cortex_a53_835769,
-                               options::OPT_mno_fix_cortex_a53_835769)) {
-    CmdArgs.push_back("-mllvm");
-    if (A->getOption().matches(options::OPT_mfix_cortex_a53_835769))
-      CmdArgs.push_back("-aarch64-fix-cortex-a53-835769=1");
-    else
-      CmdArgs.push_back("-aarch64-fix-cortex-a53-835769=0");
-  } else if (Triple.isAndroid()) {
-    // Enabled A53 errata (835769) workaround by default on android
-    CmdArgs.push_back("-mllvm");
-    CmdArgs.push_back("-aarch64-fix-cortex-a53-835769=1");
-  }
-
   // Forward the -mglobal-merge option for explicit control over the pass.
   if (Arg *A = Args.getLastArg(options::OPT_mglobal_merge,
                                options::OPT_mno_global_merge)) {
@@ -1785,66 +1797,56 @@ void Clang::AddAArch64TargetArgs(const ArgList &Args,
   }
 
   // Enable/disable return address signing and indirect branch targets.
-  if (Arg *A = Args.getLastArg(options::OPT_msign_return_address_EQ,
-                               options::OPT_mbranch_protection_EQ)) {
-
-    const Driver &D = getToolChain().getDriver();
-
-    StringRef Scope, Key;
-    bool IndirectBranches;
-
-    if (A->getOption().matches(options::OPT_msign_return_address_EQ)) {
-      Scope = A->getValue();
-      if (!Scope.equals("none") && !Scope.equals("non-leaf") &&
-          !Scope.equals("all"))
-        D.Diag(diag::err_invalid_branch_protection)
-            << Scope << A->getAsString(Args);
-      Key = "a_key";
-      if (Triple.isOSOpenBSD())
-        IndirectBranches = true;
-      else
-        IndirectBranches = false;
-    } else {
-      StringRef Err;
-      llvm::AArch64::ParsedBranchProtection PBP;
-      if (!llvm::AArch64::parseBranchProtection(A->getValue(), PBP, Err))
-        D.Diag(diag::err_invalid_branch_protection)
-            << Err << A->getAsString(Args);
-      Scope = PBP.Scope;
-      Key = PBP.Key;
-      IndirectBranches = PBP.BranchTargetEnforcement;
-    }
-
-    CmdArgs.push_back(
-        Args.MakeArgString(Twine("-msign-return-address=") + Scope));
-    CmdArgs.push_back(
-        Args.MakeArgString(Twine("-msign-return-address-key=") + Key));
-    if (IndirectBranches)
-      CmdArgs.push_back("-mbranch-target-enforce");
-  } else {
-    if (Triple.isOSOpenBSD()) {
-      CmdArgs.push_back("-msign-return-address=non-leaf");
-      CmdArgs.push_back("-msign-return-address-key=a_key");
-      CmdArgs.push_back("-mbranch-target-enforce");
-    }
-  }
+  CollectARMPACBTIOptions(getToolChain(), Args, CmdArgs, true /*isAArch64*/);
 
   // Handle -msve_vector_bits=<bits>
   if (Arg *A = Args.getLastArg(options::OPT_msve_vector_bits_EQ)) {
     StringRef Val = A->getValue();
     const Driver &D = getToolChain().getDriver();
     if (Val.equals("128") || Val.equals("256") || Val.equals("512") ||
-        Val.equals("1024") || Val.equals("2048"))
+        Val.equals("1024") || Val.equals("2048") || Val.equals("128+") ||
+        Val.equals("256+") || Val.equals("512+") || Val.equals("1024+") ||
+        Val.equals("2048+")) {
+      unsigned Bits = 0;
+      if (Val.endswith("+"))
+        Val = Val.substr(0, Val.size() - 1);
+      else {
+        bool Invalid = Val.getAsInteger(10, Bits); (void)Invalid;
+        assert(!Invalid && "Failed to parse value");
+        CmdArgs.push_back(
+            Args.MakeArgString("-mvscale-max=" + llvm::Twine(Bits / 128)));
+      }
+
+      bool Invalid = Val.getAsInteger(10, Bits); (void)Invalid;
+      assert(!Invalid && "Failed to parse value");
       CmdArgs.push_back(
-          Args.MakeArgString(llvm::Twine("-msve-vector-bits=") + Val));
+          Args.MakeArgString("-mvscale-min=" + llvm::Twine(Bits / 128)));
     // Silently drop requests for vector-length agnostic code as it's implied.
-    else if (!Val.equals("scalable"))
+    } else if (!Val.equals("scalable"))
       // Handle the unsupported values passed to msve-vector-bits.
       D.Diag(diag::err_drv_unsupported_option_argument)
-          << A->getOption().getName() << Val;
+          << A->getSpelling() << Val;
   }
 
   AddAAPCSVolatileBitfieldArgs(Args, CmdArgs);
+
+  if (const Arg *A = Args.getLastArg(clang::driver::options::OPT_mtune_EQ)) {
+    CmdArgs.push_back("-tune-cpu");
+    if (strcmp(A->getValue(), "native") == 0)
+      CmdArgs.push_back(Args.MakeArgString(llvm::sys::getHostCPUName()));
+    else
+      CmdArgs.push_back(A->getValue());
+  }
+
+  AddUnalignedAccessWarning(CmdArgs);
+}
+
+void Clang::AddLoongArchTargetArgs(const ArgList &Args,
+                                   ArgStringList &CmdArgs) const {
+  CmdArgs.push_back("-target-abi");
+  CmdArgs.push_back(loongarch::getLoongArchABI(getToolChain().getDriver(), Args,
+                                               getToolChain().getTriple())
+                        .data());
 }
 
 void Clang::AddMIPSTargetArgs(const ArgList &Args,
@@ -1887,6 +1889,11 @@ void Clang::AddMIPSTargetArgs(const ArgList &Args,
     }
   }
 
+  if (Args.getLastArg(options::OPT_mfix4300)) {
+    CmdArgs.push_back("-mllvm");
+    CmdArgs.push_back("-mfix4300");
+  }
+
   if (Arg *A = Args.getLastArg(options::OPT_G)) {
     StringRef v = A->getValue();
     CmdArgs.push_back("-mllvm");
@@ -1976,7 +1983,7 @@ void Clang::AddMIPSTargetArgs(const ArgList &Args,
         CmdArgs.push_back(Args.MakeArgString("-mips-compact-branches=" + Val));
       } else
         D.Diag(diag::err_drv_unsupported_option_argument)
-            << A->getOption().getName() << Val;
+            << A->getSpelling() << Val;
     } else
       D.Diag(diag::warn_target_unsupported_compact_branches) << CPUName;
   }
@@ -1992,14 +1999,19 @@ void Clang::AddMIPSTargetArgs(const ArgList &Args,
 
 void Clang::AddPPCTargetArgs(const ArgList &Args,
                              ArgStringList &CmdArgs) const {
+  const llvm::Triple &T = getToolChain().getTriple();
+  if (const Arg *A = Args.getLastArg(options::OPT_mtune_EQ)) {
+    CmdArgs.push_back("-tune-cpu");
+    std::string CPU = ppc::getPPCTuneCPU(Args, T);
+    CmdArgs.push_back(Args.MakeArgString(CPU));
+  }
+
   // Select the ABI to use.
   const char *ABIName = nullptr;
-  const llvm::Triple &T = getToolChain().getTriple();
   if (T.isOSBinFormatELF()) {
     switch (getToolChain().getArch()) {
     case llvm::Triple::ppc64: {
-      if ((T.isOSFreeBSD() && T.getOSMajorVersion() >= 13) ||
-          T.isOSOpenBSD() || T.isMusl())
+      if (T.isPPC64ELFv2ABI())
         ABIName = "elfv2";
       else
         ABIName = "elfv1";
@@ -2013,7 +2025,7 @@ void Clang::AddPPCTargetArgs(const ArgList &Args,
     }
   }
 
-  bool IEEELongDouble = false;
+  bool IEEELongDouble = getToolChain().defaultToIEEELongDouble();
   for (const Arg *A : Args.filtered(options::OPT_mabi_EQ)) {
     StringRef V = A->getValue();
     if (V == "ieeelongdouble")
@@ -2090,18 +2102,16 @@ void Clang::AddRISCVTargetArgs(const ArgList &Args,
 
   SetRISCVSmallDataLimit(getToolChain(), Args, CmdArgs);
 
-  std::string TuneCPU;
-
-  if (const Arg *A = Args.getLastArg(clang::driver::options::OPT_mtune_EQ)) {
-    StringRef Name = A->getValue();
-
-    Name = llvm::RISCV::resolveTuneCPUAlias(Name, Triple.isArch64Bit());
-    TuneCPU = std::string(Name);
-  }
+  if (!Args.hasFlag(options::OPT_mimplicit_float,
+                    options::OPT_mno_implicit_float, true))
+    CmdArgs.push_back("-no-implicit-float");
 
-  if (!TuneCPU.empty()) {
+  if (const Arg *A = Args.getLastArg(options::OPT_mtune_EQ)) {
     CmdArgs.push_back("-tune-cpu");
-    CmdArgs.push_back(Args.MakeArgString(TuneCPU));
+    if (strcmp(A->getValue(), "native") == 0)
+      CmdArgs.push_back(Args.MakeArgString(llvm::sys::getHostCPUName()));
+    else
+      CmdArgs.push_back(A->getValue());
   }
 }
 
@@ -2121,12 +2131,32 @@ void Clang::AddSparcTargetArgs(const ArgList &Args,
     CmdArgs.push_back("-mfloat-abi");
     CmdArgs.push_back("hard");
   }
+
+  if (const Arg *A = Args.getLastArg(clang::driver::options::OPT_mtune_EQ)) {
+    StringRef Name = A->getValue();
+    std::string TuneCPU;
+    if (Name == "native")
+      TuneCPU = std::string(llvm::sys::getHostCPUName());
+    else
+      TuneCPU = std::string(Name);
+
+    CmdArgs.push_back("-tune-cpu");
+    CmdArgs.push_back(Args.MakeArgString(TuneCPU));
+  }
 }
 
 void Clang::AddSystemZTargetArgs(const ArgList &Args,
                                  ArgStringList &CmdArgs) const {
-  bool HasBackchain = Args.hasFlag(options::OPT_mbackchain,
-                                   options::OPT_mno_backchain, false);
+  if (const Arg *A = Args.getLastArg(options::OPT_mtune_EQ)) {
+    CmdArgs.push_back("-tune-cpu");
+    if (strcmp(A->getValue(), "native") == 0)
+      CmdArgs.push_back(Args.MakeArgString(llvm::sys::getHostCPUName()));
+    else
+      CmdArgs.push_back(A->getValue());
+  }
+
+  bool HasBackchain =
+      Args.hasFlag(options::OPT_mbackchain, options::OPT_mno_backchain, false);
   bool HasPackedStack = Args.hasFlag(options::OPT_mpacked_stack,
                                      options::OPT_mno_packed_stack, false);
   systemz::FloatABI FloatABI =
@@ -2182,15 +2212,21 @@ void Clang::AddX86TargetArgs(const ArgList &Args,
     if (Value == "intel" || Value == "att") {
       CmdArgs.push_back("-mllvm");
       CmdArgs.push_back(Args.MakeArgString("-x86-asm-syntax=" + Value));
+      CmdArgs.push_back(Args.MakeArgString("-inline-asm=" + Value));
     } else {
       D.Diag(diag::err_drv_unsupported_option_argument)
-          << A->getOption().getName() << Value;
+          << A->getSpelling() << Value;
     }
   } else if (D.IsCLMode()) {
     CmdArgs.push_back("-mllvm");
     CmdArgs.push_back("-x86-asm-syntax=intel");
   }
 
+  if (Arg *A = Args.getLastArg(options::OPT_mskip_rax_setup,
+                               options::OPT_mno_skip_rax_setup))
+    if (A->getOption().matches(options::OPT_mskip_rax_setup))
+      CmdArgs.push_back(Args.MakeArgString("-mskip-rax-setup"));
+
   // Set flags to support MCU ABI.
   if (Args.hasFlag(options::OPT_miamcu, options::OPT_mno_iamcu, false)) {
     CmdArgs.push_back("-mfloat-abi");
@@ -2200,10 +2236,10 @@ void Clang::AddX86TargetArgs(const ArgList &Args,
 
   // Handle -mtune.
 
-  // Default to "generic" unless -march is present or targetting the PS4.
+  // Default to "generic" unless -march is present or targetting the PS4/PS5.
   std::string TuneCPU;
   if (!Args.hasArg(clang::driver::options::OPT_march_EQ) &&
-      !getToolChain().getTriple().isPS4CPU())
+      !getToolChain().getTriple().isPS())
     TuneCPU = "generic";
 
   // Override based on -mtune.
@@ -2231,8 +2267,8 @@ void Clang::AddHexagonTargetArgs(const ArgList &Args,
 
   if (auto G = toolchains::HexagonToolChain::getSmallDataThreshold(Args)) {
     CmdArgs.push_back("-mllvm");
-    CmdArgs.push_back(Args.MakeArgString("-hexagon-small-data-threshold=" +
-                                         Twine(G.getValue())));
+    CmdArgs.push_back(
+        Args.MakeArgString("-hexagon-small-data-threshold=" + Twine(*G)));
   }
 
   if (!Args.hasArg(options::OPT_fno_short_enums))
@@ -2262,7 +2298,7 @@ void Clang::AddLanaiTargetArgs(const ArgList &Args,
       if (Mregparm != 4) {
         getToolChain().getDriver().Diag(
             diag::err_drv_unsupported_option_argument)
-            << A->getOption().getName() << Value;
+            << A->getSpelling() << Value;
       }
     }
   }
@@ -2272,10 +2308,8 @@ void Clang::AddWebAssemblyTargetArgs(const ArgList &Args,
                                      ArgStringList &CmdArgs) const {
   // Default to "hidden" visibility.
   if (!Args.hasArg(options::OPT_fvisibility_EQ,
-                   options::OPT_fvisibility_ms_compat)) {
-    CmdArgs.push_back("-fvisibility");
-    CmdArgs.push_back("hidden");
-  }
+                   options::OPT_fvisibility_ms_compat))
+    CmdArgs.push_back("-fvisibility=hidden");
 }
 
 void Clang::AddVETargetArgs(const ArgList &Args, ArgStringList &CmdArgs) const {
@@ -2297,7 +2331,8 @@ void Clang::DumpCompilationDatabase(Compilation &C, StringRef Filename,
   if (!CompilationDatabase) {
     std::error_code EC;
     auto File = std::make_unique<llvm::raw_fd_ostream>(
-        Filename, EC, llvm::sys::fs::OF_TextWithCRLF);
+        Filename, EC,
+        llvm::sys::fs::OF_TextWithCRLF | llvm::sys::fs::OF_Append);
     if (EC) {
       D.Diag(clang::diag::err_drv_compilationdatabase) << Filename
                                                        << EC.message();
@@ -2323,6 +2358,7 @@ void Clang::DumpCompilationDatabase(Compilation &C, StringRef Filename,
     CDB << ", \"" << escape(Buf) << "\"";
   }
   CDB << ", \"" << escape(Input.getFilename()) << "\"";
+  CDB << ", \"-o\", \"" << escape(Output.getFilename()) << "\"";
   for (auto &A: Args) {
     auto &O = A->getOption();
     // Skip language selection, which is positional.
@@ -2336,6 +2372,9 @@ void Clang::DumpCompilationDatabase(Compilation &C, StringRef Filename,
     // Skip inputs.
     if (O.getKind() == Option::InputClass)
       continue;
+    // Skip output.
+    if (O.getID() == options::OPT_o)
+      continue;
     // All other arguments are quoted and appended.
     ArgStringList ASL;
     A->render(Args, ASL);
@@ -2409,6 +2448,8 @@ static void CollectArgsForIntegratedAssembler(Compilation &C,
                    DefaultIncrementalLinkerCompatible))
     CmdArgs.push_back("-mincremental-linker-compatible");
 
+  Args.AddLastArg(CmdArgs, options::OPT_femit_dwarf_unwind_EQ);
+
   // If you add more args here, also add them to the block below that
   // starts with "// If CollectArgsForIntegratedAssembler() isn't called below".
 
@@ -2420,7 +2461,7 @@ static void CollectArgsForIntegratedAssembler(Compilation &C,
   bool TakeNextArg = false;
 
   bool UseRelaxRelocations = C.getDefaultToolChain().useRelaxRelocations();
-  bool UseNoExecStack = C.getDefaultToolChain().isNoExecStackDefault();
+  bool UseNoExecStack = false;
   const char *MipsTargetFeature = nullptr;
   StringRef ImplicitIt;
   for (const Arg *A :
@@ -2438,7 +2479,7 @@ static void CollectArgsForIntegratedAssembler(Compilation &C,
         ImplicitIt = A->getValue();
         if (!CheckARMImplicitITArg(ImplicitIt))
           D.Diag(diag::err_drv_unsupported_option_argument)
-              << A->getOption().getName() << ImplicitIt;
+              << A->getSpelling() << ImplicitIt;
         continue;
       default:
         break;
@@ -2459,6 +2500,13 @@ static void CollectArgsForIntegratedAssembler(Compilation &C,
       switch (C.getDefaultToolChain().getArch()) {
       default:
         break;
+      case llvm::Triple::wasm32:
+      case llvm::Triple::wasm64:
+        if (Value == "--no-type-check") {
+          CmdArgs.push_back("-mno-type-check");
+          continue;
+        }
+        break;
       case llvm::Triple::thumb:
       case llvm::Triple::thumbeb:
       case llvm::Triple::arm:
@@ -2599,14 +2647,14 @@ static void CollectArgsForIntegratedAssembler(Compilation &C,
         D.PrintVersion(C, llvm::outs());
       } else {
         D.Diag(diag::err_drv_unsupported_option_argument)
-            << A->getOption().getName() << Value;
+            << A->getSpelling() << Value;
       }
     }
   }
   if (ImplicitIt.size())
     AddARMImplicitITArgs(Args, CmdArgs, ImplicitIt);
-  if (UseRelaxRelocations)
-    CmdArgs.push_back("--mrelax-relocations");
+  if (!UseRelaxRelocations)
+    CmdArgs.push_back("-mrelax-relocations=no");
   if (UseNoExecStack)
     CmdArgs.push_back("-mnoexecstack");
   if (MipsTargetFeature != nullptr) {
@@ -2618,6 +2666,11 @@ static void CollectArgsForIntegratedAssembler(Compilation &C,
   if (C.getDriver().embedBitcodeEnabled() ||
       C.getDriver().embedBitcodeMarkerOnly())
     Args.AddLastArg(CmdArgs, options::OPT_fembed_bitcode_EQ);
+
+  if (const char *AsSecureLogFile = getenv("AS_SECURE_LOG_FILE")) {
+    CmdArgs.push_back("-as-secure-log-file");
+    CmdArgs.push_back(Args.MakeArgString(AsSecureLogFile));
+  }
 }
 
 static void RenderFloatingPointOptions(const ToolChain &TC, const Driver &D,
@@ -2631,6 +2684,7 @@ static void RenderFloatingPointOptions(const ToolChain &TC, const Driver &D,
   // LLVM flags based on the final state.
   bool HonorINFs = true;
   bool HonorNaNs = true;
+  bool ApproxFunc = false;
   // -fmath-errno is the default on some platforms, e.g. BSD-derived OSes.
   bool MathErrno = TC.IsMathErrnoDefault();
   bool AssociativeMath = false;
@@ -2645,6 +2699,8 @@ static void RenderFloatingPointOptions(const ToolChain &TC, const Driver &D,
   StringRef FPModel = "";
   // -ffp-exception-behavior options: strict, maytrap, ignore
   StringRef FPExceptionBehavior = "";
+  // -ffp-eval-method options: double, extended, source
+  StringRef FPEvalMethod = "";
   const llvm::DenormalMode DefaultDenormalFPMath =
       TC.getDefaultDenormalModeForType(Args, JA);
   const llvm::DenormalMode DefaultDenormalFP32Math =
@@ -2652,9 +2708,16 @@ static void RenderFloatingPointOptions(const ToolChain &TC, const Driver &D,
 
   llvm::DenormalMode DenormalFPMath = DefaultDenormalFPMath;
   llvm::DenormalMode DenormalFP32Math = DefaultDenormalFP32Math;
-  StringRef FPContract = "";
+  // CUDA and HIP don't rely on the frontend to pass an ffp-contract option.
+  // If one wasn't given by the user, don't pass it here.
+  StringRef FPContract;
+  StringRef LastSeenFfpContractOption;
+  bool SeenUnsafeMathModeOption = false;
+  if (!JA.isDeviceOffloading(Action::OFK_Cuda) &&
+      !JA.isOffloading(Action::OFK_HIP))
+    FPContract = "on";
   bool StrictFPModel = false;
-
+  StringRef Float16ExcessPrecision = "";
 
   if (const Arg *A = Args.getLastArg(options::OPT_flimited_precision_EQ)) {
     CmdArgs.push_back("-mlimit-float-precision");
@@ -2671,13 +2734,14 @@ static void RenderFloatingPointOptions(const ToolChain &TC, const Driver &D,
       // If -ffp-model= is seen, reset to fno-fast-math
       HonorINFs = true;
       HonorNaNs = true;
+      ApproxFunc = false;
       // Turning *off* -ffast-math restores the toolchain default.
       MathErrno = TC.IsMathErrnoDefault();
       AssociativeMath = false;
       ReciprocalMath = false;
       SignedZeros = true;
       // -fno_fast_math restores default denormal and fpcontract handling
-      FPContract = "";
+      FPContract = "on";
       DenormalFPMath = llvm::DenormalMode::getIEEE();
 
       // FIXME: The target may have picked a non-IEEE default mode here based on
@@ -2697,12 +2761,10 @@ static void RenderFloatingPointOptions(const ToolChain &TC, const Driver &D,
       // ffp-model= is a Driver option, it is entirely rewritten into more
       // granular options before being passed into cc1.
       // Use the gcc option in the switch below.
-      if (!FPModel.empty() && !FPModel.equals(Val)) {
+      if (!FPModel.empty() && !FPModel.equals(Val))
         D.Diag(clang::diag::warn_drv_overriding_flag_option)
-          << Args.MakeArgString("-ffp-model=" + FPModel)
-          << Args.MakeArgString("-ffp-model=" + Val);
-        FPContract = "";
-      }
+            << Args.MakeArgString("-ffp-model=" + FPModel)
+            << Args.MakeArgString("-ffp-model=" + Val);
       if (Val.equals("fast")) {
         optID = options::OPT_ffast_math;
         FPModel = Val;
@@ -2710,7 +2772,7 @@ static void RenderFloatingPointOptions(const ToolChain &TC, const Driver &D,
       } else if (Val.equals("precise")) {
         optID = options::OPT_ffp_contract;
         FPModel = Val;
-        FPContract = "fast";
+        FPContract = "on";
         PreciseFPModel = true;
       } else if (Val.equals("strict")) {
         StrictFPModel = true;
@@ -2721,7 +2783,7 @@ static void RenderFloatingPointOptions(const ToolChain &TC, const Driver &D,
         TrappingMath = true;
       } else
         D.Diag(diag::err_drv_unsupported_option_argument)
-            << A->getOption().getName() << Val;
+            << A->getSpelling() << Val;
       break;
       }
     }
@@ -2735,6 +2797,8 @@ static void RenderFloatingPointOptions(const ToolChain &TC, const Driver &D,
     case options::OPT_fno_honor_infinities: HonorINFs = false;        break;
     case options::OPT_fhonor_nans:          HonorNaNs = true;         break;
     case options::OPT_fno_honor_nans:       HonorNaNs = false;        break;
+    case options::OPT_fapprox_func:         ApproxFunc = true;        break;
+    case options::OPT_fno_approx_func:      ApproxFunc = false;       break;
     case options::OPT_fmath_errno:          MathErrno = true;         break;
     case options::OPT_fno_math_errno:       MathErrno = false;        break;
     case options::OPT_fassociative_math:    AssociativeMath = true;   break;
@@ -2778,6 +2842,7 @@ static void RenderFloatingPointOptions(const ToolChain &TC, const Driver &D,
 
     case options::OPT_fdenormal_fp_math_EQ:
       DenormalFPMath = llvm::parseDenormalFPAttribute(A->getValue());
+      DenormalFP32Math = DenormalFPMath;
       if (!DenormalFPMath.isValid()) {
         D.Diag(diag::err_drv_invalid_value)
             << A->getAsString(Args) << A->getValue();
@@ -2796,15 +2861,16 @@ static void RenderFloatingPointOptions(const ToolChain &TC, const Driver &D,
     case options::OPT_ffp_contract: {
       StringRef Val = A->getValue();
       if (PreciseFPModel) {
-        // -ffp-model=precise enables ffp-contract=fast as a side effect
-        // the FPContract value has already been set to a string literal
-        // and the Val string isn't a pertinent value.
+        // -ffp-model=precise enables ffp-contract=on.
+        // -ffp-model=precise sets PreciseFPModel to on and Val to
+        // "precise". FPContract is set.
         ;
-      } else if (Val.equals("fast") || Val.equals("on") || Val.equals("off"))
+      } else if (Val.equals("fast") || Val.equals("on") || Val.equals("off")) {
         FPContract = Val;
-      else
+        LastSeenFfpContractOption = Val;
+      } else
         D.Diag(diag::err_drv_unsupported_option_argument)
-           << A->getOption().getName() << Val;
+            << A->getSpelling() << Val;
       break;
     }
 
@@ -2832,10 +2898,43 @@ static void RenderFloatingPointOptions(const ToolChain &TC, const Driver &D,
         TrappingMath = TrappingMathPresent = true;
       } else
         D.Diag(diag::err_drv_unsupported_option_argument)
-            << A->getOption().getName() << Val;
+            << A->getSpelling() << Val;
+      break;
+    }
+
+    // Validate and pass through -ffp-eval-method option.
+    case options::OPT_ffp_eval_method_EQ: {
+      StringRef Val = A->getValue();
+      if (Val.equals("double") || Val.equals("extended") ||
+          Val.equals("source"))
+        FPEvalMethod = Val;
+      else
+        D.Diag(diag::err_drv_unsupported_option_argument)
+            << A->getSpelling() << Val;
       break;
     }
 
+    case options::OPT_fexcess_precision_EQ: {
+      StringRef Val = A->getValue();
+      const llvm::Triple::ArchType Arch = TC.getArch();
+      if (Arch == llvm::Triple::x86 || Arch == llvm::Triple::x86_64) {
+        if (Val.equals("standard") || Val.equals("fast"))
+          Float16ExcessPrecision = Val;
+        // To make it GCC compatible, allow the value of "16" which
+        // means disable excess precision, the same meaning than clang's
+        // equivalent value "none".
+        else if (Val.equals("16"))
+          Float16ExcessPrecision = "none";
+        else
+          D.Diag(diag::err_drv_unsupported_option_argument)
+              << A->getSpelling() << Val;
+      } else {
+        if (!(Val.equals("standard") || Val.equals("fast")))
+          D.Diag(diag::err_drv_unsupported_option_argument)
+              << A->getSpelling() << Val;
+      }
+      break;
+    }
     case options::OPT_ffinite_math_only:
       HonorINFs = false;
       HonorNaNs = false;
@@ -2849,37 +2948,51 @@ static void RenderFloatingPointOptions(const ToolChain &TC, const Driver &D,
       AssociativeMath = true;
       ReciprocalMath = true;
       SignedZeros = false;
+      ApproxFunc = true;
       TrappingMath = false;
       FPExceptionBehavior = "";
+      FPContract = "fast";
+      SeenUnsafeMathModeOption = true;
       break;
     case options::OPT_fno_unsafe_math_optimizations:
       AssociativeMath = false;
       ReciprocalMath = false;
       SignedZeros = true;
+      ApproxFunc = false;
       TrappingMath = true;
       FPExceptionBehavior = "strict";
 
       // The target may have opted to flush by default, so force IEEE.
       DenormalFPMath = llvm::DenormalMode::getIEEE();
       DenormalFP32Math = llvm::DenormalMode::getIEEE();
+      if (!JA.isDeviceOffloading(Action::OFK_Cuda) &&
+          !JA.isOffloading(Action::OFK_HIP)) {
+        if (LastSeenFfpContractOption != "") {
+          FPContract = LastSeenFfpContractOption;
+        } else if (SeenUnsafeMathModeOption)
+          FPContract = "on";
+      }
       break;
 
     case options::OPT_Ofast:
       // If -Ofast is the optimization level, then -ffast-math should be enabled
       if (!OFastEnabled)
         continue;
-      LLVM_FALLTHROUGH;
+      [[fallthrough]];
     case options::OPT_ffast_math:
       HonorINFs = false;
       HonorNaNs = false;
       MathErrno = false;
       AssociativeMath = true;
       ReciprocalMath = true;
+      ApproxFunc = true;
       SignedZeros = false;
       TrappingMath = false;
       RoundingFPMath = false;
+      FPExceptionBehavior = "";
       // If fast-math is set then set the fp-contract mode to fast.
       FPContract = "fast";
+      SeenUnsafeMathModeOption = true;
       break;
     case options::OPT_fno_fast_math:
       HonorINFs = true;
@@ -2890,33 +3003,39 @@ static void RenderFloatingPointOptions(const ToolChain &TC, const Driver &D,
       MathErrno = TC.IsMathErrnoDefault();
       AssociativeMath = false;
       ReciprocalMath = false;
+      ApproxFunc = false;
       SignedZeros = true;
-      TrappingMath = false;
-      RoundingFPMath = false;
       // -fno_fast_math restores default denormal and fpcontract handling
       DenormalFPMath = DefaultDenormalFPMath;
       DenormalFP32Math = llvm::DenormalMode::getIEEE();
-      FPContract = "";
+      if (!JA.isDeviceOffloading(Action::OFK_Cuda) &&
+          !JA.isOffloading(Action::OFK_HIP)) {
+        if (LastSeenFfpContractOption != "") {
+          FPContract = LastSeenFfpContractOption;
+        } else if (SeenUnsafeMathModeOption)
+          FPContract = "on";
+      }
       break;
     }
     if (StrictFPModel) {
       // If -ffp-model=strict has been specified on command line but
       // subsequent options conflict then emit warning diagnostic.
-      if (HonorINFs && HonorNaNs &&
-        !AssociativeMath && !ReciprocalMath &&
-        SignedZeros && TrappingMath && RoundingFPMath &&
-        (FPContract.equals("off") || FPContract.empty()) &&
-        DenormalFPMath == llvm::DenormalMode::getIEEE() &&
-        DenormalFP32Math == llvm::DenormalMode::getIEEE())
+      if (HonorINFs && HonorNaNs && !AssociativeMath && !ReciprocalMath &&
+          SignedZeros && TrappingMath && RoundingFPMath && !ApproxFunc &&
+          DenormalFPMath == llvm::DenormalMode::getIEEE() &&
+          DenormalFP32Math == llvm::DenormalMode::getIEEE() &&
+          FPContract.equals("off"))
         // OK: Current Arg doesn't conflict with -ffp-model=strict
         ;
       else {
         StrictFPModel = false;
         FPModel = "";
-        D.Diag(clang::diag::warn_drv_overriding_flag_option)
-            << "-ffp-model=strict" <<
-            ((A->getNumValues() == 0) ?  A->getSpelling()
-            : Args.MakeArgString(A->getSpelling() + A->getValue()));
+        auto RHS = (A->getNumValues() == 0)
+                       ? A->getSpelling()
+                       : Args.MakeArgString(A->getSpelling() + A->getValue());
+        if (RHS != "-ffp-model=strict")
+          D.Diag(clang::diag::warn_drv_overriding_flag_option)
+              << "-ffp-model=strict" << RHS;
       }
     }
 
@@ -2930,12 +3049,15 @@ static void RenderFloatingPointOptions(const ToolChain &TC, const Driver &D,
   if (!HonorNaNs)
     CmdArgs.push_back("-menable-no-nans");
 
+  if (ApproxFunc)
+    CmdArgs.push_back("-fapprox-func");
+
   if (MathErrno)
     CmdArgs.push_back("-fmath-errno");
 
-  if (!MathErrno && AssociativeMath && ReciprocalMath && !SignedZeros &&
-      !TrappingMath)
-    CmdArgs.push_back("-menable-unsafe-fp-math");
+ if (AssociativeMath && ReciprocalMath && !SignedZeros && ApproxFunc &&
+     !TrappingMath)
+    CmdArgs.push_back("-funsafe-math-optimizations");
 
   if (!SignedZeros)
     CmdArgs.push_back("-fno-signed-zeros");
@@ -2980,12 +3102,19 @@ static void RenderFloatingPointOptions(const ToolChain &TC, const Driver &D,
     CmdArgs.push_back(Args.MakeArgString("-ffp-exception-behavior=" +
                       FPExceptionBehavior));
 
+  if (!FPEvalMethod.empty())
+    CmdArgs.push_back(Args.MakeArgString("-ffp-eval-method=" + FPEvalMethod));
+
+  if (!Float16ExcessPrecision.empty())
+    CmdArgs.push_back(Args.MakeArgString("-ffloat16-excess-precision=" +
+                                         Float16ExcessPrecision));
+
   ParseMRecip(D, Args, CmdArgs);
 
   // -ffast-math enables the __FAST_MATH__ preprocessor macro, but check for the
   // individual features enabled by -ffast-math instead of the option itself as
   // that's consistent with gcc's behaviour.
-  if (!HonorINFs && !HonorNaNs && !MathErrno && AssociativeMath &&
+  if (!HonorINFs && !HonorNaNs && !MathErrno && AssociativeMath && ApproxFunc &&
       ReciprocalMath && !SignedZeros && !TrappingMath && !RoundingFPMath) {
     CmdArgs.push_back("-ffast-math");
     if (FPModel.equals("fast")) {
@@ -3020,12 +3149,6 @@ static void RenderFloatingPointOptions(const ToolChain &TC, const Driver &D,
 static void RenderAnalyzerOptions(const ArgList &Args, ArgStringList &CmdArgs,
                                   const llvm::Triple &Triple,
                                   const InputInfo &Input) {
-  // Enable region store model by default.
-  CmdArgs.push_back("-analyzer-store=region");
-
-  // Treat blocks as analysis entry points.
-  CmdArgs.push_back("-analyzer-opt-analyze-nested-blocks");
-
   // Add default argument set.
   if (!Args.hasArg(options::OPT__analyzer_no_default_checks)) {
     CmdArgs.push_back("-analyzer-checker=core");
@@ -3043,8 +3166,8 @@ static void RenderAnalyzerOptions(const ArgList &Args, ArgStringList &CmdArgs,
       CmdArgs.push_back("-analyzer-checker=unix.cstring.NullArg");
     }
 
-    // Disable some unix checkers for PS4.
-    if (Triple.isPS4CPU()) {
+    // Disable some unix checkers for PS4/PS5.
+    if (Triple.isPS()) {
       CmdArgs.push_back("-analyzer-disable-checker=unix.API");
       CmdArgs.push_back("-analyzer-disable-checker=unix.Vfork");
     }
@@ -3062,7 +3185,7 @@ static void RenderAnalyzerOptions(const ArgList &Args, ArgStringList &CmdArgs,
     if (types::isCXX(Input.getType()))
       CmdArgs.push_back("-analyzer-checker=cplusplus");
 
-    if (!Triple.isPS4CPU()) {
+    if (!Triple.isPS()) {
       CmdArgs.push_back("-analyzer-checker=security.insecureAPI.UncheckedReturn");
       CmdArgs.push_back("-analyzer-checker=security.insecureAPI.getpw");
       CmdArgs.push_back("-analyzer-checker=security.insecureAPI.gets");
@@ -3092,6 +3215,16 @@ static void RenderAnalyzerOptions(const ArgList &Args, ArgStringList &CmdArgs,
   Args.AddAllArgValues(CmdArgs, options::OPT_Xanalyzer);
 }
 
+static bool isValidSymbolName(StringRef S) {
+  if (S.empty())
+    return false;
+
+  if (std::isdigit(S[0]))
+    return false;
+
+  return llvm::all_of(S, [](char C) { return std::isalnum(C) || C == '_'; });
+}
+
 static void RenderSSPOptions(const Driver &D, const ToolChain &TC,
                              const ArgList &Args, ArgStringList &CmdArgs,
                              bool KernelOrKext) {
@@ -3118,6 +3251,12 @@ static void RenderSSPOptions(const Driver &D, const ToolChain &TC,
       StackProtectorLevel = LangOptions::SSPStrong;
     else if (A->getOption().matches(options::OPT_fstack_protector_all))
       StackProtectorLevel = LangOptions::SSPReq;
+
+    if (EffectiveTriple.isBPF() && StackProtectorLevel != LangOptions::SSPOff) {
+      D.Diag(diag::warn_drv_unsupported_option_for_target)
+          << A->getSpelling() << EffectiveTriple.getTriple();
+      StackProtectorLevel = DefaultStackProtectorLevel;
+    }
   } else {
     StackProtectorLevel = DefaultStackProtectorLevel;
   }
@@ -3143,14 +3282,42 @@ static void RenderSSPOptions(const Driver &D, const ToolChain &TC,
   const std::string &TripleStr = EffectiveTriple.getTriple();
   if (Arg *A = Args.getLastArg(options::OPT_mstack_protector_guard_EQ)) {
     StringRef Value = A->getValue();
-    if (!EffectiveTriple.isX86() && !EffectiveTriple.isAArch64())
+    if (!EffectiveTriple.isX86() && !EffectiveTriple.isAArch64() &&
+        !EffectiveTriple.isARM() && !EffectiveTriple.isThumb())
       D.Diag(diag::err_drv_unsupported_opt_for_target)
           << A->getAsString(Args) << TripleStr;
-    if (EffectiveTriple.isX86() && Value != "tls" && Value != "global") {
+    if ((EffectiveTriple.isX86() || EffectiveTriple.isARM() ||
+         EffectiveTriple.isThumb()) &&
+        Value != "tls" && Value != "global") {
       D.Diag(diag::err_drv_invalid_value_with_suggestion)
           << A->getOption().getName() << Value << "tls global";
       return;
     }
+    if ((EffectiveTriple.isARM() || EffectiveTriple.isThumb()) &&
+        Value == "tls") {
+      if (!Args.hasArg(options::OPT_mstack_protector_guard_offset_EQ)) {
+        D.Diag(diag::err_drv_ssp_missing_offset_argument)
+            << A->getAsString(Args);
+        return;
+      }
+      // Check whether the target subarch supports the hardware TLS register
+      if (!arm::isHardTPSupported(EffectiveTriple)) {
+        D.Diag(diag::err_target_unsupported_tp_hard)
+            << EffectiveTriple.getArchName();
+        return;
+      }
+      // Check whether the user asked for something other than -mtp=cp15
+      if (Arg *A = Args.getLastArg(options::OPT_mtp_mode_EQ)) {
+        StringRef Value = A->getValue();
+        if (Value != "cp15") {
+          D.Diag(diag::err_drv_argument_not_allowed_with)
+              << A->getAsString(Args) << "-mstack-protector-guard=tls";
+          return;
+        }
+      }
+      CmdArgs.push_back("-target-feature");
+      CmdArgs.push_back("+read-tp-hard");
+    }
     if (EffectiveTriple.isAArch64() && Value != "sysreg" && Value != "global") {
       D.Diag(diag::err_drv_invalid_value_with_suggestion)
           << A->getOption().getName() << Value << "sysreg global";
@@ -3161,7 +3328,8 @@ static void RenderSSPOptions(const Driver &D, const ToolChain &TC,
 
   if (Arg *A = Args.getLastArg(options::OPT_mstack_protector_guard_offset_EQ)) {
     StringRef Value = A->getValue();
-    if (!EffectiveTriple.isX86() && !EffectiveTriple.isAArch64())
+    if (!EffectiveTriple.isX86() && !EffectiveTriple.isAArch64() &&
+        !EffectiveTriple.isARM() && !EffectiveTriple.isThumb())
       D.Diag(diag::err_drv_unsupported_opt_for_target)
           << A->getAsString(Args) << TripleStr;
     int Offset;
@@ -3169,6 +3337,12 @@ static void RenderSSPOptions(const Driver &D, const ToolChain &TC,
       D.Diag(diag::err_drv_invalid_value) << A->getOption().getName() << Value;
       return;
     }
+    if ((EffectiveTriple.isARM() || EffectiveTriple.isThumb()) &&
+        (Offset < 0 || Offset > 0xfffff)) {
+      D.Diag(diag::err_drv_invalid_int_value)
+          << A->getOption().getName() << Value;
+      return;
+    }
     A->render(Args, CmdArgs);
   }
 
@@ -3188,22 +3362,31 @@ static void RenderSSPOptions(const Driver &D, const ToolChain &TC,
     }
     A->render(Args, CmdArgs);
   }
+
+  if (Arg *A = Args.getLastArg(options::OPT_mstack_protector_guard_symbol_EQ)) {
+    StringRef Value = A->getValue();
+    if (!isValidSymbolName(Value)) {
+      D.Diag(diag::err_drv_argument_only_allowed_with)
+          << A->getOption().getName() << "legal symbol name";
+      return;
+    }
+    A->render(Args, CmdArgs);
+  }
 }
 
 static void RenderSCPOptions(const ToolChain &TC, const ArgList &Args,
                              ArgStringList &CmdArgs) {
   const llvm::Triple &EffectiveTriple = TC.getEffectiveTriple();
 
-  if (!EffectiveTriple.isOSLinux())
+  if (!EffectiveTriple.isOSFreeBSD() && !EffectiveTriple.isOSLinux())
     return;
 
   if (!EffectiveTriple.isX86() && !EffectiveTriple.isSystemZ() &&
       !EffectiveTriple.isPPC64())
     return;
 
-  if (Args.hasFlag(options::OPT_fstack_clash_protection,
-                   options::OPT_fno_stack_clash_protection, false))
-    CmdArgs.push_back("-fstack-clash-protection");
+  Args.addOptInFlag(CmdArgs, options::OPT_fstack_clash_protection,
+                    options::OPT_fno_stack_clash_protection);
 }
 
 static void RenderTrivialAutoVarInitOptions(const Driver &D,
@@ -3224,7 +3407,7 @@ static void RenderTrivialAutoVarInitOptions(const Driver &D,
         TrivialAutoVarInit = Val;
       else
         D.Diag(diag::err_drv_unsupported_option_argument)
-            << A->getOption().getName() << Val;
+            << A->getSpelling() << Val;
       break;
     }
     }
@@ -3243,8 +3426,6 @@ static void RenderTrivialAutoVarInitOptions(const Driver &D,
     }
 
   if (!TrivialAutoVarInit.empty()) {
-    if (TrivialAutoVarInit == "zero" && !Args.hasArg(options::OPT_enable_trivial_var_init_zero))
-      D.Diag(diag::err_drv_trivial_auto_var_init_zero_disabled);
     CmdArgs.push_back(
         Args.MakeArgString("-ftrivial-auto-var-init=" + TrivialAutoVarInit));
   }
@@ -3286,6 +3467,9 @@ static void RenderOpenCLOptions(const ArgList &Args, ArgStringList &CmdArgs,
   if (Arg *A = Args.getLastArg(options::OPT_cl_std_EQ)) {
     std::string CLStdStr = std::string("-cl-std=") + A->getValue();
     CmdArgs.push_back(Args.MakeArgString(CLStdStr));
+  } else if (Arg *A = Args.getLastArg(options::OPT_cl_ext_EQ)) {
+    std::string CLExtStr = std::string("-cl-ext=") + A->getValue();
+    CmdArgs.push_back(Args.MakeArgString(CLExtStr));
   }
 
   for (const auto &Arg : ForwardedArguments)
@@ -3301,6 +3485,29 @@ static void RenderOpenCLOptions(const ArgList &Args, ArgStringList &CmdArgs,
   }
 }
 
+static void RenderHLSLOptions(const ArgList &Args, ArgStringList &CmdArgs,
+                              types::ID InputType) {
+  const unsigned ForwardedArguments[] = {options::OPT_dxil_validator_version,
+                                         options::OPT_D,
+                                         options::OPT_I,
+                                         options::OPT_S,
+                                         options::OPT_O,
+                                         options::OPT_emit_llvm,
+                                         options::OPT_emit_obj,
+                                         options::OPT_disable_llvm_passes,
+                                         options::OPT_fnative_half_type,
+                                         options::OPT_hlsl_entrypoint};
+  if (!types::isHLSL(InputType))
+    return;
+  for (const auto &Arg : ForwardedArguments)
+    if (const auto *A = Args.getLastArg(Arg))
+      A->renderAsInput(Args, CmdArgs);
+  // Add the default headers if dxc_no_stdinc is not set.
+  if (!Args.hasArg(options::OPT_dxc_no_stdinc) &&
+      !Args.hasArg(options::OPT_nostdinc))
+    CmdArgs.push_back("-finclude-default-header");
+}
+
 static void RenderARCMigrateToolOptions(const Driver &D, const ArgList &Args,
                                         ArgStringList &CmdArgs) {
   bool ARCMTEnabled = false;
@@ -3369,7 +3576,7 @@ static void RenderARCMigrateToolOptions(const Driver &D, const ArgList &Args,
     Args.AddLastArg(CmdArgs, options::OPT_objcmt_returns_innerpointer_property);
     Args.AddLastArg(CmdArgs, options::OPT_objcmt_ns_nonatomic_iosonly);
     Args.AddLastArg(CmdArgs, options::OPT_objcmt_migrate_designated_init);
-    Args.AddLastArg(CmdArgs, options::OPT_objcmt_whitelist_dir_path);
+    Args.AddLastArg(CmdArgs, options::OPT_objcmt_allowlist_dir_path);
   }
 }
 
@@ -3387,20 +3594,13 @@ static void RenderBuiltinOptions(const ToolChain &TC, const llvm::Triple &T,
     UseBuiltins = false;
 
   // Process the -fno-builtin-* options.
-  for (const auto &Arg : Args) {
-    const Option &O = Arg->getOption();
-    if (!O.matches(options::OPT_fno_builtin_))
-      continue;
-
-    Arg->claim();
+  for (const Arg *A : Args.filtered(options::OPT_fno_builtin_)) {
+    A->claim();
 
     // If -fno-builtin is specified, then there's no need to pass the option to
     // the frontend.
-    if (!UseBuiltins)
-      continue;
-
-    StringRef FuncName = Arg->getValue();
-    CmdArgs.push_back(Args.MakeArgString("-fno-builtin-" + FuncName));
+    if (UseBuiltins)
+      A->render(Args, CmdArgs);
   }
 
   // le32-specific flags:
@@ -3411,6 +3611,11 @@ static void RenderBuiltinOptions(const ToolChain &TC, const llvm::Triple &T,
 }
 
 bool Driver::getDefaultModuleCachePath(SmallVectorImpl<char> &Result) {
+  if (const char *Str = std::getenv("CLANG_MODULE_CACHE_PATH")) {
+    Twine Path{Str};
+    Path.toVector(Result);
+    return Path.getSingleStringRef() != "";
+  }
   if (llvm::sys::path::cache_directory(Result)) {
     llvm::sys::path::append(Result, "clang");
     llvm::sys::path::append(Result, "ModuleCache");
@@ -3419,10 +3624,19 @@ bool Driver::getDefaultModuleCachePath(SmallVectorImpl<char> &Result) {
   return false;
 }
 
-static void RenderModulesOptions(Compilation &C, const Driver &D,
+static bool RenderModulesOptions(Compilation &C, const Driver &D,
                                  const ArgList &Args, const InputInfo &Input,
-                                 const InputInfo &Output,
-                                 ArgStringList &CmdArgs, bool &HaveModules) {
+                                 const InputInfo &Output, const Arg *Std,
+                                 ArgStringList &CmdArgs) {
+  bool IsCXX = types::isCXX(Input.getType());
+  // FIXME: Find a better way to determine whether the input has standard c++
+  // modules support by default.
+  bool HaveStdCXXModules =
+      IsCXX && Std &&
+      (Std->containsValue("c++2a") || Std->containsValue("c++20") ||
+       Std->containsValue("c++2b") || Std->containsValue("c++latest"));
+  bool HaveModules = HaveStdCXXModules;
+
   // -fmodules enables the use of precompiled modules (off by default).
   // Users can pass -fno-cxx-modules to turn off modules support for
   // C++/Objective-C++ programs.
@@ -3430,7 +3644,7 @@ static void RenderModulesOptions(Compilation &C, const Driver &D,
   if (Args.hasFlag(options::OPT_fmodules, options::OPT_fno_modules, false)) {
     bool AllowedInCXX = Args.hasFlag(options::OPT_fcxx_modules,
                                      options::OPT_fno_cxx_modules, true);
-    if (AllowedInCXX || !types::isCXX(Input.getType())) {
+    if (AllowedInCXX || !IsCXX) {
       CmdArgs.push_back("-fmodules");
       HaveClangModules = true;
     }
@@ -3438,6 +3652,7 @@ static void RenderModulesOptions(Compilation &C, const Driver &D,
 
   HaveModules |= HaveClangModules;
   if (Args.hasArg(options::OPT_fmodules_ts)) {
+    D.Diag(diag::warn_deprecated_fmodules_ts_flag);
     CmdArgs.push_back("-fmodules-ts");
     HaveModules = true;
   }
@@ -3449,9 +3664,8 @@ static void RenderModulesOptions(Compilation &C, const Driver &D,
     CmdArgs.push_back("-fimplicit-module-maps");
 
   // -fmodules-decluse checks that modules used are declared so (off by default)
-  if (Args.hasFlag(options::OPT_fmodules_decluse,
-                   options::OPT_fno_modules_decluse, false))
-    CmdArgs.push_back("-fmodules-decluse");
+  Args.addOptInFlag(CmdArgs, options::OPT_fmodules_decluse,
+                    options::OPT_fno_modules_decluse);
 
   // -fmodules-strict-decluse is like -fmodule-decluse, but also checks that
   // all #included headers are part of modules.
@@ -3559,38 +3773,55 @@ static void RenderModulesOptions(Compilation &C, const Driver &D,
   Args.AddLastArg(CmdArgs, options::OPT_fmodules_prune_interval);
   Args.AddLastArg(CmdArgs, options::OPT_fmodules_prune_after);
 
-  Args.AddLastArg(CmdArgs, options::OPT_fbuild_session_timestamp);
+  if (HaveClangModules) {
+    Args.AddLastArg(CmdArgs, options::OPT_fbuild_session_timestamp);
 
-  if (Arg *A = Args.getLastArg(options::OPT_fbuild_session_file)) {
-    if (Args.hasArg(options::OPT_fbuild_session_timestamp))
-      D.Diag(diag::err_drv_argument_not_allowed_with)
-          << A->getAsString(Args) << "-fbuild-session-timestamp";
+    if (Arg *A = Args.getLastArg(options::OPT_fbuild_session_file)) {
+      if (Args.hasArg(options::OPT_fbuild_session_timestamp))
+        D.Diag(diag::err_drv_argument_not_allowed_with)
+            << A->getAsString(Args) << "-fbuild-session-timestamp";
 
-    llvm::sys::fs::file_status Status;
-    if (llvm::sys::fs::status(A->getValue(), Status))
-      D.Diag(diag::err_drv_no_such_file) << A->getValue();
-    CmdArgs.push_back(
-        Args.MakeArgString("-fbuild-session-timestamp=" +
-                           Twine((uint64_t)Status.getLastModificationTime()
-                                     .time_since_epoch()
-                                     .count())));
-  }
+      llvm::sys::fs::file_status Status;
+      if (llvm::sys::fs::status(A->getValue(), Status))
+        D.Diag(diag::err_drv_no_such_file) << A->getValue();
+      CmdArgs.push_back(Args.MakeArgString(
+          "-fbuild-session-timestamp=" +
+          Twine((uint64_t)std::chrono::duration_cast<std::chrono::seconds>(
+                    Status.getLastModificationTime().time_since_epoch())
+                    .count())));
+    }
 
-  if (Args.getLastArg(options::OPT_fmodules_validate_once_per_build_session)) {
-    if (!Args.getLastArg(options::OPT_fbuild_session_timestamp,
-                         options::OPT_fbuild_session_file))
-      D.Diag(diag::err_drv_modules_validate_once_requires_timestamp);
+    if (Args.getLastArg(
+            options::OPT_fmodules_validate_once_per_build_session)) {
+      if (!Args.getLastArg(options::OPT_fbuild_session_timestamp,
+                           options::OPT_fbuild_session_file))
+        D.Diag(diag::err_drv_modules_validate_once_requires_timestamp);
+
+      Args.AddLastArg(CmdArgs,
+                      options::OPT_fmodules_validate_once_per_build_session);
+    }
+
+    if (Args.hasFlag(options::OPT_fmodules_validate_system_headers,
+                     options::OPT_fno_modules_validate_system_headers,
+                     ImplicitModules))
+      CmdArgs.push_back("-fmodules-validate-system-headers");
 
     Args.AddLastArg(CmdArgs,
-                    options::OPT_fmodules_validate_once_per_build_session);
+                    options::OPT_fmodules_disable_diagnostic_validation);
+  } else {
+    Args.ClaimAllArgs(options::OPT_fbuild_session_timestamp);
+    Args.ClaimAllArgs(options::OPT_fbuild_session_file);
+    Args.ClaimAllArgs(options::OPT_fmodules_validate_once_per_build_session);
+    Args.ClaimAllArgs(options::OPT_fmodules_validate_system_headers);
+    Args.ClaimAllArgs(options::OPT_fno_modules_validate_system_headers);
+    Args.ClaimAllArgs(options::OPT_fmodules_disable_diagnostic_validation);
   }
 
-  if (Args.hasFlag(options::OPT_fmodules_validate_system_headers,
-                   options::OPT_fno_modules_validate_system_headers,
-                   ImplicitModules))
-    CmdArgs.push_back("-fmodules-validate-system-headers");
+  // Claim `-fmodule-output` and `-fmodule-output=` to avoid unused warnings.
+  Args.ClaimAllArgs(options::OPT_fmodule_output);
+  Args.ClaimAllArgs(options::OPT_fmodule_output_EQ);
 
-  Args.AddLastArg(CmdArgs, options::OPT_fmodules_disable_diagnostic_validation);
+  return HaveModules;
 }
 
 static void RenderCharacterOptions(const ArgList &Args, const llvm::Triple &T,
@@ -3750,15 +3981,10 @@ static void RenderDiagnosticsOptions(const Driver &D, const ArgList &Args,
                     options::OPT_fno_caret_diagnostics, CaretDefault))
     CmdArgs.push_back("-fno-caret-diagnostics");
 
-  // -fdiagnostics-fixit-info is default, only pass non-default.
-  if (!Args.hasFlag(options::OPT_fdiagnostics_fixit_info,
-                    options::OPT_fno_diagnostics_fixit_info))
-    CmdArgs.push_back("-fno-diagnostics-fixit-info");
-
-  // Enable -fdiagnostics-show-option by default.
-  if (!Args.hasFlag(options::OPT_fdiagnostics_show_option,
-                    options::OPT_fno_diagnostics_show_option, true))
-    CmdArgs.push_back("-fno-diagnostics-show-option");
+  Args.addOptOutFlag(CmdArgs, options::OPT_fdiagnostics_fixit_info,
+                     options::OPT_fno_diagnostics_fixit_info);
+  Args.addOptOutFlag(CmdArgs, options::OPT_fdiagnostics_show_option,
+                     options::OPT_fno_diagnostics_show_option);
 
   if (const Arg *A =
           Args.getLastArg(options::OPT_fdiagnostics_show_category_EQ)) {
@@ -3766,9 +3992,8 @@ static void RenderDiagnosticsOptions(const Driver &D, const ArgList &Args,
     CmdArgs.push_back(A->getValue());
   }
 
-  if (Args.hasFlag(options::OPT_fdiagnostics_show_hotness,
-                   options::OPT_fno_diagnostics_show_hotness, false))
-    CmdArgs.push_back("-fdiagnostics-show-hotness");
+  Args.addOptInFlag(CmdArgs, options::OPT_fdiagnostics_show_hotness,
+                    options::OPT_fno_diagnostics_show_hotness);
 
   if (const Arg *A =
           Args.getLastArg(options::OPT_fdiagnostics_hotness_threshold_EQ)) {
@@ -3780,6 +4005,9 @@ static void RenderDiagnosticsOptions(const Driver &D, const ArgList &Args,
   if (const Arg *A = Args.getLastArg(options::OPT_fdiagnostics_format_EQ)) {
     CmdArgs.push_back("-fdiagnostics-format");
     CmdArgs.push_back(A->getValue());
+    if (StringRef(A->getValue()) == "sarif" ||
+        StringRef(A->getValue()) == "SARIF")
+      D.Diag(diag::warn_drv_sarif_format_unstable);
   }
 
   if (const Arg *A = Args.getLastArg(
@@ -3796,22 +4024,13 @@ static void RenderDiagnosticsOptions(const Driver &D, const ArgList &Args,
   // re-parsed to construct this job; claim any possible color diagnostic here
   // to avoid warn_drv_unused_argument and diagnose bad
   // OPT_fdiagnostics_color_EQ values.
-  for (const Arg *A : Args) {
-    const Option &O = A->getOption();
-    if (!O.matches(options::OPT_fcolor_diagnostics) &&
-        !O.matches(options::OPT_fdiagnostics_color) &&
-        !O.matches(options::OPT_fno_color_diagnostics) &&
-        !O.matches(options::OPT_fno_diagnostics_color) &&
-        !O.matches(options::OPT_fdiagnostics_color_EQ))
-      continue;
-
-    if (O.matches(options::OPT_fdiagnostics_color_EQ)) {
-      StringRef Value(A->getValue());
-      if (Value != "always" && Value != "never" && Value != "auto")
-        D.Diag(diag::err_drv_clang_unsupported)
-            << ("-fdiagnostics-color=" + Value).str();
-    }
-    A->claim();
+  Args.getLastArg(options::OPT_fcolor_diagnostics,
+                  options::OPT_fno_color_diagnostics);
+  if (const Arg *A = Args.getLastArg(options::OPT_fdiagnostics_color_EQ)) {
+    StringRef Value(A->getValue());
+    if (Value != "always" && Value != "never" && Value != "auto")
+      D.Diag(diag::err_drv_invalid_argument_to_option)
+          << Value << A->getOption().getName();
   }
 
   if (D.getDiags().getDiagnosticOptions().ShowColors)
@@ -3820,9 +4039,8 @@ static void RenderDiagnosticsOptions(const Driver &D, const ArgList &Args,
   if (Args.hasArg(options::OPT_fansi_escape_codes))
     CmdArgs.push_back("-fansi-escape-codes");
 
-  if (!Args.hasFlag(options::OPT_fshow_source_location,
-                    options::OPT_fno_show_source_location))
-    CmdArgs.push_back("-fno-show-source-location");
+  Args.addOptOutFlag(CmdArgs, options::OPT_fshow_source_location,
+                     options::OPT_fno_show_source_location);
 
   if (Args.hasArg(options::OPT_fdiagnostics_absolute_paths))
     CmdArgs.push_back("-fdiagnostics-absolute-paths");
@@ -3831,14 +4049,11 @@ static void RenderDiagnosticsOptions(const Driver &D, const ArgList &Args,
                     ColumnDefault))
     CmdArgs.push_back("-fno-show-column");
 
-  if (!Args.hasFlag(options::OPT_fspell_checking,
-                    options::OPT_fno_spell_checking))
-    CmdArgs.push_back("-fno-spell-checking");
+  Args.addOptOutFlag(CmdArgs, options::OPT_fspell_checking,
+                     options::OPT_fno_spell_checking);
 }
 
-enum class DwarfFissionKind { None, Split, Single };
-
-static DwarfFissionKind getDebugFissionKind(const Driver &D,
+DwarfFissionKind tools::getDebugFissionKind(const Driver &D,
                                             const ArgList &Args, Arg *&Arg) {
   Arg = Args.getLastArg(options::OPT_gsplit_dwarf, options::OPT_gsplit_dwarf_EQ,
                         options::OPT_gno_split_dwarf);
@@ -3855,7 +4070,7 @@ static DwarfFissionKind getDebugFissionKind(const Driver &D,
     return DwarfFissionKind::Single;
 
   D.Diag(diag::err_drv_unsupported_option_argument)
-      << Arg->getOption().getName() << Arg->getValue();
+      << Arg->getSpelling() << Arg->getValue();
   return DwarfFissionKind::None;
 }
 
@@ -3888,12 +4103,6 @@ static void renderDebugOptions(const ToolChain &TC, const Driver &D,
                                ArgStringList &CmdArgs,
                                codegenoptions::DebugInfoKind &DebugInfoKind,
                                DwarfFissionKind &DwarfFission) {
-  // These two forms of profiling info can't be used together.
-  if (const Arg *A1 = Args.getLastArg(options::OPT_fpseudo_probe_for_profiling))
-    if (const Arg *A2 = Args.getLastArg(options::OPT_fdebug_info_for_profiling))
-      D.Diag(diag::err_drv_argument_not_allowed_with)
-          << A1->getAsString(Args) << A2->getAsString(Args);
-
   if (Args.hasFlag(options::OPT_fdebug_info_for_profiling,
                    options::OPT_fno_debug_info_for_profiling, false) &&
       checkDebugInfoOption(
@@ -3947,8 +4156,10 @@ static void renderDebugOptions(const ToolChain &TC, const Driver &D,
   }
 
   // If a debugger tuning argument appeared, remember it.
+  bool HasDebuggerTuning = false;
   if (const Arg *A =
           Args.getLastArg(options::OPT_gTune_Group, options::OPT_ggdbN_Group)) {
+    HasDebuggerTuning = true;
     if (checkDebugInfoOption(A, Args, D, TC)) {
       if (A->getOption().matches(options::OPT_glldb))
         DebuggerTuning = llvm::DebuggerKind::LLDB;
@@ -3962,19 +4173,12 @@ static void renderDebugOptions(const ToolChain &TC, const Driver &D,
   }
 
   // If a -gdwarf argument appeared, remember it.
-  const Arg *GDwarfN = getDwarfNArg(Args);
   bool EmitDwarf = false;
-  if (GDwarfN) {
-    if (checkDebugInfoOption(GDwarfN, Args, D, TC))
-      EmitDwarf = true;
-    else
-      GDwarfN = nullptr;
-  }
+  if (const Arg *A = getDwarfNArg(Args))
+    EmitDwarf = checkDebugInfoOption(A, Args, D, TC);
 
-  if (const Arg *A = Args.getLastArg(options::OPT_gcodeview)) {
-    if (checkDebugInfoOption(A, Args, D, TC))
-      EmitCodeView = true;
-  }
+  if (const Arg *A = Args.getLastArg(options::OPT_gcodeview))
+    EmitCodeView = checkDebugInfoOption(A, Args, D, TC);
 
   // If the user asked for debug info but did not explicitly specify -gcodeview
   // or -gdwarf, ask the toolchain for the default format.
@@ -3993,25 +4197,13 @@ static void renderDebugOptions(const ToolChain &TC, const Driver &D,
   unsigned RequestedDWARFVersion = 0; // DWARF version requested by the user
   unsigned EffectiveDWARFVersion = 0; // DWARF version TC can generate. It may
                                       // be lower than what the user wanted.
-  unsigned DefaultDWARFVersion = ParseDebugDefaultVersion(TC, Args);
   if (EmitDwarf) {
-    // Start with the platform default DWARF version
-    RequestedDWARFVersion = TC.GetDefaultDwarfVersion();
-    assert(RequestedDWARFVersion &&
-           "toolchain default DWARF version must be nonzero");
-
-    // If the user specified a default DWARF version, that takes precedence
-    // over the platform default.
-    if (DefaultDWARFVersion)
-      RequestedDWARFVersion = DefaultDWARFVersion;
-
-    // Override with a user-specified DWARF version
-    if (GDwarfN)
-      if (auto ExplicitVersion = DwarfVersionNum(GDwarfN->getSpelling()))
-        RequestedDWARFVersion = ExplicitVersion;
+    RequestedDWARFVersion = getDwarfVersion(TC, Args);
     // Clamp effective DWARF version to the max supported by the toolchain.
     EffectiveDWARFVersion =
         std::min(RequestedDWARFVersion, TC.getMaxDwarfVersion());
+  } else {
+    Args.ClaimAllArgs(options::OPT_fdebug_default_version);
   }
 
   // -gline-directives-only supported only for the DWARF debug info.
@@ -4045,9 +4237,11 @@ static void renderDebugOptions(const ToolChain &TC, const Driver &D,
     CmdArgs.push_back("-gno-column-info");
 
   // FIXME: Move backend command line options to the module.
-  // If -gline-tables-only or -gline-directives-only is the last option it wins.
-  if (const Arg *A = Args.getLastArg(options::OPT_gmodules))
-    if (checkDebugInfoOption(A, Args, D, TC)) {
+  if (Args.hasFlag(options::OPT_gmodules, options::OPT_gno_modules, false)) {
+    // If -gline-tables-only or -gline-directives-only is the last option it
+    // wins.
+    if (checkDebugInfoOption(Args.getLastArg(options::OPT_gmodules), Args, D,
+                             TC)) {
       if (DebugInfoKind != codegenoptions::DebugLineTablesOnly &&
           DebugInfoKind != codegenoptions::DebugDirectivesOnly) {
         DebugInfoKind = codegenoptions::DebugInfoConstructor;
@@ -4055,6 +4249,7 @@ static void renderDebugOptions(const ToolChain &TC, const Driver &D,
         CmdArgs.push_back("-fmodule-format=obj");
       }
     }
+  }
 
   if (T.isOSBinFormatELF() && SplitDWARFInlining)
     CmdArgs.push_back("-fsplit-dwarf-inlining");
@@ -4103,19 +4298,16 @@ static void renderDebugOptions(const ToolChain &TC, const Driver &D,
   if (EmitCodeView) {
     CmdArgs.push_back("-gcodeview");
 
-    // Emit codeview type hashes if requested.
-    if (Args.hasFlag(options::OPT_gcodeview_ghash,
-                     options::OPT_gno_codeview_ghash, false)) {
-      CmdArgs.push_back("-gcodeview-ghash");
-    }
-  }
+    Args.addOptInFlag(CmdArgs, options::OPT_gcodeview_ghash,
+                      options::OPT_gno_codeview_ghash);
 
-  // Omit inline line tables if requested.
-  if (Args.hasFlag(options::OPT_gno_inline_line_tables,
-                   options::OPT_ginline_line_tables, false)) {
-    CmdArgs.push_back("-gno-inline-line-tables");
+    Args.addOptOutFlag(CmdArgs, options::OPT_gcodeview_command_line,
+                       options::OPT_gno_codeview_command_line);
   }
 
+  Args.addOptOutFlag(CmdArgs, options::OPT_ginline_line_tables,
+                     options::OPT_gno_inline_line_tables);
+
   // When emitting remarks, we need at least debug lines in the output.
   if (willEmitRemarks(Args) &&
       DebugInfoKind <= codegenoptions::DebugDirectivesOnly)
@@ -4124,8 +4316,12 @@ static void renderDebugOptions(const ToolChain &TC, const Driver &D,
   // Adjust the debug info kind for the given toolchain.
   TC.adjustDebugInfoKind(DebugInfoKind, Args);
 
+  // On AIX, the debugger tuning option can be omitted if it is not explicitly
+  // set.
   RenderDebugEnablingArgs(Args, CmdArgs, DebugInfoKind, EffectiveDWARFVersion,
-                          DebuggerTuning);
+                          T.isOSAIX() && !HasDebuggerTuning
+                              ? llvm::DebuggerKind::Default
+                              : DebuggerTuning);
 
   // -fdebug-macro turns on macro debug info generation.
   if (Args.hasFlag(options::OPT_fdebug_macro, options::OPT_fno_debug_macro,
@@ -4147,12 +4343,27 @@ static void renderDebugOptions(const ToolChain &TC, const Driver &D,
                                            options::OPT_gpubnames)
                             ? "-gpubnames"
                             : "-ggnu-pubnames");
+  const auto *SimpleTemplateNamesArg =
+      Args.getLastArg(options::OPT_gsimple_template_names,
+                      options::OPT_gno_simple_template_names);
+  bool ForwardTemplateParams = DebuggerTuning == llvm::DebuggerKind::SCE;
+  if (SimpleTemplateNamesArg &&
+      checkDebugInfoOption(SimpleTemplateNamesArg, Args, D, TC)) {
+    const auto &Opt = SimpleTemplateNamesArg->getOption();
+    if (Opt.matches(options::OPT_gsimple_template_names)) {
+      ForwardTemplateParams = true;
+      CmdArgs.push_back("-gsimple-template-names=simple");
+    }
+  }
 
-  if (Args.hasFlag(options::OPT_fdebug_ranges_base_address,
-                   options::OPT_fno_debug_ranges_base_address, false)) {
-    CmdArgs.push_back("-fdebug-ranges-base-address");
+  if (const Arg *A = Args.getLastArg(options::OPT_gsrc_hash_EQ)) {
+    StringRef v = A->getValue();
+    CmdArgs.push_back(Args.MakeArgString("-gsrc-hash=" + v));
   }
 
+  Args.addOptInFlag(CmdArgs, options::OPT_fdebug_ranges_base_address,
+                    options::OPT_fno_debug_ranges_base_address);
+
   // -gdwarf-aranges turns on the emission of the aranges section in the
   // backend.
   // Always enabled for SCE tuning.
@@ -4164,9 +4375,8 @@ static void renderDebugOptions(const ToolChain &TC, const Driver &D,
     CmdArgs.push_back("-generate-arange-section");
   }
 
-  if (Args.hasFlag(options::OPT_fforce_dwarf_frame,
-                   options::OPT_fno_force_dwarf_frame, false))
-    CmdArgs.push_back("-fforce-dwarf-frame");
+  Args.addOptInFlag(CmdArgs, options::OPT_fforce_dwarf_frame,
+                    options::OPT_fno_force_dwarf_frame);
 
   if (Args.hasFlag(options::OPT_fdebug_types_section,
                    options::OPT_fno_debug_types_section, false)) {
@@ -4193,7 +4403,7 @@ static void renderDebugOptions(const ToolChain &TC, const Driver &D,
 
   // Decide how to render forward declarations of template instantiations.
   // SCE wants full descriptions, others just get them in the name.
-  if (DebuggerTuning == llvm::DebuggerKind::SCE)
+  if (ForwardTemplateParams)
     CmdArgs.push_back("-debug-forward-template-params");
 
   // Do we need to explicitly import anonymous namespaces into the parent
@@ -4205,6 +4415,71 @@ static void renderDebugOptions(const ToolChain &TC, const Driver &D,
   RenderDebugInfoCompressionArgs(Args, CmdArgs, D, TC);
 }
 
+static void ProcessVSRuntimeLibrary(const ArgList &Args,
+                                    ArgStringList &CmdArgs) {
+  unsigned RTOptionID = options::OPT__SLASH_MT;
+
+  if (Args.hasArg(options::OPT__SLASH_LDd))
+    // The /LDd option implies /MTd. The dependent lib part can be overridden,
+    // but defining _DEBUG is sticky.
+    RTOptionID = options::OPT__SLASH_MTd;
+
+  if (Arg *A = Args.getLastArg(options::OPT__SLASH_M_Group))
+    RTOptionID = A->getOption().getID();
+
+  if (Arg *A = Args.getLastArg(options::OPT_fms_runtime_lib_EQ)) {
+    RTOptionID = llvm::StringSwitch<unsigned>(A->getValue())
+                     .Case("static", options::OPT__SLASH_MT)
+                     .Case("static_dbg", options::OPT__SLASH_MTd)
+                     .Case("dll", options::OPT__SLASH_MD)
+                     .Case("dll_dbg", options::OPT__SLASH_MDd)
+                     .Default(options::OPT__SLASH_MT);
+  }
+
+  StringRef FlagForCRT;
+  switch (RTOptionID) {
+  case options::OPT__SLASH_MD:
+    if (Args.hasArg(options::OPT__SLASH_LDd))
+      CmdArgs.push_back("-D_DEBUG");
+    CmdArgs.push_back("-D_MT");
+    CmdArgs.push_back("-D_DLL");
+    FlagForCRT = "--dependent-lib=msvcrt";
+    break;
+  case options::OPT__SLASH_MDd:
+    CmdArgs.push_back("-D_DEBUG");
+    CmdArgs.push_back("-D_MT");
+    CmdArgs.push_back("-D_DLL");
+    FlagForCRT = "--dependent-lib=msvcrtd";
+    break;
+  case options::OPT__SLASH_MT:
+    if (Args.hasArg(options::OPT__SLASH_LDd))
+      CmdArgs.push_back("-D_DEBUG");
+    CmdArgs.push_back("-D_MT");
+    CmdArgs.push_back("-flto-visibility-public-std");
+    FlagForCRT = "--dependent-lib=libcmt";
+    break;
+  case options::OPT__SLASH_MTd:
+    CmdArgs.push_back("-D_DEBUG");
+    CmdArgs.push_back("-D_MT");
+    CmdArgs.push_back("-flto-visibility-public-std");
+    FlagForCRT = "--dependent-lib=libcmtd";
+    break;
+  default:
+    llvm_unreachable("Unexpected option ID.");
+  }
+
+  if (Args.hasArg(options::OPT_fms_omit_default_lib)) {
+    CmdArgs.push_back("-D_VC_NODEFAULTLIB");
+  } else {
+    CmdArgs.push_back(FlagForCRT.data());
+
+    // This provides POSIX compatibility (maps 'open' to '_open'), which most
+    // users want.  The /Za flag to cl.exe turns this off, but it's not
+    // implemented in clang.
+    CmdArgs.push_back("--dependent-lib=oldnames");
+  }
+}
+
 void Clang::ConstructJob(Compilation &C, const JobAction &JA,
                          const InputInfo &Output, const InputInfoList &Inputs,
                          const ArgList &Args, const char *LinkingOutput) const {
@@ -4218,50 +4493,57 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
   const Driver &D = TC.getDriver();
   ArgStringList CmdArgs;
 
-  // Check number of inputs for sanity. We need at least one input.
   assert(Inputs.size() >= 1 && "Must have at least one input.");
   // CUDA/HIP compilation may have multiple inputs (source file + results of
   // device-side compilations). OpenMP device jobs also take the host IR as a
   // second input. Module precompilation accepts a list of header files to
-  // include as part of the module. All other jobs are expected to have exactly
-  // one input.
+  // include as part of the module. API extraction accepts a list of header
+  // files whose API information is emitted in the output. All other jobs are
+  // expected to have exactly one input.
   bool IsCuda = JA.isOffloading(Action::OFK_Cuda);
   bool IsCudaDevice = JA.isDeviceOffloading(Action::OFK_Cuda);
   bool IsHIP = JA.isOffloading(Action::OFK_HIP);
   bool IsHIPDevice = JA.isDeviceOffloading(Action::OFK_HIP);
   bool IsOpenMPDevice = JA.isDeviceOffloading(Action::OFK_OpenMP);
-  bool IsHeaderModulePrecompile = isa<HeaderModulePrecompileJobAction>(JA);
+  bool IsExtractAPI = isa<ExtractAPIJobAction>(JA);
   bool IsDeviceOffloadAction = !(JA.isDeviceOffloading(Action::OFK_None) ||
                                  JA.isDeviceOffloading(Action::OFK_Host));
+  bool IsHostOffloadingAction =
+      JA.isHostOffloading(Action::OFK_OpenMP) ||
+      (JA.isHostOffloading(C.getActiveOffloadKinds()) &&
+       Args.hasFlag(options::OPT_offload_new_driver,
+                    options::OPT_no_offload_new_driver, false));
+
+  bool IsRDCMode =
+      Args.hasFlag(options::OPT_fgpu_rdc, options::OPT_fno_gpu_rdc, false);
   bool IsUsingLTO = D.isUsingLTO(IsDeviceOffloadAction);
   auto LTOMode = D.getLTOMode(IsDeviceOffloadAction);
 
-  // A header module compilation doesn't have a main input file, so invent a
-  // fake one as a placeholder.
-  const char *ModuleName = [&]{
-    auto *ModuleNameArg = Args.getLastArg(options::OPT_fmodule_name_EQ);
-    return ModuleNameArg ? ModuleNameArg->getValue() : "";
-  }();
-  InputInfo HeaderModuleInput(Inputs[0].getType(), ModuleName, ModuleName);
+  // Extract API doesn't have a main input file, so invent a fake one as a
+  // placeholder.
+  InputInfo ExtractAPIPlaceholderInput(Inputs[0].getType(), "extract-api",
+                                       "extract-api");
 
   const InputInfo &Input =
-      IsHeaderModulePrecompile ? HeaderModuleInput : Inputs[0];
+      IsExtractAPI ? ExtractAPIPlaceholderInput : Inputs[0];
 
-  InputInfoList ModuleHeaderInputs;
+  InputInfoList ExtractAPIInputs;
+  InputInfoList HostOffloadingInputs;
   const InputInfo *CudaDeviceInput = nullptr;
   const InputInfo *OpenMPDeviceInput = nullptr;
   for (const InputInfo &I : Inputs) {
-    if (&I == &Input) {
-      // This is the primary input.
-    } else if (IsHeaderModulePrecompile &&
-               types::getPrecompiledType(I.getType()) == types::TY_PCH) {
-      types::ID Expected = HeaderModuleInput.getType();
-      if (I.getType() != Expected) {
-        D.Diag(diag::err_drv_module_header_wrong_kind)
+    if (&I == &Input || I.getType() == types::TY_Nothing) {
+      // This is the primary input or contains nothing.
+    } else if (IsExtractAPI) {
+      auto ExpectedInputType = ExtractAPIPlaceholderInput.getType();
+      if (I.getType() != ExpectedInputType) {
+        D.Diag(diag::err_drv_extract_api_wrong_kind)
             << I.getFilename() << types::getTypeName(I.getType())
-            << types::getTypeName(Expected);
+            << types::getTypeName(ExpectedInputType);
       }
-      ModuleHeaderInputs.push_back(I);
+      ExtractAPIInputs.push_back(I);
+    } else if (IsHostOffloadingAction) {
+      HostOffloadingInputs.push_back(I);
     } else if ((IsCuda || IsHIP) && !CudaDeviceInput) {
       CudaDeviceInput = &I;
     } else if (IsOpenMPDevice && !OpenMPDeviceInput) {
@@ -4375,7 +4657,7 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
   TC.addClangWarningOptions(CmdArgs);
 
   // FIXME: Subclass ToolChain for SPIR and move this to addClangWarningOptions.
-  if (Triple.isSPIR())
+  if (Triple.isSPIR() || Triple.isSPIRV())
     CmdArgs.push_back("-Wspir-compat");
 
   // Select the appropriate action.
@@ -4409,6 +4691,7 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
     }
     Args.ClaimAllArgs(options::OPT_Wa_COMMA);
     Args.ClaimAllArgs(options::OPT_Xassembler);
+    Args.ClaimAllArgs(options::OPT_femit_dwarf_unwind_EQ);
   }
 
   if (isa<AnalyzeJobAction>(JA)) {
@@ -4424,6 +4707,8 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
       if (Args.hasArg(options::OPT_rewrite_objc) &&
           !Args.hasArg(options::OPT_g_Group))
         CmdArgs.push_back("-P");
+      else if (JA.getType() == types::TY_PP_CXXHeaderUnit)
+        CmdArgs.push_back("-fdirectives-only");
     }
   } else if (isa<AssembleJobAction>(JA)) {
     CmdArgs.push_back("-emit-obj");
@@ -4436,13 +4721,22 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
     if (JA.getType() == types::TY_Nothing)
       CmdArgs.push_back("-fsyntax-only");
     else if (JA.getType() == types::TY_ModuleFile)
-      CmdArgs.push_back(IsHeaderModulePrecompile
-                            ? "-emit-header-module"
-                            : "-emit-module-interface");
+      CmdArgs.push_back("-emit-module-interface");
+    else if (JA.getType() == types::TY_HeaderUnit)
+      CmdArgs.push_back("-emit-header-unit");
     else
       CmdArgs.push_back("-emit-pch");
   } else if (isa<VerifyPCHJobAction>(JA)) {
     CmdArgs.push_back("-verify-pch");
+  } else if (isa<ExtractAPIJobAction>(JA)) {
+    assert(JA.getType() == types::TY_API_INFO &&
+           "Extract API actions must generate a API information.");
+    CmdArgs.push_back("-extract-api");
+    if (Arg *ProductNameArg = Args.getLastArg(options::OPT_product_name_EQ))
+      ProductNameArg->render(Args, CmdArgs);
+    if (Arg *ExtractAPIIgnoresFileArg =
+            Args.getLastArg(options::OPT_extract_api_ignores_EQ))
+      ExtractAPIIgnoresFileArg->render(Args, CmdArgs);
   } else {
     assert((isa<CompileJobAction>(JA) || isa<BackendJobAction>(JA)) &&
            "Invalid action for clang tool.");
@@ -4493,28 +4787,27 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
       CmdArgs.push_back("-emit-llvm-uselists");
 
     if (IsUsingLTO) {
-      if (!IsDeviceOffloadAction) {
-        if (Args.hasArg(options::OPT_flto))
-          CmdArgs.push_back("-flto");
-        else {
-          if (D.getLTOMode() == LTOK_Thin)
-            CmdArgs.push_back("-flto=thin");
-          else
-            CmdArgs.push_back("-flto=full");
-        }
-        CmdArgs.push_back("-flto-unit");
-      } else if (Triple.isAMDGPU()) {
-        // Only AMDGPU supports device-side LTO
-        assert(LTOMode == LTOK_Full || LTOMode == LTOK_Thin);
-        CmdArgs.push_back(Args.MakeArgString(
-            Twine("-flto=") + (LTOMode == LTOK_Thin ? "thin" : "full")));
-        CmdArgs.push_back("-flto-unit");
-      } else {
+      if (IsDeviceOffloadAction && !JA.isDeviceOffloading(Action::OFK_OpenMP) &&
+          !Args.hasFlag(options::OPT_offload_new_driver,
+                        options::OPT_no_offload_new_driver, false) &&
+          !Triple.isAMDGPU()) {
         D.Diag(diag::err_drv_unsupported_opt_for_target)
             << Args.getLastArg(options::OPT_foffload_lto,
                                options::OPT_foffload_lto_EQ)
                    ->getAsString(Args)
             << Triple.getTriple();
+      } else if (Triple.isNVPTX() && !IsRDCMode &&
+                 JA.isDeviceOffloading(Action::OFK_Cuda)) {
+        D.Diag(diag::err_drv_unsupported_opt_for_language_mode)
+            << Args.getLastArg(options::OPT_foffload_lto,
+                               options::OPT_foffload_lto_EQ)
+                   ->getAsString(Args)
+            << "-fno-gpu-rdc";
+      } else {
+        assert(LTOMode == LTOK_Full || LTOMode == LTOK_Thin);
+        CmdArgs.push_back(Args.MakeArgString(
+            Twine("-flto=") + (LTOMode == LTOK_Thin ? "thin" : "full")));
+        CmdArgs.push_back("-flto-unit");
       }
     }
   }
@@ -4552,7 +4845,7 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
 
     // reject options that shouldn't be supported in bitcode
     // also reject kernel/kext
-    static const constexpr unsigned kBitcodeOptionBlacklist[] = {
+    static const constexpr unsigned kBitcodeOptionIgnorelist[] = {
         options::OPT_mkernel,
         options::OPT_fapple_kext,
         options::OPT_ffunction_sections,
@@ -4596,14 +4889,12 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
         options::OPT_mllvm,
     };
     for (const auto &A : Args)
-      if (llvm::find(kBitcodeOptionBlacklist, A->getOption().getID()) !=
-          std::end(kBitcodeOptionBlacklist))
+      if (llvm::is_contained(kBitcodeOptionIgnorelist, A->getOption().getID()))
         D.Diag(diag::err_drv_unsupported_embed_bitcode) << A->getSpelling();
 
     // Render the CodeGen options that need to be passed.
-    if (!Args.hasFlag(options::OPT_foptimize_sibling_calls,
-                      options::OPT_fno_optimize_sibling_calls))
-      CmdArgs.push_back("-mdisable-tail-calls");
+    Args.addOptOutFlag(CmdArgs, options::OPT_foptimize_sibling_calls,
+                       options::OPT_fno_optimize_sibling_calls);
 
     RenderFloatingPointOptions(TC, D, isOptimizationLevelFast(Args), Args,
                                CmdArgs, JA);
@@ -4614,7 +4905,7 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
     case llvm::Triple::arm:
     case llvm::Triple::armeb:
     case llvm::Triple::thumbeb:
-      RenderARMABI(Triple, Args, CmdArgs);
+      RenderARMABI(D, Triple, Args, CmdArgs);
       break;
     case llvm::Triple::aarch64:
     case llvm::Triple::aarch64_32:
@@ -4665,6 +4956,7 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
   // cleanup.
   if (!C.isForDiagnostics())
     CmdArgs.push_back("-disable-free");
+  CmdArgs.push_back("-clear-ast-before-backend");
 
 #ifdef NDEBUG
   const bool IsAssertBuild = false;
@@ -4680,10 +4972,9 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
   if (Args.hasFlag(options::OPT_fdiscard_value_names,
                    options::OPT_fno_discard_value_names, !IsAssertBuild)) {
     if (Args.hasArg(options::OPT_fdiscard_value_names) &&
-        (std::any_of(Inputs.begin(), Inputs.end(),
-                     [](const clang::driver::InputInfo &II) {
-                       return types::isLLVMIR(II.getType());
-                     }))) {
+        llvm::any_of(Inputs, [](const clang::driver::InputInfo &II) {
+          return types::isLLVMIR(II.getType());
+        })) {
       D.Diag(diag::warn_ignoring_fdiscard_for_bitcode);
     }
     CmdArgs.push_back("-discard-value-names");
@@ -4713,13 +5004,13 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
   // Since we can't access frontend flags through hasArg, let's manually iterate
   // through them.
   bool FoundAnalyzerConfig = false;
-  for (auto Arg : Args.filtered(options::OPT_Xclang))
+  for (auto *Arg : Args.filtered(options::OPT_Xclang))
     if (StringRef(Arg->getValue()) == "-analyzer-config") {
       FoundAnalyzerConfig = true;
       break;
     }
   if (!FoundAnalyzerConfig)
-    for (auto Arg : Args.filtered(options::OPT_Xanalyzer))
+    for (auto *Arg : Args.filtered(options::OPT_Xanalyzer))
       if (StringRef(Arg->getValue()) == "-analyzer-config") {
         FoundAnalyzerConfig = true;
         break;
@@ -4736,10 +5027,45 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
     CmdArgs.push_back(Args.MakeArgString(std::to_string(FunctionAlignment)));
   }
 
+  // We support -falign-loops=N where N is a power of 2. GCC supports more
+  // forms.
+  if (const Arg *A = Args.getLastArg(options::OPT_falign_loops_EQ)) {
+    unsigned Value = 0;
+    if (StringRef(A->getValue()).getAsInteger(10, Value) || Value > 65536)
+      TC.getDriver().Diag(diag::err_drv_invalid_int_value)
+          << A->getAsString(Args) << A->getValue();
+    else if (Value & (Value - 1))
+      TC.getDriver().Diag(diag::err_drv_alignment_not_power_of_two)
+          << A->getAsString(Args) << A->getValue();
+    // Treat =0 as unspecified (use the target preference).
+    if (Value)
+      CmdArgs.push_back(Args.MakeArgString("-falign-loops=" +
+                                           Twine(std::min(Value, 65536u))));
+  }
+
   llvm::Reloc::Model RelocationModel;
   unsigned PICLevel;
   bool IsPIE;
   std::tie(RelocationModel, PICLevel, IsPIE) = ParsePICArgs(TC, Args);
+  Arg *LastPICDataRelArg =
+      Args.getLastArg(options::OPT_mno_pic_data_is_text_relative,
+                      options::OPT_mpic_data_is_text_relative);
+  bool NoPICDataIsTextRelative = false;
+  if (LastPICDataRelArg) {
+    if (LastPICDataRelArg->getOption().matches(
+            options::OPT_mno_pic_data_is_text_relative)) {
+      NoPICDataIsTextRelative = true;
+      if (!PICLevel)
+        D.Diag(diag::err_drv_argument_only_allowed_with)
+            << "-mno-pic-data-is-text-relative"
+            << "-fpic/-fpie";
+    }
+    if (!Triple.isSystemZ())
+      D.Diag(diag::err_drv_unsupported_opt_for_target)
+          << (NoPICDataIsTextRelative ? "-mno-pic-data-is-text-relative"
+                                      : "-mpic-data-is-text-relative")
+          << RawTriple.str();
+  }
 
   bool IsROPI = RelocationModel == llvm::Reloc::ROPI ||
                 RelocationModel == llvm::Reloc::ROPI_RWPI;
@@ -4768,6 +5094,8 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
     CmdArgs.push_back(PICLevel == 1 ? "1" : "2");
     if (IsPIE)
       CmdArgs.push_back("-pic-is-pie");
+    if (NoPICDataIsTextRelative)
+      CmdArgs.push_back("-mcmodel=medium");
   }
 
   if (RelocationModel == llvm::Reloc::ROPI ||
@@ -4824,15 +5152,33 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
     }
   }
 
-  Args.AddLastArg(CmdArgs, options::OPT_fveclib);
+  if (Arg *A = Args.getLastArg(options::OPT_fveclib)) {
+    StringRef Name = A->getValue();
+    if (Name == "SVML") {
+      if (Triple.getArch() != llvm::Triple::x86 &&
+          Triple.getArch() != llvm::Triple::x86_64)
+        D.Diag(diag::err_drv_unsupported_opt_for_target)
+            << Name << Triple.getArchName();
+    } else if (Name == "LIBMVEC-X86") {
+      if (Triple.getArch() != llvm::Triple::x86 &&
+          Triple.getArch() != llvm::Triple::x86_64)
+        D.Diag(diag::err_drv_unsupported_opt_for_target)
+            << Name << Triple.getArchName();
+    } else if (Name == "SLEEF") {
+      if (Triple.getArch() != llvm::Triple::aarch64 &&
+          Triple.getArch() != llvm::Triple::aarch64_be)
+        D.Diag(diag::err_drv_unsupported_opt_for_target)
+            << Name << Triple.getArchName();
+    }
+    A->render(Args, CmdArgs);
+  }
 
   if (Args.hasFlag(options::OPT_fmerge_all_constants,
                    options::OPT_fno_merge_all_constants, false))
     CmdArgs.push_back("-fmerge-all-constants");
 
-  if (Args.hasFlag(options::OPT_fno_delete_null_pointer_checks,
-                   options::OPT_fdelete_null_pointer_checks, false))
-    CmdArgs.push_back("-fno-delete-null-pointer-checks");
+  Args.addOptOutFlag(CmdArgs, options::OPT_fdelete_null_pointer_checks,
+                     options::OPT_fno_delete_null_pointer_checks);
 
   // LLVM Code Generator Options.
 
@@ -4857,6 +5203,13 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
       CmdArgs.push_back("-mabi=vec-default");
   }
 
+  if (Arg *A = Args.getLastArg(options::OPT_mabi_EQ_quadword_atomics)) {
+    if (!Triple.isOSAIX() || Triple.isPPC32())
+      D.Diag(diag::err_drv_unsupported_opt_for_target)
+        << A->getSpelling() << RawTriple.str();
+    CmdArgs.push_back("-mabi=quadword-atomics");
+  }
+
   if (Arg *A = Args.getLastArg(options::OPT_mlong_double_128)) {
     // Emit the unsupported option error until the Clang's library integration
     // support for 128-bit long double is available for AIX.
@@ -4873,20 +5226,15 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
       D.Diag(diag::err_drv_missing_argument) << A->getSpelling() << 1;
     else
       CmdArgs.push_back(Args.MakeArgString("-fwarn-stack-size=" + v));
-    A->claim();
-  }
-
-  if (!Args.hasFlag(options::OPT_fjump_tables, options::OPT_fno_jump_tables,
-                    true))
-    CmdArgs.push_back("-fno-jump-tables");
-
-  if (Args.hasFlag(options::OPT_fprofile_sample_accurate,
-                   options::OPT_fno_profile_sample_accurate, false))
-    CmdArgs.push_back("-fprofile-sample-accurate");
+    A->claim();
+  }
 
-  if (!Args.hasFlag(options::OPT_fpreserve_as_comments,
-                    options::OPT_fno_preserve_as_comments, true))
-    CmdArgs.push_back("-fno-preserve-as-comments");
+  Args.addOptOutFlag(CmdArgs, options::OPT_fjump_tables,
+                     options::OPT_fno_jump_tables);
+  Args.addOptInFlag(CmdArgs, options::OPT_fprofile_sample_accurate,
+                    options::OPT_fno_profile_sample_accurate);
+  Args.addOptOutFlag(CmdArgs, options::OPT_fpreserve_as_comments,
+                     options::OPT_fno_preserve_as_comments);
 
   if (Arg *A = Args.getLastArg(options::OPT_mregparm_EQ)) {
     CmdArgs.push_back("-mregparm");
@@ -4946,9 +5294,8 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
   assert(FPKeepKindStr && "unknown FramePointerKind");
   CmdArgs.push_back(FPKeepKindStr);
 
-  if (!Args.hasFlag(options::OPT_fzero_initialized_in_bss,
-                    options::OPT_fno_zero_initialized_in_bss, true))
-    CmdArgs.push_back("-fno-zero-initialized-in-bss");
+  Args.addOptOutFlag(CmdArgs, options::OPT_fzero_initialized_in_bss,
+                     options::OPT_fno_zero_initialized_in_bss);
 
   bool OFastEnabled = isOptimizationLevelFast(Args);
   // If -Ofast is the optimization level, then -fstrict-aliasing should be
@@ -4965,31 +5312,22 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
                     options::OPT_fno_strict_aliasing, StrictAliasingDefault))
     CmdArgs.push_back("-relaxed-aliasing");
   if (!Args.hasFlag(options::OPT_fstruct_path_tbaa,
-                    options::OPT_fno_struct_path_tbaa))
+                    options::OPT_fno_struct_path_tbaa, true))
     CmdArgs.push_back("-no-struct-path-tbaa");
-  if (Args.hasFlag(options::OPT_fstrict_enums, options::OPT_fno_strict_enums,
-                   false))
-    CmdArgs.push_back("-fstrict-enums");
-  if (!Args.hasFlag(options::OPT_fstrict_return, options::OPT_fno_strict_return,
-                    true))
-    CmdArgs.push_back("-fno-strict-return");
-  if (Args.hasFlag(options::OPT_fallow_editor_placeholders,
-                   options::OPT_fno_allow_editor_placeholders, false))
-    CmdArgs.push_back("-fallow-editor-placeholders");
-  if (Args.hasFlag(options::OPT_fstrict_vtable_pointers,
-                   options::OPT_fno_strict_vtable_pointers,
-                   false))
-    CmdArgs.push_back("-fstrict-vtable-pointers");
-  if (Args.hasFlag(options::OPT_fforce_emit_vtables,
-                   options::OPT_fno_force_emit_vtables,
-                   false))
-    CmdArgs.push_back("-fforce-emit-vtables");
-  if (!Args.hasFlag(options::OPT_foptimize_sibling_calls,
-                    options::OPT_fno_optimize_sibling_calls))
-    CmdArgs.push_back("-mdisable-tail-calls");
-  if (Args.hasFlag(options::OPT_fno_escaping_block_tail_calls,
-                   options::OPT_fescaping_block_tail_calls, false))
-    CmdArgs.push_back("-fno-escaping-block-tail-calls");
+  Args.addOptInFlag(CmdArgs, options::OPT_fstrict_enums,
+                    options::OPT_fno_strict_enums);
+  Args.addOptOutFlag(CmdArgs, options::OPT_fstrict_return,
+                     options::OPT_fno_strict_return);
+  Args.addOptInFlag(CmdArgs, options::OPT_fallow_editor_placeholders,
+                    options::OPT_fno_allow_editor_placeholders);
+  Args.addOptInFlag(CmdArgs, options::OPT_fstrict_vtable_pointers,
+                    options::OPT_fno_strict_vtable_pointers);
+  Args.addOptInFlag(CmdArgs, options::OPT_fforce_emit_vtables,
+                    options::OPT_fno_force_emit_vtables);
+  Args.addOptOutFlag(CmdArgs, options::OPT_foptimize_sibling_calls,
+                     options::OPT_fno_optimize_sibling_calls);
+  Args.addOptOutFlag(CmdArgs, options::OPT_fescaping_block_tail_calls,
+                     options::OPT_fno_escaping_block_tail_calls);
 
   Args.AddLastArg(CmdArgs, options::OPT_ffine_grained_bitfield_accesses,
                   options::OPT_fno_fine_grained_bitfield_accesses);
@@ -4998,9 +5336,8 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
                   options::OPT_fno_experimental_relative_cxx_abi_vtables);
 
   // Handle segmented stacks.
-  if (Args.hasFlag(options::OPT_fsplit_stack, options::OPT_fno_split_stack,
-                   false))
-    CmdArgs.push_back("-fsplit-stack");
+  Args.addOptInFlag(CmdArgs, options::OPT_fsplit_stack,
+                    options::OPT_fno_split_stack);
 
   // -fprotect-parens=0 is default.
   if (Args.hasFlag(options::OPT_fprotect_parens,
@@ -5080,9 +5417,9 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
   }
 
   // Enable -mconstructor-aliases except on darwin, where we have to work around
-  // a linker bug (see <rdar://problem/7651567>), and CUDA/AMDGPU device code,
-  // where aliases aren't supported.
-  if (!RawTriple.isOSDarwin() && !RawTriple.isNVPTX() && !RawTriple.isAMDGPU())
+  // a linker bug (see <rdar://problem/7651567>), and CUDA device code, where
+  // aliases aren't supported.
+  if (!RawTriple.isOSDarwin() && !RawTriple.isNVPTX())
     CmdArgs.push_back("-mconstructor-aliases");
 
   // Darwin's kernel doesn't support guard variables; just die if we
@@ -5117,19 +5454,30 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
   if (Freestanding)
     CmdArgs.push_back("-ffreestanding");
 
+  Args.AddLastArg(CmdArgs, options::OPT_fno_knr_functions);
+
   // This is a coarse approximation of what llvm-gcc actually does, both
   // -fasynchronous-unwind-tables and -fnon-call-exceptions interact in more
   // complicated ways.
+  auto SanitizeArgs = TC.getSanitizerArgs(Args);
+
+  bool IsAsyncUnwindTablesDefault =
+      TC.getDefaultUnwindTableLevel(Args) == ToolChain::UnwindTableLevel::Asynchronous;
+  bool IsSyncUnwindTablesDefault =
+      TC.getDefaultUnwindTableLevel(Args) == ToolChain::UnwindTableLevel::Synchronous;
+
+  bool AsyncUnwindTables = Args.hasFlag(
+      options::OPT_fasynchronous_unwind_tables,
+      options::OPT_fno_asynchronous_unwind_tables,
+      (IsAsyncUnwindTablesDefault || SanitizeArgs.needsUnwindTables()) &&
+          !Freestanding);
   bool UnwindTables =
-      Args.hasFlag(options::OPT_fasynchronous_unwind_tables,
-                   options::OPT_fno_asynchronous_unwind_tables,
-                   (TC.IsUnwindTablesDefault(Args) ||
-                    TC.getSanitizerArgs().needsUnwindTables()) &&
-                       !Freestanding);
-  UnwindTables = Args.hasFlag(options::OPT_funwind_tables,
-                              options::OPT_fno_unwind_tables, UnwindTables);
-  if (UnwindTables)
-    CmdArgs.push_back("-munwind-tables");
+      Args.hasFlag(options::OPT_funwind_tables, options::OPT_fno_unwind_tables,
+                   IsSyncUnwindTablesDefault && !Freestanding);
+  if (AsyncUnwindTables)
+    CmdArgs.push_back("-funwind-tables=2");
+  else if (UnwindTables)
+     CmdArgs.push_back("-funwind-tables=1");
 
   // Prepare `-aux-target-cpu` and `-aux-target-feature` unless
   // `--gpu-use-aux-triple-only` is specified.
@@ -5138,7 +5486,7 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
     const ArgList &HostArgs =
         C.getArgsForToolChain(nullptr, StringRef(), Action::OFK_None);
     std::string HostCPU =
-        getCPUName(HostArgs, *TC.getAuxTriple(), /*FromAs*/ false);
+        getCPUName(D, HostArgs, *TC.getAuxTriple(), /*FromAs*/ false);
     if (!HostCPU.empty()) {
       CmdArgs.push_back("-aux-target-cpu");
       CmdArgs.push_back(Args.MakeArgString(HostCPU));
@@ -5149,15 +5497,15 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
 
   TC.addClangTargetOptions(Args, CmdArgs, JA.getOffloadingDeviceKind());
 
-  // FIXME: Handle -mtune=.
-  (void)Args.hasArg(options::OPT_mtune_EQ);
-
   if (Arg *A = Args.getLastArg(options::OPT_mcmodel_EQ)) {
     StringRef CM = A->getValue();
     if (CM == "small" || CM == "kernel" || CM == "medium" || CM == "large" ||
         CM == "tiny") {
       if (Triple.isOSAIX() && CM == "medium")
         CmdArgs.push_back("-mcmodel=large");
+      else if (Triple.isAArch64() && (CM == "kernel" || CM == "medium"))
+        D.Diag(diag::err_drv_invalid_argument_to_option)
+            << CM << A->getOption().getName();
       else
         A->render(Args, CmdArgs);
     } else {
@@ -5180,7 +5528,7 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
   }
 
   // Add the target cpu
-  std::string CPU = getCPUName(Args, Triple, /*FromAs*/ false);
+  std::string CPU = getCPUName(D, Args, Triple, /*FromAs*/ false);
   if (!CPU.empty()) {
     CmdArgs.push_back("-target-cpu");
     CmdArgs.push_back(Args.MakeArgString(CPU));
@@ -5198,7 +5546,8 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
   // as errors, but until then, we can live with a warning being emitted by the
   // compiler. This way, Clang can be used to compile code with scalable vectors
   // and identify possible issues.
-  if (isa<BackendJobAction>(JA)) {
+  if (isa<AssembleJobAction>(JA) || isa<CompileJobAction>(JA) ||
+      isa<BackendJobAction>(JA)) {
     CmdArgs.push_back("-mllvm");
     CmdArgs.push_back("-treat-scalable-fixed-error-as-warning");
   }
@@ -5217,6 +5566,19 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
                      types::isLLVMIR(InputType), CmdArgs, DebugInfoKind,
                      DwarfFission);
 
+  // This controls whether or not we perform JustMyCode instrumentation.
+  if (Args.hasFlag(options::OPT_fjmc, options::OPT_fno_jmc, false)) {
+    if (TC.getTriple().isOSBinFormatELF()) {
+      if (DebugInfoKind >= codegenoptions::DebugInfoConstructor)
+        CmdArgs.push_back("-fjmc");
+      else
+        D.Diag(clang::diag::warn_drv_jmc_requires_debuginfo) << "-fjmc"
+                                                             << "-g";
+    } else {
+      D.Diag(clang::diag::warn_drv_fjmc_for_elf_only);
+    }
+  }
+
   // Add the split debug info name to the command lines here so we
   // can propagate it to the backend.
   bool SplitDWARF = (DwarfFission != DwarfFissionKind::None) &&
@@ -5269,12 +5631,19 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
   }
   Args.AddAllArgs(CmdArgs, options::OPT_fshow_skipped_includes);
 
-  if (D.CCPrintHeaders && !D.CCGenDiagnostics) {
+  if (D.CCPrintHeadersFormat && !D.CCGenDiagnostics) {
     CmdArgs.push_back("-header-include-file");
     CmdArgs.push_back(!D.CCPrintHeadersFilename.empty()
                           ? D.CCPrintHeadersFilename.c_str()
                           : "-");
     CmdArgs.push_back("-sys-header-deps");
+    CmdArgs.push_back(Args.MakeArgString(
+        "-header-include-format=" +
+        std::string(headerIncludeFormatKindToString(D.CCPrintHeadersFormat))));
+    CmdArgs.push_back(
+        Args.MakeArgString("-header-include-filtering=" +
+                           std::string(headerIncludeFilteringKindToString(
+                               D.CCPrintHeadersFiltering))));
   }
   Args.AddLastArg(CmdArgs, options::OPT_P);
   Args.AddLastArg(CmdArgs, options::OPT_print_ivar_layout);
@@ -5332,17 +5701,12 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
     CmdArgs.push_back("-fdata-sections");
   }
 
-  if (!Args.hasFlag(options::OPT_funique_section_names,
-                    options::OPT_fno_unique_section_names, true))
-    CmdArgs.push_back("-fno-unique-section-names");
-
-  if (Args.hasFlag(options::OPT_funique_internal_linkage_names,
-                   options::OPT_fno_unique_internal_linkage_names, false))
-    CmdArgs.push_back("-funique-internal-linkage-names");
-
-  if (Args.hasFlag(options::OPT_funique_basic_block_section_names,
-                   options::OPT_fno_unique_basic_block_section_names, false))
-    CmdArgs.push_back("-funique-basic-block-section-names");
+  Args.addOptOutFlag(CmdArgs, options::OPT_funique_section_names,
+                     options::OPT_fno_unique_section_names);
+  Args.addOptInFlag(CmdArgs, options::OPT_funique_internal_linkage_names,
+                    options::OPT_fno_unique_internal_linkage_names);
+  Args.addOptInFlag(CmdArgs, options::OPT_funique_basic_block_section_names,
+                    options::OPT_fno_unique_basic_block_section_names);
 
   if (Arg *A = Args.getLastArg(options::OPT_fsplit_machine_functions,
                                options::OPT_fno_split_machine_functions)) {
@@ -5364,15 +5728,21 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
   // for sampling, overhead of call arc collection is way too high and there's
   // no way to collect the output.
   if (!Triple.isNVPTX() && !Triple.isAMDGCN())
-    addPGOAndCoverageFlags(TC, C, D, Output, Args, CmdArgs);
+    addPGOAndCoverageFlags(TC, C, D, Output, Args, SanitizeArgs, CmdArgs);
 
   Args.AddLastArg(CmdArgs, options::OPT_fclang_abi_compat_EQ);
 
-  // Add runtime flag for PS4 when PGO, coverage, or sanitizers are enabled.
-  if (RawTriple.isPS4CPU() &&
+  if (getLastProfileSampleUseArg(Args) &&
+      Args.hasArg(options::OPT_fsample_profile_use_profi)) {
+    CmdArgs.push_back("-mllvm");
+    CmdArgs.push_back("-sample-profile-use-profi");
+  }
+
+  // Add runtime flag for PS4/PS5 when PGO, coverage, or sanitizers are enabled.
+  if (RawTriple.isPS() &&
       !Args.hasArg(options::OPT_nostdlib, options::OPT_nodefaultlibs)) {
-    PS4cpu::addProfileRTArgs(TC, Args, CmdArgs);
-    PS4cpu::addSanitizerArgs(TC, CmdArgs);
+    PScpu::addProfileRTArgs(TC, Args, CmdArgs);
+    PScpu::addSanitizerArgs(TC, Args, CmdArgs);
   }
 
   // Pass options for controlling the default header search paths.
@@ -5434,16 +5804,33 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
 
   Args.AddAllArgs(CmdArgs, options::OPT_R_Group);
 
-  Args.AddAllArgs(CmdArgs, options::OPT_W_Group);
+  for (const Arg *A :
+       Args.filtered(options::OPT_W_Group, options::OPT__SLASH_wd)) {
+    A->claim();
+    if (A->getOption().getID() == options::OPT__SLASH_wd) {
+      unsigned WarningNumber;
+      if (StringRef(A->getValue()).getAsInteger(10, WarningNumber)) {
+        D.Diag(diag::err_drv_invalid_int_value)
+            << A->getAsString(Args) << A->getValue();
+        continue;
+      }
+
+      if (auto Group = diagGroupFromCLWarningID(WarningNumber)) {
+        CmdArgs.push_back(Args.MakeArgString(
+            "-Wno-" + DiagnosticIDs::getWarningOptionForGroup(*Group)));
+      }
+      continue;
+    }
+    A->render(Args, CmdArgs);
+  }
+
   if (Args.hasFlag(options::OPT_pedantic, options::OPT_no_pedantic, false))
     CmdArgs.push_back("-pedantic");
   Args.AddLastArg(CmdArgs, options::OPT_pedantic_errors);
   Args.AddLastArg(CmdArgs, options::OPT_w);
 
-  // Fixed point flags
-  if (Args.hasFlag(options::OPT_ffixed_point, options::OPT_fno_fixed_point,
-                   /*Default=*/false))
-    Args.AddLastArg(CmdArgs, options::OPT_ffixed_point);
+  Args.addOptInFlag(CmdArgs, options::OPT_ffixed_point,
+                    options::OPT_fno_fixed_point);
 
   if (Arg *A = Args.getLastArg(options::OPT_fcxx_abi_EQ))
     A->render(Args, CmdArgs);
@@ -5451,6 +5838,9 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
   Args.AddLastArg(CmdArgs, options::OPT_fexperimental_relative_cxx_abi_vtables,
                   options::OPT_fno_experimental_relative_cxx_abi_vtables);
 
+  if (Arg *A = Args.getLastArg(options::OPT_ffuchsia_api_level_EQ))
+    A->render(Args, CmdArgs);
+
   // Handle -{std, ansi, trigraphs} -- take the last of -{std, ansi}
   // (-ansi is equivalent to -std=c89 or -std=c++98).
   //
@@ -5493,11 +5883,6 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
 
     Args.AddLastArg(CmdArgs, options::OPT_ftrigraphs,
                     options::OPT_fno_trigraphs);
-
-    // HIP headers has minimum C++ standard requirements. Therefore set the
-    // default language standard.
-    if (IsHIP)
-      CmdArgs.push_back(IsWindowsMSVC ? "-std=c++14" : "-std=c++11");
   }
 
   // GCC's behavior for -Wwrite-strings is a bit strange:
@@ -5541,9 +5926,10 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
     CmdArgs.push_back("-fno-autolink");
 
   // Add in -fdebug-compilation-dir if necessary.
-  addDebugCompDirArg(Args, CmdArgs, D.getVFS());
+  const char *DebugCompilationDir =
+      addDebugCompDirArg(Args, CmdArgs, D.getVFS());
 
-  addDebugPrefixMapArg(D, Args, CmdArgs);
+  addDebugPrefixMapArg(D, TC, Args, CmdArgs);
 
   if (Arg *A = Args.getLastArg(options::OPT_ftemplate_depth_,
                                options::OPT_ftemplate_depth_EQ)) {
@@ -5566,6 +5952,8 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
     CmdArgs.push_back(A->getValue());
   }
 
+  Args.AddLastArg(CmdArgs, options::OPT_fexperimental_library);
+
   if (Args.hasArg(options::OPT_fexperimental_new_constant_interpreter))
     CmdArgs.push_back("-fexperimental-new-constant-interpreter");
 
@@ -5591,7 +5979,7 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
       "standalone", "objc", "swift", "swift-5.0", "swift-4.2", "swift-4.1",
     };
 
-    if (find(kCFABIs, StringRef(A->getValue())) == std::end(kCFABIs))
+    if (!llvm::is_contained(kCFABIs, StringRef(A->getValue())))
       D.Diag(diag::err_drv_invalid_cf_runtime_abi) << A->getValue();
     else
       A->render(Args, CmdArgs);
@@ -5607,9 +5995,8 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
     CmdArgs.push_back(A->getValue());
   }
 
-  if (Args.hasFlag(options::OPT_fstack_size_section,
-                   options::OPT_fno_stack_size_section, RawTriple.isPS4()))
-    CmdArgs.push_back("-fstack-size-section");
+  Args.addOptInFlag(CmdArgs, options::OPT_fstack_size_section,
+                    options::OPT_fno_stack_size_section);
 
   if (Args.hasArg(options::OPT_fstack_usage)) {
     CmdArgs.push_back("-stack-usage-file");
@@ -5665,22 +6052,33 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
     CmdArgs.push_back(
         Args.MakeArgString("-fmessage-length=" + Twine(MessageLength)));
 
+  if (Arg *A = Args.getLastArg(options::OPT_frandomize_layout_seed_EQ))
+    CmdArgs.push_back(
+        Args.MakeArgString("-frandomize-layout-seed=" + Twine(A->getValue(0))));
+
+  if (Arg *A = Args.getLastArg(options::OPT_frandomize_layout_seed_file_EQ))
+    CmdArgs.push_back(Args.MakeArgString("-frandomize-layout-seed-file=" +
+                                         Twine(A->getValue(0))));
+
   // -fvisibility= and -fvisibility-ms-compat are of a piece.
   if (const Arg *A = Args.getLastArg(options::OPT_fvisibility_EQ,
                                      options::OPT_fvisibility_ms_compat)) {
     if (A->getOption().matches(options::OPT_fvisibility_EQ)) {
-      CmdArgs.push_back("-fvisibility");
-      CmdArgs.push_back(A->getValue());
+      A->render(Args, CmdArgs);
     } else {
       assert(A->getOption().matches(options::OPT_fvisibility_ms_compat));
-      CmdArgs.push_back("-fvisibility");
-      CmdArgs.push_back("hidden");
-      CmdArgs.push_back("-ftype-visibility");
-      CmdArgs.push_back("default");
+      CmdArgs.push_back("-fvisibility=hidden");
+      CmdArgs.push_back("-ftype-visibility=default");
     }
+  } else if (IsOpenMPDevice) {
+    // When compiling for the OpenMP device we want protected visibility by
+    // default. This prevents the device from accidentally preempting code on
+    // the host, makes the system more robust, and improves performance.
+    CmdArgs.push_back("-fvisibility=protected");
   }
 
-  if (!RawTriple.isPS4())
+  // PS4/PS5 process these options in addClangTargetOptions.
+  if (!RawTriple.isPS()) {
     if (const Arg *A =
             Args.getLastArg(options::OPT_fvisibility_from_dllstorageclass,
                             options::OPT_fno_visibility_from_dllstorageclass)) {
@@ -5694,6 +6092,7 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
                         options::OPT_fvisibility_externs_nodllstorageclass_EQ);
       }
     }
+  }
 
   if (const Arg *A = Args.getLastArg(options::OPT_mignore_xcoff_visibility)) {
     if (Triple.isOSAIX())
@@ -5703,6 +6102,14 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
           << A->getAsString(Args) << TripleStr;
   }
 
+  if (const Arg *A =
+          Args.getLastArg(options::OPT_mdefault_visibility_export_mapping_EQ)) {
+    if (Triple.isOSAIX())
+      A->render(Args, CmdArgs);
+    else
+      D.Diag(diag::err_drv_unsupported_opt_for_target)
+          << A->getAsString(Args) << TripleStr;
+  }
 
   if (Args.hasFlag(options::OPT_fvisibility_inlines_hidden,
                     options::OPT_fno_visibility_inlines_hidden, false))
@@ -5711,9 +6118,12 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
   Args.AddLastArg(CmdArgs, options::OPT_fvisibility_inlines_hidden_static_local_var,
                            options::OPT_fno_visibility_inlines_hidden_static_local_var);
   Args.AddLastArg(CmdArgs, options::OPT_fvisibility_global_new_delete_hidden);
-
   Args.AddLastArg(CmdArgs, options::OPT_ftlsmodel_EQ);
 
+  if (Args.hasFlag(options::OPT_fnew_infallible,
+                   options::OPT_fno_new_infallible, false))
+    CmdArgs.push_back("-fnew-infallible");
+
   if (Args.hasFlag(options::OPT_fno_operator_names,
                    options::OPT_foperator_names, false))
     CmdArgs.push_back("-fno-operator-names");
@@ -5724,6 +6134,16 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
   Args.AddLastArg(CmdArgs, options::OPT_fdigraphs, options::OPT_fno_digraphs);
   Args.AddLastArg(CmdArgs, options::OPT_femulated_tls,
                   options::OPT_fno_emulated_tls);
+  Args.AddLastArg(CmdArgs, options::OPT_fzero_call_used_regs_EQ);
+
+  if (Arg *A = Args.getLastArg(options::OPT_fzero_call_used_regs_EQ)) {
+    // FIXME: There's no reason for this to be restricted to X86. The backend
+    // code needs to be changed to include the appropriate function calls
+    // automatically.
+    if (!Triple.isX86() && !Triple.isAArch64())
+      D.Diag(diag::err_drv_unsupported_opt_for_target)
+          << A->getAsString(Args) << TripleStr;
+  }
 
   // AltiVec-like language extensions aren't relevant for assembling.
   if (!isa<PreprocessJobAction>(JA) || Output.getType() != types::TY_PP_Asm)
@@ -5754,6 +6174,9 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
                       options::OPT_fno_openmp_simd);
       Args.AddAllArgs(CmdArgs, options::OPT_fopenmp_enable_irbuilder);
       Args.AddAllArgs(CmdArgs, options::OPT_fopenmp_version_EQ);
+      if (!Args.hasFlag(options::OPT_fopenmp_extensions,
+                        options::OPT_fno_openmp_extensions, /*Default=*/true))
+        CmdArgs.push_back("-fno-openmp-extensions");
       Args.AddAllArgs(CmdArgs, options::OPT_fopenmp_cuda_number_of_sm_EQ);
       Args.AddAllArgs(CmdArgs, options::OPT_fopenmp_cuda_blocks_per_sm_EQ);
       Args.AddAllArgs(CmdArgs,
@@ -5769,12 +6192,28 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
                        options::OPT_fno_openmp_cuda_mode, /*Default=*/false))
         CmdArgs.push_back("-fopenmp-cuda-mode");
 
-      // When in OpenMP offloading mode with NVPTX target, check if full runtime
-      // is required.
-      if (Args.hasFlag(options::OPT_fopenmp_cuda_force_full_runtime,
-                       options::OPT_fno_openmp_cuda_force_full_runtime,
+      // When in OpenMP offloading mode, enable debugging on the device.
+      Args.AddAllArgs(CmdArgs, options::OPT_fopenmp_target_debug_EQ);
+      if (Args.hasFlag(options::OPT_fopenmp_target_debug,
+                       options::OPT_fno_openmp_target_debug, /*Default=*/false))
+        CmdArgs.push_back("-fopenmp-target-debug");
+
+      // When in OpenMP offloading mode, forward assumptions information about
+      // thread and team counts in the device.
+      if (Args.hasFlag(options::OPT_fopenmp_assume_teams_oversubscription,
+                       options::OPT_fno_openmp_assume_teams_oversubscription,
                        /*Default=*/false))
-        CmdArgs.push_back("-fopenmp-cuda-force-full-runtime");
+        CmdArgs.push_back("-fopenmp-assume-teams-oversubscription");
+      if (Args.hasFlag(options::OPT_fopenmp_assume_threads_oversubscription,
+                       options::OPT_fno_openmp_assume_threads_oversubscription,
+                       /*Default=*/false))
+        CmdArgs.push_back("-fopenmp-assume-threads-oversubscription");
+      if (Args.hasArg(options::OPT_fopenmp_assume_no_thread_state))
+        CmdArgs.push_back("-fopenmp-assume-no-thread-state");
+      if (Args.hasArg(options::OPT_fopenmp_assume_no_nested_parallelism))
+        CmdArgs.push_back("-fopenmp-assume-no-nested-parallelism");
+      if (Args.hasArg(options::OPT_fopenmp_offload_mandatory))
+        CmdArgs.push_back("-fopenmp-offload-mandatory");
       break;
     default:
       // By default, if Clang doesn't know how to generate useful OpenMP code
@@ -5789,10 +6228,16 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
     Args.AddLastArg(CmdArgs, options::OPT_fopenmp_simd,
                     options::OPT_fno_openmp_simd);
     Args.AddAllArgs(CmdArgs, options::OPT_fopenmp_version_EQ);
+    Args.addOptOutFlag(CmdArgs, options::OPT_fopenmp_extensions,
+                       options::OPT_fno_openmp_extensions);
   }
 
-  const SanitizerArgs &Sanitize = TC.getSanitizerArgs();
-  Sanitize.addArgs(TC, Args, CmdArgs, InputType);
+  // Forward the new driver to change offloading code generation.
+  if (Args.hasFlag(options::OPT_offload_new_driver,
+                   options::OPT_no_offload_new_driver, false))
+    CmdArgs.push_back("--offload-new-driver");
+
+  SanitizeArgs.addArgs(TC, Args, CmdArgs, InputType);
 
   const XRayArgs &XRay = TC.getXRayArgs();
   XRay.addArgs(TC, Args, CmdArgs, InputType);
@@ -5825,6 +6270,8 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
     }
   }
 
+  Args.AddLastArg(CmdArgs, options::OPT_fms_hotpatch);
+
   if (TC.SupportsProfiling()) {
     Args.AddLastArg(CmdArgs, options::OPT_pg);
 
@@ -5851,6 +6298,12 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
             << A->getAsString(Args) << TripleStr;
     }
   }
+  if (Arg *A = Args.getLastArgNoClaim(options::OPT_p)) {
+    if (!TC.getTriple().isOSAIX() && !TC.getTriple().isOSOpenBSD()) {
+      D.Diag(diag::err_drv_unsupported_opt_for_target)
+          << A->getAsString(Args) << TripleStr;
+    }
+  }
 
   if (Args.getLastArg(options::OPT_fapple_kext) ||
       (Args.hasArg(options::OPT_mkernel) && types::isCXX(InputType)))
@@ -5865,6 +6318,7 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
   Args.AddLastArg(CmdArgs, options::OPT_ftime_report_EQ);
   Args.AddLastArg(CmdArgs, options::OPT_ftime_trace);
   Args.AddLastArg(CmdArgs, options::OPT_ftime_trace_granularity_EQ);
+  Args.AddLastArg(CmdArgs, options::OPT_ftime_trace_EQ);
   Args.AddLastArg(CmdArgs, options::OPT_ftrapv);
   Args.AddLastArg(CmdArgs, options::OPT_malign_double);
   Args.AddLastArg(CmdArgs, options::OPT_fno_temp_file);
@@ -5900,11 +6354,12 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
   Args.AddLastArg(CmdArgs, options::OPT_funroll_loops,
                   options::OPT_fno_unroll_loops);
 
+  Args.AddLastArg(CmdArgs, options::OPT_fstrict_flex_arrays_EQ);
+
   Args.AddLastArg(CmdArgs, options::OPT_pthread);
 
-  if (Args.hasFlag(options::OPT_mspeculative_load_hardening,
-                   options::OPT_mno_speculative_load_hardening, false))
-    CmdArgs.push_back(Args.MakeArgString("-mspeculative-load-hardening"));
+  Args.addOptInFlag(CmdArgs, options::OPT_mspeculative_load_hardening,
+                    options::OPT_mno_speculative_load_hardening);
 
   // -ret-protector
   unsigned RetProtector = 1;
@@ -5951,10 +6406,10 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
   RenderSCPOptions(TC, Args, CmdArgs);
   RenderTrivialAutoVarInitOptions(D, TC, Args, CmdArgs);
 
-  // Translate -mstackrealign
-  if (Args.hasFlag(options::OPT_mstackrealign, options::OPT_mno_stackrealign,
-                   false))
-    CmdArgs.push_back(Args.MakeArgString("-mstackrealign"));
+  Args.AddLastArg(CmdArgs, options::OPT_fswift_async_fp_EQ);
+
+  Args.addOptInFlag(CmdArgs, options::OPT_mstackrealign,
+                    options::OPT_mno_stackrealign);
 
   if (Args.hasArg(options::OPT_mstack_alignment)) {
     StringRef alignment = Args.getLastArgValue(options::OPT_mstack_alignment);
@@ -5970,9 +6425,8 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
       CmdArgs.push_back("-mstack-probe-size=0");
   }
 
-  if (!Args.hasFlag(options::OPT_mstack_arg_probe,
-                    options::OPT_mno_stack_arg_probe, true))
-    CmdArgs.push_back(Args.MakeArgString("-mno-stack-arg-probe"));
+  Args.addOptOutFlag(CmdArgs, options::OPT_mstack_arg_probe,
+                     options::OPT_mno_stack_arg_probe);
 
   if (Arg *A = Args.getLastArg(options::OPT_mrestrict_it,
                                options::OPT_mno_restrict_it)) {
@@ -5981,19 +6435,16 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
       CmdArgs.push_back("-arm-restrict-it");
     } else {
       CmdArgs.push_back("-mllvm");
-      CmdArgs.push_back("-arm-no-restrict-it");
+      CmdArgs.push_back("-arm-default-it");
     }
-  } else if (Triple.isOSWindows() &&
-             (Triple.getArch() == llvm::Triple::arm ||
-              Triple.getArch() == llvm::Triple::thumb)) {
-    // Windows on ARM expects restricted IT blocks
-    CmdArgs.push_back("-mllvm");
-    CmdArgs.push_back("-arm-restrict-it");
   }
 
   // Forward -cl options to -cc1
   RenderOpenCLOptions(Args, CmdArgs, InputType);
 
+  // Forward hlsl options to -cc1
+  RenderHLSLOptions(Args, CmdArgs, InputType);
+
   if (IsHIP) {
     if (Args.hasFlag(options::OPT_fhip_new_launch_api,
                      options::OPT_fno_hip_new_launch_api, true))
@@ -6001,10 +6452,12 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
     if (Args.hasFlag(options::OPT_fgpu_allow_device_init,
                      options::OPT_fno_gpu_allow_device_init, false))
       CmdArgs.push_back("-fgpu-allow-device-init");
+    Args.addOptInFlag(CmdArgs, options::OPT_fhip_kernel_arg_name,
+                      options::OPT_fno_hip_kernel_arg_name);
   }
 
   if (IsCuda || IsHIP) {
-    if (Args.hasFlag(options::OPT_fgpu_rdc, options::OPT_fno_gpu_rdc, false))
+    if (IsRDCMode)
       CmdArgs.push_back("-fgpu-rdc");
     if (Args.hasFlag(options::OPT_fgpu_defer_diag,
                      options::OPT_fno_gpu_defer_diag, false))
@@ -6017,6 +6470,10 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
     }
   }
 
+  // Forward -nogpulib to -cc1.
+  if (Args.hasArg(options::OPT_nogpulib))
+    CmdArgs.push_back("-nogpulib");
+
   if (Arg *A = Args.getLastArg(options::OPT_fcf_protection_EQ)) {
     CmdArgs.push_back(
         Args.MakeArgString(Twine("-fcf-protection=") + A->getValue()));
@@ -6027,6 +6484,12 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
     CmdArgs.push_back("-fno-jump-tables");
   }
 
+  if (Arg *A = Args.getLastArg(options::OPT_mfunction_return_EQ))
+    CmdArgs.push_back(
+        Args.MakeArgString(Twine("-mfunction-return=") + A->getValue()));
+
+  Args.AddLastArg(CmdArgs, options::OPT_mindirect_branch_cs_prefix);
+
   // Forward -f options with positive and negative forms; we translate these by
   // hand.  Do not propagate PGO options to the GPU-side compilations as the
   // profile info is for the host-side compilation only.
@@ -6061,9 +6524,8 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
   }
   RenderBuiltinOptions(TC, RawTriple, Args, CmdArgs);
 
-  if (!Args.hasFlag(options::OPT_fassume_sane_operator_new,
-                    options::OPT_fno_assume_sane_operator_new))
-    CmdArgs.push_back("-fno-assume-sane-operator-new");
+  Args.addOptOutFlag(CmdArgs, options::OPT_fassume_sane_operator_new,
+                     options::OPT_fno_assume_sane_operator_new);
 
   // -fblocks=0 is default.
   if (Args.hasFlag(options::OPT_fblocks, options::OPT_fno_blocks,
@@ -6084,21 +6546,22 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
   if (Args.hasFlag(options::OPT_fcoroutines_ts, options::OPT_fno_coroutines_ts,
                    false) &&
       types::isCXX(InputType)) {
+    D.Diag(diag::warn_deperecated_fcoroutines_ts_flag);
     CmdArgs.push_back("-fcoroutines-ts");
   }
 
+  if (Args.hasFlag(options::OPT_fcoro_aligned_allocation,
+                   options::OPT_fno_coro_aligned_allocation, false) &&
+      types::isCXX(InputType))
+    CmdArgs.push_back("-fcoro-aligned-allocation");
+
   Args.AddLastArg(CmdArgs, options::OPT_fdouble_square_bracket_attributes,
                   options::OPT_fno_double_square_bracket_attributes);
 
-  // -faccess-control is default.
-  if (Args.hasFlag(options::OPT_fno_access_control,
-                   options::OPT_faccess_control, false))
-    CmdArgs.push_back("-fno-access-control");
-
-  // -felide-constructors is the default.
-  if (Args.hasFlag(options::OPT_fno_elide_constructors,
-                   options::OPT_felide_constructors, false))
-    CmdArgs.push_back("-fno-elide-constructors");
+  Args.addOptOutFlag(CmdArgs, options::OPT_faccess_control,
+                     options::OPT_fno_access_control);
+  Args.addOptOutFlag(CmdArgs, options::OPT_felide_constructors,
+                     options::OPT_fno_elide_constructors);
 
   ToolChain::RTTIMode RTTIMode = TC.getRTTIMode();
 
@@ -6117,7 +6580,6 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
   if (!Args.hasFlag(
           options::OPT_fuse_cxa_atexit, options::OPT_fno_use_cxa_atexit,
           !RawTriple.isOSAIX() && !RawTriple.isOSWindows() &&
-              TC.getArch() != llvm::Triple::xcore &&
               ((RawTriple.getVendor() != llvm::Triple::MipsTechnologies) ||
                RawTriple.hasEnvironment())) ||
       KernelOrKext)
@@ -6128,10 +6590,18 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
                    RawTriple.isOSDarwin() && !KernelOrKext))
     CmdArgs.push_back("-fregister-global-dtors-with-atexit");
 
-  // -fno-use-line-directives is default.
-  if (Args.hasFlag(options::OPT_fuse_line_directives,
-                   options::OPT_fno_use_line_directives, false))
-    CmdArgs.push_back("-fuse-line-directives");
+  Args.addOptInFlag(CmdArgs, options::OPT_fuse_line_directives,
+                    options::OPT_fno_use_line_directives);
+
+  // -fno-minimize-whitespace is default.
+  if (Args.hasFlag(options::OPT_fminimize_whitespace,
+                   options::OPT_fno_minimize_whitespace, false)) {
+    types::ID InputType = Inputs[0].getType();
+    if (!isDerivedFromC(InputType))
+      D.Diag(diag::err_drv_minws_unsupported_input_type)
+          << types::getTypeName(InputType);
+    CmdArgs.push_back("-fminimize-whitespace");
+  }
 
   // -fms-extensions=0 is default.
   if (Args.hasFlag(options::OPT_fms_extensions, options::OPT_fno_ms_extensions,
@@ -6146,6 +6616,10 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
   if (IsMSVCCompat)
     CmdArgs.push_back("-fms-compatibility");
 
+  if (Triple.isWindowsMSVCEnvironment() && !D.IsCLMode() &&
+      Args.hasArg(options::OPT_fms_runtime_lib_EQ))
+    ProcessVSRuntimeLibrary(Args, CmdArgs);
+
   // Handle -fgcc-version, if present.
   VersionTuple GNUCVer;
   if (Arg *A = Args.getLastArg(options::OPT_fgnuc_version_EQ)) {
@@ -6154,8 +6628,8 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
     StringRef Val = A->getValue();
     Val = Val.empty() ? "0" : Val; // Treat "" as 0 or disable.
     bool Invalid = GNUCVer.tryParse(Val);
-    unsigned Minor = GNUCVer.getMinor().getValueOr(0);
-    unsigned Patch = GNUCVer.getSubminor().getValueOr(0);
+    unsigned Minor = GNUCVer.getMinor().value_or(0);
+    unsigned Patch = GNUCVer.getSubminor().value_or(0);
     if (Invalid || GNUCVer.getBuild() || Minor >= 100 || Patch >= 100) {
       D.Diag(diag::err_drv_invalid_value)
           << A->getAsString(Args) << A->getValue();
@@ -6214,14 +6688,12 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
     CmdArgs.push_back(LanguageStandard.data());
   }
 
-  // -fno-borland-extensions is default.
-  if (Args.hasFlag(options::OPT_fborland_extensions,
-                   options::OPT_fno_borland_extensions, false))
-    CmdArgs.push_back("-fborland-extensions");
+  Args.addOptInFlag(CmdArgs, options::OPT_fborland_extensions,
+                    options::OPT_fno_borland_extensions);
 
-  // -fno-declspec is default, except for PS4.
+  // -fno-declspec is default, except for PS4/PS5.
   if (Args.hasFlag(options::OPT_fdeclspec, options::OPT_fno_declspec,
-                   RawTriple.isPS4()))
+                   RawTriple.isPS()))
     CmdArgs.push_back("-fdeclspec");
   else if (Args.hasArg(options::OPT_fno_declspec))
     CmdArgs.push_back("-fno-declspec"); // Explicitly disabling __declspec.
@@ -6230,7 +6702,8 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
   // than 19.
   if (!Args.hasFlag(options::OPT_fthreadsafe_statics,
                     options::OPT_fno_threadsafe_statics,
-                    !IsWindowsMSVC || IsMSVC2015Compatible))
+                    !types::isOpenCL(InputType) &&
+                        (!IsWindowsMSVC || IsMSVC2015Compatible)))
     CmdArgs.push_back("-fno-threadsafe-statics");
 
   // -fno-delayed-template-parsing is default, except when targeting MSVC.
@@ -6246,23 +6719,23 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
   Args.AddLastArg(CmdArgs, options::OPT_fgnu_keywords,
                   options::OPT_fno_gnu_keywords);
 
-  if (Args.hasFlag(options::OPT_fgnu89_inline, options::OPT_fno_gnu89_inline,
-                   false))
-    CmdArgs.push_back("-fgnu89-inline");
+  Args.addOptInFlag(CmdArgs, options::OPT_fgnu89_inline,
+                    options::OPT_fno_gnu89_inline);
 
-  if (Args.hasArg(options::OPT_fno_inline))
-    CmdArgs.push_back("-fno-inline");
+  const Arg *InlineArg = Args.getLastArg(options::OPT_finline_functions,
+                                         options::OPT_finline_hint_functions,
+                                         options::OPT_fno_inline_functions);
+  if (Arg *A = Args.getLastArg(options::OPT_finline, options::OPT_fno_inline)) {
+    if (A->getOption().matches(options::OPT_fno_inline))
+      A->render(Args, CmdArgs);
+  } else if (InlineArg) {
+    InlineArg->render(Args, CmdArgs);
+  }
 
-  Args.AddLastArg(CmdArgs, options::OPT_finline_functions,
-                  options::OPT_finline_hint_functions,
-                  options::OPT_fno_inline_functions);
+  Args.AddLastArg(CmdArgs, options::OPT_finline_max_stacksize_EQ);
 
-  // FIXME: Find a better way to determine whether the language has modules
-  // support by default, or just assume that all languages do.
   bool HaveModules =
-      Std && (Std->containsValue("c++2a") || Std->containsValue("c++20") ||
-              Std->containsValue("c++latest"));
-  RenderModulesOptions(C, D, Args, Input, Output, CmdArgs, HaveModules);
+      RenderModulesOptions(C, D, Args, Input, Output, Std, CmdArgs);
 
   if (Args.hasFlag(options::OPT_fpch_validate_input_files_content,
                    options::OPT_fno_pch_validate_input_files_content, false))
@@ -6277,9 +6750,6 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
                    false))
     CmdArgs.push_back("-fmodules-debuginfo");
 
-  Args.AddLastArg(CmdArgs, options::OPT_flegacy_pass_manager,
-                  options::OPT_fno_legacy_pass_manager);
-
   ObjCRuntime Runtime = AddObjCRuntimeArgs(Args, Inputs, CmdArgs, rewriteKind);
   RenderObjCOptions(TC, D, RawTriple, Args, Runtime, rewriteKind != RK_None,
                     Input, CmdArgs);
@@ -6330,22 +6800,19 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
   }
 
   // C++ "sane" operator new.
-  if (!Args.hasFlag(options::OPT_fassume_sane_operator_new,
-                    options::OPT_fno_assume_sane_operator_new))
-    CmdArgs.push_back("-fno-assume-sane-operator-new");
+  Args.addOptOutFlag(CmdArgs, options::OPT_fassume_sane_operator_new,
+                     options::OPT_fno_assume_sane_operator_new);
 
   // -frelaxed-template-template-args is off by default, as it is a severe
   // breaking change until a corresponding change to template partial ordering
   // is provided.
-  if (Args.hasFlag(options::OPT_frelaxed_template_template_args,
-                   options::OPT_fno_relaxed_template_template_args, false))
-    CmdArgs.push_back("-frelaxed-template-template-args");
+  Args.addOptInFlag(CmdArgs, options::OPT_frelaxed_template_template_args,
+                    options::OPT_fno_relaxed_template_template_args);
 
   // -fsized-deallocation is off by default, as it is an ABI-breaking change for
   // most platforms.
-  if (Args.hasFlag(options::OPT_fsized_deallocation,
-                   options::OPT_fno_sized_deallocation, false))
-    CmdArgs.push_back("-fsized-deallocation");
+  Args.addOptInFlag(CmdArgs, options::OPT_fsized_deallocation,
+                    options::OPT_fno_sized_deallocation);
 
   // -faligned-allocation is on by default in C++17 onwards and otherwise off
   // by default.
@@ -6368,15 +6835,13 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
   // -fconstant-cfstrings is default, and may be subject to argument translation
   // on Darwin.
   if (!Args.hasFlag(options::OPT_fconstant_cfstrings,
-                    options::OPT_fno_constant_cfstrings) ||
+                    options::OPT_fno_constant_cfstrings, true) ||
       !Args.hasFlag(options::OPT_mconstant_cfstrings,
-                    options::OPT_mno_constant_cfstrings))
+                    options::OPT_mno_constant_cfstrings, true))
     CmdArgs.push_back("-fno-constant-cfstrings");
 
-  // -fno-pascal-strings is default, only pass non-default.
-  if (Args.hasFlag(options::OPT_fpascal_strings,
-                   options::OPT_fno_pascal_strings, false))
-    CmdArgs.push_back("-fpascal-strings");
+  Args.addOptInFlag(CmdArgs, options::OPT_fpascal_strings,
+                    options::OPT_fno_pascal_strings);
 
   // Honor -fpack-struct= and -fpack-struct, if given. Note that
   // -fno-pack-struct doesn't apply to -fpack-struct=.
@@ -6408,18 +6873,17 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
     CmdArgs.push_back("-Qn");
 
   // -fno-common is the default, set -fcommon only when that flag is set.
-  if (Args.hasFlag(options::OPT_fcommon, options::OPT_fno_common, false))
-    CmdArgs.push_back("-fcommon");
+  Args.addOptInFlag(CmdArgs, options::OPT_fcommon, options::OPT_fno_common);
 
   // -fsigned-bitfields is default, and clang doesn't yet support
   // -funsigned-bitfields.
   if (!Args.hasFlag(options::OPT_fsigned_bitfields,
-                    options::OPT_funsigned_bitfields))
+                    options::OPT_funsigned_bitfields, true))
     D.Diag(diag::warn_drv_clang_unsupported)
         << Args.getLastArg(options::OPT_funsigned_bitfields)->getAsString(Args);
 
   // -fsigned-bitfields is default, and clang doesn't support -fno-for-scope.
-  if (!Args.hasFlag(options::OPT_ffor_scope, options::OPT_fno_for_scope))
+  if (!Args.hasFlag(options::OPT_ffor_scope, options::OPT_fno_for_scope, true))
     D.Diag(diag::err_drv_clang_unsupported)
         << Args.getLastArg(options::OPT_fno_for_scope)->getAsString(Args);
 
@@ -6441,15 +6905,11 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
 
   RenderDiagnosticsOptions(D, Args, CmdArgs);
 
-  // -fno-asm-blocks is default.
-  if (Args.hasFlag(options::OPT_fasm_blocks, options::OPT_fno_asm_blocks,
-                   false))
-    CmdArgs.push_back("-fasm-blocks");
+  Args.addOptInFlag(CmdArgs, options::OPT_fasm_blocks,
+                    options::OPT_fno_asm_blocks);
 
-  // -fgnu-inline-asm is default.
-  if (!Args.hasFlag(options::OPT_fgnu_inline_asm,
-                    options::OPT_fno_gnu_inline_asm, true))
-    CmdArgs.push_back("-fno-gnu-inline-asm");
+  Args.addOptOutFlag(CmdArgs, options::OPT_fgnu_inline_asm,
+                     options::OPT_fno_gnu_inline_asm);
 
   // Enable vectorization per default according to the optimization level
   // selected. For optimization levels that want vectorization we use the alias
@@ -6485,17 +6945,8 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
       CmdArgs.push_back("-fno-dollars-in-identifiers");
   }
 
-  // -funit-at-a-time is default, and we don't support -fno-unit-at-a-time for
-  // practical purposes.
-  if (Arg *A = Args.getLastArg(options::OPT_funit_at_a_time,
-                               options::OPT_fno_unit_at_a_time)) {
-    if (A->getOption().matches(options::OPT_fno_unit_at_a_time))
-      D.Diag(diag::warn_drv_clang_unsupported) << A->getAsString(Args);
-  }
-
-  if (Args.hasFlag(options::OPT_fapple_pragma_pack,
-                   options::OPT_fno_apple_pragma_pack, false))
-    CmdArgs.push_back("-fapple-pragma-pack");
+  Args.addOptInFlag(CmdArgs, options::OPT_fapple_pragma_pack,
+                    options::OPT_fno_apple_pragma_pack);
 
   if (Args.hasFlag(options::OPT_fxl_pragma_pack,
                    options::OPT_fno_xl_pragma_pack, RawTriple.isOSAIX()))
@@ -6522,6 +6973,9 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
     CmdArgs.push_back("-fno-builtin-strndup");
   }
 
+  Args.addOptInFlag(CmdArgs, options::OPT_fdirectives_only,
+                    options::OPT_fno_directives_only);
+
   // Enable rewrite includes if the user's asked for it or if we're generating
   // diagnostics.
   // TODO: Once -module-dependency-dir works with -frewrite-includes it'd be
@@ -6542,6 +6996,7 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
 
   Args.AddLastArg(CmdArgs, options::OPT_dM);
   Args.AddLastArg(CmdArgs, options::OPT_dD);
+  Args.AddLastArg(CmdArgs, options::OPT_dI);
 
   Args.AddLastArg(CmdArgs, options::OPT_fmax_tokens_EQ);
 
@@ -6566,6 +7021,35 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
     A->claim();
   }
 
+  // Turn -fplugin-arg-pluginname-key=value into
+  // -plugin-arg-pluginname key=value
+  // GCC has an actual plugin_argument struct with key/value pairs that it
+  // passes to its plugins, but we don't, so just pass it on as-is.
+  //
+  // The syntax for -fplugin-arg- is ambiguous if both plugin name and
+  // argument key are allowed to contain dashes. GCC therefore only
+  // allows dashes in the key. We do the same.
+  for (const Arg *A : Args.filtered(options::OPT_fplugin_arg)) {
+    auto ArgValue = StringRef(A->getValue());
+    auto FirstDashIndex = ArgValue.find('-');
+    StringRef PluginName = ArgValue.substr(0, FirstDashIndex);
+    StringRef Arg = ArgValue.substr(FirstDashIndex + 1);
+
+    A->claim();
+    if (FirstDashIndex == StringRef::npos || Arg.empty()) {
+      if (PluginName.empty()) {
+        D.Diag(diag::warn_drv_missing_plugin_name) << A->getAsString(Args);
+      } else {
+        D.Diag(diag::warn_drv_missing_plugin_arg)
+            << PluginName << A->getAsString(Args);
+      }
+      continue;
+    }
+
+    CmdArgs.push_back(Args.MakeArgString(Twine("-plugin-arg-") + PluginName));
+    CmdArgs.push_back(Args.MakeArgString(Arg));
+  }
+
   // Forward -fpass-plugin=name.so to -cc1.
   for (const Arg *A : Args.filtered(options::OPT_fpass_plugin_EQ)) {
     CmdArgs.push_back(
@@ -6580,18 +7064,16 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
 
   // Forward -Xclang arguments to -cc1, and -mllvm arguments to the LLVM option
   // parser.
-  // -finclude-default-header flag is for preprocessor,
-  // do not pass it to other cc1 commands when save-temps is enabled
-  if (C.getDriver().isSaveTempsEnabled() &&
-      !isa<PreprocessJobAction>(JA)) {
-    for (auto Arg : Args.filtered(options::OPT_Xclang)) {
-      Arg->claim();
-      if (StringRef(Arg->getValue()) != "-finclude-default-header")
-        CmdArgs.push_back(Arg->getValue());
+  for (auto Arg : Args.filtered(options::OPT_Xclang)) {
+    Arg->claim();
+    // -finclude-default-header flag is for preprocessor,
+    // do not pass it to other cc1 commands when save-temps is enabled
+    if (C.getDriver().isSaveTempsEnabled() &&
+        !isa<PreprocessJobAction>(JA)) {
+      if (StringRef(Arg->getValue()) == "-finclude-default-header")
+        continue;
     }
-  }
-  else {
-    Args.AddAllArgValues(CmdArgs, options::OPT_Xclang);
+    CmdArgs.push_back(Arg->getValue());
   }
   for (const Arg *A : Args.filtered(options::OPT_mllvm)) {
     A->claim();
@@ -6663,13 +7145,22 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
     }
   }
 
-  // Host-side cuda compilation receives all device-side outputs in a single
-  // fatbin as Inputs[1]. Include the binary with -fcuda-include-gpubinary.
+  // Host-side offloading compilation receives all device-side outputs. Include
+  // them in the host compilation depending on the target. If the host inputs
+  // are not empty we use the new-driver scheme, otherwise use the old scheme.
   if ((IsCuda || IsHIP) && CudaDeviceInput) {
+    CmdArgs.push_back("-fcuda-include-gpubinary");
+    CmdArgs.push_back(CudaDeviceInput->getFilename());
+  } else if (!HostOffloadingInputs.empty()) {
+    if ((IsCuda || IsHIP) && !IsRDCMode) {
+      assert(HostOffloadingInputs.size() == 1 && "Only one input expected");
       CmdArgs.push_back("-fcuda-include-gpubinary");
-      CmdArgs.push_back(CudaDeviceInput->getFilename());
-      if (Args.hasFlag(options::OPT_fgpu_rdc, options::OPT_fno_gpu_rdc, false))
-        CmdArgs.push_back("-fgpu-rdc");
+      CmdArgs.push_back(HostOffloadingInputs.front().getFilename());
+    } else {
+      for (const InputInfo Input : HostOffloadingInputs)
+        CmdArgs.push_back(Args.MakeArgString("-fembed-offload-object=" +
+                                             TC.getInputFilename(Input)));
+    }
   }
 
   if (IsCuda) {
@@ -6690,8 +7181,10 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
       CmdArgs.push_back(Args.MakeArgString(Twine("-cuid=") + Twine(CUID)));
   }
 
-  if (IsHIP)
+  if (IsHIP) {
     CmdArgs.push_back("-fcuda-allow-variadic-functions");
+    Args.AddLastArg(CmdArgs, options::OPT_fgpu_default_stream_EQ);
+  }
 
   if (IsCudaDevice || IsHIPDevice) {
     StringRef InlineThresh =
@@ -6719,28 +7212,20 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
   if (Triple.isAMDGPU()) {
     handleAMDGPUCodeObjectVersionOptions(D, Args, CmdArgs);
 
-    if (Args.hasFlag(options::OPT_munsafe_fp_atomics,
-                     options::OPT_mno_unsafe_fp_atomics, /*Default=*/false))
-      CmdArgs.push_back("-munsafe-fp-atomics");
+    Args.addOptInFlag(CmdArgs, options::OPT_munsafe_fp_atomics,
+                      options::OPT_mno_unsafe_fp_atomics);
   }
 
   // For all the host OpenMP offloading compile jobs we need to pass the targets
   // information using -fopenmp-targets= option.
   if (JA.isHostOffloading(Action::OFK_OpenMP)) {
-    SmallString<128> TargetInfo("-fopenmp-targets=");
+    SmallString<128> Targets("-fopenmp-targets=");
 
-    Arg *Tgts = Args.getLastArg(options::OPT_fopenmp_targets_EQ);
-    assert(Tgts && Tgts->getNumValues() &&
-           "OpenMP offloading has to have targets specified.");
-    for (unsigned i = 0; i < Tgts->getNumValues(); ++i) {
-      if (i)
-        TargetInfo += ',';
-      // We need to get the string from the triple because it may be not exactly
-      // the same as the one we get directly from the arguments.
-      llvm::Triple T(Tgts->getValue(i));
-      TargetInfo += T.getTriple();
-    }
-    CmdArgs.push_back(Args.MakeArgString(TargetInfo.str()));
+    SmallVector<std::string, 4> Triples;
+    auto TCRange = C.getOffloadToolChains<Action::OFK_OpenMP>();
+    std::transform(TCRange.first, TCRange.second, std::back_inserter(Triples),
+                   [](auto TC) { return TC.second->getTripleString(); });
+    CmdArgs.push_back(Args.MakeArgString(Targets + llvm::join(Triples, ",")));
   }
 
   bool VirtualFunctionElimination =
@@ -6782,12 +7267,12 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
   }
 
   bool DefaultsSplitLTOUnit =
-      (WholeProgramVTables || Sanitize.needsLTO()) &&
+      (WholeProgramVTables || SanitizeArgs.needsLTO()) &&
       (LTOMode == LTOK_Full || TC.canSplitThinLTOUnit());
   bool SplitLTOUnit =
       Args.hasFlag(options::OPT_fsplit_lto_unit,
                    options::OPT_fno_split_lto_unit, DefaultsSplitLTOUnit);
-  if (Sanitize.needsLTO() && !SplitLTOUnit)
+  if (SanitizeArgs.needsLTO() && !SplitLTOUnit)
     D.Diag(diag::err_drv_argument_not_allowed_with) << "-fno-split-lto-unit"
                                                     << "-fsanitize=cfi";
   if (SplitLTOUnit)
@@ -6841,34 +7326,29 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
       CmdArgs.push_back("-fforce-enable-int128");
   }
 
-  if (Args.hasFlag(options::OPT_fkeep_static_consts,
-                   options::OPT_fno_keep_static_consts, false))
-    CmdArgs.push_back("-fkeep-static-consts");
-
-  if (Args.hasFlag(options::OPT_fcomplete_member_pointers,
-                   options::OPT_fno_complete_member_pointers, false))
-    CmdArgs.push_back("-fcomplete-member-pointers");
-
-  if (!Args.hasFlag(options::OPT_fcxx_static_destructors,
-                    options::OPT_fno_cxx_static_destructors, true))
-    CmdArgs.push_back("-fno-c++-static-destructors");
+  Args.addOptInFlag(CmdArgs, options::OPT_fkeep_static_consts,
+                    options::OPT_fno_keep_static_consts);
+  Args.addOptInFlag(CmdArgs, options::OPT_fcomplete_member_pointers,
+                    options::OPT_fno_complete_member_pointers);
+  Args.addOptOutFlag(CmdArgs, options::OPT_fcxx_static_destructors,
+                     options::OPT_fno_cxx_static_destructors);
 
   addMachineOutlinerArgs(D, Args, CmdArgs, Triple, /*IsLTO=*/false);
 
   if (Arg *A = Args.getLastArg(options::OPT_moutline_atomics,
                                options::OPT_mno_outline_atomics)) {
-    if (A->getOption().matches(options::OPT_moutline_atomics)) {
-      // Option -moutline-atomics supported for AArch64 target only.
-      if (!Triple.isAArch64()) {
-        D.Diag(diag::warn_drv_moutline_atomics_unsupported_opt)
-            << Triple.getArchName();
-      } else {
+    // Option -moutline-atomics supported for AArch64 target only.
+    if (!Triple.isAArch64()) {
+      D.Diag(diag::warn_drv_moutline_atomics_unsupported_opt)
+          << Triple.getArchName() << A->getOption().getName();
+    } else {
+      if (A->getOption().matches(options::OPT_moutline_atomics)) {
         CmdArgs.push_back("-target-feature");
         CmdArgs.push_back("+outline-atomics");
+      } else {
+        CmdArgs.push_back("-target-feature");
+        CmdArgs.push_back("-outline-atomics");
       }
-    } else {
-      CmdArgs.push_back("-target-feature");
-      CmdArgs.push_back("-outline-atomics");
     }
   } else if (Triple.isAArch64() &&
              getToolChain().IsAArch64OutlineAtomicsDefault(Args)) {
@@ -6876,6 +7356,14 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
     CmdArgs.push_back("+outline-atomics");
   }
 
+  if (Triple.isAArch64() &&
+      (Args.hasArg(options::OPT_mno_fmv) ||
+       getToolChain().GetRuntimeLibType(Args) != ToolChain::RLT_CompilerRT)) {
+    // Disable Function Multiversioning on AArch64 target.
+    CmdArgs.push_back("-target-feature");
+    CmdArgs.push_back("-fmv");
+  }
+
   if (Args.hasFlag(options::OPT_faddrsig, options::OPT_fno_addrsig,
                    (TC.getTriple().isOSBinFormatELF() ||
                     TC.getTriple().isOSBinFormatCOFF()) &&
@@ -6886,7 +7374,8 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
     CmdArgs.push_back("-faddrsig");
 
   if ((Triple.isOSBinFormatELF() || Triple.isOSBinFormatMachO()) &&
-      (EH || UnwindTables || DebugInfoKind != codegenoptions::NoDebugInfo))
+      (EH || UnwindTables || AsyncUnwindTables ||
+       DebugInfoKind != codegenoptions::NoDebugInfo))
     CmdArgs.push_back("-D__GCC_HAVE_DWARF2_CFI_ASM=1");
 
   if (Arg *A = Args.getLastArg(options::OPT_fsymbol_partition_EQ)) {
@@ -6897,6 +7386,11 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
     CmdArgs.push_back(Args.MakeArgString(Str));
   }
 
+  // Add the output path to the object file for CodeView debug infos.
+  if (EmitCodeView && Output.isFilename())
+    addDebugObjectName(Args, CmdArgs, DebugCompilationDir,
+                       Output.getFilename());
+
   // Add the "-o out -x type src.c" flags last. This is done primarily to make
   // the -cc1 command easier to edit when reproducing compiler crashes.
   if (Output.getType() == types::TY_Dependencies) {
@@ -6919,8 +7413,8 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
   addDashXForInput(Args, Input, CmdArgs);
 
   ArrayRef<InputInfo> FrontendInputs = Input;
-  if (IsHeaderModulePrecompile)
-    FrontendInputs = ModuleHeaderInputs;
+  if (IsExtractAPI)
+    FrontendInputs = ExtractAPIInputs;
   else if (Input.isNothing())
     FrontendInputs = {};
 
@@ -6970,11 +7464,11 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
   Args.ClaimAllArgs(options::OPT_emit_llvm);
 }
 
-Clang::Clang(const ToolChain &TC)
+Clang::Clang(const ToolChain &TC, bool HasIntegratedBackend)
     // CAUTION! The first constructor argument ("clang") is not arbitrary,
     // as it is for other tools. Some operations on a Tool actually test
     // whether that tool is Clang based on the Tool's Name as a string.
-    : Tool("clang", "clang frontend", TC) {}
+    : Tool("clang", "clang frontend", TC), HasBackend(HasIntegratedBackend) {}
 
 Clang::~Clang() {}
 
@@ -7172,6 +7666,12 @@ static EHFlags parseClangCLEHFlags(const Driver &D, const ArgList &Args) {
     EH.NoUnwindC = true;
   }
 
+  if (Args.hasArg(options::OPT__SLASH_kernel)) {
+    EH.Synch = false;
+    EH.NoUnwindC = false;
+    EH.Asynch = false;
+  }
+
   return EH;
 }
 
@@ -7179,59 +7679,9 @@ void Clang::AddClangCLArgs(const ArgList &Args, types::ID InputType,
                            ArgStringList &CmdArgs,
                            codegenoptions::DebugInfoKind *DebugInfoKind,
                            bool *EmitCodeView) const {
-  unsigned RTOptionID = options::OPT__SLASH_MT;
   bool isNVPTX = getToolChain().getTriple().isNVPTX();
 
-  if (Args.hasArg(options::OPT__SLASH_LDd))
-    // The /LDd option implies /MTd. The dependent lib part can be overridden,
-    // but defining _DEBUG is sticky.
-    RTOptionID = options::OPT__SLASH_MTd;
-
-  if (Arg *A = Args.getLastArg(options::OPT__SLASH_M_Group))
-    RTOptionID = A->getOption().getID();
-
-  StringRef FlagForCRT;
-  switch (RTOptionID) {
-  case options::OPT__SLASH_MD:
-    if (Args.hasArg(options::OPT__SLASH_LDd))
-      CmdArgs.push_back("-D_DEBUG");
-    CmdArgs.push_back("-D_MT");
-    CmdArgs.push_back("-D_DLL");
-    FlagForCRT = "--dependent-lib=msvcrt";
-    break;
-  case options::OPT__SLASH_MDd:
-    CmdArgs.push_back("-D_DEBUG");
-    CmdArgs.push_back("-D_MT");
-    CmdArgs.push_back("-D_DLL");
-    FlagForCRT = "--dependent-lib=msvcrtd";
-    break;
-  case options::OPT__SLASH_MT:
-    if (Args.hasArg(options::OPT__SLASH_LDd))
-      CmdArgs.push_back("-D_DEBUG");
-    CmdArgs.push_back("-D_MT");
-    CmdArgs.push_back("-flto-visibility-public-std");
-    FlagForCRT = "--dependent-lib=libcmt";
-    break;
-  case options::OPT__SLASH_MTd:
-    CmdArgs.push_back("-D_DEBUG");
-    CmdArgs.push_back("-D_MT");
-    CmdArgs.push_back("-flto-visibility-public-std");
-    FlagForCRT = "--dependent-lib=libcmtd";
-    break;
-  default:
-    llvm_unreachable("Unexpected option ID.");
-  }
-
-  if (Args.hasArg(options::OPT__SLASH_Zl)) {
-    CmdArgs.push_back("-D_VC_NODEFAULTLIB");
-  } else {
-    CmdArgs.push_back(FlagForCRT.data());
-
-    // This provides POSIX compatibility (maps 'open' to '_open'), which most
-    // users want.  The /Za flag to cl.exe turns this off, but it's not
-    // implemented in clang.
-    CmdArgs.push_back("--dependent-lib=oldnames");
-  }
+  ProcessVSRuntimeLibrary(Args, CmdArgs);
 
   if (Arg *ShowIncludes =
           Args.getLastArg(options::OPT__SLASH_showIncludes,
@@ -7267,6 +7717,17 @@ void Clang::AddClangCLArgs(const ArgList &Args, types::ID InputType,
   }
 
   const Driver &D = getToolChain().getDriver();
+
+  // This controls whether or not we perform JustMyCode instrumentation.
+  if (Args.hasFlag(options::OPT__SLASH_JMC, options::OPT__SLASH_JMC_,
+                   /*Default=*/false)) {
+    if (*EmitCodeView && *DebugInfoKind >= codegenoptions::DebugInfoConstructor)
+      CmdArgs.push_back("-fjmc");
+    else
+      D.Diag(clang::diag::warn_drv_jmc_requires_debuginfo) << "/JMC"
+                                                           << "'/Zi', '/Z7'";
+  }
+
   EHFlags EH = parseClangCLEHFlags(D, Args);
   if (!isNVPTX && (EH.Synch || EH.Asynch)) {
     if (types::isCXX(InputType))
@@ -7300,6 +7761,32 @@ void Clang::AddClangCLArgs(const ArgList &Args, types::ID InputType,
   CmdArgs.push_back("-fno-dllexport-inlines");
  }
 
+ if (Args.hasFlag(options::OPT__SLASH_Zc_wchar_t_,
+                  options::OPT__SLASH_Zc_wchar_t, false)) {
+   CmdArgs.push_back("-fno-wchar");
+ }
+
+ if (Args.hasArg(options::OPT__SLASH_kernel)) {
+   llvm::Triple::ArchType Arch = getToolChain().getArch();
+   std::vector<std::string> Values =
+       Args.getAllArgValues(options::OPT__SLASH_arch);
+   if (!Values.empty()) {
+     llvm::SmallSet<std::string, 4> SupportedArches;
+     if (Arch == llvm::Triple::x86)
+       SupportedArches.insert("IA32");
+
+     for (auto &V : Values)
+       if (!SupportedArches.contains(V))
+         D.Diag(diag::err_drv_argument_not_allowed_with)
+             << std::string("/arch:").append(V) << "/kernel";
+   }
+
+   CmdArgs.push_back("-fno-rtti");
+   if (Args.hasFlag(options::OPT__SLASH_GR, options::OPT__SLASH_GR_, false))
+     D.Diag(diag::err_drv_argument_not_allowed_with) << "/GR"
+                                                     << "/kernel";
+ }
+
   Arg *MostGeneralArg = Args.getLastArg(options::OPT__SLASH_vmg);
   Arg *BestCaseArg = Args.getLastArg(options::OPT__SLASH_vmb);
   if (MostGeneralArg && BestCaseArg)
@@ -7369,7 +7856,10 @@ void Clang::AddClangCLArgs(const ArgList &Args, types::ID InputType,
     CmdArgs.push_back("msvc");
   }
 
-  if (Arg *A = Args.getLastArg(options::OPT__SLASH_guard)) {
+  if (Args.hasArg(options::OPT__SLASH_kernel))
+    CmdArgs.push_back("-fms-kernel");
+
+  for (const Arg *A : Args.filtered(options::OPT__SLASH_guard)) {
     StringRef GuardArgs = A->getValue();
     // The only valid options are "cf", "cf,nochecks", "cf-", "ehcont" and
     // "ehcont-".
@@ -7388,6 +7878,7 @@ void Clang::AddClangCLArgs(const ArgList &Args, types::ID InputType,
     } else {
       D.Diag(diag::err_drv_invalid_value) << A->getSpelling() << GuardArgs;
     }
+    A->claim();
   }
 }
 
@@ -7444,7 +7935,7 @@ void ClangAs::AddX86TargetArgs(const ArgList &Args,
       CmdArgs.push_back(Args.MakeArgString("-x86-asm-syntax=" + Value));
     } else {
       getToolChain().getDriver().Diag(diag::err_drv_unsupported_option_argument)
-          << A->getOption().getName() << Value;
+          << A->getSpelling() << Value;
     }
   }
 }
@@ -7487,6 +7978,8 @@ void ClangAs::ConstructJob(Compilation &C, const JobAction &JA,
   CmdArgs.push_back("-triple");
   CmdArgs.push_back(Args.MakeArgString(TripleStr));
 
+  getToolChain().addClangCC1ASTargetOptions(Args, CmdArgs);
+
   // Set the output mode, we currently only expect to be used as a real
   // assembler.
   CmdArgs.push_back("-filetype");
@@ -7498,7 +7991,7 @@ void ClangAs::ConstructJob(Compilation &C, const JobAction &JA,
   CmdArgs.push_back(Clang::getBaseInputName(Args, Input));
 
   // Add the target cpu
-  std::string CPU = getCPUName(Args, Triple, /*FromAs*/ true);
+  std::string CPU = getCPUName(D, Args, Triple, /*FromAs*/ true);
   if (!CPU.empty()) {
     CmdArgs.push_back("-target-cpu");
     CmdArgs.push_back(Args.MakeArgString(CPU));
@@ -7514,11 +8007,14 @@ void ClangAs::ConstructJob(Compilation &C, const JobAction &JA,
   Args.AddAllArgs(CmdArgs, options::OPT_I_Group);
 
   // Determine the original source input.
-  const Action *SourceAction = &JA;
-  while (SourceAction->getKind() != Action::InputClass) {
-    assert(!SourceAction->getInputs().empty() && "unexpected root action!");
-    SourceAction = SourceAction->getInputs()[0];
-  }
+  auto FindSource = [](const Action *S) -> const Action * {
+    while (S->getKind() != Action::InputClass) {
+      assert(!S->getInputs().empty() && "unexpected root action!");
+      S = S->getInputs()[0];
+    }
+    return S;
+  };
+  const Action *SourceAction = FindSource(&JA);
 
   // Forward -g and handle debug info related flags, assuming we are dealing
   // with an actual assembly file.
@@ -7528,15 +8024,12 @@ void ClangAs::ConstructJob(Compilation &C, const JobAction &JA,
     WantDebug = !A->getOption().matches(options::OPT_g0) &&
                 !A->getOption().matches(options::OPT_ggdb0);
 
-  unsigned DwarfVersion = ParseDebugDefaultVersion(getToolChain(), Args);
-  if (const Arg *GDwarfN = getDwarfNArg(Args))
-    DwarfVersion = DwarfVersionNum(GDwarfN->getSpelling());
-
-  if (DwarfVersion == 0)
-    DwarfVersion = getToolChain().GetDefaultDwarfVersion();
-
   codegenoptions::DebugInfoKind DebugInfoKind = codegenoptions::NoDebugInfo;
 
+  // Add the -fdebug-compilation-dir flag if needed.
+  const char *DebugCompilationDir =
+      addDebugCompDirArg(Args, CmdArgs, C.getDriver().getVFS());
+
   if (SourceAction->getType() == types::TY_Asm ||
       SourceAction->getType() == types::TY_PP_Asm) {
     // You might think that it would be ok to set DebugInfoKind outside of
@@ -7545,10 +8038,9 @@ void ClangAs::ConstructJob(Compilation &C, const JobAction &JA,
     // and it's not clear whether that test is just overly restrictive.
     DebugInfoKind = (WantDebug ? codegenoptions::DebugInfoConstructor
                                : codegenoptions::NoDebugInfo);
-    // Add the -fdebug-compilation-dir flag if needed.
-    addDebugCompDirArg(Args, CmdArgs, C.getDriver().getVFS());
 
-    addDebugPrefixMapArg(getToolChain().getDriver(), Args, CmdArgs);
+    addDebugPrefixMapArg(getToolChain().getDriver(), getToolChain(), Args,
+                         CmdArgs);
 
     // Set the AT_producer to the clang version when using the integrated
     // assembler on assembly source files.
@@ -7558,12 +8050,12 @@ void ClangAs::ConstructJob(Compilation &C, const JobAction &JA,
     // And pass along -I options
     Args.AddAllArgs(CmdArgs, options::OPT_I);
   }
+  const unsigned DwarfVersion = getDwarfVersion(getToolChain(), Args);
   RenderDebugEnablingArgs(Args, CmdArgs, DebugInfoKind, DwarfVersion,
                           llvm::DebuggerKind::Default);
   renderDwarfFormat(D, Triple, Args, CmdArgs, DwarfVersion);
   RenderDebugInfoCompressionArgs(Args, CmdArgs, D, getToolChain());
 
-
   // Handle -fPIC et al -- the relocation-model affects the assembler
   // for some targets.
   llvm::Reloc::Model RelocationModel;
@@ -7657,6 +8149,29 @@ void ClangAs::ConstructJob(Compilation &C, const JobAction &JA,
 
   Args.AddAllArgs(CmdArgs, options::OPT_mllvm);
 
+  if (DebugInfoKind > codegenoptions::NoDebugInfo && Output.isFilename())
+    addDebugObjectName(Args, CmdArgs, DebugCompilationDir,
+                       Output.getFilename());
+
+  // Fixup any previous commands that use -object-file-name because when we
+  // generated them, the final .obj name wasn't yet known.
+  for (Command &J : C.getJobs()) {
+    if (SourceAction != FindSource(&J.getSource()))
+      continue;
+    auto &JArgs = J.getArguments();
+    for (unsigned I = 0; I < JArgs.size(); ++I) {
+      if (StringRef(JArgs[I]).startswith("-object-file-name=") &&
+          Output.isFilename()) {
+        ArgStringList NewArgs(JArgs.begin(), JArgs.begin() + I);
+        addDebugObjectName(Args, NewArgs, DebugCompilationDir,
+                           Output.getFilename());
+        NewArgs.append(JArgs.begin() + I + 1, JArgs.end());
+        J.replaceArguments(NewArgs);
+        break;
+      }
+    }
+  }
+
   assert(Output.isFilename() && "Unexpected lipo output.");
   CmdArgs.push_back("-o");
   CmdArgs.push_back(Output.getFilename());
@@ -7670,7 +8185,7 @@ void ClangAs::ConstructJob(Compilation &C, const JobAction &JA,
   }
 
   if (Triple.isAMDGPU())
-    handleAMDGPUCodeObjectVersionOptions(D, Args, CmdArgs);
+    handleAMDGPUCodeObjectVersionOptions(D, Args, CmdArgs, /*IsCC1As=*/true);
 
   assert(Input.isFilename() && "Invalid input.");
   CmdArgs.push_back(Input.getFilename());
@@ -7701,8 +8216,10 @@ void OffloadBundler::ConstructJob(Compilation &C, const JobAction &JA,
   // The bundling command looks like this:
   // clang-offload-bundler -type=bc
   //   -targets=host-triple,openmp-triple1,openmp-triple2
-  //   -outputs=input_file
-  //   -inputs=unbundle_file_host,unbundle_file_tgt1,unbundle_file_tgt2"
+  //   -output=output_file
+  //   -input=unbundle_file_host
+  //   -input=unbundle_file_tgt1
+  //   -input=unbundle_file_tgt2
 
   ArgStringList CmdArgs;
 
@@ -7734,31 +8251,41 @@ void OffloadBundler::ConstructJob(Compilation &C, const JobAction &JA,
       });
     }
     Triples += Action::GetOffloadKindName(CurKind);
-    Triples += "-";
-    std::string NormalizedTriple = CurTC->getTriple().normalize();
-    Triples += NormalizedTriple;
-
-    if (CurDep->getOffloadingArch() != nullptr) {
-      // If OffloadArch is present it can only appear as the 6th hypen
-      // sepearated field of Bundle Entry ID. So, pad required number of
-      // hyphens in Triple.
-      for (int i = 4 - StringRef(NormalizedTriple).count("-"); i > 0; i--)
-        Triples += "-";
+    Triples += '-';
+    Triples += CurTC->getTriple().normalize();
+    if ((CurKind == Action::OFK_HIP || CurKind == Action::OFK_Cuda) &&
+        !StringRef(CurDep->getOffloadingArch()).empty()) {
+      Triples += '-';
       Triples += CurDep->getOffloadingArch();
     }
+
+    // TODO: Replace parsing of -march flag. Can be done by storing GPUArch
+    //       with each toolchain.
+    StringRef GPUArchName;
+    if (CurKind == Action::OFK_OpenMP) {
+      // Extract GPUArch from -march argument in TC argument list.
+      for (unsigned ArgIndex = 0; ArgIndex < TCArgs.size(); ArgIndex++) {
+        auto ArchStr = StringRef(TCArgs.getArgString(ArgIndex));
+        auto Arch = ArchStr.startswith_insensitive("-march=");
+        if (Arch) {
+          GPUArchName = ArchStr.substr(7);
+          Triples += "-";
+          break;
+        }
+      }
+      Triples += GPUArchName.str();
+    }
   }
   CmdArgs.push_back(TCArgs.MakeArgString(Triples));
 
   // Get bundled file command.
   CmdArgs.push_back(
-      TCArgs.MakeArgString(Twine("-outputs=") + Output.getFilename()));
+      TCArgs.MakeArgString(Twine("-output=") + Output.getFilename()));
 
   // Get unbundled files command.
-  SmallString<128> UB;
-  UB += "-inputs=";
   for (unsigned I = 0; I < Inputs.size(); ++I) {
-    if (I)
-      UB += ',';
+    SmallString<128> UB;
+    UB += "-input=";
 
     // Find ToolChain for this input.
     const ToolChain *CurTC = &getToolChain();
@@ -7773,14 +8300,13 @@ void OffloadBundler::ConstructJob(Compilation &C, const JobAction &JA,
     } else {
       UB += CurTC->getInputFilename(Inputs[I]);
     }
+    CmdArgs.push_back(TCArgs.MakeArgString(UB));
   }
-  CmdArgs.push_back(TCArgs.MakeArgString(UB));
-
   // All the inputs are encoded as commands.
   C.addCommand(std::make_unique<Command>(
       JA, *this, ResponseFileSupport::None(),
       TCArgs.MakeArgString(getToolChain().GetProgramPath(getShortName())),
-      CmdArgs, None, Output));
+      CmdArgs, std::nullopt, Output));
 }
 
 void OffloadBundler::ConstructJobMultipleOutputs(
@@ -7793,8 +8319,10 @@ void OffloadBundler::ConstructJobMultipleOutputs(
   // The unbundling command looks like this:
   // clang-offload-bundler -type=bc
   //   -targets=host-triple,openmp-triple1,openmp-triple2
-  //   -inputs=input_file
-  //   -outputs=unbundle_file_host,unbundle_file_tgt1,unbundle_file_tgt2"
+  //   -input=input_file
+  //   -output=unbundle_file_host
+  //   -output=unbundle_file_tgt1
+  //   -output=unbundle_file_tgt2
   //   -unbundle
 
   ArgStringList CmdArgs;
@@ -7816,36 +8344,45 @@ void OffloadBundler::ConstructJobMultipleOutputs(
 
     auto &Dep = DepInfo[I];
     Triples += Action::GetOffloadKindName(Dep.DependentOffloadKind);
-    Triples += "-";
-    std::string NormalizedTriple =
-        Dep.DependentToolChain->getTriple().normalize();
-    Triples += NormalizedTriple;
-
-    if (!Dep.DependentBoundArch.empty()) {
-      // If OffloadArch is present it can only appear as the 6th hypen
-      // sepearated field of Bundle Entry ID. So, pad required number of
-      // hyphens in Triple.
-      for (int i = 4 - StringRef(NormalizedTriple).count("-"); i > 0; i--)
-        Triples += "-";
+    Triples += '-';
+    Triples += Dep.DependentToolChain->getTriple().normalize();
+    if ((Dep.DependentOffloadKind == Action::OFK_HIP ||
+         Dep.DependentOffloadKind == Action::OFK_Cuda) &&
+        !Dep.DependentBoundArch.empty()) {
+      Triples += '-';
       Triples += Dep.DependentBoundArch;
     }
+    // TODO: Replace parsing of -march flag. Can be done by storing GPUArch
+    //       with each toolchain.
+    StringRef GPUArchName;
+    if (Dep.DependentOffloadKind == Action::OFK_OpenMP) {
+      // Extract GPUArch from -march argument in TC argument list.
+      for (unsigned ArgIndex = 0; ArgIndex < TCArgs.size(); ArgIndex++) {
+        StringRef ArchStr = StringRef(TCArgs.getArgString(ArgIndex));
+        auto Arch = ArchStr.startswith_insensitive("-march=");
+        if (Arch) {
+          GPUArchName = ArchStr.substr(7);
+          Triples += "-";
+          break;
+        }
+      }
+      Triples += GPUArchName.str();
+    }
   }
 
   CmdArgs.push_back(TCArgs.MakeArgString(Triples));
 
   // Get bundled file command.
   CmdArgs.push_back(
-      TCArgs.MakeArgString(Twine("-inputs=") + Input.getFilename()));
+      TCArgs.MakeArgString(Twine("-input=") + Input.getFilename()));
 
   // Get unbundled files command.
-  SmallString<128> UB;
-  UB += "-outputs=";
   for (unsigned I = 0; I < Outputs.size(); ++I) {
-    if (I)
-      UB += ',';
+    SmallString<128> UB;
+    UB += "-output=";
     UB += DepInfo[I].DependentToolChain->getInputFilename(Outputs[I]);
+    CmdArgs.push_back(TCArgs.MakeArgString(UB));
   }
-  CmdArgs.push_back(TCArgs.MakeArgString(UB));
   CmdArgs.push_back("-unbundle");
   CmdArgs.push_back("-allow-missing-bundles");
 
@@ -7853,31 +8390,54 @@ void OffloadBundler::ConstructJobMultipleOutputs(
   C.addCommand(std::make_unique<Command>(
       JA, *this, ResponseFileSupport::None(),
       TCArgs.MakeArgString(getToolChain().GetProgramPath(getShortName())),
-      CmdArgs, None, Outputs));
+      CmdArgs, std::nullopt, Outputs));
 }
 
-void OffloadWrapper::ConstructJob(Compilation &C, const JobAction &JA,
-                                  const InputInfo &Output,
-                                  const InputInfoList &Inputs,
-                                  const ArgList &Args,
-                                  const char *LinkingOutput) const {
+void OffloadPackager::ConstructJob(Compilation &C, const JobAction &JA,
+                                   const InputInfo &Output,
+                                   const InputInfoList &Inputs,
+                                   const llvm::opt::ArgList &Args,
+                                   const char *LinkingOutput) const {
   ArgStringList CmdArgs;
 
-  const llvm::Triple &Triple = getToolChain().getEffectiveTriple();
-
-  // Add the "effective" target triple.
-  CmdArgs.push_back("-target");
-  CmdArgs.push_back(Args.MakeArgString(Triple.getTriple()));
-
   // Add the output file name.
   assert(Output.isFilename() && "Invalid output.");
   CmdArgs.push_back("-o");
   CmdArgs.push_back(Output.getFilename());
 
-  // Add inputs.
-  for (const InputInfo &I : Inputs) {
-    assert(I.isFilename() && "Invalid input.");
-    CmdArgs.push_back(I.getFilename());
+  // Create the inputs to bundle the needed metadata.
+  for (const InputInfo &Input : Inputs) {
+    const Action *OffloadAction = Input.getAction();
+    const ToolChain *TC = OffloadAction->getOffloadingToolChain();
+    const ArgList &TCArgs =
+        C.getArgsForToolChain(TC, OffloadAction->getOffloadingArch(),
+                              OffloadAction->getOffloadingDeviceKind());
+    StringRef File = C.getArgs().MakeArgString(TC->getInputFilename(Input));
+    StringRef Arch = (OffloadAction->getOffloadingArch())
+                         ? OffloadAction->getOffloadingArch()
+                         : TCArgs.getLastArgValue(options::OPT_march_EQ);
+    StringRef Kind =
+      Action::GetOffloadKindName(OffloadAction->getOffloadingDeviceKind());
+
+    ArgStringList Features;
+    SmallVector<StringRef> FeatureArgs;
+    getTargetFeatures(TC->getDriver(), TC->getTriple(), TCArgs, Features,
+                      false);
+    llvm::copy_if(Features, std::back_inserter(FeatureArgs),
+                  [](StringRef Arg) { return !Arg.startswith("-target"); });
+
+    SmallVector<std::string> Parts{
+        "file=" + File.str(),
+        "triple=" + TC->getTripleString(),
+        "arch=" + Arch.str(),
+        "kind=" + Kind.str(),
+    };
+
+    if (TC->getDriver().isUsingLTO(/* IsOffload */ true))
+      for (StringRef Feature : FeatureArgs)
+        Parts.emplace_back("feature=" + Feature.str());
+
+    CmdArgs.push_back(Args.MakeArgString("--image=" + llvm::join(Parts, ",")));
   }
 
   C.addCommand(std::make_unique<Command>(
@@ -7885,3 +8445,119 @@ void OffloadWrapper::ConstructJob(Compilation &C, const JobAction &JA,
       Args.MakeArgString(getToolChain().GetProgramPath(getShortName())),
       CmdArgs, Inputs, Output));
 }
+
+void LinkerWrapper::ConstructJob(Compilation &C, const JobAction &JA,
+                                 const InputInfo &Output,
+                                 const InputInfoList &Inputs,
+                                 const ArgList &Args,
+                                 const char *LinkingOutput) const {
+  const Driver &D = getToolChain().getDriver();
+  const llvm::Triple TheTriple = getToolChain().getTriple();
+  ArgStringList CmdArgs;
+
+  // Pass the CUDA path to the linker wrapper tool.
+  for (Action::OffloadKind Kind : {Action::OFK_Cuda, Action::OFK_OpenMP}) {
+    auto TCRange = C.getOffloadToolChains(Kind);
+    for (auto &I : llvm::make_range(TCRange.first, TCRange.second)) {
+      const ToolChain *TC = I.second;
+      if (TC->getTriple().isNVPTX()) {
+        CudaInstallationDetector CudaInstallation(D, TheTriple, Args);
+        if (CudaInstallation.isValid())
+          CmdArgs.push_back(Args.MakeArgString(
+              "--cuda-path=" + CudaInstallation.getInstallPath()));
+        break;
+      }
+    }
+  }
+
+  if (D.isUsingLTO(/* IsOffload */ true)) {
+    // Pass in the optimization level to use for LTO.
+    if (const Arg *A = Args.getLastArg(options::OPT_O_Group)) {
+      StringRef OOpt;
+      if (A->getOption().matches(options::OPT_O4) ||
+          A->getOption().matches(options::OPT_Ofast))
+        OOpt = "3";
+      else if (A->getOption().matches(options::OPT_O)) {
+        OOpt = A->getValue();
+        if (OOpt == "g")
+          OOpt = "1";
+        else if (OOpt == "s" || OOpt == "z")
+          OOpt = "2";
+      } else if (A->getOption().matches(options::OPT_O0))
+        OOpt = "0";
+      if (!OOpt.empty())
+        CmdArgs.push_back(Args.MakeArgString(Twine("--opt-level=O") + OOpt));
+    }
+  }
+
+  CmdArgs.push_back(
+      Args.MakeArgString("--host-triple=" + TheTriple.getTriple()));
+  if (Args.hasArg(options::OPT_v))
+    CmdArgs.push_back("--wrapper-verbose");
+
+  if (const Arg *A = Args.getLastArg(options::OPT_g_Group)) {
+    if (!A->getOption().matches(options::OPT_g0))
+      CmdArgs.push_back("--device-debug");
+  }
+
+  for (const auto &A : Args.getAllArgValues(options::OPT_Xcuda_ptxas))
+    CmdArgs.push_back(Args.MakeArgString("--ptxas-arg=" + A));
+
+  // Forward remarks passes to the LLVM backend in the wrapper.
+  if (const Arg *A = Args.getLastArg(options::OPT_Rpass_EQ))
+    CmdArgs.push_back(Args.MakeArgString(Twine("--offload-opt=-pass-remarks=") +
+                                         A->getValue()));
+  if (const Arg *A = Args.getLastArg(options::OPT_Rpass_missed_EQ))
+    CmdArgs.push_back(Args.MakeArgString(
+        Twine("--offload-opt=-pass-remarks-missed=") + A->getValue()));
+  if (const Arg *A = Args.getLastArg(options::OPT_Rpass_analysis_EQ))
+    CmdArgs.push_back(Args.MakeArgString(
+        Twine("--offload-opt=-pass-remarks-analysis=") + A->getValue()));
+  if (Args.getLastArg(options::OPT_save_temps_EQ))
+    CmdArgs.push_back("--save-temps");
+
+  // Construct the link job so we can wrap around it.
+  Linker->ConstructJob(C, JA, Output, Inputs, Args, LinkingOutput);
+  const auto &LinkCommand = C.getJobs().getJobs().back();
+
+  // Forward -Xoffload-linker<-triple> arguments to the device link job.
+  for (Arg *A : Args.filtered(options::OPT_Xoffload_linker)) {
+    StringRef Val = A->getValue(0);
+    if (Val.empty())
+      CmdArgs.push_back(
+          Args.MakeArgString(Twine("--device-linker=") + A->getValue(1)));
+    else
+      CmdArgs.push_back(Args.MakeArgString(
+          "--device-linker=" +
+          ToolChain::getOpenMPTriple(Val.drop_front()).getTriple() + "=" +
+          A->getValue(1)));
+  }
+  Args.ClaimAllArgs(options::OPT_Xoffload_linker);
+
+  // Embed bitcode instead of an object in JIT mode.
+  if (Args.hasFlag(options::OPT_fopenmp_target_jit,
+                   options::OPT_fno_openmp_target_jit, false))
+    CmdArgs.push_back("--embed-bitcode");
+
+  // Forward `-mllvm` arguments to the LLVM invocations if present.
+  for (Arg *A : Args.filtered(options::OPT_mllvm)) {
+    CmdArgs.push_back("-mllvm");
+    CmdArgs.push_back(A->getValue());
+    A->claim();
+  }
+
+  // Add the linker arguments to be forwarded by the wrapper.
+  CmdArgs.push_back(Args.MakeArgString(Twine("--linker-path=") +
+                                       LinkCommand->getExecutable()));
+  CmdArgs.push_back("--");
+  for (const char *LinkArg : LinkCommand->getArguments())
+    CmdArgs.push_back(LinkArg);
+
+  const char *Exec =
+      Args.MakeArgString(getToolChain().GetProgramPath("clang-linker-wrapper"));
+
+  // Replace the executable and arguments of the link job with the
+  // wrapper.
+  LinkCommand->replaceExecutable(Exec);
+  LinkCommand->replaceArguments(CmdArgs);
+}
diff --git a/gnu/llvm/clang/lib/Driver/ToolChains/Gnu.cpp b/gnu/llvm/clang/lib/Driver/ToolChains/Gnu.cpp
index ab041a2b690..4f234031665 100644
--- a/gnu/llvm/clang/lib/Driver/ToolChains/Gnu.cpp
+++ b/gnu/llvm/clang/lib/Driver/ToolChains/Gnu.cpp
@@ -8,6 +8,7 @@
 
 #include "Gnu.h"
 #include "Arch/ARM.h"
+#include "Arch/CSKY.h"
 #include "Arch/Mips.h"
 #include "Arch/PPC.h"
 #include "Arch/RISCV.h"
@@ -22,6 +23,8 @@
 #include "clang/Driver/Options.h"
 #include "clang/Driver/Tool.h"
 #include "clang/Driver/ToolChain.h"
+#include "llvm/ADT/StringSet.h"
+#include "llvm/ADT/Twine.h"
 #include "llvm/Option/ArgList.h"
 #include "llvm/Support/CodeGen.h"
 #include "llvm/Support/Path.h"
@@ -82,7 +85,7 @@ void tools::gcc::Common::ConstructJob(Compilation &C, const JobAction &JA,
 
   RenderExtraToolArgs(JA, CmdArgs);
 
-  // If using a driver driver, force the arch.
+  // If using a driver, force the arch.
   if (getToolChain().getTriple().isOSDarwin()) {
     CmdArgs.push_back("-arch");
     CmdArgs.push_back(
@@ -226,7 +229,7 @@ static bool isArmBigEndian(const llvm::Triple &Triple,
   case llvm::Triple::armeb:
   case llvm::Triple::thumbeb:
     IsBigEndian = true;
-    LLVM_FALLTHROUGH;
+    [[fallthrough]];
   case llvm::Triple::arm:
   case llvm::Triple::thumb:
     if (Arg *A = Args.getLastArg(options::OPT_mlittle_endian,
@@ -277,6 +280,10 @@ static const char *getLDMOption(const llvm::Triple &T, const ArgList &Args) {
     return "elf32_sparc";
   case llvm::Triple::sparcv9:
     return "elf64_sparc";
+  case llvm::Triple::loongarch32:
+    return "elf32loongarch";
+  case llvm::Triple::loongarch64:
+    return "elf64loongarch";
   case llvm::Triple::mips:
     return "elf32btsmip";
   case llvm::Triple::mipsel:
@@ -299,6 +306,8 @@ static const char *getLDMOption(const llvm::Triple &T, const ArgList &Args) {
     return "elf_x86_64";
   case llvm::Triple::ve:
     return "elf64ve";
+  case llvm::Triple::csky:
+    return "cskyelf_linux";
   default:
     return nullptr;
   }
@@ -312,7 +321,7 @@ static bool getPIE(const ArgList &Args, const ToolChain &TC) {
   Arg *A = Args.getLastArg(options::OPT_pie, options::OPT_no_pie,
                            options::OPT_nopie);
   if (!A)
-    return TC.isPIEDefault();
+    return TC.isPIEDefault(Args);
   return A->getOption().matches(options::OPT_pie);
 }
 
@@ -323,8 +332,8 @@ static bool getStaticPIE(const ArgList &Args, const ToolChain &TC) {
   if (HasStaticPIE && Args.hasArg(options::OPT_nopie)) {
     const Driver &D = TC.getDriver();
     const llvm::opt::OptTable &Opts = D.getOpts();
-    const char *StaticPIEName = Opts.getOptionName(options::OPT_static_pie);
-    const char *NoPIEName = Opts.getOptionName(options::OPT_nopie);
+    StringRef StaticPIEName = Opts.getOptionName(options::OPT_static_pie);
+    StringRef NoPIEName = Opts.getOptionName(options::OPT_nopie);
     D.Diag(diag::err_drv_cannot_mix_options) << StaticPIEName << NoPIEName;
   }
   return HasStaticPIE;
@@ -429,11 +438,6 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA,
     CmdArgs.push_back("text");
   }
 
-  if (ToolChain.isNoExecStackDefault()) {
-    CmdArgs.push_back("-z");
-    CmdArgs.push_back("noexecstack");
-  }
-
   if (Args.hasArg(options::OPT_rdynamic))
     CmdArgs.push_back("-export-dynamic");
 
@@ -451,16 +455,11 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA,
   // Most Android ARM64 targets should enable the linker fix for erratum
   // 843419. Only non-Cortex-A53 devices are allowed to skip this flag.
   if (Arch == llvm::Triple::aarch64 && isAndroid) {
-    std::string CPU = getCPUName(Args, Triple);
+    std::string CPU = getCPUName(D, Args, Triple);
     if (CPU.empty() || CPU == "generic" || CPU == "cortex-a53")
       CmdArgs.push_back("--fix-cortex-a53-843419");
   }
 
-  // Android does not allow shared text relocations. Emit a warning if the
-  // user's code contains any.
-  if (isAndroid)
-      CmdArgs.push_back("--warn-shared-textrel");
-
   ToolChain.addExtraOpts(CmdArgs);
 
   CmdArgs.push_back("--eh-frame-hdr");
@@ -472,22 +471,20 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA,
     D.Diag(diag::err_target_unknown_triple) << Triple.str();
     return;
   }
+  if (Triple.isRISCV())
+    CmdArgs.push_back("-X");
 
-  if (IsStatic) {
-    if (Arch == llvm::Triple::arm || Arch == llvm::Triple::armeb ||
-        Arch == llvm::Triple::thumb || Arch == llvm::Triple::thumbeb)
-      CmdArgs.push_back("-Bstatic");
-    else
-      CmdArgs.push_back("-static");
-  } else if (Args.hasArg(options::OPT_shared)) {
+  if (Args.hasArg(options::OPT_shared))
     CmdArgs.push_back("-shared");
-  }
 
-  if (!IsStatic) {
+  if (IsStatic) {
+    CmdArgs.push_back("-static");
+  } else {
     if (Args.hasArg(options::OPT_rdynamic))
       CmdArgs.push_back("-export-dynamic");
 
-    if (!Args.hasArg(options::OPT_shared) && !IsStaticPIE) {
+    if (!Args.hasArg(options::OPT_shared) && !IsStaticPIE &&
+        !Args.hasArg(options::OPT_r)) {
       CmdArgs.push_back("-dynamic-linker");
       CmdArgs.push_back(Args.MakeArgString(Twine(D.DyldPrefix) +
                                            ToolChain.getDynamicLinker(Args)));
@@ -497,7 +494,8 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA,
   CmdArgs.push_back("-o");
   CmdArgs.push_back(Output.getFilename());
 
-  if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nostartfiles)) {
+  if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nostartfiles,
+                   options::OPT_r)) {
     if (!isAndroid && !IsIAMCU) {
       const char *crt1 = nullptr;
       if (!Args.hasArg(options::OPT_shared)) {
@@ -534,10 +532,10 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA,
       }
       if (P.empty()) {
         const char *crtbegin;
-        if (IsStatic)
-          crtbegin = isAndroid ? "crtbegin_static.o" : "crtbeginT.o";
-        else if (Args.hasArg(options::OPT_shared))
+        if (Args.hasArg(options::OPT_shared))
           crtbegin = isAndroid ? "crtbegin_so.o" : "crtbeginS.o";
+        else if (IsStatic)
+          crtbegin = isAndroid ? "crtbegin_static.o" : "crtbeginT.o";
         else if (IsPIE || IsStaticPIE)
           crtbegin = isAndroid ? "crtbegin_dynamic.o" : "crtbeginS.o";
         else
@@ -569,11 +567,15 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA,
   bool NeedsXRayDeps = addXRayRuntime(ToolChain, Args, CmdArgs);
   addLinkerCompressDebugSectionsOption(ToolChain, Args, CmdArgs);
   AddLinkerInputs(ToolChain, Inputs, Args, CmdArgs, JA);
+
+  addHIPRuntimeLibArgs(ToolChain, Args, CmdArgs);
+
   // The profile runtime also needs access to system libraries.
   getToolChain().addProfileRTLibs(Args, CmdArgs);
 
   if (D.CCCIsCXX() &&
-      !Args.hasArg(options::OPT_nostdlib, options::OPT_nodefaultlibs)) {
+      !Args.hasArg(options::OPT_nostdlib, options::OPT_nodefaultlibs,
+                   options::OPT_r)) {
     if (ToolChain.ShouldLinkCXXStdlib(Args)) {
       bool OnlyLibstdcxxStatic = Args.hasArg(options::OPT_static_libstdcxx) &&
                                  !Args.hasArg(options::OPT_static);
@@ -585,10 +587,21 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA,
     }
     CmdArgs.push_back("-lm");
   }
+
   // Silence warnings when linking C code with a C++ '-stdlib' argument.
   Args.ClaimAllArgs(options::OPT_stdlib_EQ);
 
-  if (!Args.hasArg(options::OPT_nostdlib)) {
+  // Additional linker set-up and flags for Fortran. This is required in order
+  // to generate executables. As Fortran runtime depends on the C runtime,
+  // these dependencies need to be listed before the C runtime below (i.e.
+  // AddRuntTimeLibs).
+  if (D.IsFlangMode()) {
+    addFortranRuntimeLibraryPath(ToolChain, Args, CmdArgs);
+    addFortranRuntimeLibs(ToolChain, CmdArgs);
+    CmdArgs.push_back("-lm");
+  }
+
+  if (!Args.hasArg(options::OPT_nostdlib, options::OPT_r)) {
     if (!Args.hasArg(options::OPT_nodefaultlibs)) {
       if (IsStatic || IsStaticPIE)
         CmdArgs.push_back("--start-group");
@@ -617,6 +630,16 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA,
 
       AddRunTimeLibs(ToolChain, D, CmdArgs, Args);
 
+      // LLVM support for atomics on 32-bit SPARC V8+ is incomplete, so
+      // forcibly link with libatomic as a workaround.
+      // TODO: Issue #41880 and D118021.
+      if (getToolChain().getTriple().getArch() == llvm::Triple::sparc) {
+        CmdArgs.push_back("--push-state");
+        CmdArgs.push_back("--as-needed");
+        CmdArgs.push_back("-latomic");
+        CmdArgs.push_back("--pop-state");
+      }
+
       if (WantPthread && !isAndroid)
         CmdArgs.push_back("-lpthread");
 
@@ -702,20 +725,16 @@ void tools::gnutools::Assembler::ConstructJob(Compilation &C,
       CmdArgs.push_back("--compress-debug-sections");
     } else {
       StringRef Value = A->getValue();
-      if (Value == "none" || Value == "zlib" || Value == "zlib-gnu") {
+      if (Value == "none" || Value == "zlib" || Value == "zstd") {
         CmdArgs.push_back(
             Args.MakeArgString("--compress-debug-sections=" + Twine(Value)));
       } else {
         D.Diag(diag::err_drv_unsupported_option_argument)
-            << A->getOption().getName() << Value;
+            << A->getSpelling() << Value;
       }
     }
   }
 
-  if (getToolChain().isNoExecStackDefault()) {
-      CmdArgs.push_back("--noexecstack");
-  }
-
   switch (getToolChain().getArch()) {
   default:
     break;
@@ -734,32 +753,32 @@ void tools::gnutools::Assembler::ConstructJob(Compilation &C,
     CmdArgs.push_back("-a32");
     CmdArgs.push_back("-mppc");
     CmdArgs.push_back("-mbig-endian");
-    CmdArgs.push_back(
-      ppc::getPPCAsmModeForCPU(getCPUName(Args, getToolChain().getTriple())));
+    CmdArgs.push_back(ppc::getPPCAsmModeForCPU(
+        getCPUName(D, Args, getToolChain().getTriple())));
     break;
   }
   case llvm::Triple::ppcle: {
     CmdArgs.push_back("-a32");
     CmdArgs.push_back("-mppc");
     CmdArgs.push_back("-mlittle-endian");
-    CmdArgs.push_back(
-        ppc::getPPCAsmModeForCPU(getCPUName(Args, getToolChain().getTriple())));
+    CmdArgs.push_back(ppc::getPPCAsmModeForCPU(
+        getCPUName(D, Args, getToolChain().getTriple())));
     break;
   }
   case llvm::Triple::ppc64: {
     CmdArgs.push_back("-a64");
     CmdArgs.push_back("-mppc64");
     CmdArgs.push_back("-mbig-endian");
-    CmdArgs.push_back(
-      ppc::getPPCAsmModeForCPU(getCPUName(Args, getToolChain().getTriple())));
+    CmdArgs.push_back(ppc::getPPCAsmModeForCPU(
+        getCPUName(D, Args, getToolChain().getTriple())));
     break;
   }
   case llvm::Triple::ppc64le: {
     CmdArgs.push_back("-a64");
     CmdArgs.push_back("-mppc64");
     CmdArgs.push_back("-mlittle-endian");
-    CmdArgs.push_back(
-      ppc::getPPCAsmModeForCPU(getCPUName(Args, getToolChain().getTriple())));
+    CmdArgs.push_back(ppc::getPPCAsmModeForCPU(
+        getCPUName(D, Args, getToolChain().getTriple())));
     break;
   }
   case llvm::Triple::riscv32:
@@ -770,12 +789,14 @@ void tools::gnutools::Assembler::ConstructJob(Compilation &C,
     StringRef MArchName = riscv::getRISCVArch(Args, getToolChain().getTriple());
     CmdArgs.push_back("-march");
     CmdArgs.push_back(MArchName.data());
+    if (!Args.hasFlag(options::OPT_mrelax, options::OPT_mno_relax, true))
+      Args.addOptOutFlag(CmdArgs, options::OPT_mrelax, options::OPT_mno_relax);
     break;
   }
   case llvm::Triple::sparc:
   case llvm::Triple::sparcel: {
     CmdArgs.push_back("-32");
-    std::string CPU = getCPUName(Args, getToolChain().getTriple());
+    std::string CPU = getCPUName(D, Args, getToolChain().getTriple());
     CmdArgs.push_back(
         sparc::getSparcAsmModeForCPU(CPU, getToolChain().getTriple()));
     AddAssemblerKPIC(getToolChain(), Args, CmdArgs);
@@ -783,7 +804,7 @@ void tools::gnutools::Assembler::ConstructJob(Compilation &C,
   }
   case llvm::Triple::sparcv9: {
     CmdArgs.push_back("-64");
-    std::string CPU = getCPUName(Args, getToolChain().getTriple());
+    std::string CPU = getCPUName(D, Args, getToolChain().getTriple());
     CmdArgs.push_back(
         sparc::getSparcAsmModeForCPU(CPU, getToolChain().getTriple()));
     AddAssemblerKPIC(getToolChain(), Args, CmdArgs);
@@ -931,7 +952,7 @@ void tools::gnutools::Assembler::ConstructJob(Compilation &C,
   for (const Arg *A : Args.filtered(options::OPT_ffile_prefix_map_EQ,
                                     options::OPT_fdebug_prefix_map_EQ)) {
     StringRef Map = A->getValue();
-    if (Map.find('=') == StringRef::npos)
+    if (!Map.contains('='))
       D.Diag(diag::err_drv_invalid_argument_to_option)
           << Map << A->getOption().getName();
     else {
@@ -950,6 +971,17 @@ void tools::gnutools::Assembler::ConstructJob(Compilation &C,
   for (const auto &II : Inputs)
     CmdArgs.push_back(II.getFilename());
 
+  if (Arg *A = Args.getLastArg(options::OPT_g_Flag, options::OPT_gN_Group,
+                               options::OPT_gdwarf_2, options::OPT_gdwarf_3,
+                               options::OPT_gdwarf_4, options::OPT_gdwarf_5,
+                               options::OPT_gdwarf))
+    if (!A->getOption().matches(options::OPT_g0)) {
+      Args.AddLastArg(CmdArgs, options::OPT_g_Flag);
+
+      unsigned DwarfVersion = getDwarfVersion(getToolChain(), Args);
+      CmdArgs.push_back(Args.MakeArgString("-gdwarf-" + Twine(DwarfVersion)));
+    }
+
   const char *Exec =
       Args.MakeArgString(getToolChain().GetProgramPath(DefaultAssembler));
   C.addCommand(std::make_unique<Command>(JA, *this,
@@ -1086,7 +1118,8 @@ static bool findMipsCsMultilibs(const Multilib::flags_list &Flags,
                        .flag("-m32")
                        .flag("-mabi=n32");
 
-    Multilib M32 = Multilib().flag("-m64").flag("+m32").flag("-mabi=n32");
+    Multilib M32 =
+        Multilib().gccSuffix("/32").flag("-m64").flag("+m32").flag("-mabi=n32");
 
     DebianMipsMultilibs =
         MultilibSet().Either(M32, M64, MAbiN32).FilterOut(NonExistent);
@@ -1342,7 +1375,7 @@ static bool findMipsMtiMultilibs(const Multilib::flags_list &Flags,
                   {"/../../../../mips-mti-linux-gnu/lib" + M.gccSuffix()});
             });
   }
-  for (auto Candidate : {&MtiMipsMultilibsV1, &MtiMipsMultilibsV2}) {
+  for (auto *Candidate : {&MtiMipsMultilibsV1, &MtiMipsMultilibsV2}) {
     if (Candidate->select(Flags, Result.SelectedMultilib)) {
       Result.Multilibs = *Candidate;
       return true;
@@ -1435,7 +1468,7 @@ static bool findMipsImgMultilibs(const Multilib::flags_list &Flags,
                   {"/../../../../mips-img-linux-gnu/lib" + M.gccSuffix()});
             });
   }
-  for (auto Candidate : {&ImgMultilibsV1, &ImgMultilibsV2}) {
+  for (auto *Candidate : {&ImgMultilibsV1, &ImgMultilibsV2}) {
     if (Candidate->select(Flags, Result.SelectedMultilib)) {
       Result.Multilibs = *Candidate;
       return true;
@@ -1473,7 +1506,7 @@ bool clang::driver::findMIPSMultilibs(const Driver &D,
   addMultilibFlag(CPUName == "mips64r6", "march=mips64r6", Flags);
   addMultilibFlag(isMicroMips(Args), "mmicromips", Flags);
   addMultilibFlag(tools::mips::isUCLibc(Args), "muclibc", Flags);
-  addMultilibFlag(tools::mips::isNaN2008(Args, TargetTriple), "mnan=2008",
+  addMultilibFlag(tools::mips::isNaN2008(D, Args, TargetTriple), "mnan=2008",
                   Flags);
   addMultilibFlag(ABIName == "n32", "mabi=n32", Flags);
   addMultilibFlag(ABIName == "n64", "mabi=n64", Flags);
@@ -1585,6 +1618,69 @@ static bool findMSP430Multilibs(const Driver &D,
   return false;
 }
 
+static void findCSKYMultilibs(const Driver &D, const llvm::Triple &TargetTriple,
+                              StringRef Path, const ArgList &Args,
+                              DetectedMultilibs &Result) {
+  FilterNonExistent NonExistent(Path, "/crtbegin.o", D.getVFS());
+
+  tools::csky::FloatABI TheFloatABI = tools::csky::getCSKYFloatABI(D, Args);
+  std::optional<llvm::StringRef> Res =
+      tools::csky::getCSKYArchName(D, Args, TargetTriple);
+
+  if (!Res)
+    return;
+  auto ARCHName = *Res;
+
+  Multilib::flags_list Flags;
+  addMultilibFlag(TheFloatABI == tools::csky::FloatABI::Hard, "hard-fp", Flags);
+  addMultilibFlag(TheFloatABI == tools::csky::FloatABI::SoftFP, "soft-fp",
+                  Flags);
+  addMultilibFlag(TheFloatABI == tools::csky::FloatABI::Soft, "soft", Flags);
+  addMultilibFlag(ARCHName == "ck801", "march=ck801", Flags);
+  addMultilibFlag(ARCHName == "ck802", "march=ck802", Flags);
+  addMultilibFlag(ARCHName == "ck803", "march=ck803", Flags);
+  addMultilibFlag(ARCHName == "ck804", "march=ck804", Flags);
+  addMultilibFlag(ARCHName == "ck805", "march=ck805", Flags);
+  addMultilibFlag(ARCHName == "ck807", "march=ck807", Flags);
+  addMultilibFlag(ARCHName == "ck810", "march=ck810", Flags);
+  addMultilibFlag(ARCHName == "ck810v", "march=ck810v", Flags);
+  addMultilibFlag(ARCHName == "ck860", "march=ck860", Flags);
+  addMultilibFlag(ARCHName == "ck860v", "march=ck860v", Flags);
+
+  bool isBigEndian = false;
+  if (Arg *A = Args.getLastArg(options::OPT_mlittle_endian,
+                               options::OPT_mbig_endian))
+    isBigEndian = !A->getOption().matches(options::OPT_mlittle_endian);
+  addMultilibFlag(isBigEndian, "EB", Flags);
+
+  auto HardFloat = makeMultilib("/hard-fp").flag("+hard-fp");
+  auto SoftFpFloat = makeMultilib("/soft-fp").flag("+soft-fp");
+  auto SoftFloat = makeMultilib("").flag("+soft");
+  auto Arch801 = makeMultilib("/ck801").flag("+march=ck801");
+  auto Arch802 = makeMultilib("/ck802").flag("+march=ck802");
+  auto Arch803 = makeMultilib("/ck803").flag("+march=ck803");
+  // CK804 use the same library as CK803
+  auto Arch804 = makeMultilib("/ck803").flag("+march=ck804");
+  auto Arch805 = makeMultilib("/ck805").flag("+march=ck805");
+  auto Arch807 = makeMultilib("/ck807").flag("+march=ck807");
+  auto Arch810 = makeMultilib("").flag("+march=ck810");
+  auto Arch810v = makeMultilib("/ck810v").flag("+march=ck810v");
+  auto Arch860 = makeMultilib("/ck860").flag("+march=ck860");
+  auto Arch860v = makeMultilib("/ck860v").flag("+march=ck860v");
+  auto BigEndian = makeMultilib("/big").flag("+EB");
+
+  MultilibSet CSKYMultilibs =
+      MultilibSet()
+          .Maybe(BigEndian)
+          .Either({Arch801, Arch802, Arch803, Arch804, Arch805, Arch807,
+                   Arch810, Arch810v, Arch860, Arch860v})
+          .Either(HardFloat, SoftFpFloat, SoftFloat)
+          .FilterOut(NonExistent);
+
+  if (CSKYMultilibs.select(Flags, Result.SelectedMultilib))
+    Result.Multilibs = CSKYMultilibs;
+}
+
 static void findRISCVBareMetalMultilibs(const Driver &D,
                                         const llvm::Triple &TargetTriple,
                                         StringRef Path, const ArgList &Args,
@@ -1790,8 +1886,15 @@ bool Generic_GCC::GCCVersion::isOlderThan(int RHSMajor, int RHSMinor,
                                           StringRef RHSPatchSuffix) const {
   if (Major != RHSMajor)
     return Major < RHSMajor;
-  if (Minor != RHSMinor)
+  if (Minor != RHSMinor) {
+    // Note that versions without a specified minor sort higher than those with
+    // a minor.
+    if (RHSMinor == -1)
+      return true;
+    if (Minor == -1)
+      return false;
     return Minor < RHSMinor;
+  }
   if (Patch != RHSPatch) {
     // Note that versions without a specified patch sort higher than those with
     // a patch.
@@ -1908,6 +2011,28 @@ void Generic_GCC::GCCInstallationDetector::init(
                            CandidateTripleAliases, CandidateBiarchLibDirs,
                            CandidateBiarchTripleAliases);
 
+  // If --gcc-install-dir= is specified, skip filesystem detection.
+  if (const Arg *A =
+          Args.getLastArg(clang::driver::options::OPT_gcc_install_dir_EQ);
+      A && A->getValue()[0]) {
+    StringRef InstallDir = A->getValue();
+    if (!ScanGCCForMultilibs(TargetTriple, Args, InstallDir, false)) {
+      D.Diag(diag::err_drv_invalid_gcc_install_dir) << InstallDir;
+    } else {
+      (void)InstallDir.consume_back("/");
+      StringRef VersionText = llvm::sys::path::filename(InstallDir);
+      StringRef TripleText =
+          llvm::sys::path::filename(llvm::sys::path::parent_path(InstallDir));
+
+      Version = GCCVersion::Parse(VersionText);
+      GCCTriple.setTriple(TripleText);
+      GCCInstallPath = std::string(InstallDir);
+      GCCParentLibPath = GCCInstallPath + "/../../..";
+      IsValid = true;
+    }
+    return;
+  }
+
   // Compute the set of prefixes for our search.
   SmallVector<std::string, 8> Prefixes;
   StringRef GCCToolchainDir = getGCCToolchainDir(Args, D.SysRoot);
@@ -1962,7 +2087,7 @@ void Generic_GCC::GCCInstallationDetector::init(
     if (!VFS.exists(Prefix))
       continue;
     for (StringRef Suffix : CandidateLibDirs) {
-      const std::string LibDir = Prefix + Suffix.str();
+      const std::string LibDir = concat(Prefix, Suffix);
       if (!VFS.exists(LibDir))
         continue;
       // Maybe filter out <libdir>/gcc and <libdir>/gcc-cross.
@@ -2011,8 +2136,8 @@ void Generic_GCC::GCCInstallationDetector::print(raw_ostream &OS) const {
 }
 
 bool Generic_GCC::GCCInstallationDetector::getBiarchSibling(Multilib &M) const {
-  if (BiarchSibling.hasValue()) {
-    M = BiarchSibling.getValue();
+  if (BiarchSibling) {
+    M = *BiarchSibling;
     return true;
   }
   return false;
@@ -2028,7 +2153,7 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes(
     // so we need to find those /usr/gcc/*/lib/gcc libdirs and go with
     // /usr/gcc/<version> as a prefix.
 
-    std::string PrefixDir = SysRoot.str() + "/usr/gcc";
+    std::string PrefixDir = concat(SysRoot, "/usr/gcc");
     std::error_code EC;
     for (llvm::vfs::directory_iterator LI = D.getVFS().dir_begin(PrefixDir, EC),
                                        LE;
@@ -2050,9 +2175,17 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes(
     return;
   }
 
-  // Non-Solaris is much simpler - most systems just go with "/usr".
-  if (SysRoot.empty() && TargetTriple.getOS() == llvm::Triple::Linux) {
-    // Yet, still look for RHEL devtoolsets.
+  // For Linux, if --sysroot is not specified, look for RHEL/CentOS devtoolsets
+  // and gcc-toolsets.
+  if (SysRoot.empty() && TargetTriple.getOS() == llvm::Triple::Linux &&
+      D.getVFS().exists("/opt/rh")) {
+    // TODO: We may want to remove this, since the functionality
+    //   can be achieved using config files.
+    Prefixes.push_back("/opt/rh/gcc-toolset-12/root/usr");
+    Prefixes.push_back("/opt/rh/gcc-toolset-11/root/usr");
+    Prefixes.push_back("/opt/rh/gcc-toolset-10/root/usr");
+    Prefixes.push_back("/opt/rh/devtoolset-12/root/usr");
+    Prefixes.push_back("/opt/rh/devtoolset-11/root/usr");
     Prefixes.push_back("/opt/rh/devtoolset-10/root/usr");
     Prefixes.push_back("/opt/rh/devtoolset-9/root/usr");
     Prefixes.push_back("/opt/rh/devtoolset-8/root/usr");
@@ -2062,7 +2195,9 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes(
     Prefixes.push_back("/opt/rh/devtoolset-3/root/usr");
     Prefixes.push_back("/opt/rh/devtoolset-2/root/usr");
   }
-  Prefixes.push_back(SysRoot.str() + "/usr");
+
+  // Fall back to /usr which is used by most non-Solaris systems.
+  Prefixes.push_back(concat(SysRoot, "/usr"));
 }
 
 /*static*/ void Generic_GCC::GCCInstallationDetector::CollectLibDirsAndTriples(
@@ -2074,30 +2209,38 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes(
   // Declare a bunch of static data sets that we'll select between below. These
   // are specifically designed to always refer to string literals to avoid any
   // lifetime or initialization issues.
+  //
+  // The *Triples variables hard code some triples so that, for example,
+  // --target=aarch64 (incomplete triple) can detect lib/aarch64-linux-gnu.
+  // They are not needed when the user has correct LLVM_DEFAULT_TARGET_TRIPLE
+  // and always uses the full --target (e.g. --target=aarch64-linux-gnu).  The
+  // lists should shrink over time. Please don't add more elements to *Triples.
   static const char *const AArch64LibDirs[] = {"/lib64", "/lib"};
   static const char *const AArch64Triples[] = {
       "aarch64-none-linux-gnu", "aarch64-linux-gnu", "aarch64-redhat-linux",
-      "aarch64-suse-linux", "aarch64-linux-android"};
+      "aarch64-suse-linux"};
   static const char *const AArch64beLibDirs[] = {"/lib"};
   static const char *const AArch64beTriples[] = {"aarch64_be-none-linux-gnu",
                                                  "aarch64_be-linux-gnu"};
 
   static const char *const ARMLibDirs[] = {"/lib"};
-  static const char *const ARMTriples[] = {"arm-linux-gnueabi",
-                                           "arm-linux-androideabi"};
+  static const char *const ARMTriples[] = {"arm-linux-gnueabi"};
   static const char *const ARMHFTriples[] = {"arm-linux-gnueabihf",
                                              "armv7hl-redhat-linux-gnueabi",
                                              "armv6hl-suse-linux-gnueabi",
                                              "armv7hl-suse-linux-gnueabi"};
   static const char *const ARMebLibDirs[] = {"/lib"};
-  static const char *const ARMebTriples[] = {"armeb-linux-gnueabi",
-                                             "armeb-linux-androideabi"};
+  static const char *const ARMebTriples[] = {"armeb-linux-gnueabi"};
   static const char *const ARMebHFTriples[] = {
       "armeb-linux-gnueabihf", "armebv7hl-redhat-linux-gnueabi"};
 
   static const char *const AVRLibDirs[] = {"/lib"};
   static const char *const AVRTriples[] = {"avr"};
 
+  static const char *const CSKYLibDirs[] = {"/lib"};
+  static const char *const CSKYTriples[] = {
+      "csky-linux-gnuabiv2", "csky-linux-uclibcabiv2", "csky-elf-noneabiv2"};
+
   static const char *const X86_64LibDirs[] = {"/lib64", "/lib"};
   static const char *const X86_64Triples[] = {
       "x86_64-linux-gnu",       "x86_64-unknown-linux-gnu",
@@ -2105,31 +2248,32 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes(
       "x86_64-redhat-linux",    "x86_64-suse-linux",
       "x86_64-manbo-linux-gnu", "x86_64-linux-gnu",
       "x86_64-slackware-linux", "x86_64-unknown-linux",
-      "x86_64-amazon-linux",    "x86_64-linux-android"};
+      "x86_64-amazon-linux"};
   static const char *const X32Triples[] = {"x86_64-linux-gnux32",
                                            "x86_64-pc-linux-gnux32"};
   static const char *const X32LibDirs[] = {"/libx32", "/lib"};
   static const char *const X86LibDirs[] = {"/lib32", "/lib"};
   static const char *const X86Triples[] = {
-      "i586-linux-gnu",     "i686-linux-gnu",
-      "i686-pc-linux-gnu",  "i386-redhat-linux6E",
-      "i686-redhat-linux",  "i386-redhat-linux",
-      "i586-suse-linux",    "i686-montavista-linux",
-      "i686-linux-android", "i686-gnu",
+      "i586-linux-gnu",      "i686-linux-gnu",        "i686-pc-linux-gnu",
+      "i386-redhat-linux6E", "i686-redhat-linux",     "i386-redhat-linux",
+      "i586-suse-linux",     "i686-montavista-linux", "i686-gnu",
   };
 
+  static const char *const LoongArch64LibDirs[] = {"/lib64", "/lib"};
+  static const char *const LoongArch64Triples[] = {
+      "loongarch64-linux-gnu", "loongarch64-unknown-linux-gnu"};
+
   static const char *const M68kLibDirs[] = {"/lib"};
   static const char *const M68kTriples[] = {
       "m68k-linux-gnu", "m68k-unknown-linux-gnu", "m68k-suse-linux"};
 
-  static const char *const MIPSLibDirs[] = {"/lib"};
+  static const char *const MIPSLibDirs[] = {"/libo32", "/lib"};
   static const char *const MIPSTriples[] = {
       "mips-linux-gnu", "mips-mti-linux", "mips-mti-linux-gnu",
       "mips-img-linux-gnu", "mipsisa32r6-linux-gnu"};
-  static const char *const MIPSELLibDirs[] = {"/lib"};
+  static const char *const MIPSELLibDirs[] = {"/libo32", "/lib"};
   static const char *const MIPSELTriples[] = {
-      "mipsel-linux-gnu", "mips-img-linux-gnu", "mipsisa32r6el-linux-gnu",
-      "mipsel-linux-android"};
+      "mipsel-linux-gnu", "mips-img-linux-gnu", "mipsisa32r6el-linux-gnu"};
 
   static const char *const MIPS64LibDirs[] = {"/lib64", "/lib"};
   static const char *const MIPS64Triples[] = {
@@ -2140,8 +2284,7 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes(
   static const char *const MIPS64ELTriples[] = {
       "mips64el-linux-gnu",      "mips-mti-linux-gnu",
       "mips-img-linux-gnu",      "mips64el-linux-gnuabi64",
-      "mipsisa64r6el-linux-gnu", "mipsisa64r6el-linux-gnuabi64",
-      "mips64el-linux-android"};
+      "mipsisa64r6el-linux-gnu", "mipsisa64r6el-linux-gnuabi64"};
 
   static const char *const MIPSN32LibDirs[] = {"/lib32"};
   static const char *const MIPSN32Triples[] = {"mips64-linux-gnuabin32",
@@ -2181,9 +2324,7 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes(
   static const char *const RISCV64LibDirs[] = {"/lib64", "/lib"};
   static const char *const RISCV64Triples[] = {"riscv64-unknown-linux-gnu",
                                                "riscv64-linux-gnu",
-                                               "riscv64-unknown-elf",
-                                               "riscv64-redhat-linux",
-                                               "riscv64-suse-linux"};
+                                               "riscv64-unknown-elf"};
 
   static const char *const SPARCv8LibDirs[] = {"/lib32", "/lib"};
   static const char *const SPARCv8Triples[] = {"sparc-linux-gnu",
@@ -2338,6 +2479,10 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes(
     LibDirs.append(begin(AVRLibDirs), end(AVRLibDirs));
     TripleAliases.append(begin(AVRTriples), end(AVRTriples));
     break;
+  case llvm::Triple::csky:
+    LibDirs.append(begin(CSKYLibDirs), end(CSKYLibDirs));
+    TripleAliases.append(begin(CSKYTriples), end(CSKYTriples));
+    break;
   case llvm::Triple::x86_64:
     if (TargetTriple.isX32()) {
       LibDirs.append(begin(X32LibDirs), end(X32LibDirs));
@@ -2365,6 +2510,11 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes(
       BiarchTripleAliases.append(begin(X32Triples), end(X32Triples));
     }
     break;
+  // TODO: Handle loongarch32.
+  case llvm::Triple::loongarch64:
+    LibDirs.append(begin(LoongArch64LibDirs), end(LoongArch64LibDirs));
+    TripleAliases.append(begin(LoongArch64Triples), end(LoongArch64Triples));
+    break;
   case llvm::Triple::m68k:
     LibDirs.append(begin(M68kLibDirs), end(M68kLibDirs));
     TripleAliases.append(begin(M68kTriples), end(M68kTriples));
@@ -2487,6 +2637,8 @@ bool Generic_GCC::GCCInstallationDetector::ScanGCCForMultilibs(
   if (isArmOrThumbArch(TargetArch) && TargetTriple.isAndroid()) {
     // It should also work without multilibs in a simplified toolchain.
     findAndroidArmMultilibs(D, TargetTriple, Path, Args, Detected);
+  } else if (TargetTriple.isCSKY()) {
+    findCSKYMultilibs(D, TargetTriple, Path, Args, Detected);
   } else if (TargetTriple.isMIPS()) {
     if (!findMIPSMultilibs(D, TargetTriple, Path, Args, Detected))
       return false;
@@ -2577,7 +2729,7 @@ bool Generic_GCC::GCCInstallationDetector::ScanGentooConfigs(
     const llvm::Triple &TargetTriple, const ArgList &Args,
     const SmallVectorImpl<StringRef> &CandidateTriples,
     const SmallVectorImpl<StringRef> &CandidateBiarchTriples) {
-  if (!D.getVFS().exists(D.SysRoot + GentooConfigDir))
+  if (!D.getVFS().exists(concat(D.SysRoot, GentooConfigDir)))
     return false;
 
   for (StringRef CandidateTriple : CandidateTriples) {
@@ -2596,8 +2748,8 @@ bool Generic_GCC::GCCInstallationDetector::ScanGentooGccConfig(
     const llvm::Triple &TargetTriple, const ArgList &Args,
     StringRef CandidateTriple, bool NeedsBiarchSuffix) {
   llvm::ErrorOr<std::unique_ptr<llvm::MemoryBuffer>> File =
-      D.getVFS().getBufferForFile(D.SysRoot + GentooConfigDir + "/config-" +
-                                  CandidateTriple.str());
+      D.getVFS().getBufferForFile(concat(D.SysRoot, GentooConfigDir,
+                                         "/config-" + CandidateTriple.str()));
   if (File) {
     SmallVector<StringRef, 2> Lines;
     File.get()->getBuffer().split(Lines, "\n");
@@ -2608,8 +2760,8 @@ bool Generic_GCC::GCCInstallationDetector::ScanGentooGccConfig(
         continue;
       // Process the config file pointed to by CURRENT.
       llvm::ErrorOr<std::unique_ptr<llvm::MemoryBuffer>> ConfigFile =
-          D.getVFS().getBufferForFile(D.SysRoot + GentooConfigDir + "/" +
-                                      Line.str());
+          D.getVFS().getBufferForFile(
+              concat(D.SysRoot, GentooConfigDir, "/" + Line));
       std::pair<StringRef, StringRef> ActiveVersion = Line.rsplit('-');
       // List of paths to scan for libraries.
       SmallVector<StringRef, 4> GentooScanPaths;
@@ -2642,7 +2794,7 @@ bool Generic_GCC::GCCInstallationDetector::ScanGentooGccConfig(
 
       // Scan all paths for GCC libraries.
       for (const auto &GentooScanPath : GentooScanPaths) {
-        std::string GentooPath = D.SysRoot + std::string(GentooScanPath);
+        std::string GentooPath = concat(D.SysRoot, GentooScanPath);
         if (D.getVFS().exists(GentooPath + "/crtbegin.o")) {
           if (!ScanGCCForMultilibs(TargetTriple, Args, GentooPath,
                                    NeedsBiarchSuffix))
@@ -2701,17 +2853,19 @@ void Generic_GCC::printVerboseInfo(raw_ostream &OS) const {
   RocmInstallation.print(OS);
 }
 
-bool Generic_GCC::IsUnwindTablesDefault(const ArgList &Args) const {
+ToolChain::UnwindTableLevel
+Generic_GCC::getDefaultUnwindTableLevel(const ArgList &Args) const {
   switch (getArch()) {
   case llvm::Triple::aarch64:
   case llvm::Triple::ppc:
   case llvm::Triple::ppcle:
   case llvm::Triple::ppc64:
   case llvm::Triple::ppc64le:
+  case llvm::Triple::x86:
   case llvm::Triple::x86_64:
-    return true;
+    return UnwindTableLevel::Asynchronous;
   default:
-    return false;
+    return UnwindTableLevel::None;
   }
 }
 
@@ -2727,7 +2881,9 @@ bool Generic_GCC::isPICDefault() const {
   }
 }
 
-bool Generic_GCC::isPIEDefault() const { return false; }
+bool Generic_GCC::isPIEDefault(const llvm::opt::ArgList &Args) const {
+  return false;
+}
 
 bool Generic_GCC::isPICDefaultForced() const {
   return getArch() == llvm::Triple::x86_64 && getTriple().isOSWindows();
@@ -2735,38 +2891,42 @@ bool Generic_GCC::isPICDefaultForced() const {
 
 bool Generic_GCC::IsIntegratedAssemblerDefault() const {
   switch (getTriple().getArch()) {
-  case llvm::Triple::x86:
-  case llvm::Triple::x86_64:
   case llvm::Triple::aarch64:
   case llvm::Triple::aarch64_be:
+  case llvm::Triple::amdgcn:
   case llvm::Triple::arm:
   case llvm::Triple::armeb:
   case llvm::Triple::avr:
   case llvm::Triple::bpfel:
   case llvm::Triple::bpfeb:
-  case llvm::Triple::thumb:
-  case llvm::Triple::thumbeb:
+  case llvm::Triple::csky:
+  case llvm::Triple::hexagon:
+  case llvm::Triple::lanai:
+  case llvm::Triple::loongarch32:
+  case llvm::Triple::loongarch64:
+  case llvm::Triple::m68k:
+  case llvm::Triple::mips:
+  case llvm::Triple::mipsel:
+  case llvm::Triple::mips64:
+  case llvm::Triple::mips64el:
+  case llvm::Triple::msp430:
   case llvm::Triple::ppc:
   case llvm::Triple::ppcle:
   case llvm::Triple::ppc64:
   case llvm::Triple::ppc64le:
+  case llvm::Triple::r600:
   case llvm::Triple::riscv32:
   case llvm::Triple::riscv64:
-  case llvm::Triple::systemz:
-  case llvm::Triple::mips:
-  case llvm::Triple::mipsel:
-  case llvm::Triple::mips64:
-  case llvm::Triple::mips64el:
-  case llvm::Triple::msp430:
-  case llvm::Triple::m68k:
-    return true;
   case llvm::Triple::sparc:
   case llvm::Triple::sparcel:
   case llvm::Triple::sparcv9:
-    if (getTriple().isOSFreeBSD() ||
-        getTriple().isOSSolaris())
-      return true;
-    return false;
+  case llvm::Triple::systemz:
+  case llvm::Triple::thumb:
+  case llvm::Triple::thumbeb:
+  case llvm::Triple::ve:
+  case llvm::Triple::x86:
+  case llvm::Triple::x86_64:
+    return true;
   default:
     return false;
   }
@@ -2809,6 +2969,11 @@ void Generic_GCC::AddMultilibPaths(const Driver &D,
         D, GCCInstallation.getInstallPath() + SelectedMultilib.gccSuffix(),
         Paths);
 
+    // Add lib/gcc/$triple/$libdir
+    // For GCC built with --enable-version-specific-runtime-libs.
+    addPathIfExists(D, GCCInstallation.getInstallPath() + "/../" + OSLibDir,
+                    Paths);
+
     // GCC cross compiling toolchains will install target libraries which ship
     // as part of the toolchain under <prefix>/<triple>/<libdir> rather than as
     // any part of the GCC installation in
@@ -2927,9 +3092,9 @@ Generic_GCC::addLibCxxIncludePaths(const llvm::opt::ArgList &DriverArgs,
   // If this is a development, non-installed, clang, libcxx will
   // not be found at ../include/c++ but it likely to be found at
   // one of the following two locations:
-  if (AddIncludePath(SysRoot + "/usr/local/include"))
+  if (AddIncludePath(concat(SysRoot, "/usr/local/include")))
     return;
-  if (AddIncludePath(SysRoot + "/usr/include"))
+  if (AddIncludePath(concat(SysRoot, "/usr/include")))
     return;
 }
 
@@ -2987,6 +3152,15 @@ bool Generic_GCC::addGCCLibStdCxxIncludePaths(
           TripleStr, Multilib.includeSuffix(), DriverArgs, CC1Args))
     return true;
 
+  // Try /gcc/$triple/$version/include/c++/ (gcc --print-multiarch is not
+  // empty). Like above but for GCC built with
+  // --enable-version-specific-runtime-libs.
+  if (addLibStdCXXIncludePaths(LibDir.str() + "/gcc/" + TripleStr + "/" +
+                                   Version.Text + "/include/c++/",
+                               TripleStr, Multilib.includeSuffix(), DriverArgs,
+                               CC1Args))
+    return true;
+
   // Detect Debian g++-multiarch-incdir.diff.
   if (addLibStdCXXIncludePaths(LibDir.str() + "/../include/c++/" + Version.Text,
                                DebianMultiarch, Multilib.includeSuffix(),
diff --git a/gnu/llvm/clang/lib/Driver/ToolChains/HIP.cpp b/gnu/llvm/clang/lib/Driver/ToolChains/HIP.cpp
deleted file mode 100644
index c4e840de86e..00000000000
--- a/gnu/llvm/clang/lib/Driver/ToolChains/HIP.cpp
+++ /dev/null
@@ -1,458 +0,0 @@
-//===--- HIP.cpp - HIP Tool and ToolChain Implementations -------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "HIP.h"
-#include "AMDGPU.h"
-#include "CommonArgs.h"
-#include "clang/Basic/Cuda.h"
-#include "clang/Basic/TargetID.h"
-#include "clang/Driver/Compilation.h"
-#include "clang/Driver/Driver.h"
-#include "clang/Driver/DriverDiagnostic.h"
-#include "clang/Driver/InputInfo.h"
-#include "clang/Driver/Options.h"
-#include "llvm/Support/Alignment.h"
-#include "llvm/Support/FileSystem.h"
-#include "llvm/Support/Path.h"
-#include "llvm/Support/TargetParser.h"
-
-using namespace clang::driver;
-using namespace clang::driver::toolchains;
-using namespace clang::driver::tools;
-using namespace clang;
-using namespace llvm::opt;
-
-#if defined(_WIN32) || defined(_WIN64)
-#define NULL_FILE "nul"
-#else
-#define NULL_FILE "/dev/null"
-#endif
-
-namespace {
-const unsigned HIPCodeObjectAlign = 4096;
-} // namespace
-
-void AMDGCN::Linker::constructLldCommand(Compilation &C, const JobAction &JA,
-                                          const InputInfoList &Inputs,
-                                          const InputInfo &Output,
-                                          const llvm::opt::ArgList &Args) const {
-  // Construct lld command.
-  // The output from ld.lld is an HSA code object file.
-  ArgStringList LldArgs{"-flavor", "gnu", "--no-undefined", "-shared",
-                        "-plugin-opt=-amdgpu-internalize-symbols"};
-
-  auto &TC = getToolChain();
-  auto &D = TC.getDriver();
-  assert(!Inputs.empty() && "Must have at least one input.");
-  bool IsThinLTO = D.getLTOMode(/*IsOffload=*/true) == LTOK_Thin;
-  addLTOOptions(TC, Args, LldArgs, Output, Inputs[0], IsThinLTO);
-
-  // Extract all the -m options
-  std::vector<llvm::StringRef> Features;
-  amdgpu::getAMDGPUTargetFeatures(D, TC.getTriple(), Args, Features);
-
-  // Add features to mattr such as cumode
-  std::string MAttrString = "-plugin-opt=-mattr=";
-  for (auto OneFeature : unifyTargetFeatures(Features)) {
-    MAttrString.append(Args.MakeArgString(OneFeature));
-    if (OneFeature != Features.back())
-      MAttrString.append(",");
-  }
-  if (!Features.empty())
-    LldArgs.push_back(Args.MakeArgString(MAttrString));
-
-  // ToDo: Remove this option after AMDGPU backend supports ISA-level linking.
-  // Since AMDGPU backend currently does not support ISA-level linking, all
-  // called functions need to be imported.
-  if (IsThinLTO)
-    LldArgs.push_back(Args.MakeArgString("-plugin-opt=-force-import-all"));
-
-  for (const Arg *A : Args.filtered(options::OPT_mllvm)) {
-    LldArgs.push_back(
-        Args.MakeArgString(Twine("-plugin-opt=") + A->getValue(0)));
-  }
-
-  if (C.getDriver().isSaveTempsEnabled())
-    LldArgs.push_back("-save-temps");
-
-  addLinkerCompressDebugSectionsOption(TC, Args, LldArgs);
-
-  LldArgs.append({"-o", Output.getFilename()});
-  for (auto Input : Inputs)
-    LldArgs.push_back(Input.getFilename());
-
-  if (Args.hasFlag(options::OPT_fgpu_sanitize, options::OPT_fno_gpu_sanitize,
-                   false))
-    llvm::for_each(TC.getHIPDeviceLibs(Args), [&](StringRef BCFile) {
-      LldArgs.push_back(Args.MakeArgString(BCFile));
-    });
-
-  const char *Lld = Args.MakeArgString(getToolChain().GetProgramPath("lld"));
-  C.addCommand(std::make_unique<Command>(JA, *this, ResponseFileSupport::None(),
-                                         Lld, LldArgs, Inputs, Output));
-}
-
-// Construct a clang-offload-bundler command to bundle code objects for
-// different GPU's into a HIP fat binary.
-void AMDGCN::constructHIPFatbinCommand(Compilation &C, const JobAction &JA,
-                  StringRef OutputFileName, const InputInfoList &Inputs,
-                  const llvm::opt::ArgList &Args, const Tool& T) {
-  // Construct clang-offload-bundler command to bundle object files for
-  // for different GPU archs.
-  ArgStringList BundlerArgs;
-  BundlerArgs.push_back(Args.MakeArgString("-type=o"));
-  BundlerArgs.push_back(
-      Args.MakeArgString("-bundle-align=" + Twine(HIPCodeObjectAlign)));
-
-  // ToDo: Remove the dummy host binary entry which is required by
-  // clang-offload-bundler.
-  std::string BundlerTargetArg = "-targets=host-x86_64-unknown-linux";
-  std::string BundlerInputArg = "-inputs=" NULL_FILE;
-
-  // For code object version 2 and 3, the offload kind in bundle ID is 'hip'
-  // for backward compatibility. For code object version 4 and greater, the
-  // offload kind in bundle ID is 'hipv4'.
-  std::string OffloadKind = "hip";
-  if (getAMDGPUCodeObjectVersion(C.getDriver(), Args) >= 4)
-    OffloadKind = OffloadKind + "v4";
-  for (const auto &II : Inputs) {
-    const auto* A = II.getAction();
-    BundlerTargetArg = BundlerTargetArg + "," + OffloadKind +
-                       "-amdgcn-amd-amdhsa--" +
-                       StringRef(A->getOffloadingArch()).str();
-    BundlerInputArg = BundlerInputArg + "," + II.getFilename();
-  }
-  BundlerArgs.push_back(Args.MakeArgString(BundlerTargetArg));
-  BundlerArgs.push_back(Args.MakeArgString(BundlerInputArg));
-
-  std::string Output = std::string(OutputFileName);
-  auto BundlerOutputArg =
-      Args.MakeArgString(std::string("-outputs=").append(Output));
-  BundlerArgs.push_back(BundlerOutputArg);
-
-  const char *Bundler = Args.MakeArgString(
-      T.getToolChain().GetProgramPath("clang-offload-bundler"));
-  C.addCommand(std::make_unique<Command>(
-      JA, T, ResponseFileSupport::None(), Bundler, BundlerArgs, Inputs,
-      InputInfo(&JA, Args.MakeArgString(Output))));
-}
-
-/// Add Generated HIP Object File which has device images embedded into the
-/// host to the argument list for linking. Using MC directives, embed the
-/// device code and also define symbols required by the code generation so that
-/// the image can be retrieved at runtime.
-void AMDGCN::Linker::constructGenerateObjFileFromHIPFatBinary(
-    Compilation &C, const InputInfo &Output,
-    const InputInfoList &Inputs, const ArgList &Args,
-    const JobAction &JA) const {
-  const ToolChain &TC = getToolChain();
-  std::string Name =
-      std::string(llvm::sys::path::stem(Output.getFilename()));
-
-  // Create Temp Object File Generator,
-  // Offload Bundled file and Bundled Object file.
-  // Keep them if save-temps is enabled.
-  const char *McinFile;
-  const char *BundleFile;
-  if (C.getDriver().isSaveTempsEnabled()) {
-    McinFile = C.getArgs().MakeArgString(Name + ".mcin");
-    BundleFile = C.getArgs().MakeArgString(Name + ".hipfb");
-  } else {
-    auto TmpNameMcin = C.getDriver().GetTemporaryPath(Name, "mcin");
-    McinFile = C.addTempFile(C.getArgs().MakeArgString(TmpNameMcin));
-    auto TmpNameFb = C.getDriver().GetTemporaryPath(Name, "hipfb");
-    BundleFile = C.addTempFile(C.getArgs().MakeArgString(TmpNameFb));
-  }
-  constructHIPFatbinCommand(C, JA, BundleFile, Inputs, Args, *this);
-
-  // Create a buffer to write the contents of the temp obj generator.
-  std::string ObjBuffer;
-  llvm::raw_string_ostream ObjStream(ObjBuffer);
-
-  // Add MC directives to embed target binaries. We ensure that each
-  // section and image is 16-byte aligned. This is not mandatory, but
-  // increases the likelihood of data to be aligned with a cache block
-  // in several main host machines.
-  ObjStream << "#       HIP Object Generator\n";
-  ObjStream << "# *** Automatically generated by Clang ***\n";
-  ObjStream << "  .protected __hip_fatbin\n";
-  ObjStream << "  .type __hip_fatbin,@object\n";
-  ObjStream << "  .section .hip_fatbin,\"a\",@progbits\n";
-  ObjStream << "  .globl __hip_fatbin\n";
-  ObjStream << "  .p2align " << llvm::Log2(llvm::Align(HIPCodeObjectAlign))
-            << "\n";
-  ObjStream << "__hip_fatbin:\n";
-  ObjStream << "  .incbin \"" << BundleFile << "\"\n";
-  ObjStream.flush();
-
-  // Dump the contents of the temp object file gen if the user requested that.
-  // We support this option to enable testing of behavior with -###.
-  if (C.getArgs().hasArg(options::OPT_fhip_dump_offload_linker_script))
-    llvm::errs() << ObjBuffer;
-
-  // Open script file and write the contents.
-  std::error_code EC;
-  llvm::raw_fd_ostream Objf(McinFile, EC, llvm::sys::fs::OF_None);
-
-  if (EC) {
-    C.getDriver().Diag(clang::diag::err_unable_to_make_temp) << EC.message();
-    return;
-  }
-
-  Objf << ObjBuffer;
-
-  ArgStringList McArgs{"-o",      Output.getFilename(),
-                       McinFile,  "--filetype=obj"};
-  const char *Mc = Args.MakeArgString(TC.GetProgramPath("llvm-mc"));
-  C.addCommand(std::make_unique<Command>(JA, *this, ResponseFileSupport::None(),
-                                         Mc, McArgs, Inputs, Output));
-}
-
-// For amdgcn the inputs of the linker job are device bitcode and output is
-// object file. It calls llvm-link, opt, llc, then lld steps.
-void AMDGCN::Linker::ConstructJob(Compilation &C, const JobAction &JA,
-                                   const InputInfo &Output,
-                                   const InputInfoList &Inputs,
-                                   const ArgList &Args,
-                                   const char *LinkingOutput) const {
-  if (Inputs.size() > 0 &&
-      Inputs[0].getType() == types::TY_Image &&
-      JA.getType() == types::TY_Object)
-    return constructGenerateObjFileFromHIPFatBinary(C, Output, Inputs, Args, JA);
-
-  if (JA.getType() == types::TY_HIP_FATBIN)
-    return constructHIPFatbinCommand(C, JA, Output.getFilename(), Inputs, Args, *this);
-
-  return constructLldCommand(C, JA, Inputs, Output, Args);
-}
-
-HIPToolChain::HIPToolChain(const Driver &D, const llvm::Triple &Triple,
-                             const ToolChain &HostTC, const ArgList &Args)
-    : ROCMToolChain(D, Triple, Args), HostTC(HostTC) {
-  // Lookup binaries into the driver directory, this is used to
-  // discover the clang-offload-bundler executable.
-  getProgramPaths().push_back(getDriver().Dir);
-}
-
-void HIPToolChain::addClangTargetOptions(
-    const llvm::opt::ArgList &DriverArgs,
-    llvm::opt::ArgStringList &CC1Args,
-    Action::OffloadKind DeviceOffloadingKind) const {
-  HostTC.addClangTargetOptions(DriverArgs, CC1Args, DeviceOffloadingKind);
-
-  assert(DeviceOffloadingKind == Action::OFK_HIP &&
-         "Only HIP offloading kinds are supported for GPUs.");
-
-  CC1Args.push_back("-fcuda-is-device");
-
-  if (DriverArgs.hasFlag(options::OPT_fcuda_approx_transcendentals,
-                         options::OPT_fno_cuda_approx_transcendentals, false))
-    CC1Args.push_back("-fcuda-approx-transcendentals");
-
-  if (!DriverArgs.hasFlag(options::OPT_fgpu_rdc, options::OPT_fno_gpu_rdc,
-                          false))
-    CC1Args.append({"-mllvm", "-amdgpu-internalize-symbols"});
-
-  StringRef MaxThreadsPerBlock =
-      DriverArgs.getLastArgValue(options::OPT_gpu_max_threads_per_block_EQ);
-  if (!MaxThreadsPerBlock.empty()) {
-    std::string ArgStr =
-        std::string("--gpu-max-threads-per-block=") + MaxThreadsPerBlock.str();
-    CC1Args.push_back(DriverArgs.MakeArgStringRef(ArgStr));
-  }
-
-  CC1Args.push_back("-fcuda-allow-variadic-functions");
-
-  // Default to "hidden" visibility, as object level linking will not be
-  // supported for the foreseeable future.
-  if (!DriverArgs.hasArg(options::OPT_fvisibility_EQ,
-                         options::OPT_fvisibility_ms_compat)) {
-    CC1Args.append({"-fvisibility", "hidden"});
-    CC1Args.push_back("-fapply-global-visibility-to-externs");
-  }
-
-  llvm::for_each(getHIPDeviceLibs(DriverArgs), [&](StringRef BCFile) {
-    CC1Args.push_back("-mlink-builtin-bitcode");
-    CC1Args.push_back(DriverArgs.MakeArgString(BCFile));
-  });
-}
-
-llvm::opt::DerivedArgList *
-HIPToolChain::TranslateArgs(const llvm::opt::DerivedArgList &Args,
-                             StringRef BoundArch,
-                             Action::OffloadKind DeviceOffloadKind) const {
-  DerivedArgList *DAL =
-      HostTC.TranslateArgs(Args, BoundArch, DeviceOffloadKind);
-  if (!DAL)
-    DAL = new DerivedArgList(Args.getBaseArgs());
-
-  const OptTable &Opts = getDriver().getOpts();
-
-  for (Arg *A : Args) {
-    if (!shouldSkipArgument(A))
-      DAL->append(A);
-  }
-
-  if (!BoundArch.empty()) {
-    DAL->eraseArg(options::OPT_mcpu_EQ);
-    DAL->AddJoinedArg(nullptr, Opts.getOption(options::OPT_mcpu_EQ), BoundArch);
-    checkTargetID(*DAL);
-  }
-
-  return DAL;
-}
-
-Tool *HIPToolChain::buildLinker() const {
-  assert(getTriple().getArch() == llvm::Triple::amdgcn);
-  return new tools::AMDGCN::Linker(*this);
-}
-
-void HIPToolChain::addClangWarningOptions(ArgStringList &CC1Args) const {
-  HostTC.addClangWarningOptions(CC1Args);
-}
-
-ToolChain::CXXStdlibType
-HIPToolChain::GetCXXStdlibType(const ArgList &Args) const {
-  return HostTC.GetCXXStdlibType(Args);
-}
-
-void HIPToolChain::AddClangSystemIncludeArgs(const ArgList &DriverArgs,
-                                              ArgStringList &CC1Args) const {
-  HostTC.AddClangSystemIncludeArgs(DriverArgs, CC1Args);
-}
-
-void HIPToolChain::AddClangCXXStdlibIncludeArgs(const ArgList &Args,
-                                                 ArgStringList &CC1Args) const {
-  HostTC.AddClangCXXStdlibIncludeArgs(Args, CC1Args);
-}
-
-void HIPToolChain::AddIAMCUIncludeArgs(const ArgList &Args,
-                                        ArgStringList &CC1Args) const {
-  HostTC.AddIAMCUIncludeArgs(Args, CC1Args);
-}
-
-void HIPToolChain::AddHIPIncludeArgs(const ArgList &DriverArgs,
-                                     ArgStringList &CC1Args) const {
-  RocmInstallation.AddHIPIncludeArgs(DriverArgs, CC1Args);
-}
-
-SanitizerMask HIPToolChain::getSupportedSanitizers() const {
-  // The HIPToolChain only supports sanitizers in the sense that it allows
-  // sanitizer arguments on the command line if they are supported by the host
-  // toolchain. The HIPToolChain will actually ignore any command line
-  // arguments for any of these "supported" sanitizers. That means that no
-  // sanitization of device code is actually supported at this time.
-  //
-  // This behavior is necessary because the host and device toolchains
-  // invocations often share the command line, so the device toolchain must
-  // tolerate flags meant only for the host toolchain.
-  return HostTC.getSupportedSanitizers();
-}
-
-VersionTuple HIPToolChain::computeMSVCVersion(const Driver *D,
-                                               const ArgList &Args) const {
-  return HostTC.computeMSVCVersion(D, Args);
-}
-
-llvm::SmallVector<std::string, 12>
-HIPToolChain::getHIPDeviceLibs(const llvm::opt::ArgList &DriverArgs) const {
-  llvm::SmallVector<std::string, 12> BCLibs;
-  if (DriverArgs.hasArg(options::OPT_nogpulib))
-    return {};
-  ArgStringList LibraryPaths;
-
-  // Find in --hip-device-lib-path and HIP_LIBRARY_PATH.
-  for (auto Path : RocmInstallation.getRocmDeviceLibPathArg())
-    LibraryPaths.push_back(DriverArgs.MakeArgString(Path));
-
-  addDirectoryList(DriverArgs, LibraryPaths, "", "HIP_DEVICE_LIB_PATH");
-
-  // Maintain compatability with --hip-device-lib.
-  auto BCLibArgs = DriverArgs.getAllArgValues(options::OPT_hip_device_lib_EQ);
-  if (!BCLibArgs.empty()) {
-    llvm::for_each(BCLibArgs, [&](StringRef BCName) {
-      StringRef FullName;
-      for (std::string LibraryPath : LibraryPaths) {
-        SmallString<128> Path(LibraryPath);
-        llvm::sys::path::append(Path, BCName);
-        FullName = Path;
-        if (llvm::sys::fs::exists(FullName)) {
-          BCLibs.push_back(FullName.str());
-          return;
-        }
-      }
-      getDriver().Diag(diag::err_drv_no_such_file) << BCName;
-    });
-  } else {
-    if (!RocmInstallation.hasDeviceLibrary()) {
-      getDriver().Diag(diag::err_drv_no_rocm_device_lib) << 0;
-      return {};
-    }
-    StringRef GpuArch = getGPUArch(DriverArgs);
-    assert(!GpuArch.empty() && "Must have an explicit GPU arch.");
-
-    // If --hip-device-lib is not set, add the default bitcode libraries.
-    if (DriverArgs.hasFlag(options::OPT_fgpu_sanitize,
-                           options::OPT_fno_gpu_sanitize, false)) {
-      auto AsanRTL = RocmInstallation.getAsanRTLPath();
-      if (AsanRTL.empty()) {
-        unsigned DiagID = getDriver().getDiags().getCustomDiagID(
-            DiagnosticsEngine::Error,
-            "AMDGPU address sanitizer runtime library (asanrtl) is not found. "
-            "Please install ROCm device library which supports address "
-            "sanitizer");
-        getDriver().Diag(DiagID);
-        return {};
-      } else
-        BCLibs.push_back(AsanRTL.str());
-    }
-
-    // Add the HIP specific bitcode library.
-    BCLibs.push_back(RocmInstallation.getHIPPath().str());
-
-    // Add common device libraries like ocml etc.
-    BCLibs.append(getCommonDeviceLibNames(DriverArgs, GpuArch.str()));
-
-    // Add instrument lib.
-    auto InstLib =
-        DriverArgs.getLastArgValue(options::OPT_gpu_instrument_lib_EQ);
-    if (InstLib.empty())
-      return BCLibs;
-    if (llvm::sys::fs::exists(InstLib))
-      BCLibs.push_back(InstLib.str());
-    else
-      getDriver().Diag(diag::err_drv_no_such_file) << InstLib;
-  }
-
-  return BCLibs;
-}
-
-void HIPToolChain::checkTargetID(const llvm::opt::ArgList &DriverArgs) const {
-  auto PTID = getParsedTargetID(DriverArgs);
-  if (PTID.OptionalTargetID && !PTID.OptionalGPUArch) {
-    getDriver().Diag(clang::diag::err_drv_bad_target_id)
-        << PTID.OptionalTargetID.getValue();
-    return;
-  }
-
-  assert(PTID.OptionalFeatures && "Invalid return from getParsedTargetID");
-  auto &FeatureMap = PTID.OptionalFeatures.getValue();
-  // Sanitizer is not supported with xnack-.
-  if (DriverArgs.hasFlag(options::OPT_fgpu_sanitize,
-                         options::OPT_fno_gpu_sanitize, false)) {
-    auto Loc = FeatureMap.find("xnack");
-    if (Loc != FeatureMap.end() && !Loc->second) {
-      auto &Diags = getDriver().getDiags();
-      auto DiagID = Diags.getCustomDiagID(
-          DiagnosticsEngine::Error,
-          "'-fgpu-sanitize' is not compatible with offload arch '%0'. "
-          "Use an offload arch without 'xnack-' instead");
-      Diags.Report(DiagID) << PTID.OptionalTargetID.getValue();
-    }
-  }
-}
diff --git a/gnu/llvm/clang/lib/Driver/ToolChains/HIP.h b/gnu/llvm/clang/lib/Driver/ToolChains/HIP.h
deleted file mode 100644
index 3cced0a320d..00000000000
--- a/gnu/llvm/clang/lib/Driver/ToolChains/HIP.h
+++ /dev/null
@@ -1,108 +0,0 @@
-//===--- HIP.h - HIP ToolChain Implementations ------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_CLANG_LIB_DRIVER_TOOLCHAINS_HIP_H
-#define LLVM_CLANG_LIB_DRIVER_TOOLCHAINS_HIP_H
-
-#include "clang/Driver/ToolChain.h"
-#include "clang/Driver/Tool.h"
-#include "AMDGPU.h"
-
-namespace clang {
-namespace driver {
-
-namespace tools {
-
-namespace AMDGCN {
-  // Construct command for creating HIP fatbin.
-  void constructHIPFatbinCommand(Compilation &C, const JobAction &JA,
-                  StringRef OutputFileName, const InputInfoList &Inputs,
-                  const llvm::opt::ArgList &TCArgs, const Tool& T);
-
-// Runs llvm-link/opt/llc/lld, which links multiple LLVM bitcode, together with
-// device library, then compiles it to ISA in a shared object.
-class LLVM_LIBRARY_VISIBILITY Linker : public Tool {
-public:
-  Linker(const ToolChain &TC) : Tool("AMDGCN::Linker", "amdgcn-link", TC) {}
-
-  bool hasIntegratedCPP() const override { return false; }
-
-  void ConstructJob(Compilation &C, const JobAction &JA,
-                    const InputInfo &Output, const InputInfoList &Inputs,
-                    const llvm::opt::ArgList &TCArgs,
-                    const char *LinkingOutput) const override;
-
-private:
-
-  void constructLldCommand(Compilation &C, const JobAction &JA,
-                           const InputInfoList &Inputs, const InputInfo &Output,
-                           const llvm::opt::ArgList &Args) const;
-
-  // Construct command for creating Object from HIP fatbin.
-  void constructGenerateObjFileFromHIPFatBinary(Compilation &C,
-                                                const InputInfo &Output,
-                                                const InputInfoList &Inputs,
-                                                const llvm::opt::ArgList &Args,
-                                                const JobAction &JA) const;
-};
-
-} // end namespace AMDGCN
-} // end namespace tools
-
-namespace toolchains {
-
-class LLVM_LIBRARY_VISIBILITY HIPToolChain final : public ROCMToolChain {
-public:
-  HIPToolChain(const Driver &D, const llvm::Triple &Triple,
-                const ToolChain &HostTC, const llvm::opt::ArgList &Args);
-
-  const llvm::Triple *getAuxTriple() const override {
-    return &HostTC.getTriple();
-  }
-
-  llvm::opt::DerivedArgList *
-  TranslateArgs(const llvm::opt::DerivedArgList &Args, StringRef BoundArch,
-                Action::OffloadKind DeviceOffloadKind) const override;
-  void addClangTargetOptions(const llvm::opt::ArgList &DriverArgs,
-                             llvm::opt::ArgStringList &CC1Args,
-                             Action::OffloadKind DeviceOffloadKind) const override;
-  void addClangWarningOptions(llvm::opt::ArgStringList &CC1Args) const override;
-  CXXStdlibType GetCXXStdlibType(const llvm::opt::ArgList &Args) const override;
-  void
-  AddClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs,
-                            llvm::opt::ArgStringList &CC1Args) const override;
-  void AddClangCXXStdlibIncludeArgs(
-      const llvm::opt::ArgList &Args,
-      llvm::opt::ArgStringList &CC1Args) const override;
-  void AddIAMCUIncludeArgs(const llvm::opt::ArgList &DriverArgs,
-                           llvm::opt::ArgStringList &CC1Args) const override;
-  void AddHIPIncludeArgs(const llvm::opt::ArgList &DriverArgs,
-                         llvm::opt::ArgStringList &CC1Args) const override;
-  llvm::SmallVector<std::string, 12>
-  getHIPDeviceLibs(const llvm::opt::ArgList &Args) const override;
-
-  SanitizerMask getSupportedSanitizers() const override;
-
-  VersionTuple
-  computeMSVCVersion(const Driver *D,
-                     const llvm::opt::ArgList &Args) const override;
-
-  unsigned GetDefaultDwarfVersion() const override { return 4; }
-
-  const ToolChain &HostTC;
-  void checkTargetID(const llvm::opt::ArgList &DriverArgs) const override;
-
-protected:
-  Tool *buildLinker() const override;
-};
-
-} // end namespace toolchains
-} // end namespace driver
-} // end namespace clang
-
-#endif // LLVM_CLANG_LIB_DRIVER_TOOLCHAINS_HIP_H
diff --git a/gnu/llvm/clang/lib/Driver/ToolChains/MSVCSetupApi.h b/gnu/llvm/clang/lib/Driver/ToolChains/MSVCSetupApi.h
deleted file mode 100644
index a890b85fd5e..00000000000
--- a/gnu/llvm/clang/lib/Driver/ToolChains/MSVCSetupApi.h
+++ /dev/null
@@ -1,514 +0,0 @@
-// <copyright file="Program.cpp" company="Microsoft Corporation">
-// Copyright (C) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license.
-// </copyright>
-// <license>
-// The MIT License (MIT)
-//
-// Copyright (C) Microsoft Corporation. All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation the
-// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-// sell copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-// </license>
-
-#pragma once
-
-// Constants
-//
-#ifndef E_NOTFOUND
-#define E_NOTFOUND HRESULT_FROM_WIN32(ERROR_NOT_FOUND)
-#endif
-
-#ifndef E_FILENOTFOUND
-#define E_FILENOTFOUND HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)
-#endif
-
-// Enumerations
-//
-/// <summary>
-/// The state of an instance.
-/// </summary>
-enum InstanceState : unsigned {
-  /// <summary>
-  /// The instance state has not been determined.
-  /// </summary>
-  eNone = 0,
-
-  /// <summary>
-  /// The instance installation path exists.
-  /// </summary>
-  eLocal = 1,
-
-  /// <summary>
-  /// A product is registered to the instance.
-  /// </summary>
-  eRegistered = 2,
-
-  /// <summary>
-  /// No reboot is required for the instance.
-  /// </summary>
-  eNoRebootRequired = 4,
-
-  /// <summary>
-  /// The instance represents a complete install.
-  /// </summary>
-  eComplete = MAXUINT,
-};
-
-// Forward interface declarations
-//
-#ifndef __ISetupInstance_FWD_DEFINED__
-#define __ISetupInstance_FWD_DEFINED__
-typedef struct ISetupInstance ISetupInstance;
-#endif
-
-#ifndef __ISetupInstance2_FWD_DEFINED__
-#define __ISetupInstance2_FWD_DEFINED__
-typedef struct ISetupInstance2 ISetupInstance2;
-#endif
-
-#ifndef __IEnumSetupInstances_FWD_DEFINED__
-#define __IEnumSetupInstances_FWD_DEFINED__
-typedef struct IEnumSetupInstances IEnumSetupInstances;
-#endif
-
-#ifndef __ISetupConfiguration_FWD_DEFINED__
-#define __ISetupConfiguration_FWD_DEFINED__
-typedef struct ISetupConfiguration ISetupConfiguration;
-#endif
-
-#ifndef __ISetupConfiguration2_FWD_DEFINED__
-#define __ISetupConfiguration2_FWD_DEFINED__
-typedef struct ISetupConfiguration2 ISetupConfiguration2;
-#endif
-
-#ifndef __ISetupPackageReference_FWD_DEFINED__
-#define __ISetupPackageReference_FWD_DEFINED__
-typedef struct ISetupPackageReference ISetupPackageReference;
-#endif
-
-#ifndef __ISetupHelper_FWD_DEFINED__
-#define __ISetupHelper_FWD_DEFINED__
-typedef struct ISetupHelper ISetupHelper;
-#endif
-
-// Forward class declarations
-//
-#ifndef __SetupConfiguration_FWD_DEFINED__
-#define __SetupConfiguration_FWD_DEFINED__
-
-#ifdef __cplusplus
-typedef class SetupConfiguration SetupConfiguration;
-#endif
-
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// Interface definitions
-//
-EXTERN_C const IID IID_ISetupInstance;
-
-#if defined(__cplusplus) && !defined(CINTERFACE)
-/// <summary>
-/// Information about an instance of a product.
-/// </summary>
-struct DECLSPEC_UUID("B41463C3-8866-43B5-BC33-2B0676F7F42E")
-    DECLSPEC_NOVTABLE ISetupInstance : public IUnknown {
-  /// <summary>
-  /// Gets the instance identifier (should match the name of the parent instance
-  /// directory).
-  /// </summary>
-  /// <param name="pbstrInstanceId">The instance identifier.</param>
-  /// <returns>Standard HRESULT indicating success or failure, including
-  /// E_FILENOTFOUND if the instance state does not exist.</returns>
-  STDMETHOD(GetInstanceId)(_Out_ BSTR *pbstrInstanceId) = 0;
-
-  /// <summary>
-  /// Gets the local date and time when the installation was originally
-  /// installed.
-  /// </summary>
-  /// <param name="pInstallDate">The local date and time when the installation
-  /// was originally installed.</param>
-  /// <returns>Standard HRESULT indicating success or failure, including
-  /// E_FILENOTFOUND if the instance state does not exist and E_NOTFOUND if the
-  /// property is not defined.</returns>
-  STDMETHOD(GetInstallDate)(_Out_ LPFILETIME pInstallDate) = 0;
-
-  /// <summary>
-  /// Gets the unique name of the installation, often indicating the branch and
-  /// other information used for telemetry.
-  /// </summary>
-  /// <param name="pbstrInstallationName">The unique name of the installation,
-  /// often indicating the branch and other information used for
-  /// telemetry.</param>
-  /// <returns>Standard HRESULT indicating success or failure, including
-  /// E_FILENOTFOUND if the instance state does not exist and E_NOTFOUND if the
-  /// property is not defined.</returns>
-  STDMETHOD(GetInstallationName)(_Out_ BSTR *pbstrInstallationName) = 0;
-
-  /// <summary>
-  /// Gets the path to the installation root of the product.
-  /// </summary>
-  /// <param name="pbstrInstallationPath">The path to the installation root of
-  /// the product.</param>
-  /// <returns>Standard HRESULT indicating success or failure, including
-  /// E_FILENOTFOUND if the instance state does not exist and E_NOTFOUND if the
-  /// property is not defined.</returns>
-  STDMETHOD(GetInstallationPath)(_Out_ BSTR *pbstrInstallationPath) = 0;
-
-  /// <summary>
-  /// Gets the version of the product installed in this instance.
-  /// </summary>
-  /// <param name="pbstrInstallationVersion">The version of the product
-  /// installed in this instance.</param>
-  /// <returns>Standard HRESULT indicating success or failure, including
-  /// E_FILENOTFOUND if the instance state does not exist and E_NOTFOUND if the
-  /// property is not defined.</returns>
-  STDMETHOD(GetInstallationVersion)(_Out_ BSTR *pbstrInstallationVersion) = 0;
-
-  /// <summary>
-  /// Gets the display name (title) of the product installed in this instance.
-  /// </summary>
-  /// <param name="lcid">The LCID for the display name.</param>
-  /// <param name="pbstrDisplayName">The display name (title) of the product
-  /// installed in this instance.</param>
-  /// <returns>Standard HRESULT indicating success or failure, including
-  /// E_FILENOTFOUND if the instance state does not exist and E_NOTFOUND if the
-  /// property is not defined.</returns>
-  STDMETHOD(GetDisplayName)(_In_ LCID lcid, _Out_ BSTR *pbstrDisplayName) = 0;
-
-  /// <summary>
-  /// Gets the description of the product installed in this instance.
-  /// </summary>
-  /// <param name="lcid">The LCID for the description.</param>
-  /// <param name="pbstrDescription">The description of the product installed in
-  /// this instance.</param>
-  /// <returns>Standard HRESULT indicating success or failure, including
-  /// E_FILENOTFOUND if the instance state does not exist and E_NOTFOUND if the
-  /// property is not defined.</returns>
-  STDMETHOD(GetDescription)(_In_ LCID lcid, _Out_ BSTR *pbstrDescription) = 0;
-
-  /// <summary>
-  /// Resolves the optional relative path to the root path of the instance.
-  /// </summary>
-  /// <param name="pwszRelativePath">A relative path within the instance to
-  /// resolve, or NULL to get the root path.</param>
-  /// <param name="pbstrAbsolutePath">The full path to the optional relative
-  /// path within the instance. If the relative path is NULL, the root path will
-  /// always terminate in a backslash.</param>
-  /// <returns>Standard HRESULT indicating success or failure, including
-  /// E_FILENOTFOUND if the instance state does not exist and E_NOTFOUND if the
-  /// property is not defined.</returns>
-  STDMETHOD(ResolvePath)
-  (_In_opt_z_ LPCOLESTR pwszRelativePath, _Out_ BSTR *pbstrAbsolutePath) = 0;
-};
-#endif
-
-EXTERN_C const IID IID_ISetupInstance2;
-
-#if defined(__cplusplus) && !defined(CINTERFACE)
-/// <summary>
-/// Information about an instance of a product.
-/// </summary>
-struct DECLSPEC_UUID("89143C9A-05AF-49B0-B717-72E218A2185C")
-    DECLSPEC_NOVTABLE ISetupInstance2 : public ISetupInstance {
-  /// <summary>
-  /// Gets the state of the instance.
-  /// </summary>
-  /// <param name="pState">The state of the instance.</param>
-  /// <returns>Standard HRESULT indicating success or failure, including
-  /// E_FILENOTFOUND if the instance state does not exist.</returns>
-  STDMETHOD(GetState)(_Out_ InstanceState *pState) = 0;
-
-  /// <summary>
-  /// Gets an array of package references registered to the instance.
-  /// </summary>
-  /// <param name="ppsaPackages">Pointer to an array of <see
-  /// cref="ISetupPackageReference"/>.</param>
-  /// <returns>Standard HRESULT indicating success or failure, including
-  /// E_FILENOTFOUND if the instance state does not exist and E_NOTFOUND if the
-  /// packages property is not defined.</returns>
-  STDMETHOD(GetPackages)(_Out_ LPSAFEARRAY *ppsaPackages) = 0;
-
-  /// <summary>
-  /// Gets a pointer to the <see cref="ISetupPackageReference"/> that represents
-  /// the registered product.
-  /// </summary>
-  /// <param name="ppPackage">Pointer to an instance of <see
-  /// cref="ISetupPackageReference"/>. This may be NULL if <see
-  /// cref="GetState"/> does not return <see cref="eComplete"/>.</param>
-  /// <returns>Standard HRESULT indicating success or failure, including
-  /// E_FILENOTFOUND if the instance state does not exist and E_NOTFOUND if the
-  /// packages property is not defined.</returns>
-  STDMETHOD(GetProduct)
-  (_Outptr_result_maybenull_ ISetupPackageReference **ppPackage) = 0;
-
-  /// <summary>
-  /// Gets the relative path to the product application, if available.
-  /// </summary>
-  /// <param name="pbstrProductPath">The relative path to the product
-  /// application, if available.</param>
-  /// <returns>Standard HRESULT indicating success or failure, including
-  /// E_FILENOTFOUND if the instance state does not exist.</returns>
-  STDMETHOD(GetProductPath)
-  (_Outptr_result_maybenull_ BSTR *pbstrProductPath) = 0;
-};
-#endif
-
-EXTERN_C const IID IID_IEnumSetupInstances;
-
-#if defined(__cplusplus) && !defined(CINTERFACE)
-/// <summary>
-/// A enumerator of installed <see cref="ISetupInstance"/> objects.
-/// </summary>
-struct DECLSPEC_UUID("6380BCFF-41D3-4B2E-8B2E-BF8A6810C848")
-    DECLSPEC_NOVTABLE IEnumSetupInstances : public IUnknown {
-  /// <summary>
-  /// Retrieves the next set of product instances in the enumeration sequence.
-  /// </summary>
-  /// <param name="celt">The number of product instances to retrieve.</param>
-  /// <param name="rgelt">A pointer to an array of <see
-  /// cref="ISetupInstance"/>.</param>
-  /// <param name="pceltFetched">A pointer to the number of product instances
-  /// retrieved. If celt is 1 this parameter may be NULL.</param>
-  /// <returns>S_OK if the number of elements were fetched, S_FALSE if nothing
-  /// was fetched (at end of enumeration), E_INVALIDARG if celt is greater than
-  /// 1 and pceltFetched is NULL, or E_OUTOFMEMORY if an <see
-  /// cref="ISetupInstance"/> could not be allocated.</returns>
-  STDMETHOD(Next)
-  (_In_ ULONG celt, _Out_writes_to_(celt, *pceltFetched) ISetupInstance **rgelt,
-   _Out_opt_ _Deref_out_range_(0, celt) ULONG *pceltFetched) = 0;
-
-  /// <summary>
-  /// Skips the next set of product instances in the enumeration sequence.
-  /// </summary>
-  /// <param name="celt">The number of product instances to skip.</param>
-  /// <returns>S_OK if the number of elements could be skipped; otherwise,
-  /// S_FALSE;</returns>
-  STDMETHOD(Skip)(_In_ ULONG celt) = 0;
-
-  /// <summary>
-  /// Resets the enumeration sequence to the beginning.
-  /// </summary>
-  /// <returns>Always returns S_OK;</returns>
-  STDMETHOD(Reset)(void) = 0;
-
-  /// <summary>
-  /// Creates a new enumeration object in the same state as the current
-  /// enumeration object: the new object points to the same place in the
-  /// enumeration sequence.
-  /// </summary>
-  /// <param name="ppenum">A pointer to a pointer to a new <see
-  /// cref="IEnumSetupInstances"/> interface. If the method fails, this
-  /// parameter is undefined.</param>
-  /// <returns>S_OK if a clone was returned; otherwise, E_OUTOFMEMORY.</returns>
-  STDMETHOD(Clone)(_Deref_out_opt_ IEnumSetupInstances **ppenum) = 0;
-};
-#endif
-
-EXTERN_C const IID IID_ISetupConfiguration;
-
-#if defined(__cplusplus) && !defined(CINTERFACE)
-/// <summary>
-/// Gets information about product instances set up on the machine.
-/// </summary>
-struct DECLSPEC_UUID("42843719-DB4C-46C2-8E7C-64F1816EFD5B")
-    DECLSPEC_NOVTABLE ISetupConfiguration : public IUnknown {
-  /// <summary>
-  /// Enumerates all completed product instances installed.
-  /// </summary>
-  /// <param name="ppEnumInstances">An enumeration of completed, installed
-  /// product instances.</param>
-  /// <returns>Standard HRESULT indicating success or failure.</returns>
-  STDMETHOD(EnumInstances)(_Out_ IEnumSetupInstances **ppEnumInstances) = 0;
-
-  /// <summary>
-  /// Gets the instance for the current process path.
-  /// </summary>
-  /// <param name="ppInstance">The instance for the current process
-  /// path.</param>
-  /// <returns>The instance for the current process path, or E_NOTFOUND if not
-  /// found.</returns>
-  STDMETHOD(GetInstanceForCurrentProcess)
-  (_Out_ ISetupInstance **ppInstance) = 0;
-
-  /// <summary>
-  /// Gets the instance for the given path.
-  /// </summary>
-  /// <param name="ppInstance">The instance for the given path.</param>
-  /// <returns>The instance for the given path, or E_NOTFOUND if not
-  /// found.</returns>
-  STDMETHOD(GetInstanceForPath)
-  (_In_z_ LPCWSTR wzPath, _Out_ ISetupInstance **ppInstance) = 0;
-};
-#endif
-
-EXTERN_C const IID IID_ISetupConfiguration2;
-
-#if defined(__cplusplus) && !defined(CINTERFACE)
-/// <summary>
-/// Gets information about product instances.
-/// </summary>
-struct DECLSPEC_UUID("26AAB78C-4A60-49D6-AF3B-3C35BC93365D")
-    DECLSPEC_NOVTABLE ISetupConfiguration2 : public ISetupConfiguration {
-  /// <summary>
-  /// Enumerates all product instances.
-  /// </summary>
-  /// <param name="ppEnumInstances">An enumeration of all product
-  /// instances.</param>
-  /// <returns>Standard HRESULT indicating success or failure.</returns>
-  STDMETHOD(EnumAllInstances)(_Out_ IEnumSetupInstances **ppEnumInstances) = 0;
-};
-#endif
-
-EXTERN_C const IID IID_ISetupPackageReference;
-
-#if defined(__cplusplus) && !defined(CINTERFACE)
-/// <summary>
-/// A reference to a package.
-/// </summary>
-struct DECLSPEC_UUID("da8d8a16-b2b6-4487-a2f1-594ccccd6bf5")
-    DECLSPEC_NOVTABLE ISetupPackageReference : public IUnknown {
-  /// <summary>
-  /// Gets the general package identifier.
-  /// </summary>
-  /// <param name="pbstrId">The general package identifier.</param>
-  /// <returns>Standard HRESULT indicating success or failure.</returns>
-  STDMETHOD(GetId)(_Out_ BSTR *pbstrId) = 0;
-
-  /// <summary>
-  /// Gets the version of the package.
-  /// </summary>
-  /// <param name="pbstrVersion">The version of the package.</param>
-  /// <returns>Standard HRESULT indicating success or failure.</returns>
-  STDMETHOD(GetVersion)(_Out_ BSTR *pbstrVersion) = 0;
-
-  /// <summary>
-  /// Gets the target process architecture of the package.
-  /// </summary>
-  /// <param name="pbstrChip">The target process architecture of the
-  /// package.</param>
-  /// <returns>Standard HRESULT indicating success or failure.</returns>
-  STDMETHOD(GetChip)(_Out_ BSTR *pbstrChip) = 0;
-
-  /// <summary>
-  /// Gets the language and optional region identifier.
-  /// </summary>
-  /// <param name="pbstrLanguage">The language and optional region
-  /// identifier.</param>
-  /// <returns>Standard HRESULT indicating success or failure.</returns>
-  STDMETHOD(GetLanguage)(_Out_ BSTR *pbstrLanguage) = 0;
-
-  /// <summary>
-  /// Gets the build branch of the package.
-  /// </summary>
-  /// <param name="pbstrBranch">The build branch of the package.</param>
-  /// <returns>Standard HRESULT indicating success or failure.</returns>
-  STDMETHOD(GetBranch)(_Out_ BSTR *pbstrBranch) = 0;
-
-  /// <summary>
-  /// Gets the type of the package.
-  /// </summary>
-  /// <param name="pbstrType">The type of the package.</param>
-  /// <returns>Standard HRESULT indicating success or failure.</returns>
-  STDMETHOD(GetType)(_Out_ BSTR *pbstrType) = 0;
-
-  /// <summary>
-  /// Gets the unique identifier consisting of all defined tokens.
-  /// </summary>
-  /// <param name="pbstrUniqueId">The unique identifier consisting of all
-  /// defined tokens.</param>
-  /// <returns>Standard HRESULT indicating success or failure, including
-  /// E_UNEXPECTED if no Id was defined (required).</returns>
-  STDMETHOD(GetUniqueId)(_Out_ BSTR *pbstrUniqueId) = 0;
-};
-#endif
-
-EXTERN_C const IID IID_ISetupHelper;
-
-#if defined(__cplusplus) && !defined(CINTERFACE)
-/// <summary>
-/// Helper functions.
-/// </summary>
-/// <remarks>
-/// You can query for this interface from the <see cref="SetupConfiguration"/>
-/// class.
-/// </remarks>
-struct DECLSPEC_UUID("42b21b78-6192-463e-87bf-d577838f1d5c")
-    DECLSPEC_NOVTABLE ISetupHelper : public IUnknown {
-  /// <summary>
-  /// Parses a dotted quad version string into a 64-bit unsigned integer.
-  /// </summary>
-  /// <param name="pwszVersion">The dotted quad version string to parse, e.g.
-  /// 1.2.3.4.</param>
-  /// <param name="pullVersion">A 64-bit unsigned integer representing the
-  /// version. You can compare this to other versions.</param>
-  /// <returns>Standard HRESULT indicating success or failure.</returns>
-  STDMETHOD(ParseVersion)
-  (_In_ LPCOLESTR pwszVersion, _Out_ PULONGLONG pullVersion) = 0;
-
-  /// <summary>
-  /// Parses a dotted quad version string into a 64-bit unsigned integer.
-  /// </summary>
-  /// <param name="pwszVersionRange">The string containing 1 or 2 dotted quad
-  /// version strings to parse, e.g. [1.0,) that means 1.0.0.0 or newer.</param>
-  /// <param name="pullMinVersion">A 64-bit unsigned integer representing the
-  /// minimum version, which may be 0. You can compare this to other
-  /// versions.</param>
-  /// <param name="pullMaxVersion">A 64-bit unsigned integer representing the
-  /// maximum version, which may be MAXULONGLONG. You can compare this to other
-  /// versions.</param>
-  /// <returns>Standard HRESULT indicating success or failure.</returns>
-  STDMETHOD(ParseVersionRange)
-  (_In_ LPCOLESTR pwszVersionRange, _Out_ PULONGLONG pullMinVersion,
-   _Out_ PULONGLONG pullMaxVersion) = 0;
-};
-#endif
-
-// Class declarations
-//
-EXTERN_C const CLSID CLSID_SetupConfiguration;
-
-#ifdef __cplusplus
-/// <summary>
-/// This class implements <see cref="ISetupConfiguration"/>, <see
-/// cref="ISetupConfiguration2"/>, and <see cref="ISetupHelper"/>.
-/// </summary>
-class DECLSPEC_UUID("177F0C4A-1CD3-4DE7-A32C-71DBBB9FA36D") SetupConfiguration;
-#endif
-
-// Function declarations
-//
-/// <summary>
-/// Gets an <see cref="ISetupConfiguration"/> that provides information about
-/// product instances installed on the machine.
-/// </summary>
-/// <param name="ppConfiguration">The <see cref="ISetupConfiguration"/> that
-/// provides information about product instances installed on the
-/// machine.</param>
-/// <param name="pReserved">Reserved for future use.</param>
-/// <returns>Standard HRESULT indicating success or failure.</returns>
-STDMETHODIMP GetSetupConfiguration(_Out_ ISetupConfiguration **ppConfiguration,
-                                   _Reserved_ LPVOID pReserved);
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/gnu/llvm/clang/lib/Driver/ToolChains/OpenBSD.cpp b/gnu/llvm/clang/lib/Driver/ToolChains/OpenBSD.cpp
index 12e8edb21e0..9c34992921e 100644
--- a/gnu/llvm/clang/lib/Driver/ToolChains/OpenBSD.cpp
+++ b/gnu/llvm/clang/lib/Driver/ToolChains/OpenBSD.cpp
@@ -7,6 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "OpenBSD.h"
+#include "Arch/ARM.h"
 #include "Arch/Mips.h"
 #include "Arch/Sparc.h"
 #include "CommonArgs.h"
@@ -29,16 +30,30 @@ void openbsd::Assembler::ConstructJob(Compilation &C, const JobAction &JA,
                                       const InputInfoList &Inputs,
                                       const ArgList &Args,
                                       const char *LinkingOutput) const {
+  const toolchains::OpenBSD &ToolChain =
+      static_cast<const toolchains::OpenBSD &>(getToolChain());
+  const Driver &D = ToolChain.getDriver();
+  const llvm::Triple &Triple = ToolChain.getTriple();
+
   claimNoWarnArgs(Args);
   ArgStringList CmdArgs;
 
-  switch (getToolChain().getArch()) {
+  switch (ToolChain.getArch()) {
   case llvm::Triple::x86:
     // When building 32-bit code on OpenBSD/amd64, we have to explicitly
     // instruct as in the base system to assemble 32-bit code.
     CmdArgs.push_back("--32");
     break;
 
+  case llvm::Triple::arm:
+  case llvm::Triple::armeb: {
+    StringRef MArch, MCPU;
+    arm::getARMArchCPUFromArgs(Args, MArch, MCPU, /*FromAs*/ true);
+    std::string Arch = arm::getARMTargetCPU(MCPU, MArch, Triple);
+    CmdArgs.push_back(Args.MakeArgString("-mcpu=" + Arch));
+    break;
+  }
+
   case llvm::Triple::ppc:
     CmdArgs.push_back("-mppc");
     CmdArgs.push_back("-many");
@@ -46,9 +61,9 @@ void openbsd::Assembler::ConstructJob(Compilation &C, const JobAction &JA,
 
   case llvm::Triple::sparcv9: {
     CmdArgs.push_back("-64");
-    std::string CPU = getCPUName(Args, getToolChain().getTriple());
-    CmdArgs.push_back(sparc::getSparcAsmModeForCPU(CPU, getToolChain().getTriple()));
-    AddAssemblerKPIC(getToolChain(), Args, CmdArgs);
+    std::string CPU = getCPUName(D, Args, Triple);
+    CmdArgs.push_back(sparc::getSparcAsmModeForCPU(CPU, Triple));
+    AddAssemblerKPIC(ToolChain, Args, CmdArgs);
     break;
   }
 
@@ -56,17 +71,20 @@ void openbsd::Assembler::ConstructJob(Compilation &C, const JobAction &JA,
   case llvm::Triple::mips64el: {
     StringRef CPUName;
     StringRef ABIName;
-    mips::getMipsCPUAndABI(Args, getToolChain().getTriple(), CPUName, ABIName);
+    mips::getMipsCPUAndABI(Args, Triple, CPUName, ABIName);
+
+    CmdArgs.push_back("-march");
+    CmdArgs.push_back(CPUName.data());
 
     CmdArgs.push_back("-mabi");
     CmdArgs.push_back(mips::getGnuCompatibleMipsABIName(ABIName).data());
 
-    if (getToolChain().getTriple().isLittleEndian())
+    if (Triple.isLittleEndian())
       CmdArgs.push_back("-EL");
     else
       CmdArgs.push_back("-EB");
 
-    AddAssemblerKPIC(getToolChain(), Args, CmdArgs);
+    AddAssemblerKPIC(ToolChain, Args, CmdArgs);
     break;
   }
 
@@ -82,7 +100,7 @@ void openbsd::Assembler::ConstructJob(Compilation &C, const JobAction &JA,
   for (const auto &II : Inputs)
     CmdArgs.push_back(II.getFilename());
 
-  const char *Exec = Args.MakeArgString(getToolChain().GetProgramPath("as"));
+  const char *Exec = Args.MakeArgString(ToolChain.GetProgramPath("as"));
   C.addCommand(std::make_unique<Command>(JA, *this,
                                          ResponseFileSupport::AtFileCurCP(),
                                          Exec, CmdArgs, Inputs, Output));
@@ -95,7 +113,8 @@ void openbsd::Linker::ConstructJob(Compilation &C, const JobAction &JA,
                                    const char *LinkingOutput) const {
   const toolchains::OpenBSD &ToolChain =
       static_cast<const toolchains::OpenBSD &>(getToolChain());
-  const Driver &D = getToolChain().getDriver();
+  const Driver &D = ToolChain.getDriver();
+  const llvm::Triple::ArchType Arch = ToolChain.getArch();
   ArgStringList CmdArgs;
 
   // Silence warning for "clang -g foo.o -o foo"
@@ -106,9 +125,12 @@ void openbsd::Linker::ConstructJob(Compilation &C, const JobAction &JA,
   // handled somewhere else.
   Args.ClaimAllArgs(options::OPT_w);
 
-  if (ToolChain.getArch() == llvm::Triple::mips64)
+  if (!D.SysRoot.empty())
+    CmdArgs.push_back(Args.MakeArgString("--sysroot=" + D.SysRoot));
+
+  if (Arch == llvm::Triple::mips64)
     CmdArgs.push_back("-EB");
-  else if (ToolChain.getArch() == llvm::Triple::mips64el)
+  else if (Arch == llvm::Triple::mips64el)
     CmdArgs.push_back("-EL");
 
   if (!Args.hasArg(options::OPT_nostdlib, options::OPT_shared)) {
@@ -125,7 +147,7 @@ void openbsd::Linker::ConstructJob(Compilation &C, const JobAction &JA,
     CmdArgs.push_back("-Bdynamic");
     if (Args.hasArg(options::OPT_shared)) {
       CmdArgs.push_back("-shared");
-    } else {
+    } else if (!Args.hasArg(options::OPT_r)) {
       CmdArgs.push_back("-dynamic-linker");
       CmdArgs.push_back("/usr/libexec/ld.so");
     }
@@ -136,6 +158,9 @@ void openbsd::Linker::ConstructJob(Compilation &C, const JobAction &JA,
   if (Args.hasArg(options::OPT_nopie) || Args.hasArg(options::OPT_pg))
     CmdArgs.push_back("-nopie");
 
+  if (Arch == llvm::Triple::riscv64)
+    CmdArgs.push_back("-X");
+
   if (Output.isFilename()) {
     CmdArgs.push_back("-o");
     CmdArgs.push_back(Output.getFilename());
@@ -143,7 +168,8 @@ void openbsd::Linker::ConstructJob(Compilation &C, const JobAction &JA,
     assert(Output.isNothing() && "Invalid output.");
   }
 
-  if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nostartfiles)) {
+  if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nostartfiles,
+                   options::OPT_r)) {
     const char *crt0 = nullptr;
     const char *crtbegin = nullptr;
     if (!Args.hasArg(options::OPT_shared)) {
@@ -174,7 +200,8 @@ void openbsd::Linker::ConstructJob(Compilation &C, const JobAction &JA,
   bool NeedsXRayDeps = addXRayRuntime(ToolChain, Args, CmdArgs);
   AddLinkerInputs(ToolChain, Inputs, Args, CmdArgs, JA);
 
-  if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nodefaultlibs)) {
+  if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nodefaultlibs,
+                   options::OPT_r)) {
     // Use the static OpenMP runtime with -static-openmp
     bool StaticOpenMP = Args.hasArg(options::OPT_static_openmp) &&
                         !Args.hasArg(options::OPT_static);
@@ -217,7 +244,8 @@ void openbsd::Linker::ConstructJob(Compilation &C, const JobAction &JA,
     CmdArgs.push_back("-lcompiler_rt");
   }
 
-  if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nostartfiles)) {
+  if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nostartfiles,
+                   options::OPT_r)) {
     const char *crtend = nullptr;
     if (!Args.hasArg(options::OPT_shared))
       crtend = "crtend.o";
@@ -260,7 +288,7 @@ SanitizerMask OpenBSD::getSupportedSanitizers() const {
 OpenBSD::OpenBSD(const Driver &D, const llvm::Triple &Triple,
                  const ArgList &Args)
     : Generic_ELF(D, Triple, Args) {
-  getFilePaths().push_back(getDriver().SysRoot + "/usr/lib");
+  getFilePaths().push_back(concat(getDriver().SysRoot, "/usr/lib"));
 }
 
 void OpenBSD::AddClangSystemIncludeArgs(
@@ -293,13 +321,14 @@ void OpenBSD::AddClangSystemIncludeArgs(
     return;
   }
 
-  addExternCSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/usr/include");
+  addExternCSystemInclude(DriverArgs, CC1Args,
+                          concat(D.SysRoot, "/usr/include"));
 }
 
 void OpenBSD::addLibCxxIncludePaths(const llvm::opt::ArgList &DriverArgs,
                                     llvm::opt::ArgStringList &CC1Args) const {
   addSystemInclude(DriverArgs, CC1Args,
-                   getDriver().SysRoot + "/usr/include/c++/v1");
+                   concat(getDriver().SysRoot, "/usr/include/c++/v1"));
 }
 
 void OpenBSD::AddCXXStdlibLibArgs(const ArgList &Args,
@@ -307,26 +336,27 @@ void OpenBSD::AddCXXStdlibLibArgs(const ArgList &Args,
   bool Profiling = Args.hasArg(options::OPT_pg);
 
   CmdArgs.push_back(Profiling ? "-lc++_p" : "-lc++");
+  if (Args.hasArg(options::OPT_fexperimental_library))
+    CmdArgs.push_back("-lc++experimental");
   CmdArgs.push_back(Profiling ? "-lc++abi_p" : "-lc++abi");
   CmdArgs.push_back(Profiling ? "-lpthread_p" : "-lpthread");
 }
 
-std::string OpenBSD::getCompilerRT(const ArgList &Args,
-                                   StringRef Component,
+std::string OpenBSD::getCompilerRT(const ArgList &Args, StringRef Component,
                                    FileType Type) const {
   if (Component == "builtins") {
     SmallString<128> Path(getDriver().SysRoot);
     llvm::sys::path::append(Path, "/usr/lib/libcompiler_rt.a");
     return std::string(Path.str());
-  } else {
-    SmallString<128> P(getDriver().ResourceDir);
-    std::string CRTBasename =
-        buildCompilerRTBasename(Args, Component, Type, /*AddArch=*/false);
-    llvm::sys::path::append(P, "lib", CRTBasename);
-    if (getVFS().exists(P))
-      return std::string(P.str());
-    return ToolChain::getCompilerRT(Args, Component, Type);
   }
+  SmallString<128> P(getDriver().ResourceDir);
+  std::string CRTBasename =
+      buildCompilerRTBasename(Args, Component, Type, /*AddArch=*/false);
+  llvm::sys::path::append(P, "lib", CRTBasename);
+  // Checks if this is the base system case which uses a different location.
+  if (getVFS().exists(P))
+    return std::string(P.str());
+  return ToolChain::getCompilerRT(Args, Component, Type);
 }
 
 Tool *OpenBSD::buildAssembler() const {
@@ -336,3 +366,13 @@ Tool *OpenBSD::buildAssembler() const {
 Tool *OpenBSD::buildLinker() const { return new tools::openbsd::Linker(*this); }
 
 bool OpenBSD::HasNativeLLVMSupport() const { return true; }
+
+ToolChain::UnwindTableLevel
+OpenBSD::getDefaultUnwindTableLevel(const ArgList &Args) const {
+  switch (getArch()) {
+  case llvm::Triple::arm:
+    return UnwindTableLevel::None;
+  default:
+    return UnwindTableLevel::Asynchronous;
+  }
+}
diff --git a/gnu/llvm/clang/lib/Driver/ToolChains/OpenBSD.h b/gnu/llvm/clang/lib/Driver/ToolChains/OpenBSD.h
index ec3a056dcdf..b7d3d1b5b6d 100644
--- a/gnu/llvm/clang/lib/Driver/ToolChains/OpenBSD.h
+++ b/gnu/llvm/clang/lib/Driver/ToolChains/OpenBSD.h
@@ -59,7 +59,9 @@ public:
 
   bool IsMathErrnoDefault() const override { return false; }
   bool IsObjCNonFragileABIDefault() const override { return true; }
-  bool isPIEDefault() const override { return true; }
+  bool isPIEDefault(const llvm::opt::ArgList &Args) const override {
+    return true;
+  }
 
   RuntimeLibType GetDefaultRuntimeLibType() const override {
     return ToolChain::RLT_CompilerRT;
@@ -80,14 +82,8 @@ public:
   std::string getCompilerRT(const llvm::opt::ArgList &Args, StringRef Component,
                             FileType Type = ToolChain::FT_Static) const override;
 
-  bool IsUnwindTablesDefault(const llvm::opt::ArgList &Args) const override {
-    switch (getArch()) {
-      case llvm::Triple::arm:
-        return false;
-      default:
-        return true;
-    }
-  }
+  UnwindTableLevel
+  getDefaultUnwindTableLevel(const llvm::opt::ArgList &Args) const override;
 
   LangOptions::StackProtectorMode
   GetDefaultStackProtectorLevel(bool KernelOrKext) const override {
diff --git a/gnu/llvm/clang/lib/Frontend/CompilerInstance.cpp b/gnu/llvm/clang/lib/Frontend/CompilerInstance.cpp
index c642af1849b..ac9f8f8ed51 100644
--- a/gnu/llvm/clang/lib/Frontend/CompilerInstance.cpp
+++ b/gnu/llvm/clang/lib/Frontend/CompilerInstance.cpp
@@ -12,6 +12,7 @@
 #include "clang/AST/Decl.h"
 #include "clang/Basic/CharInfo.h"
 #include "clang/Basic/Diagnostic.h"
+#include "clang/Basic/DiagnosticOptions.h"
 #include "clang/Basic/FileManager.h"
 #include "clang/Basic/LangStandard.h"
 #include "clang/Basic/SourceManager.h"
@@ -23,7 +24,9 @@
 #include "clang/Frontend/FrontendAction.h"
 #include "clang/Frontend/FrontendActions.h"
 #include "clang/Frontend/FrontendDiagnostic.h"
+#include "clang/Frontend/FrontendPluginRegistry.h"
 #include "clang/Frontend/LogDiagnosticPrinter.h"
+#include "clang/Frontend/SARIFDiagnosticPrinter.h"
 #include "clang/Frontend/SerializedDiagnosticPrinter.h"
 #include "clang/Frontend/TextDiagnosticPrinter.h"
 #include "clang/Frontend/Utils.h"
@@ -36,7 +39,9 @@
 #include "clang/Serialization/ASTReader.h"
 #include "clang/Serialization/GlobalModuleIndex.h"
 #include "clang/Serialization/InMemoryModuleCache.h"
+#include "llvm/ADT/ScopeExit.h"
 #include "llvm/ADT/Statistic.h"
+#include "llvm/Config/llvm-config.h"
 #include "llvm/Support/BuryPointer.h"
 #include "llvm/Support/CrashRecoveryContext.h"
 #include "llvm/Support/Errc.h"
@@ -50,6 +55,7 @@
 #include "llvm/Support/TimeProfiler.h"
 #include "llvm/Support/Timer.h"
 #include "llvm/Support/raw_ostream.h"
+#include <optional>
 #include <time.h>
 #include <utility>
 
@@ -113,20 +119,20 @@ bool CompilerInstance::createTarget() {
     auto TO = std::make_shared<TargetOptions>();
     TO->Triple = llvm::Triple::normalize(getFrontendOpts().AuxTriple);
     if (getFrontendOpts().AuxTargetCPU)
-      TO->CPU = getFrontendOpts().AuxTargetCPU.getValue();
+      TO->CPU = *getFrontendOpts().AuxTargetCPU;
     if (getFrontendOpts().AuxTargetFeatures)
-      TO->FeaturesAsWritten = getFrontendOpts().AuxTargetFeatures.getValue();
+      TO->FeaturesAsWritten = *getFrontendOpts().AuxTargetFeatures;
     TO->HostTriple = getTarget().getTriple().str();
     setAuxTarget(TargetInfo::CreateTargetInfo(getDiagnostics(), TO));
   }
 
   if (!getTarget().hasStrictFP() && !getLangOpts().ExpStrictFP) {
-    if (getLangOpts().getFPRoundingMode() !=
-        llvm::RoundingMode::NearestTiesToEven) {
+    if (getLangOpts().RoundingMath) {
       getDiagnostics().Report(diag::warn_fe_backend_unsupported_fp_rounding);
-      getLangOpts().setFPRoundingMode(llvm::RoundingMode::NearestTiesToEven);
+      getLangOpts().RoundingMath = false;
     }
-    if (getLangOpts().getFPExceptionMode() != LangOptions::FPE_Ignore) {
+    auto FPExc = getLangOpts().getFPExceptionMode();
+    if (FPExc != LangOptions::FPE_Default && FPExc != LangOptions::FPE_Ignore) {
       getDiagnostics().Report(diag::warn_fe_backend_unsupported_fp_exceptions);
       getLangOpts().setFPExceptionMode(LangOptions::FPE_Ignore);
     }
@@ -230,7 +236,7 @@ static void collectIncludePCH(CompilerInstance &CI,
 
   StringRef PCHInclude = PPOpts.ImplicitPCHInclude;
   FileManager &FileMgr = CI.getFileManager();
-  auto PCHDir = FileMgr.getDirectory(PCHInclude);
+  auto PCHDir = FileMgr.getOptionalDirectoryRef(PCHInclude);
   if (!PCHDir) {
     MDC->addFile(PCHInclude);
     return;
@@ -238,7 +244,7 @@ static void collectIncludePCH(CompilerInstance &CI,
 
   std::error_code EC;
   SmallString<128> DirNative;
-  llvm::sys::path::native((*PCHDir)->getName(), DirNative);
+  llvm::sys::path::native(PCHDir->getName(), DirNative);
   llvm::vfs::FileSystem &FS = FileMgr.getVirtualFileSystem();
   SimpleASTReaderListener Validator(CI.getPreprocessor());
   for (llvm::vfs::directory_iterator Dir = FS.dir_begin(DirNative, EC), DirEnd;
@@ -247,7 +253,8 @@ static void collectIncludePCH(CompilerInstance &CI,
     // used here since we're not interested in validating the PCH at this time,
     // but only to check whether this is a file containing an AST.
     if (!ASTReader::readASTFileControlBlock(
-            Dir->path(), FileMgr, CI.getPCHContainerReader(),
+            Dir->path(), FileMgr, CI.getModuleCache(),
+            CI.getPCHContainerReader(),
             /*FindModuleFileExtensions=*/false, Validator,
             /*ValidateDiagnosticOptions=*/false))
       MDC->addFile(Dir->path());
@@ -344,6 +351,8 @@ CompilerInstance::createDiagnostics(DiagnosticOptions *Opts,
   // implementing -verify.
   if (Client) {
     Diags->setClient(Client, ShouldOwnClient);
+  } else if (Opts->getFormat() == DiagnosticOptions::SARIF) {
+    Diags->setClient(new SARIFDiagnosticPrinter(llvm::errs(), Opts));
   } else
     Diags->setClient(new TextDiagnosticPrinter(llvm::errs(), Opts));
 
@@ -417,7 +426,7 @@ static void InitializeFileRemapping(DiagnosticsEngine &Diags,
   // Remap files in the source manager (with other files).
   for (const auto &RF : InitOpts.RemappedFiles) {
     // Find the file that we're mapping to.
-    auto ToFile = FileMgr.getFile(RF.second);
+    OptionalFileEntryRef ToFile = FileMgr.getOptionalFileRef(RF.second);
     if (!ToFile) {
       Diags.Report(diag::err_fe_remap_missing_to_file) << RF.first << RF.second;
       continue;
@@ -425,7 +434,7 @@ static void InitializeFileRemapping(DiagnosticsEngine &Diags,
 
     // Create the file entry for the file that we're mapping from.
     const FileEntry *FromFile =
-        FileMgr.getVirtualFile(RF.first, (*ToFile)->getSize(), 0);
+        FileMgr.getVirtualFile(RF.first, ToFile->getSize(), 0);
     if (!FromFile) {
       Diags.Report(diag::err_fe_remap_missing_from_file) << RF.first;
       continue;
@@ -558,6 +567,54 @@ void CompilerInstance::createASTContext() {
 
 // ExternalASTSource
 
+namespace {
+// Helper to recursively read the module names for all modules we're adding.
+// We mark these as known and redirect any attempt to load that module to
+// the files we were handed.
+struct ReadModuleNames : ASTReaderListener {
+  Preprocessor &PP;
+  llvm::SmallVector<std::string, 8> LoadedModules;
+
+  ReadModuleNames(Preprocessor &PP) : PP(PP) {}
+
+  void ReadModuleName(StringRef ModuleName) override {
+    // Keep the module name as a string for now. It's not safe to create a new
+    // IdentifierInfo from an ASTReader callback.
+    LoadedModules.push_back(ModuleName.str());
+  }
+
+  void registerAll() {
+    ModuleMap &MM = PP.getHeaderSearchInfo().getModuleMap();
+    for (const std::string &LoadedModule : LoadedModules)
+      MM.cacheModuleLoad(*PP.getIdentifierInfo(LoadedModule),
+                         MM.findModule(LoadedModule));
+    LoadedModules.clear();
+  }
+
+  void markAllUnavailable() {
+    for (const std::string &LoadedModule : LoadedModules) {
+      if (Module *M = PP.getHeaderSearchInfo().getModuleMap().findModule(
+              LoadedModule)) {
+        M->HasIncompatibleModuleFile = true;
+
+        // Mark module as available if the only reason it was unavailable
+        // was missing headers.
+        SmallVector<Module *, 2> Stack;
+        Stack.push_back(M);
+        while (!Stack.empty()) {
+          Module *Current = Stack.pop_back_val();
+          if (Current->IsUnimportable) continue;
+          Current->IsAvailable = true;
+          Stack.insert(Stack.end(),
+                       Current->submodule_begin(), Current->submodule_end());
+        }
+      }
+    }
+    LoadedModules.clear();
+  }
+};
+} // namespace
+
 void CompilerInstance::createPCHExternalASTSource(
     StringRef Path, DisableValidationForModuleKind DisableValidation,
     bool AllowPCHWithCompilerErrors, void *DeserializationListener,
@@ -602,6 +659,11 @@ IntrusiveRefCntPtr<ASTReader> CompilerInstance::createPCHExternalASTSource(
   for (auto &Listener : DependencyCollectors)
     Listener->attachToASTReader(*Reader);
 
+  auto Listener = std::make_unique<ReadModuleNames>(PP);
+  auto &ListenerRef = *Listener;
+  ASTReader::ListenerScope ReadModuleNamesListener(*Reader,
+                                                   std::move(Listener));
+
   switch (Reader->ReadAST(Path,
                           Preamble ? serialization::MK_Preamble
                                    : serialization::MK_PCH,
@@ -611,6 +673,7 @@ IntrusiveRefCntPtr<ASTReader> CompilerInstance::createPCHExternalASTSource(
     // Set the predefines buffer as suggested by the PCH reader. Typically, the
     // predefines buffer will be empty.
     PP.setPredefines(Reader->getSuggestedPredefines());
+    ListenerRef.registerAll();
     return Reader;
 
   case ASTReader::Failure:
@@ -626,6 +689,7 @@ IntrusiveRefCntPtr<ASTReader> CompilerInstance::createPCHExternalASTSource(
     break;
   }
 
+  ListenerRef.markAllUnavailable();
   Context.setExternalSource(nullptr);
   return nullptr;
 }
@@ -653,13 +717,10 @@ static bool EnableCodeCompletion(Preprocessor &PP,
 void CompilerInstance::createCodeCompletionConsumer() {
   const ParsedSourceLocation &Loc = getFrontendOpts().CodeCompletionAt;
   if (!CompletionConsumer) {
-    setCodeCompletionConsumer(
-      createCodeCompletionConsumer(getPreprocessor(),
-                                   Loc.FileName, Loc.Line, Loc.Column,
-                                   getFrontendOpts().CodeCompleteOpts,
-                                   llvm::outs()));
-    if (!CompletionConsumer)
-      return;
+    setCodeCompletionConsumer(createCodeCompletionConsumer(
+        getPreprocessor(), Loc.FileName, Loc.Line, Loc.Column,
+        getFrontendOpts().CodeCompleteOpts, llvm::outs()));
+    return;
   } else if (EnableCodeCompletion(getPreprocessor(), Loc.FileName,
                                   Loc.Line, Loc.Column)) {
     setCodeCompletionConsumer(nullptr);
@@ -703,6 +764,8 @@ void CompilerInstance::createSema(TranslationUnitKind TUKind,
 // Output Files
 
 void CompilerInstance::clearOutputFiles(bool EraseFiles) {
+  // The ASTConsumer can own streams that write to the output files.
+  assert(!hasASTConsumer() && "ASTConsumer should be reset");
   // Ignore errors that occur when trying to discard the temp file.
   for (OutputFile &OF : OutputFiles) {
     if (EraseFiles) {
@@ -721,12 +784,7 @@ void CompilerInstance::clearOutputFiles(bool EraseFiles) {
       continue;
     }
 
-    // If '-working-directory' was passed, the output filename should be
-    // relative to that.
-    SmallString<128> NewOutFile(OF.Filename);
-    FileMgr->FixupRelativePath(NewOutFile);
-
-    llvm::Error E = OF.File->keep(NewOutFile);
+    llvm::Error E = OF.File->keep(OF.Filename);
     if (!E)
       continue;
 
@@ -747,7 +805,7 @@ std::unique_ptr<raw_pwrite_stream> CompilerInstance::createDefaultOutputFile(
     bool Binary, StringRef InFile, StringRef Extension, bool RemoveFileOnSignal,
     bool CreateMissingDirectories, bool ForceUseTemporary) {
   StringRef OutputPath = getFrontendOpts().OutputFile;
-  Optional<SmallString<128>> PathStorage;
+  std::optional<SmallString<128>> PathStorage;
   if (OutputPath.empty()) {
     if (InFile == "-" || Extension.empty()) {
       OutputPath = "-";
@@ -789,8 +847,17 @@ CompilerInstance::createOutputFileImpl(StringRef OutputPath, bool Binary,
   assert((!CreateMissingDirectories || UseTemporary) &&
          "CreateMissingDirectories is only allowed when using temporary files");
 
+  // If '-working-directory' was passed, the output filename should be
+  // relative to that.
+  std::optional<SmallString<128>> AbsPath;
+  if (OutputPath != "-" && !llvm::sys::path::is_absolute(OutputPath)) {
+    AbsPath.emplace(OutputPath);
+    FileMgr->FixupRelativePath(*AbsPath);
+    OutputPath = *AbsPath;
+  }
+
   std::unique_ptr<llvm::raw_fd_ostream> OS;
-  Optional<StringRef> OSFile;
+  std::optional<StringRef> OSFile;
 
   if (UseTemporary) {
     if (OutputPath == "-")
@@ -812,7 +879,7 @@ CompilerInstance::createOutputFileImpl(StringRef OutputPath, bool Binary,
     }
   }
 
-  Optional<llvm::sys::fs::TempFile> Temp;
+  std::optional<llvm::sys::fs::TempFile> Temp;
   if (UseTemporary) {
     // Create a temporary file.
     // Insert -%%%%%%%% before the extension (if any), and because some tools
@@ -940,6 +1007,11 @@ bool CompilerInstance::ExecuteAction(FrontendAction &Act) {
   // DesiredStackSpace available.
   noteBottomOfStack();
 
+  auto FinishDiagnosticClient = llvm::make_scope_exit([&]() {
+    // Notify the diagnostic client that all files were processed.
+    getDiagnosticClient().finish();
+  });
+
   raw_ostream &OS = getVerboseOutputStream();
 
   if (!Act.PrepareToExecute(*this))
@@ -954,9 +1026,9 @@ bool CompilerInstance::ExecuteAction(FrontendAction &Act) {
 
   // Validate/process some options.
   if (getHeaderSearchOpts().Verbose)
-    OS << "clang -cc1 version " CLANG_VERSION_STRING
-       << " based upon " << BACKEND_PACKAGE_STRING
-       << " default target " << llvm::sys::getDefaultTargetTriple() << "\n";
+    OS << "clang -cc1 version " CLANG_VERSION_STRING << " based upon LLVM "
+       << LLVM_VERSION_STRING << " default target "
+       << llvm::sys::getDefaultTargetTriple() << "\n";
 
   if (getCodeGenOpts().TimePasses)
     createFrontendTimer();
@@ -978,9 +1050,6 @@ bool CompilerInstance::ExecuteAction(FrontendAction &Act) {
     }
   }
 
-  // Notify the diagnostic client that all files were processed.
-  getDiagnostics().getClient()->finish();
-
   if (getDiagnosticOpts().ShowCarets) {
     // We can have multiple diagnostics sharing one diagnostic client.
     // Get the total number of warnings/errors from the client.
@@ -1029,6 +1098,27 @@ bool CompilerInstance::ExecuteAction(FrontendAction &Act) {
   return !getDiagnostics().getClient()->getNumErrors();
 }
 
+void CompilerInstance::LoadRequestedPlugins() {
+  // Load any requested plugins.
+  for (const std::string &Path : getFrontendOpts().Plugins) {
+    std::string Error;
+    if (llvm::sys::DynamicLibrary::LoadLibraryPermanently(Path.c_str(), &Error))
+      getDiagnostics().Report(diag::err_fe_unable_to_load_plugin)
+          << Path << Error;
+  }
+
+  // Check if any of the loaded plugins replaces the main AST action
+  for (const FrontendPluginRegistry::entry &Plugin :
+       FrontendPluginRegistry::entries()) {
+    std::unique_ptr<PluginASTAction> P(Plugin.instantiate());
+    if (P->getActionType() == PluginASTAction::ReplaceAction) {
+      getFrontendOpts().ProgramAction = clang::frontend::PluginAction;
+      getFrontendOpts().ActionName = Plugin.getName().str();
+      break;
+    }
+  }
+}
+
 /// Determine the appropriate source input kind based on language
 /// options.
 static Language getLanguageFromOptions(const LangOptions &LangOpts) {
@@ -1071,20 +1161,17 @@ compileModuleImpl(CompilerInstance &ImportingInstance, SourceLocation ImportLoc,
 
   // For any options that aren't intended to affect how a module is built,
   // reset them to their default values.
-  Invocation->getLangOpts()->resetNonModularOptions();
-  PPOpts.resetNonModularOptions();
+  Invocation->resetNonModularOptions();
 
   // Remove any macro definitions that are explicitly ignored by the module.
   // They aren't supposed to affect how the module is built anyway.
   HeaderSearchOptions &HSOpts = Invocation->getHeaderSearchOpts();
-  PPOpts.Macros.erase(
-      std::remove_if(PPOpts.Macros.begin(), PPOpts.Macros.end(),
-                     [&HSOpts](const std::pair<std::string, bool> &def) {
-        StringRef MacroDef = def.first;
-        return HSOpts.ModulesIgnoreMacros.count(
-                   llvm::CachedHashString(MacroDef.split('=').first)) > 0;
-      }),
-      PPOpts.Macros.end());
+  llvm::erase_if(PPOpts.Macros,
+                 [&HSOpts](const std::pair<std::string, bool> &def) {
+                   StringRef MacroDef = def.first;
+                   return HSOpts.ModulesIgnoreMacros.contains(
+                       llvm::CachedHashString(MacroDef.split('=').first));
+                 });
 
   // If the original compiler invocation had -fmodule-name, pass it through.
   Invocation->getLangOpts()->ModuleName =
@@ -1136,11 +1223,16 @@ compileModuleImpl(CompilerInstance &ImportingInstance, SourceLocation ImportLoc,
                                    ImportingInstance.getDiagnosticClient()),
                              /*ShouldOwnClient=*/true);
 
-  // Note that this module is part of the module build stack, so that we
-  // can detect cycles in the module graph.
-  Instance.setFileManager(&ImportingInstance.getFileManager());
+  if (FrontendOpts.ModulesShareFileManager) {
+    Instance.setFileManager(&ImportingInstance.getFileManager());
+  } else {
+    Instance.createFileManager(&ImportingInstance.getVirtualFileSystem());
+  }
   Instance.createSourceManager(Instance.getFileManager());
   SourceManager &SourceMgr = Instance.getSourceManager();
+
+  // Note that this module is part of the module build stack, so that we
+  // can detect cycles in the module graph.
   SourceMgr.setModuleBuildStack(
     ImportingInstance.getSourceManager().getModuleBuildStack());
   SourceMgr.pushModuleBuildStack(ModuleName,
@@ -1160,8 +1252,7 @@ compileModuleImpl(CompilerInstance &ImportingInstance, SourceLocation ImportLoc,
 
   // Execute the action to actually build the module in-place. Use a separate
   // thread so that we get a stack large enough.
-  llvm::CrashRecoveryContext CRC;
-  CRC.RunSafelyOnThread(
+  bool Crashed = !llvm::CrashRecoveryContext().RunSafelyOnThread(
       [&]() {
         GenerateModuleFromModuleMapAction Action;
         Instance.ExecuteAction(Action);
@@ -1174,9 +1265,15 @@ compileModuleImpl(CompilerInstance &ImportingInstance, SourceLocation ImportLoc,
                                             diag::remark_module_build_done)
     << ModuleName;
 
-  // Delete any remaining temporary files related to Instance, in case the
-  // module generation thread crashed.
-  Instance.clearOutputFiles(/*EraseFiles=*/true);
+  if (Crashed) {
+    // Clear the ASTConsumer if it hasn't been already, in case it owns streams
+    // that must be closed before clearing output files.
+    Instance.setSema(nullptr);
+    Instance.setASTConsumer(nullptr);
+
+    // Delete any remaining temporary files related to Instance.
+    Instance.clearOutputFiles(/*EraseFiles=*/true);
+  }
 
   // If \p AllowPCMWithCompilerErrors is set return 'success' even if errors
   // occurred.
@@ -1184,19 +1281,17 @@ compileModuleImpl(CompilerInstance &ImportingInstance, SourceLocation ImportLoc,
          Instance.getFrontendOpts().AllowPCMWithCompilerErrors;
 }
 
-static const FileEntry *getPublicModuleMap(const FileEntry *File,
-                                           FileManager &FileMgr) {
-  StringRef Filename = llvm::sys::path::filename(File->getName());
-  SmallString<128> PublicFilename(File->getDir()->getName());
+static OptionalFileEntryRef getPublicModuleMap(FileEntryRef File,
+                                               FileManager &FileMgr) {
+  StringRef Filename = llvm::sys::path::filename(File.getName());
+  SmallString<128> PublicFilename(File.getDir().getName());
   if (Filename == "module_private.map")
     llvm::sys::path::append(PublicFilename, "module.map");
   else if (Filename == "module.private.modulemap")
     llvm::sys::path::append(PublicFilename, "module.modulemap");
   else
-    return nullptr;
-  if (auto FE = FileMgr.getFile(PublicFilename))
-    return *FE;
-  return nullptr;
+    return std::nullopt;
+  return FileMgr.getOptionalFileRef(PublicFilename);
 }
 
 /// Compile a module file for the given module in a separate compiler instance,
@@ -1212,21 +1307,22 @@ static bool compileModule(CompilerInstance &ImportingInstance,
   ModuleMap &ModMap
     = ImportingInstance.getPreprocessor().getHeaderSearchInfo().getModuleMap();
   bool Result;
-  if (const FileEntry *ModuleMapFile =
+  if (OptionalFileEntryRef ModuleMapFile =
           ModMap.getContainingModuleMapFile(Module)) {
     // Canonicalize compilation to start with the public module map. This is
     // vital for submodules declarations in the private module maps to be
     // correctly parsed when depending on a top level module in the public one.
-    if (const FileEntry *PublicMMFile = getPublicModuleMap(
-            ModuleMapFile, ImportingInstance.getFileManager()))
+    if (OptionalFileEntryRef PublicMMFile = getPublicModuleMap(
+            *ModuleMapFile, ImportingInstance.getFileManager()))
       ModuleMapFile = PublicMMFile;
 
+    StringRef ModuleMapFilePath = ModuleMapFile->getNameAsRequested();
+
     // Use the module map where this module resides.
     Result = compileModuleImpl(
         ImportingInstance, ImportLoc, Module->getTopLevelModuleName(),
-        FrontendInputFile(ModuleMapFile->getName(), IK, +Module->IsSystem),
-        ModMap.getModuleMapFileForUniquing(Module)->getName(),
-        ModuleFileName);
+        FrontendInputFile(ModuleMapFilePath, IK, +Module->IsSystem),
+        ModMap.getModuleMapFileForUniquing(Module)->getName(), ModuleFileName);
   } else {
     // FIXME: We only need to fake up an input file here as a way of
     // transporting the module's directory to the module map parser. We should
@@ -1248,7 +1344,7 @@ static bool compileModule(CompilerInstance &ImportingInstance,
         [&](CompilerInstance &Instance) {
       std::unique_ptr<llvm::MemoryBuffer> ModuleMapBuffer =
           llvm::MemoryBuffer::getMemBuffer(InferredModuleMapContent);
-      ModuleMapFile = Instance.getFileManager().getVirtualFile(
+      const FileEntry *ModuleMapFile = Instance.getFileManager().getVirtualFile(
           FakeModuleMapFile, InferredModuleMapContent.size(), 0);
       Instance.getSourceManager().overrideFileContents(
           ModuleMapFile, std::move(ModuleMapBuffer));
@@ -1264,31 +1360,82 @@ static bool compileModule(CompilerInstance &ImportingInstance,
   return Result;
 }
 
+/// Read the AST right after compiling the module.
+static bool readASTAfterCompileModule(CompilerInstance &ImportingInstance,
+                                      SourceLocation ImportLoc,
+                                      SourceLocation ModuleNameLoc,
+                                      Module *Module, StringRef ModuleFileName,
+                                      bool *OutOfDate) {
+  DiagnosticsEngine &Diags = ImportingInstance.getDiagnostics();
+
+  unsigned ModuleLoadCapabilities = ASTReader::ARR_Missing;
+  if (OutOfDate)
+    ModuleLoadCapabilities |= ASTReader::ARR_OutOfDate;
+
+  // Try to read the module file, now that we've compiled it.
+  ASTReader::ASTReadResult ReadResult =
+      ImportingInstance.getASTReader()->ReadAST(
+          ModuleFileName, serialization::MK_ImplicitModule, ImportLoc,
+          ModuleLoadCapabilities);
+  if (ReadResult == ASTReader::Success)
+    return true;
+
+  // The caller wants to handle out-of-date failures.
+  if (OutOfDate && ReadResult == ASTReader::OutOfDate) {
+    *OutOfDate = true;
+    return false;
+  }
+
+  // The ASTReader didn't diagnose the error, so conservatively report it.
+  if (ReadResult == ASTReader::Missing || !Diags.hasErrorOccurred())
+    Diags.Report(ModuleNameLoc, diag::err_module_not_built)
+      << Module->Name << SourceRange(ImportLoc, ModuleNameLoc);
+
+  return false;
+}
+
 /// Compile a module in a separate compiler instance and read the AST,
 /// returning true if the module compiles without errors.
+static bool compileModuleAndReadASTImpl(CompilerInstance &ImportingInstance,
+                                        SourceLocation ImportLoc,
+                                        SourceLocation ModuleNameLoc,
+                                        Module *Module,
+                                        StringRef ModuleFileName) {
+  if (!compileModule(ImportingInstance, ModuleNameLoc, Module,
+                     ModuleFileName)) {
+    ImportingInstance.getDiagnostics().Report(ModuleNameLoc,
+                                              diag::err_module_not_built)
+        << Module->Name << SourceRange(ImportLoc, ModuleNameLoc);
+    return false;
+  }
+
+  return readASTAfterCompileModule(ImportingInstance, ImportLoc, ModuleNameLoc,
+                                   Module, ModuleFileName,
+                                   /*OutOfDate=*/nullptr);
+}
+
+/// Compile a module in a separate compiler instance and read the AST,
+/// returning true if the module compiles without errors, using a lock manager
+/// to avoid building the same module in multiple compiler instances.
 ///
 /// Uses a lock file manager and exponential backoff to reduce the chances that
 /// multiple instances will compete to create the same module.  On timeout,
 /// deletes the lock file in order to avoid deadlock from crashing processes or
 /// bugs in the lock file manager.
-static bool compileModuleAndReadAST(CompilerInstance &ImportingInstance,
-                                    SourceLocation ImportLoc,
-                                    SourceLocation ModuleNameLoc,
-                                    Module *Module, StringRef ModuleFileName) {
+static bool compileModuleAndReadASTBehindLock(
+    CompilerInstance &ImportingInstance, SourceLocation ImportLoc,
+    SourceLocation ModuleNameLoc, Module *Module, StringRef ModuleFileName) {
   DiagnosticsEngine &Diags = ImportingInstance.getDiagnostics();
 
-  auto diagnoseBuildFailure = [&] {
-    Diags.Report(ModuleNameLoc, diag::err_module_not_built)
-        << Module->Name << SourceRange(ImportLoc, ModuleNameLoc);
-  };
+  Diags.Report(ModuleNameLoc, diag::remark_module_lock)
+      << ModuleFileName << Module->Name;
 
   // FIXME: have LockFileManager return an error_code so that we can
   // avoid the mkdir when the directory already exists.
   StringRef Dir = llvm::sys::path::parent_path(ModuleFileName);
   llvm::sys::fs::create_directories(Dir);
 
-  while (1) {
-    unsigned ModuleLoadCapabilities = ASTReader::ARR_Missing;
+  while (true) {
     llvm::LockFileManager Locked(ModuleFileName);
     switch (Locked) {
     case llvm::LockFileManager::LFS_Error:
@@ -1299,61 +1446,67 @@ static bool compileModuleAndReadAST(CompilerInstance &ImportingInstance,
           << Module->Name << Locked.getErrorMessage();
       // Clear out any potential leftover.
       Locked.unsafeRemoveLockFile();
-      LLVM_FALLTHROUGH;
+      [[fallthrough]];
     case llvm::LockFileManager::LFS_Owned:
       // We're responsible for building the module ourselves.
-      if (!compileModule(ImportingInstance, ModuleNameLoc, Module,
-                         ModuleFileName)) {
-        diagnoseBuildFailure();
-        return false;
-      }
-      break;
+      return compileModuleAndReadASTImpl(ImportingInstance, ImportLoc,
+                                         ModuleNameLoc, Module, ModuleFileName);
 
     case llvm::LockFileManager::LFS_Shared:
-      // Someone else is responsible for building the module. Wait for them to
-      // finish.
-      switch (Locked.waitForUnlock()) {
-      case llvm::LockFileManager::Res_Success:
-        ModuleLoadCapabilities |= ASTReader::ARR_OutOfDate;
-        break;
-      case llvm::LockFileManager::Res_OwnerDied:
-        continue; // try again to get the lock.
-      case llvm::LockFileManager::Res_Timeout:
-        // Since ModuleCache takes care of correctness, we try waiting for
-        // another process to complete the build so clang does not do it done
-        // twice. If case of timeout, build it ourselves.
-        Diags.Report(ModuleNameLoc, diag::remark_module_lock_timeout)
-            << Module->Name;
-        // Clear the lock file so that future invocations can make progress.
-        Locked.unsafeRemoveLockFile();
-        continue;
-      }
-      break;
+      break; // The interesting case.
     }
 
-    // Try to read the module file, now that we've compiled it.
-    ASTReader::ASTReadResult ReadResult =
-        ImportingInstance.getASTReader()->ReadAST(
-            ModuleFileName, serialization::MK_ImplicitModule, ImportLoc,
-            ModuleLoadCapabilities);
-
-    if (ReadResult == ASTReader::OutOfDate &&
-        Locked == llvm::LockFileManager::LFS_Shared) {
-      // The module may be out of date in the presence of file system races,
-      // or if one of its imports depends on header search paths that are not
-      // consistent with this ImportingInstance.  Try again...
+    // Someone else is responsible for building the module. Wait for them to
+    // finish.
+    switch (Locked.waitForUnlock()) {
+    case llvm::LockFileManager::Res_Success:
+      break; // The interesting case.
+    case llvm::LockFileManager::Res_OwnerDied:
+      continue; // try again to get the lock.
+    case llvm::LockFileManager::Res_Timeout:
+      // Since ModuleCache takes care of correctness, we try waiting for
+      // another process to complete the build so clang does not do it done
+      // twice. If case of timeout, build it ourselves.
+      Diags.Report(ModuleNameLoc, diag::remark_module_lock_timeout)
+          << Module->Name;
+      // Clear the lock file so that future invocations can make progress.
+      Locked.unsafeRemoveLockFile();
       continue;
-    } else if (ReadResult == ASTReader::Missing) {
-      diagnoseBuildFailure();
-    } else if (ReadResult != ASTReader::Success &&
-               !Diags.hasErrorOccurred()) {
-      // The ASTReader didn't diagnose the error, so conservatively report it.
-      diagnoseBuildFailure();
     }
-    return ReadResult == ASTReader::Success;
+
+    // Read the module that was just written by someone else.
+    bool OutOfDate = false;
+    if (readASTAfterCompileModule(ImportingInstance, ImportLoc, ModuleNameLoc,
+                                  Module, ModuleFileName, &OutOfDate))
+      return true;
+    if (!OutOfDate)
+      return false;
+
+    // The module may be out of date in the presence of file system races,
+    // or if one of its imports depends on header search paths that are not
+    // consistent with this ImportingInstance.  Try again...
   }
 }
 
+/// Compile a module in a separate compiler instance and read the AST,
+/// returning true if the module compiles without errors, potentially using a
+/// lock manager to avoid building the same module in multiple compiler
+/// instances.
+static bool compileModuleAndReadAST(CompilerInstance &ImportingInstance,
+                                    SourceLocation ImportLoc,
+                                    SourceLocation ModuleNameLoc,
+                                    Module *Module, StringRef ModuleFileName) {
+  return ImportingInstance.getInvocation()
+                 .getFrontendOpts()
+                 .BuildingImplicitModuleUsesLock
+             ? compileModuleAndReadASTBehindLock(ImportingInstance, ImportLoc,
+                                                 ModuleNameLoc, Module,
+                                                 ModuleFileName)
+             : compileModuleAndReadASTImpl(ImportingInstance, ImportLoc,
+                                           ModuleNameLoc, Module,
+                                           ModuleFileName);
+}
+
 /// Diagnose differences between the current definition of the given
 /// configuration macro and the definition provided on the command line.
 static void checkConfigMacro(Preprocessor &PP, StringRef ConfigMacro,
@@ -1555,52 +1708,6 @@ bool CompilerInstance::loadModuleFile(StringRef FileName) {
                *FrontendTimerGroup);
   llvm::TimeRegion TimeLoading(FrontendTimerGroup ? &Timer : nullptr);
 
-  // Helper to recursively read the module names for all modules we're adding.
-  // We mark these as known and redirect any attempt to load that module to
-  // the files we were handed.
-  struct ReadModuleNames : ASTReaderListener {
-    CompilerInstance &CI;
-    llvm::SmallVector<IdentifierInfo*, 8> LoadedModules;
-
-    ReadModuleNames(CompilerInstance &CI) : CI(CI) {}
-
-    void ReadModuleName(StringRef ModuleName) override {
-      LoadedModules.push_back(
-          CI.getPreprocessor().getIdentifierInfo(ModuleName));
-    }
-
-    void registerAll() {
-      ModuleMap &MM = CI.getPreprocessor().getHeaderSearchInfo().getModuleMap();
-      for (auto *II : LoadedModules)
-        MM.cacheModuleLoad(*II, MM.findModule(II->getName()));
-      LoadedModules.clear();
-    }
-
-    void markAllUnavailable() {
-      for (auto *II : LoadedModules) {
-        if (Module *M = CI.getPreprocessor()
-                            .getHeaderSearchInfo()
-                            .getModuleMap()
-                            .findModule(II->getName())) {
-          M->HasIncompatibleModuleFile = true;
-
-          // Mark module as available if the only reason it was unavailable
-          // was missing headers.
-          SmallVector<Module *, 2> Stack;
-          Stack.push_back(M);
-          while (!Stack.empty()) {
-            Module *Current = Stack.pop_back_val();
-            if (Current->IsUnimportable) continue;
-            Current->IsAvailable = true;
-            Stack.insert(Stack.end(),
-                         Current->submodule_begin(), Current->submodule_end());
-          }
-        }
-      }
-      LoadedModules.clear();
-    }
-  };
-
   // If we don't already have an ASTReader, create one now.
   if (!TheASTReader)
     createASTReader();
@@ -1612,7 +1719,7 @@ bool CompilerInstance::loadModuleFile(StringRef FileName) {
                                           SourceLocation())
         <= DiagnosticsEngine::Warning;
 
-  auto Listener = std::make_unique<ReadModuleNames>(*this);
+  auto Listener = std::make_unique<ReadModuleNames>(*PP);
   auto &ListenerRef = *Listener;
   ASTReader::ListenerScope ReadModuleNamesListener(*TheASTReader,
                                                    std::move(Listener));
@@ -1691,7 +1798,8 @@ ModuleLoadResult CompilerInstance::findOrCompileModuleAndReadAST(
     SourceLocation ModuleNameLoc, bool IsInclusionDirective) {
   // Search for a module with the given name.
   HeaderSearch &HS = PP->getHeaderSearchInfo();
-  Module *M = HS.lookupModule(ModuleName, true, !IsInclusionDirective);
+  Module *M =
+      HS.lookupModule(ModuleName, ImportLoc, true, !IsInclusionDirective);
 
   // Select the source and filename for loading the named module.
   std::string ModuleFilename;
@@ -1750,7 +1858,7 @@ ModuleLoadResult CompilerInstance::findOrCompileModuleAndReadAST(
 
     // A prebuilt module is indexed as a ModuleFile; the Module does not exist
     // until the first call to ReadAST.  Look it up now.
-    M = HS.lookupModule(ModuleName, true, !IsInclusionDirective);
+    M = HS.lookupModule(ModuleName, ImportLoc, true, !IsInclusionDirective);
 
     // Check whether M refers to the file in the prebuilt module path.
     if (M && M->getASTFile())
@@ -1776,7 +1884,7 @@ ModuleLoadResult CompilerInstance::findOrCompileModuleAndReadAST(
                               diag::warn_module_config_mismatch)
           << ModuleFilename;
     // Fall through to error out.
-    LLVM_FALLTHROUGH;
+    [[fallthrough]];
   case ASTReader::VersionMismatch:
   case ASTReader::HadErrors:
     ModuleLoader::HadFatalFailure = true;
@@ -1873,16 +1981,9 @@ CompilerInstance::loadModule(SourceLocation ImportLoc,
   } else if (ModuleName == getLangOpts().CurrentModule) {
     // This is the module we're building.
     Module = PP->getHeaderSearchInfo().lookupModule(
-        ModuleName, /*AllowSearch*/ true,
+        ModuleName, ImportLoc, /*AllowSearch*/ true,
         /*AllowExtraModuleMapSearch*/ !IsInclusionDirective);
-    /// FIXME: perhaps we should (a) look for a module using the module name
-    //  to file map (PrebuiltModuleFiles) and (b) diagnose if still not found?
-    //if (Module == nullptr) {
-    //  getDiagnostics().Report(ModuleNameLoc, diag::err_module_not_found)
-    //    << ModuleName;
-    //  DisableGeneratingGlobalModuleIndex = true;
-    //  return ModuleLoadResult();
-    //}
+
     MM.cacheModuleLoad(*Path[0].first, Module);
   } else {
     ModuleLoadResult Result = findOrCompileModuleAndReadAST(
@@ -1903,90 +2004,84 @@ CompilerInstance::loadModule(SourceLocation ImportLoc,
   // Verify that the rest of the module path actually corresponds to
   // a submodule.
   bool MapPrivateSubModToTopLevel = false;
-  if (Path.size() > 1) {
-    for (unsigned I = 1, N = Path.size(); I != N; ++I) {
-      StringRef Name = Path[I].first->getName();
-      clang::Module *Sub = Module->findSubmodule(Name);
-
-      // If the user is requesting Foo.Private and it doesn't exist, try to
-      // match Foo_Private and emit a warning asking for the user to write
-      // @import Foo_Private instead. FIXME: remove this when existing clients
-      // migrate off of Foo.Private syntax.
-      if (!Sub && PP->getLangOpts().ImplicitModules && Name == "Private" &&
-          Module == Module->getTopLevelModule()) {
-        SmallString<128> PrivateModule(Module->Name);
-        PrivateModule.append("_Private");
-
-        SmallVector<std::pair<IdentifierInfo *, SourceLocation>, 2> PrivPath;
-        auto &II = PP->getIdentifierTable().get(
-            PrivateModule, PP->getIdentifierInfo(Module->Name)->getTokenID());
-        PrivPath.push_back(std::make_pair(&II, Path[0].second));
-
-        if (PP->getHeaderSearchInfo().lookupModule(PrivateModule, true,
-                                                   !IsInclusionDirective))
-          Sub =
-              loadModule(ImportLoc, PrivPath, Visibility, IsInclusionDirective);
-        if (Sub) {
-          MapPrivateSubModToTopLevel = true;
-          if (!getDiagnostics().isIgnored(
-                  diag::warn_no_priv_submodule_use_toplevel, ImportLoc)) {
-            getDiagnostics().Report(Path[I].second,
-                                    diag::warn_no_priv_submodule_use_toplevel)
-                << Path[I].first << Module->getFullModuleName() << PrivateModule
-                << SourceRange(Path[0].second, Path[I].second)
-                << FixItHint::CreateReplacement(SourceRange(Path[0].second),
-                                                PrivateModule);
-            getDiagnostics().Report(Sub->DefinitionLoc,
-                                    diag::note_private_top_level_defined);
-          }
+  for (unsigned I = 1, N = Path.size(); I != N; ++I) {
+    StringRef Name = Path[I].first->getName();
+    clang::Module *Sub = Module->findSubmodule(Name);
+
+    // If the user is requesting Foo.Private and it doesn't exist, try to
+    // match Foo_Private and emit a warning asking for the user to write
+    // @import Foo_Private instead. FIXME: remove this when existing clients
+    // migrate off of Foo.Private syntax.
+    if (!Sub && Name == "Private" && Module == Module->getTopLevelModule()) {
+      SmallString<128> PrivateModule(Module->Name);
+      PrivateModule.append("_Private");
+
+      SmallVector<std::pair<IdentifierInfo *, SourceLocation>, 2> PrivPath;
+      auto &II = PP->getIdentifierTable().get(
+          PrivateModule, PP->getIdentifierInfo(Module->Name)->getTokenID());
+      PrivPath.push_back(std::make_pair(&II, Path[0].second));
+
+      if (PP->getHeaderSearchInfo().lookupModule(PrivateModule, ImportLoc, true,
+                                                 !IsInclusionDirective))
+        Sub = loadModule(ImportLoc, PrivPath, Visibility, IsInclusionDirective);
+      if (Sub) {
+        MapPrivateSubModToTopLevel = true;
+        PP->markClangModuleAsAffecting(Module);
+        if (!getDiagnostics().isIgnored(
+                diag::warn_no_priv_submodule_use_toplevel, ImportLoc)) {
+          getDiagnostics().Report(Path[I].second,
+                                  diag::warn_no_priv_submodule_use_toplevel)
+              << Path[I].first << Module->getFullModuleName() << PrivateModule
+              << SourceRange(Path[0].second, Path[I].second)
+              << FixItHint::CreateReplacement(SourceRange(Path[0].second),
+                                              PrivateModule);
+          getDiagnostics().Report(Sub->DefinitionLoc,
+                                  diag::note_private_top_level_defined);
         }
       }
+    }
 
-      if (!Sub) {
-        // Attempt to perform typo correction to find a module name that works.
-        SmallVector<StringRef, 2> Best;
-        unsigned BestEditDistance = (std::numeric_limits<unsigned>::max)();
-
-        for (clang::Module::submodule_iterator J = Module->submodule_begin(),
-                                            JEnd = Module->submodule_end();
-             J != JEnd; ++J) {
-          unsigned ED = Name.edit_distance((*J)->Name,
-                                           /*AllowReplacements=*/true,
-                                           BestEditDistance);
-          if (ED <= BestEditDistance) {
-            if (ED < BestEditDistance) {
-              Best.clear();
-              BestEditDistance = ED;
-            }
-
-            Best.push_back((*J)->Name);
+    if (!Sub) {
+      // Attempt to perform typo correction to find a module name that works.
+      SmallVector<StringRef, 2> Best;
+      unsigned BestEditDistance = (std::numeric_limits<unsigned>::max)();
+
+      for (class Module *SubModule : Module->submodules()) {
+        unsigned ED =
+            Name.edit_distance(SubModule->Name,
+                               /*AllowReplacements=*/true, BestEditDistance);
+        if (ED <= BestEditDistance) {
+          if (ED < BestEditDistance) {
+            Best.clear();
+            BestEditDistance = ED;
           }
+
+          Best.push_back(SubModule->Name);
         }
+      }
 
-        // If there was a clear winner, user it.
-        if (Best.size() == 1) {
-          getDiagnostics().Report(Path[I].second,
-                                  diag::err_no_submodule_suggest)
+      // If there was a clear winner, user it.
+      if (Best.size() == 1) {
+        getDiagnostics().Report(Path[I].second, diag::err_no_submodule_suggest)
             << Path[I].first << Module->getFullModuleName() << Best[0]
-            << SourceRange(Path[0].second, Path[I-1].second)
+            << SourceRange(Path[0].second, Path[I - 1].second)
             << FixItHint::CreateReplacement(SourceRange(Path[I].second),
                                             Best[0]);
 
-          Sub = Module->findSubmodule(Best[0]);
-        }
+        Sub = Module->findSubmodule(Best[0]);
       }
+    }
 
-      if (!Sub) {
-        // No submodule by this name. Complain, and don't look for further
-        // submodules.
-        getDiagnostics().Report(Path[I].second, diag::err_no_submodule)
+    if (!Sub) {
+      // No submodule by this name. Complain, and don't look for further
+      // submodules.
+      getDiagnostics().Report(Path[I].second, diag::err_no_submodule)
           << Path[I].first << Module->getFullModuleName()
-          << SourceRange(Path[0].second, Path[I-1].second);
-        break;
-      }
-
-      Module = Sub;
+          << SourceRange(Path[0].second, Path[I - 1].second);
+      break;
     }
+
+    Module = Sub;
   }
 
   // Make the named module visible, if it's not already part of the module
@@ -2003,7 +2098,7 @@ CompilerInstance::loadModule(SourceLocation ImportLoc,
         << Module->getFullModuleName()
         << SourceRange(Path.front().second, Path.back().second);
 
-      return ModuleLoadResult::MissingExpected;
+      return ModuleLoadResult(Module, ModuleLoadResult::MissingExpected);
     }
 
     // Check whether this module is available.
@@ -2071,8 +2166,7 @@ void CompilerInstance::createModuleFromSource(SourceLocation ImportLoc,
     const FileEntry *ModuleMapFile = Other.getFileManager().getVirtualFile(
         ModuleMapFileName, NullTerminatedSource.size(), 0);
     Other.getSourceManager().overrideFileContents(
-        ModuleMapFile,
-        llvm::MemoryBuffer::getMemBuffer(NullTerminatedSource.c_str()));
+        ModuleMapFile, llvm::MemoryBuffer::getMemBuffer(NullTerminatedSource));
 
     Other.BuiltModules = std::move(BuiltModules);
     Other.DeleteBuiltModules = false;
diff --git a/gnu/llvm/clang/lib/Frontend/CompilerInvocation.cpp b/gnu/llvm/clang/lib/Frontend/CompilerInvocation.cpp
index efc51477725..f2fd34330cf 100644
--- a/gnu/llvm/clang/lib/Frontend/CompilerInvocation.cpp
+++ b/gnu/llvm/clang/lib/Frontend/CompilerInvocation.cpp
@@ -52,8 +52,6 @@
 #include "llvm/ADT/DenseSet.h"
 #include "llvm/ADT/FloatingPointMode.h"
 #include "llvm/ADT/Hashing.h"
-#include "llvm/ADT/None.h"
-#include "llvm/ADT/Optional.h"
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/SmallString.h"
 #include "llvm/ADT/SmallVector.h"
@@ -78,6 +76,7 @@
 #include "llvm/Support/ErrorHandling.h"
 #include "llvm/Support/ErrorOr.h"
 #include "llvm/Support/FileSystem.h"
+#include "llvm/Support/HashBuilder.h"
 #include "llvm/Support/Host.h"
 #include "llvm/Support/MathExtras.h"
 #include "llvm/Support/MemoryBuffer.h"
@@ -93,7 +92,11 @@
 #include <cassert>
 #include <cstddef>
 #include <cstring>
+#include <ctime>
+#include <fstream>
+#include <limits>
 #include <memory>
+#include <optional>
 #include <string>
 #include <tuple>
 #include <type_traits>
@@ -105,6 +108,20 @@ using namespace driver;
 using namespace options;
 using namespace llvm::opt;
 
+//===----------------------------------------------------------------------===//
+// Helpers.
+//===----------------------------------------------------------------------===//
+
+// Parse misexpect tolerance argument value.
+// Valid option values are integers in the range [0, 100)
+static Expected<std::optional<uint32_t>> parseToleranceOption(StringRef Arg) {
+  uint32_t Val;
+  if (Arg.getAsInteger(10, Val))
+    return llvm::createStringError(llvm::inconvertibleErrorCode(),
+                                   "Not an integer: %s", Arg.data());
+  return Val;
+}
+
 //===----------------------------------------------------------------------===//
 // Initialization.
 //===----------------------------------------------------------------------===//
@@ -152,21 +169,22 @@ CompilerInvocationRefBase::~CompilerInvocationRefBase() = default;
 #include "clang/Driver/Options.inc"
 #undef SIMPLE_ENUM_VALUE_TABLE
 
-static llvm::Optional<bool> normalizeSimpleFlag(OptSpecifier Opt,
-                                                unsigned TableIndex,
-                                                const ArgList &Args,
-                                                DiagnosticsEngine &Diags) {
+static std::optional<bool> normalizeSimpleFlag(OptSpecifier Opt,
+                                               unsigned TableIndex,
+                                               const ArgList &Args,
+                                               DiagnosticsEngine &Diags) {
   if (Args.hasArg(Opt))
     return true;
-  return None;
+  return std::nullopt;
 }
 
-static Optional<bool> normalizeSimpleNegativeFlag(OptSpecifier Opt, unsigned,
-                                                  const ArgList &Args,
-                                                  DiagnosticsEngine &) {
+static std::optional<bool> normalizeSimpleNegativeFlag(OptSpecifier Opt,
+                                                       unsigned,
+                                                       const ArgList &Args,
+                                                       DiagnosticsEngine &) {
   if (Args.hasArg(Opt))
     return false;
-  return None;
+  return std::nullopt;
 }
 
 /// The tblgen-erated code passes in a fifth parameter of an arbitrary type, but
@@ -181,18 +199,17 @@ static void denormalizeSimpleFlag(SmallVectorImpl<const char *> &Args,
 }
 
 template <typename T> static constexpr bool is_uint64_t_convertible() {
-  return !std::is_same<T, uint64_t>::value &&
-         llvm::is_integral_or_enum<T>::value;
+  return !std::is_same_v<T, uint64_t> && llvm::is_integral_or_enum<T>::value;
 }
 
 template <typename T,
           std::enable_if_t<!is_uint64_t_convertible<T>(), bool> = false>
 static auto makeFlagToValueNormalizer(T Value) {
   return [Value](OptSpecifier Opt, unsigned, const ArgList &Args,
-                 DiagnosticsEngine &) -> Optional<T> {
+                 DiagnosticsEngine &) -> std::optional<T> {
     if (Args.hasArg(Opt))
       return Value;
-    return None;
+    return std::nullopt;
   };
 }
 
@@ -204,13 +221,13 @@ static auto makeFlagToValueNormalizer(T Value) {
 
 static auto makeBooleanOptionNormalizer(bool Value, bool OtherValue,
                                         OptSpecifier OtherOpt) {
-  return [Value, OtherValue, OtherOpt](OptSpecifier Opt, unsigned,
-                                       const ArgList &Args,
-                                       DiagnosticsEngine &) -> Optional<bool> {
+  return [Value, OtherValue,
+          OtherOpt](OptSpecifier Opt, unsigned, const ArgList &Args,
+                    DiagnosticsEngine &) -> std::optional<bool> {
     if (const Arg *A = Args.getLastArg(Opt, OtherOpt)) {
       return A->getOption().matches(Opt) ? Value : OtherValue;
     }
-    return None;
+    return std::nullopt;
   };
 }
 
@@ -253,34 +270,34 @@ denormalizeString(SmallVectorImpl<const char *> &Args, const char *Spelling,
   denormalizeStringImpl(Args, Spelling, SA, OptClass, TableIndex, Twine(Value));
 }
 
-static Optional<SimpleEnumValue>
+static std::optional<SimpleEnumValue>
 findValueTableByName(const SimpleEnumValueTable &Table, StringRef Name) {
   for (int I = 0, E = Table.Size; I != E; ++I)
     if (Name == Table.Table[I].Name)
       return Table.Table[I];
 
-  return None;
+  return std::nullopt;
 }
 
-static Optional<SimpleEnumValue>
+static std::optional<SimpleEnumValue>
 findValueTableByValue(const SimpleEnumValueTable &Table, unsigned Value) {
   for (int I = 0, E = Table.Size; I != E; ++I)
     if (Value == Table.Table[I].Value)
       return Table.Table[I];
 
-  return None;
+  return std::nullopt;
 }
 
-static llvm::Optional<unsigned> normalizeSimpleEnum(OptSpecifier Opt,
-                                                    unsigned TableIndex,
-                                                    const ArgList &Args,
-                                                    DiagnosticsEngine &Diags) {
+static std::optional<unsigned> normalizeSimpleEnum(OptSpecifier Opt,
+                                                   unsigned TableIndex,
+                                                   const ArgList &Args,
+                                                   DiagnosticsEngine &Diags) {
   assert(TableIndex < SimpleEnumValueTablesSize);
   const SimpleEnumValueTable &Table = SimpleEnumValueTables[TableIndex];
 
   auto *Arg = Args.getLastArg(Opt);
   if (!Arg)
-    return None;
+    return std::nullopt;
 
   StringRef ArgValue = Arg->getValue();
   if (auto MaybeEnumVal = findValueTableByName(Table, ArgValue))
@@ -288,7 +305,7 @@ static llvm::Optional<unsigned> normalizeSimpleEnum(OptSpecifier Opt,
 
   Diags.Report(diag::err_drv_invalid_value)
       << Arg->getAsString(Args) << ArgValue;
-  return None;
+  return std::nullopt;
 }
 
 static void denormalizeSimpleEnumImpl(SmallVectorImpl<const char *> &Args,
@@ -317,32 +334,33 @@ static void denormalizeSimpleEnum(SmallVectorImpl<const char *> &Args,
                                    static_cast<unsigned>(Value));
 }
 
-static Optional<std::string> normalizeString(OptSpecifier Opt, int TableIndex,
-                                             const ArgList &Args,
-                                             DiagnosticsEngine &Diags) {
+static std::optional<std::string> normalizeString(OptSpecifier Opt,
+                                                  int TableIndex,
+                                                  const ArgList &Args,
+                                                  DiagnosticsEngine &Diags) {
   auto *Arg = Args.getLastArg(Opt);
   if (!Arg)
-    return None;
+    return std::nullopt;
   return std::string(Arg->getValue());
 }
 
 template <typename IntTy>
-static Optional<IntTy> normalizeStringIntegral(OptSpecifier Opt, int,
-                                               const ArgList &Args,
-                                               DiagnosticsEngine &Diags) {
+static std::optional<IntTy> normalizeStringIntegral(OptSpecifier Opt, int,
+                                                    const ArgList &Args,
+                                                    DiagnosticsEngine &Diags) {
   auto *Arg = Args.getLastArg(Opt);
   if (!Arg)
-    return None;
+    return std::nullopt;
   IntTy Res;
   if (StringRef(Arg->getValue()).getAsInteger(0, Res)) {
     Diags.Report(diag::err_drv_invalid_int_value)
         << Arg->getAsString(Args) << Arg->getValue();
-    return None;
+    return std::nullopt;
   }
   return Res;
 }
 
-static Optional<std::vector<std::string>>
+static std::optional<std::vector<std::string>>
 normalizeStringVector(OptSpecifier Opt, int, const ArgList &Args,
                       DiagnosticsEngine &) {
   return Args.getAllArgValues(Opt);
@@ -380,12 +398,13 @@ static void denormalizeStringVector(SmallVectorImpl<const char *> &Args,
   }
 }
 
-static Optional<std::string> normalizeTriple(OptSpecifier Opt, int TableIndex,
-                                             const ArgList &Args,
-                                             DiagnosticsEngine &Diags) {
+static std::optional<std::string> normalizeTriple(OptSpecifier Opt,
+                                                  int TableIndex,
+                                                  const ArgList &Args,
+                                                  DiagnosticsEngine &Diags) {
   auto *Arg = Args.getLastArg(Opt);
   if (!Arg)
-    return None;
+    return std::nullopt;
   return llvm::Triple::normalize(Arg->getValue());
 }
 
@@ -437,7 +456,7 @@ static T extractMaskValue(T KeyPath) {
     }(EXTRACTOR(KEYPATH));                                                     \
   }
 
-static const StringRef GetInputKindName(InputKind IK);
+static StringRef GetInputKindName(InputKind IK);
 
 static bool FixupInvocation(CompilerInvocation &Invocation,
                             DiagnosticsEngine &Diags, const ArgList &Args,
@@ -453,6 +472,8 @@ static bool FixupInvocation(CompilerInvocation &Invocation,
   CodeGenOpts.XRayAlwaysEmitTypedEvents = LangOpts.XRayAlwaysEmitTypedEvents;
   CodeGenOpts.DisableFree = FrontendOpts.DisableFree;
   FrontendOpts.GenerateGlobalModuleIndex = FrontendOpts.UseGlobalModuleIndex;
+  if (FrontendOpts.ShowStats)
+    CodeGenOpts.ClearASTBeforeBackend = false;
   LangOpts.SanitizeCoverage = CodeGenOpts.hasSanitizeCoverage();
   LangOpts.ForceEmitVTables = CodeGenOpts.ForceEmitVTables;
   LangOpts.SpeculativeLoadHardening = CodeGenOpts.SpeculativeLoadHardening;
@@ -472,9 +493,6 @@ static bool FixupInvocation(CompilerInvocation &Invocation,
   if (LangOpts.AppleKext && !LangOpts.CPlusPlus)
     Diags.Report(diag::warn_c_kext);
 
-  if (Args.hasArg(OPT_fconcepts_ts))
-    Diags.Report(diag::warn_fe_concepts_ts_flag);
-
   if (LangOpts.NewAlignOverride &&
       !llvm::isPowerOf2_32(LangOpts.NewAlignOverride)) {
     Arg *A = Args.getLastArg(OPT_fnew_alignment_EQ);
@@ -492,6 +510,10 @@ static bool FixupInvocation(CompilerInvocation &Invocation,
     Diags.Report(diag::err_drv_argument_not_allowed_with)
         << "-fgnu89-inline" << GetInputKindName(IK);
 
+  if (Args.hasArg(OPT_hlsl_entrypoint) && !LangOpts.HLSL)
+    Diags.Report(diag::err_drv_argument_not_allowed_with)
+        << "-hlsl-entry" << GetInputKindName(IK);
+
   if (Args.hasArg(OPT_fgpu_allow_device_init) && !LangOpts.HIP)
     Diags.Report(diag::warn_ignored_hip_only_option)
         << Args.getLastArg(OPT_fgpu_allow_device_init)->getAsString(Args);
@@ -500,12 +522,29 @@ static bool FixupInvocation(CompilerInvocation &Invocation,
     Diags.Report(diag::warn_ignored_hip_only_option)
         << Args.getLastArg(OPT_gpu_max_threads_per_block_EQ)->getAsString(Args);
 
+  // When these options are used, the compiler is allowed to apply
+  // optimizations that may affect the final result. For example
+  // (x+y)+z is transformed to x+(y+z) but may not give the same
+  // final result; it's not value safe.
+  // Another example can be to simplify x/x to 1.0 but x could be 0.0, INF
+  // or NaN. Final result may then differ. An error is issued when the eval
+  // method is set with one of these options.
+  if (Args.hasArg(OPT_ffp_eval_method_EQ)) {
+    if (LangOpts.ApproxFunc)
+      Diags.Report(diag::err_incompatible_fp_eval_method_options) << 0;
+    if (LangOpts.AllowFPReassoc)
+      Diags.Report(diag::err_incompatible_fp_eval_method_options) << 1;
+    if (LangOpts.AllowRecip)
+      Diags.Report(diag::err_incompatible_fp_eval_method_options) << 2;
+  }
+
   // -cl-strict-aliasing needs to emit diagnostic in the case where CL > 1.0.
   // This option should be deprecated for CL > 1.0 because
   // this option was added for compatibility with OpenCL 1.0.
-  if (Args.getLastArg(OPT_cl_strict_aliasing) && LangOpts.OpenCLVersion > 100)
+  if (Args.getLastArg(OPT_cl_strict_aliasing) &&
+      (LangOpts.getOpenCLCompatibleVersion() > 100))
     Diags.Report(diag::warn_option_invalid_ocl_version)
-        << LangOpts.getOpenCLVersionTuple().getAsString()
+        << LangOpts.getOpenCLVersionString()
         << Args.getLastArg(OPT_cl_strict_aliasing)->getAsString(Args);
 
   if (Arg *A = Args.getLastArg(OPT_fdefault_calling_conv_EQ)) {
@@ -522,11 +561,6 @@ static bool FixupInvocation(CompilerInvocation &Invocation,
           << A->getSpelling() << T.getTriple();
   }
 
-  if (!CodeGenOpts.ProfileRemappingFile.empty() && CodeGenOpts.LegacyPassManager)
-    Diags.Report(diag::err_drv_argument_only_allowed_with)
-        << Args.getLastArg(OPT_fprofile_remapping_file_EQ)->getAsString(Args)
-        << "-fno-legacy-pass-manager";
-
   return Diags.getNumErrors() == NumErrorsBefore;
 }
 
@@ -608,9 +642,8 @@ using GenerateFn = llvm::function_ref<void(
     CompilerInvocation::StringAllocator)>;
 
 // May perform round-trip of command line arguments. By default, the round-trip
-// is enabled if CLANG_ROUND_TRIP_CC1_ARGS was defined during build. This can be
-// overwritten at run-time via the "-round-trip-args" and "-no-round-trip-args"
-// command line flags.
+// is enabled in assert builds. This can be overwritten at run-time via the
+// "-round-trip-args" and "-no-round-trip-args" command line flags.
 // During round-trip, the command line arguments are parsed into a dummy
 // instance of CompilerInvocation which is used to generate the command line
 // arguments again. The real CompilerInvocation instance is then created by
@@ -620,8 +653,7 @@ static bool RoundTrip(ParseFn Parse, GenerateFn Generate,
                       CompilerInvocation &DummyInvocation,
                       ArrayRef<const char *> CommandLineArgs,
                       DiagnosticsEngine &Diags, const char *Argv0) {
-  // FIXME: Switch to '#ifndef NDEBUG' when possible.
-#ifdef CLANG_ROUND_TRIP_CC1_ARGS
+#ifndef NDEBUG
   bool DoRoundTripDefault = true;
 #else
   bool DoRoundTripDefault = false;
@@ -768,9 +800,7 @@ static void parseAnalyzerConfigs(AnalyzerOptions &AnOpts,
 static void getAllNoBuiltinFuncValues(ArgList &Args,
                                       std::vector<std::string> &Funcs) {
   std::vector<std::string> Values = Args.getAllArgValues(OPT_fno_builtin_);
-  auto BuiltinEnd = llvm::partition(Values, [](const std::string FuncName) {
-    return Builtin::Context::isBuiltinFunc(FuncName);
-  });
+  auto BuiltinEnd = llvm::partition(Values, Builtin::Context::isBuiltinFunc);
   Funcs.insert(Funcs.end(), Values.begin(), BuiltinEnd);
 }
 
@@ -790,18 +820,6 @@ static void GenerateAnalyzerArgs(AnalyzerOptions &Opts,
 #include "clang/Driver/Options.inc"
 #undef ANALYZER_OPTION_WITH_MARSHALLING
 
-  if (Opts.AnalysisStoreOpt != RegionStoreModel) {
-    switch (Opts.AnalysisStoreOpt) {
-#define ANALYSIS_STORE(NAME, CMDFLAG, DESC, CREATFN)                           \
-  case NAME##Model:                                                            \
-    GenerateArg(Args, OPT_analyzer_store, CMDFLAG, SA);                        \
-    break;
-#include "clang/StaticAnalyzer/Core/Analyses.def"
-    default:
-      llvm_unreachable("Tried to generate unknown analysis store.");
-    }
-  }
-
   if (Opts.AnalysisConstraintsOpt != RangeConstraintsModel) {
     switch (Opts.AnalysisConstraintsOpt) {
 #define ANALYSIS_CONSTRAINTS(NAME, CMDFLAG, DESC, CREATFN)                     \
@@ -889,21 +907,6 @@ static bool ParseAnalyzerArgs(AnalyzerOptions &Opts, ArgList &Args,
 #include "clang/Driver/Options.inc"
 #undef ANALYZER_OPTION_WITH_MARSHALLING
 
-  if (Arg *A = Args.getLastArg(OPT_analyzer_store)) {
-    StringRef Name = A->getValue();
-    AnalysisStores Value = llvm::StringSwitch<AnalysisStores>(Name)
-#define ANALYSIS_STORE(NAME, CMDFLAG, DESC, CREATFN) \
-      .Case(CMDFLAG, NAME##Model)
-#include "clang/StaticAnalyzer/Core/Analyses.def"
-      .Default(NumStores);
-    if (Value == NumStores) {
-      Diags.Report(diag::err_drv_invalid_value)
-        << A->getAsString(Args) << Name;
-    } else {
-      Opts.AnalysisStoreOpt = Value;
-    }
-  }
-
   if (Arg *A = Args.getLastArg(OPT_analyzer_constraints)) {
     StringRef Name = A->getValue();
     AnalysisConstraints Value = llvm::StringSwitch<AnalysisConstraints>(Name)
@@ -915,6 +918,11 @@ static bool ParseAnalyzerArgs(AnalyzerOptions &Opts, ArgList &Args,
       Diags.Report(diag::err_drv_invalid_value)
         << A->getAsString(Args) << Name;
     } else {
+#ifndef LLVM_WITH_Z3
+      if (Value == AnalysisConstraints::Z3ConstraintsModel) {
+        Diags.Report(diag::err_analyzer_not_built_with_z3);
+      }
+#endif // LLVM_WITH_Z3
       Opts.AnalysisConstraintsOpt = Value;
     }
   }
@@ -995,7 +1003,7 @@ static bool ParseAnalyzerArgs(AnalyzerOptions &Opts, ArgList &Args,
                      diag::err_analyzer_config_no_value) << configVal;
         break;
       }
-      if (val.find('=') != StringRef::npos) {
+      if (val.contains('=')) {
         Diags.Report(SourceLocation(),
                      diag::err_analyzer_config_multiple_values)
           << configVal;
@@ -1012,6 +1020,15 @@ static bool ParseAnalyzerArgs(AnalyzerOptions &Opts, ArgList &Args,
 
       A->claim();
       Opts.Config[key] = std::string(val);
+
+      // FIXME: Remove this hunk after clang-17 released.
+      constexpr auto SingleFAM =
+          "consider-single-element-arrays-as-flexible-array-members";
+      if (key == SingleFAM) {
+        Diags.Report(diag::warn_analyzer_deprecated_option_with_alternative)
+            << SingleFAM << "clang-17"
+            << "-fstrict-flex-arrays=<N>";
+      }
     }
   }
 
@@ -1049,11 +1066,12 @@ static void initOption(AnalyzerOptions::ConfigTable &Config,
 static void initOption(AnalyzerOptions::ConfigTable &Config,
                        DiagnosticsEngine *Diags,
                        bool &OptionField, StringRef Name, bool DefaultVal) {
-  auto PossiblyInvalidVal = llvm::StringSwitch<Optional<bool>>(
-                 getStringOption(Config, Name, (DefaultVal ? "true" : "false")))
-      .Case("true", true)
-      .Case("false", false)
-      .Default(None);
+  auto PossiblyInvalidVal =
+      llvm::StringSwitch<std::optional<bool>>(
+          getStringOption(Config, Name, (DefaultVal ? "true" : "false")))
+          .Case("true", true)
+          .Case("false", false)
+          .Default(std::nullopt);
 
   if (!PossiblyInvalidVal) {
     if (Diags)
@@ -1062,7 +1080,7 @@ static void initOption(AnalyzerOptions::ConfigTable &Config,
     else
       OptionField = DefaultVal;
   } else
-    OptionField = PossiblyInvalidVal.getValue();
+    OptionField = *PossiblyInvalidVal;
 }
 
 static void initOption(AnalyzerOptions::ConfigTable &Config,
@@ -1081,25 +1099,22 @@ static void initOption(AnalyzerOptions::ConfigTable &Config,
 static void parseAnalyzerConfigs(AnalyzerOptions &AnOpts,
                                  DiagnosticsEngine *Diags) {
   // TODO: There's no need to store the entire configtable, it'd be plenty
-  // enough tostore checker options.
+  // enough to store checker options.
 
 #define ANALYZER_OPTION(TYPE, NAME, CMDFLAG, DESC, DEFAULT_VAL)                \
   initOption(AnOpts.Config, Diags, AnOpts.NAME, CMDFLAG, DEFAULT_VAL);
+#define ANALYZER_OPTION_DEPENDS_ON_USER_MODE(...)
+#include "clang/StaticAnalyzer/Core/AnalyzerOptions.def"
 
-#define ANALYZER_OPTION_DEPENDS_ON_USER_MODE(TYPE, NAME, CMDFLAG, DESC,        \
-                                           SHALLOW_VAL, DEEP_VAL)              \
-  switch (AnOpts.getUserMode()) {                                              \
-  case UMK_Shallow:                                                            \
-    initOption(AnOpts.Config, Diags, AnOpts.NAME, CMDFLAG, SHALLOW_VAL);       \
-    break;                                                                     \
-  case UMK_Deep:                                                               \
-    initOption(AnOpts.Config, Diags, AnOpts.NAME, CMDFLAG, DEEP_VAL);          \
-    break;                                                                     \
-  }                                                                            \
+  assert(AnOpts.UserMode == "shallow" || AnOpts.UserMode == "deep");
+  const bool InShallowMode = AnOpts.UserMode == "shallow";
 
+#define ANALYZER_OPTION(...)
+#define ANALYZER_OPTION_DEPENDS_ON_USER_MODE(TYPE, NAME, CMDFLAG, DESC,        \
+                                             SHALLOW_VAL, DEEP_VAL)            \
+  initOption(AnOpts.Config, Diags, AnOpts.NAME, CMDFLAG,                       \
+             InShallowMode ? SHALLOW_VAL : DEEP_VAL);
 #include "clang/StaticAnalyzer/Core/AnalyzerOptions.def"
-#undef ANALYZER_OPTION
-#undef ANALYZER_OPTION_DEPENDS_ON_USER_MODE
 
   // At this point, AnalyzerOptions is configured. Let's validate some options.
 
@@ -1118,10 +1133,9 @@ static void parseAnalyzerConfigs(AnalyzerOptions &AnOpts,
     for (const StringRef &CheckerOrPackage : CheckersAndPackages) {
       if (Diags) {
         bool IsChecker = CheckerOrPackage.contains('.');
-        bool IsValidName =
-            IsChecker
-                ? llvm::find(Checkers, CheckerOrPackage) != Checkers.end()
-                : llvm::find(Packages, CheckerOrPackage) != Packages.end();
+        bool IsValidName = IsChecker
+                               ? llvm::is_contained(Checkers, CheckerOrPackage)
+                               : llvm::is_contained(Packages, CheckerOrPackage);
 
         if (!IsValidName)
           Diags->Report(diag::err_unknown_analyzer_checker_or_package)
@@ -1172,8 +1186,9 @@ ParseOptimizationRemark(DiagnosticsEngine &Diags, ArgList &Args,
                         OptSpecifier OptEQ, StringRef Name) {
   CodeGenOptions::OptRemark Result;
 
-  auto InitializeResultPattern = [&Diags, &Args, &Result](const Arg *A) {
-    Result.Pattern = A->getValue();
+  auto InitializeResultPattern = [&Diags, &Args, &Result](const Arg *A,
+                                                          StringRef Pattern) {
+    Result.Pattern = Pattern.str();
 
     std::string RegexError;
     Result.Regex = std::make_shared<llvm::Regex>(Result.Pattern);
@@ -1198,19 +1213,23 @@ ParseOptimizationRemark(DiagnosticsEngine &Diags, ArgList &Args,
         Result.Kind = CodeGenOptions::RK_Disabled;
       else if (Value == "no-everything")
         Result.Kind = CodeGenOptions::RK_DisabledEverything;
+      else
+        continue;
+
+      if (Result.Kind == CodeGenOptions::RK_Disabled ||
+          Result.Kind == CodeGenOptions::RK_DisabledEverything) {
+        Result.Pattern = "";
+        Result.Regex = nullptr;
+      } else {
+        InitializeResultPattern(A, ".*");
+      }
     } else if (A->getOption().matches(OptEQ)) {
       Result.Kind = CodeGenOptions::RK_WithPattern;
-      if (!InitializeResultPattern(A))
+      if (!InitializeResultPattern(A, A->getValue()))
         return CodeGenOptions::OptRemark();
     }
   }
 
-  if (Result.Kind == CodeGenOptions::RK_Disabled ||
-      Result.Kind == CodeGenOptions::RK_DisabledEverything) {
-    Result.Pattern = "";
-    Result.Regex = nullptr;
-  }
-
   return Result;
 }
 
@@ -1279,22 +1298,28 @@ static std::string serializeXRayInstrumentationBundle(const XRayInstrSet &S) {
   std::string Buffer;
   llvm::raw_string_ostream OS(Buffer);
   llvm::interleave(BundleParts, OS, [&OS](StringRef Part) { OS << Part; }, ",");
-  return OS.str();
+  return Buffer;
 }
 
 // Set the profile kind using fprofile-instrument-use-path.
 static void setPGOUseInstrumentor(CodeGenOptions &Opts,
-                                  const Twine &ProfileName) {
+                                  const Twine &ProfileName,
+                                  DiagnosticsEngine &Diags) {
   auto ReaderOrErr = llvm::IndexedInstrProfReader::create(ProfileName);
-  // In error, return silently and let Clang PGOUse report the error message.
   if (auto E = ReaderOrErr.takeError()) {
-    llvm::consumeError(std::move(E));
-    Opts.setProfileUse(CodeGenOptions::ProfileClangInstr);
+    unsigned DiagID = Diags.getCustomDiagID(DiagnosticsEngine::Error,
+                                            "Error in reading profile %0: %1");
+    llvm::handleAllErrors(std::move(E), [&](const llvm::ErrorInfoBase &EI) {
+      Diags.Report(DiagID) << ProfileName.str() << EI.message();
+    });
     return;
   }
   std::unique_ptr<llvm::IndexedInstrProfReader> PGOReader =
     std::move(ReaderOrErr.get());
-  if (PGOReader->isIRLevelProfile()) {
+  // Currently memprof profiles are only added at the IR level. Mark the profile
+  // type as IR in that case as well and the subsequent matching needs to detect
+  // which is available (might be one or both).
+  if (PGOReader->isIRLevelProfile() || PGOReader->hasMemoryProfile()) {
     if (PGOReader->hasCSIRLevelProfile())
       Opts.setProfileUse(CodeGenOptions::ProfileCSIRInstr);
     else
@@ -1339,7 +1364,7 @@ void CompilerInvocation::GenerateCodeGenArgs(
   else if (!Opts.DirectAccessExternalData && LangOpts->PICLevel == 0)
     GenerateArg(Args, OPT_fno_direct_access_external_data, SA);
 
-  Optional<StringRef> DebugInfoVal;
+  std::optional<StringRef> DebugInfoVal;
   switch (Opts.DebugInfo) {
   case codegenoptions::DebugLineTablesOnly:
     DebugInfoVal = "line-tables-only";
@@ -1360,10 +1385,10 @@ void CompilerInvocation::GenerateCodeGenArgs(
     DebugInfoVal = "unused-types";
     break;
   case codegenoptions::NoDebugInfo: // default value
-    DebugInfoVal = None;
+    DebugInfoVal = std::nullopt;
     break;
   case codegenoptions::LocTrackingOnly: // implied value
-    DebugInfoVal = None;
+    DebugInfoVal = std::nullopt;
     break;
   }
   if (DebugInfoVal)
@@ -1406,6 +1431,13 @@ void CompilerInvocation::GenerateCodeGenArgs(
                llvm::DICompileUnit::DebugNameTableKind::Default))
     GenerateArg(Args, OPT_gpubnames, SA);
 
+  auto TNK = Opts.getDebugSimpleTemplateNames();
+  if (TNK != codegenoptions::DebugTemplateNamesKind::Full) {
+    if (TNK == codegenoptions::DebugTemplateNamesKind::Simple)
+      GenerateArg(Args, OPT_gsimple_template_names_EQ, "simple", SA);
+    else if (TNK == codegenoptions::DebugTemplateNamesKind::Mangled)
+      GenerateArg(Args, OPT_gsimple_template_names_EQ, "mangled", SA);
+  }
   // ProfileInstrumentUsePath is marshalled automatically, no need to generate
   // it or PGOUseInstrumentor.
 
@@ -1417,7 +1449,7 @@ void CompilerInvocation::GenerateCodeGenArgs(
   }
 
   if (Opts.PrepareForLTO && !Opts.PrepareForThinLTO)
-    GenerateArg(Args, OPT_flto, SA);
+    GenerateArg(Args, OPT_flto_EQ, "full", SA);
 
   if (Opts.PrepareForThinLTO)
     GenerateArg(Args, OPT_flto_EQ, "thin", SA);
@@ -1462,6 +1494,9 @@ void CompilerInvocation::GenerateCodeGenArgs(
   else if (Opts.CFProtectionBranch)
     GenerateArg(Args, OPT_fcf_protection_EQ, "branch", SA);
 
+  if (Opts.FunctionReturnThunks)
+    GenerateArg(Args, OPT_mfunction_return_EQ, "thunk-extern", SA);
+
   for (const auto &F : Opts.LinkBitcodeFiles) {
     bool Builtint = F.LinkFlags == llvm::Linker::Flags::LinkOnlyNeeded &&
                     F.PropagateAttrs && F.Internalize;
@@ -1474,18 +1509,14 @@ void CompilerInvocation::GenerateCodeGenArgs(
     GenerateArg(Args, OPT_ret_protector, SA);
   }
 
-  // TODO: Consider removing marshalling annotations from f[no_]emulated_tls.
-  //  That would make it easy to generate the option only **once** if it was
-  //  explicitly set to non-default value.
-  if (Opts.ExplicitEmulatedTLS) {
-    GenerateArg(
-        Args, Opts.EmulatedTLS ? OPT_femulated_tls : OPT_fno_emulated_tls, SA);
-  }
+  GenerateArg(
+      Args, Opts.EmulatedTLS ? OPT_femulated_tls : OPT_fno_emulated_tls, SA);
 
   if (Opts.FPDenormalMode != llvm::DenormalMode::getIEEE())
     GenerateArg(Args, OPT_fdenormal_fp_math_EQ, Opts.FPDenormalMode.str(), SA);
 
-  if (Opts.FP32DenormalMode != llvm::DenormalMode::getIEEE())
+  if ((Opts.FPDenormalMode != Opts.FP32DenormalMode) ||
+      (Opts.FP32DenormalMode != llvm::DenormalMode::getIEEE()))
     GenerateArg(Args, OPT_fdenormal_fp_math_f32_EQ, Opts.FP32DenormalMode.str(),
                 SA);
 
@@ -1523,6 +1554,9 @@ void CompilerInvocation::GenerateCodeGenArgs(
                   : "auto",
               SA);
 
+  GenerateArg(Args, OPT_fdiagnostics_misexpect_tolerance_EQ,
+              Twine(*Opts.DiagnosticsMisExpectTolerance), SA);
+
   for (StringRef Sanitizer : serializeSanitizerKinds(Opts.SanitizeRecover))
     GenerateArg(Args, OPT_fsanitize_recover_EQ, Sanitizer, SA);
 
@@ -1584,23 +1618,22 @@ bool CompilerInvocation::ParseCodeGenArgs(CodeGenOptions &Opts, ArgList &Args,
 
   // At O0 we want to fully disable inlining outside of cases marked with
   // 'alwaysinline' that are required for correctness.
-  Opts.setInlining((Opts.OptimizationLevel == 0)
-                       ? CodeGenOptions::OnlyAlwaysInlining
-                       : CodeGenOptions::NormalInlining);
-  // Explicit inlining flags can disable some or all inlining even at
-  // optimization levels above zero.
-  if (Arg *InlineArg = Args.getLastArg(
-          options::OPT_finline_functions, options::OPT_finline_hint_functions,
-          options::OPT_fno_inline_functions, options::OPT_fno_inline)) {
-    if (Opts.OptimizationLevel > 0) {
-      const Option &InlineOpt = InlineArg->getOption();
-      if (InlineOpt.matches(options::OPT_finline_functions))
-        Opts.setInlining(CodeGenOptions::NormalInlining);
-      else if (InlineOpt.matches(options::OPT_finline_hint_functions))
-        Opts.setInlining(CodeGenOptions::OnlyHintInlining);
-      else
-        Opts.setInlining(CodeGenOptions::OnlyAlwaysInlining);
-    }
+  if (Opts.OptimizationLevel == 0) {
+    Opts.setInlining(CodeGenOptions::OnlyAlwaysInlining);
+  } else if (const Arg *A = Args.getLastArg(options::OPT_finline_functions,
+                                            options::OPT_finline_hint_functions,
+                                            options::OPT_fno_inline_functions,
+                                            options::OPT_fno_inline)) {
+    // Explicit inlining flags can disable some or all inlining even at
+    // optimization levels above zero.
+    if (A->getOption().matches(options::OPT_finline_functions))
+      Opts.setInlining(CodeGenOptions::NormalInlining);
+    else if (A->getOption().matches(options::OPT_finline_hint_functions))
+      Opts.setInlining(CodeGenOptions::OnlyHintInlining);
+    else
+      Opts.setInlining(CodeGenOptions::OnlyAlwaysInlining);
+  } else {
+    Opts.setInlining(CodeGenOptions::NormalInlining);
   }
 
   // PIC defaults to -fno-direct-access-external-data while non-PIC defaults to
@@ -1684,19 +1717,25 @@ bool CompilerInvocation::ParseCodeGenArgs(CodeGenOptions &Opts, ArgList &Args,
           : Args.hasArg(OPT_gpubnames)
                 ? llvm::DICompileUnit::DebugNameTableKind::Default
                 : llvm::DICompileUnit::DebugNameTableKind::None);
+  if (const Arg *A = Args.getLastArg(OPT_gsimple_template_names_EQ)) {
+    StringRef Value = A->getValue();
+    if (Value != "simple" && Value != "mangled")
+      Diags.Report(diag::err_drv_unsupported_option_argument)
+          << A->getSpelling() << A->getValue();
+    Opts.setDebugSimpleTemplateNames(
+        StringRef(A->getValue()) == "simple"
+            ? codegenoptions::DebugTemplateNamesKind::Simple
+            : codegenoptions::DebugTemplateNamesKind::Mangled);
+  }
 
   if (!Opts.ProfileInstrumentUsePath.empty())
-    setPGOUseInstrumentor(Opts, Opts.ProfileInstrumentUsePath);
+    setPGOUseInstrumentor(Opts, Opts.ProfileInstrumentUsePath, Diags);
 
   if (const Arg *A = Args.getLastArg(OPT_ftime_report, OPT_ftime_report_EQ)) {
     Opts.TimePasses = true;
 
     // -ftime-report= is only for new pass manager.
     if (A->getOption().getID() == OPT_ftime_report_EQ) {
-      if (Opts.LegacyPassManager)
-        Diags.Report(diag::err_drv_argument_only_allowed_with)
-            << A->getAsString(Args) << "-fno-legacy-pass-manager";
-
       StringRef Val = A->getValue();
       if (Val == "per-pass")
         Opts.TimePassesPerRun = false;
@@ -1708,9 +1747,10 @@ bool CompilerInvocation::ParseCodeGenArgs(CodeGenOptions &Opts, ArgList &Args,
     }
   }
 
-  Opts.PrepareForLTO = Args.hasArg(OPT_flto, OPT_flto_EQ);
+  Opts.PrepareForLTO = false;
   Opts.PrepareForThinLTO = false;
   if (Arg *A = Args.getLastArg(OPT_flto_EQ)) {
+    Opts.PrepareForLTO = true;
     StringRef S = A->getValue();
     if (S == "thin")
       Opts.PrepareForThinLTO = true;
@@ -1796,6 +1836,27 @@ bool CompilerInvocation::ParseCodeGenArgs(CodeGenOptions &Opts, ArgList &Args,
       Diags.Report(diag::err_drv_invalid_value) << A->getAsString(Args) << Name;
   }
 
+  if (const Arg *A = Args.getLastArg(OPT_mfunction_return_EQ)) {
+    auto Val = llvm::StringSwitch<llvm::FunctionReturnThunksKind>(A->getValue())
+                   .Case("keep", llvm::FunctionReturnThunksKind::Keep)
+                   .Case("thunk-extern", llvm::FunctionReturnThunksKind::Extern)
+                   .Default(llvm::FunctionReturnThunksKind::Invalid);
+    // SystemZ might want to add support for "expolines."
+    if (!T.isX86())
+      Diags.Report(diag::err_drv_argument_not_allowed_with)
+          << A->getSpelling() << T.getTriple();
+    else if (Val == llvm::FunctionReturnThunksKind::Invalid)
+      Diags.Report(diag::err_drv_invalid_value)
+          << A->getAsString(Args) << A->getValue();
+    else if (Val == llvm::FunctionReturnThunksKind::Extern &&
+             Args.getLastArgValue(OPT_mcmodel_EQ).equals("large"))
+      Diags.Report(diag::err_drv_argument_not_allowed_with)
+          << A->getAsString(Args)
+          << Args.getLastArg(OPT_mcmodel_EQ)->getAsString(Args);
+    else
+      Opts.FunctionReturnThunks = static_cast<unsigned>(Val);
+  }
+
   for (auto *A :
        Args.filtered(OPT_mlink_bitcode_file, OPT_mlink_builtin_bitcode)) {
     CodeGenOptions::BitcodeFileToLink F;
@@ -1812,9 +1873,9 @@ bool CompilerInvocation::ParseCodeGenArgs(CodeGenOptions &Opts, ArgList &Args,
 
   Opts.ReturnProtector = Args.hasArg(OPT_ret_protector);
 
-  if (Args.getLastArg(OPT_femulated_tls) ||
-      Args.getLastArg(OPT_fno_emulated_tls)) {
-    Opts.ExplicitEmulatedTLS = true;
+  if (!Args.getLastArg(OPT_femulated_tls) &&
+      !Args.getLastArg(OPT_fno_emulated_tls)) {
+    Opts.EmulatedTLS = T.hasDefaultEmulatedTLS();
   }
 
   if (Arg *A = Args.getLastArg(OPT_ftlsmodel_EQ)) {
@@ -1828,6 +1889,7 @@ bool CompilerInvocation::ParseCodeGenArgs(CodeGenOptions &Opts, ArgList &Args,
   if (Arg *A = Args.getLastArg(OPT_fdenormal_fp_math_EQ)) {
     StringRef Val = A->getValue();
     Opts.FPDenormalMode = llvm::parseDenormalFPAttribute(Val);
+    Opts.FP32DenormalMode = Opts.FPDenormalMode;
     if (!Opts.FPDenormalMode.isValid())
       Diags.Report(diag::err_drv_invalid_value) << A->getAsString(Args) << Val;
   }
@@ -1871,6 +1933,12 @@ bool CompilerInvocation::ParseCodeGenArgs(CodeGenOptions &Opts, ArgList &Args,
     Opts.EnableAIXExtendedAltivecABI = O.matches(OPT_mabi_EQ_vec_extabi);
   }
 
+  if (Arg *A = Args.getLastArg(OPT_mabi_EQ_quadword_atomics)) {
+    if (!T.isOSAIX() || T.isPPC32())
+      Diags.Report(diag::err_drv_unsupported_opt_for_target)
+        << A->getSpelling() << T.str();
+  }
+
   bool NeedLocTracking = false;
 
   if (!Opts.OptRecordFile.empty())
@@ -1920,14 +1988,31 @@ bool CompilerInvocation::ParseCodeGenArgs(CodeGenOptions &Opts, ArgList &Args,
           << "-fdiagnostics-hotness-threshold=";
     } else {
       Opts.DiagnosticsHotnessThreshold = *ResultOrErr;
-      if ((!Opts.DiagnosticsHotnessThreshold.hasValue() ||
-           Opts.DiagnosticsHotnessThreshold.getValue() > 0) &&
+      if ((!Opts.DiagnosticsHotnessThreshold ||
+           *Opts.DiagnosticsHotnessThreshold > 0) &&
           !UsingProfile)
         Diags.Report(diag::warn_drv_diagnostics_hotness_requires_pgo)
             << "-fdiagnostics-hotness-threshold=";
     }
   }
 
+  if (auto *arg =
+          Args.getLastArg(options::OPT_fdiagnostics_misexpect_tolerance_EQ)) {
+    auto ResultOrErr = parseToleranceOption(arg->getValue());
+
+    if (!ResultOrErr) {
+      Diags.Report(diag::err_drv_invalid_diagnotics_misexpect_tolerance)
+          << "-fdiagnostics-misexpect-tolerance=";
+    } else {
+      Opts.DiagnosticsMisExpectTolerance = *ResultOrErr;
+      if ((!Opts.DiagnosticsMisExpectTolerance ||
+           *Opts.DiagnosticsMisExpectTolerance > 0) &&
+          !UsingProfile)
+        Diags.Report(diag::warn_drv_diagnostics_misexpect_requires_pgo)
+            << "-fdiagnostics-misexpect-tolerance=";
+    }
+  }
+
   // If the user requested to use a sample profile for PGO, then the
   // backend will need to track source location information so the profile
   // can be incorporated into the IR.
@@ -1958,8 +2043,8 @@ bool CompilerInvocation::ParseCodeGenArgs(CodeGenOptions &Opts, ArgList &Args,
   else if (Args.hasArg(options::OPT_fno_finite_loops))
     Opts.FiniteLoops = CodeGenOptions::FiniteLoopsKind::Never;
 
-  Opts.EmitIEEENaNCompliantInsts =
-      Args.hasFlag(options::OPT_mamdgpu_ieee, options::OPT_mno_amdgpu_ieee);
+  Opts.EmitIEEENaNCompliantInsts = Args.hasFlag(
+      options::OPT_mamdgpu_ieee, options::OPT_mno_amdgpu_ieee, true);
   if (!Opts.EmitIEEENaNCompliantInsts && !LangOptsRef.NoHonorNaNs)
     Diags.Report(diag::err_drv_amdgpu_ieee_without_no_honor_nans);
 
@@ -2041,13 +2126,13 @@ static bool ParseDependencyOutputArgs(DependencyOutputOptions &Opts,
   if (!Args.hasArg(OPT_fno_sanitize_ignorelist)) {
     for (const auto *A : Args.filtered(OPT_fsanitize_ignorelist_EQ)) {
       StringRef Val = A->getValue();
-      if (Val.find('=') == StringRef::npos)
+      if (!Val.contains('='))
         Opts.ExtraDeps.emplace_back(std::string(Val), EDK_SanitizeIgnorelist);
     }
     if (Opts.IncludeSystemHeaders) {
       for (const auto *A : Args.filtered(OPT_fsanitize_system_ignorelist_EQ)) {
         StringRef Val = A->getValue();
-        if (Val.find('=') == StringRef::npos)
+        if (!Val.contains('='))
           Opts.ExtraDeps.emplace_back(std::string(Val), EDK_SanitizeIgnorelist);
       }
     }
@@ -2064,10 +2149,20 @@ static bool ParseDependencyOutputArgs(DependencyOutputOptions &Opts,
   // Only the -fmodule-file=<file> form.
   for (const auto *A : Args.filtered(OPT_fmodule_file)) {
     StringRef Val = A->getValue();
-    if (Val.find('=') == StringRef::npos)
+    if (!Val.contains('='))
       Opts.ExtraDeps.emplace_back(std::string(Val), EDK_ModuleFile);
   }
 
+  // Check for invalid combinations of header-include-format
+  // and header-include-filtering.
+  if ((Opts.HeaderIncludeFormat == HIFMT_Textual &&
+       Opts.HeaderIncludeFiltering != HIFIL_None) ||
+      (Opts.HeaderIncludeFormat == HIFMT_JSON &&
+       Opts.HeaderIncludeFiltering != HIFIL_Only_Direct_System))
+    Diags.Report(diag::err_drv_print_header_env_var_combination_cc1)
+        << Args.getLastArg(OPT_header_include_format_EQ)->getValue()
+        << Args.getLastArg(OPT_header_include_filtering_EQ)->getValue();
+
   return Diags.getNumErrors() == NumErrorsBefore;
 }
 
@@ -2083,11 +2178,9 @@ static bool parseShowColorsArgs(const ArgList &Args, bool DefaultColor) {
   } ShowColors = DefaultColor ? Colors_Auto : Colors_Off;
   for (auto *A : Args) {
     const Option &O = A->getOption();
-    if (O.matches(options::OPT_fcolor_diagnostics) ||
-        O.matches(options::OPT_fdiagnostics_color)) {
+    if (O.matches(options::OPT_fcolor_diagnostics)) {
       ShowColors = Colors_On;
-    } else if (O.matches(options::OPT_fno_color_diagnostics) ||
-               O.matches(options::OPT_fno_diagnostics_color)) {
+    } else if (O.matches(options::OPT_fno_color_diagnostics)) {
       ShowColors = Colors_Off;
     } else if (O.matches(options::OPT_fdiagnostics_color_EQ)) {
       StringRef Value(A->getValue());
@@ -2261,10 +2354,23 @@ void CompilerInvocation::GenerateDiagnosticArgs(
   }
 }
 
+std::unique_ptr<DiagnosticOptions>
+clang::CreateAndPopulateDiagOpts(ArrayRef<const char *> Argv) {
+  auto DiagOpts = std::make_unique<DiagnosticOptions>();
+  unsigned MissingArgIndex, MissingArgCount;
+  InputArgList Args = getDriverOptTable().ParseArgs(
+      Argv.slice(1), MissingArgIndex, MissingArgCount);
+  // We ignore MissingArgCount and the return value of ParseDiagnosticArgs.
+  // Any errors that would be diagnosed here will also be diagnosed later,
+  // when the DiagnosticsEngine actually exists.
+  (void)ParseDiagnosticArgs(*DiagOpts, Args);
+  return DiagOpts;
+}
+
 bool clang::ParseDiagnosticArgs(DiagnosticOptions &Opts, ArgList &Args,
                                 DiagnosticsEngine *Diags,
                                 bool DefaultDiagColor) {
-  Optional<DiagnosticsEngine> IgnoringDiags;
+  std::optional<DiagnosticsEngine> IgnoringDiags;
   if (!Diags) {
     IgnoringDiags.emplace(new DiagnosticIDs(), new DiagnosticOptions(),
                           new IgnoringDiagConsumer());
@@ -2374,15 +2480,15 @@ static const auto &getFrontendActionTable() {
       {frontend::EmitLLVM, OPT_emit_llvm},
       {frontend::EmitLLVMOnly, OPT_emit_llvm_only},
       {frontend::EmitCodeGenOnly, OPT_emit_codegen_only},
-      {frontend::EmitCodeGenOnly, OPT_emit_codegen_only},
       {frontend::EmitObj, OPT_emit_obj},
+      {frontend::ExtractAPI, OPT_extract_api},
 
       {frontend::FixIt, OPT_fixit_EQ},
       {frontend::FixIt, OPT_fixit},
 
       {frontend::GenerateModule, OPT_emit_module},
       {frontend::GenerateModuleInterface, OPT_emit_module_interface},
-      {frontend::GenerateHeaderModule, OPT_emit_header_module},
+      {frontend::GenerateHeaderUnit, OPT_emit_header_unit},
       {frontend::GeneratePCH, OPT_emit_pch},
       {frontend::GenerateInterfaceStubs, OPT_emit_interface_stubs},
       {frontend::InitOnly, OPT_init_only},
@@ -2399,29 +2505,30 @@ static const auto &getFrontendActionTable() {
       {frontend::MigrateSource, OPT_migrate},
       {frontend::RunPreprocessorOnly, OPT_Eonly},
       {frontend::PrintDependencyDirectivesSourceMinimizerOutput,
-          OPT_print_dependency_directives_minimized_source},
+       OPT_print_dependency_directives_minimized_source},
   };
 
   return Table;
 }
 
 /// Maps command line option to frontend action.
-static Optional<frontend::ActionKind> getFrontendAction(OptSpecifier &Opt) {
+static std::optional<frontend::ActionKind>
+getFrontendAction(OptSpecifier &Opt) {
   for (const auto &ActionOpt : getFrontendActionTable())
     if (ActionOpt.second == Opt.getID())
       return ActionOpt.first;
 
-  return None;
+  return std::nullopt;
 }
 
 /// Maps frontend action to command line option.
-static Optional<OptSpecifier>
+static std::optional<OptSpecifier>
 getProgramActionOpt(frontend::ActionKind ProgramAction) {
   for (const auto &ActionOpt : getFrontendActionTable())
     if (ActionOpt.first == ProgramAction)
       return OptSpecifier(ActionOpt.second);
 
-  return None;
+  return std::nullopt;
 }
 
 static void GenerateFrontendArgs(const FrontendOptions &Opts,
@@ -2440,7 +2547,7 @@ static void GenerateFrontendArgs(const FrontendOptions &Opts,
 #include "clang/Driver/Options.inc"
 #undef FRONTEND_OPTION_WITH_MARSHALLING
 
-  Optional<OptSpecifier> ProgramActionOpt =
+  std::optional<OptSpecifier> ProgramActionOpt =
       getProgramActionOpt(Opts.ProgramAction);
 
   // Generating a simple flag covers most frontend actions.
@@ -2518,10 +2625,10 @@ static void GenerateFrontendArgs(const FrontendOptions &Opts,
   for (const auto &ModuleFile : Opts.ModuleFiles)
     GenerateArg(Args, OPT_fmodule_file, ModuleFile, SA);
 
-  if (Opts.AuxTargetCPU.hasValue())
+  if (Opts.AuxTargetCPU)
     GenerateArg(Args, OPT_aux_target_cpu, *Opts.AuxTargetCPU, SA);
 
-  if (Opts.AuxTargetFeatures.hasValue())
+  if (Opts.AuxTargetFeatures)
     for (const auto &Feature : *Opts.AuxTargetFeatures)
       GenerateArg(Args, OPT_aux_target_feature, Feature, SA);
 
@@ -2529,6 +2636,20 @@ static void GenerateFrontendArgs(const FrontendOptions &Opts,
     StringRef Preprocessed = Opts.DashX.isPreprocessed() ? "-cpp-output" : "";
     StringRef ModuleMap =
         Opts.DashX.getFormat() == InputKind::ModuleMap ? "-module-map" : "";
+    StringRef HeaderUnit = "";
+    switch (Opts.DashX.getHeaderUnitKind()) {
+    case InputKind::HeaderUnit_None:
+      break;
+    case InputKind::HeaderUnit_User:
+      HeaderUnit = "-user";
+      break;
+    case InputKind::HeaderUnit_System:
+      HeaderUnit = "-system";
+      break;
+    case InputKind::HeaderUnit_Abs:
+      HeaderUnit = "-header-unit";
+      break;
+    }
     StringRef Header = IsHeader ? "-header" : "";
 
     StringRef Lang;
@@ -2571,9 +2692,13 @@ static void GenerateFrontendArgs(const FrontendOptions &Opts,
     case Language::LLVM_IR:
       Lang = "ir";
       break;
+    case Language::HLSL:
+      Lang = "hlsl";
+      break;
     }
 
-    GenerateArg(Args, OPT_x, Lang + Header + ModuleMap + Preprocessed, SA);
+    GenerateArg(Args, OPT_x,
+                Lang + HeaderUnit + Header + ModuleMap + Preprocessed, SA);
   }
 
   // OPT_INPUT has a unique class, generate it directly.
@@ -2601,7 +2726,7 @@ static bool ParseFrontendArgs(FrontendOptions &Opts, ArgList &Args,
   Opts.ProgramAction = frontend::ParseSyntaxOnly;
   if (const Arg *A = Args.getLastArg(OPT_Action_Group)) {
     OptSpecifier Opt = OptSpecifier(A->getOption().getID());
-    Optional<frontend::ActionKind> ProgramAction = getFrontendAction(Opt);
+    std::optional<frontend::ActionKind> ProgramAction = getFrontendAction(Opt);
     assert(ProgramAction && "Option specifier not in Action_Group.");
 
     if (ProgramAction == frontend::ASTDump &&
@@ -2695,7 +2820,7 @@ static bool ParseFrontendArgs(FrontendOptions &Opts, ArgList &Args,
   // Only the -fmodule-file=<file> form.
   for (const auto *A : Args.filtered(OPT_fmodule_file)) {
     StringRef Val = A->getValue();
-    if (Val.find('=') == StringRef::npos)
+    if (!Val.contains('='))
       Opts.ModuleFiles.push_back(std::string(Val));
   }
 
@@ -2718,13 +2843,32 @@ static bool ParseFrontendArgs(FrontendOptions &Opts, ArgList &Args,
   if (const Arg *A = Args.getLastArg(OPT_x)) {
     StringRef XValue = A->getValue();
 
-    // Parse suffixes: '<lang>(-header|[-module-map][-cpp-output])'.
+    // Parse suffixes:
+    // '<lang>(-[{header-unit,user,system}-]header|[-module-map][-cpp-output])'.
     // FIXME: Supporting '<lang>-header-cpp-output' would be useful.
     bool Preprocessed = XValue.consume_back("-cpp-output");
     bool ModuleMap = XValue.consume_back("-module-map");
-    IsHeaderFile = !Preprocessed && !ModuleMap &&
-                   XValue != "precompiled-header" &&
-                   XValue.consume_back("-header");
+    // Detect and consume the header indicator.
+    bool IsHeader =
+        XValue != "precompiled-header" && XValue.consume_back("-header");
+
+    // If we have c++-{user,system}-header, that indicates a header unit input
+    // likewise, if the user put -fmodule-header together with a header with an
+    // absolute path (header-unit-header).
+    InputKind::HeaderUnitKind HUK = InputKind::HeaderUnit_None;
+    if (IsHeader || Preprocessed) {
+      if (XValue.consume_back("-header-unit"))
+        HUK = InputKind::HeaderUnit_Abs;
+      else if (XValue.consume_back("-system"))
+        HUK = InputKind::HeaderUnit_System;
+      else if (XValue.consume_back("-user"))
+        HUK = InputKind::HeaderUnit_User;
+    }
+
+    // The value set by this processing is an un-preprocessed source which is
+    // not intended to be a module map or header unit.
+    IsHeaderFile = IsHeader && !Preprocessed && !ModuleMap &&
+                   HUK == InputKind::HeaderUnit_None;
 
     // Principal languages.
     DashX = llvm::StringSwitch<InputKind>(XValue)
@@ -2737,18 +2881,21 @@ static bool ParseFrontendArgs(FrontendOptions &Opts, ArgList &Args,
                 .Case("objective-c", Language::ObjC)
                 .Case("objective-c++", Language::ObjCXX)
                 .Case("renderscript", Language::RenderScript)
+                .Case("hlsl", Language::HLSL)
                 .Default(Language::Unknown);
 
     // "objc[++]-cpp-output" is an acceptable synonym for
     // "objective-c[++]-cpp-output".
-    if (DashX.isUnknown() && Preprocessed && !IsHeaderFile && !ModuleMap)
+    if (DashX.isUnknown() && Preprocessed && !IsHeaderFile && !ModuleMap &&
+        HUK == InputKind::HeaderUnit_None)
       DashX = llvm::StringSwitch<InputKind>(XValue)
                   .Case("objc", Language::ObjC)
                   .Case("objc++", Language::ObjCXX)
                   .Default(Language::Unknown);
 
     // Some special cases cannot be combined with suffixes.
-    if (DashX.isUnknown() && !Preprocessed && !ModuleMap && !IsHeaderFile)
+    if (DashX.isUnknown() && !Preprocessed && !IsHeaderFile && !ModuleMap &&
+        HUK == InputKind::HeaderUnit_None)
       DashX = llvm::StringSwitch<InputKind>(XValue)
                   .Case("cpp-output", InputKind(Language::C).getPreprocessed())
                   .Case("assembler-with-cpp", Language::Asm)
@@ -2763,6 +2910,12 @@ static bool ParseFrontendArgs(FrontendOptions &Opts, ArgList &Args,
 
     if (Preprocessed)
       DashX = DashX.getPreprocessed();
+    // A regular header is considered mutually exclusive with a header unit.
+    if (HUK != InputKind::HeaderUnit_None) {
+      DashX = DashX.withHeaderUnit(HUK);
+      IsHeaderFile = true;
+    } else if (IsHeaderFile)
+      DashX = DashX.getHeader();
     if (ModuleMap)
       DashX = DashX.withFormat(InputKind::ModuleMap);
   }
@@ -2772,6 +2925,11 @@ static bool ParseFrontendArgs(FrontendOptions &Opts, ArgList &Args,
   Opts.Inputs.clear();
   if (Inputs.empty())
     Inputs.push_back("-");
+
+  if (DashX.getHeaderUnitKind() != InputKind::HeaderUnit_None &&
+      Inputs.size() > 1)
+    Diags.Report(diag::err_drv_header_unit_extra_inputs) << Inputs[1];
+
   for (unsigned i = 0, e = Inputs.size(); i != e; ++i) {
     InputKind IK = DashX;
     if (IK.isUnknown()) {
@@ -2841,9 +2999,9 @@ static void GenerateHeaderSearchArgs(HeaderSearchOptions &Opts,
 
   auto Matches = [](const HeaderSearchOptions::Entry &Entry,
                     llvm::ArrayRef<frontend::IncludeDirGroup> Groups,
-                    llvm::Optional<bool> IsFramework,
-                    llvm::Optional<bool> IgnoreSysRoot) {
-    return llvm::find(Groups, Entry.Group) != Groups.end() &&
+                    std::optional<bool> IsFramework,
+                    std::optional<bool> IgnoreSysRoot) {
+    return llvm::is_contained(Groups, Entry.Group) &&
            (!IsFramework || (Entry.IsFramework == *IsFramework)) &&
            (!IgnoreSysRoot || (Entry.IgnoreSysRoot == *IgnoreSysRoot));
   };
@@ -2852,8 +3010,8 @@ static void GenerateHeaderSearchArgs(HeaderSearchOptions &Opts,
   auto End = Opts.UserEntries.end();
 
   // Add -I..., -F..., and -index-header-map options in order.
-  for (; It < End &&
-         Matches(*It, {frontend::IndexHeaderMap, frontend::Angled}, None, true);
+  for (; It < End && Matches(*It, {frontend::IndexHeaderMap, frontend::Angled},
+                             std::nullopt, true);
        ++It) {
     OptSpecifier Opt = [It, Matches]() {
       if (Matches(*It, frontend::IndexHeaderMap, true, true))
@@ -2891,7 +3049,8 @@ static void GenerateHeaderSearchArgs(HeaderSearchOptions &Opts,
     GenerateArg(Args, OPT_idirafter, It->Path, SA);
   for (; It < End && Matches(*It, {frontend::Quoted}, false, true); ++It)
     GenerateArg(Args, OPT_iquote, It->Path, SA);
-  for (; It < End && Matches(*It, {frontend::System}, false, None); ++It)
+  for (; It < End && Matches(*It, {frontend::System}, false, std::nullopt);
+       ++It)
     GenerateArg(Args, It->IgnoreSysRoot ? OPT_isystem : OPT_iwithsysroot,
                 It->Path, SA);
   for (; It < End && Matches(*It, {frontend::System}, true, true); ++It)
@@ -2970,7 +3129,7 @@ static bool ParseHeaderSearchArgs(HeaderSearchOptions &Opts, ArgList &Args,
   // Only the -fmodule-file=<name>=<file> form.
   for (const auto *A : Args.filtered(OPT_fmodule_file)) {
     StringRef Val = A->getValue();
-    if (Val.find('=') != StringRef::npos){
+    if (Val.contains('=')) {
       auto Split = Val.split('=');
       Opts.PrebuiltModuleFiles.insert(
           {std::string(Split.first), std::string(Split.second)});
@@ -3070,156 +3229,6 @@ static bool ParseHeaderSearchArgs(HeaderSearchOptions &Opts, ArgList &Args,
   return Diags.getNumErrors() == NumErrorsBefore;
 }
 
-void CompilerInvocation::setLangDefaults(LangOptions &Opts, InputKind IK,
-                                         const llvm::Triple &T,
-                                         std::vector<std::string> &Includes,
-                                         LangStandard::Kind LangStd) {
-  // Set some properties which depend solely on the input kind; it would be nice
-  // to move these to the language standard, and have the driver resolve the
-  // input kind + language standard.
-  //
-  // FIXME: Perhaps a better model would be for a single source file to have
-  // multiple language standards (C / C++ std, ObjC std, OpenCL std, OpenMP std)
-  // simultaneously active?
-  if (IK.getLanguage() == Language::Asm) {
-    Opts.AsmPreprocessor = 1;
-  } else if (IK.isObjectiveC()) {
-    Opts.ObjC = 1;
-  }
-
-  if (LangStd == LangStandard::lang_unspecified) {
-    // Based on the base language, pick one.
-    switch (IK.getLanguage()) {
-    case Language::Unknown:
-    case Language::LLVM_IR:
-      llvm_unreachable("Invalid input kind!");
-    case Language::OpenCL:
-      LangStd = LangStandard::lang_opencl12;
-      break;
-    case Language::OpenCLCXX:
-      LangStd = LangStandard::lang_openclcpp;
-      break;
-    case Language::CUDA:
-      LangStd = LangStandard::lang_cuda;
-      break;
-    case Language::Asm:
-    case Language::C:
-#if defined(CLANG_DEFAULT_STD_C)
-      LangStd = CLANG_DEFAULT_STD_C;
-#else
-      // The PS4 uses C99 as the default C standard.
-      if (T.isPS4())
-        LangStd = LangStandard::lang_gnu99;
-      else
-        LangStd = LangStandard::lang_gnu17;
-#endif
-      break;
-    case Language::ObjC:
-#if defined(CLANG_DEFAULT_STD_C)
-      LangStd = CLANG_DEFAULT_STD_C;
-#else
-      LangStd = LangStandard::lang_gnu11;
-#endif
-      break;
-    case Language::CXX:
-    case Language::ObjCXX:
-#if defined(CLANG_DEFAULT_STD_CXX)
-      LangStd = CLANG_DEFAULT_STD_CXX;
-#else
-      LangStd = LangStandard::lang_gnucxx14;
-#endif
-      break;
-    case Language::RenderScript:
-      LangStd = LangStandard::lang_c99;
-      break;
-    case Language::HIP:
-      LangStd = LangStandard::lang_hip;
-      break;
-    }
-  }
-
-  const LangStandard &Std = LangStandard::getLangStandardForKind(LangStd);
-  Opts.LangStd = LangStd;
-  Opts.LineComment = Std.hasLineComments();
-  Opts.C99 = Std.isC99();
-  Opts.C11 = Std.isC11();
-  Opts.C17 = Std.isC17();
-  Opts.C2x = Std.isC2x();
-  Opts.CPlusPlus = Std.isCPlusPlus();
-  Opts.CPlusPlus11 = Std.isCPlusPlus11();
-  Opts.CPlusPlus14 = Std.isCPlusPlus14();
-  Opts.CPlusPlus17 = Std.isCPlusPlus17();
-  Opts.CPlusPlus20 = Std.isCPlusPlus20();
-  Opts.CPlusPlus2b = Std.isCPlusPlus2b();
-  Opts.GNUMode = Std.isGNUMode();
-  Opts.GNUCVersion = 0;
-  Opts.HexFloats = Std.hasHexFloats();
-  Opts.ImplicitInt = Std.hasImplicitInt();
-
-  Opts.CPlusPlusModules = Opts.CPlusPlus20;
-
-  // Set OpenCL Version.
-  Opts.OpenCL = Std.isOpenCL();
-  if (LangStd == LangStandard::lang_opencl10)
-    Opts.OpenCLVersion = 100;
-  else if (LangStd == LangStandard::lang_opencl11)
-    Opts.OpenCLVersion = 110;
-  else if (LangStd == LangStandard::lang_opencl12)
-    Opts.OpenCLVersion = 120;
-  else if (LangStd == LangStandard::lang_opencl20)
-    Opts.OpenCLVersion = 200;
-  else if (LangStd == LangStandard::lang_opencl30)
-    Opts.OpenCLVersion = 300;
-  else if (LangStd == LangStandard::lang_openclcpp)
-    Opts.OpenCLCPlusPlusVersion = 100;
-
-  // OpenCL has some additional defaults.
-  if (Opts.OpenCL) {
-    Opts.AltiVec = 0;
-    Opts.ZVector = 0;
-    Opts.setDefaultFPContractMode(LangOptions::FPM_On);
-    Opts.OpenCLCPlusPlus = Opts.CPlusPlus;
-    Opts.OpenCLPipes = Opts.OpenCLCPlusPlus || Opts.OpenCLVersion == 200;
-    Opts.OpenCLGenericAddressSpace =
-        Opts.OpenCLCPlusPlus || Opts.OpenCLVersion == 200;
-
-    // Include default header file for OpenCL.
-    if (Opts.IncludeDefaultHeader) {
-      if (Opts.DeclareOpenCLBuiltins) {
-        // Only include base header file for builtin types and constants.
-        Includes.push_back("opencl-c-base.h");
-      } else {
-        Includes.push_back("opencl-c.h");
-      }
-    }
-  }
-
-  Opts.HIP = IK.getLanguage() == Language::HIP;
-  Opts.CUDA = IK.getLanguage() == Language::CUDA || Opts.HIP;
-  if (Opts.HIP) {
-    // HIP toolchain does not support 'Fast' FPOpFusion in backends since it
-    // fuses multiplication/addition instructions without contract flag from
-    // device library functions in LLVM bitcode, which causes accuracy loss in
-    // certain math functions, e.g. tan(-1e20) becomes -0.933 instead of 0.8446.
-    // For device library functions in bitcode to work, 'Strict' or 'Standard'
-    // FPOpFusion options in backends is needed. Therefore 'fast-honor-pragmas'
-    // FP contract option is used to allow fuse across statements in frontend
-    // whereas respecting contract flag in backend.
-    Opts.setDefaultFPContractMode(LangOptions::FPM_FastHonorPragmas);
-  } else if (Opts.CUDA) {
-    // Allow fuse across statements disregarding pragmas.
-    Opts.setDefaultFPContractMode(LangOptions::FPM_Fast);
-  }
-
-  Opts.RenderScript = IK.getLanguage() == Language::RenderScript;
-
-  // OpenCL and C++ both have bool, true, false keywords.
-  Opts.Bool = Opts.OpenCL || Opts.CPlusPlus;
-
-  // OpenCL has half keyword
-  Opts.Half = Opts.OpenCL;
-}
-
 /// Check if input file kind and language standard are compatible.
 static bool IsInputCompatibleWithStandard(InputKind IK,
                                           const LangStandard &S) {
@@ -3257,13 +3266,16 @@ static bool IsInputCompatibleWithStandard(InputKind IK,
     // FIXME: The -std= value is not ignored; it affects the tokenization
     // and preprocessing rules if we're preprocessing this asm input.
     return true;
+
+  case Language::HLSL:
+    return S.getLanguage() == Language::HLSL;
   }
 
   llvm_unreachable("unexpected input language");
 }
 
 /// Get language name for given input kind.
-static const StringRef GetInputKindName(InputKind IK) {
+static StringRef GetInputKindName(InputKind IK) {
   switch (IK.getLanguage()) {
   case Language::C:
     return "C";
@@ -3289,6 +3301,9 @@ static const StringRef GetInputKindName(InputKind IK) {
   case Language::LLVM_IR:
     return "LLVM IR";
 
+  case Language::HLSL:
+    return "HLSL";
+
   case Language::Unknown:
     break;
   }
@@ -3320,7 +3335,8 @@ void CompilerInvocation::GenerateLangArgs(const LangOptions &Opts,
   case LangStandard::lang_opencl12:
   case LangStandard::lang_opencl20:
   case LangStandard::lang_opencl30:
-  case LangStandard::lang_openclcpp:
+  case LangStandard::lang_openclcpp10:
+  case LangStandard::lang_openclcpp2021:
     StdOpt = OPT_cl_std_EQ;
     break;
   default:
@@ -3423,6 +3439,8 @@ void CompilerInvocation::GenerateLangArgs(const LangOptions &Opts,
     GenerateArg(Args, OPT_mlong_double_128, SA);
   else if (Opts.LongDoubleSize == 64)
     GenerateArg(Args, OPT_mlong_double_64, SA);
+  else if (Opts.LongDoubleSize == 80)
+    GenerateArg(Args, OPT_mlong_double_80, SA);
 
   // Not generating '-mrtd', it's just an alias for '-fdefault-calling-conv='.
 
@@ -3451,6 +3469,16 @@ void CompilerInvocation::GenerateLangArgs(const LangOptions &Opts,
       GenerateArg(Args, OPT_fopenmp_version_EQ, Twine(Opts.OpenMP), SA);
   }
 
+  if (Opts.OpenMPThreadSubscription)
+    GenerateArg(Args, OPT_fopenmp_assume_threads_oversubscription, SA);
+
+  if (Opts.OpenMPTeamSubscription)
+    GenerateArg(Args, OPT_fopenmp_assume_teams_oversubscription, SA);
+
+  if (Opts.OpenMPTargetDebug != 0)
+    GenerateArg(Args, OPT_fopenmp_target_debug_EQ,
+                Twine(Opts.OpenMPTargetDebug), SA);
+
   if (Opts.OpenMPCUDANumSMs != 0)
     GenerateArg(Args, OPT_fopenmp_cuda_number_of_sm_EQ,
                 Twine(Opts.OpenMPCUDANumSMs), SA);
@@ -3478,9 +3506,6 @@ void CompilerInvocation::GenerateLangArgs(const LangOptions &Opts,
   if (Opts.OpenMPCUDAMode)
     GenerateArg(Args, OPT_fopenmp_cuda_mode, SA);
 
-  if (Opts.OpenMPCUDAForceFullRuntime)
-    GenerateArg(Args, OPT_fopenmp_cuda_force_full_runtime, SA);
-
   // The arguments used to set Optimize, OptimizeSize and NoInlineDefine are
   // generated from CodeGenOptions.
 
@@ -3514,6 +3539,10 @@ void CompilerInvocation::GenerateLangArgs(const LangOptions &Opts,
     GenerateArg(Args, OPT_fclang_abi_compat_EQ, "11.0", SA);
   else if (Opts.getClangABICompat() == LangOptions::ClangABI::Ver12)
     GenerateArg(Args, OPT_fclang_abi_compat_EQ, "12.0", SA);
+  else if (Opts.getClangABICompat() == LangOptions::ClangABI::Ver14)
+    GenerateArg(Args, OPT_fclang_abi_compat_EQ, "14.0", SA);
+  else if (Opts.getClangABICompat() == LangOptions::ClangABI::Ver15)
+    GenerateArg(Args, OPT_fclang_abi_compat_EQ, "15.0", SA);
 
   if (Opts.getSignReturnAddressScope() ==
       LangOptions::SignReturnAddressScopeKind::All)
@@ -3535,8 +3564,16 @@ void CompilerInvocation::GenerateLangArgs(const LangOptions &Opts,
   else
     GenerateArg(Args, OPT_fno_experimental_relative_cxx_abi_vtables, SA);
 
+  if (Opts.UseTargetPathSeparator)
+    GenerateArg(Args, OPT_ffile_reproducible, SA);
+  else
+    GenerateArg(Args, OPT_fno_file_reproducible, SA);
+
   for (const auto &MP : Opts.MacroPrefixMap)
     GenerateArg(Args, OPT_fmacro_prefix_map_EQ, MP.first + "=" + MP.second, SA);
+
+  if (!Opts.RandstructSeed.empty())
+    GenerateArg(Args, OPT_frandomize_layout_seed_EQ, Opts.RandstructSeed, SA);
 }
 
 bool CompilerInvocation::ParseLangArgs(LangOptions &Opts, ArgList &Args,
@@ -3617,7 +3654,9 @@ bool CompilerInvocation::ParseLangArgs(LangOptions &Opts, ArgList &Args,
         .Cases("cl1.2", "CL1.2", LangStandard::lang_opencl12)
         .Cases("cl2.0", "CL2.0", LangStandard::lang_opencl20)
         .Cases("cl3.0", "CL3.0", LangStandard::lang_opencl30)
-        .Cases("clc++", "CLC++", LangStandard::lang_openclcpp)
+        .Cases("clc++", "CLC++", LangStandard::lang_openclcpp10)
+        .Cases("clc++1.0", "CLC++1.0", LangStandard::lang_openclcpp10)
+        .Cases("clc++2021", "CLC++2021", LangStandard::lang_openclcpp2021)
         .Default(LangStandard::lang_unspecified);
 
     if (OpenCLLangStd == LangStandard::lang_unspecified) {
@@ -3632,7 +3671,7 @@ bool CompilerInvocation::ParseLangArgs(LangOptions &Opts, ArgList &Args,
   Opts.IncludeDefaultHeader = Args.hasArg(OPT_finclude_default_header);
   Opts.DeclareOpenCLBuiltins = Args.hasArg(OPT_fdeclare_opencl_builtins);
 
-  CompilerInvocation::setLangDefaults(Opts, IK, T, Includes, LangStd);
+  LangOptions::setLangDefaults(Opts, IK.getLanguage(), T, Includes, LangStd);
 
   // The key paths of codegen options defined in Options.td start with
   // "LangOpts->". Let's provide the expected variable name and type.
@@ -3719,8 +3758,8 @@ bool CompilerInvocation::ParseLangArgs(LangOptions &Opts, ArgList &Args,
     VersionTuple GNUCVer;
     bool Invalid = GNUCVer.tryParse(A->getValue());
     unsigned Major = GNUCVer.getMajor();
-    unsigned Minor = GNUCVer.getMinor().getValueOr(0);
-    unsigned Patch = GNUCVer.getSubminor().getValueOr(0);
+    unsigned Minor = GNUCVer.getMinor().value_or(0);
+    unsigned Patch = GNUCVer.getSubminor().value_or(0);
     if (Invalid || GNUCVer.getBuild() || Minor >= 100 || Patch >= 100) {
       Diags.Report(diag::err_drv_invalid_value)
           << A->getAsString(Args) << A->getValue();
@@ -3728,28 +3767,7 @@ bool CompilerInvocation::ParseLangArgs(LangOptions &Opts, ArgList &Args,
     Opts.GNUCVersion = Major * 100 * 100 + Minor * 100 + Patch;
   }
 
-  // In AIX OS, the -mignore-xcoff-visibility is enable by default if there is
-  // no -fvisibility=* option.
-  // This is the reason why '-fvisibility' needs to be always generated:
-  // its absence implies '-mignore-xcoff-visibility'.
-  //
-  // Suppose the original cc1 command line does contain '-fvisibility default':
-  // '-mignore-xcoff-visibility' should not be implied.
-  // * If '-fvisibility' is not generated (as most options with default values
-  //   don't), its absence would imply '-mignore-xcoff-visibility'. This changes
-  //   the command line semantics.
-  // * If '-fvisibility' is generated regardless of its presence and value,
-  //   '-mignore-xcoff-visibility' won't be implied and the command line
-  //   semantics are kept intact.
-  //
-  // When the original cc1 command line does **not** contain '-fvisibility',
-  // '-mignore-xcoff-visibility' is implied. The generated command line will
-  // contain both '-fvisibility default' and '-mignore-xcoff-visibility' and
-  // subsequent calls to `CreateFromArgs`/`generateCC1CommandLine` will always
-  // produce the same arguments. 
- 
-  if (T.isOSAIX() && (Args.hasArg(OPT_mignore_xcoff_visibility) ||
-                      !Args.hasArg(OPT_fvisibility)))
+  if (T.isOSAIX() && (Args.hasArg(OPT_mignore_xcoff_visibility)))
     Opts.IgnoreXCOFFVisibility = 1;
 
   if (Args.hasArg(OPT_ftrapv)) {
@@ -3768,8 +3786,8 @@ bool CompilerInvocation::ParseLangArgs(LangOptions &Opts, ArgList &Args,
       Diags.Report(diag::err_drv_invalid_value) << A->getAsString(Args)
                                                 << A->getValue();
     Opts.MSCompatibilityVersion = VT.getMajor() * 10000000 +
-                                  VT.getMinor().getValueOr(0) * 100000 +
-                                  VT.getSubminor().getValueOr(0);
+                                  VT.getMinor().value_or(0) * 100000 +
+                                  VT.getSubminor().value_or(0);
   }
 
   // Mimicking gcc's behavior, trigraphs are only enabled if -trigraphs
@@ -3791,11 +3809,19 @@ bool CompilerInvocation::ParseLangArgs(LangOptions &Opts, ArgList &Args,
   Opts.NoBuiltin = Args.hasArg(OPT_fno_builtin) || Opts.Freestanding;
   if (!Opts.NoBuiltin)
     getAllNoBuiltinFuncValues(Args, Opts.NoBuiltinFuncs);
-  Opts.LongDoubleSize = Args.hasArg(OPT_mlong_double_128)
-                            ? 128
-                            : Args.hasArg(OPT_mlong_double_64) ? 64 : 0;
-  if (Opts.FastRelaxedMath)
+  if (Arg *A = Args.getLastArg(options::OPT_LongDouble_Group)) {
+    if (A->getOption().matches(options::OPT_mlong_double_64))
+      Opts.LongDoubleSize = 64;
+    else if (A->getOption().matches(options::OPT_mlong_double_80))
+      Opts.LongDoubleSize = 80;
+    else if (A->getOption().matches(options::OPT_mlong_double_128))
+      Opts.LongDoubleSize = 128;
+    else
+      Opts.LongDoubleSize = 0;
+  }
+  if (Opts.FastRelaxedMath || Opts.CLUnsafeMath)
     Opts.setDefaultFPContractMode(LangOptions::FPM_Fast);
+
   llvm::sort(Opts.ModuleFeatures);
 
   // -mrtd option
@@ -3854,6 +3880,7 @@ bool CompilerInvocation::ParseLangArgs(LangOptions &Opts, ArgList &Args,
   // handling code for those requiring so.
   if ((Opts.OpenMPIsDevice && (T.isNVPTX() || T.isAMDGCN())) ||
       Opts.OpenCLCPlusPlus) {
+
     Opts.Exceptions = 0;
     Opts.CXXExceptions = 0;
   }
@@ -3869,6 +3896,23 @@ bool CompilerInvocation::ParseLangArgs(LangOptions &Opts, ArgList &Args,
         Opts.OpenMPCUDAReductionBufNum, Diags);
   }
 
+  // Set the value of the debugging flag used in the new offloading device RTL.
+  // Set either by a specific value or to a default if not specified.
+  if (Opts.OpenMPIsDevice && (Args.hasArg(OPT_fopenmp_target_debug) ||
+                              Args.hasArg(OPT_fopenmp_target_debug_EQ))) {
+    Opts.OpenMPTargetDebug = getLastArgIntValue(
+        Args, OPT_fopenmp_target_debug_EQ, Opts.OpenMPTargetDebug, Diags);
+    if (!Opts.OpenMPTargetDebug && Args.hasArg(OPT_fopenmp_target_debug))
+      Opts.OpenMPTargetDebug = 1;
+  }
+
+  if (Opts.OpenMPIsDevice) {
+    if (Args.hasArg(OPT_fopenmp_assume_teams_oversubscription))
+      Opts.OpenMPTeamSubscription = true;
+    if (Args.hasArg(OPT_fopenmp_assume_threads_oversubscription))
+      Opts.OpenMPThreadSubscription = true;
+  }
+
   // Get the OpenMP target triples if any.
   if (Arg *A = Args.getLastArg(options::OPT_fopenmp_targets_EQ)) {
     enum ArchPtrSize { Arch16Bit, Arch32Bit, Arch64Bit };
@@ -3913,11 +3957,6 @@ bool CompilerInvocation::ParseLangArgs(LangOptions &Opts, ArgList &Args,
   Opts.OpenMPCUDAMode = Opts.OpenMPIsDevice && (T.isNVPTX() || T.isAMDGCN()) &&
                         Args.hasArg(options::OPT_fopenmp_cuda_mode);
 
-  // Set CUDA mode for OpenMP target NVPTX/AMDGCN if specified in options
-  Opts.OpenMPCUDAForceFullRuntime =
-      Opts.OpenMPIsDevice && (T.isNVPTX() || T.isAMDGCN()) &&
-      Args.hasArg(options::OPT_fopenmp_cuda_force_full_runtime);
-
   // FIXME: Eliminate this dependency.
   unsigned Opt = getOptimizationLevel(Args, IK, Diags),
        OptSize = getOptimizationLevelSize(Args);
@@ -3989,6 +4028,10 @@ bool CompilerInvocation::ParseLangArgs(LangOptions &Opts, ArgList &Args,
         Opts.setClangABICompat(LangOptions::ClangABI::Ver11);
       else if (Major <= 12)
         Opts.setClangABICompat(LangOptions::ClangABI::Ver12);
+      else if (Major <= 14)
+        Opts.setClangABICompat(LangOptions::ClangABI::Ver14);
+      else if (Major <= 15)
+        Opts.setClangABICompat(LangOptions::ClangABI::Ver15);
     } else if (Ver != "latest") {
       Diags.Report(diag::err_drv_invalid_value)
           << A->getAsString(Args) << A->getValue();
@@ -4052,6 +4095,40 @@ bool CompilerInvocation::ParseLangArgs(LangOptions &Opts, ArgList &Args,
         {std::string(Split.first), std::string(Split.second)});
   }
 
+  Opts.UseTargetPathSeparator =
+      !Args.getLastArg(OPT_fno_file_reproducible) &&
+      (Args.getLastArg(OPT_ffile_compilation_dir_EQ) ||
+       Args.getLastArg(OPT_fmacro_prefix_map_EQ) ||
+       Args.getLastArg(OPT_ffile_reproducible));
+
+  // Error if -mvscale-min is unbounded.
+  if (Arg *A = Args.getLastArg(options::OPT_mvscale_min_EQ)) {
+    unsigned VScaleMin;
+    if (StringRef(A->getValue()).getAsInteger(10, VScaleMin) || VScaleMin == 0)
+      Diags.Report(diag::err_cc1_unbounded_vscale_min);
+  }
+
+  if (const Arg *A = Args.getLastArg(OPT_frandomize_layout_seed_file_EQ)) {
+    std::ifstream SeedFile(A->getValue(0));
+
+    if (!SeedFile.is_open())
+      Diags.Report(diag::err_drv_cannot_open_randomize_layout_seed_file)
+          << A->getValue(0);
+
+    std::getline(SeedFile, Opts.RandstructSeed);
+  }
+
+  if (const Arg *A = Args.getLastArg(OPT_frandomize_layout_seed_EQ))
+    Opts.RandstructSeed = A->getValue(0);
+
+  // Validate options for HLSL
+  if (Opts.HLSL) {
+    bool SupportedTarget = T.getArch() == llvm::Triple::dxil &&
+                           T.getOS() == llvm::Triple::ShaderModel;
+    if (!SupportedTarget)
+      Diags.Report(diag::err_drv_hlsl_unsupported_target) << T.str();
+  }
+
   return Diags.getNumErrors() == NumErrorsBefore;
 }
 
@@ -4068,10 +4145,11 @@ static bool isStrictlyPreprocessorAction(frontend::ActionKind Action) {
   case frontend::EmitLLVMOnly:
   case frontend::EmitCodeGenOnly:
   case frontend::EmitObj:
+  case frontend::ExtractAPI:
   case frontend::FixIt:
   case frontend::GenerateModule:
   case frontend::GenerateModuleInterface:
-  case frontend::GenerateHeaderModule:
+  case frontend::GenerateHeaderUnit:
   case frontend::GeneratePCH:
   case frontend::GenerateInterfaceStubs:
   case frontend::ParseSyntaxOnly:
@@ -4153,6 +4231,10 @@ static void GeneratePreprocessorArgs(PreprocessorOptions &Opts,
         ((LangOpts.DeclareOpenCLBuiltins && I == "opencl-c-base.h") ||
          I == "opencl-c.h"))
       continue;
+    // Don't generate HLSL includes. They are implied by other flags that are
+    // generated elsewhere.
+    if (LangOpts.HLSL && I == "hlsl.h")
+      continue;
 
     GenerateArg(Args, OPT_include, I, SA);
   }
@@ -4163,6 +4245,9 @@ static void GeneratePreprocessorArgs(PreprocessorOptions &Opts,
   for (const auto &RF : Opts.RemappedFiles)
     GenerateArg(Args, OPT_remap_file, RF.first + ";" + RF.second, SA);
 
+  if (Opts.SourceDateEpoch)
+    GenerateArg(Args, OPT_source_date_epoch, Twine(*Opts.SourceDateEpoch), SA);
+
   // Don't handle LexEditorPlaceholders. It is implied by the action that is
   // generated elsewhere.
 }
@@ -4245,6 +4330,22 @@ static bool ParsePreprocessorArgs(PreprocessorOptions &Opts, ArgList &Args,
     Opts.addRemappedFile(Split.first, Split.second);
   }
 
+  if (const Arg *A = Args.getLastArg(OPT_source_date_epoch)) {
+    StringRef Epoch = A->getValue();
+    // SOURCE_DATE_EPOCH, if specified, must be a non-negative decimal integer.
+    // On time64 systems, pick 253402300799 (the UNIX timestamp of
+    // 9999-12-31T23:59:59Z) as the upper bound.
+    const uint64_t MaxTimestamp =
+        std::min<uint64_t>(std::numeric_limits<time_t>::max(), 253402300799);
+    uint64_t V;
+    if (Epoch.getAsInteger(10, V) || V > MaxTimestamp) {
+      Diags.Report(diag::err_fe_invalid_source_date_epoch)
+          << Epoch << MaxTimestamp;
+    } else {
+      Opts.SourceDateEpoch = V;
+    }
+  }
+
   // Always avoid lexing editor placeholders when we're just running the
   // preprocessor as we never want to emit the
   // "editor placeholder in source file" error in PP only mode.
@@ -4275,6 +4376,8 @@ static void GeneratePreprocessorOutputArgs(
     GenerateArg(Args, OPT_dM, SA);
   if (!Generate_dM && Opts.ShowMacros)
     GenerateArg(Args, OPT_dD, SA);
+  if (Opts.DirectivesOnly)
+    GenerateArg(Args, OPT_fdirectives_only, SA);
 }
 
 static bool ParsePreprocessorOutputArgs(PreprocessorOutputOptions &Opts,
@@ -4297,6 +4400,7 @@ static bool ParsePreprocessorOutputArgs(PreprocessorOutputOptions &Opts,
 
   Opts.ShowCPP = isStrictlyPreprocessorAction(Action) && !Args.hasArg(OPT_dM);
   Opts.ShowMacros = Args.hasArg(OPT_dM) || Args.hasArg(OPT_dD);
+  Opts.DirectivesOnly = Args.hasArg(OPT_fdirectives_only);
 
   return Diags.getNumErrors() == NumErrorsBefore;
 }
@@ -4319,6 +4423,9 @@ static void GenerateTargetArgs(const TargetOptions &Opts,
   if (!Opts.SDKVersion.empty())
     GenerateArg(Args, OPT_target_sdk_version_EQ, Opts.SDKVersion.getAsString(),
                 SA);
+  if (!Opts.DarwinTargetVariantSDKVersion.empty())
+    GenerateArg(Args, OPT_darwin_target_variant_sdk_version_EQ,
+                Opts.DarwinTargetVariantSDKVersion.getAsString(), SA);
 }
 
 static bool ParseTargetArgs(TargetOptions &Opts, ArgList &Args,
@@ -4346,6 +4453,15 @@ static bool ParseTargetArgs(TargetOptions &Opts, ArgList &Args,
     else
       Opts.SDKVersion = Version;
   }
+  if (Arg *A =
+          Args.getLastArg(options::OPT_darwin_target_variant_sdk_version_EQ)) {
+    llvm::VersionTuple Version;
+    if (Version.tryParse(A->getValue()))
+      Diags.Report(diag::err_drv_invalid_value)
+          << A->getAsString(Args) << A->getValue();
+    else
+      Opts.DarwinTargetVariantSDKVersion = Version;
+  }
 
   return Diags.getNumErrors() == NumErrorsBefore;
 }
@@ -4397,6 +4513,13 @@ bool CompilerInvocation::CreateFromArgsImpl(
   if (Res.getFrontendOpts().ProgramAction == frontend::RewriteObjC)
     LangOpts.ObjCExceptions = 1;
 
+  for (auto Warning : Res.getDiagnosticOpts().Warnings) {
+    if (Warning == "misexpect" &&
+        !Diags.isIgnored(diag::warn_profile_data_misexpect, SourceLocation())) {
+      Res.getCodeGenOpts().MisExpect = true;
+    }
+  }
+
   if (LangOpts.CUDA) {
     // During CUDA device-side compilation, the aux triple is the
     // triple used for host compilation.
@@ -4441,8 +4564,10 @@ bool CompilerInvocation::CreateFromArgsImpl(
   }
 
   // Store the command-line for using in the CodeView backend.
-  Res.getCodeGenOpts().Argv0 = Argv0;
-  Res.getCodeGenOpts().CommandLineArgs = CommandLineArgs;
+  if (Res.getCodeGenOpts().CodeViewCommandLine) {
+    Res.getCodeGenOpts().Argv0 = Argv0;
+    append_range(Res.getCodeGenOpts().CommandLineArgs, CommandLineArgs);
+  }
 
   FixupInvocation(Res, Diags, Args, DashX);
 
@@ -4461,121 +4586,107 @@ bool CompilerInvocation::CreateFromArgs(CompilerInvocation &Invocation,
         return CreateFromArgsImpl(Invocation, CommandLineArgs, Diags, Argv0);
       },
       [](CompilerInvocation &Invocation, SmallVectorImpl<const char *> &Args,
-         StringAllocator SA) { Invocation.generateCC1CommandLine(Args, SA); },
+         StringAllocator SA) {
+        Args.push_back("-cc1");
+        Invocation.generateCC1CommandLine(Args, SA);
+      },
       Invocation, DummyInvocation, CommandLineArgs, Diags, Argv0);
 }
 
 std::string CompilerInvocation::getModuleHash() const {
+  // FIXME: Consider using SHA1 instead of MD5.
+  llvm::HashBuilder<llvm::MD5, llvm::support::endianness::native> HBuilder;
+
   // Note: For QoI reasons, the things we use as a hash here should all be
   // dumped via the -module-info flag.
-  using llvm::hash_code;
-  using llvm::hash_value;
-  using llvm::hash_combine;
-  using llvm::hash_combine_range;
 
   // Start the signature with the compiler version.
-  // FIXME: We'd rather use something more cryptographically sound than
-  // CityHash, but this will do for now.
-  hash_code code = hash_value(getClangFullRepositoryVersion());
+  HBuilder.add(getClangFullRepositoryVersion());
 
   // Also include the serialization version, in case LLVM_APPEND_VC_REV is off
   // and getClangFullRepositoryVersion() doesn't include git revision.
-  code = hash_combine(code, serialization::VERSION_MAJOR,
-                      serialization::VERSION_MINOR);
+  HBuilder.add(serialization::VERSION_MAJOR, serialization::VERSION_MINOR);
 
   // Extend the signature with the language options
-#define LANGOPT(Name, Bits, Default, Description) \
-   code = hash_combine(code, LangOpts->Name);
-#define ENUM_LANGOPT(Name, Type, Bits, Default, Description) \
-  code = hash_combine(code, static_cast<unsigned>(LangOpts->get##Name()));
+#define LANGOPT(Name, Bits, Default, Description) HBuilder.add(LangOpts->Name);
+#define ENUM_LANGOPT(Name, Type, Bits, Default, Description)                   \
+  HBuilder.add(static_cast<unsigned>(LangOpts->get##Name()));
 #define BENIGN_LANGOPT(Name, Bits, Default, Description)
 #define BENIGN_ENUM_LANGOPT(Name, Type, Bits, Default, Description)
 #include "clang/Basic/LangOptions.def"
 
-  for (StringRef Feature : LangOpts->ModuleFeatures)
-    code = hash_combine(code, Feature);
+  HBuilder.addRange(LangOpts->ModuleFeatures);
 
-  code = hash_combine(code, LangOpts->ObjCRuntime);
-  const auto &BCN = LangOpts->CommentOpts.BlockCommandNames;
-  code = hash_combine(code, hash_combine_range(BCN.begin(), BCN.end()));
+  HBuilder.add(LangOpts->ObjCRuntime);
+  HBuilder.addRange(LangOpts->CommentOpts.BlockCommandNames);
 
   // Extend the signature with the target options.
-  code = hash_combine(code, TargetOpts->Triple, TargetOpts->CPU,
-                      TargetOpts->TuneCPU, TargetOpts->ABI);
-  for (const auto &FeatureAsWritten : TargetOpts->FeaturesAsWritten)
-    code = hash_combine(code, FeatureAsWritten);
+  HBuilder.add(TargetOpts->Triple, TargetOpts->CPU, TargetOpts->TuneCPU,
+               TargetOpts->ABI);
+  HBuilder.addRange(TargetOpts->FeaturesAsWritten);
 
   // Extend the signature with preprocessor options.
   const PreprocessorOptions &ppOpts = getPreprocessorOpts();
-  const HeaderSearchOptions &hsOpts = getHeaderSearchOpts();
-  code = hash_combine(code, ppOpts.UsePredefines, ppOpts.DetailedRecord);
+  HBuilder.add(ppOpts.UsePredefines, ppOpts.DetailedRecord);
 
-  for (const auto &I : getPreprocessorOpts().Macros) {
+  const HeaderSearchOptions &hsOpts = getHeaderSearchOpts();
+  for (const auto &Macro : getPreprocessorOpts().Macros) {
     // If we're supposed to ignore this macro for the purposes of modules,
     // don't put it into the hash.
     if (!hsOpts.ModulesIgnoreMacros.empty()) {
       // Check whether we're ignoring this macro.
-      StringRef MacroDef = I.first;
+      StringRef MacroDef = Macro.first;
       if (hsOpts.ModulesIgnoreMacros.count(
               llvm::CachedHashString(MacroDef.split('=').first)))
         continue;
     }
 
-    code = hash_combine(code, I.first, I.second);
+    HBuilder.add(Macro);
   }
 
   // Extend the signature with the sysroot and other header search options.
-  code = hash_combine(code, hsOpts.Sysroot,
-                      hsOpts.ModuleFormat,
-                      hsOpts.UseDebugInfo,
-                      hsOpts.UseBuiltinIncludes,
-                      hsOpts.UseStandardSystemIncludes,
-                      hsOpts.UseStandardCXXIncludes,
-                      hsOpts.UseLibcxx,
-                      hsOpts.ModulesValidateDiagnosticOptions);
-  code = hash_combine(code, hsOpts.ResourceDir);
+  HBuilder.add(hsOpts.Sysroot, hsOpts.ModuleFormat, hsOpts.UseDebugInfo,
+               hsOpts.UseBuiltinIncludes, hsOpts.UseStandardSystemIncludes,
+               hsOpts.UseStandardCXXIncludes, hsOpts.UseLibcxx,
+               hsOpts.ModulesValidateDiagnosticOptions);
+  HBuilder.add(hsOpts.ResourceDir);
 
   if (hsOpts.ModulesStrictContextHash) {
-    hash_code SHPC = hash_combine_range(hsOpts.SystemHeaderPrefixes.begin(),
-                                        hsOpts.SystemHeaderPrefixes.end());
-    hash_code UEC = hash_combine_range(hsOpts.UserEntries.begin(),
-                                       hsOpts.UserEntries.end());
-    code = hash_combine(code, hsOpts.SystemHeaderPrefixes.size(), SHPC,
-                        hsOpts.UserEntries.size(), UEC);
+    HBuilder.addRange(hsOpts.SystemHeaderPrefixes);
+    HBuilder.addRange(hsOpts.UserEntries);
 
     const DiagnosticOptions &diagOpts = getDiagnosticOpts();
-    #define DIAGOPT(Name, Bits, Default) \
-      code = hash_combine(code, diagOpts.Name);
-    #define ENUM_DIAGOPT(Name, Type, Bits, Default) \
-      code = hash_combine(code, diagOpts.get##Name());
-    #include "clang/Basic/DiagnosticOptions.def"
-    #undef DIAGOPT
-    #undef ENUM_DIAGOPT
+#define DIAGOPT(Name, Bits, Default) HBuilder.add(diagOpts.Name);
+#define ENUM_DIAGOPT(Name, Type, Bits, Default)                                \
+  HBuilder.add(diagOpts.get##Name());
+#include "clang/Basic/DiagnosticOptions.def"
+#undef DIAGOPT
+#undef ENUM_DIAGOPT
   }
 
   // Extend the signature with the user build path.
-  code = hash_combine(code, hsOpts.ModuleUserBuildPath);
+  HBuilder.add(hsOpts.ModuleUserBuildPath);
 
   // Extend the signature with the module file extensions.
-  const FrontendOptions &frontendOpts = getFrontendOpts();
-  for (const auto &ext : frontendOpts.ModuleFileExtensions) {
-    code = ext->hashExtension(code);
-  }
+  for (const auto &ext : getFrontendOpts().ModuleFileExtensions)
+    ext->hashExtension(HBuilder);
 
   // When compiling with -gmodules, also hash -fdebug-prefix-map as it
   // affects the debug info in the PCM.
   if (getCodeGenOpts().DebugTypeExtRefs)
-    for (const auto &KeyValue : getCodeGenOpts().DebugPrefixMap)
-      code = hash_combine(code, KeyValue.first, KeyValue.second);
+    HBuilder.addRange(getCodeGenOpts().DebugPrefixMap);
 
   // Extend the signature with the enabled sanitizers, if at least one is
   // enabled. Sanitizers which cannot affect AST generation aren't hashed.
   SanitizerSet SanHash = LangOpts->Sanitize;
   SanHash.clear(getPPTransparentSanitizers());
   if (!SanHash.empty())
-    code = hash_combine(code, SanHash.Mask);
+    HBuilder.add(SanHash.Mask);
 
-  return toString(llvm::APInt(64, code), 36, /*Signed=*/false);
+  llvm::MD5::MD5Result Result;
+  HBuilder.getHasher().final(Result);
+  uint64_t Hash = Result.high() ^ Result.low();
+  return toString(llvm::APInt(64, Hash), 36, /*Signed=*/false);
 }
 
 void CompilerInvocation::generateCC1CommandLine(
@@ -4599,6 +4710,37 @@ void CompilerInvocation::generateCC1CommandLine(
   GenerateDependencyOutputArgs(DependencyOutputOpts, Args, SA);
 }
 
+std::vector<std::string> CompilerInvocation::getCC1CommandLine() const {
+  // Set up string allocator.
+  llvm::BumpPtrAllocator Alloc;
+  llvm::StringSaver Strings(Alloc);
+  auto SA = [&Strings](const Twine &Arg) { return Strings.save(Arg).data(); };
+
+  // Synthesize full command line from the CompilerInvocation, including "-cc1".
+  SmallVector<const char *, 32> Args{"-cc1"};
+  generateCC1CommandLine(Args, SA);
+
+  // Convert arguments to the return type.
+  return std::vector<std::string>{Args.begin(), Args.end()};
+}
+
+void CompilerInvocation::resetNonModularOptions() {
+  getLangOpts()->resetNonModularOptions();
+  getPreprocessorOpts().resetNonModularOptions();
+}
+
+void CompilerInvocation::clearImplicitModuleBuildOptions() {
+  getLangOpts()->ImplicitModules = false;
+  getHeaderSearchOpts().ImplicitModuleMaps = false;
+  getHeaderSearchOpts().ModuleCachePath.clear();
+  getHeaderSearchOpts().ModulesValidateOncePerBuildSession = false;
+  getHeaderSearchOpts().BuildSessionTimestamp = 0;
+  // The specific values we canonicalize to for pruning don't affect behaviour,
+  /// so use the default values so they may be dropped from the command-line.
+  getHeaderSearchOpts().ModuleCachePruneInterval = 7 * 24 * 60 * 60;
+  getHeaderSearchOpts().ModuleCachePruneAfter = 31 * 24 * 60 * 60;
+}
+
 IntrusiveRefCntPtr<llvm::vfs::FileSystem>
 clang::createVFSFromCompilerInvocation(const CompilerInvocation &CI,
                                        DiagnosticsEngine &Diags) {
@@ -4610,12 +4752,19 @@ IntrusiveRefCntPtr<llvm::vfs::FileSystem>
 clang::createVFSFromCompilerInvocation(
     const CompilerInvocation &CI, DiagnosticsEngine &Diags,
     IntrusiveRefCntPtr<llvm::vfs::FileSystem> BaseFS) {
-  if (CI.getHeaderSearchOpts().VFSOverlayFiles.empty())
+  return createVFSFromOverlayFiles(CI.getHeaderSearchOpts().VFSOverlayFiles,
+                                   Diags, std::move(BaseFS));
+}
+
+IntrusiveRefCntPtr<llvm::vfs::FileSystem> clang::createVFSFromOverlayFiles(
+    ArrayRef<std::string> VFSOverlayFiles, DiagnosticsEngine &Diags,
+    IntrusiveRefCntPtr<llvm::vfs::FileSystem> BaseFS) {
+  if (VFSOverlayFiles.empty())
     return BaseFS;
 
   IntrusiveRefCntPtr<llvm::vfs::FileSystem> Result = BaseFS;
   // earlier vfs files are on the bottom
-  for (const auto &File : CI.getHeaderSearchOpts().VFSOverlayFiles) {
+  for (const auto &File : VFSOverlayFiles) {
     llvm::ErrorOr<std::unique_ptr<llvm::MemoryBuffer>> Buffer =
         Result->getBufferForFile(File);
     if (!Buffer) {
diff --git a/gnu/llvm/clang/lib/Frontend/InitHeaderSearch.cpp b/gnu/llvm/clang/lib/Frontend/InitHeaderSearch.cpp
deleted file mode 100644
index ba9f96384f8..00000000000
--- a/gnu/llvm/clang/lib/Frontend/InitHeaderSearch.cpp
+++ /dev/null
@@ -1,656 +0,0 @@
-//===--- InitHeaderSearch.cpp - Initialize header search paths ------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file implements the InitHeaderSearch class.
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/Basic/FileManager.h"
-#include "clang/Basic/LangOptions.h"
-#include "clang/Config/config.h" // C_INCLUDE_DIRS
-#include "clang/Frontend/FrontendDiagnostic.h"
-#include "clang/Frontend/Utils.h"
-#include "clang/Lex/HeaderMap.h"
-#include "clang/Lex/HeaderSearch.h"
-#include "clang/Lex/HeaderSearchOptions.h"
-#include "llvm/ADT/SmallPtrSet.h"
-#include "llvm/ADT/SmallString.h"
-#include "llvm/ADT/SmallVector.h"
-#include "llvm/ADT/StringExtras.h"
-#include "llvm/ADT/Triple.h"
-#include "llvm/ADT/Twine.h"
-#include "llvm/Support/ErrorHandling.h"
-#include "llvm/Support/Path.h"
-#include "llvm/Support/raw_ostream.h"
-
-using namespace clang;
-using namespace clang::frontend;
-
-namespace {
-/// Holds information about a single DirectoryLookup object.
-struct DirectoryLookupInfo {
-  IncludeDirGroup Group;
-  DirectoryLookup Lookup;
-
-  DirectoryLookupInfo(IncludeDirGroup Group, DirectoryLookup Lookup)
-      : Group(Group), Lookup(Lookup) {}
-};
-
-/// InitHeaderSearch - This class makes it easier to set the search paths of
-///  a HeaderSearch object. InitHeaderSearch stores several search path lists
-///  internally, which can be sent to a HeaderSearch object in one swoop.
-class InitHeaderSearch {
-  std::vector<DirectoryLookupInfo> IncludePath;
-  std::vector<std::pair<std::string, bool> > SystemHeaderPrefixes;
-  HeaderSearch &Headers;
-  bool Verbose;
-  std::string IncludeSysroot;
-  bool HasSysroot;
-
-public:
-  InitHeaderSearch(HeaderSearch &HS, bool verbose, StringRef sysroot)
-      : Headers(HS), Verbose(verbose), IncludeSysroot(std::string(sysroot)),
-        HasSysroot(!(sysroot.empty() || sysroot == "/")) {}
-
-  /// AddPath - Add the specified path to the specified group list, prefixing
-  /// the sysroot if used.
-  /// Returns true if the path exists, false if it was ignored.
-  bool AddPath(const Twine &Path, IncludeDirGroup Group, bool isFramework);
-
-  /// AddUnmappedPath - Add the specified path to the specified group list,
-  /// without performing any sysroot remapping.
-  /// Returns true if the path exists, false if it was ignored.
-  bool AddUnmappedPath(const Twine &Path, IncludeDirGroup Group,
-                       bool isFramework);
-
-  /// AddSystemHeaderPrefix - Add the specified prefix to the system header
-  /// prefix list.
-  void AddSystemHeaderPrefix(StringRef Prefix, bool IsSystemHeader) {
-    SystemHeaderPrefixes.emplace_back(std::string(Prefix), IsSystemHeader);
-  }
-
-  /// AddGnuCPlusPlusIncludePaths - Add the necessary paths to support a gnu
-  ///  libstdc++.
-  /// Returns true if the \p Base path was found, false if it does not exist.
-  bool AddGnuCPlusPlusIncludePaths(StringRef Base, StringRef ArchDir,
-                                   StringRef Dir32, StringRef Dir64,
-                                   const llvm::Triple &triple);
-
-  /// AddMinGWCPlusPlusIncludePaths - Add the necessary paths to support a MinGW
-  ///  libstdc++.
-  void AddMinGWCPlusPlusIncludePaths(StringRef Base,
-                                     StringRef Arch,
-                                     StringRef Version);
-
-  // AddDefaultCIncludePaths - Add paths that should always be searched.
-  void AddDefaultCIncludePaths(const llvm::Triple &triple,
-                               const HeaderSearchOptions &HSOpts);
-
-  // AddDefaultCPlusPlusIncludePaths -  Add paths that should be searched when
-  //  compiling c++.
-  void AddDefaultCPlusPlusIncludePaths(const LangOptions &LangOpts,
-                                       const llvm::Triple &triple,
-                                       const HeaderSearchOptions &HSOpts);
-
-  /// AddDefaultSystemIncludePaths - Adds the default system include paths so
-  ///  that e.g. stdio.h is found.
-  void AddDefaultIncludePaths(const LangOptions &Lang,
-                              const llvm::Triple &triple,
-                              const HeaderSearchOptions &HSOpts);
-
-  /// Realize - Merges all search path lists into one list and send it to
-  /// HeaderSearch.
-  void Realize(const LangOptions &Lang);
-};
-
-}  // end anonymous namespace.
-
-static bool CanPrefixSysroot(StringRef Path) {
-#if defined(_WIN32)
-  return !Path.empty() && llvm::sys::path::is_separator(Path[0]);
-#else
-  return llvm::sys::path::is_absolute(Path);
-#endif
-}
-
-bool InitHeaderSearch::AddPath(const Twine &Path, IncludeDirGroup Group,
-                               bool isFramework) {
-  // Add the path with sysroot prepended, if desired and this is a system header
-  // group.
-  if (HasSysroot) {
-    SmallString<256> MappedPathStorage;
-    StringRef MappedPathStr = Path.toStringRef(MappedPathStorage);
-    if (CanPrefixSysroot(MappedPathStr)) {
-      return AddUnmappedPath(IncludeSysroot + Path, Group, isFramework);
-    }
-  }
-
-  return AddUnmappedPath(Path, Group, isFramework);
-}
-
-bool InitHeaderSearch::AddUnmappedPath(const Twine &Path, IncludeDirGroup Group,
-                                       bool isFramework) {
-  assert(!Path.isTriviallyEmpty() && "can't handle empty path here");
-
-  FileManager &FM = Headers.getFileMgr();
-  SmallString<256> MappedPathStorage;
-  StringRef MappedPathStr = Path.toStringRef(MappedPathStorage);
-
-  // If use system headers while cross-compiling, emit the warning.
-  if (HasSysroot && (MappedPathStr.startswith("/usr/include") ||
-                     MappedPathStr.startswith("/usr/local/include"))) {
-    Headers.getDiags().Report(diag::warn_poison_system_directories)
-        << MappedPathStr;
-  }
-
-  // Compute the DirectoryLookup type.
-  SrcMgr::CharacteristicKind Type;
-  if (Group == Quoted || Group == Angled || Group == IndexHeaderMap) {
-    Type = SrcMgr::C_User;
-  } else if (Group == ExternCSystem) {
-    Type = SrcMgr::C_ExternCSystem;
-  } else {
-    Type = SrcMgr::C_System;
-  }
-
-  // If the directory exists, add it.
-  if (auto DE = FM.getOptionalDirectoryRef(MappedPathStr)) {
-    IncludePath.emplace_back(Group, DirectoryLookup(*DE, Type, isFramework));
-    return true;
-  }
-
-  // Check to see if this is an apple-style headermap (which are not allowed to
-  // be frameworks).
-  if (!isFramework) {
-    if (auto FE = FM.getFile(MappedPathStr)) {
-      if (const HeaderMap *HM = Headers.CreateHeaderMap(*FE)) {
-        // It is a headermap, add it to the search path.
-        IncludePath.emplace_back(
-            Group, DirectoryLookup(HM, Type, Group == IndexHeaderMap));
-        return true;
-      }
-    }
-  }
-
-  if (Verbose)
-    llvm::errs() << "ignoring nonexistent directory \""
-                 << MappedPathStr << "\"\n";
-  return false;
-}
-
-bool InitHeaderSearch::AddGnuCPlusPlusIncludePaths(StringRef Base,
-                                                   StringRef ArchDir,
-                                                   StringRef Dir32,
-                                                   StringRef Dir64,
-                                                   const llvm::Triple &triple) {
-  // Add the base dir
-  bool IsBaseFound = AddPath(Base, CXXSystem, false);
-
-  // Add the multilib dirs
-  llvm::Triple::ArchType arch = triple.getArch();
-  bool is64bit = arch == llvm::Triple::ppc64 || arch == llvm::Triple::x86_64;
-  if (is64bit)
-    AddPath(Base + "/" + ArchDir + "/" + Dir64, CXXSystem, false);
-  else
-    AddPath(Base + "/" + ArchDir + "/" + Dir32, CXXSystem, false);
-
-  // Add the backward dir
-  AddPath(Base + "/backward", CXXSystem, false);
-  return IsBaseFound;
-}
-
-void InitHeaderSearch::AddMinGWCPlusPlusIncludePaths(StringRef Base,
-                                                     StringRef Arch,
-                                                     StringRef Version) {
-  AddPath(Base + "/" + Arch + "/" + Version + "/include/c++",
-          CXXSystem, false);
-  AddPath(Base + "/" + Arch + "/" + Version + "/include/c++/" + Arch,
-          CXXSystem, false);
-  AddPath(Base + "/" + Arch + "/" + Version + "/include/c++/backward",
-          CXXSystem, false);
-}
-
-void InitHeaderSearch::AddDefaultCIncludePaths(const llvm::Triple &triple,
-                                            const HeaderSearchOptions &HSOpts) {
-  llvm::Triple::OSType os = triple.getOS();
-
-  if (triple.isOSDarwin()) {
-    llvm_unreachable("Include management is handled in the driver.");
-  }
-
-  if (HSOpts.UseStandardSystemIncludes) {
-    switch (os) {
-    case llvm::Triple::CloudABI:
-    case llvm::Triple::FreeBSD:
-    case llvm::Triple::NetBSD:
-    case llvm::Triple::OpenBSD:
-    case llvm::Triple::NaCl:
-    case llvm::Triple::PS4:
-    case llvm::Triple::ELFIAMCU:
-    case llvm::Triple::Fuchsia:
-      break;
-    case llvm::Triple::Win32:
-      if (triple.getEnvironment() != llvm::Triple::Cygnus)
-        break;
-      LLVM_FALLTHROUGH;
-    default:
-      // FIXME: temporary hack: hard-coded paths.
-      AddPath("/usr/local/include", System, false);
-      break;
-    }
-  }
-
-  // Builtin includes use #include_next directives and should be positioned
-  // just prior C include dirs.
-  if (HSOpts.UseBuiltinIncludes) {
-    // Ignore the sys root, we *always* look for clang headers relative to
-    // supplied path.
-    SmallString<128> P = StringRef(HSOpts.ResourceDir);
-    llvm::sys::path::append(P, "include");
-    AddUnmappedPath(P, ExternCSystem, false);
-  }
-
-  // All remaining additions are for system include directories, early exit if
-  // we aren't using them.
-  if (!HSOpts.UseStandardSystemIncludes)
-    return;
-
-  // Add dirs specified via 'configure --with-c-include-dirs'.
-  StringRef CIncludeDirs(C_INCLUDE_DIRS);
-  if (CIncludeDirs != "") {
-    SmallVector<StringRef, 5> dirs;
-    CIncludeDirs.split(dirs, ":");
-    for (StringRef dir : dirs)
-      AddPath(dir, ExternCSystem, false);
-    return;
-  }
-
-  switch (os) {
-  case llvm::Triple::Linux:
-  case llvm::Triple::Hurd:
-  case llvm::Triple::Solaris:
-  case llvm::Triple::OpenBSD:
-    llvm_unreachable("Include management is handled in the driver.");
-
-  case llvm::Triple::CloudABI: {
-    // <sysroot>/<triple>/include
-    SmallString<128> P = StringRef(HSOpts.ResourceDir);
-    llvm::sys::path::append(P, "../../..", triple.str(), "include");
-    AddPath(P, System, false);
-    break;
-  }
-
-  case llvm::Triple::Haiku:
-    AddPath("/boot/system/non-packaged/develop/headers", System, false);
-    AddPath("/boot/system/develop/headers/os", System, false);
-    AddPath("/boot/system/develop/headers/os/app", System, false);
-    AddPath("/boot/system/develop/headers/os/arch", System, false);
-    AddPath("/boot/system/develop/headers/os/device", System, false);
-    AddPath("/boot/system/develop/headers/os/drivers", System, false);
-    AddPath("/boot/system/develop/headers/os/game", System, false);
-    AddPath("/boot/system/develop/headers/os/interface", System, false);
-    AddPath("/boot/system/develop/headers/os/kernel", System, false);
-    AddPath("/boot/system/develop/headers/os/locale", System, false);
-    AddPath("/boot/system/develop/headers/os/mail", System, false);
-    AddPath("/boot/system/develop/headers/os/media", System, false);
-    AddPath("/boot/system/develop/headers/os/midi", System, false);
-    AddPath("/boot/system/develop/headers/os/midi2", System, false);
-    AddPath("/boot/system/develop/headers/os/net", System, false);
-    AddPath("/boot/system/develop/headers/os/opengl", System, false);
-    AddPath("/boot/system/develop/headers/os/storage", System, false);
-    AddPath("/boot/system/develop/headers/os/support", System, false);
-    AddPath("/boot/system/develop/headers/os/translation", System, false);
-    AddPath("/boot/system/develop/headers/os/add-ons/graphics", System, false);
-    AddPath("/boot/system/develop/headers/os/add-ons/input_server", System, false);
-    AddPath("/boot/system/develop/headers/os/add-ons/mail_daemon", System, false);
-    AddPath("/boot/system/develop/headers/os/add-ons/registrar", System, false);
-    AddPath("/boot/system/develop/headers/os/add-ons/screen_saver", System, false);
-    AddPath("/boot/system/develop/headers/os/add-ons/tracker", System, false);
-    AddPath("/boot/system/develop/headers/os/be_apps/Deskbar", System, false);
-    AddPath("/boot/system/develop/headers/os/be_apps/NetPositive", System, false);
-    AddPath("/boot/system/develop/headers/os/be_apps/Tracker", System, false);
-    AddPath("/boot/system/develop/headers/3rdparty", System, false);
-    AddPath("/boot/system/develop/headers/bsd", System, false);
-    AddPath("/boot/system/develop/headers/glibc", System, false);
-    AddPath("/boot/system/develop/headers/posix", System, false);
-    AddPath("/boot/system/develop/headers",  System, false);
-    break;
-  case llvm::Triple::RTEMS:
-    break;
-  case llvm::Triple::Win32:
-    switch (triple.getEnvironment()) {
-    default: llvm_unreachable("Include management is handled in the driver.");
-    case llvm::Triple::Cygnus:
-      AddPath("/usr/include/w32api", System, false);
-      break;
-    case llvm::Triple::GNU:
-      break;
-    }
-    break;
-  default:
-    break;
-  }
-
-  switch (os) {
-  case llvm::Triple::CloudABI:
-  case llvm::Triple::RTEMS:
-  case llvm::Triple::NaCl:
-  case llvm::Triple::ELFIAMCU:
-  case llvm::Triple::Fuchsia:
-    break;
-  case llvm::Triple::PS4: {
-    // <isysroot> gets prepended later in AddPath().
-    std::string BaseSDKPath = "";
-    if (!HasSysroot) {
-      const char *envValue = getenv("SCE_ORBIS_SDK_DIR");
-      if (envValue)
-        BaseSDKPath = envValue;
-      else {
-        // HSOpts.ResourceDir variable contains the location of Clang's
-        // resource files.
-        // Assuming that Clang is configured for PS4 without
-        // --with-clang-resource-dir option, the location of Clang's resource
-        // files is <SDK_DIR>/host_tools/lib/clang
-        SmallString<128> P = StringRef(HSOpts.ResourceDir);
-        llvm::sys::path::append(P, "../../..");
-        BaseSDKPath = std::string(P.str());
-      }
-    }
-    AddPath(BaseSDKPath + "/target/include", System, false);
-    if (triple.isPS4CPU())
-      AddPath(BaseSDKPath + "/target/include_common", System, false);
-    LLVM_FALLTHROUGH;
-  }
-  default:
-    AddPath("/usr/include", ExternCSystem, false);
-    break;
-  }
-}
-
-void InitHeaderSearch::AddDefaultCPlusPlusIncludePaths(
-    const LangOptions &LangOpts, const llvm::Triple &triple,
-    const HeaderSearchOptions &HSOpts) {
-  llvm::Triple::OSType os = triple.getOS();
-  // FIXME: temporary hack: hard-coded paths.
-
-  if (triple.isOSDarwin()) {
-    llvm_unreachable("Include management is handled in the driver.");
-  }
-
-  switch (os) {
-  case llvm::Triple::Linux:
-  case llvm::Triple::Hurd:
-  case llvm::Triple::Solaris:
-  case llvm::Triple::AIX:
-    llvm_unreachable("Include management is handled in the driver.");
-    break;
-  case llvm::Triple::Win32:
-    switch (triple.getEnvironment()) {
-    default: llvm_unreachable("Include management is handled in the driver.");
-    case llvm::Triple::Cygnus:
-      // Cygwin-1.7
-      AddMinGWCPlusPlusIncludePaths("/usr/lib/gcc", "i686-pc-cygwin", "4.7.3");
-      AddMinGWCPlusPlusIncludePaths("/usr/lib/gcc", "i686-pc-cygwin", "4.5.3");
-      AddMinGWCPlusPlusIncludePaths("/usr/lib/gcc", "i686-pc-cygwin", "4.3.4");
-      // g++-4 / Cygwin-1.5
-      AddMinGWCPlusPlusIncludePaths("/usr/lib/gcc", "i686-pc-cygwin", "4.3.2");
-      break;
-    }
-    break;
-  case llvm::Triple::DragonFly:
-    AddPath("/usr/include/c++/5.0", CXXSystem, false);
-    break;
-  case llvm::Triple::Minix:
-    AddGnuCPlusPlusIncludePaths("/usr/gnu/include/c++/4.4.3",
-                                "", "", "", triple);
-    break;
-  default:
-    break;
-  }
-}
-
-void InitHeaderSearch::AddDefaultIncludePaths(const LangOptions &Lang,
-                                              const llvm::Triple &triple,
-                                            const HeaderSearchOptions &HSOpts) {
-  // NB: This code path is going away. All of the logic is moving into the
-  // driver which has the information necessary to do target-specific
-  // selections of default include paths. Each target which moves there will be
-  // exempted from this logic here until we can delete the entire pile of code.
-  switch (triple.getOS()) {
-  default:
-    break; // Everything else continues to use this routine's logic.
-
-  case llvm::Triple::Emscripten:
-  case llvm::Triple::Linux:
-  case llvm::Triple::Hurd:
-  case llvm::Triple::OpenBSD:
-  case llvm::Triple::Solaris:
-  case llvm::Triple::WASI:
-  case llvm::Triple::AIX:
-    return;
-
-  case llvm::Triple::Win32:
-    if (triple.getEnvironment() != llvm::Triple::Cygnus ||
-        triple.isOSBinFormatMachO())
-      return;
-    break;
-
-  case llvm::Triple::UnknownOS:
-    if (triple.isWasm())
-      return;
-    break;
-  }
-
-  // All header search logic is handled in the Driver for Darwin.
-  if (triple.isOSDarwin()) {
-    if (HSOpts.UseStandardSystemIncludes) {
-      // Add the default framework include paths on Darwin.
-      AddPath("/System/Library/Frameworks", System, true);
-      AddPath("/Library/Frameworks", System, true);
-    }
-    return;
-  }
-
-  if (Lang.CPlusPlus && !Lang.AsmPreprocessor &&
-      HSOpts.UseStandardCXXIncludes && HSOpts.UseStandardSystemIncludes) {
-    if (HSOpts.UseLibcxx) {
-      AddPath("/usr/include/c++/v1", CXXSystem, false);
-    } else {
-      AddDefaultCPlusPlusIncludePaths(Lang, triple, HSOpts);
-    }
-  }
-
-  AddDefaultCIncludePaths(triple, HSOpts);
-}
-
-/// RemoveDuplicates - If there are duplicate directory entries in the specified
-/// search list, remove the later (dead) ones.  Returns the number of non-system
-/// headers removed, which is used to update NumAngled.
-static unsigned RemoveDuplicates(std::vector<DirectoryLookup> &SearchList,
-                                 unsigned First, bool Verbose) {
-  llvm::SmallPtrSet<const DirectoryEntry *, 8> SeenDirs;
-  llvm::SmallPtrSet<const DirectoryEntry *, 8> SeenFrameworkDirs;
-  llvm::SmallPtrSet<const HeaderMap *, 8> SeenHeaderMaps;
-  unsigned NonSystemRemoved = 0;
-  for (unsigned i = First; i != SearchList.size(); ++i) {
-    unsigned DirToRemove = i;
-
-    const DirectoryLookup &CurEntry = SearchList[i];
-
-    if (CurEntry.isNormalDir()) {
-      // If this isn't the first time we've seen this dir, remove it.
-      if (SeenDirs.insert(CurEntry.getDir()).second)
-        continue;
-    } else if (CurEntry.isFramework()) {
-      // If this isn't the first time we've seen this framework dir, remove it.
-      if (SeenFrameworkDirs.insert(CurEntry.getFrameworkDir()).second)
-        continue;
-    } else {
-      assert(CurEntry.isHeaderMap() && "Not a headermap or normal dir?");
-      // If this isn't the first time we've seen this headermap, remove it.
-      if (SeenHeaderMaps.insert(CurEntry.getHeaderMap()).second)
-        continue;
-    }
-
-    // If we have a normal #include dir/framework/headermap that is shadowed
-    // later in the chain by a system include location, we actually want to
-    // ignore the user's request and drop the user dir... keeping the system
-    // dir.  This is weird, but required to emulate GCC's search path correctly.
-    //
-    // Since dupes of system dirs are rare, just rescan to find the original
-    // that we're nuking instead of using a DenseMap.
-    if (CurEntry.getDirCharacteristic() != SrcMgr::C_User) {
-      // Find the dir that this is the same of.
-      unsigned FirstDir;
-      for (FirstDir = First;; ++FirstDir) {
-        assert(FirstDir != i && "Didn't find dupe?");
-
-        const DirectoryLookup &SearchEntry = SearchList[FirstDir];
-
-        // If these are different lookup types, then they can't be the dupe.
-        if (SearchEntry.getLookupType() != CurEntry.getLookupType())
-          continue;
-
-        bool isSame;
-        if (CurEntry.isNormalDir())
-          isSame = SearchEntry.getDir() == CurEntry.getDir();
-        else if (CurEntry.isFramework())
-          isSame = SearchEntry.getFrameworkDir() == CurEntry.getFrameworkDir();
-        else {
-          assert(CurEntry.isHeaderMap() && "Not a headermap or normal dir?");
-          isSame = SearchEntry.getHeaderMap() == CurEntry.getHeaderMap();
-        }
-
-        if (isSame)
-          break;
-      }
-
-      // If the first dir in the search path is a non-system dir, zap it
-      // instead of the system one.
-      if (SearchList[FirstDir].getDirCharacteristic() == SrcMgr::C_User)
-        DirToRemove = FirstDir;
-    }
-
-    if (Verbose) {
-      llvm::errs() << "ignoring duplicate directory \""
-                   << CurEntry.getName() << "\"\n";
-      if (DirToRemove != i)
-        llvm::errs() << "  as it is a non-system directory that duplicates "
-                     << "a system directory\n";
-    }
-    if (DirToRemove != i)
-      ++NonSystemRemoved;
-
-    // This is reached if the current entry is a duplicate.  Remove the
-    // DirToRemove (usually the current dir).
-    SearchList.erase(SearchList.begin()+DirToRemove);
-    --i;
-  }
-  return NonSystemRemoved;
-}
-
-
-void InitHeaderSearch::Realize(const LangOptions &Lang) {
-  // Concatenate ANGLE+SYSTEM+AFTER chains together into SearchList.
-  std::vector<DirectoryLookup> SearchList;
-  SearchList.reserve(IncludePath.size());
-
-  // Quoted arguments go first.
-  for (auto &Include : IncludePath)
-    if (Include.Group == Quoted)
-      SearchList.push_back(Include.Lookup);
-
-  // Deduplicate and remember index.
-  RemoveDuplicates(SearchList, 0, Verbose);
-  unsigned NumQuoted = SearchList.size();
-
-  for (auto &Include : IncludePath)
-    if (Include.Group == Angled || Include.Group == IndexHeaderMap)
-      SearchList.push_back(Include.Lookup);
-
-  RemoveDuplicates(SearchList, NumQuoted, Verbose);
-  unsigned NumAngled = SearchList.size();
-
-  for (auto &Include : IncludePath)
-    if (Include.Group == System || Include.Group == ExternCSystem ||
-        (!Lang.ObjC && !Lang.CPlusPlus && Include.Group == CSystem) ||
-        (/*FIXME !Lang.ObjC && */ Lang.CPlusPlus &&
-         Include.Group == CXXSystem) ||
-        (Lang.ObjC && !Lang.CPlusPlus && Include.Group == ObjCSystem) ||
-        (Lang.ObjC && Lang.CPlusPlus && Include.Group == ObjCXXSystem))
-      SearchList.push_back(Include.Lookup);
-
-  for (auto &Include : IncludePath)
-    if (Include.Group == After)
-      SearchList.push_back(Include.Lookup);
-
-  // Remove duplicates across both the Angled and System directories.  GCC does
-  // this and failing to remove duplicates across these two groups breaks
-  // #include_next.
-  unsigned NonSystemRemoved = RemoveDuplicates(SearchList, NumQuoted, Verbose);
-  NumAngled -= NonSystemRemoved;
-
-  bool DontSearchCurDir = false;  // TODO: set to true if -I- is set?
-  Headers.SetSearchPaths(SearchList, NumQuoted, NumAngled, DontSearchCurDir);
-
-  Headers.SetSystemHeaderPrefixes(SystemHeaderPrefixes);
-
-  // If verbose, print the list of directories that will be searched.
-  if (Verbose) {
-    llvm::errs() << "#include \"...\" search starts here:\n";
-    for (unsigned i = 0, e = SearchList.size(); i != e; ++i) {
-      if (i == NumQuoted)
-        llvm::errs() << "#include <...> search starts here:\n";
-      StringRef Name = SearchList[i].getName();
-      const char *Suffix;
-      if (SearchList[i].isNormalDir())
-        Suffix = "";
-      else if (SearchList[i].isFramework())
-        Suffix = " (framework directory)";
-      else {
-        assert(SearchList[i].isHeaderMap() && "Unknown DirectoryLookup");
-        Suffix = " (headermap)";
-      }
-      llvm::errs() << " " << Name << Suffix << "\n";
-    }
-    llvm::errs() << "End of search list.\n";
-  }
-}
-
-void clang::ApplyHeaderSearchOptions(HeaderSearch &HS,
-                                     const HeaderSearchOptions &HSOpts,
-                                     const LangOptions &Lang,
-                                     const llvm::Triple &Triple) {
-  InitHeaderSearch Init(HS, HSOpts.Verbose, HSOpts.Sysroot);
-
-  // Add the user defined entries.
-  for (unsigned i = 0, e = HSOpts.UserEntries.size(); i != e; ++i) {
-    const HeaderSearchOptions::Entry &E = HSOpts.UserEntries[i];
-    if (E.IgnoreSysRoot) {
-      Init.AddUnmappedPath(E.Path, E.Group, E.IsFramework);
-    } else {
-      Init.AddPath(E.Path, E.Group, E.IsFramework);
-    }
-  }
-
-  Init.AddDefaultIncludePaths(Lang, Triple, HSOpts);
-
-  for (unsigned i = 0, e = HSOpts.SystemHeaderPrefixes.size(); i != e; ++i)
-    Init.AddSystemHeaderPrefix(HSOpts.SystemHeaderPrefixes[i].Prefix,
-                               HSOpts.SystemHeaderPrefixes[i].IsSystemHeader);
-
-  if (HSOpts.UseBuiltinIncludes) {
-    // Set up the builtin include directory in the module map.
-    SmallString<128> P = StringRef(HSOpts.ResourceDir);
-    llvm::sys::path::append(P, "include");
-    if (auto Dir = HS.getFileMgr().getDirectory(P))
-      HS.getModuleMap().setBuiltinIncludeDir(*Dir);
-  }
-
-  Init.Realize(Lang);
-}
diff --git a/gnu/llvm/clang/lib/Lex/DependencyDirectivesSourceMinimizer.cpp b/gnu/llvm/clang/lib/Lex/DependencyDirectivesSourceMinimizer.cpp
deleted file mode 100644
index cfca167f8bf..00000000000
--- a/gnu/llvm/clang/lib/Lex/DependencyDirectivesSourceMinimizer.cpp
+++ /dev/null
@@ -1,961 +0,0 @@
-//===- DependencyDirectivesSourceMinimizer.cpp -  -------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-///
-/// \file
-/// This is the implementation for minimizing header and source files to the
-/// minimum necessary preprocessor directives for evaluating includes. It
-/// reduces the source down to #define, #include, #import, @import, and any
-/// conditional preprocessor logic that contains one of those.
-///
-//===----------------------------------------------------------------------===//
-
-#include "clang/Lex/DependencyDirectivesSourceMinimizer.h"
-#include "clang/Basic/CharInfo.h"
-#include "clang/Basic/Diagnostic.h"
-#include "clang/Lex/LexDiagnostic.h"
-#include "llvm/ADT/StringMap.h"
-#include "llvm/ADT/StringSwitch.h"
-#include "llvm/Support/MemoryBuffer.h"
-
-using namespace llvm;
-using namespace clang;
-using namespace clang::minimize_source_to_dependency_directives;
-
-namespace {
-
-struct Minimizer {
-  /// Minimized output.
-  SmallVectorImpl<char> &Out;
-  /// The known tokens encountered during the minimization.
-  SmallVectorImpl<Token> &Tokens;
-
-  Minimizer(SmallVectorImpl<char> &Out, SmallVectorImpl<Token> &Tokens,
-            StringRef Input, DiagnosticsEngine *Diags,
-            SourceLocation InputSourceLoc)
-      : Out(Out), Tokens(Tokens), Input(Input), Diags(Diags),
-        InputSourceLoc(InputSourceLoc) {}
-
-  /// Lex the provided source and emit the minimized output.
-  ///
-  /// \returns True on error.
-  bool minimize();
-
-private:
-  struct IdInfo {
-    const char *Last;
-    StringRef Name;
-  };
-
-  /// Lex an identifier.
-  ///
-  /// \pre First points at a valid identifier head.
-  LLVM_NODISCARD IdInfo lexIdentifier(const char *First, const char *const End);
-  LLVM_NODISCARD bool isNextIdentifier(StringRef Id, const char *&First,
-                                       const char *const End);
-  LLVM_NODISCARD bool minimizeImpl(const char *First, const char *const End);
-  LLVM_NODISCARD bool lexPPLine(const char *&First, const char *const End);
-  LLVM_NODISCARD bool lexAt(const char *&First, const char *const End);
-  LLVM_NODISCARD bool lexModule(const char *&First, const char *const End);
-  LLVM_NODISCARD bool lexDefine(const char *&First, const char *const End);
-  LLVM_NODISCARD bool lexPragma(const char *&First, const char *const End);
-  LLVM_NODISCARD bool lexEndif(const char *&First, const char *const End);
-  LLVM_NODISCARD bool lexDefault(TokenKind Kind, StringRef Directive,
-                                 const char *&First, const char *const End);
-  Token &makeToken(TokenKind K) {
-    Tokens.emplace_back(K, Out.size());
-    return Tokens.back();
-  }
-  void popToken() {
-    Out.resize(Tokens.back().Offset);
-    Tokens.pop_back();
-  }
-  TokenKind top() const { return Tokens.empty() ? pp_none : Tokens.back().K; }
-
-  Minimizer &put(char Byte) {
-    Out.push_back(Byte);
-    return *this;
-  }
-  Minimizer &append(StringRef S) { return append(S.begin(), S.end()); }
-  Minimizer &append(const char *First, const char *Last) {
-    Out.append(First, Last);
-    return *this;
-  }
-
-  void printToNewline(const char *&First, const char *const End);
-  void printAdjacentModuleNameParts(const char *&First, const char *const End);
-  LLVM_NODISCARD bool printAtImportBody(const char *&First,
-                                        const char *const End);
-  void printDirectiveBody(const char *&First, const char *const End);
-  void printAdjacentMacroArgs(const char *&First, const char *const End);
-  LLVM_NODISCARD bool printMacroArgs(const char *&First, const char *const End);
-
-  /// Reports a diagnostic if the diagnostic engine is provided. Always returns
-  /// true at the end.
-  bool reportError(const char *CurPtr, unsigned Err);
-
-  StringMap<char> SplitIds;
-  StringRef Input;
-  DiagnosticsEngine *Diags;
-  SourceLocation InputSourceLoc;
-};
-
-} // end anonymous namespace
-
-bool Minimizer::reportError(const char *CurPtr, unsigned Err) {
-  if (!Diags)
-    return true;
-  assert(CurPtr >= Input.data() && "invalid buffer ptr");
-  Diags->Report(InputSourceLoc.getLocWithOffset(CurPtr - Input.data()), Err);
-  return true;
-}
-
-static void skipOverSpaces(const char *&First, const char *const End) {
-  while (First != End && isHorizontalWhitespace(*First))
-    ++First;
-}
-
-LLVM_NODISCARD static bool isRawStringLiteral(const char *First,
-                                              const char *Current) {
-  assert(First <= Current);
-
-  // Check if we can even back up.
-  if (*Current != '"' || First == Current)
-    return false;
-
-  // Check for an "R".
-  --Current;
-  if (*Current != 'R')
-    return false;
-  if (First == Current || !isIdentifierBody(*--Current))
-    return true;
-
-  // Check for a prefix of "u", "U", or "L".
-  if (*Current == 'u' || *Current == 'U' || *Current == 'L')
-    return First == Current || !isIdentifierBody(*--Current);
-
-  // Check for a prefix of "u8".
-  if (*Current != '8' || First == Current || *Current-- != 'u')
-    return false;
-  return First == Current || !isIdentifierBody(*--Current);
-}
-
-static void skipRawString(const char *&First, const char *const End) {
-  assert(First[0] == '"');
-  assert(First[-1] == 'R');
-
-  const char *Last = ++First;
-  while (Last != End && *Last != '(')
-    ++Last;
-  if (Last == End) {
-    First = Last; // Hit the end... just give up.
-    return;
-  }
-
-  StringRef Terminator(First, Last - First);
-  for (;;) {
-    // Move First to just past the next ")".
-    First = Last;
-    while (First != End && *First != ')')
-      ++First;
-    if (First == End)
-      return;
-    ++First;
-
-    // Look ahead for the terminator sequence.
-    Last = First;
-    while (Last != End && size_t(Last - First) < Terminator.size() &&
-           Terminator[Last - First] == *Last)
-      ++Last;
-
-    // Check if we hit it (or the end of the file).
-    if (Last == End) {
-      First = Last;
-      return;
-    }
-    if (size_t(Last - First) < Terminator.size())
-      continue;
-    if (*Last != '"')
-      continue;
-    First = Last + 1;
-    return;
-  }
-}
-
-// Returns the length of EOL, either 0 (no end-of-line), 1 (\n) or 2 (\r\n)
-static unsigned isEOL(const char *First, const char *const End) {
-  if (First == End)
-    return 0;
-  if (End - First > 1 && isVerticalWhitespace(First[0]) &&
-      isVerticalWhitespace(First[1]) && First[0] != First[1])
-    return 2;
-  return !!isVerticalWhitespace(First[0]);
-}
-
-static void skipString(const char *&First, const char *const End) {
-  assert(*First == '\'' || *First == '"' || *First == '<');
-  const char Terminator = *First == '<' ? '>' : *First;
-  for (++First; First != End && *First != Terminator; ++First) {
-    // String and character literals don't extend past the end of the line.
-    if (isVerticalWhitespace(*First))
-      return;
-    if (*First != '\\')
-      continue;
-    // Skip past backslash to the next character. This ensures that the
-    // character right after it is skipped as well, which matters if it's
-    // the terminator.
-    if (++First == End)
-      return;
-    if (!isWhitespace(*First))
-      continue;
-    // Whitespace after the backslash might indicate a line continuation.
-    const char *FirstAfterBackslashPastSpace = First;
-    skipOverSpaces(FirstAfterBackslashPastSpace, End);
-    if (unsigned NLSize = isEOL(FirstAfterBackslashPastSpace, End)) {
-      // Advance the character pointer to the next line for the next
-      // iteration.
-      First = FirstAfterBackslashPastSpace + NLSize - 1;
-    }
-  }
-  if (First != End)
-    ++First; // Finish off the string.
-}
-
-// Returns the length of the skipped newline
-static unsigned skipNewline(const char *&First, const char *End) {
-  if (First == End)
-    return 0;
-  assert(isVerticalWhitespace(*First));
-  unsigned Len = isEOL(First, End);
-  assert(Len && "expected newline");
-  First += Len;
-  return Len;
-}
-
-static bool wasLineContinuation(const char *First, unsigned EOLLen) {
-  return *(First - (int)EOLLen - 1) == '\\';
-}
-
-static void skipToNewlineRaw(const char *&First, const char *const End) {
-  for (;;) {
-    if (First == End)
-      return;
-
-    unsigned Len = isEOL(First, End);
-    if (Len)
-      return;
-
-    do {
-      if (++First == End)
-        return;
-      Len = isEOL(First, End);
-    } while (!Len);
-
-    if (First[-1] != '\\')
-      return;
-
-    First += Len;
-    // Keep skipping lines...
-  }
-}
-
-static const char *findLastNonSpace(const char *First, const char *Last) {
-  assert(First <= Last);
-  while (First != Last && isHorizontalWhitespace(Last[-1]))
-    --Last;
-  return Last;
-}
-
-static const char *findFirstTrailingSpace(const char *First,
-                                          const char *Last) {
-  const char *LastNonSpace = findLastNonSpace(First, Last);
-  if (Last == LastNonSpace)
-    return Last;
-  assert(isHorizontalWhitespace(LastNonSpace[0]));
-  return LastNonSpace + 1;
-}
-
-static void skipLineComment(const char *&First, const char *const End) {
-  assert(First[0] == '/' && First[1] == '/');
-  First += 2;
-  skipToNewlineRaw(First, End);
-}
-
-static void skipBlockComment(const char *&First, const char *const End) {
-  assert(First[0] == '/' && First[1] == '*');
-  if (End - First < 4) {
-    First = End;
-    return;
-  }
-  for (First += 3; First != End; ++First)
-    if (First[-1] == '*' && First[0] == '/') {
-      ++First;
-      return;
-    }
-}
-
-/// \returns True if the current single quotation mark character is a C++ 14
-/// digit separator.
-static bool isQuoteCppDigitSeparator(const char *const Start,
-                                     const char *const Cur,
-                                     const char *const End) {
-  assert(*Cur == '\'' && "expected quotation character");
-  // skipLine called in places where we don't expect a valid number
-  // body before `start` on the same line, so always return false at the start.
-  if (Start == Cur)
-    return false;
-  // The previous character must be a valid PP number character.
-  // Make sure that the L, u, U, u8 prefixes don't get marked as a
-  // separator though.
-  char Prev = *(Cur - 1);
-  if (Prev == 'L' || Prev == 'U' || Prev == 'u')
-    return false;
-  if (Prev == '8' && (Cur - 1 != Start) && *(Cur - 2) == 'u')
-    return false;
-  if (!isPreprocessingNumberBody(Prev))
-    return false;
-  // The next character should be a valid identifier body character.
-  return (Cur + 1) < End && isIdentifierBody(*(Cur + 1));
-}
-
-static void skipLine(const char *&First, const char *const End) {
-  for (;;) {
-    assert(First <= End);
-    if (First == End)
-      return;
-
-    if (isVerticalWhitespace(*First)) {
-      skipNewline(First, End);
-      return;
-    }
-    const char *Start = First;
-    while (First != End && !isVerticalWhitespace(*First)) {
-      // Iterate over strings correctly to avoid comments and newlines.
-      if (*First == '"' ||
-          (*First == '\'' && !isQuoteCppDigitSeparator(Start, First, End))) {
-        if (isRawStringLiteral(Start, First))
-          skipRawString(First, End);
-        else
-          skipString(First, End);
-        continue;
-      }
-
-      // Iterate over comments correctly.
-      if (*First != '/' || End - First < 2) {
-        ++First;
-        continue;
-      }
-
-      if (First[1] == '/') {
-        // "//...".
-        skipLineComment(First, End);
-        continue;
-      }
-
-      if (First[1] != '*') {
-        ++First;
-        continue;
-      }
-
-      // "/*...*/".
-      skipBlockComment(First, End);
-    }
-    if (First == End)
-      return;
-
-    // Skip over the newline.
-    unsigned Len = skipNewline(First, End);
-    if (!wasLineContinuation(First, Len)) // Continue past line-continuations.
-      break;
-  }
-}
-
-static void skipDirective(StringRef Name, const char *&First,
-                          const char *const End) {
-  if (llvm::StringSwitch<bool>(Name)
-          .Case("warning", true)
-          .Case("error", true)
-          .Default(false))
-    // Do not process quotes or comments.
-    skipToNewlineRaw(First, End);
-  else
-    skipLine(First, End);
-}
-
-void Minimizer::printToNewline(const char *&First, const char *const End) {
-  while (First != End && !isVerticalWhitespace(*First)) {
-    const char *Last = First;
-    do {
-      // Iterate over strings correctly to avoid comments and newlines.
-      if (*Last == '"' || *Last == '\'' ||
-          (*Last == '<' && top() == pp_include)) {
-        if (LLVM_UNLIKELY(isRawStringLiteral(First, Last)))
-          skipRawString(Last, End);
-        else
-          skipString(Last, End);
-        continue;
-      }
-      if (*Last != '/' || End - Last < 2) {
-        ++Last;
-        continue; // Gather the rest up to print verbatim.
-      }
-
-      if (Last[1] != '/' && Last[1] != '*') {
-        ++Last;
-        continue;
-      }
-
-      // Deal with "//..." and "/*...*/".
-      append(First, findFirstTrailingSpace(First, Last));
-      First = Last;
-
-      if (Last[1] == '/') {
-        skipLineComment(First, End);
-        return;
-      }
-
-      put(' ');
-      skipBlockComment(First, End);
-      skipOverSpaces(First, End);
-      Last = First;
-    } while (Last != End && !isVerticalWhitespace(*Last));
-
-    // Print out the string.
-    const char *LastBeforeTrailingSpace = findLastNonSpace(First, Last);
-    if (Last == End || LastBeforeTrailingSpace == First ||
-        LastBeforeTrailingSpace[-1] != '\\') {
-      append(First, LastBeforeTrailingSpace);
-      First = Last;
-      skipNewline(First, End);
-      return;
-    }
-
-    // Print up to the backslash, backing up over spaces. Preserve at least one
-    // space, as the space matters when tokens are separated by a line
-    // continuation.
-    append(First, findFirstTrailingSpace(
-                      First, LastBeforeTrailingSpace - 1));
-
-    First = Last;
-    skipNewline(First, End);
-    skipOverSpaces(First, End);
-  }
-}
-
-static void skipWhitespace(const char *&First, const char *const End) {
-  for (;;) {
-    assert(First <= End);
-    skipOverSpaces(First, End);
-
-    if (End - First < 2)
-      return;
-
-    if (First[0] == '\\' && isVerticalWhitespace(First[1])) {
-      skipNewline(++First, End);
-      continue;
-    }
-
-    // Check for a non-comment character.
-    if (First[0] != '/')
-      return;
-
-    // "// ...".
-    if (First[1] == '/') {
-      skipLineComment(First, End);
-      return;
-    }
-
-    // Cannot be a comment.
-    if (First[1] != '*')
-      return;
-
-    // "/*...*/".
-    skipBlockComment(First, End);
-  }
-}
-
-void Minimizer::printAdjacentModuleNameParts(const char *&First,
-                                             const char *const End) {
-  // Skip over parts of the body.
-  const char *Last = First;
-  do
-    ++Last;
-  while (Last != End && (isIdentifierBody(*Last) || *Last == '.'));
-  append(First, Last);
-  First = Last;
-}
-
-bool Minimizer::printAtImportBody(const char *&First, const char *const End) {
-  for (;;) {
-    skipWhitespace(First, End);
-    if (First == End)
-      return true;
-
-    if (isVerticalWhitespace(*First)) {
-      skipNewline(First, End);
-      continue;
-    }
-
-    // Found a semicolon.
-    if (*First == ';') {
-      put(*First++).put('\n');
-      return false;
-    }
-
-    // Don't handle macro expansions inside @import for now.
-    if (!isIdentifierBody(*First) && *First != '.')
-      return true;
-
-    printAdjacentModuleNameParts(First, End);
-  }
-}
-
-void Minimizer::printDirectiveBody(const char *&First, const char *const End) {
-  skipWhitespace(First, End); // Skip initial whitespace.
-  printToNewline(First, End);
-  while (Out.back() == ' ')
-    Out.pop_back();
-  put('\n');
-}
-
-LLVM_NODISCARD static const char *lexRawIdentifier(const char *First,
-                                                   const char *const End) {
-  assert(isIdentifierBody(*First) && "invalid identifer");
-  const char *Last = First + 1;
-  while (Last != End && isIdentifierBody(*Last))
-    ++Last;
-  return Last;
-}
-
-LLVM_NODISCARD static const char *
-getIdentifierContinuation(const char *First, const char *const End) {
-  if (End - First < 3 || First[0] != '\\' || !isVerticalWhitespace(First[1]))
-    return nullptr;
-
-  ++First;
-  skipNewline(First, End);
-  if (First == End)
-    return nullptr;
-  return isIdentifierBody(First[0]) ? First : nullptr;
-}
-
-Minimizer::IdInfo Minimizer::lexIdentifier(const char *First,
-                                           const char *const End) {
-  const char *Last = lexRawIdentifier(First, End);
-  const char *Next = getIdentifierContinuation(Last, End);
-  if (LLVM_LIKELY(!Next))
-    return IdInfo{Last, StringRef(First, Last - First)};
-
-  // Slow path, where identifiers are split over lines.
-  SmallVector<char, 64> Id(First, Last);
-  while (Next) {
-    Last = lexRawIdentifier(Next, End);
-    Id.append(Next, Last);
-    Next = getIdentifierContinuation(Last, End);
-  }
-  return IdInfo{
-      Last,
-      SplitIds.try_emplace(StringRef(Id.begin(), Id.size()), 0).first->first()};
-}
-
-void Minimizer::printAdjacentMacroArgs(const char *&First,
-                                       const char *const End) {
-  // Skip over parts of the body.
-  const char *Last = First;
-  do
-    ++Last;
-  while (Last != End &&
-         (isIdentifierBody(*Last) || *Last == '.' || *Last == ','));
-  append(First, Last);
-  First = Last;
-}
-
-bool Minimizer::printMacroArgs(const char *&First, const char *const End) {
-  assert(*First == '(');
-  put(*First++);
-  for (;;) {
-    skipWhitespace(First, End);
-    if (First == End)
-      return true;
-
-    if (*First == ')') {
-      put(*First++);
-      return false;
-    }
-
-    // This is intentionally fairly liberal.
-    if (!(isIdentifierBody(*First) || *First == '.' || *First == ','))
-      return true;
-
-    printAdjacentMacroArgs(First, End);
-  }
-}
-
-/// Looks for an identifier starting from Last.
-///
-/// Updates "First" to just past the next identifier, if any.  Returns true iff
-/// the identifier matches "Id".
-bool Minimizer::isNextIdentifier(StringRef Id, const char *&First,
-                                 const char *const End) {
-  skipWhitespace(First, End);
-  if (First == End || !isIdentifierHead(*First))
-    return false;
-
-  IdInfo FoundId = lexIdentifier(First, End);
-  First = FoundId.Last;
-  return FoundId.Name == Id;
-}
-
-bool Minimizer::lexAt(const char *&First, const char *const End) {
-  // Handle "@import".
-  const char *ImportLoc = First++;
-  if (!isNextIdentifier("import", First, End)) {
-    skipLine(First, End);
-    return false;
-  }
-  makeToken(decl_at_import);
-  append("@import ");
-  if (printAtImportBody(First, End))
-    return reportError(
-        ImportLoc, diag::err_dep_source_minimizer_missing_sema_after_at_import);
-  skipWhitespace(First, End);
-  if (First == End)
-    return false;
-  if (!isVerticalWhitespace(*First))
-    return reportError(
-        ImportLoc, diag::err_dep_source_minimizer_unexpected_tokens_at_import);
-  skipNewline(First, End);
-  return false;
-}
-
-bool Minimizer::lexModule(const char *&First, const char *const End) {
-  IdInfo Id = lexIdentifier(First, End);
-  First = Id.Last;
-  bool Export = false;
-  if (Id.Name == "export") {
-    Export = true;
-    skipWhitespace(First, End);
-    if (!isIdentifierBody(*First)) {
-      skipLine(First, End);
-      return false;
-    }
-    Id = lexIdentifier(First, End);
-    First = Id.Last;
-  }
-
-  if (Id.Name != "module" && Id.Name != "import") {
-    skipLine(First, End);
-    return false;
-  }
-
-  skipWhitespace(First, End);
-
-  // Ignore this as a module directive if the next character can't be part of
-  // an import.
-
-  switch (*First) {
-  case ':':
-  case '<':
-  case '"':
-    break;
-  default:
-    if (!isIdentifierBody(*First)) {
-      skipLine(First, End);
-      return false;
-    }
-  }
-
-  if (Export) {
-    makeToken(cxx_export_decl);
-    append("export ");
-  }
-
-  if (Id.Name == "module")
-    makeToken(cxx_module_decl);
-  else
-    makeToken(cxx_import_decl);
-  append(Id.Name);
-  append(" ");
-  printToNewline(First, End);
-  append("\n");
-  return false;
-}
-
-bool Minimizer::lexDefine(const char *&First, const char *const End) {
-  makeToken(pp_define);
-  append("#define ");
-  skipWhitespace(First, End);
-
-  if (!isIdentifierHead(*First))
-    return reportError(First, diag::err_pp_macro_not_identifier);
-
-  IdInfo Id = lexIdentifier(First, End);
-  const char *Last = Id.Last;
-  append(Id.Name);
-  if (Last == End)
-    return false;
-  if (*Last == '(') {
-    size_t Size = Out.size();
-    if (printMacroArgs(Last, End)) {
-      // Be robust to bad macro arguments, since they can show up in disabled
-      // code.
-      Out.resize(Size);
-      append("(/* invalid */\n");
-      skipLine(Last, End);
-      return false;
-    }
-  }
-  skipWhitespace(Last, End);
-  if (Last == End)
-    return false;
-  if (!isVerticalWhitespace(*Last))
-    put(' ');
-  printDirectiveBody(Last, End);
-  First = Last;
-  return false;
-}
-
-bool Minimizer::lexPragma(const char *&First, const char *const End) {
-  // #pragma.
-  skipWhitespace(First, End);
-  if (First == End || !isIdentifierHead(*First))
-    return false;
-
-  IdInfo FoundId = lexIdentifier(First, End);
-  First = FoundId.Last;
-  if (FoundId.Name == "once") {
-    // #pragma once
-    skipLine(First, End);
-    makeToken(pp_pragma_once);
-    append("#pragma once\n");
-    return false;
-  }
-
-  if (FoundId.Name != "clang") {
-    skipLine(First, End);
-    return false;
-  }
-
-  // #pragma clang.
-  if (!isNextIdentifier("module", First, End)) {
-    skipLine(First, End);
-    return false;
-  }
-
-  // #pragma clang module.
-  if (!isNextIdentifier("import", First, End)) {
-    skipLine(First, End);
-    return false;
-  }
-
-  // #pragma clang module import.
-  makeToken(pp_pragma_import);
-  append("#pragma clang module import ");
-  printDirectiveBody(First, End);
-  return false;
-}
-
-bool Minimizer::lexEndif(const char *&First, const char *const End) {
-  // Strip out "#else" if it's empty.
-  if (top() == pp_else)
-    popToken();
-
-  // If "#ifdef" is empty, strip it and skip the "#endif".
-  //
-  // FIXME: Once/if Clang starts disallowing __has_include in macro expansions,
-  // we can skip empty `#if` and `#elif` blocks as well after scanning for a
-  // literal __has_include in the condition.  Even without that rule we could
-  // drop the tokens if we scan for identifiers in the condition and find none.
-  if (top() == pp_ifdef || top() == pp_ifndef) {
-    popToken();
-    skipLine(First, End);
-    return false;
-  }
-
-  return lexDefault(pp_endif, "endif", First, End);
-}
-
-bool Minimizer::lexDefault(TokenKind Kind, StringRef Directive,
-                           const char *&First, const char *const End) {
-  makeToken(Kind);
-  put('#').append(Directive).put(' ');
-  printDirectiveBody(First, End);
-  return false;
-}
-
-static bool isStartOfRelevantLine(char First) {
-  switch (First) {
-  case '#':
-  case '@':
-  case 'i':
-  case 'e':
-  case 'm':
-    return true;
-  }
-  return false;
-}
-
-bool Minimizer::lexPPLine(const char *&First, const char *const End) {
-  assert(First != End);
-
-  skipWhitespace(First, End);
-  assert(First <= End);
-  if (First == End)
-    return false;
-
-  if (!isStartOfRelevantLine(*First)) {
-    skipLine(First, End);
-    assert(First <= End);
-    return false;
-  }
-
-  // Handle "@import".
-  if (*First == '@')
-    return lexAt(First, End);
-
-  if (*First == 'i' || *First == 'e' || *First == 'm')
-    return lexModule(First, End);
-
-  // Handle preprocessing directives.
-  ++First; // Skip over '#'.
-  skipWhitespace(First, End);
-
-  if (First == End)
-    return reportError(First, diag::err_pp_expected_eol);
-
-  if (!isIdentifierHead(*First)) {
-    skipLine(First, End);
-    return false;
-  }
-
-  // Figure out the token.
-  IdInfo Id = lexIdentifier(First, End);
-  First = Id.Last;
-  auto Kind = llvm::StringSwitch<TokenKind>(Id.Name)
-                  .Case("include", pp_include)
-                  .Case("__include_macros", pp___include_macros)
-                  .Case("define", pp_define)
-                  .Case("undef", pp_undef)
-                  .Case("import", pp_import)
-                  .Case("include_next", pp_include_next)
-                  .Case("if", pp_if)
-                  .Case("ifdef", pp_ifdef)
-                  .Case("ifndef", pp_ifndef)
-                  .Case("elif", pp_elif)
-                  .Case("elifdef", pp_elifdef)
-                  .Case("elifndef", pp_elifndef)
-                  .Case("else", pp_else)
-                  .Case("endif", pp_endif)
-                  .Case("pragma", pp_pragma_import)
-                  .Default(pp_none);
-  if (Kind == pp_none) {
-    skipDirective(Id.Name, First, End);
-    return false;
-  }
-
-  if (Kind == pp_endif)
-    return lexEndif(First, End);
-
-  if (Kind == pp_define)
-    return lexDefine(First, End);
-
-  if (Kind == pp_pragma_import)
-    return lexPragma(First, End);
-
-  // Everything else.
-  return lexDefault(Kind, Id.Name, First, End);
-}
-
-static void skipUTF8ByteOrderMark(const char *&First, const char *const End) {
-  if ((End - First) >= 3 && First[0] == '\xef' && First[1] == '\xbb' &&
-      First[2] == '\xbf')
-    First += 3;
-}
-
-bool Minimizer::minimizeImpl(const char *First, const char *const End) {
-  skipUTF8ByteOrderMark(First, End);
-  while (First != End)
-    if (lexPPLine(First, End))
-      return true;
-  return false;
-}
-
-bool Minimizer::minimize() {
-  bool Error = minimizeImpl(Input.begin(), Input.end());
-
-  if (!Error) {
-    // Add a trailing newline and an EOF on success.
-    if (!Out.empty() && Out.back() != '\n')
-      Out.push_back('\n');
-    makeToken(pp_eof);
-  }
-
-  // Null-terminate the output. This way the memory buffer that's passed to
-  // Clang will not have to worry about the terminating '\0'.
-  Out.push_back(0);
-  Out.pop_back();
-  return Error;
-}
-
-bool clang::minimize_source_to_dependency_directives::computeSkippedRanges(
-    ArrayRef<Token> Input, llvm::SmallVectorImpl<SkippedRange> &Range) {
-  struct Directive {
-    enum DirectiveKind {
-      If,  // if/ifdef/ifndef
-      Else // elif/elifdef/elifndef, else
-    };
-    int Offset;
-    DirectiveKind Kind;
-  };
-  llvm::SmallVector<Directive, 32> Offsets;
-  for (const Token &T : Input) {
-    switch (T.K) {
-    case pp_if:
-    case pp_ifdef:
-    case pp_ifndef:
-      Offsets.push_back({T.Offset, Directive::If});
-      break;
-
-    case pp_elif:
-    case pp_elifdef:
-    case pp_elifndef:
-    case pp_else: {
-      if (Offsets.empty())
-        return true;
-      int PreviousOffset = Offsets.back().Offset;
-      Range.push_back({PreviousOffset, T.Offset - PreviousOffset});
-      Offsets.push_back({T.Offset, Directive::Else});
-      break;
-    }
-
-    case pp_endif: {
-      if (Offsets.empty())
-        return true;
-      int PreviousOffset = Offsets.back().Offset;
-      Range.push_back({PreviousOffset, T.Offset - PreviousOffset});
-      do {
-        Directive::DirectiveKind Kind = Offsets.pop_back_val().Kind;
-        if (Kind == Directive::If)
-          break;
-      } while (!Offsets.empty());
-      break;
-    }
-    default:
-      break;
-    }
-  }
-  return false;
-}
-
-bool clang::minimizeSourceToDependencyDirectives(
-    StringRef Input, SmallVectorImpl<char> &Output,
-    SmallVectorImpl<Token> &Tokens, DiagnosticsEngine *Diags,
-    SourceLocation InputSourceLoc) {
-  Output.clear();
-  Tokens.clear();
-  return Minimizer(Output, Tokens, Input, Diags, InputSourceLoc).minimize();
-}
diff --git a/gnu/llvm/clang/lib/Sema/SemaChecking.cpp b/gnu/llvm/clang/lib/Sema/SemaChecking.cpp
index 9309dac2d39..727c45cb46e 100644
--- a/gnu/llvm/clang/lib/Sema/SemaChecking.cpp
+++ b/gnu/llvm/clang/lib/Sema/SemaChecking.cpp
@@ -67,8 +67,6 @@
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/ADT/FoldingSet.h"
-#include "llvm/ADT/None.h"
-#include "llvm/ADT/Optional.h"
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/SmallBitVector.h"
 #include "llvm/ADT/SmallPtrSet.h"
@@ -96,6 +94,7 @@
 #include <cstdint>
 #include <functional>
 #include <limits>
+#include <optional>
 #include <string>
 #include <tuple>
 #include <utility>
@@ -109,24 +108,79 @@ SourceLocation Sema::getLocationOfStringLiteralByte(const StringLiteral *SL,
                                Context.getTargetInfo());
 }
 
+static constexpr unsigned short combineFAPK(Sema::FormatArgumentPassingKind A,
+                                            Sema::FormatArgumentPassingKind B) {
+  return (A << 8) | B;
+}
+
+/// Checks that a call expression's argument count is at least the desired
+/// number. This is useful when doing custom type-checking on a variadic
+/// function. Returns true on error.
+static bool checkArgCountAtLeast(Sema &S, CallExpr *Call,
+                                 unsigned MinArgCount) {
+  unsigned ArgCount = Call->getNumArgs();
+  if (ArgCount >= MinArgCount)
+    return false;
+
+  return S.Diag(Call->getEndLoc(), diag::err_typecheck_call_too_few_args)
+         << 0 /*function call*/ << MinArgCount << ArgCount
+         << Call->getSourceRange();
+}
+
+/// Checks that a call expression's argument count is at most the desired
+/// number. This is useful when doing custom type-checking on a variadic
+/// function. Returns true on error.
+static bool checkArgCountAtMost(Sema &S, CallExpr *Call, unsigned MaxArgCount) {
+  unsigned ArgCount = Call->getNumArgs();
+  if (ArgCount <= MaxArgCount)
+    return false;
+  return S.Diag(Call->getEndLoc(),
+                diag::err_typecheck_call_too_many_args_at_most)
+         << 0 /*function call*/ << MaxArgCount << ArgCount
+         << Call->getSourceRange();
+}
+
+/// Checks that a call expression's argument count is in the desired range. This
+/// is useful when doing custom type-checking on a variadic function. Returns
+/// true on error.
+static bool checkArgCountRange(Sema &S, CallExpr *Call, unsigned MinArgCount,
+                               unsigned MaxArgCount) {
+  return checkArgCountAtLeast(S, Call, MinArgCount) ||
+         checkArgCountAtMost(S, Call, MaxArgCount);
+}
+
 /// Checks that a call expression's argument count is the desired number.
 /// This is useful when doing custom type-checking.  Returns true on error.
-static bool checkArgCount(Sema &S, CallExpr *call, unsigned desiredArgCount) {
-  unsigned argCount = call->getNumArgs();
-  if (argCount == desiredArgCount) return false;
+static bool checkArgCount(Sema &S, CallExpr *Call, unsigned DesiredArgCount) {
+  unsigned ArgCount = Call->getNumArgs();
+  if (ArgCount == DesiredArgCount)
+    return false;
 
-  if (argCount < desiredArgCount)
-    return S.Diag(call->getEndLoc(), diag::err_typecheck_call_too_few_args)
-           << 0 /*function call*/ << desiredArgCount << argCount
-           << call->getSourceRange();
+  if (checkArgCountAtLeast(S, Call, DesiredArgCount))
+    return true;
+  assert(ArgCount > DesiredArgCount && "should have diagnosed this");
 
   // Highlight all the excess arguments.
-  SourceRange range(call->getArg(desiredArgCount)->getBeginLoc(),
-                    call->getArg(argCount - 1)->getEndLoc());
+  SourceRange Range(Call->getArg(DesiredArgCount)->getBeginLoc(),
+                    Call->getArg(ArgCount - 1)->getEndLoc());
 
-  return S.Diag(range.getBegin(), diag::err_typecheck_call_too_many_args)
-    << 0 /*function call*/ << desiredArgCount << argCount
-    << call->getArg(1)->getSourceRange();
+  return S.Diag(Range.getBegin(), diag::err_typecheck_call_too_many_args)
+         << 0 /*function call*/ << DesiredArgCount << ArgCount
+         << Call->getArg(1)->getSourceRange();
+}
+
+static bool convertArgumentToType(Sema &S, Expr *&Value, QualType Ty) {
+  if (Value->isTypeDependent())
+    return false;
+
+  InitializedEntity Entity =
+      InitializedEntity::InitializeParameter(S.Context, Ty, false);
+  ExprResult Result =
+      S.PerformCopyInitialization(Entity, SourceLocation(), Value);
+  if (Result.isInvalid())
+    return true;
+  Value = Result.get();
+  return false;
 }
 
 /// Check that the first argument to __builtin_annotation is an integer
@@ -147,7 +201,7 @@ static bool SemaBuiltinAnnotation(Sema &S, CallExpr *TheCall) {
   // Second argument should be a constant string.
   Expr *StrArg = TheCall->getArg(1)->IgnoreParenCasts();
   StringLiteral *Literal = dyn_cast<StringLiteral>(StrArg);
-  if (!Literal || !Literal->isAscii()) {
+  if (!Literal || !Literal->isOrdinary()) {
     S.Diag(StrArg->getBeginLoc(), diag::err_builtin_annotation_second_arg)
         << StrArg->getSourceRange();
     return true;
@@ -195,6 +249,29 @@ static bool SemaBuiltinAddressof(Sema &S, CallExpr *TheCall) {
   return false;
 }
 
+/// Check that the argument to __builtin_function_start is a function.
+static bool SemaBuiltinFunctionStart(Sema &S, CallExpr *TheCall) {
+  if (checkArgCount(S, TheCall, 1))
+    return true;
+
+  ExprResult Arg = S.DefaultFunctionArrayLvalueConversion(TheCall->getArg(0));
+  if (Arg.isInvalid())
+    return true;
+
+  TheCall->setArg(0, Arg.get());
+  const FunctionDecl *FD = dyn_cast_or_null<FunctionDecl>(
+      Arg.get()->getAsBuiltinConstantDeclRef(S.getASTContext()));
+
+  if (!FD) {
+    S.Diag(TheCall->getBeginLoc(), diag::err_function_start_invalid_type)
+        << TheCall->getSourceRange();
+    return true;
+  }
+
+  return !S.checkAddressOfFunctionIsAvailable(FD, /*Complain=*/true,
+                                              TheCall->getBeginLoc());
+}
+
 /// Check the number of arguments and set the result type to
 /// the argument type.
 static bool SemaBuiltinPreserveAI(Sema &S, CallExpr *TheCall) {
@@ -325,17 +402,17 @@ static bool SemaBuiltinOverflow(Sema &S, CallExpr *TheCall,
     }
   }
 
-  // Disallow signed ExtIntType args larger than 128 bits to mul function until
-  // we improve backend support.
+  // Disallow signed bit-precise integer args larger than 128 bits to mul
+  // function until we improve backend support.
   if (BuiltinID == Builtin::BI__builtin_mul_overflow) {
     for (unsigned I = 0; I < 3; ++I) {
       const auto Arg = TheCall->getArg(I);
       // Third argument will be a pointer.
       auto Ty = I < 2 ? Arg->getType() : Arg->getType()->getPointeeType();
-      if (Ty->isExtIntType() && Ty->isSignedIntegerType() &&
+      if (Ty->isBitIntType() && Ty->isSignedIntegerType() &&
           S.getASTContext().getIntWidth(Ty) > 128)
         return S.Diag(Arg->getBeginLoc(),
-                      diag::err_overflow_builtin_ext_int_max_size)
+                      diag::err_overflow_builtin_bit_int_max_size)
                << 128;
     }
   }
@@ -343,6 +420,311 @@ static bool SemaBuiltinOverflow(Sema &S, CallExpr *TheCall,
   return false;
 }
 
+namespace {
+struct BuiltinDumpStructGenerator {
+  Sema &S;
+  CallExpr *TheCall;
+  SourceLocation Loc = TheCall->getBeginLoc();
+  SmallVector<Expr *, 32> Actions;
+  DiagnosticErrorTrap ErrorTracker;
+  PrintingPolicy Policy;
+
+  BuiltinDumpStructGenerator(Sema &S, CallExpr *TheCall)
+      : S(S), TheCall(TheCall), ErrorTracker(S.getDiagnostics()),
+        Policy(S.Context.getPrintingPolicy()) {
+    Policy.AnonymousTagLocations = false;
+  }
+
+  Expr *makeOpaqueValueExpr(Expr *Inner) {
+    auto *OVE = new (S.Context)
+        OpaqueValueExpr(Loc, Inner->getType(), Inner->getValueKind(),
+                        Inner->getObjectKind(), Inner);
+    Actions.push_back(OVE);
+    return OVE;
+  }
+
+  Expr *getStringLiteral(llvm::StringRef Str) {
+    Expr *Lit = S.Context.getPredefinedStringLiteralFromCache(Str);
+    // Wrap the literal in parentheses to attach a source location.
+    return new (S.Context) ParenExpr(Loc, Loc, Lit);
+  }
+
+  bool callPrintFunction(llvm::StringRef Format,
+                         llvm::ArrayRef<Expr *> Exprs = {}) {
+    SmallVector<Expr *, 8> Args;
+    assert(TheCall->getNumArgs() >= 2);
+    Args.reserve((TheCall->getNumArgs() - 2) + /*Format*/ 1 + Exprs.size());
+    Args.assign(TheCall->arg_begin() + 2, TheCall->arg_end());
+    Args.push_back(getStringLiteral(Format));
+    Args.insert(Args.end(), Exprs.begin(), Exprs.end());
+
+    // Register a note to explain why we're performing the call.
+    Sema::CodeSynthesisContext Ctx;
+    Ctx.Kind = Sema::CodeSynthesisContext::BuildingBuiltinDumpStructCall;
+    Ctx.PointOfInstantiation = Loc;
+    Ctx.CallArgs = Args.data();
+    Ctx.NumCallArgs = Args.size();
+    S.pushCodeSynthesisContext(Ctx);
+
+    ExprResult RealCall =
+        S.BuildCallExpr(/*Scope=*/nullptr, TheCall->getArg(1),
+                        TheCall->getBeginLoc(), Args, TheCall->getRParenLoc());
+
+    S.popCodeSynthesisContext();
+    if (!RealCall.isInvalid())
+      Actions.push_back(RealCall.get());
+    // Bail out if we've hit any errors, even if we managed to build the
+    // call. We don't want to produce more than one error.
+    return RealCall.isInvalid() || ErrorTracker.hasErrorOccurred();
+  }
+
+  Expr *getIndentString(unsigned Depth) {
+    if (!Depth)
+      return nullptr;
+
+    llvm::SmallString<32> Indent;
+    Indent.resize(Depth * Policy.Indentation, ' ');
+    return getStringLiteral(Indent);
+  }
+
+  Expr *getTypeString(QualType T) {
+    return getStringLiteral(T.getAsString(Policy));
+  }
+
+  bool appendFormatSpecifier(QualType T, llvm::SmallVectorImpl<char> &Str) {
+    llvm::raw_svector_ostream OS(Str);
+
+    // Format 'bool', 'char', 'signed char', 'unsigned char' as numbers, rather
+    // than trying to print a single character.
+    if (auto *BT = T->getAs<BuiltinType>()) {
+      switch (BT->getKind()) {
+      case BuiltinType::Bool:
+        OS << "%d";
+        return true;
+      case BuiltinType::Char_U:
+      case BuiltinType::UChar:
+        OS << "%hhu";
+        return true;
+      case BuiltinType::Char_S:
+      case BuiltinType::SChar:
+        OS << "%hhd";
+        return true;
+      default:
+        break;
+      }
+    }
+
+    analyze_printf::PrintfSpecifier Specifier;
+    if (Specifier.fixType(T, S.getLangOpts(), S.Context, /*IsObjCLiteral=*/false)) {
+      // We were able to guess how to format this.
+      if (Specifier.getConversionSpecifier().getKind() ==
+          analyze_printf::PrintfConversionSpecifier::sArg) {
+        // Wrap double-quotes around a '%s' specifier and limit its maximum
+        // length. Ideally we'd also somehow escape special characters in the
+        // contents but printf doesn't support that.
+        // FIXME: '%s' formatting is not safe in general.
+        OS << '"';
+        Specifier.setPrecision(analyze_printf::OptionalAmount(32u));
+        Specifier.toString(OS);
+        OS << '"';
+        // FIXME: It would be nice to include a '...' if the string doesn't fit
+        // in the length limit.
+      } else {
+        Specifier.toString(OS);
+      }
+      return true;
+    }
+
+    if (T->isPointerType()) {
+      // Format all pointers with '%p'.
+      OS << "%p";
+      return true;
+    }
+
+    return false;
+  }
+
+  bool dumpUnnamedRecord(const RecordDecl *RD, Expr *E, unsigned Depth) {
+    Expr *IndentLit = getIndentString(Depth);
+    Expr *TypeLit = getTypeString(S.Context.getRecordType(RD));
+    if (IndentLit ? callPrintFunction("%s%s", {IndentLit, TypeLit})
+                  : callPrintFunction("%s", {TypeLit}))
+      return true;
+
+    return dumpRecordValue(RD, E, IndentLit, Depth);
+  }
+
+  // Dump a record value. E should be a pointer or lvalue referring to an RD.
+  bool dumpRecordValue(const RecordDecl *RD, Expr *E, Expr *RecordIndent,
+                       unsigned Depth) {
+    // FIXME: Decide what to do if RD is a union. At least we should probably
+    // turn off printing `const char*` members with `%s`, because that is very
+    // likely to crash if that's not the active member. Whatever we decide, we
+    // should document it.
+
+    // Build an OpaqueValueExpr so we can refer to E more than once without
+    // triggering re-evaluation.
+    Expr *RecordArg = makeOpaqueValueExpr(E);
+    bool RecordArgIsPtr = RecordArg->getType()->isPointerType();
+
+    if (callPrintFunction(" {\n"))
+      return true;
+
+    // Dump each base class, regardless of whether they're aggregates.
+    if (const auto *CXXRD = dyn_cast<CXXRecordDecl>(RD)) {
+      for (const auto &Base : CXXRD->bases()) {
+        QualType BaseType =
+            RecordArgIsPtr ? S.Context.getPointerType(Base.getType())
+                           : S.Context.getLValueReferenceType(Base.getType());
+        ExprResult BasePtr = S.BuildCStyleCastExpr(
+            Loc, S.Context.getTrivialTypeSourceInfo(BaseType, Loc), Loc,
+            RecordArg);
+        if (BasePtr.isInvalid() ||
+            dumpUnnamedRecord(Base.getType()->getAsRecordDecl(), BasePtr.get(),
+                              Depth + 1))
+          return true;
+      }
+    }
+
+    Expr *FieldIndentArg = getIndentString(Depth + 1);
+
+    // Dump each field.
+    for (auto *D : RD->decls()) {
+      auto *IFD = dyn_cast<IndirectFieldDecl>(D);
+      auto *FD = IFD ? IFD->getAnonField() : dyn_cast<FieldDecl>(D);
+      if (!FD || FD->isUnnamedBitfield() || FD->isAnonymousStructOrUnion())
+        continue;
+
+      llvm::SmallString<20> Format = llvm::StringRef("%s%s %s ");
+      llvm::SmallVector<Expr *, 5> Args = {FieldIndentArg,
+                                           getTypeString(FD->getType()),
+                                           getStringLiteral(FD->getName())};
+
+      if (FD->isBitField()) {
+        Format += ": %zu ";
+        QualType SizeT = S.Context.getSizeType();
+        llvm::APInt BitWidth(S.Context.getIntWidth(SizeT),
+                             FD->getBitWidthValue(S.Context));
+        Args.push_back(IntegerLiteral::Create(S.Context, BitWidth, SizeT, Loc));
+      }
+
+      Format += "=";
+
+      ExprResult Field =
+          IFD ? S.BuildAnonymousStructUnionMemberReference(
+                    CXXScopeSpec(), Loc, IFD,
+                    DeclAccessPair::make(IFD, AS_public), RecordArg, Loc)
+              : S.BuildFieldReferenceExpr(
+                    RecordArg, RecordArgIsPtr, Loc, CXXScopeSpec(), FD,
+                    DeclAccessPair::make(FD, AS_public),
+                    DeclarationNameInfo(FD->getDeclName(), Loc));
+      if (Field.isInvalid())
+        return true;
+
+      auto *InnerRD = FD->getType()->getAsRecordDecl();
+      auto *InnerCXXRD = dyn_cast_or_null<CXXRecordDecl>(InnerRD);
+      if (InnerRD && (!InnerCXXRD || InnerCXXRD->isAggregate())) {
+        // Recursively print the values of members of aggregate record type.
+        if (callPrintFunction(Format, Args) ||
+            dumpRecordValue(InnerRD, Field.get(), FieldIndentArg, Depth + 1))
+          return true;
+      } else {
+        Format += " ";
+        if (appendFormatSpecifier(FD->getType(), Format)) {
+          // We know how to print this field.
+          Args.push_back(Field.get());
+        } else {
+          // We don't know how to print this field. Print out its address
+          // with a format specifier that a smart tool will be able to
+          // recognize and treat specially.
+          Format += "*%p";
+          ExprResult FieldAddr =
+              S.BuildUnaryOp(nullptr, Loc, UO_AddrOf, Field.get());
+          if (FieldAddr.isInvalid())
+            return true;
+          Args.push_back(FieldAddr.get());
+        }
+        Format += "\n";
+        if (callPrintFunction(Format, Args))
+          return true;
+      }
+    }
+
+    return RecordIndent ? callPrintFunction("%s}\n", RecordIndent)
+                        : callPrintFunction("}\n");
+  }
+
+  Expr *buildWrapper() {
+    auto *Wrapper = PseudoObjectExpr::Create(S.Context, TheCall, Actions,
+                                             PseudoObjectExpr::NoResult);
+    TheCall->setType(Wrapper->getType());
+    TheCall->setValueKind(Wrapper->getValueKind());
+    return Wrapper;
+  }
+};
+} // namespace
+
+static ExprResult SemaBuiltinDumpStruct(Sema &S, CallExpr *TheCall) {
+  if (checkArgCountAtLeast(S, TheCall, 2))
+    return ExprError();
+
+  ExprResult PtrArgResult = S.DefaultLvalueConversion(TheCall->getArg(0));
+  if (PtrArgResult.isInvalid())
+    return ExprError();
+  TheCall->setArg(0, PtrArgResult.get());
+
+  // First argument should be a pointer to a struct.
+  QualType PtrArgType = PtrArgResult.get()->getType();
+  if (!PtrArgType->isPointerType() ||
+      !PtrArgType->getPointeeType()->isRecordType()) {
+    S.Diag(PtrArgResult.get()->getBeginLoc(),
+           diag::err_expected_struct_pointer_argument)
+        << 1 << TheCall->getDirectCallee() << PtrArgType;
+    return ExprError();
+  }
+  const RecordDecl *RD = PtrArgType->getPointeeType()->getAsRecordDecl();
+
+  // Second argument is a callable, but we can't fully validate it until we try
+  // calling it.
+  QualType FnArgType = TheCall->getArg(1)->getType();
+  if (!FnArgType->isFunctionType() && !FnArgType->isFunctionPointerType() &&
+      !FnArgType->isBlockPointerType() &&
+      !(S.getLangOpts().CPlusPlus && FnArgType->isRecordType())) {
+    auto *BT = FnArgType->getAs<BuiltinType>();
+    switch (BT ? BT->getKind() : BuiltinType::Void) {
+    case BuiltinType::Dependent:
+    case BuiltinType::Overload:
+    case BuiltinType::BoundMember:
+    case BuiltinType::PseudoObject:
+    case BuiltinType::UnknownAny:
+    case BuiltinType::BuiltinFn:
+      // This might be a callable.
+      break;
+
+    default:
+      S.Diag(TheCall->getArg(1)->getBeginLoc(),
+             diag::err_expected_callable_argument)
+          << 2 << TheCall->getDirectCallee() << FnArgType;
+      return ExprError();
+    }
+  }
+
+  BuiltinDumpStructGenerator Generator(S, TheCall);
+
+  // Wrap parentheses around the given pointer. This is not necessary for
+  // correct code generation, but it means that when we pretty-print the call
+  // arguments in our diagnostics we will produce '(&s)->n' instead of the
+  // incorrect '&s->n'.
+  Expr *PtrArg = PtrArgResult.get();
+  PtrArg = new (S.Context)
+      ParenExpr(PtrArg->getBeginLoc(),
+                S.getLocForEndOfToken(PtrArg->getEndLoc()), PtrArg);
+  if (Generator.dumpUnnamedRecord(RD, PtrArg, 0))
+    return ExprError();
+
+  return Generator.buildWrapper();
+}
+
 static bool SemaBuiltinCallWithStaticChain(Sema &S, CallExpr *BuiltinCall) {
   if (checkArgCount(S, BuiltinCall, 2))
     return true;
@@ -408,6 +790,65 @@ static bool SemaBuiltinCallWithStaticChain(Sema &S, CallExpr *BuiltinCall) {
 
 namespace {
 
+class ScanfDiagnosticFormatHandler
+    : public analyze_format_string::FormatStringHandler {
+  // Accepts the argument index (relative to the first destination index) of the
+  // argument whose size we want.
+  using ComputeSizeFunction =
+      llvm::function_ref<std::optional<llvm::APSInt>(unsigned)>;
+
+  // Accepts the argument index (relative to the first destination index), the
+  // destination size, and the source size).
+  using DiagnoseFunction =
+      llvm::function_ref<void(unsigned, unsigned, unsigned)>;
+
+  ComputeSizeFunction ComputeSizeArgument;
+  DiagnoseFunction Diagnose;
+
+public:
+  ScanfDiagnosticFormatHandler(ComputeSizeFunction ComputeSizeArgument,
+                               DiagnoseFunction Diagnose)
+      : ComputeSizeArgument(ComputeSizeArgument), Diagnose(Diagnose) {}
+
+  bool HandleScanfSpecifier(const analyze_scanf::ScanfSpecifier &FS,
+                            const char *StartSpecifier,
+                            unsigned specifierLen) override {
+    if (!FS.consumesDataArgument())
+      return true;
+
+    unsigned NulByte = 0;
+    switch ((FS.getConversionSpecifier().getKind())) {
+    default:
+      return true;
+    case analyze_format_string::ConversionSpecifier::sArg:
+    case analyze_format_string::ConversionSpecifier::ScanListArg:
+      NulByte = 1;
+      break;
+    case analyze_format_string::ConversionSpecifier::cArg:
+      break;
+    }
+
+    analyze_format_string::OptionalAmount FW = FS.getFieldWidth();
+    if (FW.getHowSpecified() !=
+        analyze_format_string::OptionalAmount::HowSpecified::Constant)
+      return true;
+
+    unsigned SourceSize = FW.getConstantAmount() + NulByte;
+
+    std::optional<llvm::APSInt> DestSizeAPS =
+        ComputeSizeArgument(FS.getArgIndex());
+    if (!DestSizeAPS)
+      return true;
+
+    unsigned DestSize = DestSizeAPS->getZExtValue();
+
+    if (DestSize < SourceSize)
+      Diagnose(FS.getArgIndex(), DestSize, SourceSize);
+
+    return true;
+  }
+};
+
 class EstimateSizeFormatHandler
     : public analyze_format_string::FormatStringHandler {
   size_t Size;
@@ -418,7 +859,8 @@ public:
              1 /* null byte always written by sprintf */) {}
 
   bool HandlePrintfSpecifier(const analyze_printf::PrintfSpecifier &FS,
-                             const char *, unsigned SpecifierLen) override {
+                             const char *, unsigned SpecifierLen,
+                             const TargetInfo &) override {
 
     const size_t FieldWidth = computeFieldWidth(FS);
     const size_t Precision = computePrecision(FS);
@@ -588,32 +1030,199 @@ private:
 
 } // namespace
 
-/// Check a call to BuiltinID for buffer overflows. If BuiltinID is a
-/// __builtin_*_chk function, then use the object size argument specified in the
-/// source. Otherwise, infer the object size using __builtin_object_size.
 void Sema::checkFortifiedBuiltinMemoryFunction(FunctionDecl *FD,
                                                CallExpr *TheCall) {
-  // FIXME: There are some more useful checks we could be doing here:
-  //  - Evaluate strlen of strcpy arguments, use as object size.
-
   if (TheCall->isValueDependent() || TheCall->isTypeDependent() ||
       isConstantEvaluated())
     return;
 
-  unsigned BuiltinID = FD->getBuiltinID(/*ConsiderWrappers=*/true);
+  bool UseDABAttr = false;
+  const FunctionDecl *UseDecl = FD;
+
+  const auto *DABAttr = FD->getAttr<DiagnoseAsBuiltinAttr>();
+  if (DABAttr) {
+    UseDecl = DABAttr->getFunction();
+    assert(UseDecl && "Missing FunctionDecl in DiagnoseAsBuiltin attribute!");
+    UseDABAttr = true;
+  }
+
+  unsigned BuiltinID = UseDecl->getBuiltinID(/*ConsiderWrappers=*/true);
+
   if (!BuiltinID)
     return;
 
   const TargetInfo &TI = getASTContext().getTargetInfo();
   unsigned SizeTypeWidth = TI.getTypeWidth(TI.getSizeType());
 
+  auto TranslateIndex = [&](unsigned Index) -> std::optional<unsigned> {
+    // If we refer to a diagnose_as_builtin attribute, we need to change the
+    // argument index to refer to the arguments of the called function. Unless
+    // the index is out of bounds, which presumably means it's a variadic
+    // function.
+    if (!UseDABAttr)
+      return Index;
+    unsigned DABIndices = DABAttr->argIndices_size();
+    unsigned NewIndex = Index < DABIndices
+                            ? DABAttr->argIndices_begin()[Index]
+                            : Index - DABIndices + FD->getNumParams();
+    if (NewIndex >= TheCall->getNumArgs())
+      return std::nullopt;
+    return NewIndex;
+  };
+
+  auto ComputeExplicitObjectSizeArgument =
+      [&](unsigned Index) -> std::optional<llvm::APSInt> {
+    std::optional<unsigned> IndexOptional = TranslateIndex(Index);
+    if (!IndexOptional)
+      return std::nullopt;
+    unsigned NewIndex = *IndexOptional;
+    Expr::EvalResult Result;
+    Expr *SizeArg = TheCall->getArg(NewIndex);
+    if (!SizeArg->EvaluateAsInt(Result, getASTContext()))
+      return std::nullopt;
+    llvm::APSInt Integer = Result.Val.getInt();
+    Integer.setIsUnsigned(true);
+    return Integer;
+  };
+
+  auto ComputeSizeArgument =
+      [&](unsigned Index) -> std::optional<llvm::APSInt> {
+    // If the parameter has a pass_object_size attribute, then we should use its
+    // (potentially) more strict checking mode. Otherwise, conservatively assume
+    // type 0.
+    int BOSType = 0;
+    // This check can fail for variadic functions.
+    if (Index < FD->getNumParams()) {
+      if (const auto *POS =
+              FD->getParamDecl(Index)->getAttr<PassObjectSizeAttr>())
+        BOSType = POS->getType();
+    }
+
+    std::optional<unsigned> IndexOptional = TranslateIndex(Index);
+    if (!IndexOptional)
+      return std::nullopt;
+    unsigned NewIndex = *IndexOptional;
+
+    if (NewIndex >= TheCall->getNumArgs())
+      return std::nullopt;
+
+    const Expr *ObjArg = TheCall->getArg(NewIndex);
+    uint64_t Result;
+    if (!ObjArg->tryEvaluateObjectSize(Result, getASTContext(), BOSType))
+      return std::nullopt;
+
+    // Get the object size in the target's size_t width.
+    return llvm::APSInt::getUnsigned(Result).extOrTrunc(SizeTypeWidth);
+  };
+
+  auto ComputeStrLenArgument =
+      [&](unsigned Index) -> std::optional<llvm::APSInt> {
+    std::optional<unsigned> IndexOptional = TranslateIndex(Index);
+    if (!IndexOptional)
+      return std::nullopt;
+    unsigned NewIndex = *IndexOptional;
+
+    const Expr *ObjArg = TheCall->getArg(NewIndex);
+    uint64_t Result;
+    if (!ObjArg->tryEvaluateStrLen(Result, getASTContext()))
+      return std::nullopt;
+    // Add 1 for null byte.
+    return llvm::APSInt::getUnsigned(Result + 1).extOrTrunc(SizeTypeWidth);
+  };
+
+  std::optional<llvm::APSInt> SourceSize;
+  std::optional<llvm::APSInt> DestinationSize;
   unsigned DiagID = 0;
   bool IsChkVariant = false;
-  Optional<llvm::APSInt> UsedSize;
-  unsigned SizeIndex, ObjectIndex;
+
+  auto GetFunctionName = [&]() {
+    StringRef FunctionName = getASTContext().BuiltinInfo.getName(BuiltinID);
+    // Skim off the details of whichever builtin was called to produce a better
+    // diagnostic, as it's unlikely that the user wrote the __builtin
+    // explicitly.
+    if (IsChkVariant) {
+      FunctionName = FunctionName.drop_front(std::strlen("__builtin___"));
+      FunctionName = FunctionName.drop_back(std::strlen("_chk"));
+    } else if (FunctionName.startswith("__builtin_")) {
+      FunctionName = FunctionName.drop_front(std::strlen("__builtin_"));
+    }
+    return FunctionName;
+  };
+
   switch (BuiltinID) {
   default:
     return;
+  case Builtin::BI__builtin_strcpy:
+  case Builtin::BIstrcpy: {
+    DiagID = diag::warn_fortify_strlen_overflow;
+    SourceSize = ComputeStrLenArgument(1);
+    DestinationSize = ComputeSizeArgument(0);
+    break;
+  }
+
+  case Builtin::BI__builtin___strcpy_chk: {
+    DiagID = diag::warn_fortify_strlen_overflow;
+    SourceSize = ComputeStrLenArgument(1);
+    DestinationSize = ComputeExplicitObjectSizeArgument(2);
+    IsChkVariant = true;
+    break;
+  }
+
+  case Builtin::BIscanf:
+  case Builtin::BIfscanf:
+  case Builtin::BIsscanf: {
+    unsigned FormatIndex = 1;
+    unsigned DataIndex = 2;
+    if (BuiltinID == Builtin::BIscanf) {
+      FormatIndex = 0;
+      DataIndex = 1;
+    }
+
+    const auto *FormatExpr =
+        TheCall->getArg(FormatIndex)->IgnoreParenImpCasts();
+
+    const auto *Format = dyn_cast<StringLiteral>(FormatExpr);
+    if (!Format)
+      return;
+
+    if (!Format->isOrdinary() && !Format->isUTF8())
+      return;
+
+    auto Diagnose = [&](unsigned ArgIndex, unsigned DestSize,
+                        unsigned SourceSize) {
+      DiagID = diag::warn_fortify_scanf_overflow;
+      unsigned Index = ArgIndex + DataIndex;
+      StringRef FunctionName = GetFunctionName();
+      DiagRuntimeBehavior(TheCall->getArg(Index)->getBeginLoc(), TheCall,
+                          PDiag(DiagID) << FunctionName << (Index + 1)
+                                        << DestSize << SourceSize);
+    };
+
+    StringRef FormatStrRef = Format->getString();
+    auto ShiftedComputeSizeArgument = [&](unsigned Index) {
+      return ComputeSizeArgument(Index + DataIndex);
+    };
+    ScanfDiagnosticFormatHandler H(ShiftedComputeSizeArgument, Diagnose);
+    const char *FormatBytes = FormatStrRef.data();
+    const ConstantArrayType *T =
+        Context.getAsConstantArrayType(Format->getType());
+    assert(T && "String literal not of constant array type!");
+    size_t TypeSize = T->getSize().getZExtValue();
+
+    // In case there's a null byte somewhere.
+    size_t StrLen =
+        std::min(std::max(TypeSize, size_t(1)) - 1, FormatStrRef.find(0));
+
+    analyze_format_string::ParseScanfString(H, FormatBytes,
+                                            FormatBytes + StrLen, getLangOpts(),
+                                            Context.getTargetInfo());
+
+    // Unlike the other cases, in this one we have already issued the diagnostic
+    // here, so no need to continue (because unlike the other cases, here the
+    // diagnostic refers to the argument number).
+    return;
+  }
+
   case Builtin::BIsprintf:
   case Builtin::BI__builtin___sprintf_chk: {
     size_t FormatIndex = BuiltinID == Builtin::BIsprintf ? 1 : 3;
@@ -621,7 +1230,7 @@ void Sema::checkFortifiedBuiltinMemoryFunction(FunctionDecl *FD,
 
     if (auto *Format = dyn_cast<StringLiteral>(FormatExpr)) {
 
-      if (!Format->isAscii() && !Format->isUTF8())
+      if (!Format->isOrdinary() && !Format->isUTF8())
         return;
 
       StringRef FormatStrRef = Format->getString();
@@ -639,14 +1248,13 @@ void Sema::checkFortifiedBuiltinMemoryFunction(FunctionDecl *FD,
               H, FormatBytes, FormatBytes + StrLen, getLangOpts(),
               Context.getTargetInfo(), false)) {
         DiagID = diag::warn_fortify_source_format_overflow;
-        UsedSize = llvm::APSInt::getUnsigned(H.getSizeLowerBound())
-                       .extOrTrunc(SizeTypeWidth);
+        SourceSize = llvm::APSInt::getUnsigned(H.getSizeLowerBound())
+                         .extOrTrunc(SizeTypeWidth);
         if (BuiltinID == Builtin::BI__builtin___sprintf_chk) {
+          DestinationSize = ComputeExplicitObjectSizeArgument(2);
           IsChkVariant = true;
-          ObjectIndex = 2;
         } else {
-          IsChkVariant = false;
-          ObjectIndex = 0;
+          DestinationSize = ComputeSizeArgument(0);
         }
         break;
       }
@@ -664,18 +1272,19 @@ void Sema::checkFortifiedBuiltinMemoryFunction(FunctionDecl *FD,
   case Builtin::BI__builtin___memccpy_chk:
   case Builtin::BI__builtin___mempcpy_chk: {
     DiagID = diag::warn_builtin_chk_overflow;
+    SourceSize = ComputeExplicitObjectSizeArgument(TheCall->getNumArgs() - 2);
+    DestinationSize =
+        ComputeExplicitObjectSizeArgument(TheCall->getNumArgs() - 1);
     IsChkVariant = true;
-    SizeIndex = TheCall->getNumArgs() - 2;
-    ObjectIndex = TheCall->getNumArgs() - 1;
     break;
   }
 
   case Builtin::BI__builtin___snprintf_chk:
   case Builtin::BI__builtin___vsnprintf_chk: {
     DiagID = diag::warn_builtin_chk_overflow;
+    SourceSize = ComputeExplicitObjectSizeArgument(1);
+    DestinationSize = ComputeExplicitObjectSizeArgument(3);
     IsChkVariant = true;
-    SizeIndex = 1;
-    ObjectIndex = 3;
     break;
   }
 
@@ -691,8 +1300,8 @@ void Sema::checkFortifiedBuiltinMemoryFunction(FunctionDecl *FD,
     // size larger than the destination buffer though; this is a runtime abort
     // in _FORTIFY_SOURCE mode, and is quite suspicious otherwise.
     DiagID = diag::warn_fortify_source_size_mismatch;
-    SizeIndex = TheCall->getNumArgs() - 1;
-    ObjectIndex = 0;
+    SourceSize = ComputeExplicitObjectSizeArgument(TheCall->getNumArgs() - 1);
+    DestinationSize = ComputeSizeArgument(0);
     break;
   }
 
@@ -705,8 +1314,8 @@ void Sema::checkFortifiedBuiltinMemoryFunction(FunctionDecl *FD,
   case Builtin::BImempcpy:
   case Builtin::BI__builtin_mempcpy: {
     DiagID = diag::warn_fortify_source_overflow;
-    SizeIndex = TheCall->getNumArgs() - 1;
-    ObjectIndex = 0;
+    SourceSize = ComputeExplicitObjectSizeArgument(TheCall->getNumArgs() - 1);
+    DestinationSize = ComputeSizeArgument(0);
     break;
   }
   case Builtin::BIsnprintf:
@@ -714,66 +1323,25 @@ void Sema::checkFortifiedBuiltinMemoryFunction(FunctionDecl *FD,
   case Builtin::BIvsnprintf:
   case Builtin::BI__builtin_vsnprintf: {
     DiagID = diag::warn_fortify_source_size_mismatch;
-    SizeIndex = 1;
-    ObjectIndex = 0;
+    SourceSize = ComputeExplicitObjectSizeArgument(1);
+    DestinationSize = ComputeSizeArgument(0);
     break;
   }
   }
 
-  llvm::APSInt ObjectSize;
-  // For __builtin___*_chk, the object size is explicitly provided by the caller
-  // (usually using __builtin_object_size). Use that value to check this call.
-  if (IsChkVariant) {
-    Expr::EvalResult Result;
-    Expr *SizeArg = TheCall->getArg(ObjectIndex);
-    if (!SizeArg->EvaluateAsInt(Result, getASTContext()))
-      return;
-    ObjectSize = Result.Val.getInt();
-
-  // Otherwise, try to evaluate an imaginary call to __builtin_object_size.
-  } else {
-    // If the parameter has a pass_object_size attribute, then we should use its
-    // (potentially) more strict checking mode. Otherwise, conservatively assume
-    // type 0.
-    int BOSType = 0;
-    if (const auto *POS =
-            FD->getParamDecl(ObjectIndex)->getAttr<PassObjectSizeAttr>())
-      BOSType = POS->getType();
-
-    Expr *ObjArg = TheCall->getArg(ObjectIndex);
-    uint64_t Result;
-    if (!ObjArg->tryEvaluateObjectSize(Result, getASTContext(), BOSType))
-      return;
-    // Get the object size in the target's size_t width.
-    ObjectSize = llvm::APSInt::getUnsigned(Result).extOrTrunc(SizeTypeWidth);
-  }
-
-  // Evaluate the number of bytes of the object that this call will use.
-  if (!UsedSize) {
-    Expr::EvalResult Result;
-    Expr *UsedSizeArg = TheCall->getArg(SizeIndex);
-    if (!UsedSizeArg->EvaluateAsInt(Result, getASTContext()))
-      return;
-    UsedSize = Result.Val.getInt().extOrTrunc(SizeTypeWidth);
-  }
-
-  if (UsedSize.getValue().ule(ObjectSize))
+  if (!SourceSize || !DestinationSize ||
+      llvm::APSInt::compareValues(*SourceSize, *DestinationSize) <= 0)
     return;
 
-  StringRef FunctionName = getASTContext().BuiltinInfo.getName(BuiltinID);
-  // Skim off the details of whichever builtin was called to produce a better
-  // diagnostic, as it's unlikley that the user wrote the __builtin explicitly.
-  if (IsChkVariant) {
-    FunctionName = FunctionName.drop_front(std::strlen("__builtin___"));
-    FunctionName = FunctionName.drop_back(std::strlen("_chk"));
-  } else if (FunctionName.startswith("__builtin_")) {
-    FunctionName = FunctionName.drop_front(std::strlen("__builtin_"));
-  }
+  StringRef FunctionName = GetFunctionName();
 
+  SmallString<16> DestinationStr;
+  SmallString<16> SourceStr;
+  DestinationSize->toString(DestinationStr, /*Radix=*/10);
+  SourceSize->toString(SourceStr, /*Radix=*/10);
   DiagRuntimeBehavior(TheCall->getBeginLoc(), TheCall,
                       PDiag(DiagID)
-                          << FunctionName << toString(ObjectSize, /*Radix=*/10)
-                          << toString(UsedSize.getValue(), /*Radix=*/10));
+                          << FunctionName << DestinationStr << SourceStr);
 }
 
 static bool SemaBuiltinSEHScopeCheck(Sema &SemaRef, CallExpr *TheCall,
@@ -838,9 +1406,15 @@ static bool checkOpenCLBlockArgs(Sema &S, Expr *BlockArg) {
 }
 
 static bool checkOpenCLSubgroupExt(Sema &S, CallExpr *Call) {
-  if (!S.getOpenCLOptions().isSupported("cl_khr_subgroups", S.getLangOpts())) {
+  // OpenCL device can support extension but not the feature as extension
+  // requires subgroup independent forward progress, but subgroup independent
+  // forward progress is optional in OpenCL C 3.0 __opencl_c_subgroups feature.
+  if (!S.getOpenCLOptions().isSupported("cl_khr_subgroups", S.getLangOpts()) &&
+      !S.getOpenCLOptions().isSupported("__opencl_c_subgroups",
+                                        S.getLangOpts())) {
     S.Diag(Call->getBeginLoc(), diag::err_opencl_requires_extension)
-        << 1 << Call->getDirectCallee() << "cl_khr_subgroups";
+        << 1 << Call->getDirectCallee()
+        << "cl_khr_subgroups or __opencl_c_subgroups";
     return true;
   }
   return false;
@@ -1336,18 +1910,18 @@ static ExprResult SemaBuiltinLaunder(Sema &S, CallExpr *TheCall) {
 
   TheCall->setType(ParamTy);
 
-  auto DiagSelect = [&]() -> llvm::Optional<unsigned> {
+  auto DiagSelect = [&]() -> std::optional<unsigned> {
     if (!ParamTy->isPointerType())
       return 0;
     if (ParamTy->isFunctionPointerType())
       return 1;
     if (ParamTy->isVoidPointerType())
       return 2;
-    return llvm::Optional<unsigned>{};
+    return std::optional<unsigned>{};
   }();
-  if (DiagSelect.hasValue()) {
+  if (DiagSelect) {
     S.Diag(TheCall->getBeginLoc(), diag::err_builtin_launder_invalid_arg)
-        << DiagSelect.getValue() << TheCall->getSourceRange();
+        << *DiagSelect << TheCall->getSourceRange();
     return ExprError();
   }
 
@@ -1375,11 +1949,26 @@ static ExprResult SemaBuiltinLaunder(Sema &S, CallExpr *TheCall) {
   return TheCall;
 }
 
+// Emit an error and return true if the current object format type is in the
+// list of unsupported types.
+static bool CheckBuiltinTargetNotInUnsupported(
+    Sema &S, unsigned BuiltinID, CallExpr *TheCall,
+    ArrayRef<llvm::Triple::ObjectFormatType> UnsupportedObjectFormatTypes) {
+  llvm::Triple::ObjectFormatType CurObjFormat =
+      S.getASTContext().getTargetInfo().getTriple().getObjectFormat();
+  if (llvm::is_contained(UnsupportedObjectFormatTypes, CurObjFormat)) {
+    S.Diag(TheCall->getBeginLoc(), diag::err_builtin_target_unsupported)
+        << TheCall->getSourceRange();
+    return true;
+  }
+  return false;
+}
+
 // Emit an error and return true if the current architecture is not in the list
 // of supported architectures.
 static bool
-CheckBuiltinTargetSupport(Sema &S, unsigned BuiltinID, CallExpr *TheCall,
-                          ArrayRef<llvm::Triple::ArchType> SupportedArchs) {
+CheckBuiltinTargetInSupported(Sema &S, unsigned BuiltinID, CallExpr *TheCall,
+                              ArrayRef<llvm::Triple::ArchType> SupportedArchs) {
   llvm::Triple::ArchType CurArch =
       S.getASTContext().getTargetInfo().getTriple().getArch();
   if (llvm::is_contained(SupportedArchs, CurArch))
@@ -1433,9 +2022,39 @@ bool Sema::CheckTSBuiltinFunctionCall(const TargetInfo &TI, unsigned BuiltinID,
   case llvm::Triple::riscv32:
   case llvm::Triple::riscv64:
     return CheckRISCVBuiltinFunctionCall(TI, BuiltinID, TheCall);
+  case llvm::Triple::loongarch32:
+  case llvm::Triple::loongarch64:
+    return CheckLoongArchBuiltinFunctionCall(TI, BuiltinID, TheCall);
   }
 }
 
+// Check if \p Ty is a valid type for the elementwise math builtins. If it is
+// not a valid type, emit an error message and return true. Otherwise return
+// false.
+static bool checkMathBuiltinElementType(Sema &S, SourceLocation Loc,
+                                        QualType Ty) {
+  if (!Ty->getAs<VectorType>() && !ConstantMatrixType::isValidElementType(Ty)) {
+    return S.Diag(Loc, diag::err_builtin_invalid_arg_type)
+           << 1 << /* vector, integer or float ty*/ 0 << Ty;
+  }
+
+  return false;
+}
+
+static bool checkFPMathBuiltinElementType(Sema &S, SourceLocation Loc,
+                                          QualType ArgTy, int ArgIndex) {
+  QualType EltTy = ArgTy;
+  if (auto *VecTy = EltTy->getAs<VectorType>())
+    EltTy = VecTy->getElementType();
+
+  if (!EltTy->isRealFloatingType()) {
+    return S.Diag(Loc, diag::err_builtin_invalid_arg_type)
+           << ArgIndex << /* vector or float ty*/ 5 << ArgTy;
+  }
+
+  return false;
+}
+
 ExprResult
 Sema::CheckBuiltinFunctionCall(FunctionDecl *FDecl, unsigned BuiltinID,
                                CallExpr *TheCall) {
@@ -1454,13 +2073,22 @@ Sema::CheckBuiltinFunctionCall(FunctionDecl *FDecl, unsigned BuiltinID,
     if ((ICEArguments & (1 << ArgNo)) == 0) continue;
 
     llvm::APSInt Result;
-    if (SemaBuiltinConstantArg(TheCall, ArgNo, Result))
+    // If we don't have enough arguments, continue so we can issue better
+    // diagnostic in checkArgCount(...)
+    if (ArgNo < TheCall->getNumArgs() &&
+        SemaBuiltinConstantArg(TheCall, ArgNo, Result))
       return true;
     ICEArguments &= ~(1 << ArgNo);
   }
 
   switch (BuiltinID) {
   case Builtin::BI__builtin___CFStringMakeConstantString:
+    // CFStringMakeConstantString is currently not implemented for GOFF (i.e.,
+    // on z/OS) and for XCOFF (i.e., on AIX). Emit unsupported
+    if (CheckBuiltinTargetNotInUnsupported(
+            *this, BuiltinID, TheCall,
+            {llvm::Triple::GOFF, llvm::Triple::XCOFF}))
+      return ExprError();
     assert(TheCall->getNumArgs() == 1 &&
            "Wrong # arguments to builtin CFStringMakeConstantString");
     if (CheckObjCString(TheCall->getArg(0)))
@@ -1495,7 +2123,7 @@ Sema::CheckBuiltinFunctionCall(FunctionDecl *FDecl, unsigned BuiltinID,
   case Builtin::BI_interlockedbittestandreset_acq:
   case Builtin::BI_interlockedbittestandreset_rel:
   case Builtin::BI_interlockedbittestandreset_nf:
-    if (CheckBuiltinTargetSupport(
+    if (CheckBuiltinTargetInSupported(
             *this, BuiltinID, TheCall,
             {llvm::Triple::arm, llvm::Triple::thumb, llvm::Triple::aarch64}))
       return ExprError();
@@ -1508,9 +2136,10 @@ Sema::CheckBuiltinFunctionCall(FunctionDecl *FDecl, unsigned BuiltinID,
   case Builtin::BI_bittestandset64:
   case Builtin::BI_interlockedbittestandreset64:
   case Builtin::BI_interlockedbittestandset64:
-    if (CheckBuiltinTargetSupport(*this, BuiltinID, TheCall,
-                                  {llvm::Triple::x86_64, llvm::Triple::arm,
-                                   llvm::Triple::thumb, llvm::Triple::aarch64}))
+    if (CheckBuiltinTargetInSupported(*this, BuiltinID, TheCall,
+                                      {llvm::Triple::x86_64, llvm::Triple::arm,
+                                       llvm::Triple::thumb,
+                                       llvm::Triple::aarch64}))
       return ExprError();
     break;
 
@@ -1547,10 +2176,12 @@ Sema::CheckBuiltinFunctionCall(FunctionDecl *FDecl, unsigned BuiltinID,
       return ExprError();
     break;
   case Builtin::BI__builtin_alloca_with_align:
+  case Builtin::BI__builtin_alloca_with_align_uninitialized:
     if (SemaBuiltinAllocaWithAlign(TheCall))
       return ExprError();
-    LLVM_FALLTHROUGH;
+    [[fallthrough]];
   case Builtin::BI__builtin_alloca:
+  case Builtin::BI__builtin_alloca_uninitialized:
     Diag(TheCall->getBeginLoc(), diag::warn_alloca)
         << TheCall->getDirectCallee();
     break;
@@ -1715,12 +2346,23 @@ Sema::CheckBuiltinFunctionCall(FunctionDecl *FDecl, unsigned BuiltinID,
     // value so we bail out.
     if (SizeOp->isValueDependent())
       break;
-    if (!SizeOp->EvaluateKnownConstInt(Context).isNullValue()) {
+    if (!SizeOp->EvaluateKnownConstInt(Context).isZero()) {
       CheckNonNullArgument(*this, TheCall->getArg(0), TheCall->getExprLoc());
       CheckNonNullArgument(*this, TheCall->getArg(1), TheCall->getExprLoc());
     }
     break;
   }
+  case Builtin::BI__builtin_memset_inline: {
+    clang::Expr *SizeOp = TheCall->getArg(2);
+    // We warn about filling to `nullptr` pointers when `size` is greater than
+    // 0. When `size` is value dependent we cannot evaluate its value so we bail
+    // out.
+    if (SizeOp->isValueDependent())
+      break;
+    if (!SizeOp->EvaluateKnownConstInt(Context).isZero())
+      CheckNonNullArgument(*this, TheCall->getArg(0), TheCall->getExprLoc());
+    break;
+  }
 #define BUILTIN(ID, TYPE, ATTRS)
 #define ATOMIC_BUILTIN(ID, TYPE, ATTRS) \
   case Builtin::BI##ID: \
@@ -1738,6 +2380,10 @@ Sema::CheckBuiltinFunctionCall(FunctionDecl *FDecl, unsigned BuiltinID,
     if (SemaBuiltinAddressof(*this, TheCall))
       return ExprError();
     break;
+  case Builtin::BI__builtin_function_start:
+    if (SemaBuiltinFunctionStart(*this, TheCall))
+      return ExprError();
+    break;
   case Builtin::BI__builtin_is_aligned:
   case Builtin::BI__builtin_align_up:
   case Builtin::BI__builtin_align_down:
@@ -1759,62 +2405,8 @@ Sema::CheckBuiltinFunctionCall(FunctionDecl *FDecl, unsigned BuiltinID,
       CorrectDelayedTyposInExpr(TheCallResult.get());
     return Res;
   }
-  case Builtin::BI__builtin_dump_struct: {
-    // We first want to ensure we are called with 2 arguments
-    if (checkArgCount(*this, TheCall, 2))
-      return ExprError();
-    // Ensure that the first argument is of type 'struct XX *'
-    const Expr *PtrArg = TheCall->getArg(0)->IgnoreParenImpCasts();
-    const QualType PtrArgType = PtrArg->getType();
-    if (!PtrArgType->isPointerType() ||
-        !PtrArgType->getPointeeType()->isRecordType()) {
-      Diag(PtrArg->getBeginLoc(), diag::err_typecheck_convert_incompatible)
-          << PtrArgType << "structure pointer" << 1 << 0 << 3 << 1 << PtrArgType
-          << "structure pointer";
-      return ExprError();
-    }
-
-    // Ensure that the second argument is of type 'FunctionType'
-    const Expr *FnPtrArg = TheCall->getArg(1)->IgnoreImpCasts();
-    const QualType FnPtrArgType = FnPtrArg->getType();
-    if (!FnPtrArgType->isPointerType()) {
-      Diag(FnPtrArg->getBeginLoc(), diag::err_typecheck_convert_incompatible)
-          << FnPtrArgType << "'int (*)(const char *, ...)'" << 1 << 0 << 3 << 2
-          << FnPtrArgType << "'int (*)(const char *, ...)'";
-      return ExprError();
-    }
-
-    const auto *FuncType =
-        FnPtrArgType->getPointeeType()->getAs<FunctionType>();
-
-    if (!FuncType) {
-      Diag(FnPtrArg->getBeginLoc(), diag::err_typecheck_convert_incompatible)
-          << FnPtrArgType << "'int (*)(const char *, ...)'" << 1 << 0 << 3 << 2
-          << FnPtrArgType << "'int (*)(const char *, ...)'";
-      return ExprError();
-    }
-
-    if (const auto *FT = dyn_cast<FunctionProtoType>(FuncType)) {
-      if (!FT->getNumParams()) {
-        Diag(FnPtrArg->getBeginLoc(), diag::err_typecheck_convert_incompatible)
-            << FnPtrArgType << "'int (*)(const char *, ...)'" << 1 << 0 << 3
-            << 2 << FnPtrArgType << "'int (*)(const char *, ...)'";
-        return ExprError();
-      }
-      QualType PT = FT->getParamType(0);
-      if (!FT->isVariadic() || FT->getReturnType() != Context.IntTy ||
-          !PT->isPointerType() || !PT->getPointeeType()->isCharType() ||
-          !PT->getPointeeType().isConstQualified()) {
-        Diag(FnPtrArg->getBeginLoc(), diag::err_typecheck_convert_incompatible)
-            << FnPtrArgType << "'int (*)(const char *, ...)'" << 1 << 0 << 3
-            << 2 << FnPtrArgType << "'int (*)(const char *, ...)'";
-        return ExprError();
-      }
-    }
-
-    TheCall->setType(Context.IntTy);
-    break;
-  }
+  case Builtin::BI__builtin_dump_struct:
+    return SemaBuiltinDumpStruct(*this, TheCall);
   case Builtin::BI__builtin_expect_with_probability: {
     // We first want to ensure we are called with 3 arguments
     if (checkArgCount(*this, TheCall, 3))
@@ -1876,6 +2468,32 @@ Sema::CheckBuiltinFunctionCall(FunctionDecl *FDecl, unsigned BuiltinID,
 
     TheCall->setType(Context.VoidPtrTy);
     break;
+  case Builtin::BIaddressof:
+  case Builtin::BI__addressof:
+  case Builtin::BIforward:
+  case Builtin::BImove:
+  case Builtin::BImove_if_noexcept:
+  case Builtin::BIas_const: {
+    // These are all expected to be of the form
+    //   T &/&&/* f(U &/&&)
+    // where T and U only differ in qualification.
+    if (checkArgCount(*this, TheCall, 1))
+      return ExprError();
+    QualType Param = FDecl->getParamDecl(0)->getType();
+    QualType Result = FDecl->getReturnType();
+    bool ReturnsPointer = BuiltinID == Builtin::BIaddressof ||
+                          BuiltinID == Builtin::BI__addressof;
+    if (!(Param->isReferenceType() &&
+          (ReturnsPointer ? Result->isAnyPointerType()
+                          : Result->isReferenceType()) &&
+          Context.hasSameUnqualifiedType(Param->getPointeeType(),
+                                         Result->getPointeeType()))) {
+      Diag(TheCall->getBeginLoc(), diag::err_builtin_move_forward_unsupported)
+          << FDecl;
+      return ExprError();
+    }
+    break;
+  }
   // OpenCL v2.0, s6.13.16 - Pipe functions
   case Builtin::BIread_pipe:
   case Builtin::BIwrite_pipe:
@@ -1938,7 +2556,7 @@ Sema::CheckBuiltinFunctionCall(FunctionDecl *FDecl, unsigned BuiltinID,
     break;
   case Builtin::BI__builtin_os_log_format:
     Cleanup.setExprNeedsCleanups(true);
-    LLVM_FALLTHROUGH;
+    [[fallthrough]];
   case Builtin::BI__builtin_os_log_format_buffer_size:
     if (SemaBuiltinOSLogFormat(TheCall))
       return ExprError();
@@ -1962,6 +2580,147 @@ Sema::CheckBuiltinFunctionCall(FunctionDecl *FDecl, unsigned BuiltinID,
     break;
   }
 
+  // __builtin_elementwise_abs restricts the element type to signed integers or
+  // floating point types only.
+  case Builtin::BI__builtin_elementwise_abs: {
+    if (PrepareBuiltinElementwiseMathOneArgCall(TheCall))
+      return ExprError();
+
+    QualType ArgTy = TheCall->getArg(0)->getType();
+    QualType EltTy = ArgTy;
+
+    if (auto *VecTy = EltTy->getAs<VectorType>())
+      EltTy = VecTy->getElementType();
+    if (EltTy->isUnsignedIntegerType()) {
+      Diag(TheCall->getArg(0)->getBeginLoc(),
+           diag::err_builtin_invalid_arg_type)
+          << 1 << /* signed integer or float ty*/ 3 << ArgTy;
+      return ExprError();
+    }
+    break;
+  }
+
+  // These builtins restrict the element type to floating point
+  // types only.
+  case Builtin::BI__builtin_elementwise_ceil:
+  case Builtin::BI__builtin_elementwise_cos:
+  case Builtin::BI__builtin_elementwise_floor:
+  case Builtin::BI__builtin_elementwise_roundeven:
+  case Builtin::BI__builtin_elementwise_sin:
+  case Builtin::BI__builtin_elementwise_trunc:
+  case Builtin::BI__builtin_elementwise_canonicalize: {
+    if (PrepareBuiltinElementwiseMathOneArgCall(TheCall))
+      return ExprError();
+
+    QualType ArgTy = TheCall->getArg(0)->getType();
+    QualType EltTy = ArgTy;
+
+    if (auto *VecTy = EltTy->getAs<VectorType>())
+      EltTy = VecTy->getElementType();
+    if (!EltTy->isFloatingType()) {
+      Diag(TheCall->getArg(0)->getBeginLoc(),
+           diag::err_builtin_invalid_arg_type)
+          << 1 << /* float ty*/ 5 << ArgTy;
+
+      return ExprError();
+    }
+    break;
+  }
+
+  // These builtins restrict the element type to integer
+  // types only.
+  case Builtin::BI__builtin_elementwise_add_sat:
+  case Builtin::BI__builtin_elementwise_sub_sat: {
+    if (SemaBuiltinElementwiseMath(TheCall))
+      return ExprError();
+
+    const Expr *Arg = TheCall->getArg(0);
+    QualType ArgTy = Arg->getType();
+    QualType EltTy = ArgTy;
+
+    if (auto *VecTy = EltTy->getAs<VectorType>())
+      EltTy = VecTy->getElementType();
+
+    if (!EltTy->isIntegerType()) {
+      Diag(Arg->getBeginLoc(), diag::err_builtin_invalid_arg_type)
+          << 1 << /* integer ty */ 6 << ArgTy;
+      return ExprError();
+    }
+    break;
+  }
+
+  case Builtin::BI__builtin_elementwise_min:
+  case Builtin::BI__builtin_elementwise_max:
+    if (SemaBuiltinElementwiseMath(TheCall))
+      return ExprError();
+    break;
+  case Builtin::BI__builtin_elementwise_copysign: {
+    if (checkArgCount(*this, TheCall, 2))
+      return ExprError();
+
+    ExprResult Magnitude = UsualUnaryConversions(TheCall->getArg(0));
+    ExprResult Sign = UsualUnaryConversions(TheCall->getArg(1));
+    if (Magnitude.isInvalid() || Sign.isInvalid())
+      return ExprError();
+
+    QualType MagnitudeTy = Magnitude.get()->getType();
+    QualType SignTy = Sign.get()->getType();
+    if (checkFPMathBuiltinElementType(*this, TheCall->getArg(0)->getBeginLoc(),
+                                      MagnitudeTy, 1) ||
+        checkFPMathBuiltinElementType(*this, TheCall->getArg(1)->getBeginLoc(),
+                                      SignTy, 2)) {
+      return ExprError();
+    }
+
+    if (MagnitudeTy.getCanonicalType() != SignTy.getCanonicalType()) {
+      return Diag(Sign.get()->getBeginLoc(),
+                  diag::err_typecheck_call_different_arg_types)
+             << MagnitudeTy << SignTy;
+    }
+
+    TheCall->setArg(0, Magnitude.get());
+    TheCall->setArg(1, Sign.get());
+    TheCall->setType(Magnitude.get()->getType());
+    break;
+  }
+  case Builtin::BI__builtin_reduce_max:
+  case Builtin::BI__builtin_reduce_min: {
+    if (PrepareBuiltinReduceMathOneArgCall(TheCall))
+      return ExprError();
+
+    const Expr *Arg = TheCall->getArg(0);
+    const auto *TyA = Arg->getType()->getAs<VectorType>();
+    if (!TyA) {
+      Diag(Arg->getBeginLoc(), diag::err_builtin_invalid_arg_type)
+          << 1 << /* vector ty*/ 4 << Arg->getType();
+      return ExprError();
+    }
+
+    TheCall->setType(TyA->getElementType());
+    break;
+  }
+
+  // These builtins support vectors of integers only.
+  // TODO: ADD/MUL should support floating-point types.
+  case Builtin::BI__builtin_reduce_add:
+  case Builtin::BI__builtin_reduce_mul:
+  case Builtin::BI__builtin_reduce_xor:
+  case Builtin::BI__builtin_reduce_or:
+  case Builtin::BI__builtin_reduce_and: {
+    if (PrepareBuiltinReduceMathOneArgCall(TheCall))
+      return ExprError();
+
+    const Expr *Arg = TheCall->getArg(0);
+    const auto *TyA = Arg->getType()->getAs<VectorType>();
+    if (!TyA || !TyA->getElementType()->isIntegerType()) {
+      Diag(Arg->getBeginLoc(), diag::err_builtin_invalid_arg_type)
+          << 1  << /* vector of integers */ 6 << Arg->getType();
+      return ExprError();
+    }
+    TheCall->setType(TyA->getElementType());
+    break;
+  }
+
   case Builtin::BI__builtin_matrix_transpose:
     return SemaBuiltinMatrixTranspose(TheCall, TheCallResult);
 
@@ -2527,13 +3286,15 @@ bool Sema::CheckAArch64BuiltinFunctionCall(const TargetInfo &TI,
 
   if (BuiltinID == AArch64::BI__builtin_arm_prefetch) {
     return SemaBuiltinConstantArgRange(TheCall, 1, 0, 1) ||
-      SemaBuiltinConstantArgRange(TheCall, 2, 0, 2) ||
-      SemaBuiltinConstantArgRange(TheCall, 3, 0, 1) ||
-      SemaBuiltinConstantArgRange(TheCall, 4, 0, 1);
+           SemaBuiltinConstantArgRange(TheCall, 2, 0, 3) ||
+           SemaBuiltinConstantArgRange(TheCall, 3, 0, 1) ||
+           SemaBuiltinConstantArgRange(TheCall, 4, 0, 1);
   }
 
   if (BuiltinID == AArch64::BI__builtin_arm_rsr64 ||
-      BuiltinID == AArch64::BI__builtin_arm_wsr64)
+      BuiltinID == AArch64::BI__builtin_arm_wsr64 ||
+      BuiltinID == AArch64::BI__builtin_arm_rsr128 ||
+      BuiltinID == AArch64::BI__builtin_arm_wsr128)
     return SemaBuiltinARMSpecialReg(BuiltinID, TheCall, 0, 5, true);
 
   // Memory Tagging Extensions (MTE) Intrinsics
@@ -2562,6 +3323,9 @@ bool Sema::CheckAArch64BuiltinFunctionCall(const TargetInfo &TI,
   if (BuiltinID == AArch64::BI__getReg)
     return SemaBuiltinConstantArgRange(TheCall, 0, 0, 31);
 
+  if (BuiltinID == AArch64::BI__break)
+    return SemaBuiltinConstantArgRange(TheCall, 0, 0, 0xffff);
+
   if (CheckNeonBuiltinFunctionCall(TI, BuiltinID, TheCall))
     return true;
 
@@ -2591,19 +3355,8 @@ static bool isValidBPFPreserveFieldInfoArg(Expr *Arg) {
   // to BPF backend to check whether the access is a
   // field access or not.
   return (Arg->IgnoreParens()->getObjectKind() == OK_BitField ||
-          dyn_cast<MemberExpr>(Arg->IgnoreParens()) ||
-          dyn_cast<ArraySubscriptExpr>(Arg->IgnoreParens()));
-}
-
-static bool isEltOfVectorTy(ASTContext &Context, CallExpr *Call, Sema &S,
-                            QualType VectorTy, QualType EltTy) {
-  QualType VectorEltTy = VectorTy->castAs<VectorType>()->getElementType();
-  if (!Context.hasSameType(VectorEltTy, EltTy)) {
-    S.Diag(Call->getBeginLoc(), diag::err_typecheck_call_different_arg_types)
-        << Call->getSourceRange() << VectorEltTy << EltTy;
-    return false;
-  }
-  return true;
+          isa<MemberExpr>(Arg->IgnoreParens()) ||
+          isa<ArraySubscriptExpr>(Arg->IgnoreParens()));
 }
 
 static bool isValidBPFPreserveTypeInfoArg(Expr *Arg) {
@@ -2611,13 +3364,13 @@ static bool isValidBPFPreserveTypeInfoArg(Expr *Arg) {
   if (ArgType->getAsPlaceholderType())
     return false;
 
-  // for TYPE_EXISTENCE/TYPE_SIZEOF reloc type
+  // for TYPE_EXISTENCE/TYPE_MATCH/TYPE_SIZEOF reloc type
   // format:
   //   1. __builtin_preserve_type_info(*(<type> *)0, flag);
   //   2. <type> var;
   //      __builtin_preserve_type_info(var, flag);
-  if (!dyn_cast<DeclRefExpr>(Arg->IgnoreParens()) &&
-      !dyn_cast<UnaryOperator>(Arg->IgnoreParens()))
+  if (!isa<DeclRefExpr>(Arg->IgnoreParens()) &&
+      !isa<UnaryOperator>(Arg->IgnoreParens()))
     return false;
 
   // Typedef type.
@@ -2674,12 +3427,7 @@ static bool isValidBPFPreserveEnumValueArg(Expr *Arg) {
     return false;
 
   // The enum value must be supported.
-  for (auto *EDI : ET->getDecl()->enumerators()) {
-    if (EDI == Enumerator)
-      return true;
-  }
-
-  return false;
+  return llvm::is_contained(ET->getDecl()->enumerators(), Enumerator);
 }
 
 bool Sema::CheckBPFBuiltinFunctionCall(unsigned BuiltinID,
@@ -2695,7 +3443,7 @@ bool Sema::CheckBPFBuiltinFunctionCall(unsigned BuiltinID,
 
   // The second argument needs to be a constant int
   Expr *Arg = TheCall->getArg(1);
-  Optional<llvm::APSInt> Value = Arg->getIntegerConstantExpr(Context);
+  std::optional<llvm::APSInt> Value = Arg->getIntegerConstantExpr(Context);
   diag::kind kind;
   if (!Value) {
     if (BuiltinID == BPF::BI__builtin_preserve_field_info)
@@ -2942,6 +3690,31 @@ bool Sema::CheckHexagonBuiltinArgument(unsigned BuiltinID, CallExpr *TheCall) {
     { Hexagon::BI__builtin_HEXAGON_V6_vrsadubi_acc,   {{ 3, false, 1,  0 }} },
     { Hexagon::BI__builtin_HEXAGON_V6_vrsadubi_acc_128B,
                                                       {{ 3, false, 1,  0 }} },
+
+    { Hexagon::BI__builtin_HEXAGON_V6_v6mpyhubs10,    {{ 2, false, 2,  0 }} },
+    { Hexagon::BI__builtin_HEXAGON_V6_v6mpyhubs10_128B,
+                                                      {{ 2, false, 2,  0 }} },
+    { Hexagon::BI__builtin_HEXAGON_V6_v6mpyhubs10_vxx,
+                                                      {{ 3, false, 2,  0 }} },
+    { Hexagon::BI__builtin_HEXAGON_V6_v6mpyhubs10_vxx_128B,
+                                                      {{ 3, false, 2,  0 }} },
+    { Hexagon::BI__builtin_HEXAGON_V6_v6mpyvubs10,    {{ 2, false, 2,  0 }} },
+    { Hexagon::BI__builtin_HEXAGON_V6_v6mpyvubs10_128B,
+                                                      {{ 2, false, 2,  0 }} },
+    { Hexagon::BI__builtin_HEXAGON_V6_v6mpyvubs10_vxx,
+                                                      {{ 3, false, 2,  0 }} },
+    { Hexagon::BI__builtin_HEXAGON_V6_v6mpyvubs10_vxx_128B,
+                                                      {{ 3, false, 2,  0 }} },
+    { Hexagon::BI__builtin_HEXAGON_V6_vlutvvbi,       {{ 2, false, 3,  0 }} },
+    { Hexagon::BI__builtin_HEXAGON_V6_vlutvvbi_128B,  {{ 2, false, 3,  0 }} },
+    { Hexagon::BI__builtin_HEXAGON_V6_vlutvvb_oracci, {{ 3, false, 3,  0 }} },
+    { Hexagon::BI__builtin_HEXAGON_V6_vlutvvb_oracci_128B,
+                                                      {{ 3, false, 3,  0 }} },
+    { Hexagon::BI__builtin_HEXAGON_V6_vlutvwhi,       {{ 2, false, 3,  0 }} },
+    { Hexagon::BI__builtin_HEXAGON_V6_vlutvwhi_128B,  {{ 2, false, 3,  0 }} },
+    { Hexagon::BI__builtin_HEXAGON_V6_vlutvwh_oracci, {{ 3, false, 3,  0 }} },
+    { Hexagon::BI__builtin_HEXAGON_V6_vlutvwh_oracci_128B,
+                                                      {{ 3, false, 3,  0 }} },
   };
 
   // Use a dynamically initialized static to sort the table exactly once on
@@ -2974,16 +3747,101 @@ bool Sema::CheckHexagonBuiltinArgument(unsigned BuiltinID, CallExpr *TheCall) {
       unsigned M = 1 << A.Align;
       Min *= M;
       Max *= M;
-      Error |= SemaBuiltinConstantArgRange(TheCall, A.OpNum, Min, Max) |
-               SemaBuiltinConstantArgMultiple(TheCall, A.OpNum, M);
+      Error |= SemaBuiltinConstantArgRange(TheCall, A.OpNum, Min, Max);
+      Error |= SemaBuiltinConstantArgMultiple(TheCall, A.OpNum, M);
     }
   }
-  return Error;
-}
+  return Error;
+}
+
+bool Sema::CheckHexagonBuiltinFunctionCall(unsigned BuiltinID,
+                                           CallExpr *TheCall) {
+  return CheckHexagonBuiltinArgument(BuiltinID, TheCall);
+}
+
+bool Sema::CheckLoongArchBuiltinFunctionCall(const TargetInfo &TI,
+                                             unsigned BuiltinID,
+                                             CallExpr *TheCall) {
+  switch (BuiltinID) {
+  default:
+    break;
+  case LoongArch::BI__builtin_loongarch_cacop_d:
+    if (!TI.hasFeature("64bit"))
+      return Diag(TheCall->getBeginLoc(),
+                  diag::err_loongarch_builtin_requires_la64)
+             << TheCall->getSourceRange();
+    LLVM_FALLTHROUGH;
+  case LoongArch::BI__builtin_loongarch_cacop_w: {
+    if (BuiltinID == LoongArch::BI__builtin_loongarch_cacop_w &&
+        !TI.hasFeature("32bit"))
+      return Diag(TheCall->getBeginLoc(),
+                  diag::err_loongarch_builtin_requires_la32)
+             << TheCall->getSourceRange();
+    SemaBuiltinConstantArgRange(TheCall, 0, 0, llvm::maxUIntN(5));
+    SemaBuiltinConstantArgRange(TheCall, 2, llvm::minIntN(12),
+                                llvm::maxIntN(12));
+    break;
+  }
+  case LoongArch::BI__builtin_loongarch_crc_w_b_w:
+  case LoongArch::BI__builtin_loongarch_crc_w_h_w:
+  case LoongArch::BI__builtin_loongarch_crc_w_w_w:
+  case LoongArch::BI__builtin_loongarch_crc_w_d_w:
+  case LoongArch::BI__builtin_loongarch_crcc_w_b_w:
+  case LoongArch::BI__builtin_loongarch_crcc_w_h_w:
+  case LoongArch::BI__builtin_loongarch_crcc_w_w_w:
+  case LoongArch::BI__builtin_loongarch_crcc_w_d_w:
+  case LoongArch::BI__builtin_loongarch_iocsrrd_d:
+  case LoongArch::BI__builtin_loongarch_iocsrwr_d:
+  case LoongArch::BI__builtin_loongarch_asrtle_d:
+  case LoongArch::BI__builtin_loongarch_asrtgt_d:
+    if (!TI.hasFeature("64bit"))
+      return Diag(TheCall->getBeginLoc(),
+                  diag::err_loongarch_builtin_requires_la64)
+             << TheCall->getSourceRange();
+    break;
+  case LoongArch::BI__builtin_loongarch_break:
+  case LoongArch::BI__builtin_loongarch_dbar:
+  case LoongArch::BI__builtin_loongarch_ibar:
+  case LoongArch::BI__builtin_loongarch_syscall:
+    // Check if immediate is in [0, 32767].
+    return SemaBuiltinConstantArgRange(TheCall, 0, 0, 32767);
+  case LoongArch::BI__builtin_loongarch_csrrd_w:
+    return SemaBuiltinConstantArgRange(TheCall, 0, 0, 16383);
+  case LoongArch::BI__builtin_loongarch_csrwr_w:
+    return SemaBuiltinConstantArgRange(TheCall, 1, 0, 16383);
+  case LoongArch::BI__builtin_loongarch_csrxchg_w:
+    return SemaBuiltinConstantArgRange(TheCall, 2, 0, 16383);
+  case LoongArch::BI__builtin_loongarch_csrrd_d:
+    if (!TI.hasFeature("64bit"))
+      return Diag(TheCall->getBeginLoc(),
+                  diag::err_loongarch_builtin_requires_la64)
+             << TheCall->getSourceRange();
+    return SemaBuiltinConstantArgRange(TheCall, 0, 0, 16383);
+  case LoongArch::BI__builtin_loongarch_csrwr_d:
+    if (!TI.hasFeature("64bit"))
+      return Diag(TheCall->getBeginLoc(),
+                  diag::err_loongarch_builtin_requires_la64)
+             << TheCall->getSourceRange();
+    return SemaBuiltinConstantArgRange(TheCall, 1, 0, 16383);
+  case LoongArch::BI__builtin_loongarch_csrxchg_d:
+    if (!TI.hasFeature("64bit"))
+      return Diag(TheCall->getBeginLoc(),
+                  diag::err_loongarch_builtin_requires_la64)
+             << TheCall->getSourceRange();
+    return SemaBuiltinConstantArgRange(TheCall, 2, 0, 16383);
+  case LoongArch::BI__builtin_loongarch_lddir_d:
+  case LoongArch::BI__builtin_loongarch_ldpte_d:
+    if (!TI.hasFeature("64bit"))
+      return Diag(TheCall->getBeginLoc(),
+                  diag::err_loongarch_builtin_requires_la64)
+             << TheCall->getSourceRange();
+    return SemaBuiltinConstantArgRange(TheCall, 1, 0, 31);
+  case LoongArch::BI__builtin_loongarch_movfcsr2gr:
+  case LoongArch::BI__builtin_loongarch_movgr2fcsr:
+    return SemaBuiltinConstantArgRange(TheCall, 0, 0, llvm::maxUIntN(2));
+  }
 
-bool Sema::CheckHexagonBuiltinFunctionCall(unsigned BuiltinID,
-                                           CallExpr *TheCall) {
-  return CheckHexagonBuiltinArgument(BuiltinID, TheCall);
+  return false;
 }
 
 bool Sema::CheckMipsBuiltinFunctionCall(const TargetInfo &TI,
@@ -3265,6 +4123,8 @@ static bool isPPC_64Builtin(unsigned BuiltinID) {
   case PPC::BI__builtin_divde:
   case PPC::BI__builtin_divdeu:
   case PPC::BI__builtin_bpermd:
+  case PPC::BI__builtin_pdepd:
+  case PPC::BI__builtin_pextd:
   case PPC::BI__builtin_ppc_ldarx:
   case PPC::BI__builtin_ppc_stdcx:
   case PPC::BI__builtin_ppc_tdw:
@@ -3280,6 +4140,14 @@ static bool isPPC_64Builtin(unsigned BuiltinID) {
   case PPC::BI__builtin_ppc_store8r:
   case PPC::BI__builtin_ppc_insert_exp:
   case PPC::BI__builtin_ppc_extract_sig:
+  case PPC::BI__builtin_ppc_addex:
+  case PPC::BI__builtin_darn:
+  case PPC::BI__builtin_darn_raw:
+  case PPC::BI__builtin_ppc_compare_and_swaplp:
+  case PPC::BI__builtin_ppc_fetch_and_addlp:
+  case PPC::BI__builtin_ppc_fetch_and_andlp:
+  case PPC::BI__builtin_ppc_fetch_and_orlp:
+  case PPC::BI__builtin_ppc_fetch_and_swaplp:
     return true;
   }
   return false;
@@ -3343,14 +4211,55 @@ bool Sema::CheckPPCBuiltinFunctionCall(const TargetInfo &TI, unsigned BuiltinID,
   case PPC::BI__builtin_altivec_dss:
     return SemaBuiltinConstantArgRange(TheCall, 0, 0, 3);
   case PPC::BI__builtin_tbegin:
-  case PPC::BI__builtin_tend: i = 0; l = 0; u = 1; break;
-  case PPC::BI__builtin_tsr: i = 0; l = 0; u = 7; break;
+  case PPC::BI__builtin_tend:
+    return SemaBuiltinConstantArgRange(TheCall, 0, 0, 1) ||
+           SemaFeatureCheck(*this, TheCall, "htm",
+                            diag::err_ppc_builtin_requires_htm);
+  case PPC::BI__builtin_tsr:
+    return SemaBuiltinConstantArgRange(TheCall, 0, 0, 7) ||
+           SemaFeatureCheck(*this, TheCall, "htm",
+                            diag::err_ppc_builtin_requires_htm);
   case PPC::BI__builtin_tabortwc:
-  case PPC::BI__builtin_tabortdc: i = 0; l = 0; u = 31; break;
+  case PPC::BI__builtin_tabortdc:
+    return SemaBuiltinConstantArgRange(TheCall, 0, 0, 31) ||
+           SemaFeatureCheck(*this, TheCall, "htm",
+                            diag::err_ppc_builtin_requires_htm);
   case PPC::BI__builtin_tabortwci:
   case PPC::BI__builtin_tabortdci:
-    return SemaBuiltinConstantArgRange(TheCall, 0, 0, 31) ||
-           SemaBuiltinConstantArgRange(TheCall, 2, 0, 31);
+    return SemaFeatureCheck(*this, TheCall, "htm",
+                            diag::err_ppc_builtin_requires_htm) ||
+           (SemaBuiltinConstantArgRange(TheCall, 0, 0, 31) ||
+            SemaBuiltinConstantArgRange(TheCall, 2, 0, 31));
+  case PPC::BI__builtin_tabort:
+  case PPC::BI__builtin_tcheck:
+  case PPC::BI__builtin_treclaim:
+  case PPC::BI__builtin_trechkpt:
+  case PPC::BI__builtin_tendall:
+  case PPC::BI__builtin_tresume:
+  case PPC::BI__builtin_tsuspend:
+  case PPC::BI__builtin_get_texasr:
+  case PPC::BI__builtin_get_texasru:
+  case PPC::BI__builtin_get_tfhar:
+  case PPC::BI__builtin_get_tfiar:
+  case PPC::BI__builtin_set_texasr:
+  case PPC::BI__builtin_set_texasru:
+  case PPC::BI__builtin_set_tfhar:
+  case PPC::BI__builtin_set_tfiar:
+  case PPC::BI__builtin_ttest:
+    return SemaFeatureCheck(*this, TheCall, "htm",
+                            diag::err_ppc_builtin_requires_htm);
+  // According to GCC 'Basic PowerPC Built-in Functions Available on ISA 2.05',
+  // __builtin_(un)pack_longdouble are available only if long double uses IBM
+  // extended double representation.
+  case PPC::BI__builtin_unpack_longdouble:
+    if (SemaBuiltinConstantArgRange(TheCall, 1, 0, 1))
+      return true;
+    [[fallthrough]];
+  case PPC::BI__builtin_pack_longdouble:
+    if (&TI.getLongDoubleFormat() != &llvm::APFloat::PPCDoubleDouble())
+      return Diag(TheCall->getBeginLoc(), diag::err_ppc_builtin_requires_abi)
+             << "ibmlongdouble";
+    return false;
   case PPC::BI__builtin_altivec_dst:
   case PPC::BI__builtin_altivec_dstt:
   case PPC::BI__builtin_altivec_dstst:
@@ -3375,16 +4284,12 @@ bool Sema::CheckPPCBuiltinFunctionCall(const TargetInfo &TI, unsigned BuiltinID,
   case PPC::BI__builtin_pack_vector_int128:
     return SemaFeatureCheck(*this, TheCall, "vsx",
                             diag::err_ppc_builtin_only_on_arch, "7");
+  case PPC::BI__builtin_pdepd:
+  case PPC::BI__builtin_pextd:
+    return SemaFeatureCheck(*this, TheCall, "isa-v31-instructions",
+                            diag::err_ppc_builtin_only_on_arch, "10");
   case PPC::BI__builtin_altivec_vgnb:
      return SemaBuiltinConstantArgRange(TheCall, 1, 2, 7);
-  case PPC::BI__builtin_altivec_vec_replace_elt:
-  case PPC::BI__builtin_altivec_vec_replace_unaligned: {
-    QualType VecTy = TheCall->getArg(0)->getType();
-    QualType EltTy = TheCall->getArg(1)->getType();
-    unsigned Width = Context.getIntWidth(EltTy);
-    return SemaBuiltinConstantArgRange(TheCall, 2, 0, Width == 32 ? 12 : 8) ||
-           !isEltOfVectorTy(Context, TheCall, *this, VecTy, EltTy);
-  }
   case PPC::BI__builtin_vsx_xxeval:
      return SemaBuiltinConstantArgRange(TheCall, 3, 0, 255);
   case PPC::BI__builtin_altivec_vsldbi:
@@ -3410,8 +4315,7 @@ bool Sema::CheckPPCBuiltinFunctionCall(const TargetInfo &TI, unsigned BuiltinID,
   // For __rlwnm, __rlwimi and __rldimi, the last parameter mask must
   // be a constant that represents a contiguous bit field.
   case PPC::BI__builtin_ppc_rlwnm:
-    return SemaBuiltinConstantArg(TheCall, 1, Result) ||
-           SemaValueIsRunOfOnes(TheCall, 2);
+    return SemaValueIsRunOfOnes(TheCall, 2);
   case PPC::BI__builtin_ppc_rlwimi:
   case PPC::BI__builtin_ppc_rldimi:
     return SemaBuiltinConstantArg(TheCall, 2, Result) ||
@@ -3421,6 +4325,19 @@ bool Sema::CheckPPCBuiltinFunctionCall(const TargetInfo &TI, unsigned BuiltinID,
   case PPC::BI__builtin_ppc_insert_exp:
     return SemaFeatureCheck(*this, TheCall, "power9-vector",
                             diag::err_ppc_builtin_only_on_arch, "9");
+  case PPC::BI__builtin_ppc_addex: {
+    if (SemaFeatureCheck(*this, TheCall, "isa-v30-instructions",
+                         diag::err_ppc_builtin_only_on_arch, "9") ||
+        SemaBuiltinConstantArgRange(TheCall, 2, 0, 3))
+      return true;
+    // Output warning for reserved values 1 to 3.
+    int ArgValue =
+        TheCall->getArg(2)->getIntegerConstantExpr(Context)->getSExtValue();
+    if (ArgValue != 0)
+      Diag(TheCall->getBeginLoc(), diag::warn_argument_undefined_behaviour)
+          << ArgValue;
+    return false;
+  }
   case PPC::BI__builtin_ppc_mtfsb0:
   case PPC::BI__builtin_ppc_mtfsb1:
     return SemaBuiltinConstantArgRange(TheCall, 0, 0, 31);
@@ -3445,9 +4362,78 @@ bool Sema::CheckPPCBuiltinFunctionCall(const TargetInfo &TI, unsigned BuiltinID,
     return SemaFeatureCheck(*this, TheCall, "isa-v207-instructions",
                             diag::err_ppc_builtin_only_on_arch, "8") ||
            SemaBuiltinConstantArgRange(TheCall, 1, 1, 16);
-#define CUSTOM_BUILTIN(Name, Intr, Types, Acc) \
-  case PPC::BI__builtin_##Name: \
-    return SemaBuiltinPPCMMACall(TheCall, Types);
+  case PPC::BI__builtin_altivec_vcntmbb:
+  case PPC::BI__builtin_altivec_vcntmbh:
+  case PPC::BI__builtin_altivec_vcntmbw:
+  case PPC::BI__builtin_altivec_vcntmbd:
+    return SemaBuiltinConstantArgRange(TheCall, 1, 0, 1);
+  case PPC::BI__builtin_darn:
+  case PPC::BI__builtin_darn_raw:
+  case PPC::BI__builtin_darn_32:
+    return SemaFeatureCheck(*this, TheCall, "isa-v30-instructions",
+                            diag::err_ppc_builtin_only_on_arch, "9");
+  case PPC::BI__builtin_vsx_xxgenpcvbm:
+  case PPC::BI__builtin_vsx_xxgenpcvhm:
+  case PPC::BI__builtin_vsx_xxgenpcvwm:
+  case PPC::BI__builtin_vsx_xxgenpcvdm:
+    return SemaBuiltinConstantArgRange(TheCall, 1, 0, 3);
+  case PPC::BI__builtin_ppc_compare_exp_uo:
+  case PPC::BI__builtin_ppc_compare_exp_lt:
+  case PPC::BI__builtin_ppc_compare_exp_gt:
+  case PPC::BI__builtin_ppc_compare_exp_eq:
+    return SemaFeatureCheck(*this, TheCall, "isa-v30-instructions",
+                            diag::err_ppc_builtin_only_on_arch, "9") ||
+           SemaFeatureCheck(*this, TheCall, "vsx",
+                            diag::err_ppc_builtin_requires_vsx);
+  case PPC::BI__builtin_ppc_test_data_class: {
+    // Check if the first argument of the __builtin_ppc_test_data_class call is
+    // valid. The argument must be 'float' or 'double' or '__float128'.
+    QualType ArgType = TheCall->getArg(0)->getType();
+    if (ArgType != QualType(Context.FloatTy) &&
+        ArgType != QualType(Context.DoubleTy) &&
+        ArgType != QualType(Context.Float128Ty))
+      return Diag(TheCall->getBeginLoc(),
+                  diag::err_ppc_invalid_test_data_class_type);
+    return SemaFeatureCheck(*this, TheCall, "isa-v30-instructions",
+                            diag::err_ppc_builtin_only_on_arch, "9") ||
+           SemaFeatureCheck(*this, TheCall, "vsx",
+                            diag::err_ppc_builtin_requires_vsx) ||
+           SemaBuiltinConstantArgRange(TheCall, 1, 0, 127);
+  }
+  case PPC::BI__builtin_ppc_maxfe:
+  case PPC::BI__builtin_ppc_minfe:
+  case PPC::BI__builtin_ppc_maxfl:
+  case PPC::BI__builtin_ppc_minfl:
+  case PPC::BI__builtin_ppc_maxfs:
+  case PPC::BI__builtin_ppc_minfs: {
+    if (Context.getTargetInfo().getTriple().isOSAIX() &&
+        (BuiltinID == PPC::BI__builtin_ppc_maxfe ||
+         BuiltinID == PPC::BI__builtin_ppc_minfe))
+      return Diag(TheCall->getBeginLoc(), diag::err_target_unsupported_type)
+             << "builtin" << true << 128 << QualType(Context.LongDoubleTy)
+             << false << Context.getTargetInfo().getTriple().str();
+    // Argument type should be exact.
+    QualType ArgType = QualType(Context.LongDoubleTy);
+    if (BuiltinID == PPC::BI__builtin_ppc_maxfl ||
+        BuiltinID == PPC::BI__builtin_ppc_minfl)
+      ArgType = QualType(Context.DoubleTy);
+    else if (BuiltinID == PPC::BI__builtin_ppc_maxfs ||
+             BuiltinID == PPC::BI__builtin_ppc_minfs)
+      ArgType = QualType(Context.FloatTy);
+    for (unsigned I = 0, E = TheCall->getNumArgs(); I < E; ++I)
+      if (TheCall->getArg(I)->getType() != ArgType)
+        return Diag(TheCall->getBeginLoc(),
+                    diag::err_typecheck_convert_incompatible)
+               << TheCall->getArg(I)->getType() << ArgType << 1 << 0 << 0;
+    return false;
+  }
+  case PPC::BI__builtin_ppc_load8r:
+  case PPC::BI__builtin_ppc_store8r:
+    return SemaFeatureCheck(*this, TheCall, "isa-v206-instructions",
+                            diag::err_ppc_builtin_only_on_arch, "7");
+#define CUSTOM_BUILTIN(Name, Intr, Types, Acc)                                 \
+  case PPC::BI__builtin_##Name:                                                \
+    return SemaBuiltinPPCMMACall(TheCall, BuiltinID, Types);
 #include "clang/Basic/BuiltinsPPC.def"
   }
   return SemaBuiltinConstantArgRange(TheCall, i, l, u);
@@ -3499,7 +4485,7 @@ bool Sema::CheckAMDGCNBuiltinFunctionCall(unsigned BuiltinID,
            << ArgExpr->getType();
   auto Ord = ArgResult.Val.getInt().getZExtValue();
 
-  // Check valididty of memory ordering as per C11 / C++11's memody model.
+  // Check validity of memory ordering as per C11 / C++11's memody model.
   // Only fence needs check. Atomic dec/inc allow all memory orders.
   if (!llvm::isValidAtomicOrderingCABI(Ord))
     return Diag(ArgExpr->getBeginLoc(),
@@ -3563,161 +4549,90 @@ bool Sema::CheckRISCVBuiltinFunctionCall(const TargetInfo &TI,
 
   // Check if each required feature is included
   for (StringRef F : ReqFeatures) {
-    if (TI.hasFeature(F))
-      continue;
-
-    // If the feature is 64bit, alter the string so it will print better in
-    // the diagnostic.
-    if (F == "64bit")
-      F = "RV64";
-
-    // Convert features like "zbr" and "experimental-zbr" to "Zbr".
-    F.consume_front("experimental-");
-    std::string FeatureStr = F.str();
-    FeatureStr[0] = std::toupper(FeatureStr[0]);
+    SmallVector<StringRef> ReqOpFeatures;
+    F.split(ReqOpFeatures, '|');
+
+    if (llvm::none_of(ReqOpFeatures,
+                      [&TI](StringRef OF) { return TI.hasFeature(OF); })) {
+      std::string FeatureStrs;
+      bool IsExtension = true;
+      for (StringRef OF : ReqOpFeatures) {
+        // If the feature is 64bit, alter the string so it will print better in
+        // the diagnostic.
+        if (OF == "64bit") {
+          assert(ReqOpFeatures.size() == 1 && "Expected '64bit' to be alone");
+          OF = "RV64";
+          IsExtension = false;
+        }
+        if (OF == "32bit") {
+          assert(ReqOpFeatures.size() == 1 && "Expected '32bit' to be alone");
+          OF = "RV32";
+          IsExtension = false;
+        }
 
-    // Error message
-    FeatureMissing = true;
-    Diag(TheCall->getBeginLoc(), diag::err_riscv_builtin_requires_extension)
-        << TheCall->getSourceRange() << StringRef(FeatureStr);
+        // Convert features like "zbr" and "experimental-zbr" to "Zbr".
+        OF.consume_front("experimental-");
+        std::string FeatureStr = OF.str();
+        FeatureStr[0] = std::toupper(FeatureStr[0]);
+        // Combine strings.
+        FeatureStrs += FeatureStrs == "" ? "" : ", ";
+        FeatureStrs += "'";
+        FeatureStrs += FeatureStr;
+        FeatureStrs += "'";
+      }
+      // Error message
+      FeatureMissing = true;
+      Diag(TheCall->getBeginLoc(), diag::err_riscv_builtin_requires_extension)
+          << IsExtension
+          << TheCall->getSourceRange() << StringRef(FeatureStrs);
+    }
   }
 
   if (FeatureMissing)
     return true;
 
   switch (BuiltinID) {
-  case RISCV::BI__builtin_rvv_vsetvli:
+  case RISCVVector::BI__builtin_rvv_vsetvli:
     return SemaBuiltinConstantArgRange(TheCall, 1, 0, 3) ||
            CheckRISCVLMUL(TheCall, 2);
-  case RISCV::BI__builtin_rvv_vsetvlimax:
+  case RISCVVector::BI__builtin_rvv_vsetvlimax:
     return SemaBuiltinConstantArgRange(TheCall, 0, 0, 3) ||
            CheckRISCVLMUL(TheCall, 1);
-  case RISCV::BI__builtin_rvv_vget_v_i8m2_i8m1:
-  case RISCV::BI__builtin_rvv_vget_v_i16m2_i16m1:
-  case RISCV::BI__builtin_rvv_vget_v_i32m2_i32m1:
-  case RISCV::BI__builtin_rvv_vget_v_i64m2_i64m1:
-  case RISCV::BI__builtin_rvv_vget_v_f32m2_f32m1:
-  case RISCV::BI__builtin_rvv_vget_v_f64m2_f64m1:
-  case RISCV::BI__builtin_rvv_vget_v_u8m2_u8m1:
-  case RISCV::BI__builtin_rvv_vget_v_u16m2_u16m1:
-  case RISCV::BI__builtin_rvv_vget_v_u32m2_u32m1:
-  case RISCV::BI__builtin_rvv_vget_v_u64m2_u64m1:
-  case RISCV::BI__builtin_rvv_vget_v_i8m4_i8m2:
-  case RISCV::BI__builtin_rvv_vget_v_i16m4_i16m2:
-  case RISCV::BI__builtin_rvv_vget_v_i32m4_i32m2:
-  case RISCV::BI__builtin_rvv_vget_v_i64m4_i64m2:
-  case RISCV::BI__builtin_rvv_vget_v_f32m4_f32m2:
-  case RISCV::BI__builtin_rvv_vget_v_f64m4_f64m2:
-  case RISCV::BI__builtin_rvv_vget_v_u8m4_u8m2:
-  case RISCV::BI__builtin_rvv_vget_v_u16m4_u16m2:
-  case RISCV::BI__builtin_rvv_vget_v_u32m4_u32m2:
-  case RISCV::BI__builtin_rvv_vget_v_u64m4_u64m2:
-  case RISCV::BI__builtin_rvv_vget_v_i8m8_i8m4:
-  case RISCV::BI__builtin_rvv_vget_v_i16m8_i16m4:
-  case RISCV::BI__builtin_rvv_vget_v_i32m8_i32m4:
-  case RISCV::BI__builtin_rvv_vget_v_i64m8_i64m4:
-  case RISCV::BI__builtin_rvv_vget_v_f32m8_f32m4:
-  case RISCV::BI__builtin_rvv_vget_v_f64m8_f64m4:
-  case RISCV::BI__builtin_rvv_vget_v_u8m8_u8m4:
-  case RISCV::BI__builtin_rvv_vget_v_u16m8_u16m4:
-  case RISCV::BI__builtin_rvv_vget_v_u32m8_u32m4:
-  case RISCV::BI__builtin_rvv_vget_v_u64m8_u64m4:
-    return SemaBuiltinConstantArgRange(TheCall, 1, 0, 1);
-  case RISCV::BI__builtin_rvv_vget_v_i8m4_i8m1:
-  case RISCV::BI__builtin_rvv_vget_v_i16m4_i16m1:
-  case RISCV::BI__builtin_rvv_vget_v_i32m4_i32m1:
-  case RISCV::BI__builtin_rvv_vget_v_i64m4_i64m1:
-  case RISCV::BI__builtin_rvv_vget_v_f32m4_f32m1:
-  case RISCV::BI__builtin_rvv_vget_v_f64m4_f64m1:
-  case RISCV::BI__builtin_rvv_vget_v_u8m4_u8m1:
-  case RISCV::BI__builtin_rvv_vget_v_u16m4_u16m1:
-  case RISCV::BI__builtin_rvv_vget_v_u32m4_u32m1:
-  case RISCV::BI__builtin_rvv_vget_v_u64m4_u64m1:
-  case RISCV::BI__builtin_rvv_vget_v_i8m8_i8m2:
-  case RISCV::BI__builtin_rvv_vget_v_i16m8_i16m2:
-  case RISCV::BI__builtin_rvv_vget_v_i32m8_i32m2:
-  case RISCV::BI__builtin_rvv_vget_v_i64m8_i64m2:
-  case RISCV::BI__builtin_rvv_vget_v_f32m8_f32m2:
-  case RISCV::BI__builtin_rvv_vget_v_f64m8_f64m2:
-  case RISCV::BI__builtin_rvv_vget_v_u8m8_u8m2:
-  case RISCV::BI__builtin_rvv_vget_v_u16m8_u16m2:
-  case RISCV::BI__builtin_rvv_vget_v_u32m8_u32m2:
-  case RISCV::BI__builtin_rvv_vget_v_u64m8_u64m2:
-    return SemaBuiltinConstantArgRange(TheCall, 1, 0, 3);
-  case RISCV::BI__builtin_rvv_vget_v_i8m8_i8m1:
-  case RISCV::BI__builtin_rvv_vget_v_i16m8_i16m1:
-  case RISCV::BI__builtin_rvv_vget_v_i32m8_i32m1:
-  case RISCV::BI__builtin_rvv_vget_v_i64m8_i64m1:
-  case RISCV::BI__builtin_rvv_vget_v_f32m8_f32m1:
-  case RISCV::BI__builtin_rvv_vget_v_f64m8_f64m1:
-  case RISCV::BI__builtin_rvv_vget_v_u8m8_u8m1:
-  case RISCV::BI__builtin_rvv_vget_v_u16m8_u16m1:
-  case RISCV::BI__builtin_rvv_vget_v_u32m8_u32m1:
-  case RISCV::BI__builtin_rvv_vget_v_u64m8_u64m1:
-    return SemaBuiltinConstantArgRange(TheCall, 1, 0, 7);
-  case RISCV::BI__builtin_rvv_vset_v_i8m1_i8m2:
-  case RISCV::BI__builtin_rvv_vset_v_i16m1_i16m2:
-  case RISCV::BI__builtin_rvv_vset_v_i32m1_i32m2:
-  case RISCV::BI__builtin_rvv_vset_v_i64m1_i64m2:
-  case RISCV::BI__builtin_rvv_vset_v_f32m1_f32m2:
-  case RISCV::BI__builtin_rvv_vset_v_f64m1_f64m2:
-  case RISCV::BI__builtin_rvv_vset_v_u8m1_u8m2:
-  case RISCV::BI__builtin_rvv_vset_v_u16m1_u16m2:
-  case RISCV::BI__builtin_rvv_vset_v_u32m1_u32m2:
-  case RISCV::BI__builtin_rvv_vset_v_u64m1_u64m2:
-  case RISCV::BI__builtin_rvv_vset_v_i8m2_i8m4:
-  case RISCV::BI__builtin_rvv_vset_v_i16m2_i16m4:
-  case RISCV::BI__builtin_rvv_vset_v_i32m2_i32m4:
-  case RISCV::BI__builtin_rvv_vset_v_i64m2_i64m4:
-  case RISCV::BI__builtin_rvv_vset_v_f32m2_f32m4:
-  case RISCV::BI__builtin_rvv_vset_v_f64m2_f64m4:
-  case RISCV::BI__builtin_rvv_vset_v_u8m2_u8m4:
-  case RISCV::BI__builtin_rvv_vset_v_u16m2_u16m4:
-  case RISCV::BI__builtin_rvv_vset_v_u32m2_u32m4:
-  case RISCV::BI__builtin_rvv_vset_v_u64m2_u64m4:
-  case RISCV::BI__builtin_rvv_vset_v_i8m4_i8m8:
-  case RISCV::BI__builtin_rvv_vset_v_i16m4_i16m8:
-  case RISCV::BI__builtin_rvv_vset_v_i32m4_i32m8:
-  case RISCV::BI__builtin_rvv_vset_v_i64m4_i64m8:
-  case RISCV::BI__builtin_rvv_vset_v_f32m4_f32m8:
-  case RISCV::BI__builtin_rvv_vset_v_f64m4_f64m8:
-  case RISCV::BI__builtin_rvv_vset_v_u8m4_u8m8:
-  case RISCV::BI__builtin_rvv_vset_v_u16m4_u16m8:
-  case RISCV::BI__builtin_rvv_vset_v_u32m4_u32m8:
-  case RISCV::BI__builtin_rvv_vset_v_u64m4_u64m8:
-    return SemaBuiltinConstantArgRange(TheCall, 1, 0, 1);
-  case RISCV::BI__builtin_rvv_vset_v_i8m1_i8m4:
-  case RISCV::BI__builtin_rvv_vset_v_i16m1_i16m4:
-  case RISCV::BI__builtin_rvv_vset_v_i32m1_i32m4:
-  case RISCV::BI__builtin_rvv_vset_v_i64m1_i64m4:
-  case RISCV::BI__builtin_rvv_vset_v_f32m1_f32m4:
-  case RISCV::BI__builtin_rvv_vset_v_f64m1_f64m4:
-  case RISCV::BI__builtin_rvv_vset_v_u8m1_u8m4:
-  case RISCV::BI__builtin_rvv_vset_v_u16m1_u16m4:
-  case RISCV::BI__builtin_rvv_vset_v_u32m1_u32m4:
-  case RISCV::BI__builtin_rvv_vset_v_u64m1_u64m4:
-  case RISCV::BI__builtin_rvv_vset_v_i8m2_i8m8:
-  case RISCV::BI__builtin_rvv_vset_v_i16m2_i16m8:
-  case RISCV::BI__builtin_rvv_vset_v_i32m2_i32m8:
-  case RISCV::BI__builtin_rvv_vset_v_i64m2_i64m8:
-  case RISCV::BI__builtin_rvv_vset_v_f32m2_f32m8:
-  case RISCV::BI__builtin_rvv_vset_v_f64m2_f64m8:
-  case RISCV::BI__builtin_rvv_vset_v_u8m2_u8m8:
-  case RISCV::BI__builtin_rvv_vset_v_u16m2_u16m8:
-  case RISCV::BI__builtin_rvv_vset_v_u32m2_u32m8:
-  case RISCV::BI__builtin_rvv_vset_v_u64m2_u64m8:
-    return SemaBuiltinConstantArgRange(TheCall, 1, 0, 3);
-  case RISCV::BI__builtin_rvv_vset_v_i8m1_i8m8:
-  case RISCV::BI__builtin_rvv_vset_v_i16m1_i16m8:
-  case RISCV::BI__builtin_rvv_vset_v_i32m1_i32m8:
-  case RISCV::BI__builtin_rvv_vset_v_i64m1_i64m8:
-  case RISCV::BI__builtin_rvv_vset_v_f32m1_f32m8:
-  case RISCV::BI__builtin_rvv_vset_v_f64m1_f64m8:
-  case RISCV::BI__builtin_rvv_vset_v_u8m1_u8m8:
-  case RISCV::BI__builtin_rvv_vset_v_u16m1_u16m8:
-  case RISCV::BI__builtin_rvv_vset_v_u32m1_u32m8:
-  case RISCV::BI__builtin_rvv_vset_v_u64m1_u64m8:
-    return SemaBuiltinConstantArgRange(TheCall, 1, 0, 7);
+  case RISCVVector::BI__builtin_rvv_vget_v: {
+    ASTContext::BuiltinVectorTypeInfo ResVecInfo =
+        Context.getBuiltinVectorTypeInfo(cast<BuiltinType>(
+            TheCall->getType().getCanonicalType().getTypePtr()));
+    ASTContext::BuiltinVectorTypeInfo VecInfo =
+        Context.getBuiltinVectorTypeInfo(cast<BuiltinType>(
+            TheCall->getArg(0)->getType().getCanonicalType().getTypePtr()));
+    unsigned MaxIndex =
+        (VecInfo.EC.getKnownMinValue() * VecInfo.NumVectors) /
+        (ResVecInfo.EC.getKnownMinValue() * ResVecInfo.NumVectors);
+    return SemaBuiltinConstantArgRange(TheCall, 1, 0, MaxIndex - 1);
+  }
+  case RISCVVector::BI__builtin_rvv_vset_v: {
+    ASTContext::BuiltinVectorTypeInfo ResVecInfo =
+        Context.getBuiltinVectorTypeInfo(cast<BuiltinType>(
+            TheCall->getType().getCanonicalType().getTypePtr()));
+    ASTContext::BuiltinVectorTypeInfo VecInfo =
+        Context.getBuiltinVectorTypeInfo(cast<BuiltinType>(
+            TheCall->getArg(2)->getType().getCanonicalType().getTypePtr()));
+    unsigned MaxIndex =
+        (ResVecInfo.EC.getKnownMinValue() * ResVecInfo.NumVectors) /
+        (VecInfo.EC.getKnownMinValue() * VecInfo.NumVectors);
+    return SemaBuiltinConstantArgRange(TheCall, 1, 0, MaxIndex - 1);
+  }
+  // Check if byteselect is in [0, 3]
+  case RISCV::BI__builtin_riscv_aes32dsi_32:
+  case RISCV::BI__builtin_riscv_aes32dsmi_32:
+  case RISCV::BI__builtin_riscv_aes32esi_32:
+  case RISCV::BI__builtin_riscv_aes32esmi_32:
+  case RISCV::BI__builtin_riscv_sm4ks:
+  case RISCV::BI__builtin_riscv_sm4ed:
+    return SemaBuiltinConstantArgRange(TheCall, 2, 0, 3);
+  // Check if rnum is in [0, 10]
+  case RISCV::BI__builtin_riscv_aes64ks1i_64:
+    return SemaBuiltinConstantArgRange(TheCall, 1, 0, 10);
   }
 
   return false;
@@ -3727,7 +4642,8 @@ bool Sema::CheckSystemZBuiltinFunctionCall(unsigned BuiltinID,
                                            CallExpr *TheCall) {
   if (BuiltinID == SystemZ::BI__builtin_tabort) {
     Expr *Arg = TheCall->getArg(0);
-    if (Optional<llvm::APSInt> AbortCode = Arg->getIntegerConstantExpr(Context))
+    if (std::optional<llvm::APSInt> AbortCode =
+            Arg->getIntegerConstantExpr(Context))
       if (AbortCode->getSExtValue() >= 0 && AbortCode->getSExtValue() < 256)
         return Diag(Arg->getBeginLoc(), diag::err_systemz_invalid_tabort_code)
                << Arg->getSourceRange();
@@ -3850,14 +4766,22 @@ bool Sema::CheckX86BuiltinRoundingOrSAE(unsigned BuiltinID, CallExpr *TheCall) {
   case X86::BI__builtin_ia32_vcvttss2si64:
   case X86::BI__builtin_ia32_vcvttss2usi32:
   case X86::BI__builtin_ia32_vcvttss2usi64:
+  case X86::BI__builtin_ia32_vcvttsh2si32:
+  case X86::BI__builtin_ia32_vcvttsh2si64:
+  case X86::BI__builtin_ia32_vcvttsh2usi32:
+  case X86::BI__builtin_ia32_vcvttsh2usi64:
     ArgNum = 1;
     break;
   case X86::BI__builtin_ia32_maxpd512:
   case X86::BI__builtin_ia32_maxps512:
   case X86::BI__builtin_ia32_minpd512:
   case X86::BI__builtin_ia32_minps512:
+  case X86::BI__builtin_ia32_maxph512:
+  case X86::BI__builtin_ia32_minph512:
     ArgNum = 2;
     break;
+  case X86::BI__builtin_ia32_vcvtph2pd512_mask:
+  case X86::BI__builtin_ia32_vcvtph2psx512_mask:
   case X86::BI__builtin_ia32_cvtps2pd512_mask:
   case X86::BI__builtin_ia32_cvttpd2dq512_mask:
   case X86::BI__builtin_ia32_cvttpd2qq512_mask:
@@ -3867,16 +4791,24 @@ bool Sema::CheckX86BuiltinRoundingOrSAE(unsigned BuiltinID, CallExpr *TheCall) {
   case X86::BI__builtin_ia32_cvttps2qq512_mask:
   case X86::BI__builtin_ia32_cvttps2udq512_mask:
   case X86::BI__builtin_ia32_cvttps2uqq512_mask:
+  case X86::BI__builtin_ia32_vcvttph2w512_mask:
+  case X86::BI__builtin_ia32_vcvttph2uw512_mask:
+  case X86::BI__builtin_ia32_vcvttph2dq512_mask:
+  case X86::BI__builtin_ia32_vcvttph2udq512_mask:
+  case X86::BI__builtin_ia32_vcvttph2qq512_mask:
+  case X86::BI__builtin_ia32_vcvttph2uqq512_mask:
   case X86::BI__builtin_ia32_exp2pd_mask:
   case X86::BI__builtin_ia32_exp2ps_mask:
   case X86::BI__builtin_ia32_getexppd512_mask:
   case X86::BI__builtin_ia32_getexpps512_mask:
+  case X86::BI__builtin_ia32_getexpph512_mask:
   case X86::BI__builtin_ia32_rcp28pd_mask:
   case X86::BI__builtin_ia32_rcp28ps_mask:
   case X86::BI__builtin_ia32_rsqrt28pd_mask:
   case X86::BI__builtin_ia32_rsqrt28ps_mask:
   case X86::BI__builtin_ia32_vcomisd:
   case X86::BI__builtin_ia32_vcomiss:
+  case X86::BI__builtin_ia32_vcomish:
   case X86::BI__builtin_ia32_vcvtph2ps512_mask:
     ArgNum = 3;
     break;
@@ -3884,21 +4816,30 @@ bool Sema::CheckX86BuiltinRoundingOrSAE(unsigned BuiltinID, CallExpr *TheCall) {
   case X86::BI__builtin_ia32_cmpps512_mask:
   case X86::BI__builtin_ia32_cmpsd_mask:
   case X86::BI__builtin_ia32_cmpss_mask:
+  case X86::BI__builtin_ia32_cmpsh_mask:
+  case X86::BI__builtin_ia32_vcvtsh2sd_round_mask:
+  case X86::BI__builtin_ia32_vcvtsh2ss_round_mask:
   case X86::BI__builtin_ia32_cvtss2sd_round_mask:
   case X86::BI__builtin_ia32_getexpsd128_round_mask:
   case X86::BI__builtin_ia32_getexpss128_round_mask:
+  case X86::BI__builtin_ia32_getexpsh128_round_mask:
   case X86::BI__builtin_ia32_getmantpd512_mask:
   case X86::BI__builtin_ia32_getmantps512_mask:
+  case X86::BI__builtin_ia32_getmantph512_mask:
   case X86::BI__builtin_ia32_maxsd_round_mask:
   case X86::BI__builtin_ia32_maxss_round_mask:
+  case X86::BI__builtin_ia32_maxsh_round_mask:
   case X86::BI__builtin_ia32_minsd_round_mask:
   case X86::BI__builtin_ia32_minss_round_mask:
+  case X86::BI__builtin_ia32_minsh_round_mask:
   case X86::BI__builtin_ia32_rcp28sd_round_mask:
   case X86::BI__builtin_ia32_rcp28ss_round_mask:
   case X86::BI__builtin_ia32_reducepd512_mask:
   case X86::BI__builtin_ia32_reduceps512_mask:
+  case X86::BI__builtin_ia32_reduceph512_mask:
   case X86::BI__builtin_ia32_rndscalepd_mask:
   case X86::BI__builtin_ia32_rndscaleps_mask:
+  case X86::BI__builtin_ia32_rndscaleph_mask:
   case X86::BI__builtin_ia32_rsqrt28sd_round_mask:
   case X86::BI__builtin_ia32_rsqrt28ss_round_mask:
     ArgNum = 4;
@@ -3913,14 +4854,17 @@ bool Sema::CheckX86BuiltinRoundingOrSAE(unsigned BuiltinID, CallExpr *TheCall) {
   case X86::BI__builtin_ia32_fixupimmss_maskz:
   case X86::BI__builtin_ia32_getmantsd_round_mask:
   case X86::BI__builtin_ia32_getmantss_round_mask:
+  case X86::BI__builtin_ia32_getmantsh_round_mask:
   case X86::BI__builtin_ia32_rangepd512_mask:
   case X86::BI__builtin_ia32_rangeps512_mask:
   case X86::BI__builtin_ia32_rangesd128_round_mask:
   case X86::BI__builtin_ia32_rangess128_round_mask:
   case X86::BI__builtin_ia32_reducesd_mask:
   case X86::BI__builtin_ia32_reducess_mask:
+  case X86::BI__builtin_ia32_reducesh_mask:
   case X86::BI__builtin_ia32_rndscalesd_round_mask:
   case X86::BI__builtin_ia32_rndscaless_round_mask:
+  case X86::BI__builtin_ia32_rndscalesh_round_mask:
     ArgNum = 5;
     break;
   case X86::BI__builtin_ia32_vcvtsd2si64:
@@ -3931,11 +4875,20 @@ bool Sema::CheckX86BuiltinRoundingOrSAE(unsigned BuiltinID, CallExpr *TheCall) {
   case X86::BI__builtin_ia32_vcvtss2si64:
   case X86::BI__builtin_ia32_vcvtss2usi32:
   case X86::BI__builtin_ia32_vcvtss2usi64:
+  case X86::BI__builtin_ia32_vcvtsh2si32:
+  case X86::BI__builtin_ia32_vcvtsh2si64:
+  case X86::BI__builtin_ia32_vcvtsh2usi32:
+  case X86::BI__builtin_ia32_vcvtsh2usi64:
   case X86::BI__builtin_ia32_sqrtpd512:
   case X86::BI__builtin_ia32_sqrtps512:
+  case X86::BI__builtin_ia32_sqrtph512:
     ArgNum = 1;
     HasRC = true;
     break;
+  case X86::BI__builtin_ia32_addph512:
+  case X86::BI__builtin_ia32_divph512:
+  case X86::BI__builtin_ia32_mulph512:
+  case X86::BI__builtin_ia32_subph512:
   case X86::BI__builtin_ia32_addpd512:
   case X86::BI__builtin_ia32_addps512:
   case X86::BI__builtin_ia32_divpd512:
@@ -3950,11 +4903,17 @@ bool Sema::CheckX86BuiltinRoundingOrSAE(unsigned BuiltinID, CallExpr *TheCall) {
   case X86::BI__builtin_ia32_cvtusi2sd64:
   case X86::BI__builtin_ia32_cvtusi2ss32:
   case X86::BI__builtin_ia32_cvtusi2ss64:
+  case X86::BI__builtin_ia32_vcvtusi2sh:
+  case X86::BI__builtin_ia32_vcvtusi642sh:
+  case X86::BI__builtin_ia32_vcvtsi2sh:
+  case X86::BI__builtin_ia32_vcvtsi642sh:
     ArgNum = 2;
     HasRC = true;
     break;
   case X86::BI__builtin_ia32_cvtdq2ps512_mask:
   case X86::BI__builtin_ia32_cvtudq2ps512_mask:
+  case X86::BI__builtin_ia32_vcvtpd2ph512_mask:
+  case X86::BI__builtin_ia32_vcvtps2phx512_mask:
   case X86::BI__builtin_ia32_cvtpd2ps512_mask:
   case X86::BI__builtin_ia32_cvtpd2dq512_mask:
   case X86::BI__builtin_ia32_cvtpd2qq512_mask:
@@ -3968,30 +4927,54 @@ bool Sema::CheckX86BuiltinRoundingOrSAE(unsigned BuiltinID, CallExpr *TheCall) {
   case X86::BI__builtin_ia32_cvtqq2ps512_mask:
   case X86::BI__builtin_ia32_cvtuqq2pd512_mask:
   case X86::BI__builtin_ia32_cvtuqq2ps512_mask:
+  case X86::BI__builtin_ia32_vcvtdq2ph512_mask:
+  case X86::BI__builtin_ia32_vcvtudq2ph512_mask:
+  case X86::BI__builtin_ia32_vcvtw2ph512_mask:
+  case X86::BI__builtin_ia32_vcvtuw2ph512_mask:
+  case X86::BI__builtin_ia32_vcvtph2w512_mask:
+  case X86::BI__builtin_ia32_vcvtph2uw512_mask:
+  case X86::BI__builtin_ia32_vcvtph2dq512_mask:
+  case X86::BI__builtin_ia32_vcvtph2udq512_mask:
+  case X86::BI__builtin_ia32_vcvtph2qq512_mask:
+  case X86::BI__builtin_ia32_vcvtph2uqq512_mask:
+  case X86::BI__builtin_ia32_vcvtqq2ph512_mask:
+  case X86::BI__builtin_ia32_vcvtuqq2ph512_mask:
     ArgNum = 3;
     HasRC = true;
     break;
+  case X86::BI__builtin_ia32_addsh_round_mask:
   case X86::BI__builtin_ia32_addss_round_mask:
   case X86::BI__builtin_ia32_addsd_round_mask:
+  case X86::BI__builtin_ia32_divsh_round_mask:
   case X86::BI__builtin_ia32_divss_round_mask:
   case X86::BI__builtin_ia32_divsd_round_mask:
+  case X86::BI__builtin_ia32_mulsh_round_mask:
   case X86::BI__builtin_ia32_mulss_round_mask:
   case X86::BI__builtin_ia32_mulsd_round_mask:
+  case X86::BI__builtin_ia32_subsh_round_mask:
   case X86::BI__builtin_ia32_subss_round_mask:
   case X86::BI__builtin_ia32_subsd_round_mask:
+  case X86::BI__builtin_ia32_scalefph512_mask:
   case X86::BI__builtin_ia32_scalefpd512_mask:
   case X86::BI__builtin_ia32_scalefps512_mask:
   case X86::BI__builtin_ia32_scalefsd_round_mask:
   case X86::BI__builtin_ia32_scalefss_round_mask:
+  case X86::BI__builtin_ia32_scalefsh_round_mask:
   case X86::BI__builtin_ia32_cvtsd2ss_round_mask:
+  case X86::BI__builtin_ia32_vcvtss2sh_round_mask:
+  case X86::BI__builtin_ia32_vcvtsd2sh_round_mask:
   case X86::BI__builtin_ia32_sqrtsd_round_mask:
   case X86::BI__builtin_ia32_sqrtss_round_mask:
+  case X86::BI__builtin_ia32_sqrtsh_round_mask:
   case X86::BI__builtin_ia32_vfmaddsd3_mask:
   case X86::BI__builtin_ia32_vfmaddsd3_maskz:
   case X86::BI__builtin_ia32_vfmaddsd3_mask3:
   case X86::BI__builtin_ia32_vfmaddss3_mask:
   case X86::BI__builtin_ia32_vfmaddss3_maskz:
   case X86::BI__builtin_ia32_vfmaddss3_mask3:
+  case X86::BI__builtin_ia32_vfmaddsh3_mask:
+  case X86::BI__builtin_ia32_vfmaddsh3_maskz:
+  case X86::BI__builtin_ia32_vfmaddsh3_mask3:
   case X86::BI__builtin_ia32_vfmaddpd512_mask:
   case X86::BI__builtin_ia32_vfmaddpd512_maskz:
   case X86::BI__builtin_ia32_vfmaddpd512_mask3:
@@ -4000,6 +4983,10 @@ bool Sema::CheckX86BuiltinRoundingOrSAE(unsigned BuiltinID, CallExpr *TheCall) {
   case X86::BI__builtin_ia32_vfmaddps512_maskz:
   case X86::BI__builtin_ia32_vfmaddps512_mask3:
   case X86::BI__builtin_ia32_vfmsubps512_mask3:
+  case X86::BI__builtin_ia32_vfmaddph512_mask:
+  case X86::BI__builtin_ia32_vfmaddph512_maskz:
+  case X86::BI__builtin_ia32_vfmaddph512_mask3:
+  case X86::BI__builtin_ia32_vfmsubph512_mask3:
   case X86::BI__builtin_ia32_vfmaddsubpd512_mask:
   case X86::BI__builtin_ia32_vfmaddsubpd512_maskz:
   case X86::BI__builtin_ia32_vfmaddsubpd512_mask3:
@@ -4008,6 +4995,26 @@ bool Sema::CheckX86BuiltinRoundingOrSAE(unsigned BuiltinID, CallExpr *TheCall) {
   case X86::BI__builtin_ia32_vfmaddsubps512_maskz:
   case X86::BI__builtin_ia32_vfmaddsubps512_mask3:
   case X86::BI__builtin_ia32_vfmsubaddps512_mask3:
+  case X86::BI__builtin_ia32_vfmaddsubph512_mask:
+  case X86::BI__builtin_ia32_vfmaddsubph512_maskz:
+  case X86::BI__builtin_ia32_vfmaddsubph512_mask3:
+  case X86::BI__builtin_ia32_vfmsubaddph512_mask3:
+  case X86::BI__builtin_ia32_vfmaddcsh_mask:
+  case X86::BI__builtin_ia32_vfmaddcsh_round_mask:
+  case X86::BI__builtin_ia32_vfmaddcsh_round_mask3:
+  case X86::BI__builtin_ia32_vfmaddcph512_mask:
+  case X86::BI__builtin_ia32_vfmaddcph512_maskz:
+  case X86::BI__builtin_ia32_vfmaddcph512_mask3:
+  case X86::BI__builtin_ia32_vfcmaddcsh_mask:
+  case X86::BI__builtin_ia32_vfcmaddcsh_round_mask:
+  case X86::BI__builtin_ia32_vfcmaddcsh_round_mask3:
+  case X86::BI__builtin_ia32_vfcmaddcph512_mask:
+  case X86::BI__builtin_ia32_vfcmaddcph512_maskz:
+  case X86::BI__builtin_ia32_vfcmaddcph512_mask3:
+  case X86::BI__builtin_ia32_vfmulcsh_mask:
+  case X86::BI__builtin_ia32_vfmulcph512_mask:
+  case X86::BI__builtin_ia32_vfcmulcsh_mask:
+  case X86::BI__builtin_ia32_vfcmulcph512_mask:
     ArgNum = 4;
     HasRC = true;
     break;
@@ -4197,6 +5204,7 @@ bool Sema::CheckX86BuiltinTileArguments(unsigned BuiltinID, CallExpr *TheCall) {
   case X86::BI__builtin_ia32_tdpbusd:
   case X86::BI__builtin_ia32_tdpbuud:
   case X86::BI__builtin_ia32_tdpbf16ps:
+  case X86::BI__builtin_ia32_tdpfp16ps:
     return CheckX86BuiltinTileRangeAndDuplicate(TheCall, {0, 1, 2});
   }
 }
@@ -4359,6 +5367,9 @@ bool Sema::CheckX86BuiltinFunctionCall(const TargetInfo &TI, unsigned BuiltinID,
   case X86::BI__builtin_ia32_getmantps256_mask:
   case X86::BI__builtin_ia32_getmantpd512_mask:
   case X86::BI__builtin_ia32_getmantps512_mask:
+  case X86::BI__builtin_ia32_getmantph128_mask:
+  case X86::BI__builtin_ia32_getmantph256_mask:
+  case X86::BI__builtin_ia32_getmantph512_mask:
   case X86::BI__builtin_ia32_vec_ext_v16qi:
   case X86::BI__builtin_ia32_vec_ext_v16hi:
     i = 1; l = 0; u = 15;
@@ -4377,6 +5388,7 @@ bool Sema::CheckX86BuiltinFunctionCall(const TargetInfo &TI, unsigned BuiltinID,
   case X86::BI__builtin_ia32_rangeps512_mask:
   case X86::BI__builtin_ia32_getmantsd_round_mask:
   case X86::BI__builtin_ia32_getmantss_round_mask:
+  case X86::BI__builtin_ia32_getmantsh_round_mask:
   case X86::BI__builtin_ia32_vec_set_v16qi:
   case X86::BI__builtin_ia32_vec_set_v16hi:
     i = 2; l = 0; u = 15;
@@ -4429,12 +5441,16 @@ bool Sema::CheckX86BuiltinFunctionCall(const TargetInfo &TI, unsigned BuiltinID,
   case X86::BI__builtin_ia32_rndscalepd_256_mask:
   case X86::BI__builtin_ia32_rndscaleps_mask:
   case X86::BI__builtin_ia32_rndscalepd_mask:
+  case X86::BI__builtin_ia32_rndscaleph_mask:
   case X86::BI__builtin_ia32_reducepd128_mask:
   case X86::BI__builtin_ia32_reducepd256_mask:
   case X86::BI__builtin_ia32_reducepd512_mask:
   case X86::BI__builtin_ia32_reduceps128_mask:
   case X86::BI__builtin_ia32_reduceps256_mask:
   case X86::BI__builtin_ia32_reduceps512_mask:
+  case X86::BI__builtin_ia32_reduceph128_mask:
+  case X86::BI__builtin_ia32_reduceph256_mask:
+  case X86::BI__builtin_ia32_reduceph512_mask:
   case X86::BI__builtin_ia32_prold512:
   case X86::BI__builtin_ia32_prolq512:
   case X86::BI__builtin_ia32_prold128:
@@ -4453,8 +5469,12 @@ bool Sema::CheckX86BuiltinFunctionCall(const TargetInfo &TI, unsigned BuiltinID,
   case X86::BI__builtin_ia32_fpclassps256_mask:
   case X86::BI__builtin_ia32_fpclassps512_mask:
   case X86::BI__builtin_ia32_fpclasspd512_mask:
+  case X86::BI__builtin_ia32_fpclassph128_mask:
+  case X86::BI__builtin_ia32_fpclassph256_mask:
+  case X86::BI__builtin_ia32_fpclassph512_mask:
   case X86::BI__builtin_ia32_fpclasssd_mask:
   case X86::BI__builtin_ia32_fpclassss_mask:
+  case X86::BI__builtin_ia32_fpclasssh_mask:
   case X86::BI__builtin_ia32_pslldqi128_byteshift:
   case X86::BI__builtin_ia32_pslldqi256_byteshift:
   case X86::BI__builtin_ia32_pslldqi512_byteshift:
@@ -4565,8 +5585,14 @@ bool Sema::CheckX86BuiltinFunctionCall(const TargetInfo &TI, unsigned BuiltinID,
   case X86::BI__builtin_ia32_reducess_mask:
   case X86::BI__builtin_ia32_rndscalesd_round_mask:
   case X86::BI__builtin_ia32_rndscaless_round_mask:
+  case X86::BI__builtin_ia32_rndscalesh_round_mask:
+  case X86::BI__builtin_ia32_reducesh_mask:
     i = 4; l = 0; u = 255;
     break;
+  case X86::BI__builtin_ia32_cmpccxadd32:
+  case X86::BI__builtin_ia32_cmpccxadd64:
+    i = 3; l = 0; u = 15;
+    break;
   }
 
   // Note that we don't force a hard error on the range check here, allowing
@@ -4581,10 +5607,16 @@ bool Sema::CheckX86BuiltinFunctionCall(const TargetInfo &TI, unsigned BuiltinID,
 /// Returns true when the format fits the function and the FormatStringInfo has
 /// been populated.
 bool Sema::getFormatStringInfo(const FormatAttr *Format, bool IsCXXMember,
-                               FormatStringInfo *FSI) {
-  FSI->HasVAListArg = Format->getFirstArg() == 0;
+                               bool IsVariadic, FormatStringInfo *FSI) {
+  if (Format->getFirstArg() == 0)
+    FSI->ArgPassingKind = FAPK_VAList;
+  else if (IsVariadic)
+    FSI->ArgPassingKind = FAPK_Variadic;
+  else
+    FSI->ArgPassingKind = FAPK_Fixed;
   FSI->FormatIdx = Format->getFormatIdx() - 1;
-  FSI->FirstDataArg = FSI->HasVAListArg ? 0 : Format->getFirstArg() - 1;
+  FSI->FirstDataArg =
+      FSI->ArgPassingKind == FAPK_VAList ? 0 : Format->getFirstArg() - 1;
 
   // The way the format attribute works in GCC, the implicit this argument
   // of member functions is counted. However, it doesn't appear in our own
@@ -4604,8 +5636,7 @@ bool Sema::getFormatStringInfo(const FormatAttr *Format, bool IsCXXMember,
 /// Returns true if the value evaluates to null.
 static bool CheckNonNullExpr(Sema &S, const Expr *Expr) {
   // If the expression has non-null type, it doesn't evaluate to null.
-  if (auto nullability
-        = Expr->IgnoreImplicit()->getType()->getNullability(S.Context)) {
+  if (auto nullability = Expr->IgnoreImplicit()->getType()->getNullability()) {
     if (*nullability == NullabilityKind::NonNull)
       return false;
   }
@@ -4639,7 +5670,7 @@ static void CheckNonNullArgument(Sema &S,
 bool Sema::GetFormatNSStringIdx(const FormatAttr *Format, unsigned &Idx) {
   FormatStringInfo FSI;
   if ((GetFormatStringType(Format) == FST_NSString) &&
-      getFormatStringInfo(Format, false, &FSI)) {
+      getFormatStringInfo(Format, false, true, &FSI)) {
     Idx = FSI.FormatIdx;
     return true;
   }
@@ -4689,8 +5720,8 @@ DiagnoseCStringFormatDirectiveInCFAPI(Sema &S,
 }
 
 /// Determine whether the given type has a non-null nullability annotation.
-static bool isNonNullType(ASTContext &ctx, QualType type) {
-  if (auto nullability = type->getNullability(ctx))
+static bool isNonNullType(QualType type) {
+  if (auto nullability = type->getNullability())
     return *nullability == NullabilityKind::NonNull;
 
   return false;
@@ -4703,7 +5734,7 @@ static void CheckNonNullArguments(Sema &S,
                                   SourceLocation CallSiteLoc) {
   assert((FDecl || Proto) && "Need a function declaration or prototype");
 
-  // Already checked by by constant evaluator.
+  // Already checked by constant evaluator.
   if (S.isConstantEvaluated())
     return;
   // Check the attributes attached to the method/function itself.
@@ -4743,8 +5774,7 @@ static void CheckNonNullArguments(Sema &S,
     for (ArrayRef<ParmVarDecl*>::iterator I = parms.begin(), E = parms.end();
          I != E; ++I, ++ParamIndex) {
       const ParmVarDecl *PVD = *I;
-      if (PVD->hasAttr<NonNullAttr>() ||
-          isNonNullType(S.Context, PVD->getType())) {
+      if (PVD->hasAttr<NonNullAttr>() || isNonNullType(PVD->getType())) {
         if (NonNullArgs.empty())
           NonNullArgs.resize(Args.size());
 
@@ -4773,7 +5803,7 @@ static void CheckNonNullArguments(Sema &S,
     if (Proto) {
       unsigned Index = 0;
       for (auto paramType : Proto->getParamTypes()) {
-        if (isNonNullType(S.Context, paramType)) {
+        if (isNonNullType(paramType)) {
           if (NonNullArgs.empty())
             NonNullArgs.resize(Args.size());
 
@@ -4789,7 +5819,41 @@ static void CheckNonNullArguments(Sema &S,
   for (unsigned ArgIndex = 0, ArgIndexEnd = NonNullArgs.size();
        ArgIndex != ArgIndexEnd; ++ArgIndex) {
     if (NonNullArgs[ArgIndex])
-      CheckNonNullArgument(S, Args[ArgIndex], CallSiteLoc);
+      CheckNonNullArgument(S, Args[ArgIndex], Args[ArgIndex]->getExprLoc());
+  }
+}
+
+// 16 byte ByVal alignment not due to a vector member is not honoured by XL
+// on AIX. Emit a warning here that users are generating binary incompatible
+// code to be safe.
+// Here we try to get information about the alignment of the struct member
+// from the struct passed to the caller function. We only warn when the struct
+// is passed byval, hence the series of checks and early returns if we are a not
+// passing a struct byval.
+void Sema::checkAIXMemberAlignment(SourceLocation Loc, const Expr *Arg) {
+  const auto *ICE = dyn_cast<ImplicitCastExpr>(Arg->IgnoreParens());
+  if (!ICE)
+    return;
+
+  const auto *DR = dyn_cast<DeclRefExpr>(ICE->getSubExpr());
+  if (!DR)
+    return;
+
+  const auto *PD = dyn_cast<ParmVarDecl>(DR->getDecl());
+  if (!PD || !PD->getType()->isRecordType())
+    return;
+
+  QualType ArgType = Arg->getType();
+  for (const FieldDecl *FD :
+       ArgType->castAs<RecordType>()->getDecl()->fields()) {
+    if (const auto *AA = FD->getAttr<AlignedAttr>()) {
+      CharUnits Alignment =
+          Context.toCharUnitsFromBits(AA->getAlignment(Context));
+      if (Alignment.getQuantity() == 16) {
+        Diag(FD->getLocation(), diag::warn_not_xl_compatible) << FD;
+        Diag(Loc, diag::note_misaligned_member_used_here) << PD;
+      }
+    }
   }
 }
 
@@ -4816,9 +5880,9 @@ void Sema::CheckArgAlignment(SourceLocation Loc, NamedDecl *FDecl,
 
   // Find expected alignment, and the actual alignment of the passed object.
   // getTypeAlignInChars requires complete types
-  if (ArgTy.isNull() || ParamTy->isIncompleteType() ||
-      ArgTy->isIncompleteType() || ParamTy->isUndeducedType() ||
-      ArgTy->isUndeducedType())
+  if (ArgTy.isNull() || ParamTy->isDependentType() ||
+      ParamTy->isIncompleteType() || ArgTy->isIncompleteType() ||
+      ParamTy->isUndeducedType() || ArgTy->isUndeducedType())
     return;
 
   CharUnits ParamAlign = Context.getTypeAlignInChars(ParamTy);
@@ -4829,7 +5893,7 @@ void Sema::CheckArgAlignment(SourceLocation Loc, NamedDecl *FDecl,
   if (ArgAlign < ParamAlign)
     Diag(Loc, diag::warn_param_mismatched_alignment)
         << (int)ArgAlign.getQuantity() << (int)ParamAlign.getQuantity()
-        << ParamName << FDecl;
+        << ParamName << (FDecl != nullptr) << FDecl;
 }
 
 /// Handles the checks for format strings, non-POD arguments to vararg
@@ -4903,6 +5967,12 @@ void Sema::checkCall(NamedDecl *FDecl, const FunctionProtoType *Proto,
         if (Arg->containsErrors())
           continue;
 
+        if (Context.getTargetInfo().getTriple().isOSAIX() && FDecl && Arg &&
+            FDecl->hasLinkage() &&
+            FDecl->getFormalLinkage() != InternalLinkage &&
+            CallType == VariadicDoesNotApply)
+          checkAIXMemberAlignment((Arg->getExprLoc()), Arg);
+
         QualType ParamTy = Proto->getParamType(ArgIdx);
         QualType ArgTy = Arg->getType();
         CheckArgAlignment(Arg->getExprLoc(), FDecl, std::to_string(ArgIdx + 1),
@@ -4964,14 +6034,14 @@ bool Sema::CheckFunctionCall(FunctionDecl *FDecl, CallExpr *TheCall,
   unsigned NumArgs = TheCall->getNumArgs();
 
   Expr *ImplicitThis = nullptr;
-  if (IsMemberOperatorCall) {
-    // If this is a call to a member operator, hide the first argument
-    // from checkCall.
+  if (IsMemberOperatorCall && !FDecl->isStatic()) {
+    // If this is a call to a non-static member operator, hide the first
+    // argument from checkCall.
     // FIXME: Our choice of AST representation here is less than ideal.
     ImplicitThis = Args[0];
     ++Args;
     --NumArgs;
-  } else if (IsMemberFunction)
+  } else if (IsMemberFunction && !FDecl->isStatic())
     ImplicitThis =
         cast<CXXMemberCallExpr>(TheCall)->getImplicitObjectArgument();
 
@@ -4991,7 +6061,7 @@ bool Sema::CheckFunctionCall(FunctionDecl *FDecl, CallExpr *TheCall,
                       ThisTypeFromDecl);
   }
 
-  checkCall(FDecl, Proto, ImplicitThis, llvm::makeArrayRef(Args, NumArgs),
+  checkCall(FDecl, Proto, ImplicitThis, llvm::ArrayRef(Args, NumArgs),
             IsMemberFunction, TheCall->getRParenLoc(),
             TheCall->getCallee()->getSourceRange(), CallType);
 
@@ -5001,7 +6071,9 @@ bool Sema::CheckFunctionCall(FunctionDecl *FDecl, CallExpr *TheCall,
   if (!FnInfo)
     return false;
 
-  CheckTCBEnforcement(TheCall, FDecl);
+  // Enforce TCB except for builtin calls, which are always allowed.
+  if (FDecl->getBuiltinID() == 0)
+    CheckTCBEnforcement(TheCall->getExprLoc(), FDecl);
 
   CheckAbsoluteValueFunction(TheCall, FDecl);
   CheckMaxUnsignedZero(TheCall, FDecl);
@@ -5041,6 +6113,8 @@ bool Sema::CheckObjCMethodCall(ObjCMethodDecl *Method, SourceLocation lbrac,
             /*IsMemberFunction=*/false, lbrac, Method->getSourceRange(),
             CallType);
 
+  CheckTCBEnforcement(lbrac, Method);
+
   return false;
 }
 
@@ -5068,7 +6142,7 @@ bool Sema::CheckPointerCall(NamedDecl *NDecl, CallExpr *TheCall,
   }
 
   checkCall(NDecl, Proto, /*ThisArg=*/nullptr,
-            llvm::makeArrayRef(TheCall->getArgs(), TheCall->getNumArgs()),
+            llvm::ArrayRef(TheCall->getArgs(), TheCall->getNumArgs()),
             /*IsMemberFunction=*/false, TheCall->getRParenLoc(),
             TheCall->getCallee()->getSourceRange(), CallType);
 
@@ -5081,7 +6155,7 @@ bool Sema::CheckOtherCall(CallExpr *TheCall, const FunctionProtoType *Proto) {
   VariadicCallType CallType = getVariadicCallType(/*FDecl=*/nullptr, Proto,
                                                   TheCall->getCallee());
   checkCall(/*FDecl=*/nullptr, Proto, /*ThisArg=*/nullptr,
-            llvm::makeArrayRef(TheCall->getArgs(), TheCall->getNumArgs()),
+            llvm::ArrayRef(TheCall->getArgs(), TheCall->getNumArgs()),
             /*IsMemberFunction=*/false, TheCall->getRParenLoc(),
             TheCall->getCallee()->getSourceRange(), CallType);
 
@@ -5100,6 +6174,7 @@ static bool isValidOrderingForOp(int64_t Ordering, AtomicExpr::AtomicOp Op) {
 
   case AtomicExpr::AO__c11_atomic_load:
   case AtomicExpr::AO__opencl_atomic_load:
+  case AtomicExpr::AO__hip_atomic_load:
   case AtomicExpr::AO__atomic_load_n:
   case AtomicExpr::AO__atomic_load:
     return OrderingCABI != llvm::AtomicOrderingCABI::release &&
@@ -5107,6 +6182,7 @@ static bool isValidOrderingForOp(int64_t Ordering, AtomicExpr::AtomicOp Op) {
 
   case AtomicExpr::AO__c11_atomic_store:
   case AtomicExpr::AO__opencl_atomic_store:
+  case AtomicExpr::AO__hip_atomic_store:
   case AtomicExpr::AO__atomic_store:
   case AtomicExpr::AO__atomic_store_n:
     return OrderingCABI != llvm::AtomicOrderingCABI::consume &&
@@ -5183,6 +6259,8 @@ ExprResult Sema::BuildAtomicExpr(SourceRange CallRange, SourceRange ExprRange,
                 "need to update code for modified C11 atomics");
   bool IsOpenCL = Op >= AtomicExpr::AO__opencl_atomic_init &&
                   Op <= AtomicExpr::AO__opencl_atomic_fetch_max;
+  bool IsHIP = Op >= AtomicExpr::AO__hip_atomic_load &&
+               Op <= AtomicExpr::AO__hip_atomic_fetch_max;
   bool IsC11 = (Op >= AtomicExpr::AO__c11_atomic_init &&
                Op <= AtomicExpr::AO__c11_atomic_fetch_min) ||
                IsOpenCL;
@@ -5200,6 +6278,7 @@ ExprResult Sema::BuildAtomicExpr(SourceRange CallRange, SourceRange ExprRange,
 
   case AtomicExpr::AO__c11_atomic_load:
   case AtomicExpr::AO__opencl_atomic_load:
+  case AtomicExpr::AO__hip_atomic_load:
   case AtomicExpr::AO__atomic_load_n:
     Form = Load;
     break;
@@ -5210,11 +6289,14 @@ ExprResult Sema::BuildAtomicExpr(SourceRange CallRange, SourceRange ExprRange,
 
   case AtomicExpr::AO__c11_atomic_store:
   case AtomicExpr::AO__opencl_atomic_store:
+  case AtomicExpr::AO__hip_atomic_store:
   case AtomicExpr::AO__atomic_store:
   case AtomicExpr::AO__atomic_store_n:
     Form = Copy;
     break;
-
+  case AtomicExpr::AO__hip_atomic_fetch_add:
+  case AtomicExpr::AO__hip_atomic_fetch_min:
+  case AtomicExpr::AO__hip_atomic_fetch_max:
   case AtomicExpr::AO__c11_atomic_fetch_add:
   case AtomicExpr::AO__c11_atomic_fetch_sub:
   case AtomicExpr::AO__opencl_atomic_fetch_add:
@@ -5229,6 +6311,10 @@ ExprResult Sema::BuildAtomicExpr(SourceRange CallRange, SourceRange ExprRange,
   case AtomicExpr::AO__c11_atomic_fetch_and:
   case AtomicExpr::AO__c11_atomic_fetch_or:
   case AtomicExpr::AO__c11_atomic_fetch_xor:
+  case AtomicExpr::AO__hip_atomic_fetch_and:
+  case AtomicExpr::AO__hip_atomic_fetch_or:
+  case AtomicExpr::AO__hip_atomic_fetch_xor:
+  case AtomicExpr::AO__c11_atomic_fetch_nand:
   case AtomicExpr::AO__opencl_atomic_fetch_and:
   case AtomicExpr::AO__opencl_atomic_fetch_or:
   case AtomicExpr::AO__opencl_atomic_fetch_xor:
@@ -5254,6 +6340,7 @@ ExprResult Sema::BuildAtomicExpr(SourceRange CallRange, SourceRange ExprRange,
     break;
 
   case AtomicExpr::AO__c11_atomic_exchange:
+  case AtomicExpr::AO__hip_atomic_exchange:
   case AtomicExpr::AO__opencl_atomic_exchange:
   case AtomicExpr::AO__atomic_exchange_n:
     Form = Xchg;
@@ -5265,8 +6352,10 @@ ExprResult Sema::BuildAtomicExpr(SourceRange CallRange, SourceRange ExprRange,
 
   case AtomicExpr::AO__c11_atomic_compare_exchange_strong:
   case AtomicExpr::AO__c11_atomic_compare_exchange_weak:
+  case AtomicExpr::AO__hip_atomic_compare_exchange_strong:
   case AtomicExpr::AO__opencl_atomic_compare_exchange_strong:
   case AtomicExpr::AO__opencl_atomic_compare_exchange_weak:
+  case AtomicExpr::AO__hip_atomic_compare_exchange_weak:
     Form = C11CmpXchg;
     break;
 
@@ -5277,7 +6366,7 @@ ExprResult Sema::BuildAtomicExpr(SourceRange CallRange, SourceRange ExprRange,
   }
 
   unsigned AdjustedNumArgs = NumArgs[Form];
-  if (IsOpenCL && Op != AtomicExpr::AO__opencl_atomic_init)
+  if ((IsOpenCL || IsHIP) && Op != AtomicExpr::AO__opencl_atomic_init)
     ++AdjustedNumArgs;
   // Check we have the right number of arguments.
   if (Args.size() < AdjustedNumArgs) {
@@ -5334,8 +6423,8 @@ ExprResult Sema::BuildAtomicExpr(SourceRange CallRange, SourceRange ExprRange,
 
   // For an arithmetic operation, the implied arithmetic must be well-formed.
   if (Form == Arithmetic) {
-    // gcc does not enforce these rules for GNU atomics, but we do so for
-    // sanity.
+    // GCC does not enforce these rules for GNU atomics, but we do to help catch
+    // trivial type errors.
     auto IsAllowedValueType = [&](QualType ValType) {
       if (ValType->isIntegerType())
         return true;
@@ -5376,7 +6465,9 @@ ExprResult Sema::BuildAtomicExpr(SourceRange CallRange, SourceRange ExprRange,
   if (!IsC11 && !AtomTy.isTriviallyCopyableType(Context) &&
       !AtomTy->isScalarType()) {
     // For GNU atomics, require a trivially-copyable type. This is not part of
-    // the GNU atomics specification, but we enforce it for sanity.
+    // the GNU atomics specification but we enforce it for consistency with
+    // other atomics which generally all require a trivially-copyable type. This
+    // is because atomics just copy bits.
     Diag(ExprRange.getBegin(), diag::err_atomic_op_needs_trivial_copy)
         << Ptr->getType() << Ptr->getSourceRange();
     return ExprError();
@@ -5415,7 +6506,7 @@ ExprResult Sema::BuildAtomicExpr(SourceRange CallRange, SourceRange ExprRange,
   // arguments are actually passed as pointers.
   QualType ByValType = ValType; // 'CP'
   bool IsPassedByAddress = false;
-  if (!IsC11 && !IsN) {
+  if (!IsC11 && !IsHIP && !IsN) {
     ByValType = Ptr->getType();
     IsPassedByAddress = true;
   }
@@ -5569,7 +6660,7 @@ ExprResult Sema::BuildAtomicExpr(SourceRange CallRange, SourceRange ExprRange,
   }
 
   if (SubExprs.size() >= 2 && Form != Init) {
-    if (Optional<llvm::APSInt> Result =
+    if (std::optional<llvm::APSInt> Result =
             SubExprs[1]->getIntegerConstantExpr(Context))
       if (!isValidOrderingForOp(Result->getSExtValue(), Op))
         Diag(SubExprs[1]->getBeginLoc(),
@@ -5579,7 +6670,7 @@ ExprResult Sema::BuildAtomicExpr(SourceRange CallRange, SourceRange ExprRange,
 
   if (auto ScopeModel = AtomicExpr::getScopeModel(Op)) {
     auto *Scope = Args[Args.size() - 1];
-    if (Optional<llvm::APSInt> Result =
+    if (std::optional<llvm::APSInt> Result =
             Scope->getIntegerConstantExpr(Context)) {
       if (!ScopeModel->isValid(Result->getZExtValue()))
         Diag(Scope->getBeginLoc(), diag::err_atomic_op_has_invalid_synch_scope)
@@ -5594,16 +6685,19 @@ ExprResult Sema::BuildAtomicExpr(SourceRange CallRange, SourceRange ExprRange,
   if ((Op == AtomicExpr::AO__c11_atomic_load ||
        Op == AtomicExpr::AO__c11_atomic_store ||
        Op == AtomicExpr::AO__opencl_atomic_load ||
-       Op == AtomicExpr::AO__opencl_atomic_store ) &&
+       Op == AtomicExpr::AO__hip_atomic_load ||
+       Op == AtomicExpr::AO__opencl_atomic_store ||
+       Op == AtomicExpr::AO__hip_atomic_store) &&
       Context.AtomicUsesUnsupportedLibcall(AE))
     Diag(AE->getBeginLoc(), diag::err_atomic_load_store_uses_lib)
         << ((Op == AtomicExpr::AO__c11_atomic_load ||
-             Op == AtomicExpr::AO__opencl_atomic_load)
+             Op == AtomicExpr::AO__opencl_atomic_load ||
+             Op == AtomicExpr::AO__hip_atomic_load)
                 ? 0
                 : 1);
 
-  if (ValType->isExtIntType()) {
-    Diag(Ptr->getExprLoc(), diag::err_atomic_builtin_ext_int_prohibit);
+  if (ValType->isBitIntType()) {
+    Diag(Ptr->getExprLoc(), diag::err_atomic_builtin_bit_int_prohibit);
     return ExprError();
   }
 
@@ -5625,7 +6719,7 @@ static bool checkBuiltinArgument(Sema &S, CallExpr *E, unsigned ArgIndex) {
   InitializedEntity Entity =
     InitializedEntity::InitializeParameter(S.Context, Param);
 
-  ExprResult Arg = E->getArg(0);
+  ExprResult Arg = E->getArg(ArgIndex);
   Arg = S.PerformCopyInitialization(Entity, SourceLocation(), Arg);
   if (Arg.isInvalid())
     return true;
@@ -5943,7 +7037,7 @@ Sema::SemaBuiltinAtomicOverloaded(ExprResult TheCallResult) {
   // Get the decl for the concrete builtin from this, we can tell what the
   // concrete integer type we should convert to is.
   unsigned NewBuiltinID = BuiltinIndices[BuiltinIndex][SizeIndex];
-  const char *NewBuiltinName = Context.BuiltinInfo.getName(NewBuiltinID);
+  StringRef NewBuiltinName = Context.BuiltinInfo.getName(NewBuiltinID);
   FunctionDecl *NewBuiltinDecl;
   if (NewBuiltinID == BuiltinID)
     NewBuiltinDecl = FDecl;
@@ -6000,11 +7094,11 @@ Sema::SemaBuiltinAtomicOverloaded(ExprResult TheCallResult) {
   // gracefully.
   TheCall->setType(ResultType);
 
-  // Prohibit use of _ExtInt with atomic builtins.
-  // The arguments would have already been converted to the first argument's
-  // type, so only need to check the first argument.
-  const auto *ExtIntValType = ValType->getAs<ExtIntType>();
-  if (ExtIntValType && !llvm::isPowerOf2_64(ExtIntValType->getNumBits())) {
+  // Prohibit problematic uses of bit-precise integer types with atomic
+  // builtins. The arguments would have already been converted to the first
+  // argument's type, so only need to check the first argument.
+  const auto *BitIntValType = ValType->getAs<BitIntType>();
+  if (BitIntValType && !llvm::isPowerOf2_64(BitIntValType->getNumBits())) {
     Diag(FirstArg->getExprLoc(), diag::err_atomic_builtin_ext_int_size);
     return ExprError();
   }
@@ -6092,7 +7186,7 @@ bool Sema::CheckObjCString(Expr *Arg) {
   Arg = Arg->IgnoreParenCasts();
   StringLiteral *Literal = dyn_cast<StringLiteral>(Arg);
 
-  if (!Literal || !Literal->isAscii()) {
+  if (!Literal || !Literal->isOrdinary()) {
     Diag(Arg->getBeginLoc(), diag::err_cfstring_literal_not_string_constant)
         << Arg->getSourceRange();
     return true;
@@ -6127,7 +7221,7 @@ ExprResult Sema::CheckOSLogFormatStringArg(Expr *Arg) {
     }
   }
 
-  if (!Literal || (!Literal->isAscii() && !Literal->isUTF8())) {
+  if (!Literal || (!Literal->isOrdinary() && !Literal->isUTF8())) {
     return ExprError(
         Diag(Arg->getBeginLoc(), diag::err_os_log_format_not_string_constant)
         << Arg->getSourceRange());
@@ -6225,6 +7319,9 @@ bool Sema::SemaBuiltinVAStart(unsigned BuiltinID, CallExpr *TheCall) {
   if (checkVAStartABI(*this, BuiltinID, Fn))
     return true;
 
+  // In C2x mode, va_start only needs one argument. However, the builtin still
+  // requires two arguments (which matches the behavior of the GCC builtin),
+  // <stdarg.h> passes `0` as the second argument in C2x mode.
   if (checkArgCount(*this, TheCall, 2))
     return true;
 
@@ -6238,9 +7335,15 @@ bool Sema::SemaBuiltinVAStart(unsigned BuiltinID, CallExpr *TheCall) {
     return true;
 
   // Verify that the second argument to the builtin is the last argument of the
-  // current function or method.
+  // current function or method. In C2x mode, if the second argument is an
+  // integer constant expression with value 0, then we don't bother with this
+  // check.
   bool SecondArgIsLastNamedArgument = false;
   const Expr *Arg = TheCall->getArg(1)->IgnoreParenCasts();
+  if (std::optional<llvm::APSInt> Val =
+          TheCall->getArg(1)->getIntegerConstantExpr(Context);
+      Val && LangOpts.C2x && *Val == 0)
+    return false;
 
   // These are valid if SecondArgIsLastNamedArgument is false after the next
   // block.
@@ -6266,7 +7369,7 @@ bool Sema::SemaBuiltinVAStart(unsigned BuiltinID, CallExpr *TheCall) {
            Type->isSpecificBuiltinType(BuiltinType::Float) || [=] {
              // Promotable integers are UB, but enumerations need a bit of
              // extra checking to see what their promotable type actually is.
-             if (!Type->isPromotableIntegerType())
+             if (!Context.isPromotableIntegerType(Type))
                return false;
              if (!Type->isEnumeralType())
                return true;
@@ -6281,11 +7384,25 @@ bool Sema::SemaBuiltinVAStart(unsigned BuiltinID, CallExpr *TheCall) {
     Diag(ParamLoc, diag::note_parameter_type) << Type;
   }
 
-  TheCall->setType(Context.VoidTy);
   return false;
 }
 
 bool Sema::SemaBuiltinVAStartARMMicrosoft(CallExpr *Call) {
+  auto IsSuitablyTypedFormatArgument = [this](const Expr *Arg) -> bool {
+    const LangOptions &LO = getLangOpts();
+
+    if (LO.CPlusPlus)
+      return Arg->getType()
+                 .getCanonicalType()
+                 .getTypePtr()
+                 ->getPointeeType()
+                 .withoutLocalFastQualifiers() == Context.CharTy;
+
+    // In C, allow aliasing through `char *`, this is required for AArch64 at
+    // least.
+    return true;
+  };
+
   // void __va_start(va_list *ap, const char *named_addr, size_t slot_size,
   //                 const char *named_addr);
 
@@ -6314,8 +7431,7 @@ bool Sema::SemaBuiltinVAStartARMMicrosoft(CallExpr *Call) {
 
   const QualType &ConstCharPtrTy =
       Context.getPointerType(Context.CharTy.withConst());
-  if (!Arg1Ty->isPointerType() ||
-      Arg1Ty->getPointeeType().withoutLocalFastQualifiers() != Context.CharTy)
+  if (!Arg1Ty->isPointerType() || !IsSuitablyTypedFormatArgument(Arg1))
     Diag(Arg1->getBeginLoc(), diag::err_typecheck_convert_incompatible)
         << Arg1->getType() << ConstCharPtrTy << 1 /* different class */
         << 0                                      /* qualifier difference */
@@ -6579,14 +7695,14 @@ ExprResult Sema::SemaBuiltinShuffleVector(CallExpr *TheCall) {
         TheCall->getArg(i)->isValueDependent())
       continue;
 
-    Optional<llvm::APSInt> Result;
+    std::optional<llvm::APSInt> Result;
     if (!(Result = TheCall->getArg(i)->getIntegerConstantExpr(Context)))
       return ExprError(Diag(TheCall->getBeginLoc(),
                             diag::err_shufflevector_nonconstant_argument)
                        << TheCall->getArg(i)->getSourceRange());
 
     // Allow -1 which will be translated to undef in the IR.
-    if (Result->isSigned() && Result->isAllOnesValue())
+    if (Result->isSigned() && Result->isAllOnes())
       continue;
 
     if (Result->getActiveBits() > 64 ||
@@ -6733,38 +7849,43 @@ bool Sema::SemaBuiltinAllocaWithAlign(CallExpr *TheCall) {
 /// Handle __builtin_assume_aligned. This is declared
 /// as (const void*, size_t, ...) and can take one optional constant int arg.
 bool Sema::SemaBuiltinAssumeAligned(CallExpr *TheCall) {
+  if (checkArgCountRange(*this, TheCall, 2, 3))
+    return true;
+
   unsigned NumArgs = TheCall->getNumArgs();
+  Expr *FirstArg = TheCall->getArg(0);
 
-  if (NumArgs > 3)
-    return Diag(TheCall->getEndLoc(),
-                diag::err_typecheck_call_too_many_args_at_most)
-           << 0 /*function call*/ << 3 << NumArgs << TheCall->getSourceRange();
+  {
+    ExprResult FirstArgResult =
+        DefaultFunctionArrayLvalueConversion(FirstArg);
+    if (FirstArgResult.isInvalid())
+      return true;
+    TheCall->setArg(0, FirstArgResult.get());
+  }
 
   // The alignment must be a constant integer.
-  Expr *Arg = TheCall->getArg(1);
+  Expr *SecondArg = TheCall->getArg(1);
 
   // We can't check the value of a dependent argument.
-  if (!Arg->isTypeDependent() && !Arg->isValueDependent()) {
+  if (!SecondArg->isValueDependent()) {
     llvm::APSInt Result;
     if (SemaBuiltinConstantArg(TheCall, 1, Result))
       return true;
 
     if (!Result.isPowerOf2())
       return Diag(TheCall->getBeginLoc(), diag::err_alignment_not_power_of_two)
-             << Arg->getSourceRange();
+             << SecondArg->getSourceRange();
 
     if (Result > Sema::MaximumAlignment)
       Diag(TheCall->getBeginLoc(), diag::warn_assume_aligned_too_great)
-          << Arg->getSourceRange() << Sema::MaximumAlignment;
+          << SecondArg->getSourceRange() << Sema::MaximumAlignment;
   }
 
   if (NumArgs > 2) {
-    ExprResult Arg(TheCall->getArg(2));
-    InitializedEntity Entity = InitializedEntity::InitializeParameter(Context,
-      Context.getSizeType(), false);
-    Arg = PerformCopyInitialization(Entity, SourceLocation(), Arg);
-    if (Arg.isInvalid()) return true;
-    TheCall->setArg(2, Arg.get());
+    Expr *ThirdArg = TheCall->getArg(2);
+    if (convertArgumentToType(*this, ThirdArg, Context.getSizeType()))
+      return true;
+    TheCall->setArg(2, ThirdArg);
   }
 
   return false;
@@ -6835,7 +7956,7 @@ bool Sema::SemaBuiltinOSLogFormat(CallExpr *TheCall) {
     llvm::SmallBitVector CheckedVarArgs(NumArgs, false);
     ArrayRef<const Expr *> Args(TheCall->getArgs(), TheCall->getNumArgs());
     bool Success = CheckFormatArguments(
-        Args, /*HasVAListArg*/ false, FormatIdx, FirstDataArg, FST_OSLog,
+        Args, FAPK_Variadic, FormatIdx, FirstDataArg, FST_OSLog,
         VariadicFunction, TheCall->getBeginLoc(), SourceRange(),
         CheckedVarArgs);
     if (!Success)
@@ -6860,7 +7981,7 @@ bool Sema::SemaBuiltinConstantArg(CallExpr *TheCall, int ArgNum,
 
   if (Arg->isTypeDependent() || Arg->isValueDependent()) return false;
 
-  Optional<llvm::APSInt> R;
+  std::optional<llvm::APSInt> R;
   if (!(R = Arg->getIntegerConstantExpr(Context)))
     return Diag(TheCall->getBeginLoc(), diag::err_constant_integer_arg_type)
            << FDecl->getDeclName() << Arg->getSourceRange();
@@ -7195,6 +8316,8 @@ bool Sema::SemaBuiltinARMSpecialReg(unsigned BuiltinID, CallExpr *TheCall,
                       BuiltinID == ARM::BI__builtin_arm_wsrp;
   bool IsAArch64Builtin = BuiltinID == AArch64::BI__builtin_arm_rsr64 ||
                           BuiltinID == AArch64::BI__builtin_arm_wsr64 ||
+                          BuiltinID == AArch64::BI__builtin_arm_rsr128 ||
+                          BuiltinID == AArch64::BI__builtin_arm_wsr128 ||
                           BuiltinID == AArch64::BI__builtin_arm_rsr ||
                           BuiltinID == AArch64::BI__builtin_arm_rsrp ||
                           BuiltinID == AArch64::BI__builtin_arm_wsr ||
@@ -7262,21 +8385,51 @@ bool Sema::SemaBuiltinARMSpecialReg(unsigned BuiltinID, CallExpr *TheCall,
       return Diag(TheCall->getBeginLoc(), diag::err_arm_invalid_specialreg)
              << Arg->getSourceRange();
   } else if (IsAArch64Builtin && Fields.size() == 1) {
-    // If the register name is one of those that appear in the condition below
-    // and the special register builtin being used is one of the write builtins,
-    // then we require that the argument provided for writing to the register
-    // is an integer constant expression. This is because it will be lowered to
-    // an MSR (immediate) instruction, so we need to know the immediate at
-    // compile time.
+    // This code validates writes to PSTATE registers.
+
+    // Not a write.
     if (TheCall->getNumArgs() != 2)
       return false;
 
-    std::string RegLower = Reg.lower();
-    if (RegLower != "spsel" && RegLower != "daifset" && RegLower != "daifclr" &&
-        RegLower != "pan" && RegLower != "uao")
+    // The 128-bit system register accesses do not touch PSTATE.
+    if (BuiltinID == AArch64::BI__builtin_arm_rsr128 ||
+        BuiltinID == AArch64::BI__builtin_arm_wsr128)
       return false;
 
-    return SemaBuiltinConstantArgRange(TheCall, 1, 0, 15);
+    // These are the named PSTATE accesses using "MSR (immediate)" instructions,
+    // along with the upper limit on the immediates allowed.
+    auto MaxLimit = llvm::StringSwitch<std::optional<unsigned>>(Reg)
+      .CaseLower("spsel", 15)
+      .CaseLower("daifclr", 15)
+      .CaseLower("daifset", 15)
+      .CaseLower("pan", 15)
+      .CaseLower("uao", 15)
+      .CaseLower("dit", 15)
+      .CaseLower("ssbs", 15)
+      .CaseLower("tco", 15)
+      .CaseLower("allint", 1)
+      .CaseLower("pm", 1)
+      .Default(std::nullopt);
+
+    // If this is not a named PSTATE, just continue without validating, as this
+    // will be lowered to an "MSR (register)" instruction directly
+    if (!MaxLimit)
+      return false;
+
+    // Here we only allow constants in the range for that pstate, as required by
+    // the ACLE.
+    //
+    // While clang also accepts the names of system registers in its ACLE
+    // intrinsics, we prevent this with the PSTATE names used in MSR (immediate)
+    // as the value written via a register is different to the value used as an
+    // immediate to have the same effect. e.g., for the instruction `msr tco,
+    // x0`, it is bit 25 of register x0 that is written into PSTATE.TCO, but
+    // with `msr tco, #imm`, it is bit 0 of xN that is written into PSTATE.TCO.
+    //
+    // If a programmer wants to codegen the MSR (register) form of `msr tco,
+    // xN`, they can still do so by specifying the register using five
+    // colon-separated numbers in a string.
+    return SemaBuiltinConstantArgRange(TheCall, 1, 0, *MaxLimit);
   }
 
   return false;
@@ -7286,11 +8439,35 @@ bool Sema::SemaBuiltinARMSpecialReg(unsigned BuiltinID, CallExpr *TheCall,
 /// Emit an error and return true on failure; return false on success.
 /// TypeStr is a string containing the type descriptor of the value returned by
 /// the builtin and the descriptors of the expected type of the arguments.
-bool Sema::SemaBuiltinPPCMMACall(CallExpr *TheCall, const char *TypeStr) {
+bool Sema::SemaBuiltinPPCMMACall(CallExpr *TheCall, unsigned BuiltinID,
+                                 const char *TypeStr) {
 
   assert((TypeStr[0] != '\0') &&
          "Invalid types in PPC MMA builtin declaration");
 
+  switch (BuiltinID) {
+  default:
+    // This function is called in CheckPPCBuiltinFunctionCall where the
+    // BuiltinID is guaranteed to be an MMA or pair vector memop builtin, here
+    // we are isolating the pair vector memop builtins that can be used with mma
+    // off so the default case is every builtin that requires mma and paired
+    // vector memops.
+    if (SemaFeatureCheck(*this, TheCall, "paired-vector-memops",
+                         diag::err_ppc_builtin_only_on_arch, "10") ||
+        SemaFeatureCheck(*this, TheCall, "mma",
+                         diag::err_ppc_builtin_only_on_arch, "10"))
+      return true;
+    break;
+  case PPC::BI__builtin_vsx_lxvp:
+  case PPC::BI__builtin_vsx_stxvp:
+  case PPC::BI__builtin_vsx_assemble_pair:
+  case PPC::BI__builtin_vsx_disassemble_pair:
+    if (SemaFeatureCheck(*this, TheCall, "paired-vector-memops",
+                         diag::err_ppc_builtin_only_on_arch, "10"))
+      return true;
+    break;
+  }
+
   unsigned Mask = 0;
   unsigned ArgNum = 0;
 
@@ -7308,13 +8485,23 @@ bool Sema::SemaBuiltinPPCMMACall(CallExpr *TheCall, const char *TypeStr) {
     }
 
     Expr *Arg = TheCall->getArg(ArgNum);
-    QualType ArgType = Arg->getType();
-
-    if ((ExpectedType->isVoidPointerType() && !ArgType->isPointerType()) ||
-        (!ExpectedType->isVoidPointerType() &&
-           ArgType.getCanonicalType() != ExpectedType))
-      return Diag(Arg->getBeginLoc(), diag::err_typecheck_convert_incompatible)
-             << ArgType << ExpectedType << 1 << 0 << 0;
+    QualType PassedType = Arg->getType();
+    QualType StrippedRVType = PassedType.getCanonicalType();
+
+    // Strip Restrict/Volatile qualifiers.
+    if (StrippedRVType.isRestrictQualified() ||
+        StrippedRVType.isVolatileQualified())
+      StrippedRVType = StrippedRVType.getCanonicalType().getUnqualifiedType();
+
+    // The only case where the argument type and expected type are allowed to
+    // mismatch is if the argument type is a non-void pointer (or array) and
+    // expected type is a void pointer.
+    if (StrippedRVType != ExpectedType)
+      if (!(ExpectedType->isVoidPointerType() &&
+            (StrippedRVType->isPointerType() || StrippedRVType->isArrayType())))
+        return Diag(Arg->getBeginLoc(),
+                    diag::err_typecheck_convert_incompatible)
+               << PassedType << ExpectedType << 1 << 0 << 0;
 
     // If the value of the Mask is not 0, we have a constraint in the size of
     // the integer argument so here we ensure the argument is a constant that
@@ -7496,7 +8683,7 @@ class FormatStringLiteral {
 
   QualType getType() const { return FExpr->getType(); }
 
-  bool isAscii() const { return FExpr->isAscii(); }
+  bool isAscii() const { return FExpr->isOrdinary(); }
   bool isWide() const { return FExpr->isWide(); }
   bool isUTF8() const { return FExpr->isUTF8(); }
   bool isUTF16() const { return FExpr->isUTF16(); }
@@ -7518,19 +8705,18 @@ class FormatStringLiteral {
   SourceLocation getEndLoc() const LLVM_READONLY { return FExpr->getEndLoc(); }
 };
 
-}  // namespace
+} // namespace
+
+static void CheckFormatString(
+    Sema &S, const FormatStringLiteral *FExpr, const Expr *OrigFormatExpr,
+    ArrayRef<const Expr *> Args, Sema::FormatArgumentPassingKind APK,
+    unsigned format_idx, unsigned firstDataArg, Sema::FormatStringType Type,
+    bool inFunctionCall, Sema::VariadicCallType CallType,
+    llvm::SmallBitVector &CheckedVarArgs, UncoveredArgHandler &UncoveredArg,
+    bool IgnoreStringsWithoutSpecifiers);
 
-static void CheckFormatString(Sema &S, const FormatStringLiteral *FExpr,
-                              const Expr *OrigFormatExpr,
-                              ArrayRef<const Expr *> Args,
-                              bool HasVAListArg, unsigned format_idx,
-                              unsigned firstDataArg,
-                              Sema::FormatStringType Type,
-                              bool inFunctionCall,
-                              Sema::VariadicCallType CallType,
-                              llvm::SmallBitVector &CheckedVarArgs,
-                              UncoveredArgHandler &UncoveredArg,
-                              bool IgnoreStringsWithoutSpecifiers);
+static const Expr *maybeConstEvalStringLiteral(ASTContext &Context,
+                                               const Expr *E);
 
 // Determine if an expression is a string literal or constant string.
 // If this function returns false on the arguments to a function expecting a
@@ -7538,16 +8724,15 @@ static void CheckFormatString(Sema &S, const FormatStringLiteral *FExpr,
 // True string literals are then checked by CheckFormatString.
 static StringLiteralCheckType
 checkFormatStringExpr(Sema &S, const Expr *E, ArrayRef<const Expr *> Args,
-                      bool HasVAListArg, unsigned format_idx,
+                      Sema::FormatArgumentPassingKind APK, unsigned format_idx,
                       unsigned firstDataArg, Sema::FormatStringType Type,
                       Sema::VariadicCallType CallType, bool InFunctionCall,
                       llvm::SmallBitVector &CheckedVarArgs,
-                      UncoveredArgHandler &UncoveredArg,
-                      llvm::APSInt Offset,
+                      UncoveredArgHandler &UncoveredArg, llvm::APSInt Offset,
                       bool IgnoreStringsWithoutSpecifiers = false) {
   if (S.isConstantEvaluated())
     return SLCT_NotALiteral;
- tryAgain:
+tryAgain:
   assert(Offset.isSigned() && "invalid offset");
 
   if (E->isTypeDependent() || E->isValueDependent())
@@ -7563,6 +8748,15 @@ checkFormatStringExpr(Sema &S, const Expr *E, ArrayRef<const Expr *> Args,
     return SLCT_UncheckedLiteral;
 
   switch (E->getStmtClass()) {
+  case Stmt::InitListExprClass:
+    // Handle expressions like {"foobar"}.
+    if (const clang::Expr *SLE = maybeConstEvalStringLiteral(S.Context, E)) {
+      return checkFormatStringExpr(S, SLE, Args, APK, format_idx, firstDataArg,
+                                   Type, CallType, /*InFunctionCall*/ false,
+                                   CheckedVarArgs, UncoveredArg, Offset,
+                                   IgnoreStringsWithoutSpecifiers);
+    }
+    return SLCT_NotALiteral;
   case Stmt::BinaryConditionalOperatorClass:
   case Stmt::ConditionalOperatorClass: {
     // The expression is a literal if both sub-expressions were, and it was
@@ -7592,9 +8786,8 @@ checkFormatStringExpr(Sema &S, const Expr *E, ArrayRef<const Expr *> Args,
     if (!CheckLeft)
       Left = SLCT_UncheckedLiteral;
     else {
-      Left = checkFormatStringExpr(S, C->getTrueExpr(), Args,
-                                   HasVAListArg, format_idx, firstDataArg,
-                                   Type, CallType, InFunctionCall,
+      Left = checkFormatStringExpr(S, C->getTrueExpr(), Args, APK, format_idx,
+                                   firstDataArg, Type, CallType, InFunctionCall,
                                    CheckedVarArgs, UncoveredArg, Offset,
                                    IgnoreStringsWithoutSpecifiers);
       if (Left == SLCT_NotALiteral || !CheckRight) {
@@ -7603,8 +8796,8 @@ checkFormatStringExpr(Sema &S, const Expr *E, ArrayRef<const Expr *> Args,
     }
 
     StringLiteralCheckType Right = checkFormatStringExpr(
-        S, C->getFalseExpr(), Args, HasVAListArg, format_idx, firstDataArg,
-        Type, CallType, InFunctionCall, CheckedVarArgs, UncoveredArg, Offset,
+        S, C->getFalseExpr(), Args, APK, format_idx, firstDataArg, Type,
+        CallType, InFunctionCall, CheckedVarArgs, UncoveredArg, Offset,
         IgnoreStringsWithoutSpecifiers);
 
     return (CheckLeft && Left < Right) ? Left : Right;
@@ -7654,42 +8847,85 @@ checkFormatStringExpr(Sema &S, const Expr *E, ArrayRef<const Expr *> Args,
             if (InitList->isStringLiteralInit())
               Init = InitList->getInit(0)->IgnoreParenImpCasts();
           }
-          return checkFormatStringExpr(S, Init, Args,
-                                       HasVAListArg, format_idx,
-                                       firstDataArg, Type, CallType,
-                                       /*InFunctionCall*/ false, CheckedVarArgs,
-                                       UncoveredArg, Offset);
+          return checkFormatStringExpr(
+              S, Init, Args, APK, format_idx, firstDataArg, Type, CallType,
+              /*InFunctionCall*/ false, CheckedVarArgs, UncoveredArg, Offset);
         }
       }
 
-      // For vprintf* functions (i.e., HasVAListArg==true), we add a
-      // special check to see if the format string is a function parameter
-      // of the function calling the printf function.  If the function
-      // has an attribute indicating it is a printf-like function, then we
-      // should suppress warnings concerning non-literals being used in a call
-      // to a vprintf function.  For example:
+      // When the format argument is an argument of this function, and this
+      // function also has the format attribute, there are several interactions
+      // for which there shouldn't be a warning. For instance, when calling
+      // v*printf from a function that has the printf format attribute, we
+      // should not emit a warning about using `fmt`, even though it's not
+      // constant, because the arguments have already been checked for the
+      // caller of `logmessage`:
       //
-      // void
-      // logmessage(char const *fmt __attribute__ (format (printf, 1, 2)), ...){
-      //      va_list ap;
-      //      va_start(ap, fmt);
-      //      vprintf(fmt, ap);  // Do NOT emit a warning about "fmt".
-      //      ...
+      //  __attribute__((format(printf, 1, 2)))
+      //  void logmessage(char const *fmt, ...) {
+      //    va_list ap;
+      //    va_start(ap, fmt);
+      //    vprintf(fmt, ap);  /* do not emit a warning about "fmt" */
+      //    ...
       // }
-      if (HasVAListArg) {
-        if (const ParmVarDecl *PV = dyn_cast<ParmVarDecl>(VD)) {
-          if (const NamedDecl *ND = dyn_cast<NamedDecl>(PV->getDeclContext())) {
-            int PVIndex = PV->getFunctionScopeIndex() + 1;
-            for (const auto *PVFormat : ND->specific_attrs<FormatAttr>()) {
-              // adjust for implicit parameter
-              if (const CXXMethodDecl *MD = dyn_cast<CXXMethodDecl>(ND))
-                if (MD->isInstance())
-                  ++PVIndex;
+      //
+      // Another interaction that we need to support is calling a variadic
+      // format function from a format function that has fixed arguments. For
+      // instance:
+      //
+      //  __attribute__((format(printf, 1, 2)))
+      //  void logstring(char const *fmt, char const *str) {
+      //    printf(fmt, str);  /* do not emit a warning about "fmt" */
+      //  }
+      //
+      // Same (and perhaps more relatably) for the variadic template case:
+      //
+      //  template<typename... Args>
+      //  __attribute__((format(printf, 1, 2)))
+      //  void log(const char *fmt, Args&&... args) {
+      //    printf(fmt, forward<Args>(args)...);
+      //           /* do not emit a warning about "fmt" */
+      //  }
+      //
+      // Due to implementation difficulty, we only check the format, not the
+      // format arguments, in all cases.
+      //
+      if (const auto *PV = dyn_cast<ParmVarDecl>(VD)) {
+        if (const auto *D = dyn_cast<Decl>(PV->getDeclContext())) {
+          for (const auto *PVFormat : D->specific_attrs<FormatAttr>()) {
+            bool IsCXXMember = false;
+            if (const auto *MD = dyn_cast<CXXMethodDecl>(D))
+              IsCXXMember = MD->isInstance();
+
+            bool IsVariadic = false;
+            if (const FunctionType *FnTy = D->getFunctionType())
+              IsVariadic = cast<FunctionProtoType>(FnTy)->isVariadic();
+            else if (const auto *BD = dyn_cast<BlockDecl>(D))
+              IsVariadic = BD->isVariadic();
+            else if (const auto *OMD = dyn_cast<ObjCMethodDecl>(D))
+              IsVariadic = OMD->isVariadic();
+
+            Sema::FormatStringInfo CallerFSI;
+            if (Sema::getFormatStringInfo(PVFormat, IsCXXMember, IsVariadic,
+                                          &CallerFSI)) {
               // We also check if the formats are compatible.
               // We can't pass a 'scanf' string to a 'printf' function.
-              if (PVIndex == PVFormat->getFormatIdx() &&
-                  Type == S.GetFormatStringType(PVFormat))
-                return SLCT_UncheckedLiteral;
+              if (PV->getFunctionScopeIndex() == CallerFSI.FormatIdx &&
+                  Type == S.GetFormatStringType(PVFormat)) {
+                // Lastly, check that argument passing kinds transition in a
+                // way that makes sense:
+                // from a caller with FAPK_VAList, allow FAPK_VAList
+                // from a caller with FAPK_Fixed, allow FAPK_Fixed
+                // from a caller with FAPK_Fixed, allow FAPK_Variadic
+                // from a caller with FAPK_Variadic, allow FAPK_VAList
+                switch (combineFAPK(CallerFSI.ArgPassingKind, APK)) {
+                case combineFAPK(Sema::FAPK_VAList, Sema::FAPK_VAList):
+                case combineFAPK(Sema::FAPK_Fixed, Sema::FAPK_Fixed):
+                case combineFAPK(Sema::FAPK_Fixed, Sema::FAPK_Variadic):
+                case combineFAPK(Sema::FAPK_Variadic, Sema::FAPK_VAList):
+                  return SLCT_UncheckedLiteral;
+                }
+              }
             }
           }
         }
@@ -7708,8 +8944,8 @@ checkFormatStringExpr(Sema &S, const Expr *E, ArrayRef<const Expr *> Args,
       for (const auto *FA : ND->specific_attrs<FormatArgAttr>()) {
         const Expr *Arg = CE->getArg(FA->getFormatIdx().getASTIndex());
         StringLiteralCheckType Result = checkFormatStringExpr(
-            S, Arg, Args, HasVAListArg, format_idx, firstDataArg, Type,
-            CallType, InFunctionCall, CheckedVarArgs, UncoveredArg, Offset,
+            S, Arg, Args, APK, format_idx, firstDataArg, Type, CallType,
+            InFunctionCall, CheckedVarArgs, UncoveredArg, Offset,
             IgnoreStringsWithoutSpecifiers);
         if (IsFirst) {
           CommonResult = Result;
@@ -7724,16 +8960,18 @@ checkFormatStringExpr(Sema &S, const Expr *E, ArrayRef<const Expr *> Args,
         if (BuiltinID == Builtin::BI__builtin___CFStringMakeConstantString ||
             BuiltinID == Builtin::BI__builtin___NSStringMakeConstantString) {
           const Expr *Arg = CE->getArg(0);
-          return checkFormatStringExpr(S, Arg, Args,
-                                       HasVAListArg, format_idx,
-                                       firstDataArg, Type, CallType,
-                                       InFunctionCall, CheckedVarArgs,
-                                       UncoveredArg, Offset,
-                                       IgnoreStringsWithoutSpecifiers);
+          return checkFormatStringExpr(
+              S, Arg, Args, APK, format_idx, firstDataArg, Type, CallType,
+              InFunctionCall, CheckedVarArgs, UncoveredArg, Offset,
+              IgnoreStringsWithoutSpecifiers);
         }
       }
     }
-
+    if (const Expr *SLE = maybeConstEvalStringLiteral(S.Context, E))
+      return checkFormatStringExpr(S, SLE, Args, APK, format_idx, firstDataArg,
+                                   Type, CallType, /*InFunctionCall*/ false,
+                                   CheckedVarArgs, UncoveredArg, Offset,
+                                   IgnoreStringsWithoutSpecifiers);
     return SLCT_NotALiteral;
   }
   case Stmt::ObjCMessageExprClass: {
@@ -7757,8 +8995,8 @@ checkFormatStringExpr(Sema &S, const Expr *E, ArrayRef<const Expr *> Args,
 
         const Expr *Arg = ME->getArg(FA->getFormatIdx().getASTIndex());
         return checkFormatStringExpr(
-            S, Arg, Args, HasVAListArg, format_idx, firstDataArg, Type,
-            CallType, InFunctionCall, CheckedVarArgs, UncoveredArg, Offset,
+            S, Arg, Args, APK, format_idx, firstDataArg, Type, CallType,
+            InFunctionCall, CheckedVarArgs, UncoveredArg, Offset,
             IgnoreStringsWithoutSpecifiers);
       }
     }
@@ -7781,9 +9019,8 @@ checkFormatStringExpr(Sema &S, const Expr *E, ArrayRef<const Expr *> Args,
         return SLCT_NotALiteral;
       }
       FormatStringLiteral FStr(StrE, Offset.sextOrTrunc(64).getSExtValue());
-      CheckFormatString(S, &FStr, E, Args, HasVAListArg, format_idx,
-                        firstDataArg, Type, InFunctionCall, CallType,
-                        CheckedVarArgs, UncoveredArg,
+      CheckFormatString(S, &FStr, E, Args, APK, format_idx, firstDataArg, Type,
+                        InFunctionCall, CallType, CheckedVarArgs, UncoveredArg,
                         IgnoreStringsWithoutSpecifiers);
       return SLCT_CheckedLiteral;
     }
@@ -7844,6 +9081,20 @@ checkFormatStringExpr(Sema &S, const Expr *E, ArrayRef<const Expr *> Args,
   }
 }
 
+// If this expression can be evaluated at compile-time,
+// check if the result is a StringLiteral and return it
+// otherwise return nullptr
+static const Expr *maybeConstEvalStringLiteral(ASTContext &Context,
+                                               const Expr *E) {
+  Expr::EvalResult Result;
+  if (E->EvaluateAsRValue(Result, Context) && Result.Val.isLValue()) {
+    const auto *LVE = Result.Val.getLValueBase().dyn_cast<const Expr *>();
+    if (isa_and_nonnull<StringLiteral>(LVE))
+      return LVE;
+  }
+  return nullptr;
+}
+
 Sema::FormatStringType Sema::GetFormatStringType(const FormatAttr *Format) {
   return llvm::StringSwitch<FormatStringType>(Format->getType()->getName())
       .Case("scanf", FST_Scanf)
@@ -7862,24 +9113,25 @@ Sema::FormatStringType Sema::GetFormatStringType(const FormatAttr *Format) {
 /// functions) for correct use of format strings.
 /// Returns true if a format string has been fully checked.
 bool Sema::CheckFormatArguments(const FormatAttr *Format,
-                                ArrayRef<const Expr *> Args,
-                                bool IsCXXMember,
-                                VariadicCallType CallType,
-                                SourceLocation Loc, SourceRange Range,
+                                ArrayRef<const Expr *> Args, bool IsCXXMember,
+                                VariadicCallType CallType, SourceLocation Loc,
+                                SourceRange Range,
                                 llvm::SmallBitVector &CheckedVarArgs) {
   FormatStringInfo FSI;
-  if (getFormatStringInfo(Format, IsCXXMember, &FSI))
-    return CheckFormatArguments(Args, FSI.HasVAListArg, FSI.FormatIdx,
+  if (getFormatStringInfo(Format, IsCXXMember, CallType != VariadicDoesNotApply,
+                          &FSI))
+    return CheckFormatArguments(Args, FSI.ArgPassingKind, FSI.FormatIdx,
                                 FSI.FirstDataArg, GetFormatStringType(Format),
                                 CallType, Loc, Range, CheckedVarArgs);
   return false;
 }
 
 bool Sema::CheckFormatArguments(ArrayRef<const Expr *> Args,
-                                bool HasVAListArg, unsigned format_idx,
-                                unsigned firstDataArg, FormatStringType Type,
-                                VariadicCallType CallType,
-                                SourceLocation Loc, SourceRange Range,
+                                Sema::FormatArgumentPassingKind APK,
+                                unsigned format_idx, unsigned firstDataArg,
+                                FormatStringType Type,
+                                VariadicCallType CallType, SourceLocation Loc,
+                                SourceRange Range,
                                 llvm::SmallBitVector &CheckedVarArgs) {
   // CHECK: printf/scanf-like function is called with no format string.
   if (format_idx >= Args.size()) {
@@ -7902,12 +9154,11 @@ bool Sema::CheckFormatArguments(ArrayRef<const Expr *> Args,
   // ObjC string uses the same format specifiers as C string, so we can use
   // the same format string checking logic for both ObjC and C strings.
   UncoveredArgHandler UncoveredArg;
-  StringLiteralCheckType CT =
-      checkFormatStringExpr(*this, OrigFormatExpr, Args, HasVAListArg,
-                            format_idx, firstDataArg, Type, CallType,
-                            /*IsFunctionCall*/ true, CheckedVarArgs,
-                            UncoveredArg,
-                            /*no string offset*/ llvm::APSInt(64, false) = 0);
+  StringLiteralCheckType CT = checkFormatStringExpr(
+      *this, OrigFormatExpr, Args, APK, format_idx, firstDataArg, Type,
+      CallType,
+      /*IsFunctionCall*/ true, CheckedVarArgs, UncoveredArg,
+      /*no string offset*/ llvm::APSInt(64, false) = 0);
 
   // Generate a diagnostic where an uncovered argument is detected.
   if (UncoveredArg.hasUncoveredArg()) {
@@ -7971,7 +9222,7 @@ protected:
   const unsigned FirstDataArg;
   const unsigned NumDataArgs;
   const char *Beg; // Start of format string.
-  const bool HasVAListArg;
+  const Sema::FormatArgumentPassingKind ArgPassingKind;
   ArrayRef<const Expr *> Args;
   unsigned FormatIdx;
   llvm::SmallBitVector CoveredArgs;
@@ -7986,14 +9237,15 @@ public:
   CheckFormatHandler(Sema &s, const FormatStringLiteral *fexpr,
                      const Expr *origFormatExpr,
                      const Sema::FormatStringType type, unsigned firstDataArg,
-                     unsigned numDataArgs, const char *beg, bool hasVAListArg,
+                     unsigned numDataArgs, const char *beg,
+                     Sema::FormatArgumentPassingKind APK,
                      ArrayRef<const Expr *> Args, unsigned formatIdx,
                      bool inFunctionCall, Sema::VariadicCallType callType,
                      llvm::SmallBitVector &CheckedVarArgs,
                      UncoveredArgHandler &UncoveredArg)
       : S(s), FExpr(fexpr), OrigFormatExpr(origFormatExpr), FSType(type),
         FirstDataArg(firstDataArg), NumDataArgs(numDataArgs), Beg(beg),
-        HasVAListArg(hasVAListArg), Args(Args), FormatIdx(formatIdx),
+        ArgPassingKind(APK), Args(Args), FormatIdx(formatIdx),
         inFunctionCall(inFunctionCall), CallType(callType),
         CheckedVarArgs(CheckedVarArgs), UncoveredArg(UncoveredArg) {
     CoveredArgs.resize(numDataArgs);
@@ -8034,7 +9286,7 @@ public:
   EmitFormatDiagnostic(Sema &S, bool inFunctionCall, const Expr *ArgumentExpr,
                        const PartialDiagnostic &PDiag, SourceLocation StringLoc,
                        bool IsStringLocation, Range StringRange,
-                       ArrayRef<FixItHint> Fixit = None);
+                       ArrayRef<FixItHint> Fixit = std::nullopt);
 
 protected:
   bool HandleInvalidConversionSpecifier(unsigned argIndex, SourceLocation Loc,
@@ -8061,7 +9313,7 @@ protected:
   template <typename Range>
   void EmitFormatDiagnostic(PartialDiagnostic PDiag, SourceLocation StringLoc,
                             bool IsStringLocation, Range StringRange,
-                            ArrayRef<FixItHint> Fixit = None);
+                            ArrayRef<FixItHint> Fixit = std::nullopt);
 };
 
 } // namespace
@@ -8104,7 +9356,7 @@ void CheckFormatHandler::HandleInvalidLengthModifier(
   CharSourceRange LMRange = getSpecifierRange(LM.getStart(), LM.getLength());
 
   // See if we know how to fix this length modifier.
-  Optional<LengthModifier> FixedLM = FS.getCorrectedLengthModifier();
+  std::optional<LengthModifier> FixedLM = FS.getCorrectedLengthModifier();
   if (FixedLM) {
     EmitFormatDiagnostic(S.PDiag(DiagID) << LM.toString() << CS.toString(),
                          getLocationOfByte(LM.getStart()),
@@ -8137,7 +9389,7 @@ void CheckFormatHandler::HandleNonStandardLengthModifier(
   CharSourceRange LMRange = getSpecifierRange(LM.getStart(), LM.getLength());
 
   // See if we know how to fix this length modifier.
-  Optional<LengthModifier> FixedLM = FS.getCorrectedLengthModifier();
+  std::optional<LengthModifier> FixedLM = FS.getCorrectedLengthModifier();
   if (FixedLM) {
     EmitFormatDiagnostic(S.PDiag(diag::warn_format_non_standard)
                            << LM.toString() << 0,
@@ -8164,7 +9416,7 @@ void CheckFormatHandler::HandleNonStandardConversionSpecifier(
   using namespace analyze_format_string;
 
   // See if we know how to fix this conversion specifier.
-  Optional<ConversionSpecifier> FixedCS = CS.getStandardSpecifier();
+  std::optional<ConversionSpecifier> FixedCS = CS.getStandardSpecifier();
   if (FixedCS) {
     EmitFormatDiagnostic(S.PDiag(diag::warn_format_non_standard)
                           << CS.toString() << /*conversion specifier*/1,
@@ -8229,8 +9481,8 @@ const Expr *CheckFormatHandler::getDataArg(unsigned i) const {
 void CheckFormatHandler::DoneProcessing() {
   // Does the number of data arguments exceed the number of
   // format conversions in the format string?
-  if (!HasVAListArg) {
-      // Find any arguments that weren't covered.
+  if (ArgPassingKind != Sema::FAPK_VAList) {
+    // Find any arguments that weren't covered.
     CoveredArgs.flip();
     signed notCoveredArg = CoveredArgs.find_first();
     if (notCoveredArg >= 0) {
@@ -8425,13 +9677,13 @@ public:
                      const Expr *origFormatExpr,
                      const Sema::FormatStringType type, unsigned firstDataArg,
                      unsigned numDataArgs, bool isObjC, const char *beg,
-                     bool hasVAListArg, ArrayRef<const Expr *> Args,
-                     unsigned formatIdx, bool inFunctionCall,
-                     Sema::VariadicCallType CallType,
+                     Sema::FormatArgumentPassingKind APK,
+                     ArrayRef<const Expr *> Args, unsigned formatIdx,
+                     bool inFunctionCall, Sema::VariadicCallType CallType,
                      llvm::SmallBitVector &CheckedVarArgs,
                      UncoveredArgHandler &UncoveredArg)
       : CheckFormatHandler(s, fexpr, origFormatExpr, type, firstDataArg,
-                           numDataArgs, beg, hasVAListArg, Args, formatIdx,
+                           numDataArgs, beg, APK, Args, formatIdx,
                            inFunctionCall, CallType, CheckedVarArgs,
                            UncoveredArg) {}
 
@@ -8451,8 +9703,8 @@ public:
   void handleInvalidMaskType(StringRef MaskType) override;
 
   bool HandlePrintfSpecifier(const analyze_printf::PrintfSpecifier &FS,
-                             const char *startSpecifier,
-                             unsigned specifierLen) override;
+                             const char *startSpecifier, unsigned specifierLen,
+                             const TargetInfo &Target) override;
   bool checkFormatExpr(const analyze_printf::PrintfSpecifier &FS,
                        const char *StartSpecifier,
                        unsigned SpecifierLen,
@@ -8506,17 +9758,16 @@ void CheckPrintfHandler::handleInvalidMaskType(StringRef MaskType) {
 }
 
 bool CheckPrintfHandler::HandleAmount(
-                               const analyze_format_string::OptionalAmount &Amt,
-                               unsigned k, const char *startSpecifier,
-                               unsigned specifierLen) {
+    const analyze_format_string::OptionalAmount &Amt, unsigned k,
+    const char *startSpecifier, unsigned specifierLen) {
   if (Amt.hasDataArgument()) {
-    if (!HasVAListArg) {
+    if (ArgPassingKind != Sema::FAPK_VAList) {
       unsigned argIndex = Amt.getArgIndex();
       if (argIndex >= NumDataArgs) {
         EmitFormatDiagnostic(S.PDiag(diag::warn_printf_asterisk_missing_arg)
-                               << k,
+                                 << k,
                              getLocationOfByte(Amt.getStart()),
-                             /*IsStringLocation*/true,
+                             /*IsStringLocation*/ true,
                              getSpecifierRange(startSpecifier, specifierLen));
         // Don't do any more checking.  We will just emit
         // spurious errors.
@@ -8711,11 +9962,9 @@ bool CheckPrintfHandler::checkForCStrMembers(
   return false;
 }
 
-bool
-CheckPrintfHandler::HandlePrintfSpecifier(const analyze_printf::PrintfSpecifier
-                                            &FS,
-                                          const char *startSpecifier,
-                                          unsigned specifierLen) {
+bool CheckPrintfHandler::HandlePrintfSpecifier(
+    const analyze_printf::PrintfSpecifier &FS, const char *startSpecifier,
+    unsigned specifierLen, const TargetInfo &Target) {
   using namespace analyze_format_string;
   using namespace analyze_printf;
 
@@ -8871,6 +10120,15 @@ CheckPrintfHandler::HandlePrintfSpecifier(const analyze_printf::PrintfSpecifier
     }
   }
 
+  const llvm::Triple &Triple = Target.getTriple();
+  if (CS.getKind() == ConversionSpecifier::nArg &&
+      (Triple.isAndroid() || Triple.isOSFuchsia())) {
+    EmitFormatDiagnostic(S.PDiag(diag::warn_printf_narg_not_supported),
+                         getLocationOfByte(CS.getStart()),
+                         /*IsStringLocation*/ false,
+                         getSpecifierRange(startSpecifier, specifierLen));
+  }
+
   // Check for invalid use of field width
   if (!FS.hasValidFieldWidth()) {
     HandleInvalidAmount(FS, FS.getFieldWidth(), /* field width */ 0,
@@ -8929,7 +10187,7 @@ CheckPrintfHandler::HandlePrintfSpecifier(const analyze_printf::PrintfSpecifier
     HandleNonStandardConversionSpecifier(CS, startSpecifier, specifierLen);
 
   // The remaining checks depend on the data arguments.
-  if (HasVAListArg)
+  if (ArgPassingKind == Sema::FAPK_VAList)
     return true;
 
   if (!CheckNumArgs(FS, CS, startSpecifier, specifierLen, argIndex))
@@ -9044,7 +10302,7 @@ isArithmeticArgumentPromotion(Sema &S, const ImplicitCastExpr *ICE) {
   // It's an integer promotion if the destination type is the promoted
   // source type.
   if (ICE->getCastKind() == CK_IntegralCast &&
-      From->isPromotableIntegerType() &&
+      S.Context.isPromotableIntegerType(From) &&
       S.Context.getPromotedIntegerType(From) == To)
     return true;
   // Look through vector types, since we do default argument promotion for
@@ -9077,6 +10335,12 @@ CheckPrintfHandler::checkFormatExpr(const analyze_printf::PrintfSpecifier &FS,
     ExprTy = TET->getUnderlyingExpr()->getType();
   }
 
+  // When using the format attribute in C++, you can receive a function or an
+  // array that will necessarily decay to a pointer when passed to the final
+  // format consumer. Apply decay before type comparison.
+  if (ExprTy->canDecayToPointerType())
+    ExprTy = S.Context.getDecayedType(ExprTy);
+
   // Diagnose attempts to print a boolean value as a character. Unlike other
   // -Wformat diagnostics, this is fine from a type perspective, but it still
   // doesn't make sense.
@@ -9093,10 +10357,14 @@ CheckPrintfHandler::checkFormatExpr(const analyze_printf::PrintfSpecifier &FS,
     return true;
   }
 
-  analyze_printf::ArgType::MatchKind Match = AT.matchesType(S.Context, ExprTy);
-  if (Match == analyze_printf::ArgType::Match)
+  ArgType::MatchKind ImplicitMatch = ArgType::NoMatch;
+  ArgType::MatchKind Match = AT.matchesType(S.Context, ExprTy);
+  if (Match == ArgType::Match)
     return true;
 
+  // NoMatchPromotionTypeConfusion should be only returned in ImplictCastExpr
+  assert(Match != ArgType::NoMatchPromotionTypeConfusion);
+
   // Look through argument promotions for our error message's reported type.
   // This includes the integral and floating promotions, but excludes array
   // and function pointer decay (seeing that an argument intended to be a
@@ -9113,13 +10381,9 @@ CheckPrintfHandler::checkFormatExpr(const analyze_printf::PrintfSpecifier &FS,
       if (ICE->getType() == S.Context.IntTy ||
           ICE->getType() == S.Context.UnsignedIntTy) {
         // All further checking is done on the subexpression
-        const analyze_printf::ArgType::MatchKind ImplicitMatch =
-            AT.matchesType(S.Context, ExprTy);
-        if (ImplicitMatch == analyze_printf::ArgType::Match)
+        ImplicitMatch = AT.matchesType(S.Context, ExprTy);
+        if (ImplicitMatch == ArgType::Match)
           return true;
-        if (ImplicitMatch == ArgType::NoMatchPedantic ||
-            ImplicitMatch == ArgType::NoMatchTypeConfusion)
-          Match = ImplicitMatch;
       }
     }
   } else if (const CharacterLiteral *CL = dyn_cast<CharacterLiteral>(E)) {
@@ -9130,10 +10394,29 @@ CheckPrintfHandler::checkFormatExpr(const analyze_printf::PrintfSpecifier &FS,
     // modifier is provided.
     if (ExprTy == S.Context.IntTy &&
         FS.getLengthModifier().getKind() != LengthModifier::AsChar)
-      if (llvm::isUIntN(S.Context.getCharWidth(), CL->getValue()))
+      if (llvm::isUIntN(S.Context.getCharWidth(), CL->getValue())) {
         ExprTy = S.Context.CharTy;
+        // To improve check results, we consider a character literal in C
+        // to be a 'char' rather than an 'int'. 'printf("%hd", 'a');' is
+        // more likely a type confusion situation, so we will suggest to
+        // use '%hhd' instead by discarding the MatchPromotion.
+        if (Match == ArgType::MatchPromotion)
+          Match = ArgType::NoMatch;
+      }
   }
-
+  if (Match == ArgType::MatchPromotion) {
+    // WG14 N2562 only clarified promotions in *printf
+    // For NSLog in ObjC, just preserve -Wformat behavior
+    if (!S.getLangOpts().ObjC &&
+        ImplicitMatch != ArgType::NoMatchPromotionTypeConfusion &&
+        ImplicitMatch != ArgType::NoMatchTypeConfusion)
+      return true;
+    Match = ArgType::NoMatch;
+  }
+  if (ImplicitMatch == ArgType::NoMatchPedantic ||
+      ImplicitMatch == ArgType::NoMatchTypeConfusion)
+    Match = ImplicitMatch;
+  assert(Match != ArgType::MatchPromotion);
   // Look through enums to their underlying type.
   bool IsEnum = false;
   if (auto EnumTy = ExprTy->getAs<EnumType>()) {
@@ -9206,7 +10489,10 @@ CheckPrintfHandler::checkFormatExpr(const analyze_printf::PrintfSpecifier &FS,
     if (IntendedTy == ExprTy && !ShouldNotPrintDirectly) {
       unsigned Diag;
       switch (Match) {
-      case ArgType::Match: llvm_unreachable("expected non-matching");
+      case ArgType::Match:
+      case ArgType::MatchPromotion:
+      case ArgType::NoMatchPromotionTypeConfusion:
+        llvm_unreachable("expected non-matching");
       case ArgType::NoMatchPedantic:
         Diag = diag::warn_format_conversion_argument_type_mismatch_pedantic;
         break;
@@ -9269,7 +10555,7 @@ CheckPrintfHandler::checkFormatExpr(const analyze_printf::PrintfSpecifier &FS,
         // We extract the name from the typedef because we don't want to show
         // the underlying type in the diagnostic.
         StringRef Name;
-        if (const TypedefType *TypedefTy = dyn_cast<TypedefType>(ExprTy))
+        if (const auto *TypedefTy = ExprTy->getAs<TypedefType>())
           Name = TypedefTy->getDecl()->getName();
         else
           Name = CastTyName;
@@ -9297,12 +10583,16 @@ CheckPrintfHandler::checkFormatExpr(const analyze_printf::PrintfSpecifier &FS,
     // Since the warning for passing non-POD types to variadic functions
     // was deferred until now, we emit a warning for non-POD
     // arguments here.
+    bool EmitTypeMismatch = false;
     switch (S.isValidVarArgType(ExprTy)) {
     case Sema::VAK_Valid:
     case Sema::VAK_ValidInCXX11: {
       unsigned Diag;
       switch (Match) {
-      case ArgType::Match: llvm_unreachable("expected non-matching");
+      case ArgType::Match:
+      case ArgType::MatchPromotion:
+      case ArgType::NoMatchPromotionTypeConfusion:
+        llvm_unreachable("expected non-matching");
       case ArgType::NoMatchPedantic:
         Diag = diag::warn_format_conversion_argument_type_mismatch_pedantic;
         break;
@@ -9322,17 +10612,23 @@ CheckPrintfHandler::checkFormatExpr(const analyze_printf::PrintfSpecifier &FS,
     }
     case Sema::VAK_Undefined:
     case Sema::VAK_MSVCUndefined:
-      EmitFormatDiagnostic(S.PDiag(diag::warn_non_pod_vararg_with_format_string)
-                               << S.getLangOpts().CPlusPlus11 << ExprTy
-                               << CallType
-                               << AT.getRepresentativeTypeName(S.Context) << CSR
-                               << E->getSourceRange(),
-                           E->getBeginLoc(), /*IsStringLocation*/ false, CSR);
-      checkForCStrMembers(AT, E);
+      if (CallType == Sema::VariadicDoesNotApply) {
+        EmitTypeMismatch = true;
+      } else {
+        EmitFormatDiagnostic(
+            S.PDiag(diag::warn_non_pod_vararg_with_format_string)
+                << S.getLangOpts().CPlusPlus11 << ExprTy << CallType
+                << AT.getRepresentativeTypeName(S.Context) << CSR
+                << E->getSourceRange(),
+            E->getBeginLoc(), /*IsStringLocation*/ false, CSR);
+        checkForCStrMembers(AT, E);
+      }
       break;
 
     case Sema::VAK_Invalid:
-      if (ExprTy->isObjCObjectType())
+      if (CallType == Sema::VariadicDoesNotApply)
+        EmitTypeMismatch = true;
+      else if (ExprTy->isObjCObjectType())
         EmitFormatDiagnostic(
             S.PDiag(diag::err_cannot_pass_objc_interface_to_vararg_format)
                 << S.getLangOpts().CPlusPlus11 << ExprTy << CallType
@@ -9348,6 +10644,19 @@ CheckPrintfHandler::checkFormatExpr(const analyze_printf::PrintfSpecifier &FS,
       break;
     }
 
+    if (EmitTypeMismatch) {
+      // The function is not variadic, so we do not generate warnings about
+      // being allowed to pass that object as a variadic argument. Instead,
+      // since there are inherently no printf specifiers for types which cannot
+      // be passed as variadic arguments, emit a plain old specifier mismatch
+      // argument.
+      EmitFormatDiagnostic(
+          S.PDiag(diag::warn_format_conversion_argument_type_mismatch)
+              << AT.getRepresentativeTypeName(S.Context) << ExprTy << false
+              << E->getSourceRange(),
+          E->getBeginLoc(), false, CSR);
+    }
+
     assert(FirstDataArg + FS.getArgIndex() < CheckedVarArgs.size() &&
            "format string specifier index out of range");
     CheckedVarArgs[FirstDataArg + FS.getArgIndex()] = true;
@@ -9365,13 +10674,13 @@ public:
   CheckScanfHandler(Sema &s, const FormatStringLiteral *fexpr,
                     const Expr *origFormatExpr, Sema::FormatStringType type,
                     unsigned firstDataArg, unsigned numDataArgs,
-                    const char *beg, bool hasVAListArg,
+                    const char *beg, Sema::FormatArgumentPassingKind APK,
                     ArrayRef<const Expr *> Args, unsigned formatIdx,
                     bool inFunctionCall, Sema::VariadicCallType CallType,
                     llvm::SmallBitVector &CheckedVarArgs,
                     UncoveredArgHandler &UncoveredArg)
       : CheckFormatHandler(s, fexpr, origFormatExpr, type, firstDataArg,
-                           numDataArgs, beg, hasVAListArg, Args, formatIdx,
+                           numDataArgs, beg, APK, Args, formatIdx,
                            inFunctionCall, CallType, CheckedVarArgs,
                            UncoveredArg) {}
 
@@ -9475,7 +10784,7 @@ bool CheckScanfHandler::HandleScanfSpecifier(
     HandleNonStandardConversionSpecifier(CS, startSpecifier, specifierLen);
 
   // The remaining checks depend on the data arguments.
-  if (HasVAListArg)
+  if (ArgPassingKind == Sema::FAPK_VAList)
     return true;
 
   if (!CheckNumArgs(FS, CS, startSpecifier, specifierLen, argIndex))
@@ -9532,17 +10841,13 @@ bool CheckScanfHandler::HandleScanfSpecifier(
   return true;
 }
 
-static void CheckFormatString(Sema &S, const FormatStringLiteral *FExpr,
-                              const Expr *OrigFormatExpr,
-                              ArrayRef<const Expr *> Args,
-                              bool HasVAListArg, unsigned format_idx,
-                              unsigned firstDataArg,
-                              Sema::FormatStringType Type,
-                              bool inFunctionCall,
-                              Sema::VariadicCallType CallType,
-                              llvm::SmallBitVector &CheckedVarArgs,
-                              UncoveredArgHandler &UncoveredArg,
-                              bool IgnoreStringsWithoutSpecifiers) {
+static void CheckFormatString(
+    Sema &S, const FormatStringLiteral *FExpr, const Expr *OrigFormatExpr,
+    ArrayRef<const Expr *> Args, Sema::FormatArgumentPassingKind APK,
+    unsigned format_idx, unsigned firstDataArg, Sema::FormatStringType Type,
+    bool inFunctionCall, Sema::VariadicCallType CallType,
+    llvm::SmallBitVector &CheckedVarArgs, UncoveredArgHandler &UncoveredArg,
+    bool IgnoreStringsWithoutSpecifiers) {
   // CHECK: is the format string a wide literal?
   if (!FExpr->isAscii() && !FExpr->isUTF8()) {
     CheckFormatHandler::EmitFormatDiagnostic(
@@ -9570,8 +10875,7 @@ static void CheckFormatString(Sema &S, const FormatStringLiteral *FExpr,
 
   // Emit a warning if the string literal is truncated and does not contain an
   // embedded null character.
-  if (TypeSize <= StrRef.size() &&
-      StrRef.substr(0, TypeSize).find('\0') == StringRef::npos) {
+  if (TypeSize <= StrRef.size() && !StrRef.substr(0, TypeSize).contains('\0')) {
     CheckFormatHandler::EmitFormatDiagnostic(
         S, inFunctionCall, Args[format_idx],
         S.PDiag(diag::warn_printf_format_string_not_null_terminated),
@@ -9595,23 +10899,21 @@ static void CheckFormatString(Sema &S, const FormatStringLiteral *FExpr,
       Type == Sema::FST_Syslog) {
     CheckPrintfHandler H(
         S, FExpr, OrigFormatExpr, Type, firstDataArg, numDataArgs,
-        (Type == Sema::FST_NSString || Type == Sema::FST_OSTrace), Str,
-        HasVAListArg, Args, format_idx, inFunctionCall, CallType,
-        CheckedVarArgs, UncoveredArg);
-
-    if (!analyze_format_string::ParsePrintfString(H, Str, Str + StrLen,
-                                                  S.getLangOpts(),
-                                                  S.Context.getTargetInfo(),
-                Type == Sema::FST_Kprintf || Type == Sema::FST_FreeBSDKPrintf))
+        (Type == Sema::FST_NSString || Type == Sema::FST_OSTrace), Str, APK,
+        Args, format_idx, inFunctionCall, CallType, CheckedVarArgs,
+        UncoveredArg);
+
+    if (!analyze_format_string::ParsePrintfString(
+            H, Str, Str + StrLen, S.getLangOpts(), S.Context.getTargetInfo(),
+            Type == Sema::FST_Kprintf || Type == Sema::FST_FreeBSDKPrintf))
       H.DoneProcessing();
   } else if (Type == Sema::FST_Scanf) {
     CheckScanfHandler H(S, FExpr, OrigFormatExpr, Type, firstDataArg,
-                        numDataArgs, Str, HasVAListArg, Args, format_idx,
-                        inFunctionCall, CallType, CheckedVarArgs, UncoveredArg);
+                        numDataArgs, Str, APK, Args, format_idx, inFunctionCall,
+                        CallType, CheckedVarArgs, UncoveredArg);
 
-    if (!analyze_format_string::ParseScanfString(H, Str, Str + StrLen,
-                                                 S.getLangOpts(),
-                                                 S.Context.getTargetInfo()))
+    if (!analyze_format_string::ParseScanfString(
+            H, Str, Str + StrLen, S.getLangOpts(), S.Context.getTargetInfo()))
       H.DoneProcessing();
   } // TODO: handle other formats
 }
@@ -9845,7 +11147,7 @@ static void emitReplacement(Sema &S, SourceLocation Loc, SourceRange Range,
                             unsigned AbsKind, QualType ArgType) {
   bool EmitHeaderHint = true;
   const char *HeaderName = nullptr;
-  const char *FunctionName = nullptr;
+  StringRef FunctionName;
   if (S.getLangOpts().CPlusPlus && !ArgType->isAnyComplexType()) {
     FunctionName = "std::abs";
     if (ArgType->isIntegralOrEnumerationType()) {
@@ -9953,7 +11255,7 @@ void Sema::CheckAbsoluteValueFunction(const CallExpr *Call,
   // Unsigned types cannot be negative.  Suggest removing the absolute value
   // function call.
   if (ArgType->isUnsignedIntegerType()) {
-    const char *FunctionName =
+    StringRef FunctionName =
         IsStdAbs ? "std::abs" : Context.BuiltinInfo.getName(AbsKind);
     Diag(Call->getExprLoc(), diag::warn_unsigned_abs) << ArgType << ParamType;
     Diag(Call->getExprLoc(), diag::note_remove_abs)
@@ -10304,7 +11606,10 @@ static void CheckMemaccessSize(Sema &S, unsigned BId, const CallExpr *Call) {
     Call->getArg(BId == Builtin::BImemset ? 2 : 1)->IgnoreImpCasts();
 
   auto isLiteralZero = [](const Expr *E) {
-    return isa<IntegerLiteral>(E) && cast<IntegerLiteral>(E)->getValue() == 0;
+    return (isa<IntegerLiteral>(E) &&
+            cast<IntegerLiteral>(E)->getValue() == 0) ||
+           (isa<CharacterLiteral>(E) &&
+            cast<CharacterLiteral>(E)->getValue() == 0);
   };
 
   // If we're memsetting or bzeroing 0 bytes, then this is likely an error.
@@ -10826,7 +12131,7 @@ void CheckFreeArgumentsCast(Sema &S, const std::string &CalleeName,
 /// Alerts the user that they are attempting to free a non-malloc'd object.
 void Sema::CheckFreeArguments(const CallExpr *E) {
   const std::string CalleeName =
-      dyn_cast<FunctionDecl>(E->getCalleeDecl())->getQualifiedNameAsString();
+      cast<FunctionDecl>(E->getCalleeDecl())->getQualifiedNameAsString();
 
   { // Prefer something that doesn't involve a cast to make things simpler.
     const Expr *Arg = E->getArg(0)->IgnoreParenCasts();
@@ -10869,7 +12174,7 @@ Sema::CheckReturnValExpr(Expr *RetValExp, QualType lhsType,
                          const FunctionDecl *FD) {
   // Check if the return value is null but should not be.
   if (((Attrs && hasSpecificAttr<ReturnsNonNullAttr>(*Attrs)) ||
-       (!isObjCMethod && isNonNullType(Context, lhsType))) &&
+       (!isObjCMethod && isNonNullType(lhsType))) &&
       CheckNonNullExpr(*this, RetValExp))
     Diag(ReturnLoc, diag::warn_null_ret)
       << (isObjCMethod ? 1 : 0) << RetValExp->getSourceRange();
@@ -10897,19 +12202,50 @@ Sema::CheckReturnValExpr(Expr *RetValExp, QualType lhsType,
     CheckPPCMMAType(RetValExp->getType(), ReturnLoc);
 }
 
-//===--- CHECK: Floating-Point comparisons (-Wfloat-equal) ---------------===//
+/// Check for comparisons of floating-point values using == and !=. Issue a
+/// warning if the comparison is not likely to do what the programmer intended.
+void Sema::CheckFloatComparison(SourceLocation Loc, Expr *LHS, Expr *RHS,
+                                BinaryOperatorKind Opcode) {
+  if (!BinaryOperator::isEqualityOp(Opcode))
+    return;
+
+  // Match and capture subexpressions such as "(float) X == 0.1".
+  FloatingLiteral *FPLiteral;
+  CastExpr *FPCast;
+  auto getCastAndLiteral = [&FPLiteral, &FPCast](Expr *L, Expr *R) {
+    FPLiteral = dyn_cast<FloatingLiteral>(L->IgnoreParens());
+    FPCast = dyn_cast<CastExpr>(R->IgnoreParens());
+    return FPLiteral && FPCast;
+  };
+
+  if (getCastAndLiteral(LHS, RHS) || getCastAndLiteral(RHS, LHS)) {
+    auto *SourceTy = FPCast->getSubExpr()->getType()->getAs<BuiltinType>();
+    auto *TargetTy = FPLiteral->getType()->getAs<BuiltinType>();
+    if (SourceTy && TargetTy && SourceTy->isFloatingPoint() &&
+        TargetTy->isFloatingPoint()) {
+      bool Lossy;
+      llvm::APFloat TargetC = FPLiteral->getValue();
+      TargetC.convert(Context.getFloatTypeSemantics(QualType(SourceTy, 0)),
+                      llvm::APFloat::rmNearestTiesToEven, &Lossy);
+      if (Lossy) {
+        // If the literal cannot be represented in the source type, then a
+        // check for == is always false and check for != is always true.
+        Diag(Loc, diag::warn_float_compare_literal)
+            << (Opcode == BO_EQ) << QualType(SourceTy, 0)
+            << LHS->getSourceRange() << RHS->getSourceRange();
+        return;
+      }
+    }
+  }
 
-/// Check for comparisons of floating point operands using != and ==.
-/// Issue a warning if these are no self-comparisons, as they are not likely
-/// to do what the programmer intended.
-void Sema::CheckFloatComparison(SourceLocation Loc, Expr* LHS, Expr *RHS) {
+  // Match a more general floating-point equality comparison (-Wfloat-equal).
   Expr* LeftExprSansParen = LHS->IgnoreParenImpCasts();
   Expr* RightExprSansParen = RHS->IgnoreParenImpCasts();
 
   // Special case: check for x == x (which is OK).
   // Do not emit warnings for such cases.
-  if (DeclRefExpr* DRL = dyn_cast<DeclRefExpr>(LeftExprSansParen))
-    if (DeclRefExpr* DRR = dyn_cast<DeclRefExpr>(RightExprSansParen))
+  if (auto *DRL = dyn_cast<DeclRefExpr>(LeftExprSansParen))
+    if (auto *DRR = dyn_cast<DeclRefExpr>(RightExprSansParen))
       if (DRL->getDecl() == DRR->getDecl())
         return;
 
@@ -11011,7 +12347,7 @@ struct IntRange {
                         false/*NonNegative*/);
     }
 
-    if (const auto *EIT = dyn_cast<ExtIntType>(T))
+    if (const auto *EIT = dyn_cast<BitIntType>(T))
       return IntRange(EIT->getNumBits(), EIT->isUnsigned());
 
     const BuiltinType *BT = cast<BuiltinType>(T);
@@ -11037,7 +12373,7 @@ struct IntRange {
     if (const EnumType *ET = dyn_cast<EnumType>(T))
       T = C.getCanonicalType(ET->getDecl()->getIntegerType()).getTypePtr();
 
-    if (const auto *EIT = dyn_cast<ExtIntType>(T))
+    if (const auto *EIT = dyn_cast<BitIntType>(T))
       return IntRange(EIT->getNumBits(), EIT->isUnsigned());
 
     const BuiltinType *BT = cast<BuiltinType>(T);
@@ -11164,7 +12500,7 @@ static QualType GetExprType(const Expr *E) {
 ///
 /// \param MaxWidth The width to which the value will be truncated.
 /// \param Approximate If \c true, return a likely range for the result: in
-///        particular, assume that aritmetic on narrower types doesn't leave
+///        particular, assume that arithmetic on narrower types doesn't leave
 ///        those types. If \c false, return a range including all possible
 ///        result values.
 static IntRange GetExprRange(ASTContext &C, const Expr *E, unsigned MaxWidth,
@@ -11288,7 +12624,7 @@ static IntRange GetExprRange(ASTContext &C, const Expr *E, unsigned MaxWidth,
           return IntRange(R.Width, /*NonNegative*/ true);
         }
       }
-      LLVM_FALLTHROUGH;
+      [[fallthrough]];
 
     case BO_ShlAssign:
       return IntRange::forValueOfType(C, GetExprType(E));
@@ -11301,7 +12637,7 @@ static IntRange GetExprRange(ASTContext &C, const Expr *E, unsigned MaxWidth,
 
       // If the shift amount is a positive constant, drop the width by
       // that much.
-      if (Optional<llvm::APSInt> shift =
+      if (std::optional<llvm::APSInt> shift =
               BO->getRHS()->getIntegerConstantExpr(C)) {
         if (shift->isNonNegative()) {
           unsigned zext = shift->getZExtValue();
@@ -11346,7 +12682,7 @@ static IntRange GetExprRange(ASTContext &C, const Expr *E, unsigned MaxWidth,
                                 Approximate);
 
       // If the divisor is constant, use that.
-      if (Optional<llvm::APSInt> divisor =
+      if (std::optional<llvm::APSInt> divisor =
               BO->getRHS()->getIntegerConstantExpr(C)) {
         unsigned log2 = divisor->logBase2(); // floor(log_2(divisor))
         if (log2 >= L.Width)
@@ -11576,7 +12912,7 @@ struct PromotedRange {
     llvm_unreachable("impossible compare result");
   }
 
-  static llvm::Optional<StringRef>
+  static std::optional<StringRef>
   constantValue(BinaryOperatorKind Op, ComparisonResult R, bool ConstantOnRHS) {
     if (Op == BO_Cmp) {
       ComparisonResult LTFlag = LT, GTFlag = GT;
@@ -11585,7 +12921,7 @@ struct PromotedRange {
       if (R & EQ) return StringRef("'std::strong_ordering::equal'");
       if (R & LTFlag) return StringRef("'std::strong_ordering::less'");
       if (R & GTFlag) return StringRef("'std::strong_ordering::greater'");
-      return llvm::None;
+      return std::nullopt;
     }
 
     ComparisonResult TrueFlag, FalseFlag;
@@ -11610,7 +12946,7 @@ struct PromotedRange {
       return StringRef("true");
     if (R & FalseFlag)
       return StringRef("false");
-    return llvm::None;
+    return std::nullopt;
   }
 };
 }
@@ -11820,8 +13156,10 @@ static void AnalyzeComparison(Sema &S, BinaryOperator *E) {
   Expr *RHS = E->getRHS();
 
   if (T->isIntegralType(S.Context)) {
-    Optional<llvm::APSInt> RHSValue = RHS->getIntegerConstantExpr(S.Context);
-    Optional<llvm::APSInt> LHSValue = LHS->getIntegerConstantExpr(S.Context);
+    std::optional<llvm::APSInt> RHSValue =
+        RHS->getIntegerConstantExpr(S.Context);
+    std::optional<llvm::APSInt> LHSValue =
+        LHS->getIntegerConstantExpr(S.Context);
 
     // We don't care about expressions whose result is a constant.
     if (RHSValue && LHSValue)
@@ -11942,9 +13280,6 @@ static bool AnalyzeBitFieldAssignment(Sema &S, FieldDecl *Bitfield, Expr *Init,
     }
   }
 
-  if (Bitfield->getType()->isBooleanType())
-    return false;
-
   // Ignore value- or type-dependent expressions.
   if (Bitfield->getBitWidth()->isValueDependent() ||
       Bitfield->getBitWidth()->isTypeDependent() ||
@@ -12016,6 +13351,18 @@ static bool AnalyzeBitFieldAssignment(Sema &S, FieldDecl *Bitfield, Expr *Init,
 
   unsigned OriginalWidth = Value.getBitWidth();
 
+  // In C, the macro 'true' from stdbool.h will evaluate to '1'; To reduce
+  // false positives where the user is demonstrating they intend to use the
+  // bit-field as a Boolean, check to see if the value is 1 and we're assigning
+  // to a one-bit bit-field to see if the value came from a macro named 'true'.
+  bool OneAssignedToOneBitBitfield = FieldWidth == 1 && Value == 1;
+  if (OneAssignedToOneBitBitfield && !S.LangOpts.CPlusPlus) {
+    SourceLocation MaybeMacroLoc = OriginalInit->getBeginLoc();
+    if (S.SourceMgr.isInSystemMacro(MaybeMacroLoc) &&
+        S.findMacroSpelling(MaybeMacroLoc, "true"))
+      return false;
+  }
+
   if (!Value.isSigned() || Value.isNegative())
     if (UnaryOperator *UO = dyn_cast<UnaryOperator>(OriginalInit))
       if (UO->getOpcode() == UO_Minus || UO->getOpcode() == UO_Not)
@@ -12033,17 +13380,14 @@ static bool AnalyzeBitFieldAssignment(Sema &S, FieldDecl *Bitfield, Expr *Init,
   if (llvm::APSInt::isSameValue(Value, TruncatedValue))
     return false;
 
-  // Special-case bitfields of width 1: booleans are naturally 0/1, and
-  // therefore don't strictly fit into a signed bitfield of width 1.
-  if (FieldWidth == 1 && Value == 1)
-    return false;
-
   std::string PrettyValue = toString(Value, 10);
   std::string PrettyTrunc = toString(TruncatedValue, 10);
 
-  S.Diag(InitLoc, diag::warn_impcast_bitfield_precision_constant)
-    << PrettyValue << PrettyTrunc << OriginalInit->getType()
-    << Init->getSourceRange();
+  S.Diag(InitLoc, OneAssignedToOneBitBitfield
+                      ? diag::warn_impcast_single_bit_bitield_precision_constant
+                      : diag::warn_impcast_bitfield_precision_constant)
+      << PrettyValue << PrettyTrunc << OriginalInit->getType()
+      << Init->getSourceRange();
 
   return true;
 }
@@ -12329,9 +13673,10 @@ static void DiagnoseNullConversion(Sema &S, Expr *E, QualType T,
     return;
 
   // Check for NULL (GNUNull) or nullptr (CXX11_nullptr).
-  const Expr::NullPointerConstantKind NullKind =
-      E->isNullPointerConstant(S.Context, Expr::NPC_ValueDependentIsNotNull);
-  if (NullKind != Expr::NPCK_GNUNull && NullKind != Expr::NPCK_CXX11_nullptr)
+  const Expr *NewE = E->IgnoreParenImpCasts();
+  bool IsGNUNullExpr = isa<GNUNullExpr>(NewE);
+  bool HasNullPtrType = NewE->getType()->isNullPtrType();
+  if (!IsGNUNullExpr && !HasNullPtrType)
     return;
 
   // Return if target type is a safe conversion.
@@ -12348,7 +13693,7 @@ static void DiagnoseNullConversion(Sema &S, Expr *E, QualType T,
   CC = S.SourceMgr.getTopMacroCallerLoc(CC);
 
   // __null is usually wrapped in a macro.  Go up a macro if that is the case.
-  if (NullKind == Expr::NPCK_GNUNull && Loc.isMacroID()) {
+  if (IsGNUNullExpr && Loc.isMacroID()) {
     StringRef MacroName = Lexer::getImmediateMacroNameForDiagnostics(
         Loc, S.SourceMgr, S.getLangOpts());
     if (MacroName == "NULL")
@@ -12360,7 +13705,7 @@ static void DiagnoseNullConversion(Sema &S, Expr *E, QualType T,
     return;
 
   S.Diag(Loc, diag::warn_impcast_null_pointer_to_integer)
-      << (NullKind == Expr::NPCK_CXX11_nullptr) << T << SourceRange(CC)
+      << HasNullPtrType << T << SourceRange(CC)
       << FixItHint::CreateReplacement(Loc,
                                       S.getFixItZeroLiteralForType(T, Loc));
 }
@@ -12649,6 +13994,29 @@ static void CheckImplicitConversion(Sema &S, Expr *E, QualType T,
   const BuiltinType *SourceBT = dyn_cast<BuiltinType>(Source);
   const BuiltinType *TargetBT = dyn_cast<BuiltinType>(Target);
 
+  // Strip SVE vector types
+  if (SourceBT && SourceBT->isVLSTBuiltinType()) {
+    // Need the original target type for vector type checks
+    const Type *OriginalTarget = S.Context.getCanonicalType(T).getTypePtr();
+    // Handle conversion from scalable to fixed when msve-vector-bits is
+    // specified
+    if (S.Context.areCompatibleSveTypes(QualType(OriginalTarget, 0),
+                                        QualType(Source, 0)) ||
+        S.Context.areLaxCompatibleSveTypes(QualType(OriginalTarget, 0),
+                                           QualType(Source, 0)))
+      return;
+
+    // If the vector cast is cast between two vectors of the same size, it is
+    // a bitcast, not a conversion.
+    if (S.Context.getTypeSize(Source) == S.Context.getTypeSize(Target))
+      return;
+
+    Source = SourceBT->getSveEltType(S.Context).getTypePtr();
+  }
+
+  if (TargetBT && TargetBT->isVLSTBuiltinType())
+    Target = TargetBT->getSveEltType(S.Context).getTypePtr();
+
   // If the source is floating point...
   if (SourceBT && SourceBT->isFloatingPoint()) {
     // ...and the target is floating point...
@@ -12800,7 +14168,7 @@ static void CheckImplicitConversion(Sema &S, Expr *E, QualType T,
     if (SourcePrecision > 0 && TargetPrecision > 0 &&
         SourcePrecision > TargetPrecision) {
 
-      if (Optional<llvm::APSInt> SourceInt =
+      if (std::optional<llvm::APSInt> SourceInt =
               E->getIntegerConstantExpr(S.Context)) {
         // If the source integer is a constant, convert it to the target
         // floating point type. Issue a warning if the value changes
@@ -12934,9 +14302,10 @@ static void CheckImplicitConversion(Sema &S, Expr *E, QualType T,
     // Fall through for non-constants to give a sign conversion warning.
   }
 
-  if ((TargetRange.NonNegative && !LikelySourceRange.NonNegative) ||
-      (!TargetRange.NonNegative && LikelySourceRange.NonNegative &&
-       LikelySourceRange.Width == TargetRange.Width)) {
+  if ((!isa<EnumType>(Target) || !isa<EnumType>(Source)) &&
+      ((TargetRange.NonNegative && !LikelySourceRange.NonNegative) ||
+       (!TargetRange.NonNegative && LikelySourceRange.NonNegative &&
+        LikelySourceRange.Width == TargetRange.Width))) {
     if (S.SourceMgr.isInSystemMacro(CC))
       return;
 
@@ -13085,6 +14454,20 @@ static void AnalyzeImplicitConversions(
           << OrigE->getSourceRange() << T->isBooleanType()
           << FixItHint::CreateReplacement(UO->getBeginLoc(), "!");
 
+  if (const auto *BO = dyn_cast<BinaryOperator>(SourceExpr))
+    if ((BO->getOpcode() == BO_And || BO->getOpcode() == BO_Or) &&
+        BO->getLHS()->isKnownToHaveBooleanValue() &&
+        BO->getRHS()->isKnownToHaveBooleanValue() &&
+        BO->getLHS()->HasSideEffects(S.Context) &&
+        BO->getRHS()->HasSideEffects(S.Context)) {
+      S.Diag(BO->getBeginLoc(), diag::warn_bitwise_instead_of_logical)
+          << (BO->getOpcode() == BO_And ? "&" : "|") << OrigE->getSourceRange()
+          << FixItHint::CreateReplacement(
+                 BO->getOperatorLoc(),
+                 (BO->getOpcode() == BO_And ? "&&" : "||"));
+      S.Diag(BO->getBeginLoc(), diag::note_cast_operand_to_int);
+    }
+
   // For conditional operators, we analyze the arguments as if they
   // were being fed directly into the output.
   if (auto *CO = dyn_cast<AbstractConditionalOperator>(SourceExpr)) {
@@ -13153,6 +14536,13 @@ static void AnalyzeImplicitConversions(
     if (!ChildExpr)
       continue;
 
+    if (auto *CSE = dyn_cast<CoroutineSuspendExpr>(E))
+      if (ChildExpr == CSE->getOperand())
+        // Do not recurse over a CoroutineSuspendExpr's operand.
+        // The operand is also a subexpression of getCommonExpr(), and
+        // recursing into it directly would produce duplicate diagnostics.
+        continue;
+
     if (IsLogicalAndOperator &&
         isa<StringLiteral>(ChildExpr->IgnoreParenImpCasts()))
       // Ignore checking string literals that are in logical and operators.
@@ -13501,6 +14891,17 @@ void Sema::CheckForIntOverflow (Expr *E) {
       Exprs.append(Call->arg_begin(), Call->arg_end());
     else if (auto Message = dyn_cast<ObjCMessageExpr>(E))
       Exprs.append(Message->arg_begin(), Message->arg_end());
+    else if (auto Construct = dyn_cast<CXXConstructExpr>(E))
+      Exprs.append(Construct->arg_begin(), Construct->arg_end());
+    else if (auto Array = dyn_cast<ArraySubscriptExpr>(E))
+      Exprs.push_back(Array->getIdx());
+    else if (auto Compound = dyn_cast<CompoundLiteralExpr>(E))
+      Exprs.push_back(Compound->getInitializer());
+    else if (auto New = dyn_cast<CXXNewExpr>(E)) {
+      if (New->isArray())
+        if (auto ArraySize = New->getArraySize())
+          Exprs.push_back(*ArraySize);
+    }
   } while (!Exprs.empty());
 }
 
@@ -13604,7 +15005,7 @@ class SequenceChecker : public ConstEvaluatedExprVisitor<SequenceChecker> {
     const Expr *UsageExpr;
     SequenceTree::Seq Seq;
 
-    Usage() : UsageExpr(nullptr), Seq() {}
+    Usage() : UsageExpr(nullptr) {}
   };
 
   struct UsageInfo {
@@ -13613,7 +15014,7 @@ class SequenceChecker : public ConstEvaluatedExprVisitor<SequenceChecker> {
     /// Have we issued a diagnostic for this object already?
     bool Diagnosed;
 
-    UsageInfo() : Uses(), Diagnosed(false) {}
+    UsageInfo() : Diagnosed(false) {}
   };
   using UsageInfoMap = llvm::SmallDenseMap<Object, UsageInfo, 16>;
 
@@ -14367,8 +15768,8 @@ void Sema::CheckUnsequencedOperations(const Expr *E) {
 
 void Sema::CheckCompletedExpr(Expr *E, SourceLocation CheckLoc,
                               bool IsConstexpr) {
-  llvm::SaveAndRestore<bool> ConstantContext(
-      isConstantEvaluatedOverride, IsConstexpr || isa<ConstantExpr>(E));
+  llvm::SaveAndRestore ConstantContext(isConstantEvaluatedOverride,
+                                       IsConstexpr || isa<ConstantExpr>(E));
   CheckImplicitConversions(E, CheckLoc);
   if (!E->isInstantiationDependent())
     CheckUnsequencedOperations(E);
@@ -14493,8 +15894,11 @@ bool Sema::CheckParmsForFunctionDef(ArrayRef<ParmVarDecl *> Parameters,
   return HasInvalidParm;
 }
 
-Optional<std::pair<CharUnits, CharUnits>>
-static getBaseAlignmentAndOffsetFromPtr(const Expr *E, ASTContext &Ctx);
+std::optional<std::pair<
+    CharUnits, CharUnits>> static getBaseAlignmentAndOffsetFromPtr(const Expr
+                                                                       *E,
+                                                                   ASTContext
+                                                                       &Ctx);
 
 /// Compute the alignment and offset of the base class object given the
 /// derived-to-base cast expression and the alignment and offset of the derived
@@ -14528,21 +15932,21 @@ getDerivedToBaseAlignmentAndOffset(const CastExpr *CE, QualType DerivedType,
 }
 
 /// Compute the alignment and offset of a binary additive operator.
-static Optional<std::pair<CharUnits, CharUnits>>
+static std::optional<std::pair<CharUnits, CharUnits>>
 getAlignmentAndOffsetFromBinAddOrSub(const Expr *PtrE, const Expr *IntE,
                                      bool IsSub, ASTContext &Ctx) {
   QualType PointeeType = PtrE->getType()->getPointeeType();
 
   if (!PointeeType->isConstantSizeType())
-    return llvm::None;
+    return std::nullopt;
 
   auto P = getBaseAlignmentAndOffsetFromPtr(PtrE, Ctx);
 
   if (!P)
-    return llvm::None;
+    return std::nullopt;
 
   CharUnits EltSize = Ctx.getTypeSizeInChars(PointeeType);
-  if (Optional<llvm::APSInt> IdxRes = IntE->getIntegerConstantExpr(Ctx)) {
+  if (std::optional<llvm::APSInt> IdxRes = IntE->getIntegerConstantExpr(Ctx)) {
     CharUnits Offset = EltSize * IdxRes->getExtValue();
     if (IsSub)
       Offset = -Offset;
@@ -14559,8 +15963,10 @@ getAlignmentAndOffsetFromBinAddOrSub(const Expr *PtrE, const Expr *IntE,
 
 /// This helper function takes an lvalue expression and returns the alignment of
 /// a VarDecl and a constant offset from the VarDecl.
-Optional<std::pair<CharUnits, CharUnits>>
-static getBaseAlignmentAndOffsetFromLValue(const Expr *E, ASTContext &Ctx) {
+std::optional<std::pair<
+    CharUnits,
+    CharUnits>> static getBaseAlignmentAndOffsetFromLValue(const Expr *E,
+                                                           ASTContext &Ctx) {
   E = E->IgnoreParens();
   switch (E->getStmtClass()) {
   default:
@@ -14608,7 +16014,7 @@ static getBaseAlignmentAndOffsetFromLValue(const Expr *E, ASTContext &Ctx) {
     if (!FD || FD->getType()->isReferenceType() ||
         FD->getParent()->isInvalidDecl())
       break;
-    Optional<std::pair<CharUnits, CharUnits>> P;
+    std::optional<std::pair<CharUnits, CharUnits>> P;
     if (ME->isArrow())
       P = getBaseAlignmentAndOffsetFromPtr(ME->getBase(), Ctx);
     else
@@ -14642,13 +16048,16 @@ static getBaseAlignmentAndOffsetFromLValue(const Expr *E, ASTContext &Ctx) {
     break;
   }
   }
-  return llvm::None;
+  return std::nullopt;
 }
 
 /// This helper function takes a pointer expression and returns the alignment of
 /// a VarDecl and a constant offset from the VarDecl.
-Optional<std::pair<CharUnits, CharUnits>>
-static getBaseAlignmentAndOffsetFromPtr(const Expr *E, ASTContext &Ctx) {
+std::optional<std::pair<
+    CharUnits, CharUnits>> static getBaseAlignmentAndOffsetFromPtr(const Expr
+                                                                       *E,
+                                                                   ASTContext
+                                                                       &Ctx) {
   E = E->IgnoreParens();
   switch (E->getStmtClass()) {
   default:
@@ -14707,12 +16116,12 @@ static getBaseAlignmentAndOffsetFromPtr(const Expr *E, ASTContext &Ctx) {
     break;
   }
   }
-  return llvm::None;
+  return std::nullopt;
 }
 
 static CharUnits getPresumedAlignmentOfPointer(const Expr *E, Sema &S) {
   // See if we can compute the alignment of a VarDecl and an offset from it.
-  Optional<std::pair<CharUnits, CharUnits>> P =
+  std::optional<std::pair<CharUnits, CharUnits>> P =
       getBaseAlignmentAndOffsetFromPtr(E, S.Context);
 
   if (P)
@@ -14766,53 +16175,6 @@ void Sema::CheckCastAlign(Expr *Op, QualType T, SourceRange TRange) {
     << TRange << Op->getSourceRange();
 }
 
-/// Check whether this array fits the idiom of a size-one tail padded
-/// array member of a struct.
-///
-/// We avoid emitting out-of-bounds access warnings for such arrays as they are
-/// commonly used to emulate flexible arrays in C89 code.
-static bool IsTailPaddedMemberArray(Sema &S, const llvm::APInt &Size,
-                                    const NamedDecl *ND) {
-  if (Size != 1 || !ND) return false;
-
-  const FieldDecl *FD = dyn_cast<FieldDecl>(ND);
-  if (!FD) return false;
-
-  // Don't consider sizes resulting from macro expansions or template argument
-  // substitution to form C89 tail-padded arrays.
-
-  TypeSourceInfo *TInfo = FD->getTypeSourceInfo();
-  while (TInfo) {
-    TypeLoc TL = TInfo->getTypeLoc();
-    // Look through typedefs.
-    if (TypedefTypeLoc TTL = TL.getAs<TypedefTypeLoc>()) {
-      const TypedefNameDecl *TDL = TTL.getTypedefNameDecl();
-      TInfo = TDL->getTypeSourceInfo();
-      continue;
-    }
-    if (ConstantArrayTypeLoc CTL = TL.getAs<ConstantArrayTypeLoc>()) {
-      const Expr *SizeExpr = dyn_cast<IntegerLiteral>(CTL.getSizeExpr());
-      if (!SizeExpr || SizeExpr->getExprLoc().isMacroID())
-        return false;
-    }
-    break;
-  }
-
-  const RecordDecl *RD = dyn_cast<RecordDecl>(FD->getDeclContext());
-  if (!RD) return false;
-  if (RD->isUnion()) return false;
-  if (const CXXRecordDecl *CRD = dyn_cast<CXXRecordDecl>(RD)) {
-    if (!CRD->isStandardLayout()) return false;
-  }
-
-  // See if this is the last field decl in the record.
-  const Decl *D = FD;
-  while ((D = D->getNextDeclInContext()))
-    if (isa<FieldDecl>(D))
-      return false;
-  return true;
-}
-
 void Sema::CheckArrayAccess(const Expr *BaseExpr, const Expr *IndexExpr,
                             const ArraySubscriptExpr *ASE,
                             bool AllowOnePastEnd, bool IndexNegated) {
@@ -14830,9 +16192,15 @@ void Sema::CheckArrayAccess(const Expr *BaseExpr, const Expr *IndexExpr,
   const ConstantArrayType *ArrayTy =
       Context.getAsConstantArrayType(BaseExpr->getType());
 
+  LangOptions::StrictFlexArraysLevelKind
+    StrictFlexArraysLevel = getLangOpts().getStrictFlexArraysLevel();
+
   const Type *BaseType =
       ArrayTy == nullptr ? nullptr : ArrayTy->getElementType().getTypePtr();
-  bool IsUnboundedArray = (BaseType == nullptr);
+  bool IsUnboundedArray =
+      BaseType == nullptr || BaseExpr->isFlexibleArrayMemberLike(
+                                 Context, StrictFlexArraysLevel,
+                                 /*IgnoreTemplateOrMacroSubstitution=*/true);
   if (EffectiveType->isDependentType() ||
       (!IsUnboundedArray && BaseType->isDependentType()))
     return;
@@ -14847,21 +16215,16 @@ void Sema::CheckArrayAccess(const Expr *BaseExpr, const Expr *IndexExpr,
     index = -index;
   }
 
-  const NamedDecl *ND = nullptr;
-  if (const DeclRefExpr *DRE = dyn_cast<DeclRefExpr>(BaseExpr))
-    ND = DRE->getDecl();
-  if (const MemberExpr *ME = dyn_cast<MemberExpr>(BaseExpr))
-    ND = ME->getMemberDecl();
-
   if (IsUnboundedArray) {
+    if (EffectiveType->isFunctionType())
+      return;
     if (index.isUnsigned() || !index.isNegative()) {
       const auto &ASTC = getASTContext();
-      unsigned AddrBits =
-          ASTC.getTargetInfo().getPointerWidth(ASTC.getTargetAddressSpace(
-              EffectiveType->getCanonicalTypeInternal()));
+      unsigned AddrBits = ASTC.getTargetInfo().getPointerWidth(
+          EffectiveType->getCanonicalTypeInternal().getAddressSpace());
       if (index.getBitWidth() < AddrBits)
         index = index.zext(AddrBits);
-      Optional<CharUnits> ElemCharUnits =
+      std::optional<CharUnits> ElemCharUnits =
           ASTC.getTypeSizeInCharsIfKnown(EffectiveType);
       // PR50741 - If EffectiveType has unknown size (e.g., if it's a void
       // pointer) bounds-checking isn't meaningful.
@@ -14904,15 +16267,14 @@ void Sema::CheckArrayAccess(const Expr *BaseExpr, const Expr *IndexExpr,
                               << (unsigned)MaxElems.getLimitedValue(~0U)
                               << IndexExpr->getSourceRange());
 
-      if (!ND) {
-        // Try harder to find a NamedDecl to point at in the note.
-        while (const auto *ASE = dyn_cast<ArraySubscriptExpr>(BaseExpr))
-          BaseExpr = ASE->getBase()->IgnoreParenCasts();
-        if (const auto *DRE = dyn_cast<DeclRefExpr>(BaseExpr))
-          ND = DRE->getDecl();
-        if (const auto *ME = dyn_cast<MemberExpr>(BaseExpr))
-          ND = ME->getMemberDecl();
-      }
+      const NamedDecl *ND = nullptr;
+      // Try harder to find a NamedDecl to point at in the note.
+      while (const auto *ASE = dyn_cast<ArraySubscriptExpr>(BaseExpr))
+        BaseExpr = ASE->getBase()->IgnoreParenCasts();
+      if (const auto *DRE = dyn_cast<DeclRefExpr>(BaseExpr))
+        ND = DRE->getDecl();
+      if (const auto *ME = dyn_cast<MemberExpr>(BaseExpr))
+        ND = ME->getMemberDecl();
 
       if (ND)
         DiagRuntimeBehavior(ND->getBeginLoc(), BaseExpr,
@@ -14932,20 +16294,24 @@ void Sema::CheckArrayAccess(const Expr *BaseExpr, const Expr *IndexExpr,
       return;
 
     llvm::APInt size = ArrayTy->getSize();
-    if (!size.isStrictlyPositive())
-      return;
 
     if (BaseType != EffectiveType) {
-      // Make sure we're comparing apples to apples when comparing index to size
+      // Make sure we're comparing apples to apples when comparing index to
+      // size.
       uint64_t ptrarith_typesize = Context.getTypeSize(EffectiveType);
       uint64_t array_typesize = Context.getTypeSize(BaseType);
-      // Handle ptrarith_typesize being zero, such as when casting to void*
-      if (!ptrarith_typesize) ptrarith_typesize = 1;
+
+      // Handle ptrarith_typesize being zero, such as when casting to void*.
+      // Use the size in bits (what "getTypeSize()" returns) rather than bytes.
+      if (!ptrarith_typesize)
+        ptrarith_typesize = Context.getCharWidth();
+
       if (ptrarith_typesize != array_typesize) {
-        // There's a cast to a different size type involved
+        // There's a cast to a different size type involved.
         uint64_t ratio = array_typesize / ptrarith_typesize;
+
         // TODO: Be smarter about handling cases where array_typesize is not a
-        // multiple of ptrarith_typesize
+        // multiple of ptrarith_typesize.
         if (ptrarith_typesize * ratio == array_typesize)
           size *= llvm::APInt(size.getBitWidth(), ratio);
       }
@@ -14963,12 +16329,6 @@ void Sema::CheckArrayAccess(const Expr *BaseExpr, const Expr *IndexExpr,
     if (AllowOnePastEnd ? index.ule(size) : index.ult(size))
       return;
 
-    // Also don't warn for arrays of size 1 which are members of some
-    // structure. These are often used to approximate flexible arrays in C89
-    // code.
-    if (IsTailPaddedMemberArray(*this, size, ND))
-      return;
-
     // Suppress the warning if the subscript expression (as identified by the
     // ']' location) and the index expression are both from macro expansions
     // within a system header.
@@ -14985,12 +16345,13 @@ void Sema::CheckArrayAccess(const Expr *BaseExpr, const Expr *IndexExpr,
 
     unsigned DiagID = ASE ? diag::warn_array_index_exceeds_bounds
                           : diag::warn_ptr_arith_exceeds_bounds;
+    unsigned CastMsg = (!ASE || BaseType == EffectiveType) ? 0 : 1;
+    QualType CastMsgTy = ASE ? ASE->getLHS()->getType() : QualType();
 
-    DiagRuntimeBehavior(BaseExpr->getBeginLoc(), BaseExpr,
-                        PDiag(DiagID) << toString(index, 10, true)
-                                      << toString(size, 10, true)
-                                      << (unsigned)size.getLimitedValue(~0U)
-                                      << IndexExpr->getSourceRange());
+    DiagRuntimeBehavior(
+        BaseExpr->getBeginLoc(), BaseExpr,
+        PDiag(DiagID) << toString(index, 10, true) << ArrayTy->desugar()
+                      << CastMsg << CastMsgTy << IndexExpr->getSourceRange());
   } else {
     unsigned DiagID = diag::warn_array_index_precedes_bounds;
     if (!ASE) {
@@ -15003,15 +16364,14 @@ void Sema::CheckArrayAccess(const Expr *BaseExpr, const Expr *IndexExpr,
                                       << IndexExpr->getSourceRange());
   }
 
-  if (!ND) {
-    // Try harder to find a NamedDecl to point at in the note.
-    while (const auto *ASE = dyn_cast<ArraySubscriptExpr>(BaseExpr))
-      BaseExpr = ASE->getBase()->IgnoreParenCasts();
-    if (const auto *DRE = dyn_cast<DeclRefExpr>(BaseExpr))
-      ND = DRE->getDecl();
-    if (const auto *ME = dyn_cast<MemberExpr>(BaseExpr))
-      ND = ME->getMemberDecl();
-  }
+  const NamedDecl *ND = nullptr;
+  // Try harder to find a NamedDecl to point at in the note.
+  while (const auto *ASE = dyn_cast<ArraySubscriptExpr>(BaseExpr))
+    BaseExpr = ASE->getBase()->IgnoreParenCasts();
+  if (const auto *DRE = dyn_cast<DeclRefExpr>(BaseExpr))
+    ND = DRE->getDecl();
+  if (const auto *ME = dyn_cast<MemberExpr>(BaseExpr))
+    ND = ME->getMemberDecl();
 
   if (ND)
     DiagRuntimeBehavior(ND->getBeginLoc(), BaseExpr,
@@ -15236,7 +16596,7 @@ namespace {
           return;
         if (Expr *RHS = BinOp->getRHS()) {
           RHS = RHS->IgnoreParenCasts();
-          Optional<llvm::APSInt> Value;
+          std::optional<llvm::APSInt> Value;
           VarWillBeReased =
               (RHS && (Value = RHS->getIntegerConstantExpr(Context)) &&
                *Value == 0);
@@ -15317,21 +16677,21 @@ static bool isSetterLikeSelector(Selector sel) {
   return !isLowercase(str.front());
 }
 
-static Optional<int> GetNSMutableArrayArgumentIndex(Sema &S,
-                                                    ObjCMessageExpr *Message) {
+static std::optional<int>
+GetNSMutableArrayArgumentIndex(Sema &S, ObjCMessageExpr *Message) {
   bool IsMutableArray = S.NSAPIObj->isSubclassOfNSClass(
                                                 Message->getReceiverInterface(),
                                                 NSAPI::ClassId_NSMutableArray);
   if (!IsMutableArray) {
-    return None;
+    return std::nullopt;
   }
 
   Selector Sel = Message->getSelector();
 
-  Optional<NSAPI::NSArrayMethodKind> MKOpt =
-    S.NSAPIObj->getNSArrayMethodKind(Sel);
+  std::optional<NSAPI::NSArrayMethodKind> MKOpt =
+      S.NSAPIObj->getNSArrayMethodKind(Sel);
   if (!MKOpt) {
-    return None;
+    return std::nullopt;
   }
 
   NSAPI::NSArrayMethodKind MK = *MKOpt;
@@ -15345,28 +16705,27 @@ static Optional<int> GetNSMutableArrayArgumentIndex(Sema &S,
       return 1;
 
     default:
-      return None;
+      return std::nullopt;
   }
 
-  return None;
+  return std::nullopt;
 }
 
-static
-Optional<int> GetNSMutableDictionaryArgumentIndex(Sema &S,
-                                                  ObjCMessageExpr *Message) {
+static std::optional<int>
+GetNSMutableDictionaryArgumentIndex(Sema &S, ObjCMessageExpr *Message) {
   bool IsMutableDictionary = S.NSAPIObj->isSubclassOfNSClass(
                                             Message->getReceiverInterface(),
                                             NSAPI::ClassId_NSMutableDictionary);
   if (!IsMutableDictionary) {
-    return None;
+    return std::nullopt;
   }
 
   Selector Sel = Message->getSelector();
 
-  Optional<NSAPI::NSDictionaryMethodKind> MKOpt =
-    S.NSAPIObj->getNSDictionaryMethodKind(Sel);
+  std::optional<NSAPI::NSDictionaryMethodKind> MKOpt =
+      S.NSAPIObj->getNSDictionaryMethodKind(Sel);
   if (!MKOpt) {
-    return None;
+    return std::nullopt;
   }
 
   NSAPI::NSDictionaryMethodKind MK = *MKOpt;
@@ -15378,13 +16737,14 @@ Optional<int> GetNSMutableDictionaryArgumentIndex(Sema &S,
       return 0;
 
     default:
-      return None;
+      return std::nullopt;
   }
 
-  return None;
+  return std::nullopt;
 }
 
-static Optional<int> GetNSSetArgumentIndex(Sema &S, ObjCMessageExpr *Message) {
+static std::optional<int> GetNSSetArgumentIndex(Sema &S,
+                                                ObjCMessageExpr *Message) {
   bool IsMutableSet = S.NSAPIObj->isSubclassOfNSClass(
                                                 Message->getReceiverInterface(),
                                                 NSAPI::ClassId_NSMutableSet);
@@ -15393,14 +16753,15 @@ static Optional<int> GetNSSetArgumentIndex(Sema &S, ObjCMessageExpr *Message) {
                                             Message->getReceiverInterface(),
                                             NSAPI::ClassId_NSMutableOrderedSet);
   if (!IsMutableSet && !IsMutableOrderedSet) {
-    return None;
+    return std::nullopt;
   }
 
   Selector Sel = Message->getSelector();
 
-  Optional<NSAPI::NSSetMethodKind> MKOpt = S.NSAPIObj->getNSSetMethodKind(Sel);
+  std::optional<NSAPI::NSSetMethodKind> MKOpt =
+      S.NSAPIObj->getNSSetMethodKind(Sel);
   if (!MKOpt) {
-    return None;
+    return std::nullopt;
   }
 
   NSAPI::NSSetMethodKind MK = *MKOpt;
@@ -15415,7 +16776,7 @@ static Optional<int> GetNSSetArgumentIndex(Sema &S, ObjCMessageExpr *Message) {
       return 1;
   }
 
-  return None;
+  return std::nullopt;
 }
 
 void Sema::CheckObjCCircularContainer(ObjCMessageExpr *Message) {
@@ -15423,7 +16784,7 @@ void Sema::CheckObjCCircularContainer(ObjCMessageExpr *Message) {
     return;
   }
 
-  Optional<int> ArgOpt;
+  std::optional<int> ArgOpt;
 
   if (!(ArgOpt = GetNSMutableArrayArgumentIndex(*this, Message)) &&
       !(ArgOpt = GetNSMutableDictionaryArgumentIndex(*this, Message)) &&
@@ -15721,7 +17082,7 @@ void Sema::DiagnoseEmptyLoopBody(const Stmt *S,
     Body = FS->getBody();
     DiagID = diag::warn_empty_for_body;
   } else if (const WhileStmt *WS = dyn_cast<WhileStmt>(S)) {
-    StmtLoc = WS->getCond()->getSourceRange().getEnd();
+    StmtLoc = WS->getRParenLoc();
     Body = WS->getBody();
     DiagID = diag::warn_empty_while_body;
   } else
@@ -15813,9 +17174,15 @@ void Sema::DiagnoseSelfMove(const Expr *LHSExpr, const Expr *RHSExpr,
         RHSDeclRef->getDecl()->getCanonicalDecl())
       return;
 
-    Diag(OpLoc, diag::warn_self_move) << LHSExpr->getType()
-                                        << LHSExpr->getSourceRange()
-                                        << RHSExpr->getSourceRange();
+    auto D = Diag(OpLoc, diag::warn_self_move)
+             << LHSExpr->getType() << LHSExpr->getSourceRange()
+             << RHSExpr->getSourceRange();
+    if (const FieldDecl *F =
+            getSelfAssignmentClassMemberCandidate(RHSDeclRef->getDecl()))
+      D << 1 << F
+        << FixItHint::CreateInsertion(LHSDeclRef->getBeginLoc(), "this->");
+    else
+      D << 0;
     return;
   }
 
@@ -15850,16 +17217,16 @@ void Sema::DiagnoseSelfMove(const Expr *LHSExpr, const Expr *RHSExpr,
         RHSDeclRef->getDecl()->getCanonicalDecl())
       return;
 
-    Diag(OpLoc, diag::warn_self_move) << LHSExpr->getType()
-                                        << LHSExpr->getSourceRange()
-                                        << RHSExpr->getSourceRange();
+    Diag(OpLoc, diag::warn_self_move)
+        << LHSExpr->getType() << 0 << LHSExpr->getSourceRange()
+        << RHSExpr->getSourceRange();
     return;
   }
 
   if (isa<CXXThisExpr>(LHSBase) && isa<CXXThisExpr>(RHSBase))
-    Diag(OpLoc, diag::warn_self_move) << LHSExpr->getType()
-                                        << LHSExpr->getSourceRange()
-                                        << RHSExpr->getSourceRange();
+    Diag(OpLoc, diag::warn_self_move)
+        << LHSExpr->getType() << 0 << LHSExpr->getSourceRange()
+        << RHSExpr->getSourceRange();
 }
 
 //===--- Layout compatibility ----------------------------------------------//
@@ -16025,7 +17392,7 @@ static bool isLayoutCompatible(ASTContext &C, QualType T1, QualType T2) {
 ///
 /// \param MagicValue Type tag magic value.
 ///
-/// \param isConstantEvaluated wether the evalaution should be performed in
+/// \param isConstantEvaluated whether the evalaution should be performed in
 
 /// constant context.
 static bool FindTypeTagExpr(const Expr *TypeExpr, const ASTContext &Ctx,
@@ -16105,7 +17472,7 @@ static bool FindTypeTagExpr(const Expr *TypeExpr, const ASTContext &Ctx,
 ///
 /// \param TypeInfo Information about the corresponding C type.
 ///
-/// \param isConstantEvaluated wether the evalaution should be performed in
+/// \param isConstantEvaluated whether the evalaution should be performed in
 /// constant context.
 ///
 /// \returns true if the corresponding C type was found.
@@ -16298,15 +17665,15 @@ void Sema::DiagnoseMisalignedMembers() {
 
 void Sema::DiscardMisalignedMemberAddress(const Type *T, Expr *E) {
   E = E->IgnoreParens();
-  if (!T->isPointerType() && !T->isIntegerType())
+  if (!T->isPointerType() && !T->isIntegerType() && !T->isDependentType())
     return;
   if (isa<UnaryOperator>(E) &&
       cast<UnaryOperator>(E)->getOpcode() == UO_AddrOf) {
     auto *Op = cast<UnaryOperator>(E)->getSubExpr()->IgnoreParens();
     if (isa<MemberExpr>(Op)) {
-      auto MA = llvm::find(MisalignedMembers, MisalignedMember(Op));
+      auto *MA = llvm::find(MisalignedMembers, MisalignedMember(Op));
       if (MA != MisalignedMembers.end() &&
-          (T->isIntegerType() ||
+          (T->isDependentType() || T->isIntegerType() ||
            (T->isPointerType() && (T->getPointeeType()->isIncompleteType() ||
                                    Context.getTypeAlignInChars(
                                        T->getPointeeType()) <= MA->Alignment))))
@@ -16378,10 +17745,8 @@ void Sema::RefersToMemberWithReducedAlignment(
 
   // Synthesize offset of the whole access.
   CharUnits Offset;
-  for (auto I = ReverseMemberChain.rbegin(); I != ReverseMemberChain.rend();
-       I++) {
-    Offset += Context.toCharUnitsFromBits(Context.getFieldOffset(*I));
-  }
+  for (const FieldDecl *FD : llvm::reverse(ReverseMemberChain))
+    Offset += Context.toCharUnitsFromBits(Context.getFieldOffset(FD));
 
   // Compute the CompleteObjectAlignment as the alignment of the whole chain.
   CharUnits CompleteObjectAlignment = Context.getTypeAlignInChars(
@@ -16434,6 +17799,66 @@ void Sema::CheckAddressOfPackedMember(Expr *rhs) {
                      _2, _3, _4));
 }
 
+bool Sema::PrepareBuiltinElementwiseMathOneArgCall(CallExpr *TheCall) {
+  if (checkArgCount(*this, TheCall, 1))
+    return true;
+
+  ExprResult A = UsualUnaryConversions(TheCall->getArg(0));
+  if (A.isInvalid())
+    return true;
+
+  TheCall->setArg(0, A.get());
+  QualType TyA = A.get()->getType();
+
+  if (checkMathBuiltinElementType(*this, A.get()->getBeginLoc(), TyA))
+    return true;
+
+  TheCall->setType(TyA);
+  return false;
+}
+
+bool Sema::SemaBuiltinElementwiseMath(CallExpr *TheCall) {
+  if (checkArgCount(*this, TheCall, 2))
+    return true;
+
+  ExprResult A = TheCall->getArg(0);
+  ExprResult B = TheCall->getArg(1);
+  // Do standard promotions between the two arguments, returning their common
+  // type.
+  QualType Res =
+      UsualArithmeticConversions(A, B, TheCall->getExprLoc(), ACK_Comparison);
+  if (A.isInvalid() || B.isInvalid())
+    return true;
+
+  QualType TyA = A.get()->getType();
+  QualType TyB = B.get()->getType();
+
+  if (Res.isNull() || TyA.getCanonicalType() != TyB.getCanonicalType())
+    return Diag(A.get()->getBeginLoc(),
+                diag::err_typecheck_call_different_arg_types)
+           << TyA << TyB;
+
+  if (checkMathBuiltinElementType(*this, A.get()->getBeginLoc(), TyA))
+    return true;
+
+  TheCall->setArg(0, A.get());
+  TheCall->setArg(1, B.get());
+  TheCall->setType(Res);
+  return false;
+}
+
+bool Sema::PrepareBuiltinReduceMathOneArgCall(CallExpr *TheCall) {
+  if (checkArgCount(*this, TheCall, 1))
+    return true;
+
+  ExprResult A = UsualUnaryConversions(TheCall->getArg(0));
+  if (A.isInvalid())
+    return true;
+
+  TheCall->setArg(0, A.get());
+  return false;
+}
+
 ExprResult Sema::SemaBuiltinMatrixTranspose(CallExpr *TheCall,
                                             ExprResult CallResult) {
   if (checkArgCount(*this, TheCall, 1))
@@ -16446,7 +17871,8 @@ ExprResult Sema::SemaBuiltinMatrixTranspose(CallExpr *TheCall,
 
   auto *MType = Matrix->getType()->getAs<ConstantMatrixType>();
   if (!MType) {
-    Diag(Matrix->getBeginLoc(), diag::err_builtin_matrix_arg);
+    Diag(Matrix->getBeginLoc(), diag::err_builtin_invalid_arg_type)
+        << 1 << /* matrix ty*/ 1 << Matrix->getType();
     return ExprError();
   }
 
@@ -16464,10 +17890,10 @@ ExprResult Sema::SemaBuiltinMatrixTranspose(CallExpr *TheCall,
 }
 
 // Get and verify the matrix dimensions.
-static llvm::Optional<unsigned>
+static std::optional<unsigned>
 getAndVerifyMatrixDimension(Expr *Expr, StringRef Name, Sema &S) {
   SourceLocation ErrorPos;
-  Optional<llvm::APSInt> Value =
+  std::optional<llvm::APSInt> Value =
       Expr->getIntegerConstantExpr(S.Context, &ErrorPos);
   if (!Value) {
     S.Diag(Expr->getBeginLoc(), diag::err_builtin_matrix_scalar_unsigned_arg)
@@ -16517,15 +17943,16 @@ ExprResult Sema::SemaBuiltinMatrixColumnMajorLoad(CallExpr *TheCall,
   auto *PtrTy = PtrExpr->getType()->getAs<PointerType>();
   QualType ElementTy;
   if (!PtrTy) {
-    Diag(PtrExpr->getBeginLoc(), diag::err_builtin_matrix_pointer_arg)
-        << PtrArgIdx + 1;
+    Diag(PtrExpr->getBeginLoc(), diag::err_builtin_invalid_arg_type)
+        << PtrArgIdx + 1 << /*pointer to element ty*/ 2 << PtrExpr->getType();
     ArgError = true;
   } else {
     ElementTy = PtrTy->getPointeeType().getUnqualifiedType();
 
     if (!ConstantMatrixType::isValidElementType(ElementTy)) {
-      Diag(PtrExpr->getBeginLoc(), diag::err_builtin_matrix_pointer_arg)
-          << PtrArgIdx + 1;
+      Diag(PtrExpr->getBeginLoc(), diag::err_builtin_invalid_arg_type)
+          << PtrArgIdx + 1 << /* pointer to element ty*/ 2
+          << PtrExpr->getType();
       ArgError = true;
     }
   }
@@ -16554,7 +17981,7 @@ ExprResult Sema::SemaBuiltinMatrixColumnMajorLoad(CallExpr *TheCall,
   } else
     ColumnsExpr = nullptr;
 
-  // If any any part of the result matrix type is still pending, just use
+  // If any part of the result matrix type is still pending, just use
   // Context.DependentTy, until all parts are resolved.
   if ((RowsExpr && RowsExpr->isTypeDependent()) ||
       (ColumnsExpr && ColumnsExpr->isTypeDependent())) {
@@ -16562,12 +17989,12 @@ ExprResult Sema::SemaBuiltinMatrixColumnMajorLoad(CallExpr *TheCall,
     return CallResult;
   }
 
-  // Check row and column dimenions.
-  llvm::Optional<unsigned> MaybeRows;
+  // Check row and column dimensions.
+  std::optional<unsigned> MaybeRows;
   if (RowsExpr)
     MaybeRows = getAndVerifyMatrixDimension(RowsExpr, "row", *this);
 
-  llvm::Optional<unsigned> MaybeColumns;
+  std::optional<unsigned> MaybeColumns;
   if (ColumnsExpr)
     MaybeColumns = getAndVerifyMatrixDimension(ColumnsExpr, "column", *this);
 
@@ -16579,7 +18006,7 @@ ExprResult Sema::SemaBuiltinMatrixColumnMajorLoad(CallExpr *TheCall,
   TheCall->setArg(3, StrideExpr);
 
   if (MaybeRows) {
-    if (Optional<llvm::APSInt> Value =
+    if (std::optional<llvm::APSInt> Value =
             StrideExpr->getIntegerConstantExpr(Context)) {
       uint64_t Stride = Value->getZExtValue();
       if (Stride < *MaybeRows) {
@@ -16624,7 +18051,8 @@ ExprResult Sema::SemaBuiltinMatrixColumnMajorStore(CallExpr *TheCall,
 
   auto *MatrixTy = MatrixExpr->getType()->getAs<ConstantMatrixType>();
   if (!MatrixTy) {
-    Diag(MatrixExpr->getBeginLoc(), diag::err_builtin_matrix_arg) << 0;
+    Diag(MatrixExpr->getBeginLoc(), diag::err_builtin_invalid_arg_type)
+        << 1 << /*matrix ty */ 1 << MatrixExpr->getType();
     ArgError = true;
   }
 
@@ -16643,8 +18071,8 @@ ExprResult Sema::SemaBuiltinMatrixColumnMajorStore(CallExpr *TheCall,
   // Check pointer argument.
   auto *PtrTy = PtrExpr->getType()->getAs<PointerType>();
   if (!PtrTy) {
-    Diag(PtrExpr->getBeginLoc(), diag::err_builtin_matrix_pointer_arg)
-        << PtrArgIdx + 1;
+    Diag(PtrExpr->getBeginLoc(), diag::err_builtin_invalid_arg_type)
+        << PtrArgIdx + 1 << /*pointer to element ty*/ 2 << PtrExpr->getType();
     ArgError = true;
   } else {
     QualType ElementTy = PtrTy->getPointeeType();
@@ -16678,7 +18106,7 @@ ExprResult Sema::SemaBuiltinMatrixColumnMajorStore(CallExpr *TheCall,
 
   // Check stride argument.
   if (MatrixTy) {
-    if (Optional<llvm::APSInt> Value =
+    if (std::optional<llvm::APSInt> Value =
             StrideExpr->getIntegerConstantExpr(Context)) {
       uint64_t Stride = Value->getZExtValue();
       if (Stride < MatrixTy->getNumRows()) {
@@ -16699,33 +18127,28 @@ ExprResult Sema::SemaBuiltinMatrixColumnMajorStore(CallExpr *TheCall,
 /// CheckTCBEnforcement - Enforces that every function in a named TCB only
 /// directly calls other functions in the same TCB as marked by the enforce_tcb
 /// and enforce_tcb_leaf attributes.
-void Sema::CheckTCBEnforcement(const CallExpr *TheCall,
-                               const FunctionDecl *Callee) {
-  const FunctionDecl *Caller = getCurFunctionDecl();
+void Sema::CheckTCBEnforcement(const SourceLocation CallExprLoc,
+                               const NamedDecl *Callee) {
+  const NamedDecl *Caller = getCurFunctionOrMethodDecl();
 
-  // Calls to builtins are not enforced.
-  if (!Caller || !Caller->hasAttr<EnforceTCBAttr>() ||
-      Callee->getBuiltinID() != 0)
+  if (!Caller || !Caller->hasAttr<EnforceTCBAttr>())
     return;
 
   // Search through the enforce_tcb and enforce_tcb_leaf attributes to find
   // all TCBs the callee is a part of.
   llvm::StringSet<> CalleeTCBs;
-  for_each(Callee->specific_attrs<EnforceTCBAttr>(),
-           [&](const auto *A) { CalleeTCBs.insert(A->getTCBName()); });
-  for_each(Callee->specific_attrs<EnforceTCBLeafAttr>(),
-           [&](const auto *A) { CalleeTCBs.insert(A->getTCBName()); });
+  for (const auto *A : Callee->specific_attrs<EnforceTCBAttr>())
+    CalleeTCBs.insert(A->getTCBName());
+  for (const auto *A : Callee->specific_attrs<EnforceTCBLeafAttr>())
+    CalleeTCBs.insert(A->getTCBName());
 
   // Go through the TCBs the caller is a part of and emit warnings if Caller
   // is in a TCB that the Callee is not.
-  for_each(
-      Caller->specific_attrs<EnforceTCBAttr>(),
-      [&](const auto *A) {
-        StringRef CallerTCB = A->getTCBName();
-        if (CalleeTCBs.count(CallerTCB) == 0) {
-          this->Diag(TheCall->getExprLoc(),
-                     diag::warn_tcb_enforcement_violation) << Callee
-                                                           << CallerTCB;
-        }
-      });
+  for (const auto *A : Caller->specific_attrs<EnforceTCBAttr>()) {
+    StringRef CallerTCB = A->getTCBName();
+    if (CalleeTCBs.count(CallerTCB) == 0) {
+      this->Diag(CallExprLoc, diag::warn_tcb_enforcement_violation)
+          << Callee << CallerTCB;
+    }
+  }
 }
diff --git a/gnu/llvm/clang/lib/Sema/SemaDeclAttr.cpp b/gnu/llvm/clang/lib/Sema/SemaDeclAttr.cpp
index 18424f305a6..54c8f898cdd 100644
--- a/gnu/llvm/clang/lib/Sema/SemaDeclAttr.cpp
+++ b/gnu/llvm/clang/lib/Sema/SemaDeclAttr.cpp
@@ -24,6 +24,8 @@
 #include "clang/AST/Type.h"
 #include "clang/Basic/CharInfo.h"
 #include "clang/Basic/DarwinSDKInfo.h"
+#include "clang/Basic/HLSLRuntime.h"
+#include "clang/Basic/LangOptions.h"
 #include "clang/Basic/SourceLocation.h"
 #include "clang/Basic/SourceManager.h"
 #include "clang/Basic/TargetBuiltins.h"
@@ -37,7 +39,6 @@
 #include "clang/Sema/Scope.h"
 #include "clang/Sema/ScopeInfo.h"
 #include "clang/Sema/SemaInternal.h"
-#include "llvm/ADT/Optional.h"
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/StringExtras.h"
 #include "llvm/IR/Assumptions.h"
@@ -45,6 +46,7 @@
 #include "llvm/Support/Error.h"
 #include "llvm/Support/MathExtras.h"
 #include "llvm/Support/raw_ostream.h"
+#include <optional>
 
 using namespace clang;
 using namespace sema;
@@ -200,7 +202,7 @@ static unsigned getNumAttributeArgs(const ParsedAttr &AL) {
 /// A helper function to provide Attribute Location for the Attr types
 /// AND the ParsedAttr.
 template <typename AttrInfo>
-static std::enable_if_t<std::is_base_of<Attr, AttrInfo>::value, SourceLocation>
+static std::enable_if_t<std::is_base_of_v<Attr, AttrInfo>, SourceLocation>
 getAttrLoc(const AttrInfo &AL) {
   return AL.getLocation();
 }
@@ -215,8 +217,8 @@ template <typename AttrInfo>
 static bool checkUInt32Argument(Sema &S, const AttrInfo &AI, const Expr *Expr,
                                 uint32_t &Val, unsigned Idx = UINT_MAX,
                                 bool StrictlyUnsigned = false) {
-  Optional<llvm::APSInt> I = llvm::APSInt(32);
-  if (Expr->isTypeDependent() || Expr->isValueDependent() ||
+  std::optional<llvm::APSInt> I = llvm::APSInt(32);
+  if (Expr->isTypeDependent() ||
       !(I = Expr->getIntegerConstantExpr(S.Context))) {
     if (Idx != UINT_MAX)
       S.Diag(getAttrLoc(AI), diag::err_attribute_argument_n_type)
@@ -307,8 +309,8 @@ static bool checkFunctionOrMethodParameterIndex(
   unsigned NumParams =
       (HP ? getFunctionOrMethodNumParams(D) : 0) + HasImplicitThisParam;
 
-  Optional<llvm::APSInt> IdxInt;
-  if (IdxExpr->isTypeDependent() || IdxExpr->isValueDependent() ||
+  std::optional<llvm::APSInt> IdxInt;
+  if (IdxExpr->isTypeDependent() ||
       !(IdxInt = IdxExpr->getIntegerConstantExpr(S.Context))) {
     S.Diag(getAttrLoc(AI), diag::err_attribute_argument_n_type)
         << &AI << AttrArgNum << AANT_ArgumentIntegerConstant
@@ -334,6 +336,26 @@ static bool checkFunctionOrMethodParameterIndex(
   return true;
 }
 
+/// Check if the argument \p E is a ASCII string literal. If not emit an error
+/// and return false, otherwise set \p Str to the value of the string literal
+/// and return true.
+bool Sema::checkStringLiteralArgumentAttr(const AttributeCommonInfo &CI,
+                                          const Expr *E, StringRef &Str,
+                                          SourceLocation *ArgLocation) {
+  const auto *Literal = dyn_cast<StringLiteral>(E->IgnoreParenCasts());
+  if (ArgLocation)
+    *ArgLocation = E->getBeginLoc();
+
+  if (!Literal || !Literal->isOrdinary()) {
+    Diag(E->getBeginLoc(), diag::err_attribute_argument_type)
+        << CI << AANT_ArgumentString;
+    return false;
+  }
+
+  Str = Literal->getString();
+  return true;
+}
+
 /// Check if the argument \p ArgNum of \p Attr is a ASCII string literal.
 /// If not emit an error and return false. If the argument is an identifier it
 /// will emit an error with a fixit hint and treat it as if it was a string
@@ -356,18 +378,7 @@ bool Sema::checkStringLiteralArgumentAttr(const ParsedAttr &AL, unsigned ArgNum,
 
   // Now check for an actual string literal.
   Expr *ArgExpr = AL.getArgAsExpr(ArgNum);
-  const auto *Literal = dyn_cast<StringLiteral>(ArgExpr->IgnoreParenCasts());
-  if (ArgLocation)
-    *ArgLocation = ArgExpr->getBeginLoc();
-
-  if (!Literal || !Literal->isAscii()) {
-    Diag(ArgExpr->getBeginLoc(), diag::err_attribute_argument_type)
-        << AL << AANT_ArgumentString;
-    return false;
-  }
-
-  Str = Literal->getString();
-  return true;
+  return checkStringLiteralArgumentAttr(AL, ArgExpr, Str, ArgLocation);
 }
 
 /// Applies the given attribute to the Decl without performing any
@@ -610,7 +621,7 @@ static void checkAttrArgsAreCapabilityObjs(Sema &S, Decl *D,
 
     if (const auto *StrLit = dyn_cast<StringLiteral>(ArgExp)) {
       if (StrLit->getLength() == 0 ||
-          (StrLit->isAscii() && StrLit->getString() == StringRef("*"))) {
+          (StrLit->isOrdinary() && StrLit->getString() == StringRef("*"))) {
         // Pass empty strings to the analyzer without warnings.
         // Treat "*" as the universal lock.
         Args.push_back(ArgExp);
@@ -947,6 +958,14 @@ static void handleEnableIfAttr(Sema &S, Decl *D, const ParsedAttr &AL) {
     D->addAttr(::new (S.Context) EnableIfAttr(S.Context, AL, Cond, Msg));
 }
 
+static void handleErrorAttr(Sema &S, Decl *D, const ParsedAttr &AL) {
+  StringRef NewUserDiagnostic;
+  if (!S.checkStringLiteralArgumentAttr(AL, 0, NewUserDiagnostic))
+    return;
+  if (ErrorAttr *EA = S.mergeErrorAttr(D, AL, NewUserDiagnostic))
+    D->addAttr(EA);
+}
+
 namespace {
 /// Determines if a given Expr references any of the given function's
 /// ParmVarDecls, or the function's implicit `this` parameter (if applicable).
@@ -993,6 +1012,84 @@ public:
 };
 }
 
+static void handleDiagnoseAsBuiltinAttr(Sema &S, Decl *D,
+                                        const ParsedAttr &AL) {
+  const auto *DeclFD = cast<FunctionDecl>(D);
+
+  if (const auto *MethodDecl = dyn_cast<CXXMethodDecl>(DeclFD))
+    if (!MethodDecl->isStatic()) {
+      S.Diag(AL.getLoc(), diag::err_attribute_no_member_function) << AL;
+      return;
+    }
+
+  auto DiagnoseType = [&](unsigned Index, AttributeArgumentNType T) {
+    SourceLocation Loc = [&]() {
+      auto Union = AL.getArg(Index - 1);
+      if (Union.is<Expr *>())
+        return Union.get<Expr *>()->getBeginLoc();
+      return Union.get<IdentifierLoc *>()->Loc;
+    }();
+
+    S.Diag(Loc, diag::err_attribute_argument_n_type) << AL << Index << T;
+  };
+
+  FunctionDecl *AttrFD = [&]() -> FunctionDecl * {
+    if (!AL.isArgExpr(0))
+      return nullptr;
+    auto *F = dyn_cast_or_null<DeclRefExpr>(AL.getArgAsExpr(0));
+    if (!F)
+      return nullptr;
+    return dyn_cast_or_null<FunctionDecl>(F->getFoundDecl());
+  }();
+
+  if (!AttrFD || !AttrFD->getBuiltinID(true)) {
+    DiagnoseType(1, AANT_ArgumentBuiltinFunction);
+    return;
+  }
+
+  if (AttrFD->getNumParams() != AL.getNumArgs() - 1) {
+    S.Diag(AL.getLoc(), diag::err_attribute_wrong_number_arguments_for)
+        << AL << AttrFD << AttrFD->getNumParams();
+    return;
+  }
+
+  SmallVector<unsigned, 8> Indices;
+
+  for (unsigned I = 1; I < AL.getNumArgs(); ++I) {
+    if (!AL.isArgExpr(I)) {
+      DiagnoseType(I + 1, AANT_ArgumentIntegerConstant);
+      return;
+    }
+
+    const Expr *IndexExpr = AL.getArgAsExpr(I);
+    uint32_t Index;
+
+    if (!checkUInt32Argument(S, AL, IndexExpr, Index, I + 1, false))
+      return;
+
+    if (Index > DeclFD->getNumParams()) {
+      S.Diag(AL.getLoc(), diag::err_attribute_bounds_for_function)
+          << AL << Index << DeclFD << DeclFD->getNumParams();
+      return;
+    }
+
+    QualType T1 = AttrFD->getParamDecl(I - 1)->getType();
+    QualType T2 = DeclFD->getParamDecl(Index - 1)->getType();
+
+    if (T1.getCanonicalType().getUnqualifiedType() !=
+        T2.getCanonicalType().getUnqualifiedType()) {
+      S.Diag(IndexExpr->getBeginLoc(), diag::err_attribute_parameter_types)
+          << AL << Index << DeclFD << T2 << I << AttrFD << T1;
+      return;
+    }
+
+    Indices.push_back(Index - 1);
+  }
+
+  D->addAttr(::new (S.Context) DiagnoseAsBuiltinAttr(
+      S.Context, AL, AttrFD, Indices.data(), Indices.size()));
+}
+
 static void handleDiagnoseIfAttr(Sema &S, Decl *D, const ParsedAttr &AL) {
   S.Diag(AL.getLoc(), diag::ext_clang_diagnose_if);
 
@@ -1308,9 +1405,9 @@ static void handlePackedAttr(Sema &S, Decl *D, const ParsedAttr &AL) {
                                 FD->isBitField() &&
                                 S.Context.getTypeAlign(FD->getType()) <= 8);
 
-    if (S.getASTContext().getTargetInfo().getTriple().isPS4()) {
+    if (S.getASTContext().getTargetInfo().getTriple().isPS()) {
       if (BitfieldByteAligned)
-        // The PS4 target needs to maintain ABI backwards compatibility.
+        // The PS4/PS5 targets need to maintain ABI backwards compatibility.
         S.Diag(AL.getLoc(), diag::warn_attribute_ignored_for_field_of_type)
             << AL << FD->getType();
       else
@@ -1593,7 +1690,7 @@ void Sema::AddAssumeAlignedAttr(Decl *D, const AttributeCommonInfo &CI, Expr *E,
   }
 
   if (!E->isValueDependent()) {
-    Optional<llvm::APSInt> I = llvm::APSInt(64);
+    std::optional<llvm::APSInt> I = llvm::APSInt(64);
     if (!(I = E->getIntegerConstantExpr(Context))) {
       if (OE)
         Diag(AttrLoc, diag::err_attribute_argument_n_type)
@@ -1780,15 +1877,14 @@ static void handleOwnershipAttr(Sema &S, Decl *D, const ParsedAttr &AL) {
     for (const auto *I : D->specific_attrs<OwnershipAttr>()) {
       // Cannot have two ownership attributes of different kinds for the same
       // index.
-      if (I->getOwnKind() != K && I->args_end() !=
-          std::find(I->args_begin(), I->args_end(), Idx)) {
+      if (I->getOwnKind() != K && llvm::is_contained(I->args(), Idx)) {
         S.Diag(AL.getLoc(), diag::err_attributes_are_not_compatible) << AL << I;
         return;
       } else if (K == OwnershipAttr::Returns &&
                  I->getOwnKind() == OwnershipAttr::Returns) {
         // A returns attribute conflicts with any other returns attribute using
         // a different index.
-        if (std::find(I->args_begin(), I->args_end(), Idx) == I->args_end()) {
+        if (!llvm::is_contained(I->args(), Idx)) {
           S.Diag(I->getLocation(), diag::err_ownership_returns_index_mismatch)
               << I->args_begin()->getSourceIndex();
           if (I->args_size())
@@ -1957,6 +2053,28 @@ static void handleRestrictAttr(Sema &S, Decl *D, const ParsedAttr &AL) {
 }
 
 static void handleCPUSpecificAttr(Sema &S, Decl *D, const ParsedAttr &AL) {
+  // Ensure we don't combine these with themselves, since that causes some
+  // confusing behavior.
+  if (AL.getParsedKind() == ParsedAttr::AT_CPUDispatch) {
+    if (checkAttrMutualExclusion<CPUSpecificAttr>(S, D, AL))
+      return;
+
+    if (const auto *Other = D->getAttr<CPUDispatchAttr>()) {
+      S.Diag(AL.getLoc(), diag::err_disallowed_duplicate_attribute) << AL;
+      S.Diag(Other->getLocation(), diag::note_conflicting_attribute);
+      return;
+    }
+  } else if (AL.getParsedKind() == ParsedAttr::AT_CPUSpecific) {
+    if (checkAttrMutualExclusion<CPUDispatchAttr>(S, D, AL))
+      return;
+
+    if (const auto *Other = D->getAttr<CPUSpecificAttr>()) {
+      S.Diag(AL.getLoc(), diag::err_disallowed_duplicate_attribute) << AL;
+      S.Diag(Other->getLocation(), diag::note_conflicting_attribute);
+      return;
+    }
+  }
+
   FunctionDecl *FD = cast<FunctionDecl>(D);
 
   if (const auto *MD = dyn_cast<CXXMethodDecl>(D)) {
@@ -2041,6 +2159,14 @@ static void handleNakedAttr(Sema &S, Decl *D, const ParsedAttr &AL) {
           << AL << Triple.getArchName();
       return;
     }
+
+    // This form is not allowed to be written on a member function (static or
+    // nonstatic) when in Microsoft compatibility mode.
+    if (S.getLangOpts().MSVCCompat && isa<CXXMethodDecl>(D)) {
+      S.Diag(AL.getLoc(), diag::err_attribute_wrong_decl_type_str)
+          << AL << "non-member functions";
+      return;
+    }
   }
 
   D->addAttr(::new (S.Context) NakedAttr(S.Context, AL));
@@ -2058,6 +2184,21 @@ static void handleNoReturnAttr(Sema &S, Decl *D, const ParsedAttr &Attrs) {
   D->addAttr(::new (S.Context) NoReturnAttr(S.Context, Attrs));
 }
 
+static void handleStandardNoReturnAttr(Sema &S, Decl *D, const ParsedAttr &A) {
+  // The [[_Noreturn]] spelling is deprecated in C2x, so if that was used,
+  // issue an appropriate diagnostic. However, don't issue a diagnostic if the
+  // attribute name comes from a macro expansion. We don't want to punish users
+  // who write [[noreturn]] after including <stdnoreturn.h> (where 'noreturn'
+  // is defined as a macro which expands to '_Noreturn').
+  if (!S.getLangOpts().CPlusPlus &&
+      A.getSemanticSpelling() == CXX11NoReturnAttr::C2x_Noreturn &&
+      !(A.getLoc().isMacroID() &&
+        S.getSourceManager().isInSystemMacro(A.getLoc())))
+    S.Diag(A.getLoc(), diag::warn_deprecated_noreturn_spelling) << A.getRange();
+
+  D->addAttr(::new (S.Context) CXX11NoReturnAttr(S.Context, A));
+}
+
 static void handleNoCfCheckAttr(Sema &S, Decl *D, const ParsedAttr &Attrs) {
   if (!S.getLangOpts().CFProtectionBranch)
     S.Diag(Attrs.getLoc(), diag::warn_nocf_check_attribute_ignored);
@@ -2188,6 +2329,10 @@ static void handleUnusedAttr(Sema &S, Decl *D, const ParsedAttr &AL) {
 
 static void handleConstructorAttr(Sema &S, Decl *D, const ParsedAttr &AL) {
   uint32_t priority = ConstructorAttr::DefaultPriority;
+  if (S.getLangOpts().HLSL && AL.getNumArgs()) {
+    S.Diag(AL.getLoc(), diag::err_hlsl_init_priority_unsupported);
+    return;
+  }
   if (AL.getNumArgs() &&
       !checkUInt32Argument(S, AL, AL.getArgAsExpr(0), priority))
     return;
@@ -2488,6 +2633,15 @@ static void handleAvailabilityAttr(Sema &S, Decl *D, const ParsedAttr &AL) {
     }
   }
 
+  if (II->isStr("fuchsia")) {
+    std::optional<unsigned> Min, Sub;
+    if ((Min = Introduced.Version.getMinor()) ||
+        (Sub = Introduced.Version.getSubminor())) {
+      S.Diag(AL.getLoc(), diag::warn_availability_fuchsia_unavailable_minor);
+      return;
+    }
+  }
+
   int PriorityModifier = AL.isPragmaClangAttribute()
                              ? Sema::AP_PragmaClangAttribute
                              : Sema::AP_Explicit;
@@ -2508,37 +2662,53 @@ static void handleAvailabilityAttr(Sema &S, Decl *D, const ParsedAttr &AL) {
       NewII = &S.Context.Idents.get("watchos_app_extension");
 
     if (NewII) {
-        auto adjustWatchOSVersion = [](VersionTuple Version) -> VersionTuple {
-          if (Version.empty())
-            return Version;
-          auto Major = Version.getMajor();
-          auto NewMajor = Major >= 9 ? Major - 7 : 0;
-          if (NewMajor >= 2) {
-            if (Version.getMinor().hasValue()) {
-              if (Version.getSubminor().hasValue())
-                return VersionTuple(NewMajor, Version.getMinor().getValue(),
-                                    Version.getSubminor().getValue());
-              else
-                return VersionTuple(NewMajor, Version.getMinor().getValue());
-            }
-            return VersionTuple(NewMajor);
+      const auto *SDKInfo = S.getDarwinSDKInfoForAvailabilityChecking();
+      const auto *IOSToWatchOSMapping =
+          SDKInfo ? SDKInfo->getVersionMapping(
+                        DarwinSDKInfo::OSEnvPair::iOStoWatchOSPair())
+                  : nullptr;
+
+      auto adjustWatchOSVersion =
+          [IOSToWatchOSMapping](VersionTuple Version) -> VersionTuple {
+        if (Version.empty())
+          return Version;
+        auto MinimumWatchOSVersion = VersionTuple(2, 0);
+
+        if (IOSToWatchOSMapping) {
+          if (auto MappedVersion = IOSToWatchOSMapping->map(
+                  Version, MinimumWatchOSVersion, std::nullopt)) {
+            return *MappedVersion;
           }
+        }
 
-          return VersionTuple(2, 0);
-        };
+        auto Major = Version.getMajor();
+        auto NewMajor = Major >= 9 ? Major - 7 : 0;
+        if (NewMajor >= 2) {
+          if (Version.getMinor()) {
+            if (Version.getSubminor())
+              return VersionTuple(NewMajor, *Version.getMinor(),
+                                  *Version.getSubminor());
+            else
+              return VersionTuple(NewMajor, *Version.getMinor());
+          }
+          return VersionTuple(NewMajor);
+        }
 
-        auto NewIntroduced = adjustWatchOSVersion(Introduced.Version);
-        auto NewDeprecated = adjustWatchOSVersion(Deprecated.Version);
-        auto NewObsoleted = adjustWatchOSVersion(Obsoleted.Version);
-
-        AvailabilityAttr *NewAttr = S.mergeAvailabilityAttr(
-            ND, AL, NewII, true /*Implicit*/, NewIntroduced, NewDeprecated,
-            NewObsoleted, IsUnavailable, Str, IsStrict, Replacement,
-            Sema::AMK_None,
-            PriorityModifier + Sema::AP_InferredFromOtherPlatform);
-        if (NewAttr)
-          D->addAttr(NewAttr);
-      }
+        return MinimumWatchOSVersion;
+      };
+
+      auto NewIntroduced = adjustWatchOSVersion(Introduced.Version);
+      auto NewDeprecated = adjustWatchOSVersion(Deprecated.Version);
+      auto NewObsoleted = adjustWatchOSVersion(Obsoleted.Version);
+
+      AvailabilityAttr *NewAttr = S.mergeAvailabilityAttr(
+          ND, AL, NewII, true /*Implicit*/, NewIntroduced, NewDeprecated,
+          NewObsoleted, IsUnavailable, Str, IsStrict, Replacement,
+          Sema::AMK_None,
+          PriorityModifier + Sema::AP_InferredFromOtherPlatform);
+      if (NewAttr)
+        D->addAttr(NewAttr);
+    }
   } else if (S.Context.getTargetInfo().getTriple().isTvOS()) {
     // Transcribe "ios" to "tvos" (and add a new attribute) if the versioning
     // matches before the start of the tvOS platform.
@@ -2549,14 +2719,38 @@ static void handleAvailabilityAttr(Sema &S, Decl *D, const ParsedAttr &AL) {
       NewII = &S.Context.Idents.get("tvos_app_extension");
 
     if (NewII) {
+      const auto *SDKInfo = S.getDarwinSDKInfoForAvailabilityChecking();
+      const auto *IOSToTvOSMapping =
+          SDKInfo ? SDKInfo->getVersionMapping(
+                        DarwinSDKInfo::OSEnvPair::iOStoTvOSPair())
+                  : nullptr;
+
+      auto AdjustTvOSVersion =
+          [IOSToTvOSMapping](VersionTuple Version) -> VersionTuple {
+        if (Version.empty())
+          return Version;
+
+        if (IOSToTvOSMapping) {
+          if (auto MappedVersion = IOSToTvOSMapping->map(
+                  Version, VersionTuple(0, 0), std::nullopt)) {
+            return *MappedVersion;
+          }
+        }
+        return Version;
+      };
+
+      auto NewIntroduced = AdjustTvOSVersion(Introduced.Version);
+      auto NewDeprecated = AdjustTvOSVersion(Deprecated.Version);
+      auto NewObsoleted = AdjustTvOSVersion(Obsoleted.Version);
+
       AvailabilityAttr *NewAttr = S.mergeAvailabilityAttr(
-          ND, AL, NewII, true /*Implicit*/, Introduced.Version,
-          Deprecated.Version, Obsoleted.Version, IsUnavailable, Str, IsStrict,
-          Replacement, Sema::AMK_None,
+          ND, AL, NewII, true /*Implicit*/, NewIntroduced, NewDeprecated,
+          NewObsoleted, IsUnavailable, Str, IsStrict, Replacement,
+          Sema::AMK_None,
           PriorityModifier + Sema::AP_InferredFromOtherPlatform);
       if (NewAttr)
         D->addAttr(NewAttr);
-      }
+    }
   } else if (S.Context.getTargetInfo().getTriple().getOS() ==
                  llvm::Triple::IOS &&
              S.Context.getTargetInfo().getTriple().isMacCatalystEnvironment()) {
@@ -2601,24 +2795,25 @@ static void handleAvailabilityAttr(Sema &S, Decl *D, const ParsedAttr &AL) {
         // attributes that are inferred from 'ios'.
         NewII = &S.Context.Idents.get("maccatalyst");
         auto RemapMacOSVersion =
-            [&](const VersionTuple &V) -> Optional<VersionTuple> {
+            [&](const VersionTuple &V) -> std::optional<VersionTuple> {
           if (V.empty())
-            return None;
+            return std::nullopt;
           // API_TO_BE_DEPRECATED is 100000.
           if (V.getMajor() == 100000)
             return VersionTuple(100000);
           // The minimum iosmac version is 13.1
-          return MacOStoMacCatalystMapping->map(V, VersionTuple(13, 1), None);
+          return MacOStoMacCatalystMapping->map(V, VersionTuple(13, 1),
+                                                std::nullopt);
         };
-        Optional<VersionTuple> NewIntroduced =
-                                   RemapMacOSVersion(Introduced.Version),
-                               NewDeprecated =
-                                   RemapMacOSVersion(Deprecated.Version),
-                               NewObsoleted =
-                                   RemapMacOSVersion(Obsoleted.Version);
+        std::optional<VersionTuple> NewIntroduced =
+                                        RemapMacOSVersion(Introduced.Version),
+                                    NewDeprecated =
+                                        RemapMacOSVersion(Deprecated.Version),
+                                    NewObsoleted =
+                                        RemapMacOSVersion(Obsoleted.Version);
         if (NewIntroduced || NewDeprecated || NewObsoleted) {
           auto VersionOrEmptyVersion =
-              [](const Optional<VersionTuple> &V) -> VersionTuple {
+              [](const std::optional<VersionTuple> &V) -> VersionTuple {
             return V ? *V : VersionTuple();
           };
           AvailabilityAttr *NewAttr = S.mergeAvailabilityAttr(
@@ -2842,9 +3037,8 @@ static void handleSentinelAttr(Sema &S, Decl *D, const ParsedAttr &AL) {
   unsigned sentinel = (unsigned)SentinelAttr::DefaultSentinel;
   if (AL.getNumArgs() > 0) {
     Expr *E = AL.getArgAsExpr(0);
-    Optional<llvm::APSInt> Idx = llvm::APSInt(32);
-    if (E->isTypeDependent() || E->isValueDependent() ||
-        !(Idx = E->getIntegerConstantExpr(S.Context))) {
+    std::optional<llvm::APSInt> Idx = llvm::APSInt(32);
+    if (E->isTypeDependent() || !(Idx = E->getIntegerConstantExpr(S.Context))) {
       S.Diag(AL.getLoc(), diag::err_attribute_argument_n_type)
           << AL << 1 << AANT_ArgumentIntegerConstant << E->getSourceRange();
       return;
@@ -2862,9 +3056,8 @@ static void handleSentinelAttr(Sema &S, Decl *D, const ParsedAttr &AL) {
   unsigned nullPos = (unsigned)SentinelAttr::DefaultNullPos;
   if (AL.getNumArgs() > 1) {
     Expr *E = AL.getArgAsExpr(1);
-    Optional<llvm::APSInt> Idx = llvm::APSInt(32);
-    if (E->isTypeDependent() || E->isValueDependent() ||
-        !(Idx = E->getIntegerConstantExpr(S.Context))) {
+    std::optional<llvm::APSInt> Idx = llvm::APSInt(32);
+    if (E->isTypeDependent() || !(Idx = E->getIntegerConstantExpr(S.Context))) {
       S.Diag(AL.getLoc(), diag::err_attribute_argument_n_type)
           << AL << 2 << AANT_ArgumentIntegerConstant << E->getSourceRange();
       return;
@@ -2958,7 +3151,7 @@ static void handleWarnUnusedResult(Sema &S, Decl *D, const ParsedAttr &AL) {
       if (LO.CPlusPlus && !LO.CPlusPlus20)
         S.Diag(AL.getLoc(), diag::ext_cxx20_attr) << AL;
 
-      // Since this this is spelled [[nodiscard]], get the optional string
+      // Since this is spelled [[nodiscard]], get the optional string
       // literal. If in C++ mode, but not in C++2a mode, diagnose as an
       // extension.
       // FIXME: C2x should support this feature as well, even as an extension.
@@ -2968,6 +3161,14 @@ static void handleWarnUnusedResult(Sema &S, Decl *D, const ParsedAttr &AL) {
       S.Diag(AL.getLoc(), diag::ext_cxx17_attr) << AL;
   }
 
+  if ((!AL.isGNUAttribute() &&
+       !(AL.isStandardAttributeSyntax() && AL.isClangScope())) &&
+      isa<TypedefNameDecl>(D)) {
+    S.Diag(AL.getLoc(), diag::warn_unused_result_typedef_unsupported_spelling)
+        << AL.isGNUScope();
+    return;
+  }
+
   D->addAttr(::new (S.Context) WarnUnusedResultAttr(S.Context, AL, Str));
 }
 
@@ -3195,59 +3396,96 @@ static void handleCodeSegAttr(Sema &S, Decl *D, const ParsedAttr &AL) {
 // handled later in the process, once we know how many exist.
 bool Sema::checkTargetAttr(SourceLocation LiteralLoc, StringRef AttrStr) {
   enum FirstParam { Unsupported, Duplicate, Unknown };
-  enum SecondParam { None, Architecture, Tune };
-  if (AttrStr.find("fpmath=") != StringRef::npos)
+  enum SecondParam { None, CPU, Tune };
+  enum ThirdParam { Target, TargetClones };
+  if (AttrStr.contains("fpmath="))
     return Diag(LiteralLoc, diag::warn_unsupported_target_attribute)
-           << Unsupported << None << "fpmath=";
+           << Unsupported << None << "fpmath=" << Target;
 
   // Diagnose use of tune if target doesn't support it.
   if (!Context.getTargetInfo().supportsTargetAttributeTune() &&
-      AttrStr.find("tune=") != StringRef::npos)
+      AttrStr.contains("tune="))
     return Diag(LiteralLoc, diag::warn_unsupported_target_attribute)
-           << Unsupported << None << "tune=";
+           << Unsupported << None << "tune=" << Target;
 
-  ParsedTargetAttr ParsedAttrs = TargetAttr::parse(AttrStr);
+  ParsedTargetAttr ParsedAttrs =
+      Context.getTargetInfo().parseTargetAttr(AttrStr);
 
-  if (!ParsedAttrs.Architecture.empty() &&
-      !Context.getTargetInfo().isValidCPUName(ParsedAttrs.Architecture))
+  if (!ParsedAttrs.CPU.empty() &&
+      !Context.getTargetInfo().isValidCPUName(ParsedAttrs.CPU))
     return Diag(LiteralLoc, diag::warn_unsupported_target_attribute)
-           << Unknown << Architecture << ParsedAttrs.Architecture;
+           << Unknown << CPU << ParsedAttrs.CPU << Target;
 
   if (!ParsedAttrs.Tune.empty() &&
       !Context.getTargetInfo().isValidCPUName(ParsedAttrs.Tune))
     return Diag(LiteralLoc, diag::warn_unsupported_target_attribute)
-           << Unknown << Tune << ParsedAttrs.Tune;
+           << Unknown << Tune << ParsedAttrs.Tune << Target;
 
-  if (ParsedAttrs.DuplicateArchitecture)
-    return Diag(LiteralLoc, diag::warn_unsupported_target_attribute)
-           << Duplicate << None << "arch=";
-  if (ParsedAttrs.DuplicateTune)
+  if (ParsedAttrs.Duplicate != "")
     return Diag(LiteralLoc, diag::warn_unsupported_target_attribute)
-           << Duplicate << None << "tune=";
+           << Duplicate << None << ParsedAttrs.Duplicate << Target;
 
   for (const auto &Feature : ParsedAttrs.Features) {
     auto CurFeature = StringRef(Feature).drop_front(); // remove + or -.
     if (!Context.getTargetInfo().isValidFeatureName(CurFeature))
       return Diag(LiteralLoc, diag::warn_unsupported_target_attribute)
-             << Unsupported << None << CurFeature;
+             << Unsupported << None << CurFeature << Target;
   }
 
   TargetInfo::BranchProtectionInfo BPI;
-  StringRef Error;
-  if (!ParsedAttrs.BranchProtection.empty() &&
-      !Context.getTargetInfo().validateBranchProtection(
-          ParsedAttrs.BranchProtection, BPI, Error)) {
-    if (Error.empty())
+  StringRef DiagMsg;
+  if (ParsedAttrs.BranchProtection.empty())
+    return false;
+  if (!Context.getTargetInfo().validateBranchProtection(
+          ParsedAttrs.BranchProtection, ParsedAttrs.CPU, BPI, DiagMsg)) {
+    if (DiagMsg.empty())
       return Diag(LiteralLoc, diag::warn_unsupported_target_attribute)
-             << Unsupported << None << "branch-protection";
-    else
-      return Diag(LiteralLoc, diag::err_invalid_branch_protection_spec)
-             << Error;
+             << Unsupported << None << "branch-protection" << Target;
+    return Diag(LiteralLoc, diag::err_invalid_branch_protection_spec)
+           << DiagMsg;
   }
+  if (!DiagMsg.empty())
+    Diag(LiteralLoc, diag::warn_unsupported_branch_protection_spec) << DiagMsg;
 
   return false;
 }
 
+// Check Target Version attrs
+bool Sema::checkTargetVersionAttr(SourceLocation LiteralLoc, StringRef &AttrStr,
+                                  bool &isDefault) {
+  enum FirstParam { Unsupported };
+  enum SecondParam { None };
+  enum ThirdParam { Target, TargetClones, TargetVersion };
+  if (AttrStr.trim() == "default")
+    isDefault = true;
+  llvm::SmallVector<StringRef, 8> Features;
+  AttrStr.split(Features, "+");
+  for (auto &CurFeature : Features) {
+    CurFeature = CurFeature.trim();
+    if (CurFeature == "default")
+      continue;
+    if (!Context.getTargetInfo().validateCpuSupports(CurFeature))
+      return Diag(LiteralLoc, diag::warn_unsupported_target_attribute)
+             << Unsupported << None << CurFeature << TargetVersion;
+  }
+  return false;
+}
+
+static void handleTargetVersionAttr(Sema &S, Decl *D, const ParsedAttr &AL) {
+  StringRef Str;
+  SourceLocation LiteralLoc;
+  bool isDefault = false;
+  if (!S.checkStringLiteralArgumentAttr(AL, 0, Str, &LiteralLoc) ||
+      S.checkTargetVersionAttr(LiteralLoc, Str, isDefault))
+    return;
+  // Do not create default only target_version attribute
+  if (!isDefault) {
+    TargetVersionAttr *NewAttr =
+        ::new (S.Context) TargetVersionAttr(S.Context, AL, Str);
+    D->addAttr(NewAttr);
+  }
+}
+
 static void handleTargetAttr(Sema &S, Decl *D, const ParsedAttr &AL) {
   StringRef Str;
   SourceLocation LiteralLoc;
@@ -3259,6 +3497,170 @@ static void handleTargetAttr(Sema &S, Decl *D, const ParsedAttr &AL) {
   D->addAttr(NewAttr);
 }
 
+bool Sema::checkTargetClonesAttrString(
+    SourceLocation LiteralLoc, StringRef Str, const StringLiteral *Literal,
+    bool &HasDefault, bool &HasCommas, bool &HasNotDefault,
+    SmallVectorImpl<SmallString<64>> &StringsBuffer) {
+  enum FirstParam { Unsupported, Duplicate, Unknown };
+  enum SecondParam { None, CPU, Tune };
+  enum ThirdParam { Target, TargetClones };
+  HasCommas = HasCommas || Str.contains(',');
+  // Warn on empty at the beginning of a string.
+  if (Str.size() == 0)
+    return Diag(LiteralLoc, diag::warn_unsupported_target_attribute)
+           << Unsupported << None << "" << TargetClones;
+
+  std::pair<StringRef, StringRef> Parts = {{}, Str};
+  while (!Parts.second.empty()) {
+    Parts = Parts.second.split(',');
+    StringRef Cur = Parts.first.trim();
+    SourceLocation CurLoc = Literal->getLocationOfByte(
+        Cur.data() - Literal->getString().data(), getSourceManager(),
+        getLangOpts(), Context.getTargetInfo());
+
+    bool DefaultIsDupe = false;
+    bool HasCodeGenImpact = false;
+    if (Cur.empty())
+      return Diag(CurLoc, diag::warn_unsupported_target_attribute)
+             << Unsupported << None << "" << TargetClones;
+
+    if (Context.getTargetInfo().getTriple().isAArch64()) {
+      // AArch64 target clones specific
+      if (Cur == "default") {
+        DefaultIsDupe = HasDefault;
+        HasDefault = true;
+        if (llvm::is_contained(StringsBuffer, Cur) || DefaultIsDupe)
+          Diag(CurLoc, diag::warn_target_clone_duplicate_options);
+        else
+          StringsBuffer.push_back(Cur);
+      } else {
+        std::pair<StringRef, StringRef> CurParts = {{}, Cur};
+        llvm::SmallVector<StringRef, 8> CurFeatures;
+        while (!CurParts.second.empty()) {
+          CurParts = CurParts.second.split('+');
+          StringRef CurFeature = CurParts.first.trim();
+          if (!Context.getTargetInfo().validateCpuSupports(CurFeature)) {
+            Diag(CurLoc, diag::warn_unsupported_target_attribute)
+                << Unsupported << None << CurFeature << TargetClones;
+            continue;
+          }
+          std::string Options;
+          if (Context.getTargetInfo().getFeatureDepOptions(CurFeature, Options))
+            HasCodeGenImpact = true;
+          CurFeatures.push_back(CurFeature);
+        }
+        // Canonize TargetClones Attributes
+        llvm::sort(CurFeatures);
+        SmallString<64> Res;
+        for (auto &CurFeat : CurFeatures) {
+          if (!Res.equals(""))
+            Res.append("+");
+          Res.append(CurFeat);
+        }
+        if (llvm::is_contained(StringsBuffer, Res) || DefaultIsDupe)
+          Diag(CurLoc, diag::warn_target_clone_duplicate_options);
+        else if (!HasCodeGenImpact)
+          // Ignore features in target_clone attribute that don't impact
+          // code generation
+          Diag(CurLoc, diag::warn_target_clone_no_impact_options);
+        else if (!Res.empty()) {
+          StringsBuffer.push_back(Res);
+          HasNotDefault = true;
+        }
+      }
+    } else {
+      // Other targets ( currently X86 )
+      if (Cur.startswith("arch=")) {
+        if (!Context.getTargetInfo().isValidCPUName(
+                Cur.drop_front(sizeof("arch=") - 1)))
+          return Diag(CurLoc, diag::warn_unsupported_target_attribute)
+                 << Unsupported << CPU << Cur.drop_front(sizeof("arch=") - 1)
+                 << TargetClones;
+      } else if (Cur == "default") {
+        DefaultIsDupe = HasDefault;
+        HasDefault = true;
+      } else if (!Context.getTargetInfo().isValidFeatureName(Cur))
+        return Diag(CurLoc, diag::warn_unsupported_target_attribute)
+               << Unsupported << None << Cur << TargetClones;
+      if (llvm::is_contained(StringsBuffer, Cur) || DefaultIsDupe)
+        Diag(CurLoc, diag::warn_target_clone_duplicate_options);
+      // Note: Add even if there are duplicates, since it changes name mangling.
+      StringsBuffer.push_back(Cur);
+    }
+  }
+  if (Str.rtrim().endswith(","))
+    return Diag(LiteralLoc, diag::warn_unsupported_target_attribute)
+           << Unsupported << None << "" << TargetClones;
+  return false;
+}
+
+static void handleTargetClonesAttr(Sema &S, Decl *D, const ParsedAttr &AL) {
+  if (S.Context.getTargetInfo().getTriple().isAArch64() &&
+      !S.Context.getTargetInfo().hasFeature("fmv"))
+    return;
+
+  // Ensure we don't combine these with themselves, since that causes some
+  // confusing behavior.
+  if (const auto *Other = D->getAttr<TargetClonesAttr>()) {
+    S.Diag(AL.getLoc(), diag::err_disallowed_duplicate_attribute) << AL;
+    S.Diag(Other->getLocation(), diag::note_conflicting_attribute);
+    return;
+  }
+  if (checkAttrMutualExclusion<TargetClonesAttr>(S, D, AL))
+    return;
+
+  SmallVector<StringRef, 2> Strings;
+  SmallVector<SmallString<64>, 2> StringsBuffer;
+  bool HasCommas = false, HasDefault = false, HasNotDefault = false;
+
+  for (unsigned I = 0, E = AL.getNumArgs(); I != E; ++I) {
+    StringRef CurStr;
+    SourceLocation LiteralLoc;
+    if (!S.checkStringLiteralArgumentAttr(AL, I, CurStr, &LiteralLoc) ||
+        S.checkTargetClonesAttrString(
+            LiteralLoc, CurStr,
+            cast<StringLiteral>(AL.getArgAsExpr(I)->IgnoreParenCasts()),
+            HasDefault, HasCommas, HasNotDefault, StringsBuffer))
+      return;
+  }
+  for (auto &SmallStr : StringsBuffer)
+    Strings.push_back(SmallStr.str());
+
+  if (HasCommas && AL.getNumArgs() > 1)
+    S.Diag(AL.getLoc(), diag::warn_target_clone_mixed_values);
+
+  if (S.Context.getTargetInfo().getTriple().isAArch64() && !HasDefault) {
+    // Add default attribute if there is no one
+    HasDefault = true;
+    Strings.push_back("default");
+  }
+
+  if (!HasDefault) {
+    S.Diag(AL.getLoc(), diag::err_target_clone_must_have_default);
+    return;
+  }
+
+  // FIXME: We could probably figure out how to get this to work for lambdas
+  // someday.
+  if (const auto *MD = dyn_cast<CXXMethodDecl>(D)) {
+    if (MD->getParent()->isLambda()) {
+      S.Diag(D->getLocation(), diag::err_multiversion_doesnt_support)
+          << static_cast<unsigned>(MultiVersionKind::TargetClones)
+          << /*Lambda*/ 9;
+      return;
+    }
+  }
+
+  // No multiversion if we have default version only.
+  if (S.Context.getTargetInfo().getTriple().isAArch64() && !HasNotDefault)
+    return;
+
+  cast<FunctionDecl>(D)->setIsMultiVersion();
+  TargetClonesAttr *NewAttr = ::new (S.Context)
+      TargetClonesAttr(S.Context, AL, Strings.data(), Strings.size());
+  D->addAttr(NewAttr);
+}
+
 static void handleMinVectorWidthAttr(Sema &S, Decl *D, const ParsedAttr &AL) {
   Expr *E = AL.getArgAsExpr(0);
   uint32_t VecWidth;
@@ -3368,11 +3770,17 @@ static void handleFormatArgAttr(Sema &S, Decl *D, const ParsedAttr &AL) {
       (!Ty->isPointerType() ||
        !Ty->castAs<PointerType>()->getPointeeType()->isCharType())) {
     S.Diag(AL.getLoc(), diag::err_format_attribute_not)
-        << "a string type" << IdxExpr->getSourceRange()
-        << getFunctionOrMethodParamRange(D, 0);
+        << IdxExpr->getSourceRange() << getFunctionOrMethodParamRange(D, 0);
     return;
   }
   Ty = getFunctionOrMethodResultType(D);
+  // replace instancetype with the class type
+  auto Instancetype = S.Context.getObjCInstanceTypeDecl()->getTypeForDecl();
+  if (Ty->getAs<TypedefType>() == Instancetype)
+    if (auto *OMD = dyn_cast<ObjCMethodDecl>(D))
+      if (auto *Interface = OMD->getClassInterface())
+        Ty = S.Context.getObjCObjectPointerType(
+            QualType(Interface->getTypeForDecl(), 0));
   if (!isNSStringType(Ty, S.Context, /*AllowNSAttributedString=*/true) &&
       !isCFStringType(Ty, S.Context) &&
       (!Ty->isPointerType() ||
@@ -3424,6 +3832,11 @@ static void handleInitPriorityAttr(Sema &S, Decl *D, const ParsedAttr &AL) {
     S.Diag(AL.getLoc(), diag::warn_attribute_ignored) << AL;
     return;
   }
+  
+  if (S.getLangOpts().HLSL) {
+    S.Diag(AL.getLoc(), diag::err_hlsl_init_priority_unsupported);
+    return;
+  }
 
   if (S.getCurFunctionOrMethodDecl()) {
     S.Diag(AL.getLoc(), diag::err_init_priority_object_attr);
@@ -3459,6 +3872,29 @@ static void handleInitPriorityAttr(Sema &S, Decl *D, const ParsedAttr &AL) {
   D->addAttr(::new (S.Context) InitPriorityAttr(S.Context, AL, prioritynum));
 }
 
+ErrorAttr *Sema::mergeErrorAttr(Decl *D, const AttributeCommonInfo &CI,
+                                StringRef NewUserDiagnostic) {
+  if (const auto *EA = D->getAttr<ErrorAttr>()) {
+    std::string NewAttr = CI.getNormalizedFullName();
+    assert((NewAttr == "error" || NewAttr == "warning") &&
+           "unexpected normalized full name");
+    bool Match = (EA->isError() && NewAttr == "error") ||
+                 (EA->isWarning() && NewAttr == "warning");
+    if (!Match) {
+      Diag(EA->getLocation(), diag::err_attributes_are_not_compatible)
+          << CI << EA;
+      Diag(CI.getLoc(), diag::note_conflicting_attribute);
+      return nullptr;
+    }
+    if (EA->getUserDiagnostic() != NewUserDiagnostic) {
+      Diag(CI.getLoc(), diag::warn_duplicate_attribute) << EA;
+      Diag(EA->getLoc(), diag::note_previous_attribute);
+    }
+    D->dropAttr<ErrorAttr>();
+  }
+  return ::new (Context) ErrorAttr(Context, CI, NewUserDiagnostic);
+}
+
 FormatAttr *Sema::mergeFormatAttr(Decl *D, const AttributeCommonInfo &CI,
                                   IdentifierInfo *Format, int FormatIdx,
                                   int FirstArg) {
@@ -3540,27 +3976,12 @@ static void handleFormatAttr(Sema &S, Decl *D, const ParsedAttr &AL) {
   // make sure the format string is really a string
   QualType Ty = getFunctionOrMethodParamType(D, ArgIdx);
 
-  if (Kind == CFStringFormat) {
-    if (!isCFStringType(Ty, S.Context)) {
-      S.Diag(AL.getLoc(), diag::err_format_attribute_not)
-        << "a CFString" << IdxExpr->getSourceRange()
-        << getFunctionOrMethodParamRange(D, ArgIdx);
-      return;
-    }
-  } else if (Kind == NSStringFormat) {
-    // FIXME: do we need to check if the type is NSString*?  What are the
-    // semantics?
-    if (!isNSStringType(Ty, S.Context, /*AllowNSAttributedString=*/true)) {
-      S.Diag(AL.getLoc(), diag::err_format_attribute_not)
-        << "an NSString" << IdxExpr->getSourceRange()
-        << getFunctionOrMethodParamRange(D, ArgIdx);
-      return;
-    }
-  } else if (!Ty->isPointerType() ||
-             !Ty->castAs<PointerType>()->getPointeeType()->isCharType()) {
+  if (!isNSStringType(Ty, S.Context, true) &&
+      !isCFStringType(Ty, S.Context) &&
+      (!Ty->isPointerType() ||
+       !Ty->castAs<PointerType>()->getPointeeType()->isCharType())) {
     S.Diag(AL.getLoc(), diag::err_format_attribute_not)
-      << "a string type" << IdxExpr->getSourceRange()
-      << getFunctionOrMethodParamRange(D, ArgIdx);
+      << IdxExpr->getSourceRange() << getFunctionOrMethodParamRange(D, ArgIdx);
     return;
   }
 
@@ -3570,29 +3991,38 @@ static void handleFormatAttr(Sema &S, Decl *D, const ParsedAttr &AL) {
   if (!checkUInt32Argument(S, AL, FirstArgExpr, FirstArg, 3))
     return;
 
-  // check if the function is variadic if the 3rd argument non-zero
+  // FirstArg == 0 is is always valid.
   if (FirstArg != 0) {
-    if (isFunctionOrMethodVariadic(D)) {
-      ++NumArgs; // +1 for ...
-    } else {
-      S.Diag(D->getLocation(), diag::err_format_attribute_requires_variadic);
-      return;
-    }
-  }
-
-  // strftime requires FirstArg to be 0 because it doesn't read from any
-  // variable the input is just the current time + the format string.
-  if (Kind == StrftimeFormat) {
-    if (FirstArg != 0) {
+    if (Kind == StrftimeFormat) {
+      // If the kind is strftime, FirstArg must be 0 because strftime does not
+      // use any variadic arguments.
       S.Diag(AL.getLoc(), diag::err_format_strftime_third_parameter)
-        << FirstArgExpr->getSourceRange();
+          << FirstArgExpr->getSourceRange()
+          << FixItHint::CreateReplacement(FirstArgExpr->getSourceRange(), "0");
       return;
+    } else if (isFunctionOrMethodVariadic(D)) {
+      // Else, if the function is variadic, then FirstArg must be 0 or the
+      // "position" of the ... parameter. It's unusual to use 0 with variadic
+      // functions, so the fixit proposes the latter.
+      if (FirstArg != NumArgs + 1) {
+        S.Diag(AL.getLoc(), diag::err_attribute_argument_out_of_bounds)
+            << AL << 3 << FirstArgExpr->getSourceRange()
+            << FixItHint::CreateReplacement(FirstArgExpr->getSourceRange(),
+                                            std::to_string(NumArgs + 1));
+        return;
+      }
+    } else {
+      // Inescapable GCC compatibility diagnostic.
+      S.Diag(D->getLocation(), diag::warn_gcc_requires_variadic_function) << AL;
+      if (FirstArg <= Idx) {
+        // Else, the function is not variadic, and FirstArg must be 0 or any
+        // parameter after the format parameter. We don't offer a fixit because
+        // there are too many possible good values.
+        S.Diag(AL.getLoc(), diag::err_attribute_argument_out_of_bounds)
+            << AL << 3 << FirstArgExpr->getSourceRange();
+        return;
+      }
     }
-  // if 0 it disables parameter checking (to use with e.g. va_list)
-  } else if (FirstArg != 0 && FirstArg != NumArgs) {
-    S.Diag(AL.getLoc(), diag::err_attribute_argument_out_of_bounds)
-        << AL << 3 << FirstArgExpr->getSourceRange();
-    return;
   }
 
   FormatAttr *NewAttr = S.mergeFormatAttr(D, AL, II, Idx, FirstArg);
@@ -3833,48 +4263,10 @@ static void handleTransparentUnionAttr(Sema &S, Decl *D, const ParsedAttr &AL) {
 void Sema::AddAnnotationAttr(Decl *D, const AttributeCommonInfo &CI,
                              StringRef Str, MutableArrayRef<Expr *> Args) {
   auto *Attr = AnnotateAttr::Create(Context, Str, Args.data(), Args.size(), CI);
-  llvm::SmallVector<PartialDiagnosticAt, 8> Notes;
-  for (unsigned Idx = 0; Idx < Attr->args_size(); Idx++) {
-    Expr *&E = Attr->args_begin()[Idx];
-    assert(E && "error are handled before");
-    if (E->isValueDependent() || E->isTypeDependent())
-      continue;
-
-    if (E->getType()->isArrayType())
-      E = ImpCastExprToType(E, Context.getPointerType(E->getType()),
-                            clang::CK_ArrayToPointerDecay)
-              .get();
-    if (E->getType()->isFunctionType())
-      E = ImplicitCastExpr::Create(Context,
-                                   Context.getPointerType(E->getType()),
-                                   clang::CK_FunctionToPointerDecay, E, nullptr,
-                                   VK_PRValue, FPOptionsOverride());
-    if (E->isLValue())
-      E = ImplicitCastExpr::Create(Context, E->getType().getNonReferenceType(),
-                                   clang::CK_LValueToRValue, E, nullptr,
-                                   VK_PRValue, FPOptionsOverride());
-
-    Expr::EvalResult Eval;
-    Notes.clear();
-    Eval.Diag = &Notes;
-
-    bool Result =
-        E->EvaluateAsConstantExpr(Eval, Context);
-
-    /// Result means the expression can be folded to a constant.
-    /// Note.empty() means the expression is a valid constant expression in the
-    /// current language mode.
-    if (!Result || !Notes.empty()) {
-      Diag(E->getBeginLoc(), diag::err_attribute_argument_n_type)
-          << CI << (Idx + 1) << AANT_ArgumentConstantExpr;
-      for (auto &Note : Notes)
-        Diag(Note.first, Note.second);
-      return;
-    }
-    assert(Eval.Val.hasValue());
-    E = ConstantExpr::Create(Context, E, Eval.Val);
+  if (ConstantFoldAttrArgs(
+          CI, MutableArrayRef<Expr *>(Attr->args_begin(), Attr->args_end()))) {
+    D->addAttr(Attr);
   }
-  D->addAttr(Attr);
 }
 
 static void handleAnnotateAttr(Sema &S, Decl *D, const ParsedAttr &AL) {
@@ -3977,6 +4369,9 @@ void Sema::AddAlignedAttr(Decl *D, const AttributeCommonInfo &CI, Expr *E,
     //   declared with the register storage class specifier. An
     //   alignment-specifier may also be applied to the declaration of a class
     //   or enumeration type.
+    // CWG 2354:
+    //   CWG agreed to remove permission for alignas to be applied to
+    //   enumerations.
     // C11 6.7.5/2:
     //   An alignment attribute shall not be specified in a declaration of
     //   a typedef, or a bit-field, or a function, or a parameter, or an
@@ -3992,6 +4387,9 @@ void Sema::AddAlignedAttr(Decl *D, const AttributeCommonInfo &CI, Expr *E,
     } else if (const auto *FD = dyn_cast<FieldDecl>(D)) {
       if (FD->isBitField())
         DiagKind = 3;
+    } else if (const auto *ED = dyn_cast<EnumDecl>(D)) {
+      if (ED->getLangOpts().CPlusPlus)
+        DiagKind = 4;
     } else if (!isa<TagDecl>(D)) {
       Diag(AttrLoc, diag::err_attribute_wrong_decl_type) << &TmpAttr
         << (TmpAttr.isC11() ? ExpectedVariableOrField
@@ -4032,13 +4430,6 @@ void Sema::AddAlignedAttr(Decl *D, const AttributeCommonInfo &CI, Expr *E,
     return;
 
   uint64_t AlignVal = Alignment.getZExtValue();
-  // 16 byte ByVal alignment not due to a vector member is not honoured by XL
-  // on AIX. Emit a warning here that users are generating binary incompatible
-  // code to be safe.
-  if (AlignVal >= 16 && isa<FieldDecl>(D) &&
-      Context.getTargetInfo().getTriple().isOSAIX())
-    Diag(AttrLoc, diag::warn_not_xl_compatible) << E->getSourceRange();
-
   // C++11 [dcl.align]p2:
   //   -- if the constant expression evaluates to zero, the alignment
   //      specifier shall have no effect
@@ -4052,21 +4443,21 @@ void Sema::AddAlignedAttr(Decl *D, const AttributeCommonInfo &CI, Expr *E,
     }
   }
 
-  unsigned MaximumAlignment = Sema::MaximumAlignment;
+  uint64_t MaximumAlignment = Sema::MaximumAlignment;
   if (Context.getTargetInfo().getTriple().isOSBinFormatCOFF())
-    MaximumAlignment = std::min(MaximumAlignment, 8192u);
+    MaximumAlignment = std::min(MaximumAlignment, uint64_t(8192));
   if (AlignVal > MaximumAlignment) {
     Diag(AttrLoc, diag::err_attribute_aligned_too_great)
         << MaximumAlignment << E->getSourceRange();
     return;
   }
 
-  if (Context.getTargetInfo().isTLSSupported()) {
+  const auto *VD = dyn_cast<VarDecl>(D);
+  if (VD) {
     unsigned MaxTLSAlign =
         Context.toCharUnitsFromBits(Context.getTargetInfo().getMaxTLSAlign())
             .getQuantity();
-    const auto *VD = dyn_cast<VarDecl>(D);
-    if (MaxTLSAlign && AlignVal > MaxTLSAlign && VD &&
+    if (MaxTLSAlign && AlignVal > MaxTLSAlign &&
         VD->getTLSKind() != VarDecl::TLS_None) {
       Diag(VD->getLocation(), diag::err_tls_var_aligned_over_maximum)
           << (unsigned)AlignVal << VD << MaxTLSAlign;
@@ -4074,6 +4465,17 @@ void Sema::AddAlignedAttr(Decl *D, const AttributeCommonInfo &CI, Expr *E,
     }
   }
 
+  // On AIX, an aligned attribute can not decrease the alignment when applied
+  // to a variable declaration with vector type.
+  if (VD && Context.getTargetInfo().getTriple().isOSAIX()) {
+    const Type *Ty = VD->getType().getTypePtr();
+    if (Ty->isVectorType() && AlignVal < 16) {
+      Diag(VD->getLocation(), diag::warn_aligned_attr_underaligned)
+          << VD->getType() << 16;
+      return;
+    }
+  }
+
   AlignedAttr *AA = ::new (Context) AlignedAttr(Context, CI, true, ICE.get());
   AA->setPackExpansion(IsPackExpansion);
   D->addAttr(AA);
@@ -4162,9 +4564,10 @@ bool Sema::checkMSInheritanceAttrOnDefinition(
 /// attribute.
 static void parseModeAttrArg(Sema &S, StringRef Str, unsigned &DestWidth,
                              bool &IntegerMode, bool &ComplexMode,
-                             bool &ExplicitIEEE) {
+                             FloatModeKind &ExplicitType) {
   IntegerMode = true;
   ComplexMode = false;
+  ExplicitType = FloatModeKind::NoFloat;
   switch (Str.size()) {
   case 2:
     switch (Str[0]) {
@@ -4184,13 +4587,17 @@ static void parseModeAttrArg(Sema &S, StringRef Str, unsigned &DestWidth,
       DestWidth = 96;
       break;
     case 'K': // KFmode - IEEE quad precision (__float128)
-      ExplicitIEEE = true;
+      ExplicitType = FloatModeKind::Float128;
       DestWidth = Str[1] == 'I' ? 0 : 128;
       break;
     case 'T':
-      ExplicitIEEE = false;
+      ExplicitType = FloatModeKind::LongDouble;
       DestWidth = 128;
       break;
+    case 'I':
+      ExplicitType = FloatModeKind::Ibm128;
+      DestWidth = Str[1] == 'I' ? 0 : 128;
+      break;
     }
     if (Str[1] == 'F') {
       IntegerMode = false;
@@ -4211,7 +4618,7 @@ static void parseModeAttrArg(Sema &S, StringRef Str, unsigned &DestWidth,
     break;
   case 7:
     if (Str == "pointer")
-      DestWidth = S.Context.getTargetInfo().getPointerWidth(0);
+      DestWidth = S.Context.getTargetInfo().getPointerWidth(LangAS::Default);
     break;
   case 11:
     if (Str == "unwind_word")
@@ -4249,7 +4656,7 @@ void Sema::AddModeAttr(Decl *D, const AttributeCommonInfo &CI,
   unsigned DestWidth = 0;
   bool IntegerMode = true;
   bool ComplexMode = false;
-  bool ExplicitIEEE = false;
+  FloatModeKind ExplicitType = FloatModeKind::NoFloat;
   llvm::APInt VectorSize(64, 0);
   if (Str.size() >= 4 && Str[0] == 'V') {
     // Minimal length of vector mode is 4: 'V' + NUMBER(>=1) + TYPE(>=2).
@@ -4262,7 +4669,7 @@ void Sema::AddModeAttr(Decl *D, const AttributeCommonInfo &CI,
         !Str.substr(1, VectorStringLength).getAsInteger(10, VectorSize) &&
         VectorSize.isPowerOf2()) {
       parseModeAttrArg(*this, Str.substr(VectorStringLength + 1), DestWidth,
-                       IntegerMode, ComplexMode, ExplicitIEEE);
+                       IntegerMode, ComplexMode, ExplicitType);
       // Avoid duplicate warning from template instantiation.
       if (!InInstantiation)
         Diag(AttrLoc, diag::warn_vector_mode_deprecated);
@@ -4273,7 +4680,7 @@ void Sema::AddModeAttr(Decl *D, const AttributeCommonInfo &CI,
 
   if (!VectorSize)
     parseModeAttrArg(*this, Str, DestWidth, IntegerMode, ComplexMode,
-                     ExplicitIEEE);
+                     ExplicitType);
 
   // FIXME: Sync this with InitializePredefinedMacros; we need to match int8_t
   // and friends, at least with glibc.
@@ -4316,7 +4723,7 @@ void Sema::AddModeAttr(Decl *D, const AttributeCommonInfo &CI,
     return;
   }
   bool IntegralOrAnyEnumType = (OldElemTy->isIntegralOrEnumerationType() &&
-                                !OldElemTy->isExtIntType()) ||
+                                !OldElemTy->isBitIntType()) ||
                                OldElemTy->getAs<EnumType>();
 
   if (!OldElemTy->getAs<BuiltinType>() && !OldElemTy->isComplexType() &&
@@ -4339,7 +4746,7 @@ void Sema::AddModeAttr(Decl *D, const AttributeCommonInfo &CI,
     NewElemTy = Context.getIntTypeForBitwidth(DestWidth,
                                               OldElemTy->isSignedIntegerType());
   else
-    NewElemTy = Context.getRealTypeForBitwidth(DestWidth, ExplicitIEEE);
+    NewElemTy = Context.getRealTypeForBitwidth(DestWidth, ExplicitType);
 
   if (NewElemTy.isNull()) {
     Diag(AttrLoc, diag::err_machine_mode) << 1 /*Unsupported*/ << Name;
@@ -4680,6 +5087,12 @@ static void handleCallConvAttr(Sema &S, Decl *D, const ParsedAttr &AL) {
   case ParsedAttr::AT_AArch64VectorPcs:
     D->addAttr(::new (S.Context) AArch64VectorPcsAttr(S.Context, AL));
     return;
+  case ParsedAttr::AT_AArch64SVEPcs:
+    D->addAttr(::new (S.Context) AArch64SVEPcsAttr(S.Context, AL));
+    return;
+  case ParsedAttr::AT_AMDGPUKernelCall:
+    D->addAttr(::new (S.Context) AMDGPUKernelCallAttr(S.Context, AL));
+    return;
   case ParsedAttr::AT_IntelOclBicc:
     D->addAttr(::new (S.Context) IntelOclBiccAttr(S.Context, AL));
     return;
@@ -4734,7 +5147,7 @@ static void handleLifetimeCategoryAttr(Sema &S, Decl *D, const ParsedAttr &AL) {
   }
 
   // To check if earlier decl attributes do not conflict the newly parsed ones
-  // we always add (and check) the attribute to the cannonical decl. We need
+  // we always add (and check) the attribute to the canonical decl. We need
   // to repeat the check for attribute mutual exclusion because we're attaching
   // all of the attributes to the canonical declaration rather than the current
   // declaration.
@@ -4777,6 +5190,21 @@ static void handleLifetimeCategoryAttr(Sema &S, Decl *D, const ParsedAttr &AL) {
   }
 }
 
+static void handleRandomizeLayoutAttr(Sema &S, Decl *D, const ParsedAttr &AL) {
+  if (checkAttrMutualExclusion<NoRandomizeLayoutAttr>(S, D, AL))
+    return;
+  if (!D->hasAttr<RandomizeLayoutAttr>())
+    D->addAttr(::new (S.Context) RandomizeLayoutAttr(S.Context, AL));
+}
+
+static void handleNoRandomizeLayoutAttr(Sema &S, Decl *D,
+                                        const ParsedAttr &AL) {
+  if (checkAttrMutualExclusion<RandomizeLayoutAttr>(S, D, AL))
+    return;
+  if (!D->hasAttr<NoRandomizeLayoutAttr>())
+    D->addAttr(::new (S.Context) NoRandomizeLayoutAttr(S.Context, AL));
+}
+
 bool Sema::CheckCallingConvAttr(const ParsedAttr &Attrs, CallingConv &CC,
                                 const FunctionDecl *FD) {
   if (Attrs.isInvalid())
@@ -4822,6 +5250,12 @@ bool Sema::CheckCallingConvAttr(const ParsedAttr &Attrs, CallingConv &CC,
   case ParsedAttr::AT_AArch64VectorPcs:
     CC = CC_AArch64VectorCall;
     break;
+  case ParsedAttr::AT_AArch64SVEPcs:
+    CC = CC_AArch64SVEPCS;
+    break;
+  case ParsedAttr::AT_AMDGPUKernelCall:
+    CC = CC_AMDGPUKernelCall;
+    break;
   case ParsedAttr::AT_RegCall:
     CC = CC_X86RegCall;
     break;
@@ -5072,7 +5506,7 @@ static Expr *makeLaunchBoundsArgExpr(Sema &S, Expr *E,
   if (E->isValueDependent())
     return E;
 
-  Optional<llvm::APSInt> I = llvm::APSInt(64);
+  std::optional<llvm::APSInt> I = llvm::APSInt(64);
   if (!(I = E->getIntegerConstantExpr(S.Context))) {
     S.Diag(E->getExprLoc(), diag::err_attribute_argument_n_type)
         << &AL << Idx << AANT_ArgumentIntegerConstant << E->getSourceRange();
@@ -5227,9 +5661,10 @@ static bool ArmBuiltinAliasValid(unsigned BuiltinID, StringRef AliasName,
                                  const char *IntrinNames) {
   if (AliasName.startswith("__arm_"))
     AliasName = AliasName.substr(6);
-  const IntrinToName *It = std::lower_bound(
-      Map.begin(), Map.end(), BuiltinID,
-      [](const IntrinToName &L, unsigned Id) { return L.Id < Id; });
+  const IntrinToName *It =
+      llvm::lower_bound(Map, BuiltinID, [](const IntrinToName &L, unsigned Id) {
+        return L.Id < Id;
+      });
   if (It == Map.end() || It->Id != BuiltinID)
     return false;
   StringRef FullName(&IntrinNames[It->FullName]);
@@ -5285,8 +5720,8 @@ static void handleArmBuiltinAliasAttr(Sema &S, Decl *D, const ParsedAttr &AL) {
 }
 
 static bool RISCVAliasValid(unsigned BuiltinID, StringRef AliasName) {
-  return BuiltinID >= Builtin::FirstTSBuiltin &&
-         BuiltinID < RISCV::LastTSBuiltin;
+  return BuiltinID >= RISCV::FirstRVVBuiltin &&
+         BuiltinID <= RISCV::LastRVVBuiltin;
 }
 
 static void handleBuiltinAliasAttr(Sema &S, Decl *D,
@@ -5304,11 +5739,12 @@ static void handleBuiltinAliasAttr(Sema &S, Decl *D,
   bool IsAArch64 = S.Context.getTargetInfo().getTriple().isAArch64();
   bool IsARM = S.Context.getTargetInfo().getTriple().isARM();
   bool IsRISCV = S.Context.getTargetInfo().getTriple().isRISCV();
+  bool IsHLSL = S.Context.getLangOpts().HLSL;
   if ((IsAArch64 && !ArmSveAliasValid(S.Context, BuiltinID, AliasName)) ||
       (IsARM && !ArmMveAliasValid(BuiltinID, AliasName) &&
        !ArmCdeAliasValid(BuiltinID, AliasName)) ||
       (IsRISCV && !RISCVAliasValid(BuiltinID, AliasName)) ||
-      (!IsAArch64 && !IsARM && !IsRISCV)) {
+      (!IsAArch64 && !IsARM && !IsRISCV && !IsHLSL)) {
     S.Diag(AL.getLoc(), diag::err_attribute_builtin_alias) << AL;
     return;
   }
@@ -6064,7 +6500,7 @@ validateSwiftFunctionName(Sema &S, const ParsedAttr &AL, SourceLocation Loc,
   if (BaseName.empty()) {
     BaseName = ContextName;
     ContextName = StringRef();
-  } else if (ContextName.empty() || !isValidIdentifier(ContextName)) {
+  } else if (ContextName.empty() || !isValidAsciiIdentifier(ContextName)) {
     S.Diag(Loc, diag::warn_attr_swift_name_invalid_identifier)
         << AL << /*context*/ 1;
     return false;
@@ -6072,7 +6508,7 @@ validateSwiftFunctionName(Sema &S, const ParsedAttr &AL, SourceLocation Loc,
     IsMember = true;
   }
 
-  if (!isValidIdentifier(BaseName) || BaseName == "_") {
+  if (!isValidAsciiIdentifier(BaseName) || BaseName == "_") {
     S.Diag(Loc, diag::warn_attr_swift_name_invalid_identifier)
         << AL << /*basename*/ 0;
     return false;
@@ -6116,13 +6552,13 @@ validateSwiftFunctionName(Sema &S, const ParsedAttr &AL, SourceLocation Loc,
   }
 
   StringRef CurrentParam;
-  llvm::Optional<unsigned> SelfLocation;
+  std::optional<unsigned> SelfLocation;
   unsigned NewValueCount = 0;
-  llvm::Optional<unsigned> NewValueLocation;
+  std::optional<unsigned> NewValueLocation;
   do {
     std::tie(CurrentParam, Parameters) = Parameters.split(':');
 
-    if (!isValidIdentifier(CurrentParam)) {
+    if (!isValidAsciiIdentifier(CurrentParam)) {
       S.Diag(Loc, diag::warn_attr_swift_name_invalid_identifier)
           << AL << /*parameter*/2;
       return false;
@@ -6263,13 +6699,12 @@ bool Sema::DiagnoseSwiftName(Decl *D, StringRef Name, SourceLocation Loc,
       // might be because we've transformed some of them. Check for potential
       // "out" parameters and err on the side of not warning.
       unsigned MaybeOutParamCount =
-          std::count_if(Params.begin(), Params.end(),
-                        [](const ParmVarDecl *Param) -> bool {
-        QualType ParamTy = Param->getType();
-        if (ParamTy->isReferenceType() || ParamTy->isPointerType())
-          return !ParamTy->getPointeeType().isConstQualified();
-        return false;
-      });
+          llvm::count_if(Params, [](const ParmVarDecl *Param) -> bool {
+            QualType ParamTy = Param->getType();
+            if (ParamTy->isReferenceType() || ParamTy->isPointerType())
+              return !ParamTy->getPointeeType().isConstQualified();
+            return false;
+          });
 
       ParamCountValid = SwiftParamCount + MaybeOutParamCount >= ParamCount;
     }
@@ -6291,13 +6726,13 @@ bool Sema::DiagnoseSwiftName(Decl *D, StringRef Name, SourceLocation Loc,
     if (BaseName.empty()) {
       BaseName = ContextName;
       ContextName = StringRef();
-    } else if (!isValidIdentifier(ContextName)) {
+    } else if (!isValidAsciiIdentifier(ContextName)) {
       Diag(Loc, diag::warn_attr_swift_name_invalid_identifier) << AL
           << /*context*/1;
       return false;
     }
 
-    if (!isValidIdentifier(BaseName)) {
+    if (!isValidAsciiIdentifier(BaseName)) {
       Diag(Loc, diag::warn_attr_swift_name_invalid_identifier) << AL
           << /*basename*/0;
       return false;
@@ -6494,6 +6929,248 @@ static void handleUuidAttr(Sema &S, Decl *D, const ParsedAttr &AL) {
     D->addAttr(UA);
 }
 
+static void handleHLSLNumThreadsAttr(Sema &S, Decl *D, const ParsedAttr &AL) {
+  using llvm::Triple;
+  Triple Target = S.Context.getTargetInfo().getTriple();
+  auto Env = S.Context.getTargetInfo().getTriple().getEnvironment();
+  if (!llvm::is_contained({Triple::Compute, Triple::Mesh, Triple::Amplification,
+                           Triple::Library},
+                          Env)) {
+    uint32_t Pipeline =
+        static_cast<uint32_t>(hlsl::getStageFromEnvironment(Env));
+    S.Diag(AL.getLoc(), diag::err_hlsl_attr_unsupported_in_stage)
+        << AL << Pipeline << "Compute, Amplification, Mesh or Library";
+    return;
+  }
+
+  llvm::VersionTuple SMVersion = Target.getOSVersion();
+  uint32_t ZMax = 1024;
+  uint32_t ThreadMax = 1024;
+  if (SMVersion.getMajor() <= 4) {
+    ZMax = 1;
+    ThreadMax = 768;
+  } else if (SMVersion.getMajor() == 5) {
+    ZMax = 64;
+    ThreadMax = 1024;
+  }
+
+  uint32_t X;
+  if (!checkUInt32Argument(S, AL, AL.getArgAsExpr(0), X))
+    return;
+  if (X > 1024) {
+    S.Diag(AL.getArgAsExpr(0)->getExprLoc(),
+           diag::err_hlsl_numthreads_argument_oor) << 0 << 1024;
+    return;
+  }
+  uint32_t Y;
+  if (!checkUInt32Argument(S, AL, AL.getArgAsExpr(1), Y))
+    return;
+  if (Y > 1024) {
+    S.Diag(AL.getArgAsExpr(1)->getExprLoc(),
+           diag::err_hlsl_numthreads_argument_oor) << 1 << 1024;
+    return;
+  }
+  uint32_t Z;
+  if (!checkUInt32Argument(S, AL, AL.getArgAsExpr(2), Z))
+    return;
+  if (Z > ZMax) {
+    S.Diag(AL.getArgAsExpr(2)->getExprLoc(),
+           diag::err_hlsl_numthreads_argument_oor) << 2 << ZMax;
+    return;
+  }
+
+  if (X * Y * Z > ThreadMax) {
+    S.Diag(AL.getLoc(), diag::err_hlsl_numthreads_invalid) << ThreadMax;
+    return;
+  }
+
+  HLSLNumThreadsAttr *NewAttr = S.mergeHLSLNumThreadsAttr(D, AL, X, Y, Z);
+  if (NewAttr)
+    D->addAttr(NewAttr);
+}
+
+HLSLNumThreadsAttr *Sema::mergeHLSLNumThreadsAttr(Decl *D,
+                                                  const AttributeCommonInfo &AL,
+                                                  int X, int Y, int Z) {
+  if (HLSLNumThreadsAttr *NT = D->getAttr<HLSLNumThreadsAttr>()) {
+    if (NT->getX() != X || NT->getY() != Y || NT->getZ() != Z) {
+      Diag(NT->getLocation(), diag::err_hlsl_attribute_param_mismatch) << AL;
+      Diag(AL.getLoc(), diag::note_conflicting_attribute);
+    }
+    return nullptr;
+  }
+  return ::new (Context) HLSLNumThreadsAttr(Context, AL, X, Y, Z);
+}
+
+static void handleHLSLSVGroupIndexAttr(Sema &S, Decl *D, const ParsedAttr &AL) {
+  using llvm::Triple;
+  auto Env = S.Context.getTargetInfo().getTriple().getEnvironment();
+  if (Env != Triple::Compute && Env != Triple::Library) {
+    // FIXME: it is OK for a compute shader entry and pixel shader entry live in
+    // same HLSL file. Issue https://github.com/llvm/llvm-project/issues/57880.
+    ShaderStage Pipeline = hlsl::getStageFromEnvironment(Env);
+    S.Diag(AL.getLoc(), diag::err_hlsl_attr_unsupported_in_stage)
+        << AL << (uint32_t)Pipeline << "Compute";
+    return;
+  }
+
+  D->addAttr(::new (S.Context) HLSLSV_GroupIndexAttr(S.Context, AL));
+}
+
+static bool isLegalTypeForHLSLSV_DispatchThreadID(QualType T) {
+  if (!T->hasUnsignedIntegerRepresentation())
+    return false;
+  if (const auto *VT = T->getAs<VectorType>())
+    return VT->getNumElements() <= 3;
+  return true;
+}
+
+static void handleHLSLSV_DispatchThreadIDAttr(Sema &S, Decl *D,
+                                              const ParsedAttr &AL) {
+  using llvm::Triple;
+  Triple Target = S.Context.getTargetInfo().getTriple();
+  // FIXME: it is OK for a compute shader entry and pixel shader entry live in
+  // same HLSL file.Issue https://github.com/llvm/llvm-project/issues/57880.
+  if (Target.getEnvironment() != Triple::Compute &&
+      Target.getEnvironment() != Triple::Library) {
+    uint32_t Pipeline =
+        (uint32_t)S.Context.getTargetInfo().getTriple().getEnvironment() -
+        (uint32_t)llvm::Triple::Pixel;
+    S.Diag(AL.getLoc(), diag::err_hlsl_attr_unsupported_in_stage)
+        << AL << Pipeline << "Compute";
+    return;
+  }
+
+  // FIXME: report warning and ignore semantic when cannot apply on the Decl.
+  // See https://github.com/llvm/llvm-project/issues/57916.
+
+  // FIXME: support semantic on field.
+  // See https://github.com/llvm/llvm-project/issues/57889.
+  if (isa<FieldDecl>(D)) {
+    S.Diag(AL.getLoc(), diag::err_hlsl_attr_invalid_ast_node)
+        << AL << "parameter";
+    return;
+  }
+
+  auto *VD = cast<ValueDecl>(D);
+  if (!isLegalTypeForHLSLSV_DispatchThreadID(VD->getType())) {
+    S.Diag(AL.getLoc(), diag::err_hlsl_attr_invalid_type)
+        << AL << "uint/uint2/uint3";
+    return;
+  }
+
+  D->addAttr(::new (S.Context) HLSLSV_DispatchThreadIDAttr(S.Context, AL));
+}
+
+static void handleHLSLShaderAttr(Sema &S, Decl *D, const ParsedAttr &AL) {
+  StringRef Str;
+  SourceLocation ArgLoc;
+  if (!S.checkStringLiteralArgumentAttr(AL, 0, Str, &ArgLoc))
+    return;
+
+  HLSLShaderAttr::ShaderType ShaderType;
+  if (!HLSLShaderAttr::ConvertStrToShaderType(Str, ShaderType) ||
+      // Library is added to help convert HLSLShaderAttr::ShaderType to
+      // llvm::Triple::EnviromentType. It is not a legal
+      // HLSLShaderAttr::ShaderType.
+      ShaderType == HLSLShaderAttr::Library) {
+    S.Diag(AL.getLoc(), diag::warn_attribute_type_not_supported)
+        << AL << Str << ArgLoc;
+    return;
+  }
+
+  // FIXME: check function match the shader stage.
+
+  HLSLShaderAttr *NewAttr = S.mergeHLSLShaderAttr(D, AL, ShaderType);
+  if (NewAttr)
+    D->addAttr(NewAttr);
+}
+
+HLSLShaderAttr *
+Sema::mergeHLSLShaderAttr(Decl *D, const AttributeCommonInfo &AL,
+                          HLSLShaderAttr::ShaderType ShaderType) {
+  if (HLSLShaderAttr *NT = D->getAttr<HLSLShaderAttr>()) {
+    if (NT->getType() != ShaderType) {
+      Diag(NT->getLocation(), diag::err_hlsl_attribute_param_mismatch) << AL;
+      Diag(AL.getLoc(), diag::note_conflicting_attribute);
+    }
+    return nullptr;
+  }
+  return HLSLShaderAttr::Create(Context, ShaderType, AL);
+}
+
+static void handleHLSLResourceBindingAttr(Sema &S, Decl *D,
+                                          const ParsedAttr &AL) {
+  StringRef Space = "space0";
+  StringRef Slot = "";
+
+  if (!AL.isArgIdent(0)) {
+    S.Diag(AL.getLoc(), diag::err_attribute_argument_type)
+        << AL << AANT_ArgumentIdentifier;
+    return;
+  }
+
+  IdentifierLoc *Loc = AL.getArgAsIdent(0);
+  StringRef Str = Loc->Ident->getName();
+  SourceLocation ArgLoc = Loc->Loc;
+
+  SourceLocation SpaceArgLoc;
+  if (AL.getNumArgs() == 2) {
+    Slot = Str;
+    if (!AL.isArgIdent(1)) {
+      S.Diag(AL.getLoc(), diag::err_attribute_argument_type)
+          << AL << AANT_ArgumentIdentifier;
+      return;
+    }
+
+    IdentifierLoc *Loc = AL.getArgAsIdent(1);
+    Space = Loc->Ident->getName();
+    SpaceArgLoc = Loc->Loc;
+  } else {
+    Slot = Str;
+  }
+
+  // Validate.
+  if (!Slot.empty()) {
+    switch (Slot[0]) {
+    case 'u':
+    case 'b':
+    case 's':
+    case 't':
+      break;
+    default:
+      S.Diag(ArgLoc, diag::err_hlsl_unsupported_register_type)
+          << Slot.substr(0, 1);
+      return;
+    }
+
+    StringRef SlotNum = Slot.substr(1);
+    unsigned Num = 0;
+    if (SlotNum.getAsInteger(10, Num)) {
+      S.Diag(ArgLoc, diag::err_hlsl_unsupported_register_number);
+      return;
+    }
+  }
+
+  if (!Space.startswith("space")) {
+    S.Diag(SpaceArgLoc, diag::err_hlsl_expected_space) << Space;
+    return;
+  }
+  StringRef SpaceNum = Space.substr(5);
+  unsigned Num = 0;
+  if (SpaceNum.getAsInteger(10, Num)) {
+    S.Diag(SpaceArgLoc, diag::err_hlsl_expected_space) << Space;
+    return;
+  }
+
+  // FIXME: check reg type match decl. Issue
+  // https://github.com/llvm/llvm-project/issues/57886.
+  HLSLResourceBindingAttr *NewAttr =
+      HLSLResourceBindingAttr::Create(S.getASTContext(), Slot, Space, AL);
+  if (NewAttr)
+    D->addAttr(NewAttr);
+}
+
 static void handleMSInheritanceAttr(Sema &S, Decl *D, const ParsedAttr &AL) {
   if (!S.LangOpts.CPlusPlus) {
     S.Diag(AL.getLoc(), diag::err_attribute_not_supported_in_lang)
@@ -6613,7 +7290,7 @@ static void handleMSP430InterruptAttr(Sema &S, Decl *D, const ParsedAttr &AL) {
   }
 
   Expr *NumParamsExpr = static_cast<Expr *>(AL.getArgAsExpr(0));
-  Optional<llvm::APSInt> NumParams = llvm::APSInt(32);
+  std::optional<llvm::APSInt> NumParams = llvm::APSInt(32);
   if (!(NumParams = NumParamsExpr->getIntegerConstantExpr(S.Context))) {
     S.Diag(AL.getLoc(), diag::err_attribute_argument_type)
         << AL << AANT_ArgumentIntegerConstant
@@ -6815,7 +7492,7 @@ static void handleAVRSignalAttr(Sema &S, Decl *D, const ParsedAttr &AL) {
 
 static void handleBPFPreserveAIRecord(Sema &S, RecordDecl *RD) {
   // Add preserve_access_index attribute to all fields and inner records.
-  for (auto D : RD->decls()) {
+  for (auto *D : RD->decls()) {
     if (D->hasAttr<BPFPreserveAccessIndexAttr>())
       continue;
 
@@ -6832,6 +7509,30 @@ static void handleBPFPreserveAccessIndexAttr(Sema &S, Decl *D,
   Rec->addAttr(::new (S.Context) BPFPreserveAccessIndexAttr(S.Context, AL));
 }
 
+static bool hasBTFDeclTagAttr(Decl *D, StringRef Tag) {
+  for (const auto *I : D->specific_attrs<BTFDeclTagAttr>()) {
+    if (I->getBTFDeclTag() == Tag)
+      return true;
+  }
+  return false;
+}
+
+static void handleBTFDeclTagAttr(Sema &S, Decl *D, const ParsedAttr &AL) {
+  StringRef Str;
+  if (!S.checkStringLiteralArgumentAttr(AL, 0, Str))
+    return;
+  if (hasBTFDeclTagAttr(D, Str))
+    return;
+
+  D->addAttr(::new (S.Context) BTFDeclTagAttr(S.Context, AL, Str));
+}
+
+BTFDeclTagAttr *Sema::mergeBTFDeclTagAttr(Decl *D, const BTFDeclTagAttr &AL) {
+  if (hasBTFDeclTagAttr(D, AL.getBTFDeclTag()))
+    return nullptr;
+  return ::new (Context) BTFDeclTagAttr(Context, AL, AL.getBTFDeclTag());
+}
+
 static void handleWebAssemblyExportNameAttr(Sema &S, Decl *D, const ParsedAttr &AL) {
   if (!isFunctionOrMethod(D)) {
     S.Diag(D->getLocation(), diag::warn_attribute_wrong_decl_type)
@@ -7390,6 +8091,11 @@ static bool isGlobalVar(const Decl *D) {
   return false;
 }
 
+static bool isSanitizerAttributeAllowedOnGlobals(StringRef Sanitizer) {
+  return Sanitizer == "address" || Sanitizer == "hwaddress" ||
+         Sanitizer == "memtag";
+}
+
 static void handleNoSanitizeAttr(Sema &S, Decl *D, const ParsedAttr &AL) {
   if (!AL.checkAtLeastNumArgs(S, 1))
     return;
@@ -7407,9 +8113,9 @@ static void handleNoSanitizeAttr(Sema &S, Decl *D, const ParsedAttr &AL) {
             SanitizerMask() &&
         SanitizerName != "coverage")
       S.Diag(LiteralLoc, diag::warn_unknown_sanitizer_ignored) << SanitizerName;
-    else if (isGlobalVar(D) && SanitizerName != "address")
-      S.Diag(D->getLocation(), diag::err_attribute_wrong_decl_type)
-          << AL << ExpectedFunctionOrMethod;
+    else if (isGlobalVar(D) && !isSanitizerAttributeAllowedOnGlobals(SanitizerName))
+      S.Diag(D->getLocation(), diag::warn_attribute_type_not_supported_global)
+          << AL << SanitizerName;
     Sanitizers.push_back(SanitizerName);
   }
 
@@ -7435,7 +8141,7 @@ static void handleNoSanitizeSpecificAttr(Sema &S, Decl *D,
   // index rather than incorrectly assume the index for NoSanitizeSpecificAttr
   // has the same spellings as the index for NoSanitizeAttr. We don't have a
   // general way to "translate" between the two, so this hack attempts to work
-  // around the issue with hard-coded indicies. This is critical for calling
+  // around the issue with hard-coded indices. This is critical for calling
   // getSpelling() or prettyPrint() on the resulting semantic attribute object
   // without failing assertions.
   unsigned TranslatedSpellingIndex = 0;
@@ -7454,12 +8160,12 @@ static void handleInternalLinkageAttr(Sema &S, Decl *D, const ParsedAttr &AL) {
 }
 
 static void handleOpenCLNoSVMAttr(Sema &S, Decl *D, const ParsedAttr &AL) {
-  if (S.LangOpts.OpenCLVersion != 200)
+  if (S.LangOpts.getOpenCLCompatibleVersion() < 200)
     S.Diag(AL.getLoc(), diag::err_attribute_requires_opencl_version)
-        << AL << "2.0" << 0;
+        << AL << "2.0" << 1;
   else
-    S.Diag(AL.getLoc(), diag::warn_opencl_attr_deprecated_ignored) << AL
-                                                                   << "2.0";
+    S.Diag(AL.getLoc(), diag::warn_opencl_attr_deprecated_ignored)
+        << AL << S.LangOpts.getOpenCLVersionString();
 }
 
 static void handleOpenCLAccessAttr(Sema &S, Decl *D, const ParsedAttr &AL) {
@@ -7487,18 +8193,17 @@ static void handleOpenCLAccessAttr(Sema &S, Decl *D, const ParsedAttr &AL) {
   // OpenCL v3.0 s6.8 - For OpenCL C 2.0, or with the
   // __opencl_c_read_write_images feature, image objects specified as arguments
   // to a kernel can additionally be declared to be read-write.
-  // C++ for OpenCL inherits rule from OpenCL C v2.0.
+  // C++ for OpenCL 1.0 inherits rule from OpenCL C v2.0.
+  // C++ for OpenCL 2021 inherits rule from OpenCL C v3.0.
   if (const auto *PDecl = dyn_cast<ParmVarDecl>(D)) {
     const Type *DeclTy = PDecl->getType().getCanonicalType().getTypePtr();
-    if (AL.getAttrName()->getName().find("read_write") != StringRef::npos) {
-      bool ReadWriteImagesUnsupportedForOCLC =
-          (S.getLangOpts().OpenCLVersion < 200) ||
-          (S.getLangOpts().OpenCLVersion == 300 &&
+    if (AL.getAttrName()->getName().contains("read_write")) {
+      bool ReadWriteImagesUnsupported =
+          (S.getLangOpts().getOpenCLCompatibleVersion() < 200) ||
+          (S.getLangOpts().getOpenCLCompatibleVersion() == 300 &&
            !S.getOpenCLOptions().isSupported("__opencl_c_read_write_images",
                                              S.getLangOpts()));
-      if ((!S.getLangOpts().OpenCLCPlusPlus &&
-           ReadWriteImagesUnsupportedForOCLC) ||
-          DeclTy->isPipeType()) {
+      if (ReadWriteImagesUnsupported || DeclTy->isPipeType()) {
         S.Diag(AL.getLoc(), diag::err_opencl_invalid_read_write)
             << AL << PDecl->getType() << DeclTy->isImageType();
         D->setInvalidDecl(true);
@@ -7510,6 +8215,44 @@ static void handleOpenCLAccessAttr(Sema &S, Decl *D, const ParsedAttr &AL) {
   D->addAttr(::new (S.Context) OpenCLAccessAttr(S.Context, AL));
 }
 
+static void handleZeroCallUsedRegsAttr(Sema &S, Decl *D, const ParsedAttr &AL) {
+  // Check that the argument is a string literal.
+  StringRef KindStr;
+  SourceLocation LiteralLoc;
+  if (!S.checkStringLiteralArgumentAttr(AL, 0, KindStr, &LiteralLoc))
+    return;
+
+  ZeroCallUsedRegsAttr::ZeroCallUsedRegsKind Kind;
+  if (!ZeroCallUsedRegsAttr::ConvertStrToZeroCallUsedRegsKind(KindStr, Kind)) {
+    S.Diag(LiteralLoc, diag::warn_attribute_type_not_supported)
+        << AL << KindStr;
+    return;
+  }
+
+  D->dropAttr<ZeroCallUsedRegsAttr>();
+  D->addAttr(ZeroCallUsedRegsAttr::Create(S.Context, Kind, AL));
+}
+
+static void handleFunctionReturnThunksAttr(Sema &S, Decl *D,
+                                           const ParsedAttr &AL) {
+  StringRef KindStr;
+  SourceLocation LiteralLoc;
+  if (!S.checkStringLiteralArgumentAttr(AL, 0, KindStr, &LiteralLoc))
+    return;
+
+  FunctionReturnThunksAttr::Kind Kind;
+  if (!FunctionReturnThunksAttr::ConvertStrToKind(KindStr, Kind)) {
+    S.Diag(LiteralLoc, diag::warn_attribute_type_not_supported)
+        << AL << KindStr;
+    return;
+  }
+  // FIXME: it would be good to better handle attribute merging rather than
+  // silently replacing the existing attribute, so long as it does not break
+  // the expected codegen tests.
+  D->dropAttr<FunctionReturnThunksAttr>();
+  D->addAttr(FunctionReturnThunksAttr::Create(S.Context, Kind, AL));
+}
+
 static void handleSYCLKernelAttr(Sema &S, Decl *D, const ParsedAttr &AL) {
   // The 'sycl_kernel' attribute applies only to function templates.
   const auto *FD = cast<FunctionDecl>(D);
@@ -7796,18 +8539,55 @@ EnforceTCBLeafAttr *Sema::mergeEnforceTCBLeafAttr(
 // Top Level Sema Entry Points
 //===----------------------------------------------------------------------===//
 
+// Returns true if the attribute must delay setting its arguments until after
+// template instantiation, and false otherwise.
+static bool MustDelayAttributeArguments(const ParsedAttr &AL) {
+  // Only attributes that accept expression parameter packs can delay arguments.
+  if (!AL.acceptsExprPack())
+    return false;
+
+  bool AttrHasVariadicArg = AL.hasVariadicArg();
+  unsigned AttrNumArgs = AL.getNumArgMembers();
+  for (size_t I = 0; I < std::min(AL.getNumArgs(), AttrNumArgs); ++I) {
+    bool IsLastAttrArg = I == (AttrNumArgs - 1);
+    // If the argument is the last argument and it is variadic it can contain
+    // any expression.
+    if (IsLastAttrArg && AttrHasVariadicArg)
+      return false;
+    Expr *E = AL.getArgAsExpr(I);
+    bool ArgMemberCanHoldExpr = AL.isParamExpr(I);
+    // If the expression is a pack expansion then arguments must be delayed
+    // unless the argument is an expression and it is the last argument of the
+    // attribute.
+    if (isa<PackExpansionExpr>(E))
+      return !(IsLastAttrArg && ArgMemberCanHoldExpr);
+    // Last case is if the expression is value dependent then it must delay
+    // arguments unless the corresponding argument is able to hold the
+    // expression.
+    if (E->isValueDependent() && !ArgMemberCanHoldExpr)
+      return true;
+  }
+  return false;
+}
+
 /// ProcessDeclAttribute - Apply the specific attribute to the specified decl if
 /// the attribute applies to decls.  If the attribute is a type attribute, just
 /// silently ignore it if a GNU attribute.
-static void ProcessDeclAttribute(Sema &S, Scope *scope, Decl *D,
-                                 const ParsedAttr &AL,
-                                 bool IncludeCXX11Attributes) {
+static void
+ProcessDeclAttribute(Sema &S, Scope *scope, Decl *D, const ParsedAttr &AL,
+                     const Sema::ProcessDeclAttributeOptions &Options) {
   if (AL.isInvalid() || AL.getKind() == ParsedAttr::IgnoredAttribute)
     return;
 
   // Ignore C++11 attributes on declarator chunks: they appertain to the type
   // instead.
-  if (AL.isCXX11Attribute() && !IncludeCXX11Attributes)
+  // FIXME: We currently check the attribute syntax directly instead of using
+  // isCXX11Attribute(), which currently erroneously classifies the C11
+  // `_Alignas` attribute as a C++11 attribute. `_Alignas` can appear on the
+  // `DeclSpec`, so we need to let it through here to make sure it is processed
+  // appropriately. Once the behavior of isCXX11Attribute() is fixed, we can
+  // go back to using that here.
+  if (AL.getSyntax() == ParsedAttr::AS_CXX11 && !Options.IncludeCXX11Attributes)
     return;
 
   // Unknown attributes are automatically warned on. Target-specific attributes
@@ -7823,22 +8603,93 @@ static void ProcessDeclAttribute(Sema &S, Scope *scope, Decl *D,
     return;
   }
 
-  if (S.checkCommonAttributeFeatures(D, AL))
+  // Check if argument population must delayed to after template instantiation.
+  bool MustDelayArgs = MustDelayAttributeArguments(AL);
+
+  // Argument number check must be skipped if arguments are delayed.
+  if (S.checkCommonAttributeFeatures(D, AL, MustDelayArgs))
+    return;
+
+  if (MustDelayArgs) {
+    AL.handleAttrWithDelayedArgs(S, D);
     return;
+  }
 
   switch (AL.getKind()) {
   default:
     if (AL.getInfo().handleDeclAttribute(S, D, AL) != ParsedAttrInfo::NotHandled)
       break;
     if (!AL.isStmtAttr()) {
-      // Type attributes are handled elsewhere; silently move on.
       assert(AL.isTypeAttr() && "Non-type attribute not handled");
-      break;
+    }
+    if (AL.isTypeAttr()) {
+      if (Options.IgnoreTypeAttributes)
+        break;
+      if (!AL.isStandardAttributeSyntax()) {
+        // Non-[[]] type attributes are handled in processTypeAttrs(); silently
+        // move on.
+        break;
+      }
+
+      // According to the C and C++ standards, we should never see a
+      // [[]] type attribute on a declaration. However, we have in the past
+      // allowed some type attributes to "slide" to the `DeclSpec`, so we need
+      // to continue to support this legacy behavior. We only do this, however,
+      // if
+      // - we actually have a `DeclSpec`, i.e. if we're looking at a
+      //   `DeclaratorDecl`, or
+      // - we are looking at an alias-declaration, where historically we have
+      //   allowed type attributes after the identifier to slide to the type.
+      if (AL.slidesFromDeclToDeclSpecLegacyBehavior() &&
+          isa<DeclaratorDecl, TypeAliasDecl>(D)) {
+        // Suggest moving the attribute to the type instead, but only for our
+        // own vendor attributes; moving other vendors' attributes might hurt
+        // portability.
+        if (AL.isClangScope()) {
+          S.Diag(AL.getLoc(), diag::warn_type_attribute_deprecated_on_decl)
+              << AL << D->getLocation();
+        }
+
+        // Allow this type attribute to be handled in processTypeAttrs();
+        // silently move on.
+        break;
+      }
+
+      if (AL.getKind() == ParsedAttr::AT_Regparm) {
+        // `regparm` is a special case: It's a type attribute but we still want
+        // to treat it as if it had been written on the declaration because that
+        // way we'll be able to handle it directly in `processTypeAttr()`.
+        // If we treated `regparm` it as if it had been written on the
+        // `DeclSpec`, the logic in `distributeFunctionTypeAttrFromDeclSepc()`
+        // would try to move it to the declarator, but that doesn't work: We
+        // can't remove the attribute from the list of declaration attributes
+        // because it might be needed by other declarators in the same
+        // declaration.
+        break;
+      }
+
+      if (AL.getKind() == ParsedAttr::AT_VectorSize) {
+        // `vector_size` is a special case: It's a type attribute semantically,
+        // but GCC expects the [[]] syntax to be written on the declaration (and
+        // warns that the attribute has no effect if it is placed on the
+        // decl-specifier-seq).
+        // Silently move on and allow the attribute to be handled in
+        // processTypeAttr().
+        break;
+      }
+
+      if (AL.getKind() == ParsedAttr::AT_NoDeref) {
+        // FIXME: `noderef` currently doesn't work correctly in [[]] syntax.
+        // See https://github.com/llvm/llvm-project/issues/55790 for details.
+        // We allow processTypeAttrs() to emit a warning and silently move on.
+        break;
+      }
     }
     // N.B., ClangAttrEmitter.cpp emits a diagnostic helper that ensures a
     // statement attribute is not written on a declaration, but this code is
-    // needed for attributes in Attr.td that do not list any subjects.
-    S.Diag(AL.getLoc(), diag::err_stmt_attribute_invalid_on_decl)
+    // needed for type attributes as well as statement attributes in Attr.td
+    // that do not list any subjects.
+    S.Diag(AL.getLoc(), diag::err_attribute_invalid_on_decl)
         << AL << D->getLocation();
     break;
   case ParsedAttr::AT_Interrupt:
@@ -7847,6 +8698,9 @@ static void ProcessDeclAttribute(Sema &S, Scope *scope, Decl *D,
   case ParsedAttr::AT_X86ForceAlignArgPointer:
     handleX86ForceAlignArgPointerAttr(S, D, AL);
     break;
+  case ParsedAttr::AT_ReadOnlyPlacement:
+    handleSimpleAttribute<ReadOnlyPlacementAttr>(S, D, AL);
+    break;
   case ParsedAttr::AT_DLLExport:
   case ParsedAttr::AT_DLLImport:
     handleDLLAttr(S, D, AL);
@@ -7869,6 +8723,9 @@ static void ProcessDeclAttribute(Sema &S, Scope *scope, Decl *D,
   case ParsedAttr::AT_BPFPreserveAccessIndex:
     handleBPFPreserveAccessIndexAttr(S, D, AL);
     break;
+  case ParsedAttr::AT_BTFDeclTag:
+    handleBTFDeclTagAttr(S, D, AL);
+    break;
   case ParsedAttr::AT_WebAssemblyExportName:
     handleWebAssemblyExportNameAttr(S, D, AL);
     break;
@@ -7942,9 +8799,15 @@ static void ProcessDeclAttribute(Sema &S, Scope *scope, Decl *D,
   case ParsedAttr::AT_EnableIf:
     handleEnableIfAttr(S, D, AL);
     break;
+  case ParsedAttr::AT_Error:
+    handleErrorAttr(S, D, AL);
+    break;
   case ParsedAttr::AT_DiagnoseIf:
     handleDiagnoseIfAttr(S, D, AL);
     break;
+  case ParsedAttr::AT_DiagnoseAsBuiltin:
+    handleDiagnoseAsBuiltinAttr(S, D, AL);
+    break;
   case ParsedAttr::AT_NoBuiltin:
     handleNoBuiltinAttr(S, D, AL);
     break;
@@ -7966,6 +8829,9 @@ static void ProcessDeclAttribute(Sema &S, Scope *scope, Decl *D,
   case ParsedAttr::AT_SYCLKernel:
     handleSYCLKernelAttr(S, D, AL);
     break;
+  case ParsedAttr::AT_SYCLSpecialClass:
+    handleSimpleAttribute<SYCLSpecialClassAttr>(S, D, AL);
+    break;
   case ParsedAttr::AT_Format:
     handleFormatAttr(S, D, AL);
     break;
@@ -8011,6 +8877,9 @@ static void ProcessDeclAttribute(Sema &S, Scope *scope, Decl *D,
   case ParsedAttr::AT_NoEscape:
     handleNoEscapeAttr(S, D, AL);
     break;
+  case ParsedAttr::AT_MaybeUndef:
+    handleSimpleAttribute<MaybeUndefAttr>(S, D, AL);
+    break;
   case ParsedAttr::AT_AssumeAligned:
     handleAssumeAlignedAttr(S, D, AL);
     break;
@@ -8026,6 +8895,9 @@ static void ProcessDeclAttribute(Sema &S, Scope *scope, Decl *D,
   case ParsedAttr::AT_NoReturn:
     handleNoReturnAttr(S, D, AL);
     break;
+  case ParsedAttr::AT_CXX11NoReturn:
+    handleStandardNoReturnAttr(S, D, AL);
+    break;
   case ParsedAttr::AT_AnyX86NoCfCheck:
     handleNoCfCheckAttr(S, D, AL);
     break;
@@ -8123,12 +8995,24 @@ static void ProcessDeclAttribute(Sema &S, Scope *scope, Decl *D,
   case ParsedAttr::AT_Section:
     handleSectionAttr(S, D, AL);
     break;
+  case ParsedAttr::AT_RandomizeLayout:
+    handleRandomizeLayoutAttr(S, D, AL);
+    break;
+  case ParsedAttr::AT_NoRandomizeLayout:
+    handleNoRandomizeLayoutAttr(S, D, AL);
+    break;
   case ParsedAttr::AT_CodeSeg:
     handleCodeSegAttr(S, D, AL);
     break;
   case ParsedAttr::AT_Target:
     handleTargetAttr(S, D, AL);
     break;
+  case ParsedAttr::AT_TargetVersion:
+    handleTargetVersionAttr(S, D, AL);
+    break;
+  case ParsedAttr::AT_TargetClones:
+    handleTargetClonesAttr(S, D, AL);
+    break;
   case ParsedAttr::AT_MinVectorWidth:
     handleMinVectorWidthAttr(S, D, AL);
     break;
@@ -8209,6 +9093,8 @@ static void ProcessDeclAttribute(Sema &S, Scope *scope, Decl *D,
   case ParsedAttr::AT_PreserveMost:
   case ParsedAttr::AT_PreserveAll:
   case ParsedAttr::AT_AArch64VectorPcs:
+  case ParsedAttr::AT_AArch64SVEPcs:
+  case ParsedAttr::AT_AMDGPUKernelCall:
     handleCallConvAttr(S, D, AL);
     break;
   case ParsedAttr::AT_Suppress:
@@ -8239,6 +9125,12 @@ static void ProcessDeclAttribute(Sema &S, Scope *scope, Decl *D,
   case ParsedAttr::AT_InternalLinkage:
     handleInternalLinkageAttr(S, D, AL);
     break;
+  case ParsedAttr::AT_ZeroCallUsedRegs:
+    handleZeroCallUsedRegsAttr(S, D, AL);
+    break;
+  case ParsedAttr::AT_FunctionReturnThunks:
+    handleFunctionReturnThunksAttr(S, D, AL);
+    break;
 
   // Microsoft attributes:
   case ParsedAttr::AT_LayoutVersion:
@@ -8254,6 +9146,23 @@ static void ProcessDeclAttribute(Sema &S, Scope *scope, Decl *D,
     handleDeclspecThreadAttr(S, D, AL);
     break;
 
+  // HLSL attributes:
+  case ParsedAttr::AT_HLSLNumThreads:
+    handleHLSLNumThreadsAttr(S, D, AL);
+    break;
+  case ParsedAttr::AT_HLSLSV_GroupIndex:
+    handleHLSLSVGroupIndexAttr(S, D, AL);
+    break;
+  case ParsedAttr::AT_HLSLSV_DispatchThreadID:
+    handleHLSLSV_DispatchThreadIDAttr(S, D, AL);
+    break;
+  case ParsedAttr::AT_HLSLShader:
+    handleHLSLShaderAttr(S, D, AL);
+    break;
+  case ParsedAttr::AT_HLSLResourceBinding:
+    handleHLSLResourceBindingAttr(S, D, AL);
+    break;
+
   case ParsedAttr::AT_AbiTag:
     handleAbiTagAttr(S, D, AL);
     break;
@@ -8444,14 +9353,14 @@ static void ProcessDeclAttribute(Sema &S, Scope *scope, Decl *D,
 
 /// ProcessDeclAttributeList - Apply all the decl attributes in the specified
 /// attribute list to the specified decl, ignoring any type attributes.
-void Sema::ProcessDeclAttributeList(Scope *S, Decl *D,
-                                    const ParsedAttributesView &AttrList,
-                                    bool IncludeCXX11Attributes) {
+void Sema::ProcessDeclAttributeList(
+    Scope *S, Decl *D, const ParsedAttributesView &AttrList,
+    const ProcessDeclAttributeOptions &Options) {
   if (AttrList.empty())
     return;
 
   for (const ParsedAttr &AL : AttrList)
-    ProcessDeclAttribute(*this, S, D, AL, IncludeCXX11Attributes);
+    ProcessDeclAttribute(*this, S, D, AL, Options);
 
   // FIXME: We should be able to handle these cases in TableGen.
   // GCC accepts
@@ -8539,7 +9448,8 @@ bool Sema::ProcessAccessDeclAttributeList(
     AccessSpecDecl *ASDecl, const ParsedAttributesView &AttrList) {
   for (const ParsedAttr &AL : AttrList) {
     if (AL.getKind() == ParsedAttr::AT_Annotate) {
-      ProcessDeclAttribute(*this, nullptr, ASDecl, AL, AL.isCXX11Attribute());
+      ProcessDeclAttribute(*this, nullptr, ASDecl, AL,
+                           ProcessDeclAttributeOptions());
     } else {
       Diag(AL.getLoc(), diag::err_only_annotate_after_access_spec);
       return true;
@@ -8572,6 +9482,7 @@ static void checkUnusedDeclAttributes(Sema &S, const ParsedAttributesView &A) {
 /// used to build a declaration, complain about any decl attributes
 /// which might be lying around on it.
 void Sema::checkUnusedDeclAttributes(Declarator &D) {
+  ::checkUnusedDeclAttributes(*this, D.getDeclarationAttributes());
   ::checkUnusedDeclAttributes(*this, D.getDeclSpec().getAttributes());
   ::checkUnusedDeclAttributes(*this, D.getAttributes());
   for (unsigned i = 0, e = D.getNumTypeObjects(); i != e; ++i)
@@ -8580,8 +9491,8 @@ void Sema::checkUnusedDeclAttributes(Declarator &D) {
 
 /// DeclClonePragmaWeak - clone existing decl (maybe definition),
 /// \#pragma weak needs a non-definition decl and source may not have one.
-NamedDecl * Sema::DeclClonePragmaWeak(NamedDecl *ND, IdentifierInfo *II,
-                                      SourceLocation Loc) {
+NamedDecl *Sema::DeclClonePragmaWeak(NamedDecl *ND, const IdentifierInfo *II,
+                                     SourceLocation Loc) {
   assert(isa<FunctionDecl>(ND) || isa<VarDecl>(ND));
   NamedDecl *NewD = nullptr;
   if (auto *FD = dyn_cast<FunctionDecl>(ND)) {
@@ -8593,8 +9504,9 @@ NamedDecl * Sema::DeclClonePragmaWeak(NamedDecl *ND, IdentifierInfo *II,
     NewFD = FunctionDecl::Create(
         FD->getASTContext(), FD->getDeclContext(), Loc, Loc,
         DeclarationName(II), FD->getType(), FD->getTypeSourceInfo(), SC_None,
-        false /*isInlineSpecified*/, FD->hasPrototype(),
-        ConstexprSpecKind::Unspecified, FD->getTrailingRequiresClause());
+        getCurFPFeatures().isFPConstrained(), false /*isInlineSpecified*/,
+        FD->hasPrototype(), ConstexprSpecKind::Unspecified,
+        FD->getTrailingRequiresClause());
     NewD = NewFD;
 
     if (FD->getQualifier())
@@ -8625,9 +9537,7 @@ NamedDecl * Sema::DeclClonePragmaWeak(NamedDecl *ND, IdentifierInfo *II,
 
 /// DeclApplyPragmaWeak - A declaration (maybe definition) needs \#pragma weak
 /// applied to it, possibly with an alias.
-void Sema::DeclApplyPragmaWeak(Scope *S, NamedDecl *ND, WeakInfo &W) {
-  if (W.getUsed()) return; // only do this once
-  W.setUsed(true);
+void Sema::DeclApplyPragmaWeak(Scope *S, NamedDecl *ND, const WeakInfo &W) {
   if (W.getAlias()) { // clone decl, impersonate __attribute(weak,alias(...))
     IdentifierInfo *NDId = ND->getIdentifier();
     NamedDecl *NewD = DeclClonePragmaWeak(ND, W.getAlias(), W.getLocation());
@@ -8654,23 +9564,25 @@ void Sema::ProcessPragmaWeak(Scope *S, Decl *D) {
   // It's valid to "forward-declare" #pragma weak, in which case we
   // have to do this.
   LoadExternalWeakUndeclaredIdentifiers();
-  if (!WeakUndeclaredIdentifiers.empty()) {
-    NamedDecl *ND = nullptr;
-    if (auto *VD = dyn_cast<VarDecl>(D))
-      if (VD->isExternC())
-        ND = VD;
-    if (auto *FD = dyn_cast<FunctionDecl>(D))
-      if (FD->isExternC())
-        ND = FD;
-    if (ND) {
-      if (IdentifierInfo *Id = ND->getIdentifier()) {
-        auto I = WeakUndeclaredIdentifiers.find(Id);
-        if (I != WeakUndeclaredIdentifiers.end()) {
-          WeakInfo W = I->second;
-          DeclApplyPragmaWeak(S, ND, W);
-          WeakUndeclaredIdentifiers[Id] = W;
-        }
-      }
+  if (WeakUndeclaredIdentifiers.empty())
+    return;
+  NamedDecl *ND = nullptr;
+  if (auto *VD = dyn_cast<VarDecl>(D))
+    if (VD->isExternC())
+      ND = VD;
+  if (auto *FD = dyn_cast<FunctionDecl>(D))
+    if (FD->isExternC())
+      ND = FD;
+  if (!ND)
+    return;
+  if (IdentifierInfo *Id = ND->getIdentifier()) {
+    auto I = WeakUndeclaredIdentifiers.find(Id);
+    if (I != WeakUndeclaredIdentifiers.end()) {
+      auto &WeakInfos = I->second;
+      for (const auto &W : WeakInfos)
+        DeclApplyPragmaWeak(S, ND, W);
+      std::remove_reference_t<decltype(WeakInfos)> EmptyWeakInfos;
+      WeakInfos.swap(EmptyWeakInfos);
     }
   }
 }
@@ -8679,17 +9591,43 @@ void Sema::ProcessPragmaWeak(Scope *S, Decl *D) {
 /// it, apply them to D.  This is a bit tricky because PD can have attributes
 /// specified in many different places, and we need to find and apply them all.
 void Sema::ProcessDeclAttributes(Scope *S, Decl *D, const Declarator &PD) {
+  // Ordering of attributes can be important, so we take care to process
+  // attributes in the order in which they appeared in the source code.
+
+  // First, process attributes that appeared on the declaration itself (but
+  // only if they don't have the legacy behavior of "sliding" to the DeclSepc).
+  ParsedAttributesView NonSlidingAttrs;
+  for (ParsedAttr &AL : PD.getDeclarationAttributes()) {
+    if (AL.slidesFromDeclToDeclSpecLegacyBehavior()) {
+      // Skip processing the attribute, but do check if it appertains to the
+      // declaration. This is needed for the `MatrixType` attribute, which,
+      // despite being a type attribute, defines a `SubjectList` that only
+      // allows it to be used on typedef declarations.
+      AL.diagnoseAppertainsTo(*this, D);
+    } else {
+      NonSlidingAttrs.addAtEnd(&AL);
+    }
+  }
+  ProcessDeclAttributeList(S, D, NonSlidingAttrs);
+
   // Apply decl attributes from the DeclSpec if present.
-  if (!PD.getDeclSpec().getAttributes().empty())
-    ProcessDeclAttributeList(S, D, PD.getDeclSpec().getAttributes());
+  if (!PD.getDeclSpec().getAttributes().empty()) {
+    ProcessDeclAttributeList(S, D, PD.getDeclSpec().getAttributes(),
+                             ProcessDeclAttributeOptions()
+                                 .WithIncludeCXX11Attributes(false)
+                                 .WithIgnoreTypeAttributes(true));
+  }
 
   // Walk the declarator structure, applying decl attributes that were in a type
   // position to the decl itself.  This handles cases like:
   //   int *__attr__(x)** D;
   // when X is a decl attribute.
-  for (unsigned i = 0, e = PD.getNumTypeObjects(); i != e; ++i)
+  for (unsigned i = 0, e = PD.getNumTypeObjects(); i != e; ++i) {
     ProcessDeclAttributeList(S, D, PD.getTypeObject(i).getAttrs(),
-                             /*IncludeCXX11Attributes=*/false);
+                             ProcessDeclAttributeOptions()
+                                 .WithIncludeCXX11Attributes(false)
+                                 .WithIgnoreTypeAttributes(true));
+  }
 
   // Finally, apply any attributes on the decl itself.
   ProcessDeclAttributeList(S, D, PD.getAttributes());
diff --git a/gnu/llvm/clang/lib/Sema/SemaDeclCXX.cpp b/gnu/llvm/clang/lib/Sema/SemaDeclCXX.cpp
index 23020a9c16c..df83442a8cd 100644
--- a/gnu/llvm/clang/lib/Sema/SemaDeclCXX.cpp
+++ b/gnu/llvm/clang/lib/Sema/SemaDeclCXX.cpp
@@ -17,6 +17,8 @@
 #include "clang/AST/CXXInheritance.h"
 #include "clang/AST/CharUnits.h"
 #include "clang/AST/ComparisonCategories.h"
+#include "clang/AST/DeclCXX.h"
+#include "clang/AST/DeclTemplate.h"
 #include "clang/AST/EvaluatedExprVisitor.h"
 #include "clang/AST/ExprCXX.h"
 #include "clang/AST/RecordLayout.h"
@@ -26,6 +28,7 @@
 #include "clang/AST/TypeOrdering.h"
 #include "clang/Basic/AttributeCommonInfo.h"
 #include "clang/Basic/PartialDiagnostic.h"
+#include "clang/Basic/Specifiers.h"
 #include "clang/Basic/TargetInfo.h"
 #include "clang/Lex/LiteralSupport.h"
 #include "clang/Lex/Preprocessor.h"
@@ -43,6 +46,7 @@
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/StringExtras.h"
 #include <map>
+#include <optional>
 #include <set>
 
 using namespace clang;
@@ -85,7 +89,11 @@ bool CheckDefaultArgumentVisitor::VisitExpr(const Expr *Node) {
 /// determine whether this declaration can be used in the default
 /// argument expression.
 bool CheckDefaultArgumentVisitor::VisitDeclRefExpr(const DeclRefExpr *DRE) {
-  const NamedDecl *Decl = DRE->getDecl();
+  const ValueDecl *Decl = dyn_cast<ValueDecl>(DRE->getDecl());
+
+  if (!isa<VarDecl, BindingDecl>(Decl))
+    return false;
+
   if (const auto *Param = dyn_cast<ParmVarDecl>(Decl)) {
     // C++ [dcl.fct.default]p9:
     //   [...] parameters of a function shall not be used in default
@@ -99,7 +107,7 @@ bool CheckDefaultArgumentVisitor::VisitDeclRefExpr(const DeclRefExpr *DRE) {
       return S.Diag(DRE->getBeginLoc(),
                     diag::err_param_default_argument_references_param)
              << Param->getDeclName() << DefaultArg->getSourceRange();
-  } else if (const auto *VDecl = dyn_cast<VarDecl>(Decl)) {
+  } else if (auto *VD = Decl->getPotentiallyDecomposedVarDecl()) {
     // C++ [dcl.fct.default]p7:
     //   Local variables shall not be used in default argument
     //   expressions.
@@ -109,14 +117,14 @@ bool CheckDefaultArgumentVisitor::VisitDeclRefExpr(const DeclRefExpr *DRE) {
     //   expression in a default argument.
     //
     // C++20 [dcl.fct.default]p7 (DR as part of P0588R1, see also CWG 2346):
-    //   Note: A local variable cannot be odr-used (6.3) in a default argument.
+    //   Note: A local variable cannot be odr-used (6.3) in a default
+    //   argument.
     //
-    if (VDecl->isLocalVarDecl() && !DRE->isNonOdrUse())
+    if (VD->isLocalVarDecl() && !DRE->isNonOdrUse())
       return S.Diag(DRE->getBeginLoc(),
                     diag::err_param_default_argument_references_local)
-             << VDecl->getDeclName() << DefaultArg->getSourceRange();
+             << Decl << DefaultArg->getSourceRange();
   }
-
   return false;
 }
 
@@ -146,13 +154,20 @@ bool CheckDefaultArgumentVisitor::VisitPseudoObjectExpr(
 }
 
 bool CheckDefaultArgumentVisitor::VisitLambdaExpr(const LambdaExpr *Lambda) {
-  // C++11 [expr.lambda.prim]p13:
-  //   A lambda-expression appearing in a default argument shall not
-  //   implicitly or explicitly capture any entity.
-  if (Lambda->capture_begin() == Lambda->capture_end())
-    return false;
-
-  return S.Diag(Lambda->getBeginLoc(), diag::err_lambda_capture_default_arg);
+  // [expr.prim.lambda.capture]p9
+  // a lambda-expression appearing in a default argument cannot implicitly or
+  // explicitly capture any local entity. Such a lambda-expression can still
+  // have an init-capture if any full-expression in its initializer satisfies
+  // the constraints of an expression appearing in a default argument.
+  bool Invalid = false;
+  for (const LambdaCapture &LC : Lambda->captures()) {
+    if (!Lambda->isInitCapture(&LC))
+      return S.Diag(LC.getLocation(), diag::err_lambda_capture_default_arg);
+    // Init captures are always VarDecl.
+    auto *D = cast<VarDecl>(LC.getCapturedVar());
+    Invalid |= Visit(D->getInit());
+  }
+  return Invalid;
 }
 } // namespace
 
@@ -435,7 +450,7 @@ void Sema::CheckExtraCXXDefaultArguments(Declarator &D) {
 }
 
 static bool functionDeclHasDefaultArgument(const FunctionDecl *FD) {
-  return std::any_of(FD->param_begin(), FD->param_end(), [](ParmVarDecl *P) {
+  return llvm::any_of(FD->parameters(), [](ParmVarDecl *P) {
     return P->hasDefaultArg() && !P->hasInheritedDefaultArg();
   });
 }
@@ -743,11 +758,16 @@ Sema::ActOnDecompositionDeclarator(Scope *S, Declarator &D,
   // C++17 [dcl.dcl]/8:
   //   The decl-specifier-seq shall contain only the type-specifier auto
   //   and cv-qualifiers.
-  // C++2a [dcl.dcl]/8:
+  // C++20 [dcl.dcl]/8:
   //   If decl-specifier-seq contains any decl-specifier other than static,
   //   thread_local, auto, or cv-qualifiers, the program is ill-formed.
+  // C++2b [dcl.pre]/6:
+  //   Each decl-specifier in the decl-specifier-seq shall be static,
+  //   thread_local, auto (9.2.9.6 [dcl.spec.auto]), or a cv-qualifier.
   auto &DS = D.getDeclSpec();
   {
+    // Note: While constrained-auto needs to be checked, we do so separately so
+    // we can emit a better diagnostic.
     SmallVector<StringRef, 8> BadSpecifiers;
     SmallVector<SourceLocation, 8> BadSpecifierLocs;
     SmallVector<StringRef, 8> CPlusPlus20Specifiers;
@@ -774,6 +794,7 @@ Sema::ActOnDecompositionDeclarator(Scope *S, Declarator &D,
       BadSpecifiers.push_back("inline");
       BadSpecifierLocs.push_back(DS.getInlineSpecLoc());
     }
+
     if (!BadSpecifiers.empty()) {
       auto &&Err = Diag(BadSpecifierLocs.front(), diag::err_decomp_decl_spec);
       Err << (int)BadSpecifiers.size()
@@ -834,6 +855,20 @@ Sema::ActOnDecompositionDeclarator(Scope *S, Declarator &D,
       D.setInvalidType();
   }
 
+  // Constrained auto is prohibited by [decl.pre]p6, so check that here.
+  if (DS.isConstrainedAuto()) {
+    TemplateIdAnnotation *TemplRep = DS.getRepAsTemplateId();
+    assert(TemplRep->Kind == TNK_Concept_template &&
+           "No other template kind should be possible for a constrained auto");
+
+    SourceRange TemplRange{TemplRep->TemplateNameLoc,
+                           TemplRep->RAngleLoc.isValid()
+                               ? TemplRep->RAngleLoc
+                               : TemplRep->TemplateNameLoc};
+    Diag(TemplRep->TemplateNameLoc, diag::err_decomp_decl_constraint)
+        << TemplRange << FixItHint::CreateRemoval(TemplRange);
+  }
+
   // Build the BindingDecls.
   SmallVector<BindingDecl*, 8> Bindings;
 
@@ -983,9 +1018,9 @@ static std::string printTemplateArgs(const PrintingPolicy &PrintingPolicy,
   for (auto &Arg : Args.arguments()) {
     if (!First)
       OS << ", ";
-    Arg.getArgument().print(
-        PrintingPolicy, OS,
-        TemplateParameterList::shouldIncludeTypeForArgument(Params, I));
+    Arg.getArgument().print(PrintingPolicy, OS,
+                            TemplateParameterList::shouldIncludeTypeForArgument(
+                                PrintingPolicy, Params, I));
     First = false;
     I++;
   }
@@ -1228,7 +1263,7 @@ static bool checkTupleLikeDecomposition(Sema &S,
       if (E.isInvalid())
         return true;
 
-      E = S.BuildCallExpr(nullptr, E.get(), Loc, None, Loc);
+      E = S.BuildCallExpr(nullptr, E.get(), Loc, std::nullopt, Loc);
     } else {
       //   Otherwise, the initializer is get<i-1>(e), where get is looked up
       //   in the associated namespaces.
@@ -1383,9 +1418,8 @@ static bool checkMemberDecomposition(Sema &S, ArrayRef<BindingDecl*> Bindings,
                                                  DecompType.getQualifiers());
 
   auto DiagnoseBadNumberOfBindings = [&]() -> bool {
-    unsigned NumFields =
-        std::count_if(RD->field_begin(), RD->field_end(),
-                      [](FieldDecl *FD) { return !FD->isUnnamedBitfield(); });
+    unsigned NumFields = llvm::count_if(
+        RD->fields(), [](FieldDecl *FD) { return !FD->isUnnamedBitfield(); });
     assert(Bindings.size() != NumFields);
     S.Diag(Src->getLocation(), diag::err_decomp_decl_wrong_number_bindings)
         << DecompType << (unsigned)Bindings.size() << NumFields << NumFields
@@ -1892,16 +1926,26 @@ static bool CheckConstexprDeclStmt(Sema &SemaRef, const FunctionDecl *Dcl,
         if (VD->isStaticLocal()) {
           if (Kind == Sema::CheckConstexprKind::Diagnose) {
             SemaRef.Diag(VD->getLocation(),
-                         diag::err_constexpr_local_var_static)
-              << isa<CXXConstructorDecl>(Dcl)
-              << (VD->getTLSKind() == VarDecl::TLS_Dynamic);
+                         SemaRef.getLangOpts().CPlusPlus2b
+                             ? diag::warn_cxx20_compat_constexpr_var
+                             : diag::ext_constexpr_static_var)
+                << isa<CXXConstructorDecl>(Dcl)
+                << (VD->getTLSKind() == VarDecl::TLS_Dynamic);
+          } else if (!SemaRef.getLangOpts().CPlusPlus2b) {
+            return false;
           }
-          return false;
         }
-        if (CheckLiteralType(SemaRef, Kind, VD->getLocation(), VD->getType(),
-                             diag::err_constexpr_local_var_non_literal_type,
-                             isa<CXXConstructorDecl>(Dcl)))
+        if (SemaRef.LangOpts.CPlusPlus2b) {
+          CheckLiteralType(SemaRef, Kind, VD->getLocation(), VD->getType(),
+                           diag::warn_cxx20_compat_constexpr_var,
+                           isa<CXXConstructorDecl>(Dcl),
+                           /*variable of non-literal type*/ 2);
+        } else if (CheckLiteralType(
+                       SemaRef, Kind, VD->getLocation(), VD->getType(),
+                       diag::err_constexpr_local_var_non_literal_type,
+                       isa<CXXConstructorDecl>(Dcl))) {
           return false;
+        }
         if (!VD->getType()->isDependentType() &&
             !VD->hasInit() && !VD->isCXXForRangeDecl()) {
           if (Kind == Sema::CheckConstexprKind::Diagnose) {
@@ -2021,6 +2065,7 @@ static bool
 CheckConstexprFunctionStmt(Sema &SemaRef, const FunctionDecl *Dcl, Stmt *S,
                            SmallVectorImpl<SourceLocation> &ReturnStmts,
                            SourceLocation &Cxx1yLoc, SourceLocation &Cxx2aLoc,
+                           SourceLocation &Cxx2bLoc,
                            Sema::CheckConstexprKind Kind) {
   // - its function-body shall be [...] a compound-statement that contains only
   switch (S->getStmtClass()) {
@@ -2050,6 +2095,13 @@ CheckConstexprFunctionStmt(Sema &SemaRef, const FunctionDecl *Dcl, Stmt *S,
     ReturnStmts.push_back(S->getBeginLoc());
     return true;
 
+  case Stmt::AttributedStmtClass:
+    // Attributes on a statement don't affect its formal kind and hence don't
+    // affect its validity in a constexpr function.
+    return CheckConstexprFunctionStmt(
+        SemaRef, Dcl, cast<AttributedStmt>(S)->getSubStmt(), ReturnStmts,
+        Cxx1yLoc, Cxx2aLoc, Cxx2bLoc, Kind);
+
   case Stmt::CompoundStmtClass: {
     // C++1y allows compound-statements.
     if (!Cxx1yLoc.isValid())
@@ -2058,17 +2110,12 @@ CheckConstexprFunctionStmt(Sema &SemaRef, const FunctionDecl *Dcl, Stmt *S,
     CompoundStmt *CompStmt = cast<CompoundStmt>(S);
     for (auto *BodyIt : CompStmt->body()) {
       if (!CheckConstexprFunctionStmt(SemaRef, Dcl, BodyIt, ReturnStmts,
-                                      Cxx1yLoc, Cxx2aLoc, Kind))
+                                      Cxx1yLoc, Cxx2aLoc, Cxx2bLoc, Kind))
         return false;
     }
     return true;
   }
 
-  case Stmt::AttributedStmtClass:
-    if (!Cxx1yLoc.isValid())
-      Cxx1yLoc = S->getBeginLoc();
-    return true;
-
   case Stmt::IfStmtClass: {
     // C++1y allows if-statements.
     if (!Cxx1yLoc.isValid())
@@ -2076,11 +2123,11 @@ CheckConstexprFunctionStmt(Sema &SemaRef, const FunctionDecl *Dcl, Stmt *S,
 
     IfStmt *If = cast<IfStmt>(S);
     if (!CheckConstexprFunctionStmt(SemaRef, Dcl, If->getThen(), ReturnStmts,
-                                    Cxx1yLoc, Cxx2aLoc, Kind))
+                                    Cxx1yLoc, Cxx2aLoc, Cxx2bLoc, Kind))
       return false;
     if (If->getElse() &&
         !CheckConstexprFunctionStmt(SemaRef, Dcl, If->getElse(), ReturnStmts,
-                                    Cxx1yLoc, Cxx2aLoc, Kind))
+                                    Cxx1yLoc, Cxx2aLoc, Cxx2bLoc, Kind))
       return false;
     return true;
   }
@@ -2096,11 +2143,12 @@ CheckConstexprFunctionStmt(Sema &SemaRef, const FunctionDecl *Dcl, Stmt *S,
       break;
     if (!Cxx1yLoc.isValid())
       Cxx1yLoc = S->getBeginLoc();
-    for (Stmt *SubStmt : S->children())
+    for (Stmt *SubStmt : S->children()) {
       if (SubStmt &&
           !CheckConstexprFunctionStmt(SemaRef, Dcl, SubStmt, ReturnStmts,
-                                      Cxx1yLoc, Cxx2aLoc, Kind))
+                                      Cxx1yLoc, Cxx2aLoc, Cxx2bLoc, Kind))
         return false;
+    }
     return true;
 
   case Stmt::SwitchStmtClass:
@@ -2111,11 +2159,24 @@ CheckConstexprFunctionStmt(Sema &SemaRef, const FunctionDecl *Dcl, Stmt *S,
     // mutation, we can reasonably allow them in C++11 as an extension.
     if (!Cxx1yLoc.isValid())
       Cxx1yLoc = S->getBeginLoc();
-    for (Stmt *SubStmt : S->children())
+    for (Stmt *SubStmt : S->children()) {
       if (SubStmt &&
           !CheckConstexprFunctionStmt(SemaRef, Dcl, SubStmt, ReturnStmts,
-                                      Cxx1yLoc, Cxx2aLoc, Kind))
+                                      Cxx1yLoc, Cxx2aLoc, Cxx2bLoc, Kind))
         return false;
+    }
+    return true;
+
+  case Stmt::LabelStmtClass:
+  case Stmt::GotoStmtClass:
+    if (Cxx2bLoc.isInvalid())
+      Cxx2bLoc = S->getBeginLoc();
+    for (Stmt *SubStmt : S->children()) {
+      if (SubStmt &&
+          !CheckConstexprFunctionStmt(SemaRef, Dcl, SubStmt, ReturnStmts,
+                                      Cxx1yLoc, Cxx2aLoc, Cxx2bLoc, Kind))
+        return false;
+    }
     return true;
 
   case Stmt::GCCAsmStmtClass:
@@ -2127,7 +2188,7 @@ CheckConstexprFunctionStmt(Sema &SemaRef, const FunctionDecl *Dcl, Stmt *S,
     for (Stmt *SubStmt : S->children()) {
       if (SubStmt &&
           !CheckConstexprFunctionStmt(SemaRef, Dcl, SubStmt, ReturnStmts,
-                                      Cxx1yLoc, Cxx2aLoc, Kind))
+                                      Cxx1yLoc, Cxx2aLoc, Cxx2bLoc, Kind))
         return false;
     }
     return true;
@@ -2135,9 +2196,9 @@ CheckConstexprFunctionStmt(Sema &SemaRef, const FunctionDecl *Dcl, Stmt *S,
   case Stmt::CXXCatchStmtClass:
     // Do not bother checking the language mode (already covered by the
     // try block check).
-    if (!CheckConstexprFunctionStmt(SemaRef, Dcl,
-                                    cast<CXXCatchStmt>(S)->getHandlerBlock(),
-                                    ReturnStmts, Cxx1yLoc, Cxx2aLoc, Kind))
+    if (!CheckConstexprFunctionStmt(
+            SemaRef, Dcl, cast<CXXCatchStmt>(S)->getHandlerBlock(), ReturnStmts,
+            Cxx1yLoc, Cxx2aLoc, Cxx2bLoc, Kind))
       return false;
     return true;
 
@@ -2202,20 +2263,27 @@ static bool CheckConstexprFunctionBody(Sema &SemaRef, const FunctionDecl *Dcl,
   //
   // Note that walking the children here is enough to properly check for
   // CompoundStmt and CXXTryStmt body.
-  SourceLocation Cxx1yLoc, Cxx2aLoc;
+  SourceLocation Cxx1yLoc, Cxx2aLoc, Cxx2bLoc;
   for (Stmt *SubStmt : Body->children()) {
     if (SubStmt &&
         !CheckConstexprFunctionStmt(SemaRef, Dcl, SubStmt, ReturnStmts,
-                                    Cxx1yLoc, Cxx2aLoc, Kind))
+                                    Cxx1yLoc, Cxx2aLoc, Cxx2bLoc, Kind))
       return false;
   }
 
   if (Kind == Sema::CheckConstexprKind::CheckValid) {
     // If this is only valid as an extension, report that we don't satisfy the
     // constraints of the current language.
-    if ((Cxx2aLoc.isValid() && !SemaRef.getLangOpts().CPlusPlus20) ||
+    if ((Cxx2bLoc.isValid() && !SemaRef.getLangOpts().CPlusPlus2b) ||
+        (Cxx2aLoc.isValid() && !SemaRef.getLangOpts().CPlusPlus20) ||
         (Cxx1yLoc.isValid() && !SemaRef.getLangOpts().CPlusPlus17))
       return false;
+  } else if (Cxx2bLoc.isValid()) {
+    SemaRef.Diag(Cxx2bLoc,
+                 SemaRef.getLangOpts().CPlusPlus2b
+                     ? diag::warn_cxx20_compat_constexpr_body_invalid_stmt
+                     : diag::ext_constexpr_body_invalid_stmt_cxx2b)
+        << isa<CXXConstructorDecl>(Dcl);
   } else if (Cxx2aLoc.isValid()) {
     SemaRef.Diag(Cxx2aLoc,
          SemaRef.getLangOpts().CPlusPlus20
@@ -2467,6 +2535,11 @@ Sema::CheckBaseSpecifier(CXXRecordDecl *Class,
                          bool Virtual, AccessSpecifier Access,
                          TypeSourceInfo *TInfo,
                          SourceLocation EllipsisLoc) {
+  // In HLSL, unspecified class access is public rather than private.
+  if (getLangOpts().HLSL && Class->getTagKind() == TTK_Class &&
+      Access == AS_none)
+    Access = AS_public;
+
   QualType BaseType = TInfo->getType();
   if (BaseType->containsErrors()) {
     // Already emitted a diagnostic when parsing the error type.
@@ -2613,12 +2686,11 @@ Sema::CheckBaseSpecifier(CXXRecordDecl *Class,
 /// example:
 ///    class foo : public bar, virtual private baz {
 /// 'public bar' and 'virtual private baz' are each base-specifiers.
-BaseResult
-Sema::ActOnBaseSpecifier(Decl *classdecl, SourceRange SpecifierRange,
-                         ParsedAttributes &Attributes,
-                         bool Virtual, AccessSpecifier Access,
-                         ParsedType basetype, SourceLocation BaseLoc,
-                         SourceLocation EllipsisLoc) {
+BaseResult Sema::ActOnBaseSpecifier(Decl *classdecl, SourceRange SpecifierRange,
+                                    const ParsedAttributesView &Attributes,
+                                    bool Virtual, AccessSpecifier Access,
+                                    ParsedType basetype, SourceLocation BaseLoc,
+                                    SourceLocation EllipsisLoc) {
   if (!classdecl)
     return true;
 
@@ -2727,6 +2799,8 @@ bool Sema::AttachBaseSpecifiers(CXXRecordDecl *Class,
       KnownBase = Bases[idx];
       Bases[NumGoodBases++] = Bases[idx];
 
+      if (NewBaseType->isDependentType())
+        continue;
       // Note this base's direct & indirect bases, if there could be ambiguity.
       if (Bases.size() > 1)
         NoteIndirectBases(Context, IndirectBaseTypes, NewBaseType);
@@ -3044,7 +3118,7 @@ void Sema::CheckOverrideControl(NamedDecl *D) {
     return;
 
   if (MD && !MD->isVirtual()) {
-    // If we have a non-virtual method, check if if hides a virtual method.
+    // If we have a non-virtual method, check if it hides a virtual method.
     // (In that case, it's most likely the method has the wrong type.)
     SmallVector<CXXMethodDecl *, 8> OverloadedMethods;
     FindHiddenVirtualMethods(MD, OverloadedMethods);
@@ -3391,6 +3465,15 @@ Sema::ActOnCXXMemberDeclarator(Scope *S, AccessSpecifier AS, Declarator &D,
       return nullptr;
     }
 
+    if (D.getName().getKind() == UnqualifiedIdKind::IK_TemplateId) {
+      Diag(D.getIdentifierLoc(), diag::err_member_with_template_arguments)
+          << II
+          << SourceRange(D.getName().TemplateId->LAngleLoc,
+                         D.getName().TemplateId->RAngleLoc)
+          << D.getName().TemplateId->LAngleLoc;
+      D.SetIdentifier(II, Loc);
+    }
+
     if (SS.isSet() && !SS.isInvalid()) {
       // The user provided a superfluous scope specifier inside a class
       // definition:
@@ -3581,9 +3664,8 @@ namespace {
       llvm::SmallVector<unsigned, 4> UsedFieldIndex;
       // Discard the first field since it is the field decl that is being
       // initialized.
-      for (auto I = Fields.rbegin() + 1, E = Fields.rend(); I != E; ++I) {
-        UsedFieldIndex.push_back((*I)->getFieldIndex());
-      }
+      for (const FieldDecl *FD : llvm::drop_begin(llvm::reverse(Fields)))
+        UsedFieldIndex.push_back(FD->getFieldIndex());
 
       for (auto UsedIter = UsedFieldIndex.begin(),
                 UsedEnd = UsedFieldIndex.end(),
@@ -3728,7 +3810,7 @@ namespace {
 
     void CheckInitListExpr(InitListExpr *ILE) {
       InitFieldIndex.push_back(0);
-      for (auto Child : ILE->children()) {
+      for (auto *Child : ILE->children()) {
         if (InitListExpr *SubList = dyn_cast<InitListExpr>(Child)) {
           CheckInitListExpr(SubList);
         } else {
@@ -3799,7 +3881,7 @@ namespace {
       Expr *Callee = E->getCallee();
       if (isa<MemberExpr>(Callee)) {
         HandleValue(Callee, false /*AddressOf*/);
-        for (auto Arg : E->arguments())
+        for (auto *Arg : E->arguments())
           Visit(Arg);
         return;
       }
@@ -3824,7 +3906,7 @@ namespace {
         return Inherited::VisitCXXOperatorCallExpr(E);
 
       Visit(Callee);
-      for (auto Arg : E->arguments())
+      for (auto *Arg : E->arguments())
         HandleValue(Arg->IgnoreParenImpCasts(), false /*AddressOf*/);
     }
 
@@ -3975,6 +4057,21 @@ ExprResult Sema::ActOnRequiresClause(ExprResult ConstraintExpr) {
   return ConstraintExpr;
 }
 
+ExprResult Sema::ConvertMemberDefaultInitExpression(FieldDecl *FD,
+                                                    Expr *InitExpr,
+                                                    SourceLocation InitLoc) {
+  InitializedEntity Entity =
+      InitializedEntity::InitializeMemberFromDefaultMemberInitializer(FD);
+  InitializationKind Kind =
+      FD->getInClassInitStyle() == ICIS_ListInit
+          ? InitializationKind::CreateDirectList(InitExpr->getBeginLoc(),
+                                                 InitExpr->getBeginLoc(),
+                                                 InitExpr->getEndLoc())
+          : InitializationKind::CreateCopy(InitExpr->getBeginLoc(), InitLoc);
+  InitializationSequence Seq(*this, Entity, Kind, InitExpr);
+  return Seq.Perform(*this, Entity, Kind, InitExpr);
+}
+
 /// This is invoked after parsing an in-class initializer for a
 /// non-static C++ class member, and after instantiating an in-class initializer
 /// in a class template. Such actions are deferred until the class is complete.
@@ -4001,36 +4098,23 @@ void Sema::ActOnFinishCXXInClassMemberInitializer(Decl *D,
     return;
   }
 
-  ExprResult Init = InitExpr;
-  if (!FD->getType()->isDependentType() && !InitExpr->isTypeDependent()) {
-    InitializedEntity Entity =
-        InitializedEntity::InitializeMemberFromDefaultMemberInitializer(FD);
-    InitializationKind Kind =
-        FD->getInClassInitStyle() == ICIS_ListInit
-            ? InitializationKind::CreateDirectList(InitExpr->getBeginLoc(),
-                                                   InitExpr->getBeginLoc(),
-                                                   InitExpr->getEndLoc())
-            : InitializationKind::CreateCopy(InitExpr->getBeginLoc(), InitLoc);
-    InitializationSequence Seq(*this, Entity, Kind, InitExpr);
-    Init = Seq.Perform(*this, Entity, Kind, InitExpr);
+  ExprResult Init = CorrectDelayedTyposInExpr(InitExpr, /*InitDecl=*/nullptr,
+                                              /*RecoverUncorrectedTypos=*/true);
+  assert(Init.isUsable() && "Init should at least have a RecoveryExpr");
+  if (!FD->getType()->isDependentType() && !Init.get()->isTypeDependent()) {
+    Init = ConvertMemberDefaultInitExpression(FD, Init.get(), InitLoc);
+    // C++11 [class.base.init]p7:
+    //   The initialization of each base and member constitutes a
+    //   full-expression.
+    if (!Init.isInvalid())
+      Init = ActOnFinishFullExpr(Init.get(), /*DiscarededValue=*/false);
     if (Init.isInvalid()) {
       FD->setInvalidDecl();
       return;
     }
   }
 
-  // C++11 [class.base.init]p7:
-  //   The initialization of each base and member constitutes a
-  //   full-expression.
-  Init = ActOnFinishFullExpr(Init.get(), InitLoc, /*DiscardedValue*/ false);
-  if (Init.isInvalid()) {
-    FD->setInvalidDecl();
-    return;
-  }
-
-  InitExpr = Init.get();
-
-  FD->setInClassInitializer(InitExpr);
+  FD->setInClassInitializer(Init.get());
 }
 
 /// Find the direct and/or virtual base specifiers that
@@ -4114,7 +4198,7 @@ Sema::ActOnMemInitializer(Decl *ConstructorD,
 namespace {
 
 // Callback to only accept typo corrections that can be a valid C++ member
-// intializer: either a non-static field member or a base class.
+// initializer: either a non-static field member or a base class.
 class MemInitializerValidatorCCC final : public CorrectionCandidateCallback {
 public:
   explicit MemInitializerValidatorCCC(CXXRecordDecl *ClassDecl)
@@ -4162,7 +4246,8 @@ Sema::BuildMemInitializer(Decl *ConstructorD,
                           SourceLocation IdLoc,
                           Expr *Init,
                           SourceLocation EllipsisLoc) {
-  ExprResult Res = CorrectDelayedTyposInExpr(Init);
+  ExprResult Res = CorrectDelayedTyposInExpr(Init, /*InitDecl=*/nullptr,
+                                             /*RecoverUncorrectedTypos=*/true);
   if (!Res.isUsable())
     return true;
   Init = Res.get();
@@ -4214,7 +4299,7 @@ Sema::BuildMemInitializer(Decl *ConstructorD,
     if (BaseType.isNull())
       return true;
   } else if (DS.getTypeSpecType() == TST_decltype) {
-    BaseType = BuildDecltypeType(DS.getRepAsExpr(), DS.getTypeSpecTypeLoc());
+    BaseType = BuildDecltypeType(DS.getRepAsExpr());
   } else if (DS.getTypeSpecType() == TST_decltype_auto) {
     Diag(DS.getTypeSpecTypeLoc(), diag::err_decltype_auto_invalid);
     return true;
@@ -4258,6 +4343,25 @@ Sema::BuildMemInitializer(Decl *ConstructorD,
         }
       }
 
+      if (getLangOpts().MSVCCompat && !getLangOpts().CPlusPlus20) {
+        if (auto UnqualifiedBase = R.getAsSingle<ClassTemplateDecl>()) {
+          auto *TempSpec = cast<TemplateSpecializationType>(
+              UnqualifiedBase->getInjectedClassNameSpecialization());
+          TemplateName TN = TempSpec->getTemplateName();
+          for (auto const &Base : ClassDecl->bases()) {
+            auto BaseTemplate =
+                Base.getType()->getAs<TemplateSpecializationType>();
+            if (BaseTemplate && Context.hasSameTemplateName(
+                                    BaseTemplate->getTemplateName(), TN)) {
+              Diag(IdLoc, diag::ext_unqualified_base_class)
+                  << SourceRange(IdLoc, Init->getSourceRange().getEnd());
+              BaseType = Base.getType();
+              break;
+            }
+          }
+        }
+      }
+
       // If no results were found, try to correct typos.
       TypoCorrection Corr;
       MemInitializerValidatorCCC CCC(ClassDecl);
@@ -4304,17 +4408,13 @@ Sema::BuildMemInitializer(Decl *ConstructorD,
     }
 
     if (BaseType.isNull()) {
-      BaseType = Context.getTypeDeclType(TyD);
+      BaseType = getElaboratedType(ETK_None, SS, Context.getTypeDeclType(TyD));
       MarkAnyDeclReferenced(TyD->getLocation(), TyD, /*OdrUse=*/false);
-      if (SS.isSet()) {
-        BaseType = Context.getElaboratedType(ETK_None, SS.getScopeRep(),
-                                             BaseType);
-        TInfo = Context.CreateTypeSourceInfo(BaseType);
-        ElaboratedTypeLoc TL = TInfo->getTypeLoc().castAs<ElaboratedTypeLoc>();
-        TL.getNamedTypeLoc().castAs<TypeSpecTypeLoc>().setNameLoc(IdLoc);
-        TL.setElaboratedKeywordLoc(SourceLocation());
-        TL.setQualifierLoc(SS.getWithLocInContext(Context));
-      }
+      TInfo = Context.CreateTypeSourceInfo(BaseType);
+      ElaboratedTypeLoc TL = TInfo->getTypeLoc().castAs<ElaboratedTypeLoc>();
+      TL.getNamedTypeLoc().castAs<TypeSpecTypeLoc>().setNameLoc(IdLoc);
+      TL.setElaboratedKeywordLoc(SourceLocation());
+      TL.setQualifierLoc(SS.getWithLocInContext(Context));
     }
   }
 
@@ -4375,18 +4475,25 @@ Sema::BuildMemberInitializer(ValueDecl *Member, Expr *Init,
     InitializationSequence InitSeq(*this, MemberEntity, Kind, Args);
     ExprResult MemberInit = InitSeq.Perform(*this, MemberEntity, Kind, Args,
                                             nullptr);
-    if (MemberInit.isInvalid())
-      return true;
-
-    // C++11 [class.base.init]p7:
-    //   The initialization of each base and member constitutes a
-    //   full-expression.
-    MemberInit = ActOnFinishFullExpr(MemberInit.get(), InitRange.getBegin(),
-                                     /*DiscardedValue*/ false);
-    if (MemberInit.isInvalid())
-      return true;
-
-    Init = MemberInit.get();
+    if (!MemberInit.isInvalid()) {
+      // C++11 [class.base.init]p7:
+      //   The initialization of each base and member constitutes a
+      //   full-expression.
+      MemberInit = ActOnFinishFullExpr(MemberInit.get(), InitRange.getBegin(),
+                                       /*DiscardedValue*/ false);
+    }
+
+    if (MemberInit.isInvalid()) {
+      // Args were sensible expressions but we couldn't initialize the member
+      // from them. Preserve them in a RecoveryExpr instead.
+      Init = CreateRecoveryExpr(InitRange.getBegin(), InitRange.getEnd(), Args,
+                                Member->getType())
+                 .get();
+      if (!Init)
+        return true;
+    } else {
+      Init = MemberInit.get();
+    }
   }
 
   if (DirectMember) {
@@ -4403,10 +4510,10 @@ Sema::BuildMemberInitializer(ValueDecl *Member, Expr *Init,
 MemInitResult
 Sema::BuildDelegatingInitializer(TypeSourceInfo *TInfo, Expr *Init,
                                  CXXRecordDecl *ClassDecl) {
-  SourceLocation NameLoc = TInfo->getTypeLoc().getLocalSourceRange().getBegin();
+  SourceLocation NameLoc = TInfo->getTypeLoc().getSourceRange().getBegin();
   if (!LangOpts.CPlusPlus11)
     return Diag(NameLoc, diag::err_delegating_ctor)
-      << TInfo->getTypeLoc().getLocalSourceRange();
+           << TInfo->getTypeLoc().getSourceRange();
   Diag(NameLoc, diag::warn_cxx98_compat_delegating_ctor);
 
   bool InitList = true;
@@ -4428,29 +4535,35 @@ Sema::BuildDelegatingInitializer(TypeSourceInfo *TInfo, Expr *Init,
   InitializationSequence InitSeq(*this, DelegationEntity, Kind, Args);
   ExprResult DelegationInit = InitSeq.Perform(*this, DelegationEntity, Kind,
                                               Args, nullptr);
-  if (DelegationInit.isInvalid())
-    return true;
+  if (!DelegationInit.isInvalid()) {
+    assert((DelegationInit.get()->containsErrors() ||
+            cast<CXXConstructExpr>(DelegationInit.get())->getConstructor()) &&
+           "Delegating constructor with no target?");
 
-  assert(cast<CXXConstructExpr>(DelegationInit.get())->getConstructor() &&
-         "Delegating constructor with no target?");
-
-  // C++11 [class.base.init]p7:
-  //   The initialization of each base and member constitutes a
-  //   full-expression.
-  DelegationInit = ActOnFinishFullExpr(
-      DelegationInit.get(), InitRange.getBegin(), /*DiscardedValue*/ false);
-  if (DelegationInit.isInvalid())
-    return true;
+    // C++11 [class.base.init]p7:
+    //   The initialization of each base and member constitutes a
+    //   full-expression.
+    DelegationInit = ActOnFinishFullExpr(
+        DelegationInit.get(), InitRange.getBegin(), /*DiscardedValue*/ false);
+  }
 
-  // If we are in a dependent context, template instantiation will
-  // perform this type-checking again. Just save the arguments that we
-  // received in a ParenListExpr.
-  // FIXME: This isn't quite ideal, since our ASTs don't capture all
-  // of the information that we have about the base
-  // initializer. However, deconstructing the ASTs is a dicey process,
-  // and this approach is far more likely to get the corner cases right.
-  if (CurContext->isDependentContext())
-    DelegationInit = Init;
+  if (DelegationInit.isInvalid()) {
+    DelegationInit =
+        CreateRecoveryExpr(InitRange.getBegin(), InitRange.getEnd(), Args,
+                           QualType(ClassDecl->getTypeForDecl(), 0));
+    if (DelegationInit.isInvalid())
+      return true;
+  } else {
+    // If we are in a dependent context, template instantiation will
+    // perform this type-checking again. Just save the arguments that we
+    // received in a ParenListExpr.
+    // FIXME: This isn't quite ideal, since our ASTs don't capture all
+    // of the information that we have about the base
+    // initializer. However, deconstructing the ASTs is a dicey process,
+    // and this approach is far more likely to get the corner cases right.
+    if (CurContext->isDependentContext())
+      DelegationInit = Init;
+  }
 
   return new (Context) CXXCtorInitializer(Context, TInfo, InitRange.getBegin(),
                                           DelegationInit.getAs<Expr>(),
@@ -4461,12 +4574,11 @@ MemInitResult
 Sema::BuildBaseInitializer(QualType BaseType, TypeSourceInfo *BaseTInfo,
                            Expr *Init, CXXRecordDecl *ClassDecl,
                            SourceLocation EllipsisLoc) {
-  SourceLocation BaseLoc
-    = BaseTInfo->getTypeLoc().getLocalSourceRange().getBegin();
+  SourceLocation BaseLoc = BaseTInfo->getTypeLoc().getBeginLoc();
 
   if (!BaseType->isDependentType() && !BaseType->isRecordType())
     return Diag(BaseLoc, diag::err_base_init_does_not_name_class)
-             << BaseType << BaseTInfo->getTypeLoc().getLocalSourceRange();
+           << BaseType << BaseTInfo->getTypeLoc().getSourceRange();
 
   // C++ [class.base.init]p2:
   //   [...] Unless the mem-initializer-id names a nonstatic data
@@ -4474,7 +4586,12 @@ Sema::BuildBaseInitializer(QualType BaseType, TypeSourceInfo *BaseTInfo,
   //   of that class, the mem-initializer is ill-formed. A
   //   mem-initializer-list can initialize a base class using any
   //   name that denotes that base class type.
-  bool Dependent = BaseType->isDependentType() || Init->isTypeDependent();
+
+  // We can store the initializers in "as-written" form and delay analysis until
+  // instantiation if the constructor is dependent. But not for dependent
+  // (broken) code in a non-template! SetCtorInitializers does not expect this.
+  bool Dependent = CurContext->isDependentContext() &&
+                   (BaseType->isDependentType() || Init->isTypeDependent());
 
   SourceRange InitRange = Init->getSourceRange();
   if (EllipsisLoc.isValid()) {
@@ -4519,8 +4636,8 @@ Sema::BuildBaseInitializer(QualType BaseType, TypeSourceInfo *BaseTInfo,
         Dependent = true;
       else
         return Diag(BaseLoc, diag::err_not_direct_base_or_virtual)
-          << BaseType << Context.getTypeDeclType(ClassDecl)
-          << BaseTInfo->getTypeLoc().getLocalSourceRange();
+               << BaseType << Context.getTypeDeclType(ClassDecl)
+               << BaseTInfo->getTypeLoc().getSourceRange();
     }
   }
 
@@ -4561,26 +4678,30 @@ Sema::BuildBaseInitializer(QualType BaseType, TypeSourceInfo *BaseTInfo,
                                                   InitRange.getEnd());
   InitializationSequence InitSeq(*this, BaseEntity, Kind, Args);
   ExprResult BaseInit = InitSeq.Perform(*this, BaseEntity, Kind, Args, nullptr);
-  if (BaseInit.isInvalid())
-    return true;
-
-  // C++11 [class.base.init]p7:
-  //   The initialization of each base and member constitutes a
-  //   full-expression.
-  BaseInit = ActOnFinishFullExpr(BaseInit.get(), InitRange.getBegin(),
-                                 /*DiscardedValue*/ false);
-  if (BaseInit.isInvalid())
-    return true;
+  if (!BaseInit.isInvalid()) {
+    // C++11 [class.base.init]p7:
+    //   The initialization of each base and member constitutes a
+    //   full-expression.
+    BaseInit = ActOnFinishFullExpr(BaseInit.get(), InitRange.getBegin(),
+                                   /*DiscardedValue*/ false);
+  }
 
-  // If we are in a dependent context, template instantiation will
-  // perform this type-checking again. Just save the arguments that we
-  // received in a ParenListExpr.
-  // FIXME: This isn't quite ideal, since our ASTs don't capture all
-  // of the information that we have about the base
-  // initializer. However, deconstructing the ASTs is a dicey process,
-  // and this approach is far more likely to get the corner cases right.
-  if (CurContext->isDependentContext())
-    BaseInit = Init;
+  if (BaseInit.isInvalid()) {
+    BaseInit = CreateRecoveryExpr(InitRange.getBegin(), InitRange.getEnd(),
+                                  Args, BaseType);
+    if (BaseInit.isInvalid())
+      return true;
+  } else {
+    // If we are in a dependent context, template instantiation will
+    // perform this type-checking again. Just save the arguments that we
+    // received in a ParenListExpr.
+    // FIXME: This isn't quite ideal, since our ASTs don't capture all
+    // of the information that we have about the base
+    // initializer. However, deconstructing the ASTs is a dicey process,
+    // and this approach is far more likely to get the corner cases right.
+    if (CurContext->isDependentContext())
+      BaseInit = Init;
+  }
 
   return new (Context) CXXCtorInitializer(Context, BaseTInfo,
                                           BaseSpec->isVirtual(),
@@ -4590,10 +4711,10 @@ Sema::BuildBaseInitializer(QualType BaseType, TypeSourceInfo *BaseTInfo,
 }
 
 // Create a static_cast\<T&&>(expr).
-static Expr *CastForMoving(Sema &SemaRef, Expr *E, QualType T = QualType()) {
-  if (T.isNull()) T = E->getType();
-  QualType TargetType = SemaRef.BuildReferenceType(
-      T, /*SpelledAsLValue*/false, SourceLocation(), DeclarationName());
+static Expr *CastForMoving(Sema &SemaRef, Expr *E) {
+  QualType TargetType =
+      SemaRef.BuildReferenceType(E->getType(), /*SpelledAsLValue*/ false,
+                                 SourceLocation(), DeclarationName());
   SourceLocation ExprLoc = E->getBeginLoc();
   TypeSourceInfo *TargetLoc = SemaRef.Context.getTrivialTypeSourceInfo(
       TargetType, ExprLoc);
@@ -4629,8 +4750,8 @@ BuildImplicitBaseInitializer(Sema &SemaRef, CXXConstructorDecl *Constructor,
   case IIK_Default: {
     InitializationKind InitKind
       = InitializationKind::CreateDefault(Constructor->getLocation());
-    InitializationSequence InitSeq(SemaRef, InitEntity, InitKind, None);
-    BaseInit = InitSeq.Perform(SemaRef, InitEntity, InitKind, None);
+    InitializationSequence InitSeq(SemaRef, InitEntity, InitKind, std::nullopt);
+    BaseInit = InitSeq.Perform(SemaRef, InitEntity, InitKind, std::nullopt);
     break;
   }
 
@@ -4794,9 +4915,9 @@ BuildImplicitMemberInitializer(Sema &SemaRef, CXXConstructorDecl *Constructor,
     InitializationKind InitKind =
       InitializationKind::CreateDefault(Loc);
 
-    InitializationSequence InitSeq(SemaRef, InitEntity, InitKind, None);
+    InitializationSequence InitSeq(SemaRef, InitEntity, InitKind, std::nullopt);
     ExprResult MemberInit =
-      InitSeq.Perform(SemaRef, InitEntity, InitKind, None);
+        InitSeq.Perform(SemaRef, InitEntity, InitKind, std::nullopt);
 
     MemberInit = SemaRef.MaybeCreateExprWithCleanups(MemberInit);
     if (MemberInit.isInvalid())
@@ -5350,8 +5471,7 @@ static void DiagnoseBaseOrMemInitializerOrder(
     return;
 
   // Sort based on the ideal order, first in the pair.
-  llvm::sort(CorrelatedInitOrder,
-             [](auto &LHS, auto &RHS) { return LHS.first < RHS.first; });
+  llvm::sort(CorrelatedInitOrder, llvm::less_first());
 
   // Introduce a new scope as SemaDiagnosticBuilder needs to be destroyed to
   // emit the diagnostic before we can try adding notes.
@@ -5565,7 +5685,9 @@ Sema::MarkBaseAndMemberDestructorsReferenced(SourceLocation Location,
       continue;
 
     CXXDestructorDecl *Dtor = LookupDestructor(FieldClassDecl);
-    assert(Dtor && "No dtor found for FieldClassDecl!");
+    // Dtor might still be missing, e.g because it's invalid.
+    if (!Dtor)
+      continue;
     CheckDestructorAccess(Field->getLocation(), Dtor,
                           PDiag(diag::err_access_dtor_field)
                             << Field->getDeclName()
@@ -5611,7 +5733,9 @@ Sema::MarkBaseAndMemberDestructorsReferenced(SourceLocation Location,
       continue;
 
     CXXDestructorDecl *Dtor = LookupDestructor(BaseClassDecl);
-    assert(Dtor && "No dtor found for BaseClassDecl!");
+    // Dtor might still be missing, e.g because it's invalid.
+    if (!Dtor)
+      continue;
 
     // FIXME: caret should be on the start of the class name
     CheckDestructorAccess(Base.getBeginLoc(), Dtor,
@@ -5648,7 +5772,9 @@ void Sema::MarkVirtualBaseDestructorsReferenced(
       continue;
 
     CXXDestructorDecl *Dtor = LookupDestructor(BaseClassDecl);
-    assert(Dtor && "No dtor found for BaseClassDecl!");
+    // Dtor might still be missing, e.g because it's invalid.
+    if (!Dtor)
+      continue;
     if (CheckDestructorAccess(
             ClassDecl->getLocation(), Dtor,
             PDiag(diag::err_access_dtor_vbase)
@@ -5859,6 +5985,7 @@ struct CheckAbstractUsage {
     if (CT != Info.AbstractType) return;
 
     // It matched; do some magic.
+    // FIXME: These should be at most warnings. See P0929R2, CWG1640, CWG1646.
     if (Sel == Sema::AbstractArrayType) {
       Info.S.Diag(Ctx->getLocation(), diag::err_array_of_abstract_type)
         << T << TL.getSourceRange();
@@ -5877,19 +6004,31 @@ void AbstractUsageInfo::CheckType(const NamedDecl *D, TypeLoc TL,
 
 }
 
-/// Check for invalid uses of an abstract type in a method declaration.
+/// Check for invalid uses of an abstract type in a function declaration.
 static void CheckAbstractClassUsage(AbstractUsageInfo &Info,
-                                    CXXMethodDecl *MD) {
+                                    FunctionDecl *FD) {
   // No need to do the check on definitions, which require that
   // the return/param types be complete.
-  if (MD->doesThisDeclarationHaveABody())
+  if (FD->doesThisDeclarationHaveABody())
     return;
 
   // For safety's sake, just ignore it if we don't have type source
   // information.  This should never happen for non-implicit methods,
   // but...
-  if (TypeSourceInfo *TSI = MD->getTypeSourceInfo())
-    Info.CheckType(MD, TSI->getTypeLoc(), Sema::AbstractNone);
+  if (TypeSourceInfo *TSI = FD->getTypeSourceInfo())
+    Info.CheckType(FD, TSI->getTypeLoc(), Sema::AbstractNone);
+}
+
+/// Check for invalid uses of an abstract type in a variable0 declaration.
+static void CheckAbstractClassUsage(AbstractUsageInfo &Info,
+                                    VarDecl *VD) {
+  // No need to do the check on definitions, which require that
+  // the type is complete.
+  if (VD->isThisDeclarationADefinition())
+    return;
+
+  Info.CheckType(VD, VD->getTypeSourceInfo()->getTypeLoc(),
+                 Sema::AbstractVariableType);
 }
 
 /// Check for invalid uses of an abstract type within a class definition.
@@ -5898,29 +6037,32 @@ static void CheckAbstractClassUsage(AbstractUsageInfo &Info,
   for (auto *D : RD->decls()) {
     if (D->isImplicit()) continue;
 
-    // Methods and method templates.
-    if (isa<CXXMethodDecl>(D)) {
-      CheckAbstractClassUsage(Info, cast<CXXMethodDecl>(D));
-    } else if (isa<FunctionTemplateDecl>(D)) {
-      FunctionDecl *FD = cast<FunctionTemplateDecl>(D)->getTemplatedDecl();
-      CheckAbstractClassUsage(Info, cast<CXXMethodDecl>(FD));
+    // Step through friends to the befriended declaration.
+    if (auto *FD = dyn_cast<FriendDecl>(D)) {
+      D = FD->getFriendDecl();
+      if (!D) continue;
+    }
+
+    // Functions and function templates.
+    if (auto *FD = dyn_cast<FunctionDecl>(D)) {
+      CheckAbstractClassUsage(Info, FD);
+    } else if (auto *FTD = dyn_cast<FunctionTemplateDecl>(D)) {
+      CheckAbstractClassUsage(Info, FTD->getTemplatedDecl());
 
     // Fields and static variables.
-    } else if (isa<FieldDecl>(D)) {
-      FieldDecl *FD = cast<FieldDecl>(D);
+    } else if (auto *FD = dyn_cast<FieldDecl>(D)) {
       if (TypeSourceInfo *TSI = FD->getTypeSourceInfo())
         Info.CheckType(FD, TSI->getTypeLoc(), Sema::AbstractFieldType);
-    } else if (isa<VarDecl>(D)) {
-      VarDecl *VD = cast<VarDecl>(D);
-      if (TypeSourceInfo *TSI = VD->getTypeSourceInfo())
-        Info.CheckType(VD, TSI->getTypeLoc(), Sema::AbstractVariableType);
+    } else if (auto *VD = dyn_cast<VarDecl>(D)) {
+      CheckAbstractClassUsage(Info, VD);
+    } else if (auto *VTD = dyn_cast<VarTemplateDecl>(D)) {
+      CheckAbstractClassUsage(Info, VTD->getTemplatedDecl());
 
     // Nested classes and class templates.
-    } else if (isa<CXXRecordDecl>(D)) {
-      CheckAbstractClassUsage(Info, cast<CXXRecordDecl>(D));
-    } else if (isa<ClassTemplateDecl>(D)) {
-      CheckAbstractClassUsage(Info,
-                             cast<ClassTemplateDecl>(D)->getTemplatedDecl());
+    } else if (auto *RD = dyn_cast<CXXRecordDecl>(D)) {
+      CheckAbstractClassUsage(Info, RD);
+    } else if (auto *CTD = dyn_cast<ClassTemplateDecl>(D)) {
+      CheckAbstractClassUsage(Info, CTD->getTemplatedDecl());
     }
   }
 }
@@ -5960,11 +6102,14 @@ static void ReferenceDllExportedMembers(Sema &S, CXXRecordDecl *Class) {
     S.MarkVTableUsed(Class->getLocation(), Class, true);
 
   for (Decl *Member : Class->decls()) {
+    // Skip members that were not marked exported.
+    if (!Member->hasAttr<DLLExportAttr>())
+      continue;
+
     // Defined static variables that are members of an exported base
     // class must be marked export too.
     auto *VD = dyn_cast<VarDecl>(Member);
-    if (VD && Member->getAttr<DLLExportAttr>() &&
-        VD->getStorageClass() == SC_Static &&
+    if (VD && VD->getStorageClass() == SC_Static &&
         TSK == TSK_ImplicitInstantiation)
       S.MarkVariableReferenced(VD->getLocation(), VD);
 
@@ -5972,40 +6117,47 @@ static void ReferenceDllExportedMembers(Sema &S, CXXRecordDecl *Class) {
     if (!MD)
       continue;
 
-    if (Member->getAttr<DLLExportAttr>()) {
-      if (MD->isUserProvided()) {
-        // Instantiate non-default class member functions ...
+    if (MD->isUserProvided()) {
+      // Instantiate non-default class member functions ...
 
-        // .. except for certain kinds of template specializations.
-        if (TSK == TSK_ImplicitInstantiation && !ClassAttr->isInherited())
-          continue;
+      // .. except for certain kinds of template specializations.
+      if (TSK == TSK_ImplicitInstantiation && !ClassAttr->isInherited())
+        continue;
 
-        S.MarkFunctionReferenced(Class->getLocation(), MD);
+      // If this is an MS ABI dllexport default constructor, instantiate any
+      // default arguments.
+      if (S.Context.getTargetInfo().getCXXABI().isMicrosoft()) {
+        auto *CD = dyn_cast<CXXConstructorDecl>(MD);
+        if (CD && CD->isDefaultConstructor() && TSK == TSK_Undeclared) {
+          S.InstantiateDefaultCtorDefaultArgs(CD);
+        }
+      }
 
-        // The function will be passed to the consumer when its definition is
-        // encountered.
-      } else if (MD->isExplicitlyDefaulted()) {
-        // Synthesize and instantiate explicitly defaulted methods.
-        S.MarkFunctionReferenced(Class->getLocation(), MD);
+      S.MarkFunctionReferenced(Class->getLocation(), MD);
 
-        if (TSK != TSK_ExplicitInstantiationDefinition) {
-          // Except for explicit instantiation defs, we will not see the
-          // definition again later, so pass it to the consumer now.
-          S.Consumer.HandleTopLevelDecl(DeclGroupRef(MD));
-        }
-      } else if (!MD->isTrivial() ||
-                 MD->isCopyAssignmentOperator() ||
-                 MD->isMoveAssignmentOperator()) {
-        // Synthesize and instantiate non-trivial implicit methods, and the copy
-        // and move assignment operators. The latter are exported even if they
-        // are trivial, because the address of an operator can be taken and
-        // should compare equal across libraries.
-        S.MarkFunctionReferenced(Class->getLocation(), MD);
-
-        // There is no later point when we will see the definition of this
-        // function, so pass it to the consumer now.
+      // The function will be passed to the consumer when its definition is
+      // encountered.
+    } else if (MD->isExplicitlyDefaulted()) {
+      // Synthesize and instantiate explicitly defaulted methods.
+      S.MarkFunctionReferenced(Class->getLocation(), MD);
+
+      if (TSK != TSK_ExplicitInstantiationDefinition) {
+        // Except for explicit instantiation defs, we will not see the
+        // definition again later, so pass it to the consumer now.
         S.Consumer.HandleTopLevelDecl(DeclGroupRef(MD));
       }
+    } else if (!MD->isTrivial() ||
+               MD->isCopyAssignmentOperator() ||
+               MD->isMoveAssignmentOperator()) {
+      // Synthesize and instantiate non-trivial implicit methods, and the copy
+      // and move assignment operators. The latter are exported even if they
+      // are trivial, because the address of an operator can be taken and
+      // should compare equal across libraries.
+      S.MarkFunctionReferenced(Class->getLocation(), MD);
+
+      // There is no later point when we will see the definition of this
+      // function, so pass it to the consumer now.
+      S.Consumer.HandleTopLevelDecl(DeclGroupRef(MD));
     }
   }
 }
@@ -6507,7 +6659,7 @@ static bool canPassInRegisters(Sema &S, CXXRecordDecl *D,
     bool CopyCtorIsTrivial = false, CopyCtorIsTrivialForCall = false;
     bool DtorIsTrivialForCall = false;
 
-    // If a class has at least one non-deleted, trivial copy constructor, it
+    // If a class has at least one eligible, trivial copy constructor, it
     // is passed according to the C ABI. Otherwise, it is passed indirectly.
     //
     // Note: This permits classes with non-trivial copy or move ctors to be
@@ -6522,7 +6674,8 @@ static bool canPassInRegisters(Sema &S, CXXRecordDecl *D,
       }
     } else {
       for (const CXXConstructorDecl *CD : D->ctors()) {
-        if (CD->isCopyConstructor() && !CD->isDeleted()) {
+        if (CD->isCopyConstructor() && !CD->isDeleted() &&
+            !CD->isIneligibleOrNotSelected()) {
           if (CD->isTrivial())
             CopyCtorIsTrivial = true;
           if (CD->isTrivialForCall())
@@ -6588,7 +6741,7 @@ static bool canPassInRegisters(Sema &S, CXXRecordDecl *D,
     return false;
 
   for (const CXXMethodDecl *MD : D->methods()) {
-    if (MD->isDeleted())
+    if (MD->isDeleted() || MD->isIneligibleOrNotSelected())
       continue;
 
     auto *CD = dyn_cast<CXXConstructorDecl>(MD);
@@ -6842,7 +6995,8 @@ void Sema::CheckCompletedCXXClass(Scope *S, CXXRecordDecl *Record) {
     // Define defaulted constexpr virtual functions that override a base class
     // function right away.
     // FIXME: We can defer doing this until the vtable is marked as used.
-    if (M->isDefaulted() && M->isConstexpr() && M->size_overridden_methods())
+    if (CSM != CXXInvalid && !M->isDeleted() && M->isDefaulted() &&
+        M->isConstexpr() && M->size_overridden_methods())
       DefineDefaultedFunction(*this, M, M->getLocation());
 
     if (!Incomplete)
@@ -7073,6 +7227,11 @@ specialMemberIsConstexpr(Sema &S, CXXRecordDecl *ClassDecl,
                          bool ConstRHS,
                          CXXConstructorDecl *InheritedCtor = nullptr,
                          Sema::InheritedConstructorInfo *Inherited = nullptr) {
+  // Suppress duplicate constraint checking here, in case a constraint check
+  // caused us to decide to do this.  Any truely recursive checks will get
+  // caught during these checks anyway.
+  Sema::SatisfactionStackResetRAII SSRAII{S};
+
   // If we're inheriting a constructor, see if we need to call it for this base
   // class.
   if (InheritedCtor) {
@@ -7169,8 +7328,8 @@ static bool defaultedSpecialMemberIsConstexpr(
   //      class is a constexpr function, and
   for (const auto &B : ClassDecl->bases()) {
     const RecordType *BaseType = B.getType()->getAs<RecordType>();
-    if (!BaseType) continue;
-
+    if (!BaseType)
+      continue;
     CXXRecordDecl *BaseClassDecl = cast<CXXRecordDecl>(BaseType->getDecl());
     if (!specialMemberIsConstexpr(S, BaseClassDecl, CSM, 0, ConstArg,
                                   InheritedCtor, Inherited))
@@ -7297,13 +7456,15 @@ void Sema::CheckExplicitlyDefaultedFunction(Scope *S, FunctionDecl *FD) {
 
   if (DefKind.isSpecialMember()
           ? CheckExplicitlyDefaultedSpecialMember(cast<CXXMethodDecl>(FD),
-                                                  DefKind.asSpecialMember())
+                                                  DefKind.asSpecialMember(),
+                                                  FD->getDefaultLoc())
           : CheckExplicitlyDefaultedComparison(S, FD, DefKind.asComparison()))
     FD->setInvalidDecl();
 }
 
 bool Sema::CheckExplicitlyDefaultedSpecialMember(CXXMethodDecl *MD,
-                                                 CXXSpecialMember CSM) {
+                                                 CXXSpecialMember CSM,
+                                                 SourceLocation DefaultLoc) {
   CXXRecordDecl *RD = MD->getParent();
 
   assert(MD->isExplicitlyDefaulted() && CSM != CXXInvalid &&
@@ -7365,6 +7526,7 @@ bool Sema::CheckExplicitlyDefaultedSpecialMember(CXXMethodDecl *MD,
     ReturnType = Type->getReturnType();
 
     QualType DeclType = Context.getTypeDeclType(RD);
+    DeclType = Context.getElaboratedType(ETK_None, nullptr, DeclType, nullptr);
     DeclType = Context.getAddrSpaceQualType(DeclType, MD->getMethodQualifiers().getAddressSpace());
     QualType ExpectedReturnType = Context.getLValueReferenceType(DeclType);
 
@@ -7439,6 +7601,17 @@ bool Sema::CheckExplicitlyDefaultedSpecialMember(CXXMethodDecl *MD,
   // FIXME: This should not apply if the member is deleted.
   bool Constexpr = defaultedSpecialMemberIsConstexpr(*this, RD, CSM,
                                                      HasConstParam);
+
+  // C++14 [dcl.constexpr]p6 (CWG DR647/CWG DR1358):
+  //   If the instantiated template specialization of a constexpr function
+  //   template or member function of a class template would fail to satisfy
+  //   the requirements for a constexpr function or constexpr constructor, that
+  //   specialization is still a constexpr function or constexpr constructor,
+  //   even though a call to such a function cannot appear in a constant
+  //   expression.
+  if (MD->isTemplateInstantiation() && MD->isConstexpr())
+    Constexpr = true;
+
   if ((getLangOpts().CPlusPlus20 ||
        (getLangOpts().CPlusPlus14 ? !isa<CXXDestructorDecl>(MD)
                                   : isa<CXXConstructorDecl>(MD))) &&
@@ -7470,10 +7643,8 @@ bool Sema::CheckExplicitlyDefaultedSpecialMember(CXXMethodDecl *MD,
       FunctionProtoType::ExtProtoInfo EPI = Type->getExtProtoInfo();
       EPI.ExceptionSpec.Type = EST_Unevaluated;
       EPI.ExceptionSpec.SourceDecl = MD;
-      MD->setType(Context.getFunctionType(ReturnType,
-                                          llvm::makeArrayRef(&ArgType,
-                                                             ExpectedParams),
-                                          EPI));
+      MD->setType(Context.getFunctionType(
+          ReturnType, llvm::ArrayRef(&ArgType, ExpectedParams), EPI));
     }
   }
 
@@ -7484,8 +7655,11 @@ bool Sema::CheckExplicitlyDefaultedSpecialMember(CXXMethodDecl *MD,
         Diag(MD->getLocation(), diag::warn_defaulted_method_deleted) << CSM;
         if (ShouldDeleteForTypeMismatch) {
           Diag(MD->getLocation(), diag::note_deleted_type_mismatch) << CSM;
-        } else {
-          ShouldDeleteSpecialMember(MD, CSM, nullptr, /*Diagnose*/true);
+        } else if (ShouldDeleteSpecialMember(MD, CSM, nullptr,
+                                             /*Diagnose*/ true) &&
+                   DefaultLoc.isValid()) {
+          Diag(DefaultLoc, diag::note_replace_equals_default_to_delete)
+              << FixItHint::CreateReplacement(DefaultLoc, "delete");
         }
       }
       if (ShouldDeleteForTypeMismatch && !HadError) {
@@ -7743,7 +7917,8 @@ private:
     OverloadCandidateSet CandidateSet(
         FD->getLocation(), OverloadCandidateSet::CSK_Operator,
         OverloadCandidateSet::OperatorRewriteInfo(
-            OO, /*AllowRewrittenCandidates=*/!SpaceshipCandidates));
+            OO, FD->getLocation(),
+            /*AllowRewrittenCandidates=*/!SpaceshipCandidates));
 
     /// C++2a [class.compare.default]p1 [P2002R0]:
     ///   [...] the defaulted function itself is never a candidate for overload
@@ -7771,9 +7946,21 @@ private:
            DCK == DefaultedComparisonKind::Relational) &&
           !Best->RewriteKind) {
         if (Diagnose == ExplainDeleted) {
-          S.Diag(Best->Function->getLocation(),
-                 diag::note_defaulted_comparison_not_rewritten_callee)
-              << FD;
+          if (Best->Function) {
+            S.Diag(Best->Function->getLocation(),
+                   diag::note_defaulted_comparison_not_rewritten_callee)
+                << FD;
+          } else {
+            assert(Best->Conversions.size() == 2 &&
+                   Best->Conversions[0].isUserDefined() &&
+                   "non-user-defined conversion from class to built-in "
+                   "comparison");
+            S.Diag(Best->Conversions[0]
+                       .UserDefined.FoundConversionFunction.getDecl()
+                       ->getLocation(),
+                   diag::note_defaulted_comparison_not_rewritten_conversion)
+                << FD;
+          }
         }
         return Result::deleted();
       }
@@ -7870,7 +8057,7 @@ private:
                "invalid builtin comparison");
 
         if (NeedsDeducing) {
-          Optional<ComparisonCategoryType> Cat =
+          std::optional<ComparisonCategoryType> Cat =
               getComparisonCategoryForBuiltinCmp(T);
           assert(Cat && "no category for builtin comparison?");
           R.Category = *Cat;
@@ -7929,7 +8116,7 @@ private:
 
       if (Diagnose == ExplainDeleted) {
         S.Diag(Subobj.Loc, diag::note_defaulted_comparison_no_viable_function)
-            << FD << Subobj.Kind << Subobj.Decl;
+            << FD << (OO == OO_ExclaimEqual) << Subobj.Kind << Subobj.Decl;
 
         // For a three-way comparison, list both the candidates for the
         // original operator and the candidates for the synthesized operator.
@@ -8157,7 +8344,7 @@ private:
     if (ReturnFalse.isInvalid())
       return StmtError();
 
-    return S.ActOnIfStmt(Loc, false, Loc, nullptr,
+    return S.ActOnIfStmt(Loc, IfStatementKind::Ordinary, Loc, nullptr,
                          S.ActOnCondition(nullptr, Loc, NotCond.get(),
                                           Sema::ConditionKind::Boolean),
                          Loc, ReturnFalse.get(), SourceLocation(), nullptr);
@@ -8312,8 +8499,8 @@ private:
         return StmtError();
 
       // if (...)
-      return S.ActOnIfStmt(Loc, /*IsConstexpr=*/false, Loc, InitStmt, Cond, Loc,
-                           ReturnStmt.get(),
+      return S.ActOnIfStmt(Loc, IfStatementKind::Ordinary, Loc, InitStmt, Cond,
+                           Loc, ReturnStmt.get(),
                            /*ElseLoc=*/SourceLocation(), /*Else=*/nullptr);
     }
 
@@ -8467,8 +8654,6 @@ bool Sema::CheckExplicitlyDefaultedComparison(Scope *S, FunctionDecl *FD,
             QualType PlainTy = Context.getRecordType(RD);
             QualType RefTy =
                 Context.getLValueReferenceType(PlainTy.withConst());
-            if (IsMethod)
-              PlainTy = QualType();
             Diag(FD->getLocation(), diag::err_defaulted_comparison_param)
                 << int(DCK) << ParmTy << RefTy << int(!IsMethod) << PlainTy
                 << Param->getSourceRange();
@@ -8502,10 +8687,10 @@ bool Sema::CheckExplicitlyDefaultedComparison(Scope *S, FunctionDecl *FD,
                             int(1)))
       return true;
 
-    if (llvm::find_if(RD->friends(), [&](const FriendDecl *F) {
+    if (llvm::none_of(RD->friends(), [&](const FriendDecl *F) {
           return FD->getCanonicalDecl() ==
                  F->getFriendDecl()->getCanonicalDecl();
-        }) == RD->friends().end()) {
+        })) {
       Diag(FD->getLocation(), diag::err_defaulted_comparison_not_friend)
           << int(DCK) << int(0) << RD;
       Diag(RD->getCanonicalDecl()->getLocation(), diag::note_declared_at);
@@ -8527,10 +8712,11 @@ bool Sema::CheckExplicitlyDefaultedComparison(Scope *S, FunctionDecl *FD,
   // C++2a [class.spaceship]p2 [P2002R0]:
   //   Let R be the declared return type [...]. If R is auto, [...]. Otherwise,
   //   R shall not contain a placeholder type.
-  if (DCK == DefaultedComparisonKind::ThreeWay &&
-      FD->getDeclaredReturnType()->getContainedDeducedType() &&
-      !Context.hasSameType(FD->getDeclaredReturnType(),
-                           Context.getAutoDeductType())) {
+  if (QualType RT = FD->getDeclaredReturnType();
+      DCK == DefaultedComparisonKind::ThreeWay &&
+      RT->getContainedDeducedType() &&
+      (!Context.hasSameType(RT, Context.getAutoDeductType()) ||
+       RT->getContainedAutoType()->isConstrained())) {
     Diag(FD->getLocation(),
          diag::err_defaulted_comparison_deduced_return_type_not_auto)
         << (int)DCK << FD->getDeclaredReturnType() << Context.AutoDeductTy
@@ -8549,10 +8735,8 @@ bool Sema::CheckExplicitlyDefaultedComparison(Scope *S, FunctionDecl *FD,
 
   bool First = FD == FD->getCanonicalDecl();
 
-  // If we want to delete the function, then do so; there's nothing else to
-  // check in that case.
-  if (Info.Deleted) {
-    if (!First) {
+  if (!First) {
+    if (Info.Deleted) {
       // C++11 [dcl.fct.def.default]p4:
       //   [For a] user-provided explicitly-defaulted function [...] if such a
       //   function is implicitly defined as deleted, the program is ill-formed.
@@ -8566,7 +8750,21 @@ bool Sema::CheckExplicitlyDefaultedComparison(Scope *S, FunctionDecl *FD,
           .visit();
       return true;
     }
+    if (isa<CXXRecordDecl>(FD->getLexicalDeclContext())) {
+      // C++20 [class.compare.default]p1:
+      //   [...] A definition of a comparison operator as defaulted that appears
+      //   in a class shall be the first declaration of that function.
+      Diag(FD->getLocation(), diag::err_non_first_default_compare_in_class)
+          << (int)DCK;
+      Diag(FD->getCanonicalDecl()->getLocation(),
+           diag::note_previous_declaration);
+      return true;
+    }
+  }
 
+  // If we want to delete the function, then do so; there's nothing else to
+  // check in that case.
+  if (Info.Deleted) {
     SetDeclDeleted(FD, FD->getLocation());
     if (!inTemplateInstantiation() && !FD->isImplicit()) {
       Diag(FD->getLocation(), diag::warn_defaulted_comparison_deleted)
@@ -8574,6 +8772,9 @@ bool Sema::CheckExplicitlyDefaultedComparison(Scope *S, FunctionDecl *FD,
       DefaultedComparisonAnalyzer(*this, RD, FD, DCK,
                                   DefaultedComparisonAnalyzer::ExplainDeleted)
           .visit();
+      if (FD->getDefaultLoc().isValid())
+        Diag(FD->getDefaultLoc(), diag::note_replace_equals_default_to_delete)
+            << FixItHint::CreateReplacement(FD->getDefaultLoc(), "delete");
     }
     return false;
   }
@@ -9097,13 +9298,12 @@ bool SpecialMemberDeletionInfo::shouldDeleteForField(FieldDecl *FD) {
           << !!ICI << MD->getParent() << FD << FieldType << /*Reference*/0;
       return true;
     }
-    // C++11 [class.ctor]p5: any non-variant non-static data member of
-    // const-qualified type (or array thereof) with no
-    // brace-or-equal-initializer does not have a user-provided default
-    // constructor.
+    // C++11 [class.ctor]p5 (modified by DR2394): any non-variant non-static
+    // data member of const-qualified type (or array thereof) with no
+    // brace-or-equal-initializer is not const-default-constructible.
     if (!inUnion() && FieldType.isConstQualified() &&
         !FD->hasInClassInitializer() &&
-        (!FieldRecord || !FieldRecord->hasUserProvidedDefaultConstructor())) {
+        (!FieldRecord || !FieldRecord->allowConstDefaultInit())) {
       if (Diagnose)
         S.Diag(FD->getLocation(), diag::note_deleted_default_ctor_uninit_field)
           << !!ICI << MD->getParent() << FD << FD->getType() << /*Const*/1;
@@ -9173,7 +9373,8 @@ bool SpecialMemberDeletionInfo::shouldDeleteForField(FieldDecl *FD) {
       }
 
       // Don't check the implicit member of the anonymous union type.
-      // This is technically non-conformant, but sanity demands it.
+      // This is technically non-conformant but supported, and we have a
+      // diagnostic for this elsewhere.
       return false;
     }
 
@@ -9657,11 +9858,22 @@ bool Sema::SpecialMemberIsTrivial(CXXMethodDecl *MD, CXXSpecialMember CSM,
 
   case CXXCopyConstructor:
   case CXXCopyAssignment: {
-    // Trivial copy operations always have const, non-volatile parameter types.
-    ConstArg = true;
     const ParmVarDecl *Param0 = MD->getParamDecl(0);
     const ReferenceType *RT = Param0->getType()->getAs<ReferenceType>();
-    if (!RT || RT->getPointeeType().getCVRQualifiers() != Qualifiers::Const) {
+
+    // When ClangABICompat14 is true, CXX copy constructors will only be trivial
+    // if they are not user-provided and their parameter-type-list is equivalent
+    // to the parameter-type-list of an implicit declaration. This maintains the
+    // behavior before dr2171 was implemented.
+    //
+    // Otherwise, if ClangABICompat14 is false, All copy constructors can be
+    // trivial, if they are not user-provided, regardless of the qualifiers on
+    // the reference type.
+    const bool ClangABICompat14 = Context.getLangOpts().getClangABICompat() <=
+                                  LangOptions::ClangABI::Ver14;
+    if (!RT ||
+        ((RT->getPointeeType().getCVRQualifiers() != Qualifiers::Const) &&
+         ClangABICompat14)) {
       if (Diagnose)
         Diag(Param0->getLocation(), diag::note_nontrivial_param_type)
           << Param0->getSourceRange() << Param0->getType()
@@ -9669,6 +9881,8 @@ bool Sema::SpecialMemberIsTrivial(CXXMethodDecl *MD, CXXSpecialMember CSM,
                Context.getRecordType(RD).withConst());
       return false;
     }
+
+    ConstArg = RT->getPointeeType().isConstQualified();
     break;
   }
 
@@ -9843,7 +10057,7 @@ public:
 };
 } // end anonymous namespace
 
-/// Add the most overriden methods from MD to Methods
+/// Add the most overridden methods from MD to Methods
 static void AddMostOverridenMethods(const CXXMethodDecl *MD,
                         llvm::SmallPtrSetImpl<const CXXMethodDecl *>& Methods) {
   if (MD->size_overridden_methods() == 0)
@@ -10002,10 +10216,12 @@ void Sema::ActOnFinishCXXMemberSpecification(
     Diag(AL.getLoc(), diag::warn_attribute_after_definition_ignored) << AL;
   }
 
-  ActOnFields(S, RLoc, TagDecl, llvm::makeArrayRef(
-              // strict aliasing violation!
-              reinterpret_cast<Decl**>(FieldCollector->getCurFields()),
-              FieldCollector->getCurNumFields()), LBrac, RBrac, AttrList);
+  ActOnFields(S, RLoc, TagDecl,
+              llvm::ArrayRef(
+                  // strict aliasing violation!
+                  reinterpret_cast<Decl **>(FieldCollector->getCurFields()),
+                  FieldCollector->getCurNumFields()),
+              LBrac, RBrac, AttrList);
 
   CheckCompletedCXXClass(S, cast<CXXRecordDecl>(TagDecl));
 }
@@ -10571,7 +10787,7 @@ QualType Sema::CheckDestructorDeclarator(Declarator &D, QualType R,
   EPI.Variadic = false;
   EPI.TypeQuals = Qualifiers();
   EPI.RefQualifier = RQ_None;
-  return Context.getFunctionType(Context.VoidTy, None, EPI);
+  return Context.getFunctionType(Context.VoidTy, std::nullopt, EPI);
 }
 
 static void extendLeft(SourceRange &R, SourceRange Before) {
@@ -10674,7 +10890,7 @@ void Sema::CheckConversionDeclarator(Declarator &D, QualType &R,
           PastFunctionChunk = true;
           break;
         }
-        LLVM_FALLTHROUGH;
+        [[fallthrough]];
       case DeclaratorChunk::Array:
         NeedsTypedef = true;
         extendRight(After, Chunk.getSourceRange());
@@ -10747,7 +10963,8 @@ void Sema::CheckConversionDeclarator(Declarator &D, QualType &R,
   // of the errors above fired) and with the conversion type as the
   // return type.
   if (D.isInvalidType())
-    R = Context.getFunctionType(ConvType, None, Proto->getExtProtoInfo());
+    R = Context.getFunctionType(ConvType, std::nullopt,
+                                Proto->getExtProtoInfo());
 
   // C++0x explicit conversion operators.
   if (DS.hasExplicitSpecifier() && !getLangOpts().CPlusPlus20)
@@ -10909,6 +11126,7 @@ void Sema::CheckDeductionGuideDeclarator(Declarator &D, QualType &R,
 
     // Check that the return type is written as a specialization of
     // the template specified as the deduction-guide's name.
+    // The template name may not be qualified. [temp.deduct.guide]
     ParsedType TrailingReturnType = Chunk.Fun.getTrailingReturnType();
     TypeSourceInfo *TSI = nullptr;
     QualType RetTy = GetTypeFromParser(TrailingReturnType, &TSI);
@@ -10916,11 +11134,17 @@ void Sema::CheckDeductionGuideDeclarator(Declarator &D, QualType &R,
     bool AcceptableReturnType = false;
     bool MightInstantiateToSpecialization = false;
     if (auto RetTST =
-            TSI->getTypeLoc().getAs<TemplateSpecializationTypeLoc>()) {
+            TSI->getTypeLoc().getAsAdjusted<TemplateSpecializationTypeLoc>()) {
       TemplateName SpecifiedName = RetTST.getTypePtr()->getTemplateName();
       bool TemplateMatches =
           Context.hasSameTemplateName(SpecifiedName, GuidedTemplate);
-      if (SpecifiedName.getKind() == TemplateName::Template && TemplateMatches)
+      auto TKind = SpecifiedName.getKind();
+      // A Using TemplateName can't actually be valid (either it's qualified, or
+      // we're in the wrong scope). But we have diagnosed these problems
+      // already.
+      bool SimplyWritten = TKind == TemplateName::Template ||
+                           TKind == TemplateName::UsingTemplate;
+      if (SimplyWritten && TemplateMatches)
         AcceptableReturnType = true;
       else {
         // This could still instantiate to the right type, unless we know it
@@ -10962,6 +11186,11 @@ static void DiagnoseNamespaceInlineMismatch(Sema &S, SourceLocation KeywordLoc,
                                             NamespaceDecl *PrevNS) {
   assert(*IsInline != PrevNS->isInline());
 
+  // 'inline' must appear on the original definition, but not necessarily
+  // on all extension definitions, so the note should point to the first
+  // definition to avoid confusion.
+  PrevNS = PrevNS->getFirstDecl();
+
   if (PrevNS->isInline())
     // The user probably just forgot the 'inline', so suggest that it
     // be added back.
@@ -10976,10 +11205,13 @@ static void DiagnoseNamespaceInlineMismatch(Sema &S, SourceLocation KeywordLoc,
 
 /// ActOnStartNamespaceDef - This is called at the start of a namespace
 /// definition.
-Decl *Sema::ActOnStartNamespaceDef(
-    Scope *NamespcScope, SourceLocation InlineLoc, SourceLocation NamespaceLoc,
-    SourceLocation IdentLoc, IdentifierInfo *II, SourceLocation LBrace,
-    const ParsedAttributesView &AttrList, UsingDirectiveDecl *&UD) {
+Decl *Sema::ActOnStartNamespaceDef(Scope *NamespcScope,
+                                   SourceLocation InlineLoc,
+                                   SourceLocation NamespaceLoc,
+                                   SourceLocation IdentLoc, IdentifierInfo *II,
+                                   SourceLocation LBrace,
+                                   const ParsedAttributesView &AttrList,
+                                   UsingDirectiveDecl *&UD, bool IsNested) {
   SourceLocation StartLoc = InlineLoc.isValid() ? InlineLoc : NamespaceLoc;
   // For anonymous namespace, take the location of the left brace.
   SourceLocation Loc = II ? IdentLoc : LBrace;
@@ -11049,8 +11281,8 @@ Decl *Sema::ActOnStartNamespaceDef(
                                       &IsInline, PrevNS);
   }
 
-  NamespaceDecl *Namespc = NamespaceDecl::Create(Context, CurContext, IsInline,
-                                                 StartLoc, Loc, II, PrevNS);
+  NamespaceDecl *Namespc = NamespaceDecl::Create(
+      Context, CurContext, IsInline, StartLoc, Loc, II, PrevNS, IsNested);
   if (IsInvalid)
     Namespc->setInvalidDecl();
 
@@ -11311,12 +11543,11 @@ QualType Sema::CheckComparisonCategoryType(ComparisonCategoryType Kind,
 NamespaceDecl *Sema::getOrCreateStdNamespace() {
   if (!StdNamespace) {
     // The "std" namespace has not yet been defined, so build one implicitly.
-    StdNamespace = NamespaceDecl::Create(Context,
-                                         Context.getTranslationUnitDecl(),
-                                         /*Inline=*/false,
-                                         SourceLocation(), SourceLocation(),
-                                         &PP.getIdentifierTable().get("std"),
-                                         /*PrevDecl=*/nullptr);
+    StdNamespace = NamespaceDecl::Create(
+        Context, Context.getTranslationUnitDecl(),
+        /*Inline=*/false, SourceLocation(), SourceLocation(),
+        &PP.getIdentifierTable().get("std"),
+        /*PrevDecl=*/nullptr, /*Nested=*/false);
     getStdNamespace()->setImplicit(true);
   }
 
@@ -11349,7 +11580,7 @@ bool Sema::isStdInitializerList(QualType Ty, QualType *Element) {
                  Ty->getAs<TemplateSpecializationType>()) {
     Template = dyn_cast_or_null<ClassTemplateDecl>(
         TST->getTemplateName().getAsTemplateDecl());
-    Arguments = TST->getArgs();
+    Arguments = TST->template_arguments().begin();
   }
   if (!Template)
     return false;
@@ -11428,7 +11659,9 @@ QualType Sema::BuildStdInitializerList(QualType Element, SourceLocation Loc) {
   Args.addArgument(TemplateArgumentLoc(TemplateArgument(Element),
                                        Context.getTrivialTypeSourceInfo(Element,
                                                                         Loc)));
-  return Context.getCanonicalType(
+  return Context.getElaboratedType(
+      ElaboratedTypeKeyword::ETK_None,
+      NestedNameSpecifier::Create(Context, nullptr, getStdNamespace()),
       CheckTemplateIdType(TemplateName(StdInitializerList), Loc, Args));
 }
 
@@ -11690,30 +11923,40 @@ Decl *Sema::ActOnUsingDeclaration(Scope *S, AccessSpecifier AS,
 Decl *Sema::ActOnUsingEnumDeclaration(Scope *S, AccessSpecifier AS,
                                       SourceLocation UsingLoc,
                                       SourceLocation EnumLoc,
-                                      const DeclSpec &DS) {
-  switch (DS.getTypeSpecType()) {
-  case DeclSpec::TST_error:
-    // This will already have been diagnosed
+                                      SourceLocation IdentLoc,
+                                      IdentifierInfo &II, CXXScopeSpec *SS) {
+  assert(!SS->isInvalid() && "ScopeSpec is invalid");
+  TypeSourceInfo *TSI = nullptr;
+  QualType EnumTy = GetTypeFromParser(
+      getTypeName(II, IdentLoc, S, SS, /*isClassName=*/false,
+                  /*HasTrailingDot=*/false,
+                  /*ObjectType=*/nullptr, /*IsCtorOrDtorName=*/false,
+                  /*WantNontrivialTypeSourceInfo=*/true),
+      &TSI);
+  if (EnumTy.isNull()) {
+    Diag(IdentLoc, SS && isDependentScopeSpecifier(*SS)
+                       ? diag::err_using_enum_is_dependent
+                       : diag::err_unknown_typename)
+        << II.getName()
+        << SourceRange(SS ? SS->getBeginLoc() : IdentLoc, IdentLoc);
     return nullptr;
+  }
 
-  case DeclSpec::TST_enum:
-    break;
-
-  case DeclSpec::TST_typename:
-    Diag(DS.getTypeSpecTypeLoc(), diag::err_using_enum_is_dependent);
+  auto *Enum = dyn_cast_if_present<EnumDecl>(EnumTy->getAsTagDecl());
+  if (!Enum) {
+    Diag(IdentLoc, diag::err_using_enum_not_enum) << EnumTy;
     return nullptr;
-
-  default:
-    llvm_unreachable("unexpected DeclSpec type");
   }
 
-  // As with enum-decls, we ignore attributes for now.
-  auto *Enum = cast<EnumDecl>(DS.getRepAsDecl());
   if (auto *Def = Enum->getDefinition())
     Enum = Def;
 
-  auto *UD = BuildUsingEnumDeclaration(S, AS, UsingLoc, EnumLoc,
-                                       DS.getTypeSpecTypeNameLoc(), Enum);
+  if (TSI == nullptr)
+    TSI = Context.getTrivialTypeSourceInfo(EnumTy, IdentLoc);
+
+  auto *UD =
+      BuildUsingEnumDeclaration(S, AS, UsingLoc, EnumLoc, IdentLoc, TSI, Enum);
+
   if (UD)
     PushOnScopeChains(UD, S, /*AddToContext*/ false);
 
@@ -12257,7 +12500,7 @@ NamedDecl *Sema::BuildUsingDeclaration(
   // Unlike most lookups, we don't always want to hide tag
   // declarations: tag names are visible through the using declaration
   // even if hidden by ordinary names, *except* in a dependent context
-  // where it's important for the sanity of two-phase lookup.
+  // where they may be used by two-phase lookup.
   if (!IsInstantiation)
     R.setHideTags(false);
 
@@ -12405,6 +12648,7 @@ NamedDecl *Sema::BuildUsingEnumDeclaration(Scope *S, AccessSpecifier AS,
                                            SourceLocation UsingLoc,
                                            SourceLocation EnumLoc,
                                            SourceLocation NameLoc,
+                                           TypeSourceInfo *EnumType,
                                            EnumDecl *ED) {
   bool Invalid = false;
 
@@ -12431,7 +12675,7 @@ NamedDecl *Sema::BuildUsingEnumDeclaration(Scope *S, AccessSpecifier AS,
     Invalid = true;
 
   UsingEnumDecl *UD = UsingEnumDecl::Create(Context, CurContext, UsingLoc,
-                                            EnumLoc, NameLoc, ED);
+                                            EnumLoc, NameLoc, EnumType);
   UD->setAccess(AS);
   CurContext->addDecl(UD);
 
@@ -12773,7 +13017,7 @@ bool Sema::CheckUsingDeclQualifier(SourceLocation UsingLoc, bool HasTypename,
 
   // Salient point: SS doesn't have to name a base class as long as
   // lookup only finds members from base classes.  Therefore we can
-  // diagnose here only if we can prove that that can't happen,
+  // diagnose here only if we can prove that can't happen,
   // i.e. if the class hierarchies provably don't intersect.
 
   // TODO: it would be nice if "definitely valid" results were cached
@@ -12853,7 +13097,7 @@ Decl *Sema::ActOnAliasDeclaration(Scope *S, AccessSpecifier AS,
     Previous.clear();
   }
 
-  assert(Name.Kind == UnqualifiedIdKind::IK_Identifier &&
+  assert(Name.getKind() == UnqualifiedIdKind::IK_Identifier &&
          "name in alias declaration must be an identifier");
   TypeAliasDecl *NewTD = TypeAliasDecl::Create(Context, CurContext, UsingLoc,
                                                Name.StartLocation,
@@ -12949,7 +13193,7 @@ Decl *Sema::ActOnAliasDeclaration(Scope *S, AccessSpecifier AS,
       NewDecl->setInvalidDecl();
     else if (OldDecl) {
       NewDecl->setPreviousDecl(OldDecl);
-      CheckRedeclarationModuleOwnership(NewDecl, OldDecl);
+      CheckRedeclarationInModule(NewDecl, OldDecl);
     }
 
     NewND = NewDecl;
@@ -13243,7 +13487,8 @@ void Sema::CheckImplicitSpecialMemberDeclaration(Scope *S, FunctionDecl *FD) {
   R.resolveKind();
   R.suppressDiagnostics();
 
-  CheckFunctionDeclaration(S, FD, R, /*IsMemberSpecialization*/false);
+  CheckFunctionDeclaration(S, FD, R, /*IsMemberSpecialization*/ false,
+                           FD->isThisDeclarationADefinition());
 }
 
 void Sema::setupImplicitSpecialMemberType(CXXMethodDecl *SpecialMem,
@@ -13300,20 +13545,20 @@ CXXConstructorDecl *Sema::DeclareImplicitDefaultConstructor(
   CXXConstructorDecl *DefaultCon = CXXConstructorDecl::Create(
       Context, ClassDecl, ClassLoc, NameInfo, /*Type*/ QualType(),
       /*TInfo=*/nullptr, ExplicitSpecifier(),
+      getCurFPFeatures().isFPConstrained(),
       /*isInline=*/true, /*isImplicitlyDeclared=*/true,
       Constexpr ? ConstexprSpecKind::Constexpr
                 : ConstexprSpecKind::Unspecified);
   DefaultCon->setAccess(AS_public);
   DefaultCon->setDefaulted();
 
-  if (getLangOpts().CUDA) {
+  setupImplicitSpecialMemberType(DefaultCon, Context.VoidTy, std::nullopt);
+
+  if (getLangOpts().CUDA)
     inferCUDATargetForImplicitSpecialMember(ClassDecl, CXXDefaultConstructor,
                                             DefaultCon,
                                             /* ConstRHS */ false,
                                             /* Diagnose */ false);
-  }
-
-  setupImplicitSpecialMemberType(DefaultCon, Context.VoidTy, None);
 
   // We don't need to use SpecialMemberIsTrivial here; triviality for default
   // constructors is easy to compute.
@@ -13421,7 +13666,8 @@ Sema::findInheritingConstructor(SourceLocation Loc,
 
   CXXConstructorDecl *DerivedCtor = CXXConstructorDecl::Create(
       Context, Derived, UsingLoc, NameInfo, TInfo->getType(), TInfo,
-      BaseCtor->getExplicitSpecifier(), /*isInline=*/true,
+      BaseCtor->getExplicitSpecifier(), getCurFPFeatures().isFPConstrained(),
+      /*isInline=*/true,
       /*isImplicitlyDeclared=*/true,
       Constexpr ? BaseCtor->getConstexprKind() : ConstexprSpecKind::Unspecified,
       InheritedConstructor(Shadow, BaseCtor),
@@ -13576,23 +13822,23 @@ CXXDestructorDecl *Sema::DeclareImplicitDestructor(CXXRecordDecl *ClassDecl) {
   DeclarationName Name
     = Context.DeclarationNames.getCXXDestructorName(ClassType);
   DeclarationNameInfo NameInfo(Name, ClassLoc);
-  CXXDestructorDecl *Destructor =
-      CXXDestructorDecl::Create(Context, ClassDecl, ClassLoc, NameInfo,
-                                QualType(), nullptr, /*isInline=*/true,
-                                /*isImplicitlyDeclared=*/true,
-                                Constexpr ? ConstexprSpecKind::Constexpr
-                                          : ConstexprSpecKind::Unspecified);
+  CXXDestructorDecl *Destructor = CXXDestructorDecl::Create(
+      Context, ClassDecl, ClassLoc, NameInfo, QualType(), nullptr,
+      getCurFPFeatures().isFPConstrained(),
+      /*isInline=*/true,
+      /*isImplicitlyDeclared=*/true,
+      Constexpr ? ConstexprSpecKind::Constexpr
+                : ConstexprSpecKind::Unspecified);
   Destructor->setAccess(AS_public);
   Destructor->setDefaulted();
 
-  if (getLangOpts().CUDA) {
+  setupImplicitSpecialMemberType(Destructor, Context.VoidTy, std::nullopt);
+
+  if (getLangOpts().CUDA)
     inferCUDATargetForImplicitSpecialMember(ClassDecl, CXXDestructor,
                                             Destructor,
                                             /* ConstRHS */ false,
                                             /* Diagnose */ false);
-  }
-
-  setupImplicitSpecialMemberType(Destructor, Context.VoidTy, None);
 
   // We don't need to use SpecialMemberIsTrivial here; triviality for
   // destructors is easy to compute.
@@ -13747,7 +13993,8 @@ void Sema::AdjustDestructorExceptionSpec(CXXDestructorDecl *Destructor) {
   FunctionProtoType::ExtProtoInfo EPI = DtorType->getExtProtoInfo();
   EPI.ExceptionSpec.Type = EST_Unevaluated;
   EPI.ExceptionSpec.SourceDecl = Destructor;
-  Destructor->setType(Context.getFunctionType(Context.VoidTy, None, EPI));
+  Destructor->setType(
+      Context.getFunctionType(Context.VoidTy, std::nullopt, EPI));
 
   // FIXME: If the destructor has a body that could throw, and the newly created
   // spec doesn't allow exceptions, we should emit a warning, because this
@@ -14195,6 +14442,7 @@ CXXMethodDecl *Sema::DeclareImplicitCopyAssignment(CXXRecordDecl *ClassDecl) {
     return nullptr;
 
   QualType ArgType = Context.getTypeDeclType(ClassDecl);
+  ArgType = Context.getElaboratedType(ETK_None, nullptr, ArgType, nullptr);
   LangAS AS = getDefaultCXXMethodAddrSpace();
   if (AS != LangAS::Default)
     ArgType = Context.getAddrSpaceQualType(ArgType, AS);
@@ -14217,6 +14465,7 @@ CXXMethodDecl *Sema::DeclareImplicitCopyAssignment(CXXRecordDecl *ClassDecl) {
   CXXMethodDecl *CopyAssignment = CXXMethodDecl::Create(
       Context, ClassDecl, ClassLoc, NameInfo, QualType(),
       /*TInfo=*/nullptr, /*StorageClass=*/SC_None,
+      getCurFPFeatures().isFPConstrained(),
       /*isInline=*/true,
       Constexpr ? ConstexprSpecKind::Constexpr : ConstexprSpecKind::Unspecified,
       SourceLocation());
@@ -14224,14 +14473,13 @@ CXXMethodDecl *Sema::DeclareImplicitCopyAssignment(CXXRecordDecl *ClassDecl) {
   CopyAssignment->setDefaulted();
   CopyAssignment->setImplicit();
 
-  if (getLangOpts().CUDA) {
+  setupImplicitSpecialMemberType(CopyAssignment, RetType, ArgType);
+
+  if (getLangOpts().CUDA)
     inferCUDATargetForImplicitSpecialMember(ClassDecl, CXXCopyAssignment,
                                             CopyAssignment,
                                             /* ConstRHS */ Const,
                                             /* Diagnose */ false);
-  }
-
-  setupImplicitSpecialMemberType(CopyAssignment, RetType, ArgType);
 
   // Add the parameter to the operator.
   ParmVarDecl *FromParam = ParmVarDecl::Create(Context, CopyAssignment,
@@ -14273,13 +14521,10 @@ static void diagnoseDeprecatedCopyOperation(Sema &S, CXXMethodDecl *CopyOp) {
   CXXRecordDecl *RD = CopyOp->getParent();
   CXXMethodDecl *UserDeclaredOperation = nullptr;
 
-  // In Microsoft mode, assignment operations don't affect constructors and
-  // vice versa.
   if (RD->hasUserDeclaredDestructor()) {
     UserDeclaredOperation = RD->getDestructor();
   } else if (!isa<CXXConstructorDecl>(CopyOp) &&
-             RD->hasUserDeclaredCopyConstructor() &&
-             !S.getLangOpts().MSVCCompat) {
+             RD->hasUserDeclaredCopyConstructor()) {
     // Find any user-declared copy constructor.
     for (auto *I : RD->ctors()) {
       if (I->isCopyConstructor()) {
@@ -14289,8 +14534,7 @@ static void diagnoseDeprecatedCopyOperation(Sema &S, CXXMethodDecl *CopyOp) {
     }
     assert(UserDeclaredOperation);
   } else if (isa<CXXConstructorDecl>(CopyOp) &&
-             RD->hasUserDeclaredCopyAssignment() &&
-             !S.getLangOpts().MSVCCompat) {
+             RD->hasUserDeclaredCopyAssignment()) {
     // Find any user-declared move assignment operator.
     for (auto *I : RD->methods()) {
       if (I->isCopyAssignmentOperator()) {
@@ -14475,7 +14719,8 @@ void Sema::DefineImplicitCopyAssignment(SourceLocation CurrentLocation,
 
     MemberBuilder From(OtherRef, OtherRefType, /*IsArrow=*/false, MemberLookup);
 
-    MemberBuilder To(This, getCurrentThisType(), /*IsArrow=*/true, MemberLookup);
+    MemberBuilder To(This, getCurrentThisType(), /*IsArrow=*/!LangOpts.HLSL,
+                     MemberLookup);
 
     // Build the copy of this field.
     StmtResult Copy = buildSingleCopyAssign(*this, Loc, FieldType,
@@ -14493,9 +14738,16 @@ void Sema::DefineImplicitCopyAssignment(SourceLocation CurrentLocation,
 
   if (!Invalid) {
     // Add a "return *this;"
-    ExprResult ThisObj = CreateBuiltinUnaryOp(Loc, UO_Deref, This.build(*this, Loc));
+    Expr *ThisExpr = nullptr;
+    if (!LangOpts.HLSL) {
+      ExprResult ThisObj =
+          CreateBuiltinUnaryOp(Loc, UO_Deref, This.build(*this, Loc));
+      ThisExpr = ThisObj.get();
+    } else {
+      ThisExpr = This.build(*this, Loc);
+    }
 
-    StmtResult Return = BuildReturnStmt(Loc, ThisObj.get());
+    StmtResult Return = BuildReturnStmt(Loc, ThisExpr);
     if (Return.isInvalid())
       Invalid = true;
     else
@@ -14533,6 +14785,7 @@ CXXMethodDecl *Sema::DeclareImplicitMoveAssignment(CXXRecordDecl *ClassDecl) {
   // constructor rules.
 
   QualType ArgType = Context.getTypeDeclType(ClassDecl);
+  ArgType = Context.getElaboratedType(ETK_None, nullptr, ArgType, nullptr);
   LangAS AS = getDefaultCXXMethodAddrSpace();
   if (AS != LangAS::Default)
     ArgType = Context.getAddrSpaceQualType(ArgType, AS);
@@ -14551,6 +14804,7 @@ CXXMethodDecl *Sema::DeclareImplicitMoveAssignment(CXXRecordDecl *ClassDecl) {
   CXXMethodDecl *MoveAssignment = CXXMethodDecl::Create(
       Context, ClassDecl, ClassLoc, NameInfo, QualType(),
       /*TInfo=*/nullptr, /*StorageClass=*/SC_None,
+      getCurFPFeatures().isFPConstrained(),
       /*isInline=*/true,
       Constexpr ? ConstexprSpecKind::Constexpr : ConstexprSpecKind::Unspecified,
       SourceLocation());
@@ -14558,14 +14812,13 @@ CXXMethodDecl *Sema::DeclareImplicitMoveAssignment(CXXRecordDecl *ClassDecl) {
   MoveAssignment->setDefaulted();
   MoveAssignment->setImplicit();
 
-  if (getLangOpts().CUDA) {
+  setupImplicitSpecialMemberType(MoveAssignment, RetType, ArgType);
+
+  if (getLangOpts().CUDA)
     inferCUDATargetForImplicitSpecialMember(ClassDecl, CXXMoveAssignment,
                                             MoveAssignment,
                                             /* ConstRHS */ false,
                                             /* Diagnose */ false);
-  }
-
-  setupImplicitSpecialMemberType(MoveAssignment, RetType, ArgType);
 
   // Add the parameter to the operator.
   ParmVarDecl *FromParam = ParmVarDecl::Create(Context, MoveAssignment,
@@ -14675,8 +14928,7 @@ static void checkMoveAssignmentForRepeatedMove(Sema &S, CXXRecordDecl *Class,
           continue;
 
         // We're going to move the base classes of Base. Add them to the list.
-        for (auto &BI : Base->bases())
-          Worklist.push_back(&BI);
+        llvm::append_range(Worklist, llvm::make_pointer_range(Base->bases()));
       }
     }
   }
@@ -14906,6 +15158,7 @@ CXXConstructorDecl *Sema::DeclareImplicitCopyConstructor(
 
   QualType ClassType = Context.getTypeDeclType(ClassDecl);
   QualType ArgType = ClassType;
+  ArgType = Context.getElaboratedType(ETK_None, nullptr, ArgType, nullptr);
   bool Const = ClassDecl->implicitCopyConstructorHasConstParam();
   if (Const)
     ArgType = ArgType.withConst();
@@ -14930,7 +15183,7 @@ CXXConstructorDecl *Sema::DeclareImplicitCopyConstructor(
   //   member of its class.
   CXXConstructorDecl *CopyConstructor = CXXConstructorDecl::Create(
       Context, ClassDecl, ClassLoc, NameInfo, QualType(), /*TInfo=*/nullptr,
-      ExplicitSpecifier(),
+      ExplicitSpecifier(), getCurFPFeatures().isFPConstrained(),
       /*isInline=*/true,
       /*isImplicitlyDeclared=*/true,
       Constexpr ? ConstexprSpecKind::Constexpr
@@ -14938,14 +15191,13 @@ CXXConstructorDecl *Sema::DeclareImplicitCopyConstructor(
   CopyConstructor->setAccess(AS_public);
   CopyConstructor->setDefaulted();
 
-  if (getLangOpts().CUDA) {
+  setupImplicitSpecialMemberType(CopyConstructor, Context.VoidTy, ArgType);
+
+  if (getLangOpts().CUDA)
     inferCUDATargetForImplicitSpecialMember(ClassDecl, CXXCopyConstructor,
                                             CopyConstructor,
                                             /* ConstRHS */ Const,
                                             /* Diagnose */ false);
-  }
-
-  setupImplicitSpecialMemberType(CopyConstructor, Context.VoidTy, ArgType);
 
   // During template instantiation of special member functions we need a
   // reliable TypeSourceInfo for the parameter types in order to allow functions
@@ -15030,7 +15282,8 @@ void Sema::DefineImplicitCopyConstructor(SourceLocation CurrentLocation,
                              : CopyConstructor->getLocation();
     Sema::CompoundScopeRAII CompoundScope(*this);
     CopyConstructor->setBody(
-        ActOnCompoundStmt(Loc, Loc, None, /*isStmtExpr=*/false).getAs<Stmt>());
+        ActOnCompoundStmt(Loc, Loc, std::nullopt, /*isStmtExpr=*/false)
+            .getAs<Stmt>());
     CopyConstructor->markUsed(Context);
   }
 
@@ -15050,6 +15303,7 @@ CXXConstructorDecl *Sema::DeclareImplicitMoveConstructor(
   QualType ClassType = Context.getTypeDeclType(ClassDecl);
 
   QualType ArgType = ClassType;
+  ArgType = Context.getElaboratedType(ETK_None, nullptr, ArgType, nullptr);
   LangAS AS = getDefaultCXXMethodAddrSpace();
   if (AS != LangAS::Default)
     ArgType = Context.getAddrSpaceQualType(ClassType, AS);
@@ -15070,7 +15324,7 @@ CXXConstructorDecl *Sema::DeclareImplicitMoveConstructor(
   //   member of its class.
   CXXConstructorDecl *MoveConstructor = CXXConstructorDecl::Create(
       Context, ClassDecl, ClassLoc, NameInfo, QualType(), /*TInfo=*/nullptr,
-      ExplicitSpecifier(),
+      ExplicitSpecifier(), getCurFPFeatures().isFPConstrained(),
       /*isInline=*/true,
       /*isImplicitlyDeclared=*/true,
       Constexpr ? ConstexprSpecKind::Constexpr
@@ -15078,14 +15332,13 @@ CXXConstructorDecl *Sema::DeclareImplicitMoveConstructor(
   MoveConstructor->setAccess(AS_public);
   MoveConstructor->setDefaulted();
 
-  if (getLangOpts().CUDA) {
+  setupImplicitSpecialMemberType(MoveConstructor, Context.VoidTy, ArgType);
+
+  if (getLangOpts().CUDA)
     inferCUDATargetForImplicitSpecialMember(ClassDecl, CXXMoveConstructor,
                                             MoveConstructor,
                                             /* ConstRHS */ false,
                                             /* Diagnose */ false);
-  }
-
-  setupImplicitSpecialMemberType(MoveConstructor, Context.VoidTy, ArgType);
 
   // Add the parameter to the constructor.
   ParmVarDecl *FromParam = ParmVarDecl::Create(Context, MoveConstructor,
@@ -15156,8 +15409,9 @@ void Sema::DefineImplicitMoveConstructor(SourceLocation CurrentLocation,
                              ? MoveConstructor->getEndLoc()
                              : MoveConstructor->getLocation();
     Sema::CompoundScopeRAII CompoundScope(*this);
-    MoveConstructor->setBody(ActOnCompoundStmt(
-        Loc, Loc, None, /*isStmtExpr=*/ false).getAs<Stmt>());
+    MoveConstructor->setBody(
+        ActOnCompoundStmt(Loc, Loc, std::nullopt, /*isStmtExpr=*/false)
+            .getAs<Stmt>());
     MoveConstructor->markUsed(Context);
   }
 
@@ -15182,7 +15436,8 @@ void Sema::DefineImplicitLambdaToFunctionPointerConversion(
 
   CXXRecordDecl *Lambda = Conv->getParent();
   FunctionDecl *CallOp = Lambda->getLambdaCallOperator();
-  FunctionDecl *Invoker = Lambda->getLambdaStaticInvoker(CC);
+  FunctionDecl *Invoker =
+      CallOp->isStatic() ? CallOp : Lambda->getLambdaStaticInvoker(CC);
 
   if (auto *TemplateArgs = Conv->getTemplateSpecializationArgs()) {
     CallOp = InstantiateFunctionDeclaration(
@@ -15190,10 +15445,13 @@ void Sema::DefineImplicitLambdaToFunctionPointerConversion(
     if (!CallOp)
       return;
 
-    Invoker = InstantiateFunctionDeclaration(
-        Invoker->getDescribedFunctionTemplate(), TemplateArgs, CurrentLocation);
-    if (!Invoker)
-      return;
+    if (CallOp != Invoker) {
+      Invoker = InstantiateFunctionDeclaration(
+          Invoker->getDescribedFunctionTemplate(), TemplateArgs,
+          CurrentLocation);
+      if (!Invoker)
+        return;
+    }
   }
 
   if (CallOp->isInvalidDecl())
@@ -15206,36 +15464,35 @@ void Sema::DefineImplicitLambdaToFunctionPointerConversion(
   // to the PendingInstantiations.
   MarkFunctionReferenced(CurrentLocation, CallOp);
 
-  // Fill in the __invoke function with a dummy implementation. IR generation
-  // will fill in the actual details. Update its type in case it contained
-  // an 'auto'.
-  Invoker->markUsed(Context);
-  Invoker->setReferenced();
-  Invoker->setType(Conv->getReturnType()->getPointeeType());
-  Invoker->setBody(new (Context) CompoundStmt(Conv->getLocation()));
+  if (Invoker != CallOp) {
+    // Fill in the __invoke function with a dummy implementation. IR generation
+    // will fill in the actual details. Update its type in case it contained
+    // an 'auto'.
+    Invoker->markUsed(Context);
+    Invoker->setReferenced();
+    Invoker->setType(Conv->getReturnType()->getPointeeType());
+    Invoker->setBody(new (Context) CompoundStmt(Conv->getLocation()));
+  }
 
   // Construct the body of the conversion function { return __invoke; }.
-  Expr *FunctionRef = BuildDeclRefExpr(Invoker, Invoker->getType(),
-                                       VK_LValue, Conv->getLocation());
+  Expr *FunctionRef = BuildDeclRefExpr(Invoker, Invoker->getType(), VK_LValue,
+                                       Conv->getLocation());
   assert(FunctionRef && "Can't refer to __invoke function?");
   Stmt *Return = BuildReturnStmt(Conv->getLocation(), FunctionRef).get();
-  Conv->setBody(CompoundStmt::Create(Context, Return, Conv->getLocation(),
-                                     Conv->getLocation()));
+  Conv->setBody(CompoundStmt::Create(Context, Return, FPOptionsOverride(),
+                                     Conv->getLocation(), Conv->getLocation()));
   Conv->markUsed(Context);
   Conv->setReferenced();
 
   if (ASTMutationListener *L = getASTMutationListener()) {
     L->CompletedImplicitDefinition(Conv);
-    L->CompletedImplicitDefinition(Invoker);
+    if (Invoker != CallOp)
+      L->CompletedImplicitDefinition(Invoker);
   }
 }
 
-
-
 void Sema::DefineImplicitLambdaToBlockPointerConversion(
-       SourceLocation CurrentLocation,
-       CXXConversionDecl *Conv)
-{
+    SourceLocation CurrentLocation, CXXConversionDecl *Conv) {
   assert(!Conv->getParent()->isGenericLambda());
 
   SynthesizedFunctionScope Scope(*this, Conv);
@@ -15274,8 +15531,8 @@ void Sema::DefineImplicitLambdaToBlockPointerConversion(
 
   // Set the body of the conversion function.
   Stmt *ReturnS = Return.get();
-  Conv->setBody(CompoundStmt::Create(Context, ReturnS, Conv->getLocation(),
-                                     Conv->getLocation()));
+  Conv->setBody(CompoundStmt::Create(Context, ReturnS, FPOptionsOverride(),
+                                     Conv->getLocation(), Conv->getLocation()));
   Conv->markUsed(Context);
 
   // We're done; notify the mutation listener, if any.
@@ -15295,7 +15552,7 @@ static bool hasOneRealArgument(MultiExprArg Args) {
     if (!Args[1]->isDefaultArgument())
       return false;
 
-    LLVM_FALLTHROUGH;
+    [[fallthrough]];
   case 1:
     return !Args[0]->isDefaultArgument();
   }
@@ -15364,7 +15621,10 @@ Sema::BuildCXXConstructExpr(SourceLocation ConstructLoc, QualType DeclInitType,
                             SourceRange ParenRange) {
   if (auto *Shadow = dyn_cast<ConstructorUsingShadowDecl>(FoundDecl)) {
     Constructor = findInheritingConstructor(ConstructLoc, Constructor, Shadow);
-    if (DiagnoseUseOfDecl(Constructor, ConstructLoc))
+    // The only way to get here is if we did overlaod resolution to find the
+    // shadow decl, so we don't need to worry about re-checking the trailing
+    // requires clause.
+    if (DiagnoseUseOfOverloadedDecl(Constructor, ConstructLoc))
       return ExprError();
   }
 
@@ -15408,74 +15668,10 @@ Sema::BuildCXXConstructExpr(SourceLocation ConstructLoc, QualType DeclInitType,
       Constructor);
 }
 
-ExprResult Sema::BuildCXXDefaultInitExpr(SourceLocation Loc, FieldDecl *Field) {
-  assert(Field->hasInClassInitializer());
-
-  // If we already have the in-class initializer nothing needs to be done.
-  if (Field->getInClassInitializer())
-    return CXXDefaultInitExpr::Create(Context, Loc, Field, CurContext);
-
-  // If we might have already tried and failed to instantiate, don't try again.
-  if (Field->isInvalidDecl())
-    return ExprError();
-
-  // Maybe we haven't instantiated the in-class initializer. Go check the
-  // pattern FieldDecl to see if it has one.
-  CXXRecordDecl *ParentRD = cast<CXXRecordDecl>(Field->getParent());
-
-  if (isTemplateInstantiation(ParentRD->getTemplateSpecializationKind())) {
-    CXXRecordDecl *ClassPattern = ParentRD->getTemplateInstantiationPattern();
-    DeclContext::lookup_result Lookup =
-        ClassPattern->lookup(Field->getDeclName());
-
-    FieldDecl *Pattern = nullptr;
-    for (auto L : Lookup) {
-      if (isa<FieldDecl>(L)) {
-        Pattern = cast<FieldDecl>(L);
-        break;
-      }
-    }
-    assert(Pattern && "We must have set the Pattern!");
-
-    if (!Pattern->hasInClassInitializer() ||
-        InstantiateInClassInitializer(Loc, Field, Pattern,
-                                      getTemplateInstantiationArgs(Field))) {
-      // Don't diagnose this again.
-      Field->setInvalidDecl();
-      return ExprError();
-    }
-    return CXXDefaultInitExpr::Create(Context, Loc, Field, CurContext);
-  }
-
-  // DR1351:
-  //   If the brace-or-equal-initializer of a non-static data member
-  //   invokes a defaulted default constructor of its class or of an
-  //   enclosing class in a potentially evaluated subexpression, the
-  //   program is ill-formed.
-  //
-  // This resolution is unworkable: the exception specification of the
-  // default constructor can be needed in an unevaluated context, in
-  // particular, in the operand of a noexcept-expression, and we can be
-  // unable to compute an exception specification for an enclosed class.
-  //
-  // Any attempt to resolve the exception specification of a defaulted default
-  // constructor before the initializer is lexically complete will ultimately
-  // come here at which point we can diagnose it.
-  RecordDecl *OutermostClass = ParentRD->getOuterLexicalRecordContext();
-  Diag(Loc, diag::err_default_member_initializer_not_yet_parsed)
-      << OutermostClass << Field;
-  Diag(Field->getEndLoc(),
-       diag::note_default_member_initializer_not_yet_parsed);
-  // Recover by marking the field invalid, unless we're in a SFINAE context.
-  if (!isSFINAEContext())
-    Field->setInvalidDecl();
-  return ExprError();
-}
-
 void Sema::FinalizeVarWithDestructor(VarDecl *VD, const RecordType *Record) {
   if (VD->isInvalidDecl()) return;
   // If initializing the variable failed, don't also diagnose problems with
-  // the desctructor, they're likely related.
+  // the destructor, they're likely related.
   if (VD->getInit() && VD->getInit()->containsErrors())
     return;
 
@@ -15556,19 +15752,16 @@ bool Sema::CompleteConstructorCall(CXXConstructorDecl *Constructor,
   VariadicCallType CallType =
     Proto->isVariadic() ? VariadicConstructor : VariadicDoesNotApply;
   SmallVector<Expr *, 8> AllArgs;
-  bool Invalid = GatherArgumentsForCall(Loc, Constructor,
-                                        Proto, 0,
-                                        llvm::makeArrayRef(Args, NumArgs),
-                                        AllArgs,
-                                        CallType, AllowExplicit,
-                                        IsListInitialization);
+  bool Invalid = GatherArgumentsForCall(
+      Loc, Constructor, Proto, 0, llvm::ArrayRef(Args, NumArgs), AllArgs,
+      CallType, AllowExplicit, IsListInitialization);
   ConvertedArgs.append(AllArgs.begin(), AllArgs.end());
 
   DiagnoseSentinelCalls(Constructor, Loc, AllArgs);
 
   CheckConstructorCall(Constructor, DeclInitType,
-                       llvm::makeArrayRef(AllArgs.data(), AllArgs.size()),
-                       Proto, Loc);
+                       llvm::ArrayRef(AllArgs.data(), AllArgs.size()), Proto,
+                       Loc);
 
   return Invalid;
 }
@@ -15767,18 +15960,28 @@ bool Sema::CheckOverloadedOperatorDeclaration(FunctionDecl *FnDecl) {
   if (Op == OO_New || Op == OO_Array_New)
     return CheckOperatorNewDeclaration(*this, FnDecl);
 
-  // C++ [over.oper]p6:
-  //   An operator function shall either be a non-static member
-  //   function or be a non-member function and have at least one
-  //   parameter whose type is a class, a reference to a class, an
-  //   enumeration, or a reference to an enumeration.
+  // C++ [over.oper]p7:
+  //   An operator function shall either be a member function or
+  //   be a non-member function and have at least one parameter
+  //   whose type is a class, a reference to a class, an enumeration,
+  //   or a reference to an enumeration.
+  // Note: Before C++23, a member function could not be static. The only member
+  //       function allowed to be static is the call operator function.
   if (CXXMethodDecl *MethodDecl = dyn_cast<CXXMethodDecl>(FnDecl)) {
-    if (MethodDecl->isStatic())
-      return Diag(FnDecl->getLocation(),
-                  diag::err_operator_overload_static) << FnDecl->getDeclName();
+    if (MethodDecl->isStatic()) {
+      if (Op == OO_Call || Op == OO_Subscript)
+        Diag(FnDecl->getLocation(),
+             (LangOpts.CPlusPlus2b
+                  ? diag::warn_cxx20_compat_operator_overload_static
+                  : diag::ext_operator_overload_static))
+            << FnDecl;
+      else
+        return Diag(FnDecl->getLocation(), diag::err_operator_overload_static)
+               << FnDecl;
+    }
   } else {
     bool ClassOrEnumParam = false;
-    for (auto Param : FnDecl->parameters()) {
+    for (auto *Param : FnDecl->parameters()) {
       QualType ParamType = Param->getType().getNonReferenceType();
       if (ParamType->isDependentType() || ParamType->isRecordType() ||
           ParamType->isEnumeralType()) {
@@ -15797,14 +16000,29 @@ bool Sema::CheckOverloadedOperatorDeclaration(FunctionDecl *FnDecl) {
   //   An operator function cannot have default arguments (8.3.6),
   //   except where explicitly stated below.
   //
-  // Only the function-call operator allows default arguments
-  // (C++ [over.call]p1).
+  // Only the function-call operator (C++ [over.call]p1) and the subscript
+  // operator (CWG2507) allow default arguments.
   if (Op != OO_Call) {
-    for (auto Param : FnDecl->parameters()) {
-      if (Param->hasDefaultArg())
-        return Diag(Param->getLocation(),
+    ParmVarDecl *FirstDefaultedParam = nullptr;
+    for (auto *Param : FnDecl->parameters()) {
+      if (Param->hasDefaultArg()) {
+        FirstDefaultedParam = Param;
+        break;
+      }
+    }
+    if (FirstDefaultedParam) {
+      if (Op == OO_Subscript) {
+        Diag(FnDecl->getLocation(), LangOpts.CPlusPlus2b
+                                        ? diag::ext_subscript_overload
+                                        : diag::error_subscript_overload)
+            << FnDecl->getDeclName() << 1
+            << FirstDefaultedParam->getDefaultArgRange();
+      } else {
+        return Diag(FirstDefaultedParam->getLocation(),
                     diag::err_operator_overload_default_arg)
-          << FnDecl->getDeclName() << Param->getDefaultArgRange();
+               << FnDecl->getDeclName()
+               << FirstDefaultedParam->getDefaultArgRange();
+      }
     }
   }
 
@@ -15825,10 +16043,10 @@ bool Sema::CheckOverloadedOperatorDeclaration(FunctionDecl *FnDecl) {
   //   described in the rest of this subclause.
   unsigned NumParams = FnDecl->getNumParams()
                      + (isa<CXXMethodDecl>(FnDecl)? 1 : 0);
-  if (Op != OO_Call &&
+  if (Op != OO_Call && Op != OO_Subscript &&
       ((NumParams == 1 && !CanBeUnaryOperator) ||
-       (NumParams == 2 && !CanBeBinaryOperator) ||
-       (NumParams < 1) || (NumParams > 2))) {
+       (NumParams == 2 && !CanBeBinaryOperator) || (NumParams < 1) ||
+       (NumParams > 2))) {
     // We have the wrong number of parameters.
     unsigned ErrorKind;
     if (CanBeUnaryOperator && CanBeBinaryOperator) {
@@ -15840,19 +16058,26 @@ bool Sema::CheckOverloadedOperatorDeclaration(FunctionDecl *FnDecl) {
              "All non-call overloaded operators are unary or binary!");
       ErrorKind = 1;  // 1 -> binary
     }
-
     return Diag(FnDecl->getLocation(), diag::err_operator_overload_must_be)
       << FnDecl->getDeclName() << NumParams << ErrorKind;
   }
 
-  // Overloaded operators other than operator() cannot be variadic.
+  if (Op == OO_Subscript && NumParams != 2) {
+    Diag(FnDecl->getLocation(), LangOpts.CPlusPlus2b
+                                    ? diag::ext_subscript_overload
+                                    : diag::error_subscript_overload)
+        << FnDecl->getDeclName() << (NumParams == 1 ? 0 : 2);
+  }
+
+  // Overloaded operators other than operator() and operator[] cannot be
+  // variadic.
   if (Op != OO_Call &&
       FnDecl->getType()->castAs<FunctionProtoType>()->isVariadic()) {
     return Diag(FnDecl->getLocation(), diag::err_operator_overload_variadic)
-      << FnDecl->getDeclName();
+           << FnDecl->getDeclName();
   }
 
-  // Some operators must be non-static member functions.
+  // Some operators must be member functions.
   if (MustBeMemberOperator && !isa<CXXMethodDecl>(FnDecl)) {
     return Diag(FnDecl->getLocation(),
                 diag::err_operator_overload_must_be_member)
@@ -15905,7 +16130,7 @@ checkLiteralOperatorTemplateParameterList(Sema &SemaRef,
     //
     // As a DR resolution, we also allow placeholders for deduced class
     // template specializations.
-    if (SemaRef.getLangOpts().CPlusPlus20 &&
+    if (SemaRef.getLangOpts().CPlusPlus20 && PmDecl &&
         !PmDecl->isTemplateParameterPack() &&
         (PmDecl->getType()->isRecordType() ||
          PmDecl->getType()->getAs<DeducedTemplateSpecializationType>()))
@@ -16085,7 +16310,7 @@ bool Sema::CheckLiteralOperatorDeclaration(FunctionDecl *FnDecl) {
 
   // A parameter-declaration-clause containing a default argument is not
   // equivalent to any of the permitted forms.
-  for (auto Param : FnDecl->parameters()) {
+  for (auto *Param : FnDecl->parameters()) {
     if (Param->hasDefaultArg()) {
       Diag(Param->getDefaultArgRange().getBegin(),
            diag::err_literal_operator_default_argument)
@@ -16118,7 +16343,7 @@ Decl *Sema::ActOnStartLinkageSpecification(Scope *S, SourceLocation ExternLoc,
                                            Expr *LangStr,
                                            SourceLocation LBraceLoc) {
   StringLiteral *Lit = cast<StringLiteral>(LangStr);
-  if (!Lit->isAscii()) {
+  if (!Lit->isOrdinary()) {
     Diag(LangStr->getExprLoc(), diag::err_language_linkage_spec_not_ascii)
       << LangStr->getSourceRange();
     return nullptr;
@@ -16141,6 +16366,28 @@ Decl *Sema::ActOnStartLinkageSpecification(Scope *S, SourceLocation ExternLoc,
   LinkageSpecDecl *D = LinkageSpecDecl::Create(Context, CurContext, ExternLoc,
                                                LangStr->getExprLoc(), Language,
                                                LBraceLoc.isValid());
+
+  /// C++ [module.unit]p7.2.3
+  /// - Otherwise, if the declaration
+  ///   - ...
+  ///   - ...
+  ///   - appears within a linkage-specification,
+  ///   it is attached to the global module.
+  ///
+  /// If the declaration is already in global module fragment, we don't
+  /// need to attach it again.
+  if (getLangOpts().CPlusPlusModules && isCurrentModulePurview()) {
+    Module *GlobalModule =
+        PushGlobalModuleFragment(ExternLoc, /*IsImplicit=*/true);
+    /// According to [module.reach]p3.2,
+    /// The declaration in global module fragment is reachable if it is not
+    /// discarded. And the discarded declaration should be deleted. So it
+    /// doesn't matter mark the declaration in global module fragment as
+    /// reachable here.
+    D->setModuleOwnershipKind(Decl::ModuleOwnershipKind::ReachableWhenImported);
+    D->setLocalOwningModule(GlobalModule);
+  }
+
   CurContext->addDecl(D);
   PushDeclContext(S, D);
   return D;
@@ -16157,6 +16404,14 @@ Decl *Sema::ActOnFinishLinkageSpecification(Scope *S,
     LinkageSpecDecl* LSDecl = cast<LinkageSpecDecl>(LinkageSpec);
     LSDecl->setRBraceLoc(RBraceLoc);
   }
+
+  // If the current module doesn't has Parent, it implies that the
+  // LinkageSpec isn't in the module created by itself. So we don't
+  // need to pop it.
+  if (getLangOpts().CPlusPlusModules && getCurrentModule() &&
+      getCurrentModule()->isGlobalModule() && getCurrentModule()->Parent)
+    PopGlobalModuleFragment();
+
   PopDeclContext();
   return LinkageSpec;
 }
@@ -16373,6 +16628,137 @@ Decl *Sema::ActOnStaticAssertDeclaration(SourceLocation StaticAssertLoc,
                                       AssertMessage, RParenLoc, false);
 }
 
+/// Convert \V to a string we can present to the user in a diagnostic
+/// \T is the type of the expression that has been evaluated into \V
+static bool ConvertAPValueToString(const APValue &V, QualType T,
+                                   SmallVectorImpl<char> &Str) {
+  if (!V.hasValue())
+    return false;
+
+  switch (V.getKind()) {
+  case APValue::ValueKind::Int:
+    if (T->isBooleanType()) {
+      // Bools are reduced to ints during evaluation, but for
+      // diagnostic purposes we want to print them as
+      // true or false.
+      int64_t BoolValue = V.getInt().getExtValue();
+      assert((BoolValue == 0 || BoolValue == 1) &&
+             "Bool type, but value is not 0 or 1");
+      llvm::raw_svector_ostream OS(Str);
+      OS << (BoolValue ? "true" : "false");
+    } else if (T->isCharType()) {
+      // Same is true for chars.
+      Str.push_back('\'');
+      Str.push_back(V.getInt().getExtValue());
+      Str.push_back('\'');
+    } else
+      V.getInt().toString(Str);
+
+    break;
+
+  case APValue::ValueKind::Float:
+    V.getFloat().toString(Str);
+    break;
+
+  case APValue::ValueKind::LValue:
+    if (V.isNullPointer()) {
+      llvm::raw_svector_ostream OS(Str);
+      OS << "nullptr";
+    } else
+      return false;
+    break;
+
+  case APValue::ValueKind::ComplexFloat: {
+    llvm::raw_svector_ostream OS(Str);
+    OS << '(';
+    V.getComplexFloatReal().toString(Str);
+    OS << " + ";
+    V.getComplexFloatImag().toString(Str);
+    OS << "i)";
+  } break;
+
+  case APValue::ValueKind::ComplexInt: {
+    llvm::raw_svector_ostream OS(Str);
+    OS << '(';
+    V.getComplexIntReal().toString(Str);
+    OS << " + ";
+    V.getComplexIntImag().toString(Str);
+    OS << "i)";
+  } break;
+
+  default:
+    return false;
+  }
+
+  return true;
+}
+
+/// Some Expression types are not useful to print notes about,
+/// e.g. literals and values that have already been expanded
+/// before such as int-valued template parameters.
+static bool UsefulToPrintExpr(const Expr *E) {
+  E = E->IgnoreParenImpCasts();
+  // Literals are pretty easy for humans to understand.
+  if (isa<IntegerLiteral, FloatingLiteral, CharacterLiteral, CXXBoolLiteralExpr,
+          CXXNullPtrLiteralExpr, FixedPointLiteral, ImaginaryLiteral>(E))
+    return false;
+
+  // These have been substituted from template parameters
+  // and appear as literals in the static assert error.
+  if (isa<SubstNonTypeTemplateParmExpr>(E))
+    return false;
+
+  // -5 is also simple to understand.
+  if (const auto *UnaryOp = dyn_cast<UnaryOperator>(E))
+    return UsefulToPrintExpr(UnaryOp->getSubExpr());
+
+  // Ignore nested binary operators. This could be a FIXME for improvements
+  // to the diagnostics in the future.
+  if (isa<BinaryOperator>(E))
+    return false;
+
+  return true;
+}
+
+/// Try to print more useful information about a failed static_assert
+/// with expression \E
+void Sema::DiagnoseStaticAssertDetails(const Expr *E) {
+  if (const auto *Op = dyn_cast<BinaryOperator>(E)) {
+    const Expr *LHS = Op->getLHS()->IgnoreParenImpCasts();
+    const Expr *RHS = Op->getRHS()->IgnoreParenImpCasts();
+
+    // Ignore comparisons of boolean expressions with a boolean literal.
+    if ((isa<CXXBoolLiteralExpr>(LHS) && RHS->getType()->isBooleanType()) ||
+        (isa<CXXBoolLiteralExpr>(RHS) && LHS->getType()->isBooleanType()))
+      return;
+
+    // Don't print obvious expressions.
+    if (!UsefulToPrintExpr(LHS) && !UsefulToPrintExpr(RHS))
+      return;
+
+    struct {
+      const clang::Expr *Cond;
+      Expr::EvalResult Result;
+      SmallString<12> ValueString;
+      bool Print;
+    } DiagSide[2] = {{LHS, Expr::EvalResult(), {}, false},
+                     {RHS, Expr::EvalResult(), {}, false}};
+    for (unsigned I = 0; I < 2; I++) {
+      const Expr *Side = DiagSide[I].Cond;
+
+      Side->EvaluateAsRValue(DiagSide[I].Result, Context, true);
+
+      DiagSide[I].Print = ConvertAPValueToString(
+          DiagSide[I].Result.Val, Side->getType(), DiagSide[I].ValueString);
+    }
+    if (DiagSide[0].Print && DiagSide[1].Print) {
+      Diag(Op->getExprLoc(), diag::note_expr_evaluates_to)
+          << DiagSide[0].ValueString << Op->getOpcodeStr()
+          << DiagSide[1].ValueString << Op->getSourceRange();
+    }
+  }
+}
+
 Decl *Sema::BuildStaticAssertDeclaration(SourceLocation StaticAssertLoc,
                                          Expr *AssertExpr,
                                          StringLiteral *AssertMessage,
@@ -16397,17 +16783,32 @@ Decl *Sema::BuildStaticAssertDeclaration(SourceLocation StaticAssertLoc,
       AssertExpr = FullAssertExpr.get();
 
     llvm::APSInt Cond;
+    Expr *BaseExpr = AssertExpr;
+    AllowFoldKind FoldKind = NoFold;
+
+    if (!getLangOpts().CPlusPlus) {
+      // In C mode, allow folding as an extension for better compatibility with
+      // C++ in terms of expressions like static_assert("test") or
+      // static_assert(nullptr).
+      FoldKind = AllowFold;
+    }
+
     if (!Failed && VerifyIntegerConstantExpression(
-                       AssertExpr, &Cond,
-                       diag::err_static_assert_expression_is_not_constant)
-                       .isInvalid())
+                       BaseExpr, &Cond,
+                       diag::err_static_assert_expression_is_not_constant,
+                       FoldKind).isInvalid())
       Failed = true;
 
     if (!Failed && !Cond) {
       SmallString<256> MsgBuffer;
       llvm::raw_svector_ostream Msg(MsgBuffer);
-      if (AssertMessage)
-        AssertMessage->printPretty(Msg, nullptr, getPrintingPolicy());
+      if (AssertMessage) {
+        const auto *MsgStr = cast<StringLiteral>(AssertMessage);
+        if (MsgStr->isOrdinary())
+          Msg << MsgStr->getString();
+        else
+          MsgStr->printPretty(Msg, nullptr, getPrintingPolicy());
+      }
 
       Expr *InnerCond = nullptr;
       std::string InnerCondDescription;
@@ -16426,6 +16827,7 @@ Decl *Sema::BuildStaticAssertDeclaration(SourceLocation StaticAssertLoc,
         Diag(StaticAssertLoc, diag::err_static_assert_requirement_failed)
           << InnerCondDescription << !AssertMessage
           << Msg.str() << InnerCond->getSourceRange();
+        DiagnoseStaticAssertDetails(InnerCond);
       } else {
         Diag(StaticAssertLoc, diag::err_static_assert_failed)
           << !AssertMessage << Msg.str() << AssertExpr->getSourceRange();
@@ -16459,7 +16861,7 @@ FriendDecl *Sema::CheckFriendTypeDecl(SourceLocation LocStart,
   assert(TSInfo && "NULL TypeSourceInfo for friend type declaration");
 
   QualType T = TSInfo->getType();
-  SourceRange TypeRange = TSInfo->getTypeLoc().getLocalSourceRange();
+  SourceRange TypeRange = TSInfo->getTypeLoc().getSourceRange();
 
   // C++03 [class.friend]p2:
   //   An elaborated-type-specifier shall be used in a friend declaration
@@ -16525,12 +16927,10 @@ FriendDecl *Sema::CheckFriendTypeDecl(SourceLocation LocStart,
 
 /// Handle a friend tag declaration where the scope specifier was
 /// templated.
-Decl *Sema::ActOnTemplatedFriendTag(Scope *S, SourceLocation FriendLoc,
-                                    unsigned TagSpec, SourceLocation TagLoc,
-                                    CXXScopeSpec &SS, IdentifierInfo *Name,
-                                    SourceLocation NameLoc,
-                                    const ParsedAttributesView &Attr,
-                                    MultiTemplateParamsArg TempParamLists) {
+DeclResult Sema::ActOnTemplatedFriendTag(
+    Scope *S, SourceLocation FriendLoc, unsigned TagSpec, SourceLocation TagLoc,
+    CXXScopeSpec &SS, IdentifierInfo *Name, SourceLocation NameLoc,
+    const ParsedAttributesView &Attr, MultiTemplateParamsArg TempParamLists) {
   TagTypeKind Kind = TypeWithKeyword::getTagTypeKindForTypeSpec(TagSpec);
 
   bool IsMemberSpecialization = false;
@@ -16543,7 +16943,7 @@ Decl *Sema::ActOnTemplatedFriendTag(Scope *S, SourceLocation FriendLoc,
     if (TemplateParams->size() > 0) {
       // This is a declaration of a class template.
       if (Invalid)
-        return nullptr;
+        return true;
 
       return CheckClassTemplate(S, TagSpec, TUK_Friend, TagLoc, SS, Name,
                                 NameLoc, Attr, TemplateParams, AS_public,
@@ -16558,7 +16958,7 @@ Decl *Sema::ActOnTemplatedFriendTag(Scope *S, SourceLocation FriendLoc,
     }
   }
 
-  if (Invalid) return nullptr;
+  if (Invalid) return true;
 
   bool isAllExplicitSpecializations = true;
   for (unsigned I = TempParamLists.size(); I-- > 0; ) {
@@ -16577,15 +16977,15 @@ Decl *Sema::ActOnTemplatedFriendTag(Scope *S, SourceLocation FriendLoc,
     if (SS.isEmpty()) {
       bool Owned = false;
       bool IsDependent = false;
-      return ActOnTag(S, TagSpec, TUK_Friend, TagLoc, SS, Name, NameLoc,
-                      Attr, AS_public,
+      return ActOnTag(S, TagSpec, TUK_Friend, TagLoc, SS, Name, NameLoc, Attr,
+                      AS_public,
                       /*ModulePrivateLoc=*/SourceLocation(),
                       MultiTemplateParamsArg(), Owned, IsDependent,
                       /*ScopedEnumKWLoc=*/SourceLocation(),
                       /*ScopedEnumUsesClassTag=*/false,
                       /*UnderlyingType=*/TypeResult(),
                       /*IsTypeSpecifier=*/false,
-                      /*IsTemplateParamOrArg=*/false);
+                      /*IsTemplateParamOrArg=*/false, /*OOK=*/OOK_Outside);
     }
 
     NestedNameSpecifierLoc QualifierLoc = SS.getWithLocInContext(Context);
@@ -16594,7 +16994,7 @@ Decl *Sema::ActOnTemplatedFriendTag(Scope *S, SourceLocation FriendLoc,
     QualType T = CheckTypenameType(Keyword, TagLoc, QualifierLoc,
                                    *Name, NameLoc);
     if (T.isNull())
-      return nullptr;
+      return true;
 
     TypeSourceInfo *TSI = Context.CreateTypeSourceInfo(T);
     if (isa<DependentNameType>(T)) {
@@ -16692,7 +17092,8 @@ Decl *Sema::ActOnFriendTypeDecl(Scope *S, const DeclSpec &DS,
   // Try to convert the decl specifier to a type.  This works for
   // friend templates because ActOnTag never produces a ClassTemplateDecl
   // for a TUK_Friend.
-  Declarator TheDeclarator(DS, DeclaratorContext::Member);
+  Declarator TheDeclarator(DS, ParsedAttributesView::none(),
+                           DeclaratorContext::Member);
   TypeSourceInfo *TSI = GetTypeForDeclarator(TheDeclarator, S);
   QualType T = TSI->getType();
   if (TheDeclarator.isInvalidType())
@@ -16881,10 +17282,7 @@ NamedDecl *Sema::ActOnFriendFunctionDecl(Scope *S, Declarator &D,
     while (DC->isRecord())
       DC = DC->getParent();
 
-    DeclContext *LookupDC = DC;
-    while (LookupDC->isTransparentContext())
-      LookupDC = LookupDC->getParent();
-
+    DeclContext *LookupDC = DC->getNonTransparentContext();
     while (true) {
       LookupQualifiedName(Previous, LookupDC);
 
@@ -17164,6 +17562,7 @@ void Sema::SetDeclDefaulted(Decl *Dcl, SourceLocation DefaultLoc) {
 
   FD->setDefaulted();
   FD->setExplicitlyDefaulted();
+  FD->setDefaultLoc(DefaultLoc);
 
   // Defer checking functions that are defaulted in a dependent context.
   if (FD->isDependentContext())
@@ -17174,10 +17573,13 @@ void Sema::SetDeclDefaulted(Decl *Dcl, SourceLocation DefaultLoc) {
   // that we've marked it as defaulted.
   FD->setWillHaveBody(false);
 
-  // If this is a comparison's defaulted definition within the record, do
-  // the checking when the record is complete.
-  if (DefKind.isComparison() && isa<CXXRecordDecl>(FD->getLexicalDeclContext()))
-    return;
+  if (DefKind.isComparison()) {
+    // If this comparison's defaulting occurs within the definition of its
+    // lexical class context, we have to do the checking when complete.
+    if (auto const *RD = dyn_cast<CXXRecordDecl>(FD->getLexicalDeclContext()))
+      if (!RD->isCompleteDefinition())
+        return;
+  }
 
   // If this member fn was defaulted on its first declaration, we will have
   // already performed the checking in CheckCompletedCXXClass. Such a
@@ -17200,7 +17602,8 @@ void Sema::SetDeclDefaulted(Decl *Dcl, SourceLocation DefaultLoc) {
   } else {
     auto *MD = cast<CXXMethodDecl>(FD);
 
-    if (CheckExplicitlyDefaultedSpecialMember(MD, DefKind.asSpecialMember()))
+    if (CheckExplicitlyDefaultedSpecialMember(MD, DefKind.asSpecialMember(),
+                                              DefaultLoc))
       MD->setInvalidDecl();
     else
       DefineDefaultedFunction(*this, MD, DefaultLoc);
@@ -17226,6 +17629,21 @@ void Sema::DiagnoseReturnInConstructorExceptionHandler(CXXTryStmt *TryBlock) {
   }
 }
 
+void Sema::SetFunctionBodyKind(Decl *D, SourceLocation Loc,
+                               FnBodyKind BodyKind) {
+  switch (BodyKind) {
+  case FnBodyKind::Delete:
+    SetDeclDeleted(D, Loc);
+    break;
+  case FnBodyKind::Default:
+    SetDeclDefaulted(D, Loc);
+    break;
+  case FnBodyKind::Other:
+    llvm_unreachable(
+        "Parsed function body should be '= delete;' or '= default;'");
+  }
+}
+
 bool Sema::CheckOverridingFunctionAttributes(const CXXMethodDecl *New,
                                              const CXXMethodDecl *Old) {
   const auto *NewFT = New->getType()->castAs<FunctionProtoType>();
@@ -17610,7 +18028,7 @@ bool Sema::DefineUsedVTables() {
       // definition.
       bool IsExplicitInstantiationDeclaration =
           ClassTSK == TSK_ExplicitInstantiationDeclaration;
-      for (auto R : Class->redecls()) {
+      for (auto *R : Class->redecls()) {
         TemplateSpecializationKind TSK
           = cast<CXXRecordDecl>(R)->getTemplateSpecializationKind();
         if (TSK == TSK_ExplicitInstantiationDeclaration)
@@ -17646,16 +18064,12 @@ bool Sema::DefineUsedVTables() {
     // no key function or the key function is inlined. Don't warn in C++ ABIs
     // that lack key functions, since the user won't be able to make one.
     if (Context.getTargetInfo().getCXXABI().hasKeyFunctions() &&
-        Class->isExternallyVisible() && ClassTSK != TSK_ImplicitInstantiation) {
+        Class->isExternallyVisible() && ClassTSK != TSK_ImplicitInstantiation &&
+        ClassTSK != TSK_ExplicitInstantiationDefinition) {
       const FunctionDecl *KeyFunctionDef = nullptr;
       if (!KeyFunction || (KeyFunction->hasBody(KeyFunctionDef) &&
-                           KeyFunctionDef->isInlined())) {
-        Diag(Class->getLocation(),
-             ClassTSK == TSK_ExplicitInstantiationDefinition
-                 ? diag::warn_weak_template_vtable
-                 : diag::warn_weak_vtable)
-            << Class;
-      }
+                           KeyFunctionDef->isInlined()))
+        Diag(Class->getLocation(), diag::warn_weak_vtable) << Class;
     }
   }
   VTableUses.clear();
@@ -17726,9 +18140,9 @@ void Sema::SetIvarInitializers(ObjCImplementationDecl *ObjCImplementation) {
       InitializationKind InitKind =
         InitializationKind::CreateDefault(ObjCImplementation->getLocation());
 
-      InitializationSequence InitSeq(*this, InitEntity, InitKind, None);
+      InitializationSequence InitSeq(*this, InitEntity, InitKind, std::nullopt);
       ExprResult MemberInit =
-        InitSeq.Perform(*this, InitEntity, InitKind, None);
+          InitSeq.Perform(*this, InitEntity, InitKind, std::nullopt);
       MemberInit = MaybeCreateExprWithCleanups(MemberInit);
       // Note, MemberInit could actually come back empty if no initialization
       // is required (e.g., because it would call a trivial default constructor)
@@ -17829,8 +18243,8 @@ void Sema::CheckDelegatingCtorCycles() {
   llvm::SmallPtrSet<CXXConstructorDecl*, 4> Valid, Invalid, Current;
 
   for (DelegatingCtorDeclsType::iterator
-         I = DelegatingCtorDecls.begin(ExternalSource),
-         E = DelegatingCtorDecls.end();
+           I = DelegatingCtorDecls.begin(ExternalSource.get()),
+           E = DelegatingCtorDecls.end();
        I != E; ++I)
     DelegatingCycleHelper(*I, Valid, Invalid, Current, *this);
 
@@ -17920,7 +18334,7 @@ bool Sema::checkThisInStaticMemberFunctionExceptionSpec(CXXMethodDecl *Method) {
   case EST_NoexceptTrue:
     if (!Finder.TraverseStmt(Proto->getNoexceptExpr()))
       return true;
-    LLVM_FALLTHROUGH;
+    [[fallthrough]];
 
   case EST_Dynamic:
     for (const auto &E : Proto->exceptions()) {
@@ -17946,27 +18360,27 @@ bool Sema::checkThisInStaticMemberFunctionAttributes(CXXMethodDecl *Method) {
     else if (const auto *G = dyn_cast<PtGuardedByAttr>(A))
       Arg = G->getArg();
     else if (const auto *AA = dyn_cast<AcquiredAfterAttr>(A))
-      Args = llvm::makeArrayRef(AA->args_begin(), AA->args_size());
+      Args = llvm::ArrayRef(AA->args_begin(), AA->args_size());
     else if (const auto *AB = dyn_cast<AcquiredBeforeAttr>(A))
-      Args = llvm::makeArrayRef(AB->args_begin(), AB->args_size());
+      Args = llvm::ArrayRef(AB->args_begin(), AB->args_size());
     else if (const auto *ETLF = dyn_cast<ExclusiveTrylockFunctionAttr>(A)) {
       Arg = ETLF->getSuccessValue();
-      Args = llvm::makeArrayRef(ETLF->args_begin(), ETLF->args_size());
+      Args = llvm::ArrayRef(ETLF->args_begin(), ETLF->args_size());
     } else if (const auto *STLF = dyn_cast<SharedTrylockFunctionAttr>(A)) {
       Arg = STLF->getSuccessValue();
-      Args = llvm::makeArrayRef(STLF->args_begin(), STLF->args_size());
+      Args = llvm::ArrayRef(STLF->args_begin(), STLF->args_size());
     } else if (const auto *LR = dyn_cast<LockReturnedAttr>(A))
       Arg = LR->getArg();
     else if (const auto *LE = dyn_cast<LocksExcludedAttr>(A))
-      Args = llvm::makeArrayRef(LE->args_begin(), LE->args_size());
+      Args = llvm::ArrayRef(LE->args_begin(), LE->args_size());
     else if (const auto *RC = dyn_cast<RequiresCapabilityAttr>(A))
-      Args = llvm::makeArrayRef(RC->args_begin(), RC->args_size());
+      Args = llvm::ArrayRef(RC->args_begin(), RC->args_size());
     else if (const auto *AC = dyn_cast<AcquireCapabilityAttr>(A))
-      Args = llvm::makeArrayRef(AC->args_begin(), AC->args_size());
+      Args = llvm::ArrayRef(AC->args_begin(), AC->args_size());
     else if (const auto *AC = dyn_cast<TryAcquireCapabilityAttr>(A))
-      Args = llvm::makeArrayRef(AC->args_begin(), AC->args_size());
+      Args = llvm::ArrayRef(AC->args_begin(), AC->args_size());
     else if (const auto *RC = dyn_cast<ReleaseCapabilityAttr>(A))
-      Args = llvm::makeArrayRef(RC->args_begin(), RC->args_size());
+      Args = llvm::ArrayRef(RC->args_begin(), RC->args_size());
 
     if (Arg && !Finder.TraverseStmt(Arg))
       return true;
@@ -18176,8 +18590,7 @@ void Sema::ActOnStartFunctionDeclarationDeclarator(
   }
   if (ExplicitParams) {
     Info.AutoTemplateParameterDepth = ExplicitParams->getDepth();
-    for (NamedDecl *Param : *ExplicitParams)
-      Info.TemplateParams.push_back(Param);
+    llvm::append_range(Info.TemplateParams, *ExplicitParams);
     Info.NumExplicitTemplateParams = ExplicitParams->size();
   } else {
     Info.AutoTemplateParameterDepth = TemplateParameterDepth;
diff --git a/gnu/llvm/clang/lib/StaticAnalyzer/Checkers/Taint.h b/gnu/llvm/clang/lib/StaticAnalyzer/Checkers/Taint.h
deleted file mode 100644
index 659a3c898d5..00000000000
--- a/gnu/llvm/clang/lib/StaticAnalyzer/Checkers/Taint.h
+++ /dev/null
@@ -1,106 +0,0 @@
-//=== Taint.h - Taint tracking and basic propagation rules. --------*- C++ -*-//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// Defines basic, non-domain-specific mechanisms for tracking tainted values.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_CLANG_LIB_STATICANALYZER_CHECKERS_TAINT_H
-#define LLVM_CLANG_LIB_STATICANALYZER_CHECKERS_TAINT_H
-
-#include "clang/StaticAnalyzer/Core/BugReporter/BugReporterVisitors.h"
-#include "clang/StaticAnalyzer/Core/PathSensitive/ProgramState.h"
-
-namespace clang {
-namespace ento {
-namespace taint {
-
-/// The type of taint, which helps to differentiate between different types of
-/// taint.
-using TaintTagType = unsigned;
-
-static constexpr TaintTagType TaintTagGeneric = 0;
-
-/// Create a new state in which the value of the statement is marked as tainted.
-LLVM_NODISCARD ProgramStateRef addTaint(ProgramStateRef State, const Stmt *S,
-                                        const LocationContext *LCtx,
-                                        TaintTagType Kind = TaintTagGeneric);
-
-/// Create a new state in which the value is marked as tainted.
-LLVM_NODISCARD ProgramStateRef addTaint(ProgramStateRef State, SVal V,
-                                        TaintTagType Kind = TaintTagGeneric);
-
-/// Create a new state in which the symbol is marked as tainted.
-LLVM_NODISCARD ProgramStateRef addTaint(ProgramStateRef State, SymbolRef Sym,
-                                        TaintTagType Kind = TaintTagGeneric);
-
-/// Create a new state in which the pointer represented by the region
-/// is marked as tainted.
-LLVM_NODISCARD ProgramStateRef addTaint(ProgramStateRef State,
-                                        const MemRegion *R,
-                                        TaintTagType Kind = TaintTagGeneric);
-
-LLVM_NODISCARD ProgramStateRef removeTaint(ProgramStateRef State, SVal V);
-
-LLVM_NODISCARD ProgramStateRef removeTaint(ProgramStateRef State,
-                                           const MemRegion *R);
-
-LLVM_NODISCARD ProgramStateRef removeTaint(ProgramStateRef State,
-                                           SymbolRef Sym);
-
-/// Create a new state in a which a sub-region of a given symbol is tainted.
-/// This might be necessary when referring to regions that can not have an
-/// individual symbol, e.g. if they are represented by the default binding of
-/// a LazyCompoundVal.
-LLVM_NODISCARD ProgramStateRef addPartialTaint(
-    ProgramStateRef State, SymbolRef ParentSym, const SubRegion *SubRegion,
-    TaintTagType Kind = TaintTagGeneric);
-
-/// Check if the statement has a tainted value in the given state.
-bool isTainted(ProgramStateRef State, const Stmt *S,
-               const LocationContext *LCtx,
-               TaintTagType Kind = TaintTagGeneric);
-
-/// Check if the value is tainted in the given state.
-bool isTainted(ProgramStateRef State, SVal V,
-               TaintTagType Kind = TaintTagGeneric);
-
-/// Check if the symbol is tainted in the given state.
-bool isTainted(ProgramStateRef State, SymbolRef Sym,
-               TaintTagType Kind = TaintTagGeneric);
-
-/// Check if the pointer represented by the region is tainted in the given
-/// state.
-bool isTainted(ProgramStateRef State, const MemRegion *Reg,
-               TaintTagType Kind = TaintTagGeneric);
-
-void printTaint(ProgramStateRef State, raw_ostream &Out, const char *nl = "\n",
-                const char *sep = "");
-
-LLVM_DUMP_METHOD void dumpTaint(ProgramStateRef State);
-
-/// The bug visitor prints a diagnostic message at the location where a given
-/// variable was tainted.
-class TaintBugVisitor final : public BugReporterVisitor {
-private:
-  const SVal V;
-
-public:
-  TaintBugVisitor(const SVal V) : V(V) {}
-  void Profile(llvm::FoldingSetNodeID &ID) const override { ID.Add(V); }
-
-  PathDiagnosticPieceRef VisitNode(const ExplodedNode *N,
-                                   BugReporterContext &BRC,
-                                   PathSensitiveBugReport &BR) override;
-};
-
-} // namespace taint
-} // namespace ento
-} // namespace clang
-
-#endif
diff --git a/gnu/llvm/clang/tools/clang-offload-wrapper/CMakeLists.txt b/gnu/llvm/clang/tools/clang-offload-wrapper/CMakeLists.txt
deleted file mode 100644
index 8bcb46267a3..00000000000
--- a/gnu/llvm/clang/tools/clang-offload-wrapper/CMakeLists.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-set(LLVM_LINK_COMPONENTS BitWriter Core Support TransformUtils)
-
-add_clang_tool(clang-offload-wrapper
-  ClangOffloadWrapper.cpp
-
-  DEPENDS
-  intrinsics_gen
-  )
-
-set(CLANG_OFFLOAD_WRAPPER_LIB_DEPS
-  clangBasic
-  )
-
-add_dependencies(clang clang-offload-wrapper)
-
-clang_target_link_libraries(clang-offload-wrapper
-  PRIVATE
-  ${CLANG_OFFLOAD_WRAPPER_LIB_DEPS}
-  )
diff --git a/gnu/llvm/clang/tools/clang-offload-wrapper/ClangOffloadWrapper.cpp b/gnu/llvm/clang/tools/clang-offload-wrapper/ClangOffloadWrapper.cpp
deleted file mode 100644
index fff12716b6f..00000000000
--- a/gnu/llvm/clang/tools/clang-offload-wrapper/ClangOffloadWrapper.cpp
+++ /dev/null
@@ -1,378 +0,0 @@
-//===-- clang-offload-wrapper/ClangOffloadWrapper.cpp -----------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-///
-/// \file
-/// Implementation of the offload wrapper tool. It takes offload target binaries
-/// as input and creates wrapper bitcode file containing target binaries
-/// packaged as data. Wrapper bitcode also includes initialization code which
-/// registers target binaries in offloading runtime at program startup.
-///
-//===----------------------------------------------------------------------===//
-
-#include "clang/Basic/Version.h"
-#include "llvm/ADT/ArrayRef.h"
-#include "llvm/ADT/Triple.h"
-#include "llvm/Bitcode/BitcodeWriter.h"
-#include "llvm/IR/Constants.h"
-#include "llvm/IR/GlobalVariable.h"
-#include "llvm/IR/IRBuilder.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/IR/Module.h"
-#include "llvm/Support/CommandLine.h"
-#include "llvm/Support/Errc.h"
-#include "llvm/Support/Error.h"
-#include "llvm/Support/ErrorOr.h"
-#include "llvm/Support/FileSystem.h"
-#include "llvm/Support/MemoryBuffer.h"
-#include "llvm/Support/Signals.h"
-#include "llvm/Support/ToolOutputFile.h"
-#include "llvm/Support/WithColor.h"
-#include "llvm/Support/raw_ostream.h"
-#include "llvm/Transforms/Utils/ModuleUtils.h"
-#include <cassert>
-#include <cstdint>
-
-using namespace llvm;
-
-static cl::opt<bool> Help("h", cl::desc("Alias for -help"), cl::Hidden);
-
-// Mark all our options with this category, everything else (except for -version
-// and -help) will be hidden.
-static cl::OptionCategory
-    ClangOffloadWrapperCategory("clang-offload-wrapper options");
-
-static cl::opt<std::string> Output("o", cl::Required,
-                                   cl::desc("Output filename"),
-                                   cl::value_desc("filename"),
-                                   cl::cat(ClangOffloadWrapperCategory));
-
-static cl::list<std::string> Inputs(cl::Positional, cl::OneOrMore,
-                                    cl::desc("<input files>"),
-                                    cl::cat(ClangOffloadWrapperCategory));
-
-static cl::opt<std::string>
-    Target("target", cl::Required,
-           cl::desc("Target triple for the output module"),
-           cl::value_desc("triple"), cl::cat(ClangOffloadWrapperCategory));
-
-namespace {
-
-class BinaryWrapper {
-  LLVMContext C;
-  Module M;
-
-  StructType *EntryTy = nullptr;
-  StructType *ImageTy = nullptr;
-  StructType *DescTy = nullptr;
-
-private:
-  IntegerType *getSizeTTy() {
-    switch (M.getDataLayout().getPointerTypeSize(Type::getInt8PtrTy(C))) {
-    case 4u:
-      return Type::getInt32Ty(C);
-    case 8u:
-      return Type::getInt64Ty(C);
-    }
-    llvm_unreachable("unsupported pointer type size");
-  }
-
-  // struct __tgt_offload_entry {
-  //   void *addr;
-  //   char *name;
-  //   size_t size;
-  //   int32_t flags;
-  //   int32_t reserved;
-  // };
-  StructType *getEntryTy() {
-    if (!EntryTy)
-      EntryTy = StructType::create("__tgt_offload_entry", Type::getInt8PtrTy(C),
-                                   Type::getInt8PtrTy(C), getSizeTTy(),
-                                   Type::getInt32Ty(C), Type::getInt32Ty(C));
-    return EntryTy;
-  }
-
-  PointerType *getEntryPtrTy() { return PointerType::getUnqual(getEntryTy()); }
-
-  // struct __tgt_device_image {
-  //   void *ImageStart;
-  //   void *ImageEnd;
-  //   __tgt_offload_entry *EntriesBegin;
-  //   __tgt_offload_entry *EntriesEnd;
-  // };
-  StructType *getDeviceImageTy() {
-    if (!ImageTy)
-      ImageTy = StructType::create("__tgt_device_image", Type::getInt8PtrTy(C),
-                                   Type::getInt8PtrTy(C), getEntryPtrTy(),
-                                   getEntryPtrTy());
-    return ImageTy;
-  }
-
-  PointerType *getDeviceImagePtrTy() {
-    return PointerType::getUnqual(getDeviceImageTy());
-  }
-
-  // struct __tgt_bin_desc {
-  //   int32_t NumDeviceImages;
-  //   __tgt_device_image *DeviceImages;
-  //   __tgt_offload_entry *HostEntriesBegin;
-  //   __tgt_offload_entry *HostEntriesEnd;
-  // };
-  StructType *getBinDescTy() {
-    if (!DescTy)
-      DescTy = StructType::create("__tgt_bin_desc", Type::getInt32Ty(C),
-                                  getDeviceImagePtrTy(), getEntryPtrTy(),
-                                  getEntryPtrTy());
-    return DescTy;
-  }
-
-  PointerType *getBinDescPtrTy() {
-    return PointerType::getUnqual(getBinDescTy());
-  }
-
-  /// Creates binary descriptor for the given device images. Binary descriptor
-  /// is an object that is passed to the offloading runtime at program startup
-  /// and it describes all device images available in the executable or shared
-  /// library. It is defined as follows
-  ///
-  /// __attribute__((visibility("hidden")))
-  /// extern __tgt_offload_entry *__start_omp_offloading_entries;
-  /// __attribute__((visibility("hidden")))
-  /// extern __tgt_offload_entry *__stop_omp_offloading_entries;
-  ///
-  /// static const char Image0[] = { <Bufs.front() contents> };
-  ///  ...
-  /// static const char ImageN[] = { <Bufs.back() contents> };
-  ///
-  /// static const __tgt_device_image Images[] = {
-  ///   {
-  ///     Image0,                            /*ImageStart*/
-  ///     Image0 + sizeof(Image0),           /*ImageEnd*/
-  ///     __start_omp_offloading_entries,    /*EntriesBegin*/
-  ///     __stop_omp_offloading_entries      /*EntriesEnd*/
-  ///   },
-  ///   ...
-  ///   {
-  ///     ImageN,                            /*ImageStart*/
-  ///     ImageN + sizeof(ImageN),           /*ImageEnd*/
-  ///     __start_omp_offloading_entries,    /*EntriesBegin*/
-  ///     __stop_omp_offloading_entries      /*EntriesEnd*/
-  ///   }
-  /// };
-  ///
-  /// static const __tgt_bin_desc BinDesc = {
-  ///   sizeof(Images) / sizeof(Images[0]),  /*NumDeviceImages*/
-  ///   Images,                              /*DeviceImages*/
-  ///   __start_omp_offloading_entries,      /*HostEntriesBegin*/
-  ///   __stop_omp_offloading_entries        /*HostEntriesEnd*/
-  /// };
-  ///
-  /// Global variable that represents BinDesc is returned.
-  GlobalVariable *createBinDesc(ArrayRef<ArrayRef<char>> Bufs) {
-    // Create external begin/end symbols for the offload entries table.
-    auto *EntriesB = new GlobalVariable(
-        M, getEntryTy(), /*isConstant*/ true, GlobalValue::ExternalLinkage,
-        /*Initializer*/ nullptr, "__start_omp_offloading_entries");
-    EntriesB->setVisibility(GlobalValue::HiddenVisibility);
-    auto *EntriesE = new GlobalVariable(
-        M, getEntryTy(), /*isConstant*/ true, GlobalValue::ExternalLinkage,
-        /*Initializer*/ nullptr, "__stop_omp_offloading_entries");
-    EntriesE->setVisibility(GlobalValue::HiddenVisibility);
-
-    // We assume that external begin/end symbols that we have created above will
-    // be defined by the linker. But linker will do that only if linker inputs
-    // have section with "omp_offloading_entries" name which is not guaranteed.
-    // So, we just create dummy zero sized object in the offload entries section
-    // to force linker to define those symbols.
-    auto *DummyInit =
-        ConstantAggregateZero::get(ArrayType::get(getEntryTy(), 0u));
-    auto *DummyEntry = new GlobalVariable(
-        M, DummyInit->getType(), true, GlobalVariable::ExternalLinkage,
-        DummyInit, "__dummy.omp_offloading.entry");
-    DummyEntry->setSection("omp_offloading_entries");
-    DummyEntry->setVisibility(GlobalValue::HiddenVisibility);
-
-    auto *Zero = ConstantInt::get(getSizeTTy(), 0u);
-    Constant *ZeroZero[] = {Zero, Zero};
-
-    // Create initializer for the images array.
-    SmallVector<Constant *, 4u> ImagesInits;
-    ImagesInits.reserve(Bufs.size());
-    for (ArrayRef<char> Buf : Bufs) {
-      auto *Data = ConstantDataArray::get(C, Buf);
-      auto *Image = new GlobalVariable(M, Data->getType(), /*isConstant*/ true,
-                                       GlobalVariable::InternalLinkage, Data,
-                                       ".omp_offloading.device_image");
-      Image->setUnnamedAddr(GlobalValue::UnnamedAddr::Global);
-
-      auto *Size = ConstantInt::get(getSizeTTy(), Buf.size());
-      Constant *ZeroSize[] = {Zero, Size};
-
-      auto *ImageB = ConstantExpr::getGetElementPtr(Image->getValueType(),
-                                                    Image, ZeroZero);
-      auto *ImageE = ConstantExpr::getGetElementPtr(Image->getValueType(),
-                                                    Image, ZeroSize);
-
-      ImagesInits.push_back(ConstantStruct::get(getDeviceImageTy(), ImageB,
-                                                ImageE, EntriesB, EntriesE));
-    }
-
-    // Then create images array.
-    auto *ImagesData = ConstantArray::get(
-        ArrayType::get(getDeviceImageTy(), ImagesInits.size()), ImagesInits);
-
-    auto *Images =
-        new GlobalVariable(M, ImagesData->getType(), /*isConstant*/ true,
-                           GlobalValue::InternalLinkage, ImagesData,
-                           ".omp_offloading.device_images");
-    Images->setUnnamedAddr(GlobalValue::UnnamedAddr::Global);
-
-    auto *ImagesB = ConstantExpr::getGetElementPtr(Images->getValueType(),
-                                                   Images, ZeroZero);
-
-    // And finally create the binary descriptor object.
-    auto *DescInit = ConstantStruct::get(
-        getBinDescTy(),
-        ConstantInt::get(Type::getInt32Ty(C), ImagesInits.size()), ImagesB,
-        EntriesB, EntriesE);
-
-    return new GlobalVariable(M, DescInit->getType(), /*isConstant*/ true,
-                              GlobalValue::InternalLinkage, DescInit,
-                              ".omp_offloading.descriptor");
-  }
-
-  void createRegisterFunction(GlobalVariable *BinDesc) {
-    auto *FuncTy = FunctionType::get(Type::getVoidTy(C), /*isVarArg*/ false);
-    auto *Func = Function::Create(FuncTy, GlobalValue::InternalLinkage,
-                                  ".omp_offloading.descriptor_reg", &M);
-    Func->setSection(".text.startup");
-
-    // Get __tgt_register_lib function declaration.
-    auto *RegFuncTy = FunctionType::get(Type::getVoidTy(C), getBinDescPtrTy(),
-                                        /*isVarArg*/ false);
-    FunctionCallee RegFuncC =
-        M.getOrInsertFunction("__tgt_register_lib", RegFuncTy);
-
-    // Construct function body
-    IRBuilder<> Builder(BasicBlock::Create(C, "entry", Func));
-    Builder.CreateCall(RegFuncC, BinDesc);
-    Builder.CreateRetVoid();
-
-    // Add this function to constructors.
-    // Set priority to 1 so that __tgt_register_lib is executed AFTER
-    // __tgt_register_requires (we want to know what requirements have been
-    // asked for before we load a libomptarget plugin so that by the time the
-    // plugin is loaded it can report how many devices there are which can
-    // satisfy these requirements).
-    appendToGlobalCtors(M, Func, /*Priority*/ 1);
-  }
-
-  void createUnregisterFunction(GlobalVariable *BinDesc) {
-    auto *FuncTy = FunctionType::get(Type::getVoidTy(C), /*isVarArg*/ false);
-    auto *Func = Function::Create(FuncTy, GlobalValue::InternalLinkage,
-                                  ".omp_offloading.descriptor_unreg", &M);
-    Func->setSection(".text.startup");
-
-    // Get __tgt_unregister_lib function declaration.
-    auto *UnRegFuncTy = FunctionType::get(Type::getVoidTy(C), getBinDescPtrTy(),
-                                          /*isVarArg*/ false);
-    FunctionCallee UnRegFuncC =
-        M.getOrInsertFunction("__tgt_unregister_lib", UnRegFuncTy);
-
-    // Construct function body
-    IRBuilder<> Builder(BasicBlock::Create(C, "entry", Func));
-    Builder.CreateCall(UnRegFuncC, BinDesc);
-    Builder.CreateRetVoid();
-
-    // Add this function to global destructors.
-    // Match priority of __tgt_register_lib
-    appendToGlobalDtors(M, Func, /*Priority*/ 1);
-  }
-
-public:
-  BinaryWrapper(StringRef Target) : M("offload.wrapper.object", C) {
-    M.setTargetTriple(Target);
-  }
-
-  const Module &wrapBinaries(ArrayRef<ArrayRef<char>> Binaries) {
-    GlobalVariable *Desc = createBinDesc(Binaries);
-    assert(Desc && "no binary descriptor");
-    createRegisterFunction(Desc);
-    createUnregisterFunction(Desc);
-    return M;
-  }
-};
-
-} // anonymous namespace
-
-int main(int argc, const char **argv) {
-  sys::PrintStackTraceOnErrorSignal(argv[0]);
-
-  cl::HideUnrelatedOptions(ClangOffloadWrapperCategory);
-  cl::SetVersionPrinter([](raw_ostream &OS) {
-    OS << clang::getClangToolFullVersion("clang-offload-wrapper") << '\n';
-  });
-  cl::ParseCommandLineOptions(
-      argc, argv,
-      "A tool to create a wrapper bitcode for offload target binaries. Takes "
-      "offload\ntarget binaries as input and produces bitcode file containing "
-      "target binaries packaged\nas data and initialization code which "
-      "registers target binaries in offload runtime.\n");
-
-  if (Help) {
-    cl::PrintHelpMessage();
-    return 0;
-  }
-
-  auto reportError = [argv](Error E) {
-    logAllUnhandledErrors(std::move(E), WithColor::error(errs(), argv[0]));
-  };
-
-  if (Triple(Target).getArch() == Triple::UnknownArch) {
-    reportError(createStringError(
-        errc::invalid_argument, "'" + Target + "': unsupported target triple"));
-    return 1;
-  }
-
-  // Read device binaries.
-  SmallVector<std::unique_ptr<MemoryBuffer>, 4u> Buffers;
-  SmallVector<ArrayRef<char>, 4u> Images;
-  Buffers.reserve(Inputs.size());
-  Images.reserve(Inputs.size());
-  for (const std::string &File : Inputs) {
-    ErrorOr<std::unique_ptr<MemoryBuffer>> BufOrErr =
-        MemoryBuffer::getFileOrSTDIN(File);
-    if (!BufOrErr) {
-      reportError(createFileError(File, BufOrErr.getError()));
-      return 1;
-    }
-    const std::unique_ptr<MemoryBuffer> &Buf =
-        Buffers.emplace_back(std::move(*BufOrErr));
-    Images.emplace_back(Buf->getBufferStart(), Buf->getBufferSize());
-  }
-
-  // Create the output file to write the resulting bitcode to.
-  std::error_code EC;
-  ToolOutputFile Out(Output, EC, sys::fs::OF_None);
-  if (EC) {
-    reportError(createFileError(Output, EC));
-    return 1;
-  }
-
-  // Create a wrapper for device binaries and write its bitcode to the file.
-  WriteBitcodeToFile(BinaryWrapper(Target).wrapBinaries(
-                         makeArrayRef(Images.data(), Images.size())),
-                     Out.os());
-  if (Out.os().has_error()) {
-    reportError(createFileError(Output, Out.os().error()));
-    return 1;
-  }
-
-  // Success.
-  Out.keep();
-  return 0;
-}
diff --git a/gnu/llvm/clang/tools/clang-shlib/CMakeLists.txt b/gnu/llvm/clang/tools/clang-shlib/CMakeLists.txt
index de9daba6716..001ed2cc85c 100644
--- a/gnu/llvm/clang/tools/clang-shlib/CMakeLists.txt
+++ b/gnu/llvm/clang/tools/clang-shlib/CMakeLists.txt
@@ -50,6 +50,6 @@ add_clang_library(clang-cpp
                   ${_DEPS})
 # Optimize function calls for default visibility definitions to avoid PLT and
 # reduce dynamic relocations.
-if (NOT APPLE AND NOT MINGW)
+if (NOT APPLE AND NOT MINGW AND ${OPENBSD_LD_IS_LLD})
   target_link_options(clang-cpp PRIVATE LINKER:-Bsymbolic-functions)
 endif()
diff --git a/gnu/llvm/clang/unittests/AST/ASTContextParentMapTest.cpp b/gnu/llvm/clang/unittests/AST/ASTContextParentMapTest.cpp
deleted file mode 100644
index 4d11ef0b796..00000000000
--- a/gnu/llvm/clang/unittests/AST/ASTContextParentMapTest.cpp
+++ /dev/null
@@ -1,123 +0,0 @@
-//===- unittest/AST/ASTContextParentMapTest.cpp - AST parent map test -----===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// Tests for the getParents(...) methods of ASTContext.
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/AST/ASTContext.h"
-#include "MatchVerifier.h"
-#include "clang/ASTMatchers/ASTMatchFinder.h"
-#include "clang/ASTMatchers/ASTMatchers.h"
-#include "clang/Tooling/Tooling.h"
-#include "gtest/gtest.h"
-#include "gmock/gmock.h"
-
-using testing::ElementsAre;
-
-namespace clang {
-namespace ast_matchers {
-
-TEST(GetParents, ReturnsParentForDecl) {
-  MatchVerifier<Decl> Verifier;
-  EXPECT_TRUE(
-      Verifier.match("class C { void f(); };",
-                     cxxMethodDecl(hasParent(recordDecl(hasName("C"))))));
-}
-
-TEST(GetParents, ReturnsParentForStmt) {
-  MatchVerifier<Stmt> Verifier;
-  EXPECT_TRUE(Verifier.match("class C { void f() { if (true) {} } };",
-                             ifStmt(hasParent(compoundStmt()))));
-}
-
-TEST(GetParents, ReturnsParentForTypeLoc) {
-  MatchVerifier<TypeLoc> Verifier;
-  EXPECT_TRUE(
-      Verifier.match("namespace a { class b {}; } void f(a::b) {}",
-                     typeLoc(hasParent(typeLoc(hasParent(functionDecl()))))));
-}
-
-TEST(GetParents, ReturnsParentForNestedNameSpecifierLoc) {
-  MatchVerifier<NestedNameSpecifierLoc> Verifier;
-  EXPECT_TRUE(Verifier.match("namespace a { class b {}; } void f(a::b) {}",
-                             nestedNameSpecifierLoc(hasParent(typeLoc()))));
-}
-
-TEST(GetParents, ReturnsParentInsideTemplateInstantiations) {
-  MatchVerifier<Decl> DeclVerifier;
-  EXPECT_TRUE(DeclVerifier.match(
-      "template<typename T> struct C { void f() {} };"
-      "void g() { C<int> c; c.f(); }",
-      cxxMethodDecl(hasName("f"),
-                 hasParent(cxxRecordDecl(isTemplateInstantiation())))));
-  EXPECT_TRUE(DeclVerifier.match(
-      "template<typename T> struct C { void f() {} };"
-      "void g() { C<int> c; c.f(); }",
-      cxxMethodDecl(hasName("f"),
-                 hasParent(cxxRecordDecl(unless(isTemplateInstantiation()))))));
-  EXPECT_FALSE(DeclVerifier.match(
-      "template<typename T> struct C { void f() {} };"
-      "void g() { C<int> c; c.f(); }",
-      cxxMethodDecl(
-          hasName("f"),
-          allOf(hasParent(cxxRecordDecl(unless(isTemplateInstantiation()))),
-                hasParent(cxxRecordDecl(isTemplateInstantiation()))))));
-}
-
-TEST(GetParents, ReturnsMultipleParentsInTemplateInstantiations) {
-  MatchVerifier<Stmt> TemplateVerifier;
-  EXPECT_TRUE(TemplateVerifier.match(
-      "template<typename T> struct C { void f() {} };"
-      "void g() { C<int> c; c.f(); }",
-      compoundStmt(allOf(
-          hasAncestor(cxxRecordDecl(isTemplateInstantiation())),
-          hasAncestor(cxxRecordDecl(unless(isTemplateInstantiation())))))));
-}
-
-TEST(GetParents, RespectsTraversalScope) {
-  auto AST = tooling::buildASTFromCode(
-      "struct foo { int bar; }; struct baz{};", "foo.cpp",
-      std::make_shared<PCHContainerOperations>());
-  auto &Ctx = AST->getASTContext();
-  auto &TU = *Ctx.getTranslationUnitDecl();
-  auto &Foo = *TU.lookup(&Ctx.Idents.get("foo")).front();
-  auto &Bar = *cast<DeclContext>(Foo).lookup(&Ctx.Idents.get("bar")).front();
-  auto &Baz = *TU.lookup(&Ctx.Idents.get("baz")).front();
-
-  // Initially, scope is the whole TU.
-  EXPECT_THAT(Ctx.getParents(Bar), ElementsAre(DynTypedNode::create(Foo)));
-  EXPECT_THAT(Ctx.getParents(Foo), ElementsAre(DynTypedNode::create(TU)));
-  EXPECT_THAT(Ctx.getParents(Baz), ElementsAre(DynTypedNode::create(TU)));
-
-  // Restrict the scope, now some parents are gone.
-  Ctx.setTraversalScope({&Foo});
-  EXPECT_THAT(Ctx.getParents(Bar), ElementsAre(DynTypedNode::create(Foo)));
-  EXPECT_THAT(Ctx.getParents(Foo), ElementsAre(DynTypedNode::create(TU)));
-  EXPECT_THAT(Ctx.getParents(Baz), ElementsAre());
-
-  // Reset the scope, we get back the original results.
-  Ctx.setTraversalScope({&TU});
-  EXPECT_THAT(Ctx.getParents(Bar), ElementsAre(DynTypedNode::create(Foo)));
-  EXPECT_THAT(Ctx.getParents(Foo), ElementsAre(DynTypedNode::create(TU)));
-  EXPECT_THAT(Ctx.getParents(Baz), ElementsAre(DynTypedNode::create(TU)));
-}
-
-TEST(GetParents, ImplicitLambdaNodes) {
-  MatchVerifier<Decl> LambdaVerifier;
-  EXPECT_TRUE(LambdaVerifier.match(
-      "auto x = []{int y;};",
-      varDecl(hasName("y"), hasAncestor(functionDecl(
-                                hasOverloadedOperatorName("()"),
-                                hasParent(cxxRecordDecl(
-                                    isImplicit(), hasParent(lambdaExpr())))))),
-      Lang_CXX11));
-}
-
-} // end namespace ast_matchers
-} // end namespace clang
diff --git a/gnu/llvm/clang/unittests/AST/ASTImporterFixtures.cpp b/gnu/llvm/clang/unittests/AST/ASTImporterFixtures.cpp
deleted file mode 100644
index 897b370dd3c..00000000000
--- a/gnu/llvm/clang/unittests/AST/ASTImporterFixtures.cpp
+++ /dev/null
@@ -1,238 +0,0 @@
-//===- unittest/AST/ASTImporterFixtures.cpp - AST unit test support -------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-/// \file
-/// Implementation of fixture classes for testing the ASTImporter.
-//
-//===----------------------------------------------------------------------===//
-
-#include "ASTImporterFixtures.h"
-
-#include "clang/AST/ASTImporter.h"
-#include "clang/AST/ASTImporterSharedState.h"
-#include "clang/Frontend/ASTUnit.h"
-#include "clang/Tooling/Tooling.h"
-
-namespace clang {
-namespace ast_matchers {
-
-void createVirtualFileIfNeeded(ASTUnit *ToAST, StringRef FileName,
-                               std::unique_ptr<llvm::MemoryBuffer> &&Buffer) {
-  assert(ToAST);
-  ASTContext &ToCtx = ToAST->getASTContext();
-  auto *OFS = static_cast<llvm::vfs::OverlayFileSystem *>(
-      &ToCtx.getSourceManager().getFileManager().getVirtualFileSystem());
-  auto *MFS = static_cast<llvm::vfs::InMemoryFileSystem *>(
-      OFS->overlays_begin()->get());
-  MFS->addFile(FileName, 0, std::move(Buffer));
-}
-
-void createVirtualFileIfNeeded(ASTUnit *ToAST, StringRef FileName,
-                               StringRef Code) {
-  return createVirtualFileIfNeeded(ToAST, FileName,
-                                   llvm::MemoryBuffer::getMemBuffer(Code));
-}
-
-ASTImporterTestBase::TU::TU(StringRef Code, StringRef FileName,
-                            std::vector<std::string> Args,
-                            ImporterConstructor C,
-                            ASTImporter::ODRHandlingType ODRHandling)
-    : Code(std::string(Code)), FileName(std::string(FileName)),
-      Unit(tooling::buildASTFromCodeWithArgs(this->Code, Args, this->FileName)),
-      TUDecl(Unit->getASTContext().getTranslationUnitDecl()), Creator(C),
-      ODRHandling(ODRHandling) {
-  Unit->enableSourceFileDiagnostics();
-
-  // If the test doesn't need a specific ASTImporter, we just create a
-  // normal ASTImporter with it.
-  if (!Creator)
-    Creator = [](ASTContext &ToContext, FileManager &ToFileManager,
-                 ASTContext &FromContext, FileManager &FromFileManager,
-                 bool MinimalImport,
-                 const std::shared_ptr<ASTImporterSharedState> &SharedState) {
-      return new ASTImporter(ToContext, ToFileManager, FromContext,
-                             FromFileManager, MinimalImport, SharedState);
-    };
-}
-
-ASTImporterTestBase::TU::~TU() {}
-
-void ASTImporterTestBase::TU::lazyInitImporter(
-    const std::shared_ptr<ASTImporterSharedState> &SharedState,
-    ASTUnit *ToAST) {
-  assert(ToAST);
-  if (!Importer) {
-    Importer.reset(Creator(ToAST->getASTContext(), ToAST->getFileManager(),
-                           Unit->getASTContext(), Unit->getFileManager(), false,
-                           SharedState));
-    Importer->setODRHandling(ODRHandling);
-  }
-  assert(&ToAST->getASTContext() == &Importer->getToContext());
-  createVirtualFileIfNeeded(ToAST, FileName, Code);
-}
-
-Decl *ASTImporterTestBase::TU::import(
-    const std::shared_ptr<ASTImporterSharedState> &SharedState, ASTUnit *ToAST,
-    Decl *FromDecl) {
-  lazyInitImporter(SharedState, ToAST);
-  if (auto ImportedOrErr = Importer->Import(FromDecl))
-    return *ImportedOrErr;
-  else {
-    llvm::consumeError(ImportedOrErr.takeError());
-    return nullptr;
-  }
-}
-
-llvm::Expected<Decl *> ASTImporterTestBase::TU::importOrError(
-    const std::shared_ptr<ASTImporterSharedState> &SharedState, ASTUnit *ToAST,
-    Decl *FromDecl) {
-  lazyInitImporter(SharedState, ToAST);
-  return Importer->Import(FromDecl);
-}
-
-QualType ASTImporterTestBase::TU::import(
-    const std::shared_ptr<ASTImporterSharedState> &SharedState, ASTUnit *ToAST,
-    QualType FromType) {
-  lazyInitImporter(SharedState, ToAST);
-  if (auto ImportedOrErr = Importer->Import(FromType))
-    return *ImportedOrErr;
-  else {
-    llvm::consumeError(ImportedOrErr.takeError());
-    return QualType{};
-  }
-}
-
-void ASTImporterTestBase::lazyInitSharedState(TranslationUnitDecl *ToTU) {
-  assert(ToTU);
-  if (!SharedStatePtr)
-    SharedStatePtr = std::make_shared<ASTImporterSharedState>(*ToTU);
-}
-
-void ASTImporterTestBase::lazyInitToAST(TestLanguage ToLang,
-                                        StringRef ToSrcCode,
-                                        StringRef FileName) {
-  if (ToAST)
-    return;
-  std::vector<std::string> ToArgs = getCommandLineArgsForLanguage(ToLang);
-  // Source code must be a valid live buffer through the tests lifetime.
-  ToCode = std::string(ToSrcCode);
-  // Build the AST from an empty file.
-  ToAST = tooling::buildASTFromCodeWithArgs(ToCode, ToArgs, FileName);
-  ToAST->enableSourceFileDiagnostics();
-  lazyInitSharedState(ToAST->getASTContext().getTranslationUnitDecl());
-}
-
-ASTImporterTestBase::TU *ASTImporterTestBase::findFromTU(Decl *From) {
-  // Create a virtual file in the To Ctx which corresponds to the file from
-  // which we want to import the `From` Decl. Without this source locations
-  // will be invalid in the ToCtx.
-  auto It = llvm::find_if(FromTUs, [From](const TU &E) {
-    return E.TUDecl == From->getTranslationUnitDecl();
-  });
-  assert(It != FromTUs.end());
-  return &*It;
-}
-
-std::tuple<Decl *, Decl *> ASTImporterTestBase::getImportedDecl(
-    StringRef FromSrcCode, TestLanguage FromLang, StringRef ToSrcCode,
-    TestLanguage ToLang, StringRef Identifier) {
-  std::vector<std::string> FromArgs = getCommandLineArgsForLanguage(FromLang);
-  std::vector<std::string> ToArgs = getCommandLineArgsForLanguage(ToLang);
-
-  FromTUs.emplace_back(FromSrcCode, InputFileName, FromArgs, Creator,
-                       ODRHandling);
-  TU &FromTU = FromTUs.back();
-
-  assert(!ToAST);
-  lazyInitToAST(ToLang, ToSrcCode, OutputFileName);
-
-  ASTContext &FromCtx = FromTU.Unit->getASTContext();
-
-  IdentifierInfo *ImportedII = &FromCtx.Idents.get(Identifier);
-  assert(ImportedII && "Declaration with the given identifier "
-                       "should be specified in test!");
-  DeclarationName ImportDeclName(ImportedII);
-  SmallVector<NamedDecl *, 1> FoundDecls;
-  FromCtx.getTranslationUnitDecl()->localUncachedLookup(ImportDeclName,
-                                                        FoundDecls);
-
-  assert(FoundDecls.size() == 1);
-
-  Decl *Imported =
-      FromTU.import(SharedStatePtr, ToAST.get(), FoundDecls.front());
-
-  assert(Imported);
-  return std::make_tuple(*FoundDecls.begin(), Imported);
-}
-
-TranslationUnitDecl *ASTImporterTestBase::getTuDecl(StringRef SrcCode,
-                                                    TestLanguage Lang,
-                                                    StringRef FileName) {
-  assert(llvm::find_if(FromTUs, [FileName](const TU &E) {
-           return E.FileName == FileName;
-         }) == FromTUs.end());
-
-  std::vector<std::string> Args = getCommandLineArgsForLanguage(Lang);
-  FromTUs.emplace_back(SrcCode, FileName, Args, Creator, ODRHandling);
-  TU &Tu = FromTUs.back();
-
-  return Tu.TUDecl;
-}
-
-TranslationUnitDecl *ASTImporterTestBase::getToTuDecl(StringRef ToSrcCode,
-                                                      TestLanguage ToLang) {
-  std::vector<std::string> ToArgs = getCommandLineArgsForLanguage(ToLang);
-  assert(!ToAST);
-  lazyInitToAST(ToLang, ToSrcCode, OutputFileName);
-  return ToAST->getASTContext().getTranslationUnitDecl();
-}
-
-Decl *ASTImporterTestBase::Import(Decl *From, TestLanguage ToLang) {
-  lazyInitToAST(ToLang, "", OutputFileName);
-  TU *FromTU = findFromTU(From);
-  assert(SharedStatePtr);
-  Decl *To = FromTU->import(SharedStatePtr, ToAST.get(), From);
-  return To;
-}
-
-llvm::Expected<Decl *> ASTImporterTestBase::importOrError(Decl *From,
-                                                          TestLanguage ToLang) {
-  lazyInitToAST(ToLang, "", OutputFileName);
-  TU *FromTU = findFromTU(From);
-  assert(SharedStatePtr);
-  llvm::Expected<Decl *> To =
-      FromTU->importOrError(SharedStatePtr, ToAST.get(), From);
-  return To;
-}
-
-QualType ASTImporterTestBase::ImportType(QualType FromType, Decl *TUDecl,
-                                         TestLanguage ToLang) {
-  lazyInitToAST(ToLang, "", OutputFileName);
-  TU *FromTU = findFromTU(TUDecl);
-  assert(SharedStatePtr);
-  return FromTU->import(SharedStatePtr, ToAST.get(), FromType);
-}
-
-ASTImporterTestBase::~ASTImporterTestBase() {
-  if (!::testing::Test::HasFailure())
-    return;
-
-  for (auto &Tu : FromTUs) {
-    assert(Tu.Unit);
-    llvm::errs() << "FromAST:\n";
-    Tu.Unit->getASTContext().getTranslationUnitDecl()->dump();
-    llvm::errs() << "\n";
-  }
-  if (ToAST) {
-    llvm::errs() << "ToAST:\n";
-    ToAST->getASTContext().getTranslationUnitDecl()->dump();
-  }
-}
-
-} // end namespace ast_matchers
-} // end namespace clang
diff --git a/gnu/llvm/clang/unittests/AST/ASTImporterFixtures.h b/gnu/llvm/clang/unittests/AST/ASTImporterFixtures.h
deleted file mode 100644
index a63a98b7654..00000000000
--- a/gnu/llvm/clang/unittests/AST/ASTImporterFixtures.h
+++ /dev/null
@@ -1,472 +0,0 @@
-//===- unittest/AST/ASTImporterFixtures.h - AST unit test support ---------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-/// \file
-/// Fixture classes for testing the ASTImporter.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_CLANG_UNITTESTS_AST_IMPORTER_FIXTURES_H
-#define LLVM_CLANG_UNITTESTS_AST_IMPORTER_FIXTURES_H
-
-#include "gmock/gmock.h"
-
-#include "clang/AST/ASTImporter.h"
-#include "clang/AST/ASTImporterSharedState.h"
-#include "clang/Frontend/ASTUnit.h"
-#include "clang/Testing/CommandLineArgs.h"
-#include "llvm/Support/Error.h"
-#include "llvm/Support/ErrorHandling.h"
-
-#include "DeclMatcher.h"
-#include "MatchVerifier.h"
-
-#include <sstream>
-
-namespace clang {
-
-class ASTImporter;
-class ASTImporterSharedState;
-class ASTUnit;
-
-namespace ast_matchers {
-
-const StringRef DeclToImportID = "declToImport";
-const StringRef DeclToVerifyID = "declToVerify";
-
-// Creates a virtual file and assigns that to the context of given AST. If the
-// file already exists then the file will not be created again as a duplicate.
-void createVirtualFileIfNeeded(ASTUnit *ToAST, StringRef FileName,
-                               std::unique_ptr<llvm::MemoryBuffer> &&Buffer);
-
-void createVirtualFileIfNeeded(ASTUnit *ToAST, StringRef FileName,
-                               StringRef Code);
-
-// Common base for the different families of ASTImporter tests that are
-// parameterized on the compiler options which may result a different AST. E.g.
-// -fms-compatibility or -fdelayed-template-parsing.
-class CompilerOptionSpecificTest : public ::testing::Test {
-protected:
-  // Return the extra arguments appended to runtime options at compilation.
-  virtual std::vector<std::string> getExtraArgs() const { return {}; }
-
-  // Returns the argument vector used for a specific language option, this set
-  // can be tweaked by the test parameters.
-  std::vector<std::string>
-  getCommandLineArgsForLanguage(TestLanguage Lang) const {
-    std::vector<std::string> Args = getCommandLineArgsForTesting(Lang);
-    std::vector<std::string> ExtraArgs = getExtraArgs();
-    for (const auto &Arg : ExtraArgs) {
-      Args.push_back(Arg);
-    }
-    return Args;
-  }
-};
-
-const auto DefaultTestArrayForRunOptions =
-    std::array<std::vector<std::string>, 4>{
-        {std::vector<std::string>(),
-         std::vector<std::string>{"-fdelayed-template-parsing"},
-         std::vector<std::string>{"-fms-compatibility"},
-         std::vector<std::string>{"-fdelayed-template-parsing",
-                                  "-fms-compatibility"}}};
-
-const auto DefaultTestValuesForRunOptions =
-    ::testing::ValuesIn(DefaultTestArrayForRunOptions);
-
-// This class provides generic methods to write tests which can check internal
-// attributes of AST nodes like getPreviousDecl(), isVirtual(), etc. Also,
-// this fixture makes it possible to import from several "From" contexts.
-class ASTImporterTestBase : public CompilerOptionSpecificTest {
-
-  const char *const InputFileName = "input.cc";
-  const char *const OutputFileName = "output.cc";
-
-public:
-  /// Allocates an ASTImporter (or one of its subclasses).
-  typedef std::function<ASTImporter *(
-      ASTContext &, FileManager &, ASTContext &, FileManager &, bool,
-      const std::shared_ptr<ASTImporterSharedState> &SharedState)>
-      ImporterConstructor;
-
-  // ODR handling type for the AST importer.
-  ASTImporter::ODRHandlingType ODRHandling;
-
-  // The lambda that constructs the ASTImporter we use in this test.
-  ImporterConstructor Creator;
-
-private:
-  // Buffer for the To context, must live in the test scope.
-  std::string ToCode;
-
-  // Represents a "From" translation unit and holds an importer object which we
-  // use to import from this translation unit.
-  struct TU {
-    // Buffer for the context, must live in the test scope.
-    std::string Code;
-    std::string FileName;
-    std::unique_ptr<ASTUnit> Unit;
-    TranslationUnitDecl *TUDecl = nullptr;
-    std::unique_ptr<ASTImporter> Importer;
-    ImporterConstructor Creator;
-    ASTImporter::ODRHandlingType ODRHandling;
-
-    TU(StringRef Code, StringRef FileName, std::vector<std::string> Args,
-       ImporterConstructor C = ImporterConstructor(),
-       ASTImporter::ODRHandlingType ODRHandling =
-           ASTImporter::ODRHandlingType::Conservative);
-    ~TU();
-
-    void
-    lazyInitImporter(const std::shared_ptr<ASTImporterSharedState> &SharedState,
-                     ASTUnit *ToAST);
-    Decl *import(const std::shared_ptr<ASTImporterSharedState> &SharedState,
-                 ASTUnit *ToAST, Decl *FromDecl);
-    llvm::Expected<Decl *>
-    importOrError(const std::shared_ptr<ASTImporterSharedState> &SharedState,
-                  ASTUnit *ToAST, Decl *FromDecl);
-    QualType import(const std::shared_ptr<ASTImporterSharedState> &SharedState,
-                    ASTUnit *ToAST, QualType FromType);
-  };
-
-  // We may have several From contexts and related translation units. In each
-  // AST, the buffers for the source are handled via references and are set
-  // during the creation of the AST. These references must point to a valid
-  // buffer until the AST is alive. Thus, we must use a list in order to avoid
-  // moving of the stored objects because that would mean breaking the
-  // references in the AST. By using a vector a move could happen when the
-  // vector is expanding, with the list we won't have these issues.
-  std::list<TU> FromTUs;
-
-  // Initialize the shared state if not initialized already.
-  void lazyInitSharedState(TranslationUnitDecl *ToTU);
-
-  void lazyInitToAST(TestLanguage ToLang, StringRef ToSrcCode,
-                     StringRef FileName);
-
-protected:
-  std::shared_ptr<ASTImporterSharedState> SharedStatePtr;
-
-public:
-  // We may have several From context but only one To context.
-  std::unique_ptr<ASTUnit> ToAST;
-
-  // Returns with the TU associated with the given Decl.
-  TU *findFromTU(Decl *From);
-
-  // Creates an AST both for the From and To source code and imports the Decl
-  // of the identifier into the To context.
-  // Must not be called more than once within the same test.
-  std::tuple<Decl *, Decl *>
-  getImportedDecl(StringRef FromSrcCode, TestLanguage FromLang,
-                  StringRef ToSrcCode, TestLanguage ToLang,
-                  StringRef Identifier = DeclToImportID);
-
-  // Creates a TU decl for the given source code which can be used as a From
-  // context.  May be called several times in a given test (with different file
-  // name).
-  TranslationUnitDecl *getTuDecl(StringRef SrcCode, TestLanguage Lang,
-                                 StringRef FileName = "input.cc");
-
-  // Creates the To context with the given source code and returns the TU decl.
-  TranslationUnitDecl *getToTuDecl(StringRef ToSrcCode, TestLanguage ToLang);
-
-  // Import the given Decl into the ToCtx.
-  // May be called several times in a given test.
-  // The different instances of the param From may have different ASTContext.
-  Decl *Import(Decl *From, TestLanguage ToLang);
-
-  template <class DeclT> DeclT *Import(DeclT *From, TestLanguage Lang) {
-    return cast_or_null<DeclT>(Import(cast<Decl>(From), Lang));
-  }
-
-  // Import the given Decl into the ToCtx.
-  // Same as Import but returns the result of the import which can be an error.
-  llvm::Expected<Decl *> importOrError(Decl *From, TestLanguage ToLang);
-
-  QualType ImportType(QualType FromType, Decl *TUDecl, TestLanguage ToLang);
-
-  ASTImporterTestBase()
-      : ODRHandling(ASTImporter::ODRHandlingType::Conservative) {}
-  ~ASTImporterTestBase();
-};
-
-class ASTImporterOptionSpecificTestBase
-    : public ASTImporterTestBase,
-      public ::testing::WithParamInterface<std::vector<std::string>> {
-protected:
-  std::vector<std::string> getExtraArgs() const override { return GetParam(); }
-};
-
-// Base class for those tests which use the family of `testImport` functions.
-class TestImportBase
-    : public CompilerOptionSpecificTest,
-      public ::testing::WithParamInterface<std::vector<std::string>> {
-
-  template <typename NodeType>
-  llvm::Expected<NodeType> importNode(ASTUnit *From, ASTUnit *To,
-                                      ASTImporter &Importer, NodeType Node) {
-    ASTContext &ToCtx = To->getASTContext();
-
-    // Add 'From' file to virtual file system so importer can 'find' it
-    // while importing SourceLocations. It is safe to add same file multiple
-    // times - it just isn't replaced.
-    StringRef FromFileName = From->getMainFileName();
-    createVirtualFileIfNeeded(To, FromFileName,
-                              From->getBufferForFile(FromFileName));
-
-    auto Imported = Importer.Import(Node);
-
-    if (Imported) {
-      // This should dump source locations and assert if some source locations
-      // were not imported.
-      SmallString<1024> ImportChecker;
-      llvm::raw_svector_ostream ToNothing(ImportChecker);
-      ToCtx.getTranslationUnitDecl()->print(ToNothing);
-
-      // This traverses the AST to catch certain bugs like poorly or not
-      // implemented subtrees.
-      (*Imported)->dump(ToNothing);
-    }
-
-    return Imported;
-  }
-
-  template <typename NodeType>
-  testing::AssertionResult
-  testImport(const std::string &FromCode,
-             const std::vector<std::string> &FromArgs,
-             const std::string &ToCode, const std::vector<std::string> &ToArgs,
-             MatchVerifier<NodeType> &Verifier,
-             const internal::BindableMatcher<NodeType> &SearchMatcher,
-             const internal::BindableMatcher<NodeType> &VerificationMatcher) {
-    const char *const InputFileName = "input.cc";
-    const char *const OutputFileName = "output.cc";
-
-    std::unique_ptr<ASTUnit> FromAST = tooling::buildASTFromCodeWithArgs(
-                                 FromCode, FromArgs, InputFileName),
-                             ToAST = tooling::buildASTFromCodeWithArgs(
-                                 ToCode, ToArgs, OutputFileName);
-
-    ASTContext &FromCtx = FromAST->getASTContext(),
-               &ToCtx = ToAST->getASTContext();
-
-    ASTImporter Importer(ToCtx, ToAST->getFileManager(), FromCtx,
-                         FromAST->getFileManager(), false);
-
-    auto FoundNodes = match(SearchMatcher, FromCtx);
-    if (FoundNodes.size() != 1)
-      return testing::AssertionFailure()
-             << "Multiple potential nodes were found!";
-
-    auto ToImport = selectFirst<NodeType>(DeclToImportID, FoundNodes);
-    if (!ToImport)
-      return testing::AssertionFailure() << "Node type mismatch!";
-
-    // Sanity check: the node being imported should match in the same way as
-    // the result node.
-    internal::BindableMatcher<NodeType> WrapperMatcher(VerificationMatcher);
-    EXPECT_TRUE(Verifier.match(ToImport, WrapperMatcher));
-
-    auto Imported = importNode(FromAST.get(), ToAST.get(), Importer, ToImport);
-    if (!Imported) {
-      std::string ErrorText;
-      handleAllErrors(
-          Imported.takeError(),
-          [&ErrorText](const ImportError &Err) { ErrorText = Err.message(); });
-      return testing::AssertionFailure()
-             << "Import failed, error: \"" << ErrorText << "\"!";
-    }
-
-    return Verifier.match(*Imported, WrapperMatcher);
-  }
-
-  template <typename NodeType>
-  testing::AssertionResult
-  testImport(const std::string &FromCode,
-             const std::vector<std::string> &FromArgs,
-             const std::string &ToCode, const std::vector<std::string> &ToArgs,
-             MatchVerifier<NodeType> &Verifier,
-             const internal::BindableMatcher<NodeType> &VerificationMatcher) {
-    return testImport(
-        FromCode, FromArgs, ToCode, ToArgs, Verifier,
-        translationUnitDecl(
-            has(namedDecl(hasName(DeclToImportID)).bind(DeclToImportID))),
-        VerificationMatcher);
-  }
-
-protected:
-  std::vector<std::string> getExtraArgs() const override { return GetParam(); }
-
-public:
-  /// Test how AST node named "declToImport" located in the translation unit
-  /// of "FromCode" virtual file is imported to "ToCode" virtual file.
-  /// The verification is done by running AMatcher over the imported node.
-  template <typename NodeType, typename MatcherType>
-  void testImport(const std::string &FromCode, TestLanguage FromLang,
-                  const std::string &ToCode, TestLanguage ToLang,
-                  MatchVerifier<NodeType> &Verifier,
-                  const MatcherType &AMatcher) {
-    std::vector<std::string> FromArgs = getCommandLineArgsForLanguage(FromLang);
-    std::vector<std::string> ToArgs = getCommandLineArgsForLanguage(ToLang);
-    EXPECT_TRUE(
-        testImport(FromCode, FromArgs, ToCode, ToArgs, Verifier, AMatcher));
-  }
-
-  struct ImportAction {
-    StringRef FromFilename;
-    StringRef ToFilename;
-    // FIXME: Generalize this to support other node kinds.
-    internal::BindableMatcher<Decl> ImportPredicate;
-
-    ImportAction(StringRef FromFilename, StringRef ToFilename,
-                 DeclarationMatcher ImportPredicate)
-        : FromFilename(FromFilename), ToFilename(ToFilename),
-          ImportPredicate(ImportPredicate) {}
-
-    ImportAction(StringRef FromFilename, StringRef ToFilename,
-                 const std::string &DeclName)
-        : FromFilename(FromFilename), ToFilename(ToFilename),
-          ImportPredicate(namedDecl(hasName(DeclName))) {}
-  };
-
-  using SingleASTUnit = std::unique_ptr<ASTUnit>;
-  using AllASTUnits = llvm::StringMap<SingleASTUnit>;
-
-  struct CodeEntry {
-    std::string CodeSample;
-    TestLanguage Lang;
-  };
-
-  using CodeFiles = llvm::StringMap<CodeEntry>;
-
-  /// Builds an ASTUnit for one potential compile options set.
-  SingleASTUnit createASTUnit(StringRef FileName, const CodeEntry &CE) const {
-    std::vector<std::string> Args = getCommandLineArgsForLanguage(CE.Lang);
-    auto AST = tooling::buildASTFromCodeWithArgs(CE.CodeSample, Args, FileName);
-    EXPECT_TRUE(AST.get());
-    return AST;
-  }
-
-  /// Test an arbitrary sequence of imports for a set of given in-memory files.
-  /// The verification is done by running VerificationMatcher against a
-  /// specified AST node inside of one of given files.
-  /// \param CodeSamples Map whose key is the file name and the value is the
-  /// file content.
-  /// \param ImportActions Sequence of imports. Each import in sequence
-  /// specifies "from file" and "to file" and a matcher that is used for
-  /// searching a declaration for import in "from file".
-  /// \param FileForFinalCheck Name of virtual file for which the final check is
-  /// applied.
-  /// \param FinalSelectPredicate Matcher that specifies the AST node in the
-  /// FileForFinalCheck for which the verification will be done.
-  /// \param VerificationMatcher Matcher that will be used for verification
-  /// after all imports in sequence are done.
-  void testImportSequence(const CodeFiles &CodeSamples,
-                          const std::vector<ImportAction> &ImportActions,
-                          StringRef FileForFinalCheck,
-                          internal::BindableMatcher<Decl> FinalSelectPredicate,
-                          internal::BindableMatcher<Decl> VerificationMatcher) {
-    AllASTUnits AllASTs;
-    using ImporterKey = std::pair<const ASTUnit *, const ASTUnit *>;
-    llvm::DenseMap<ImporterKey, std::unique_ptr<ASTImporter>> Importers;
-
-    auto GenASTsIfNeeded = [this, &AllASTs, &CodeSamples](StringRef Filename) {
-      if (!AllASTs.count(Filename)) {
-        auto Found = CodeSamples.find(Filename);
-        assert(Found != CodeSamples.end() && "Wrong file for import!");
-        AllASTs[Filename] = createASTUnit(Filename, Found->getValue());
-      }
-    };
-
-    for (const ImportAction &Action : ImportActions) {
-      StringRef FromFile = Action.FromFilename, ToFile = Action.ToFilename;
-      GenASTsIfNeeded(FromFile);
-      GenASTsIfNeeded(ToFile);
-
-      ASTUnit *From = AllASTs[FromFile].get();
-      ASTUnit *To = AllASTs[ToFile].get();
-
-      // Create a new importer if needed.
-      std::unique_ptr<ASTImporter> &ImporterRef = Importers[{From, To}];
-      if (!ImporterRef)
-        ImporterRef.reset(new ASTImporter(
-            To->getASTContext(), To->getFileManager(), From->getASTContext(),
-            From->getFileManager(), false));
-
-      // Find the declaration and import it.
-      auto FoundDecl = match(Action.ImportPredicate.bind(DeclToImportID),
-                             From->getASTContext());
-      EXPECT_TRUE(FoundDecl.size() == 1);
-      const Decl *ToImport = selectFirst<Decl>(DeclToImportID, FoundDecl);
-      auto Imported = importNode(From, To, *ImporterRef, ToImport);
-      EXPECT_TRUE(static_cast<bool>(Imported));
-      if (!Imported)
-        llvm::consumeError(Imported.takeError());
-    }
-
-    // Find the declaration and import it.
-    auto FoundDecl = match(FinalSelectPredicate.bind(DeclToVerifyID),
-                           AllASTs[FileForFinalCheck]->getASTContext());
-    EXPECT_TRUE(FoundDecl.size() == 1);
-    const Decl *ToVerify = selectFirst<Decl>(DeclToVerifyID, FoundDecl);
-    MatchVerifier<Decl> Verifier;
-    EXPECT_TRUE(Verifier.match(
-        ToVerify, internal::BindableMatcher<Decl>(VerificationMatcher)));
-  }
-};
-
-template <typename T> RecordDecl *getRecordDecl(T *D) {
-  auto *ET = cast<ElaboratedType>(D->getType().getTypePtr());
-  return cast<RecordType>(ET->getNamedType().getTypePtr())->getDecl();
-}
-
-template <class T>
-::testing::AssertionResult isSuccess(llvm::Expected<T> &ValOrErr) {
-  if (ValOrErr)
-    return ::testing::AssertionSuccess() << "Expected<> contains no error.";
-  else
-    return ::testing::AssertionFailure()
-           << "Expected<> contains error: " << toString(ValOrErr.takeError());
-}
-
-template <class T>
-::testing::AssertionResult isImportError(llvm::Expected<T> &ValOrErr,
-                                         ImportError::ErrorKind Kind) {
-  if (ValOrErr) {
-    return ::testing::AssertionFailure() << "Expected<> is expected to contain "
-                                            "error but does contain value \""
-                                         << (*ValOrErr) << "\"";
-  } else {
-    std::ostringstream OS;
-    bool Result = false;
-    auto Err = llvm::handleErrors(
-        ValOrErr.takeError(), [&OS, &Result, Kind](clang::ImportError &IE) {
-          if (IE.Error == Kind) {
-            Result = true;
-            OS << "Expected<> contains an ImportError " << IE.toString();
-          } else {
-            OS << "Expected<> contains an ImportError " << IE.toString()
-               << " instead of kind " << Kind;
-          }
-        });
-    if (Err) {
-      OS << "Expected<> contains unexpected error: "
-         << toString(std::move(Err));
-    }
-    if (Result)
-      return ::testing::AssertionSuccess() << OS.str();
-    else
-      return ::testing::AssertionFailure() << OS.str();
-  }
-}
-
-} // end namespace ast_matchers
-} // end namespace clang
-
-#endif
diff --git a/gnu/llvm/clang/unittests/AST/ASTImporterGenericRedeclTest.cpp b/gnu/llvm/clang/unittests/AST/ASTImporterGenericRedeclTest.cpp
deleted file mode 100644
index 1206fac15d4..00000000000
--- a/gnu/llvm/clang/unittests/AST/ASTImporterGenericRedeclTest.cpp
+++ /dev/null
@@ -1,647 +0,0 @@
-//===- unittest/AST/ASTImporterTest.cpp - AST node import test ------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// Type-parameterized tests for the correct import of redecl chains.
-//
-//===----------------------------------------------------------------------===//
-
-#include "ASTImporterFixtures.h"
-
-namespace clang {
-namespace ast_matchers {
-
-using internal::BindableMatcher;
-
-struct Function {
-  using DeclTy = FunctionDecl;
-  static constexpr auto *Prototype = "void X();";
-  static constexpr auto *Definition = "void X() {}";
-  BindableMatcher<Decl> getPattern() {
-    return functionDecl(hasName("X"), unless(isImplicit()));
-  }
-};
-
-struct Class {
-  using DeclTy = CXXRecordDecl;
-  static constexpr auto *Prototype = "class X;";
-  static constexpr auto *Definition = "class X {};";
-  BindableMatcher<Decl> getPattern() {
-    return cxxRecordDecl(hasName("X"), unless(isImplicit()));
-  }
-};
-
-struct EnumClass {
-  using DeclTy = EnumDecl;
-  static constexpr auto *Prototype = "enum class X;";
-  static constexpr auto *Definition = "enum class X {};";
-  BindableMatcher<Decl> getPattern() {
-    return enumDecl(hasName("X"), unless(isImplicit()));
-  }
-};
-
-struct Variable {
-  using DeclTy = VarDecl;
-  static constexpr auto *Prototype = "extern int X;";
-  static constexpr auto *Definition = "int X;";
-  BindableMatcher<Decl> getPattern() { return varDecl(hasName("X")); }
-};
-
-struct FunctionTemplate {
-  using DeclTy = FunctionTemplateDecl;
-  static constexpr auto *Prototype = "template <class T> void X();";
-  static constexpr auto *Definition =
-      R"(
-      template <class T> void X() {};
-      // Explicit instantiation is a must because of -fdelayed-template-parsing:
-      template void X<int>();
-      )";
-  BindableMatcher<Decl> getPattern() {
-    return functionTemplateDecl(hasName("X"), unless(isImplicit()));
-  }
-};
-
-struct ClassTemplate {
-  using DeclTy = ClassTemplateDecl;
-  static constexpr auto *Prototype = "template <class T> class X;";
-  static constexpr auto *Definition = "template <class T> class X {};";
-  BindableMatcher<Decl> getPattern() {
-    return classTemplateDecl(hasName("X"), unless(isImplicit()));
-  }
-};
-
-struct VariableTemplate {
-  using DeclTy = VarTemplateDecl;
-  static constexpr auto *Prototype = "template <class T> extern T X;";
-  static constexpr auto *Definition =
-      R"(
-      template <class T> T X;
-      template <> int X<int>;
-      )";
-  // There is no matcher for varTemplateDecl so use a work-around.
-  BindableMatcher<Decl> getPattern() {
-    return namedDecl(hasName("X"), unless(isImplicit()),
-                     has(templateTypeParmDecl()));
-  }
-};
-
-struct FunctionTemplateSpec {
-  using DeclTy = FunctionDecl;
-  static constexpr auto *Prototype =
-      R"(
-      // Proto of the primary template.
-      template <class T>
-      void X();
-      // Proto of the specialization.
-      template <>
-      void X<int>();
-      )";
-  static constexpr auto *Definition =
-      R"(
-      // Proto of the primary template.
-      template <class T>
-      void X();
-      // Specialization and definition.
-      template <>
-      void X<int>() {}
-      )";
-  BindableMatcher<Decl> getPattern() {
-    return functionDecl(hasName("X"), isExplicitTemplateSpecialization());
-  }
-};
-
-struct ClassTemplateSpec {
-  using DeclTy = ClassTemplateSpecializationDecl;
-  static constexpr auto *Prototype =
-      R"(
-    template <class T> class X;
-    template <> class X<int>;
-    )";
-  static constexpr auto *Definition =
-      R"(
-    template <class T> class X;
-    template <> class X<int> {};
-    )";
-  BindableMatcher<Decl> getPattern() {
-    return classTemplateSpecializationDecl(hasName("X"), unless(isImplicit()));
-  }
-};
-
-template <typename TypeParam>
-struct RedeclChain : ASTImporterOptionSpecificTestBase {
-
-  using DeclTy = typename TypeParam::DeclTy;
-  std::string getPrototype() { return TypeParam::Prototype; }
-  std::string getDefinition() { return TypeParam::Definition; }
-  BindableMatcher<Decl> getPattern() const { return TypeParam().getPattern(); }
-
-  void CheckPreviousDecl(Decl *Prev, Decl *Current) {
-    ASSERT_NE(Prev, Current);
-    ASSERT_EQ(&Prev->getASTContext(), &Current->getASTContext());
-    EXPECT_EQ(Prev->getCanonicalDecl(), Current->getCanonicalDecl());
-
-    // Templates.
-    if (auto *PrevT = dyn_cast<TemplateDecl>(Prev)) {
-      EXPECT_EQ(Current->getPreviousDecl(), Prev);
-      auto *CurrentT = cast<TemplateDecl>(Current);
-      ASSERT_TRUE(PrevT->getTemplatedDecl());
-      ASSERT_TRUE(CurrentT->getTemplatedDecl());
-      EXPECT_EQ(CurrentT->getTemplatedDecl()->getPreviousDecl(),
-                PrevT->getTemplatedDecl());
-      return;
-    }
-
-    // Specializations.
-    if (auto *PrevF = dyn_cast<FunctionDecl>(Prev)) {
-      if (PrevF->getTemplatedKind() ==
-          FunctionDecl::TK_FunctionTemplateSpecialization) {
-        // There may be a hidden fwd spec decl before a spec decl.
-        // In that case the previous visible decl can be reached through that
-        // invisible one.
-        EXPECT_THAT(Prev, testing::AnyOf(
-                              Current->getPreviousDecl(),
-                              Current->getPreviousDecl()->getPreviousDecl()));
-        auto *ToTU = Prev->getTranslationUnitDecl();
-        auto *TemplateD = FirstDeclMatcher<FunctionTemplateDecl>().match(
-            ToTU, functionTemplateDecl());
-        auto *FirstSpecD = *(TemplateD->spec_begin());
-        EXPECT_EQ(FirstSpecD->getCanonicalDecl(), PrevF->getCanonicalDecl());
-        return;
-      }
-    }
-
-    // The rest: Classes, Functions, etc.
-    EXPECT_EQ(Current->getPreviousDecl(), Prev);
-  }
-
-  void
-  TypedTest_PrototypeShouldBeImportedAsAPrototypeWhenThereIsNoDefinition() {
-    Decl *FromTU = getTuDecl(getPrototype(), Lang_CXX03);
-    auto *FromD = FirstDeclMatcher<DeclTy>().match(FromTU, getPattern());
-    ASSERT_FALSE(FromD->isThisDeclarationADefinition());
-
-    Decl *ImportedD = Import(FromD, Lang_CXX03);
-    Decl *ToTU = ImportedD->getTranslationUnitDecl();
-
-    EXPECT_EQ(DeclCounter<DeclTy>().match(ToTU, getPattern()), 1u);
-    auto *ToD = LastDeclMatcher<DeclTy>().match(ToTU, getPattern());
-    EXPECT_TRUE(ImportedD == ToD);
-    EXPECT_FALSE(ToD->isThisDeclarationADefinition());
-    if (auto *ToT = dyn_cast<TemplateDecl>(ToD)) {
-      EXPECT_TRUE(ToT->getTemplatedDecl());
-    }
-  }
-
-  void TypedTest_DefinitionShouldBeImportedAsADefinition() {
-    Decl *FromTU = getTuDecl(getDefinition(), Lang_CXX03);
-    auto *FromD = FirstDeclMatcher<DeclTy>().match(FromTU, getPattern());
-    ASSERT_TRUE(FromD->isThisDeclarationADefinition());
-
-    Decl *ImportedD = Import(FromD, Lang_CXX03);
-    Decl *ToTU = ImportedD->getTranslationUnitDecl();
-
-    EXPECT_EQ(DeclCounter<DeclTy>().match(ToTU, getPattern()), 1u);
-    auto *ToD = LastDeclMatcher<DeclTy>().match(ToTU, getPattern());
-    EXPECT_TRUE(ToD->isThisDeclarationADefinition());
-    if (auto *ToT = dyn_cast<TemplateDecl>(ToD)) {
-      EXPECT_TRUE(ToT->getTemplatedDecl());
-    }
-  }
-
-  void TypedTest_ImportPrototypeAfterImportedPrototype() {
-    Decl *FromTU = getTuDecl(getPrototype() + getPrototype(), Lang_CXX03);
-    auto *From0 = FirstDeclMatcher<DeclTy>().match(FromTU, getPattern());
-    auto *From1 = LastDeclMatcher<DeclTy>().match(FromTU, getPattern());
-    ASSERT_FALSE(From0->isThisDeclarationADefinition());
-    ASSERT_FALSE(From1->isThisDeclarationADefinition());
-
-    Decl *Imported0 = Import(From0, Lang_CXX03);
-    Decl *Imported1 = Import(From1, Lang_CXX03);
-    Decl *ToTU = Imported0->getTranslationUnitDecl();
-
-    EXPECT_EQ(DeclCounter<DeclTy>().match(ToTU, getPattern()), 2u);
-    auto *To0 = FirstDeclMatcher<DeclTy>().match(ToTU, getPattern());
-    auto *To1 = LastDeclMatcher<DeclTy>().match(ToTU, getPattern());
-    EXPECT_TRUE(Imported0 == To0);
-    EXPECT_TRUE(Imported1 == To1);
-    EXPECT_FALSE(To0->isThisDeclarationADefinition());
-    EXPECT_FALSE(To1->isThisDeclarationADefinition());
-
-    CheckPreviousDecl(To0, To1);
-  }
-
-  void TypedTest_ImportDefinitionAfterImportedPrototype() {
-    Decl *FromTU = getTuDecl(getPrototype() + getDefinition(), Lang_CXX03);
-    auto *FromProto = FirstDeclMatcher<DeclTy>().match(FromTU, getPattern());
-    auto *FromDef = LastDeclMatcher<DeclTy>().match(FromTU, getPattern());
-    ASSERT_FALSE(FromProto->isThisDeclarationADefinition());
-    ASSERT_TRUE(FromDef->isThisDeclarationADefinition());
-
-    Decl *ImportedProto = Import(FromProto, Lang_CXX03);
-    Decl *ImportedDef = Import(FromDef, Lang_CXX03);
-    Decl *ToTU = ImportedProto->getTranslationUnitDecl();
-
-    EXPECT_EQ(DeclCounter<DeclTy>().match(ToTU, getPattern()), 2u);
-    auto *ToProto = FirstDeclMatcher<DeclTy>().match(ToTU, getPattern());
-    auto *ToDef = LastDeclMatcher<DeclTy>().match(ToTU, getPattern());
-    EXPECT_TRUE(ImportedProto == ToProto);
-    EXPECT_TRUE(ImportedDef == ToDef);
-    EXPECT_FALSE(ToProto->isThisDeclarationADefinition());
-    EXPECT_TRUE(ToDef->isThisDeclarationADefinition());
-
-    CheckPreviousDecl(ToProto, ToDef);
-  }
-
-  void TypedTest_ImportPrototypeAfterImportedDefinition() {
-    Decl *FromTU = getTuDecl(getDefinition() + getPrototype(), Lang_CXX03);
-    auto *FromDef = FirstDeclMatcher<DeclTy>().match(FromTU, getPattern());
-    auto *FromProto = LastDeclMatcher<DeclTy>().match(FromTU, getPattern());
-    ASSERT_TRUE(FromDef->isThisDeclarationADefinition());
-    ASSERT_FALSE(FromProto->isThisDeclarationADefinition());
-
-    Decl *ImportedDef = Import(FromDef, Lang_CXX03);
-    Decl *ImportedProto = Import(FromProto, Lang_CXX03);
-    Decl *ToTU = ImportedDef->getTranslationUnitDecl();
-
-    EXPECT_EQ(DeclCounter<DeclTy>().match(ToTU, getPattern()), 2u);
-    auto *ToDef = FirstDeclMatcher<DeclTy>().match(ToTU, getPattern());
-    auto *ToProto = LastDeclMatcher<DeclTy>().match(ToTU, getPattern());
-    EXPECT_TRUE(ImportedDef == ToDef);
-    EXPECT_TRUE(ImportedProto == ToProto);
-    EXPECT_TRUE(ToDef->isThisDeclarationADefinition());
-    EXPECT_FALSE(ToProto->isThisDeclarationADefinition());
-
-    CheckPreviousDecl(ToDef, ToProto);
-  }
-
-  void TypedTest_ImportPrototypes() {
-    Decl *FromTU0 = getTuDecl(getPrototype(), Lang_CXX03, "input0.cc");
-    Decl *FromTU1 = getTuDecl(getPrototype(), Lang_CXX03, "input1.cc");
-    auto *From0 = FirstDeclMatcher<DeclTy>().match(FromTU0, getPattern());
-    auto *From1 = FirstDeclMatcher<DeclTy>().match(FromTU1, getPattern());
-    ASSERT_FALSE(From0->isThisDeclarationADefinition());
-    ASSERT_FALSE(From1->isThisDeclarationADefinition());
-
-    Decl *Imported0 = Import(From0, Lang_CXX03);
-    Decl *Imported1 = Import(From1, Lang_CXX03);
-    Decl *ToTU = Imported0->getTranslationUnitDecl();
-
-    EXPECT_EQ(DeclCounter<DeclTy>().match(ToTU, getPattern()), 2u);
-    auto *To0 = FirstDeclMatcher<DeclTy>().match(ToTU, getPattern());
-    auto *To1 = LastDeclMatcher<DeclTy>().match(ToTU, getPattern());
-    EXPECT_TRUE(Imported0 == To0);
-    EXPECT_TRUE(Imported1 == To1);
-    EXPECT_FALSE(To0->isThisDeclarationADefinition());
-    EXPECT_FALSE(To1->isThisDeclarationADefinition());
-
-    CheckPreviousDecl(To0, To1);
-  }
-
-  void TypedTest_ImportDefinitions() {
-    Decl *FromTU0 = getTuDecl(getDefinition(), Lang_CXX03, "input0.cc");
-    Decl *FromTU1 = getTuDecl(getDefinition(), Lang_CXX03, "input1.cc");
-    auto *From0 = FirstDeclMatcher<DeclTy>().match(FromTU0, getPattern());
-    auto *From1 = FirstDeclMatcher<DeclTy>().match(FromTU1, getPattern());
-    ASSERT_TRUE(From0->isThisDeclarationADefinition());
-    ASSERT_TRUE(From1->isThisDeclarationADefinition());
-
-    Decl *Imported0 = Import(From0, Lang_CXX03);
-    Decl *Imported1 = Import(From1, Lang_CXX03);
-    Decl *ToTU = Imported0->getTranslationUnitDecl();
-
-    EXPECT_EQ(Imported0, Imported1);
-    EXPECT_EQ(DeclCounter<DeclTy>().match(ToTU, getPattern()), 1u);
-    auto *To0 = FirstDeclMatcher<DeclTy>().match(ToTU, getPattern());
-    EXPECT_TRUE(Imported0 == To0);
-    EXPECT_TRUE(To0->isThisDeclarationADefinition());
-    if (auto *ToT0 = dyn_cast<TemplateDecl>(To0)) {
-      EXPECT_TRUE(ToT0->getTemplatedDecl());
-    }
-  }
-
-  void TypedTest_ImportDefinitionThenPrototype() {
-    Decl *FromTUDef = getTuDecl(getDefinition(), Lang_CXX03, "input0.cc");
-    Decl *FromTUProto = getTuDecl(getPrototype(), Lang_CXX03, "input1.cc");
-    auto *FromDef = FirstDeclMatcher<DeclTy>().match(FromTUDef, getPattern());
-    auto *FromProto =
-        FirstDeclMatcher<DeclTy>().match(FromTUProto, getPattern());
-    ASSERT_TRUE(FromDef->isThisDeclarationADefinition());
-    ASSERT_FALSE(FromProto->isThisDeclarationADefinition());
-
-    Decl *ImportedDef = Import(FromDef, Lang_CXX03);
-    Decl *ImportedProto = Import(FromProto, Lang_CXX03);
-    Decl *ToTU = ImportedDef->getTranslationUnitDecl();
-
-    EXPECT_NE(ImportedDef, ImportedProto);
-    EXPECT_EQ(DeclCounter<DeclTy>().match(ToTU, getPattern()), 2u);
-    auto *ToDef = FirstDeclMatcher<DeclTy>().match(ToTU, getPattern());
-    auto *ToProto = LastDeclMatcher<DeclTy>().match(ToTU, getPattern());
-    EXPECT_TRUE(ImportedDef == ToDef);
-    EXPECT_TRUE(ImportedProto == ToProto);
-    EXPECT_TRUE(ToDef->isThisDeclarationADefinition());
-    EXPECT_FALSE(ToProto->isThisDeclarationADefinition());
-
-    CheckPreviousDecl(ToDef, ToProto);
-  }
-
-  void TypedTest_ImportPrototypeThenDefinition() {
-    Decl *FromTUProto = getTuDecl(getPrototype(), Lang_CXX03, "input0.cc");
-    Decl *FromTUDef = getTuDecl(getDefinition(), Lang_CXX03, "input1.cc");
-    auto *FromProto =
-        FirstDeclMatcher<DeclTy>().match(FromTUProto, getPattern());
-    auto *FromDef = FirstDeclMatcher<DeclTy>().match(FromTUDef, getPattern());
-    ASSERT_TRUE(FromDef->isThisDeclarationADefinition());
-    ASSERT_FALSE(FromProto->isThisDeclarationADefinition());
-
-    Decl *ImportedProto = Import(FromProto, Lang_CXX03);
-    Decl *ImportedDef = Import(FromDef, Lang_CXX03);
-    Decl *ToTU = ImportedDef->getTranslationUnitDecl();
-
-    EXPECT_NE(ImportedDef, ImportedProto);
-    EXPECT_EQ(DeclCounter<DeclTy>().match(ToTU, getPattern()), 2u);
-    auto *ToProto = FirstDeclMatcher<DeclTy>().match(ToTU, getPattern());
-    auto *ToDef = LastDeclMatcher<DeclTy>().match(ToTU, getPattern());
-    EXPECT_TRUE(ImportedDef == ToDef);
-    EXPECT_TRUE(ImportedProto == ToProto);
-    EXPECT_TRUE(ToDef->isThisDeclarationADefinition());
-    EXPECT_FALSE(ToProto->isThisDeclarationADefinition());
-
-    CheckPreviousDecl(ToProto, ToDef);
-  }
-
-  void TypedTest_WholeRedeclChainIsImportedAtOnce() {
-    Decl *FromTU = getTuDecl(getPrototype() + getDefinition(), Lang_CXX03);
-    auto *FromD = // Definition
-        LastDeclMatcher<DeclTy>().match(FromTU, getPattern());
-    ASSERT_TRUE(FromD->isThisDeclarationADefinition());
-
-    Decl *ImportedD = Import(FromD, Lang_CXX03);
-    Decl *ToTU = ImportedD->getTranslationUnitDecl();
-
-    // The whole redecl chain is imported at once.
-    EXPECT_EQ(DeclCounter<DeclTy>().match(ToTU, getPattern()), 2u);
-    EXPECT_TRUE(cast<DeclTy>(ImportedD)->isThisDeclarationADefinition());
-  }
-
-  void TypedTest_ImportPrototypeThenProtoAndDefinition() {
-    {
-      Decl *FromTU = getTuDecl(getPrototype(), Lang_CXX03, "input0.cc");
-      auto *FromD = FirstDeclMatcher<DeclTy>().match(FromTU, getPattern());
-      Import(FromD, Lang_CXX03);
-    }
-    {
-      Decl *FromTU =
-          getTuDecl(getPrototype() + getDefinition(), Lang_CXX03, "input1.cc");
-      auto *FromD = FirstDeclMatcher<DeclTy>().match(FromTU, getPattern());
-      Import(FromD, Lang_CXX03);
-    }
-
-    Decl *ToTU = ToAST->getASTContext().getTranslationUnitDecl();
-
-    ASSERT_EQ(DeclCounter<DeclTy>().match(ToTU, getPattern()), 3u);
-    DeclTy *ProtoD = FirstDeclMatcher<DeclTy>().match(ToTU, getPattern());
-    EXPECT_FALSE(ProtoD->isThisDeclarationADefinition());
-
-    DeclTy *DefinitionD = LastDeclMatcher<DeclTy>().match(ToTU, getPattern());
-    EXPECT_TRUE(DefinitionD->isThisDeclarationADefinition());
-
-    EXPECT_TRUE(DefinitionD->getPreviousDecl());
-    EXPECT_FALSE(
-        DefinitionD->getPreviousDecl()->isThisDeclarationADefinition());
-
-    CheckPreviousDecl(ProtoD, DefinitionD->getPreviousDecl());
-  }
-};
-
-#define ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(BaseTemplate, TypeParam,       \
-                                                NamePrefix, TestCase)          \
-  using BaseTemplate##TypeParam = BaseTemplate<TypeParam>;                     \
-  TEST_P(BaseTemplate##TypeParam, NamePrefix##TestCase) {                      \
-    TypedTest_##TestCase();                                                    \
-  }
-
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(
-    RedeclChain, Function, ,
-    PrototypeShouldBeImportedAsAPrototypeWhenThereIsNoDefinition)
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(
-    RedeclChain, Class, ,
-    PrototypeShouldBeImportedAsAPrototypeWhenThereIsNoDefinition)
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(
-    RedeclChain, EnumClass, ,
-    PrototypeShouldBeImportedAsAPrototypeWhenThereIsNoDefinition)
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(
-    RedeclChain, Variable, ,
-    PrototypeShouldBeImportedAsAPrototypeWhenThereIsNoDefinition)
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(
-    RedeclChain, FunctionTemplate, ,
-    PrototypeShouldBeImportedAsAPrototypeWhenThereIsNoDefinition)
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(
-    RedeclChain, ClassTemplate, ,
-    PrototypeShouldBeImportedAsAPrototypeWhenThereIsNoDefinition)
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(
-    RedeclChain, VariableTemplate, ,
-    PrototypeShouldBeImportedAsAPrototypeWhenThereIsNoDefinition)
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(
-    RedeclChain, FunctionTemplateSpec, ,
-    PrototypeShouldBeImportedAsAPrototypeWhenThereIsNoDefinition)
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(
-    RedeclChain, ClassTemplateSpec, ,
-    PrototypeShouldBeImportedAsAPrototypeWhenThereIsNoDefinition)
-
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, Function, ,
-                                        DefinitionShouldBeImportedAsADefinition)
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, Class, ,
-                                        DefinitionShouldBeImportedAsADefinition)
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, EnumClass, ,
-                                        DefinitionShouldBeImportedAsADefinition)
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, Variable, ,
-                                        DefinitionShouldBeImportedAsADefinition)
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, FunctionTemplate, ,
-                                        DefinitionShouldBeImportedAsADefinition)
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, ClassTemplate, ,
-                                        DefinitionShouldBeImportedAsADefinition)
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, VariableTemplate, ,
-                                        DefinitionShouldBeImportedAsADefinition)
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, FunctionTemplateSpec, ,
-                                        DefinitionShouldBeImportedAsADefinition)
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, ClassTemplateSpec, ,
-                                        DefinitionShouldBeImportedAsADefinition)
-
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, Function, ,
-                                        ImportPrototypeAfterImportedPrototype)
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, Class, ,
-                                        ImportPrototypeAfterImportedPrototype)
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, EnumClass, ,
-                                        ImportPrototypeAfterImportedPrototype)
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, Variable, ,
-                                        ImportPrototypeAfterImportedPrototype)
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, FunctionTemplate, ,
-                                        ImportPrototypeAfterImportedPrototype)
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, ClassTemplate, ,
-                                        ImportPrototypeAfterImportedPrototype)
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, VariableTemplate, ,
-                                        ImportPrototypeAfterImportedPrototype)
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, FunctionTemplateSpec, ,
-                                        ImportPrototypeAfterImportedPrototype)
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, ClassTemplateSpec, ,
-                                        ImportPrototypeAfterImportedPrototype)
-
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, Function, ,
-                                        ImportDefinitionAfterImportedPrototype)
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, Class, ,
-                                        ImportDefinitionAfterImportedPrototype)
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, EnumClass, ,
-                                        ImportDefinitionAfterImportedPrototype)
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, Variable, ,
-                                        ImportDefinitionAfterImportedPrototype)
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, FunctionTemplate, ,
-                                        ImportDefinitionAfterImportedPrototype)
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, ClassTemplate, ,
-                                        ImportDefinitionAfterImportedPrototype)
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, VariableTemplate, ,
-                                        ImportDefinitionAfterImportedPrototype)
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, FunctionTemplateSpec, ,
-                                        ImportDefinitionAfterImportedPrototype)
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, ClassTemplateSpec, ,
-                                        ImportDefinitionAfterImportedPrototype)
-
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, Function, ,
-                                        ImportPrototypeAfterImportedDefinition)
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, Class, ,
-                                        ImportPrototypeAfterImportedDefinition)
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, EnumClass, ,
-                                        ImportPrototypeAfterImportedDefinition)
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, Variable, ,
-                                        ImportPrototypeAfterImportedDefinition)
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, FunctionTemplate, ,
-                                        ImportPrototypeAfterImportedDefinition)
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, ClassTemplate, ,
-                                        ImportPrototypeAfterImportedDefinition)
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, VariableTemplate, ,
-                                        ImportPrototypeAfterImportedDefinition)
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, FunctionTemplateSpec, ,
-                                        ImportPrototypeAfterImportedDefinition)
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, ClassTemplateSpec, ,
-                                        ImportPrototypeAfterImportedDefinition)
-
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, Function, ,
-                                        ImportPrototypes)
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, Class, , ImportPrototypes)
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, EnumClass, ,
-                                        ImportPrototypes)
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, Variable, ,
-                                        ImportPrototypes)
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, FunctionTemplate, ,
-                                        ImportPrototypes)
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, ClassTemplate, ,
-                                        ImportPrototypes)
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, VariableTemplate, ,
-                                        ImportPrototypes)
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, ClassTemplateSpec, ,
-                                        ImportPrototypes)
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, FunctionTemplateSpec, ,
-                                        ImportPrototypes)
-
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, Function, ,
-                                        ImportDefinitions)
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, Class, , ImportDefinitions)
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, EnumClass, ,
-                                        ImportDefinitions)
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, Variable, ,
-                                        ImportDefinitions)
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, FunctionTemplate, ,
-                                        ImportDefinitions)
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, ClassTemplate, ,
-                                        ImportDefinitions)
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, VariableTemplate, ,
-                                        ImportDefinitions)
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, ClassTemplateSpec, ,
-                                        ImportDefinitions)
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, FunctionTemplateSpec, ,
-                                        ImportDefinitions)
-
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, Function, ,
-                                        ImportDefinitionThenPrototype)
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, Class, ,
-                                        ImportDefinitionThenPrototype)
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, EnumClass, ,
-                                        ImportDefinitionThenPrototype)
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, Variable, ,
-                                        ImportDefinitionThenPrototype)
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, FunctionTemplate, ,
-                                        ImportDefinitionThenPrototype)
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, ClassTemplate, ,
-                                        ImportDefinitionThenPrototype)
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, VariableTemplate, ,
-                                        ImportDefinitionThenPrototype)
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, FunctionTemplateSpec, ,
-                                        ImportDefinitionThenPrototype)
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, ClassTemplateSpec, ,
-                                        ImportDefinitionThenPrototype)
-
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, Function, ,
-                                        ImportPrototypeThenDefinition)
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, Class, ,
-                                        ImportPrototypeThenDefinition)
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, EnumClass, ,
-                                        ImportPrototypeThenDefinition)
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, Variable, ,
-                                        ImportPrototypeThenDefinition)
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, FunctionTemplate, ,
-                                        ImportPrototypeThenDefinition)
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, ClassTemplate, ,
-                                        ImportPrototypeThenDefinition)
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, VariableTemplate, ,
-                                        ImportPrototypeThenDefinition)
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, FunctionTemplateSpec, ,
-                                        ImportPrototypeThenDefinition)
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, ClassTemplateSpec, ,
-                                        ImportPrototypeThenDefinition)
-
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, Function, ,
-                                        WholeRedeclChainIsImportedAtOnce)
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, Variable, ,
-                                        WholeRedeclChainIsImportedAtOnce)
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, FunctionTemplate, ,
-                                        WholeRedeclChainIsImportedAtOnce)
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, VariableTemplate, ,
-                                        WholeRedeclChainIsImportedAtOnce)
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, FunctionTemplateSpec, ,
-                                        WholeRedeclChainIsImportedAtOnce)
-
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, Function, ,
-                                        ImportPrototypeThenProtoAndDefinition)
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, Variable, ,
-                                        ImportPrototypeThenProtoAndDefinition)
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, FunctionTemplate, ,
-                                        ImportPrototypeThenProtoAndDefinition)
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, VariableTemplate, ,
-                                        ImportPrototypeThenProtoAndDefinition)
-ASTIMPORTER_INSTANTIATE_TYPED_TEST_SUITE(RedeclChain, FunctionTemplateSpec, ,
-                                        ImportPrototypeThenProtoAndDefinition)
-
-INSTANTIATE_TEST_SUITE_P(ParameterizedTests, RedeclChainFunction,
-                        DefaultTestValuesForRunOptions);
-INSTANTIATE_TEST_SUITE_P(ParameterizedTests, RedeclChainClass,
-                        DefaultTestValuesForRunOptions);
-INSTANTIATE_TEST_SUITE_P(ParameterizedTests, RedeclChainEnumClass,
-                        DefaultTestValuesForRunOptions);
-INSTANTIATE_TEST_SUITE_P(ParameterizedTests, RedeclChainVariable,
-                        DefaultTestValuesForRunOptions);
-INSTANTIATE_TEST_SUITE_P(ParameterizedTests, RedeclChainFunctionTemplate,
-                        DefaultTestValuesForRunOptions);
-INSTANTIATE_TEST_SUITE_P(ParameterizedTests, RedeclChainClassTemplate,
-                        DefaultTestValuesForRunOptions);
-INSTANTIATE_TEST_SUITE_P(ParameterizedTests, RedeclChainVariableTemplate,
-                        DefaultTestValuesForRunOptions);
-INSTANTIATE_TEST_SUITE_P(ParameterizedTests, RedeclChainFunctionTemplateSpec,
-                        DefaultTestValuesForRunOptions);
-INSTANTIATE_TEST_SUITE_P(ParameterizedTests, RedeclChainClassTemplateSpec,
-                        DefaultTestValuesForRunOptions);
-
-} // end namespace ast_matchers
-} // end namespace clang
diff --git a/gnu/llvm/clang/unittests/AST/ASTImporterODRStrategiesTest.cpp b/gnu/llvm/clang/unittests/AST/ASTImporterODRStrategiesTest.cpp
deleted file mode 100644
index eabdfeb03ed..00000000000
--- a/gnu/llvm/clang/unittests/AST/ASTImporterODRStrategiesTest.cpp
+++ /dev/null
@@ -1,696 +0,0 @@
-//===- unittest/AST/ASTImporterODRStrategiesTest.cpp -----------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// Type-parameterized tests to verify the import behaviour in case of ODR
-// violation.
-//
-//===----------------------------------------------------------------------===//
-
-#include "ASTImporterFixtures.h"
-
-namespace clang {
-namespace ast_matchers {
-
-using internal::BindableMatcher;
-
-// DeclTy: Type of the Decl to check.
-// Prototype: "Prototype" (forward declaration) of the Decl.
-// Definition: A definition for the Prototype.
-// ConflictingPrototype: A prototype with the same name but different
-// declaration.
-// ConflictingDefinition: A different definition for Prototype.
-// ConflictingProtoDef: A definition for ConflictingPrototype.
-// getPattern: Return a matcher that matches any of Prototype, Definition,
-// ConflictingPrototype, ConflictingDefinition, ConflictingProtoDef.
-
-struct Function {
-  using DeclTy = FunctionDecl;
-  static constexpr auto *Prototype = "void X(int);";
-  static constexpr auto *ConflictingPrototype = "void X(double);";
-  static constexpr auto *Definition = "void X(int a) {}";
-  static constexpr auto *ConflictingDefinition = "void X(double a) {}";
-  BindableMatcher<Decl> getPattern() {
-    return functionDecl(hasName("X"), unless(isImplicit()));
-  }
-  TestLanguage getLang() { return Lang_C99; }
-};
-
-struct Typedef {
-  using DeclTy = TypedefNameDecl;
-  static constexpr auto *Definition = "typedef int X;";
-  static constexpr auto *ConflictingDefinition = "typedef double X;";
-  BindableMatcher<Decl> getPattern() { return typedefNameDecl(hasName("X")); }
-  TestLanguage getLang() { return Lang_CXX03; }
-};
-
-struct TypedefAlias {
-  using DeclTy = TypedefNameDecl;
-  static constexpr auto *Definition = "using X = int;";
-  static constexpr auto *ConflictingDefinition = "using X = double;";
-  BindableMatcher<Decl> getPattern() { return typedefNameDecl(hasName("X")); }
-  TestLanguage getLang() { return Lang_CXX11; }
-};
-
-struct Enum {
-  using DeclTy = EnumDecl;
-  static constexpr auto *Definition = "enum X { a, b };";
-  static constexpr auto *ConflictingDefinition = "enum X { a, b, c };";
-  BindableMatcher<Decl> getPattern() { return enumDecl(hasName("X")); }
-  TestLanguage getLang() { return Lang_CXX03; }
-};
-
-struct EnumClass {
-  using DeclTy = EnumDecl;
-  static constexpr auto *Definition = "enum class X { a, b };";
-  static constexpr auto *ConflictingDefinition = "enum class X { a, b, c };";
-  BindableMatcher<Decl> getPattern() { return enumDecl(hasName("X")); }
-  TestLanguage getLang() { return Lang_CXX11; }
-};
-
-struct EnumConstant {
-  using DeclTy = EnumConstantDecl;
-  static constexpr auto *Definition = "enum E { X = 0 };";
-  static constexpr auto *ConflictingDefinition = "enum E { X = 1 };";
-  BindableMatcher<Decl> getPattern() { return enumConstantDecl(hasName("X")); }
-  TestLanguage getLang() { return Lang_CXX03; }
-};
-
-struct Class {
-  using DeclTy = CXXRecordDecl;
-  static constexpr auto *Prototype = "class X;";
-  static constexpr auto *Definition = "class X {};";
-  static constexpr auto *ConflictingDefinition = "class X { int A; };";
-  BindableMatcher<Decl> getPattern() {
-    return cxxRecordDecl(hasName("X"), unless(isImplicit()));
-  }
-  TestLanguage getLang() { return Lang_CXX03; }
-};
-
-struct Variable {
-  using DeclTy = VarDecl;
-  static constexpr auto *Prototype = "extern int X;";
-  static constexpr auto *ConflictingPrototype = "extern float X;";
-  static constexpr auto *Definition = "int X;";
-  static constexpr auto *ConflictingDefinition = "float X;";
-  BindableMatcher<Decl> getPattern() { return varDecl(hasName("X")); }
-  TestLanguage getLang() { return Lang_CXX03; }
-};
-
-struct ClassTemplate {
-  using DeclTy = ClassTemplateDecl;
-  static constexpr auto *Prototype = "template <class> class X;";
-  static constexpr auto *ConflictingPrototype = "template <int> class X;";
-  static constexpr auto *Definition = "template <class> class X {};";
-  static constexpr auto *ConflictingDefinition =
-      "template <class> class X { int A; };";
-  static constexpr auto *ConflictingProtoDef = "template <int> class X { };";
-  BindableMatcher<Decl> getPattern() {
-    return classTemplateDecl(hasName("X"), unless(isImplicit()));
-  }
-  TestLanguage getLang() { return Lang_CXX03; }
-};
-
-struct FunctionTemplate {
-  using DeclTy = FunctionTemplateDecl;
-  static constexpr auto *Definition0 =
-      R"(
-      template <class T>
-      void X(T a) {};
-      )";
-  // This is actually not a conflicting definition, but another primary template.
-  static constexpr auto *Definition1 =
-      R"(
-      template <class T>
-      void X(T* a) {};
-      )";
-  BindableMatcher<Decl> getPattern() {
-    return functionTemplateDecl(hasName("X"), unless(isImplicit()));
-  }
-  static std::string getDef0() { return Definition0; }
-  static std::string getDef1() { return Definition1; }
-  TestLanguage getLang() { return Lang_CXX03; }
-};
-
-static const internal::VariadicDynCastAllOfMatcher<Decl, VarTemplateDecl>
-    varTemplateDecl;
-
-struct VarTemplate {
-  using DeclTy = VarTemplateDecl;
-  static constexpr auto *Definition =
-      R"(
-      template <class T>
-      constexpr T X = 0;
-      )";
-  static constexpr auto *ConflictingDefinition =
-      R"(
-      template <int>
-      constexpr int X = 0;
-      )";
-  BindableMatcher<Decl> getPattern() { return varTemplateDecl(hasName("X")); }
-  TestLanguage getLang() { return Lang_CXX14; }
-};
-
-struct ClassTemplateSpec {
-  using DeclTy = ClassTemplateSpecializationDecl;
-  static constexpr auto *Prototype =
-      R"(
-      template <class T> class X;
-      template <> class X<int>;
-      )";
-  static constexpr auto *Definition =
-      R"(
-      template <class T> class X;
-      template <> class X<int> {};
-      )";
-  static constexpr auto *ConflictingDefinition =
-      R"(
-      template <class T> class X;
-      template <> class X<int> { int A; };
-      )";
-  BindableMatcher<Decl> getPattern() {
-    return classTemplateSpecializationDecl(hasName("X"), unless(isImplicit()));
-  }
-  TestLanguage getLang() { return Lang_CXX03; }
-};
-
-// Function template specializations are all "full" specializations.
-// Structural equivalency does not check the body of functions, so we cannot
-// create conflicting function template specializations.
-struct FunctionTemplateSpec {
-  using DeclTy = FunctionDecl;
-
-  static constexpr auto *Definition0 =
-      R"(
-      template <class T>
-      void X(T a);
-      template <> void X(int a) {};
-      )";
-
-  // This is actually not a conflicting definition, but another full
-  // specialization.
-  // Thus, during the import we would create a new specialization with a
-  // different type argument.
-  static constexpr auto *Definition1 =
-      R"(
-      template <class T>
-      void X(T a);
-      template <> void X(double a) {};
-      )";
-
-  BindableMatcher<Decl> getPattern() {
-    return functionDecl(hasName("X"), isExplicitTemplateSpecialization(),
-                        unless(isImplicit()));
-  }
-  static std::string getDef0() { return Definition0; }
-  static std::string getDef1() { return Definition1; }
-  TestLanguage getLang() { return Lang_CXX03; }
-};
-
-static const internal::VariadicDynCastAllOfMatcher<
-    Decl, VarTemplateSpecializationDecl>
-    varTemplateSpecializationDecl;
-
-struct VarTemplateSpec {
-  using DeclTy = VarTemplateSpecializationDecl;
-  static constexpr auto *Definition =
-      R"(
-      template <class T> T X = 0;
-      template <> int X<int> = 0;
-      )";
-  static constexpr auto *ConflictingDefinition =
-      R"(
-      template <class T> T X = 0;
-      template <> float X<int> = 1.0;
-      )";
-  BindableMatcher<Decl> getPattern() {
-    return varTemplateSpecializationDecl(hasName("X"), unless(isImplicit()));
-  }
-  TestLanguage getLang() { return Lang_CXX14; }
-};
-
-template <typename TypeParam, ASTImporter::ODRHandlingType ODRHandlingParam>
-struct ODRViolation : ASTImporterOptionSpecificTestBase {
-
-  using DeclTy = typename TypeParam::DeclTy;
-
-  ODRViolation() { ODRHandling = ODRHandlingParam; }
-
-  static std::string getPrototype() { return TypeParam::Prototype; }
-  static std::string getConflictingPrototype() {
-    return TypeParam::ConflictingPrototype;
-  }
-  static std::string getDefinition() { return TypeParam::Definition; }
-  static std::string getConflictingDefinition() {
-    return TypeParam::ConflictingDefinition;
-  }
-  static std::string getConflictingProtoDef() {
-    return TypeParam::ConflictingProtoDef;
-  }
-  static BindableMatcher<Decl> getPattern() { return TypeParam().getPattern(); }
-  static TestLanguage getLang() { return TypeParam().getLang(); }
-
-  template <std::string (*ToTUContent)(), std::string (*FromTUContent)(),
-            void (*ResultChecker)(llvm::Expected<Decl *> &, Decl *, Decl *)>
-  void TypedTest_ImportAfter() {
-    Decl *ToTU = getToTuDecl(ToTUContent(), getLang());
-    auto *ToD = FirstDeclMatcher<DeclTy>().match(ToTU, getPattern());
-
-    Decl *FromTU = getTuDecl(FromTUContent(), getLang());
-    auto *FromD = FirstDeclMatcher<DeclTy>().match(FromTU, getPattern());
-
-    auto Result = importOrError(FromD, getLang());
-
-    ResultChecker(Result, ToTU, ToD);
-  }
-
-  // Check that a Decl has been successfully imported into a standalone redecl
-  // chain.
-  static void CheckImportedAsNew(llvm::Expected<Decl *> &Result, Decl *ToTU,
-                                 Decl *ToD) {
-    ASSERT_TRUE(isSuccess(Result));
-    Decl *ImportedD = *Result;
-    ASSERT_TRUE(ImportedD);
-    EXPECT_NE(ImportedD, ToD);
-    EXPECT_EQ(DeclCounter<DeclTy>().match(ToTU, getPattern()), 2u);
-
-    // There may be a hidden fwd spec decl before a function spec decl.
-    if (auto *ImportedF = dyn_cast<FunctionDecl>(ImportedD))
-      if (ImportedF->getTemplatedKind() ==
-          FunctionDecl::TK_FunctionTemplateSpecialization)
-        return;
-
-    EXPECT_FALSE(ImportedD->getPreviousDecl());
-  }
-
-  // Check that a Decl was not imported because of NameConflict.
-  static void CheckImportNameConflict(llvm::Expected<Decl *> &Result,
-                                      Decl *ToTU, Decl *ToD) {
-    EXPECT_TRUE(isImportError(Result, ImportError::NameConflict));
-    EXPECT_EQ(DeclCounter<DeclTy>().match(ToTU, getPattern()), 1u);
-  }
-
-  // Check that a Decl was not imported because lookup found the same decl.
-  static void CheckImportFoundExisting(llvm::Expected<Decl *> &Result,
-                                      Decl *ToTU, Decl *ToD) {
-    ASSERT_TRUE(isSuccess(Result));
-    EXPECT_EQ(DeclCounter<DeclTy>().match(ToTU, getPattern()), 1u);
-  }
-
-  void TypedTest_ImportConflictingDefAfterDef() {
-    TypedTest_ImportAfter<getDefinition, getConflictingDefinition,
-                          CheckImportedAsNew>();
-  }
-  void TypedTest_ImportConflictingProtoAfterProto() {
-    TypedTest_ImportAfter<getPrototype, getConflictingPrototype,
-                          CheckImportedAsNew>();
-  }
-  void TypedTest_ImportConflictingProtoAfterDef() {
-    TypedTest_ImportAfter<getDefinition, getConflictingPrototype,
-                          CheckImportedAsNew>();
-  }
-  void TypedTest_ImportConflictingDefAfterProto() {
-    TypedTest_ImportAfter<getConflictingPrototype, getDefinition,
-                          CheckImportedAsNew>();
-  }
-  void TypedTest_ImportConflictingProtoDefAfterProto() {
-    TypedTest_ImportAfter<getPrototype, getConflictingProtoDef,
-                          CheckImportedAsNew>();
-  }
-  void TypedTest_ImportConflictingProtoAfterProtoDef() {
-    TypedTest_ImportAfter<getConflictingProtoDef, getPrototype,
-                          CheckImportedAsNew>();
-  }
-  void TypedTest_ImportConflictingProtoDefAfterDef() {
-    TypedTest_ImportAfter<getDefinition, getConflictingProtoDef,
-                          CheckImportedAsNew>();
-  }
-  void TypedTest_ImportConflictingDefAfterProtoDef() {
-    TypedTest_ImportAfter<getConflictingProtoDef, getDefinition,
-                          CheckImportedAsNew>();
-  }
-
-  void TypedTest_DontImportConflictingProtoAfterProto() {
-    TypedTest_ImportAfter<getPrototype, getConflictingPrototype,
-                          CheckImportNameConflict>();
-  }
-  void TypedTest_DontImportConflictingDefAfterDef() {
-    TypedTest_ImportAfter<getDefinition, getConflictingDefinition,
-                          CheckImportNameConflict>();
-  }
-  void TypedTest_DontImportConflictingProtoAfterDef() {
-    TypedTest_ImportAfter<getDefinition, getConflictingPrototype,
-                          CheckImportNameConflict>();
-  }
-  void TypedTest_DontImportConflictingDefAfterProto() {
-    TypedTest_ImportAfter<getConflictingPrototype, getDefinition,
-                          CheckImportNameConflict>();
-  }
-  void TypedTest_DontImportConflictingProtoDefAfterProto() {
-    TypedTest_ImportAfter<getPrototype, getConflictingProtoDef,
-                          CheckImportNameConflict>();
-  }
-  void TypedTest_DontImportConflictingProtoAfterProtoDef() {
-    TypedTest_ImportAfter<getConflictingProtoDef, getPrototype,
-                          CheckImportNameConflict>();
-  }
-  void TypedTest_DontImportConflictingProtoDefAfterDef() {
-    TypedTest_ImportAfter<getDefinition, getConflictingProtoDef,
-                          CheckImportNameConflict>();
-  }
-  void TypedTest_DontImportConflictingDefAfterProtoDef() {
-    TypedTest_ImportAfter<getConflictingProtoDef, getDefinition,
-                          CheckImportNameConflict>();
-  }
-
-  // Used for function templates and function template specializations.
-  void TypedTest_ImportDifferentDefAfterDef() {
-    TypedTest_ImportAfter<TypeParam::getDef0, TypeParam::getDef1,
-                          CheckImportedAsNew>();
-  }
-  void TypedTest_DontImportSameDefAfterDef() {
-    TypedTest_ImportAfter<TypeParam::getDef0, TypeParam::getDef0,
-                          CheckImportFoundExisting>();
-  }
-};
-
-// ==============================
-// Define the parametrized tests.
-// ==============================
-
-#define ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(                           \
-    TypeParam, ODRHandlingParam, NamePrefix, TestCase)                         \
-  using TypeParam##ODRHandlingParam =                                          \
-      ODRViolation<TypeParam, ASTImporter::ODRHandlingType::ODRHandlingParam>; \
-  TEST_P(TypeParam##ODRHandlingParam, NamePrefix##TestCase) {                  \
-    TypedTest_##TestCase();                                                    \
-  }
-
-// clang-format off
-
-ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
-    Function, Liberal, ,
-    ImportConflictingDefAfterDef)
-ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
-    Typedef, Liberal, ,
-    ImportConflictingDefAfterDef)
-ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
-    TypedefAlias, Liberal, ,
-    ImportConflictingDefAfterDef)
-ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
-    Enum, Liberal, ,
-    ImportConflictingDefAfterDef)
-ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
-    EnumClass, Liberal, ,
-    ImportConflictingDefAfterDef)
-ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
-    EnumConstant, Liberal, ,
-    ImportConflictingDefAfterDef)
-ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
-    Class, Liberal, ,
-    ImportConflictingDefAfterDef)
-ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
-    Variable, Liberal, ,
-    ImportConflictingDefAfterDef)
-ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
-    ClassTemplate, Liberal, ,
-    ImportConflictingDefAfterDef)
-ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
-    VarTemplate, Liberal, ,
-    ImportConflictingDefAfterDef)
-// Class and variable template specializations/instantiatons are always
-// imported conservatively, because the AST holds the specializations in a set,
-// and the key within the set is a hash calculated from the arguments of the
-// specialization.
-ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
-    ClassTemplateSpec, Liberal, ,
-    DontImportConflictingDefAfterDef) // Don't import !!!
-ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
-    VarTemplateSpec, Liberal, ,
-    DontImportConflictingDefAfterDef) // Don't import !!!
-
-ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
-    Function, Conservative, ,
-    DontImportConflictingDefAfterDef)
-ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
-    Typedef, Conservative, ,
-    DontImportConflictingDefAfterDef)
-ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
-    TypedefAlias, Conservative, ,
-    DontImportConflictingDefAfterDef)
-ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
-    Enum, Conservative, ,
-    DontImportConflictingDefAfterDef)
-ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
-    EnumClass, Conservative, ,
-    DontImportConflictingDefAfterDef)
-ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
-    EnumConstant, Conservative, ,
-    DontImportConflictingDefAfterDef)
-ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
-    Class, Conservative, ,
-    DontImportConflictingDefAfterDef)
-ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
-    Variable, Conservative, ,
-    DontImportConflictingDefAfterDef)
-ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
-    ClassTemplate, Conservative, ,
-    DontImportConflictingDefAfterDef)
-ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
-    VarTemplate, Conservative, ,
-    DontImportConflictingDefAfterDef)
-ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
-    ClassTemplateSpec, Conservative, ,
-    DontImportConflictingDefAfterDef)
-ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
-    VarTemplateSpec, Conservative, ,
-    DontImportConflictingDefAfterDef)
-
-ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
-    Function, Liberal, ,
-    ImportConflictingProtoAfterProto)
-ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
-    Variable, Liberal, ,
-    ImportConflictingProtoAfterProto)
-ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
-    ClassTemplate, Liberal, ,
-    ImportConflictingProtoAfterProto)
-
-ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
-    Function, Conservative, ,
-    DontImportConflictingProtoAfterProto)
-ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
-    Variable, Conservative, ,
-    DontImportConflictingProtoAfterProto)
-ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
-    ClassTemplate, Conservative, ,
-    DontImportConflictingProtoAfterProto)
-
-ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
-    Variable, Liberal, ,
-    ImportConflictingProtoAfterDef)
-ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
-    ClassTemplate, Liberal, ,
-    ImportConflictingProtoAfterDef)
-
-ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
-    Variable, Conservative, ,
-    DontImportConflictingProtoAfterDef)
-ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
-    ClassTemplate, Conservative, ,
-    DontImportConflictingProtoAfterDef)
-
-ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
-    Function, Liberal, ,
-    ImportConflictingDefAfterProto)
-ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
-    Variable, Liberal, ,
-    ImportConflictingDefAfterProto)
-ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
-    ClassTemplate, Liberal, ,
-    ImportConflictingDefAfterProto)
-
-ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
-    Function, Conservative, ,
-    DontImportConflictingDefAfterProto)
-ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
-    Variable, Conservative, ,
-    DontImportConflictingDefAfterProto)
-ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
-    ClassTemplate, Conservative, ,
-    DontImportConflictingDefAfterProto)
-
-ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
-    ClassTemplate, Liberal, ,
-    ImportConflictingProtoDefAfterProto)
-
-ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
-    ClassTemplate, Conservative, ,
-    DontImportConflictingProtoDefAfterProto)
-
-ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
-    ClassTemplate, Liberal, ,
-    ImportConflictingProtoAfterProtoDef)
-
-ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
-    ClassTemplate, Conservative, ,
-    DontImportConflictingProtoAfterProtoDef)
-
-ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
-    ClassTemplate, Liberal, ,
-    ImportConflictingProtoDefAfterDef)
-
-ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
-    ClassTemplate, Conservative, ,
-    DontImportConflictingProtoDefAfterDef)
-
-ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
-    ClassTemplate, Liberal, ,
-    ImportConflictingDefAfterProtoDef)
-
-ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
-    ClassTemplate, Conservative, ,
-    DontImportConflictingDefAfterProtoDef)
-
-// FunctionTemplate decls overload with each other. Thus, they are imported
-// always as a new node, independently from any ODRHandling strategy.
-//
-// Function template specializations are "full" specializations. Structural
-// equivalency does not check the body of functions, so we cannot create
-// conflicting function template specializations. Thus, ODR handling strategies
-// has nothing to do with function template specializations. Fully specialized
-// function templates are imported as new nodes if their template arguments are
-// different.
-ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
-    FunctionTemplate, Liberal, ,
-    ImportDifferentDefAfterDef)
-ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
-    FunctionTemplateSpec, Liberal, ,
-    ImportDifferentDefAfterDef)
-ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
-    FunctionTemplate, Conservative, ,
-    ImportDifferentDefAfterDef)
-ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
-    FunctionTemplateSpec, Conservative, ,
-    ImportDifferentDefAfterDef)
-ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
-    FunctionTemplate, Liberal, ,
-    DontImportSameDefAfterDef)
-ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
-    FunctionTemplateSpec, Liberal, ,
-    DontImportSameDefAfterDef)
-ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
-    FunctionTemplate, Conservative, ,
-    DontImportSameDefAfterDef)
-ASTIMPORTER_ODR_INSTANTIATE_TYPED_TEST_SUITE(
-    FunctionTemplateSpec, Conservative, ,
-    DontImportSameDefAfterDef)
-
-// ======================
-// Instantiate the tests.
-// ======================
-
-// FIXME: These fail on Windows.
-#if !defined(_WIN32)
-INSTANTIATE_TEST_SUITE_P(
-    ODRViolationTests, FunctionConservative,
-    DefaultTestValuesForRunOptions );
-#endif
-INSTANTIATE_TEST_SUITE_P(
-    ODRViolationTests, TypedefConservative,
-    DefaultTestValuesForRunOptions );
-INSTANTIATE_TEST_SUITE_P(
-    ODRViolationTests, TypedefAliasConservative,
-    DefaultTestValuesForRunOptions );
-INSTANTIATE_TEST_SUITE_P(
-    ODRViolationTests, EnumConservative,
-    DefaultTestValuesForRunOptions );
-INSTANTIATE_TEST_SUITE_P(
-    ODRViolationTests, EnumClassConservative,
-    DefaultTestValuesForRunOptions );
-INSTANTIATE_TEST_SUITE_P(
-    ODRViolationTests, EnumConstantConservative,
-    DefaultTestValuesForRunOptions );
-INSTANTIATE_TEST_SUITE_P(
-    ODRViolationTests, ClassConservative,
-    DefaultTestValuesForRunOptions );
-INSTANTIATE_TEST_SUITE_P(
-    ODRViolationTests, VariableConservative,
-    DefaultTestValuesForRunOptions);
-INSTANTIATE_TEST_SUITE_P(
-    ODRViolationTests, ClassTemplateConservative,
-    DefaultTestValuesForRunOptions);
-INSTANTIATE_TEST_SUITE_P(
-    ODRViolationTests, FunctionTemplateConservative,
-    DefaultTestValuesForRunOptions);
-// FIXME: Make VarTemplate tests work.
-//INSTANTIATE_TEST_SUITE_P(
-    //ODRViolationTests, VarTemplateConservative,
-    //DefaultTestValuesForRunOptions);
-INSTANTIATE_TEST_SUITE_P(
-    ODRViolationTests, FunctionTemplateSpecConservative,
-    DefaultTestValuesForRunOptions);
-INSTANTIATE_TEST_SUITE_P(
-    ODRViolationTests, ClassTemplateSpecConservative,
-    DefaultTestValuesForRunOptions);
-// FIXME: Make VarTemplateSpec tests work.
-//INSTANTIATE_TEST_SUITE_P(
-    //ODRViolationTests, VarTemplateSpecConservative,
-    //DefaultTestValuesForRunOptions);
-
-// FIXME: These fail on Windows.
-#if !defined(_WIN32)
-INSTANTIATE_TEST_SUITE_P(
-    ODRViolationTests, FunctionLiberal,
-    DefaultTestValuesForRunOptions);
-#endif
-INSTANTIATE_TEST_SUITE_P(
-    ODRViolationTests, TypedefLiberal,
-    DefaultTestValuesForRunOptions);
-INSTANTIATE_TEST_SUITE_P(
-    ODRViolationTests, TypedefAliasLiberal,
-    DefaultTestValuesForRunOptions);
-INSTANTIATE_TEST_SUITE_P(
-    ODRViolationTests, EnumLiberal,
-    DefaultTestValuesForRunOptions);
-INSTANTIATE_TEST_SUITE_P(
-    ODRViolationTests, EnumClassLiberal,
-    DefaultTestValuesForRunOptions);
-INSTANTIATE_TEST_SUITE_P(
-    ODRViolationTests, EnumConstantLiberal,
-    DefaultTestValuesForRunOptions);
-INSTANTIATE_TEST_SUITE_P(
-    ODRViolationTests, ClassLiberal,
-    DefaultTestValuesForRunOptions);
-INSTANTIATE_TEST_SUITE_P(
-    ODRViolationTests, VariableLiberal,
-    DefaultTestValuesForRunOptions);
-INSTANTIATE_TEST_SUITE_P(
-    ODRViolationTests, ClassTemplateLiberal,
-    DefaultTestValuesForRunOptions);
-INSTANTIATE_TEST_SUITE_P(
-    ODRViolationTests, FunctionTemplateLiberal,
-    DefaultTestValuesForRunOptions);
-// FIXME: Make VarTemplate tests work.
-// INSTANTIATE_TEST_SUITE_P(
-//     ODRViolationTests, VarTemplateLiberal,
-//     DefaultTestValuesForRunOptions);
-INSTANTIATE_TEST_SUITE_P(
-    ODRViolationTests, ClassTemplateSpecLiberal,
-    DefaultTestValuesForRunOptions);
-INSTANTIATE_TEST_SUITE_P(
-    ODRViolationTests, FunctionTemplateSpecLiberal,
-    DefaultTestValuesForRunOptions);
-// FIXME: Make VarTemplateSpec tests work.
-//INSTANTIATE_TEST_SUITE_P(
-    //ODRViolationTests, VarTemplateSpecLiberal,
-    //DefaultTestValuesForRunOptions );
-
-// clang-format on
-
-} // end namespace ast_matchers
-} // end namespace clang
diff --git a/gnu/llvm/clang/unittests/AST/ASTImporterObjCTest.cpp b/gnu/llvm/clang/unittests/AST/ASTImporterObjCTest.cpp
deleted file mode 100644
index c9751fd8dda..00000000000
--- a/gnu/llvm/clang/unittests/AST/ASTImporterObjCTest.cpp
+++ /dev/null
@@ -1,89 +0,0 @@
-//===- unittest/AST/ASTImporterObjCTest.cpp -============================--===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// Tests for the correct import of AST nodes related to Objective-C and
-// Objective-C++.
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/AST/DeclContextInternals.h"
-#include "clang/ASTMatchers/ASTMatchers.h"
-#include "gtest/gtest.h"
-
-#include "ASTImporterFixtures.h"
-
-using namespace clang::ast_matchers;
-using namespace clang;
-
-namespace {
-struct ImportObjCDecl : ASTImporterOptionSpecificTestBase {};
-} // namespace
-
-TEST_P(ImportObjCDecl, ImplicitlyDeclareSelf) {
-  Decl *FromTU = getTuDecl(R"(
-                           __attribute__((objc_root_class))
-                           @interface Root
-                           @end
-                           @interface C : Root
-                             -(void)method;
-                           @end
-                           @implementation C
-                             -(void)method {}
-                           @end
-                           )",
-                           Lang_OBJCXX, "input.mm");
-  auto *FromMethod = LastDeclMatcher<ObjCMethodDecl>().match(
-      FromTU, namedDecl(hasName("method")));
-  ASSERT_TRUE(FromMethod);
-  auto ToMethod = Import(FromMethod, Lang_OBJCXX);
-  ASSERT_TRUE(ToMethod);
-
-  // Both methods should have their implicit parameters.
-  EXPECT_TRUE(FromMethod->getSelfDecl() != nullptr);
-  EXPECT_TRUE(ToMethod->getSelfDecl() != nullptr);
-}
-
-TEST_P(ImportObjCDecl, ObjPropertyNameConflict) {
-  // Tests that properties that share the same name are correctly imported.
-  // This is only possible with one instance and one class property.
-  Decl *FromTU = getTuDecl(R"(
-                           @interface DupProp{}
-                           @property (class) int prop;
-                           @property int prop;
-                           @end
-                           )",
-                           Lang_OBJCXX, "input.mm");
-  auto *FromClass = FirstDeclMatcher<ObjCInterfaceDecl>().match(
-      FromTU, namedDecl(hasName("DupProp")));
-  auto ToClass = Import(FromClass, Lang_OBJCXX);
-  ASSERT_TRUE(ToClass);
-  // We should have one class and one instance property.
-  ASSERT_EQ(
-      1, std::distance(ToClass->classprop_begin(), ToClass->classprop_end()));
-  ASSERT_EQ(1,
-            std::distance(ToClass->instprop_begin(), ToClass->instprop_end()));
-  for (clang::ObjCPropertyDecl *prop : ToClass->properties()) {
-    // All properties should have a getter and a setter.
-    ASSERT_TRUE(prop->getGetterMethodDecl());
-    ASSERT_TRUE(prop->getSetterMethodDecl());
-    // The getters/setters should be able to find the right associated property.
-    ASSERT_EQ(prop->getGetterMethodDecl()->findPropertyDecl(), prop);
-    ASSERT_EQ(prop->getSetterMethodDecl()->findPropertyDecl(), prop);
-  }
-}
-
-static const auto ObjCTestArrayForRunOptions =
-    std::array<std::vector<std::string>, 2>{
-        {std::vector<std::string>{"-fno-objc-arc"},
-         std::vector<std::string>{"-fobjc-arc"}}};
-
-const auto ObjCTestValuesForRunOptions =
-    ::testing::ValuesIn(ObjCTestArrayForRunOptions);
-
-INSTANTIATE_TEST_SUITE_P(ParameterizedTests, ImportObjCDecl,
-                         ObjCTestValuesForRunOptions);
diff --git a/gnu/llvm/clang/unittests/AST/ASTImporterTest.cpp b/gnu/llvm/clang/unittests/AST/ASTImporterTest.cpp
deleted file mode 100644
index d49e7c0cd1f..00000000000
--- a/gnu/llvm/clang/unittests/AST/ASTImporterTest.cpp
+++ /dev/null
@@ -1,6802 +0,0 @@
-//===- unittest/AST/ASTImporterTest.cpp - AST node import test ------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// Tests for the correct import of AST nodes from one AST context to another.
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/ASTMatchers/ASTMatchers.h"
-#include "llvm/ADT/StringMap.h"
-#include "llvm/Support/SmallVectorMemoryBuffer.h"
-
-#include "clang/AST/DeclContextInternals.h"
-#include "gtest/gtest.h"
-
-#include "ASTImporterFixtures.h"
-
-namespace clang {
-namespace ast_matchers {
-
-using internal::Matcher;
-using internal::BindableMatcher;
-using llvm::StringMap;
-
-static const RecordDecl *getRecordDeclOfFriend(FriendDecl *FD) {
-  QualType Ty = FD->getFriendType()->getType().getCanonicalType();
-  return cast<RecordType>(Ty)->getDecl();
-}
-
-struct ImportExpr : TestImportBase {};
-struct ImportType : TestImportBase {};
-struct ImportDecl : TestImportBase {};
-struct ImportFixedPointExpr : ImportExpr {};
-
-struct CanonicalRedeclChain : ASTImporterOptionSpecificTestBase {};
-
-TEST_P(CanonicalRedeclChain, ShouldBeConsequentWithMatchers) {
-  Decl *FromTU = getTuDecl("void f();", Lang_CXX03);
-  auto Pattern = functionDecl(hasName("f"));
-  auto *D0 = FirstDeclMatcher<FunctionDecl>().match(FromTU, Pattern);
-
-  auto Redecls = getCanonicalForwardRedeclChain(D0);
-  ASSERT_EQ(Redecls.size(), 1u);
-  EXPECT_EQ(D0, Redecls[0]);
-}
-
-TEST_P(CanonicalRedeclChain, ShouldBeConsequentWithMatchers2) {
-  Decl *FromTU = getTuDecl("void f(); void f(); void f();", Lang_CXX03);
-  auto Pattern = functionDecl(hasName("f"));
-  auto *D0 = FirstDeclMatcher<FunctionDecl>().match(FromTU, Pattern);
-  auto *D2 = LastDeclMatcher<FunctionDecl>().match(FromTU, Pattern);
-  FunctionDecl *D1 = D2->getPreviousDecl();
-
-  auto Redecls = getCanonicalForwardRedeclChain(D0);
-  ASSERT_EQ(Redecls.size(), 3u);
-  EXPECT_EQ(D0, Redecls[0]);
-  EXPECT_EQ(D1, Redecls[1]);
-  EXPECT_EQ(D2, Redecls[2]);
-}
-
-TEST_P(CanonicalRedeclChain, ShouldBeSameForAllDeclInTheChain) {
-  Decl *FromTU = getTuDecl("void f(); void f(); void f();", Lang_CXX03);
-  auto Pattern = functionDecl(hasName("f"));
-  auto *D0 = FirstDeclMatcher<FunctionDecl>().match(FromTU, Pattern);
-  auto *D2 = LastDeclMatcher<FunctionDecl>().match(FromTU, Pattern);
-  FunctionDecl *D1 = D2->getPreviousDecl();
-
-  auto RedeclsD0 = getCanonicalForwardRedeclChain(D0);
-  auto RedeclsD1 = getCanonicalForwardRedeclChain(D1);
-  auto RedeclsD2 = getCanonicalForwardRedeclChain(D2);
-
-  EXPECT_THAT(RedeclsD0, ::testing::ContainerEq(RedeclsD1));
-  EXPECT_THAT(RedeclsD1, ::testing::ContainerEq(RedeclsD2));
-}
-
-namespace {
-struct RedirectingImporter : public ASTImporter {
-  using ASTImporter::ASTImporter;
-
-protected:
-  llvm::Expected<Decl *> ImportImpl(Decl *FromD) override {
-    auto *ND = dyn_cast<NamedDecl>(FromD);
-    if (!ND || ND->getName() != "shouldNotBeImported")
-      return ASTImporter::ImportImpl(FromD);
-    for (Decl *D : getToContext().getTranslationUnitDecl()->decls()) {
-      if (auto *ND = dyn_cast<NamedDecl>(D))
-        if (ND->getName() == "realDecl") {
-          RegisterImportedDecl(FromD, ND);
-          return ND;
-        }
-    }
-    return ASTImporter::ImportImpl(FromD);
-  }
-};
-
-} // namespace
-
-struct RedirectingImporterTest : ASTImporterOptionSpecificTestBase {
-  RedirectingImporterTest() {
-    Creator = [](ASTContext &ToContext, FileManager &ToFileManager,
-                 ASTContext &FromContext, FileManager &FromFileManager,
-                 bool MinimalImport,
-                 const std::shared_ptr<ASTImporterSharedState> &SharedState) {
-      return new RedirectingImporter(ToContext, ToFileManager, FromContext,
-                                     FromFileManager, MinimalImport,
-                                     SharedState);
-    };
-  }
-};
-
-// Test that an ASTImporter subclass can intercept an import call.
-TEST_P(RedirectingImporterTest, InterceptImport) {
-  Decl *From, *To;
-  std::tie(From, To) =
-      getImportedDecl("class shouldNotBeImported {};", Lang_CXX03,
-                      "class realDecl {};", Lang_CXX03, "shouldNotBeImported");
-  auto *Imported = cast<CXXRecordDecl>(To);
-  EXPECT_EQ(Imported->getQualifiedNameAsString(), "realDecl");
-
-  // Make sure our importer prevented the importing of the decl.
-  auto *ToTU = Imported->getTranslationUnitDecl();
-  auto Pattern = functionDecl(hasName("shouldNotBeImported"));
-  unsigned count =
-      DeclCounterWithPredicate<CXXRecordDecl>().match(ToTU, Pattern);
-  EXPECT_EQ(0U, count);
-}
-
-// Test that when we indirectly import a declaration the custom ASTImporter
-// is still intercepting the import.
-TEST_P(RedirectingImporterTest, InterceptIndirectImport) {
-  Decl *From, *To;
-  std::tie(From, To) =
-      getImportedDecl("class shouldNotBeImported {};"
-                      "class F { shouldNotBeImported f; };",
-                      Lang_CXX03, "class realDecl {};", Lang_CXX03, "F");
-
-  // Make sure our ASTImporter prevented the importing of the decl.
-  auto *ToTU = To->getTranslationUnitDecl();
-  auto Pattern = functionDecl(hasName("shouldNotBeImported"));
-  unsigned count =
-      DeclCounterWithPredicate<CXXRecordDecl>().match(ToTU, Pattern);
-  EXPECT_EQ(0U, count);
-}
-
-struct ImportPath : ASTImporterOptionSpecificTestBase {
-  Decl *FromTU;
-  FunctionDecl *D0, *D1, *D2;
-  ImportPath() {
-    FromTU = getTuDecl("void f(); void f(); void f();", Lang_CXX03);
-    auto Pattern = functionDecl(hasName("f"));
-    D0 = FirstDeclMatcher<FunctionDecl>().match(FromTU, Pattern);
-    D2 = LastDeclMatcher<FunctionDecl>().match(FromTU, Pattern);
-    D1 = D2->getPreviousDecl();
-  }
-};
-
-TEST_P(ImportPath, Push) {
-  ASTImporter::ImportPathTy path;
-  path.push(D0);
-  EXPECT_FALSE(path.hasCycleAtBack());
-}
-
-TEST_P(ImportPath, SmallCycle) {
-  ASTImporter::ImportPathTy path;
-  path.push(D0);
-  path.push(D0);
-  EXPECT_TRUE(path.hasCycleAtBack());
-  path.pop();
-  EXPECT_FALSE(path.hasCycleAtBack());
-  path.push(D0);
-  EXPECT_TRUE(path.hasCycleAtBack());
-}
-
-TEST_P(ImportPath, GetSmallCycle) {
-  ASTImporter::ImportPathTy path;
-  path.push(D0);
-  path.push(D0);
-  EXPECT_TRUE(path.hasCycleAtBack());
-  std::array<Decl* ,2> Res;
-  int i = 0;
-  for (Decl *Di : path.getCycleAtBack()) {
-    Res[i++] = Di;
-  }
-  ASSERT_EQ(i, 2);
-  EXPECT_EQ(Res[0], D0);
-  EXPECT_EQ(Res[1], D0);
-}
-
-TEST_P(ImportPath, GetCycle) {
-  ASTImporter::ImportPathTy path;
-  path.push(D0);
-  path.push(D1);
-  path.push(D2);
-  path.push(D0);
-  EXPECT_TRUE(path.hasCycleAtBack());
-  std::array<Decl* ,4> Res;
-  int i = 0;
-  for (Decl *Di : path.getCycleAtBack()) {
-    Res[i++] = Di;
-  }
-  ASSERT_EQ(i, 4);
-  EXPECT_EQ(Res[0], D0);
-  EXPECT_EQ(Res[1], D2);
-  EXPECT_EQ(Res[2], D1);
-  EXPECT_EQ(Res[3], D0);
-}
-
-TEST_P(ImportPath, CycleAfterCycle) {
-  ASTImporter::ImportPathTy path;
-  path.push(D0);
-  path.push(D1);
-  path.push(D0);
-  path.push(D1);
-  path.push(D2);
-  path.push(D0);
-  EXPECT_TRUE(path.hasCycleAtBack());
-  std::array<Decl* ,4> Res;
-  int i = 0;
-  for (Decl *Di : path.getCycleAtBack()) {
-    Res[i++] = Di;
-  }
-  ASSERT_EQ(i, 4);
-  EXPECT_EQ(Res[0], D0);
-  EXPECT_EQ(Res[1], D2);
-  EXPECT_EQ(Res[2], D1);
-  EXPECT_EQ(Res[3], D0);
-
-  path.pop();
-  path.pop();
-  path.pop();
-  EXPECT_TRUE(path.hasCycleAtBack());
-  i = 0;
-  for (Decl *Di : path.getCycleAtBack()) {
-    Res[i++] = Di;
-  }
-  ASSERT_EQ(i, 3);
-  EXPECT_EQ(Res[0], D0);
-  EXPECT_EQ(Res[1], D1);
-  EXPECT_EQ(Res[2], D0);
-
-  path.pop();
-  EXPECT_FALSE(path.hasCycleAtBack());
-}
-
-const internal::VariadicDynCastAllOfMatcher<Stmt, SourceLocExpr> sourceLocExpr;
-
-AST_MATCHER_P(SourceLocExpr, hasBuiltinStr, StringRef, Str) {
-  return Node.getBuiltinStr() == Str;
-}
-
-TEST_P(ImportExpr, ImportSourceLocExpr) {
-  MatchVerifier<Decl> Verifier;
-  testImport("void declToImport() { (void)__builtin_FILE(); }", Lang_CXX03, "",
-             Lang_CXX03, Verifier,
-             functionDecl(hasDescendant(
-                 sourceLocExpr(hasBuiltinStr("__builtin_FILE")))));
-  testImport("void declToImport() { (void)__builtin_COLUMN(); }", Lang_CXX03,
-             "", Lang_CXX03, Verifier,
-             functionDecl(hasDescendant(
-                 sourceLocExpr(hasBuiltinStr("__builtin_COLUMN")))));
-}
-
-TEST_P(ImportExpr, ImportStringLiteral) {
-  MatchVerifier<Decl> Verifier;
-  testImport("void declToImport() { (void)\"foo\"; }", Lang_CXX03, "",
-             Lang_CXX03, Verifier,
-             functionDecl(hasDescendant(
-                 stringLiteral(hasType(asString("const char [4]"))))));
-  testImport("void declToImport() { (void)L\"foo\"; }", Lang_CXX03, "",
-             Lang_CXX03, Verifier,
-             functionDecl(hasDescendant(
-                 stringLiteral(hasType(asString("const wchar_t [4]"))))));
-  testImport("void declToImport() { (void) \"foo\" \"bar\"; }", Lang_CXX03, "",
-             Lang_CXX03, Verifier,
-             functionDecl(hasDescendant(
-                 stringLiteral(hasType(asString("const char [7]"))))));
-}
-
-TEST_P(ImportExpr, ImportChooseExpr) {
-  MatchVerifier<Decl> Verifier;
-
-  // This case tests C code that is not condition-dependent and has a true
-  // condition.
-  testImport("void declToImport() { (void)__builtin_choose_expr(1, 2, 3); }",
-             Lang_C99, "", Lang_C99, Verifier,
-             functionDecl(hasDescendant(chooseExpr())));
-}
-
-TEST_P(ImportExpr, ImportGNUNullExpr) {
-  MatchVerifier<Decl> Verifier;
-  testImport("void declToImport() { (void)__null; }", Lang_CXX03, "",
-             Lang_CXX03, Verifier,
-             functionDecl(hasDescendant(gnuNullExpr(hasType(isInteger())))));
-}
-
-TEST_P(ImportExpr, ImportGenericSelectionExpr) {
-  MatchVerifier<Decl> Verifier;
-
-  testImport(
-      "void declToImport() { int x; (void)_Generic(x, int: 0, float: 1); }",
-      Lang_C99, "", Lang_C99, Verifier,
-      functionDecl(hasDescendant(genericSelectionExpr())));
-}
-
-TEST_P(ImportExpr, ImportCXXNullPtrLiteralExpr) {
-  MatchVerifier<Decl> Verifier;
-  testImport(
-      "void declToImport() { (void)nullptr; }",
-      Lang_CXX11, "", Lang_CXX11, Verifier,
-      functionDecl(hasDescendant(cxxNullPtrLiteralExpr())));
-}
-
-
-TEST_P(ImportExpr, ImportFloatinglLiteralExpr) {
-  MatchVerifier<Decl> Verifier;
-  testImport("void declToImport() { (void)1.0; }", Lang_C99, "", Lang_C99,
-             Verifier,
-             functionDecl(hasDescendant(
-                 floatLiteral(equals(1.0), hasType(asString("double"))))));
-  testImport("void declToImport() { (void)1.0e-5f; }", Lang_C99, "", Lang_C99,
-             Verifier,
-             functionDecl(hasDescendant(
-                 floatLiteral(equals(1.0e-5f), hasType(asString("float"))))));
-}
-
-TEST_P(ImportFixedPointExpr, ImportFixedPointerLiteralExpr) {
-  MatchVerifier<Decl> Verifier;
-  testImport("void declToImport() { (void)1.0k; }", Lang_C99, "", Lang_C99,
-             Verifier, functionDecl(hasDescendant(fixedPointLiteral())));
-  testImport("void declToImport() { (void)0.75r; }", Lang_C99, "", Lang_C99,
-             Verifier, functionDecl(hasDescendant(fixedPointLiteral())));
-}
-
-TEST_P(ImportExpr, ImportImaginaryLiteralExpr) {
-  MatchVerifier<Decl> Verifier;
-  testImport(
-      "void declToImport() { (void)1.0i; }",
-      Lang_CXX14, "", Lang_CXX14, Verifier,
-      functionDecl(hasDescendant(imaginaryLiteral())));
-}
-
-TEST_P(ImportExpr, ImportCompoundLiteralExpr) {
-  MatchVerifier<Decl> Verifier;
-  testImport("void declToImport() {"
-             "  struct s { int x; long y; unsigned z; }; "
-             "  (void)(struct s){ 42, 0L, 1U }; }",
-             Lang_CXX03, "", Lang_CXX03, Verifier,
-             functionDecl(hasDescendant(compoundLiteralExpr(
-                 hasType(asString("struct s")),
-                 has(initListExpr(
-                     hasType(asString("struct s")),
-                     has(integerLiteral(equals(42), hasType(asString("int")))),
-                     has(integerLiteral(equals(0), hasType(asString("long")))),
-                     has(integerLiteral(
-                         equals(1), hasType(asString("unsigned int"))))))))));
-}
-
-TEST_P(ImportExpr, ImportCXXThisExpr) {
-  MatchVerifier<Decl> Verifier;
-  testImport("class declToImport { void f() { (void)this; } };", Lang_CXX03, "",
-             Lang_CXX03, Verifier,
-             cxxRecordDecl(hasMethod(hasDescendant(
-                 cxxThisExpr(hasType(asString("class declToImport *")))))));
-}
-
-TEST_P(ImportExpr, ImportAtomicExpr) {
-  MatchVerifier<Decl> Verifier;
-  testImport("void declToImport() { int *ptr; __atomic_load_n(ptr, 1); }",
-             Lang_C99, "", Lang_C99, Verifier,
-             functionDecl(hasDescendant(atomicExpr(
-                 has(ignoringParenImpCasts(
-                     declRefExpr(hasDeclaration(varDecl(hasName("ptr"))),
-                                 hasType(asString("int *"))))),
-                 has(integerLiteral(equals(1), hasType(asString("int"))))))));
-}
-
-TEST_P(ImportExpr, ImportLabelDeclAndAddrLabelExpr) {
-  MatchVerifier<Decl> Verifier;
-  testImport("void declToImport() { loop: goto loop; (void)&&loop; }", Lang_C99,
-             "", Lang_C99, Verifier,
-             functionDecl(hasDescendant(labelStmt(
-                              hasDeclaration(labelDecl(hasName("loop"))))),
-                          hasDescendant(addrLabelExpr(
-                              hasDeclaration(labelDecl(hasName("loop")))))));
-}
-
-AST_MATCHER_P(TemplateDecl, hasTemplateDecl,
-              internal::Matcher<NamedDecl>, InnerMatcher) {
-  const NamedDecl *Template = Node.getTemplatedDecl();
-  return Template && InnerMatcher.matches(*Template, Finder, Builder);
-}
-
-TEST_P(ImportExpr, ImportParenListExpr) {
-  MatchVerifier<Decl> Verifier;
-  testImport(
-      "template<typename T> class dummy { void f() { dummy X(*this); } };"
-      "typedef dummy<int> declToImport;"
-      "template class dummy<int>;",
-      Lang_CXX03, "", Lang_CXX03, Verifier,
-      typedefDecl(hasType(templateSpecializationType(
-          hasDeclaration(classTemplateSpecializationDecl(hasSpecializedTemplate(
-              classTemplateDecl(hasTemplateDecl(cxxRecordDecl(hasMethod(allOf(
-                  hasName("f"),
-                  hasBody(compoundStmt(has(declStmt(hasSingleDecl(
-                      varDecl(hasInitializer(parenListExpr(has(unaryOperator(
-                          hasOperatorName("*"),
-                          hasUnaryOperand(cxxThisExpr())))))))))))))))))))))));
-}
-
-TEST_P(ImportExpr, ImportSwitch) {
-  MatchVerifier<Decl> Verifier;
-  testImport("void declToImport() { int b; switch (b) { case 1: break; } }",
-             Lang_C99, "", Lang_C99, Verifier,
-             functionDecl(hasDescendant(
-                 switchStmt(has(compoundStmt(has(caseStmt())))))));
-}
-
-TEST_P(ImportExpr, ImportStmtExpr) {
-  MatchVerifier<Decl> Verifier;
-  testImport(
-      "void declToImport() { int b; int a = b ?: 1; int C = ({int X=4; X;}); }",
-      Lang_C99, "", Lang_C99, Verifier,
-      traverse(TK_AsIs,
-               functionDecl(hasDescendant(varDecl(
-                   hasName("C"), hasType(asString("int")),
-                   hasInitializer(stmtExpr(
-                       hasAnySubstatement(declStmt(hasSingleDecl(varDecl(
-                           hasName("X"), hasType(asString("int")),
-                           hasInitializer(integerLiteral(equals(4))))))),
-                       hasDescendant(implicitCastExpr()))))))));
-}
-
-TEST_P(ImportExpr, ImportConditionalOperator) {
-  MatchVerifier<Decl> Verifier;
-  testImport("void declToImport() { (void)(true ? 1 : -5); }", Lang_CXX03, "",
-             Lang_CXX03, Verifier,
-             functionDecl(hasDescendant(conditionalOperator(
-                 hasCondition(cxxBoolLiteral(equals(true))),
-                 hasTrueExpression(integerLiteral(equals(1))),
-                 hasFalseExpression(unaryOperator(
-                     hasUnaryOperand(integerLiteral(equals(5)))))))));
-}
-
-TEST_P(ImportExpr, ImportBinaryConditionalOperator) {
-  MatchVerifier<Decl> Verifier;
-  testImport(
-      "void declToImport() { (void)(1 ?: -5); }", Lang_CXX03, "", Lang_CXX03,
-      Verifier,
-      traverse(TK_AsIs,
-               functionDecl(hasDescendant(binaryConditionalOperator(
-                   hasCondition(implicitCastExpr(
-                       hasSourceExpression(opaqueValueExpr(
-                           hasSourceExpression(integerLiteral(equals(1))))),
-                       hasType(booleanType()))),
-                   hasTrueExpression(opaqueValueExpr(
-                       hasSourceExpression(integerLiteral(equals(1))))),
-                   hasFalseExpression(unaryOperator(
-                       hasOperatorName("-"),
-                       hasUnaryOperand(integerLiteral(equals(5))))))))));
-}
-
-TEST_P(ImportExpr, ImportDesignatedInitExpr) {
-  MatchVerifier<Decl> Verifier;
-  testImport(
-      "void declToImport() {"
-      "  struct point { double x; double y; };"
-      "  struct point ptarray[10] = "
-      "{ [2].y = 1.0, [2].x = 2.0, [0].x = 1.0 }; }",
-      Lang_C99, "", Lang_C99, Verifier,
-      functionDecl(hasDescendant(initListExpr(
-          has(designatedInitExpr(designatorCountIs(2),
-                                 hasDescendant(floatLiteral(equals(1.0))),
-                                 hasDescendant(integerLiteral(equals(2))))),
-          has(designatedInitExpr(designatorCountIs(2),
-                                 hasDescendant(floatLiteral(equals(2.0))),
-                                 hasDescendant(integerLiteral(equals(2))))),
-          has(designatedInitExpr(designatorCountIs(2),
-                                 hasDescendant(floatLiteral(equals(1.0))),
-                                 hasDescendant(integerLiteral(equals(0)))))))));
-}
-
-TEST_P(ImportExpr, ImportPredefinedExpr) {
-  MatchVerifier<Decl> Verifier;
-  // __func__ expands as StringLiteral("declToImport")
-  testImport("void declToImport() { (void)__func__; }", Lang_CXX03, "",
-             Lang_CXX03, Verifier,
-             functionDecl(hasDescendant(predefinedExpr(
-                 hasType(asString("const char [13]")),
-                 has(stringLiteral(hasType(asString("const char [13]"))))))));
-}
-
-TEST_P(ImportExpr, ImportInitListExpr) {
-  MatchVerifier<Decl> Verifier;
-  testImport(
-      "void declToImport() {"
-      "  struct point { double x; double y; };"
-      "  point ptarray[10] = { [2].y = 1.0, [2].x = 2.0,"
-      "                        [0].x = 1.0 }; }",
-      Lang_CXX03, "", Lang_CXX03, Verifier,
-      functionDecl(hasDescendant(initListExpr(
-          has(cxxConstructExpr(requiresZeroInitialization())),
-          has(initListExpr(
-              hasType(asString("struct point")), has(floatLiteral(equals(1.0))),
-              has(implicitValueInitExpr(hasType(asString("double")))))),
-          has(initListExpr(hasType(asString("struct point")),
-                           has(floatLiteral(equals(2.0))),
-                           has(floatLiteral(equals(1.0)))))))));
-}
-
-
-const internal::VariadicDynCastAllOfMatcher<Expr, VAArgExpr> vaArgExpr;
-
-TEST_P(ImportExpr, ImportVAArgExpr) {
-  MatchVerifier<Decl> Verifier;
-  testImport("void declToImport(__builtin_va_list list, ...) {"
-             "  (void)__builtin_va_arg(list, int); }",
-             Lang_CXX03, "", Lang_CXX03, Verifier,
-             functionDecl(hasDescendant(
-                 cStyleCastExpr(hasSourceExpression(vaArgExpr())))));
-}
-
-TEST_P(ImportExpr, CXXTemporaryObjectExpr) {
-  MatchVerifier<Decl> Verifier;
-  testImport(
-      "struct C {};"
-      "void declToImport() { C c = C(); }",
-      Lang_CXX03, "", Lang_CXX03, Verifier,
-      traverse(TK_AsIs,
-               functionDecl(hasDescendant(exprWithCleanups(has(cxxConstructExpr(
-                   has(materializeTemporaryExpr(has(implicitCastExpr(
-                       has(cxxTemporaryObjectExpr()))))))))))));
-}
-
-TEST_P(ImportType, ImportAtomicType) {
-  MatchVerifier<Decl> Verifier;
-  testImport(
-      "void declToImport() { typedef _Atomic(int) a_int; }",
-      Lang_CXX11, "", Lang_CXX11, Verifier,
-      functionDecl(hasDescendant(typedefDecl(has(atomicType())))));
-}
-
-TEST_P(ImportDecl, ImportFunctionTemplateDecl) {
-  MatchVerifier<Decl> Verifier;
-  testImport("template <typename T> void declToImport() { };", Lang_CXX03, "",
-             Lang_CXX03, Verifier, functionTemplateDecl());
-}
-
-TEST_P(ImportExpr, ImportCXXDependentScopeMemberExpr) {
-  MatchVerifier<Decl> Verifier;
-  testImport("template <typename T> struct C { T t; };"
-             "template <typename T> void declToImport() {"
-             "  C<T> d;"
-             "  (void)d.t;"
-             "}"
-             "void instantiate() { declToImport<int>(); }",
-             Lang_CXX03, "", Lang_CXX03, Verifier,
-             functionTemplateDecl(hasDescendant(
-                 cStyleCastExpr(has(cxxDependentScopeMemberExpr())))));
-  testImport("template <typename T> struct C { T t; };"
-             "template <typename T> void declToImport() {"
-             "  C<T> d;"
-             "  (void)(&d)->t;"
-             "}"
-             "void instantiate() { declToImport<int>(); }",
-             Lang_CXX03, "", Lang_CXX03, Verifier,
-             functionTemplateDecl(hasDescendant(
-                 cStyleCastExpr(has(cxxDependentScopeMemberExpr())))));
-}
-
-TEST_P(ImportType, ImportTypeAliasTemplate) {
-  MatchVerifier<Decl> Verifier;
-  testImport(
-      "template <int K>"
-      "struct dummy { static const int i = K; };"
-      "template <int K> using dummy2 = dummy<K>;"
-      "int declToImport() { return dummy2<3>::i; }",
-      Lang_CXX11, "", Lang_CXX11, Verifier,
-      traverse(TK_AsIs,
-               functionDecl(hasDescendant(implicitCastExpr(has(declRefExpr()))),
-                            unless(hasAncestor(
-                                translationUnitDecl(has(typeAliasDecl())))))));
-}
-
-const internal::VariadicDynCastAllOfMatcher<Decl, VarTemplateSpecializationDecl>
-    varTemplateSpecializationDecl;
-
-TEST_P(ImportDecl, ImportVarTemplate) {
-  MatchVerifier<Decl> Verifier;
-  testImport(
-      "template <typename T>"
-      "T pi = T(3.1415926535897932385L);"
-      "void declToImport() { (void)pi<int>; }",
-      Lang_CXX14, "", Lang_CXX14, Verifier,
-      functionDecl(
-          hasDescendant(declRefExpr(to(varTemplateSpecializationDecl()))),
-          unless(hasAncestor(translationUnitDecl(has(varDecl(
-              hasName("pi"), unless(varTemplateSpecializationDecl()))))))));
-}
-
-TEST_P(ImportType, ImportPackExpansion) {
-  MatchVerifier<Decl> Verifier;
-  testImport("template <typename... Args>"
-             "struct dummy {"
-             "  dummy(Args... args) {}"
-             "  static const int i = 4;"
-             "};"
-             "int declToImport() { return dummy<int>::i; }",
-             Lang_CXX11, "", Lang_CXX11, Verifier,
-             traverse(TK_AsIs, functionDecl(hasDescendant(returnStmt(has(
-                                   implicitCastExpr(has(declRefExpr()))))))));
-}
-
-const internal::VariadicDynCastAllOfMatcher<Type,
-                                            DependentTemplateSpecializationType>
-    dependentTemplateSpecializationType;
-
-TEST_P(ImportType, ImportDependentTemplateSpecialization) {
-  MatchVerifier<Decl> Verifier;
-  testImport("template<typename T>"
-             "struct A;"
-             "template<typename T>"
-             "struct declToImport {"
-             "  typename A<T>::template B<T> a;"
-             "};",
-             Lang_CXX03, "", Lang_CXX03, Verifier,
-             classTemplateDecl(has(cxxRecordDecl(has(
-                 fieldDecl(hasType(dependentTemplateSpecializationType())))))));
-}
-
-TEST_P(ImportType, ImportDeducedTemplateSpecialization) {
-  MatchVerifier<Decl> Verifier;
-  testImport("template <typename T>"
-             "class C { public: C(T); };"
-             "C declToImport(123);",
-             Lang_CXX17, "", Lang_CXX17, Verifier,
-             varDecl(hasType(deducedTemplateSpecializationType())));
-}
-
-const internal::VariadicDynCastAllOfMatcher<Stmt, SizeOfPackExpr>
-    sizeOfPackExpr;
-
-TEST_P(ImportExpr, ImportSizeOfPackExpr) {
-  MatchVerifier<Decl> Verifier;
-  testImport(
-      "template <typename... Ts>"
-      "void declToImport() {"
-      "  const int i = sizeof...(Ts);"
-      "};"
-      "void g() { declToImport<int>(); }",
-      Lang_CXX11, "", Lang_CXX11, Verifier,
-          functionTemplateDecl(hasDescendant(sizeOfPackExpr())));
-  testImport(
-      "template <typename... Ts>"
-      "using X = int[sizeof...(Ts)];"
-      "template <typename... Us>"
-      "struct Y {"
-      "  X<Us..., int, double, int, Us...> f;"
-      "};"
-      "Y<float, int> declToImport;",
-      Lang_CXX11, "", Lang_CXX11, Verifier,
-      varDecl(hasType(classTemplateSpecializationDecl(has(fieldDecl(hasType(
-          hasUnqualifiedDesugaredType(constantArrayType(hasSize(7))))))))));
-}
-
-const internal::VariadicDynCastAllOfMatcher<Stmt, CXXFoldExpr> cxxFoldExpr;
-
-AST_MATCHER_P(CXXFoldExpr, hasOperator, BinaryOperatorKind, Op) {
-  return Node.getOperator() == Op;
-}
-AST_MATCHER(CXXFoldExpr, hasInit) { return Node.getInit(); }
-AST_MATCHER(CXXFoldExpr, isRightFold) { return Node.isRightFold(); }
-AST_MATCHER(CXXFoldExpr, isLeftFold) { return Node.isLeftFold(); }
-
-TEST_P(ImportExpr, ImportCXXFoldExpr) {
-  auto Match1 =
-      cxxFoldExpr(hasOperator(BO_Add), isLeftFold(), unless(hasInit()));
-  auto Match2 = cxxFoldExpr(hasOperator(BO_Sub), isLeftFold(), hasInit());
-  auto Match3 =
-      cxxFoldExpr(hasOperator(BO_Mul), isRightFold(), unless(hasInit()));
-  auto Match4 = cxxFoldExpr(hasOperator(BO_Div), isRightFold(), hasInit());
-
-  MatchVerifier<Decl> Verifier;
-  testImport("template <typename... Ts>"
-             "void declToImport(Ts... args) {"
-             "  const int i1 = (... + args);"
-             "  const int i2 = (1 - ... - args);"
-             "  const int i3 = (args * ...);"
-             "  const int i4 = (args / ... / 1);"
-             "};"
-             "void g() { declToImport(1, 2, 3, 4, 5); }",
-             Lang_CXX17, "", Lang_CXX17, Verifier,
-             functionTemplateDecl(hasDescendant(Match1), hasDescendant(Match2),
-                                  hasDescendant(Match3),
-                                  hasDescendant(Match4)));
-}
-
-/// \brief Matches __builtin_types_compatible_p:
-/// GNU extension to check equivalent types
-/// Given
-/// \code
-///   __builtin_types_compatible_p(int, int)
-/// \endcode
-//  will generate TypeTraitExpr <...> 'int'
-const internal::VariadicDynCastAllOfMatcher<Stmt, TypeTraitExpr> typeTraitExpr;
-
-TEST_P(ImportExpr, ImportTypeTraitExpr) {
-  MatchVerifier<Decl> Verifier;
-  testImport(
-      "void declToImport() { "
-      "  (void)__builtin_types_compatible_p(int, int);"
-      "}",
-      Lang_C99, "", Lang_C99, Verifier,
-      functionDecl(hasDescendant(typeTraitExpr(hasType(asString("int"))))));
-}
-
-const internal::VariadicDynCastAllOfMatcher<Stmt, CXXTypeidExpr> cxxTypeidExpr;
-
-TEST_P(ImportExpr, ImportCXXTypeidExpr) {
-  MatchVerifier<Decl> Verifier;
-  testImport(
-      "namespace std { class type_info {}; }"
-      "void declToImport() {"
-      "  int x;"
-      "  auto a = typeid(int); auto b = typeid(x);"
-      "}",
-      Lang_CXX11, "", Lang_CXX11, Verifier,
-      traverse(
-          TK_AsIs,
-          functionDecl(
-              hasDescendant(varDecl(hasName("a"), hasInitializer(hasDescendant(
-                                                      cxxTypeidExpr())))),
-              hasDescendant(varDecl(hasName("b"), hasInitializer(hasDescendant(
-                                                      cxxTypeidExpr())))))));
-}
-
-TEST_P(ImportExpr, ImportTypeTraitExprValDep) {
-  MatchVerifier<Decl> Verifier;
-  testImport(
-      "template<typename T> struct declToImport {"
-      "  void m() { (void)__is_pod(T); }"
-      "};"
-      "void f() { declToImport<int>().m(); }",
-      Lang_CXX11, "", Lang_CXX11, Verifier,
-      classTemplateDecl(has(cxxRecordDecl(has(
-          functionDecl(hasDescendant(
-              typeTraitExpr(hasType(booleanType())))))))));
-}
-
-TEST_P(ImportDecl, ImportRecordDeclInFunc) {
-  MatchVerifier<Decl> Verifier;
-  testImport("int declToImport() { "
-             "  struct data_t {int a;int b;};"
-             "  struct data_t d;"
-             "  return 0;"
-             "}",
-             Lang_C99, "", Lang_C99, Verifier,
-             functionDecl(hasBody(compoundStmt(
-                 has(declStmt(hasSingleDecl(varDecl(hasName("d")))))))));
-}
-
-TEST_P(ImportDecl, ImportedVarDeclPreservesThreadLocalStorage) {
-  MatchVerifier<Decl> Verifier;
-  testImport("thread_local int declToImport;", Lang_CXX11, "", Lang_CXX11,
-             Verifier, varDecl(hasThreadStorageDuration()));
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase, ImportRecordTypeInFunc) {
-  Decl *FromTU = getTuDecl("int declToImport() { "
-                           "  struct data_t {int a;int b;};"
-                           "  struct data_t d;"
-                           "  return 0;"
-                           "}",
-                           Lang_C99, "input.c");
-  auto *FromVar =
-      FirstDeclMatcher<VarDecl>().match(FromTU, varDecl(hasName("d")));
-  ASSERT_TRUE(FromVar);
-  auto ToType =
-      ImportType(FromVar->getType().getCanonicalType(), FromVar, Lang_C99);
-  EXPECT_FALSE(ToType.isNull());
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase, ImportRecordDeclInFuncParams) {
-  // This construct is not supported by ASTImporter.
-  Decl *FromTU = getTuDecl(
-      "int declToImport(struct data_t{int a;int b;} ***d){ return 0; }",
-      Lang_C99, "input.c");
-  auto *From = FirstDeclMatcher<FunctionDecl>().match(
-      FromTU, functionDecl(hasName("declToImport")));
-  ASSERT_TRUE(From);
-  auto *To = Import(From, Lang_C99);
-  EXPECT_EQ(To, nullptr);
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase, ImportRecordDeclInFuncFromMacro) {
-  Decl *FromTU =
-      getTuDecl("#define NONAME_SIZEOF(type) sizeof(struct{type *dummy;}) \n"
-                "int declToImport(){ return NONAME_SIZEOF(int); }",
-                Lang_C99, "input.c");
-  auto *From = FirstDeclMatcher<FunctionDecl>().match(
-      FromTU, functionDecl(hasName("declToImport")));
-  ASSERT_TRUE(From);
-  auto *To = Import(From, Lang_C99);
-  ASSERT_TRUE(To);
-  EXPECT_TRUE(MatchVerifier<FunctionDecl>().match(
-      To, functionDecl(hasName("declToImport"),
-                       hasDescendant(unaryExprOrTypeTraitExpr()))));
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase,
-       ImportRecordDeclInFuncParamsFromMacro) {
-  // This construct is not supported by ASTImporter.
-  Decl *FromTU =
-      getTuDecl("#define PAIR_STRUCT(type) struct data_t{type a;type b;} \n"
-                "int declToImport(PAIR_STRUCT(int) ***d){ return 0; }",
-                Lang_C99, "input.c");
-  auto *From = FirstDeclMatcher<FunctionDecl>().match(
-      FromTU, functionDecl(hasName("declToImport")));
-  ASSERT_TRUE(From);
-  auto *To = Import(From, Lang_C99);
-  EXPECT_EQ(To, nullptr);
-}
-
-const internal::VariadicDynCastAllOfMatcher<Expr, CXXPseudoDestructorExpr>
-    cxxPseudoDestructorExpr;
-
-TEST_P(ImportExpr, ImportCXXPseudoDestructorExpr) {
-  MatchVerifier<Decl> Verifier;
-  testImport(
-      "typedef int T;"
-      "void declToImport(int *p) {"
-      "  T t;"
-      "  p->T::~T();"
-      "}",
-      Lang_CXX03, "", Lang_CXX03, Verifier,
-      functionDecl(hasDescendant(callExpr(has(cxxPseudoDestructorExpr())))));
-}
-
-TEST_P(ImportDecl, ImportUsingDecl) {
-  MatchVerifier<Decl> Verifier;
-  testImport("namespace foo { int bar; }"
-             "void declToImport() { using foo::bar; }",
-             Lang_CXX03, "", Lang_CXX03, Verifier,
-             functionDecl(hasDescendant(usingDecl(hasName("bar")))));
-}
-
-TEST_P(ImportDecl, ImportUsingEnumDecl) {
-  MatchVerifier<Decl> Verifier;
-  testImport("namespace foo { enum bar { baz, toto, quux }; }"
-             "void declToImport() { using enum foo::bar; }",
-             Lang_CXX20, "", Lang_CXX20, Verifier,
-             functionDecl(hasDescendant(usingEnumDecl(hasName("bar")))));
-}
-
-/// \brief Matches shadow declarations introduced into a scope by a
-///        (resolved) using declaration.
-///
-/// Given
-/// \code
-///   namespace n { int f; }
-///   namespace declToImport { using n::f; }
-/// \endcode
-/// usingShadowDecl()
-///   matches \code f \endcode
-const internal::VariadicDynCastAllOfMatcher<Decl,
-                                            UsingShadowDecl> usingShadowDecl;
-
-TEST_P(ImportDecl, ImportUsingShadowDecl) {
-  MatchVerifier<Decl> Verifier;
-  // from using-decl
-  testImport("namespace foo { int bar; }"
-             "namespace declToImport { using foo::bar; }",
-             Lang_CXX03, "", Lang_CXX03, Verifier,
-             namespaceDecl(has(usingShadowDecl(hasName("bar")))));
-  // from using-enum-decl
-  testImport("namespace foo { enum bar {baz, toto, quux }; }"
-             "namespace declToImport { using enum foo::bar; }",
-             Lang_CXX20, "", Lang_CXX20, Verifier,
-             namespaceDecl(has(usingShadowDecl(hasName("baz")))));
-}
-
-TEST_P(ImportExpr, ImportUnresolvedLookupExpr) {
-  MatchVerifier<Decl> Verifier;
-  testImport("template<typename T> int foo();"
-             "template <typename T> void declToImport() {"
-             "  (void)::foo<T>;"
-             "  (void)::template foo<T>;"
-             "}"
-             "void instantiate() { declToImport<int>(); }",
-             Lang_CXX03, "", Lang_CXX03, Verifier,
-             functionTemplateDecl(hasDescendant(unresolvedLookupExpr())));
-}
-
-TEST_P(ImportExpr, ImportCXXUnresolvedConstructExpr) {
-  MatchVerifier<Decl> Verifier;
-  testImport("template <typename T> struct C { T t; };"
-             "template <typename T> void declToImport() {"
-             "  C<T> d;"
-             "  d.t = T();"
-             "}"
-             "void instantiate() { declToImport<int>(); }",
-             Lang_CXX03, "", Lang_CXX03, Verifier,
-             functionTemplateDecl(hasDescendant(
-                 binaryOperator(has(cxxUnresolvedConstructExpr())))));
-  testImport("template <typename T> struct C { T t; };"
-             "template <typename T> void declToImport() {"
-             "  C<T> d;"
-             "  (&d)->t = T();"
-             "}"
-             "void instantiate() { declToImport<int>(); }",
-             Lang_CXX03, "", Lang_CXX03, Verifier,
-             functionTemplateDecl(hasDescendant(
-                 binaryOperator(has(cxxUnresolvedConstructExpr())))));
-}
-
-/// Check that function "declToImport()" (which is the templated function
-/// for corresponding FunctionTemplateDecl) is not added into DeclContext.
-/// Same for class template declarations.
-TEST_P(ImportDecl, ImportTemplatedDeclForTemplate) {
-  MatchVerifier<Decl> Verifier;
-  testImport("template <typename T> void declToImport() { T a = 1; }"
-             "void instantiate() { declToImport<int>(); }",
-             Lang_CXX03, "", Lang_CXX03, Verifier,
-             functionTemplateDecl(hasAncestor(translationUnitDecl(
-                 unless(has(functionDecl(hasName("declToImport"))))))));
-  testImport("template <typename T> struct declToImport { T t; };"
-             "void instantiate() { declToImport<int>(); }",
-             Lang_CXX03, "", Lang_CXX03, Verifier,
-             classTemplateDecl(hasAncestor(translationUnitDecl(
-                 unless(has(cxxRecordDecl(hasName("declToImport"))))))));
-}
-
-TEST_P(ImportDecl, ImportClassTemplatePartialSpecialization) {
-  MatchVerifier<Decl> Verifier;
-  auto Code =
-      R"s(
-      struct declToImport {
-        template <typename T0> struct X;
-        template <typename T0> struct X<T0 *> {};
-      };
-      )s";
-  testImport(Code, Lang_CXX03, "", Lang_CXX03, Verifier,
-             recordDecl(has(classTemplateDecl()),
-                        has(classTemplateSpecializationDecl())));
-}
-
-TEST_P(ImportExpr, CXXOperatorCallExpr) {
-  MatchVerifier<Decl> Verifier;
-  testImport(
-      "class declToImport {"
-      "  void f() { *this = declToImport(); }"
-      "};",
-      Lang_CXX03, "", Lang_CXX03, Verifier,
-      cxxRecordDecl(has(cxxMethodDecl(hasDescendant(cxxOperatorCallExpr())))));
-}
-
-TEST_P(ImportExpr, DependentSizedArrayType) {
-  MatchVerifier<Decl> Verifier;
-  testImport("template<typename T, int Size> class declToImport {"
-             "  T data[Size];"
-             "};",
-             Lang_CXX03, "", Lang_CXX03, Verifier,
-             classTemplateDecl(has(cxxRecordDecl(
-                 has(fieldDecl(hasType(dependentSizedArrayType())))))));
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase, TemplateTypeParmDeclNoDefaultArg) {
-  Decl *FromTU = getTuDecl("template<typename T> struct X {};", Lang_CXX03);
-  auto From = FirstDeclMatcher<TemplateTypeParmDecl>().match(
-      FromTU, templateTypeParmDecl(hasName("T")));
-  TemplateTypeParmDecl *To = Import(From, Lang_CXX03);
-  ASSERT_FALSE(To->hasDefaultArgument());
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase, TemplateTypeParmDeclDefaultArg) {
-  Decl *FromTU =
-      getTuDecl("template<typename T = int> struct X {};", Lang_CXX03);
-  auto From = FirstDeclMatcher<TemplateTypeParmDecl>().match(
-      FromTU, templateTypeParmDecl(hasName("T")));
-  TemplateTypeParmDecl *To = Import(From, Lang_CXX03);
-  ASSERT_TRUE(To->hasDefaultArgument());
-  QualType ToArg = To->getDefaultArgument();
-  ASSERT_EQ(ToArg, QualType(To->getASTContext().IntTy));
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase, ImportBeginLocOfDeclRefExpr) {
-  Decl *FromTU =
-      getTuDecl("class A { public: static int X; }; void f() { (void)A::X; }",
-                Lang_CXX03);
-  auto From = FirstDeclMatcher<FunctionDecl>().match(
-      FromTU, functionDecl(hasName("f")));
-  ASSERT_TRUE(From);
-  ASSERT_TRUE(
-      cast<CStyleCastExpr>(cast<CompoundStmt>(From->getBody())->body_front())
-          ->getSubExpr()
-          ->getBeginLoc()
-          .isValid());
-  FunctionDecl *To = Import(From, Lang_CXX03);
-  ASSERT_TRUE(To);
-  ASSERT_TRUE(
-      cast<CStyleCastExpr>(cast<CompoundStmt>(To->getBody())->body_front())
-          ->getSubExpr()
-          ->getBeginLoc()
-          .isValid());
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase,
-       TemplateTemplateParmDeclNoDefaultArg) {
-  Decl *FromTU = getTuDecl(R"(
-                           template<template<typename> typename TT> struct Y {};
-                           )",
-                           Lang_CXX17);
-  auto From = FirstDeclMatcher<TemplateTemplateParmDecl>().match(
-      FromTU, templateTemplateParmDecl(hasName("TT")));
-  TemplateTemplateParmDecl *To = Import(From, Lang_CXX17);
-  ASSERT_FALSE(To->hasDefaultArgument());
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase, TemplateTemplateParmDeclDefaultArg) {
-  Decl *FromTU = getTuDecl(R"(
-                           template<typename T> struct X {};
-                           template<template<typename> typename TT = X> struct Y {};
-                           )",
-                           Lang_CXX17);
-  auto From = FirstDeclMatcher<TemplateTemplateParmDecl>().match(
-      FromTU, templateTemplateParmDecl(hasName("TT")));
-  TemplateTemplateParmDecl *To = Import(From, Lang_CXX17);
-  ASSERT_TRUE(To->hasDefaultArgument());
-  const TemplateArgument &ToDefaultArg = To->getDefaultArgument().getArgument();
-  ASSERT_TRUE(To->isTemplateDecl());
-  TemplateDecl *ToTemplate = ToDefaultArg.getAsTemplate().getAsTemplateDecl();
-
-  // Find the default argument template 'X' in the AST and compare it against
-  // the default argument we got.
-  auto ToExpectedDecl = FirstDeclMatcher<ClassTemplateDecl>().match(
-      To->getTranslationUnitDecl(), classTemplateDecl(hasName("X")));
-  ASSERT_EQ(ToTemplate, ToExpectedDecl);
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase, NonTypeTemplateParmDeclNoDefaultArg) {
-  Decl *FromTU = getTuDecl("template<int N> struct X {};", Lang_CXX03);
-  auto From = FirstDeclMatcher<NonTypeTemplateParmDecl>().match(
-      FromTU, nonTypeTemplateParmDecl(hasName("N")));
-  NonTypeTemplateParmDecl *To = Import(From, Lang_CXX03);
-  ASSERT_FALSE(To->hasDefaultArgument());
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase, NonTypeTemplateParmDeclDefaultArg) {
-  Decl *FromTU = getTuDecl("template<int S = 1> struct X {};", Lang_CXX03);
-  auto From = FirstDeclMatcher<NonTypeTemplateParmDecl>().match(
-      FromTU, nonTypeTemplateParmDecl(hasName("S")));
-  NonTypeTemplateParmDecl *To = Import(From, Lang_CXX03);
-  ASSERT_TRUE(To->hasDefaultArgument());
-  Stmt *ToArg = To->getDefaultArgument();
-  ASSERT_TRUE(isa<ConstantExpr>(ToArg));
-  ToArg = *ToArg->child_begin();
-  ASSERT_TRUE(isa<IntegerLiteral>(ToArg));
-  ASSERT_EQ(cast<IntegerLiteral>(ToArg)->getValue().getLimitedValue(), 1U);
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase,
-       ImportOfTemplatedDeclOfClassTemplateDecl) {
-  Decl *FromTU = getTuDecl("template<class X> struct S{};", Lang_CXX03);
-  auto From =
-      FirstDeclMatcher<ClassTemplateDecl>().match(FromTU, classTemplateDecl());
-  ASSERT_TRUE(From);
-  auto To = cast<ClassTemplateDecl>(Import(From, Lang_CXX03));
-  ASSERT_TRUE(To);
-  Decl *ToTemplated = To->getTemplatedDecl();
-  Decl *ToTemplated1 = Import(From->getTemplatedDecl(), Lang_CXX03);
-  EXPECT_TRUE(ToTemplated1);
-  EXPECT_EQ(ToTemplated1, ToTemplated);
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase,
-       ImportOfTemplatedDeclOfFunctionTemplateDecl) {
-  Decl *FromTU = getTuDecl("template<class X> void f(){}", Lang_CXX03);
-  auto From = FirstDeclMatcher<FunctionTemplateDecl>().match(
-      FromTU, functionTemplateDecl());
-  ASSERT_TRUE(From);
-  auto To = cast<FunctionTemplateDecl>(Import(From, Lang_CXX03));
-  ASSERT_TRUE(To);
-  Decl *ToTemplated = To->getTemplatedDecl();
-  Decl *ToTemplated1 = Import(From->getTemplatedDecl(), Lang_CXX03);
-  EXPECT_TRUE(ToTemplated1);
-  EXPECT_EQ(ToTemplated1, ToTemplated);
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase,
-       ImportOfTemplatedDeclShouldImportTheClassTemplateDecl) {
-  Decl *FromTU = getTuDecl("template<class X> struct S{};", Lang_CXX03);
-  auto FromFT =
-      FirstDeclMatcher<ClassTemplateDecl>().match(FromTU, classTemplateDecl());
-  ASSERT_TRUE(FromFT);
-
-  auto ToTemplated =
-      cast<CXXRecordDecl>(Import(FromFT->getTemplatedDecl(), Lang_CXX03));
-  EXPECT_TRUE(ToTemplated);
-  auto ToTU = ToTemplated->getTranslationUnitDecl();
-  auto ToFT =
-      FirstDeclMatcher<ClassTemplateDecl>().match(ToTU, classTemplateDecl());
-  EXPECT_TRUE(ToFT);
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase,
-       ImportOfTemplatedDeclShouldImportTheFunctionTemplateDecl) {
-  Decl *FromTU = getTuDecl("template<class X> void f(){}", Lang_CXX03);
-  auto FromFT = FirstDeclMatcher<FunctionTemplateDecl>().match(
-      FromTU, functionTemplateDecl());
-  ASSERT_TRUE(FromFT);
-
-  auto ToTemplated =
-      cast<FunctionDecl>(Import(FromFT->getTemplatedDecl(), Lang_CXX03));
-  EXPECT_TRUE(ToTemplated);
-  auto ToTU = ToTemplated->getTranslationUnitDecl();
-  auto ToFT = FirstDeclMatcher<FunctionTemplateDecl>().match(
-      ToTU, functionTemplateDecl());
-  EXPECT_TRUE(ToFT);
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase, ImportCorrectTemplatedDecl) {
-  auto Code =
-        R"(
-        namespace x {
-          template<class X> struct S1{};
-          template<class X> struct S2{};
-          template<class X> struct S3{};
-        }
-        )";
-  Decl *FromTU = getTuDecl(Code, Lang_CXX03);
-  auto FromNs =
-      FirstDeclMatcher<NamespaceDecl>().match(FromTU, namespaceDecl());
-  auto ToNs = cast<NamespaceDecl>(Import(FromNs, Lang_CXX03));
-  ASSERT_TRUE(ToNs);
-  auto From =
-      FirstDeclMatcher<ClassTemplateDecl>().match(FromTU,
-                                                  classTemplateDecl(
-                                                      hasName("S2")));
-  auto To =
-      FirstDeclMatcher<ClassTemplateDecl>().match(ToNs,
-                                                  classTemplateDecl(
-                                                      hasName("S2")));
-  ASSERT_TRUE(From);
-  ASSERT_TRUE(To);
-  auto ToTemplated = To->getTemplatedDecl();
-  auto ToTemplated1 =
-      cast<CXXRecordDecl>(Import(From->getTemplatedDecl(), Lang_CXX03));
-  EXPECT_TRUE(ToTemplated1);
-  ASSERT_EQ(ToTemplated1, ToTemplated);
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase, ImportChooseExpr) {
-  // This tests the import of isConditionTrue directly to make sure the importer
-  // gets it right.
-  Decl *From, *To;
-  std::tie(From, To) = getImportedDecl(
-      "void declToImport() { (void)__builtin_choose_expr(1, 0, 1); }", Lang_C99,
-      "", Lang_C99);
-
-  auto ToResults = match(chooseExpr().bind("choose"), To->getASTContext());
-  auto FromResults = match(chooseExpr().bind("choose"), From->getASTContext());
-
-  const ChooseExpr *FromChooseExpr =
-      selectFirst<ChooseExpr>("choose", FromResults);
-  ASSERT_TRUE(FromChooseExpr);
-
-  const ChooseExpr *ToChooseExpr = selectFirst<ChooseExpr>("choose", ToResults);
-  ASSERT_TRUE(ToChooseExpr);
-
-  EXPECT_EQ(FromChooseExpr->isConditionTrue(), ToChooseExpr->isConditionTrue());
-  EXPECT_EQ(FromChooseExpr->isConditionDependent(),
-            ToChooseExpr->isConditionDependent());
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase, ImportGenericSelectionExpr) {
-  Decl *From, *To;
-  std::tie(From, To) = getImportedDecl(
-      R"(
-      int declToImport() {
-        int x;
-        return _Generic(x, int: 0, default: 1);
-      }
-      )",
-      Lang_C99, "", Lang_C99);
-
-  auto ToResults =
-      match(genericSelectionExpr().bind("expr"), To->getASTContext());
-  auto FromResults =
-      match(genericSelectionExpr().bind("expr"), From->getASTContext());
-
-  const GenericSelectionExpr *FromGenericSelectionExpr =
-      selectFirst<GenericSelectionExpr>("expr", FromResults);
-  ASSERT_TRUE(FromGenericSelectionExpr);
-
-  const GenericSelectionExpr *ToGenericSelectionExpr =
-      selectFirst<GenericSelectionExpr>("expr", ToResults);
-  ASSERT_TRUE(ToGenericSelectionExpr);
-
-  EXPECT_EQ(FromGenericSelectionExpr->isResultDependent(),
-            ToGenericSelectionExpr->isResultDependent());
-  EXPECT_EQ(FromGenericSelectionExpr->getResultIndex(),
-            ToGenericSelectionExpr->getResultIndex());
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase,
-       ImportFunctionWithBackReferringParameter) {
-  Decl *From, *To;
-  std::tie(From, To) = getImportedDecl(
-      R"(
-      template <typename T> struct X {};
-
-      void declToImport(int y, X<int> &x) {}
-
-      template <> struct X<int> {
-        void g() {
-          X<int> x;
-          declToImport(0, x);
-        }
-      };
-      )",
-      Lang_CXX03, "", Lang_CXX03);
-
-  MatchVerifier<Decl> Verifier;
-  auto Matcher = functionDecl(hasName("declToImport"),
-                              parameterCountIs(2),
-                              hasParameter(0, hasName("y")),
-                              hasParameter(1, hasName("x")),
-                              hasParameter(1, hasType(asString("X<int> &"))));
-  ASSERT_TRUE(Verifier.match(From, Matcher));
-  EXPECT_TRUE(Verifier.match(To, Matcher));
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase,
-       TUshouldNotContainTemplatedDeclOfFunctionTemplates) {
-  Decl *From, *To;
-  std::tie(From, To) =
-      getImportedDecl("template <typename T> void declToImport() { T a = 1; }"
-                      "void instantiate() { declToImport<int>(); }",
-                      Lang_CXX03, "", Lang_CXX03);
-
-  auto Check = [](Decl *D) -> bool {
-    auto TU = D->getTranslationUnitDecl();
-    for (auto Child : TU->decls()) {
-      if (auto *FD = dyn_cast<FunctionDecl>(Child)) {
-        if (FD->getNameAsString() == "declToImport") {
-          GTEST_NONFATAL_FAILURE_(
-              "TU should not contain any FunctionDecl with name declToImport");
-          return false;
-        }
-      }
-    }
-    return true;
-  };
-
-  ASSERT_TRUE(Check(From));
-  EXPECT_TRUE(Check(To));
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase,
-       TUshouldNotContainTemplatedDeclOfClassTemplates) {
-  Decl *From, *To;
-  std::tie(From, To) =
-      getImportedDecl("template <typename T> struct declToImport { T t; };"
-                      "void instantiate() { declToImport<int>(); }",
-                      Lang_CXX03, "", Lang_CXX03);
-
-  auto Check = [](Decl *D) -> bool {
-    auto TU = D->getTranslationUnitDecl();
-    for (auto Child : TU->decls()) {
-      if (auto *RD = dyn_cast<CXXRecordDecl>(Child)) {
-        if (RD->getNameAsString() == "declToImport") {
-          GTEST_NONFATAL_FAILURE_(
-              "TU should not contain any CXXRecordDecl with name declToImport");
-          return false;
-        }
-      }
-    }
-    return true;
-  };
-
-  ASSERT_TRUE(Check(From));
-  EXPECT_TRUE(Check(To));
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase,
-       TUshouldNotContainTemplatedDeclOfTypeAlias) {
-  Decl *From, *To;
-  std::tie(From, To) =
-      getImportedDecl(
-          "template <typename T> struct X {};"
-          "template <typename T> using declToImport = X<T>;"
-          "void instantiate() { declToImport<int> a; }",
-                      Lang_CXX11, "", Lang_CXX11);
-
-  auto Check = [](Decl *D) -> bool {
-    auto TU = D->getTranslationUnitDecl();
-    for (auto Child : TU->decls()) {
-      if (auto *AD = dyn_cast<TypeAliasDecl>(Child)) {
-        if (AD->getNameAsString() == "declToImport") {
-          GTEST_NONFATAL_FAILURE_(
-              "TU should not contain any TypeAliasDecl with name declToImport");
-          return false;
-        }
-      }
-    }
-    return true;
-  };
-
-  ASSERT_TRUE(Check(From));
-  EXPECT_TRUE(Check(To));
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase,
-       TUshouldNotContainClassTemplateSpecializationOfImplicitInstantiation) {
-
-  Decl *From, *To;
-  std::tie(From, To) = getImportedDecl(
-      R"(
-      template<class T>
-      class Base {};
-      class declToImport : public Base<declToImport> {};
-      )",
-      Lang_CXX03, "", Lang_CXX03);
-
-  // Check that the ClassTemplateSpecializationDecl is NOT the child of the TU.
-  auto Pattern =
-      translationUnitDecl(unless(has(classTemplateSpecializationDecl())));
-  ASSERT_TRUE(
-      MatchVerifier<Decl>{}.match(From->getTranslationUnitDecl(), Pattern));
-  EXPECT_TRUE(
-      MatchVerifier<Decl>{}.match(To->getTranslationUnitDecl(), Pattern));
-
-  // Check that the ClassTemplateSpecializationDecl is the child of the
-  // ClassTemplateDecl.
-  Pattern = translationUnitDecl(has(classTemplateDecl(
-      hasName("Base"), has(classTemplateSpecializationDecl()))));
-  ASSERT_TRUE(
-      MatchVerifier<Decl>{}.match(From->getTranslationUnitDecl(), Pattern));
-  EXPECT_TRUE(
-      MatchVerifier<Decl>{}.match(To->getTranslationUnitDecl(), Pattern));
-}
-
-AST_MATCHER_P(RecordDecl, hasFieldOrder, std::vector<StringRef>, Order) {
-  size_t Index = 0;
-  for (Decl *D : Node.decls()) {
-    if (isa<FieldDecl>(D) || isa<IndirectFieldDecl>(D)) {
-      auto *ND = cast<NamedDecl>(D);
-      if (Index == Order.size())
-        return false;
-      if (ND->getName() != Order[Index])
-        return false;
-      ++Index;
-    }
-  }
-  return Index == Order.size();
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase,
-       TUshouldContainClassTemplateSpecializationOfExplicitInstantiation) {
-  Decl *From, *To;
-  std::tie(From, To) = getImportedDecl(
-      R"(
-      namespace NS {
-        template<class T>
-        class X {};
-        template class X<int>;
-      }
-      )",
-      Lang_CXX03, "", Lang_CXX03, "NS");
-
-  // Check that the ClassTemplateSpecializationDecl is NOT the child of the
-  // ClassTemplateDecl.
-  auto Pattern = namespaceDecl(has(classTemplateDecl(
-      hasName("X"), unless(has(classTemplateSpecializationDecl())))));
-  ASSERT_TRUE(MatchVerifier<Decl>{}.match(From, Pattern));
-  EXPECT_TRUE(MatchVerifier<Decl>{}.match(To, Pattern));
-
-  // Check that the ClassTemplateSpecializationDecl is the child of the
-  // NamespaceDecl.
-  Pattern = namespaceDecl(has(classTemplateSpecializationDecl(hasName("X"))));
-  ASSERT_TRUE(MatchVerifier<Decl>{}.match(From, Pattern));
-  EXPECT_TRUE(MatchVerifier<Decl>{}.match(To, Pattern));
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase,
-       CXXRecordDeclFieldsShouldBeInCorrectOrder) {
-  Decl *From, *To;
-  std::tie(From, To) =
-      getImportedDecl(
-          "struct declToImport { int a; int b; };",
-                      Lang_CXX11, "", Lang_CXX11);
-
-  MatchVerifier<Decl> Verifier;
-  ASSERT_TRUE(Verifier.match(From, cxxRecordDecl(hasFieldOrder({"a", "b"}))));
-  EXPECT_TRUE(Verifier.match(To, cxxRecordDecl(hasFieldOrder({"a", "b"}))));
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase,
-       CXXRecordDeclFieldOrderShouldNotDependOnImportOrder) {
-  Decl *From, *To;
-  std::tie(From, To) = getImportedDecl(
-      // The original recursive algorithm of ASTImporter first imports 'c' then
-      // 'b' and lastly 'a'.  Therefore we must restore the order somehow.
-      R"s(
-      struct declToImport {
-          int a = c + b;
-          int b = 1;
-          int c = 2;
-      };
-      )s",
-      Lang_CXX11, "", Lang_CXX11);
-
-  MatchVerifier<Decl> Verifier;
-  ASSERT_TRUE(
-      Verifier.match(From, cxxRecordDecl(hasFieldOrder({"a", "b", "c"}))));
-  EXPECT_TRUE(
-      Verifier.match(To, cxxRecordDecl(hasFieldOrder({"a", "b", "c"}))));
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase,
-       CXXRecordDeclFieldAndIndirectFieldOrder) {
-  Decl *From, *To;
-  std::tie(From, To) = getImportedDecl(
-      // First field is "a", then the field for unnamed union, then "b" and "c"
-      // from it (indirect fields), then "d".
-      R"s(
-      struct declToImport {
-        int a = d;
-        union { 
-          int b;
-          int c;
-        };
-        int d;
-      };
-      )s",
-      Lang_CXX11, "", Lang_CXX11);
-
-  MatchVerifier<Decl> Verifier;
-  ASSERT_TRUE(Verifier.match(
-      From, cxxRecordDecl(hasFieldOrder({"a", "", "b", "c", "d"}))));
-  EXPECT_TRUE(Verifier.match(
-      To, cxxRecordDecl(hasFieldOrder({"a", "", "b", "c", "d"}))));
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase, ShouldImportImplicitCXXRecordDecl) {
-  Decl *From, *To;
-  std::tie(From, To) = getImportedDecl(
-      R"(
-      struct declToImport {
-      };
-      )",
-      Lang_CXX03, "", Lang_CXX03);
-
-  MatchVerifier<Decl> Verifier;
-  // Match the implicit Decl.
-  auto Matcher = cxxRecordDecl(has(cxxRecordDecl()));
-  ASSERT_TRUE(Verifier.match(From, Matcher));
-  EXPECT_TRUE(Verifier.match(To, Matcher));
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase,
-       ShouldImportImplicitCXXRecordDeclOfClassTemplate) {
-  Decl *From, *To;
-  std::tie(From, To) = getImportedDecl(
-      R"(
-      template <typename U>
-      struct declToImport {
-      };
-      )",
-      Lang_CXX03, "", Lang_CXX03);
-
-  MatchVerifier<Decl> Verifier;
-  // Match the implicit Decl.
-  auto Matcher = classTemplateDecl(has(cxxRecordDecl(has(cxxRecordDecl()))));
-  ASSERT_TRUE(Verifier.match(From, Matcher));
-  EXPECT_TRUE(Verifier.match(To, Matcher));
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase,
-       ShouldImportImplicitCXXRecordDeclOfClassTemplateSpecializationDecl) {
-  Decl *From, *To;
-  std::tie(From, To) = getImportedDecl(
-      R"(
-      template<class T>
-      class Base {};
-      class declToImport : public Base<declToImport> {};
-      )",
-      Lang_CXX03, "", Lang_CXX03);
-
-  auto hasImplicitClass = has(cxxRecordDecl());
-  auto Pattern = translationUnitDecl(has(classTemplateDecl(
-      hasName("Base"),
-      has(classTemplateSpecializationDecl(hasImplicitClass)))));
-  ASSERT_TRUE(
-      MatchVerifier<Decl>{}.match(From->getTranslationUnitDecl(), Pattern));
-  EXPECT_TRUE(
-      MatchVerifier<Decl>{}.match(To->getTranslationUnitDecl(), Pattern));
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase, IDNSOrdinary) {
-  Decl *From, *To;
-  std::tie(From, To) =
-      getImportedDecl("void declToImport() {}", Lang_CXX03, "", Lang_CXX03);
-
-  MatchVerifier<Decl> Verifier;
-  auto Matcher = functionDecl();
-  ASSERT_TRUE(Verifier.match(From, Matcher));
-  EXPECT_TRUE(Verifier.match(To, Matcher));
-  EXPECT_EQ(From->getIdentifierNamespace(), To->getIdentifierNamespace());
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase, IDNSOfNonmemberOperator) {
-  Decl *FromTU = getTuDecl(
-      R"(
-      struct X {};
-      void operator<<(int, X);
-      )",
-      Lang_CXX03);
-  Decl *From = LastDeclMatcher<Decl>{}.match(FromTU, functionDecl());
-  const Decl *To = Import(From, Lang_CXX03);
-  EXPECT_EQ(From->getIdentifierNamespace(), To->getIdentifierNamespace());
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase,
-       ShouldImportMembersOfClassTemplateSpecializationDecl) {
-  Decl *From, *To;
-  std::tie(From, To) = getImportedDecl(
-      R"(
-      template<class T>
-      class Base { int a; };
-      class declToImport : Base<declToImport> {};
-      )",
-      Lang_CXX03, "", Lang_CXX03);
-
-  auto Pattern = translationUnitDecl(has(classTemplateDecl(
-      hasName("Base"),
-      has(classTemplateSpecializationDecl(has(fieldDecl(hasName("a"))))))));
-  ASSERT_TRUE(
-      MatchVerifier<Decl>{}.match(From->getTranslationUnitDecl(), Pattern));
-  EXPECT_TRUE(
-      MatchVerifier<Decl>{}.match(To->getTranslationUnitDecl(), Pattern));
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase,
-       ImportDefinitionOfClassTemplateAfterFwdDecl) {
-  {
-    Decl *FromTU = getTuDecl(
-        R"(
-            template <typename T>
-            struct B;
-            )",
-        Lang_CXX03, "input0.cc");
-    auto *FromD = FirstDeclMatcher<ClassTemplateDecl>().match(
-        FromTU, classTemplateDecl(hasName("B")));
-
-    Import(FromD, Lang_CXX03);
-  }
-
-  {
-    Decl *FromTU = getTuDecl(
-        R"(
-            template <typename T>
-            struct B {
-              void f();
-            };
-            )",
-        Lang_CXX03, "input1.cc");
-    FunctionDecl *FromD = FirstDeclMatcher<FunctionDecl>().match(
-        FromTU, functionDecl(hasName("f")));
-    Import(FromD, Lang_CXX03);
-    auto *FromCTD = FirstDeclMatcher<ClassTemplateDecl>().match(
-        FromTU, classTemplateDecl(hasName("B")));
-    auto *ToCTD = cast<ClassTemplateDecl>(Import(FromCTD, Lang_CXX03));
-    EXPECT_TRUE(ToCTD->isThisDeclarationADefinition());
-  }
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase,
-       ImportDefinitionOfClassTemplateIfThereIsAnExistingFwdDeclAndDefinition) {
-  Decl *ToTU = getToTuDecl(
-      R"(
-      template <typename T>
-      struct B {
-        void f();
-      };
-
-      template <typename T>
-      struct B;
-      )",
-      Lang_CXX03);
-  ASSERT_EQ(1u, DeclCounterWithPredicate<ClassTemplateDecl>(
-                    [](const ClassTemplateDecl *T) {
-                      return T->isThisDeclarationADefinition();
-                    })
-                    .match(ToTU, classTemplateDecl()));
-
-  Decl *FromTU = getTuDecl(
-      R"(
-      template <typename T>
-      struct B {
-        void f();
-      };
-      )",
-      Lang_CXX03, "input1.cc");
-  ClassTemplateDecl *FromD = FirstDeclMatcher<ClassTemplateDecl>().match(
-      FromTU, classTemplateDecl(hasName("B")));
-
-  Import(FromD, Lang_CXX03);
-
-  // We should have only one definition.
-  EXPECT_EQ(1u, DeclCounterWithPredicate<ClassTemplateDecl>(
-                    [](const ClassTemplateDecl *T) {
-                      return T->isThisDeclarationADefinition();
-                    })
-                    .match(ToTU, classTemplateDecl()));
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase,
-       ImportDefinitionOfClassIfThereIsAnExistingFwdDeclAndDefinition) {
-  Decl *ToTU = getToTuDecl(
-      R"(
-      struct B {
-        void f();
-      };
-
-      struct B;
-      )",
-      Lang_CXX03);
-  ASSERT_EQ(2u, DeclCounter<CXXRecordDecl>().match(
-                    ToTU, cxxRecordDecl(unless(isImplicit()))));
-
-  Decl *FromTU = getTuDecl(
-      R"(
-      struct B {
-        void f();
-      };
-      )",
-      Lang_CXX03, "input1.cc");
-  auto *FromD = FirstDeclMatcher<CXXRecordDecl>().match(
-      FromTU, cxxRecordDecl(hasName("B")));
-
-  Import(FromD, Lang_CXX03);
-
-  EXPECT_EQ(2u, DeclCounter<CXXRecordDecl>().match(
-                    ToTU, cxxRecordDecl(unless(isImplicit()))));
-}
-
-static void CompareSourceLocs(FullSourceLoc Loc1, FullSourceLoc Loc2) {
-  EXPECT_EQ(Loc1.getExpansionLineNumber(), Loc2.getExpansionLineNumber());
-  EXPECT_EQ(Loc1.getExpansionColumnNumber(), Loc2.getExpansionColumnNumber());
-  EXPECT_EQ(Loc1.getSpellingLineNumber(), Loc2.getSpellingLineNumber());
-  EXPECT_EQ(Loc1.getSpellingColumnNumber(), Loc2.getSpellingColumnNumber());
-}
-static void CompareSourceRanges(SourceRange Range1, SourceRange Range2,
-                                SourceManager &SM1, SourceManager &SM2) {
-  CompareSourceLocs(FullSourceLoc{ Range1.getBegin(), SM1 },
-                    FullSourceLoc{ Range2.getBegin(), SM2 });
-  CompareSourceLocs(FullSourceLoc{ Range1.getEnd(), SM1 },
-                    FullSourceLoc{ Range2.getEnd(), SM2 });
-}
-TEST_P(ASTImporterOptionSpecificTestBase, ImportSourceLocs) {
-  Decl *FromTU = getTuDecl(
-      R"(
-      #define MFOO(arg) arg = arg + 1
-
-      void foo() {
-        int a = 5;
-        MFOO(a);
-      }
-      )",
-      Lang_CXX03);
-  auto FromD = FirstDeclMatcher<FunctionDecl>().match(FromTU, functionDecl());
-  auto ToD = Import(FromD, Lang_CXX03);
-
-  auto ToLHS = LastDeclMatcher<DeclRefExpr>().match(ToD, declRefExpr());
-  auto FromLHS = LastDeclMatcher<DeclRefExpr>().match(FromTU, declRefExpr());
-  auto ToRHS = LastDeclMatcher<IntegerLiteral>().match(ToD, integerLiteral());
-  auto FromRHS =
-      LastDeclMatcher<IntegerLiteral>().match(FromTU, integerLiteral());
-
-  SourceManager &ToSM = ToAST->getASTContext().getSourceManager();
-  SourceManager &FromSM = FromD->getASTContext().getSourceManager();
-  CompareSourceRanges(ToD->getSourceRange(), FromD->getSourceRange(), ToSM,
-                      FromSM);
-  CompareSourceRanges(ToLHS->getSourceRange(), FromLHS->getSourceRange(), ToSM,
-                      FromSM);
-  CompareSourceRanges(ToRHS->getSourceRange(), FromRHS->getSourceRange(), ToSM,
-                      FromSM);
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase, ImportNestedMacro) {
-  Decl *FromTU = getTuDecl(
-      R"(
-      #define FUNC_INT void declToImport
-      #define FUNC FUNC_INT
-      FUNC(int a);
-      )",
-      Lang_CXX03);
-  auto FromD = FirstDeclMatcher<FunctionDecl>().match(FromTU, functionDecl());
-  auto ToD = Import(FromD, Lang_CXX03);
-
-  SourceManager &ToSM = ToAST->getASTContext().getSourceManager();
-  SourceManager &FromSM = FromD->getASTContext().getSourceManager();
-  CompareSourceRanges(ToD->getSourceRange(), FromD->getSourceRange(), ToSM,
-                      FromSM);
-}
-
-TEST_P(
-    ASTImporterOptionSpecificTestBase,
-    ImportDefinitionOfClassTemplateSpecIfThereIsAnExistingFwdDeclAndDefinition) {
-  Decl *ToTU = getToTuDecl(
-      R"(
-      template <typename T>
-      struct B;
-
-      template <>
-      struct B<int> {};
-
-      template <>
-      struct B<int>;
-      )",
-      Lang_CXX03);
-  // We should have only one definition.
-  ASSERT_EQ(1u, DeclCounterWithPredicate<ClassTemplateSpecializationDecl>(
-                    [](const ClassTemplateSpecializationDecl *T) {
-                      return T->isThisDeclarationADefinition();
-                    })
-                    .match(ToTU, classTemplateSpecializationDecl()));
-
-  Decl *FromTU = getTuDecl(
-      R"(
-      template <typename T>
-      struct B;
-
-      template <>
-      struct B<int> {};
-      )",
-      Lang_CXX03, "input1.cc");
-  auto *FromD = FirstDeclMatcher<ClassTemplateSpecializationDecl>().match(
-      FromTU, classTemplateSpecializationDecl(hasName("B")));
-
-  Import(FromD, Lang_CXX03);
-
-  // We should have only one definition.
-  EXPECT_EQ(1u, DeclCounterWithPredicate<ClassTemplateSpecializationDecl>(
-                    [](const ClassTemplateSpecializationDecl *T) {
-                      return T->isThisDeclarationADefinition();
-                    })
-                    .match(ToTU, classTemplateSpecializationDecl()));
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase, ObjectsWithUnnamedStructType) {
-  Decl *FromTU = getTuDecl(
-      R"(
-      struct { int a; int b; } object0 = { 2, 3 };
-      struct { int x; int y; int z; } object1;
-      )",
-      Lang_CXX03, "input0.cc");
-
-  auto *Obj0 =
-      FirstDeclMatcher<VarDecl>().match(FromTU, varDecl(hasName("object0")));
-  auto *From0 = getRecordDecl(Obj0);
-  auto *Obj1 =
-      FirstDeclMatcher<VarDecl>().match(FromTU, varDecl(hasName("object1")));
-  auto *From1 = getRecordDecl(Obj1);
-
-  auto *To0 = Import(From0, Lang_CXX03);
-  auto *To1 = Import(From1, Lang_CXX03);
-
-  EXPECT_TRUE(To0);
-  EXPECT_TRUE(To1);
-  EXPECT_NE(To0, To1);
-  EXPECT_NE(To0->getCanonicalDecl(), To1->getCanonicalDecl());
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase, AnonymousRecords) {
-  auto *Code =
-      R"(
-      struct X {
-        struct { int a; };
-        struct { int b; };
-      };
-      )";
-  Decl *FromTU0 = getTuDecl(Code, Lang_C99, "input0.c");
-
-  Decl *FromTU1 = getTuDecl(Code, Lang_C99, "input1.c");
-
-  auto *X0 =
-      FirstDeclMatcher<RecordDecl>().match(FromTU0, recordDecl(hasName("X")));
-  auto *X1 =
-      FirstDeclMatcher<RecordDecl>().match(FromTU1, recordDecl(hasName("X")));
-  Import(X0, Lang_C99);
-  Import(X1, Lang_C99);
-
-  auto *ToTU = ToAST->getASTContext().getTranslationUnitDecl();
-  // We expect no (ODR) warning during the import.
-  EXPECT_EQ(0u, ToTU->getASTContext().getDiagnostics().getNumWarnings());
-  EXPECT_EQ(1u,
-            DeclCounter<RecordDecl>().match(ToTU, recordDecl(hasName("X"))));
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase, AnonymousRecordsReversed) {
-  Decl *FromTU0 = getTuDecl(
-      R"(
-      struct X {
-        struct { int a; };
-        struct { int b; };
-      };
-      )",
-      Lang_C99, "input0.c");
-
-  Decl *FromTU1 = getTuDecl(
-      R"(
-      struct X { // reversed order
-        struct { int b; };
-        struct { int a; };
-      };
-      )",
-      Lang_C99, "input1.c");
-
-  auto *X0 =
-      FirstDeclMatcher<RecordDecl>().match(FromTU0, recordDecl(hasName("X")));
-  auto *X1 =
-      FirstDeclMatcher<RecordDecl>().match(FromTU1, recordDecl(hasName("X")));
-  Import(X0, Lang_C99);
-  Import(X1, Lang_C99);
-
-  auto *ToTU = ToAST->getASTContext().getTranslationUnitDecl();
-  // We expect one (ODR) warning during the import.
-  EXPECT_EQ(1u, ToTU->getASTContext().getDiagnostics().getNumWarnings());
-  EXPECT_EQ(1u,
-            DeclCounter<RecordDecl>().match(ToTU, recordDecl(hasName("X"))));
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase, ImportDoesUpdateUsedFlag) {
-  auto Pattern = varDecl(hasName("x"));
-  VarDecl *Imported1;
-  {
-    Decl *FromTU = getTuDecl("extern int x;", Lang_CXX03, "input0.cc");
-    auto *FromD = FirstDeclMatcher<VarDecl>().match(FromTU, Pattern);
-    Imported1 = cast<VarDecl>(Import(FromD, Lang_CXX03));
-  }
-  VarDecl *Imported2;
-  {
-    Decl *FromTU = getTuDecl("int x;", Lang_CXX03, "input1.cc");
-    auto *FromD = FirstDeclMatcher<VarDecl>().match(FromTU, Pattern);
-    Imported2 = cast<VarDecl>(Import(FromD, Lang_CXX03));
-  }
-  EXPECT_EQ(Imported1->getCanonicalDecl(), Imported2->getCanonicalDecl());
-  EXPECT_FALSE(Imported2->isUsed(false));
-  {
-    Decl *FromTU = getTuDecl("extern int x; int f() { return x; }", Lang_CXX03,
-                             "input2.cc");
-    auto *FromD = FirstDeclMatcher<FunctionDecl>().match(
-        FromTU, functionDecl(hasName("f")));
-    Import(FromD, Lang_CXX03);
-  }
-  EXPECT_TRUE(Imported2->isUsed(false));
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase, ImportDoesUpdateUsedFlag2) {
-  auto Pattern = varDecl(hasName("x"));
-  VarDecl *ExistingD;
-  {
-    Decl *ToTU = getToTuDecl("int x = 1;", Lang_CXX03);
-    ExistingD = FirstDeclMatcher<VarDecl>().match(ToTU, Pattern);
-  }
-  EXPECT_FALSE(ExistingD->isUsed(false));
-  {
-    Decl *FromTU =
-        getTuDecl("int x = 1; int f() { return x; }", Lang_CXX03, "input1.cc");
-    auto *FromD = FirstDeclMatcher<FunctionDecl>().match(
-        FromTU, functionDecl(hasName("f")));
-    Import(FromD, Lang_CXX03);
-  }
-  EXPECT_TRUE(ExistingD->isUsed(false));
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase, ImportDoesUpdateUsedFlag3) {
-  auto Pattern = varDecl(hasName("a"));
-  VarDecl *ExistingD;
-  {
-    Decl *ToTU = getToTuDecl(
-        R"(
-        struct A {
-          static const int a = 1;
-        };
-        )",
-        Lang_CXX03);
-    ExistingD = FirstDeclMatcher<VarDecl>().match(ToTU, Pattern);
-  }
-  EXPECT_FALSE(ExistingD->isUsed(false));
-  {
-    Decl *FromTU = getTuDecl(
-        R"(
-        struct A {
-          static const int a = 1;
-        };
-        const int *f() { return &A::a; } // requires storage,
-                                         // thus used flag will be set
-        )",
-        Lang_CXX03, "input1.cc");
-    auto *FromFunD = FirstDeclMatcher<FunctionDecl>().match(
-        FromTU, functionDecl(hasName("f")));
-    auto *FromD = FirstDeclMatcher<VarDecl>().match(FromTU, Pattern);
-    ASSERT_TRUE(FromD->isUsed(false));
-    Import(FromFunD, Lang_CXX03);
-  }
-  EXPECT_TRUE(ExistingD->isUsed(false));
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase, ReimportWithUsedFlag) {
-  auto Pattern = varDecl(hasName("x"));
-
-  Decl *FromTU = getTuDecl("int x;", Lang_CXX03, "input0.cc");
-  auto *FromD = FirstDeclMatcher<VarDecl>().match(FromTU, Pattern);
-
-  auto *Imported1 = cast<VarDecl>(Import(FromD, Lang_CXX03));
-
-  ASSERT_FALSE(Imported1->isUsed(false));
-
-  FromD->setIsUsed();
-  auto *Imported2 = cast<VarDecl>(Import(FromD, Lang_CXX03));
-
-  EXPECT_EQ(Imported1, Imported2);
-  EXPECT_TRUE(Imported2->isUsed(false));
-}
-
-struct ImportFunctions : ASTImporterOptionSpecificTestBase {};
-
-TEST_P(ImportFunctions, ImportPrototypeOfRecursiveFunction) {
-  Decl *FromTU = getTuDecl("void f(); void f() { f(); }", Lang_CXX03);
-  auto Pattern = functionDecl(hasName("f"));
-  auto *From =
-      FirstDeclMatcher<FunctionDecl>().match(FromTU, Pattern); // Proto
-
-  Decl *ImportedD = Import(From, Lang_CXX03);
-  Decl *ToTU = ImportedD->getTranslationUnitDecl();
-
-  EXPECT_EQ(DeclCounter<FunctionDecl>().match(ToTU, Pattern), 2u);
-  auto *To0 = FirstDeclMatcher<FunctionDecl>().match(ToTU, Pattern);
-  auto *To1 = LastDeclMatcher<FunctionDecl>().match(ToTU, Pattern);
-  EXPECT_TRUE(ImportedD == To0);
-  EXPECT_FALSE(To0->doesThisDeclarationHaveABody());
-  EXPECT_TRUE(To1->doesThisDeclarationHaveABody());
-  EXPECT_EQ(To1->getPreviousDecl(), To0);
-}
-
-TEST_P(ImportFunctions, ImportDefinitionOfRecursiveFunction) {
-  Decl *FromTU = getTuDecl("void f(); void f() { f(); }", Lang_CXX03);
-  auto Pattern = functionDecl(hasName("f"));
-  auto *From =
-      LastDeclMatcher<FunctionDecl>().match(FromTU, Pattern); // Def
-
-  Decl *ImportedD = Import(From, Lang_CXX03);
-  Decl *ToTU = ImportedD->getTranslationUnitDecl();
-
-  EXPECT_EQ(DeclCounter<FunctionDecl>().match(ToTU, Pattern), 2u);
-  auto *To0 = FirstDeclMatcher<FunctionDecl>().match(ToTU, Pattern);
-  auto *To1 = LastDeclMatcher<FunctionDecl>().match(ToTU, Pattern);
-  EXPECT_TRUE(ImportedD == To1);
-  EXPECT_FALSE(To0->doesThisDeclarationHaveABody());
-  EXPECT_TRUE(To1->doesThisDeclarationHaveABody());
-  EXPECT_EQ(To1->getPreviousDecl(), To0);
-}
-
-TEST_P(ImportFunctions, OverriddenMethodsShouldBeImported) {
-  auto Code =
-      R"(
-      struct B { virtual void f(); };
-      void B::f() {}
-      struct D : B { void f(); };
-      )";
-  auto Pattern =
-      cxxMethodDecl(hasName("f"), hasParent(cxxRecordDecl(hasName("D"))));
-  Decl *FromTU = getTuDecl(Code, Lang_CXX03);
-  CXXMethodDecl *Proto =
-      FirstDeclMatcher<CXXMethodDecl>().match(FromTU, Pattern);
-
-  ASSERT_EQ(Proto->size_overridden_methods(), 1u);
-  CXXMethodDecl *To = cast<CXXMethodDecl>(Import(Proto, Lang_CXX03));
-  EXPECT_EQ(To->size_overridden_methods(), 1u);
-}
-
-TEST_P(ImportFunctions, VirtualFlagShouldBePreservedWhenImportingPrototype) {
-  auto Code =
-      R"(
-      struct B { virtual void f(); };
-      void B::f() {}
-      )";
-  auto Pattern =
-      cxxMethodDecl(hasName("f"), hasParent(cxxRecordDecl(hasName("B"))));
-  Decl *FromTU = getTuDecl(Code, Lang_CXX03);
-  CXXMethodDecl *Proto =
-      FirstDeclMatcher<CXXMethodDecl>().match(FromTU, Pattern);
-  CXXMethodDecl *Def = LastDeclMatcher<CXXMethodDecl>().match(FromTU, Pattern);
-
-  ASSERT_TRUE(Proto->isVirtual());
-  ASSERT_TRUE(Def->isVirtual());
-  CXXMethodDecl *To = cast<CXXMethodDecl>(Import(Proto, Lang_CXX03));
-  EXPECT_TRUE(To->isVirtual());
-}
-
-TEST_P(ImportFunctions,
-       ImportDefinitionIfThereIsAnExistingDefinitionAndFwdDecl) {
-  Decl *ToTU = getToTuDecl(
-      R"(
-      void f() {}
-      void f();
-      )",
-      Lang_CXX03);
-  ASSERT_EQ(1u,
-            DeclCounterWithPredicate<FunctionDecl>([](const FunctionDecl *FD) {
-              return FD->doesThisDeclarationHaveABody();
-            }).match(ToTU, functionDecl()));
-
-  Decl *FromTU = getTuDecl("void f() {}", Lang_CXX03, "input0.cc");
-  auto *FromD = FirstDeclMatcher<FunctionDecl>().match(FromTU, functionDecl());
-
-  Import(FromD, Lang_CXX03);
-
-  EXPECT_EQ(1u,
-            DeclCounterWithPredicate<FunctionDecl>([](const FunctionDecl *FD) {
-              return FD->doesThisDeclarationHaveABody();
-            }).match(ToTU, functionDecl()));
-}
-
-TEST_P(ImportFunctions, ImportOverriddenMethodTwice) {
-  auto Code =
-      R"(
-      struct B { virtual void f(); };
-      struct D:B { void f(); };
-      )";
-  auto BFP =
-      cxxMethodDecl(hasName("f"), hasParent(cxxRecordDecl(hasName("B"))));
-  auto DFP =
-      cxxMethodDecl(hasName("f"), hasParent(cxxRecordDecl(hasName("D"))));
-
-  Decl *FromTU0 = getTuDecl(Code, Lang_CXX03);
-  auto *DF = FirstDeclMatcher<CXXMethodDecl>().match(FromTU0, DFP);
-  Import(DF, Lang_CXX03);
-
-  Decl *FromTU1 = getTuDecl(Code, Lang_CXX03, "input1.cc");
-  auto *BF = FirstDeclMatcher<CXXMethodDecl>().match(FromTU1, BFP);
-  Import(BF, Lang_CXX03);
-
-  auto *ToTU = ToAST->getASTContext().getTranslationUnitDecl();
-
-  EXPECT_EQ(DeclCounter<FunctionDecl>().match(ToTU, BFP), 1u);
-  EXPECT_EQ(DeclCounter<FunctionDecl>().match(ToTU, DFP), 1u);
-}
-
-TEST_P(ImportFunctions, ImportOverriddenMethodTwiceDefinitionFirst) {
-  auto CodeWithoutDef =
-      R"(
-      struct B { virtual void f(); };
-      struct D:B { void f(); };
-      )";
-  auto CodeWithDef =
-      R"(
-    struct B { virtual void f(){}; };
-    struct D:B { void f(){}; };
-  )";
-  auto BFP =
-      cxxMethodDecl(hasName("f"), hasParent(cxxRecordDecl(hasName("B"))));
-  auto DFP =
-      cxxMethodDecl(hasName("f"), hasParent(cxxRecordDecl(hasName("D"))));
-  auto BFDefP = cxxMethodDecl(
-      hasName("f"), hasParent(cxxRecordDecl(hasName("B"))), isDefinition());
-  auto DFDefP = cxxMethodDecl(
-      hasName("f"), hasParent(cxxRecordDecl(hasName("D"))), isDefinition());
-  auto FDefAllP = cxxMethodDecl(hasName("f"), isDefinition());
-
-  {
-    Decl *FromTU = getTuDecl(CodeWithDef, Lang_CXX03, "input0.cc");
-    auto *FromD = FirstDeclMatcher<CXXMethodDecl>().match(FromTU, DFP);
-    Import(FromD, Lang_CXX03);
-  }
-  {
-    Decl *FromTU = getTuDecl(CodeWithoutDef, Lang_CXX03, "input1.cc");
-    auto *FromB = FirstDeclMatcher<CXXMethodDecl>().match(FromTU, BFP);
-    Import(FromB, Lang_CXX03);
-  }
-
-  auto *ToTU = ToAST->getASTContext().getTranslationUnitDecl();
-
-  EXPECT_EQ(DeclCounter<FunctionDecl>().match(ToTU, BFP), 1u);
-  EXPECT_EQ(DeclCounter<FunctionDecl>().match(ToTU, DFP), 1u);
-  EXPECT_EQ(DeclCounter<FunctionDecl>().match(ToTU, BFDefP), 1u);
-  EXPECT_EQ(DeclCounter<FunctionDecl>().match(ToTU, DFDefP), 1u);
-  EXPECT_EQ(DeclCounter<FunctionDecl>().match(ToTU, FDefAllP), 2u);
-}
-
-TEST_P(ImportFunctions, ImportOverriddenMethodTwiceOutOfClassDef) {
-  auto Code =
-      R"(
-      struct B { virtual void f(); };
-      struct D:B { void f(); };
-      void B::f(){};
-      )";
-
-  auto BFP =
-      cxxMethodDecl(hasName("f"), hasParent(cxxRecordDecl(hasName("B"))));
-  auto BFDefP = cxxMethodDecl(
-      hasName("f"), hasParent(cxxRecordDecl(hasName("B"))), isDefinition());
-  auto DFP = cxxMethodDecl(hasName("f"), hasParent(cxxRecordDecl(hasName("D"))),
-                           unless(isDefinition()));
-
-  Decl *FromTU0 = getTuDecl(Code, Lang_CXX03);
-  auto *D = FirstDeclMatcher<CXXMethodDecl>().match(FromTU0, DFP);
-  Import(D, Lang_CXX03);
-
-  Decl *FromTU1 = getTuDecl(Code, Lang_CXX03, "input1.cc");
-  auto *B = FirstDeclMatcher<CXXMethodDecl>().match(FromTU1, BFP);
-  Import(B, Lang_CXX03);
-
-  auto *ToTU = ToAST->getASTContext().getTranslationUnitDecl();
-
-  EXPECT_EQ(DeclCounter<FunctionDecl>().match(ToTU, BFP), 1u);
-  EXPECT_EQ(DeclCounter<FunctionDecl>().match(ToTU, BFDefP), 0u);
-
-  auto *ToB = FirstDeclMatcher<CXXRecordDecl>().match(
-      ToTU, cxxRecordDecl(hasName("B")));
-  auto *ToBFInClass = FirstDeclMatcher<CXXMethodDecl>().match(ToTU, BFP);
-  auto *ToBFOutOfClass = FirstDeclMatcher<CXXMethodDecl>().match(
-      ToTU, cxxMethodDecl(hasName("f"), isDefinition()));
-
-  // The definition should be out-of-class.
-  EXPECT_NE(ToBFInClass, ToBFOutOfClass);
-  EXPECT_NE(ToBFInClass->getLexicalDeclContext(),
-            ToBFOutOfClass->getLexicalDeclContext());
-  EXPECT_EQ(ToBFOutOfClass->getDeclContext(), ToB);
-  EXPECT_EQ(ToBFOutOfClass->getLexicalDeclContext(), ToTU);
-
-  // Check that the redecl chain is intact.
-  EXPECT_EQ(ToBFOutOfClass->getPreviousDecl(), ToBFInClass);
-}
-
-TEST_P(ImportFunctions,
-       ImportOverriddenMethodTwiceOutOfClassDefInSeparateCode) {
-  auto CodeTU0 =
-      R"(
-      struct B { virtual void f(); };
-      struct D:B { void f(); };
-      )";
-  auto CodeTU1 =
-      R"(
-      struct B { virtual void f(); };
-      struct D:B { void f(); };
-      void B::f(){}
-      void D::f(){}
-      void foo(B &b, D &d) { b.f(); d.f(); }
-      )";
-
-  auto BFP =
-      cxxMethodDecl(hasName("f"), hasParent(cxxRecordDecl(hasName("B"))));
-  auto BFDefP = cxxMethodDecl(
-      hasName("f"), hasParent(cxxRecordDecl(hasName("B"))), isDefinition());
-  auto DFP =
-      cxxMethodDecl(hasName("f"), hasParent(cxxRecordDecl(hasName("D"))));
-  auto DFDefP = cxxMethodDecl(
-      hasName("f"), hasParent(cxxRecordDecl(hasName("D"))), isDefinition());
-  auto FooDef = functionDecl(hasName("foo"));
-
-  {
-    Decl *FromTU0 = getTuDecl(CodeTU0, Lang_CXX03, "input0.cc");
-    auto *D = FirstDeclMatcher<CXXMethodDecl>().match(FromTU0, DFP);
-    Import(D, Lang_CXX03);
-  }
-
-  {
-    Decl *FromTU1 = getTuDecl(CodeTU1, Lang_CXX03, "input1.cc");
-    auto *Foo = FirstDeclMatcher<FunctionDecl>().match(FromTU1, FooDef);
-    Import(Foo, Lang_CXX03);
-  }
-
-  auto *ToTU = ToAST->getASTContext().getTranslationUnitDecl();
-
-  EXPECT_EQ(DeclCounter<FunctionDecl>().match(ToTU, BFP), 1u);
-  EXPECT_EQ(DeclCounter<FunctionDecl>().match(ToTU, DFP), 1u);
-  EXPECT_EQ(DeclCounter<FunctionDecl>().match(ToTU, BFDefP), 0u);
-  EXPECT_EQ(DeclCounter<FunctionDecl>().match(ToTU, DFDefP), 0u);
-
-  auto *ToB = FirstDeclMatcher<CXXRecordDecl>().match(
-      ToTU, cxxRecordDecl(hasName("B")));
-  auto *ToD = FirstDeclMatcher<CXXRecordDecl>().match(
-      ToTU, cxxRecordDecl(hasName("D")));
-  auto *ToBFInClass = FirstDeclMatcher<CXXMethodDecl>().match(ToTU, BFP);
-  auto *ToBFOutOfClass = FirstDeclMatcher<CXXMethodDecl>().match(
-      ToTU, cxxMethodDecl(hasName("f"), isDefinition()));
-  auto *ToDFInClass = FirstDeclMatcher<CXXMethodDecl>().match(ToTU, DFP);
-  auto *ToDFOutOfClass = LastDeclMatcher<CXXMethodDecl>().match(
-      ToTU, cxxMethodDecl(hasName("f"), isDefinition()));
-
-  // The definition should be out-of-class.
-  EXPECT_NE(ToBFInClass, ToBFOutOfClass);
-  EXPECT_NE(ToBFInClass->getLexicalDeclContext(),
-            ToBFOutOfClass->getLexicalDeclContext());
-  EXPECT_EQ(ToBFOutOfClass->getDeclContext(), ToB);
-  EXPECT_EQ(ToBFOutOfClass->getLexicalDeclContext(), ToTU);
-
-  EXPECT_NE(ToDFInClass, ToDFOutOfClass);
-  EXPECT_NE(ToDFInClass->getLexicalDeclContext(),
-            ToDFOutOfClass->getLexicalDeclContext());
-  EXPECT_EQ(ToDFOutOfClass->getDeclContext(), ToD);
-  EXPECT_EQ(ToDFOutOfClass->getLexicalDeclContext(), ToTU);
-
-  // Check that the redecl chain is intact.
-  EXPECT_EQ(ToBFOutOfClass->getPreviousDecl(), ToBFInClass);
-  EXPECT_EQ(ToDFOutOfClass->getPreviousDecl(), ToDFInClass);
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase, ImportVariableChainInC) {
-    std::string Code = "static int v; static int v = 0;";
-    auto Pattern = varDecl(hasName("v"));
-
-    TranslationUnitDecl *FromTu = getTuDecl(Code, Lang_C99, "input0.c");
-
-    auto *From0 = FirstDeclMatcher<VarDecl>().match(FromTu, Pattern);
-    auto *From1 = LastDeclMatcher<VarDecl>().match(FromTu, Pattern);
-
-    auto *To0 = Import(From0, Lang_C99);
-    auto *To1 = Import(From1, Lang_C99);
-
-    EXPECT_TRUE(To0);
-    ASSERT_TRUE(To1);
-    EXPECT_NE(To0, To1);
-    EXPECT_EQ(To1->getPreviousDecl(), To0);
-}
-
-TEST_P(ImportFunctions, ImportFromDifferentScopedAnonNamespace) {
-  TranslationUnitDecl *FromTu =
-      getTuDecl("namespace NS0 { namespace { void f(); } }"
-                "namespace NS1 { namespace { void f(); } }",
-                Lang_CXX03, "input0.cc");
-  auto Pattern = functionDecl(hasName("f"));
-
-  auto *FromF0 = FirstDeclMatcher<FunctionDecl>().match(FromTu, Pattern);
-  auto *FromF1 = LastDeclMatcher<FunctionDecl>().match(FromTu, Pattern);
-
-  auto *ToF0 = Import(FromF0, Lang_CXX03);
-  auto *ToF1 = Import(FromF1, Lang_CXX03);
-
-  EXPECT_TRUE(ToF0);
-  ASSERT_TRUE(ToF1);
-  EXPECT_NE(ToF0, ToF1);
-  EXPECT_FALSE(ToF1->getPreviousDecl());
-}
-
-TEST_P(ImportFunctions, ImportFunctionFromUnnamedNamespace) {
-  {
-    Decl *FromTU = getTuDecl("namespace { void f() {} } void g0() { f(); }",
-                             Lang_CXX03, "input0.cc");
-    auto *FromD = FirstDeclMatcher<FunctionDecl>().match(
-        FromTU, functionDecl(hasName("g0")));
-
-    Import(FromD, Lang_CXX03);
-  }
-  {
-    Decl *FromTU =
-        getTuDecl("namespace { void f() { int a; } } void g1() { f(); }",
-                  Lang_CXX03, "input1.cc");
-    auto *FromD = FirstDeclMatcher<FunctionDecl>().match(
-        FromTU, functionDecl(hasName("g1")));
-    Import(FromD, Lang_CXX03);
-  }
-
-  Decl *ToTU = ToAST->getASTContext().getTranslationUnitDecl();
-  ASSERT_EQ(DeclCounter<FunctionDecl>().match(ToTU, functionDecl(hasName("f"))),
-            2u);
-}
-
-TEST_P(ImportFunctions, ImportImplicitFunctionsInLambda) {
-  Decl *FromTU = getTuDecl(
-      R"(
-      void foo() {
-        (void)[]() { ; };
-      }
-      )",
-      Lang_CXX11);
-  auto *FromD = FirstDeclMatcher<FunctionDecl>().match(
-      FromTU, functionDecl(hasName("foo")));
-  auto *ToD = Import(FromD, Lang_CXX03);
-  EXPECT_TRUE(ToD);
-  CXXRecordDecl *LambdaRec =
-      cast<LambdaExpr>(cast<CStyleCastExpr>(
-                           *cast<CompoundStmt>(ToD->getBody())->body_begin())
-                           ->getSubExpr())
-          ->getLambdaClass();
-  EXPECT_TRUE(LambdaRec->getDestructor());
-}
-
-TEST_P(ImportFunctions,
-       CallExprOfMemberFunctionTemplateWithExplicitTemplateArgs) {
-  Decl *FromTU = getTuDecl(
-      R"(
-      struct X {
-        template <typename T>
-        void foo(){}
-      };
-      void f() {
-        X x;
-        x.foo<int>();
-      }
-      )",
-      Lang_CXX03);
-  auto *FromD = FirstDeclMatcher<FunctionDecl>().match(
-      FromTU, functionDecl(hasName("f")));
-  auto *ToD = Import(FromD, Lang_CXX03);
-  EXPECT_TRUE(ToD);
-  EXPECT_TRUE(MatchVerifier<FunctionDecl>().match(
-      ToD, functionDecl(hasName("f"), hasDescendant(declRefExpr()))));
-}
-
-TEST_P(ImportFunctions,
-       DependentCallExprOfMemberFunctionTemplateWithExplicitTemplateArgs) {
-  Decl *FromTU = getTuDecl(
-      R"(
-      struct X {
-        template <typename T>
-        void foo(){}
-      };
-      template <typename T>
-      void f() {
-        X x;
-        x.foo<T>();
-      }
-      void g() {
-        f<int>();
-      }
-      )",
-      Lang_CXX03);
-  auto *FromD = FirstDeclMatcher<FunctionDecl>().match(
-      FromTU, functionDecl(hasName("g")));
-  auto *ToD = Import(FromD, Lang_CXX03);
-  EXPECT_TRUE(ToD);
-  Decl *ToTU = ToAST->getASTContext().getTranslationUnitDecl();
-  EXPECT_TRUE(MatchVerifier<TranslationUnitDecl>().match(
-      ToTU, translationUnitDecl(hasDescendant(
-                functionDecl(hasName("f"), hasDescendant(declRefExpr()))))));
-}
-
-struct ImportFunctionTemplates : ASTImporterOptionSpecificTestBase {};
-
-TEST_P(ImportFunctionTemplates, ImportFunctionTemplateInRecordDeclTwice) {
-  auto Code =
-      R"(
-      class X {
-        template <class T>
-        void f(T t);
-      };
-      )";
-  Decl *FromTU1 = getTuDecl(Code, Lang_CXX03, "input1.cc");
-  auto *FromD1 = FirstDeclMatcher<FunctionTemplateDecl>().match(
-      FromTU1, functionTemplateDecl(hasName("f")));
-  auto *ToD1 = Import(FromD1, Lang_CXX03);
-  Decl *FromTU2 = getTuDecl(Code, Lang_CXX03, "input2.cc");
-  auto *FromD2 = FirstDeclMatcher<FunctionTemplateDecl>().match(
-      FromTU2, functionTemplateDecl(hasName("f")));
-  auto *ToD2 = Import(FromD2, Lang_CXX03);
-  EXPECT_EQ(ToD1, ToD2);
-}
-
-TEST_P(ImportFunctionTemplates,
-       ImportFunctionTemplateWithDefInRecordDeclTwice) {
-  auto Code =
-      R"(
-      class X {
-        template <class T>
-        void f(T t);
-      };
-      template <class T>
-      void X::f(T t) {};
-      )";
-  Decl *FromTU1 = getTuDecl(Code, Lang_CXX03, "input1.cc");
-  auto *FromD1 = FirstDeclMatcher<FunctionTemplateDecl>().match(
-      FromTU1, functionTemplateDecl(hasName("f")));
-  auto *ToD1 = Import(FromD1, Lang_CXX03);
-  Decl *FromTU2 = getTuDecl(Code, Lang_CXX03, "input2.cc");
-  auto *FromD2 = FirstDeclMatcher<FunctionTemplateDecl>().match(
-      FromTU2, functionTemplateDecl(hasName("f")));
-  auto *ToD2 = Import(FromD2, Lang_CXX03);
-  EXPECT_EQ(ToD1, ToD2);
-}
-
-TEST_P(ImportFunctionTemplates,
-       ImportFunctionWhenThereIsAFunTemplateWithSameName) {
-  getToTuDecl(
-      R"(
-      template <typename T>
-      void foo(T) {}
-      void foo();
-      )",
-      Lang_CXX03);
-  Decl *FromTU = getTuDecl("void foo();", Lang_CXX03);
-  auto *FromD = FirstDeclMatcher<FunctionDecl>().match(
-      FromTU, functionDecl(hasName("foo")));
-  auto *ImportedD = Import(FromD, Lang_CXX03);
-  EXPECT_TRUE(ImportedD);
-}
-
-TEST_P(ImportFunctionTemplates,
-       ImportConstructorWhenThereIsAFunTemplateWithSameName) {
-  auto Code =
-      R"(
-      struct Foo {
-        template <typename T>
-        Foo(T) {}
-        Foo();
-      };
-      )";
-  getToTuDecl(Code, Lang_CXX03);
-  Decl *FromTU = getTuDecl(Code, Lang_CXX03);
-  auto *FromD =
-      LastDeclMatcher<CXXConstructorDecl>().match(FromTU, cxxConstructorDecl());
-  auto *ImportedD = Import(FromD, Lang_CXX03);
-  EXPECT_TRUE(ImportedD);
-}
-
-TEST_P(ImportFunctionTemplates,
-       ImportOperatorWhenThereIsAFunTemplateWithSameName) {
-  getToTuDecl(
-      R"(
-      template <typename T>
-      void operator<(T,T) {}
-      struct X{};
-      void operator<(X, X);
-      )",
-      Lang_CXX03);
-  Decl *FromTU = getTuDecl(
-      R"(
-      struct X{};
-      void operator<(X, X);
-      )",
-      Lang_CXX03);
-  auto *FromD = LastDeclMatcher<FunctionDecl>().match(
-      FromTU, functionDecl(hasOverloadedOperatorName("<")));
-  auto *ImportedD = Import(FromD, Lang_CXX03);
-  EXPECT_TRUE(ImportedD);
-}
-
-struct ImportFriendFunctions : ImportFunctions {};
-
-TEST_P(ImportFriendFunctions, ImportFriendFunctionRedeclChainProto) {
-  auto Pattern = functionDecl(hasName("f"));
-
-  Decl *FromTU = getTuDecl("struct X { friend void f(); };"
-                           "void f();",
-                           Lang_CXX03, "input0.cc");
-  auto *FromD = FirstDeclMatcher<FunctionDecl>().match(FromTU, Pattern);
-
-  auto *ImportedD = cast<FunctionDecl>(Import(FromD, Lang_CXX03));
-  Decl *ToTU = ToAST->getASTContext().getTranslationUnitDecl();
-  ASSERT_EQ(DeclCounter<FunctionDecl>().match(ToTU, Pattern), 2u);
-  EXPECT_FALSE(ImportedD->doesThisDeclarationHaveABody());
-  auto *ToFD = LastDeclMatcher<FunctionDecl>().match(ToTU, Pattern);
-  EXPECT_FALSE(ToFD->doesThisDeclarationHaveABody());
-  EXPECT_EQ(ToFD->getPreviousDecl(), ImportedD);
-}
-
-TEST_P(ImportFriendFunctions,
-       ImportFriendFunctionRedeclChainProto_OutOfClassProtoFirst) {
-  auto Pattern = functionDecl(hasName("f"));
-
-  Decl *FromTU = getTuDecl("void f();"
-                           "struct X { friend void f(); };",
-                           Lang_CXX03, "input0.cc");
-  auto FromD = FirstDeclMatcher<FunctionDecl>().match(FromTU, Pattern);
-
-  auto *ImportedD = cast<FunctionDecl>(Import(FromD, Lang_CXX03));
-  Decl *ToTU = ToAST->getASTContext().getTranslationUnitDecl();
-  ASSERT_EQ(DeclCounter<FunctionDecl>().match(ToTU, Pattern), 2u);
-  EXPECT_FALSE(ImportedD->doesThisDeclarationHaveABody());
-  auto *ToFD = LastDeclMatcher<FunctionDecl>().match(ToTU, Pattern);
-  EXPECT_FALSE(ToFD->doesThisDeclarationHaveABody());
-  EXPECT_EQ(ToFD->getPreviousDecl(), ImportedD);
-}
-
-TEST_P(ImportFriendFunctions, ImportFriendFunctionRedeclChainDef) {
-  auto Pattern = functionDecl(hasName("f"));
-
-  Decl *FromTU = getTuDecl("struct X { friend void f(){} };"
-                           "void f();",
-                           Lang_CXX03, "input0.cc");
-  auto *FromD = FirstDeclMatcher<FunctionDecl>().match(FromTU, Pattern);
-
-  auto *ImportedD = cast<FunctionDecl>(Import(FromD, Lang_CXX03));
-  Decl *ToTU = ToAST->getASTContext().getTranslationUnitDecl();
-  ASSERT_EQ(DeclCounter<FunctionDecl>().match(ToTU, Pattern), 2u);
-  EXPECT_TRUE(ImportedD->doesThisDeclarationHaveABody());
-  auto *ToFD = LastDeclMatcher<FunctionDecl>().match(ToTU, Pattern);
-  EXPECT_FALSE(ToFD->doesThisDeclarationHaveABody());
-  EXPECT_EQ(ToFD->getPreviousDecl(), ImportedD);
-}
-
-TEST_P(ImportFriendFunctions,
-       ImportFriendFunctionRedeclChainDef_OutOfClassDef) {
-  auto Pattern = functionDecl(hasName("f"));
-
-  Decl *FromTU = getTuDecl("struct X { friend void f(); };"
-                           "void f(){}",
-                           Lang_CXX03, "input0.cc");
-  auto *FromD = FirstDeclMatcher<FunctionDecl>().match(FromTU, Pattern);
-
-  auto *ImportedD = cast<FunctionDecl>(Import(FromD, Lang_CXX03));
-  Decl *ToTU = ToAST->getASTContext().getTranslationUnitDecl();
-  ASSERT_EQ(DeclCounter<FunctionDecl>().match(ToTU, Pattern), 2u);
-  EXPECT_FALSE(ImportedD->doesThisDeclarationHaveABody());
-  auto *ToFD = LastDeclMatcher<FunctionDecl>().match(ToTU, Pattern);
-  EXPECT_TRUE(ToFD->doesThisDeclarationHaveABody());
-  EXPECT_EQ(ToFD->getPreviousDecl(), ImportedD);
-}
-
-TEST_P(ImportFriendFunctions, ImportFriendFunctionRedeclChainDefWithClass) {
-  auto Pattern = functionDecl(hasName("f"));
-
-  Decl *FromTU = getTuDecl(
-      R"(
-        class X;
-        void f(X *x){}
-        class X{
-        friend void f(X *x);
-        };
-      )",
-      Lang_CXX03, "input0.cc");
-  auto *FromD = FirstDeclMatcher<FunctionDecl>().match(FromTU, Pattern);
-
-  auto *ImportedD = cast<FunctionDecl>(Import(FromD, Lang_CXX03));
-  Decl *ToTU = ToAST->getASTContext().getTranslationUnitDecl();
-  ASSERT_EQ(DeclCounter<FunctionDecl>().match(ToTU, Pattern), 2u);
-  EXPECT_TRUE(ImportedD->doesThisDeclarationHaveABody());
-  auto *InClassFD = cast<FunctionDecl>(FirstDeclMatcher<FriendDecl>()
-                                              .match(ToTU, friendDecl())
-                                              ->getFriendDecl());
-  EXPECT_FALSE(InClassFD->doesThisDeclarationHaveABody());
-  EXPECT_EQ(InClassFD->getPreviousDecl(), ImportedD);
-  // The parameters must refer the same type
-  EXPECT_EQ((*InClassFD->param_begin())->getOriginalType(),
-            (*ImportedD->param_begin())->getOriginalType());
-}
-
-TEST_P(ImportFriendFunctions,
-       ImportFriendFunctionRedeclChainDefWithClass_ImportTheProto) {
-  auto Pattern = functionDecl(hasName("f"));
-
-  Decl *FromTU = getTuDecl(
-      R"(
-        class X;
-        void f(X *x){}
-        class X{
-        friend void f(X *x);
-        };
-      )",
-      Lang_CXX03, "input0.cc");
-  auto *FromD = LastDeclMatcher<FunctionDecl>().match(FromTU, Pattern);
-
-  auto *ImportedD = cast<FunctionDecl>(Import(FromD, Lang_CXX03));
-  Decl *ToTU = ToAST->getASTContext().getTranslationUnitDecl();
-  ASSERT_EQ(DeclCounter<FunctionDecl>().match(ToTU, Pattern), 2u);
-  EXPECT_FALSE(ImportedD->doesThisDeclarationHaveABody());
-  auto *OutOfClassFD = FirstDeclMatcher<FunctionDecl>().match(
-      ToTU, functionDecl(unless(hasParent(friendDecl()))));
-
-  EXPECT_TRUE(OutOfClassFD->doesThisDeclarationHaveABody());
-  EXPECT_EQ(ImportedD->getPreviousDecl(), OutOfClassFD);
-  // The parameters must refer the same type
-  EXPECT_EQ((*OutOfClassFD->param_begin())->getOriginalType(),
-            (*ImportedD->param_begin())->getOriginalType());
-}
-
-TEST_P(ImportFriendFunctions, ImportFriendFunctionFromMultipleTU) {
-  auto Pattern = functionDecl(hasName("f"));
-
-  FunctionDecl *ImportedD;
-  {
-    Decl *FromTU =
-        getTuDecl("struct X { friend void f(){} };", Lang_CXX03, "input0.cc");
-    auto *FromD = FirstDeclMatcher<FunctionDecl>().match(FromTU, Pattern);
-    ImportedD = cast<FunctionDecl>(Import(FromD, Lang_CXX03));
-  }
-  FunctionDecl *ImportedD1;
-  {
-    Decl *FromTU = getTuDecl("void f();", Lang_CXX03, "input1.cc");
-    auto *FromD = FirstDeclMatcher<FunctionDecl>().match(FromTU, Pattern);
-    ImportedD1 = cast<FunctionDecl>(Import(FromD, Lang_CXX03));
-  }
-
-  Decl *ToTU = ToAST->getASTContext().getTranslationUnitDecl();
-  ASSERT_EQ(DeclCounter<FunctionDecl>().match(ToTU, Pattern), 2u);
-  EXPECT_TRUE(ImportedD->doesThisDeclarationHaveABody());
-  EXPECT_FALSE(ImportedD1->doesThisDeclarationHaveABody());
-  EXPECT_EQ(ImportedD1->getPreviousDecl(), ImportedD);
-}
-
-TEST_P(ImportFriendFunctions, Lookup) {
-  auto FunctionPattern = functionDecl(hasName("f"));
-  auto ClassPattern = cxxRecordDecl(hasName("X"));
-
-  TranslationUnitDecl *FromTU =
-      getTuDecl("struct X { friend void f(); };", Lang_CXX03, "input0.cc");
-  auto *FromD = FirstDeclMatcher<FunctionDecl>().match(FromTU, FunctionPattern);
-  ASSERT_TRUE(FromD->isInIdentifierNamespace(Decl::IDNS_OrdinaryFriend));
-  ASSERT_FALSE(FromD->isInIdentifierNamespace(Decl::IDNS_Ordinary));
-  {
-    auto FromName = FromD->getDeclName();
-    auto *Class = FirstDeclMatcher<CXXRecordDecl>().match(FromTU, ClassPattern);
-    auto LookupRes = Class->noload_lookup(FromName);
-    ASSERT_TRUE(LookupRes.empty());
-    LookupRes = FromTU->noload_lookup(FromName);
-    ASSERT_TRUE(LookupRes.isSingleResult());
-  }
-
-  auto *ToD = cast<FunctionDecl>(Import(FromD, Lang_CXX03));
-  auto ToName = ToD->getDeclName();
-
-  TranslationUnitDecl *ToTU = ToAST->getASTContext().getTranslationUnitDecl();
-  auto *Class = FirstDeclMatcher<CXXRecordDecl>().match(ToTU, ClassPattern);
-  auto LookupRes = Class->noload_lookup(ToName);
-  EXPECT_TRUE(LookupRes.empty());
-  LookupRes = ToTU->noload_lookup(ToName);
-  EXPECT_TRUE(LookupRes.isSingleResult());
-
-  EXPECT_EQ(DeclCounter<FunctionDecl>().match(ToTU, FunctionPattern), 1u);
-  auto *To0 = FirstDeclMatcher<FunctionDecl>().match(ToTU, FunctionPattern);
-  EXPECT_TRUE(To0->isInIdentifierNamespace(Decl::IDNS_OrdinaryFriend));
-  EXPECT_FALSE(To0->isInIdentifierNamespace(Decl::IDNS_Ordinary));
-}
-
-TEST_P(ImportFriendFunctions, LookupWithProtoAfter) {
-  auto FunctionPattern = functionDecl(hasName("f"));
-  auto ClassPattern = cxxRecordDecl(hasName("X"));
-
-  TranslationUnitDecl *FromTU =
-      getTuDecl("struct X { friend void f(); };"
-                // This proto decl makes f available to normal
-                // lookup, otherwise it is hidden.
-                // Normal C++ lookup (implemented in
-                // `clang::Sema::CppLookupName()` and in `LookupDirect()`)
-                // returns the found `NamedDecl` only if the set IDNS is matched
-                "void f();",
-                Lang_CXX03, "input0.cc");
-  auto *FromFriend =
-      FirstDeclMatcher<FunctionDecl>().match(FromTU, FunctionPattern);
-  auto *FromNormal =
-      LastDeclMatcher<FunctionDecl>().match(FromTU, FunctionPattern);
-  ASSERT_TRUE(FromFriend->isInIdentifierNamespace(Decl::IDNS_OrdinaryFriend));
-  ASSERT_FALSE(FromFriend->isInIdentifierNamespace(Decl::IDNS_Ordinary));
-  ASSERT_FALSE(FromNormal->isInIdentifierNamespace(Decl::IDNS_OrdinaryFriend));
-  ASSERT_TRUE(FromNormal->isInIdentifierNamespace(Decl::IDNS_Ordinary));
-
-  auto FromName = FromFriend->getDeclName();
-  auto *FromClass =
-      FirstDeclMatcher<CXXRecordDecl>().match(FromTU, ClassPattern);
-  auto LookupRes = FromClass->noload_lookup(FromName);
-  ASSERT_TRUE(LookupRes.empty());
-  LookupRes = FromTU->noload_lookup(FromName);
-  ASSERT_TRUE(LookupRes.isSingleResult());
-
-  auto *ToFriend = cast<FunctionDecl>(Import(FromFriend, Lang_CXX03));
-  auto ToName = ToFriend->getDeclName();
-
-  TranslationUnitDecl *ToTU = ToAST->getASTContext().getTranslationUnitDecl();
-  auto *ToClass = FirstDeclMatcher<CXXRecordDecl>().match(ToTU, ClassPattern);
-  LookupRes = ToClass->noload_lookup(ToName);
-  EXPECT_TRUE(LookupRes.empty());
-  LookupRes = ToTU->noload_lookup(ToName);
-  // Test is disabled because this result is 2.
-  EXPECT_TRUE(LookupRes.isSingleResult());
-
-  ASSERT_EQ(DeclCounter<FunctionDecl>().match(ToTU, FunctionPattern), 2u);
-  ToFriend = FirstDeclMatcher<FunctionDecl>().match(ToTU, FunctionPattern);
-  auto *ToNormal = LastDeclMatcher<FunctionDecl>().match(ToTU, FunctionPattern);
-  EXPECT_TRUE(ToFriend->isInIdentifierNamespace(Decl::IDNS_OrdinaryFriend));
-  EXPECT_FALSE(ToFriend->isInIdentifierNamespace(Decl::IDNS_Ordinary));
-  EXPECT_FALSE(ToNormal->isInIdentifierNamespace(Decl::IDNS_OrdinaryFriend));
-  EXPECT_TRUE(ToNormal->isInIdentifierNamespace(Decl::IDNS_Ordinary));
-}
-
-TEST_P(ImportFriendFunctions, LookupWithProtoBefore) {
-  auto FunctionPattern = functionDecl(hasName("f"));
-  auto ClassPattern = cxxRecordDecl(hasName("X"));
-
-  TranslationUnitDecl *FromTU = getTuDecl("void f();"
-                                          "struct X { friend void f(); };",
-                                          Lang_CXX03, "input0.cc");
-  auto *FromNormal =
-      FirstDeclMatcher<FunctionDecl>().match(FromTU, FunctionPattern);
-  auto *FromFriend =
-      LastDeclMatcher<FunctionDecl>().match(FromTU, FunctionPattern);
-  ASSERT_FALSE(FromNormal->isInIdentifierNamespace(Decl::IDNS_OrdinaryFriend));
-  ASSERT_TRUE(FromNormal->isInIdentifierNamespace(Decl::IDNS_Ordinary));
-  ASSERT_TRUE(FromFriend->isInIdentifierNamespace(Decl::IDNS_OrdinaryFriend));
-  ASSERT_TRUE(FromFriend->isInIdentifierNamespace(Decl::IDNS_Ordinary));
-
-  auto FromName = FromNormal->getDeclName();
-  auto *FromClass =
-      FirstDeclMatcher<CXXRecordDecl>().match(FromTU, ClassPattern);
-  auto LookupRes = FromClass->noload_lookup(FromName);
-  ASSERT_TRUE(LookupRes.empty());
-  LookupRes = FromTU->noload_lookup(FromName);
-  ASSERT_TRUE(LookupRes.isSingleResult());
-
-  auto *ToNormal = cast<FunctionDecl>(Import(FromNormal, Lang_CXX03));
-  auto ToName = ToNormal->getDeclName();
-  TranslationUnitDecl *ToTU = ToAST->getASTContext().getTranslationUnitDecl();
-
-  auto *ToClass = FirstDeclMatcher<CXXRecordDecl>().match(ToTU, ClassPattern);
-  LookupRes = ToClass->noload_lookup(ToName);
-  EXPECT_TRUE(LookupRes.empty());
-  LookupRes = ToTU->noload_lookup(ToName);
-  EXPECT_TRUE(LookupRes.isSingleResult());
-
-  EXPECT_EQ(DeclCounter<FunctionDecl>().match(ToTU, FunctionPattern), 2u);
-  ToNormal = FirstDeclMatcher<FunctionDecl>().match(ToTU, FunctionPattern);
-  auto *ToFriend = LastDeclMatcher<FunctionDecl>().match(ToTU, FunctionPattern);
-  EXPECT_FALSE(ToNormal->isInIdentifierNamespace(Decl::IDNS_OrdinaryFriend));
-  EXPECT_TRUE(ToNormal->isInIdentifierNamespace(Decl::IDNS_Ordinary));
-  EXPECT_TRUE(ToFriend->isInIdentifierNamespace(Decl::IDNS_OrdinaryFriend));
-  EXPECT_TRUE(ToFriend->isInIdentifierNamespace(Decl::IDNS_Ordinary));
-}
-
-TEST_P(ImportFriendFunctions, ImportFriendChangesLookup) {
-  auto Pattern = functionDecl(hasName("f"));
-
-  TranslationUnitDecl *FromNormalTU =
-      getTuDecl("void f();", Lang_CXX03, "input0.cc");
-  auto *FromNormalF =
-      FirstDeclMatcher<FunctionDecl>().match(FromNormalTU, Pattern);
-  TranslationUnitDecl *FromFriendTU =
-      getTuDecl("class X { friend void f(); };", Lang_CXX03, "input1.cc");
-  auto *FromFriendF =
-      FirstDeclMatcher<FunctionDecl>().match(FromFriendTU, Pattern);
-  auto FromNormalName = FromNormalF->getDeclName();
-  auto FromFriendName = FromFriendF->getDeclName();
-
-  ASSERT_TRUE(FromNormalF->isInIdentifierNamespace(Decl::IDNS_Ordinary));
-  ASSERT_FALSE(FromNormalF->isInIdentifierNamespace(Decl::IDNS_OrdinaryFriend));
-  ASSERT_FALSE(FromFriendF->isInIdentifierNamespace(Decl::IDNS_Ordinary));
-  ASSERT_TRUE(FromFriendF->isInIdentifierNamespace(Decl::IDNS_OrdinaryFriend));
-  auto LookupRes = FromNormalTU->noload_lookup(FromNormalName);
-  ASSERT_TRUE(LookupRes.isSingleResult());
-  LookupRes = FromFriendTU->noload_lookup(FromFriendName);
-  ASSERT_TRUE(LookupRes.isSingleResult());
-
-  auto *ToNormalF = cast<FunctionDecl>(Import(FromNormalF, Lang_CXX03));
-  TranslationUnitDecl *ToTU = ToAST->getASTContext().getTranslationUnitDecl();
-  auto ToName = ToNormalF->getDeclName();
-  EXPECT_TRUE(ToNormalF->isInIdentifierNamespace(Decl::IDNS_Ordinary));
-  EXPECT_FALSE(ToNormalF->isInIdentifierNamespace(Decl::IDNS_OrdinaryFriend));
-  LookupRes = ToTU->noload_lookup(ToName);
-  EXPECT_TRUE(LookupRes.isSingleResult());
-  EXPECT_EQ(DeclCounter<FunctionDecl>().match(ToTU, Pattern), 1u);
-
-  auto *ToFriendF = cast<FunctionDecl>(Import(FromFriendF, Lang_CXX03));
-  LookupRes = ToTU->noload_lookup(ToName);
-  EXPECT_TRUE(LookupRes.isSingleResult());
-  EXPECT_EQ(DeclCounter<FunctionDecl>().match(ToTU, Pattern), 2u);
-
-  EXPECT_TRUE(ToNormalF->isInIdentifierNamespace(Decl::IDNS_Ordinary));
-  EXPECT_FALSE(ToNormalF->isInIdentifierNamespace(Decl::IDNS_OrdinaryFriend));
-
-  EXPECT_TRUE(ToFriendF->isInIdentifierNamespace(Decl::IDNS_Ordinary));
-  EXPECT_TRUE(ToFriendF->isInIdentifierNamespace(Decl::IDNS_OrdinaryFriend));
-}
-
-TEST_P(ImportFriendFunctions, ImportFriendList) {
-  TranslationUnitDecl *FromTU = getTuDecl("struct X { friend void f(); };"
-                                          "void f();",
-                                          Lang_CXX03, "input0.cc");
-  auto *FromFriendF = FirstDeclMatcher<FunctionDecl>().match(
-      FromTU, functionDecl(hasName("f")));
-
-  auto *FromClass = FirstDeclMatcher<CXXRecordDecl>().match(
-      FromTU, cxxRecordDecl(hasName("X")));
-  auto *FromFriend = FirstDeclMatcher<FriendDecl>().match(FromTU, friendDecl());
-  auto FromFriends = FromClass->friends();
-  unsigned int FrN = 0;
-  for (auto Fr : FromFriends) {
-    ASSERT_EQ(Fr, FromFriend);
-    ++FrN;
-  }
-  ASSERT_EQ(FrN, 1u);
-
-  Import(FromFriendF, Lang_CXX03);
-  TranslationUnitDecl *ToTU = ToAST->getASTContext().getTranslationUnitDecl();
-  auto *ToClass = FirstDeclMatcher<CXXRecordDecl>().match(
-      ToTU, cxxRecordDecl(hasName("X")));
-  auto *ToFriend = FirstDeclMatcher<FriendDecl>().match(ToTU, friendDecl());
-  auto ToFriends = ToClass->friends();
-  FrN = 0;
-  for (auto Fr : ToFriends) {
-    EXPECT_EQ(Fr, ToFriend);
-    ++FrN;
-  }
-  EXPECT_EQ(FrN, 1u);
-}
-
-AST_MATCHER_P(TagDecl, hasTypedefForAnonDecl, Matcher<TypedefNameDecl>,
-              InnerMatcher) {
-  if (auto *Typedef = Node.getTypedefNameForAnonDecl())
-    return InnerMatcher.matches(*Typedef, Finder, Builder);
-  return false;
-}
-
-TEST_P(ImportDecl, ImportEnumSequential) {
-  CodeFiles Samples{{"main.c",
-                     {"void foo();"
-                      "void moo();"
-                      "int main() { foo(); moo(); }",
-                      Lang_C99}},
-
-                    {"foo.c",
-                     {"typedef enum { THING_VALUE } thing_t;"
-                      "void conflict(thing_t type);"
-                      "void foo() { (void)THING_VALUE; }"
-                      "void conflict(thing_t type) {}",
-                      Lang_C99}},
-
-                    {"moo.c",
-                     {"typedef enum { THING_VALUE } thing_t;"
-                      "void conflict(thing_t type);"
-                      "void moo() { conflict(THING_VALUE); }",
-                      Lang_C99}}};
-
-  auto VerificationMatcher =
-      enumDecl(has(enumConstantDecl(hasName("THING_VALUE"))),
-               hasTypedefForAnonDecl(hasName("thing_t")));
-
-  ImportAction ImportFoo{"foo.c", "main.c", functionDecl(hasName("foo"))},
-      ImportMoo{"moo.c", "main.c", functionDecl(hasName("moo"))};
-
-  testImportSequence(
-      Samples, {ImportFoo, ImportMoo}, // "foo", them "moo".
-      // Just check that there is only one enum decl in the result AST.
-      "main.c", enumDecl(), VerificationMatcher);
-
-  // For different import order, result should be the same.
-  testImportSequence(
-      Samples, {ImportMoo, ImportFoo}, // "moo", them "foo".
-      // Check that there is only one enum decl in the result AST.
-      "main.c", enumDecl(), VerificationMatcher);
-}
-
-TEST_P(ImportDecl, ImportFieldOrder) {
-  MatchVerifier<Decl> Verifier;
-  testImport("struct declToImport {"
-             "  int b = a + 2;"
-             "  int a = 5;"
-             "};",
-             Lang_CXX11, "", Lang_CXX11, Verifier,
-             recordDecl(hasFieldOrder({"b", "a"})));
-}
-
-const internal::VariadicDynCastAllOfMatcher<Expr, DependentScopeDeclRefExpr>
-    dependentScopeDeclRefExpr;
-
-TEST_P(ImportExpr, DependentScopeDeclRefExpr) {
-  MatchVerifier<Decl> Verifier;
-  testImport("template <typename T> struct S { static T foo; };"
-             "template <typename T> void declToImport() {"
-             "  (void) S<T>::foo;"
-             "}"
-             "void instantiate() { declToImport<int>(); }"
-             "template <typename T> T S<T>::foo;",
-             Lang_CXX11, "", Lang_CXX11, Verifier,
-             functionTemplateDecl(has(functionDecl(has(compoundStmt(
-                 has(cStyleCastExpr(has(dependentScopeDeclRefExpr())))))))));
-
-  testImport("template <typename T> struct S {"
-             "template<typename S> static void foo(){};"
-             "};"
-             "template <typename T> void declToImport() {"
-             "  S<T>::template foo<T>();"
-             "}"
-             "void instantiate() { declToImport<int>(); }",
-             Lang_CXX11, "", Lang_CXX11, Verifier,
-             functionTemplateDecl(has(functionDecl(has(compoundStmt(
-                 has(callExpr(has(dependentScopeDeclRefExpr())))))))));
-}
-
-const internal::VariadicDynCastAllOfMatcher<Type, DependentNameType>
-    dependentNameType;
-
-TEST_P(ImportExpr, DependentNameType) {
-  MatchVerifier<Decl> Verifier;
-  testImport("template <typename T> struct declToImport {"
-             "  typedef typename T::type dependent_name;"
-             "};",
-             Lang_CXX11, "", Lang_CXX11, Verifier,
-             classTemplateDecl(has(
-                 cxxRecordDecl(has(typedefDecl(has(dependentNameType())))))));
-}
-
-TEST_P(ImportExpr, UnresolvedMemberExpr) {
-  MatchVerifier<Decl> Verifier;
-  testImport("struct S { template <typename T> void mem(); };"
-             "template <typename U> void declToImport() {"
-             "  S s;"
-             "  s.mem<U>();"
-             "}"
-             "void instantiate() { declToImport<int>(); }",
-             Lang_CXX11, "", Lang_CXX11, Verifier,
-             functionTemplateDecl(has(functionDecl(has(
-                 compoundStmt(has(callExpr(has(unresolvedMemberExpr())))))))));
-}
-
-class ImportImplicitMethods : public ASTImporterOptionSpecificTestBase {
-public:
-  static constexpr auto DefaultCode = R"(
-      struct A { int x; };
-      void f() {
-        A a;
-        A a1(a);
-        A a2(A{});
-        a = a1;
-        a = A{};
-        a.~A();
-      })";
-
-  template <typename MatcherType>
-  void testImportOf(
-      const MatcherType &MethodMatcher, const char *Code = DefaultCode) {
-    test(MethodMatcher, Code, /*ExpectedCount=*/1u);
-  }
-
-  template <typename MatcherType>
-  void testNoImportOf(
-      const MatcherType &MethodMatcher, const char *Code = DefaultCode) {
-    test(MethodMatcher, Code, /*ExpectedCount=*/0u);
-  }
-
-private:
-  template <typename MatcherType>
-  void test(const MatcherType &MethodMatcher,
-      const char *Code, unsigned int ExpectedCount) {
-    auto ClassMatcher = cxxRecordDecl(unless(isImplicit()));
-
-    Decl *ToTU = getToTuDecl(Code, Lang_CXX11);
-    auto *ToClass = FirstDeclMatcher<CXXRecordDecl>().match(
-        ToTU, ClassMatcher);
-
-    ASSERT_EQ(DeclCounter<CXXMethodDecl>().match(ToClass, MethodMatcher), 1u);
-
-    {
-      CXXMethodDecl *Method =
-          FirstDeclMatcher<CXXMethodDecl>().match(ToClass, MethodMatcher);
-      ToClass->removeDecl(Method);
-      SharedStatePtr->getLookupTable()->remove(Method);
-    }
-
-    ASSERT_EQ(DeclCounter<CXXMethodDecl>().match(ToClass, MethodMatcher), 0u);
-
-    Decl *ImportedClass = nullptr;
-    {
-      Decl *FromTU = getTuDecl(Code, Lang_CXX11, "input1.cc");
-      auto *FromClass = FirstDeclMatcher<CXXRecordDecl>().match(
-          FromTU, ClassMatcher);
-      ImportedClass = Import(FromClass, Lang_CXX11);
-    }
-
-    EXPECT_EQ(ToClass, ImportedClass);
-    EXPECT_EQ(DeclCounter<CXXMethodDecl>().match(ToClass, MethodMatcher),
-        ExpectedCount);
-  }
-};
-
-TEST_P(ImportImplicitMethods, DefaultConstructor) {
-  testImportOf(cxxConstructorDecl(isDefaultConstructor()));
-}
-
-TEST_P(ImportImplicitMethods, CopyConstructor) {
-  testImportOf(cxxConstructorDecl(isCopyConstructor()));
-}
-
-TEST_P(ImportImplicitMethods, MoveConstructor) {
-  testImportOf(cxxConstructorDecl(isMoveConstructor()));
-}
-
-TEST_P(ImportImplicitMethods, Destructor) {
-  testImportOf(cxxDestructorDecl());
-}
-
-TEST_P(ImportImplicitMethods, CopyAssignment) {
-  testImportOf(cxxMethodDecl(isCopyAssignmentOperator()));
-}
-
-TEST_P(ImportImplicitMethods, MoveAssignment) {
-  testImportOf(cxxMethodDecl(isMoveAssignmentOperator()));
-}
-
-TEST_P(ImportImplicitMethods, DoNotImportUserProvided) {
-  auto Code = R"(
-      struct A { A() { int x; } };
-      )";
-  testNoImportOf(cxxConstructorDecl(isDefaultConstructor()), Code);
-}
-
-TEST_P(ImportImplicitMethods, DoNotImportDefault) {
-  auto Code = R"(
-      struct A { A() = default; };
-      )";
-  testNoImportOf(cxxConstructorDecl(isDefaultConstructor()), Code);
-}
-
-TEST_P(ImportImplicitMethods, DoNotImportDeleted) {
-  auto Code = R"(
-      struct A { A() = delete; };
-      )";
-  testNoImportOf(cxxConstructorDecl(isDefaultConstructor()), Code);
-}
-
-TEST_P(ImportImplicitMethods, DoNotImportOtherMethod) {
-  auto Code = R"(
-      struct A { void f() { } };
-      )";
-  testNoImportOf(cxxMethodDecl(hasName("f")), Code);
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase, ImportOfEquivalentRecord) {
-  Decl *ToR1;
-  {
-    Decl *FromTU = getTuDecl("struct A { };", Lang_CXX03, "input0.cc");
-    auto *FromR = FirstDeclMatcher<CXXRecordDecl>().match(
-        FromTU, cxxRecordDecl(hasName("A")));
-
-    ToR1 = Import(FromR, Lang_CXX03);
-  }
-
-  Decl *ToR2;
-  {
-    Decl *FromTU = getTuDecl("struct A { };", Lang_CXX03, "input1.cc");
-    auto *FromR = FirstDeclMatcher<CXXRecordDecl>().match(
-        FromTU, cxxRecordDecl(hasName("A")));
-
-    ToR2 = Import(FromR, Lang_CXX03);
-  }
-
-  EXPECT_EQ(ToR1, ToR2);
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase, ImportOfNonEquivalentRecord) {
-  Decl *ToR1;
-  {
-    Decl *FromTU = getTuDecl("struct A { int x; };", Lang_CXX03, "input0.cc");
-    auto *FromR = FirstDeclMatcher<CXXRecordDecl>().match(
-        FromTU, cxxRecordDecl(hasName("A")));
-    ToR1 = Import(FromR, Lang_CXX03);
-  }
-  Decl *ToR2;
-  {
-    Decl *FromTU =
-        getTuDecl("struct A { unsigned x; };", Lang_CXX03, "input1.cc");
-    auto *FromR = FirstDeclMatcher<CXXRecordDecl>().match(
-        FromTU, cxxRecordDecl(hasName("A")));
-    ToR2 = Import(FromR, Lang_CXX03);
-  }
-  EXPECT_NE(ToR1, ToR2);
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase, ImportOfEquivalentField) {
-  Decl *ToF1;
-  {
-    Decl *FromTU = getTuDecl("struct A { int x; };", Lang_CXX03, "input0.cc");
-    auto *FromF = FirstDeclMatcher<FieldDecl>().match(
-        FromTU, fieldDecl(hasName("x")));
-    ToF1 = Import(FromF, Lang_CXX03);
-  }
-  Decl *ToF2;
-  {
-    Decl *FromTU = getTuDecl("struct A { int x; };", Lang_CXX03, "input1.cc");
-    auto *FromF = FirstDeclMatcher<FieldDecl>().match(
-        FromTU, fieldDecl(hasName("x")));
-    ToF2 = Import(FromF, Lang_CXX03);
-  }
-  EXPECT_EQ(ToF1, ToF2);
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase, ImportBitfields) {
-  Decl *FromTU = getTuDecl("struct A { unsigned x : 3; };", Lang_CXX03);
-  auto *FromF =
-      FirstDeclMatcher<FieldDecl>().match(FromTU, fieldDecl(hasName("x")));
-
-  ASSERT_TRUE(FromF->isBitField());
-  ASSERT_EQ(3u, FromF->getBitWidthValue(FromTU->getASTContext()));
-  auto *ToField = Import(FromF, Lang_CXX03);
-  auto *ToTU = ToField->getTranslationUnitDecl();
-
-  EXPECT_TRUE(ToField->isBitField());
-  EXPECT_EQ(3u, ToField->getBitWidthValue(ToTU->getASTContext()));
-
-  const auto *FromBT = FromF->getBitWidth()->getType()->getAs<BuiltinType>();
-  const auto *ToBT = ToField->getBitWidth()->getType()->getAs<BuiltinType>();
-  ASSERT_TRUE(FromBT);
-  ASSERT_EQ(BuiltinType::Int, FromBT->getKind());
-  EXPECT_TRUE(ToBT);
-  EXPECT_EQ(BuiltinType::Int, ToBT->getKind());
-}
-
-struct ImportBlock : ASTImporterOptionSpecificTestBase {};
-TEST_P(ImportBlock, ImportBlocksAreUnsupported) {
-  const auto *Code = R"(
-    void test_block__capture_null() {
-      int *p = 0;
-      ^(){
-        *p = 1;
-      }();
-    })";
-  Decl *FromTU = getTuDecl(Code, Lang_CXX03);
-  auto *FromBlock = FirstDeclMatcher<BlockDecl>().match(FromTU, blockDecl());
-  ASSERT_TRUE(FromBlock);
-
-  auto ToBlockOrError = importOrError(FromBlock, Lang_CXX03);
-
-  const auto ExpectUnsupportedConstructError = [](const ImportError &Error) {
-    EXPECT_EQ(ImportError::UnsupportedConstruct, Error.Error);
-  };
-  llvm::handleAllErrors(ToBlockOrError.takeError(),
-                        ExpectUnsupportedConstructError);
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase, ImportParmVarDecl) {
-  const auto *Code = R"(
-    template <typename T> struct Wrapper {
-      Wrapper(T Value = {}) {}
-    };
-    template class Wrapper<int>;
-    )";
-  Decl *FromTU = getTuDecl(Code, Lang_CXX11);
-  auto *FromVar = FirstDeclMatcher<ParmVarDecl>().match(
-      FromTU, parmVarDecl(hasType(asString("int"))));
-  ASSERT_TRUE(FromVar);
-  ASSERT_TRUE(FromVar->hasUninstantiatedDefaultArg());
-  ASSERT_TRUE(FromVar->getUninstantiatedDefaultArg());
-
-  const auto *ToVar = Import(FromVar, Lang_CXX11);
-  EXPECT_TRUE(ToVar);
-  EXPECT_TRUE(ToVar->hasUninstantiatedDefaultArg());
-  EXPECT_TRUE(ToVar->getUninstantiatedDefaultArg());
-  EXPECT_NE(FromVar->getUninstantiatedDefaultArg(),
-            ToVar->getUninstantiatedDefaultArg());
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase, ImportOfNonEquivalentField) {
-  Decl *ToF1;
-  {
-    Decl *FromTU = getTuDecl("struct A { int x; };", Lang_CXX03, "input0.cc");
-    auto *FromF = FirstDeclMatcher<FieldDecl>().match(
-        FromTU, fieldDecl(hasName("x")));
-    ToF1 = Import(FromF, Lang_CXX03);
-  }
-  Decl *ToF2;
-  {
-    Decl *FromTU =
-        getTuDecl("struct A { unsigned x; };", Lang_CXX03, "input1.cc");
-    auto *FromF = FirstDeclMatcher<FieldDecl>().match(
-        FromTU, fieldDecl(hasName("x")));
-    ToF2 = Import(FromF, Lang_CXX03);
-  }
-  EXPECT_NE(ToF1, ToF2);
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase, ImportOfEquivalentMethod) {
-  Decl *ToM1;
-  {
-    Decl *FromTU = getTuDecl("struct A { void x(); }; void A::x() { }",
-                             Lang_CXX03, "input0.cc");
-    auto *FromM = FirstDeclMatcher<FunctionDecl>().match(
-        FromTU, functionDecl(hasName("x"), isDefinition()));
-    ToM1 = Import(FromM, Lang_CXX03);
-  }
-  Decl *ToM2;
-  {
-    Decl *FromTU = getTuDecl("struct A { void x(); }; void A::x() { }",
-                             Lang_CXX03, "input1.cc");
-    auto *FromM = FirstDeclMatcher<FunctionDecl>().match(
-        FromTU, functionDecl(hasName("x"), isDefinition()));
-    ToM2 = Import(FromM, Lang_CXX03);
-  }
-  EXPECT_EQ(ToM1, ToM2);
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase, ImportOfNonEquivalentMethod) {
-  Decl *ToM1;
-  {
-    Decl *FromTU = getTuDecl("struct A { void x(); }; void A::x() { }",
-                             Lang_CXX03, "input0.cc");
-    auto *FromM = FirstDeclMatcher<FunctionDecl>().match(
-        FromTU, functionDecl(hasName("x"), isDefinition()));
-    ToM1 = Import(FromM, Lang_CXX03);
-  }
-  Decl *ToM2;
-  {
-    Decl *FromTU =
-        getTuDecl("struct A { void x() const; }; void A::x() const { }",
-                  Lang_CXX03, "input1.cc");
-    auto *FromM = FirstDeclMatcher<FunctionDecl>().match(
-        FromTU, functionDecl(hasName("x"), isDefinition()));
-    ToM2 = Import(FromM, Lang_CXX03);
-  }
-  EXPECT_NE(ToM1, ToM2);
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase,
-       ImportUnnamedStructsWithRecursingField) {
-  Decl *FromTU = getTuDecl(
-      R"(
-      struct A {
-        struct {
-          struct A *next;
-        } entry0;
-        struct {
-          struct A *next;
-        } entry1;
-      };
-      )",
-      Lang_C99, "input0.cc");
-  auto *From =
-      FirstDeclMatcher<RecordDecl>().match(FromTU, recordDecl(hasName("A")));
-
-  Import(From, Lang_C99);
-
-  auto *ToTU = ToAST->getASTContext().getTranslationUnitDecl();
-  auto *Entry0 =
-      FirstDeclMatcher<FieldDecl>().match(ToTU, fieldDecl(hasName("entry0")));
-  auto *Entry1 =
-      FirstDeclMatcher<FieldDecl>().match(ToTU, fieldDecl(hasName("entry1")));
-  auto *R0 = getRecordDecl(Entry0);
-  auto *R1 = getRecordDecl(Entry1);
-  EXPECT_NE(R0, R1);
-  EXPECT_TRUE(MatchVerifier<RecordDecl>().match(
-      R0, recordDecl(has(fieldDecl(hasName("next"))))));
-  EXPECT_TRUE(MatchVerifier<RecordDecl>().match(
-      R1, recordDecl(has(fieldDecl(hasName("next"))))));
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase, ImportUnnamedFieldsInCorrectOrder) {
-  Decl *FromTU = getTuDecl(
-      R"(
-      void f(int X, int Y, bool Z) {
-        (void)[X, Y, Z] { (void)Z; };
-      }
-      )",
-      Lang_CXX11, "input0.cc");
-  auto *FromF = FirstDeclMatcher<FunctionDecl>().match(
-      FromTU, functionDecl(hasName("f")));
-  auto *ToF = cast_or_null<FunctionDecl>(Import(FromF, Lang_CXX11));
-  EXPECT_TRUE(ToF);
-
-  CXXRecordDecl *FromLambda =
-      cast<LambdaExpr>(cast<CStyleCastExpr>(cast<CompoundStmt>(
-          FromF->getBody())->body_front())->getSubExpr())->getLambdaClass();
-
-  auto *ToLambda = cast_or_null<CXXRecordDecl>(Import(FromLambda, Lang_CXX11));
-  EXPECT_TRUE(ToLambda);
-
-  // Check if the fields of the lambda class are imported in correct order.
-  unsigned FromIndex = 0u;
-  for (auto *FromField : FromLambda->fields()) {
-    ASSERT_FALSE(FromField->getDeclName());
-    auto *ToField = cast_or_null<FieldDecl>(Import(FromField, Lang_CXX11));
-    EXPECT_TRUE(ToField);
-    Optional<unsigned> ToIndex = ASTImporter::getFieldIndex(ToField);
-    EXPECT_TRUE(ToIndex);
-    EXPECT_EQ(*ToIndex, FromIndex);
-    ++FromIndex;
-  }
-
-  EXPECT_EQ(FromIndex, 3u);
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase,
-       MergeFieldDeclsOfClassTemplateSpecialization) {
-  std::string ClassTemplate =
-      R"(
-      template <typename T>
-      struct X {
-          int a{0}; // FieldDecl with InitListExpr
-          X(char) : a(3) {}     // (1)
-          X(int) {}             // (2)
-      };
-      )";
-  Decl *ToTU = getToTuDecl(ClassTemplate +
-      R"(
-      void foo() {
-          // ClassTemplateSpec with ctor (1): FieldDecl without InitlistExpr
-          X<char> xc('c');
-      }
-      )", Lang_CXX11);
-  auto *ToSpec = FirstDeclMatcher<ClassTemplateSpecializationDecl>().match(
-      ToTU, classTemplateSpecializationDecl(hasName("X")));
-  // FieldDecl without InitlistExpr:
-  auto *ToField = *ToSpec->field_begin();
-  ASSERT_TRUE(ToField);
-  ASSERT_FALSE(ToField->getInClassInitializer());
-  Decl *FromTU = getTuDecl(ClassTemplate +
-      R"(
-      void bar() {
-          // ClassTemplateSpec with ctor (2): FieldDecl WITH InitlistExpr
-          X<char> xc(1);
-      }
-      )", Lang_CXX11);
-  auto *FromSpec = FirstDeclMatcher<ClassTemplateSpecializationDecl>().match(
-      FromTU, classTemplateSpecializationDecl(hasName("X")));
-  // FieldDecl with InitlistExpr:
-  auto *FromField = *FromSpec->field_begin();
-  ASSERT_TRUE(FromField);
-  ASSERT_TRUE(FromField->getInClassInitializer());
-
-  auto *ImportedSpec = Import(FromSpec, Lang_CXX11);
-  ASSERT_TRUE(ImportedSpec);
-  EXPECT_EQ(ImportedSpec, ToSpec);
-  // After the import, the FieldDecl has to be merged, thus it should have the
-  // InitListExpr.
-  EXPECT_TRUE(ToField->getInClassInitializer());
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase,
-       MergeFunctionOfClassTemplateSpecialization) {
-  std::string ClassTemplate =
-      R"(
-      template <typename T>
-      struct X {
-        void f() {}
-        void g() {}
-      };
-      )";
-  Decl *ToTU = getToTuDecl(ClassTemplate +
-      R"(
-      void foo() {
-          X<char> x;
-          x.f();
-      }
-      )", Lang_CXX11);
-  Decl *FromTU = getTuDecl(ClassTemplate +
-      R"(
-      void bar() {
-          X<char> x;
-          x.g();
-      }
-      )", Lang_CXX11);
-  auto *FromSpec = FirstDeclMatcher<ClassTemplateSpecializationDecl>().match(
-      FromTU, classTemplateSpecializationDecl(hasName("X")));
-  auto FunPattern = functionDecl(hasName("g"),
-                         hasParent(classTemplateSpecializationDecl()));
-  auto *FromFun =
-      FirstDeclMatcher<FunctionDecl>().match(FromTU, FunPattern);
-  auto *ToFun =
-      FirstDeclMatcher<FunctionDecl>().match(ToTU, FunPattern);
-  ASSERT_TRUE(FromFun->hasBody());
-  ASSERT_FALSE(ToFun->hasBody());
-  auto *ImportedSpec = Import(FromSpec, Lang_CXX11);
-  ASSERT_TRUE(ImportedSpec);
-  auto *ToSpec = FirstDeclMatcher<ClassTemplateSpecializationDecl>().match(
-      ToTU, classTemplateSpecializationDecl(hasName("X")));
-  EXPECT_EQ(ImportedSpec, ToSpec);
-  EXPECT_TRUE(ToFun->hasBody());
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase, MergeTemplateSpecWithForwardDecl) {
-  std::string ClassTemplate =
-      R"(
-      template<typename T>
-      struct X { int m; };
-      template<>
-      struct X<int> { int m; };
-      )";
-  // Append a forward decl for our template specialization.
-  getToTuDecl(ClassTemplate + "template<> struct X<int>;", Lang_CXX11);
-  Decl *FromTU = getTuDecl(ClassTemplate, Lang_CXX11);
-  auto *FromSpec = FirstDeclMatcher<ClassTemplateSpecializationDecl>().match(
-      FromTU, classTemplateSpecializationDecl(hasName("X"), isDefinition()));
-  auto *ImportedSpec = Import(FromSpec, Lang_CXX11);
-  // Check that our definition got merged with the existing definition.
-  EXPECT_TRUE(FromSpec->isThisDeclarationADefinition());
-  EXPECT_TRUE(ImportedSpec->isThisDeclarationADefinition());
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase,
-       ODRViolationOfClassTemplateSpecializationsShouldBeReported) {
-  std::string ClassTemplate =
-      R"(
-      template <typename T>
-      struct X {};
-      )";
-  Decl *ToTU = getToTuDecl(ClassTemplate +
-                               R"(
-      template <>
-      struct X<char> {
-          int a;
-      };
-      void foo() {
-          X<char> x;
-      }
-      )",
-                           Lang_CXX11);
-  Decl *FromTU = getTuDecl(ClassTemplate +
-                               R"(
-      template <>
-      struct X<char> {
-          int b;
-      };
-      void foo() {
-          X<char> x;
-      }
-      )",
-                           Lang_CXX11);
-  auto *FromSpec = FirstDeclMatcher<ClassTemplateSpecializationDecl>().match(
-      FromTU, classTemplateSpecializationDecl(hasName("X")));
-  auto *ImportedSpec = Import(FromSpec, Lang_CXX11);
-
-  // We expect one (ODR) warning during the import.
-  EXPECT_EQ(1u, ToTU->getASTContext().getDiagnostics().getNumWarnings());
-
-  // The second specialization is different from the first, thus it violates
-  // ODR, consequently we expect to keep the first specialization only, which is
-  // already in the "To" context.
-  EXPECT_FALSE(ImportedSpec);
-  EXPECT_EQ(1u,
-            DeclCounter<ClassTemplateSpecializationDecl>().match(
-                ToTU, classTemplateSpecializationDecl(hasName("X"))));
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase,
-       MergeCtorOfClassTemplateSpecialization) {
-  std::string ClassTemplate =
-      R"(
-      template <typename T>
-      struct X {
-          X(char) {}
-          X(int) {}
-      };
-      )";
-  Decl *ToTU = getToTuDecl(ClassTemplate +
-      R"(
-      void foo() {
-          X<char> x('c');
-      }
-      )", Lang_CXX11);
-  Decl *FromTU = getTuDecl(ClassTemplate +
-      R"(
-      void bar() {
-          X<char> x(1);
-      }
-      )", Lang_CXX11);
-  auto *FromSpec = FirstDeclMatcher<ClassTemplateSpecializationDecl>().match(
-      FromTU, classTemplateSpecializationDecl(hasName("X")));
-  // Match the void(int) ctor.
-  auto CtorPattern =
-      cxxConstructorDecl(hasParameter(0, varDecl(hasType(asString("int")))),
-                         hasParent(classTemplateSpecializationDecl()));
-  auto *FromCtor =
-      FirstDeclMatcher<CXXConstructorDecl>().match(FromTU, CtorPattern);
-  auto *ToCtor =
-      FirstDeclMatcher<CXXConstructorDecl>().match(ToTU, CtorPattern);
-  ASSERT_TRUE(FromCtor->hasBody());
-  ASSERT_FALSE(ToCtor->hasBody());
-  auto *ImportedSpec = Import(FromSpec, Lang_CXX11);
-  ASSERT_TRUE(ImportedSpec);
-  auto *ToSpec = FirstDeclMatcher<ClassTemplateSpecializationDecl>().match(
-      ToTU, classTemplateSpecializationDecl(hasName("X")));
-  EXPECT_EQ(ImportedSpec, ToSpec);
-  EXPECT_TRUE(ToCtor->hasBody());
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase, ClassTemplateFriendDecl) {
-  const auto *Code =
-      R"(
-      template <class T> class X {  friend T; };
-      struct Y {};
-      template class X<Y>;
-    )";
-  Decl *ToTU = getToTuDecl(Code, Lang_CXX11);
-  Decl *FromTU = getTuDecl(Code, Lang_CXX11);
-  auto *FromSpec = FirstDeclMatcher<ClassTemplateSpecializationDecl>().match(
-      FromTU, classTemplateSpecializationDecl());
-  auto *ToSpec = FirstDeclMatcher<ClassTemplateSpecializationDecl>().match(
-      ToTU, classTemplateSpecializationDecl());
-
-  auto *ImportedSpec = Import(FromSpec, Lang_CXX11);
-  EXPECT_EQ(ImportedSpec, ToSpec);
-  EXPECT_EQ(1u, DeclCounter<ClassTemplateSpecializationDecl>().match(
-                    ToTU, classTemplateSpecializationDecl()));
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase,
-       ClassTemplatePartialSpecializationsShouldNotBeDuplicated) {
-  auto Code =
-      R"(
-    // primary template
-    template<class T1, class T2, int I>
-    class A {};
-
-    // partial specialization
-    template<class T, int I>
-    class A<T, T*, I> {};
-    )";
-  Decl *ToTU = getToTuDecl(Code, Lang_CXX11);
-  Decl *FromTU = getTuDecl(Code, Lang_CXX11);
-  auto *FromSpec =
-      FirstDeclMatcher<ClassTemplatePartialSpecializationDecl>().match(
-          FromTU, classTemplatePartialSpecializationDecl());
-  auto *ToSpec =
-      FirstDeclMatcher<ClassTemplatePartialSpecializationDecl>().match(
-          ToTU, classTemplatePartialSpecializationDecl());
-
-  auto *ImportedSpec = Import(FromSpec, Lang_CXX11);
-  EXPECT_EQ(ImportedSpec, ToSpec);
-  EXPECT_EQ(1u, DeclCounter<ClassTemplatePartialSpecializationDecl>().match(
-                    ToTU, classTemplatePartialSpecializationDecl()));
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase,
-       ClassTemplateSpecializationsShouldNotBeDuplicated) {
-  auto Code =
-      R"(
-    // primary template
-    template<class T1, class T2, int I>
-    class A {};
-
-    // full specialization
-    template<>
-    class A<int, int, 1> {};
-    )";
-  Decl *ToTU = getToTuDecl(Code, Lang_CXX11);
-  Decl *FromTU = getTuDecl(Code, Lang_CXX11);
-  auto *FromSpec = FirstDeclMatcher<ClassTemplateSpecializationDecl>().match(
-      FromTU, classTemplateSpecializationDecl());
-  auto *ToSpec = FirstDeclMatcher<ClassTemplateSpecializationDecl>().match(
-      ToTU, classTemplateSpecializationDecl());
-
-  auto *ImportedSpec = Import(FromSpec, Lang_CXX11);
-  EXPECT_EQ(ImportedSpec, ToSpec);
-  EXPECT_EQ(1u, DeclCounter<ClassTemplateSpecializationDecl>().match(
-                   ToTU, classTemplateSpecializationDecl()));
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase,
-       ClassTemplateFullAndPartialSpecsShouldNotBeMixed) {
-  std::string PrimaryTemplate =
-      R"(
-    template<class T1, class T2, int I>
-    class A {};
-    )";
-  auto PartialSpec =
-      R"(
-    template<class T, int I>
-    class A<T, T*, I> {};
-    )";
-  auto FullSpec =
-      R"(
-    template<>
-    class A<int, int, 1> {};
-    )";
-  Decl *ToTU = getToTuDecl(PrimaryTemplate + FullSpec, Lang_CXX11);
-  Decl *FromTU = getTuDecl(PrimaryTemplate + PartialSpec, Lang_CXX11);
-  auto *FromSpec = FirstDeclMatcher<ClassTemplateSpecializationDecl>().match(
-      FromTU, classTemplateSpecializationDecl());
-
-  auto *ImportedSpec = Import(FromSpec, Lang_CXX11);
-  EXPECT_TRUE(ImportedSpec);
-  // Check the number of partial specializations.
-  EXPECT_EQ(1u, DeclCounter<ClassTemplatePartialSpecializationDecl>().match(
-                    ToTU, classTemplatePartialSpecializationDecl()));
-  // Check the number of full specializations.
-  EXPECT_EQ(1u, DeclCounter<ClassTemplateSpecializationDecl>().match(
-                    ToTU, classTemplateSpecializationDecl(
-                              unless(classTemplatePartialSpecializationDecl()))));
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase,
-       InitListExprValueKindShouldBeImported) {
-  Decl *TU = getTuDecl(
-      R"(
-      const int &init();
-      void foo() { const int &a{init()}; }
-      )", Lang_CXX11, "input0.cc");
-  auto *FromD = FirstDeclMatcher<VarDecl>().match(TU, varDecl(hasName("a")));
-  ASSERT_TRUE(FromD->getAnyInitializer());
-  auto *InitExpr = FromD->getAnyInitializer();
-  ASSERT_TRUE(InitExpr);
-  ASSERT_TRUE(InitExpr->isGLValue());
-
-  auto *ToD = Import(FromD, Lang_CXX11);
-  EXPECT_TRUE(ToD);
-  auto *ToInitExpr = cast<VarDecl>(ToD)->getAnyInitializer();
-  EXPECT_TRUE(ToInitExpr);
-  EXPECT_TRUE(ToInitExpr->isGLValue());
-}
-
-struct ImportVariables : ASTImporterOptionSpecificTestBase {};
-
-TEST_P(ImportVariables, ImportOfOneDeclBringsInTheWholeChain) {
-  Decl *FromTU = getTuDecl(
-      R"(
-      struct A {
-        static const int a = 1 + 2;
-      };
-      const int A::a;
-      )",
-      Lang_CXX03, "input1.cc");
-
-  auto *FromDWithInit = FirstDeclMatcher<VarDecl>().match(
-      FromTU, varDecl(hasName("a"))); // Decl with init
-  auto *FromDWithDef = LastDeclMatcher<VarDecl>().match(
-      FromTU, varDecl(hasName("a"))); // Decl with definition
-  ASSERT_NE(FromDWithInit, FromDWithDef);
-  ASSERT_EQ(FromDWithDef->getPreviousDecl(), FromDWithInit);
-
-  auto *ToD0 = cast<VarDecl>(Import(FromDWithInit, Lang_CXX11));
-  auto *ToD1 = cast<VarDecl>(Import(FromDWithDef, Lang_CXX11));
-  ASSERT_TRUE(ToD0);
-  ASSERT_TRUE(ToD1);
-  EXPECT_NE(ToD0, ToD1);
-  EXPECT_EQ(ToD1->getPreviousDecl(), ToD0);
-}
-
-TEST_P(ImportVariables, InitAndDefinitionAreInDifferentTUs) {
-  auto StructA =
-      R"(
-      struct A {
-        static const int a = 1 + 2;
-      };
-      )";
-  Decl *ToTU = getToTuDecl(StructA, Lang_CXX03);
-  Decl *FromTU = getTuDecl(std::string(StructA) + "const int A::a;", Lang_CXX03,
-                           "input1.cc");
-
-  auto *FromDWithInit = FirstDeclMatcher<VarDecl>().match(
-      FromTU, varDecl(hasName("a"))); // Decl with init
-  auto *FromDWithDef = LastDeclMatcher<VarDecl>().match(
-      FromTU, varDecl(hasName("a"))); // Decl with definition
-  ASSERT_EQ(FromDWithInit, FromDWithDef->getPreviousDecl());
-  ASSERT_TRUE(FromDWithInit->getInit());
-  ASSERT_FALSE(FromDWithInit->isThisDeclarationADefinition());
-  ASSERT_TRUE(FromDWithDef->isThisDeclarationADefinition());
-  ASSERT_FALSE(FromDWithDef->getInit());
-
-  auto *ToD = FirstDeclMatcher<VarDecl>().match(
-      ToTU, varDecl(hasName("a"))); // Decl with init
-  ASSERT_TRUE(ToD->getInit());
-  ASSERT_FALSE(ToD->getDefinition());
-
-  auto *ImportedD = cast<VarDecl>(Import(FromDWithDef, Lang_CXX11));
-  EXPECT_TRUE(ImportedD->getAnyInitializer());
-  EXPECT_TRUE(ImportedD->getDefinition());
-}
-
-TEST_P(ImportVariables, InitAndDefinitionAreInTheFromContext) {
-  auto StructA =
-      R"(
-      struct A {
-        static const int a;
-      };
-      )";
-  Decl *ToTU = getToTuDecl(StructA, Lang_CXX03);
-  Decl *FromTU = getTuDecl(std::string(StructA) + "const int A::a = 1 + 2;",
-                           Lang_CXX03, "input1.cc");
-
-  auto *FromDDeclarationOnly = FirstDeclMatcher<VarDecl>().match(
-      FromTU, varDecl(hasName("a")));
-  auto *FromDWithDef = LastDeclMatcher<VarDecl>().match(
-      FromTU, varDecl(hasName("a"))); // Decl with definition and with init.
-  ASSERT_EQ(FromDDeclarationOnly, FromDWithDef->getPreviousDecl());
-  ASSERT_FALSE(FromDDeclarationOnly->getInit());
-  ASSERT_FALSE(FromDDeclarationOnly->isThisDeclarationADefinition());
-  ASSERT_TRUE(FromDWithDef->isThisDeclarationADefinition());
-  ASSERT_TRUE(FromDWithDef->getInit());
-
-  auto *ToD = FirstDeclMatcher<VarDecl>().match(
-      ToTU, varDecl(hasName("a")));
-  ASSERT_FALSE(ToD->getInit());
-  ASSERT_FALSE(ToD->getDefinition());
-
-  auto *ImportedD = cast<VarDecl>(Import(FromDWithDef, Lang_CXX11));
-  EXPECT_TRUE(ImportedD->getAnyInitializer());
-  EXPECT_TRUE(ImportedD->getDefinition());
-}
-
-TEST_P(ImportVariables, ImportBindingDecl) {
-  Decl *From, *To;
-  std::tie(From, To) = getImportedDecl(
-      R"(
-      void declToImport() {
-        int a[2] = {1,2};
-        auto [x1,y1] = a;
-        auto& [x2,y2] = a;
-        
-        struct S {
-          mutable int x1 : 2;
-          volatile double y1;
-        };
-        S b;
-        const auto [x3, y3] = b;
-      };
-      )",
-      Lang_CXX17, "", Lang_CXX17);
-
-  TranslationUnitDecl *FromTU = From->getTranslationUnitDecl();
-  auto *FromF = FirstDeclMatcher<FunctionDecl>().match(
-      FromTU, functionDecl(hasName("declToImport")));
-  auto *ToF = Import(FromF, Lang_CXX17);
-  EXPECT_TRUE(ToF);
-
-  auto VerifyImport = [&](llvm::StringRef BindName) {
-    auto *FromB = FirstDeclMatcher<BindingDecl>().match(
-        FromF, bindingDecl(hasName(BindName)));
-    ASSERT_TRUE(FromB);
-    auto *ToB = Import(FromB, Lang_CXX17);
-    EXPECT_TRUE(ToB);
-    EXPECT_EQ(FromB->getBinding() != nullptr, ToB->getBinding() != nullptr);
-    EXPECT_EQ(FromB->getDecomposedDecl() != nullptr,
-              ToB->getDecomposedDecl() != nullptr);
-    EXPECT_EQ(FromB->getHoldingVar() != nullptr,
-              ToB->getHoldingVar() != nullptr);
-  };
-
-  VerifyImport("x1");
-  VerifyImport("y1");
-  VerifyImport("x2");
-  VerifyImport("y2");
-  VerifyImport("x3");
-  VerifyImport("y3");
-}
-
-TEST_P(ImportVariables, ImportDecompositionDeclArray) {
-  Decl *From, *To;
-  std::tie(From, To) = getImportedDecl(
-      R"(
-      void declToImport() {
-        int a[2] = {1,2};
-        auto [x1,y1] = a;
-      };
-      )",
-      Lang_CXX17, "", Lang_CXX17);
-
-  TranslationUnitDecl *FromTU = From->getTranslationUnitDecl();
-  auto *FromDecomp =
-      FirstDeclMatcher<DecompositionDecl>().match(FromTU, decompositionDecl());
-  auto *ToDecomp = Import(FromDecomp, Lang_CXX17);
-  EXPECT_TRUE(ToDecomp);
-
-  ArrayRef<BindingDecl *> FromB = FromDecomp->bindings();
-  ArrayRef<BindingDecl *> ToB = ToDecomp->bindings();
-  EXPECT_EQ(FromB.size(), ToB.size());
-  for (unsigned int I = 0; I < FromB.size(); ++I) {
-    auto *ToBI = Import(FromB[I], Lang_CXX17);
-    EXPECT_EQ(ToBI, ToB[I]);
-  }
-}
-
-struct ImportClasses : ASTImporterOptionSpecificTestBase {};
-
-TEST_P(ImportClasses, ImportDefinitionWhenProtoIsInNestedToContext) {
-  Decl *ToTU = getToTuDecl("struct A { struct X *Xp; };", Lang_C99);
-  Decl *FromTU1 = getTuDecl("struct X {};", Lang_C99, "input1.cc");
-  auto Pattern = recordDecl(hasName("X"), unless(isImplicit()));
-  auto ToProto = FirstDeclMatcher<RecordDecl>().match(ToTU, Pattern);
-  auto FromDef = FirstDeclMatcher<RecordDecl>().match(FromTU1, Pattern);
-
-  Decl *ImportedDef = Import(FromDef, Lang_C99);
-
-  EXPECT_NE(ImportedDef, ToProto);
-  EXPECT_EQ(DeclCounter<RecordDecl>().match(ToTU, Pattern), 2u);
-  auto ToDef = LastDeclMatcher<RecordDecl>().match(ToTU, Pattern);
-  EXPECT_TRUE(ImportedDef == ToDef);
-  EXPECT_TRUE(ToDef->isThisDeclarationADefinition());
-  EXPECT_FALSE(ToProto->isThisDeclarationADefinition());
-  EXPECT_EQ(ToDef->getPreviousDecl(), ToProto);
-}
-
-TEST_P(ImportClasses, ImportDefinitionWhenProtoIsInNestedToContextCXX) {
-  Decl *ToTU = getToTuDecl("struct A { struct X *Xp; };", Lang_CXX03);
-  Decl *FromTU1 = getTuDecl("struct X {};", Lang_CXX03, "input1.cc");
-  auto Pattern = recordDecl(hasName("X"), unless(isImplicit()));
-  auto ToProto = FirstDeclMatcher<RecordDecl>().match(ToTU, Pattern);
-  auto FromDef = FirstDeclMatcher<RecordDecl>().match(FromTU1, Pattern);
-
-  Decl *ImportedDef = Import(FromDef, Lang_CXX03);
-
-  EXPECT_NE(ImportedDef, ToProto);
-  EXPECT_EQ(DeclCounter<RecordDecl>().match(ToTU, Pattern), 2u);
-  auto ToDef = LastDeclMatcher<RecordDecl>().match(ToTU, Pattern);
-  EXPECT_TRUE(ImportedDef == ToDef);
-  EXPECT_TRUE(ToDef->isThisDeclarationADefinition());
-  EXPECT_FALSE(ToProto->isThisDeclarationADefinition());
-  EXPECT_EQ(ToDef->getPreviousDecl(), ToProto);
-}
-
-TEST_P(ImportClasses, ImportNestedPrototypeThenDefinition) {
-  Decl *FromTU0 =
-      getTuDecl("struct A { struct X *Xp; };", Lang_C99, "input0.cc");
-  Decl *FromTU1 = getTuDecl("struct X {};", Lang_C99, "input1.cc");
-  auto Pattern = recordDecl(hasName("X"), unless(isImplicit()));
-  auto FromProto = FirstDeclMatcher<RecordDecl>().match(FromTU0, Pattern);
-  auto FromDef = FirstDeclMatcher<RecordDecl>().match(FromTU1, Pattern);
-
-  Decl *ImportedProto = Import(FromProto, Lang_C99);
-  Decl *ImportedDef = Import(FromDef, Lang_C99);
-  Decl *ToTU = ImportedDef->getTranslationUnitDecl();
-
-  EXPECT_NE(ImportedDef, ImportedProto);
-  EXPECT_EQ(DeclCounter<RecordDecl>().match(ToTU, Pattern), 2u);
-  auto ToProto = FirstDeclMatcher<RecordDecl>().match(ToTU, Pattern);
-  auto ToDef = LastDeclMatcher<RecordDecl>().match(ToTU, Pattern);
-  EXPECT_TRUE(ImportedDef == ToDef);
-  EXPECT_TRUE(ImportedProto == ToProto);
-  EXPECT_TRUE(ToDef->isThisDeclarationADefinition());
-  EXPECT_FALSE(ToProto->isThisDeclarationADefinition());
-  EXPECT_EQ(ToDef->getPreviousDecl(), ToProto);
-}
-
-
-struct ImportFriendClasses : ASTImporterOptionSpecificTestBase {};
-
-TEST_P(ImportFriendClasses, ImportOfFriendRecordDoesNotMergeDefinition) {
-  Decl *FromTU = getTuDecl(
-      R"(
-      class A {
-        template <int I> class F {};
-        class X {
-          template <int I> friend class F;
-        };
-      };
-      )",
-      Lang_CXX03, "input0.cc");
-
-  auto *FromClass = FirstDeclMatcher<CXXRecordDecl>().match(
-      FromTU, cxxRecordDecl(hasName("F"), isDefinition()));
-  auto *FromFriendClass = LastDeclMatcher<CXXRecordDecl>().match(
-      FromTU, cxxRecordDecl(hasName("F")));
-
-  ASSERT_TRUE(FromClass);
-  ASSERT_TRUE(FromFriendClass);
-  ASSERT_NE(FromClass, FromFriendClass);
-  ASSERT_EQ(FromFriendClass->getDefinition(), FromClass);
-  ASSERT_EQ(FromFriendClass->getPreviousDecl(), FromClass);
-  ASSERT_EQ(FromFriendClass->getDescribedClassTemplate()->getPreviousDecl(),
-            FromClass->getDescribedClassTemplate());
-
-  auto *ToClass = cast<CXXRecordDecl>(Import(FromClass, Lang_CXX03));
-  auto *ToFriendClass =
-      cast<CXXRecordDecl>(Import(FromFriendClass, Lang_CXX03));
-
-  EXPECT_TRUE(ToClass);
-  EXPECT_TRUE(ToFriendClass);
-  EXPECT_NE(ToClass, ToFriendClass);
-  EXPECT_EQ(ToFriendClass->getDefinition(), ToClass);
-  EXPECT_EQ(ToFriendClass->getPreviousDecl(), ToClass);
-  EXPECT_EQ(ToFriendClass->getDescribedClassTemplate()->getPreviousDecl(),
-            ToClass->getDescribedClassTemplate());
-}
-
-TEST_P(ImportFriendClasses, ImportOfRecursiveFriendClass) {
-  Decl *FromTu = getTuDecl(
-      R"(
-      class declToImport {
-        friend class declToImport;
-      };
-      )",
-      Lang_CXX03, "input.cc");
-
-  auto *FromD = FirstDeclMatcher<CXXRecordDecl>().match(
-      FromTu, cxxRecordDecl(hasName("declToImport")));
-  auto *ToD = Import(FromD, Lang_CXX03);
-  auto Pattern = cxxRecordDecl(has(friendDecl()));
-  ASSERT_TRUE(MatchVerifier<Decl>{}.match(FromD, Pattern));
-  EXPECT_TRUE(MatchVerifier<Decl>{}.match(ToD, Pattern));
-}
-
-TEST_P(ImportFriendClasses, UndeclaredFriendClassShouldNotBeVisible) {
-  Decl *FromTu =
-      getTuDecl("class X { friend class Y; };", Lang_CXX03, "from.cc");
-  auto *FromX = FirstDeclMatcher<CXXRecordDecl>().match(
-      FromTu, cxxRecordDecl(hasName("X")));
-  auto *FromFriend = FirstDeclMatcher<FriendDecl>().match(FromTu, friendDecl());
-  RecordDecl *FromRecordOfFriend =
-      const_cast<RecordDecl *>(getRecordDeclOfFriend(FromFriend));
-
-  ASSERT_EQ(FromRecordOfFriend->getDeclContext(), cast<DeclContext>(FromTu));
-  ASSERT_EQ(FromRecordOfFriend->getLexicalDeclContext(),
-            cast<DeclContext>(FromX));
-  ASSERT_FALSE(
-      FromRecordOfFriend->getDeclContext()->containsDecl(FromRecordOfFriend));
-  ASSERT_FALSE(FromRecordOfFriend->getLexicalDeclContext()->containsDecl(
-      FromRecordOfFriend));
-  ASSERT_FALSE(FromRecordOfFriend->getLookupParent()
-                   ->lookup(FromRecordOfFriend->getDeclName())
-                   .empty());
-
-  auto *ToX = Import(FromX, Lang_CXX03);
-  ASSERT_TRUE(ToX);
-
-  Decl *ToTu = ToX->getTranslationUnitDecl();
-  auto *ToFriend = FirstDeclMatcher<FriendDecl>().match(ToTu, friendDecl());
-  RecordDecl *ToRecordOfFriend =
-      const_cast<RecordDecl *>(getRecordDeclOfFriend(ToFriend));
-
-  ASSERT_EQ(ToRecordOfFriend->getDeclContext(), cast<DeclContext>(ToTu));
-  ASSERT_EQ(ToRecordOfFriend->getLexicalDeclContext(), cast<DeclContext>(ToX));
-  EXPECT_FALSE(
-      ToRecordOfFriend->getDeclContext()->containsDecl(ToRecordOfFriend));
-  EXPECT_FALSE(ToRecordOfFriend->getLexicalDeclContext()->containsDecl(
-      ToRecordOfFriend));
-  EXPECT_FALSE(ToRecordOfFriend->getLookupParent()
-                   ->lookup(ToRecordOfFriend->getDeclName())
-                   .empty());
-}
-
-TEST_P(ImportFriendClasses, ImportOfRecursiveFriendClassTemplate) {
-  Decl *FromTu = getTuDecl(
-      R"(
-      template<class A> class declToImport {
-        template<class A1> friend class declToImport;
-      };
-      )",
-      Lang_CXX03, "input.cc");
-
-  auto *FromD =
-      FirstDeclMatcher<ClassTemplateDecl>().match(FromTu, classTemplateDecl());
-  auto *ToD = Import(FromD, Lang_CXX03);
-
-  auto Pattern = classTemplateDecl(
-      has(cxxRecordDecl(has(friendDecl(has(classTemplateDecl()))))));
-  ASSERT_TRUE(MatchVerifier<Decl>{}.match(FromD, Pattern));
-  EXPECT_TRUE(MatchVerifier<Decl>{}.match(ToD, Pattern));
-
-  auto *Class =
-      FirstDeclMatcher<ClassTemplateDecl>().match(ToD, classTemplateDecl());
-  auto *Friend = FirstDeclMatcher<FriendDecl>().match(ToD, friendDecl());
-  EXPECT_NE(Friend->getFriendDecl(), Class);
-  EXPECT_EQ(Friend->getFriendDecl()->getPreviousDecl(), Class);
-}
-
-TEST_P(ImportFriendClasses, ProperPrevDeclForClassTemplateDecls) {
-  auto Pattern = classTemplateSpecializationDecl(hasName("X"));
-
-  ClassTemplateSpecializationDecl *Imported1;
-  {
-    Decl *FromTU = getTuDecl("template<class T> class X;"
-                             "struct Y { friend class X<int>; };",
-                             Lang_CXX03, "input0.cc");
-    auto *FromD = FirstDeclMatcher<ClassTemplateSpecializationDecl>().match(
-        FromTU, Pattern);
-
-    Imported1 =
-        cast<ClassTemplateSpecializationDecl>(Import(FromD, Lang_CXX03));
-  }
-  ClassTemplateSpecializationDecl *Imported2;
-  {
-    Decl *FromTU = getTuDecl("template<class T> class X;"
-                             "template<> class X<int>{};"
-                             "struct Z { friend class X<int>; };",
-                             Lang_CXX03, "input1.cc");
-    auto *FromD = FirstDeclMatcher<ClassTemplateSpecializationDecl>().match(
-        FromTU, Pattern);
-
-    Imported2 =
-        cast<ClassTemplateSpecializationDecl>(Import(FromD, Lang_CXX03));
-  }
-
-  Decl *ToTU = ToAST->getASTContext().getTranslationUnitDecl();
-  EXPECT_EQ(DeclCounter<ClassTemplateSpecializationDecl>().match(ToTU, Pattern),
-            2u);
-  ASSERT_TRUE(Imported2->getPreviousDecl());
-  EXPECT_EQ(Imported2->getPreviousDecl(), Imported1);
-}
-
-TEST_P(ImportFriendClasses, TypeForDeclShouldBeSetInTemplated) {
-  Decl *FromTU0 = getTuDecl(
-      R"(
-      class X {
-        class Y;
-      };
-      class X::Y {
-        template <typename T>
-        friend class F; // The decl context of F is the global namespace.
-      };
-      )",
-      Lang_CXX03, "input0.cc");
-  auto *Fwd = FirstDeclMatcher<ClassTemplateDecl>().match(
-      FromTU0, classTemplateDecl(hasName("F")));
-  auto *Imported0 = cast<ClassTemplateDecl>(Import(Fwd, Lang_CXX03));
-  Decl *FromTU1 = getTuDecl(
-      R"(
-      template <typename T>
-      class F {};
-      )",
-      Lang_CXX03, "input1.cc");
-  auto *Definition = FirstDeclMatcher<ClassTemplateDecl>().match(
-      FromTU1, classTemplateDecl(hasName("F")));
-  auto *Imported1 = cast<ClassTemplateDecl>(Import(Definition, Lang_CXX03));
-  EXPECT_EQ(Imported0->getTemplatedDecl()->getTypeForDecl(),
-            Imported1->getTemplatedDecl()->getTypeForDecl());
-}
-
-TEST_P(ImportFriendClasses, DeclsFromFriendsShouldBeInRedeclChains) {
-  Decl *From, *To;
-  std::tie(From, To) =
-      getImportedDecl("class declToImport {};", Lang_CXX03,
-                      "class Y { friend class declToImport; };", Lang_CXX03);
-  auto *Imported = cast<CXXRecordDecl>(To);
-
-  EXPECT_TRUE(Imported->getPreviousDecl());
-}
-
-TEST_P(ImportFriendClasses,
-       ImportOfClassTemplateDefinitionShouldConnectToFwdFriend) {
-  Decl *ToTU = getToTuDecl(
-      R"(
-      class X {
-        class Y;
-      };
-      class X::Y {
-        template <typename T>
-        friend class F; // The decl context of F is the global namespace.
-      };
-      )",
-      Lang_CXX03);
-  auto *ToDecl = FirstDeclMatcher<ClassTemplateDecl>().match(
-      ToTU, classTemplateDecl(hasName("F")));
-  Decl *FromTU = getTuDecl(
-      R"(
-      template <typename T>
-      class F {};
-      )",
-      Lang_CXX03, "input0.cc");
-  auto *Definition = FirstDeclMatcher<ClassTemplateDecl>().match(
-      FromTU, classTemplateDecl(hasName("F")));
-  auto *ImportedDef = cast<ClassTemplateDecl>(Import(Definition, Lang_CXX03));
-  EXPECT_TRUE(ImportedDef->getPreviousDecl());
-  EXPECT_EQ(ToDecl, ImportedDef->getPreviousDecl());
-  EXPECT_EQ(ToDecl->getTemplatedDecl(),
-            ImportedDef->getTemplatedDecl()->getPreviousDecl());
-}
-
-TEST_P(ImportFriendClasses,
-       ImportOfClassTemplateDefinitionAndFwdFriendShouldBeLinked) {
-  Decl *FromTU0 = getTuDecl(
-      R"(
-      class X {
-        class Y;
-      };
-      class X::Y {
-        template <typename T>
-        friend class F; // The decl context of F is the global namespace.
-      };
-      )",
-      Lang_CXX03, "input0.cc");
-  auto *Fwd = FirstDeclMatcher<ClassTemplateDecl>().match(
-      FromTU0, classTemplateDecl(hasName("F")));
-  auto *ImportedFwd = cast<ClassTemplateDecl>(Import(Fwd, Lang_CXX03));
-  Decl *FromTU1 = getTuDecl(
-      R"(
-      template <typename T>
-      class F {};
-      )",
-      Lang_CXX03, "input1.cc");
-  auto *Definition = FirstDeclMatcher<ClassTemplateDecl>().match(
-      FromTU1, classTemplateDecl(hasName("F")));
-  auto *ImportedDef = cast<ClassTemplateDecl>(Import(Definition, Lang_CXX03));
-  EXPECT_TRUE(ImportedDef->getPreviousDecl());
-  EXPECT_EQ(ImportedFwd, ImportedDef->getPreviousDecl());
-  EXPECT_EQ(ImportedFwd->getTemplatedDecl(),
-            ImportedDef->getTemplatedDecl()->getPreviousDecl());
-}
-
-TEST_P(ImportFriendClasses, ImportOfClassDefinitionAndFwdFriendShouldBeLinked) {
-  Decl *FromTU0 = getTuDecl(
-      R"(
-      class X {
-        class Y;
-      };
-      class X::Y {
-        friend class F; // The decl context of F is the global namespace.
-      };
-      )",
-      Lang_CXX03, "input0.cc");
-  auto *Friend = FirstDeclMatcher<FriendDecl>().match(FromTU0, friendDecl());
-  QualType FT = Friend->getFriendType()->getType();
-  FT = FromTU0->getASTContext().getCanonicalType(FT);
-  auto *Fwd = cast<TagType>(FT)->getDecl();
-  auto *ImportedFwd = Import(Fwd, Lang_CXX03);
-  Decl *FromTU1 = getTuDecl(
-      R"(
-      class F {};
-      )",
-      Lang_CXX03, "input1.cc");
-  auto *Definition = FirstDeclMatcher<CXXRecordDecl>().match(
-      FromTU1, cxxRecordDecl(hasName("F")));
-  auto *ImportedDef = Import(Definition, Lang_CXX03);
-  EXPECT_TRUE(ImportedDef->getPreviousDecl());
-  EXPECT_EQ(ImportedFwd, ImportedDef->getPreviousDecl());
-}
-
-TEST_P(ImportFriendClasses, ImportOfRepeatedFriendType) {
-  const char *Code =
-      R"(
-      class Container {
-        friend class X;
-        friend class X;
-      };
-      )";
-  Decl *ToTu = getToTuDecl(Code, Lang_CXX03);
-  Decl *FromTu = getTuDecl(Code, Lang_CXX03, "from.cc");
-
-  auto *ToFriend1 = FirstDeclMatcher<FriendDecl>().match(ToTu, friendDecl());
-  auto *ToFriend2 = LastDeclMatcher<FriendDecl>().match(ToTu, friendDecl());
-  auto *FromFriend1 =
-      FirstDeclMatcher<FriendDecl>().match(FromTu, friendDecl());
-  auto *FromFriend2 = LastDeclMatcher<FriendDecl>().match(FromTu, friendDecl());
-
-  FriendDecl *ToImportedFriend1 = Import(FromFriend1, Lang_CXX03);
-  FriendDecl *ToImportedFriend2 = Import(FromFriend2, Lang_CXX03);
-
-  EXPECT_NE(ToImportedFriend1, ToImportedFriend2);
-  EXPECT_EQ(ToFriend1, ToImportedFriend1);
-  EXPECT_EQ(ToFriend2, ToImportedFriend2);
-}
-
-TEST_P(ImportFriendClasses, ImportOfRepeatedFriendDecl) {
-  const char *Code =
-      R"(
-      class Container {
-        friend void f();
-        friend void f();
-      };
-      )";
-  Decl *ToTu = getToTuDecl(Code, Lang_CXX03);
-  Decl *FromTu = getTuDecl(Code, Lang_CXX03, "from.cc");
-
-  auto *ToFriend1 = FirstDeclMatcher<FriendDecl>().match(ToTu, friendDecl());
-  auto *ToFriend2 = LastDeclMatcher<FriendDecl>().match(ToTu, friendDecl());
-  auto *FromFriend1 =
-      FirstDeclMatcher<FriendDecl>().match(FromTu, friendDecl());
-  auto *FromFriend2 = LastDeclMatcher<FriendDecl>().match(FromTu, friendDecl());
-
-  FriendDecl *ToImportedFriend1 = Import(FromFriend1, Lang_CXX03);
-  FriendDecl *ToImportedFriend2 = Import(FromFriend2, Lang_CXX03);
-
-  EXPECT_NE(ToImportedFriend1, ToImportedFriend2);
-  EXPECT_EQ(ToFriend1, ToImportedFriend1);
-  EXPECT_EQ(ToFriend2, ToImportedFriend2);
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase, FriendFunInClassTemplate) {
-  auto *Code = R"(
-  template <class T>
-  struct X {
-    friend void foo(){}
-  };
-      )";
-  TranslationUnitDecl *ToTU = getToTuDecl(Code, Lang_CXX03);
-  auto *ToFoo = FirstDeclMatcher<FunctionDecl>().match(
-      ToTU, functionDecl(hasName("foo")));
-
-  TranslationUnitDecl *FromTU = getTuDecl(Code, Lang_CXX03, "input.cc");
-  auto *FromFoo = FirstDeclMatcher<FunctionDecl>().match(
-      FromTU, functionDecl(hasName("foo")));
-  auto *ImportedFoo = Import(FromFoo, Lang_CXX03);
-  EXPECT_EQ(ImportedFoo, ToFoo);
-}
-
-struct DeclContextTest : ASTImporterOptionSpecificTestBase {};
-
-TEST_P(DeclContextTest, removeDeclOfClassTemplateSpecialization) {
-  Decl *TU = getTuDecl(
-      R"(
-      namespace NS {
-
-      template <typename T>
-      struct S {};
-      template struct S<int>;
-
-      inline namespace INS {
-        template <typename T>
-        struct S {};
-        template struct S<int>;
-      }
-
-      }
-      )", Lang_CXX11, "input0.cc");
-  auto *NS = FirstDeclMatcher<NamespaceDecl>().match(
-      TU, namespaceDecl());
-  auto *Spec = FirstDeclMatcher<ClassTemplateSpecializationDecl>().match(
-      TU, classTemplateSpecializationDecl());
-  ASSERT_TRUE(NS->containsDecl(Spec));
-
-  NS->removeDecl(Spec);
-  EXPECT_FALSE(NS->containsDecl(Spec));
-}
-
-TEST_P(DeclContextTest,
-       removeDeclShouldNotFailEvenIfWeHaveExternalVisibleStorage) {
-  Decl *TU = getTuDecl("extern int A; int A;", Lang_CXX03);
-  auto *A0 = FirstDeclMatcher<VarDecl>().match(TU, varDecl(hasName("A")));
-  auto *A1 = LastDeclMatcher<VarDecl>().match(TU, varDecl(hasName("A")));
-
-  // Investigate the list.
-  auto *DC = A0->getDeclContext();
-  ASSERT_TRUE(DC->containsDecl(A0));
-  ASSERT_TRUE(DC->containsDecl(A1));
-
-  // Investigate the lookup table.
-  auto *Map = DC->getLookupPtr();
-  ASSERT_TRUE(Map);
-  auto I = Map->find(A0->getDeclName());
-  ASSERT_NE(I, Map->end());
-  StoredDeclsList &L = I->second;
-  // The lookup table contains the most recent decl of A.
-  ASSERT_NE(L.getAsDecl(), A0);
-  ASSERT_EQ(L.getAsDecl(), A1);
-
-  ASSERT_TRUE(L.getAsDecl());
-  // Simulate the private function DeclContext::reconcileExternalVisibleStorage.
-  // We do not have a list with one element.
-  L.setHasExternalDecls();
-  ASSERT_FALSE(L.getAsList());
-  auto Results = L.getLookupResult();
-  ASSERT_EQ(1u, std::distance(Results.begin(), Results.end()));
-
-  // This asserts in the old implementation.
-  DC->removeDecl(A0);
-  EXPECT_FALSE(DC->containsDecl(A0));
-}
-
-struct ImportFunctionTemplateSpecializations
-    : ASTImporterOptionSpecificTestBase {};
-
-TEST_P(ImportFunctionTemplateSpecializations,
-       TUshouldNotContainFunctionTemplateImplicitInstantiation) {
-
-  Decl *FromTU = getTuDecl(
-      R"(
-      template<class T>
-      int f() { return 0; }
-      void foo() { f<int>(); }
-      )",
-      Lang_CXX03, "input0.cc");
-
-  // Check that the function template instantiation is NOT the child of the TU.
-  auto Pattern = translationUnitDecl(
-      unless(has(functionDecl(hasName("f"), isTemplateInstantiation()))));
-  ASSERT_TRUE(MatchVerifier<Decl>{}.match(FromTU, Pattern));
-
-  auto *Foo = FirstDeclMatcher<FunctionDecl>().match(
-      FromTU, functionDecl(hasName("foo")));
-  ASSERT_TRUE(Import(Foo, Lang_CXX03));
-
-  auto *ToTU = ToAST->getASTContext().getTranslationUnitDecl();
-  EXPECT_TRUE(MatchVerifier<Decl>{}.match(ToTU, Pattern));
-}
-
-TEST_P(ImportFunctionTemplateSpecializations,
-       TUshouldNotContainFunctionTemplateExplicitInstantiation) {
-
-  Decl *FromTU = getTuDecl(
-      R"(
-      template<class T>
-      int f() { return 0; }
-      template int f<int>();
-      )",
-      Lang_CXX03, "input0.cc");
-
-  // Check that the function template instantiation is NOT the child of the TU.
-  auto Instantiation = functionDecl(hasName("f"), isTemplateInstantiation());
-  auto Pattern = translationUnitDecl(unless(has(Instantiation)));
-  ASSERT_TRUE(MatchVerifier<Decl>{}.match(FromTU, Pattern));
-
-  ASSERT_TRUE(Import(FirstDeclMatcher<Decl>().match(FromTU, Instantiation),
-                     Lang_CXX03));
-
-  auto *ToTU = ToAST->getASTContext().getTranslationUnitDecl();
-  EXPECT_TRUE(MatchVerifier<Decl>{}.match(ToTU, Pattern));
-}
-
-TEST_P(ImportFunctionTemplateSpecializations,
-       TUshouldContainFunctionTemplateSpecialization) {
-
-  Decl *FromTU = getTuDecl(
-      R"(
-      template<class T>
-      int f() { return 0; }
-      template <> int f<int>() { return 4; }
-      )",
-      Lang_CXX03, "input0.cc");
-
-  // Check that the function template specialization is the child of the TU.
-  auto Specialization =
-      functionDecl(hasName("f"), isExplicitTemplateSpecialization());
-  auto Pattern = translationUnitDecl(has(Specialization));
-  ASSERT_TRUE(MatchVerifier<Decl>{}.match(FromTU, Pattern));
-
-  ASSERT_TRUE(Import(FirstDeclMatcher<Decl>().match(FromTU, Specialization),
-                     Lang_CXX03));
-
-  auto *ToTU = ToAST->getASTContext().getTranslationUnitDecl();
-  EXPECT_TRUE(MatchVerifier<Decl>{}.match(ToTU, Pattern));
-}
-
-TEST_P(ImportFunctionTemplateSpecializations,
-       FunctionTemplateSpecializationRedeclChain) {
-
-  Decl *FromTU = getTuDecl(
-      R"(
-      template<class T>
-      int f() { return 0; }
-      template <> int f<int>() { return 4; }
-      )",
-      Lang_CXX03, "input0.cc");
-
-  auto Spec = functionDecl(hasName("f"), isExplicitTemplateSpecialization(),
-                           hasParent(translationUnitDecl()));
-  auto *FromSpecD = FirstDeclMatcher<Decl>().match(FromTU, Spec);
-  {
-    auto *TU = FromTU;
-    auto *SpecD = FromSpecD;
-    auto *TemplateD = FirstDeclMatcher<FunctionTemplateDecl>().match(
-        TU, functionTemplateDecl());
-    auto *FirstSpecD = *(TemplateD->spec_begin());
-    ASSERT_EQ(SpecD, FirstSpecD);
-    ASSERT_TRUE(SpecD->getPreviousDecl());
-    ASSERT_FALSE(cast<FunctionDecl>(SpecD->getPreviousDecl())
-                     ->doesThisDeclarationHaveABody());
-  }
-
-  ASSERT_TRUE(Import(FromSpecD, Lang_CXX03));
-
-  {
-    auto *TU = ToAST->getASTContext().getTranslationUnitDecl();
-    auto *SpecD = FirstDeclMatcher<Decl>().match(TU, Spec);
-    auto *TemplateD = FirstDeclMatcher<FunctionTemplateDecl>().match(
-        TU, functionTemplateDecl());
-    auto *FirstSpecD = *(TemplateD->spec_begin());
-    EXPECT_EQ(SpecD, FirstSpecD);
-    ASSERT_TRUE(SpecD->getPreviousDecl());
-    EXPECT_FALSE(cast<FunctionDecl>(SpecD->getPreviousDecl())
-                     ->doesThisDeclarationHaveABody());
-  }
-}
-
-TEST_P(ImportFunctionTemplateSpecializations,
-       MatchNumberOfFunctionTemplateSpecializations) {
-
-  Decl *FromTU = getTuDecl(
-      R"(
-      template <typename T> constexpr int f() { return 0; }
-      template <> constexpr int f<int>() { return 4; }
-      void foo() {
-        static_assert(f<char>() == 0, "");
-        static_assert(f<int>() == 4, "");
-      }
-      )",
-      Lang_CXX11, "input0.cc");
-  auto *FromD = FirstDeclMatcher<FunctionDecl>().match(
-      FromTU, functionDecl(hasName("foo")));
-
-  Import(FromD, Lang_CXX11);
-  auto *ToTU = ToAST->getASTContext().getTranslationUnitDecl();
-  EXPECT_EQ(
-      DeclCounter<FunctionDecl>().match(FromTU, functionDecl(hasName("f"))),
-      DeclCounter<FunctionDecl>().match(ToTU, functionDecl(hasName("f"))));
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase,
-    ImportShouldNotReportFalseODRErrorWhenRecordIsBeingDefined) {
-  {
-    Decl *FromTU = getTuDecl(
-        R"(
-            template <typename T>
-            struct B;
-            )",
-        Lang_CXX03, "input0.cc");
-    auto *FromD = FirstDeclMatcher<ClassTemplateDecl>().match(
-        FromTU, classTemplateDecl(hasName("B")));
-
-    Import(FromD, Lang_CXX03);
-  }
-
-  {
-    Decl *FromTU = getTuDecl(
-        R"(
-            template <typename T>
-            struct B {
-              void f();
-              B* b;
-            };
-            )",
-        Lang_CXX03, "input1.cc");
-    FunctionDecl *FromD = FirstDeclMatcher<FunctionDecl>().match(
-        FromTU, functionDecl(hasName("f")));
-    Import(FromD, Lang_CXX03);
-    auto *FromCTD = FirstDeclMatcher<ClassTemplateDecl>().match(
-        FromTU, classTemplateDecl(hasName("B")));
-    auto *ToCTD = cast<ClassTemplateDecl>(Import(FromCTD, Lang_CXX03));
-    EXPECT_TRUE(ToCTD->isThisDeclarationADefinition());
-
-    // We expect no (ODR) warning during the import.
-    auto *ToTU = ToAST->getASTContext().getTranslationUnitDecl();
-    EXPECT_EQ(0u, ToTU->getASTContext().getDiagnostics().getNumWarnings());
-  }
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase,
-       ImportingTypedefShouldImportTheCompleteType) {
-  // We already have an incomplete underlying type in the "To" context.
-  auto Code =
-      R"(
-      template <typename T>
-      struct S {
-        void foo();
-      };
-      using U = S<int>;
-      )";
-  Decl *ToTU = getToTuDecl(Code, Lang_CXX11);
-  auto *ToD = FirstDeclMatcher<TypedefNameDecl>().match(ToTU,
-      typedefNameDecl(hasName("U")));
-  ASSERT_TRUE(ToD->getUnderlyingType()->isIncompleteType());
-
-  // The "From" context has the same typedef, but the underlying type is
-  // complete this time.
-  Decl *FromTU = getTuDecl(std::string(Code) +
-      R"(
-      void foo(U* u) {
-        u->foo();
-      }
-      )", Lang_CXX11);
-  auto *FromD = FirstDeclMatcher<TypedefNameDecl>().match(FromTU,
-      typedefNameDecl(hasName("U")));
-  ASSERT_FALSE(FromD->getUnderlyingType()->isIncompleteType());
-
-  // The imported type should be complete.
-  auto *ImportedD = cast<TypedefNameDecl>(Import(FromD, Lang_CXX11));
-  EXPECT_FALSE(ImportedD->getUnderlyingType()->isIncompleteType());
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase, ImportTemplateParameterLists) {
-  auto Code =
-      R"(
-      template<class T>
-      int f() { return 0; }
-      template <> int f<int>() { return 4; }
-      )";
-
-  Decl *FromTU = getTuDecl(Code, Lang_CXX03);
-  auto *FromD = FirstDeclMatcher<FunctionDecl>().match(FromTU,
-      functionDecl(hasName("f"), isExplicitTemplateSpecialization()));
-  ASSERT_EQ(FromD->getNumTemplateParameterLists(), 1u);
-
-  auto *ToD = Import(FromD, Lang_CXX03);
-  // The template parameter list should exist.
-  EXPECT_EQ(ToD->getNumTemplateParameterLists(), 1u);
-}
-
-const internal::VariadicDynCastAllOfMatcher<Decl, VarTemplateDecl>
-    varTemplateDecl;
-
-const internal::VariadicDynCastAllOfMatcher<
-    Decl, VarTemplatePartialSpecializationDecl>
-    varTemplatePartialSpecializationDecl;
-
-TEST_P(ASTImporterOptionSpecificTestBase,
-       FunctionTemplateParameterDeclContext) {
-  constexpr auto Code =
-      R"(
-      template<class T>
-      void f() {};
-      )";
-
-  Decl *FromTU = getTuDecl(Code, Lang_CXX11);
-
-  auto *FromD = FirstDeclMatcher<FunctionTemplateDecl>().match(
-      FromTU, functionTemplateDecl(hasName("f")));
-
-  ASSERT_EQ(FromD->getTemplateParameters()->getParam(0)->getDeclContext(),
-            FromD->getTemplatedDecl());
-
-  auto *ToD = Import(FromD, Lang_CXX11);
-  EXPECT_EQ(ToD->getTemplateParameters()->getParam(0)->getDeclContext(),
-            ToD->getTemplatedDecl());
-  EXPECT_TRUE(SharedStatePtr->getLookupTable()->contains(
-      ToD->getTemplatedDecl(), ToD->getTemplateParameters()->getParam(0)));
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase, ClassTemplateParameterDeclContext) {
-  constexpr auto Code =
-      R"(
-      template<class T1, class T2>
-      struct S {};
-      template<class T2>
-      struct S<int, T2> {};
-      )";
-
-  Decl *FromTU = getTuDecl(Code, Lang_CXX11);
-
-  auto *FromD = FirstDeclMatcher<ClassTemplateDecl>().match(
-      FromTU, classTemplateDecl(hasName("S")));
-  auto *FromDPart =
-      FirstDeclMatcher<ClassTemplatePartialSpecializationDecl>().match(
-          FromTU, classTemplatePartialSpecializationDecl(hasName("S")));
-
-  ASSERT_EQ(FromD->getTemplateParameters()->getParam(0)->getDeclContext(),
-            FromD->getTemplatedDecl());
-  ASSERT_EQ(FromDPart->getTemplateParameters()->getParam(0)->getDeclContext(),
-            FromDPart);
-
-  auto *ToD = Import(FromD, Lang_CXX11);
-  auto *ToDPart = Import(FromDPart, Lang_CXX11);
-
-  EXPECT_EQ(ToD->getTemplateParameters()->getParam(0)->getDeclContext(),
-            ToD->getTemplatedDecl());
-  EXPECT_TRUE(SharedStatePtr->getLookupTable()->contains(
-      ToD->getTemplatedDecl(), ToD->getTemplateParameters()->getParam(0)));
-
-  EXPECT_EQ(ToDPart->getTemplateParameters()->getParam(0)->getDeclContext(),
-            ToDPart);
-  EXPECT_TRUE(SharedStatePtr->getLookupTable()->contains(
-      ToDPart, ToDPart->getTemplateParameters()->getParam(0)));
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase,
-       CXXDeductionGuideTemplateParameterDeclContext) {
-  Decl *FromTU = getTuDecl(
-      R"(
-      template <typename T> struct A {
-        A(T);
-      };
-      A a{(int)0};
-      )",
-      Lang_CXX17, "input.cc");
-// clang-format off
-/*
-|-ClassTemplateDecl 0x1fe5000 <input.cc:2:7, line:4:7> line:2:36 A
-| |-TemplateTypeParmDecl 0x1fe4eb0 <col:17, col:26> col:26 referenced typename depth 0 index 0 T
-| |-CXXRecordDecl 0x1fe4f70 <col:29, line:4:7> line:2:36 struct A definition
-
-|-FunctionTemplateDecl 0x1fe5860 <line:2:7, line:3:12> col:9 implicit <deduction guide for A>
-| |-TemplateTypeParmDecl 0x1fe4eb0 <line:2:17, col:26> col:26 referenced typename depth 0 index 0 T
-| |-CXXDeductionGuideDecl 0x1fe57a8 <line:3:9, col:12> col:9 implicit <deduction guide for A> 'auto (T) -> A<T>'
-| | `-ParmVarDecl 0x1fe56b0 <col:11> col:12 'T'
-| `-CXXDeductionGuideDecl 0x20515d8 <col:9, col:12> col:9 implicit used <deduction guide for A> 'auto (int) -> A<int>'
-|   |-TemplateArgument type 'int'
-|   | `-BuiltinType 0x20587e0 'int'
-|   `-ParmVarDecl 0x2051388 <col:11> col:12 'int':'int'
-`-FunctionTemplateDecl 0x1fe5a78 <line:2:7, col:36> col:36 implicit <deduction guide for A>
-  |-TemplateTypeParmDecl 0x1fe4eb0 <col:17, col:26> col:26 referenced typename depth 0 index 0 T
-  `-CXXDeductionGuideDecl 0x1fe59c0 <col:36> col:36 implicit <deduction guide for A> 'auto (A<T>) -> A<T>'
-    `-ParmVarDecl 0x1fe5958 <col:36> col:36 'A<T>'
-*/
-// clang-format on
-  auto *FromD1 = FirstDeclMatcher<CXXDeductionGuideDecl>().match(
-      FromTU, cxxDeductionGuideDecl());
-  auto *FromD2 = LastDeclMatcher<CXXDeductionGuideDecl>().match(
-      FromTU, cxxDeductionGuideDecl());
-
-  NamedDecl *P1 =
-      FromD1->getDescribedFunctionTemplate()->getTemplateParameters()->getParam(
-          0);
-  NamedDecl *P2 =
-      FromD2->getDescribedFunctionTemplate()->getTemplateParameters()->getParam(
-          0);
-  DeclContext *DC = P1->getDeclContext();
-
-  ASSERT_EQ(P1, P2);
-  ASSERT_TRUE(DC == FromD1 || DC == FromD2);
-
-  auto *ToD1 = Import(FromD1, Lang_CXX17);
-  auto *ToD2 = Import(FromD2, Lang_CXX17);
-  ASSERT_TRUE(ToD1 && ToD2);
-
-  P1 = ToD1->getDescribedFunctionTemplate()->getTemplateParameters()->getParam(
-      0);
-  P2 = ToD2->getDescribedFunctionTemplate()->getTemplateParameters()->getParam(
-      0);
-  DC = P1->getDeclContext();
-
-  EXPECT_EQ(P1, P2);
-  EXPECT_TRUE(DC == ToD1 || DC == ToD2);
-
-  ASTImporterLookupTable *Tbl = SharedStatePtr->getLookupTable();
-  if (Tbl->contains(ToD1, P1)) {
-    EXPECT_FALSE(Tbl->contains(ToD2, P1));
-  } else {
-    EXPECT_TRUE(Tbl->contains(ToD2, P1));
-  }
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase, VarTemplateParameterDeclContext) {
-  constexpr auto Code =
-      R"(
-      template<class T1, class T2>
-      int X1;
-      template<class T2>
-      int X1<int, T2>;
-
-      namespace Ns {
-        template<class T1, class T2>
-        int X2;
-        template<class T2>
-        int X2<int, T2>;
-      }
-      )";
-
-  Decl *FromTU = getTuDecl(Code, Lang_CXX14);
-
-  auto *FromD1 = FirstDeclMatcher<VarTemplateDecl>().match(
-      FromTU, varTemplateDecl(hasName("X1")));
-  auto *FromD1Part =
-      FirstDeclMatcher<VarTemplatePartialSpecializationDecl>().match(
-          FromTU, varTemplatePartialSpecializationDecl(hasName("X1")));
-  auto *FromD2 = FirstDeclMatcher<VarTemplateDecl>().match(
-      FromTU, varTemplateDecl(hasName("X2")));
-  auto *FromD2Part =
-      FirstDeclMatcher<VarTemplatePartialSpecializationDecl>().match(
-          FromTU, varTemplatePartialSpecializationDecl(hasName("X2")));
-
-  ASSERT_EQ(FromD1->getTemplateParameters()->getParam(0)->getDeclContext(),
-            FromD1->getDeclContext());
-  ASSERT_EQ(FromD2->getTemplateParameters()->getParam(0)->getDeclContext(),
-            FromD2->getDeclContext());
-
-  ASSERT_EQ(FromD1Part->getTemplateParameters()->getParam(0)->getDeclContext(),
-            FromD1Part->getDeclContext());
-  // FIXME: VarTemplatePartialSpecializationDecl does not update ("adopt")
-  // template parameter decl context
-  // ASSERT_EQ(FromD2Part->getTemplateParameters()->getParam(0)->getDeclContext(),
-  // FromD2Part->getDeclContext());
-
-  auto *ToD1 = Import(FromD1, Lang_CXX14);
-  auto *ToD2 = Import(FromD2, Lang_CXX14);
-
-  auto *ToD1Part = Import(FromD1Part, Lang_CXX14);
-  auto *ToD2Part = Import(FromD2Part, Lang_CXX14);
-
-  EXPECT_EQ(ToD1->getTemplateParameters()->getParam(0)->getDeclContext(),
-            ToD1->getDeclContext());
-  EXPECT_TRUE(SharedStatePtr->getLookupTable()->contains(
-      ToD1->getDeclContext(), ToD1->getTemplateParameters()->getParam(0)));
-  EXPECT_EQ(ToD2->getTemplateParameters()->getParam(0)->getDeclContext(),
-            ToD2->getDeclContext());
-  EXPECT_TRUE(SharedStatePtr->getLookupTable()->contains(
-      ToD2->getDeclContext(), ToD2->getTemplateParameters()->getParam(0)));
-
-  EXPECT_EQ(ToD1Part->getTemplateParameters()->getParam(0)->getDeclContext(),
-            ToD1Part->getDeclContext());
-  EXPECT_TRUE(SharedStatePtr->getLookupTable()->contains(
-      ToD1Part->getDeclContext(),
-      ToD1Part->getTemplateParameters()->getParam(0)));
-  // EXPECT_EQ(ToD2Part->getTemplateParameters()->getParam(0)->getDeclContext(),
-  // ToD2Part->getDeclContext());
-  // EXPECT_TRUE(SharedStatePtr->getLookupTable()->contains(
-  //     ToD2Part->getDeclContext(),
-  //     ToD2Part->getTemplateParameters()->getParam(0)));
-  (void)ToD2Part;
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase,
-       TypeAliasTemplateParameterDeclContext) {
-  constexpr auto Code =
-      R"(
-      template<class T1, class T2>
-      struct S {};
-      template<class T> using S1 = S<T, int>;
-      namespace Ns {
-        template<class T> using S2 = S<T, int>;
-      }
-      )";
-
-  Decl *FromTU = getTuDecl(Code, Lang_CXX11);
-
-  auto *FromD1 = FirstDeclMatcher<TypeAliasTemplateDecl>().match(
-      FromTU, typeAliasTemplateDecl(hasName("S1")));
-  auto *FromD2 = FirstDeclMatcher<TypeAliasTemplateDecl>().match(
-      FromTU, typeAliasTemplateDecl(hasName("S2")));
-
-  ASSERT_EQ(FromD1->getTemplateParameters()->getParam(0)->getDeclContext(),
-            FromD1->getDeclContext());
-  ASSERT_EQ(FromD2->getTemplateParameters()->getParam(0)->getDeclContext(),
-            FromD2->getDeclContext());
-
-  auto *ToD1 = Import(FromD1, Lang_CXX11);
-  auto *ToD2 = Import(FromD2, Lang_CXX11);
-
-  EXPECT_EQ(ToD1->getTemplateParameters()->getParam(0)->getDeclContext(),
-            ToD1->getDeclContext());
-  EXPECT_TRUE(SharedStatePtr->getLookupTable()->contains(
-      ToD1->getDeclContext(), ToD1->getTemplateParameters()->getParam(0)));
-  EXPECT_EQ(ToD2->getTemplateParameters()->getParam(0)->getDeclContext(),
-            ToD2->getDeclContext());
-  EXPECT_TRUE(SharedStatePtr->getLookupTable()->contains(
-      ToD2->getDeclContext(), ToD2->getTemplateParameters()->getParam(0)));
-}
-
-struct ASTImporterLookupTableTest : ASTImporterOptionSpecificTestBase {};
-
-TEST_P(ASTImporterLookupTableTest, OneDecl) {
-  auto *ToTU = getToTuDecl("int a;", Lang_CXX03);
-  auto *D = FirstDeclMatcher<VarDecl>().match(ToTU, varDecl(hasName("a")));
-  ASTImporterLookupTable LT(*ToTU);
-  auto Res = LT.lookup(ToTU, D->getDeclName());
-  ASSERT_EQ(Res.size(), 1u);
-  EXPECT_EQ(*Res.begin(), D);
-}
-
-static Decl *findInDeclListOfDC(DeclContext *DC, DeclarationName Name) {
-  for (Decl *D : DC->decls()) {
-    if (auto *ND = dyn_cast<NamedDecl>(D))
-      if (ND->getDeclName() == Name)
-        return ND;
-  }
-  return nullptr;
-}
-
-TEST_P(ASTImporterLookupTableTest,
-    FriendWhichIsnotFoundByNormalLookupShouldBeFoundByImporterSpecificLookup) {
-  auto *Code = R"(
-  template <class T>
-  struct X {
-    friend void foo(){}
-  };
-      )";
-  TranslationUnitDecl *ToTU = getToTuDecl(Code, Lang_CXX03);
-  auto *X = FirstDeclMatcher<ClassTemplateDecl>().match(
-      ToTU, classTemplateDecl(hasName("X")));
-  auto *Foo = FirstDeclMatcher<FunctionDecl>().match(
-      ToTU, functionDecl(hasName("foo")));
-  DeclContext *FooDC = Foo->getDeclContext();
-  DeclContext *FooLexicalDC = Foo->getLexicalDeclContext();
-  ASSERT_EQ(cast<Decl>(FooLexicalDC), X->getTemplatedDecl());
-  ASSERT_EQ(cast<Decl>(FooDC), ToTU);
-  DeclarationName FooName = Foo->getDeclName();
-
-  // Cannot find in the LookupTable of its DC (TUDecl)
-  SmallVector<NamedDecl *, 2> FoundDecls;
-  FooDC->getRedeclContext()->localUncachedLookup(FooName, FoundDecls);
-  EXPECT_EQ(FoundDecls.size(), 0u);
-
-  // Cannot find in the LookupTable of its LexicalDC (X)
-  FooLexicalDC->getRedeclContext()->localUncachedLookup(FooName, FoundDecls);
-  EXPECT_EQ(FoundDecls.size(), 0u);
-
-  // Can't find in the list of Decls of the DC.
-  EXPECT_EQ(findInDeclListOfDC(FooDC, FooName), nullptr);
-
-  // Can't find in the list of Decls of the LexicalDC
-  EXPECT_EQ(findInDeclListOfDC(FooLexicalDC, FooName), nullptr);
-
-  // ASTImporter specific lookup finds it.
-  ASTImporterLookupTable LT(*ToTU);
-  auto Res = LT.lookup(FooDC, Foo->getDeclName());
-  ASSERT_EQ(Res.size(), 1u);
-  EXPECT_EQ(*Res.begin(), Foo);
-}
-
-TEST_P(ASTImporterLookupTableTest,
-       FwdDeclStructShouldBeFoundByImporterSpecificLookup) {
-  TranslationUnitDecl *ToTU =
-      getToTuDecl("struct A { struct Foo *p; };", Lang_C99);
-  auto *Foo =
-      FirstDeclMatcher<RecordDecl>().match(ToTU, recordDecl(hasName("Foo")));
-  auto *A =
-      FirstDeclMatcher<RecordDecl>().match(ToTU, recordDecl(hasName("A")));
-  DeclContext *FooDC = Foo->getDeclContext();
-  DeclContext *FooLexicalDC = Foo->getLexicalDeclContext();
-  ASSERT_EQ(cast<Decl>(FooLexicalDC), A);
-  ASSERT_EQ(cast<Decl>(FooDC), ToTU);
-  DeclarationName FooName = Foo->getDeclName();
-
-  // Cannot find in the LookupTable of its DC (TUDecl).
-  SmallVector<NamedDecl *, 2> FoundDecls;
-  FooDC->getRedeclContext()->localUncachedLookup(FooName, FoundDecls);
-  EXPECT_EQ(FoundDecls.size(), 0u);
-
-  // Cannot find in the LookupTable of its LexicalDC (A).
-  FooLexicalDC->getRedeclContext()->localUncachedLookup(FooName, FoundDecls);
-  EXPECT_EQ(FoundDecls.size(), 0u);
-
-  // Can't find in the list of Decls of the DC.
-  EXPECT_EQ(findInDeclListOfDC(FooDC, FooName), nullptr);
-
-  // Can find in the list of Decls of the LexicalDC.
-  EXPECT_EQ(findInDeclListOfDC(FooLexicalDC, FooName), Foo);
-
-  // ASTImporter specific lookup finds it.
-  ASTImporterLookupTable LT(*ToTU);
-  auto Res = LT.lookup(FooDC, Foo->getDeclName());
-  ASSERT_EQ(Res.size(), 1u);
-  EXPECT_EQ(*Res.begin(), Foo);
-}
-
-TEST_P(ASTImporterLookupTableTest, LookupFindsNamesInDifferentDC) {
-  TranslationUnitDecl *ToTU =
-      getToTuDecl("int V; struct A { int V; }; struct B { int V; };", Lang_C99);
-  DeclarationName VName = FirstDeclMatcher<VarDecl>()
-                              .match(ToTU, varDecl(hasName("V")))
-                              ->getDeclName();
-  auto *A =
-      FirstDeclMatcher<RecordDecl>().match(ToTU, recordDecl(hasName("A")));
-  auto *B =
-      FirstDeclMatcher<RecordDecl>().match(ToTU, recordDecl(hasName("B")));
-
-  ASTImporterLookupTable LT(*ToTU);
-
-  auto Res = LT.lookup(cast<DeclContext>(A), VName);
-  ASSERT_EQ(Res.size(), 1u);
-  EXPECT_EQ(*Res.begin(), FirstDeclMatcher<FieldDecl>().match(
-                        ToTU, fieldDecl(hasName("V"),
-                                        hasParent(recordDecl(hasName("A"))))));
-  Res = LT.lookup(cast<DeclContext>(B), VName);
-  ASSERT_EQ(Res.size(), 1u);
-  EXPECT_EQ(*Res.begin(), FirstDeclMatcher<FieldDecl>().match(
-                        ToTU, fieldDecl(hasName("V"),
-                                        hasParent(recordDecl(hasName("B"))))));
-  Res = LT.lookup(ToTU, VName);
-  ASSERT_EQ(Res.size(), 1u);
-  EXPECT_EQ(*Res.begin(), FirstDeclMatcher<VarDecl>().match(
-                        ToTU, varDecl(hasName("V"),
-                                        hasParent(translationUnitDecl()))));
-}
-
-TEST_P(ASTImporterLookupTableTest, LookupFindsOverloadedNames) {
-  TranslationUnitDecl *ToTU = getToTuDecl(
-      R"(
-      void foo();
-      void foo(int);
-      void foo(int, int);
-      )",
-      Lang_CXX03);
-
-  ASTImporterLookupTable LT(*ToTU);
-  auto *F0 = FirstDeclMatcher<FunctionDecl>().match(ToTU, functionDecl());
-  auto *F2 = LastDeclMatcher<FunctionDecl>().match(ToTU, functionDecl());
-  DeclarationName Name = F0->getDeclName();
-  auto Res = LT.lookup(ToTU, Name);
-  EXPECT_EQ(Res.size(), 3u);
-  EXPECT_EQ(Res.count(F0), 1u);
-  EXPECT_EQ(Res.count(F2), 1u);
-}
-
-TEST_P(ASTImporterLookupTableTest,
-       DifferentOperatorsShouldHaveDifferentResultSet) {
-  TranslationUnitDecl *ToTU = getToTuDecl(
-      R"(
-      struct X{};
-      void operator+(X, X);
-      void operator-(X, X);
-      )",
-      Lang_CXX03);
-
-  ASTImporterLookupTable LT(*ToTU);
-  auto *FPlus = FirstDeclMatcher<FunctionDecl>().match(
-      ToTU, functionDecl(hasOverloadedOperatorName("+")));
-  auto *FMinus = FirstDeclMatcher<FunctionDecl>().match(
-      ToTU, functionDecl(hasOverloadedOperatorName("-")));
-  DeclarationName NamePlus = FPlus->getDeclName();
-  auto ResPlus = LT.lookup(ToTU, NamePlus);
-  EXPECT_EQ(ResPlus.size(), 1u);
-  EXPECT_EQ(ResPlus.count(FPlus), 1u);
-  EXPECT_EQ(ResPlus.count(FMinus), 0u);
-  DeclarationName NameMinus = FMinus->getDeclName();
-  auto ResMinus = LT.lookup(ToTU, NameMinus);
-  EXPECT_EQ(ResMinus.size(), 1u);
-  EXPECT_EQ(ResMinus.count(FMinus), 1u);
-  EXPECT_EQ(ResMinus.count(FPlus), 0u);
-  EXPECT_NE(*ResMinus.begin(), *ResPlus.begin());
-}
-
-TEST_P(ASTImporterLookupTableTest, LookupDeclNamesFromDifferentTUs) {
-  TranslationUnitDecl *ToTU = getToTuDecl(
-      R"(
-      struct X {};
-      void operator+(X, X);
-      )",
-      Lang_CXX03);
-  auto *ToPlus = FirstDeclMatcher<FunctionDecl>().match(
-      ToTU, functionDecl(hasOverloadedOperatorName("+")));
-
-  Decl *FromTU = getTuDecl(
-      R"(
-      struct X {};
-      void operator+(X, X);
-      )",
-      Lang_CXX03);
-  auto *FromPlus = FirstDeclMatcher<FunctionDecl>().match(
-      FromTU, functionDecl(hasOverloadedOperatorName("+")));
-
-  // FromPlus have a different TU, thus its DeclarationName is different too.
-  ASSERT_NE(ToPlus->getDeclName(), FromPlus->getDeclName());
-
-  ASTImporterLookupTable LT(*ToTU);
-  auto Res = LT.lookup(ToTU, ToPlus->getDeclName());
-  ASSERT_EQ(Res.size(), 1u);
-  EXPECT_EQ(*Res.begin(), ToPlus);
-
-  // FromPlus have a different TU, thus its DeclarationName is different too.
-  Res = LT.lookup(ToTU, FromPlus->getDeclName());
-  ASSERT_EQ(Res.size(), 0u);
-}
-
-TEST_P(ASTImporterLookupTableTest,
-       LookupFindsFwdFriendClassDeclWithElaboratedType) {
-  TranslationUnitDecl *ToTU = getToTuDecl(
-      R"(
-      class Y { friend class F; };
-      )",
-      Lang_CXX03);
-
-  // In this case, the CXXRecordDecl is hidden, the FriendDecl is not a parent.
-  // So we must dig up the underlying CXXRecordDecl.
-  ASTImporterLookupTable LT(*ToTU);
-  auto *FriendD = FirstDeclMatcher<FriendDecl>().match(ToTU, friendDecl());
-  const RecordDecl *RD = getRecordDeclOfFriend(FriendD);
-  auto *Y = FirstDeclMatcher<CXXRecordDecl>().match(
-      ToTU, cxxRecordDecl(hasName("Y")));
-
-  DeclarationName Name = RD->getDeclName();
-  auto Res = LT.lookup(ToTU, Name);
-  EXPECT_EQ(Res.size(), 1u);
-  EXPECT_EQ(*Res.begin(), RD);
-
-  Res = LT.lookup(Y, Name);
-  EXPECT_EQ(Res.size(), 0u);
-}
-
-TEST_P(ASTImporterLookupTableTest,
-       LookupFindsFwdFriendClassDeclWithUnelaboratedType) {
-  TranslationUnitDecl *ToTU = getToTuDecl(
-      R"(
-      class F;
-      class Y { friend F; };
-      )",
-      Lang_CXX11);
-
-  // In this case, the CXXRecordDecl is hidden, the FriendDecl is not a parent.
-  // So we must dig up the underlying CXXRecordDecl.
-  ASTImporterLookupTable LT(*ToTU);
-  auto *FriendD = FirstDeclMatcher<FriendDecl>().match(ToTU, friendDecl());
-  const RecordDecl *RD = getRecordDeclOfFriend(FriendD);
-  auto *Y = FirstDeclMatcher<CXXRecordDecl>().match(ToTU, cxxRecordDecl(hasName("Y")));
-
-  DeclarationName Name = RD->getDeclName();
-  auto Res = LT.lookup(ToTU, Name);
-  EXPECT_EQ(Res.size(), 1u);
-  EXPECT_EQ(*Res.begin(), RD);
-
-  Res = LT.lookup(Y, Name);
-  EXPECT_EQ(Res.size(), 0u);
-}
-
-TEST_P(ASTImporterLookupTableTest,
-       LookupFindsFriendClassDeclWithTypeAliasDoesNotAssert) {
-  TranslationUnitDecl *ToTU = getToTuDecl(
-      R"(
-      class F;
-      using alias_of_f = F;
-      class Y { friend alias_of_f; };
-      )",
-      Lang_CXX11);
-
-  // ASTImporterLookupTable constructor handles using declarations correctly,
-  // no assert is expected.
-  ASTImporterLookupTable LT(*ToTU);
-
-  auto *Alias = FirstDeclMatcher<TypeAliasDecl>().match(
-      ToTU, typeAliasDecl(hasName("alias_of_f")));
-  DeclarationName Name = Alias->getDeclName();
-  auto Res = LT.lookup(ToTU, Name);
-  EXPECT_EQ(Res.count(Alias), 1u);
-}
-
-TEST_P(ASTImporterLookupTableTest, LookupFindsFwdFriendClassTemplateDecl) {
-  TranslationUnitDecl *ToTU = getToTuDecl(
-      R"(
-      class Y { template <class T> friend class F; };
-      )",
-      Lang_CXX03);
-
-  ASTImporterLookupTable LT(*ToTU);
-  auto *F = FirstDeclMatcher<ClassTemplateDecl>().match(
-      ToTU, classTemplateDecl(hasName("F")));
-  DeclarationName Name = F->getDeclName();
-  auto Res = LT.lookup(ToTU, Name);
-  EXPECT_EQ(Res.size(), 2u);
-  EXPECT_EQ(Res.count(F), 1u);
-  EXPECT_EQ(Res.count(F->getTemplatedDecl()), 1u);
-}
-
-TEST_P(ASTImporterLookupTableTest, DependentFriendClass) {
-  TranslationUnitDecl *ToTU = getToTuDecl(
-      R"(
-      template <typename T>
-      class F;
-
-      template <typename T>
-      class Y {
-        friend class F<T>;
-      };
-      )",
-      Lang_CXX03);
-
-  ASTImporterLookupTable LT(*ToTU);
-  auto *F = FirstDeclMatcher<ClassTemplateDecl>().match(
-      ToTU, classTemplateDecl(hasName("F")));
-  DeclarationName Name = F->getDeclName();
-  auto Res = LT.lookup(ToTU, Name);
-  EXPECT_EQ(Res.size(), 2u);
-  EXPECT_EQ(Res.count(F), 1u);
-  EXPECT_EQ(Res.count(F->getTemplatedDecl()), 1u);
-}
-
-TEST_P(ASTImporterLookupTableTest, FriendClassTemplateSpecialization) {
-  TranslationUnitDecl *ToTU = getToTuDecl(
-      R"(
-      template <typename T>
-      class F;
-
-      class Y {
-        friend class F<int>;
-      };
-      )",
-      Lang_CXX03);
-
-  ASTImporterLookupTable LT(*ToTU);
-  auto *F = FirstDeclMatcher<ClassTemplateDecl>().match(
-      ToTU, classTemplateDecl(hasName("F")));
-  DeclarationName Name = F->getDeclName();
-  auto Res = LT.lookup(ToTU, Name);
-  ASSERT_EQ(Res.size(), 3u);
-  EXPECT_EQ(Res.count(F), 1u);
-  EXPECT_EQ(Res.count(F->getTemplatedDecl()), 1u);
-  EXPECT_EQ(Res.count(*F->spec_begin()), 1u);
-}
-
-TEST_P(ASTImporterLookupTableTest, LookupFindsFwdFriendFunctionDecl) {
-  TranslationUnitDecl *ToTU = getToTuDecl(
-      R"(
-      class Y { friend void F(); };
-      )",
-      Lang_CXX03);
-
-  ASTImporterLookupTable LT(*ToTU);
-  auto *F =
-      FirstDeclMatcher<FunctionDecl>().match(ToTU, functionDecl(hasName("F")));
-  DeclarationName Name = F->getDeclName();
-  auto Res = LT.lookup(ToTU, Name);
-  EXPECT_EQ(Res.size(), 1u);
-  EXPECT_EQ(*Res.begin(), F);
-}
-
-TEST_P(ASTImporterLookupTableTest,
-       LookupFindsDeclsInClassTemplateSpecialization) {
-  TranslationUnitDecl *ToTU = getToTuDecl(
-      R"(
-      template <typename T>
-      struct X {
-        int F;
-      };
-      void foo() {
-        X<char> xc;
-      }
-      )",
-      Lang_CXX03);
-
-  ASTImporterLookupTable LT(*ToTU);
-
-  auto *Template = FirstDeclMatcher<ClassTemplateDecl>().match(
-      ToTU, classTemplateDecl(hasName("X")));
-  auto *FieldInTemplate = FirstDeclMatcher<FieldDecl>().match(
-      ToTU,
-      fieldDecl(hasParent(cxxRecordDecl(hasParent(classTemplateDecl())))));
-
-  auto *Spec = FirstDeclMatcher<ClassTemplateSpecializationDecl>().match(
-      ToTU, classTemplateSpecializationDecl(hasName("X")));
-  FieldDecl *FieldInSpec = *Spec->field_begin();
-  ASSERT_TRUE(FieldInSpec);
-
-  DeclarationName Name = FieldInSpec->getDeclName();
-  auto TemplateDC = cast<DeclContext>(Template->getTemplatedDecl());
-
-  SmallVector<NamedDecl *, 2> FoundDecls;
-  TemplateDC->getRedeclContext()->localUncachedLookup(Name, FoundDecls);
-  EXPECT_EQ(FoundDecls.size(), 1u);
-  EXPECT_EQ(FoundDecls[0], FieldInTemplate);
-
-  auto Res = LT.lookup(TemplateDC, Name);
-  ASSERT_EQ(Res.size(), 1u);
-  EXPECT_EQ(*Res.begin(), FieldInTemplate);
-
-  cast<DeclContext>(Spec)->getRedeclContext()->localUncachedLookup(Name,
-                                                                   FoundDecls);
-  EXPECT_EQ(FoundDecls.size(), 1u);
-  EXPECT_EQ(FoundDecls[0], FieldInSpec);
-
-  Res = LT.lookup(cast<DeclContext>(Spec), Name);
-  ASSERT_EQ(Res.size(), 1u);
-  EXPECT_EQ(*Res.begin(), FieldInSpec);
-}
-
-TEST_P(ASTImporterLookupTableTest, LookupFindsFwdFriendFunctionTemplateDecl) {
-  TranslationUnitDecl *ToTU = getToTuDecl(
-      R"(
-      class Y { template <class T> friend void F(); };
-      )",
-      Lang_CXX03);
-
-  ASTImporterLookupTable LT(*ToTU);
-  auto *F = FirstDeclMatcher<FunctionTemplateDecl>().match(
-      ToTU, functionTemplateDecl(hasName("F")));
-  DeclarationName Name = F->getDeclName();
-  auto Res = LT.lookup(ToTU, Name);
-  EXPECT_EQ(Res.size(), 2u);
-  EXPECT_EQ(Res.count(F), 1u);
-  EXPECT_EQ(Res.count(F->getTemplatedDecl()), 1u);
-}
-
-TEST_P(ASTImporterLookupTableTest, MultipleBefriendingClasses) {
-  TranslationUnitDecl *ToTU = getToTuDecl(
-      R"(
-      struct X;
-      struct A {
-        friend struct X;
-      };
-      struct B {
-        friend struct X;
-      };
-      )",
-      Lang_CXX03);
-
-  ASTImporterLookupTable LT(*ToTU);
-  auto *X = FirstDeclMatcher<CXXRecordDecl>().match(
-      ToTU, cxxRecordDecl(hasName("X")));
-  auto *FriendD0 = FirstDeclMatcher<FriendDecl>().match(ToTU, friendDecl());
-  auto *FriendD1 = LastDeclMatcher<FriendDecl>().match(ToTU, friendDecl());
-  const RecordDecl *RD0 = getRecordDeclOfFriend(FriendD0);
-  const RecordDecl *RD1 = getRecordDeclOfFriend(FriendD1);
-  ASSERT_EQ(RD0, RD1);
-  ASSERT_EQ(RD1, X);
-
-  DeclarationName Name = X->getDeclName();
-  auto Res = LT.lookup(ToTU, Name);
-  EXPECT_EQ(Res.size(), 1u);
-  EXPECT_EQ(*Res.begin(), X);
-}
-
-TEST_P(ASTImporterLookupTableTest, EnumConstantDecl) {
-  TranslationUnitDecl *ToTU = getToTuDecl(
-      R"(
-      enum E {
-        A,
-        B
-      };
-      )",
-      Lang_C99);
-
-  ASTImporterLookupTable LT(*ToTU);
-  auto *E = FirstDeclMatcher<EnumDecl>().match(ToTU, enumDecl(hasName("E")));
-  auto *A = FirstDeclMatcher<EnumConstantDecl>().match(
-      ToTU, enumConstantDecl(hasName("A")));
-
-  DeclarationName Name = A->getDeclName();
-  // Redecl context is the TU.
-  ASSERT_EQ(E->getRedeclContext(), ToTU);
-
-  SmallVector<NamedDecl *, 2> FoundDecls;
-  // Normal lookup finds in the DC.
-  E->localUncachedLookup(Name, FoundDecls);
-  EXPECT_EQ(FoundDecls.size(), 1u);
-
-  // Normal lookup finds in the Redecl context.
-  ToTU->localUncachedLookup(Name, FoundDecls);
-  EXPECT_EQ(FoundDecls.size(), 1u);
-
-  // Import specific lookup finds in the DC.
-  auto Res = LT.lookup(E, Name);
-  ASSERT_EQ(Res.size(), 1u);
-  EXPECT_EQ(*Res.begin(), A);
-
-  // Import specific lookup finds in the Redecl context.
-  Res = LT.lookup(ToTU, Name);
-  ASSERT_EQ(Res.size(), 1u);
-  EXPECT_EQ(*Res.begin(), A);
-}
-
-TEST_P(ASTImporterLookupTableTest, LookupSearchesInTheWholeRedeclChain) {
-  TranslationUnitDecl *ToTU = getToTuDecl(
-      R"(
-      namespace N {
-        int A;
-      }
-      namespace N {
-      }
-      )",
-      Lang_CXX03);
-  auto *N1 =
-      LastDeclMatcher<NamespaceDecl>().match(ToTU, namespaceDecl(hasName("N")));
-  auto *A = FirstDeclMatcher<VarDecl>().match(ToTU, varDecl(hasName("A")));
-  DeclarationName Name = A->getDeclName();
-
-  ASTImporterLookupTable LT(*ToTU);
-  auto Res = LT.lookup(N1, Name);
-  ASSERT_EQ(Res.size(), 1u);
-  EXPECT_EQ(*Res.begin(), A);
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase,
-       RedeclChainShouldBeCorrectAmongstNamespaces) {
-  Decl *FromTU = getTuDecl(
-      R"(
-      namespace NS {
-        struct X;
-        struct Y {
-          static const int I = 3;
-        };
-      }
-      namespace NS {
-        struct X {  // <--- To be imported
-          void method(int i = Y::I) {}
-          int f;
-        };
-      }
-      )",
-      Lang_CXX03);
-  auto *FromFwd = FirstDeclMatcher<CXXRecordDecl>().match(
-      FromTU, cxxRecordDecl(hasName("X"), unless(isImplicit())));
-  auto *FromDef = LastDeclMatcher<CXXRecordDecl>().match(
-      FromTU,
-      cxxRecordDecl(hasName("X"), isDefinition(), unless(isImplicit())));
-  ASSERT_NE(FromFwd, FromDef);
-  ASSERT_FALSE(FromFwd->isThisDeclarationADefinition());
-  ASSERT_TRUE(FromDef->isThisDeclarationADefinition());
-  ASSERT_EQ(FromFwd->getCanonicalDecl(), FromDef->getCanonicalDecl());
-
-  auto *ToDef = cast_or_null<CXXRecordDecl>(Import(FromDef, Lang_CXX03));
-  auto *ToFwd = cast_or_null<CXXRecordDecl>(Import(FromFwd, Lang_CXX03));
-  EXPECT_NE(ToFwd, ToDef);
-  EXPECT_FALSE(ToFwd->isThisDeclarationADefinition());
-  EXPECT_TRUE(ToDef->isThisDeclarationADefinition());
-  EXPECT_EQ(ToFwd->getCanonicalDecl(), ToDef->getCanonicalDecl());
-  auto *ToTU = ToAST->getASTContext().getTranslationUnitDecl();
-  // We expect no (ODR) warning during the import.
-  EXPECT_EQ(0u, ToTU->getASTContext().getDiagnostics().getNumWarnings());
-}
-
-struct ImportFriendFunctionTemplates : ASTImporterOptionSpecificTestBase {};
-
-TEST_P(ImportFriendFunctionTemplates, LookupShouldFindPreviousFriend) {
-  Decl *ToTU = getToTuDecl(
-      R"(
-      class X {
-        template <typename T> friend void foo();
-      };
-      )",
-      Lang_CXX03);
-  auto *Friend = FirstDeclMatcher<FunctionTemplateDecl>().match(
-      ToTU, functionTemplateDecl(hasName("foo")));
-
-  Decl *FromTU = getTuDecl(
-      R"(
-      template <typename T> void foo();
-      )",
-      Lang_CXX03);
-  auto *FromFoo = FirstDeclMatcher<FunctionTemplateDecl>().match(
-      FromTU, functionTemplateDecl(hasName("foo")));
-  auto *Imported = Import(FromFoo, Lang_CXX03);
-
-  EXPECT_EQ(Imported->getPreviousDecl(), Friend);
-}
-
-struct ASTImporterWithFakeErrors : ASTImporter {
-  using ASTImporter::ASTImporter;
-  bool returnWithErrorInTest() override { return true; }
-};
-
-struct ErrorHandlingTest : ASTImporterOptionSpecificTestBase {
-  ErrorHandlingTest() {
-    Creator = [](ASTContext &ToContext, FileManager &ToFileManager,
-                 ASTContext &FromContext, FileManager &FromFileManager,
-                 bool MinimalImport,
-                 const std::shared_ptr<ASTImporterSharedState> &SharedState) {
-      return new ASTImporterWithFakeErrors(ToContext, ToFileManager,
-                                           FromContext, FromFileManager,
-                                           MinimalImport, SharedState);
-    };
-  }
-  // In this test we purposely report an error (UnsupportedConstruct) when
-  // importing the below stmt.
-  static constexpr auto* ErroneousStmt = R"( asm(""); )";
-};
-
-// Check a case when no new AST node is created in the AST before encountering
-// the error.
-TEST_P(ErrorHandlingTest, ErrorHappensBeforeCreatingANewNode) {
-  TranslationUnitDecl *ToTU = getToTuDecl(
-      R"(
-      template <typename T>
-      class X {};
-      template <>
-      class X<int> { int a; };
-      )",
-      Lang_CXX03);
-  TranslationUnitDecl *FromTU = getTuDecl(
-      R"(
-      template <typename T>
-      class X {};
-      template <>
-      class X<int> { double b; };
-      )",
-      Lang_CXX03);
-  auto *FromSpec = FirstDeclMatcher<ClassTemplateSpecializationDecl>().match(
-      FromTU, classTemplateSpecializationDecl(hasName("X")));
-  ClassTemplateSpecializationDecl *ImportedSpec = Import(FromSpec, Lang_CXX03);
-  EXPECT_FALSE(ImportedSpec);
-
-  // The original Decl is kept, no new decl is created.
-  EXPECT_EQ(DeclCounter<ClassTemplateSpecializationDecl>().match(
-                ToTU, classTemplateSpecializationDecl(hasName("X"))),
-            1u);
-
-  // But an error is set to the counterpart in the "from" context.
-  ASTImporter *Importer = findFromTU(FromSpec)->Importer.get();
-  Optional<ImportError> OptErr = Importer->getImportDeclErrorIfAny(FromSpec);
-  ASSERT_TRUE(OptErr);
-  EXPECT_EQ(OptErr->Error, ImportError::NameConflict);
-}
-
-// Check a case when a new AST node is created but not linked to the AST before
-// encountering the error.
-TEST_P(ErrorHandlingTest,
-       ErrorHappensAfterCreatingTheNodeButBeforeLinkingThatToTheAST) {
-  TranslationUnitDecl *FromTU = getTuDecl(
-      std::string("void foo() { ") + ErroneousStmt + " }", Lang_CXX03);
-  auto *FromFoo = FirstDeclMatcher<FunctionDecl>().match(
-      FromTU, functionDecl(hasName("foo")));
-
-  FunctionDecl *ImportedFoo = Import(FromFoo, Lang_CXX03);
-  EXPECT_FALSE(ImportedFoo);
-
-  TranslationUnitDecl *ToTU = ToAST->getASTContext().getTranslationUnitDecl();
-  // Created, but not linked.
-  EXPECT_EQ(
-      DeclCounter<FunctionDecl>().match(ToTU, functionDecl(hasName("foo"))),
-      0u);
-
-  ASTImporter *Importer = findFromTU(FromFoo)->Importer.get();
-  Optional<ImportError> OptErr = Importer->getImportDeclErrorIfAny(FromFoo);
-  ASSERT_TRUE(OptErr);
-  EXPECT_EQ(OptErr->Error, ImportError::UnsupportedConstruct);
-}
-
-// Check a case when a new AST node is created and linked to the AST before
-// encountering the error. The error is set for the counterpart of the nodes in
-// the "from" context.
-TEST_P(ErrorHandlingTest, ErrorHappensAfterNodeIsCreatedAndLinked) {
-  TranslationUnitDecl *FromTU = getTuDecl(std::string(R"(
-      void f();
-      void f() { )") + ErroneousStmt + R"( }
-      )",
-                                          Lang_CXX03);
-  auto *FromProto = FirstDeclMatcher<FunctionDecl>().match(
-      FromTU, functionDecl(hasName("f")));
-  auto *FromDef =
-      LastDeclMatcher<FunctionDecl>().match(FromTU, functionDecl(hasName("f")));
-  FunctionDecl *ImportedProto = Import(FromProto, Lang_CXX03);
-  EXPECT_FALSE(ImportedProto); // Could not import.
-  // However, we created two nodes in the AST. 1) the fwd decl 2) the
-  // definition. The definition is not added to its DC, but the fwd decl is
-  // there.
-  TranslationUnitDecl *ToTU = ToAST->getASTContext().getTranslationUnitDecl();
-  EXPECT_EQ(DeclCounter<FunctionDecl>().match(ToTU, functionDecl(hasName("f"))),
-            1u);
-  // Match the fwd decl.
-  auto *ToProto =
-      FirstDeclMatcher<FunctionDecl>().match(ToTU, functionDecl(hasName("f")));
-  EXPECT_TRUE(ToProto);
-  // An error is set to the counterpart in the "from" context both for the fwd
-  // decl and the definition.
-  ASTImporter *Importer = findFromTU(FromProto)->Importer.get();
-  Optional<ImportError> OptErr = Importer->getImportDeclErrorIfAny(FromProto);
-  ASSERT_TRUE(OptErr);
-  EXPECT_EQ(OptErr->Error, ImportError::UnsupportedConstruct);
-  OptErr = Importer->getImportDeclErrorIfAny(FromDef);
-  ASSERT_TRUE(OptErr);
-  EXPECT_EQ(OptErr->Error, ImportError::UnsupportedConstruct);
-}
-
-// An error should be set for a class if we cannot import one member.
-TEST_P(ErrorHandlingTest, ErrorIsPropagatedFromMemberToClass) {
-  TranslationUnitDecl *FromTU = getTuDecl(std::string(R"(
-      class X {
-        void f() { )") + ErroneousStmt + R"( } // This member has the error
-                                               // during import.
-        void ok();        // The error should not prevent importing this.
-      };                  // An error will be set for X too.
-      )",
-                                          Lang_CXX03);
-  auto *FromX = FirstDeclMatcher<CXXRecordDecl>().match(
-      FromTU, cxxRecordDecl(hasName("X")));
-  CXXRecordDecl *ImportedX = Import(FromX, Lang_CXX03);
-
-  // An error is set for X.
-  EXPECT_FALSE(ImportedX);
-  ASTImporter *Importer = findFromTU(FromX)->Importer.get();
-  Optional<ImportError> OptErr = Importer->getImportDeclErrorIfAny(FromX);
-  ASSERT_TRUE(OptErr);
-  EXPECT_EQ(OptErr->Error, ImportError::UnsupportedConstruct);
-
-  // An error is set for f().
-  auto *FromF = FirstDeclMatcher<CXXMethodDecl>().match(
-      FromTU, cxxMethodDecl(hasName("f")));
-  OptErr = Importer->getImportDeclErrorIfAny(FromF);
-  ASSERT_TRUE(OptErr);
-  EXPECT_EQ(OptErr->Error, ImportError::UnsupportedConstruct);
-  // And any subsequent import should fail.
-  CXXMethodDecl *ImportedF = Import(FromF, Lang_CXX03);
-  EXPECT_FALSE(ImportedF);
-
-  // There is an error set for the other member too.
-  auto *FromOK = FirstDeclMatcher<CXXMethodDecl>().match(
-      FromTU, cxxMethodDecl(hasName("ok")));
-  OptErr = Importer->getImportDeclErrorIfAny(FromOK);
-  EXPECT_TRUE(OptErr);
-  // Cannot import the other member.
-  CXXMethodDecl *ImportedOK = Import(FromOK, Lang_CXX03);
-  EXPECT_FALSE(ImportedOK);
-}
-
-// Check that an error propagates to the dependent AST nodes.
-// In the below code it means that an error in X should propagate to A.
-// And even to F since the containing A is erroneous.
-// And to all AST nodes which we visit during the import process which finally
-// ends up in a failure (in the error() function).
-TEST_P(ErrorHandlingTest, ErrorPropagatesThroughImportCycles) {
-  Decl *FromTU = getTuDecl(std::string(R"(
-      namespace NS {
-        class A {
-          template <int I> class F {};
-          class X {
-            template <int I> friend class F;
-            void error() { )") +
-                               ErroneousStmt + R"( }
-          };
-        };
-
-        class B {};
-      } // NS
-      )",
-                           Lang_CXX03, "input0.cc");
-
-  auto *FromFRD = FirstDeclMatcher<CXXRecordDecl>().match(
-      FromTU, cxxRecordDecl(hasName("F"), isDefinition()));
-  auto *FromA = FirstDeclMatcher<CXXRecordDecl>().match(
-      FromTU, cxxRecordDecl(hasName("A"), isDefinition()));
-  auto *FromB = FirstDeclMatcher<CXXRecordDecl>().match(
-      FromTU, cxxRecordDecl(hasName("B"), isDefinition()));
-  auto *FromNS = FirstDeclMatcher<NamespaceDecl>().match(
-      FromTU, namespaceDecl(hasName("NS")));
-
-  // Start by importing the templated CXXRecordDecl of F.
-  // Import fails for that.
-  EXPECT_FALSE(Import(FromFRD, Lang_CXX03));
-  // Import fails for A.
-  EXPECT_FALSE(Import(FromA, Lang_CXX03));
-  // But we should be able to import the independent B.
-  EXPECT_TRUE(Import(FromB, Lang_CXX03));
-  // And the namespace.
-  EXPECT_TRUE(Import(FromNS, Lang_CXX03));
-
-  // An error is set to the templated CXXRecordDecl of F.
-  ASTImporter *Importer = findFromTU(FromFRD)->Importer.get();
-  Optional<ImportError> OptErr = Importer->getImportDeclErrorIfAny(FromFRD);
-  EXPECT_TRUE(OptErr);
-
-  // An error is set to A.
-  OptErr = Importer->getImportDeclErrorIfAny(FromA);
-  EXPECT_TRUE(OptErr);
-
-  // There is no error set to B.
-  OptErr = Importer->getImportDeclErrorIfAny(FromB);
-  EXPECT_FALSE(OptErr);
-
-  // There is no error set to NS.
-  OptErr = Importer->getImportDeclErrorIfAny(FromNS);
-  EXPECT_FALSE(OptErr);
-
-  // Check some of those decls whose ancestor is X, they all should have an
-  // error set if we visited them during an import process which finally failed.
-  // These decls are part of a cycle in an ImportPath.
-  // There would not be any error set for these decls if we hadn't follow the
-  // ImportPaths and the cycles.
-  OptErr = Importer->getImportDeclErrorIfAny(
-      FirstDeclMatcher<ClassTemplateDecl>().match(
-          FromTU, classTemplateDecl(hasName("F"))));
-  // An error is set to the 'F' ClassTemplateDecl.
-  EXPECT_TRUE(OptErr);
-  // An error is set to the FriendDecl.
-  OptErr = Importer->getImportDeclErrorIfAny(
-      FirstDeclMatcher<FriendDecl>().match(
-          FromTU, friendDecl()));
-  EXPECT_TRUE(OptErr);
-  // An error is set to the implicit class of A.
-  OptErr =
-      Importer->getImportDeclErrorIfAny(FirstDeclMatcher<CXXRecordDecl>().match(
-          FromTU, cxxRecordDecl(hasName("A"), isImplicit())));
-  EXPECT_TRUE(OptErr);
-  // An error is set to the implicit class of X.
-  OptErr =
-      Importer->getImportDeclErrorIfAny(FirstDeclMatcher<CXXRecordDecl>().match(
-          FromTU, cxxRecordDecl(hasName("X"), isImplicit())));
-  EXPECT_TRUE(OptErr);
-}
-
-TEST_P(ErrorHandlingTest, ErrorIsNotPropagatedFromMemberToNamespace) {
-  TranslationUnitDecl *FromTU = getTuDecl(std::string(R"(
-      namespace X {
-        void f() { )") + ErroneousStmt + R"( } // This member has the error
-                                               // during import.
-        void ok();        // The error should not prevent importing this.
-      };                  // An error will be set for X too.
-      )",
-                                          Lang_CXX03);
-  auto *FromX = FirstDeclMatcher<NamespaceDecl>().match(
-      FromTU, namespaceDecl(hasName("X")));
-  NamespaceDecl *ImportedX = Import(FromX, Lang_CXX03);
-
-  // There is no error set for X.
-  EXPECT_TRUE(ImportedX);
-  ASTImporter *Importer = findFromTU(FromX)->Importer.get();
-  Optional<ImportError> OptErr = Importer->getImportDeclErrorIfAny(FromX);
-  ASSERT_FALSE(OptErr);
-
-  // An error is set for f().
-  auto *FromF = FirstDeclMatcher<FunctionDecl>().match(
-      FromTU, functionDecl(hasName("f")));
-  OptErr = Importer->getImportDeclErrorIfAny(FromF);
-  ASSERT_TRUE(OptErr);
-  EXPECT_EQ(OptErr->Error, ImportError::UnsupportedConstruct);
-  // And any subsequent import should fail.
-  FunctionDecl *ImportedF = Import(FromF, Lang_CXX03);
-  EXPECT_FALSE(ImportedF);
-
-  // There is no error set for ok().
-  auto *FromOK = FirstDeclMatcher<FunctionDecl>().match(
-      FromTU, functionDecl(hasName("ok")));
-  OptErr = Importer->getImportDeclErrorIfAny(FromOK);
-  EXPECT_FALSE(OptErr);
-  // And we should be able to import.
-  FunctionDecl *ImportedOK = Import(FromOK, Lang_CXX03);
-  EXPECT_TRUE(ImportedOK);
-}
-
-TEST_P(ErrorHandlingTest, ODRViolationWithinTypedefDecls) {
-  // Importing `z` should fail - instead of crashing - due to an ODR violation.
-  // The `bar::e` typedef sets it's DeclContext after the import is done.
-  // However, if the importation fails, it will be left as a nullptr.
-  // During the cleanup of the failed import, we should check whether the
-  // DeclContext is null or not - instead of dereferencing that unconditionally.
-  constexpr auto ToTUCode = R"(
-      namespace X {
-        struct bar {
-          int odr_violation;
-        };
-      })";
-  constexpr auto FromTUCode = R"(
-      namespace X {
-        enum b {};
-        struct bar {
-          typedef b e;
-          static e d;
-        };
-      }
-      int z = X::bar::d;
-      )";
-  Decl *ToTU = getToTuDecl(ToTUCode, Lang_CXX11);
-  static_cast<void>(ToTU);
-  Decl *FromTU = getTuDecl(FromTUCode, Lang_CXX11);
-  auto *FromZ =
-      FirstDeclMatcher<VarDecl>().match(FromTU, varDecl(hasName("z")));
-  ASSERT_TRUE(FromZ);
-  ASSERT_TRUE(FromZ->hasInit());
-
-  auto *ImportedZ = Import(FromZ, Lang_CXX11);
-  EXPECT_FALSE(ImportedZ);
-}
-
-// An error should be set for a class if it had a previous import with an error
-// from another TU.
-TEST_P(ErrorHandlingTest,
-       ImportedDeclWithErrorShouldFailTheImportOfDeclWhichMapToIt) {
-  // We already have a fwd decl.
-  TranslationUnitDecl *ToTU = getToTuDecl("class X;", Lang_CXX03);
-  // Then we import a definition.
-  {
-    TranslationUnitDecl *FromTU = getTuDecl(std::string(R"(
-        class X {
-          void f() { )") + ErroneousStmt + R"( }
-          void ok();
-        };
-        )",
-                                            Lang_CXX03);
-    auto *FromX = FirstDeclMatcher<CXXRecordDecl>().match(
-        FromTU, cxxRecordDecl(hasName("X")));
-    CXXRecordDecl *ImportedX = Import(FromX, Lang_CXX03);
-
-    // An error is set for X ...
-    EXPECT_FALSE(ImportedX);
-    ASTImporter *Importer = findFromTU(FromX)->Importer.get();
-    Optional<ImportError> OptErr = Importer->getImportDeclErrorIfAny(FromX);
-    ASSERT_TRUE(OptErr);
-    EXPECT_EQ(OptErr->Error, ImportError::UnsupportedConstruct);
-  }
-  // ... but the node had been created.
-  auto *ToXDef = FirstDeclMatcher<CXXRecordDecl>().match(
-      ToTU, cxxRecordDecl(hasName("X"), isDefinition()));
-  // An error is set for "ToXDef" in the shared state.
-  Optional<ImportError> OptErr =
-      SharedStatePtr->getImportDeclErrorIfAny(ToXDef);
-  ASSERT_TRUE(OptErr);
-  EXPECT_EQ(OptErr->Error, ImportError::UnsupportedConstruct);
-
-  auto *ToXFwd = FirstDeclMatcher<CXXRecordDecl>().match(
-      ToTU, cxxRecordDecl(hasName("X"), unless(isDefinition())));
-  // An error is NOT set for the fwd Decl of X in the shared state.
-  OptErr = SharedStatePtr->getImportDeclErrorIfAny(ToXFwd);
-  ASSERT_FALSE(OptErr);
-
-  // Try to import  X again but from another TU.
-  {
-    TranslationUnitDecl *FromTU = getTuDecl(std::string(R"(
-        class X {
-          void f() { )") + ErroneousStmt + R"( }
-          void ok();
-        };
-        )",
-                                            Lang_CXX03, "input1.cc");
-
-    auto *FromX = FirstDeclMatcher<CXXRecordDecl>().match(
-        FromTU, cxxRecordDecl(hasName("X")));
-    CXXRecordDecl *ImportedX = Import(FromX, Lang_CXX03);
-
-    // If we did not save the errors for the "to" context then the below checks
-    // would fail, because the lookup finds the fwd Decl of the existing
-    // definition in the "to" context. We can reach the existing definition via
-    // the found fwd Decl. That existing definition is structurally equivalent
-    // (we check only the fields) with this one we want to import, so we return
-    // with the existing definition, which is erroneous (one method is missing).
-
-    // The import should fail.
-    EXPECT_FALSE(ImportedX);
-    ASTImporter *Importer = findFromTU(FromX)->Importer.get();
-    Optional<ImportError> OptErr = Importer->getImportDeclErrorIfAny(FromX);
-    // And an error is set for this new X in the "from" ctx.
-    ASSERT_TRUE(OptErr);
-    EXPECT_EQ(OptErr->Error, ImportError::UnsupportedConstruct);
-  }
-}
-
-TEST_P(ErrorHandlingTest, ImportOfOverriddenMethods) {
-  auto MatchFooA =
-      functionDecl(hasName("foo"), hasAncestor(cxxRecordDecl(hasName("A"))));
-  auto MatchFooB =
-      functionDecl(hasName("foo"), hasAncestor(cxxRecordDecl(hasName("B"))));
-  auto MatchFooC =
-      functionDecl(hasName("foo"), hasAncestor(cxxRecordDecl(hasName("C"))));
-
-  // Provoke import of a method that has overridden methods with import error.
-  TranslationUnitDecl *FromTU = getTuDecl(std::string(R"(
-        struct C;
-        struct A {
-          virtual void foo();
-          void f1(C *);
-        };
-        void A::foo() {
-          )") + ErroneousStmt + R"(
-        }
-        struct B : public A {
-          void foo() override;
-        };
-        struct C : public B {
-          void foo() override;
-        };
-        )",
-                                          Lang_CXX11);
-  auto *FromFooA = FirstDeclMatcher<FunctionDecl>().match(FromTU, MatchFooA);
-  auto *FromFooB = FirstDeclMatcher<FunctionDecl>().match(FromTU, MatchFooB);
-  auto *FromFooC = FirstDeclMatcher<FunctionDecl>().match(FromTU, MatchFooC);
-
-  EXPECT_FALSE(Import(FromFooA, Lang_CXX11));
-  ASTImporter *Importer = findFromTU(FromFooA)->Importer.get();
-  auto CheckError = [&Importer](Decl *FromD) {
-    Optional<ImportError> OptErr = Importer->getImportDeclErrorIfAny(FromD);
-    ASSERT_TRUE(OptErr);
-    EXPECT_EQ(OptErr->Error, ImportError::UnsupportedConstruct);
-  };
-  CheckError(FromFooA);
-  EXPECT_FALSE(Import(FromFooB, Lang_CXX11));
-  CheckError(FromFooB);
-  EXPECT_FALSE(Import(FromFooC, Lang_CXX11));
-  CheckError(FromFooC);
-}
-
-TEST_P(ErrorHandlingTest, ODRViolationWithinParmVarDecls) {
-  // Importing of 'f' and parameter 'P' should cause an ODR error.
-  // The error happens after the ParmVarDecl for 'P' was already created.
-  // This is a special case because the ParmVarDecl has a temporary DeclContext.
-  // Expected is no crash at error handling of ASTImporter.
-  constexpr auto ToTUCode = R"(
-      struct X {
-        char A;
-      };
-      )";
-  constexpr auto FromTUCode = R"(
-      struct X {
-        enum Y { Z };
-      };
-      void f(int P = X::Z);
-      )";
-  Decl *ToTU = getToTuDecl(ToTUCode, Lang_CXX11);
-  static_cast<void>(ToTU);
-  Decl *FromTU = getTuDecl(FromTUCode, Lang_CXX11);
-  auto *FromF = FirstDeclMatcher<FunctionDecl>().match(
-      FromTU, functionDecl(hasName("f")));
-  ASSERT_TRUE(FromF);
-
-  auto *ImportedF = Import(FromF, Lang_CXX11);
-  EXPECT_FALSE(ImportedF);
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase, LambdaInFunctionBody) {
-  Decl *FromTU = getTuDecl(
-      R"(
-      void f() {
-        auto L = [](){};
-      }
-      )",
-      Lang_CXX11, "input0.cc");
-  auto Pattern = lambdaExpr();
-  CXXRecordDecl *FromL =
-      FirstDeclMatcher<LambdaExpr>().match(FromTU, Pattern)->getLambdaClass();
-
-  auto ToL = Import(FromL, Lang_CXX11);
-  unsigned ToLSize = std::distance(ToL->decls().begin(), ToL->decls().end());
-  unsigned FromLSize =
-      std::distance(FromL->decls().begin(), FromL->decls().end());
-  EXPECT_NE(ToLSize, 0u);
-  EXPECT_EQ(ToLSize, FromLSize);
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase, LambdaInFunctionParam) {
-  Decl *FromTU = getTuDecl(
-      R"(
-      template <typename F>
-      void f(F L = [](){}) {}
-      )",
-      Lang_CXX11, "input0.cc");
-  auto Pattern = lambdaExpr();
-  CXXRecordDecl *FromL =
-      FirstDeclMatcher<LambdaExpr>().match(FromTU, Pattern)->getLambdaClass();
-
-  auto ToL = Import(FromL, Lang_CXX11);
-  unsigned ToLSize = std::distance(ToL->decls().begin(), ToL->decls().end());
-  unsigned FromLSize =
-      std::distance(FromL->decls().begin(), FromL->decls().end());
-  EXPECT_NE(ToLSize, 0u);
-  EXPECT_EQ(ToLSize, FromLSize);
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase, LambdaInGlobalScope) {
-  Decl *FromTU = getTuDecl(
-      R"(
-      auto l1 = [](unsigned lp) { return 1; };
-      auto l2 = [](int lp) { return 2; };
-      int f(int p) {
-        return l1(p) + l2(p);
-      }
-      )",
-      Lang_CXX11, "input0.cc");
-  FunctionDecl *FromF = FirstDeclMatcher<FunctionDecl>().match(
-      FromTU, functionDecl(hasName("f")));
-  FunctionDecl *ToF = Import(FromF, Lang_CXX11);
-  EXPECT_TRUE(ToF);
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase,
-       ImportExistingFriendClassTemplateDef) {
-  auto Code =
-      R"(
-        template <class T1, class T2>
-        struct Base {
-          template <class U1, class U2>
-          friend struct Class;
-        };
-        template <class T1, class T2>
-        struct Class { };
-        )";
-
-  TranslationUnitDecl *ToTU = getToTuDecl(Code, Lang_CXX03);
-  TranslationUnitDecl *FromTU = getTuDecl(Code, Lang_CXX03, "input.cc");
-
-  auto *ToClassProto = FirstDeclMatcher<ClassTemplateDecl>().match(
-      ToTU, classTemplateDecl(hasName("Class")));
-  auto *ToClassDef = LastDeclMatcher<ClassTemplateDecl>().match(
-      ToTU, classTemplateDecl(hasName("Class")));
-  ASSERT_FALSE(ToClassProto->isThisDeclarationADefinition());
-  ASSERT_TRUE(ToClassDef->isThisDeclarationADefinition());
-  // Previous friend decl is not linked to it!
-  ASSERT_FALSE(ToClassDef->getPreviousDecl());
-  ASSERT_EQ(ToClassDef->getMostRecentDecl(), ToClassDef);
-  ASSERT_EQ(ToClassProto->getMostRecentDecl(), ToClassProto);
-
-  auto *FromClassProto = FirstDeclMatcher<ClassTemplateDecl>().match(
-      FromTU, classTemplateDecl(hasName("Class")));
-  auto *FromClassDef = LastDeclMatcher<ClassTemplateDecl>().match(
-      FromTU, classTemplateDecl(hasName("Class")));
-  ASSERT_FALSE(FromClassProto->isThisDeclarationADefinition());
-  ASSERT_TRUE(FromClassDef->isThisDeclarationADefinition());
-  ASSERT_FALSE(FromClassDef->getPreviousDecl());
-  ASSERT_EQ(FromClassDef->getMostRecentDecl(), FromClassDef);
-  ASSERT_EQ(FromClassProto->getMostRecentDecl(), FromClassProto);
-
-  auto *ImportedDef = Import(FromClassDef, Lang_CXX03);
-  // At import we should find the definition for 'Class' even if the
-  // prototype (inside 'friend') for it comes first in the AST and is not
-  // linked to the definition.
-  EXPECT_EQ(ImportedDef, ToClassDef);
-}
-
-struct LLDBLookupTest : ASTImporterOptionSpecificTestBase {
-  LLDBLookupTest() {
-    Creator = [](ASTContext &ToContext, FileManager &ToFileManager,
-                 ASTContext &FromContext, FileManager &FromFileManager,
-                 bool MinimalImport,
-                 const std::shared_ptr<ASTImporterSharedState> &SharedState) {
-      return new ASTImporter(ToContext, ToFileManager, FromContext,
-                             FromFileManager, MinimalImport,
-                             // We use the regular lookup.
-                             /*SharedState=*/nullptr);
-    };
-  }
-};
-
-TEST_P(LLDBLookupTest, ImporterShouldFindInTransparentContext) {
-  TranslationUnitDecl *ToTU = getToTuDecl(
-      R"(
-      extern "C" {
-        class X{};
-      };
-      )",
-      Lang_CXX03);
-  auto *ToX = FirstDeclMatcher<CXXRecordDecl>().match(
-      ToTU, cxxRecordDecl(hasName("X")));
-
-  // Set up a stub external storage.
-  ToTU->setHasExternalLexicalStorage(true);
-  // Set up DeclContextBits.HasLazyExternalLexicalLookups to true.
-  ToTU->setMustBuildLookupTable();
-  struct TestExternalASTSource : ExternalASTSource {};
-  ToTU->getASTContext().setExternalSource(new TestExternalASTSource());
-
-  Decl *FromTU = getTuDecl(
-      R"(
-        class X;
-      )",
-      Lang_CXX03);
-  auto *FromX = FirstDeclMatcher<CXXRecordDecl>().match(
-      FromTU, cxxRecordDecl(hasName("X")));
-  auto *ImportedX = Import(FromX, Lang_CXX03);
-  // The lookup must find the existing class definition in the LinkageSpecDecl.
-  // Then the importer renders the existing and the new decl into one chain.
-  EXPECT_EQ(ImportedX->getCanonicalDecl(), ToX->getCanonicalDecl());
-}
-
-struct SVEBuiltins : ASTImporterOptionSpecificTestBase {};
-
-TEST_P(SVEBuiltins, ImportTypes) {
-  static const char *const TypeNames[] = {
-    "__SVInt8_t",
-    "__SVInt16_t",
-    "__SVInt32_t",
-    "__SVInt64_t",
-    "__SVUint8_t",
-    "__SVUint16_t",
-    "__SVUint32_t",
-    "__SVUint64_t",
-    "__SVFloat16_t",
-    "__SVBFloat16_t",
-    "__SVFloat32_t",
-    "__SVFloat64_t",
-    "__SVBool_t"
-  };
-
-  TranslationUnitDecl *ToTU = getToTuDecl("", Lang_CXX03);
-  TranslationUnitDecl *FromTU = getTuDecl("", Lang_CXX03, "input.cc");
-  for (auto *TypeName : TypeNames) {
-    auto *ToTypedef = FirstDeclMatcher<TypedefDecl>().match(
-      ToTU, typedefDecl(hasName(TypeName)));
-    QualType ToType = ToTypedef->getUnderlyingType();
-
-    auto *FromTypedef = FirstDeclMatcher<TypedefDecl>().match(
-      FromTU, typedefDecl(hasName(TypeName)));
-    QualType FromType = FromTypedef->getUnderlyingType();
-
-    QualType ImportedType = ImportType(FromType, FromTypedef, Lang_CXX03);
-    EXPECT_EQ(ImportedType, ToType);
-  }
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase, ImportOfDefaultImplicitFunctions) {
-  // Test that import of implicit functions works and the functions
-  // are merged into one chain.
-  auto GetDeclToImport = [this](StringRef File) {
-    Decl *FromTU = getTuDecl(
-        R"(
-        struct X { };
-        // Force generating some implicit operator definitions for X.
-        void f() { X x1, x2; x1 = x2; X *x3 = new X; delete x3; }
-        )",
-        Lang_CXX11, File);
-    auto *FromD = FirstDeclMatcher<CXXRecordDecl>().match(
-        FromTU, cxxRecordDecl(hasName("X"), unless(isImplicit())));
-    // Destructor is picked as one example of implicit function.
-    return FromD->getDestructor();
-  };
-
-  auto *ToD1 = Import(GetDeclToImport("input1.cc"), Lang_CXX11);
-  ASSERT_TRUE(ToD1);
-
-  auto *ToD2 = Import(GetDeclToImport("input2.cc"), Lang_CXX11);
-  ASSERT_TRUE(ToD2);
-
-  EXPECT_EQ(ToD1->getCanonicalDecl(), ToD2->getCanonicalDecl());
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase,
-       ImportOfExplicitlyDefaultedOrDeleted) {
-  Decl *FromTU = getTuDecl(
-      R"(
-        struct X { X() = default; X(const X&) = delete; };
-      )",
-      Lang_CXX11);
-  auto *FromX = FirstDeclMatcher<CXXRecordDecl>().match(
-      FromTU, cxxRecordDecl(hasName("X")));
-  auto *ImportedX = Import(FromX, Lang_CXX11);
-  auto *Constr1 = FirstDeclMatcher<CXXConstructorDecl>().match(
-      ImportedX, cxxConstructorDecl(hasName("X"), unless(isImplicit())));
-  auto *Constr2 = LastDeclMatcher<CXXConstructorDecl>().match(
-      ImportedX, cxxConstructorDecl(hasName("X"), unless(isImplicit())));
-
-  ASSERT_TRUE(ImportedX);
-  EXPECT_TRUE(Constr1->isDefaulted());
-  EXPECT_TRUE(Constr1->isExplicitlyDefaulted());
-  EXPECT_TRUE(Constr2->isDeletedAsWritten());
-  EXPECT_EQ(ImportedX->isAggregate(), FromX->isAggregate());
-}
-
-INSTANTIATE_TEST_SUITE_P(ParameterizedTests, SVEBuiltins,
-                         ::testing::Values(std::vector<std::string>{
-                             "-target", "aarch64-linux-gnu"}));
-
-INSTANTIATE_TEST_SUITE_P(ParameterizedTests, DeclContextTest,
-                         ::testing::Values(std::vector<std::string>()));
-
-INSTANTIATE_TEST_SUITE_P(ParameterizedTests, CanonicalRedeclChain,
-                         ::testing::Values(std::vector<std::string>()));
-
-TEST_P(ASTImporterOptionSpecificTestBase, LambdasAreDifferentiated) {
-  Decl *FromTU = getTuDecl(
-      R"(
-      void f() {
-        auto L0 = [](){};
-        auto L1 = [](){};
-      }
-      )",
-      Lang_CXX11, "input0.cc");
-  auto Pattern = lambdaExpr();
-  CXXRecordDecl *FromL0 =
-      FirstDeclMatcher<LambdaExpr>().match(FromTU, Pattern)->getLambdaClass();
-  CXXRecordDecl *FromL1 =
-      LastDeclMatcher<LambdaExpr>().match(FromTU, Pattern)->getLambdaClass();
-  ASSERT_NE(FromL0, FromL1);
-
-  CXXRecordDecl *ToL0 = Import(FromL0, Lang_CXX11);
-  CXXRecordDecl *ToL1 = Import(FromL1, Lang_CXX11);
-  EXPECT_NE(ToL0, ToL1);
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase,
-       LambdasInFunctionParamsAreDifferentiated) {
-  Decl *FromTU = getTuDecl(
-      R"(
-      template <typename F0, typename F1>
-      void f(F0 L0 = [](){}, F1 L1 = [](){}) {}
-      )",
-      Lang_CXX11, "input0.cc");
-  auto Pattern = cxxRecordDecl(isLambda());
-  CXXRecordDecl *FromL0 =
-      FirstDeclMatcher<CXXRecordDecl>().match(FromTU, Pattern);
-  CXXRecordDecl *FromL1 =
-      LastDeclMatcher<CXXRecordDecl>().match(FromTU, Pattern);
-  ASSERT_NE(FromL0, FromL1);
-
-  CXXRecordDecl *ToL0 = Import(FromL0, Lang_CXX11);
-  CXXRecordDecl *ToL1 = Import(FromL1, Lang_CXX11);
-  ASSERT_NE(ToL0, ToL1);
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase,
-       LambdasInFunctionParamsAreDifferentiatedWhenMacroIsUsed) {
-  Decl *FromTU = getTuDecl(
-      R"(
-      #define LAMBDA [](){}
-      template <typename F0, typename F1>
-      void f(F0 L0 = LAMBDA, F1 L1 = LAMBDA) {}
-      )",
-      Lang_CXX11, "input0.cc");
-  auto Pattern = cxxRecordDecl(isLambda());
-  CXXRecordDecl *FromL0 =
-      FirstDeclMatcher<CXXRecordDecl>().match(FromTU, Pattern);
-  CXXRecordDecl *FromL1 =
-      LastDeclMatcher<CXXRecordDecl>().match(FromTU, Pattern);
-  ASSERT_NE(FromL0, FromL1);
-
-  Import(FromL0, Lang_CXX11);
-  Import(FromL1, Lang_CXX11);
-  CXXRecordDecl *ToL0 = Import(FromL0, Lang_CXX11);
-  CXXRecordDecl *ToL1 = Import(FromL1, Lang_CXX11);
-  ASSERT_NE(ToL0, ToL1);
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase, ImportAssignedLambda) {
-  Decl *FromTU = getTuDecl(
-      R"(
-      void f() {
-        auto x = []{} = {}; auto x2 = x;
-      }
-      )",
-      Lang_CXX20, "input0.cc");
-  auto FromF = FirstDeclMatcher<FunctionDecl>().match(
-      FromTU, functionDecl(hasName("f")));
-  // We have only one lambda class.
-  ASSERT_EQ(
-      DeclCounter<CXXRecordDecl>().match(FromTU, cxxRecordDecl(isLambda())),
-      1u);
-
-  FunctionDecl *ToF = Import(FromF, Lang_CXX20);
-  EXPECT_TRUE(ToF);
-  TranslationUnitDecl *ToTU = ToAST->getASTContext().getTranslationUnitDecl();
-  // We have only one lambda class after the import.
-  EXPECT_EQ(DeclCounter<CXXRecordDecl>().match(ToTU, cxxRecordDecl(isLambda())),
-            1u);
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase, ImportDefaultConstructibleLambdas) {
-  Decl *FromTU = getTuDecl(
-      R"(
-      void f() {
-        auto x = []{} = {};
-        auto xb = []{} = {};
-      }
-      )",
-      Lang_CXX20, "input0.cc");
-  auto FromF = FirstDeclMatcher<FunctionDecl>().match(
-      FromTU, functionDecl(hasName("f")));
-  // We have two lambda classes.
-  ASSERT_EQ(
-      DeclCounter<CXXRecordDecl>().match(FromTU, cxxRecordDecl(isLambda())),
-      2u);
-
-  FunctionDecl *ToF = Import(FromF, Lang_CXX20);
-  EXPECT_TRUE(ToF);
-  TranslationUnitDecl *ToTU = ToAST->getASTContext().getTranslationUnitDecl();
-  // We have two lambda classes after the import.
-  EXPECT_EQ(DeclCounter<CXXRecordDecl>().match(ToTU, cxxRecordDecl(isLambda())),
-            2u);
-}
-
-struct ImportAutoFunctions : ASTImporterOptionSpecificTestBase {};
-
-TEST_P(ImportAutoFunctions, ReturnWithTypedefDeclaredInside) {
-  Decl *FromTU = getTuDecl(
-      R"(
-      auto X = [](long l) {
-        using int_type = long;
-        auto dur = 13;
-        return static_cast<int_type>(dur);
-      };
-      )",
-      Lang_CXX14, "input0.cc");
-  CXXMethodDecl *From =
-      FirstDeclMatcher<CXXMethodDecl>().match(FromTU, cxxMethodDecl());
-
-  // Explicitly set the return type of the lambda's operator() to the TypeAlias.
-  // Normally the return type would be the built-in 'long' type. However, there
-  // are cases when Clang does not use the canonical type and the TypeAlias is
-  // used. I could not create such an AST from regular source code, it requires
-  // some special state in the preprocessor. I've found such an AST when Clang
-  // parsed libcxx/src/filesystem/directory_iterator.cpp, but could not reduce
-  // that with creduce, because after preprocessing, the AST no longer
-  // contained the TypeAlias as a return type of the lambda.
-  ASTContext &Ctx = From->getASTContext();
-  TypeAliasDecl *FromTA =
-      FirstDeclMatcher<TypeAliasDecl>().match(FromTU, typeAliasDecl());
-  QualType TT = Ctx.getTypedefType(FromTA);
-  const FunctionProtoType *FPT = cast<FunctionProtoType>(From->getType());
-  QualType NewFunType =
-      Ctx.getFunctionType(TT, FPT->getParamTypes(), FPT->getExtProtoInfo());
-  From->setType(NewFunType);
-
-  CXXMethodDecl *To = Import(From, Lang_CXX14);
-  EXPECT_TRUE(To);
-  EXPECT_TRUE(isa<TypedefType>(To->getReturnType()));
-}
-
-TEST_P(ImportAutoFunctions, ReturnWithStructDeclaredInside) {
-  Decl *FromTU = getTuDecl(
-      R"(
-      auto foo() {
-        struct X {};
-        return X();
-      }
-      )",
-      Lang_CXX14, "input0.cc");
-  FunctionDecl *From =
-      FirstDeclMatcher<FunctionDecl>().match(FromTU, functionDecl());
-
-  FunctionDecl *To = Import(From, Lang_CXX14);
-  EXPECT_TRUE(To);
-  EXPECT_TRUE(isa<AutoType>(To->getReturnType()));
-}
-
-TEST_P(ImportAutoFunctions, ReturnWithStructDeclaredInside2) {
-  Decl *FromTU = getTuDecl(
-      R"(
-      auto foo() {
-        struct X {};
-        return X();
-      }
-      )",
-      Lang_CXX14, "input0.cc");
-  FunctionDecl *From =
-      FirstDeclMatcher<FunctionDecl>().match(FromTU, functionDecl());
-
-  // This time import the type directly.
-  QualType ToT = ImportType(From->getType(), From, Lang_CXX14);
-  const FunctionProtoType *FPT = cast<FunctionProtoType>(ToT);
-  EXPECT_TRUE(isa<AutoType>(FPT->getReturnType()));
-}
-
-TEST_P(ImportAutoFunctions, ReturnWithTypedefToStructDeclaredInside) {
-  Decl *FromTU = getTuDecl(
-      R"(
-      auto foo() {
-        struct X {};
-        using Y = X;
-        return Y();
-      }
-      )",
-      Lang_CXX14, "input0.cc");
-  FunctionDecl *From =
-      FirstDeclMatcher<FunctionDecl>().match(FromTU, functionDecl());
-
-  FunctionDecl *To = Import(From, Lang_CXX14);
-  EXPECT_TRUE(To);
-  EXPECT_TRUE(isa<AutoType>(To->getReturnType()));
-}
-
-TEST_P(ImportAutoFunctions, ReturnWithStructDeclaredNestedInside) {
-  Decl *FromTU = getTuDecl(
-      R"(
-      auto foo() {
-        struct X { struct Y{}; };
-        return X::Y();
-      }
-      )",
-      Lang_CXX14, "input0.cc");
-  FunctionDecl *From =
-      FirstDeclMatcher<FunctionDecl>().match(FromTU, functionDecl());
-
-  FunctionDecl *To = Import(From, Lang_CXX14);
-  EXPECT_TRUE(To);
-  EXPECT_TRUE(isa<AutoType>(To->getReturnType()));
-}
-
-TEST_P(ImportAutoFunctions, ReturnWithInternalLambdaType) {
-  Decl *FromTU = getTuDecl(
-      R"(
-      auto f() {
-        auto l = []() {
-          struct X {};
-          return X();
-        };
-        return l();
-      }
-      )",
-      Lang_CXX17, "input0.cc");
-  FunctionDecl *From = FirstDeclMatcher<FunctionDecl>().match(
-      FromTU, functionDecl(hasName("f")));
-
-  FunctionDecl *To = Import(From, Lang_CXX17);
-  EXPECT_TRUE(To);
-  EXPECT_TRUE(isa<AutoType>(To->getReturnType()));
-}
-
-TEST_P(ImportAutoFunctions, ReturnWithTypeInIf) {
-  Decl *FromTU = getTuDecl(
-      R"(
-      auto f() {
-        if (struct X {} x; true)
-          return X();
-        else
-          return X();
-      }
-      )",
-      Lang_CXX17, "input0.cc");
-  FunctionDecl *From = FirstDeclMatcher<FunctionDecl>().match(
-      FromTU, functionDecl(hasName("f")));
-
-  FunctionDecl *To = Import(From, Lang_CXX17);
-  EXPECT_TRUE(To);
-  EXPECT_TRUE(isa<AutoType>(To->getReturnType()));
-}
-
-TEST_P(ImportAutoFunctions, ReturnWithTypeInFor) {
-  Decl *FromTU = getTuDecl(
-      R"(
-      auto f() {
-        for (struct X {} x;;)
-          return X();
-      }
-      )",
-      Lang_CXX17, "input0.cc");
-  FunctionDecl *From = FirstDeclMatcher<FunctionDecl>().match(
-      FromTU, functionDecl(hasName("f")));
-
-  FunctionDecl *To = Import(From, Lang_CXX17);
-  EXPECT_TRUE(To);
-  EXPECT_TRUE(isa<AutoType>(To->getReturnType()));
-}
-
-TEST_P(ImportAutoFunctions, ReturnWithTypeInSwitch) {
-  Decl *FromTU = getTuDecl(
-      R"(
-      auto f() {
-        switch (struct X {} x; 10) {
-        case 10:
-          return X();
-        }
-      }
-      )",
-      Lang_CXX17, "input0.cc");
-  FunctionDecl *From = FirstDeclMatcher<FunctionDecl>().match(
-      FromTU, functionDecl(hasName("f")));
-
-  FunctionDecl *To = Import(From, Lang_CXX17);
-  EXPECT_TRUE(To);
-  EXPECT_TRUE(isa<AutoType>(To->getReturnType()));
-}
-
-struct ImportSourceLocations : ASTImporterOptionSpecificTestBase {};
-
-TEST_P(ImportSourceLocations, PreserveFileIDTreeStructure) {
-  // Tests that the FileID tree structure (with the links being the include
-  // chains) is preserved while importing other files (which need to be
-  // added to this structure with fake include locations.
-
-  SourceLocation Location1;
-  {
-    auto Pattern = varDecl(hasName("X"));
-    Decl *FromTU = getTuDecl("int X;", Lang_C99, "input0.c");
-    auto *FromD = FirstDeclMatcher<VarDecl>().match(FromTU, Pattern);
-
-    Location1 = Import(FromD, Lang_C99)->getLocation();
-  }
-  SourceLocation Location2;
-  {
-    auto Pattern = varDecl(hasName("Y"));
-    Decl *FromTU = getTuDecl("int Y;", Lang_C99, "input1.c");
-    auto *FromD = FirstDeclMatcher<VarDecl>().match(FromTU, Pattern);
-
-    Location2 = Import(FromD, Lang_C99)->getLocation();
-  }
-
-  SourceManager &ToSM = ToAST->getSourceManager();
-  FileID FileID1 = ToSM.getFileID(Location1);
-  FileID FileID2 = ToSM.getFileID(Location2);
-
-  // Check that the imported files look like as if they were included from the
-  // start of the main file.
-  SourceLocation FileStart = ToSM.getLocForStartOfFile(ToSM.getMainFileID());
-  EXPECT_NE(FileID1, ToSM.getMainFileID());
-  EXPECT_NE(FileID2, ToSM.getMainFileID());
-  EXPECT_EQ(ToSM.getIncludeLoc(FileID1), FileStart);
-  EXPECT_EQ(ToSM.getIncludeLoc(FileID2), FileStart);
-
-  // Let the SourceManager check the order of the locations. The order should
-  // be the order in which the declarations are imported.
-  EXPECT_TRUE(ToSM.isBeforeInTranslationUnit(Location1, Location2));
-  EXPECT_FALSE(ToSM.isBeforeInTranslationUnit(Location2, Location1));
-}
-
-TEST_P(ImportSourceLocations, NormalFileBuffer) {
-  // Test importing normal file buffers.
-
-  std::string Path = "input0.c";
-  std::string Source = "int X;";
-  TranslationUnitDecl *FromTU = getTuDecl(Source, Lang_C99, Path);
-
-  SourceLocation ImportedLoc;
-  {
-    // Import the VarDecl to trigger the importing of the FileID.
-    auto Pattern = varDecl(hasName("X"));
-    VarDecl *FromD = FirstDeclMatcher<VarDecl>().match(FromTU, Pattern);
-    ImportedLoc = Import(FromD, Lang_C99)->getLocation();
-  }
-
-  // Make sure the imported buffer has the original contents.
-  SourceManager &ToSM = ToAST->getSourceManager();
-  FileID ImportedID = ToSM.getFileID(ImportedLoc);
-  EXPECT_EQ(Source,
-            ToSM.getBufferOrFake(ImportedID, SourceLocation()).getBuffer());
-}
-
-TEST_P(ImportSourceLocations, OverwrittenFileBuffer) {
-  // Test importing overwritten file buffers.
-
-  std::string Path = "input0.c";
-  TranslationUnitDecl *FromTU = getTuDecl("int X;", Lang_C99, Path);
-
-  // Overwrite the file buffer for our input file with new content.
-  const std::string Contents = "overwritten contents";
-  SourceLocation ImportedLoc;
-  {
-    SourceManager &FromSM = FromTU->getASTContext().getSourceManager();
-    clang::FileManager &FM = FromSM.getFileManager();
-    const clang::FileEntry &FE =
-        *FM.getVirtualFile(Path, static_cast<off_t>(Contents.size()), 0);
-
-    llvm::SmallVector<char, 64> Buffer;
-    Buffer.append(Contents.begin(), Contents.end());
-    auto FileContents =
-        std::make_unique<llvm::SmallVectorMemoryBuffer>(std::move(Buffer), Path);
-    FromSM.overrideFileContents(&FE, std::move(FileContents));
-
-    // Import the VarDecl to trigger the importing of the FileID.
-    auto Pattern = varDecl(hasName("X"));
-    VarDecl *FromD = FirstDeclMatcher<VarDecl>().match(FromTU, Pattern);
-    ImportedLoc = Import(FromD, Lang_C99)->getLocation();
-  }
-
-  // Make sure the imported buffer has the overwritten contents.
-  SourceManager &ToSM = ToAST->getSourceManager();
-  FileID ImportedID = ToSM.getFileID(ImportedLoc);
-  EXPECT_EQ(Contents,
-            ToSM.getBufferOrFake(ImportedID, SourceLocation()).getBuffer());
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase, ImportExprOfAlignmentAttr) {
-  // Test if import of these packed and aligned attributes does not trigger an
-  // error situation where source location from 'From' context is referenced in
-  // 'To' context through evaluation of the alignof attribute.
-  // This happens if the 'alignof(A)' expression is not imported correctly.
-  Decl *FromTU = getTuDecl(
-      R"(
-      struct __attribute__((packed)) A { int __attribute__((aligned(8))) X; };
-      struct alignas(alignof(A)) S {};
-      )",
-      Lang_CXX11, "input.cc");
-  auto *FromD = FirstDeclMatcher<CXXRecordDecl>().match(
-      FromTU, cxxRecordDecl(hasName("S"), unless(isImplicit())));
-  ASSERT_TRUE(FromD);
-
-  auto *ToD = Import(FromD, Lang_CXX11);
-  ASSERT_TRUE(ToD);
-
-  auto *FromAttr = FromD->getAttr<AlignedAttr>();
-  auto *ToAttr = ToD->getAttr<AlignedAttr>();
-  EXPECT_EQ(FromAttr->isInherited(), ToAttr->isInherited());
-  EXPECT_EQ(FromAttr->isPackExpansion(), ToAttr->isPackExpansion());
-  EXPECT_EQ(FromAttr->isImplicit(), ToAttr->isImplicit());
-  EXPECT_EQ(FromAttr->getSyntax(), ToAttr->getSyntax());
-  EXPECT_EQ(FromAttr->getSemanticSpelling(), ToAttr->getSemanticSpelling());
-  EXPECT_TRUE(ToAttr->getAlignmentExpr());
-
-  auto *ToA = FirstDeclMatcher<CXXRecordDecl>().match(
-      ToD->getTranslationUnitDecl(),
-      cxxRecordDecl(hasName("A"), unless(isImplicit())));
-  // Ensure that 'struct A' was imported (through reference from attribute of
-  // 'S').
-  EXPECT_TRUE(ToA);
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase, ImportFormatAttr) {
-  Decl *FromTU = getTuDecl(
-      R"(
-      int foo(const char * fmt, ...)
-      __attribute__ ((__format__ (__scanf__, 1, 2)));
-      )",
-      Lang_CXX03, "input.cc");
-  auto *FromD = FirstDeclMatcher<FunctionDecl>().match(
-      FromTU, functionDecl(hasName("foo")));
-  ASSERT_TRUE(FromD);
-
-  auto *ToD = Import(FromD, Lang_CXX03);
-  ASSERT_TRUE(ToD);
-  ToD->dump(); // Should not crash!
-
-  auto *FromAttr = FromD->getAttr<FormatAttr>();
-  auto *ToAttr = ToD->getAttr<FormatAttr>();
-  EXPECT_EQ(FromAttr->isInherited(), ToAttr->isInherited());
-  EXPECT_EQ(FromAttr->isPackExpansion(), ToAttr->isPackExpansion());
-  EXPECT_EQ(FromAttr->isImplicit(), ToAttr->isImplicit());
-  EXPECT_EQ(FromAttr->getSyntax(), ToAttr->getSyntax());
-  EXPECT_EQ(FromAttr->getAttributeSpellingListIndex(),
-            ToAttr->getAttributeSpellingListIndex());
-  EXPECT_EQ(FromAttr->getType()->getName(), ToAttr->getType()->getName());
-}
-template <typename T>
-auto ExtendWithOptions(const T &Values, const std::vector<std::string> &Args) {
-  auto Copy = Values;
-  for (std::vector<std::string> &ArgV : Copy) {
-    for (const std::string &Arg : Args) {
-      ArgV.push_back(Arg);
-    }
-  }
-  return ::testing::ValuesIn(Copy);
-}
-
-struct ImportWithExternalSource : ASTImporterOptionSpecificTestBase {
-  ImportWithExternalSource() {
-    Creator = [](ASTContext &ToContext, FileManager &ToFileManager,
-                 ASTContext &FromContext, FileManager &FromFileManager,
-                 bool MinimalImport,
-                 const std::shared_ptr<ASTImporterSharedState> &SharedState) {
-      return new ASTImporter(ToContext, ToFileManager, FromContext,
-                             FromFileManager, MinimalImport,
-                             // We use the regular lookup.
-                             /*SharedState=*/nullptr);
-    };
-  }
-};
-
-/// An ExternalASTSource that keeps track of the tags is completed.
-struct SourceWithCompletedTagList : clang::ExternalASTSource {
-  std::vector<clang::TagDecl *> &CompletedTags;
-  SourceWithCompletedTagList(std::vector<clang::TagDecl *> &CompletedTags)
-      : CompletedTags(CompletedTags) {}
-  void CompleteType(TagDecl *Tag) override {
-    auto *Record = cast<CXXRecordDecl>(Tag);
-    Record->startDefinition();
-    Record->completeDefinition();
-    CompletedTags.push_back(Tag);
-  }
-  using clang::ExternalASTSource::CompleteType;
-};
-
-TEST_P(ImportWithExternalSource, CompleteRecordBeforeImporting) {
-  // Create an empty TU.
-  TranslationUnitDecl *FromTU = getTuDecl("", Lang_CXX03, "input.cpp");
-
-  // Create and add the test ExternalASTSource.
-  std::vector<clang::TagDecl *> CompletedTags;
-  IntrusiveRefCntPtr<ExternalASTSource> source =
-      new SourceWithCompletedTagList(CompletedTags);
-  clang::ASTContext &Context = FromTU->getASTContext();
-  Context.setExternalSource(std::move(source));
-
-  // Create a dummy class by hand with external lexical storage.
-  IdentifierInfo &Ident = Context.Idents.get("test_class");
-  auto *Record = CXXRecordDecl::Create(
-      Context, TTK_Class, FromTU, SourceLocation(), SourceLocation(), &Ident);
-  Record->setHasExternalLexicalStorage();
-  FromTU->addDecl(Record);
-
-  // Do a minimal import of the created class.
-  EXPECT_EQ(0U, CompletedTags.size());
-  Import(Record, Lang_CXX03);
-  EXPECT_EQ(0U, CompletedTags.size());
-
-  // Import the definition of the created class.
-  llvm::Error Err = findFromTU(Record)->Importer->ImportDefinition(Record);
-  EXPECT_FALSE((bool)Err);
-  consumeError(std::move(Err));
-
-  // Make sure the class was completed once.
-  EXPECT_EQ(1U, CompletedTags.size());
-  EXPECT_EQ(Record, CompletedTags.front());
-}
-
-TEST_P(ImportFunctions, CTADImplicit) {
-  Decl *FromTU = getTuDecl(
-      R"(
-      template <typename T> struct A {
-        A(T);
-      };
-      A a{(int)0};
-      )",
-      Lang_CXX17, "input.cc");
-  auto *FromD = FirstDeclMatcher<CXXDeductionGuideDecl>().match(
-      FromTU,
-      cxxDeductionGuideDecl(hasParameter(0, hasType(asString("A<T>")))));
-  auto *ToD = Import(FromD, Lang_CXX17);
-  ASSERT_TRUE(ToD);
-  EXPECT_TRUE(ToD->isCopyDeductionCandidate());
-  // Check that the deduced class template is also imported.
-  EXPECT_TRUE(findFromTU(FromD)->Importer->GetAlreadyImportedOrNull(
-      FromD->getDeducedTemplate()));
-}
-
-TEST_P(ImportFunctions, CTADUserDefinedExplicit) {
-  Decl *FromTU = getTuDecl(
-      R"(
-      template <typename T> struct A {
-        A(T);
-      };
-      template <typename T> explicit A(T) -> A<float>;
-      A a{(int)0}; // calls A<float>::A(float)
-      )",
-      Lang_CXX17, "input.cc");
-  auto *FromD = FirstDeclMatcher<CXXDeductionGuideDecl>().match(
-      FromTU, cxxDeductionGuideDecl(unless(isImplicit())));
-  // Not-implicit: i.e. not compiler-generated, user defined.
-  ASSERT_FALSE(FromD->isImplicit());
-  ASSERT_TRUE(FromD->isExplicit()); // Has the explicit keyword.
-  auto *ToD = Import(FromD, Lang_CXX17);
-  ASSERT_TRUE(ToD);
-  EXPECT_FALSE(FromD->isImplicit());
-  EXPECT_TRUE(ToD->isExplicit());
-}
-
-TEST_P(ImportFunctions, CTADWithLocalTypedef) {
-  Decl *TU = getTuDecl(
-      R"(
-      template <typename T> struct A {
-        typedef T U;
-        A(U);
-      };
-      A a{(int)0};
-      )",
-      Lang_CXX17, "input.cc");
-  auto *FromD = FirstDeclMatcher<CXXDeductionGuideDecl>().match(
-      TU, cxxDeductionGuideDecl());
-  auto *ToD = Import(FromD, Lang_CXX17);
-  ASSERT_TRUE(ToD);
-}
-
-TEST_P(ImportFunctions, ParmVarDeclDeclContext) {
-  constexpr auto FromTUCode = R"(
-      void f(int P);
-      )";
-  Decl *FromTU = getTuDecl(FromTUCode, Lang_CXX11);
-  auto *FromF = FirstDeclMatcher<FunctionDecl>().match(
-      FromTU, functionDecl(hasName("f")));
-  ASSERT_TRUE(FromF);
-
-  auto *ImportedF = Import(FromF, Lang_CXX11);
-  EXPECT_TRUE(ImportedF);
-  EXPECT_TRUE(SharedStatePtr->getLookupTable()->contains(
-      ImportedF, ImportedF->getParamDecl(0)));
-}
-
-// FIXME Move these tests out of ASTImporterTest. For that we need to factor
-// out the ASTImporter specific pars from ASTImporterOptionSpecificTestBase
-// into a new test Fixture. Then we should lift up this Fixture to its own
-// implementation file and only then could we reuse the Fixture in other AST
-// unitttests.
-struct CTAD : ASTImporterOptionSpecificTestBase {};
-
-TEST_P(CTAD, DeductionGuideShouldReferToANonLocalTypedef) {
-  Decl *TU = getTuDecl(
-      R"(
-      typedef int U;
-      template <typename T> struct A {
-        A(U, T);
-      };
-      A a{(int)0, (int)0};
-      )",
-      Lang_CXX17, "input.cc");
-  auto *Guide = FirstDeclMatcher<CXXDeductionGuideDecl>().match(
-      TU, cxxDeductionGuideDecl());
-  auto *Typedef = FirstDeclMatcher<TypedefNameDecl>().match(
-      TU, typedefNameDecl(hasName("U")));
-  ParmVarDecl *Param = Guide->getParamDecl(0);
-  // The type of the first param (which is a typedef) should match the typedef
-  // in the global scope.
-  EXPECT_EQ(Param->getType()->castAs<TypedefType>()->getDecl(), Typedef);
-}
-
-TEST_P(CTAD, DeductionGuideShouldReferToANonLocalTypedefInParamPtr) {
-  Decl *TU = getTuDecl(
-      R"(
-      typedef int U;
-      template <typename T> struct A {
-        A(U*, T);
-      };
-      A a{(int*)0, (int)0};
-      )",
-      Lang_CXX17, "input.cc");
-  auto *Guide = FirstDeclMatcher<CXXDeductionGuideDecl>().match(
-      TU, cxxDeductionGuideDecl());
-  auto *Typedef = FirstDeclMatcher<TypedefNameDecl>().match(
-      TU, typedefNameDecl(hasName("U")));
-  ParmVarDecl *Param = Guide->getParamDecl(0);
-  EXPECT_EQ(Param->getType()
-                ->getAs<PointerType>()
-                ->getPointeeType()
-                ->getAs<TypedefType>()
-                ->getDecl(),
-            Typedef);
-}
-
-TEST_P(CTAD, DeductionGuideShouldCopyALocalTypedef) {
-  Decl *TU = getTuDecl(
-      R"(
-      template <typename T> struct A {
-        typedef T U;
-        A(U, T);
-      };
-      A a{(int)0, (int)0};
-      )",
-      Lang_CXX17, "input.cc");
-  auto *Guide = FirstDeclMatcher<CXXDeductionGuideDecl>().match(
-      TU, cxxDeductionGuideDecl());
-  auto *Typedef = FirstDeclMatcher<TypedefNameDecl>().match(
-      TU, typedefNameDecl(hasName("U")));
-  ParmVarDecl *Param = Guide->getParamDecl(0);
-  EXPECT_NE(Param->getType()->castAs<TypedefType>()->getDecl(), Typedef);
-}
-
-INSTANTIATE_TEST_SUITE_P(ParameterizedTests, CTAD,
-                         DefaultTestValuesForRunOptions);
-
-TEST_P(ASTImporterOptionSpecificTestBase, TypedefWithAttribute) {
-  Decl *TU = getTuDecl(
-      R"(
-      namespace N {
-        typedef int X __attribute__((annotate("A")));
-      }
-      )",
-      Lang_CXX17, "input.cc");
-  auto *FromD =
-      FirstDeclMatcher<TypedefDecl>().match(TU, typedefDecl(hasName("X")));
-  auto *ToD = Import(FromD, Lang_CXX17);
-  ASSERT_TRUE(ToD);
-  ASSERT_EQ(ToD->getAttrs().size(), 1U);
-  auto *ToAttr = dyn_cast<AnnotateAttr>(ToD->getAttrs()[0]);
-  ASSERT_TRUE(ToAttr);
-  EXPECT_EQ(ToAttr->getAnnotation(), "A");
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase,
-       ImportOfTemplatedDeclWhenPreviousDeclHasNoDescribedTemplateSet) {
-  Decl *FromTU = getTuDecl(
-      R"(
-
-      namespace std {
-        template<typename T>
-        class basic_stringbuf;
-      }
-      namespace std {
-        class char_traits;
-        template<typename T = char_traits>
-        class basic_stringbuf;
-      }
-      namespace std {
-        template<typename T>
-        class basic_stringbuf {};
-      }
-
-      )",
-      Lang_CXX11);
-
-  auto *From1 = FirstDeclMatcher<ClassTemplateDecl>().match(
-      FromTU,
-      classTemplateDecl(hasName("basic_stringbuf"), unless(isImplicit())));
-  auto *To1 = cast_or_null<ClassTemplateDecl>(Import(From1, Lang_CXX11));
-  EXPECT_TRUE(To1);
-
-  auto *From2 = LastDeclMatcher<ClassTemplateDecl>().match(
-      FromTU,
-      classTemplateDecl(hasName("basic_stringbuf"), unless(isImplicit())));
-  auto *To2 = cast_or_null<ClassTemplateDecl>(Import(From2, Lang_CXX11));
-  EXPECT_TRUE(To2);
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase, ImportOfCapturedVLAType) {
-  Decl *FromTU = getTuDecl(
-      R"(
-      void declToImport(int N) {
-        int VLA[N];
-        [&VLA] {}; // FieldDecl inside the lambda.
-      }
-      )",
-      Lang_CXX14);
-  auto *FromFD = FirstDeclMatcher<FieldDecl>().match(FromTU, fieldDecl());
-  ASSERT_TRUE(FromFD);
-  ASSERT_TRUE(FromFD->hasCapturedVLAType());
-
-  auto *ToFD = Import(FromFD, Lang_CXX14);
-  EXPECT_TRUE(ToFD);
-  EXPECT_TRUE(ToFD->hasCapturedVLAType());
-  EXPECT_NE(FromFD->getCapturedVLAType(), ToFD->getCapturedVLAType());
-}
-
-TEST_P(ASTImporterOptionSpecificTestBase, ImportEnumMemberSpecialization) {
-  Decl *FromTU = getTuDecl(
-      R"(
-      template <class T> struct A {
-        enum tagname { enumerator };
-      };
-      template struct A<int>;
-      )",
-      Lang_CXX03);
-  auto *FromD = FirstDeclMatcher<EnumDecl>().match(
-      FromTU, enumDecl(hasName("tagname"),
-                       hasParent(classTemplateSpecializationDecl())));
-  ASSERT_TRUE(FromD);
-  ASSERT_TRUE(FromD->getMemberSpecializationInfo());
-
-  auto *ToD = Import(FromD, Lang_CXX03);
-  EXPECT_TRUE(ToD);
-  EXPECT_TRUE(ToD->getMemberSpecializationInfo());
-  EXPECT_EQ(FromD->getTemplateSpecializationKind(),
-            ToD->getTemplateSpecializationKind());
-}
-
-INSTANTIATE_TEST_SUITE_P(ParameterizedTests, ASTImporterLookupTableTest,
-                         DefaultTestValuesForRunOptions);
-
-INSTANTIATE_TEST_SUITE_P(ParameterizedTests, ImportPath,
-                         ::testing::Values(std::vector<std::string>()));
-
-INSTANTIATE_TEST_SUITE_P(ParameterizedTests, ImportExpr,
-                         DefaultTestValuesForRunOptions);
-
-INSTANTIATE_TEST_SUITE_P(ParameterizedTests, ImportFixedPointExpr,
-                         ExtendWithOptions(DefaultTestArrayForRunOptions,
-                                           std::vector<std::string>{
-                                               "-ffixed-point"}));
-
-INSTANTIATE_TEST_SUITE_P(ParameterizedTests, ImportBlock,
-                         ExtendWithOptions(DefaultTestArrayForRunOptions,
-                                           std::vector<std::string>{
-                                               "-fblocks"}));
-
-INSTANTIATE_TEST_SUITE_P(ParameterizedTests, ImportType,
-                         DefaultTestValuesForRunOptions);
-
-INSTANTIATE_TEST_SUITE_P(ParameterizedTests, ImportDecl,
-                         DefaultTestValuesForRunOptions);
-
-INSTANTIATE_TEST_SUITE_P(ParameterizedTests, ASTImporterOptionSpecificTestBase,
-                         DefaultTestValuesForRunOptions);
-
-INSTANTIATE_TEST_SUITE_P(ParameterizedTests, ErrorHandlingTest,
-                         DefaultTestValuesForRunOptions);
-
-INSTANTIATE_TEST_SUITE_P(ParameterizedTests, RedirectingImporterTest,
-                         DefaultTestValuesForRunOptions);
-
-INSTANTIATE_TEST_SUITE_P(ParameterizedTests, ImportFunctions,
-                         DefaultTestValuesForRunOptions);
-
-INSTANTIATE_TEST_SUITE_P(ParameterizedTests, ImportAutoFunctions,
-                         DefaultTestValuesForRunOptions);
-
-INSTANTIATE_TEST_SUITE_P(ParameterizedTests, ImportFunctionTemplates,
-                         DefaultTestValuesForRunOptions);
-
-INSTANTIATE_TEST_SUITE_P(ParameterizedTests, ImportFriendFunctionTemplates,
-                         DefaultTestValuesForRunOptions);
-
-INSTANTIATE_TEST_SUITE_P(ParameterizedTests, ImportClasses,
-                         DefaultTestValuesForRunOptions);
-
-INSTANTIATE_TEST_SUITE_P(ParameterizedTests, ImportFriendFunctions,
-                         DefaultTestValuesForRunOptions);
-
-INSTANTIATE_TEST_SUITE_P(ParameterizedTests, ImportFriendClasses,
-                         DefaultTestValuesForRunOptions);
-
-INSTANTIATE_TEST_SUITE_P(ParameterizedTests,
-                         ImportFunctionTemplateSpecializations,
-                         DefaultTestValuesForRunOptions);
-
-INSTANTIATE_TEST_SUITE_P(ParameterizedTests, ImportImplicitMethods,
-                         DefaultTestValuesForRunOptions);
-
-INSTANTIATE_TEST_SUITE_P(ParameterizedTests, ImportVariables,
-                         DefaultTestValuesForRunOptions);
-
-INSTANTIATE_TEST_SUITE_P(ParameterizedTests, LLDBLookupTest,
-                         DefaultTestValuesForRunOptions);
-
-INSTANTIATE_TEST_SUITE_P(ParameterizedTests, ImportSourceLocations,
-                         DefaultTestValuesForRunOptions);
-
-INSTANTIATE_TEST_SUITE_P(ParameterizedTests, ImportWithExternalSource,
-                         DefaultTestValuesForRunOptions);
-
-} // end namespace ast_matchers
-} // end namespace clang
diff --git a/gnu/llvm/clang/unittests/AST/ASTImporterVisibilityTest.cpp b/gnu/llvm/clang/unittests/AST/ASTImporterVisibilityTest.cpp
deleted file mode 100644
index cf3e51caeac..00000000000
--- a/gnu/llvm/clang/unittests/AST/ASTImporterVisibilityTest.cpp
+++ /dev/null
@@ -1,521 +0,0 @@
-//===- unittest/AST/ASTImporterTest.cpp - AST node import test ------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// Type-parameterized tests for the correct import of Decls with different
-// visibility.
-//
-//===----------------------------------------------------------------------===//
-
-// Define this to have ::testing::Combine available.
-// FIXME: Better solution for this?
-#define GTEST_HAS_COMBINE 1
-
-#include "ASTImporterFixtures.h"
-
-namespace clang {
-namespace ast_matchers {
-
-using internal::BindableMatcher;
-
-// Type parameters for type-parameterized test fixtures.
-struct GetFunPattern {
-  using DeclTy = FunctionDecl;
-  BindableMatcher<Decl> operator()() { return functionDecl(hasName("f")); }
-};
-struct GetVarPattern {
-  using DeclTy = VarDecl;
-  BindableMatcher<Decl> operator()() { return varDecl(hasName("v")); }
-};
-struct GetClassPattern {
-  using DeclTy = CXXRecordDecl;
-  BindableMatcher<Decl> operator()() { return cxxRecordDecl(hasName("X")); }
-};
-struct GetEnumPattern {
-  using DeclTy = EnumDecl;
-  BindableMatcher<Decl> operator()() { return enumDecl(hasName("E")); }
-};
-struct GetTypedefNamePattern {
-  using DeclTy = TypedefNameDecl;
-  BindableMatcher<Decl> operator()() { return typedefNameDecl(hasName("T")); }
-};
-struct GetFunTemplPattern {
-  using DeclTy = FunctionTemplateDecl;
-  BindableMatcher<Decl> operator()() {
-    return functionTemplateDecl(hasName("f"));
-  }
-};
-struct GetVarTemplPattern {
-  using DeclTy = VarTemplateDecl;
-  BindableMatcher<Decl> operator()() {
-    return namedDecl(hasName("v"), has(templateTypeParmDecl()));
-  }
-};
-struct GetClassTemplPattern {
-  using DeclTy = ClassTemplateDecl;
-  BindableMatcher<Decl> operator()() { return classTemplateDecl(hasName("X")); }
-};
-
-// Values for the value-parameterized test fixtures.
-// FunctionDecl:
-const auto *ExternF = "void f();";
-const auto *StaticF = "static void f();";
-const auto *AnonF = "namespace { void f(); }";
-// VarDecl:
-const auto *ExternV = "extern int v;";
-const auto *StaticV = "static int v;";
-const auto *AnonV = "namespace { extern int v; }";
-// CXXRecordDecl:
-const auto *ExternC = "class X;";
-const auto *AnonC = "namespace { class X; }";
-// EnumDecl:
-const auto *ExternE = "enum E {};";
-const auto *AnonE = "namespace { enum E {}; }";
-const auto *ExternEC = "enum class E;";
-const auto *AnonEC = "namespace { enum class E; }";
-// TypedefNameDecl:
-const auto *ExternTypedef = "typedef int T;";
-const auto *AnonTypedef = "namespace { typedef int T; }";
-const auto *ExternUsing = "using T = int;";
-const auto *AnonUsing = "namespace { using T = int; }";
-// FunctionTemplateDecl:
-const auto *ExternFT = "template <class> void f();";
-const auto *StaticFT = "template <class> static void f();";
-const auto *AnonFT = "namespace { template <class> void f(); }";
-// VarTemplateDecl:
-const auto *ExternVT = "template <class> extern int v;";
-const auto *StaticVT = "template <class> static int v;";
-const auto *AnonVT = "namespace { template <class> extern int v; }";
-// ClassTemplateDecl:
-const auto *ExternCT = "template <class> class X;";
-const auto *AnonCT = "namespace { template <class> class X; }";
-
-// First value in tuple: Compile options.
-// Second value in tuple: Source code to be used in the test.
-using ImportVisibilityChainParams = ::testing::WithParamInterface<
-    std::tuple<std::vector<std::string>, const char *>>;
-// Fixture to test the redecl chain of Decls with the same visibility. Gtest
-// makes it possible to have either value-parameterized or type-parameterized
-// fixtures. However, we cannot have both value- and type-parameterized test
-// fixtures. This is a value-parameterized test fixture in the gtest sense. We
-// intend to mimic gtest's type-parameters via the PatternFactory template
-// parameter. We manually instantiate the different tests with the each types.
-template <typename PatternFactory>
-class ImportVisibilityChain
-    : public ASTImporterTestBase, public ImportVisibilityChainParams {
-protected:
-  using DeclTy = typename PatternFactory::DeclTy;
-  std::vector<std::string> getExtraArgs() const override {
-    return std::get<0>(GetParam());
-  }
-  std::string getCode() const { return std::get<1>(GetParam()); }
-  BindableMatcher<Decl> getPattern() const { return PatternFactory()(); }
-
-  // Type-parameterized test.
-  void TypedTest_ImportChain() {
-    std::string Code = getCode() + getCode();
-    auto Pattern = getPattern();
-
-    TranslationUnitDecl *FromTu = getTuDecl(Code, Lang_CXX14, "input0.cc");
-
-    auto *FromD0 = FirstDeclMatcher<DeclTy>().match(FromTu, Pattern);
-    auto *FromD1 = LastDeclMatcher<DeclTy>().match(FromTu, Pattern);
-
-    auto *ToD0 = Import(FromD0, Lang_CXX14);
-    auto *ToD1 = Import(FromD1, Lang_CXX14);
-
-    EXPECT_TRUE(ToD0);
-    ASSERT_TRUE(ToD1);
-    EXPECT_NE(ToD0, ToD1);
-    EXPECT_EQ(ToD1->getPreviousDecl(), ToD0);
-  }
-};
-
-// Manual instantiation of the fixture with each type.
-using ImportFunctionsVisibilityChain = ImportVisibilityChain<GetFunPattern>;
-using ImportVariablesVisibilityChain = ImportVisibilityChain<GetVarPattern>;
-using ImportClassesVisibilityChain = ImportVisibilityChain<GetClassPattern>;
-using ImportScopedEnumsVisibilityChain = ImportVisibilityChain<GetEnumPattern>;
-using ImportFunctionTemplatesVisibilityChain =
-    ImportVisibilityChain<GetFunTemplPattern>;
-using ImportVariableTemplatesVisibilityChain =
-    ImportVisibilityChain<GetVarTemplPattern>;
-using ImportClassTemplatesVisibilityChain =
-    ImportVisibilityChain<GetClassTemplPattern>;
-
-// Value-parameterized test for functions.
-TEST_P(ImportFunctionsVisibilityChain, ImportChain) {
-  TypedTest_ImportChain();
-}
-// Value-parameterized test for variables.
-TEST_P(ImportVariablesVisibilityChain, ImportChain) {
-  TypedTest_ImportChain();
-}
-// Value-parameterized test for classes.
-TEST_P(ImportClassesVisibilityChain, ImportChain) {
-  TypedTest_ImportChain();
-}
-// Value-parameterized test for scoped enums.
-TEST_P(ImportScopedEnumsVisibilityChain, ImportChain) {
-  TypedTest_ImportChain();
-}
-// Value-parameterized test for function templates.
-TEST_P(ImportFunctionTemplatesVisibilityChain, ImportChain) {
-  TypedTest_ImportChain();
-}
-// Value-parameterized test for variable templates.
-TEST_P(ImportVariableTemplatesVisibilityChain, ImportChain) {
-  TypedTest_ImportChain();
-}
-// Value-parameterized test for class templates.
-TEST_P(ImportClassTemplatesVisibilityChain, ImportChain) {
-  TypedTest_ImportChain();
-}
-
-// Automatic instantiation of the value-parameterized tests.
-INSTANTIATE_TEST_SUITE_P(ParameterizedTests, ImportFunctionsVisibilityChain,
-                         ::testing::Combine(DefaultTestValuesForRunOptions,
-                                            ::testing::Values(ExternF, StaticF,
-                                                              AnonF)));
-INSTANTIATE_TEST_SUITE_P(
-    ParameterizedTests, ImportVariablesVisibilityChain,
-    ::testing::Combine(
-        DefaultTestValuesForRunOptions,
-        // There is no point to instantiate with StaticV, because in C++ we can
-        // forward declare a variable only with the 'extern' keyword.
-        // Consequently, each fwd declared variable has external linkage.  This
-        // is different in the C language where any declaration without an
-        // initializer is a tentative definition, subsequent definitions may be
-        // provided but they must have the same linkage.  See also the test
-        // ImportVariableChainInC which test for this special C Lang case.
-        ::testing::Values(ExternV, AnonV)) );
-INSTANTIATE_TEST_SUITE_P(
-    ParameterizedTests, ImportClassesVisibilityChain,
-    ::testing::Combine(
-        DefaultTestValuesForRunOptions,
-        ::testing::Values(ExternC, AnonC)) );
-INSTANTIATE_TEST_SUITE_P(
-    ParameterizedTests, ImportScopedEnumsVisibilityChain,
-    ::testing::Combine(
-        DefaultTestValuesForRunOptions,
-        ::testing::Values(ExternEC, AnonEC)) );
-INSTANTIATE_TEST_SUITE_P(ParameterizedTests,
-                        ImportFunctionTemplatesVisibilityChain,
-                        ::testing::Combine(DefaultTestValuesForRunOptions,
-                                           ::testing::Values(ExternFT, StaticFT,
-                                                             AnonFT)) );
-INSTANTIATE_TEST_SUITE_P(ParameterizedTests,
-                        ImportVariableTemplatesVisibilityChain,
-                        ::testing::Combine(DefaultTestValuesForRunOptions,
-                                           ::testing::Values(ExternVT,
-                                                             AnonVT)) );
-INSTANTIATE_TEST_SUITE_P(ParameterizedTests, ImportClassTemplatesVisibilityChain,
-                        ::testing::Combine(DefaultTestValuesForRunOptions,
-                                           ::testing::Values(ExternCT,
-                                                             AnonCT)) );
-
-// First value in tuple: Compile options.
-// Second value in tuple: Tuple with informations for the test.
-// Code for first import (or initial code), code to import, whether the `f`
-// functions are expected to be linked in a declaration chain.
-// One value of this tuple is combined with every value of compile options.
-// The test can have a single tuple as parameter only.
-using ImportVisibilityParams = ::testing::WithParamInterface<std::tuple<
-    std::vector<std::string>, std::tuple<const char *, const char *, bool>>>;
-
-template <typename PatternFactory>
-class ImportVisibility
-    : public ASTImporterTestBase,
-      public ImportVisibilityParams {
-protected:
-  using DeclTy = typename PatternFactory::DeclTy;
-  std::vector<std::string> getExtraArgs() const override {
-    return std::get<0>(GetParam());
-  }
-  std::string getCode0() const { return std::get<0>(std::get<1>(GetParam())); }
-  std::string getCode1() const { return std::get<1>(std::get<1>(GetParam())); }
-  bool shouldBeLinked() const { return std::get<2>(std::get<1>(GetParam())); }
-  BindableMatcher<Decl> getPattern() const { return PatternFactory()(); }
-
-  void TypedTest_ImportAfter() {
-    TranslationUnitDecl *ToTu = getToTuDecl(getCode0(), Lang_CXX14);
-    TranslationUnitDecl *FromTu =
-        getTuDecl(getCode1(), Lang_CXX14, "input1.cc");
-
-    auto *ToD0 = FirstDeclMatcher<DeclTy>().match(ToTu, getPattern());
-    auto *FromD1 = FirstDeclMatcher<DeclTy>().match(FromTu, getPattern());
-
-    auto *ToD1 = Import(FromD1, Lang_CXX14);
-
-    ASSERT_TRUE(ToD0);
-    ASSERT_TRUE(ToD1);
-    EXPECT_NE(ToD0, ToD1);
-
-    if (shouldBeLinked())
-      EXPECT_EQ(ToD1->getPreviousDecl(), ToD0);
-    else
-      EXPECT_FALSE(ToD1->getPreviousDecl());
-  }
-
-  void TypedTest_ImportAfterImport() {
-    TranslationUnitDecl *FromTu0 =
-        getTuDecl(getCode0(), Lang_CXX14, "input0.cc");
-    TranslationUnitDecl *FromTu1 =
-        getTuDecl(getCode1(), Lang_CXX14, "input1.cc");
-    auto *FromD0 = FirstDeclMatcher<DeclTy>().match(FromTu0, getPattern());
-    auto *FromD1 = FirstDeclMatcher<DeclTy>().match(FromTu1, getPattern());
-    auto *ToD0 = Import(FromD0, Lang_CXX14);
-    auto *ToD1 = Import(FromD1, Lang_CXX14);
-    ASSERT_TRUE(ToD0);
-    ASSERT_TRUE(ToD1);
-    EXPECT_NE(ToD0, ToD1);
-    if (shouldBeLinked())
-      EXPECT_EQ(ToD1->getPreviousDecl(), ToD0);
-    else
-      EXPECT_FALSE(ToD1->getPreviousDecl());
-  }
-
-  void TypedTest_ImportAfterWithMerge() {
-    TranslationUnitDecl *ToTu = getToTuDecl(getCode0(), Lang_CXX14);
-    TranslationUnitDecl *FromTu =
-        getTuDecl(getCode1(), Lang_CXX14, "input1.cc");
-
-    auto *ToF0 = FirstDeclMatcher<DeclTy>().match(ToTu, getPattern());
-    auto *FromF1 = FirstDeclMatcher<DeclTy>().match(FromTu, getPattern());
-
-    auto *ToF1 = Import(FromF1, Lang_CXX14);
-
-    ASSERT_TRUE(ToF0);
-    ASSERT_TRUE(ToF1);
-
-    if (shouldBeLinked())
-      EXPECT_EQ(ToF0, ToF1);
-    else
-      EXPECT_NE(ToF0, ToF1);
-
-    // We expect no (ODR) warning during the import.
-    EXPECT_EQ(0u, ToTu->getASTContext().getDiagnostics().getNumWarnings());
-  }
-
-  void TypedTest_ImportAfterImportWithMerge() {
-    TranslationUnitDecl *FromTu0 =
-        getTuDecl(getCode0(), Lang_CXX14, "input0.cc");
-    TranslationUnitDecl *FromTu1 =
-        getTuDecl(getCode1(), Lang_CXX14, "input1.cc");
-    auto *FromF0 = FirstDeclMatcher<DeclTy>().match(FromTu0, getPattern());
-    auto *FromF1 = FirstDeclMatcher<DeclTy>().match(FromTu1, getPattern());
-    auto *ToF0 = Import(FromF0, Lang_CXX14);
-    auto *ToF1 = Import(FromF1, Lang_CXX14);
-    ASSERT_TRUE(ToF0);
-    ASSERT_TRUE(ToF1);
-    if (shouldBeLinked())
-      EXPECT_EQ(ToF0, ToF1);
-    else
-      EXPECT_NE(ToF0, ToF1);
-
-    // We expect no (ODR) warning during the import.
-    EXPECT_EQ(0u, ToF0->getTranslationUnitDecl()
-                      ->getASTContext()
-                      .getDiagnostics()
-                      .getNumWarnings());
-  }
-};
-using ImportFunctionsVisibility = ImportVisibility<GetFunPattern>;
-using ImportVariablesVisibility = ImportVisibility<GetVarPattern>;
-using ImportClassesVisibility = ImportVisibility<GetClassPattern>;
-using ImportEnumsVisibility = ImportVisibility<GetEnumPattern>;
-using ImportScopedEnumsVisibility = ImportVisibility<GetEnumPattern>;
-using ImportTypedefNameVisibility = ImportVisibility<GetTypedefNamePattern>;
-using ImportFunctionTemplatesVisibility = ImportVisibility<GetFunTemplPattern>;
-using ImportVariableTemplatesVisibility = ImportVisibility<GetVarTemplPattern>;
-using ImportClassTemplatesVisibility = ImportVisibility<GetClassTemplPattern>;
-
-// FunctionDecl.
-TEST_P(ImportFunctionsVisibility, ImportAfter) {
-  TypedTest_ImportAfter();
-}
-TEST_P(ImportFunctionsVisibility, ImportAfterImport) {
-  TypedTest_ImportAfterImport();
-}
-// VarDecl.
-TEST_P(ImportVariablesVisibility, ImportAfter) {
-  TypedTest_ImportAfter();
-}
-TEST_P(ImportVariablesVisibility, ImportAfterImport) {
-  TypedTest_ImportAfterImport();
-}
-// CXXRecordDecl.
-TEST_P(ImportClassesVisibility, ImportAfter) {
-  TypedTest_ImportAfter();
-}
-TEST_P(ImportClassesVisibility, ImportAfterImport) {
-  TypedTest_ImportAfterImport();
-}
-// EnumDecl.
-TEST_P(ImportEnumsVisibility, ImportAfter) {
-  TypedTest_ImportAfterWithMerge();
-}
-TEST_P(ImportEnumsVisibility, ImportAfterImport) {
-  TypedTest_ImportAfterImportWithMerge();
-}
-TEST_P(ImportScopedEnumsVisibility, ImportAfter) {
-  TypedTest_ImportAfter();
-}
-TEST_P(ImportScopedEnumsVisibility, ImportAfterImport) {
-  TypedTest_ImportAfterImport();
-}
-// TypedefNameDecl.
-TEST_P(ImportTypedefNameVisibility, ImportAfter) {
-  TypedTest_ImportAfterWithMerge();
-}
-TEST_P(ImportTypedefNameVisibility, ImportAfterImport) {
-  TypedTest_ImportAfterImportWithMerge();
-}
-// FunctionTemplateDecl.
-TEST_P(ImportFunctionTemplatesVisibility, ImportAfter) {
-  TypedTest_ImportAfter();
-}
-TEST_P(ImportFunctionTemplatesVisibility, ImportAfterImport) {
-  TypedTest_ImportAfterImport();
-}
-// VarTemplateDecl.
-TEST_P(ImportVariableTemplatesVisibility, ImportAfter) {
-  TypedTest_ImportAfter();
-}
-TEST_P(ImportVariableTemplatesVisibility, ImportAfterImport) {
-  TypedTest_ImportAfterImport();
-}
-// ClassTemplateDecl.
-TEST_P(ImportClassTemplatesVisibility, ImportAfter) { TypedTest_ImportAfter(); }
-TEST_P(ImportClassTemplatesVisibility, ImportAfterImport) {
-  TypedTest_ImportAfterImport();
-}
-
-const bool ExpectLinkedDeclChain = true;
-const bool ExpectUnlinkedDeclChain = false;
-
-INSTANTIATE_TEST_SUITE_P(
-    ParameterizedTests, ImportFunctionsVisibility,
-    ::testing::Combine(
-        DefaultTestValuesForRunOptions,
-        ::testing::Values(
-            std::make_tuple(ExternF, ExternF, ExpectLinkedDeclChain),
-            std::make_tuple(ExternF, StaticF, ExpectUnlinkedDeclChain),
-            std::make_tuple(ExternF, AnonF, ExpectUnlinkedDeclChain),
-            std::make_tuple(StaticF, ExternF, ExpectUnlinkedDeclChain),
-            std::make_tuple(StaticF, StaticF, ExpectUnlinkedDeclChain),
-            std::make_tuple(StaticF, AnonF, ExpectUnlinkedDeclChain),
-            std::make_tuple(AnonF, ExternF, ExpectUnlinkedDeclChain),
-            std::make_tuple(AnonF, StaticF, ExpectUnlinkedDeclChain),
-            std::make_tuple(AnonF, AnonF, ExpectUnlinkedDeclChain))) );
-INSTANTIATE_TEST_SUITE_P(
-    ParameterizedTests, ImportVariablesVisibility,
-    ::testing::Combine(
-        DefaultTestValuesForRunOptions,
-        ::testing::Values(
-            std::make_tuple(ExternV, ExternV, ExpectLinkedDeclChain),
-            std::make_tuple(ExternV, StaticV, ExpectUnlinkedDeclChain),
-            std::make_tuple(ExternV, AnonV, ExpectUnlinkedDeclChain),
-            std::make_tuple(StaticV, ExternV, ExpectUnlinkedDeclChain),
-            std::make_tuple(StaticV, StaticV, ExpectUnlinkedDeclChain),
-            std::make_tuple(StaticV, AnonV, ExpectUnlinkedDeclChain),
-            std::make_tuple(AnonV, ExternV, ExpectUnlinkedDeclChain),
-            std::make_tuple(AnonV, StaticV, ExpectUnlinkedDeclChain),
-            std::make_tuple(AnonV, AnonV, ExpectUnlinkedDeclChain))) );
-INSTANTIATE_TEST_SUITE_P(
-    ParameterizedTests, ImportClassesVisibility,
-    ::testing::Combine(
-        DefaultTestValuesForRunOptions,
-        ::testing::Values(
-            std::make_tuple(ExternC, ExternC, ExpectLinkedDeclChain),
-            std::make_tuple(ExternC, AnonC, ExpectUnlinkedDeclChain),
-            std::make_tuple(AnonC, ExternC, ExpectUnlinkedDeclChain),
-            std::make_tuple(AnonC, AnonC, ExpectUnlinkedDeclChain))) );
-INSTANTIATE_TEST_SUITE_P(
-    ParameterizedTests, ImportEnumsVisibility,
-    ::testing::Combine(
-        DefaultTestValuesForRunOptions,
-        ::testing::Values(
-            std::make_tuple(ExternE, ExternE, ExpectLinkedDeclChain),
-            std::make_tuple(ExternE, AnonE, ExpectUnlinkedDeclChain),
-            std::make_tuple(AnonE, ExternE, ExpectUnlinkedDeclChain),
-            std::make_tuple(AnonE, AnonE, ExpectUnlinkedDeclChain))) );
-INSTANTIATE_TEST_SUITE_P(
-    ParameterizedTests, ImportScopedEnumsVisibility,
-    ::testing::Combine(
-        DefaultTestValuesForRunOptions,
-        ::testing::Values(
-            std::make_tuple(ExternEC, ExternEC, ExpectLinkedDeclChain),
-            std::make_tuple(ExternEC, AnonEC, ExpectUnlinkedDeclChain),
-            std::make_tuple(AnonEC, ExternEC, ExpectUnlinkedDeclChain),
-            std::make_tuple(AnonEC, AnonEC, ExpectUnlinkedDeclChain))) );
-INSTANTIATE_TEST_SUITE_P(
-    ParameterizedTests, ImportTypedefNameVisibility,
-    ::testing::Combine(
-        DefaultTestValuesForRunOptions,
-        ::testing::Values(
-            std::make_tuple(ExternTypedef, ExternTypedef,
-                            ExpectLinkedDeclChain),
-            std::make_tuple(ExternTypedef, AnonTypedef,
-                            ExpectUnlinkedDeclChain),
-            std::make_tuple(AnonTypedef, ExternTypedef,
-                            ExpectUnlinkedDeclChain),
-            std::make_tuple(AnonTypedef, AnonTypedef, ExpectUnlinkedDeclChain),
-
-            std::make_tuple(ExternUsing, ExternUsing, ExpectLinkedDeclChain),
-            std::make_tuple(ExternUsing, AnonUsing, ExpectUnlinkedDeclChain),
-            std::make_tuple(AnonUsing, ExternUsing, ExpectUnlinkedDeclChain),
-            std::make_tuple(AnonUsing, AnonUsing, ExpectUnlinkedDeclChain),
-
-            std::make_tuple(ExternUsing, ExternTypedef, ExpectLinkedDeclChain),
-            std::make_tuple(ExternUsing, AnonTypedef, ExpectUnlinkedDeclChain),
-            std::make_tuple(AnonUsing, ExternTypedef, ExpectUnlinkedDeclChain),
-            std::make_tuple(AnonUsing, AnonTypedef, ExpectUnlinkedDeclChain),
-
-            std::make_tuple(ExternTypedef, ExternUsing, ExpectLinkedDeclChain),
-            std::make_tuple(ExternTypedef, AnonUsing, ExpectUnlinkedDeclChain),
-            std::make_tuple(AnonTypedef, ExternUsing, ExpectUnlinkedDeclChain),
-            std::make_tuple(AnonTypedef, AnonUsing,
-                            ExpectUnlinkedDeclChain))) );
-INSTANTIATE_TEST_SUITE_P(
-    ParameterizedTests, ImportFunctionTemplatesVisibility,
-    ::testing::Combine(
-        DefaultTestValuesForRunOptions,
-        ::testing::Values(
-            std::make_tuple(ExternFT, ExternFT, ExpectLinkedDeclChain),
-            std::make_tuple(ExternFT, StaticFT, ExpectUnlinkedDeclChain),
-            std::make_tuple(ExternFT, AnonFT, ExpectUnlinkedDeclChain),
-            std::make_tuple(StaticFT, ExternFT, ExpectUnlinkedDeclChain),
-            std::make_tuple(StaticFT, StaticFT, ExpectUnlinkedDeclChain),
-            std::make_tuple(StaticFT, AnonFT, ExpectUnlinkedDeclChain),
-            std::make_tuple(AnonFT, ExternFT, ExpectUnlinkedDeclChain),
-            std::make_tuple(AnonFT, StaticFT, ExpectUnlinkedDeclChain),
-            std::make_tuple(AnonFT, AnonFT, ExpectUnlinkedDeclChain))) );
-INSTANTIATE_TEST_SUITE_P(
-    ParameterizedTests, ImportVariableTemplatesVisibility,
-    ::testing::Combine(
-        DefaultTestValuesForRunOptions,
-        ::testing::Values(
-            std::make_tuple(ExternVT, ExternVT, ExpectLinkedDeclChain),
-            std::make_tuple(ExternVT, StaticVT, ExpectUnlinkedDeclChain),
-            std::make_tuple(ExternVT, AnonVT, ExpectUnlinkedDeclChain),
-            std::make_tuple(StaticVT, ExternVT, ExpectUnlinkedDeclChain),
-            std::make_tuple(StaticVT, StaticVT, ExpectUnlinkedDeclChain),
-            std::make_tuple(StaticVT, AnonVT, ExpectUnlinkedDeclChain),
-            std::make_tuple(AnonVT, ExternVT, ExpectUnlinkedDeclChain),
-            std::make_tuple(AnonVT, StaticVT, ExpectUnlinkedDeclChain),
-            std::make_tuple(AnonVT, AnonVT, ExpectUnlinkedDeclChain))) );
-INSTANTIATE_TEST_SUITE_P(
-    ParameterizedTests, ImportClassTemplatesVisibility,
-    ::testing::Combine(
-        DefaultTestValuesForRunOptions,
-        ::testing::Values(std::make_tuple(ExternCT, ExternCT, ExpectLinkedDeclChain),
-                          std::make_tuple(ExternCT, AnonCT, ExpectUnlinkedDeclChain),
-                          std::make_tuple(AnonCT, ExternCT, ExpectUnlinkedDeclChain),
-                          std::make_tuple(AnonCT, AnonCT, ExpectUnlinkedDeclChain))) );
-} // end namespace ast_matchers
-} // end namespace clang
diff --git a/gnu/llvm/clang/unittests/AST/ASTPrint.h b/gnu/llvm/clang/unittests/AST/ASTPrint.h
deleted file mode 100644
index 58364499bcd..00000000000
--- a/gnu/llvm/clang/unittests/AST/ASTPrint.h
+++ /dev/null
@@ -1,115 +0,0 @@
-//===- unittests/AST/ASTPrint.h ------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// Helpers to simplify testing of printing of AST constructs provided in the/
-// form of the source code.
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/AST/ASTContext.h"
-#include "clang/ASTMatchers/ASTMatchFinder.h"
-#include "clang/Tooling/Tooling.h"
-#include "llvm/ADT/SmallString.h"
-#include "gtest/gtest.h"
-
-namespace clang {
-
-using PrintingPolicyAdjuster = llvm::function_ref<void(PrintingPolicy &Policy)>;
-
-template <typename NodeType>
-using NodePrinter =
-    std::function<void(llvm::raw_ostream &Out, const ASTContext *Context,
-                       const NodeType *Node,
-                       PrintingPolicyAdjuster PolicyAdjuster)>;
-
-template <typename NodeType>
-using NodeFilter = std::function<bool(const NodeType *Node)>;
-
-template <typename NodeType>
-class PrintMatch : public ast_matchers::MatchFinder::MatchCallback {
-  using PrinterT = NodePrinter<NodeType>;
-  using FilterT = NodeFilter<NodeType>;
-
-  SmallString<1024> Printed;
-  unsigned NumFoundNodes;
-  PrinterT Printer;
-  FilterT Filter;
-  PrintingPolicyAdjuster PolicyAdjuster;
-
-public:
-  PrintMatch(PrinterT Printer, PrintingPolicyAdjuster PolicyAdjuster,
-             FilterT Filter)
-      : NumFoundNodes(0), Printer(std::move(Printer)),
-        Filter(std::move(Filter)), PolicyAdjuster(PolicyAdjuster) {}
-
-  void run(const ast_matchers::MatchFinder::MatchResult &Result) override {
-    const NodeType *N = Result.Nodes.getNodeAs<NodeType>("id");
-    if (!N || !Filter(N))
-      return;
-    NumFoundNodes++;
-    if (NumFoundNodes > 1)
-      return;
-
-    llvm::raw_svector_ostream Out(Printed);
-    Printer(Out, Result.Context, N, PolicyAdjuster);
-  }
-
-  StringRef getPrinted() const { return Printed; }
-
-  unsigned getNumFoundNodes() const { return NumFoundNodes; }
-};
-
-template <typename NodeType> bool NoNodeFilter(const NodeType *) {
-  return true;
-}
-
-template <typename NodeType, typename Matcher>
-::testing::AssertionResult
-PrintedNodeMatches(StringRef Code, const std::vector<std::string> &Args,
-                   const Matcher &NodeMatch, StringRef ExpectedPrinted,
-                   StringRef FileName, NodePrinter<NodeType> Printer,
-                   PrintingPolicyAdjuster PolicyAdjuster = nullptr,
-                   bool AllowError = false,
-                   // Would like to use a lambda for the default value, but that
-                   // trips gcc 7 up.
-                   NodeFilter<NodeType> Filter = &NoNodeFilter<NodeType>) {
-
-  PrintMatch<NodeType> Callback(Printer, PolicyAdjuster, Filter);
-  ast_matchers::MatchFinder Finder;
-  Finder.addMatcher(NodeMatch, &Callback);
-  std::unique_ptr<tooling::FrontendActionFactory> Factory(
-      tooling::newFrontendActionFactory(&Finder));
-
-  bool ToolResult;
-  if (FileName.empty()) {
-    ToolResult = tooling::runToolOnCodeWithArgs(Factory->create(), Code, Args);
-  } else {
-    ToolResult =
-        tooling::runToolOnCodeWithArgs(Factory->create(), Code, Args, FileName);
-  }
-  if (!ToolResult && !AllowError)
-    return testing::AssertionFailure()
-           << "Parsing error in \"" << Code.str() << "\"";
-
-  if (Callback.getNumFoundNodes() == 0)
-    return testing::AssertionFailure() << "Matcher didn't find any nodes";
-
-  if (Callback.getNumFoundNodes() > 1)
-    return testing::AssertionFailure()
-           << "Matcher should match only one node (found "
-           << Callback.getNumFoundNodes() << ")";
-
-  if (Callback.getPrinted() != ExpectedPrinted)
-    return ::testing::AssertionFailure()
-           << "Expected \"" << ExpectedPrinted.str() << "\", got \""
-           << Callback.getPrinted().str() << "\"";
-
-  return ::testing::AssertionSuccess();
-}
-
-} // namespace clang
diff --git a/gnu/llvm/clang/unittests/AST/ASTTraverserTest.cpp b/gnu/llvm/clang/unittests/AST/ASTTraverserTest.cpp
deleted file mode 100644
index d633f90b57d..00000000000
--- a/gnu/llvm/clang/unittests/AST/ASTTraverserTest.cpp
+++ /dev/null
@@ -1,1845 +0,0 @@
-//===- unittests/AST/ASTTraverserTest.h------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/AST/ASTContext.h"
-#include "clang/AST/ASTNodeTraverser.h"
-#include "clang/AST/TextNodeDumper.h"
-#include "clang/ASTMatchers/ASTMatchFinder.h"
-#include "clang/ASTMatchers/ASTMatchers.h"
-#include "clang/Tooling/Tooling.h"
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-
-using namespace clang::tooling;
-using namespace clang::ast_matchers;
-
-namespace clang {
-
-class NodeTreePrinter : public TextTreeStructure {
-  llvm::raw_ostream &OS;
-
-public:
-  NodeTreePrinter(llvm::raw_ostream &OS)
-      : TextTreeStructure(OS, /* showColors */ false), OS(OS) {}
-
-  void Visit(const Decl *D) {
-    OS << D->getDeclKindName() << "Decl";
-    if (auto *ND = dyn_cast<NamedDecl>(D)) {
-      OS << " '" << ND->getDeclName() << "'";
-    }
-  }
-
-  void Visit(const Stmt *S) {
-    if (!S) {
-      OS << "<<<NULL>>>";
-      return;
-    }
-    OS << S->getStmtClassName();
-    if (auto *E = dyn_cast<DeclRefExpr>(S)) {
-      OS << " '" << E->getDecl()->getDeclName() << "'";
-    }
-  }
-
-  void Visit(QualType QT) {
-    OS << "QualType " << QT.split().Quals.getAsString();
-  }
-
-  void Visit(const Type *T) { OS << T->getTypeClassName() << "Type"; }
-
-  void Visit(const comments::Comment *C, const comments::FullComment *FC) {
-    OS << C->getCommentKindName();
-  }
-
-  void Visit(const CXXCtorInitializer *Init) {
-    OS << "CXXCtorInitializer";
-    if (const auto *F = Init->getAnyMember()) {
-      OS << " '" << F->getNameAsString() << "'";
-    } else if (auto const *TSI = Init->getTypeSourceInfo()) {
-      OS << " '" << TSI->getType().getAsString() << "'";
-    }
-  }
-
-  void Visit(const Attr *A) {
-    switch (A->getKind()) {
-#define ATTR(X)                                                                \
-  case attr::X:                                                                \
-    OS << #X;                                                                  \
-    break;
-#include "clang/Basic/AttrList.inc"
-    }
-    OS << "Attr";
-  }
-
-  void Visit(const OMPClause *C) { OS << "OMPClause"; }
-  void Visit(const TemplateArgument &A, SourceRange R = {},
-             const Decl *From = nullptr, const char *Label = nullptr) {
-    OS << "TemplateArgument";
-    switch (A.getKind()) {
-    case TemplateArgument::Type: {
-      OS << " type " << A.getAsType().getAsString();
-      break;
-    }
-    default:
-      break;
-    }
-  }
-
-  template <typename... T> void Visit(T...) {}
-};
-
-class TestASTDumper : public ASTNodeTraverser<TestASTDumper, NodeTreePrinter> {
-
-  NodeTreePrinter MyNodeRecorder;
-
-public:
-  TestASTDumper(llvm::raw_ostream &OS) : MyNodeRecorder(OS) {}
-  NodeTreePrinter &doGetNodeDelegate() { return MyNodeRecorder; }
-};
-
-template <typename... NodeType> std::string dumpASTString(NodeType &&... N) {
-  std::string Buffer;
-  llvm::raw_string_ostream OS(Buffer);
-
-  TestASTDumper Dumper(OS);
-
-  OS << "\n";
-
-  Dumper.Visit(std::forward<NodeType &&>(N)...);
-
-  return OS.str();
-}
-
-template <typename... NodeType>
-std::string dumpASTString(TraversalKind TK, NodeType &&... N) {
-  std::string Buffer;
-  llvm::raw_string_ostream OS(Buffer);
-
-  TestASTDumper Dumper(OS);
-  Dumper.SetTraversalKind(TK);
-
-  OS << "\n";
-
-  Dumper.Visit(std::forward<NodeType &&>(N)...);
-
-  return OS.str();
-}
-
-const FunctionDecl *getFunctionNode(clang::ASTUnit *AST,
-                                    const std::string &Name) {
-  auto Result = ast_matchers::match(functionDecl(hasName(Name)).bind("fn"),
-                                    AST->getASTContext());
-  EXPECT_EQ(Result.size(), 1u);
-  return Result[0].getNodeAs<FunctionDecl>("fn");
-}
-
-template <typename T> struct Verifier {
-  static void withDynNode(T Node, const std::string &DumpString) {
-    EXPECT_EQ(dumpASTString(DynTypedNode::create(Node)), DumpString);
-  }
-};
-
-template <typename T> struct Verifier<T *> {
-  static void withDynNode(T *Node, const std::string &DumpString) {
-    EXPECT_EQ(dumpASTString(DynTypedNode::create(*Node)), DumpString);
-  }
-};
-
-template <typename T>
-void verifyWithDynNode(T Node, const std::string &DumpString) {
-  EXPECT_EQ(dumpASTString(Node), DumpString);
-
-  Verifier<T>::withDynNode(Node, DumpString);
-}
-
-TEST(Traverse, Dump) {
-
-  auto AST = buildASTFromCode(R"cpp(
-struct A {
-  int m_number;
-
-  /// CTor
-  A() : m_number(42) {}
-
-  [[nodiscard]] const int func() {
-    return 42;
-  }
-
-};
-
-template<typename T>
-struct templ
-{
-};
-
-template<>
-struct templ<int>
-{
-};
-
-void parmvardecl_attr(struct A __attribute__((address_space(19)))*);
-
-)cpp");
-
-  const FunctionDecl *Func = getFunctionNode(AST.get(), "func");
-
-  verifyWithDynNode(Func,
-                    R"cpp(
-CXXMethodDecl 'func'
-|-CompoundStmt
-| `-ReturnStmt
-|   `-IntegerLiteral
-`-WarnUnusedResultAttr
-)cpp");
-
-  Stmt *Body = Func->getBody();
-
-  verifyWithDynNode(Body,
-                    R"cpp(
-CompoundStmt
-`-ReturnStmt
-  `-IntegerLiteral
-)cpp");
-
-  QualType QT = Func->getType();
-
-  verifyWithDynNode(QT,
-                    R"cpp(
-FunctionProtoType
-`-QualType const
-  `-BuiltinType
-)cpp");
-
-  const FunctionDecl *CTorFunc = getFunctionNode(AST.get(), "A");
-
-  verifyWithDynNode(CTorFunc->getType(),
-                    R"cpp(
-FunctionProtoType
-`-BuiltinType
-)cpp");
-
-  Attr *A = *Func->attr_begin();
-
-  {
-    std::string expectedString = R"cpp(
-WarnUnusedResultAttr
-)cpp";
-
-    EXPECT_EQ(dumpASTString(A), expectedString);
-  }
-
-  auto *CTor = dyn_cast<CXXConstructorDecl>(CTorFunc);
-  const CXXCtorInitializer *Init = *CTor->init_begin();
-
-  verifyWithDynNode(Init,
-                    R"cpp(
-CXXCtorInitializer 'm_number'
-`-IntegerLiteral
-)cpp");
-
-  const comments::FullComment *Comment =
-      AST->getASTContext().getLocalCommentForDeclUncached(CTorFunc);
-  {
-    std::string expectedString = R"cpp(
-FullComment
-`-ParagraphComment
-  `-TextComment
-)cpp";
-    EXPECT_EQ(dumpASTString(Comment, Comment), expectedString);
-  }
-
-  auto Result = ast_matchers::match(
-      classTemplateSpecializationDecl(hasName("templ")).bind("fn"),
-      AST->getASTContext());
-  EXPECT_EQ(Result.size(), 1u);
-  auto Templ = Result[0].getNodeAs<ClassTemplateSpecializationDecl>("fn");
-
-  TemplateArgument TA = Templ->getTemplateArgs()[0];
-
-  verifyWithDynNode(TA,
-                    R"cpp(
-TemplateArgument type int
-`-BuiltinType
-)cpp");
-
-  Func = getFunctionNode(AST.get(), "parmvardecl_attr");
-
-  const auto *Parm = Func->getParamDecl(0);
-  const auto TL = Parm->getTypeSourceInfo()->getTypeLoc();
-  ASSERT_TRUE(TL.getType()->isPointerType());
-
-  const auto ATL = TL.getNextTypeLoc().getAs<AttributedTypeLoc>();
-  const auto *AS = cast<AddressSpaceAttr>(ATL.getAttr());
-  EXPECT_EQ(toTargetAddressSpace(static_cast<LangAS>(AS->getAddressSpace())),
-            19u);
-}
-
-TEST(Traverse, IgnoreUnlessSpelledInSourceVars) {
-
-  auto AST = buildASTFromCode(R"cpp(
-
-struct String
-{
-    String(const char*, int = -1) {}
-
-    int overloaded() const;
-    int& overloaded();
-};
-
-void stringConstruct()
-{
-    String s = "foo";
-    s = "bar";
-}
-
-void overloadCall()
-{
-   String s = "foo";
-   (s).overloaded();
-}
-
-struct C1 {};
-struct C2 { operator C1(); };
-
-void conversionOperator()
-{
-    C2* c2;
-    C1 c1 = (*c2);
-}
-
-template <unsigned alignment>
-void template_test() {
-  static_assert(alignment, "");
-}
-void actual_template_test() {
-  template_test<4>();
-}
-
-struct OneParamCtor {
-  explicit OneParamCtor(int);
-};
-struct TwoParamCtor {
-  explicit TwoParamCtor(int, int);
-};
-
-void varDeclCtors() {
-  {
-  auto var1 = OneParamCtor(5);
-  auto var2 = TwoParamCtor(6, 7);
-  }
-  {
-  OneParamCtor var3(5);
-  TwoParamCtor var4(6, 7);
-  }
-  int i = 0;
-  {
-  auto var5 = OneParamCtor(i);
-  auto var6 = TwoParamCtor(i, 7);
-  }
-  {
-  OneParamCtor var7(i);
-  TwoParamCtor var8(i, 7);
-  }
-}
-
-)cpp");
-
-  {
-    auto FN =
-        ast_matchers::match(functionDecl(hasName("stringConstruct")).bind("fn"),
-                            AST->getASTContext());
-    EXPECT_EQ(FN.size(), 1u);
-
-    EXPECT_EQ(dumpASTString(TK_AsIs, FN[0].getNodeAs<Decl>("fn")),
-              R"cpp(
-FunctionDecl 'stringConstruct'
-`-CompoundStmt
-  |-DeclStmt
-  | `-VarDecl 's'
-  |   `-ExprWithCleanups
-  |     `-CXXConstructExpr
-  |       `-MaterializeTemporaryExpr
-  |         `-ImplicitCastExpr
-  |           `-CXXConstructExpr
-  |             |-ImplicitCastExpr
-  |             | `-StringLiteral
-  |             `-CXXDefaultArgExpr
-  `-ExprWithCleanups
-    `-CXXOperatorCallExpr
-      |-ImplicitCastExpr
-      | `-DeclRefExpr 'operator='
-      |-DeclRefExpr 's'
-      `-MaterializeTemporaryExpr
-        `-CXXConstructExpr
-          |-ImplicitCastExpr
-          | `-StringLiteral
-          `-CXXDefaultArgExpr
-)cpp");
-
-    EXPECT_EQ(dumpASTString(TK_IgnoreUnlessSpelledInSource,
-                            FN[0].getNodeAs<Decl>("fn")),
-              R"cpp(
-FunctionDecl 'stringConstruct'
-`-CompoundStmt
-  |-DeclStmt
-  | `-VarDecl 's'
-  |   `-StringLiteral
-  `-CXXOperatorCallExpr
-    |-DeclRefExpr 'operator='
-    |-DeclRefExpr 's'
-    `-StringLiteral
-)cpp");
-  }
-
-  {
-    auto FN =
-        ast_matchers::match(functionDecl(hasName("overloadCall")).bind("fn"),
-                            AST->getASTContext());
-    EXPECT_EQ(FN.size(), 1u);
-
-    EXPECT_EQ(dumpASTString(TK_AsIs, FN[0].getNodeAs<Decl>("fn")),
-              R"cpp(
-FunctionDecl 'overloadCall'
-`-CompoundStmt
-  |-DeclStmt
-  | `-VarDecl 's'
-  |   `-ExprWithCleanups
-  |     `-CXXConstructExpr
-  |       `-MaterializeTemporaryExpr
-  |         `-ImplicitCastExpr
-  |           `-CXXConstructExpr
-  |             |-ImplicitCastExpr
-  |             | `-StringLiteral
-  |             `-CXXDefaultArgExpr
-  `-CXXMemberCallExpr
-    `-MemberExpr
-      `-ParenExpr
-        `-DeclRefExpr 's'
-)cpp");
-
-    EXPECT_EQ(dumpASTString(TK_IgnoreUnlessSpelledInSource,
-                            FN[0].getNodeAs<Decl>("fn")),
-              R"cpp(
-FunctionDecl 'overloadCall'
-`-CompoundStmt
-  |-DeclStmt
-  | `-VarDecl 's'
-  |   `-StringLiteral
-  `-CXXMemberCallExpr
-    `-MemberExpr
-      `-DeclRefExpr 's'
-)cpp");
-  }
-
-  {
-    auto FN = ast_matchers::match(
-        functionDecl(hasName("conversionOperator"),
-                     hasDescendant(varDecl(hasName("c1")).bind("var"))),
-        AST->getASTContext());
-    EXPECT_EQ(FN.size(), 1u);
-
-    EXPECT_EQ(dumpASTString(TK_AsIs, FN[0].getNodeAs<Decl>("var")),
-              R"cpp(
-VarDecl 'c1'
-`-ExprWithCleanups
-  `-CXXConstructExpr
-    `-MaterializeTemporaryExpr
-      `-ImplicitCastExpr
-        `-CXXMemberCallExpr
-          `-MemberExpr
-            `-ParenExpr
-              `-UnaryOperator
-                `-ImplicitCastExpr
-                  `-DeclRefExpr 'c2'
-)cpp");
-
-    EXPECT_EQ(dumpASTString(TK_IgnoreUnlessSpelledInSource,
-                            FN[0].getNodeAs<Decl>("var")),
-              R"cpp(
-VarDecl 'c1'
-`-UnaryOperator
-  `-DeclRefExpr 'c2'
-)cpp");
-  }
-
-  {
-    auto FN = ast_matchers::match(
-        functionDecl(hasName("template_test"),
-                     hasDescendant(staticAssertDecl().bind("staticAssert"))),
-        AST->getASTContext());
-    EXPECT_EQ(FN.size(), 2u);
-
-    EXPECT_EQ(dumpASTString(TK_AsIs, FN[1].getNodeAs<Decl>("staticAssert")),
-              R"cpp(
-StaticAssertDecl
-|-ImplicitCastExpr
-| `-SubstNonTypeTemplateParmExpr
-|   |-NonTypeTemplateParmDecl 'alignment'
-|   `-IntegerLiteral
-`-StringLiteral
-)cpp");
-
-    EXPECT_EQ(dumpASTString(TK_IgnoreUnlessSpelledInSource,
-                            FN[1].getNodeAs<Decl>("staticAssert")),
-              R"cpp(
-StaticAssertDecl
-|-IntegerLiteral
-`-StringLiteral
-)cpp");
-  }
-
-  auto varChecker = [&AST](StringRef varName, StringRef SemanticDump,
-                           StringRef SyntacticDump) {
-    auto FN = ast_matchers::match(
-        functionDecl(
-            hasName("varDeclCtors"),
-            forEachDescendant(varDecl(hasName(varName)).bind("varDeclCtor"))),
-        AST->getASTContext());
-    EXPECT_EQ(FN.size(), 1u);
-
-    EXPECT_EQ(dumpASTString(TK_AsIs, FN[0].getNodeAs<Decl>("varDeclCtor")),
-              SemanticDump);
-
-    EXPECT_EQ(dumpASTString(TK_IgnoreUnlessSpelledInSource,
-                            FN[0].getNodeAs<Decl>("varDeclCtor")),
-              SyntacticDump);
-  };
-
-  varChecker("var1",
-             R"cpp(
-VarDecl 'var1'
-`-ExprWithCleanups
-  `-CXXConstructExpr
-    `-MaterializeTemporaryExpr
-      `-CXXFunctionalCastExpr
-        `-CXXConstructExpr
-          `-IntegerLiteral
-)cpp",
-             R"cpp(
-VarDecl 'var1'
-`-CXXConstructExpr
-  `-IntegerLiteral
-)cpp");
-
-  varChecker("var2",
-             R"cpp(
-VarDecl 'var2'
-`-ExprWithCleanups
-  `-CXXConstructExpr
-    `-MaterializeTemporaryExpr
-      `-CXXTemporaryObjectExpr
-        |-IntegerLiteral
-        `-IntegerLiteral
-)cpp",
-             R"cpp(
-VarDecl 'var2'
-`-CXXTemporaryObjectExpr
-  |-IntegerLiteral
-  `-IntegerLiteral
-)cpp");
-
-  varChecker("var3",
-             R"cpp(
-VarDecl 'var3'
-`-CXXConstructExpr
-  `-IntegerLiteral
-)cpp",
-             R"cpp(
-VarDecl 'var3'
-`-CXXConstructExpr
-  `-IntegerLiteral
-)cpp");
-
-  varChecker("var4",
-             R"cpp(
-VarDecl 'var4'
-`-CXXConstructExpr
-  |-IntegerLiteral
-  `-IntegerLiteral
-)cpp",
-             R"cpp(
-VarDecl 'var4'
-`-CXXConstructExpr
-  |-IntegerLiteral
-  `-IntegerLiteral
-)cpp");
-
-  varChecker("var5",
-             R"cpp(
-VarDecl 'var5'
-`-ExprWithCleanups
-  `-CXXConstructExpr
-    `-MaterializeTemporaryExpr
-      `-CXXFunctionalCastExpr
-        `-CXXConstructExpr
-          `-ImplicitCastExpr
-            `-DeclRefExpr 'i'
-)cpp",
-             R"cpp(
-VarDecl 'var5'
-`-CXXConstructExpr
-  `-DeclRefExpr 'i'
-)cpp");
-
-  varChecker("var6",
-             R"cpp(
-VarDecl 'var6'
-`-ExprWithCleanups
-  `-CXXConstructExpr
-    `-MaterializeTemporaryExpr
-      `-CXXTemporaryObjectExpr
-        |-ImplicitCastExpr
-        | `-DeclRefExpr 'i'
-        `-IntegerLiteral
-)cpp",
-             R"cpp(
-VarDecl 'var6'
-`-CXXTemporaryObjectExpr
-  |-DeclRefExpr 'i'
-  `-IntegerLiteral
-)cpp");
-
-  varChecker("var7",
-             R"cpp(
-VarDecl 'var7'
-`-CXXConstructExpr
-  `-ImplicitCastExpr
-    `-DeclRefExpr 'i'
-)cpp",
-             R"cpp(
-VarDecl 'var7'
-`-CXXConstructExpr
-  `-DeclRefExpr 'i'
-)cpp");
-
-  varChecker("var8",
-             R"cpp(
-VarDecl 'var8'
-`-CXXConstructExpr
-  |-ImplicitCastExpr
-  | `-DeclRefExpr 'i'
-  `-IntegerLiteral
-)cpp",
-             R"cpp(
-VarDecl 'var8'
-`-CXXConstructExpr
-  |-DeclRefExpr 'i'
-  `-IntegerLiteral
-)cpp");
-}
-
-TEST(Traverse, IgnoreUnlessSpelledInSourceStructs) {
-  auto AST = buildASTFromCode(R"cpp(
-
-struct MyStruct {
-  MyStruct();
-  MyStruct(int i) {
-    MyStruct();
-  }
-  ~MyStruct();
-};
-
-)cpp");
-
-  auto BN = ast_matchers::match(
-      cxxConstructorDecl(hasName("MyStruct"),
-                         hasParameter(0, parmVarDecl(hasType(isInteger()))))
-          .bind("ctor"),
-      AST->getASTContext());
-  EXPECT_EQ(BN.size(), 1u);
-
-  EXPECT_EQ(dumpASTString(TK_IgnoreUnlessSpelledInSource,
-                          BN[0].getNodeAs<Decl>("ctor")),
-            R"cpp(
-CXXConstructorDecl 'MyStruct'
-|-ParmVarDecl 'i'
-`-CompoundStmt
-  `-CXXTemporaryObjectExpr
-)cpp");
-
-  EXPECT_EQ(dumpASTString(TK_AsIs, BN[0].getNodeAs<Decl>("ctor")),
-            R"cpp(
-CXXConstructorDecl 'MyStruct'
-|-ParmVarDecl 'i'
-`-CompoundStmt
-  `-ExprWithCleanups
-    `-CXXBindTemporaryExpr
-      `-CXXTemporaryObjectExpr
-)cpp");
-}
-
-TEST(Traverse, IgnoreUnlessSpelledInSourceReturnStruct) {
-
-  auto AST = buildASTFromCode(R"cpp(
-struct Retval {
-  Retval() {}
-  ~Retval() {}
-};
-
-Retval someFun();
-
-void foo()
-{
-    someFun();
-}
-)cpp");
-
-  auto BN = ast_matchers::match(functionDecl(hasName("foo")).bind("fn"),
-                                AST->getASTContext());
-  EXPECT_EQ(BN.size(), 1u);
-
-  EXPECT_EQ(dumpASTString(TK_IgnoreUnlessSpelledInSource,
-                          BN[0].getNodeAs<Decl>("fn")),
-            R"cpp(
-FunctionDecl 'foo'
-`-CompoundStmt
-  `-CallExpr
-    `-DeclRefExpr 'someFun'
-)cpp");
-
-  EXPECT_EQ(dumpASTString(TK_AsIs, BN[0].getNodeAs<Decl>("fn")),
-            R"cpp(
-FunctionDecl 'foo'
-`-CompoundStmt
-  `-ExprWithCleanups
-    `-CXXBindTemporaryExpr
-      `-CallExpr
-        `-ImplicitCastExpr
-          `-DeclRefExpr 'someFun'
-)cpp");
-}
-
-TEST(Traverse, IgnoreUnlessSpelledInSourceReturns) {
-
-  auto AST = buildASTFromCode(R"cpp(
-
-struct A
-{
-};
-
-struct B
-{
-  B(int);
-  B(A const& a);
-  B();
-};
-
-struct C
-{
-  operator B();
-};
-
-B func1() {
-  return 42;
-}
-
-B func2() {
-  return B{42};
-}
-
-B func3() {
-  return B(42);
-}
-
-B func4() {
-  return B();
-}
-
-B func5() {
-  return B{};
-}
-
-B func6() {
-  return C();
-}
-
-B func7() {
-  return A();
-}
-
-B func8() {
-  return C{};
-}
-
-B func9() {
-  return A{};
-}
-
-B func10() {
-  A a;
-  return a;
-}
-
-B func11() {
-  B b;
-  return b;
-}
-
-B func12() {
-  C c;
-  return c;
-}
-
-)cpp");
-
-  auto getFunctionNode = [&AST](const std::string &name) {
-    auto BN = ast_matchers::match(functionDecl(hasName(name)).bind("fn"),
-                                  AST->getASTContext());
-    EXPECT_EQ(BN.size(), 1u);
-    return BN[0].getNodeAs<Decl>("fn");
-  };
-
-  {
-    auto FN = getFunctionNode("func1");
-    llvm::StringRef Expected = R"cpp(
-FunctionDecl 'func1'
-`-CompoundStmt
-  `-ReturnStmt
-    `-ExprWithCleanups
-      `-CXXConstructExpr
-        `-MaterializeTemporaryExpr
-          `-ImplicitCastExpr
-            `-CXXConstructExpr
-              `-IntegerLiteral
-)cpp";
-
-    EXPECT_EQ(dumpASTString(TK_AsIs, FN), Expected);
-
-    Expected = R"cpp(
-FunctionDecl 'func1'
-`-CompoundStmt
-  `-ReturnStmt
-    `-IntegerLiteral
-)cpp";
-    EXPECT_EQ(dumpASTString(TK_IgnoreUnlessSpelledInSource, FN), Expected);
-  }
-
-  llvm::StringRef Expected = R"cpp(
-FunctionDecl 'func2'
-`-CompoundStmt
-  `-ReturnStmt
-    `-CXXTemporaryObjectExpr
-      `-IntegerLiteral
-)cpp";
-  EXPECT_EQ(
-      dumpASTString(TK_IgnoreUnlessSpelledInSource, getFunctionNode("func2")),
-      Expected);
-
-  Expected = R"cpp(
-FunctionDecl 'func3'
-`-CompoundStmt
-  `-ReturnStmt
-    `-CXXConstructExpr
-      `-IntegerLiteral
-)cpp";
-  EXPECT_EQ(
-      dumpASTString(TK_IgnoreUnlessSpelledInSource, getFunctionNode("func3")),
-      Expected);
-
-  Expected = R"cpp(
-FunctionDecl 'func4'
-`-CompoundStmt
-  `-ReturnStmt
-    `-CXXTemporaryObjectExpr
-)cpp";
-  EXPECT_EQ(
-      dumpASTString(TK_IgnoreUnlessSpelledInSource, getFunctionNode("func4")),
-      Expected);
-
-  Expected = R"cpp(
-FunctionDecl 'func5'
-`-CompoundStmt
-  `-ReturnStmt
-    `-CXXTemporaryObjectExpr
-)cpp";
-  EXPECT_EQ(
-      dumpASTString(TK_IgnoreUnlessSpelledInSource, getFunctionNode("func5")),
-      Expected);
-
-  Expected = R"cpp(
-FunctionDecl 'func6'
-`-CompoundStmt
-  `-ReturnStmt
-    `-CXXTemporaryObjectExpr
-)cpp";
-  EXPECT_EQ(
-      dumpASTString(TK_IgnoreUnlessSpelledInSource, getFunctionNode("func6")),
-      Expected);
-
-  Expected = R"cpp(
-FunctionDecl 'func7'
-`-CompoundStmt
-  `-ReturnStmt
-    `-CXXTemporaryObjectExpr
-)cpp";
-  EXPECT_EQ(
-      dumpASTString(TK_IgnoreUnlessSpelledInSource, getFunctionNode("func7")),
-      Expected);
-
-  Expected = R"cpp(
-FunctionDecl 'func8'
-`-CompoundStmt
-  `-ReturnStmt
-    `-CXXFunctionalCastExpr
-      `-InitListExpr
-)cpp";
-  EXPECT_EQ(
-      dumpASTString(TK_IgnoreUnlessSpelledInSource, getFunctionNode("func8")),
-      Expected);
-
-  Expected = R"cpp(
-FunctionDecl 'func9'
-`-CompoundStmt
-  `-ReturnStmt
-    `-CXXFunctionalCastExpr
-      `-InitListExpr
-)cpp";
-  EXPECT_EQ(
-      dumpASTString(TK_IgnoreUnlessSpelledInSource, getFunctionNode("func9")),
-      Expected);
-
-  Expected = R"cpp(
-FunctionDecl 'func10'
-`-CompoundStmt
-  |-DeclStmt
-  | `-VarDecl 'a'
-  |   `-CXXConstructExpr
-  `-ReturnStmt
-    `-DeclRefExpr 'a'
-)cpp";
-  EXPECT_EQ(
-      dumpASTString(TK_IgnoreUnlessSpelledInSource, getFunctionNode("func10")),
-      Expected);
-
-  Expected = R"cpp(
-FunctionDecl 'func11'
-`-CompoundStmt
-  |-DeclStmt
-  | `-VarDecl 'b'
-  |   `-CXXConstructExpr
-  `-ReturnStmt
-    `-DeclRefExpr 'b'
-)cpp";
-  EXPECT_EQ(
-      dumpASTString(TK_IgnoreUnlessSpelledInSource, getFunctionNode("func11")),
-      Expected);
-
-  Expected = R"cpp(
-FunctionDecl 'func12'
-`-CompoundStmt
-  |-DeclStmt
-  | `-VarDecl 'c'
-  |   `-CXXConstructExpr
-  `-ReturnStmt
-    `-DeclRefExpr 'c'
-)cpp";
-  EXPECT_EQ(
-      dumpASTString(TK_IgnoreUnlessSpelledInSource, getFunctionNode("func12")),
-      Expected);
-}
-
-TEST(Traverse, LambdaUnlessSpelledInSource) {
-
-  auto AST =
-      buildASTFromCodeWithArgs(R"cpp(
-
-void captures() {
-  int a = 0;
-  int b = 0;
-  int d = 0;
-  int f = 0;
-
-  [a, &b, c = d, &e = f](int g, int h = 42) {};
-}
-
-void templated() {
-  int a = 0;
-  [a]<typename T>(T t) {};
-}
-
-struct SomeStruct {
-    int a = 0;
-    void capture_this() {
-        [this]() {};
-    }
-    void capture_this_copy() {
-        [self = *this]() {};
-    }
-};
-)cpp",
-                               {"-Wno-unused-value", "-Wno-c++2a-extensions"});
-
-  auto getLambdaNode = [&AST](const std::string &name) {
-    auto BN = ast_matchers::match(
-        lambdaExpr(hasAncestor(functionDecl(hasName(name)))).bind("lambda"),
-        AST->getASTContext());
-    EXPECT_EQ(BN.size(), 1u);
-    return BN[0].getNodeAs<LambdaExpr>("lambda");
-  };
-
-  {
-    auto L = getLambdaNode("captures");
-
-    llvm::StringRef Expected = R"cpp(
-LambdaExpr
-|-DeclRefExpr 'a'
-|-DeclRefExpr 'b'
-|-VarDecl 'c'
-| `-DeclRefExpr 'd'
-|-VarDecl 'e'
-| `-DeclRefExpr 'f'
-|-ParmVarDecl 'g'
-|-ParmVarDecl 'h'
-| `-IntegerLiteral
-`-CompoundStmt
-)cpp";
-    EXPECT_EQ(dumpASTString(TK_IgnoreUnlessSpelledInSource, L), Expected);
-
-    Expected = R"cpp(
-LambdaExpr
-|-CXXRecordDecl ''
-| |-CXXMethodDecl 'operator()'
-| | |-ParmVarDecl 'g'
-| | |-ParmVarDecl 'h'
-| | | `-IntegerLiteral
-| | `-CompoundStmt
-| |-FieldDecl ''
-| |-FieldDecl ''
-| |-FieldDecl ''
-| |-FieldDecl ''
-| `-CXXDestructorDecl '~'
-|-ImplicitCastExpr
-| `-DeclRefExpr 'a'
-|-DeclRefExpr 'b'
-|-ImplicitCastExpr
-| `-DeclRefExpr 'd'
-|-DeclRefExpr 'f'
-`-CompoundStmt
-)cpp";
-    EXPECT_EQ(dumpASTString(TK_AsIs, L), Expected);
-  }
-
-  {
-    auto L = getLambdaNode("templated");
-
-    llvm::StringRef Expected = R"cpp(
-LambdaExpr
-|-DeclRefExpr 'a'
-|-TemplateTypeParmDecl 'T'
-|-ParmVarDecl 't'
-`-CompoundStmt
-)cpp";
-    EXPECT_EQ(dumpASTString(TK_IgnoreUnlessSpelledInSource, L), Expected);
-  }
-
-  {
-    auto L = getLambdaNode("capture_this");
-
-    llvm::StringRef Expected = R"cpp(
-LambdaExpr
-|-CXXThisExpr
-`-CompoundStmt
-)cpp";
-    EXPECT_EQ(dumpASTString(TK_IgnoreUnlessSpelledInSource, L), Expected);
-  }
-
-  {
-    auto L = getLambdaNode("capture_this_copy");
-
-    llvm::StringRef Expected = R"cpp(
-LambdaExpr
-|-VarDecl 'self'
-| `-UnaryOperator
-|   `-CXXThisExpr
-`-CompoundStmt
-)cpp";
-    EXPECT_EQ(dumpASTString(TK_IgnoreUnlessSpelledInSource, L), Expected);
-  }
-}
-
-TEST(Traverse, IgnoreUnlessSpelledInSourceImplicit) {
-  {
-    auto AST = buildASTFromCode(R"cpp(
-int i = 0;
-)cpp");
-    const auto *TUDecl = AST->getASTContext().getTranslationUnitDecl();
-
-    EXPECT_EQ(dumpASTString(TK_IgnoreUnlessSpelledInSource, TUDecl),
-              R"cpp(
-TranslationUnitDecl
-`-VarDecl 'i'
-  `-IntegerLiteral
-)cpp");
-  }
-
-  auto AST2 = buildASTFromCodeWithArgs(R"cpp(
-struct Simple {
-};
-struct Other {
-};
-
-struct Record : Simple, Other {
-  Record() : Simple(), m_i(42) {}
-private:
-  int m_i;
-  int m_i2 = 42;
-  Simple m_s;
-};
-
-struct NonTrivial {
-    NonTrivial() {}
-    NonTrivial(NonTrivial&) {}
-    NonTrivial& operator=(NonTrivial&) { return *this; }
-
-    ~NonTrivial() {}
-};
-
-struct ContainsArray {
-    NonTrivial arr[2];
-    int irr[2];
-    ContainsArray& operator=(ContainsArray &) = default;
-};
-
-void copyIt()
-{
-    ContainsArray ca;
-    ContainsArray ca2;
-    ca2 = ca;
-}
-
-void forLoop()
-{
-    int arr[2];
-    for (auto i : arr)
-    {
-
-    }
-    for (auto& a = arr; auto i : a)
-    {
-
-    }
-}
-
-struct DefaultedAndDeleted {
-  NonTrivial nt;
-  DefaultedAndDeleted() = default;
-  ~DefaultedAndDeleted() = default;
-  DefaultedAndDeleted(DefaultedAndDeleted &) = default;
-  DefaultedAndDeleted& operator=(DefaultedAndDeleted &) = default;
-  DefaultedAndDeleted(DefaultedAndDeleted &&) = delete;
-  DefaultedAndDeleted& operator=(DefaultedAndDeleted &&) = delete;
-};
-
-void copyIt2()
-{
-    DefaultedAndDeleted ca;
-    DefaultedAndDeleted ca2;
-    ca2 = ca;
-}
-
-void hasDefaultArg(int i, int j = 0)
-{
-}
-void callDefaultArg()
-{
-  hasDefaultArg(42);
-}
-
-void decomposition()
-{
-    int arr[3];
-    auto &[f, s, t] = arr;
-
-    f = 42;
-}
-
-)cpp",
-                                       {"-std=c++20"});
-
-  {
-    auto BN = ast_matchers::match(
-        cxxRecordDecl(hasName("Record"), unless(isImplicit())).bind("rec"),
-        AST2->getASTContext());
-    EXPECT_EQ(BN.size(), 1u);
-
-    EXPECT_EQ(dumpASTString(TK_AsIs, BN[0].getNodeAs<Decl>("rec")),
-              R"cpp(
-CXXRecordDecl 'Record'
-|-CXXRecordDecl 'Record'
-|-CXXConstructorDecl 'Record'
-| |-CXXCtorInitializer 'struct Simple'
-| | `-CXXConstructExpr
-| |-CXXCtorInitializer 'struct Other'
-| | `-CXXConstructExpr
-| |-CXXCtorInitializer 'm_i'
-| | `-IntegerLiteral
-| |-CXXCtorInitializer 'm_i2'
-| | `-CXXDefaultInitExpr
-| |-CXXCtorInitializer 'm_s'
-| | `-CXXConstructExpr
-| `-CompoundStmt
-|-AccessSpecDecl
-|-FieldDecl 'm_i'
-|-FieldDecl 'm_i2'
-| `-IntegerLiteral
-`-FieldDecl 'm_s'
-)cpp");
-
-    EXPECT_EQ(dumpASTString(TK_IgnoreUnlessSpelledInSource,
-                            BN[0].getNodeAs<Decl>("rec")),
-              R"cpp(
-CXXRecordDecl 'Record'
-|-CXXConstructorDecl 'Record'
-| |-CXXCtorInitializer 'struct Simple'
-| | `-CXXConstructExpr
-| |-CXXCtorInitializer 'm_i'
-| | `-IntegerLiteral
-| `-CompoundStmt
-|-AccessSpecDecl
-|-FieldDecl 'm_i'
-|-FieldDecl 'm_i2'
-| `-IntegerLiteral
-`-FieldDecl 'm_s'
-)cpp");
-  }
-  {
-    auto BN = ast_matchers::match(
-        cxxRecordDecl(hasName("ContainsArray"), unless(isImplicit()))
-            .bind("rec"),
-        AST2->getASTContext());
-    EXPECT_EQ(BN.size(), 1u);
-
-    EXPECT_EQ(dumpASTString(TK_AsIs, BN[0].getNodeAs<Decl>("rec")),
-              R"cpp(
-CXXRecordDecl 'ContainsArray'
-|-CXXRecordDecl 'ContainsArray'
-|-FieldDecl 'arr'
-|-FieldDecl 'irr'
-|-CXXMethodDecl 'operator='
-| |-ParmVarDecl ''
-| `-CompoundStmt
-|   |-ForStmt
-|   | |-DeclStmt
-|   | | `-VarDecl '__i0'
-|   | |   `-IntegerLiteral
-|   | |-<<<NULL>>>
-|   | |-BinaryOperator
-|   | | |-ImplicitCastExpr
-|   | | | `-DeclRefExpr '__i0'
-|   | | `-IntegerLiteral
-|   | |-UnaryOperator
-|   | | `-DeclRefExpr '__i0'
-|   | `-CXXMemberCallExpr
-|   |   |-MemberExpr
-|   |   | `-ArraySubscriptExpr
-|   |   |   |-ImplicitCastExpr
-|   |   |   | `-MemberExpr
-|   |   |   |   `-CXXThisExpr
-|   |   |   `-ImplicitCastExpr
-|   |   |     `-DeclRefExpr '__i0'
-|   |   `-ArraySubscriptExpr
-|   |     |-ImplicitCastExpr
-|   |     | `-MemberExpr
-|   |     |   `-DeclRefExpr ''
-|   |     `-ImplicitCastExpr
-|   |       `-DeclRefExpr '__i0'
-|   |-CallExpr
-|   | |-ImplicitCastExpr
-|   | | `-DeclRefExpr '__builtin_memcpy'
-|   | |-ImplicitCastExpr
-|   | | `-UnaryOperator
-|   | |   `-MemberExpr
-|   | |     `-CXXThisExpr
-|   | |-ImplicitCastExpr
-|   | | `-UnaryOperator
-|   | |   `-MemberExpr
-|   | |     `-DeclRefExpr ''
-|   | `-IntegerLiteral
-|   `-ReturnStmt
-|     `-UnaryOperator
-|       `-CXXThisExpr
-|-CXXConstructorDecl 'ContainsArray'
-| `-ParmVarDecl ''
-|-CXXDestructorDecl '~ContainsArray'
-| `-CompoundStmt
-`-CXXConstructorDecl 'ContainsArray'
-  |-CXXCtorInitializer 'arr'
-  | `-CXXConstructExpr
-  `-CompoundStmt
-)cpp");
-
-    EXPECT_EQ(dumpASTString(TK_IgnoreUnlessSpelledInSource,
-                            BN[0].getNodeAs<Decl>("rec")),
-              R"cpp(
-CXXRecordDecl 'ContainsArray'
-|-FieldDecl 'arr'
-|-FieldDecl 'irr'
-`-CXXMethodDecl 'operator='
-  `-ParmVarDecl ''
-)cpp");
-  }
-  {
-    auto BN = ast_matchers::match(functionDecl(hasName("forLoop")).bind("func"),
-                                  AST2->getASTContext());
-    EXPECT_EQ(BN.size(), 1u);
-
-    EXPECT_EQ(dumpASTString(TK_AsIs, BN[0].getNodeAs<Decl>("func")),
-              R"cpp(
-FunctionDecl 'forLoop'
-`-CompoundStmt
-  |-DeclStmt
-  | `-VarDecl 'arr'
-  |-CXXForRangeStmt
-  | |-<<<NULL>>>
-  | |-DeclStmt
-  | | `-VarDecl '__range1'
-  | |   `-DeclRefExpr 'arr'
-  | |-DeclStmt
-  | | `-VarDecl '__begin1'
-  | |   `-ImplicitCastExpr
-  | |     `-DeclRefExpr '__range1'
-  | |-DeclStmt
-  | | `-VarDecl '__end1'
-  | |   `-BinaryOperator
-  | |     |-ImplicitCastExpr
-  | |     | `-DeclRefExpr '__range1'
-  | |     `-IntegerLiteral
-  | |-BinaryOperator
-  | | |-ImplicitCastExpr
-  | | | `-DeclRefExpr '__begin1'
-  | | `-ImplicitCastExpr
-  | |   `-DeclRefExpr '__end1'
-  | |-UnaryOperator
-  | | `-DeclRefExpr '__begin1'
-  | |-DeclStmt
-  | | `-VarDecl 'i'
-  | |   `-ImplicitCastExpr
-  | |     `-UnaryOperator
-  | |       `-ImplicitCastExpr
-  | |         `-DeclRefExpr '__begin1'
-  | `-CompoundStmt
-  `-CXXForRangeStmt
-    |-DeclStmt
-    | `-VarDecl 'a'
-    |   `-DeclRefExpr 'arr'
-    |-DeclStmt
-    | `-VarDecl '__range1'
-    |   `-DeclRefExpr 'a'
-    |-DeclStmt
-    | `-VarDecl '__begin1'
-    |   `-ImplicitCastExpr
-    |     `-DeclRefExpr '__range1'
-    |-DeclStmt
-    | `-VarDecl '__end1'
-    |   `-BinaryOperator
-    |     |-ImplicitCastExpr
-    |     | `-DeclRefExpr '__range1'
-    |     `-IntegerLiteral
-    |-BinaryOperator
-    | |-ImplicitCastExpr
-    | | `-DeclRefExpr '__begin1'
-    | `-ImplicitCastExpr
-    |   `-DeclRefExpr '__end1'
-    |-UnaryOperator
-    | `-DeclRefExpr '__begin1'
-    |-DeclStmt
-    | `-VarDecl 'i'
-    |   `-ImplicitCastExpr
-    |     `-UnaryOperator
-    |       `-ImplicitCastExpr
-    |         `-DeclRefExpr '__begin1'
-    `-CompoundStmt
-)cpp");
-
-    EXPECT_EQ(dumpASTString(TK_IgnoreUnlessSpelledInSource,
-                            BN[0].getNodeAs<Decl>("func")),
-              R"cpp(
-FunctionDecl 'forLoop'
-`-CompoundStmt
-  |-DeclStmt
-  | `-VarDecl 'arr'
-  |-CXXForRangeStmt
-  | |-<<<NULL>>>
-  | |-VarDecl 'i'
-  | |-DeclRefExpr 'arr'
-  | `-CompoundStmt
-  `-CXXForRangeStmt
-    |-DeclStmt
-    | `-VarDecl 'a'
-    |   `-DeclRefExpr 'arr'
-    |-VarDecl 'i'
-    |-DeclRefExpr 'a'
-    `-CompoundStmt
-)cpp");
-  }
-  {
-    auto BN = ast_matchers::match(
-        cxxRecordDecl(hasName("DefaultedAndDeleted"), unless(isImplicit()))
-            .bind("rec"),
-        AST2->getASTContext());
-    EXPECT_EQ(BN.size(), 1u);
-
-    EXPECT_EQ(dumpASTString(TK_AsIs, BN[0].getNodeAs<Decl>("rec")),
-              R"cpp(
-CXXRecordDecl 'DefaultedAndDeleted'
-|-CXXRecordDecl 'DefaultedAndDeleted'
-|-FieldDecl 'nt'
-|-CXXConstructorDecl 'DefaultedAndDeleted'
-| |-CXXCtorInitializer 'nt'
-| | `-CXXConstructExpr
-| `-CompoundStmt
-|-CXXDestructorDecl '~DefaultedAndDeleted'
-| `-CompoundStmt
-|-CXXConstructorDecl 'DefaultedAndDeleted'
-| `-ParmVarDecl ''
-|-CXXMethodDecl 'operator='
-| |-ParmVarDecl ''
-| `-CompoundStmt
-|   |-CXXMemberCallExpr
-|   | |-MemberExpr
-|   | | `-MemberExpr
-|   | |   `-CXXThisExpr
-|   | `-MemberExpr
-|   |   `-DeclRefExpr ''
-|   `-ReturnStmt
-|     `-UnaryOperator
-|       `-CXXThisExpr
-|-CXXConstructorDecl 'DefaultedAndDeleted'
-| `-ParmVarDecl ''
-`-CXXMethodDecl 'operator='
-  `-ParmVarDecl ''
-)cpp");
-
-    EXPECT_EQ(dumpASTString(TK_IgnoreUnlessSpelledInSource,
-                            BN[0].getNodeAs<Decl>("rec")),
-              R"cpp(
-CXXRecordDecl 'DefaultedAndDeleted'
-|-FieldDecl 'nt'
-|-CXXConstructorDecl 'DefaultedAndDeleted'
-|-CXXDestructorDecl '~DefaultedAndDeleted'
-|-CXXConstructorDecl 'DefaultedAndDeleted'
-| `-ParmVarDecl ''
-|-CXXMethodDecl 'operator='
-| `-ParmVarDecl ''
-|-CXXConstructorDecl 'DefaultedAndDeleted'
-| `-ParmVarDecl ''
-`-CXXMethodDecl 'operator='
-  `-ParmVarDecl ''
-)cpp");
-  }
-  {
-    auto BN = ast_matchers::match(
-        callExpr(callee(functionDecl(hasName("hasDefaultArg"))))
-            .bind("funcCall"),
-        AST2->getASTContext());
-    EXPECT_EQ(BN.size(), 1u);
-
-    EXPECT_EQ(dumpASTString(TK_AsIs, BN[0].getNodeAs<CallExpr>("funcCall")),
-              R"cpp(
-CallExpr
-|-ImplicitCastExpr
-| `-DeclRefExpr 'hasDefaultArg'
-|-IntegerLiteral
-`-CXXDefaultArgExpr
-)cpp");
-    EXPECT_EQ(dumpASTString(TK_IgnoreUnlessSpelledInSource,
-                            BN[0].getNodeAs<CallExpr>("funcCall")),
-              R"cpp(
-CallExpr
-|-DeclRefExpr 'hasDefaultArg'
-`-IntegerLiteral
-)cpp");
-  }
-
-  {
-    auto FN = ast_matchers::match(
-        functionDecl(hasName("decomposition"),
-                     hasDescendant(decompositionDecl().bind("decomp"))),
-        AST2->getASTContext());
-    EXPECT_EQ(FN.size(), 1u);
-
-    EXPECT_EQ(
-        dumpASTString(TK_AsIs, FN[0].getNodeAs<DecompositionDecl>("decomp")),
-        R"cpp(
-DecompositionDecl ''
-|-DeclRefExpr 'arr'
-|-BindingDecl 'f'
-| `-ArraySubscriptExpr
-|   |-ImplicitCastExpr
-|   | `-DeclRefExpr ''
-|   `-IntegerLiteral
-|-BindingDecl 's'
-| `-ArraySubscriptExpr
-|   |-ImplicitCastExpr
-|   | `-DeclRefExpr ''
-|   `-IntegerLiteral
-`-BindingDecl 't'
-  `-ArraySubscriptExpr
-    |-ImplicitCastExpr
-    | `-DeclRefExpr ''
-    `-IntegerLiteral
-)cpp");
-
-    EXPECT_EQ(dumpASTString(TK_IgnoreUnlessSpelledInSource,
-                            FN[0].getNodeAs<DecompositionDecl>("decomp")),
-              R"cpp(
-DecompositionDecl ''
-|-DeclRefExpr 'arr'
-|-BindingDecl 'f'
-|-BindingDecl 's'
-`-BindingDecl 't'
-)cpp");
-  }
-}
-
-TEST(Traverse, IgnoreUnlessSpelledInSourceTemplateInstantiations) {
-
-  auto AST = buildASTFromCode(R"cpp(
-template<typename T>
-struct TemplStruct {
-  TemplStruct() {}
-  ~TemplStruct() {}
-
-private:
-  T m_t;
-};
-
-template<typename T>
-T timesTwo(T input)
-{
-  return input * 2;
-}
-
-void instantiate()
-{
-  TemplStruct<int> ti;
-  TemplStruct<double> td;
-  (void)timesTwo<int>(2);
-  (void)timesTwo<double>(2);
-}
-
-template class TemplStruct<float>;
-
-extern template class TemplStruct<long>;
-
-template<> class TemplStruct<bool> {
-  TemplStruct() {}
-  ~TemplStruct() {}
-
-  void foo() {}
-private:
-  bool m_t;
-};
-
-// Explicit instantiation of template functions do not appear in the AST
-template float timesTwo(float);
-
-template<> bool timesTwo<bool>(bool) {
-  return true;
-}
-)cpp");
-  {
-    auto BN = ast_matchers::match(
-        classTemplateDecl(hasName("TemplStruct")).bind("rec"),
-        AST->getASTContext());
-    EXPECT_EQ(BN.size(), 1u);
-
-    EXPECT_EQ(dumpASTString(TK_IgnoreUnlessSpelledInSource,
-                            BN[0].getNodeAs<Decl>("rec")),
-              R"cpp(
-ClassTemplateDecl 'TemplStruct'
-|-TemplateTypeParmDecl 'T'
-`-CXXRecordDecl 'TemplStruct'
-  |-CXXConstructorDecl 'TemplStruct<T>'
-  | `-CompoundStmt
-  |-CXXDestructorDecl '~TemplStruct<T>'
-  | `-CompoundStmt
-  |-AccessSpecDecl
-  `-FieldDecl 'm_t'
-)cpp");
-
-    EXPECT_EQ(dumpASTString(TK_AsIs, BN[0].getNodeAs<Decl>("rec")),
-              R"cpp(
-ClassTemplateDecl 'TemplStruct'
-|-TemplateTypeParmDecl 'T'
-|-CXXRecordDecl 'TemplStruct'
-| |-CXXRecordDecl 'TemplStruct'
-| |-CXXConstructorDecl 'TemplStruct<T>'
-| | `-CompoundStmt
-| |-CXXDestructorDecl '~TemplStruct<T>'
-| | `-CompoundStmt
-| |-AccessSpecDecl
-| `-FieldDecl 'm_t'
-|-ClassTemplateSpecializationDecl 'TemplStruct'
-| |-TemplateArgument type int
-| | `-BuiltinType
-| |-CXXRecordDecl 'TemplStruct'
-| |-CXXConstructorDecl 'TemplStruct'
-| | `-CompoundStmt
-| |-CXXDestructorDecl '~TemplStruct'
-| | `-CompoundStmt
-| |-AccessSpecDecl
-| |-FieldDecl 'm_t'
-| `-CXXConstructorDecl 'TemplStruct'
-|   `-ParmVarDecl ''
-|-ClassTemplateSpecializationDecl 'TemplStruct'
-| |-TemplateArgument type double
-| | `-BuiltinType
-| |-CXXRecordDecl 'TemplStruct'
-| |-CXXConstructorDecl 'TemplStruct'
-| | `-CompoundStmt
-| |-CXXDestructorDecl '~TemplStruct'
-| | `-CompoundStmt
-| |-AccessSpecDecl
-| |-FieldDecl 'm_t'
-| `-CXXConstructorDecl 'TemplStruct'
-|   `-ParmVarDecl ''
-|-ClassTemplateSpecializationDecl 'TemplStruct'
-| |-TemplateArgument type float
-| | `-BuiltinType
-| |-CXXRecordDecl 'TemplStruct'
-| |-CXXConstructorDecl 'TemplStruct'
-| | `-CompoundStmt
-| |-CXXDestructorDecl '~TemplStruct'
-| | `-CompoundStmt
-| |-AccessSpecDecl
-| `-FieldDecl 'm_t'
-|-ClassTemplateSpecializationDecl 'TemplStruct'
-| |-TemplateArgument type long
-| | `-BuiltinType
-| |-CXXRecordDecl 'TemplStruct'
-| |-CXXConstructorDecl 'TemplStruct'
-| |-CXXDestructorDecl '~TemplStruct'
-| |-AccessSpecDecl
-| `-FieldDecl 'm_t'
-`-ClassTemplateSpecializationDecl 'TemplStruct'
-  |-TemplateArgument type _Bool
-  | `-BuiltinType
-  |-CXXRecordDecl 'TemplStruct'
-  |-CXXConstructorDecl 'TemplStruct'
-  | `-CompoundStmt
-  |-CXXDestructorDecl '~TemplStruct'
-  | `-CompoundStmt
-  |-CXXMethodDecl 'foo'
-  | `-CompoundStmt
-  |-AccessSpecDecl
-  `-FieldDecl 'm_t'
-)cpp");
-  }
-  {
-    auto BN = ast_matchers::match(
-        classTemplateSpecializationDecl(
-            hasTemplateArgument(
-                0, templateArgument(refersToType(asString("_Bool")))))
-            .bind("templSpec"),
-        AST->getASTContext());
-    EXPECT_EQ(BN.size(), 1u);
-
-    EXPECT_EQ(dumpASTString(TK_AsIs, BN[0].getNodeAs<Decl>("templSpec")),
-              R"cpp(
-ClassTemplateSpecializationDecl 'TemplStruct'
-|-TemplateArgument type _Bool
-| `-BuiltinType
-|-CXXRecordDecl 'TemplStruct'
-|-CXXConstructorDecl 'TemplStruct'
-| `-CompoundStmt
-|-CXXDestructorDecl '~TemplStruct'
-| `-CompoundStmt
-|-CXXMethodDecl 'foo'
-| `-CompoundStmt
-|-AccessSpecDecl
-`-FieldDecl 'm_t'
-)cpp");
-
-    EXPECT_EQ(dumpASTString(TK_IgnoreUnlessSpelledInSource,
-                            BN[0].getNodeAs<Decl>("templSpec")),
-              R"cpp(
-ClassTemplateSpecializationDecl 'TemplStruct'
-|-TemplateArgument type _Bool
-| `-BuiltinType
-|-CXXConstructorDecl 'TemplStruct'
-| `-CompoundStmt
-|-CXXDestructorDecl '~TemplStruct'
-| `-CompoundStmt
-|-CXXMethodDecl 'foo'
-| `-CompoundStmt
-|-AccessSpecDecl
-`-FieldDecl 'm_t'
-)cpp");
-  }
-  {
-    auto BN = ast_matchers::match(
-        functionTemplateDecl(hasName("timesTwo")).bind("fn"),
-        AST->getASTContext());
-    EXPECT_EQ(BN.size(), 1u);
-
-    EXPECT_EQ(dumpASTString(TK_IgnoreUnlessSpelledInSource,
-                            BN[0].getNodeAs<Decl>("fn")),
-              R"cpp(
-FunctionTemplateDecl 'timesTwo'
-|-TemplateTypeParmDecl 'T'
-`-FunctionDecl 'timesTwo'
-  |-ParmVarDecl 'input'
-  `-CompoundStmt
-    `-ReturnStmt
-      `-BinaryOperator
-        |-DeclRefExpr 'input'
-        `-IntegerLiteral
-)cpp");
-
-    EXPECT_EQ(dumpASTString(TK_AsIs, BN[0].getNodeAs<Decl>("fn")),
-              R"cpp(
-FunctionTemplateDecl 'timesTwo'
-|-TemplateTypeParmDecl 'T'
-|-FunctionDecl 'timesTwo'
-| |-ParmVarDecl 'input'
-| `-CompoundStmt
-|   `-ReturnStmt
-|     `-BinaryOperator
-|       |-DeclRefExpr 'input'
-|       `-IntegerLiteral
-|-FunctionDecl 'timesTwo'
-| |-TemplateArgument type int
-| | `-BuiltinType
-| |-ParmVarDecl 'input'
-| `-CompoundStmt
-|   `-ReturnStmt
-|     `-BinaryOperator
-|       |-ImplicitCastExpr
-|       | `-DeclRefExpr 'input'
-|       `-IntegerLiteral
-|-FunctionDecl 'timesTwo'
-| |-TemplateArgument type double
-| | `-BuiltinType
-| |-ParmVarDecl 'input'
-| `-CompoundStmt
-|   `-ReturnStmt
-|     `-BinaryOperator
-|       |-ImplicitCastExpr
-|       | `-DeclRefExpr 'input'
-|       `-ImplicitCastExpr
-|         `-IntegerLiteral
-|-FunctionDecl 'timesTwo'
-| |-TemplateArgument type float
-| | `-BuiltinType
-| |-ParmVarDecl 'input'
-| `-CompoundStmt
-|   `-ReturnStmt
-|     `-BinaryOperator
-|       |-ImplicitCastExpr
-|       | `-DeclRefExpr 'input'
-|       `-ImplicitCastExpr
-|         `-IntegerLiteral
-|-FunctionDecl 'timesTwo'
-| |-TemplateArgument type _Bool
-| | `-BuiltinType
-| |-ParmVarDecl ''
-| `-CompoundStmt
-|   `-ReturnStmt
-|     `-CXXBoolLiteralExpr
-`-FunctionDecl 'timesTwo'
-  |-TemplateArgument type _Bool
-  | `-BuiltinType
-  `-ParmVarDecl 'input'
-)cpp");
-  }
-  {
-    auto BN = ast_matchers::match(
-        classTemplateSpecializationDecl(
-            hasName("TemplStruct"),
-            hasTemplateArgument(
-                0, templateArgument(refersToType(asString("float")))),
-            hasParent(translationUnitDecl()))
-            .bind("rec"),
-        AST->getASTContext());
-    EXPECT_EQ(BN.size(), 1u);
-
-    EXPECT_EQ(dumpASTString(TK_IgnoreUnlessSpelledInSource,
-                            BN[0].getNodeAs<Decl>("rec")),
-              R"cpp(
-ClassTemplateSpecializationDecl 'TemplStruct'
-`-TemplateArgument type float
-  `-BuiltinType
-)cpp");
-
-    EXPECT_EQ(dumpASTString(TK_AsIs, BN[0].getNodeAs<Decl>("rec")),
-              R"cpp(
-ClassTemplateSpecializationDecl 'TemplStruct'
-|-TemplateArgument type float
-| `-BuiltinType
-|-CXXRecordDecl 'TemplStruct'
-|-CXXConstructorDecl 'TemplStruct'
-| `-CompoundStmt
-|-CXXDestructorDecl '~TemplStruct'
-| `-CompoundStmt
-|-AccessSpecDecl
-`-FieldDecl 'm_t'
-)cpp");
-  }
-}
-
-TEST(Traverse, CXXRewrittenBinaryOperator) {
-
-  auto AST = buildASTFromCodeWithArgs(R"cpp(
-namespace std {
-struct strong_ordering {
-  int n;
-  constexpr operator int() const { return n; }
-  static const strong_ordering equal, greater, less;
-};
-constexpr strong_ordering strong_ordering::equal = {0};
-constexpr strong_ordering strong_ordering::greater = {1};
-constexpr strong_ordering strong_ordering::less = {-1};
-}
-
-struct HasSpaceshipMem {
-  int a;
-  constexpr auto operator<=>(const HasSpaceshipMem&) const = default;
-};
-
-void binop()
-{
-    HasSpaceshipMem hs1, hs2;
-    if (hs1 < hs2)
-        return;
-}
-)cpp",
-                                      {"-std=c++20"});
-  {
-    auto BN = ast_matchers::match(cxxRewrittenBinaryOperator().bind("binop"),
-                                  AST->getASTContext());
-    EXPECT_EQ(BN.size(), 1u);
-
-    EXPECT_EQ(dumpASTString(TK_AsIs, BN[0].getNodeAs<Stmt>("binop")),
-              R"cpp(
-CXXRewrittenBinaryOperator
-`-BinaryOperator
-  |-ImplicitCastExpr
-  | `-CXXMemberCallExpr
-  |   `-MemberExpr
-  |     `-ImplicitCastExpr
-  |       `-MaterializeTemporaryExpr
-  |         `-CXXOperatorCallExpr
-  |           |-ImplicitCastExpr
-  |           | `-DeclRefExpr 'operator<=>'
-  |           |-ImplicitCastExpr
-  |           | `-DeclRefExpr 'hs1'
-  |           `-ImplicitCastExpr
-  |             `-DeclRefExpr 'hs2'
-  `-IntegerLiteral
-)cpp");
-    EXPECT_EQ(dumpASTString(TK_IgnoreUnlessSpelledInSource,
-                            BN[0].getNodeAs<Stmt>("binop")),
-              R"cpp(
-CXXRewrittenBinaryOperator
-|-DeclRefExpr 'hs1'
-`-DeclRefExpr 'hs2'
-)cpp");
-  }
-}
-
-} // namespace clang
diff --git a/gnu/llvm/clang/unittests/AST/ASTTypeTraitsTest.cpp b/gnu/llvm/clang/unittests/AST/ASTTypeTraitsTest.cpp
deleted file mode 100644
index 18e8b8431b4..00000000000
--- a/gnu/llvm/clang/unittests/AST/ASTTypeTraitsTest.cpp
+++ /dev/null
@@ -1,195 +0,0 @@
-//===- unittest/AST/ASTTypeTraits.cpp - AST type traits unit tests ------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===--------------------------------------------------------------------===//
-
-
-#include "clang/AST/ASTTypeTraits.h"
-#include "MatchVerifier.h"
-#include "gtest/gtest.h"
-
-using namespace clang::ast_matchers;
-
-namespace clang {
-namespace {
-
-TEST(ASTNodeKind, NoKind) {
-  EXPECT_FALSE(ASTNodeKind().isBaseOf(ASTNodeKind()));
-  EXPECT_FALSE(ASTNodeKind().isSame(ASTNodeKind()));
-}
-
-template <typename T> static ASTNodeKind DNT() {
-  return ASTNodeKind::getFromNodeKind<T>();
-}
-
-TEST(ASTNodeKind, IsNone) {
-  EXPECT_TRUE(ASTNodeKind().isNone());
-  EXPECT_FALSE(DNT<Decl>().isNone());
-  EXPECT_FALSE(DNT<VarDecl>().isNone());
-}
-
-TEST(ASTNodeKind, Bases) {
-  EXPECT_TRUE(DNT<Decl>().isBaseOf(DNT<VarDecl>()));
-  EXPECT_FALSE(DNT<Decl>().isSame(DNT<VarDecl>()));
-  EXPECT_FALSE(DNT<VarDecl>().isBaseOf(DNT<Decl>()));
-
-  EXPECT_TRUE(DNT<Decl>().isSame(DNT<Decl>()));
-}
-
-TEST(DynTypedNode, Clades) {
-  EXPECT_TRUE(DNT<Stmt>().getCladeKind().isSame(DNT<Stmt>()));
-  EXPECT_TRUE(DNT<Decl>().getCladeKind().isSame(DNT<Decl>()));
-
-  EXPECT_TRUE(DNT<CXXMethodDecl>().getCladeKind().isSame(DNT<Decl>()));
-  EXPECT_TRUE(DNT<CXXMemberCallExpr>().getCladeKind().isSame(DNT<Stmt>()));
-
-  EXPECT_FALSE(DNT<CXXMemberCallExpr>().getCladeKind().isSame(DNT<Decl>()));
-
-  EXPECT_TRUE(ASTNodeKind().getCladeKind().isNone());
-}
-
-TEST(ASTNodeKind, BaseDistances) {
-  unsigned Distance = 1;
-  EXPECT_TRUE(DNT<Expr>().isBaseOf(DNT<Expr>(), &Distance));
-  EXPECT_EQ(0u, Distance);
-
-  EXPECT_TRUE(DNT<Stmt>().isBaseOf(DNT<IfStmt>(), &Distance));
-  EXPECT_EQ(1u, Distance);
-
-  Distance = 3;
-  EXPECT_TRUE(DNT<DeclaratorDecl>().isBaseOf(DNT<ParmVarDecl>(), &Distance));
-  EXPECT_EQ(2u, Distance);
-}
-
-TEST(ASTNodeKind, SameBase) {
-  EXPECT_TRUE(DNT<Expr>().isBaseOf(DNT<CallExpr>()));
-  EXPECT_TRUE(DNT<Expr>().isBaseOf(DNT<BinaryOperator>()));
-  EXPECT_FALSE(DNT<CallExpr>().isBaseOf(DNT<BinaryOperator>()));
-  EXPECT_FALSE(DNT<BinaryOperator>().isBaseOf(DNT<CallExpr>()));
-}
-
-TEST(ASTNodeKind, DiffBase) {
-  EXPECT_FALSE(DNT<Expr>().isBaseOf(DNT<ArrayType>()));
-  EXPECT_FALSE(DNT<QualType>().isBaseOf(DNT<FunctionDecl>()));
-  EXPECT_FALSE(DNT<Type>().isSame(DNT<QualType>()));
-}
-
-TEST(ASTNodeKind, MostDerivedType) {
-  EXPECT_TRUE(DNT<BinaryOperator>().isSame(
-      ASTNodeKind::getMostDerivedType(DNT<Expr>(), DNT<BinaryOperator>())));
-  EXPECT_TRUE(DNT<BinaryOperator>().isSame(
-      ASTNodeKind::getMostDerivedType(DNT<BinaryOperator>(), DNT<Expr>())));
-  EXPECT_TRUE(DNT<VarDecl>().isSame(
-      ASTNodeKind::getMostDerivedType(DNT<VarDecl>(), DNT<VarDecl>())));
-
-  // Not related. Returns nothing.
-  EXPECT_TRUE(
-      ASTNodeKind::getMostDerivedType(DNT<IfStmt>(), DNT<VarDecl>()).isNone());
-  EXPECT_TRUE(ASTNodeKind::getMostDerivedType(DNT<IfStmt>(),
-                                              DNT<BinaryOperator>()).isNone());
-}
-
-TEST(ASTNodeKind, MostDerivedCommonAncestor) {
-  EXPECT_TRUE(DNT<Expr>().isSame(ASTNodeKind::getMostDerivedCommonAncestor(
-      DNT<Expr>(), DNT<BinaryOperator>())));
-  EXPECT_TRUE(DNT<Expr>().isSame(ASTNodeKind::getMostDerivedCommonAncestor(
-      DNT<BinaryOperator>(), DNT<Expr>())));
-  EXPECT_TRUE(DNT<VarDecl>().isSame(ASTNodeKind::getMostDerivedCommonAncestor(
-      DNT<VarDecl>(), DNT<VarDecl>())));
-
-  // A little related. Returns the ancestor.
-  EXPECT_TRUE(
-      DNT<NamedDecl>().isSame(ASTNodeKind::getMostDerivedCommonAncestor(
-          DNT<CXXMethodDecl>(), DNT<RecordDecl>())));
-
-  // Not related. Returns nothing.
-  EXPECT_TRUE(ASTNodeKind::getMostDerivedCommonAncestor(
-                  DNT<IfStmt>(), DNT<VarDecl>()).isNone());
-}
-
-struct Foo {};
-
-TEST(ASTNodeKind, UnknownKind) {
-  // We can construct one, but it is nowhere in the hierarchy.
-  EXPECT_FALSE(DNT<Foo>().isSame(DNT<Foo>()));
-}
-
-TEST(ASTNodeKind, Name) {
-  EXPECT_EQ("<None>", ASTNodeKind().asStringRef());
-#define VERIFY_NAME(Node) EXPECT_EQ(#Node, DNT<Node>().asStringRef());
-  VERIFY_NAME(TemplateArgument);
-  VERIFY_NAME(NestedNameSpecifierLoc);
-  VERIFY_NAME(QualType);
-  VERIFY_NAME(TypeLoc);
-  VERIFY_NAME(CXXCtorInitializer);
-  VERIFY_NAME(NestedNameSpecifier);
-  VERIFY_NAME(Decl);
-  VERIFY_NAME(CXXRecordDecl);
-  VERIFY_NAME(Stmt);
-  VERIFY_NAME(CallExpr);
-  VERIFY_NAME(Type);
-  VERIFY_NAME(ConstantArrayType);
-#undef VERIFY_NAME
-}
-
-TEST(DynTypedNode, DeclSourceRange) {
-  RangeVerifier<DynTypedNode> Verifier;
-  Verifier.expectRange(1, 1, 1, 11);
-  EXPECT_TRUE(Verifier.match("void f() {}", decl()));
-}
-
-TEST(DynTypedNode, StmtSourceRange) {
-  RangeVerifier<DynTypedNode> Verifier;
-  Verifier.expectRange(1, 10, 1, 11);
-  EXPECT_TRUE(Verifier.match("void f() {}", stmt()));
-}
-
-TEST(DynTypedNode, TypeLocSourceRange) {
-  RangeVerifier<DynTypedNode> Verifier;
-  Verifier.expectRange(1, 1, 1, 8);
-  EXPECT_TRUE(Verifier.match("void f() {}", typeLoc(loc(functionType()))));
-}
-
-TEST(DynTypedNode, NNSLocSourceRange) {
-  RangeVerifier<DynTypedNode> Verifier;
-  Verifier.expectRange(1, 33, 1, 34);
-  EXPECT_TRUE(Verifier.match("namespace N { typedef void T; } N::T f() {}",
-                             nestedNameSpecifierLoc()));
-}
-
-TEST(DynTypedNode, DeclDump) {
-  DumpVerifier Verifier;
-  Verifier.expectSubstring("FunctionDecl");
-  EXPECT_TRUE(Verifier.match("void f() {}", functionDecl()));
-}
-
-TEST(DynTypedNode, StmtDump) {
-  DumpVerifier Verifier;
-  Verifier.expectSubstring("CompoundStmt");
-  EXPECT_TRUE(Verifier.match("void f() {}", stmt()));
-}
-
-TEST(DynTypedNode, DeclPrint) {
-  PrintVerifier Verifier;
-  Verifier.expectString("void f() {\n}\n");
-  EXPECT_TRUE(Verifier.match("void f() {}", functionDecl()));
-}
-
-TEST(DynTypedNode, StmtPrint) {
-  PrintVerifier Verifier;
-  Verifier.expectString("{\n}\n");
-  EXPECT_TRUE(Verifier.match("void f() {}", stmt()));
-}
-
-TEST(DynTypedNode, QualType) {
-  QualType Q;
-  DynTypedNode Node = DynTypedNode::create(Q);
-  EXPECT_TRUE(Node == Node);
-  EXPECT_FALSE(Node < Node);
-}
-
-} // namespace
-}  // namespace clang
diff --git a/gnu/llvm/clang/unittests/AST/ASTVectorTest.cpp b/gnu/llvm/clang/unittests/AST/ASTVectorTest.cpp
deleted file mode 100644
index 1c17eb9210a..00000000000
--- a/gnu/llvm/clang/unittests/AST/ASTVectorTest.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-//===- unittests/AST/DeclTest.cpp --- Declaration tests -------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// Unit tests for the ASTVector container.
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/AST/ASTVector.h"
-#include "clang/AST/ASTContext.h"
-#include "clang/Basic/Builtins.h"
-#include "clang/Basic/FileManager.h"
-#include "clang/Basic/SourceManager.h"
-#include "gtest/gtest.h"
-
-using namespace clang;
-
-namespace clang {
-namespace ast {
-
-namespace {
-class ASTVectorTest : public ::testing::Test {
-protected:
-  ASTVectorTest()
-      : FileMgr(FileMgrOpts), DiagID(new DiagnosticIDs()),
-        Diags(DiagID, new DiagnosticOptions, new IgnoringDiagConsumer()),
-        SourceMgr(Diags, FileMgr), Idents(LangOpts, nullptr),
-        Ctxt(LangOpts, SourceMgr, Idents, Sels, Builtins, TU_Complete) {}
-
-  FileSystemOptions FileMgrOpts;
-  FileManager FileMgr;
-  IntrusiveRefCntPtr<DiagnosticIDs> DiagID;
-  DiagnosticsEngine Diags;
-  SourceManager SourceMgr;
-  LangOptions LangOpts;
-  IdentifierTable Idents;
-  SelectorTable Sels;
-  Builtin::Context Builtins;
-  ASTContext Ctxt;
-};
-} // unnamed namespace
-
-TEST_F(ASTVectorTest, Compile) {
-  ASTVector<int> V;
-  V.insert(Ctxt, V.begin(), 0);
-}
-
-TEST_F(ASTVectorTest, InsertFill) {
-  ASTVector<double> V;
-
-  // Ensure returned iterator points to first of inserted elements
-  auto I = V.insert(Ctxt, V.begin(), 5, 1.0);
-  ASSERT_EQ(V.begin(), I);
-
-  // Check non-empty case as well
-  I = V.insert(Ctxt, V.begin() + 1, 5, 1.0);
-  ASSERT_EQ(V.begin() + 1, I);
-
-  // And insert-at-end
-  I = V.insert(Ctxt, V.end(), 5, 1.0);
-  ASSERT_EQ(V.end() - 5, I);
-}
-
-TEST_F(ASTVectorTest, InsertEmpty) {
-  ASTVector<double> V;
-
-  // Ensure no pointer overflow when inserting empty range
-  int Values[] = { 0, 1, 2, 3 };
-  ArrayRef<int> IntVec(Values);
-  auto I = V.insert(Ctxt, V.begin(), IntVec.begin(), IntVec.begin());
-  ASSERT_EQ(V.begin(), I);
-  ASSERT_TRUE(V.empty());
-
-  // Non-empty range
-  I = V.insert(Ctxt, V.begin(), IntVec.begin(), IntVec.end());
-  ASSERT_EQ(V.begin(), I);
-
-  // Non-Empty Vector, empty range
-  I = V.insert(Ctxt, V.end(), IntVec.begin(), IntVec.begin());
-  ASSERT_EQ(V.begin() + IntVec.size(), I);
-
-  // Non-Empty Vector, non-empty range
-  I = V.insert(Ctxt, V.end(), IntVec.begin(), IntVec.end());
-  ASSERT_EQ(V.begin() + IntVec.size(), I);
-}
-
-} // end namespace ast
-} // end namespace clang
diff --git a/gnu/llvm/clang/unittests/AST/CMakeLists.txt b/gnu/llvm/clang/unittests/AST/CMakeLists.txt
deleted file mode 100644
index b04e2bdc20e..00000000000
--- a/gnu/llvm/clang/unittests/AST/CMakeLists.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  FrontendOpenMP
-  Support
-  )
-
-
-add_clang_unittest(ASTTests
-  ASTContextParentMapTest.cpp
-  ASTImporterFixtures.cpp
-  ASTImporterTest.cpp
-  ASTImporterObjCTest.cpp
-  ASTImporterGenericRedeclTest.cpp
-  ASTImporterODRStrategiesTest.cpp
-  ASTImporterVisibilityTest.cpp
-  ASTTraverserTest.cpp
-  ASTTypeTraitsTest.cpp
-  ASTVectorTest.cpp
-  CommentLexer.cpp
-  CommentParser.cpp
-  CommentTextTest.cpp
-  DataCollectionTest.cpp
-  DeclPrinterTest.cpp
-  DeclTest.cpp
-  EvaluateAsRValueTest.cpp
-  ExternalASTSourceTest.cpp
-  NamedDeclPrinterTest.cpp
-  RecursiveASTVisitorTest.cpp
-  SizelessTypesTest.cpp
-  SourceLocationTest.cpp
-  StmtPrinterTest.cpp
-  StructuralEquivalenceTest.cpp
-  TypePrinterTest.cpp
-  )
-
-clang_target_link_libraries(ASTTests
-  PRIVATE
-  clangAST
-  clangASTMatchers
-  clangBasic
-  clangFrontend
-  clangSerialization
-  clangTesting
-  clangTooling
-  )
-
-target_link_libraries(ASTTests
-  PRIVATE
-  LLVMTestingSupport
-)
diff --git a/gnu/llvm/clang/unittests/AST/CommentLexer.cpp b/gnu/llvm/clang/unittests/AST/CommentLexer.cpp
deleted file mode 100644
index 1883050658a..00000000000
--- a/gnu/llvm/clang/unittests/AST/CommentLexer.cpp
+++ /dev/null
@@ -1,1845 +0,0 @@
-//===- unittests/AST/CommentLexer.cpp ------ Comment lexer tests ----------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/AST/CommentLexer.h"
-#include "clang/AST/CommentCommandTraits.h"
-#include "clang/Basic/CommentOptions.h"
-#include "clang/Basic/Diagnostic.h"
-#include "clang/Basic/DiagnosticOptions.h"
-#include "clang/Basic/FileManager.h"
-#include "clang/Basic/SourceManager.h"
-#include "llvm/ADT/STLExtras.h"
-#include "gtest/gtest.h"
-#include <vector>
-
-using namespace llvm;
-using namespace clang;
-
-namespace clang {
-namespace comments {
-
-namespace {
-class CommentLexerTest : public ::testing::Test {
-protected:
-  CommentLexerTest()
-    : FileMgr(FileMgrOpts),
-      DiagID(new DiagnosticIDs()),
-      Diags(DiagID, new DiagnosticOptions, new IgnoringDiagConsumer()),
-      SourceMgr(Diags, FileMgr),
-      Traits(Allocator, CommentOptions()) {
-  }
-
-  FileSystemOptions FileMgrOpts;
-  FileManager FileMgr;
-  IntrusiveRefCntPtr<DiagnosticIDs> DiagID;
-  DiagnosticsEngine Diags;
-  SourceManager SourceMgr;
-  llvm::BumpPtrAllocator Allocator;
-  CommandTraits Traits;
-
-  void lexString(const char *Source, std::vector<Token> &Toks);
-
-  StringRef getCommandName(const Token &Tok) {
-    return Traits.getCommandInfo(Tok.getCommandID())->Name;
-  }
-
-  StringRef getVerbatimBlockName(const Token &Tok) {
-    return Traits.getCommandInfo(Tok.getVerbatimBlockID())->Name;
-  }
-
-  StringRef getVerbatimLineName(const Token &Tok) {
-    return Traits.getCommandInfo(Tok.getVerbatimLineID())->Name;
-  }
-};
-
-void CommentLexerTest::lexString(const char *Source,
-                                 std::vector<Token> &Toks) {
-  std::unique_ptr<MemoryBuffer> Buf = MemoryBuffer::getMemBuffer(Source);
-  FileID File = SourceMgr.createFileID(std::move(Buf));
-  SourceLocation Begin = SourceMgr.getLocForStartOfFile(File);
-
-  Lexer L(Allocator, Diags, Traits, Begin, Source, Source + strlen(Source));
-
-  while (1) {
-    Token Tok;
-    L.lex(Tok);
-    if (Tok.is(tok::eof))
-      break;
-    Toks.push_back(Tok);
-  }
-}
-
-} // unnamed namespace
-
-// Empty source range should be handled.
-TEST_F(CommentLexerTest, Basic1) {
-  const char *Source = "";
-  std::vector<Token> Toks;
-
-  lexString(Source, Toks);
-
-  ASSERT_EQ(0U, Toks.size());
-}
-
-// Empty comments should be handled.
-TEST_F(CommentLexerTest, Basic2) {
-  const char *Sources[] = {
-    "//", "///", "//!", "///<", "//!<"
-  };
-  for (size_t i = 0, e = array_lengthof(Sources); i != e; i++) {
-    std::vector<Token> Toks;
-
-    lexString(Sources[i], Toks);
-
-    ASSERT_EQ(1U, Toks.size());
-
-    ASSERT_EQ(tok::newline, Toks[0].getKind());
-  }
-}
-
-// Empty comments should be handled.
-TEST_F(CommentLexerTest, Basic3) {
-  const char *Sources[] = {
-    "/**/", "/***/", "/*!*/", "/**<*/", "/*!<*/"
-  };
-  for (size_t i = 0, e = array_lengthof(Sources); i != e; i++) {
-    std::vector<Token> Toks;
-
-    lexString(Sources[i], Toks);
-
-    ASSERT_EQ(2U, Toks.size());
-
-    ASSERT_EQ(tok::newline, Toks[0].getKind());
-    ASSERT_EQ(tok::newline, Toks[1].getKind());
-  }
-}
-
-// Single comment with plain text.
-TEST_F(CommentLexerTest, Basic4) {
-  const char *Sources[] = {
-    "// Meow",   "/// Meow",    "//! Meow",
-    "// Meow\n", "// Meow\r\n", "//! Meow\r",
-  };
-
-  for (size_t i = 0, e = array_lengthof(Sources); i != e; i++) {
-    std::vector<Token> Toks;
-
-    lexString(Sources[i], Toks);
-
-    ASSERT_EQ(2U, Toks.size());
-
-    ASSERT_EQ(tok::text,          Toks[0].getKind());
-    ASSERT_EQ(StringRef(" Meow"), Toks[0].getText());
-
-    ASSERT_EQ(tok::newline,       Toks[1].getKind());
-  }
-}
-
-// Single comment with plain text.
-TEST_F(CommentLexerTest, Basic5) {
-  const char *Sources[] = {
-    "/* Meow*/", "/** Meow*/",  "/*! Meow*/"
-  };
-
-  for (size_t i = 0, e = array_lengthof(Sources); i != e; i++) {
-    std::vector<Token> Toks;
-
-    lexString(Sources[i], Toks);
-
-    ASSERT_EQ(3U, Toks.size());
-
-    ASSERT_EQ(tok::text,          Toks[0].getKind());
-    ASSERT_EQ(StringRef(" Meow"), Toks[0].getText());
-
-    ASSERT_EQ(tok::newline,       Toks[1].getKind());
-    ASSERT_EQ(tok::newline,       Toks[2].getKind());
-  }
-}
-
-// Test newline escaping.
-TEST_F(CommentLexerTest, Basic6) {
-  const char *Sources[] = {
-    "// Aaa\\\n"   " Bbb\\ \n"   " Ccc?" "?/\n",
-    "// Aaa\\\r\n" " Bbb\\ \r\n" " Ccc?" "?/\r\n",
-    "// Aaa\\\r"   " Bbb\\ \r"   " Ccc?" "?/\r"
-  };
-
-  for (size_t i = 0, e = array_lengthof(Sources); i != e; i++) {
-    std::vector<Token> Toks;
-
-    lexString(Sources[i], Toks);
-
-    ASSERT_EQ(10U, Toks.size());
-
-    ASSERT_EQ(tok::text,         Toks[0].getKind());
-    ASSERT_EQ(StringRef(" Aaa"), Toks[0].getText());
-    ASSERT_EQ(tok::text,         Toks[1].getKind());
-    ASSERT_EQ(StringRef("\\"),   Toks[1].getText());
-    ASSERT_EQ(tok::newline,      Toks[2].getKind());
-
-    ASSERT_EQ(tok::text,         Toks[3].getKind());
-    ASSERT_EQ(StringRef(" Bbb"), Toks[3].getText());
-    ASSERT_EQ(tok::text,         Toks[4].getKind());
-    ASSERT_EQ(StringRef("\\"),   Toks[4].getText());
-    ASSERT_EQ(tok::text,         Toks[5].getKind());
-    ASSERT_EQ(StringRef(" "),    Toks[5].getText());
-    ASSERT_EQ(tok::newline,      Toks[6].getKind());
-
-    ASSERT_EQ(tok::text,         Toks[7].getKind());
-    ASSERT_EQ(StringRef(" Ccc?" "?/"), Toks[7].getText());
-    ASSERT_EQ(tok::newline,      Toks[8].getKind());
-
-    ASSERT_EQ(tok::newline,      Toks[9].getKind());
-  }
-}
-
-// Check that we skip C-style aligned stars correctly.
-TEST_F(CommentLexerTest, Basic7) {
-  const char *Source =
-    "/* Aaa\n"
-    " * Bbb\r\n"
-    "\t* Ccc\n"
-    "  ! Ddd\n"
-    "  * Eee\n"
-    "  ** Fff\n"
-    " */";
-  std::vector<Token> Toks;
-
-  lexString(Source, Toks);
-
-  ASSERT_EQ(15U, Toks.size());
-
-  ASSERT_EQ(tok::text,         Toks[0].getKind());
-  ASSERT_EQ(StringRef(" Aaa"), Toks[0].getText());
-  ASSERT_EQ(tok::newline,      Toks[1].getKind());
-
-  ASSERT_EQ(tok::text,         Toks[2].getKind());
-  ASSERT_EQ(StringRef(" Bbb"), Toks[2].getText());
-  ASSERT_EQ(tok::newline,      Toks[3].getKind());
-
-  ASSERT_EQ(tok::text,         Toks[4].getKind());
-  ASSERT_EQ(StringRef(" Ccc"), Toks[4].getText());
-  ASSERT_EQ(tok::newline,      Toks[5].getKind());
-
-  ASSERT_EQ(tok::text,            Toks[6].getKind());
-  ASSERT_EQ(StringRef("  ! Ddd"), Toks[6].getText());
-  ASSERT_EQ(tok::newline,         Toks[7].getKind());
-
-  ASSERT_EQ(tok::text,         Toks[8].getKind());
-  ASSERT_EQ(StringRef(" Eee"), Toks[8].getText());
-  ASSERT_EQ(tok::newline,      Toks[9].getKind());
-
-  ASSERT_EQ(tok::text,          Toks[10].getKind());
-  ASSERT_EQ(StringRef("* Fff"), Toks[10].getText());
-  ASSERT_EQ(tok::newline,       Toks[11].getKind());
-
-  ASSERT_EQ(tok::text,         Toks[12].getKind());
-  ASSERT_EQ(StringRef(" "),    Toks[12].getText());
-
-  ASSERT_EQ(tok::newline,      Toks[13].getKind());
-  ASSERT_EQ(tok::newline,      Toks[14].getKind());
-}
-
-// A command marker followed by comment end.
-TEST_F(CommentLexerTest, DoxygenCommand1) {
-  const char *Sources[] = { "//@", "///@", "//!@" };
-  for (size_t i = 0, e = array_lengthof(Sources); i != e; i++) {
-    std::vector<Token> Toks;
-
-    lexString(Sources[i], Toks);
-
-    ASSERT_EQ(2U, Toks.size());
-
-    ASSERT_EQ(tok::text,          Toks[0].getKind());
-    ASSERT_EQ(StringRef("@"),     Toks[0].getText());
-
-    ASSERT_EQ(tok::newline,       Toks[1].getKind());
-  }
-}
-
-// A command marker followed by comment end.
-TEST_F(CommentLexerTest, DoxygenCommand2) {
-  const char *Sources[] = { "/*@*/", "/**@*/", "/*!@*/"};
-  for (size_t i = 0, e = array_lengthof(Sources); i != e; i++) {
-    std::vector<Token> Toks;
-
-    lexString(Sources[i], Toks);
-
-    ASSERT_EQ(3U, Toks.size());
-
-    ASSERT_EQ(tok::text,          Toks[0].getKind());
-    ASSERT_EQ(StringRef("@"),     Toks[0].getText());
-
-    ASSERT_EQ(tok::newline,       Toks[1].getKind());
-    ASSERT_EQ(tok::newline,       Toks[2].getKind());
-  }
-}
-
-// A command marker followed by comment end.
-TEST_F(CommentLexerTest, DoxygenCommand3) {
-  const char *Sources[] = { "/*\\*/", "/**\\*/" };
-  for (size_t i = 0, e = array_lengthof(Sources); i != e; i++) {
-    std::vector<Token> Toks;
-
-    lexString(Sources[i], Toks);
-
-    ASSERT_EQ(3U, Toks.size());
-
-    ASSERT_EQ(tok::text,           Toks[0].getKind());
-    ASSERT_EQ(StringRef("\\"),     Toks[0].getText());
-
-    ASSERT_EQ(tok::newline,        Toks[1].getKind());
-    ASSERT_EQ(tok::newline,        Toks[2].getKind());
-  }
-}
-
-// Doxygen escape sequences.
-TEST_F(CommentLexerTest, DoxygenCommand4) {
-  const char *Sources[] = {
-    "/// \\\\ \\@ \\& \\$ \\# \\< \\> \\% \\\" \\. \\::",
-    "/// @\\ @@ @& @$ @# @< @> @% @\" @. @::"
-  };
-  const char *Text[] = {
-    " ",
-    "\\", " ", "@", " ", "&", " ", "$",  " ", "#", " ",
-    "<",  " ", ">", " ", "%", " ", "\"", " ", ".", " ",
-    "::", ""
-  };
-
-  for (size_t i = 0, e = array_lengthof(Sources); i != e; i++) {
-    std::vector<Token> Toks;
-
-    lexString(Sources[i], Toks);
-
-    ASSERT_EQ(array_lengthof(Text), Toks.size());
-
-    for (size_t j = 0, e = Toks.size(); j != e; j++) {
-      if(Toks[j].is(tok::text)) {
-        ASSERT_EQ(StringRef(Text[j]), Toks[j].getText())
-          << "index " << i;
-      }
-    }
-  }
-}
-
-// A command marker followed by a non-letter that is not a part of an escape
-// sequence.
-TEST_F(CommentLexerTest, DoxygenCommand5) {
-  const char *Source = "/// \\^ \\0";
-  std::vector<Token> Toks;
-
-  lexString(Source, Toks);
-
-  ASSERT_EQ(6U, Toks.size());
-
-  ASSERT_EQ(tok::text,       Toks[0].getKind());
-  ASSERT_EQ(StringRef(" "),  Toks[0].getText());
-
-  ASSERT_EQ(tok::text,       Toks[1].getKind());
-  ASSERT_EQ(StringRef("\\"), Toks[1].getText());
-
-  ASSERT_EQ(tok::text,       Toks[2].getKind());
-  ASSERT_EQ(StringRef("^ "), Toks[2].getText());
-
-  ASSERT_EQ(tok::text,       Toks[3].getKind());
-  ASSERT_EQ(StringRef("\\"), Toks[3].getText());
-
-  ASSERT_EQ(tok::text,       Toks[4].getKind());
-  ASSERT_EQ(StringRef("0"),  Toks[4].getText());
-
-  ASSERT_EQ(tok::newline,    Toks[5].getKind());
-}
-
-TEST_F(CommentLexerTest, DoxygenCommand6) {
-  const char *Source = "/// \\brief Aaa.";
-  std::vector<Token> Toks;
-
-  lexString(Source, Toks);
-
-  ASSERT_EQ(4U, Toks.size());
-
-  ASSERT_EQ(tok::text,          Toks[0].getKind());
-  ASSERT_EQ(StringRef(" "),     Toks[0].getText());
-
-  ASSERT_EQ(tok::backslash_command, Toks[1].getKind());
-  ASSERT_EQ(StringRef("brief"), getCommandName(Toks[1]));
-
-  ASSERT_EQ(tok::text,          Toks[2].getKind());
-  ASSERT_EQ(StringRef(" Aaa."), Toks[2].getText());
-
-  ASSERT_EQ(tok::newline,       Toks[3].getKind());
-}
-
-TEST_F(CommentLexerTest, DoxygenCommand7) {
-  const char *Source = "/// \\em\\em \\em\t\\em\n";
-  std::vector<Token> Toks;
-
-  lexString(Source, Toks);
-
-  ASSERT_EQ(8U, Toks.size());
-
-  ASSERT_EQ(tok::text,       Toks[0].getKind());
-  ASSERT_EQ(StringRef(" "),  Toks[0].getText());
-
-  ASSERT_EQ(tok::backslash_command, Toks[1].getKind());
-  ASSERT_EQ(StringRef("em"), getCommandName(Toks[1]));
-
-  ASSERT_EQ(tok::backslash_command, Toks[2].getKind());
-  ASSERT_EQ(StringRef("em"), getCommandName(Toks[2]));
-
-  ASSERT_EQ(tok::text,       Toks[3].getKind());
-  ASSERT_EQ(StringRef(" "),  Toks[3].getText());
-
-  ASSERT_EQ(tok::backslash_command, Toks[4].getKind());
-  ASSERT_EQ(StringRef("em"), getCommandName(Toks[4]));
-
-  ASSERT_EQ(tok::text,       Toks[5].getKind());
-  ASSERT_EQ(StringRef("\t"), Toks[5].getText());
-
-  ASSERT_EQ(tok::backslash_command, Toks[6].getKind());
-  ASSERT_EQ(StringRef("em"), getCommandName(Toks[6]));
-
-  ASSERT_EQ(tok::newline,    Toks[7].getKind());
-}
-
-TEST_F(CommentLexerTest, DoxygenCommand8) {
-  const char *Source = "/// @em@em @em\t@em\n";
-  std::vector<Token> Toks;
-
-  lexString(Source, Toks);
-
-  ASSERT_EQ(8U, Toks.size());
-
-  ASSERT_EQ(tok::text,       Toks[0].getKind());
-  ASSERT_EQ(StringRef(" "),  Toks[0].getText());
-
-  ASSERT_EQ(tok::at_command, Toks[1].getKind());
-  ASSERT_EQ(StringRef("em"), getCommandName(Toks[1]));
-
-  ASSERT_EQ(tok::at_command, Toks[2].getKind());
-  ASSERT_EQ(StringRef("em"), getCommandName(Toks[2]));
-
-  ASSERT_EQ(tok::text,       Toks[3].getKind());
-  ASSERT_EQ(StringRef(" "),  Toks[3].getText());
-
-  ASSERT_EQ(tok::at_command, Toks[4].getKind());
-  ASSERT_EQ(StringRef("em"), getCommandName(Toks[4]));
-
-  ASSERT_EQ(tok::text,       Toks[5].getKind());
-  ASSERT_EQ(StringRef("\t"), Toks[5].getText());
-
-  ASSERT_EQ(tok::at_command, Toks[6].getKind());
-  ASSERT_EQ(StringRef("em"), getCommandName(Toks[6]));
-
-  ASSERT_EQ(tok::newline,    Toks[7].getKind());
-}
-
-TEST_F(CommentLexerTest, DoxygenCommand9) {
-  const char *Source = "/// \\aaa\\bbb \\ccc\t\\ddd\n";
-  std::vector<Token> Toks;
-
-  lexString(Source, Toks);
-
-  ASSERT_EQ(8U, Toks.size());
-
-  ASSERT_EQ(tok::text,        Toks[0].getKind());
-  ASSERT_EQ(StringRef(" "),   Toks[0].getText());
-
-  ASSERT_EQ(tok::unknown_command, Toks[1].getKind());
-  ASSERT_EQ(StringRef("aaa"), Toks[1].getUnknownCommandName());
-
-  ASSERT_EQ(tok::unknown_command, Toks[2].getKind());
-  ASSERT_EQ(StringRef("bbb"), Toks[2].getUnknownCommandName());
-
-  ASSERT_EQ(tok::text,        Toks[3].getKind());
-  ASSERT_EQ(StringRef(" "),   Toks[3].getText());
-
-  ASSERT_EQ(tok::unknown_command, Toks[4].getKind());
-  ASSERT_EQ(StringRef("ccc"), Toks[4].getUnknownCommandName());
-
-  ASSERT_EQ(tok::text,        Toks[5].getKind());
-  ASSERT_EQ(StringRef("\t"),  Toks[5].getText());
-
-  ASSERT_EQ(tok::unknown_command, Toks[6].getKind());
-  ASSERT_EQ(StringRef("ddd"), Toks[6].getUnknownCommandName());
-
-  ASSERT_EQ(tok::newline,     Toks[7].getKind());
-}
-
-TEST_F(CommentLexerTest, DoxygenCommand10) {
-  const char *Source = "// \\c\n";
-  std::vector<Token> Toks;
-
-  lexString(Source, Toks);
-
-  ASSERT_EQ(3U, Toks.size());
-
-  ASSERT_EQ(tok::text,      Toks[0].getKind());
-  ASSERT_EQ(StringRef(" "), Toks[0].getText());
-
-  ASSERT_EQ(tok::backslash_command, Toks[1].getKind());
-  ASSERT_EQ(StringRef("c"), getCommandName(Toks[1]));
-
-  ASSERT_EQ(tok::newline,   Toks[2].getKind());
-}
-
-TEST_F(CommentLexerTest, RegisterCustomBlockCommand) {
-  const char *Source =
-    "/// \\NewBlockCommand Aaa.\n"
-    "/// @NewBlockCommand Aaa.\n";
-
-  Traits.registerBlockCommand(StringRef("NewBlockCommand"));
-
-  std::vector<Token> Toks;
-
-  lexString(Source, Toks);
-
-  ASSERT_EQ(8U, Toks.size());
-
-  ASSERT_EQ(tok::text,          Toks[0].getKind());
-  ASSERT_EQ(StringRef(" "),     Toks[0].getText());
-
-  ASSERT_EQ(tok::backslash_command, Toks[1].getKind());
-  ASSERT_EQ(StringRef("NewBlockCommand"), getCommandName(Toks[1]));
-
-  ASSERT_EQ(tok::text,          Toks[2].getKind());
-  ASSERT_EQ(StringRef(" Aaa."), Toks[2].getText());
-
-  ASSERT_EQ(tok::newline,       Toks[3].getKind());
-
-  ASSERT_EQ(tok::text,          Toks[4].getKind());
-  ASSERT_EQ(StringRef(" "),     Toks[4].getText());
-
-  ASSERT_EQ(tok::at_command,    Toks[5].getKind());
-  ASSERT_EQ(StringRef("NewBlockCommand"), getCommandName(Toks[5]));
-
-  ASSERT_EQ(tok::text,          Toks[6].getKind());
-  ASSERT_EQ(StringRef(" Aaa."), Toks[6].getText());
-
-  ASSERT_EQ(tok::newline,       Toks[7].getKind());
-}
-
-TEST_F(CommentLexerTest, RegisterMultipleBlockCommands) {
-  const char *Source =
-    "/// \\Foo\n"
-    "/// \\Bar Baz\n"
-    "/// \\Blech quux=corge\n";
-
-  Traits.registerBlockCommand(StringRef("Foo"));
-  Traits.registerBlockCommand(StringRef("Bar"));
-  Traits.registerBlockCommand(StringRef("Blech"));
-
-  std::vector<Token> Toks;
-
-  lexString(Source, Toks);
-
-  ASSERT_EQ(11U, Toks.size());
-
-  ASSERT_EQ(tok::text,      Toks[0].getKind());
-  ASSERT_EQ(StringRef(" "), Toks[0].getText());
-
-  ASSERT_EQ(tok::backslash_command, Toks[1].getKind());
-  ASSERT_EQ(StringRef("Foo"), getCommandName(Toks[1]));
-
-  ASSERT_EQ(tok::newline,     Toks[2].getKind());
-
-  ASSERT_EQ(tok::text,      Toks[3].getKind());
-  ASSERT_EQ(StringRef(" "), Toks[3].getText());
-
-  ASSERT_EQ(tok::backslash_command, Toks[4].getKind());
-  ASSERT_EQ(StringRef("Bar"), getCommandName(Toks[4]));
-
-  ASSERT_EQ(tok::text,         Toks[5].getKind());
-  ASSERT_EQ(StringRef(" Baz"), Toks[5].getText());
-
-  ASSERT_EQ(tok::newline,     Toks[6].getKind());
-
-  ASSERT_EQ(tok::text,      Toks[7].getKind());
-  ASSERT_EQ(StringRef(" "), Toks[7].getText());
-
-  ASSERT_EQ(tok::backslash_command, Toks[8].getKind());
-  ASSERT_EQ(StringRef("Blech"), getCommandName(Toks[8]));
-
-  ASSERT_EQ(tok::text,                Toks[9].getKind());
-  ASSERT_EQ(StringRef(" quux=corge"), Toks[9].getText());
-
-  ASSERT_EQ(tok::newline,     Toks[10].getKind());
-}
-
-// Empty verbatim block.
-TEST_F(CommentLexerTest, VerbatimBlock1) {
-  const char *Sources[] = {
-    "/// \\verbatim\\endverbatim\n//",
-    "/** \\verbatim\\endverbatim*/"
-  };
-
-  for (size_t i = 0, e = array_lengthof(Sources); i != e; i++) {
-    std::vector<Token> Toks;
-
-    lexString(Sources[i], Toks);
-
-    ASSERT_EQ(5U, Toks.size());
-
-    ASSERT_EQ(tok::text,                 Toks[0].getKind());
-    ASSERT_EQ(StringRef(" "),            Toks[0].getText());
-
-    ASSERT_EQ(tok::verbatim_block_begin, Toks[1].getKind());
-    ASSERT_EQ(StringRef("verbatim"),     getVerbatimBlockName(Toks[1]));
-
-    ASSERT_EQ(tok::verbatim_block_end,   Toks[2].getKind());
-    ASSERT_EQ(StringRef("endverbatim"),  getVerbatimBlockName(Toks[2]));
-
-    ASSERT_EQ(tok::newline,              Toks[3].getKind());
-    ASSERT_EQ(tok::newline,              Toks[4].getKind());
-  }
-}
-
-// Empty verbatim block without an end command.
-TEST_F(CommentLexerTest, VerbatimBlock2) {
-  const char *Source = "/// \\verbatim";
-
-  std::vector<Token> Toks;
-
-  lexString(Source, Toks);
-
-  ASSERT_EQ(3U, Toks.size());
-
-  ASSERT_EQ(tok::text,                 Toks[0].getKind());
-  ASSERT_EQ(StringRef(" "),            Toks[0].getText());
-
-  ASSERT_EQ(tok::verbatim_block_begin, Toks[1].getKind());
-  ASSERT_EQ(StringRef("verbatim"),     getVerbatimBlockName(Toks[1]));
-
-  ASSERT_EQ(tok::newline,              Toks[2].getKind());
-}
-
-// Empty verbatim block without an end command.
-TEST_F(CommentLexerTest, VerbatimBlock3) {
-  const char *Source = "/** \\verbatim*/";
-
-  std::vector<Token> Toks;
-
-  lexString(Source, Toks);
-
-  ASSERT_EQ(4U, Toks.size());
-
-  ASSERT_EQ(tok::text,                 Toks[0].getKind());
-  ASSERT_EQ(StringRef(" "),            Toks[0].getText());
-
-  ASSERT_EQ(tok::verbatim_block_begin, Toks[1].getKind());
-  ASSERT_EQ(StringRef("verbatim"),     getVerbatimBlockName(Toks[1]));
-
-  ASSERT_EQ(tok::newline,              Toks[2].getKind());
-  ASSERT_EQ(tok::newline,              Toks[3].getKind());
-}
-
-// Single-line verbatim block.
-TEST_F(CommentLexerTest, VerbatimBlock4) {
-  const char *Sources[] = {
-    "/// Meow \\verbatim aaa \\endverbatim\n//",
-    "/** Meow \\verbatim aaa \\endverbatim*/"
-  };
-
-  for (size_t i = 0, e = array_lengthof(Sources); i != e; i++) {
-    std::vector<Token> Toks;
-
-    lexString(Sources[i], Toks);
-
-    ASSERT_EQ(6U, Toks.size());
-
-    ASSERT_EQ(tok::text,                 Toks[0].getKind());
-    ASSERT_EQ(StringRef(" Meow "),       Toks[0].getText());
-
-    ASSERT_EQ(tok::verbatim_block_begin, Toks[1].getKind());
-    ASSERT_EQ(StringRef("verbatim"),     getVerbatimBlockName(Toks[1]));
-
-    ASSERT_EQ(tok::verbatim_block_line,  Toks[2].getKind());
-    ASSERT_EQ(StringRef(" aaa "),        Toks[2].getVerbatimBlockText());
-
-    ASSERT_EQ(tok::verbatim_block_end,   Toks[3].getKind());
-    ASSERT_EQ(StringRef("endverbatim"),  getVerbatimBlockName(Toks[3]));
-
-    ASSERT_EQ(tok::newline,              Toks[4].getKind());
-    ASSERT_EQ(tok::newline,              Toks[5].getKind());
-  }
-}
-
-// Single-line verbatim block without an end command.
-TEST_F(CommentLexerTest, VerbatimBlock5) {
-  const char *Sources[] = {
-    "/// Meow \\verbatim aaa \n//",
-    "/** Meow \\verbatim aaa */"
-  };
-
-  for (size_t i = 0, e = array_lengthof(Sources); i != e; i++) {
-    std::vector<Token> Toks;
-
-    lexString(Sources[i], Toks);
-
-    ASSERT_EQ(5U, Toks.size());
-
-    ASSERT_EQ(tok::text,                 Toks[0].getKind());
-    ASSERT_EQ(StringRef(" Meow "),       Toks[0].getText());
-
-    ASSERT_EQ(tok::verbatim_block_begin, Toks[1].getKind());
-    ASSERT_EQ(StringRef("verbatim"),     getVerbatimBlockName(Toks[1]));
-
-    ASSERT_EQ(tok::verbatim_block_line,  Toks[2].getKind());
-    ASSERT_EQ(StringRef(" aaa "),        Toks[2].getVerbatimBlockText());
-
-    ASSERT_EQ(tok::newline,              Toks[3].getKind());
-    ASSERT_EQ(tok::newline,              Toks[4].getKind());
-  }
-}
-
-TEST_F(CommentLexerTest, VerbatimBlock6) {
-  const char *Source =
-    "// \\verbatim\n"
-    "// Aaa\n"
-    "//\n"
-    "// Bbb\n"
-    "// \\endverbatim\n";
-
-  std::vector<Token> Toks;
-
-  lexString(Source, Toks);
-
-  ASSERT_EQ(10U, Toks.size());
-
-  ASSERT_EQ(tok::text,                 Toks[0].getKind());
-  ASSERT_EQ(StringRef(" "),            Toks[0].getText());
-
-  ASSERT_EQ(tok::verbatim_block_begin, Toks[1].getKind());
-  ASSERT_EQ(StringRef("verbatim"),     getVerbatimBlockName(Toks[1]));
-
-  ASSERT_EQ(tok::newline,              Toks[2].getKind());
-
-  ASSERT_EQ(tok::verbatim_block_line,  Toks[3].getKind());
-  ASSERT_EQ(StringRef(" Aaa"),         Toks[3].getVerbatimBlockText());
-
-  ASSERT_EQ(tok::newline,              Toks[4].getKind());
-
-  ASSERT_EQ(tok::newline,              Toks[5].getKind());
-
-  ASSERT_EQ(tok::verbatim_block_line,  Toks[6].getKind());
-  ASSERT_EQ(StringRef(" Bbb"),         Toks[6].getVerbatimBlockText());
-
-  ASSERT_EQ(tok::newline,              Toks[7].getKind());
-
-  ASSERT_EQ(tok::verbatim_block_end,   Toks[8].getKind());
-  ASSERT_EQ(StringRef("endverbatim"),  getVerbatimBlockName(Toks[8]));
-
-  ASSERT_EQ(tok::newline,              Toks[9].getKind());
-}
-
-TEST_F(CommentLexerTest, VerbatimBlock7) {
-  const char *Source =
-    "/* \\verbatim\n"
-    " * Aaa\n"
-    " *\n"
-    " * Bbb\n"
-    " * \\endverbatim\n"
-    " */";
-
-  std::vector<Token> Toks;
-
-  lexString(Source, Toks);
-
-  ASSERT_EQ(10U, Toks.size());
-
-  ASSERT_EQ(tok::text,                 Toks[0].getKind());
-  ASSERT_EQ(StringRef(" "),            Toks[0].getText());
-
-  ASSERT_EQ(tok::verbatim_block_begin, Toks[1].getKind());
-  ASSERT_EQ(StringRef("verbatim"),     getVerbatimBlockName(Toks[1]));
-
-  ASSERT_EQ(tok::verbatim_block_line,  Toks[2].getKind());
-  ASSERT_EQ(StringRef(" Aaa"),         Toks[2].getVerbatimBlockText());
-
-  ASSERT_EQ(tok::verbatim_block_line,  Toks[3].getKind());
-  ASSERT_EQ(StringRef(""),             Toks[3].getVerbatimBlockText());
-
-  ASSERT_EQ(tok::verbatim_block_line,  Toks[4].getKind());
-  ASSERT_EQ(StringRef(" Bbb"),         Toks[4].getVerbatimBlockText());
-
-  ASSERT_EQ(tok::verbatim_block_end,   Toks[5].getKind());
-  ASSERT_EQ(StringRef("endverbatim"),  getVerbatimBlockName(Toks[5]));
-
-  ASSERT_EQ(tok::newline,              Toks[6].getKind());
-
-  ASSERT_EQ(tok::text,                 Toks[7].getKind());
-  ASSERT_EQ(StringRef(" "),            Toks[7].getText());
-
-  ASSERT_EQ(tok::newline,              Toks[8].getKind());
-  ASSERT_EQ(tok::newline,              Toks[9].getKind());
-}
-
-// Complex test for verbatim blocks.
-TEST_F(CommentLexerTest, VerbatimBlock8) {
-  const char *Source =
-    "/* Meow \\verbatim aaa\\$\\@\n"
-    "bbb \\endverbati\r"
-    "ccc\r\n"
-    "ddd \\endverbatim Blah \\verbatim eee\n"
-    "\\endverbatim BlahBlah*/";
-  std::vector<Token> Toks;
-
-  lexString(Source, Toks);
-
-  ASSERT_EQ(14U, Toks.size());
-
-  ASSERT_EQ(tok::text,                 Toks[0].getKind());
-  ASSERT_EQ(StringRef(" Meow "),       Toks[0].getText());
-
-  ASSERT_EQ(tok::verbatim_block_begin, Toks[1].getKind());
-  ASSERT_EQ(StringRef("verbatim"),     getVerbatimBlockName(Toks[1]));
-
-  ASSERT_EQ(tok::verbatim_block_line,  Toks[2].getKind());
-  ASSERT_EQ(StringRef(" aaa\\$\\@"),   Toks[2].getVerbatimBlockText());
-
-  ASSERT_EQ(tok::verbatim_block_line,  Toks[3].getKind());
-  ASSERT_EQ(StringRef("bbb \\endverbati"), Toks[3].getVerbatimBlockText());
-
-  ASSERT_EQ(tok::verbatim_block_line,  Toks[4].getKind());
-  ASSERT_EQ(StringRef("ccc"),          Toks[4].getVerbatimBlockText());
-
-  ASSERT_EQ(tok::verbatim_block_line,  Toks[5].getKind());
-  ASSERT_EQ(StringRef("ddd "),         Toks[5].getVerbatimBlockText());
-
-  ASSERT_EQ(tok::verbatim_block_end,   Toks[6].getKind());
-  ASSERT_EQ(StringRef("endverbatim"),  getVerbatimBlockName(Toks[6]));
-
-  ASSERT_EQ(tok::text,                 Toks[7].getKind());
-  ASSERT_EQ(StringRef(" Blah "),       Toks[7].getText());
-
-  ASSERT_EQ(tok::verbatim_block_begin, Toks[8].getKind());
-  ASSERT_EQ(StringRef("verbatim"),     getVerbatimBlockName(Toks[8]));
-
-  ASSERT_EQ(tok::verbatim_block_line,  Toks[9].getKind());
-  ASSERT_EQ(StringRef(" eee"),         Toks[9].getVerbatimBlockText());
-
-  ASSERT_EQ(tok::verbatim_block_end,   Toks[10].getKind());
-  ASSERT_EQ(StringRef("endverbatim"),  getVerbatimBlockName(Toks[10]));
-
-  ASSERT_EQ(tok::text,                 Toks[11].getKind());
-  ASSERT_EQ(StringRef(" BlahBlah"),    Toks[11].getText());
-
-  ASSERT_EQ(tok::newline,              Toks[12].getKind());
-  ASSERT_EQ(tok::newline,              Toks[13].getKind());
-}
-
-// LaTeX verbatim blocks.
-TEST_F(CommentLexerTest, VerbatimBlock9) {
-  const char *Source =
-    "/// \\f$ Aaa \\f$ \\f[ Bbb \\f] \\f{ Ccc \\f}";
-  std::vector<Token> Toks;
-
-  lexString(Source, Toks);
-
-  ASSERT_EQ(13U, Toks.size());
-
-  ASSERT_EQ(tok::text,                 Toks[0].getKind());
-  ASSERT_EQ(StringRef(" "),            Toks[0].getText());
-
-  ASSERT_EQ(tok::verbatim_block_begin, Toks[1].getKind());
-  ASSERT_EQ(StringRef("f$"),           getVerbatimBlockName(Toks[1]));
-
-  ASSERT_EQ(tok::verbatim_block_line,  Toks[2].getKind());
-  ASSERT_EQ(StringRef(" Aaa "),        Toks[2].getVerbatimBlockText());
-
-  ASSERT_EQ(tok::verbatim_block_end,   Toks[3].getKind());
-  ASSERT_EQ(StringRef("f$"),           getVerbatimBlockName(Toks[3]));
-
-  ASSERT_EQ(tok::text,                 Toks[4].getKind());
-  ASSERT_EQ(StringRef(" "),            Toks[4].getText());
-
-  ASSERT_EQ(tok::verbatim_block_begin, Toks[5].getKind());
-  ASSERT_EQ(StringRef("f["),           getVerbatimBlockName(Toks[5]));
-
-  ASSERT_EQ(tok::verbatim_block_line,  Toks[6].getKind());
-  ASSERT_EQ(StringRef(" Bbb "),        Toks[6].getVerbatimBlockText());
-
-  ASSERT_EQ(tok::verbatim_block_end,   Toks[7].getKind());
-  ASSERT_EQ(StringRef("f]"),           getVerbatimBlockName(Toks[7]));
-
-  ASSERT_EQ(tok::text,                 Toks[8].getKind());
-  ASSERT_EQ(StringRef(" "),            Toks[8].getText());
-
-  ASSERT_EQ(tok::verbatim_block_begin, Toks[9].getKind());
-  ASSERT_EQ(StringRef("f{"),           getVerbatimBlockName(Toks[9]));
-
-  ASSERT_EQ(tok::verbatim_block_line,  Toks[10].getKind());
-  ASSERT_EQ(StringRef(" Ccc "),        Toks[10].getVerbatimBlockText());
-
-  ASSERT_EQ(tok::verbatim_block_end,   Toks[11].getKind());
-  ASSERT_EQ(StringRef("f}"),           getVerbatimBlockName(Toks[11]));
-
-  ASSERT_EQ(tok::newline,              Toks[12].getKind());
-}
-
-// Empty verbatim line.
-TEST_F(CommentLexerTest, VerbatimLine1) {
-  const char *Sources[] = {
-    "/// \\fn\n//",
-    "/** \\fn*/"
-  };
-
-  for (size_t i = 0, e = array_lengthof(Sources); i != e; i++) {
-    std::vector<Token> Toks;
-
-    lexString(Sources[i], Toks);
-
-    ASSERT_EQ(4U, Toks.size());
-
-    ASSERT_EQ(tok::text,               Toks[0].getKind());
-    ASSERT_EQ(StringRef(" "),          Toks[0].getText());
-
-    ASSERT_EQ(tok::verbatim_line_name, Toks[1].getKind());
-    ASSERT_EQ(StringRef("fn"),         getVerbatimLineName(Toks[1]));
-
-    ASSERT_EQ(tok::newline,            Toks[2].getKind());
-    ASSERT_EQ(tok::newline,            Toks[3].getKind());
-  }
-}
-
-// Verbatim line with Doxygen escape sequences, which should not be expanded.
-TEST_F(CommentLexerTest, VerbatimLine2) {
-  const char *Sources[] = {
-    "/// \\fn void *foo(const char *zzz = \"\\$\");\n//",
-    "/** \\fn void *foo(const char *zzz = \"\\$\");*/"
-  };
-
-  for (size_t i = 0, e = array_lengthof(Sources); i != e; i++) {
-    std::vector<Token> Toks;
-
-    lexString(Sources[i], Toks);
-
-    ASSERT_EQ(5U, Toks.size());
-
-    ASSERT_EQ(tok::text,               Toks[0].getKind());
-    ASSERT_EQ(StringRef(" "),          Toks[0].getText());
-
-    ASSERT_EQ(tok::verbatim_line_name, Toks[1].getKind());
-    ASSERT_EQ(StringRef("fn"),         getVerbatimLineName(Toks[1]));
-
-    ASSERT_EQ(tok::verbatim_line_text, Toks[2].getKind());
-    ASSERT_EQ(StringRef(" void *foo(const char *zzz = \"\\$\");"),
-                                       Toks[2].getVerbatimLineText());
-
-    ASSERT_EQ(tok::newline,            Toks[3].getKind());
-    ASSERT_EQ(tok::newline,            Toks[4].getKind());
-  }
-}
-
-// Verbatim line should not eat anything from next source line.
-TEST_F(CommentLexerTest, VerbatimLine3) {
-  const char *Source =
-    "/** \\fn void *foo(const char *zzz = \"\\$\");\n"
-    " * Meow\n"
-    " */";
-
-  std::vector<Token> Toks;
-
-  lexString(Source, Toks);
-
-  ASSERT_EQ(9U, Toks.size());
-
-  ASSERT_EQ(tok::text,               Toks[0].getKind());
-  ASSERT_EQ(StringRef(" "),          Toks[0].getText());
-
-  ASSERT_EQ(tok::verbatim_line_name, Toks[1].getKind());
-  ASSERT_EQ(StringRef("fn"),         getVerbatimLineName(Toks[1]));
-
-  ASSERT_EQ(tok::verbatim_line_text, Toks[2].getKind());
-  ASSERT_EQ(StringRef(" void *foo(const char *zzz = \"\\$\");"),
-                                     Toks[2].getVerbatimLineText());
-  ASSERT_EQ(tok::newline,            Toks[3].getKind());
-
-  ASSERT_EQ(tok::text,               Toks[4].getKind());
-  ASSERT_EQ(StringRef(" Meow"),      Toks[4].getText());
-  ASSERT_EQ(tok::newline,            Toks[5].getKind());
-
-  ASSERT_EQ(tok::text,               Toks[6].getKind());
-  ASSERT_EQ(StringRef(" "),          Toks[6].getText());
-
-  ASSERT_EQ(tok::newline,            Toks[7].getKind());
-  ASSERT_EQ(tok::newline,            Toks[8].getKind());
-}
-
-TEST_F(CommentLexerTest, HTML1) {
-  const char *Source =
-    "// <";
-
-  std::vector<Token> Toks;
-
-  lexString(Source, Toks);
-
-  ASSERT_EQ(3U, Toks.size());
-
-  ASSERT_EQ(tok::text,      Toks[0].getKind());
-  ASSERT_EQ(StringRef(" "), Toks[0].getText());
-
-  ASSERT_EQ(tok::text,      Toks[1].getKind());
-  ASSERT_EQ(StringRef("<"), Toks[1].getText());
-
-  ASSERT_EQ(tok::newline,   Toks[2].getKind());
-}
-
-TEST_F(CommentLexerTest, HTML2) {
-  const char *Source =
-    "// a<2";
-
-  std::vector<Token> Toks;
-
-  lexString(Source, Toks);
-
-  ASSERT_EQ(4U, Toks.size());
-
-  ASSERT_EQ(tok::text,       Toks[0].getKind());
-  ASSERT_EQ(StringRef(" a"), Toks[0].getText());
-
-  ASSERT_EQ(tok::text,       Toks[1].getKind());
-  ASSERT_EQ(StringRef("<"),  Toks[1].getText());
-
-  ASSERT_EQ(tok::text,       Toks[2].getKind());
-  ASSERT_EQ(StringRef("2"),  Toks[2].getText());
-
-  ASSERT_EQ(tok::newline,    Toks[3].getKind());
-}
-
-TEST_F(CommentLexerTest, HTML3) {
-  const char *Source =
-    "// < img";
-
-  std::vector<Token> Toks;
-
-  lexString(Source, Toks);
-
-  ASSERT_EQ(4U, Toks.size());
-
-  ASSERT_EQ(tok::text,         Toks[0].getKind());
-  ASSERT_EQ(StringRef(" "),    Toks[0].getText());
-
-  ASSERT_EQ(tok::text,         Toks[1].getKind());
-  ASSERT_EQ(StringRef("<"),    Toks[1].getText());
-
-  ASSERT_EQ(tok::text,         Toks[2].getKind());
-  ASSERT_EQ(StringRef(" img"), Toks[2].getText());
-
-  ASSERT_EQ(tok::newline,      Toks[3].getKind());
-}
-
-TEST_F(CommentLexerTest, HTML4) {
-  const char *Sources[] = {
-    "// <img",
-    "// <img "
-  };
-
-  for (size_t i = 0, e = array_lengthof(Sources); i != e; i++) {
-    std::vector<Token> Toks;
-
-    lexString(Sources[i], Toks);
-
-    ASSERT_EQ(3U, Toks.size());
-
-    ASSERT_EQ(tok::text,           Toks[0].getKind());
-    ASSERT_EQ(StringRef(" "),      Toks[0].getText());
-
-    ASSERT_EQ(tok::html_start_tag, Toks[1].getKind());
-    ASSERT_EQ(StringRef("img"),    Toks[1].getHTMLTagStartName());
-
-    ASSERT_EQ(tok::newline,        Toks[2].getKind());
-  }
-}
-
-TEST_F(CommentLexerTest, HTML5) {
-  const char *Source =
-    "// <img 42";
-
-  std::vector<Token> Toks;
-
-  lexString(Source, Toks);
-
-  ASSERT_EQ(4U, Toks.size());
-
-  ASSERT_EQ(tok::text,           Toks[0].getKind());
-  ASSERT_EQ(StringRef(" "),      Toks[0].getText());
-
-  ASSERT_EQ(tok::html_start_tag, Toks[1].getKind());
-  ASSERT_EQ(StringRef("img"),    Toks[1].getHTMLTagStartName());
-
-  ASSERT_EQ(tok::text,           Toks[2].getKind());
-  ASSERT_EQ(StringRef("42"),     Toks[2].getText());
-
-  ASSERT_EQ(tok::newline,        Toks[3].getKind());
-}
-
-TEST_F(CommentLexerTest, HTML6) {
-  const char *Source = "// <img> Meow";
-
-  std::vector<Token> Toks;
-
-  lexString(Source, Toks);
-
-  ASSERT_EQ(5U, Toks.size());
-
-  ASSERT_EQ(tok::text,           Toks[0].getKind());
-  ASSERT_EQ(StringRef(" "),      Toks[0].getText());
-
-  ASSERT_EQ(tok::html_start_tag, Toks[1].getKind());
-  ASSERT_EQ(StringRef("img"),    Toks[1].getHTMLTagStartName());
-
-  ASSERT_EQ(tok::html_greater,   Toks[2].getKind());
-
-  ASSERT_EQ(tok::text,           Toks[3].getKind());
-  ASSERT_EQ(StringRef(" Meow"),  Toks[3].getText());
-
-  ASSERT_EQ(tok::newline,        Toks[4].getKind());
-}
-
-TEST_F(CommentLexerTest, HTML7) {
-  const char *Source = "// <img=";
-
-  std::vector<Token> Toks;
-
-  lexString(Source, Toks);
-
-  ASSERT_EQ(4U, Toks.size());
-
-  ASSERT_EQ(tok::text,           Toks[0].getKind());
-  ASSERT_EQ(StringRef(" "),      Toks[0].getText());
-
-  ASSERT_EQ(tok::html_start_tag, Toks[1].getKind());
-  ASSERT_EQ(StringRef("img"),    Toks[1].getHTMLTagStartName());
-
-  ASSERT_EQ(tok::text,           Toks[2].getKind());
-  ASSERT_EQ(StringRef("="),      Toks[2].getText());
-
-  ASSERT_EQ(tok::newline,        Toks[3].getKind());
-}
-
-TEST_F(CommentLexerTest, HTML8) {
-  const char *Source = "// <img src=> Meow";
-
-  std::vector<Token> Toks;
-
-  lexString(Source, Toks);
-
-  ASSERT_EQ(7U, Toks.size());
-
-  ASSERT_EQ(tok::text,           Toks[0].getKind());
-  ASSERT_EQ(StringRef(" "),      Toks[0].getText());
-
-  ASSERT_EQ(tok::html_start_tag, Toks[1].getKind());
-  ASSERT_EQ(StringRef("img"),    Toks[1].getHTMLTagStartName());
-
-  ASSERT_EQ(tok::html_ident,     Toks[2].getKind());
-  ASSERT_EQ(StringRef("src"),   Toks[2].getHTMLIdent());
-
-  ASSERT_EQ(tok::html_equals,    Toks[3].getKind());
-
-  ASSERT_EQ(tok::html_greater,   Toks[4].getKind());
-
-  ASSERT_EQ(tok::text,           Toks[5].getKind());
-  ASSERT_EQ(StringRef(" Meow"),  Toks[5].getText());
-
-  ASSERT_EQ(tok::newline,        Toks[6].getKind());
-}
-
-TEST_F(CommentLexerTest, HTML9) {
-  const char *Sources[] = {
-    "// <img src",
-    "// <img src "
-  };
-
-  for (size_t i = 0, e = array_lengthof(Sources); i != e; i++) {
-    std::vector<Token> Toks;
-
-    lexString(Sources[i], Toks);
-
-    ASSERT_EQ(4U, Toks.size());
-
-    ASSERT_EQ(tok::text,           Toks[0].getKind());
-    ASSERT_EQ(StringRef(" "),      Toks[0].getText());
-
-    ASSERT_EQ(tok::html_start_tag, Toks[1].getKind());
-    ASSERT_EQ(StringRef("img"),    Toks[1].getHTMLTagStartName());
-
-    ASSERT_EQ(tok::html_ident,     Toks[2].getKind());
-    ASSERT_EQ(StringRef("src"),    Toks[2].getHTMLIdent());
-
-    ASSERT_EQ(tok::newline,        Toks[3].getKind());
-  }
-}
-
-TEST_F(CommentLexerTest, HTML10) {
-  const char *Sources[] = {
-    "// <img src=",
-    "// <img src ="
-  };
-
-  for (size_t i = 0, e = array_lengthof(Sources); i != e; i++) {
-    std::vector<Token> Toks;
-
-    lexString(Sources[i], Toks);
-
-    ASSERT_EQ(5U, Toks.size());
-
-    ASSERT_EQ(tok::text,           Toks[0].getKind());
-    ASSERT_EQ(StringRef(" "),      Toks[0].getText());
-
-    ASSERT_EQ(tok::html_start_tag, Toks[1].getKind());
-    ASSERT_EQ(StringRef("img"),    Toks[1].getHTMLTagStartName());
-
-    ASSERT_EQ(tok::html_ident,     Toks[2].getKind());
-    ASSERT_EQ(StringRef("src"),    Toks[2].getHTMLIdent());
-
-    ASSERT_EQ(tok::html_equals,    Toks[3].getKind());
-
-    ASSERT_EQ(tok::newline,        Toks[4].getKind());
-  }
-}
-
-TEST_F(CommentLexerTest, HTML11) {
-  const char *Sources[] = {
-    "// <img src=\"",
-    "// <img src = \"",
-    "// <img src=\'",
-    "// <img src = \'"
-  };
-
-  for (size_t i = 0, e = array_lengthof(Sources); i != e; i++) {
-    std::vector<Token> Toks;
-
-    lexString(Sources[i], Toks);
-
-    ASSERT_EQ(6U, Toks.size());
-
-    ASSERT_EQ(tok::text,               Toks[0].getKind());
-    ASSERT_EQ(StringRef(" "),          Toks[0].getText());
-
-    ASSERT_EQ(tok::html_start_tag,     Toks[1].getKind());
-    ASSERT_EQ(StringRef("img"),        Toks[1].getHTMLTagStartName());
-
-    ASSERT_EQ(tok::html_ident,         Toks[2].getKind());
-    ASSERT_EQ(StringRef("src"),        Toks[2].getHTMLIdent());
-
-    ASSERT_EQ(tok::html_equals,        Toks[3].getKind());
-
-    ASSERT_EQ(tok::html_quoted_string, Toks[4].getKind());
-    ASSERT_EQ(StringRef(""),           Toks[4].getHTMLQuotedString());
-
-    ASSERT_EQ(tok::newline,            Toks[5].getKind());
-  }
-}
-
-TEST_F(CommentLexerTest, HTML12) {
-  const char *Source = "// <img src=@";
-
-  std::vector<Token> Toks;
-
-  lexString(Source, Toks);
-
-  ASSERT_EQ(6U, Toks.size());
-
-  ASSERT_EQ(tok::text,           Toks[0].getKind());
-  ASSERT_EQ(StringRef(" "),      Toks[0].getText());
-
-  ASSERT_EQ(tok::html_start_tag, Toks[1].getKind());
-  ASSERT_EQ(StringRef("img"),    Toks[1].getHTMLTagStartName());
-
-  ASSERT_EQ(tok::html_ident,     Toks[2].getKind());
-  ASSERT_EQ(StringRef("src"),    Toks[2].getHTMLIdent());
-
-  ASSERT_EQ(tok::html_equals,    Toks[3].getKind());
-
-  ASSERT_EQ(tok::text,           Toks[4].getKind());
-  ASSERT_EQ(StringRef("@"),      Toks[4].getText());
-
-  ASSERT_EQ(tok::newline,        Toks[5].getKind());
-}
-
-TEST_F(CommentLexerTest, HTML13) {
-  const char *Sources[] = {
-    "// <img src=\"val\\\"\\'val",
-    "// <img src=\"val\\\"\\'val\"",
-    "// <img src=\'val\\\"\\'val",
-    "// <img src=\'val\\\"\\'val\'"
-  };
-
-  for (size_t i = 0, e = array_lengthof(Sources); i != e; i++) {
-    std::vector<Token> Toks;
-
-    lexString(Sources[i], Toks);
-
-    ASSERT_EQ(6U, Toks.size());
-
-    ASSERT_EQ(tok::text,                  Toks[0].getKind());
-    ASSERT_EQ(StringRef(" "),             Toks[0].getText());
-
-    ASSERT_EQ(tok::html_start_tag,        Toks[1].getKind());
-    ASSERT_EQ(StringRef("img"),           Toks[1].getHTMLTagStartName());
-
-    ASSERT_EQ(tok::html_ident,            Toks[2].getKind());
-    ASSERT_EQ(StringRef("src"),           Toks[2].getHTMLIdent());
-
-    ASSERT_EQ(tok::html_equals,           Toks[3].getKind());
-
-    ASSERT_EQ(tok::html_quoted_string,    Toks[4].getKind());
-    ASSERT_EQ(StringRef("val\\\"\\'val"), Toks[4].getHTMLQuotedString());
-
-    ASSERT_EQ(tok::newline,               Toks[5].getKind());
-  }
-}
-
-TEST_F(CommentLexerTest, HTML14) {
-  const char *Sources[] = {
-    "// <img src=\"val\\\"\\'val\">",
-    "// <img src=\'val\\\"\\'val\'>"
-  };
-
-  for (size_t i = 0, e = array_lengthof(Sources); i != e; i++) {
-    std::vector<Token> Toks;
-
-    lexString(Sources[i], Toks);
-
-    ASSERT_EQ(7U, Toks.size());
-
-    ASSERT_EQ(tok::text,                  Toks[0].getKind());
-    ASSERT_EQ(StringRef(" "),             Toks[0].getText());
-
-    ASSERT_EQ(tok::html_start_tag,        Toks[1].getKind());
-    ASSERT_EQ(StringRef("img"),           Toks[1].getHTMLTagStartName());
-
-    ASSERT_EQ(tok::html_ident,            Toks[2].getKind());
-    ASSERT_EQ(StringRef("src"),           Toks[2].getHTMLIdent());
-
-    ASSERT_EQ(tok::html_equals,           Toks[3].getKind());
-
-    ASSERT_EQ(tok::html_quoted_string,    Toks[4].getKind());
-    ASSERT_EQ(StringRef("val\\\"\\'val"), Toks[4].getHTMLQuotedString());
-
-    ASSERT_EQ(tok::html_greater,          Toks[5].getKind());
-
-    ASSERT_EQ(tok::newline,               Toks[6].getKind());
-  }
-}
-
-TEST_F(CommentLexerTest, HTML15) {
-  const char *Sources[] = {
-    "// <img/>",
-    "// <img />"
-  };
-
-  for (size_t i = 0, e = array_lengthof(Sources); i != e; i++) {
-    std::vector<Token> Toks;
-
-    lexString(Sources[i], Toks);
-
-    ASSERT_EQ(4U, Toks.size());
-
-    ASSERT_EQ(tok::text,               Toks[0].getKind());
-    ASSERT_EQ(StringRef(" "),          Toks[0].getText());
-
-    ASSERT_EQ(tok::html_start_tag,     Toks[1].getKind());
-    ASSERT_EQ(StringRef("img"),        Toks[1].getHTMLTagStartName());
-
-    ASSERT_EQ(tok::html_slash_greater, Toks[2].getKind());
-
-    ASSERT_EQ(tok::newline,            Toks[3].getKind());
-  }
-}
-
-TEST_F(CommentLexerTest, HTML16) {
-  const char *Sources[] = {
-    "// <img/ Aaa",
-    "// <img / Aaa"
-  };
-
-  for (size_t i = 0, e = array_lengthof(Sources); i != e; i++) {
-    std::vector<Token> Toks;
-
-    lexString(Sources[i], Toks);
-
-    ASSERT_EQ(5U, Toks.size());
-
-    ASSERT_EQ(tok::text,               Toks[0].getKind());
-    ASSERT_EQ(StringRef(" "),          Toks[0].getText());
-
-    ASSERT_EQ(tok::html_start_tag,     Toks[1].getKind());
-    ASSERT_EQ(StringRef("img"),        Toks[1].getHTMLTagStartName());
-
-    ASSERT_EQ(tok::text,               Toks[2].getKind());
-    ASSERT_EQ(StringRef("/"),          Toks[2].getText());
-
-    ASSERT_EQ(tok::text,               Toks[3].getKind());
-    ASSERT_EQ(StringRef(" Aaa"),       Toks[3].getText());
-
-    ASSERT_EQ(tok::newline,            Toks[4].getKind());
-  }
-}
-
-TEST_F(CommentLexerTest, HTML17) {
-  const char *Source = "// </";
-
-  std::vector<Token> Toks;
-
-  lexString(Source, Toks);
-
-  ASSERT_EQ(3U, Toks.size());
-
-  ASSERT_EQ(tok::text,       Toks[0].getKind());
-  ASSERT_EQ(StringRef(" "),  Toks[0].getText());
-
-  ASSERT_EQ(tok::text,       Toks[1].getKind());
-  ASSERT_EQ(StringRef("</"), Toks[1].getText());
-
-  ASSERT_EQ(tok::newline,    Toks[2].getKind());
-}
-
-TEST_F(CommentLexerTest, HTML18) {
-  const char *Source = "// </@";
-
-  std::vector<Token> Toks;
-
-  lexString(Source, Toks);
-
-  ASSERT_EQ(4U, Toks.size());
-
-  ASSERT_EQ(tok::text,       Toks[0].getKind());
-  ASSERT_EQ(StringRef(" "),  Toks[0].getText());
-
-  ASSERT_EQ(tok::text,       Toks[1].getKind());
-  ASSERT_EQ(StringRef("</"), Toks[1].getText());
-
-  ASSERT_EQ(tok::text,       Toks[2].getKind());
-  ASSERT_EQ(StringRef("@"),  Toks[2].getText());
-
-  ASSERT_EQ(tok::newline,    Toks[3].getKind());
-}
-
-TEST_F(CommentLexerTest, HTML19) {
-  const char *Source = "// </img";
-
-  std::vector<Token> Toks;
-
-  lexString(Source, Toks);
-
-  ASSERT_EQ(3U, Toks.size());
-
-  ASSERT_EQ(tok::text,         Toks[0].getKind());
-  ASSERT_EQ(StringRef(" "),    Toks[0].getText());
-
-  ASSERT_EQ(tok::html_end_tag, Toks[1].getKind());
-  ASSERT_EQ(StringRef("img"),  Toks[1].getHTMLTagEndName());
-
-  ASSERT_EQ(tok::newline,      Toks[2].getKind());
-}
-
-TEST_F(CommentLexerTest, NotAKnownHTMLTag1) {
-  const char *Source = "// <tag>";
-
-  std::vector<Token> Toks;
-
-  lexString(Source, Toks);
-
-  ASSERT_EQ(4U, Toks.size());
-
-  ASSERT_EQ(tok::text,         Toks[0].getKind());
-  ASSERT_EQ(StringRef(" "),    Toks[0].getText());
-
-  ASSERT_EQ(tok::text,         Toks[1].getKind());
-  ASSERT_EQ(StringRef("<tag"), Toks[1].getText());
-
-  ASSERT_EQ(tok::text,         Toks[2].getKind());
-  ASSERT_EQ(StringRef(">"),    Toks[2].getText());
-
-  ASSERT_EQ(tok::newline,      Toks[3].getKind());
-}
-
-TEST_F(CommentLexerTest, NotAKnownHTMLTag2) {
-  const char *Source = "// </tag>";
-
-  std::vector<Token> Toks;
-
-  lexString(Source, Toks);
-
-  ASSERT_EQ(4U, Toks.size());
-
-  ASSERT_EQ(tok::text,          Toks[0].getKind());
-  ASSERT_EQ(StringRef(" "),     Toks[0].getText());
-
-  ASSERT_EQ(tok::text,          Toks[1].getKind());
-  ASSERT_EQ(StringRef("</tag"), Toks[1].getText());
-
-  ASSERT_EQ(tok::text,          Toks[2].getKind());
-  ASSERT_EQ(StringRef(">"),     Toks[2].getText());
-
-  ASSERT_EQ(tok::newline,       Toks[3].getKind());
-}
-
-TEST_F(CommentLexerTest, HTMLCharacterReferences1) {
-  const char *Source = "// &";
-
-  std::vector<Token> Toks;
-
-  lexString(Source, Toks);
-
-  ASSERT_EQ(3U, Toks.size());
-
-  ASSERT_EQ(tok::text,         Toks[0].getKind());
-  ASSERT_EQ(StringRef(" "),    Toks[0].getText());
-
-  ASSERT_EQ(tok::text,         Toks[1].getKind());
-  ASSERT_EQ(StringRef("&"),    Toks[1].getText());
-
-  ASSERT_EQ(tok::newline,      Toks[2].getKind());
-}
-
-TEST_F(CommentLexerTest, HTMLCharacterReferences2) {
-  const char *Source = "// &!";
-
-  std::vector<Token> Toks;
-
-  lexString(Source, Toks);
-
-  ASSERT_EQ(4U, Toks.size());
-
-  ASSERT_EQ(tok::text,         Toks[0].getKind());
-  ASSERT_EQ(StringRef(" "),    Toks[0].getText());
-
-  ASSERT_EQ(tok::text,         Toks[1].getKind());
-  ASSERT_EQ(StringRef("&"),    Toks[1].getText());
-
-  ASSERT_EQ(tok::text,         Toks[2].getKind());
-  ASSERT_EQ(StringRef("!"),    Toks[2].getText());
-
-  ASSERT_EQ(tok::newline,      Toks[3].getKind());
-}
-
-TEST_F(CommentLexerTest, HTMLCharacterReferences3) {
-  const char *Source = "// &amp";
-
-  std::vector<Token> Toks;
-
-  lexString(Source, Toks);
-
-  ASSERT_EQ(3U, Toks.size());
-
-  ASSERT_EQ(tok::text,         Toks[0].getKind());
-  ASSERT_EQ(StringRef(" "),    Toks[0].getText());
-
-  ASSERT_EQ(tok::text,         Toks[1].getKind());
-  ASSERT_EQ(StringRef("&amp"), Toks[1].getText());
-
-  ASSERT_EQ(tok::newline,      Toks[2].getKind());
-}
-
-TEST_F(CommentLexerTest, HTMLCharacterReferences4) {
-  const char *Source = "// &amp!";
-
-  std::vector<Token> Toks;
-
-  lexString(Source, Toks);
-
-  ASSERT_EQ(4U, Toks.size());
-
-  ASSERT_EQ(tok::text,         Toks[0].getKind());
-  ASSERT_EQ(StringRef(" "),    Toks[0].getText());
-
-  ASSERT_EQ(tok::text,         Toks[1].getKind());
-  ASSERT_EQ(StringRef("&amp"), Toks[1].getText());
-
-  ASSERT_EQ(tok::text,         Toks[2].getKind());
-  ASSERT_EQ(StringRef("!"),    Toks[2].getText());
-
-  ASSERT_EQ(tok::newline,      Toks[3].getKind());
-}
-
-TEST_F(CommentLexerTest, HTMLCharacterReferences5) {
-  const char *Source = "// &#";
-
-  std::vector<Token> Toks;
-
-  lexString(Source, Toks);
-
-  ASSERT_EQ(3U, Toks.size());
-
-  ASSERT_EQ(tok::text,         Toks[0].getKind());
-  ASSERT_EQ(StringRef(" "),    Toks[0].getText());
-
-  ASSERT_EQ(tok::text,         Toks[1].getKind());
-  ASSERT_EQ(StringRef("&#"),   Toks[1].getText());
-
-  ASSERT_EQ(tok::newline,      Toks[2].getKind());
-}
-
-TEST_F(CommentLexerTest, HTMLCharacterReferences6) {
-  const char *Source = "// &#a";
-
-  std::vector<Token> Toks;
-
-  lexString(Source, Toks);
-
-  ASSERT_EQ(4U, Toks.size());
-
-  ASSERT_EQ(tok::text,         Toks[0].getKind());
-  ASSERT_EQ(StringRef(" "),    Toks[0].getText());
-
-  ASSERT_EQ(tok::text,         Toks[1].getKind());
-  ASSERT_EQ(StringRef("&#"),   Toks[1].getText());
-
-  ASSERT_EQ(tok::text,         Toks[2].getKind());
-  ASSERT_EQ(StringRef("a"),    Toks[2].getText());
-
-  ASSERT_EQ(tok::newline,      Toks[3].getKind());
-}
-
-TEST_F(CommentLexerTest, HTMLCharacterReferences7) {
-  const char *Source = "// &#42";
-
-  std::vector<Token> Toks;
-
-  lexString(Source, Toks);
-
-  ASSERT_EQ(3U, Toks.size());
-
-  ASSERT_EQ(tok::text,         Toks[0].getKind());
-  ASSERT_EQ(StringRef(" "),    Toks[0].getText());
-
-  ASSERT_EQ(tok::text,         Toks[1].getKind());
-  ASSERT_EQ(StringRef("&#42"), Toks[1].getText());
-
-  ASSERT_EQ(tok::newline,      Toks[2].getKind());
-}
-
-TEST_F(CommentLexerTest, HTMLCharacterReferences8) {
-  const char *Source = "// &#42a";
-
-  std::vector<Token> Toks;
-
-  lexString(Source, Toks);
-
-  ASSERT_EQ(4U, Toks.size());
-
-  ASSERT_EQ(tok::text,         Toks[0].getKind());
-  ASSERT_EQ(StringRef(" "),    Toks[0].getText());
-
-  ASSERT_EQ(tok::text,         Toks[1].getKind());
-  ASSERT_EQ(StringRef("&#42"), Toks[1].getText());
-
-  ASSERT_EQ(tok::text,         Toks[2].getKind());
-  ASSERT_EQ(StringRef("a"),    Toks[2].getText());
-
-  ASSERT_EQ(tok::newline,      Toks[3].getKind());
-}
-
-TEST_F(CommentLexerTest, HTMLCharacterReferences9) {
-  const char *Source = "// &#x";
-
-  std::vector<Token> Toks;
-
-  lexString(Source, Toks);
-
-  ASSERT_EQ(3U, Toks.size());
-
-  ASSERT_EQ(tok::text,         Toks[0].getKind());
-  ASSERT_EQ(StringRef(" "),    Toks[0].getText());
-
-  ASSERT_EQ(tok::text,         Toks[1].getKind());
-  ASSERT_EQ(StringRef("&#x"),  Toks[1].getText());
-
-  ASSERT_EQ(tok::newline,      Toks[2].getKind());
-}
-
-TEST_F(CommentLexerTest, HTMLCharacterReferences10) {
-  const char *Source = "// &#xz";
-
-  std::vector<Token> Toks;
-
-  lexString(Source, Toks);
-
-  ASSERT_EQ(4U, Toks.size());
-
-  ASSERT_EQ(tok::text,         Toks[0].getKind());
-  ASSERT_EQ(StringRef(" "),    Toks[0].getText());
-
-  ASSERT_EQ(tok::text,         Toks[1].getKind());
-  ASSERT_EQ(StringRef("&#x"),  Toks[1].getText());
-
-  ASSERT_EQ(tok::text,         Toks[2].getKind());
-  ASSERT_EQ(StringRef("z"),    Toks[2].getText());
-
-  ASSERT_EQ(tok::newline,      Toks[3].getKind());
-}
-
-TEST_F(CommentLexerTest, HTMLCharacterReferences11) {
-  const char *Source = "// &#xab";
-
-  std::vector<Token> Toks;
-
-  lexString(Source, Toks);
-
-  ASSERT_EQ(3U, Toks.size());
-
-  ASSERT_EQ(tok::text,          Toks[0].getKind());
-  ASSERT_EQ(StringRef(" "),     Toks[0].getText());
-
-  ASSERT_EQ(tok::text,          Toks[1].getKind());
-  ASSERT_EQ(StringRef("&#xab"), Toks[1].getText());
-
-  ASSERT_EQ(tok::newline,       Toks[2].getKind());
-}
-
-TEST_F(CommentLexerTest, HTMLCharacterReferences12) {
-  const char *Source = "// &#xaBz";
-
-  std::vector<Token> Toks;
-
-  lexString(Source, Toks);
-
-  ASSERT_EQ(4U, Toks.size());
-
-  ASSERT_EQ(tok::text,          Toks[0].getKind());
-  ASSERT_EQ(StringRef(" "),     Toks[0].getText());
-
-  ASSERT_EQ(tok::text,          Toks[1].getKind());
-  ASSERT_EQ(StringRef("&#xaB"), Toks[1].getText());
-
-  ASSERT_EQ(tok::text,          Toks[2].getKind());
-  ASSERT_EQ(StringRef("z"),     Toks[2].getText());
-
-  ASSERT_EQ(tok::newline,       Toks[3].getKind());
-}
-
-TEST_F(CommentLexerTest, HTMLCharacterReferences13) {
-  const char *Source = "// &amp;";
-
-  std::vector<Token> Toks;
-
-  lexString(Source, Toks);
-
-  ASSERT_EQ(3U, Toks.size());
-
-  ASSERT_EQ(tok::text,          Toks[0].getKind());
-  ASSERT_EQ(StringRef(" "),     Toks[0].getText());
-
-  ASSERT_EQ(tok::text,          Toks[1].getKind());
-  ASSERT_EQ(StringRef("&"),     Toks[1].getText());
-
-  ASSERT_EQ(tok::newline,       Toks[2].getKind());
-}
-
-TEST_F(CommentLexerTest, HTMLCharacterReferences14) {
-  const char *Source = "// &amp;&lt;";
-
-  std::vector<Token> Toks;
-
-  lexString(Source, Toks);
-
-  ASSERT_EQ(4U, Toks.size());
-
-  ASSERT_EQ(tok::text,          Toks[0].getKind());
-  ASSERT_EQ(StringRef(" "),     Toks[0].getText());
-
-  ASSERT_EQ(tok::text,          Toks[1].getKind());
-  ASSERT_EQ(StringRef("&"),     Toks[1].getText());
-
-  ASSERT_EQ(tok::text,          Toks[2].getKind());
-  ASSERT_EQ(StringRef("<"),     Toks[2].getText());
-
-  ASSERT_EQ(tok::newline,       Toks[3].getKind());
-}
-
-TEST_F(CommentLexerTest, HTMLCharacterReferences15) {
-  const char *Source = "// &amp; meow";
-
-  std::vector<Token> Toks;
-
-  lexString(Source, Toks);
-
-  ASSERT_EQ(4U, Toks.size());
-
-  ASSERT_EQ(tok::text,          Toks[0].getKind());
-  ASSERT_EQ(StringRef(" "),     Toks[0].getText());
-
-  ASSERT_EQ(tok::text,          Toks[1].getKind());
-  ASSERT_EQ(StringRef("&"),     Toks[1].getText());
-
-  ASSERT_EQ(tok::text,          Toks[2].getKind());
-  ASSERT_EQ(StringRef(" meow"), Toks[2].getText());
-
-  ASSERT_EQ(tok::newline,       Toks[3].getKind());
-}
-
-TEST_F(CommentLexerTest, HTMLCharacterReferences16) {
-  const char *Sources[] = {
-    "// &#61;",
-    "// &#x3d;",
-    "// &#X3d;",
-    "// &#X3D;"
-  };
-
-  for (size_t i = 0, e = array_lengthof(Sources); i != e; i++) {
-    std::vector<Token> Toks;
-
-    lexString(Sources[i], Toks);
-
-    ASSERT_EQ(3U, Toks.size());
-
-    ASSERT_EQ(tok::text,          Toks[0].getKind());
-    ASSERT_EQ(StringRef(" "),     Toks[0].getText());
-
-    ASSERT_EQ(tok::text,          Toks[1].getKind());
-    ASSERT_EQ(StringRef("="),     Toks[1].getText());
-
-    ASSERT_EQ(tok::newline,       Toks[2].getKind());
-  }
-}
-
-TEST_F(CommentLexerTest, MultipleComments) {
-  const char *Source =
-    "// Aaa\n"
-    "/// Bbb\n"
-    "/* Ccc\n"
-    " * Ddd*/\n"
-    "/** Eee*/";
-
-  std::vector<Token> Toks;
-
-  lexString(Source, Toks);
-
-  ASSERT_EQ(12U, Toks.size());
-
-  ASSERT_EQ(tok::text,           Toks[0].getKind());
-  ASSERT_EQ(StringRef(" Aaa"),   Toks[0].getText());
-  ASSERT_EQ(tok::newline,        Toks[1].getKind());
-
-  ASSERT_EQ(tok::text,           Toks[2].getKind());
-  ASSERT_EQ(StringRef(" Bbb"),   Toks[2].getText());
-  ASSERT_EQ(tok::newline,        Toks[3].getKind());
-
-  ASSERT_EQ(tok::text,           Toks[4].getKind());
-  ASSERT_EQ(StringRef(" Ccc"),   Toks[4].getText());
-  ASSERT_EQ(tok::newline,        Toks[5].getKind());
-
-  ASSERT_EQ(tok::text,           Toks[6].getKind());
-  ASSERT_EQ(StringRef(" Ddd"),   Toks[6].getText());
-  ASSERT_EQ(tok::newline,        Toks[7].getKind());
-  ASSERT_EQ(tok::newline,        Toks[8].getKind());
-
-  ASSERT_EQ(tok::text,           Toks[9].getKind());
-  ASSERT_EQ(StringRef(" Eee"),   Toks[9].getText());
-
-  ASSERT_EQ(tok::newline,        Toks[10].getKind());
-  ASSERT_EQ(tok::newline,        Toks[11].getKind());
-}
-
-} // end namespace comments
-} // end namespace clang
-
diff --git a/gnu/llvm/clang/unittests/AST/CommentParser.cpp b/gnu/llvm/clang/unittests/AST/CommentParser.cpp
deleted file mode 100644
index 62c461a00d1..00000000000
--- a/gnu/llvm/clang/unittests/AST/CommentParser.cpp
+++ /dev/null
@@ -1,1445 +0,0 @@
-//===- unittests/AST/CommentParser.cpp ------ Comment parser tests --------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/AST/CommentParser.h"
-#include "clang/AST/Comment.h"
-#include "clang/AST/CommentCommandTraits.h"
-#include "clang/AST/CommentLexer.h"
-#include "clang/AST/CommentSema.h"
-#include "clang/Basic/CommentOptions.h"
-#include "clang/Basic/Diagnostic.h"
-#include "clang/Basic/DiagnosticOptions.h"
-#include "clang/Basic/FileManager.h"
-#include "clang/Basic/SourceManager.h"
-#include "llvm/ADT/STLExtras.h"
-#include "llvm/Support/Allocator.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-using namespace clang;
-
-namespace clang {
-namespace comments {
-
-namespace {
-
-const bool MY_DEBUG = true;
-
-class CommentParserTest : public ::testing::Test {
-protected:
-  CommentParserTest()
-    : FileMgr(FileMgrOpts),
-      DiagID(new DiagnosticIDs()),
-      Diags(DiagID, new DiagnosticOptions, new IgnoringDiagConsumer()),
-      SourceMgr(Diags, FileMgr),
-      Traits(Allocator, CommentOptions()) {
-  }
-
-  FileSystemOptions FileMgrOpts;
-  FileManager FileMgr;
-  IntrusiveRefCntPtr<DiagnosticIDs> DiagID;
-  DiagnosticsEngine Diags;
-  SourceManager SourceMgr;
-  llvm::BumpPtrAllocator Allocator;
-  CommandTraits Traits;
-
-  FullComment *parseString(const char *Source);
-};
-
-FullComment *CommentParserTest::parseString(const char *Source) {
-  std::unique_ptr<MemoryBuffer> Buf = MemoryBuffer::getMemBuffer(Source);
-  FileID File = SourceMgr.createFileID(std::move(Buf));
-  SourceLocation Begin = SourceMgr.getLocForStartOfFile(File);
-
-  Lexer L(Allocator, Diags, Traits, Begin, Source, Source + strlen(Source));
-
-  Sema S(Allocator, SourceMgr, Diags, Traits, /*PP=*/ nullptr);
-  Parser P(L, S, Allocator, SourceMgr, Diags, Traits);
-  FullComment *FC = P.parseFullComment();
-
-  if (MY_DEBUG) {
-    llvm::errs() << "=== Source:\n" << Source << "\n=== AST:\n";
-    FC->dump();
-  }
-
-  Token Tok;
-  L.lex(Tok);
-  if (Tok.is(tok::eof))
-    return FC;
-  else
-    return nullptr;
-}
-
-::testing::AssertionResult HasChildCount(const Comment *C, size_t Count) {
-  if (!C)
-    return ::testing::AssertionFailure() << "Comment is NULL";
-
-  if (Count != C->child_count())
-    return ::testing::AssertionFailure()
-        << "Count = " << Count
-        << ", child_count = " << C->child_count();
-
-  return ::testing::AssertionSuccess();
-}
-
-template <typename T>
-::testing::AssertionResult GetChildAt(const Comment *C,
-                                      size_t Idx,
-                                      T *&Child) {
-  if (!C)
-    return ::testing::AssertionFailure() << "Comment is NULL";
-
-  if (Idx >= C->child_count())
-    return ::testing::AssertionFailure()
-        << "Idx out of range.  Idx = " << Idx
-        << ", child_count = " << C->child_count();
-
-  Comment::child_iterator I = C->child_begin() + Idx;
-  Comment *CommentChild = *I;
-  if (!CommentChild)
-    return ::testing::AssertionFailure() << "Child is NULL";
-
-  Child = dyn_cast<T>(CommentChild);
-  if (!Child)
-    return ::testing::AssertionFailure()
-        << "Child is not of requested type, but a "
-        << CommentChild->getCommentKindName();
-
-  return ::testing::AssertionSuccess();
-}
-
-::testing::AssertionResult HasTextAt(const Comment *C,
-                                     size_t Idx,
-                                     StringRef Text) {
-  TextComment *TC;
-  ::testing::AssertionResult AR = GetChildAt(C, Idx, TC);
-  if (!AR)
-    return AR;
-
-  StringRef ActualText = TC->getText();
-  if (ActualText != Text)
-    return ::testing::AssertionFailure()
-        << "TextComment has text \"" << ActualText.str() << "\", "
-           "expected \"" << Text.str() << "\"";
-
-  if (TC->hasTrailingNewline())
-    return ::testing::AssertionFailure()
-        << "TextComment has a trailing newline";
-
-  return ::testing::AssertionSuccess();
-}
-
-::testing::AssertionResult HasTextWithNewlineAt(const Comment *C,
-                                                size_t Idx,
-                                                StringRef Text) {
-  TextComment *TC;
-  ::testing::AssertionResult AR = GetChildAt(C, Idx, TC);
-  if (!AR)
-    return AR;
-
-  StringRef ActualText = TC->getText();
-  if (ActualText != Text)
-    return ::testing::AssertionFailure()
-        << "TextComment has text \"" << ActualText.str() << "\", "
-           "expected \"" << Text.str() << "\"";
-
-  if (!TC->hasTrailingNewline())
-    return ::testing::AssertionFailure()
-        << "TextComment has no trailing newline";
-
-  return ::testing::AssertionSuccess();
-}
-
-::testing::AssertionResult HasBlockCommandAt(const Comment *C,
-                                             const CommandTraits &Traits,
-                                             size_t Idx,
-                                             BlockCommandComment *&BCC,
-                                             StringRef Name,
-                                             ParagraphComment *&Paragraph) {
-  ::testing::AssertionResult AR = GetChildAt(C, Idx, BCC);
-  if (!AR)
-    return AR;
-
-  StringRef ActualName = BCC->getCommandName(Traits);
-  if (ActualName != Name)
-    return ::testing::AssertionFailure()
-        << "BlockCommandComment has name \"" << ActualName.str() << "\", "
-           "expected \"" << Name.str() << "\"";
-
-  Paragraph = BCC->getParagraph();
-
-  return ::testing::AssertionSuccess();
-}
-
-::testing::AssertionResult HasParamCommandAt(
-                              const Comment *C,
-                              const CommandTraits &Traits,
-                              size_t Idx,
-                              ParamCommandComment *&PCC,
-                              StringRef CommandName,
-                              ParamCommandComment::PassDirection Direction,
-                              bool IsDirectionExplicit,
-                              StringRef ParamName,
-                              ParagraphComment *&Paragraph) {
-  ::testing::AssertionResult AR = GetChildAt(C, Idx, PCC);
-  if (!AR)
-    return AR;
-
-  StringRef ActualCommandName = PCC->getCommandName(Traits);
-  if (ActualCommandName != CommandName)
-    return ::testing::AssertionFailure()
-        << "ParamCommandComment has name \"" << ActualCommandName.str() << "\", "
-           "expected \"" << CommandName.str() << "\"";
-
-  if (PCC->getDirection() != Direction)
-    return ::testing::AssertionFailure()
-        << "ParamCommandComment has direction " << PCC->getDirection() << ", "
-           "expected " << Direction;
-
-  if (PCC->isDirectionExplicit() != IsDirectionExplicit)
-    return ::testing::AssertionFailure()
-        << "ParamCommandComment has "
-        << (PCC->isDirectionExplicit() ? "explicit" : "implicit")
-        << " direction, "
-           "expected " << (IsDirectionExplicit ? "explicit" : "implicit");
-
-  if (!ParamName.empty() && !PCC->hasParamName())
-    return ::testing::AssertionFailure()
-        << "ParamCommandComment has no parameter name";
-
-  StringRef ActualParamName = PCC->hasParamName() ? PCC->getParamNameAsWritten() : "";
-  if (ActualParamName != ParamName)
-    return ::testing::AssertionFailure()
-        << "ParamCommandComment has parameter name \"" << ActualParamName.str()
-        << "\", "
-           "expected \"" << ParamName.str() << "\"";
-
-  Paragraph = PCC->getParagraph();
-
-  return ::testing::AssertionSuccess();
-}
-
-::testing::AssertionResult HasTParamCommandAt(
-                              const Comment *C,
-                              const CommandTraits &Traits,
-                              size_t Idx,
-                              TParamCommandComment *&TPCC,
-                              StringRef CommandName,
-                              StringRef ParamName,
-                              ParagraphComment *&Paragraph) {
-  ::testing::AssertionResult AR = GetChildAt(C, Idx, TPCC);
-  if (!AR)
-    return AR;
-
-  StringRef ActualCommandName = TPCC->getCommandName(Traits);
-  if (ActualCommandName != CommandName)
-    return ::testing::AssertionFailure()
-        << "TParamCommandComment has name \"" << ActualCommandName.str() << "\", "
-           "expected \"" << CommandName.str() << "\"";
-
-  if (!ParamName.empty() && !TPCC->hasParamName())
-    return ::testing::AssertionFailure()
-        << "TParamCommandComment has no parameter name";
-
-  StringRef ActualParamName = TPCC->hasParamName() ? TPCC->getParamNameAsWritten() : "";
-  if (ActualParamName != ParamName)
-    return ::testing::AssertionFailure()
-        << "TParamCommandComment has parameter name \"" << ActualParamName.str()
-        << "\", "
-           "expected \"" << ParamName.str() << "\"";
-
-  Paragraph = TPCC->getParagraph();
-
-  return ::testing::AssertionSuccess();
-}
-
-::testing::AssertionResult HasInlineCommandAt(const Comment *C,
-                                              const CommandTraits &Traits,
-                                              size_t Idx,
-                                              InlineCommandComment *&ICC,
-                                              StringRef Name) {
-  ::testing::AssertionResult AR = GetChildAt(C, Idx, ICC);
-  if (!AR)
-    return AR;
-
-  StringRef ActualName = ICC->getCommandName(Traits);
-  if (ActualName != Name)
-    return ::testing::AssertionFailure()
-        << "InlineCommandComment has name \"" << ActualName.str() << "\", "
-           "expected \"" << Name.str() << "\"";
-
-  return ::testing::AssertionSuccess();
-}
-
-struct NoArgs {};
-
-::testing::AssertionResult HasInlineCommandAt(const Comment *C,
-                                              const CommandTraits &Traits,
-                                              size_t Idx,
-                                              InlineCommandComment *&ICC,
-                                              StringRef Name,
-                                              NoArgs) {
-  ::testing::AssertionResult AR = HasInlineCommandAt(C, Traits, Idx, ICC, Name);
-  if (!AR)
-    return AR;
-
-  if (ICC->getNumArgs() != 0)
-    return ::testing::AssertionFailure()
-        << "InlineCommandComment has " << ICC->getNumArgs() << " arg(s), "
-           "expected 0";
-
-  return ::testing::AssertionSuccess();
-}
-
-::testing::AssertionResult HasInlineCommandAt(const Comment *C,
-                                              const CommandTraits &Traits,
-                                              size_t Idx,
-                                              InlineCommandComment *&ICC,
-                                              StringRef Name,
-                                              StringRef Arg) {
-  ::testing::AssertionResult AR = HasInlineCommandAt(C, Traits, Idx, ICC, Name);
-  if (!AR)
-    return AR;
-
-  if (ICC->getNumArgs() != 1)
-    return ::testing::AssertionFailure()
-        << "InlineCommandComment has " << ICC->getNumArgs() << " arg(s), "
-           "expected 1";
-
-  StringRef ActualArg = ICC->getArgText(0);
-  if (ActualArg != Arg)
-    return ::testing::AssertionFailure()
-        << "InlineCommandComment has argument \"" << ActualArg.str() << "\", "
-           "expected \"" << Arg.str() << "\"";
-
-  return ::testing::AssertionSuccess();
-}
-
-::testing::AssertionResult HasHTMLStartTagAt(const Comment *C,
-                                             size_t Idx,
-                                             HTMLStartTagComment *&HST,
-                                             StringRef TagName) {
-  ::testing::AssertionResult AR = GetChildAt(C, Idx, HST);
-  if (!AR)
-    return AR;
-
-  StringRef ActualTagName = HST->getTagName();
-  if (ActualTagName != TagName)
-    return ::testing::AssertionFailure()
-        << "HTMLStartTagComment has name \"" << ActualTagName.str() << "\", "
-           "expected \"" << TagName.str() << "\"";
-
-  return ::testing::AssertionSuccess();
-}
-
-struct SelfClosing {};
-
-::testing::AssertionResult HasHTMLStartTagAt(const Comment *C,
-                                             size_t Idx,
-                                             HTMLStartTagComment *&HST,
-                                             StringRef TagName,
-                                             SelfClosing) {
-  ::testing::AssertionResult AR = HasHTMLStartTagAt(C, Idx, HST, TagName);
-  if (!AR)
-    return AR;
-
-  if (!HST->isSelfClosing())
-    return ::testing::AssertionFailure()
-        << "HTMLStartTagComment is not self-closing";
-
-  return ::testing::AssertionSuccess();
-}
-
-
-struct NoAttrs {};
-
-::testing::AssertionResult HasHTMLStartTagAt(const Comment *C,
-                                             size_t Idx,
-                                             HTMLStartTagComment *&HST,
-                                             StringRef TagName,
-                                             NoAttrs) {
-  ::testing::AssertionResult AR = HasHTMLStartTagAt(C, Idx, HST, TagName);
-  if (!AR)
-    return AR;
-
-  if (HST->isSelfClosing())
-    return ::testing::AssertionFailure()
-        << "HTMLStartTagComment is self-closing";
-
-  if (HST->getNumAttrs() != 0)
-    return ::testing::AssertionFailure()
-        << "HTMLStartTagComment has " << HST->getNumAttrs() << " attr(s), "
-           "expected 0";
-
-  return ::testing::AssertionSuccess();
-}
-
-::testing::AssertionResult HasHTMLStartTagAt(const Comment *C,
-                                             size_t Idx,
-                                             HTMLStartTagComment *&HST,
-                                             StringRef TagName,
-                                             StringRef AttrName,
-                                             StringRef AttrValue) {
-  ::testing::AssertionResult AR = HasHTMLStartTagAt(C, Idx, HST, TagName);
-  if (!AR)
-    return AR;
-
-  if (HST->isSelfClosing())
-    return ::testing::AssertionFailure()
-        << "HTMLStartTagComment is self-closing";
-
-  if (HST->getNumAttrs() != 1)
-    return ::testing::AssertionFailure()
-        << "HTMLStartTagComment has " << HST->getNumAttrs() << " attr(s), "
-           "expected 1";
-
-  StringRef ActualName = HST->getAttr(0).Name;
-  if (ActualName != AttrName)
-    return ::testing::AssertionFailure()
-        << "HTMLStartTagComment has attr \"" << ActualName.str() << "\", "
-           "expected \"" << AttrName.str() << "\"";
-
-  StringRef ActualValue = HST->getAttr(0).Value;
-  if (ActualValue != AttrValue)
-    return ::testing::AssertionFailure()
-        << "HTMLStartTagComment has attr value \"" << ActualValue.str() << "\", "
-           "expected \"" << AttrValue.str() << "\"";
-
-  return ::testing::AssertionSuccess();
-}
-
-::testing::AssertionResult HasHTMLEndTagAt(const Comment *C,
-                                           size_t Idx,
-                                           HTMLEndTagComment *&HET,
-                                           StringRef TagName) {
-  ::testing::AssertionResult AR = GetChildAt(C, Idx, HET);
-  if (!AR)
-    return AR;
-
-  StringRef ActualTagName = HET->getTagName();
-  if (ActualTagName != TagName)
-    return ::testing::AssertionFailure()
-        << "HTMLEndTagComment has name \"" << ActualTagName.str() << "\", "
-           "expected \"" << TagName.str() << "\"";
-
-  return ::testing::AssertionSuccess();
-}
-
-::testing::AssertionResult HasParagraphCommentAt(const Comment *C,
-                                                 size_t Idx,
-                                                 StringRef Text) {
-  ParagraphComment *PC;
-
-  {
-    ::testing::AssertionResult AR = GetChildAt(C, Idx, PC);
-    if (!AR)
-      return AR;
-  }
-
-  {
-    ::testing::AssertionResult AR = HasChildCount(PC, 1);
-    if (!AR)
-      return AR;
-  }
-
-  {
-    ::testing::AssertionResult AR = HasTextAt(PC, 0, Text);
-    if (!AR)
-      return AR;
-  }
-
-  return ::testing::AssertionSuccess();
-}
-
-::testing::AssertionResult HasVerbatimBlockAt(const Comment *C,
-                                              const CommandTraits &Traits,
-                                              size_t Idx,
-                                              VerbatimBlockComment *&VBC,
-                                              StringRef Name,
-                                              StringRef CloseName) {
-  ::testing::AssertionResult AR = GetChildAt(C, Idx, VBC);
-  if (!AR)
-    return AR;
-
-  StringRef ActualName = VBC->getCommandName(Traits);
-  if (ActualName != Name)
-    return ::testing::AssertionFailure()
-        << "VerbatimBlockComment has name \"" << ActualName.str() << "\", "
-           "expected \"" << Name.str() << "\"";
-
-  StringRef ActualCloseName = VBC->getCloseName();
-  if (ActualCloseName != CloseName)
-    return ::testing::AssertionFailure()
-        << "VerbatimBlockComment has closing command name \""
-        << ActualCloseName.str() << "\", "
-           "expected \"" << CloseName.str() << "\"";
-
-  return ::testing::AssertionSuccess();
-}
-
-struct NoLines {};
-struct Lines {};
-
-::testing::AssertionResult HasVerbatimBlockAt(const Comment *C,
-                                              const CommandTraits &Traits,
-                                              size_t Idx,
-                                              VerbatimBlockComment *&VBC,
-                                              StringRef Name,
-                                              StringRef CloseName,
-                                              NoLines) {
-  ::testing::AssertionResult AR = HasVerbatimBlockAt(C, Traits, Idx, VBC, Name,
-                                                     CloseName);
-  if (!AR)
-    return AR;
-
-  if (VBC->getNumLines() != 0)
-    return ::testing::AssertionFailure()
-        << "VerbatimBlockComment has " << VBC->getNumLines() << " lines(s), "
-           "expected 0";
-
-  return ::testing::AssertionSuccess();
-}
-
-::testing::AssertionResult HasVerbatimBlockAt(const Comment *C,
-                                              const CommandTraits &Traits,
-                                              size_t Idx,
-                                              VerbatimBlockComment *&VBC,
-                                              StringRef Name,
-                                              StringRef CloseName,
-                                              Lines,
-                                              StringRef Line0) {
-  ::testing::AssertionResult AR = HasVerbatimBlockAt(C, Traits, Idx, VBC, Name,
-                                                     CloseName);
-  if (!AR)
-    return AR;
-
-  if (VBC->getNumLines() != 1)
-    return ::testing::AssertionFailure()
-        << "VerbatimBlockComment has " << VBC->getNumLines() << " lines(s), "
-           "expected 1";
-
-  StringRef ActualLine0 = VBC->getText(0);
-  if (ActualLine0 != Line0)
-    return ::testing::AssertionFailure()
-        << "VerbatimBlockComment has lines[0] \"" << ActualLine0.str() << "\", "
-           "expected \"" << Line0.str() << "\"";
-
-  return ::testing::AssertionSuccess();
-}
-
-::testing::AssertionResult HasVerbatimBlockAt(const Comment *C,
-                                              const CommandTraits &Traits,
-                                              size_t Idx,
-                                              VerbatimBlockComment *&VBC,
-                                              StringRef Name,
-                                              StringRef CloseName,
-                                              Lines,
-                                              StringRef Line0,
-                                              StringRef Line1) {
-  ::testing::AssertionResult AR = HasVerbatimBlockAt(C, Traits, Idx, VBC, Name,
-                                                     CloseName);
-  if (!AR)
-    return AR;
-
-  if (VBC->getNumLines() != 2)
-    return ::testing::AssertionFailure()
-        << "VerbatimBlockComment has " << VBC->getNumLines() << " lines(s), "
-           "expected 2";
-
-  StringRef ActualLine0 = VBC->getText(0);
-  if (ActualLine0 != Line0)
-    return ::testing::AssertionFailure()
-        << "VerbatimBlockComment has lines[0] \"" << ActualLine0.str() << "\", "
-           "expected \"" << Line0.str() << "\"";
-
-  StringRef ActualLine1 = VBC->getText(1);
-  if (ActualLine1 != Line1)
-    return ::testing::AssertionFailure()
-        << "VerbatimBlockComment has lines[1] \"" << ActualLine1.str() << "\", "
-           "expected \"" << Line1.str() << "\"";
-
-  return ::testing::AssertionSuccess();
-}
-
-::testing::AssertionResult HasVerbatimLineAt(const Comment *C,
-                                             const CommandTraits &Traits,
-                                             size_t Idx,
-                                             VerbatimLineComment *&VLC,
-                                             StringRef Name,
-                                             StringRef Text) {
-  ::testing::AssertionResult AR = GetChildAt(C, Idx, VLC);
-  if (!AR)
-    return AR;
-
-  StringRef ActualName = VLC->getCommandName(Traits);
-  if (ActualName != Name)
-    return ::testing::AssertionFailure()
-        << "VerbatimLineComment has name \"" << ActualName.str() << "\", "
-           "expected \"" << Name.str() << "\"";
-
-  StringRef ActualText = VLC->getText();
-  if (ActualText != Text)
-    return ::testing::AssertionFailure()
-        << "VerbatimLineComment has text \"" << ActualText.str() << "\", "
-           "expected \"" << Text.str() << "\"";
-
-  return ::testing::AssertionSuccess();
-}
-
-
-TEST_F(CommentParserTest, Basic1) {
-  const char *Source = "//";
-
-  FullComment *FC = parseString(Source);
-  ASSERT_TRUE(HasChildCount(FC, 0));
-}
-
-TEST_F(CommentParserTest, Basic2) {
-  const char *Source = "// Meow";
-
-  FullComment *FC = parseString(Source);
-  ASSERT_TRUE(HasChildCount(FC, 1));
-
-  ASSERT_TRUE(HasParagraphCommentAt(FC, 0, " Meow"));
-}
-
-TEST_F(CommentParserTest, Basic3) {
-  const char *Source =
-    "// Aaa\n"
-    "// Bbb";
-
-  FullComment *FC = parseString(Source);
-  ASSERT_TRUE(HasChildCount(FC, 1));
-
-  {
-    ParagraphComment *PC;
-    ASSERT_TRUE(GetChildAt(FC, 0, PC));
-
-    ASSERT_TRUE(HasChildCount(PC, 2));
-      ASSERT_TRUE(HasTextWithNewlineAt(PC, 0, " Aaa"));
-      ASSERT_TRUE(HasTextAt(PC, 1, " Bbb"));
-  }
-}
-
-TEST_F(CommentParserTest, ParagraphSplitting1) {
-  const char *Sources[] = {
-    ("// Aaa\n"
-    "//\n"
-    "// Bbb"),
-
-    ("// Aaa\n"
-    "// \n"
-    "// Bbb"),
-
-    ("// Aaa\n"
-    "//\t\n"
-    "// Bbb"),
-
-    ("// Aaa\n"
-    "//\n"
-    "//\n"
-    "// Bbb"),
-
-    ("/**\n"
-    " Aaa\n"
-    "\n"
-    " Bbb\n"
-    "*/"),
-
-    ("/**\n"
-    " Aaa\n"
-    " \n"
-    " Bbb\n"
-    "*/"),
-
-    ("/**\n"
-    " Aaa\n"
-    "\t \n"
-    " Bbb\n"
-    "*/"),
-  };
-
-  for (size_t i = 0, e = array_lengthof(Sources); i != e; i++) {
-    FullComment *FC = parseString(Sources[i]);
-    ASSERT_TRUE(HasChildCount(FC, 2));
-
-    ASSERT_TRUE(HasParagraphCommentAt(FC, 0, " Aaa"));
-    ASSERT_TRUE(HasParagraphCommentAt(FC, 1, " Bbb"));
-  }
-}
-
-TEST_F(CommentParserTest, Paragraph1) {
-  const char *Source =
-    "// \\brief Aaa\n"
-    "//\n"
-    "// Bbb";
-
-  FullComment *FC = parseString(Source);
-  ASSERT_TRUE(HasChildCount(FC, 3));
-
-  ASSERT_TRUE(HasParagraphCommentAt(FC, 0, " "));
-  {
-    BlockCommandComment *BCC;
-    ParagraphComment *PC;
-    ASSERT_TRUE(HasBlockCommandAt(FC, Traits, 1, BCC, "brief", PC));
-
-    ASSERT_TRUE(HasParagraphCommentAt(BCC, 0, " Aaa"));
-  }
-  ASSERT_TRUE(HasParagraphCommentAt(FC, 2, " Bbb"));
-}
-
-TEST_F(CommentParserTest, Paragraph2) {
-  const char *Source = "// \\brief \\author";
-
-  FullComment *FC = parseString(Source);
-  ASSERT_TRUE(HasChildCount(FC, 3));
-
-  ASSERT_TRUE(HasParagraphCommentAt(FC, 0, " "));
-  {
-    BlockCommandComment *BCC;
-    ParagraphComment *PC;
-    ASSERT_TRUE(HasBlockCommandAt(FC, Traits, 1, BCC, "brief", PC));
-
-    ASSERT_TRUE(HasParagraphCommentAt(BCC, 0, " "));
-  }
-  {
-    BlockCommandComment *BCC;
-    ParagraphComment *PC;
-    ASSERT_TRUE(HasBlockCommandAt(FC, Traits, 2, BCC, "author", PC));
-
-    ASSERT_TRUE(GetChildAt(BCC, 0, PC));
-      ASSERT_TRUE(HasChildCount(PC, 0));
-  }
-}
-
-TEST_F(CommentParserTest, Paragraph3) {
-  const char *Source =
-    "// \\brief Aaa\n"
-    "// Bbb \\author\n"
-    "// Ccc";
-
-  FullComment *FC = parseString(Source);
-  ASSERT_TRUE(HasChildCount(FC, 3));
-
-  ASSERT_TRUE(HasParagraphCommentAt(FC, 0, " "));
-  {
-    BlockCommandComment *BCC;
-    ParagraphComment *PC;
-    ASSERT_TRUE(HasBlockCommandAt(FC, Traits, 1, BCC, "brief", PC));
-
-    ASSERT_TRUE(GetChildAt(BCC, 0, PC));
-      ASSERT_TRUE(HasChildCount(PC, 2));
-      ASSERT_TRUE(HasTextWithNewlineAt(PC, 0, " Aaa"));
-      ASSERT_TRUE(HasTextAt(PC, 1, " Bbb "));
-  }
-  {
-    BlockCommandComment *BCC;
-    ParagraphComment *PC;
-    ASSERT_TRUE(HasBlockCommandAt(FC, Traits, 2, BCC, "author", PC));
-
-    ASSERT_TRUE(HasParagraphCommentAt(BCC, 0, " Ccc"));
-  }
-}
-
-TEST_F(CommentParserTest, ParamCommand1) {
-  const char *Source = "// \\param aaa";
-
-  FullComment *FC = parseString(Source);
-  ASSERT_TRUE(HasChildCount(FC, 2));
-
-  ASSERT_TRUE(HasParagraphCommentAt(FC, 0, " "));
-  {
-    ParamCommandComment *PCC;
-    ParagraphComment *PC;
-    ASSERT_TRUE(HasParamCommandAt(FC, Traits, 1, PCC, "param",
-                                  ParamCommandComment::In,
-                                  /* IsDirectionExplicit = */ false,
-                                  "aaa", PC));
-    ASSERT_TRUE(HasChildCount(PCC, 1));
-    ASSERT_TRUE(HasChildCount(PC, 0));
-  }
-}
-
-TEST_F(CommentParserTest, ParamCommand2) {
-  const char *Source = "// \\param\\brief";
-
-  FullComment *FC = parseString(Source);
-  ASSERT_TRUE(HasChildCount(FC, 3));
-
-  ASSERT_TRUE(HasParagraphCommentAt(FC, 0, " "));
-  {
-    ParamCommandComment *PCC;
-    ParagraphComment *PC;
-    ASSERT_TRUE(HasParamCommandAt(FC, Traits, 1, PCC, "param",
-                                  ParamCommandComment::In,
-                                  /* IsDirectionExplicit = */ false,
-                                  "", PC));
-    ASSERT_TRUE(HasChildCount(PCC, 1));
-    ASSERT_TRUE(HasChildCount(PC, 0));
-  }
-  {
-    BlockCommandComment *BCC;
-    ParagraphComment *PC;
-    ASSERT_TRUE(HasBlockCommandAt(FC, Traits, 2, BCC, "brief", PC));
-    ASSERT_TRUE(HasChildCount(PC, 0));
-  }
-}
-
-TEST_F(CommentParserTest, ParamCommand3) {
-  const char *Sources[] = {
-    "// \\param aaa Bbb\n",
-    ("// \\param\n"
-    "//     aaa Bbb\n"),
-    ("// \\param \n"
-    "//     aaa Bbb\n"),
-    ("// \\param aaa\n"
-    "// Bbb\n")
-  };
-
-  for (size_t i = 0, e = array_lengthof(Sources); i != e; i++) {
-    FullComment *FC = parseString(Sources[i]);
-    ASSERT_TRUE(HasChildCount(FC, 2));
-
-    ASSERT_TRUE(HasParagraphCommentAt(FC, 0, " "));
-    {
-      ParamCommandComment *PCC;
-      ParagraphComment *PC;
-      ASSERT_TRUE(HasParamCommandAt(FC, Traits, 1, PCC, "param",
-                                    ParamCommandComment::In,
-                                    /* IsDirectionExplicit = */ false,
-                                    "aaa", PC));
-      ASSERT_TRUE(HasChildCount(PCC, 1));
-      ASSERT_TRUE(HasParagraphCommentAt(PCC, 0, " Bbb"));
-    }
-  }
-}
-
-TEST_F(CommentParserTest, ParamCommand4) {
-  const char *Sources[] = {
-    "// \\param [in] aaa Bbb\n",
-    "// \\param[in] aaa Bbb\n",
-    ("// \\param\n"
-    "//     [in] aaa Bbb\n"),
-    ("// \\param [in]\n"
-    "//     aaa Bbb\n"),
-    ("// \\param [in] aaa\n"
-    "// Bbb\n"),
-  };
-
-  for (size_t i = 0, e = array_lengthof(Sources); i != e; i++) {
-    FullComment *FC = parseString(Sources[i]);
-    ASSERT_TRUE(HasChildCount(FC, 2));
-
-    ASSERT_TRUE(HasParagraphCommentAt(FC, 0, " "));
-    {
-      ParamCommandComment *PCC;
-      ParagraphComment *PC;
-      ASSERT_TRUE(HasParamCommandAt(FC, Traits, 1, PCC, "param",
-                                    ParamCommandComment::In,
-                                    /* IsDirectionExplicit = */ true,
-                                    "aaa", PC));
-      ASSERT_TRUE(HasChildCount(PCC, 1));
-      ASSERT_TRUE(HasParagraphCommentAt(PCC, 0, " Bbb"));
-    }
-  }
-}
-
-TEST_F(CommentParserTest, ParamCommand5) {
-  const char *Sources[] = {
-    "// \\param [out] aaa Bbb\n",
-    "// \\param[out] aaa Bbb\n",
-    ("// \\param\n"
-    "//     [out] aaa Bbb\n"),
-    ("// \\param [out]\n"
-    "//     aaa Bbb\n"),
-    ("// \\param [out] aaa\n"
-    "// Bbb\n"),
-  };
-
-  for (size_t i = 0, e = array_lengthof(Sources); i != e; i++) {
-    FullComment *FC = parseString(Sources[i]);
-    ASSERT_TRUE(HasChildCount(FC, 2));
-
-    ASSERT_TRUE(HasParagraphCommentAt(FC, 0, " "));
-    {
-      ParamCommandComment *PCC;
-      ParagraphComment *PC;
-      ASSERT_TRUE(HasParamCommandAt(FC, Traits, 1, PCC, "param",
-                                    ParamCommandComment::Out,
-                                    /* IsDirectionExplicit = */ true,
-                                    "aaa", PC));
-      ASSERT_TRUE(HasChildCount(PCC, 1));
-      ASSERT_TRUE(HasParagraphCommentAt(PCC, 0, " Bbb"));
-    }
-  }
-}
-
-TEST_F(CommentParserTest, ParamCommand6) {
-  const char *Sources[] = {
-    "// \\param [in,out] aaa Bbb\n",
-    "// \\param[in,out] aaa Bbb\n",
-    "// \\param [in, out] aaa Bbb\n",
-    "// \\param [in,\n"
-    "//     out] aaa Bbb\n",
-    "// \\param [in,out]\n"
-    "//     aaa Bbb\n",
-    "// \\param [in,out] aaa\n"
-    "// Bbb\n"
-  };
-
-  for (size_t i = 0, e = array_lengthof(Sources); i != e; i++) {
-    FullComment *FC = parseString(Sources[i]);
-    ASSERT_TRUE(HasChildCount(FC, 2));
-
-    ASSERT_TRUE(HasParagraphCommentAt(FC, 0, " "));
-    {
-      ParamCommandComment *PCC;
-      ParagraphComment *PC;
-      ASSERT_TRUE(HasParamCommandAt(FC, Traits, 1, PCC, "param",
-                                    ParamCommandComment::InOut,
-                                    /* IsDirectionExplicit = */ true,
-                                    "aaa", PC));
-      ASSERT_TRUE(HasChildCount(PCC, 1));
-      ASSERT_TRUE(HasParagraphCommentAt(PCC, 0, " Bbb"));
-    }
-  }
-}
-
-TEST_F(CommentParserTest, ParamCommand7) {
-  const char *Source =
-    "// \\param aaa \\% Bbb \\$ ccc\n";
-
-  FullComment *FC = parseString(Source);
-  ASSERT_TRUE(HasChildCount(FC, 2));
-
-  ASSERT_TRUE(HasParagraphCommentAt(FC, 0, " "));
-  {
-    ParamCommandComment *PCC;
-    ParagraphComment *PC;
-    ASSERT_TRUE(HasParamCommandAt(FC, Traits, 1, PCC, "param",
-                                  ParamCommandComment::In,
-                                  /* IsDirectionExplicit = */ false,
-                                  "aaa", PC));
-    ASSERT_TRUE(HasChildCount(PCC, 1));
-
-    ASSERT_TRUE(HasChildCount(PC, 5));
-      ASSERT_TRUE(HasTextAt(PC, 0, " "));
-      ASSERT_TRUE(HasTextAt(PC, 1, "%"));
-      ASSERT_TRUE(HasTextAt(PC, 2, " Bbb "));
-      ASSERT_TRUE(HasTextAt(PC, 3, "$"));
-      ASSERT_TRUE(HasTextAt(PC, 4, " ccc"));
-  }
-}
-
-TEST_F(CommentParserTest, TParamCommand1) {
-  const char *Sources[] = {
-    "// \\tparam aaa Bbb\n",
-    "// \\tparam\n"
-    "//     aaa Bbb\n",
-    "// \\tparam \n"
-    "//     aaa Bbb\n",
-    "// \\tparam aaa\n"
-    "// Bbb\n"
-  };
-
-  for (size_t i = 0, e = array_lengthof(Sources); i != e; i++) {
-    FullComment *FC = parseString(Sources[i]);
-    ASSERT_TRUE(HasChildCount(FC, 2));
-
-    ASSERT_TRUE(HasParagraphCommentAt(FC, 0, " "));
-    {
-      TParamCommandComment *TPCC;
-      ParagraphComment *PC;
-      ASSERT_TRUE(HasTParamCommandAt(FC, Traits, 1, TPCC, "tparam",
-                                     "aaa", PC));
-      ASSERT_TRUE(HasChildCount(TPCC, 1));
-      ASSERT_TRUE(HasParagraphCommentAt(TPCC, 0, " Bbb"));
-    }
-  }
-}
-
-TEST_F(CommentParserTest, TParamCommand2) {
-  const char *Source = "// \\tparam\\brief";
-
-  FullComment *FC = parseString(Source);
-  ASSERT_TRUE(HasChildCount(FC, 3));
-
-  ASSERT_TRUE(HasParagraphCommentAt(FC, 0, " "));
-  {
-    TParamCommandComment *TPCC;
-    ParagraphComment *PC;
-    ASSERT_TRUE(HasTParamCommandAt(FC, Traits, 1, TPCC, "tparam", "", PC));
-    ASSERT_TRUE(HasChildCount(TPCC, 1));
-    ASSERT_TRUE(HasChildCount(PC, 0));
-  }
-  {
-    BlockCommandComment *BCC;
-    ParagraphComment *PC;
-    ASSERT_TRUE(HasBlockCommandAt(FC, Traits, 2, BCC, "brief", PC));
-    ASSERT_TRUE(HasChildCount(PC, 0));
-  }
-}
-
-
-TEST_F(CommentParserTest, InlineCommand1) {
-  const char *Source = "// \\c";
-
-  FullComment *FC = parseString(Source);
-  ASSERT_TRUE(HasChildCount(FC, 1));
-
-  {
-    ParagraphComment *PC;
-    InlineCommandComment *ICC;
-    ASSERT_TRUE(GetChildAt(FC, 0, PC));
-
-    ASSERT_TRUE(HasChildCount(PC, 2));
-      ASSERT_TRUE(HasTextAt(PC, 0, " "));
-      ASSERT_TRUE(HasInlineCommandAt(PC, Traits, 1, ICC, "c", NoArgs()));
-  }
-}
-
-TEST_F(CommentParserTest, InlineCommand2) {
-  const char *Source = "// \\c ";
-
-  FullComment *FC = parseString(Source);
-  ASSERT_TRUE(HasChildCount(FC, 1));
-
-  {
-    ParagraphComment *PC;
-    InlineCommandComment *ICC;
-    ASSERT_TRUE(GetChildAt(FC, 0, PC));
-
-    ASSERT_TRUE(HasChildCount(PC, 3));
-      ASSERT_TRUE(HasTextAt(PC, 0, " "));
-      ASSERT_TRUE(HasInlineCommandAt(PC, Traits, 1, ICC, "c", NoArgs()));
-      ASSERT_TRUE(HasTextAt(PC, 2, " "));
-  }
-}
-
-TEST_F(CommentParserTest, InlineCommand3) {
-  const char *Source = "// \\c aaa\n";
-
-  FullComment *FC = parseString(Source);
-  ASSERT_TRUE(HasChildCount(FC, 1));
-
-  {
-    ParagraphComment *PC;
-    InlineCommandComment *ICC;
-    ASSERT_TRUE(GetChildAt(FC, 0, PC));
-
-    ASSERT_TRUE(HasChildCount(PC, 2));
-      ASSERT_TRUE(HasTextAt(PC, 0, " "));
-      ASSERT_TRUE(HasInlineCommandAt(PC, Traits, 1, ICC, "c", "aaa"));
-  }
-}
-
-TEST_F(CommentParserTest, InlineCommand4) {
-  const char *Source = "// \\c aaa bbb";
-
-  FullComment *FC = parseString(Source);
-  ASSERT_TRUE(HasChildCount(FC, 1));
-
-  {
-    ParagraphComment *PC;
-    InlineCommandComment *ICC;
-    ASSERT_TRUE(GetChildAt(FC, 0, PC));
-
-    ASSERT_TRUE(HasChildCount(PC, 3));
-      ASSERT_TRUE(HasTextAt(PC, 0, " "));
-      ASSERT_TRUE(HasInlineCommandAt(PC, Traits, 1, ICC, "c", "aaa"));
-      ASSERT_TRUE(HasTextAt(PC, 2, " bbb"));
-  }
-}
-
-TEST_F(CommentParserTest, InlineCommand5) {
-  const char *Source = "// \\unknown aaa\n";
-
-  FullComment *FC = parseString(Source);
-  ASSERT_TRUE(HasChildCount(FC, 1));
-
-  {
-    ParagraphComment *PC;
-    InlineCommandComment *ICC;
-    ASSERT_TRUE(GetChildAt(FC, 0, PC));
-
-    ASSERT_TRUE(HasChildCount(PC, 3));
-      ASSERT_TRUE(HasTextAt(PC, 0, " "));
-      ASSERT_TRUE(HasInlineCommandAt(PC, Traits, 1, ICC, "unknown", NoArgs()));
-      ASSERT_TRUE(HasTextAt(PC, 2, " aaa"));
-  }
-}
-
-TEST_F(CommentParserTest, HTML1) {
-  const char *Sources[] = {
-    "// <a",
-    "// <a>",
-    "// <a >"
-  };
-
-  for (size_t i = 0, e = array_lengthof(Sources); i != e; i++) {
-    FullComment *FC = parseString(Sources[i]);
-    ASSERT_TRUE(HasChildCount(FC, 1));
-
-    {
-      ParagraphComment *PC;
-      HTMLStartTagComment *HST;
-      ASSERT_TRUE(GetChildAt(FC, 0, PC));
-
-      ASSERT_TRUE(HasChildCount(PC, 2));
-        ASSERT_TRUE(HasTextAt(PC, 0, " "));
-        ASSERT_TRUE(HasHTMLStartTagAt(PC, 1, HST, "a", NoAttrs()));
-    }
-  }
-}
-
-TEST_F(CommentParserTest, HTML2) {
-  const char *Sources[] = {
-    "// <br/>",
-    "// <br />"
-  };
-
-  for (size_t i = 0, e = array_lengthof(Sources); i != e; i++) {
-    FullComment *FC = parseString(Sources[i]);
-    ASSERT_TRUE(HasChildCount(FC, 1));
-
-    {
-      ParagraphComment *PC;
-      HTMLStartTagComment *HST;
-      ASSERT_TRUE(GetChildAt(FC, 0, PC));
-
-      ASSERT_TRUE(HasChildCount(PC, 2));
-        ASSERT_TRUE(HasTextAt(PC, 0, " "));
-        ASSERT_TRUE(HasHTMLStartTagAt(PC, 1, HST, "br", SelfClosing()));
-    }
-  }
-}
-
-TEST_F(CommentParserTest, HTML3) {
-  const char *Sources[] = {
-    "// <a href",
-    "// <a href ",
-    "// <a href>",
-    "// <a href >",
-  };
-
-  for (size_t i = 0, e = array_lengthof(Sources); i != e; i++) {
-    FullComment *FC = parseString(Sources[i]);
-    ASSERT_TRUE(HasChildCount(FC, 1));
-
-    {
-      ParagraphComment *PC;
-      HTMLStartTagComment *HST;
-      ASSERT_TRUE(GetChildAt(FC, 0, PC));
-
-      ASSERT_TRUE(HasChildCount(PC, 2));
-        ASSERT_TRUE(HasTextAt(PC, 0, " "));
-        ASSERT_TRUE(HasHTMLStartTagAt(PC, 1, HST, "a", "href", ""));
-    }
-  }
-}
-
-TEST_F(CommentParserTest, HTML4) {
-  const char *Sources[] = {
-    "// <a href=\"bbb\"",
-    "// <a href=\"bbb\">",
-  };
-
-  for (size_t i = 0, e = array_lengthof(Sources); i != e; i++) {
-    FullComment *FC = parseString(Sources[i]);
-    ASSERT_TRUE(HasChildCount(FC, 1));
-
-    {
-      ParagraphComment *PC;
-      HTMLStartTagComment *HST;
-      ASSERT_TRUE(GetChildAt(FC, 0, PC));
-
-      ASSERT_TRUE(HasChildCount(PC, 2));
-        ASSERT_TRUE(HasTextAt(PC, 0, " "));
-        ASSERT_TRUE(HasHTMLStartTagAt(PC, 1, HST, "a", "href", "bbb"));
-    }
-  }
-}
-
-TEST_F(CommentParserTest, HTML5) {
-  const char *Sources[] = {
-    "// </a",
-    "// </a>",
-    "// </a >"
-  };
-
-  for (size_t i = 0, e = array_lengthof(Sources); i != e; i++) {
-    FullComment *FC = parseString(Sources[i]);
-    ASSERT_TRUE(HasChildCount(FC, 1));
-
-    {
-      ParagraphComment *PC;
-      HTMLEndTagComment *HET;
-      ASSERT_TRUE(GetChildAt(FC, 0, PC));
-
-      ASSERT_TRUE(HasChildCount(PC, 2));
-        ASSERT_TRUE(HasTextAt(PC, 0, " "));
-        ASSERT_TRUE(HasHTMLEndTagAt(PC, 1, HET, "a"));
-    }
-  }
-}
-
-TEST_F(CommentParserTest, HTML6) {
-  const char *Source =
-    "// <pre>\n"
-    "// Aaa\n"
-    "// Bbb\n"
-    "// </pre>\n";
-
-  FullComment *FC = parseString(Source);
-  ASSERT_TRUE(HasChildCount(FC, 1));
-
-  {
-    ParagraphComment *PC;
-    HTMLStartTagComment *HST;
-    HTMLEndTagComment *HET;
-    ASSERT_TRUE(GetChildAt(FC, 0, PC));
-
-    ASSERT_TRUE(HasChildCount(PC, 6));
-      ASSERT_TRUE(HasTextAt(PC, 0, " "));
-      ASSERT_TRUE(HasHTMLStartTagAt(PC, 1, HST, "pre", NoAttrs()));
-      ASSERT_TRUE(HasTextWithNewlineAt(PC, 2, " Aaa"));
-      ASSERT_TRUE(HasTextWithNewlineAt(PC, 3, " Bbb"));
-      ASSERT_TRUE(HasTextAt(PC, 4, " "));
-      ASSERT_TRUE(HasHTMLEndTagAt(PC, 5, HET, "pre"));
-  }
-}
-
-TEST_F(CommentParserTest, VerbatimBlock1) {
-  const char *Source = "// \\verbatim\\endverbatim\n";
-
-  FullComment *FC = parseString(Source);
-  ASSERT_TRUE(HasChildCount(FC, 2));
-
-  ASSERT_TRUE(HasParagraphCommentAt(FC, 0, " "));
-  {
-    VerbatimBlockComment *VCC;
-    ASSERT_TRUE(HasVerbatimBlockAt(FC, Traits, 1, VCC,
-                                   "verbatim", "endverbatim",
-                                   NoLines()));
-  }
-}
-
-TEST_F(CommentParserTest, VerbatimBlock2) {
-  const char *Source = "// \\verbatim Aaa \\endverbatim\n";
-
-  FullComment *FC = parseString(Source);
-  ASSERT_TRUE(HasChildCount(FC, 2));
-
-  ASSERT_TRUE(HasParagraphCommentAt(FC, 0, " "));
-  {
-    VerbatimBlockComment *VBC;
-    ASSERT_TRUE(HasVerbatimBlockAt(FC, Traits, 1, VBC,
-                                   "verbatim", "endverbatim",
-                                   Lines(), " Aaa "));
-  }
-}
-
-TEST_F(CommentParserTest, VerbatimBlock3) {
-  const char *Source = "// \\verbatim Aaa\n";
-
-  FullComment *FC = parseString(Source);
-  ASSERT_TRUE(HasChildCount(FC, 2));
-
-  ASSERT_TRUE(HasParagraphCommentAt(FC, 0, " "));
-  {
-    VerbatimBlockComment *VBC;
-    ASSERT_TRUE(HasVerbatimBlockAt(FC, Traits, 1, VBC, "verbatim", "",
-                                   Lines(), " Aaa"));
-  }
-}
-
-TEST_F(CommentParserTest, VerbatimBlock4) {
-  const char *Source =
-    "//\\verbatim\n"
-    "//\\endverbatim\n";
-
-  FullComment *FC = parseString(Source);
-  ASSERT_TRUE(HasChildCount(FC, 1));
-
-  {
-    VerbatimBlockComment *VBC;
-    ASSERT_TRUE(HasVerbatimBlockAt(FC, Traits, 0, VBC,
-                                   "verbatim", "endverbatim",
-                                   NoLines()));
-  }
-}
-
-TEST_F(CommentParserTest, VerbatimBlock5) {
-  const char *Sources[] = {
-    "//\\verbatim\n"
-    "// Aaa\n"
-    "//\\endverbatim\n",
-
-    "/*\\verbatim\n"
-    " * Aaa\n"
-    " *\\endverbatim*/"
-  };
-
-  for (size_t i = 0, e = array_lengthof(Sources); i != e; i++) {
-    FullComment *FC = parseString(Sources[i]);
-    ASSERT_TRUE(HasChildCount(FC, 1));
-
-    {
-      VerbatimBlockComment *VBC;
-      ASSERT_TRUE(HasVerbatimBlockAt(FC, Traits, 0, VBC,
-                                     "verbatim", "endverbatim",
-                                     Lines(), " Aaa"));
-    }
-  }
-}
-
-TEST_F(CommentParserTest, VerbatimBlock6) {
-  const char *Sources[] = {
-    "// \\verbatim\n"
-    "// Aaa\n"
-    "// \\endverbatim\n",
-
-    "/* \\verbatim\n"
-    " * Aaa\n"
-    " * \\endverbatim*/"
-  };
-
-  for (size_t i = 0, e = array_lengthof(Sources); i != e; i++) {
-    FullComment *FC = parseString(Sources[i]);
-    ASSERT_TRUE(HasChildCount(FC, 2));
-
-    ASSERT_TRUE(HasParagraphCommentAt(FC, 0, " "));
-    {
-      VerbatimBlockComment *VBC;
-      ASSERT_TRUE(HasVerbatimBlockAt(FC, Traits, 1, VBC,
-                                     "verbatim", "endverbatim",
-                                     Lines(), " Aaa"));
-    }
-  }
-}
-
-TEST_F(CommentParserTest, VerbatimBlock7) {
-  const char *Sources[] = {
-    "// \\verbatim\n"
-    "// Aaa\n"
-    "// Bbb\n"
-    "// \\endverbatim\n",
-
-    "/* \\verbatim\n"
-    " * Aaa\n"
-    " * Bbb\n"
-    " * \\endverbatim*/"
-  };
-
-  for (size_t i = 0, e = array_lengthof(Sources); i != e; i++) {
-    FullComment *FC = parseString(Sources[i]);
-    ASSERT_TRUE(HasChildCount(FC, 2));
-
-    ASSERT_TRUE(HasParagraphCommentAt(FC, 0, " "));
-    {
-      VerbatimBlockComment *VBC;
-      ASSERT_TRUE(HasVerbatimBlockAt(FC, Traits, 1, VBC,
-                                     "verbatim", "endverbatim",
-                                     Lines(), " Aaa", " Bbb"));
-    }
-  }
-}
-
-TEST_F(CommentParserTest, VerbatimBlock8) {
-  const char *Sources[] = {
-    "// \\verbatim\n"
-    "// Aaa\n"
-    "//\n"
-    "// Bbb\n"
-    "// \\endverbatim\n",
-
-    "/* \\verbatim\n"
-    " * Aaa\n"
-    " *\n"
-    " * Bbb\n"
-    " * \\endverbatim*/"
-  };
-  for (size_t i = 0, e = array_lengthof(Sources); i != e; i++) {
-    FullComment *FC = parseString(Sources[i]);
-    ASSERT_TRUE(HasChildCount(FC, 2));
-
-    ASSERT_TRUE(HasParagraphCommentAt(FC, 0, " "));
-    {
-      VerbatimBlockComment *VBC;
-      ASSERT_TRUE(HasVerbatimBlockAt(FC, Traits, 1, VBC,
-                                     "verbatim", "endverbatim"));
-      ASSERT_EQ(3U, VBC->getNumLines());
-      ASSERT_EQ(" Aaa", VBC->getText(0));
-      ASSERT_EQ("",     VBC->getText(1));
-      ASSERT_EQ(" Bbb", VBC->getText(2));
-    }
-  }
-}
-
-TEST_F(CommentParserTest, VerbatimLine1) {
-  const char *Sources[] = {
-    "// \\fn",
-    "// \\fn\n"
-  };
-
-  for (size_t i = 0, e = array_lengthof(Sources); i != e; i++) {
-    FullComment *FC = parseString(Sources[i]);
-    ASSERT_TRUE(HasChildCount(FC, 2));
-
-    ASSERT_TRUE(HasParagraphCommentAt(FC, 0, " "));
-    {
-      VerbatimLineComment *VLC;
-      ASSERT_TRUE(HasVerbatimLineAt(FC, Traits, 1, VLC, "fn", ""));
-    }
-  }
-}
-
-TEST_F(CommentParserTest, VerbatimLine2) {
-  const char *Sources[] = {
-    "/// \\fn void *foo(const char *zzz = \"\\$\");\n//",
-    "/** \\fn void *foo(const char *zzz = \"\\$\");*/"
-  };
-
-  for (size_t i = 0, e = array_lengthof(Sources); i != e; i++) {
-    FullComment *FC = parseString(Sources[i]);
-    ASSERT_TRUE(HasChildCount(FC, 2));
-
-    ASSERT_TRUE(HasParagraphCommentAt(FC, 0, " "));
-    {
-      VerbatimLineComment *VLC;
-      ASSERT_TRUE(HasVerbatimLineAt(FC, Traits, 1, VLC, "fn",
-                  " void *foo(const char *zzz = \"\\$\");"));
-    }
-  }
-}
-
-TEST_F(CommentParserTest, Deprecated) {
-  const char *Sources[] = {
-    "/** @deprecated*/",
-    "/// @deprecated\n"
-  };
-
-  for (size_t i = 0, e = array_lengthof(Sources); i != e; i++) {
-    FullComment *FC = parseString(Sources[i]);
-    ASSERT_TRUE(HasChildCount(FC, 2));
-
-    ASSERT_TRUE(HasParagraphCommentAt(FC, 0, " "));
-    {
-      BlockCommandComment *BCC;
-      ParagraphComment *PC;
-      ASSERT_TRUE(HasBlockCommandAt(FC, Traits, 1, BCC, "deprecated", PC));
-      ASSERT_TRUE(HasChildCount(PC, 0));
-    }
-  }
-}
-
-} // unnamed namespace
-
-} // end namespace comments
-} // end namespace clang
-
diff --git a/gnu/llvm/clang/unittests/AST/CommentTextTest.cpp b/gnu/llvm/clang/unittests/AST/CommentTextTest.cpp
deleted file mode 100644
index b697828698d..00000000000
--- a/gnu/llvm/clang/unittests/AST/CommentTextTest.cpp
+++ /dev/null
@@ -1,134 +0,0 @@
-//===- unittest/AST/CommentTextTest.cpp - Comment text extraction test ----===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// Tests for user-friendly output formatting of comments, i.e.
-// RawComment::getFormattedText().
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/AST/RawCommentList.h"
-#include "clang/Basic/CommentOptions.h"
-#include "clang/Basic/Diagnostic.h"
-#include "clang/Basic/DiagnosticIDs.h"
-#include "clang/Basic/FileManager.h"
-#include "clang/Basic/FileSystemOptions.h"
-#include "clang/Basic/SourceLocation.h"
-#include "clang/Basic/SourceManager.h"
-#include "llvm/Support/MemoryBuffer.h"
-#include "llvm/Support/VirtualFileSystem.h"
-#include <gtest/gtest.h>
-
-namespace clang {
-
-class CommentTextTest : public ::testing::Test {
-protected:
-  std::string formatComment(llvm::StringRef CommentText) {
-    SourceManagerForFile FileSourceMgr("comment-test.cpp", CommentText);
-    SourceManager& SourceMgr = FileSourceMgr.get();
-
-    auto CommentStartOffset = CommentText.find("/");
-    assert(CommentStartOffset != llvm::StringRef::npos);
-    FileID File = SourceMgr.getMainFileID();
-
-    SourceRange CommentRange(
-        SourceMgr.getLocForStartOfFile(File).getLocWithOffset(
-            CommentStartOffset),
-        SourceMgr.getLocForEndOfFile(File));
-    CommentOptions EmptyOpts;
-    // FIXME: technically, merged that we set here is incorrect, but that
-    // shouldn't matter.
-    RawComment Comment(SourceMgr, CommentRange, EmptyOpts, /*Merged=*/true);
-    DiagnosticsEngine Diags(new DiagnosticIDs, new DiagnosticOptions);
-    return Comment.getFormattedText(SourceMgr, Diags);
-  }
-};
-
-TEST_F(CommentTextTest, FormattedText) {
-  // clang-format off
-  auto ExpectedOutput =
-R"(This function does this and that.
-For example,
-   Runnning it in that case will give you
-   this result.
-That's about it.)";
-  // Two-slash comments.
-  auto Formatted = formatComment(
-R"cpp(
-// This function does this and that.
-// For example,
-//    Runnning it in that case will give you
-//    this result.
-// That's about it.)cpp");
-  EXPECT_EQ(ExpectedOutput, Formatted);
-
-  // Three-slash comments.
-  Formatted = formatComment(
-R"cpp(
-/// This function does this and that.
-/// For example,
-///    Runnning it in that case will give you
-///    this result.
-/// That's about it.)cpp");
-  EXPECT_EQ(ExpectedOutput, Formatted);
-
-  // Block comments.
-  Formatted = formatComment(
-R"cpp(
-/* This function does this and that.
- * For example,
- *    Runnning it in that case will give you
- *    this result.
- * That's about it.*/)cpp");
-  EXPECT_EQ(ExpectedOutput, Formatted);
-
-  // Doxygen-style block comments.
-  Formatted = formatComment(
-R"cpp(
-/** This function does this and that.
-  * For example,
-  *    Runnning it in that case will give you
-  *    this result.
-  * That's about it.*/)cpp");
-  EXPECT_EQ(ExpectedOutput, Formatted);
-
-  // Weird indentation.
-  Formatted = formatComment(
-R"cpp(
-       // This function does this and that.
-  //      For example,
-  //         Runnning it in that case will give you
-        //   this result.
-       // That's about it.)cpp");
-  EXPECT_EQ(ExpectedOutput, Formatted);
-  // clang-format on
-}
-
-TEST_F(CommentTextTest, KeepsDoxygenControlSeqs) {
-  // clang-format off
-  auto ExpectedOutput =
-R"(\brief This is the brief part of the comment.
-\param a something about a.
-@param b something about b.)";
-
-  auto Formatted = formatComment(
-R"cpp(
-/// \brief This is the brief part of the comment.
-/// \param a something about a.
-/// @param b something about b.)cpp");
-  EXPECT_EQ(ExpectedOutput, Formatted);
-  // clang-format on
-}
-
-TEST_F(CommentTextTest, EmptyFormattedText) {
-  // Test that empty formatted text doesn't cause crash.
-  const char *ExpectedOutput = "";
-  auto Formatted = formatComment("//!<");
-  EXPECT_EQ(ExpectedOutput, Formatted);
-}
-
-} // namespace clang
diff --git a/gnu/llvm/clang/unittests/AST/DataCollectionTest.cpp b/gnu/llvm/clang/unittests/AST/DataCollectionTest.cpp
deleted file mode 100644
index b732a445d99..00000000000
--- a/gnu/llvm/clang/unittests/AST/DataCollectionTest.cpp
+++ /dev/null
@@ -1,172 +0,0 @@
-//===- unittests/AST/DataCollectionTest.cpp -------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file contains tests for the DataCollection module.
-//
-// They work by hashing the collected data of two nodes and asserting that the
-// hash values are equal iff the nodes are considered equal.
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/AST/DataCollection.h"
-#include "clang/AST/DeclTemplate.h"
-#include "clang/AST/StmtVisitor.h"
-#include "clang/ASTMatchers/ASTMatchFinder.h"
-#include "clang/Tooling/Tooling.h"
-#include "gtest/gtest.h"
-
-using namespace clang;
-using namespace tooling;
-using namespace ast_matchers;
-
-namespace {
-class StmtDataCollector : public ConstStmtVisitor<StmtDataCollector> {
-  ASTContext &Context;
-  llvm::MD5 &DataConsumer;
-
-  template <class T> void addData(const T &Data) {
-    data_collection::addDataToConsumer(DataConsumer, Data);
-  }
-
-public:
-  StmtDataCollector(const Stmt *S, ASTContext &Context, llvm::MD5 &DataConsumer)
-      : Context(Context), DataConsumer(DataConsumer) {
-    this->Visit(S);
-  }
-
-#define DEF_ADD_DATA(CLASS, CODE)                                              \
-  template <class Dummy = void> Dummy Visit##CLASS(const CLASS *S) {           \
-    CODE;                                                                      \
-    ConstStmtVisitor<StmtDataCollector>::Visit##CLASS(S);                      \
-  }
-
-#include "clang/AST/StmtDataCollectors.inc"
-};
-} // end anonymous namespace
-
-namespace {
-struct StmtHashMatch : public MatchFinder::MatchCallback {
-  unsigned NumFound;
-  llvm::MD5::MD5Result &Hash;
-  StmtHashMatch(llvm::MD5::MD5Result &Hash) : NumFound(0), Hash(Hash) {}
-
-  void run(const MatchFinder::MatchResult &Result) override {
-    const Stmt *S = Result.Nodes.getNodeAs<Stmt>("id");
-    if (!S)
-      return;
-    ++NumFound;
-    if (NumFound > 1)
-      return;
-    llvm::MD5 MD5;
-    StmtDataCollector(S, *Result.Context, MD5);
-    MD5.final(Hash);
-  }
-};
-} // end anonymous namespace
-
-static testing::AssertionResult hashStmt(llvm::MD5::MD5Result &Hash,
-                                         const StatementMatcher &StmtMatch,
-                                         StringRef Code) {
-  StmtHashMatch Hasher(Hash);
-  MatchFinder Finder;
-  Finder.addMatcher(StmtMatch, &Hasher);
-  std::unique_ptr<FrontendActionFactory> Factory(
-      newFrontendActionFactory(&Finder));
-  if (!runToolOnCode(Factory->create(), Code))
-    return testing::AssertionFailure()
-           << "Parsing error in \"" << Code.str() << "\"";
-  if (Hasher.NumFound == 0)
-    return testing::AssertionFailure() << "Matcher didn't find any statements";
-  if (Hasher.NumFound > 1)
-    return testing::AssertionFailure()
-           << "Matcher should match only one statement "
-              "(found "
-           << Hasher.NumFound << ")";
-  return testing::AssertionSuccess();
-}
-
-static testing::AssertionResult
-isStmtHashEqual(const StatementMatcher &StmtMatch, StringRef Code1,
-                StringRef Code2) {
-  llvm::MD5::MD5Result Hash1, Hash2;
-  testing::AssertionResult Result = hashStmt(Hash1, StmtMatch, Code1);
-  if (!Result)
-    return Result;
-  if (!(Result = hashStmt(Hash2, StmtMatch, Code2)))
-    return Result;
-
-  return testing::AssertionResult(Hash1 == Hash2);
-}
-
-TEST(StmtDataCollector, TestDeclRefExpr) {
-  ASSERT_TRUE(isStmtHashEqual(declRefExpr().bind("id"), "int x, r = x;",
-                              "int x, r = x;"));
-  ASSERT_FALSE(isStmtHashEqual(declRefExpr().bind("id"), "int x, r = x;",
-                               "int y, r = y;"));
-  ASSERT_FALSE(isStmtHashEqual(declRefExpr().bind("id"), "int x, r = x;",
-                               "namespace n { int x, r = x; };"));
-}
-
-TEST(StmtDataCollector, TestMemberExpr) {
-  ASSERT_TRUE(isStmtHashEqual(memberExpr().bind("id"),
-                              "struct { int x; } X; int r = X.x;",
-                              "struct { int x; } X; int r = (&X)->x;"));
-  ASSERT_TRUE(isStmtHashEqual(memberExpr().bind("id"),
-                              "struct { int x; } X; int r = X.x;",
-                              "struct { int x; } Y; int r = Y.x;"));
-  ASSERT_TRUE(isStmtHashEqual(memberExpr().bind("id"),
-                              "struct { int x; } X; int r = X.x;",
-                              "struct C { int x; } X; int r = X.C::x;"));
-  ASSERT_FALSE(isStmtHashEqual(memberExpr().bind("id"),
-                               "struct { int x; } X; int r = X.x;",
-                               "struct { int y; } X; int r = X.y;"));
-}
-
-TEST(StmtDataCollector, TestIntegerLiteral) {
-  ASSERT_TRUE(
-      isStmtHashEqual(integerLiteral().bind("id"), "int x = 0;", "int x = 0;"));
-  ASSERT_TRUE(
-      isStmtHashEqual(integerLiteral().bind("id"), "int x = 0;", "int x =00;"));
-  ASSERT_FALSE(
-      isStmtHashEqual(integerLiteral().bind("id"), "int x = 0;", "int x = 1;"));
-}
-
-TEST(StmtDataCollector, TestFloatingLiteral) {
-  ASSERT_TRUE(isStmtHashEqual(floatLiteral().bind("id"), "double x = .0;",
-                              "double x = .0;"));
-  ASSERT_TRUE(isStmtHashEqual(floatLiteral().bind("id"), "double x = .10;",
-                              "double x = .1;"));
-  ASSERT_TRUE(isStmtHashEqual(floatLiteral().bind("id"), "double x = .1;",
-                              "double x = 1e-1;"));
-  ASSERT_FALSE(isStmtHashEqual(floatLiteral().bind("id"), "double x = .0;",
-                               "double x = .1;"));
-}
-
-TEST(StmtDataCollector, TestStringLiteral) {
-  ASSERT_TRUE(isStmtHashEqual(stringLiteral().bind("id"), R"(char x[] = "0";)",
-                              R"(char x[] = "0";)"));
-  ASSERT_FALSE(isStmtHashEqual(stringLiteral().bind("id"), R"(char x[] = "0";)",
-                               R"(char x[] = "1";)"));
-}
-
-TEST(StmtDataCollector, TestCXXBoolLiteral) {
-  ASSERT_TRUE(isStmtHashEqual(cxxBoolLiteral().bind("id"), "bool x = false;",
-                              "bool x = false;"));
-  ASSERT_FALSE(isStmtHashEqual(cxxBoolLiteral().bind("id"), "bool x = false;",
-                               "bool x = true;"));
-}
-
-TEST(StmtDataCollector, TestCharacterLiteral) {
-  ASSERT_TRUE(isStmtHashEqual(characterLiteral().bind("id"), "char x = '0';",
-                              "char x = '0';"));
-  ASSERT_TRUE(isStmtHashEqual(characterLiteral().bind("id"),
-                              R"(char x = '\0';)",
-                              R"(char x = '\x00';)"));
-  ASSERT_FALSE(isStmtHashEqual(characterLiteral().bind("id"), "char x = '0';",
-                               "char x = '1';"));
-}
diff --git a/gnu/llvm/clang/unittests/AST/DeclMatcher.h b/gnu/llvm/clang/unittests/AST/DeclMatcher.h
deleted file mode 100644
index a7698aab76b..00000000000
--- a/gnu/llvm/clang/unittests/AST/DeclMatcher.h
+++ /dev/null
@@ -1,78 +0,0 @@
-//===- unittest/AST/DeclMatcher.h - AST unit test support ---------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_CLANG_UNITTESTS_AST_DECLMATCHER_H
-#define LLVM_CLANG_UNITTESTS_AST_DECLMATCHER_H
-
-#include "clang/ASTMatchers/ASTMatchFinder.h"
-
-namespace clang {
-namespace ast_matchers {
-
-enum class DeclMatcherKind { First, Last };
-
-// Matcher class to retrieve the first/last matched node under a given AST.
-template <typename NodeType, DeclMatcherKind MatcherKind>
-class DeclMatcher : public MatchFinder::MatchCallback {
-  NodeType *Node = nullptr;
-  void run(const MatchFinder::MatchResult &Result) override {
-    if ((MatcherKind == DeclMatcherKind::First && Node == nullptr) ||
-        MatcherKind == DeclMatcherKind::Last) {
-      Node = const_cast<NodeType *>(Result.Nodes.getNodeAs<NodeType>(""));
-    }
-  }
-public:
-  // Returns the first/last matched node under the tree rooted in `D`.
-  template <typename MatcherType>
-  NodeType *match(const Decl *D, const MatcherType &AMatcher) {
-    MatchFinder Finder;
-    Finder.addMatcher(AMatcher.bind(""), this);
-    Finder.matchAST(D->getASTContext());
-    assert(Node);
-    return Node;
-  }
-};
-template <typename NodeType>
-using LastDeclMatcher = DeclMatcher<NodeType, DeclMatcherKind::Last>;
-template <typename NodeType>
-using FirstDeclMatcher = DeclMatcher<NodeType, DeclMatcherKind::First>;
-
-template <typename NodeType>
-class DeclCounterWithPredicate : public MatchFinder::MatchCallback {
-  using UnaryPredicate = std::function<bool(const NodeType *)>;
-  UnaryPredicate Predicate;
-  unsigned Count = 0;
-  void run(const MatchFinder::MatchResult &Result) override {
-    if (auto N = Result.Nodes.getNodeAs<NodeType>("")) {
-      if (Predicate(N))
-        ++Count;
-    }
-  }
-
-public:
-  DeclCounterWithPredicate()
-      : Predicate([](const NodeType *) { return true; }) {}
-  DeclCounterWithPredicate(UnaryPredicate P) : Predicate(P) {}
-  // Returns the number of matched nodes which satisfy the predicate under the
-  // tree rooted in `D`.
-  template <typename MatcherType>
-  unsigned match(const Decl *D, const MatcherType &AMatcher) {
-    MatchFinder Finder;
-    Finder.addMatcher(AMatcher.bind(""), this);
-    Finder.matchAST(D->getASTContext());
-    return Count;
-  }
-};
-
-template <typename NodeType>
-using DeclCounter = DeclCounterWithPredicate<NodeType>;
-
-} // end namespace ast_matchers
-} // end namespace clang
-
-#endif
diff --git a/gnu/llvm/clang/unittests/AST/DeclPrinterTest.cpp b/gnu/llvm/clang/unittests/AST/DeclPrinterTest.cpp
deleted file mode 100644
index bdc23f33f39..00000000000
--- a/gnu/llvm/clang/unittests/AST/DeclPrinterTest.cpp
+++ /dev/null
@@ -1,1397 +0,0 @@
-//===- unittests/AST/DeclPrinterTest.cpp --- Declaration printer tests ----===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file contains tests for Decl::print() and related methods.
-//
-// Search this file for WRONG to see test cases that are producing something
-// completely wrong, invalid C++ or just misleading.
-//
-// These tests have a coding convention:
-// * declaration to be printed is named 'A' unless it should have some special
-// name (e.g., 'operator+');
-// * additional helper declarations are 'Z', 'Y', 'X' and so on.
-//
-//===----------------------------------------------------------------------===//
-
-#include "ASTPrint.h"
-#include "clang/AST/ASTContext.h"
-#include "clang/ASTMatchers/ASTMatchFinder.h"
-#include "clang/ASTMatchers/ASTMatchers.h"
-#include "clang/Tooling/Tooling.h"
-#include "llvm/ADT/SmallString.h"
-#include "llvm/ADT/StringRef.h"
-#include "gtest/gtest.h"
-
-using namespace clang;
-using namespace ast_matchers;
-using namespace tooling;
-
-namespace {
-
-void PrintDecl(raw_ostream &Out, const ASTContext *Context, const Decl *D,
-               PrintingPolicyAdjuster PolicyModifier) {
-  PrintingPolicy Policy = Context->getPrintingPolicy();
-  Policy.TerseOutput = true;
-  Policy.Indentation = 0;
-  if (PolicyModifier)
-    PolicyModifier(Policy);
-  D->print(Out, Policy, /*Indentation*/ 0, /*PrintInstantiation*/ false);
-}
-
-::testing::AssertionResult
-PrintedDeclMatches(StringRef Code, const std::vector<std::string> &Args,
-                   const DeclarationMatcher &NodeMatch,
-                   StringRef ExpectedPrinted, StringRef FileName,
-                   PrintingPolicyAdjuster PolicyModifier = nullptr,
-                   bool AllowError = false) {
-  return PrintedNodeMatches<Decl>(
-      Code, Args, NodeMatch, ExpectedPrinted, FileName, PrintDecl,
-      PolicyModifier, AllowError,
-      // Filter out implicit decls
-      [](const Decl *D) { return !D->isImplicit(); });
-}
-
-::testing::AssertionResult
-PrintedDeclCXX98Matches(StringRef Code, StringRef DeclName,
-                        StringRef ExpectedPrinted,
-                        PrintingPolicyAdjuster PolicyModifier = nullptr) {
-  std::vector<std::string> Args(1, "-std=c++98");
-  return PrintedDeclMatches(Code, Args, namedDecl(hasName(DeclName)).bind("id"),
-                            ExpectedPrinted, "input.cc", PolicyModifier);
-}
-
-::testing::AssertionResult
-PrintedDeclCXX98Matches(StringRef Code, const DeclarationMatcher &NodeMatch,
-                        StringRef ExpectedPrinted,
-                        PrintingPolicyAdjuster PolicyModifier = nullptr) {
-  std::vector<std::string> Args(1, "-std=c++98");
-  return PrintedDeclMatches(Code,
-                            Args,
-                            NodeMatch,
-                            ExpectedPrinted,
-                            "input.cc",
-                            PolicyModifier);
-}
-
-::testing::AssertionResult PrintedDeclCXX11Matches(StringRef Code,
-                                                   StringRef DeclName,
-                                                   StringRef ExpectedPrinted) {
-  std::vector<std::string> Args(1, "-std=c++11");
-  return PrintedDeclMatches(Code, Args, namedDecl(hasName(DeclName)).bind("id"),
-                            ExpectedPrinted, "input.cc");
-}
-
-::testing::AssertionResult PrintedDeclCXX11Matches(
-                                  StringRef Code,
-                                  const DeclarationMatcher &NodeMatch,
-                                  StringRef ExpectedPrinted) {
-  std::vector<std::string> Args(1, "-std=c++11");
-  return PrintedDeclMatches(Code,
-                            Args,
-                            NodeMatch,
-                            ExpectedPrinted,
-                            "input.cc");
-}
-
-::testing::AssertionResult PrintedDeclCXX11nonMSCMatches(
-                                  StringRef Code,
-                                  const DeclarationMatcher &NodeMatch,
-                                  StringRef ExpectedPrinted) {
-  std::vector<std::string> Args{"-std=c++11", "-fno-delayed-template-parsing"};
-  return PrintedDeclMatches(Code,
-                            Args,
-                            NodeMatch,
-                            ExpectedPrinted,
-                            "input.cc");
-}
-
-::testing::AssertionResult
-PrintedDeclCXX17Matches(StringRef Code, const DeclarationMatcher &NodeMatch,
-                        StringRef ExpectedPrinted,
-                        PrintingPolicyAdjuster PolicyModifier = nullptr) {
-  std::vector<std::string> Args{"-std=c++17", "-fno-delayed-template-parsing"};
-  return PrintedDeclMatches(Code, Args, NodeMatch, ExpectedPrinted, "input.cc",
-                            PolicyModifier);
-}
-
-::testing::AssertionResult
-PrintedDeclC11Matches(StringRef Code, const DeclarationMatcher &NodeMatch,
-                      StringRef ExpectedPrinted,
-                      PrintingPolicyAdjuster PolicyModifier = nullptr) {
-  std::vector<std::string> Args(1, "-std=c11");
-  return PrintedDeclMatches(Code, Args, NodeMatch, ExpectedPrinted, "input.c",
-                            PolicyModifier);
-}
-
-::testing::AssertionResult
-PrintedDeclObjCMatches(StringRef Code, const DeclarationMatcher &NodeMatch,
-                       StringRef ExpectedPrinted, bool AllowError = false) {
-  std::vector<std::string> Args(1, "");
-  return PrintedDeclMatches(Code, Args, NodeMatch, ExpectedPrinted, "input.m",
-                            /*PolicyModifier=*/nullptr, AllowError);
-}
-
-} // unnamed namespace
-
-TEST(DeclPrinter, TestTypedef1) {
-  ASSERT_TRUE(PrintedDeclCXX98Matches(
-    "typedef int A;",
-    "A",
-    "typedef int A"));
-    // Should be: with semicolon
-}
-
-TEST(DeclPrinter, TestTypedef2) {
-  ASSERT_TRUE(PrintedDeclCXX98Matches(
-    "typedef const char *A;",
-    "A",
-    "typedef const char *A"));
-    // Should be: with semicolon
-}
-
-TEST(DeclPrinter, TestTypedef3) {
-  ASSERT_TRUE(PrintedDeclCXX98Matches(
-    "template <typename Y> class X {};"
-    "typedef X<int> A;",
-    "A",
-    "typedef X<int> A"));
-    // Should be: with semicolon
-}
-
-TEST(DeclPrinter, TestTypedef4) {
-  ASSERT_TRUE(PrintedDeclCXX98Matches(
-    "namespace X { class Y {}; }"
-    "typedef X::Y A;",
-    "A",
-    "typedef X::Y A"));
-    // Should be: with semicolon
-}
-
-TEST(DeclPrinter, TestNamespace1) {
-  ASSERT_TRUE(PrintedDeclCXX98Matches(
-    "namespace A { int B; }",
-    "A",
-    "namespace A {\n}"));
-    // Should be: with { ... }
-}
-
-TEST(DeclPrinter, TestNamespace2) {
-  ASSERT_TRUE(PrintedDeclCXX11Matches(
-    "inline namespace A { int B; }",
-    "A",
-    "inline namespace A {\n}"));
-    // Should be: with { ... }
-}
-
-TEST(DeclPrinter, TestNamespaceAlias1) {
-  ASSERT_TRUE(PrintedDeclCXX98Matches(
-    "namespace Z { }"
-    "namespace A = Z;",
-    "A",
-    "namespace A = Z"));
-    // Should be: with semicolon
-}
-
-TEST(DeclPrinter, TestNamespaceAlias2) {
-  ASSERT_TRUE(PrintedDeclCXX98Matches(
-    "namespace X { namespace Y {} }"
-    "namespace A = X::Y;",
-    "A",
-    "namespace A = X::Y"));
-    // Should be: with semicolon
-}
-
-TEST(DeclPrinter, TestNamespaceUnnamed) {
-  ASSERT_TRUE(PrintedDeclCXX17Matches(
-      "namespace { int X; }",
-      namespaceDecl(has(varDecl(hasName("X")))).bind("id"),
-      "namespace {\nint X;\n}",
-      [](PrintingPolicy &Policy) { Policy.TerseOutput = false; }));
-}
-
-TEST(DeclPrinter, TestNamespaceUsingDirective) {
-  ASSERT_TRUE(PrintedDeclCXX17Matches(
-      "namespace X { namespace A {} }"
-      "using namespace X::A;",
-      usingDirectiveDecl().bind("id"), "using namespace X::A",
-      [](PrintingPolicy &Policy) { Policy.TerseOutput = false; }));
-}
-
-TEST(DeclPrinter, TestEnumDecl1) {
-  ASSERT_TRUE(PrintedDeclCXX17Matches(
-      "enum A { a0, a1, a2 };", enumDecl(hasName("A")).bind("id"),
-      "enum A {\na0,\na1,\na2\n}",
-      [](PrintingPolicy &Policy) { Policy.TerseOutput = false; }));
-}
-
-TEST(DeclPrinter, TestEnumDecl2) {
-  ASSERT_TRUE(PrintedDeclCXX17Matches(
-      "enum A { a0 = -1, a1, a2 = 1 };", enumDecl(hasName("A")).bind("id"),
-      "enum A {\na0 = -1,\na1,\na2 = 1\n}",
-      [](PrintingPolicy &Policy) { Policy.TerseOutput = false; }));
-}
-
-TEST(DeclPrinter, TestEnumDecl3) {
-  ASSERT_TRUE(PrintedDeclCXX17Matches(
-      "enum { a0, a1, a2 };",
-      enumDecl(has(enumConstantDecl(hasName("a0")))).bind("id"),
-      "enum {\na0,\na1,\na2\n}",
-      [](PrintingPolicy &Policy) { Policy.TerseOutput = false; }));
-}
-
-TEST(DeclPrinter, TestEnumDecl4) {
-  ASSERT_TRUE(PrintedDeclCXX17Matches(
-      "enum class A { a0, a1, a2 };", enumDecl(hasName("A")).bind("id"),
-      "enum class A : int {\na0,\na1,\na2\n}",
-      [](PrintingPolicy &Policy) { Policy.TerseOutput = false; }));
-}
-
-TEST(DeclPrinter, TestRecordDecl1) {
-  ASSERT_TRUE(PrintedDeclC11Matches(
-      "struct A { int a; };", recordDecl(hasName("A")).bind("id"),
-      "struct A {\nint a;\n}",
-      [](PrintingPolicy &Policy) { Policy.TerseOutput = false; }));
-}
-
-TEST(DeclPrinter, TestRecordDecl2) {
-  ASSERT_TRUE(PrintedDeclC11Matches(
-      "struct A { struct { int i; }; };", recordDecl(hasName("A")).bind("id"),
-      "struct A {\nstruct {\nint i;\n};\n}",
-      [](PrintingPolicy &Policy) { Policy.TerseOutput = false; }));
-}
-
-TEST(DeclPrinter, TestRecordDecl3) {
-  ASSERT_TRUE(PrintedDeclC11Matches(
-      "union { int A; } u;",
-      recordDecl(has(fieldDecl(hasName("A")))).bind("id"), "union {\nint A;\n}",
-      [](PrintingPolicy &Policy) { Policy.TerseOutput = false; }));
-}
-
-TEST(DeclPrinter, TestCXXRecordDecl1) {
-  ASSERT_TRUE(PrintedDeclCXX98Matches(
-    "class A { int a; };",
-    "A",
-    "class A {}"));
-}
-
-TEST(DeclPrinter, TestCXXRecordDecl2) {
-  ASSERT_TRUE(PrintedDeclCXX98Matches(
-    "struct A { int a; };",
-    "A",
-    "struct A {}"));
-}
-
-TEST(DeclPrinter, TestCXXRecordDecl3) {
-  ASSERT_TRUE(PrintedDeclCXX98Matches(
-    "union A { int a; };",
-    "A",
-    "union A {}"));
-}
-
-TEST(DeclPrinter, TestCXXRecordDecl4) {
-  ASSERT_TRUE(PrintedDeclCXX98Matches(
-    "class Z { int a; };"
-    "class A : Z { int b; };",
-    "A",
-    "class A : Z {}"));
-}
-
-TEST(DeclPrinter, TestCXXRecordDecl5) {
-  ASSERT_TRUE(PrintedDeclCXX98Matches(
-    "struct Z { int a; };"
-    "struct A : Z { int b; };",
-    "A",
-    "struct A : Z {}"));
-}
-
-TEST(DeclPrinter, TestCXXRecordDecl6) {
-  ASSERT_TRUE(PrintedDeclCXX98Matches(
-    "class Z { int a; };"
-    "class A : public Z { int b; };",
-    "A",
-    "class A : public Z {}"));
-}
-
-TEST(DeclPrinter, TestCXXRecordDecl7) {
-  ASSERT_TRUE(PrintedDeclCXX98Matches(
-    "class Z { int a; };"
-    "class A : protected Z { int b; };",
-    "A",
-    "class A : protected Z {}"));
-}
-
-TEST(DeclPrinter, TestCXXRecordDecl8) {
-  ASSERT_TRUE(PrintedDeclCXX98Matches(
-    "class Z { int a; };"
-    "class A : private Z { int b; };",
-    "A",
-    "class A : private Z {}"));
-}
-
-TEST(DeclPrinter, TestCXXRecordDecl9) {
-  ASSERT_TRUE(PrintedDeclCXX98Matches(
-    "class Z { int a; };"
-    "class A : virtual Z { int b; };",
-    "A",
-    "class A : virtual Z {}"));
-}
-
-TEST(DeclPrinter, TestCXXRecordDecl10) {
-  ASSERT_TRUE(PrintedDeclCXX98Matches(
-    "class Z { int a; };"
-    "class A : virtual public Z { int b; };",
-    "A",
-    "class A : virtual public Z {}"));
-}
-
-TEST(DeclPrinter, TestCXXRecordDecl11) {
-  ASSERT_TRUE(PrintedDeclCXX98Matches(
-    "class Z { int a; };"
-    "class Y : virtual public Z { int b; };"
-    "class A : virtual public Z, private Y { int c; };",
-    "A",
-    "class A : virtual public Z, private Y {}"));
-}
-
-TEST(DeclPrinter, TestFunctionDecl1) {
-  ASSERT_TRUE(PrintedDeclCXX98Matches(
-    "void A();",
-    "A",
-    "void A()"));
-}
-
-TEST(DeclPrinter, TestFreeFunctionDecl_FullyQualifiedName) {
-    ASSERT_TRUE(PrintedDeclCXX98Matches(
-      "void A();",
-      "A",
-      "void A()",
-      [](PrintingPolicy &Policy){ Policy.FullyQualifiedName = true; }));
-}
-
-TEST(DeclPrinter, TestFreeFunctionDeclInNamespace_FullyQualifiedName) {
-    ASSERT_TRUE(PrintedDeclCXX98Matches(
-      "namespace X { void A(); };",
-      "A",
-      "void X::A()",
-      [](PrintingPolicy &Policy){ Policy.FullyQualifiedName = true; }));
-}
-
-TEST(DeclPrinter, TestMemberFunction_FullyQualifiedName) {
-    ASSERT_TRUE(PrintedDeclCXX98Matches(
-      "struct X { void A(); };",
-      "A",
-      "void X::A()",
-      [](PrintingPolicy &Policy){ Policy.FullyQualifiedName = true; }));
-}
-
-TEST(DeclPrinter, TestMemberFunctionInNamespace_FullyQualifiedName) {
-    ASSERT_TRUE(PrintedDeclCXX98Matches(
-      "namespace Z { struct X { void A(); }; }",
-      "A",
-      "void Z::X::A()",
-      [](PrintingPolicy &Policy){ Policy.FullyQualifiedName = true; }));
-}
-
-TEST(DeclPrinter, TestMemberFunctionOutside_FullyQualifiedName) {
-    ASSERT_TRUE(PrintedDeclCXX98Matches(
-      "struct X { void A(); };"
-       "void X::A() {}",
-      functionDecl(hasName("A"), isDefinition()).bind("id"),
-      "void X::A()",
-      [](PrintingPolicy &Policy){ Policy.FullyQualifiedName = true; }));
-}
-
-TEST(DeclPrinter, TestFunctionDecl2) {
-  ASSERT_TRUE(PrintedDeclCXX98Matches(
-    "void A() {}",
-    "A",
-    "void A()"));
-}
-
-TEST(DeclPrinter, TestFunctionDecl3) {
-  ASSERT_TRUE(PrintedDeclCXX98Matches(
-    "void Z();"
-    "void A() { Z(); }",
-    "A",
-    "void A()"));
-}
-
-TEST(DeclPrinter, TestFunctionDecl4) {
-  ASSERT_TRUE(PrintedDeclCXX98Matches(
-    "extern void A();",
-    "A",
-    "extern void A()"));
-}
-
-TEST(DeclPrinter, TestFunctionDecl5) {
-  ASSERT_TRUE(PrintedDeclCXX98Matches(
-    "static void A();",
-    "A",
-    "static void A()"));
-}
-
-TEST(DeclPrinter, TestFunctionDecl6) {
-  ASSERT_TRUE(PrintedDeclCXX98Matches(
-    "inline void A();",
-    "A",
-    "inline void A()"));
-}
-
-TEST(DeclPrinter, TestFunctionDecl7) {
-  ASSERT_TRUE(PrintedDeclCXX11Matches(
-    "constexpr int A(int a);",
-    "A",
-    "constexpr int A(int a)"));
-}
-
-TEST(DeclPrinter, TestFunctionDecl8) {
-  ASSERT_TRUE(PrintedDeclCXX98Matches(
-    "void A(int a);",
-    "A",
-    "void A(int a)"));
-}
-
-TEST(DeclPrinter, TestFunctionDecl9) {
-  ASSERT_TRUE(PrintedDeclCXX98Matches(
-    "void A(...);",
-    "A",
-    "void A(...)"));
-}
-
-TEST(DeclPrinter, TestFunctionDecl10) {
-  ASSERT_TRUE(PrintedDeclCXX98Matches(
-    "void A(int a, ...);",
-    "A",
-    "void A(int a, ...)"));
-}
-
-TEST(DeclPrinter, TestFunctionDecl11) {
-  ASSERT_TRUE(PrintedDeclCXX98Matches(
-    "typedef long ssize_t;"
-    "typedef int *pInt;"
-    "void A(int a, pInt b, ssize_t c);",
-    "A",
-    "void A(int a, pInt b, ssize_t c)"));
-}
-
-TEST(DeclPrinter, TestFunctionDecl12) {
-  ASSERT_TRUE(PrintedDeclCXX98Matches(
-    "void A(int a, int b = 0);",
-    "A",
-    "void A(int a, int b = 0)"));
-}
-
-TEST(DeclPrinter, TestFunctionDecl13) {
-  ASSERT_TRUE(PrintedDeclCXX98Matches(
-    "void (*A(int a))(int b);",
-    "A",
-    "void (*A(int a))(int)"));
-    // Should be: with parameter name (?)
-}
-
-TEST(DeclPrinter, TestFunctionDecl14) {
-  ASSERT_TRUE(PrintedDeclCXX98Matches(
-    "template<typename T>"
-    "void A(T t) { }"
-    "template<>"
-    "void A(int N) { }",
-    functionDecl(hasName("A"), isExplicitTemplateSpecialization()).bind("id"),
-    "template<> void A<int>(int N)"));
-}
-
-
-TEST(DeclPrinter, TestCXXConstructorDecl1) {
-  ASSERT_TRUE(PrintedDeclCXX98Matches(
-    "struct A {"
-    "  A();"
-    "};",
-    cxxConstructorDecl(ofClass(hasName("A"))).bind("id"),
-    "A()"));
-}
-
-TEST(DeclPrinter, TestCXXConstructorDecl2) {
-  ASSERT_TRUE(PrintedDeclCXX98Matches(
-    "struct A {"
-    "  A(int a);"
-    "};",
-    cxxConstructorDecl(ofClass(hasName("A"))).bind("id"),
-    "A(int a)"));
-}
-
-TEST(DeclPrinter, TestCXXConstructorDecl3) {
-  ASSERT_TRUE(PrintedDeclCXX98Matches(
-    "struct A {"
-    "  A(const A &a);"
-    "};",
-    cxxConstructorDecl(ofClass(hasName("A"))).bind("id"),
-    "A(const A &a)"));
-}
-
-TEST(DeclPrinter, TestCXXConstructorDecl4) {
-  ASSERT_TRUE(PrintedDeclCXX98Matches(
-    "struct A {"
-    "  A(const A &a, int = 0);"
-    "};",
-    cxxConstructorDecl(ofClass(hasName("A"))).bind("id"),
-    "A(const A &a, int = 0)"));
-}
-
-TEST(DeclPrinter, TestCXXConstructorDeclWithMemberInitializer) {
-  ASSERT_TRUE(PrintedDeclCXX98Matches(
-    "struct A {"
-    "  int m;"
-    "  A() : m(2) {}"
-    "};",
-    cxxConstructorDecl(ofClass(hasName("A"))).bind("id"),
-    "A()"));
-}
-
-TEST(DeclPrinter, TestCXXConstructorDeclWithMemberInitializer_NoTerseOutput) {
-  ASSERT_TRUE(PrintedDeclCXX98Matches(
-    "struct A {"
-    "  int m;"
-    "  A() : m(2) {}"
-    "};",
-    cxxConstructorDecl(ofClass(hasName("A"))).bind("id"),
-    "A() : m(2) {\n}\n",
-    [](PrintingPolicy &Policy){ Policy.TerseOutput = false; }));
-}
-
-TEST(DeclPrinter, TestCXXConstructorDecl5) {
-  ASSERT_TRUE(PrintedDeclCXX11Matches(
-    "struct A {"
-    "  A(const A &&a);"
-    "};",
-    cxxConstructorDecl(ofClass(hasName("A"))).bind("id"),
-    "A(const A &&a)"));
-}
-
-TEST(DeclPrinter, TestCXXConstructorDecl6) {
-  ASSERT_TRUE(PrintedDeclCXX98Matches(
-    "struct A {"
-    "  explicit A(int a);"
-    "};",
-    cxxConstructorDecl(ofClass(hasName("A"))).bind("id"),
-    "explicit A(int a)"));
-}
-
-TEST(DeclPrinter, TestCXXConstructorDecl7) {
-  ASSERT_TRUE(PrintedDeclCXX11Matches(
-    "struct A {"
-    "  constexpr A();"
-    "};",
-    cxxConstructorDecl(ofClass(hasName("A"))).bind("id"),
-    "constexpr A()"));
-}
-
-TEST(DeclPrinter, TestCXXConstructorDecl8) {
-  ASSERT_TRUE(PrintedDeclCXX11Matches(
-    "struct A {"
-    "  A() = default;"
-    "};",
-    cxxConstructorDecl(ofClass(hasName("A"))).bind("id"),
-    "A() = default"));
-}
-
-TEST(DeclPrinter, TestCXXConstructorDecl9) {
-  ASSERT_TRUE(PrintedDeclCXX11Matches(
-    "struct A {"
-    "  A() = delete;"
-    "};",
-    cxxConstructorDecl(ofClass(hasName("A"))).bind("id"),
-    "A() = delete"));
-}
-
-TEST(DeclPrinter, TestCXXConstructorDecl10) {
-  ASSERT_TRUE(PrintedDeclCXX11Matches(
-    "template<typename... T>"
-    "struct A {"
-    "  A(const A &a);"
-    "};",
-    cxxConstructorDecl(ofClass(hasName("A"))).bind("id"),
-    "A<T...>(const A<T...> &a)"));
-}
-
-TEST(DeclPrinter, TestCXXConstructorDecl11) {
-  ASSERT_TRUE(PrintedDeclCXX11nonMSCMatches(
-    "template<typename... T>"
-    "struct A : public T... {"
-    "  A(T&&... ts) : T(ts)... {}"
-    "};",
-    cxxConstructorDecl(ofClass(hasName("A"))).bind("id"),
-    "A<T...>(T &&...ts)"));
-}
-
-TEST(DeclPrinter, TestCXXDestructorDecl1) {
-  ASSERT_TRUE(PrintedDeclCXX98Matches(
-    "struct A {"
-    "  ~A();"
-    "};",
-    cxxDestructorDecl(ofClass(hasName("A"))).bind("id"),
-    "~A()"));
-}
-
-TEST(DeclPrinter, TestCXXDestructorDecl2) {
-  ASSERT_TRUE(PrintedDeclCXX98Matches(
-    "struct A {"
-    "  virtual ~A();"
-    "};",
-    cxxDestructorDecl(ofClass(hasName("A"))).bind("id"),
-    "virtual ~A()"));
-}
-
-TEST(DeclPrinter, TestCXXConversionDecl1) {
-  ASSERT_TRUE(PrintedDeclCXX98Matches(
-    "struct A {"
-    "  operator int();"
-    "};",
-    cxxMethodDecl(ofClass(hasName("A"))).bind("id"),
-    "operator int()"));
-}
-
-TEST(DeclPrinter, TestCXXConversionDecl2) {
-  ASSERT_TRUE(PrintedDeclCXX98Matches(
-    "struct A {"
-    "  operator bool();"
-    "};",
-    cxxMethodDecl(ofClass(hasName("A"))).bind("id"),
-    "operator bool()"));
-}
-
-TEST(DeclPrinter, TestCXXConversionDecl3) {
-  ASSERT_TRUE(PrintedDeclCXX98Matches(
-    "struct Z {};"
-    "struct A {"
-    "  operator Z();"
-    "};",
-    cxxMethodDecl(ofClass(hasName("A"))).bind("id"),
-    "operator Z()"));
-}
-
-TEST(DeclPrinter, TestCXXMethodDecl_AllocationFunction1) {
-  ASSERT_TRUE(PrintedDeclCXX11Matches(
-    "namespace std { typedef decltype(sizeof(int)) size_t; }"
-    "struct Z {"
-    "  void *operator new(std::size_t);"
-    "};",
-    cxxMethodDecl(ofClass(hasName("Z"))).bind("id"),
-    "void *operator new(std::size_t)"));
-}
-
-TEST(DeclPrinter, TestCXXMethodDecl_AllocationFunction2) {
-  ASSERT_TRUE(PrintedDeclCXX11Matches(
-    "namespace std { typedef decltype(sizeof(int)) size_t; }"
-    "struct Z {"
-    "  void *operator new[](std::size_t);"
-    "};",
-    cxxMethodDecl(ofClass(hasName("Z"))).bind("id"),
-    "void *operator new[](std::size_t)"));
-}
-
-TEST(DeclPrinter, TestCXXMethodDecl_AllocationFunction3) {
-  ASSERT_TRUE(PrintedDeclCXX11Matches(
-    "struct Z {"
-    "  void operator delete(void *);"
-    "};",
-    cxxMethodDecl(ofClass(hasName("Z"))).bind("id"),
-    "void operator delete(void *) noexcept"));
-    // Should be: without noexcept?
-}
-
-TEST(DeclPrinter, TestCXXMethodDecl_AllocationFunction4) {
-  ASSERT_TRUE(PrintedDeclCXX98Matches(
-    "struct Z {"
-    "  void operator delete(void *);"
-    "};",
-    cxxMethodDecl(ofClass(hasName("Z"))).bind("id"),
-    "void operator delete(void *)"));
-}
-
-TEST(DeclPrinter, TestCXXMethodDecl_AllocationFunction5) {
-  ASSERT_TRUE(PrintedDeclCXX11Matches(
-    "struct Z {"
-    "  void operator delete[](void *);"
-    "};",
-    cxxMethodDecl(ofClass(hasName("Z"))).bind("id"),
-    "void operator delete[](void *) noexcept"));
-    // Should be: without noexcept?
-}
-
-TEST(DeclPrinter, TestCXXMethodDecl_Operator1) {
-  const char *OperatorNames[] = {
-    "+",  "-",  "*",  "/",  "%",  "^",   "&",   "|",
-    "=",  "<",  ">",  "+=", "-=", "*=",  "/=",  "%=",
-    "^=", "&=", "|=", "<<", ">>", ">>=", "<<=", "==",  "!=",
-    "<=", ">=", "&&", "||",  ",", "->*",
-    "()", "[]"
-  };
-
-  for (unsigned i = 0, e = llvm::array_lengthof(OperatorNames); i != e; ++i) {
-    SmallString<128> Code;
-    Code.append("struct Z { void operator");
-    Code.append(OperatorNames[i]);
-    Code.append("(Z z); };");
-
-    SmallString<128> Expected;
-    Expected.append("void operator");
-    Expected.append(OperatorNames[i]);
-    Expected.append("(Z z)");
-
-    ASSERT_TRUE(PrintedDeclCXX98Matches(
-      Code,
-      cxxMethodDecl(ofClass(hasName("Z"))).bind("id"),
-      Expected));
-  }
-}
-
-TEST(DeclPrinter, TestCXXMethodDecl_Operator2) {
-  const char *OperatorNames[] = {
-    "~", "!", "++", "--", "->"
-  };
-
-  for (unsigned i = 0, e = llvm::array_lengthof(OperatorNames); i != e; ++i) {
-    SmallString<128> Code;
-    Code.append("struct Z { void operator");
-    Code.append(OperatorNames[i]);
-    Code.append("(); };");
-
-    SmallString<128> Expected;
-    Expected.append("void operator");
-    Expected.append(OperatorNames[i]);
-    Expected.append("()");
-
-    ASSERT_TRUE(PrintedDeclCXX98Matches(
-      Code,
-      cxxMethodDecl(ofClass(hasName("Z"))).bind("id"),
-      Expected));
-  }
-}
-
-TEST(DeclPrinter, TestCXXMethodDecl1) {
-  ASSERT_TRUE(PrintedDeclCXX98Matches(
-    "struct Z {"
-    "  void A(int a);"
-    "};",
-    "A",
-    "void A(int a)"));
-}
-
-TEST(DeclPrinter, TestCXXMethodDecl2) {
-  ASSERT_TRUE(PrintedDeclCXX98Matches(
-    "struct Z {"
-    "  virtual void A(int a);"
-    "};",
-    "A",
-    "virtual void A(int a)"));
-}
-
-TEST(DeclPrinter, TestCXXMethodDecl3) {
-  ASSERT_TRUE(PrintedDeclCXX98Matches(
-    "struct Z {"
-    "  virtual void A(int a);"
-    "};"
-    "struct ZZ : Z {"
-    "  void A(int a);"
-    "};",
-    "ZZ::A",
-    "void A(int a)"));
-    // TODO: should we print "virtual"?
-}
-
-TEST(DeclPrinter, TestCXXMethodDecl4) {
-  ASSERT_TRUE(PrintedDeclCXX98Matches(
-    "struct Z {"
-    "  inline void A(int a);"
-    "};",
-    "A",
-    "inline void A(int a)"));
-}
-
-TEST(DeclPrinter, TestCXXMethodDecl5) {
-  ASSERT_TRUE(PrintedDeclCXX98Matches(
-    "struct Z {"
-    "  virtual void A(int a) = 0;"
-    "};",
-    "A",
-    "virtual void A(int a) = 0"));
-}
-
-TEST(DeclPrinter, TestCXXMethodDecl_CVQualifier1) {
-  ASSERT_TRUE(PrintedDeclCXX98Matches(
-    "struct Z {"
-    "  void A(int a) const;"
-    "};",
-    "A",
-    "void A(int a) const"));
-}
-
-TEST(DeclPrinter, TestCXXMethodDecl_CVQualifier2) {
-  ASSERT_TRUE(PrintedDeclCXX98Matches(
-    "struct Z {"
-    "  void A(int a) volatile;"
-    "};",
-    "A",
-    "void A(int a) volatile"));
-}
-
-TEST(DeclPrinter, TestCXXMethodDecl_CVQualifier3) {
-  ASSERT_TRUE(PrintedDeclCXX98Matches(
-    "struct Z {"
-    "  void A(int a) const volatile;"
-    "};",
-    "A",
-    "void A(int a) const volatile"));
-}
-
-TEST(DeclPrinter, TestCXXMethodDecl_RefQualifier1) {
-  ASSERT_TRUE(PrintedDeclCXX11Matches(
-    "struct Z {"
-    "  void A(int a) &;"
-    "};",
-    "A",
-    "void A(int a) &"));
-}
-
-TEST(DeclPrinter, TestCXXMethodDecl_RefQualifier2) {
-  ASSERT_TRUE(PrintedDeclCXX11Matches(
-    "struct Z {"
-    "  void A(int a) &&;"
-    "};",
-    "A",
-    "void A(int a) &&"));
-}
-
-TEST(DeclPrinter, TestFunctionDecl_ExceptionSpecification1) {
-  ASSERT_TRUE(PrintedDeclCXX98Matches(
-    "struct Z {"
-    "  void A(int a) throw();"
-    "};",
-    "A",
-    "void A(int a) throw()"));
-}
-
-TEST(DeclPrinter, TestFunctionDecl_ExceptionSpecification2) {
-  ASSERT_TRUE(PrintedDeclCXX98Matches(
-    "struct Z {"
-    "  void A(int a) throw(int);"
-    "};",
-    "A",
-    "void A(int a) throw(int)"));
-}
-
-TEST(DeclPrinter, TestFunctionDecl_ExceptionSpecification3) {
-  ASSERT_TRUE(PrintedDeclCXX98Matches(
-    "class ZZ {};"
-    "struct Z {"
-    "  void A(int a) throw(ZZ, int);"
-    "};",
-    "A",
-    "void A(int a) throw(ZZ, int)"));
-}
-
-TEST(DeclPrinter, TestFunctionDecl_ExceptionSpecification4) {
-  ASSERT_TRUE(PrintedDeclCXX11Matches(
-    "struct Z {"
-    "  void A(int a) noexcept;"
-    "};",
-    "A",
-    "void A(int a) noexcept"));
-}
-
-TEST(DeclPrinter, TestFunctionDecl_ExceptionSpecification5) {
-  ASSERT_TRUE(PrintedDeclCXX11Matches(
-    "struct Z {"
-    "  void A(int a) noexcept(true);"
-    "};",
-    "A",
-    "void A(int a) noexcept(trueA(int a) noexcept(true)"));
-    // WRONG; Should be: "void A(int a) noexcept(true);"
-}
-
-TEST(DeclPrinter, TestFunctionDecl_ExceptionSpecification6) {
-  ASSERT_TRUE(PrintedDeclCXX11Matches(
-    "struct Z {"
-    "  void A(int a) noexcept(1 < 2);"
-    "};",
-    "A",
-    "void A(int a) noexcept(1 < 2A(int a) noexcept(1 < 2)"));
-    // WRONG; Should be: "void A(int a) noexcept(1 < 2);"
-}
-
-TEST(DeclPrinter, TestFunctionDecl_ExceptionSpecification7) {
-  ASSERT_TRUE(PrintedDeclCXX11Matches(
-    "template<int N>"
-    "struct Z {"
-    "  void A(int a) noexcept(N < 2);"
-    "};",
-    "A",
-    "void A(int a) noexcept(N < 2A(int a) noexcept(N < 2)"));
-    // WRONG; Should be: "void A(int a) noexcept(N < 2);"
-}
-
-TEST(DeclPrinter, TestVarDecl1) {
-  ASSERT_TRUE(PrintedDeclCXX98Matches(
-    "char *const (*(*A)[5])(int);",
-    "A",
-    "char *const (*(*A)[5])(int)"));
-    // Should be: with semicolon
-}
-
-TEST(DeclPrinter, TestVarDecl2) {
-  ASSERT_TRUE(PrintedDeclCXX98Matches(
-    "void (*A)() throw(int);",
-    "A",
-    "void (*A)() throw(int)"));
-    // Should be: with semicolon
-}
-
-TEST(DeclPrinter, TestVarDecl3) {
-  ASSERT_TRUE(PrintedDeclCXX11Matches(
-    "void (*A)() noexcept;",
-    "A",
-    "void (*A)() noexcept"));
-    // Should be: with semicolon
-}
-
-TEST(DeclPrinter, TestFieldDecl1) {
-  ASSERT_TRUE(PrintedDeclCXX98Matches(
-    "template<typename T>"
-    "struct Z { T A; };",
-    "A",
-    "T A"));
-    // Should be: with semicolon
-}
-
-TEST(DeclPrinter, TestFieldDecl2) {
-  ASSERT_TRUE(PrintedDeclCXX98Matches(
-    "template<int N>"
-    "struct Z { int A[N]; };",
-    "A",
-    "int A[N]"));
-    // Should be: with semicolon
-}
-
-TEST(DeclPrinter, TestClassTemplateDecl1) {
-  ASSERT_TRUE(PrintedDeclCXX98Matches(
-    "template<typename T>"
-    "struct A { T a; };",
-    classTemplateDecl(hasName("A")).bind("id"),
-    "template <typename T> struct A {}"));
-}
-
-TEST(DeclPrinter, TestClassTemplateDecl2) {
-  ASSERT_TRUE(PrintedDeclCXX98Matches(
-    "template<typename T = int>"
-    "struct A { T a; };",
-    classTemplateDecl(hasName("A")).bind("id"),
-    "template <typename T = int> struct A {}"));
-}
-
-TEST(DeclPrinter, TestClassTemplateDecl3) {
-  ASSERT_TRUE(PrintedDeclCXX98Matches(
-    "template<class T>"
-    "struct A { T a; };",
-    classTemplateDecl(hasName("A")).bind("id"),
-    "template <class T> struct A {}"));
-}
-
-TEST(DeclPrinter, TestClassTemplateDecl4) {
-  ASSERT_TRUE(PrintedDeclCXX98Matches(
-    "template<typename T, typename U>"
-    "struct A { T a; U b; };",
-    classTemplateDecl(hasName("A")).bind("id"),
-    "template <typename T, typename U> struct A {}"));
-}
-
-TEST(DeclPrinter, TestClassTemplateDecl5) {
-  ASSERT_TRUE(PrintedDeclCXX98Matches(
-    "template<int N>"
-    "struct A { int a[N]; };",
-    classTemplateDecl(hasName("A")).bind("id"),
-    "template <int N> struct A {}"));
-}
-
-TEST(DeclPrinter, TestClassTemplateDecl6) {
-  ASSERT_TRUE(PrintedDeclCXX98Matches(
-    "template<int N = 42>"
-    "struct A { int a[N]; };",
-    classTemplateDecl(hasName("A")).bind("id"),
-    "template <int N = 42> struct A {}"));
-}
-
-TEST(DeclPrinter, TestClassTemplateDecl7) {
-  ASSERT_TRUE(PrintedDeclCXX98Matches(
-    "typedef int MyInt;"
-    "template<MyInt N>"
-    "struct A { int a[N]; };",
-    classTemplateDecl(hasName("A")).bind("id"),
-    "template <MyInt N> struct A {}"));
-}
-
-TEST(DeclPrinter, TestClassTemplateDecl8) {
-  ASSERT_TRUE(PrintedDeclCXX98Matches(
-    "template<template<typename U> class T> struct A { };",
-    classTemplateDecl(hasName("A")).bind("id"),
-    "template <template <typename U> class T> struct A {}"));
-}
-
-TEST(DeclPrinter, TestClassTemplateDecl9) {
-  ASSERT_TRUE(PrintedDeclCXX98Matches(
-    "template<typename T> struct Z { };"
-    "template<template<typename U> class T = Z> struct A { };",
-    classTemplateDecl(hasName("A")).bind("id"),
-    "template <template <typename U> class T> struct A {}"));
-}
-
-TEST(DeclPrinter, TestClassTemplateDecl10) {
-  ASSERT_TRUE(PrintedDeclCXX11Matches(
-    "template<typename... T>"
-    "struct A { int a; };",
-    classTemplateDecl(hasName("A")).bind("id"),
-    "template <typename ...T> struct A {}"));
-}
-
-TEST(DeclPrinter, TestClassTemplateDecl11) {
-  ASSERT_TRUE(PrintedDeclCXX11Matches(
-    "template<typename... T>"
-    "struct A : public T... { int a; };",
-    classTemplateDecl(hasName("A")).bind("id"),
-    "template <typename ...T> struct A : public T... {}"));
-}
-
-TEST(DeclPrinter, TestClassTemplatePartialSpecializationDecl1) {
-  ASSERT_TRUE(PrintedDeclCXX98Matches(
-    "template<typename T, typename U>"
-    "struct A { T a; U b; };"
-    "template<typename T>"
-    "struct A<T, int> { T a; };",
-    classTemplateSpecializationDecl().bind("id"),
-    "template <typename T> struct A<T, int> {}"));
-}
-
-TEST(DeclPrinter, TestClassTemplatePartialSpecializationDecl2) {
-  ASSERT_TRUE(PrintedDeclCXX98Matches(
-    "template<typename T>"
-    "struct A { T a; };"
-    "template<typename T>"
-    "struct A<T *> { T a; };",
-    classTemplateSpecializationDecl().bind("id"),
-    "template <typename T> struct A<T *> {}"));
-}
-
-TEST(DeclPrinter, TestClassTemplateSpecializationDecl1) {
-  ASSERT_TRUE(PrintedDeclCXX98Matches(
-    "template<typename T>"
-    "struct A { T a; };"
-    "template<>"
-    "struct A<int> { int a; };",
-    classTemplateSpecializationDecl().bind("id"),
-    "template<> struct A<int> {}"));
-}
-
-TEST(DeclPrinter, TestFunctionTemplateDecl1) {
-  ASSERT_TRUE(PrintedDeclCXX98Matches(
-    "template<typename T>"
-    "void A(T &t);",
-    functionTemplateDecl(hasName("A")).bind("id"),
-    "template <typename T> void A(T &t)"));
-}
-
-TEST(DeclPrinter, TestFunctionTemplateDecl2) {
-  ASSERT_TRUE(PrintedDeclCXX98Matches(
-    "template<typename T>"
-    "void A(T &t) { }",
-    functionTemplateDecl(hasName("A")).bind("id"),
-    "template <typename T> void A(T &t)"));
-}
-
-TEST(DeclPrinter, TestFunctionTemplateDecl3) {
-  ASSERT_TRUE(PrintedDeclCXX11Matches(
-    "template<typename... T>"
-    "void A(T... a);",
-    functionTemplateDecl(hasName("A")).bind("id"),
-    "template <typename ...T> void A(T ...a)"));
-}
-
-TEST(DeclPrinter, TestFunctionTemplateDecl4) {
-  ASSERT_TRUE(PrintedDeclCXX98Matches(
-    "struct Z { template<typename T> void A(T t); };",
-    functionTemplateDecl(hasName("A")).bind("id"),
-    "template <typename T> void A(T t)"));
-}
-
-TEST(DeclPrinter, TestFunctionTemplateDecl5) {
-  ASSERT_TRUE(PrintedDeclCXX98Matches(
-    "struct Z { template<typename T> void A(T t) {} };",
-    functionTemplateDecl(hasName("A")).bind("id"),
-    "template <typename T> void A(T t)"));
-}
-
-TEST(DeclPrinter, TestFunctionTemplateDecl6) {
-  ASSERT_TRUE(PrintedDeclCXX98Matches(
-    "template<typename T >struct Z {"
-    "  template<typename U> void A(U t) {}"
-    "};",
-    functionTemplateDecl(hasName("A")).bind("id"),
-    "template <typename U> void A(U t)"));
-}
-
-TEST(DeclPrinter, TestUnnamedTemplateParameters) {
-  ASSERT_TRUE(PrintedDeclCXX17Matches(
-      "template <typename, int, template <typename, bool> class> void A();",
-      functionTemplateDecl(hasName("A")).bind("id"),
-      "template <typename, int, template <typename, bool> class> void A()"));
-}
-
-TEST(DeclPrinter, TestUnnamedTemplateParametersPacks) {
-  ASSERT_TRUE(PrintedDeclCXX17Matches(
-      "template <typename ..., int ...,"
-      " template <typename ..., bool ...> class ...> void A();",
-      functionTemplateDecl(hasName("A")).bind("id"),
-      "template <typename ..., int ...,"
-      " template <typename ..., bool ...> class ...> void A()"));
-}
-
-TEST(DeclPrinter, TestNamedTemplateParametersPacks) {
-  ASSERT_TRUE(PrintedDeclCXX17Matches(
-      "template <typename ...T, int ...I,"
-      " template <typename ...X, bool ...B> class ...Z> void A();",
-      functionTemplateDecl(hasName("A")).bind("id"),
-      "template <typename ...T, int ...I,"
-      " template <typename ...X, bool ...B> class ...Z> void A()"));
-}
-
-TEST(DeclPrinter, TestTemplateTemplateParameterWrittenWithTypename) {
-  ASSERT_TRUE(PrintedDeclCXX17Matches(
-      "template <template <typename> typename Z> void A();",
-      functionTemplateDecl(hasName("A")).bind("id"),
-      "template <template <typename> class Z> void A()"));
-  // WRONG: We should use typename if the parameter was written with it.
-}
-
-TEST(DeclPrinter, TestTemplateArgumentList1) {
-  ASSERT_TRUE(PrintedDeclCXX98Matches(
-    "template<typename T> struct Z {};"
-    "struct X {};"
-    "Z<X> A;",
-    "A",
-    "Z<X> A"));
-    // Should be: with semicolon
-}
-
-TEST(DeclPrinter, TestTemplateArgumentList2) {
-  ASSERT_TRUE(PrintedDeclCXX98Matches(
-    "template<typename T, typename U> struct Z {};"
-    "struct X {};"
-    "typedef int Y;"
-    "Z<X, Y> A;",
-    "A",
-    "Z<X, Y> A"));
-    // Should be: with semicolon
-}
-
-TEST(DeclPrinter, TestTemplateArgumentList3) {
-  ASSERT_TRUE(PrintedDeclCXX98Matches(
-    "template<typename T> struct Z {};"
-    "template<typename T> struct X {};"
-    "Z<X<int> > A;",
-    "A",
-    "Z<X<int> > A"));
-    // Should be: with semicolon
-}
-
-TEST(DeclPrinter, TestTemplateArgumentList4) {
-  ASSERT_TRUE(PrintedDeclCXX11Matches(
-    "template<typename T> struct Z {};"
-    "template<typename T> struct X {};"
-    "Z<X<int>> A;",
-    "A",
-    "Z<X<int>> A"));
-    // Should be: with semicolon
-}
-
-TEST(DeclPrinter, TestTemplateArgumentList5) {
-  ASSERT_TRUE(PrintedDeclCXX98Matches(
-    "template<typename T> struct Z {};"
-    "template<typename T> struct X { Z<T> A; };",
-    "A",
-    "Z<T> A"));
-    // Should be: with semicolon
-}
-
-TEST(DeclPrinter, TestTemplateArgumentList6) {
-  ASSERT_TRUE(PrintedDeclCXX98Matches(
-    "template<template<typename T> class U> struct Z {};"
-    "template<typename T> struct X {};"
-    "Z<X> A;",
-    "A",
-    "Z<X> A"));
-    // Should be: with semicolon
-}
-
-TEST(DeclPrinter, TestTemplateArgumentList7) {
-  ASSERT_TRUE(PrintedDeclCXX98Matches(
-    "template<template<typename T> class U> struct Z {};"
-    "template<template<typename T> class U> struct Y {"
-    "  Z<U> A;"
-    "};",
-    "A",
-    "Z<U> A"));
-    // Should be: with semicolon
-}
-
-TEST(DeclPrinter, TestTemplateArgumentList8) {
-  ASSERT_TRUE(PrintedDeclCXX98Matches(
-    "template<typename T> struct Z {};"
-    "template<template<typename T> class U> struct Y {"
-    "  Z<U<int> > A;"
-    "};",
-    "A",
-    "Z<U<int> > A"));
-    // Should be: with semicolon
-}
-
-TEST(DeclPrinter, TestTemplateArgumentList9) {
-  ASSERT_TRUE(PrintedDeclCXX98Matches(
-    "template<unsigned I> struct Z {};"
-    "Z<0> A;",
-    "A",
-    "Z<0> A"));
-    // Should be: with semicolon
-}
-
-TEST(DeclPrinter, TestTemplateArgumentList10) {
-  ASSERT_TRUE(PrintedDeclCXX98Matches(
-    "template<unsigned I> struct Z {};"
-    "template<unsigned I> struct X { Z<I> A; };",
-    "A",
-    "Z<I> A"));
-    // Should be: with semicolon
-}
-
-TEST(DeclPrinter, TestTemplateArgumentList11) {
-  ASSERT_TRUE(PrintedDeclCXX98Matches(
-    "template<int I> struct Z {};"
-    "Z<42 * 10 - 420 / 1> A;",
-    "A",
-    "Z<42 * 10 - 420 / 1> A"));
-    // Should be: with semicolon
-}
-
-TEST(DeclPrinter, TestTemplateArgumentList12) {
-  ASSERT_TRUE(PrintedDeclCXX98Matches(
-    "template<const char *p> struct Z {};"
-    "extern const char X[] = \"aaa\";"
-    "Z<X> A;",
-    "A",
-    "Z<X> A"));
-    // Should be: with semicolon
-}
-
-TEST(DeclPrinter, TestTemplateArgumentList13) {
-  ASSERT_TRUE(PrintedDeclCXX11Matches(
-    "template<typename... T> struct Z {};"
-    "template<typename... T> struct X {"
-    "  Z<T...> A;"
-    "};",
-    "A",
-    "Z<T...> A"));
-    // Should be: with semicolon
-}
-
-TEST(DeclPrinter, TestTemplateArgumentList14) {
-  ASSERT_TRUE(PrintedDeclCXX11Matches(
-    "template<typename... T> struct Z {};"
-    "template<typename T> struct Y {};"
-    "template<typename... T> struct X {"
-    "  Z<Y<T>...> A;"
-    "};",
-    "A",
-    "Z<Y<T>...> A"));
-    // Should be: with semicolon
-}
-
-TEST(DeclPrinter, TestTemplateArgumentList15) {
-  ASSERT_TRUE(PrintedDeclCXX11Matches(
-    "template<unsigned I> struct Z {};"
-    "template<typename... T> struct X {"
-    "  Z<sizeof...(T)> A;"
-    "};",
-    "A",
-    "Z<sizeof...(T)> A"));
-    // Should be: with semicolon
-}
-
-TEST(DeclPrinter, TestTemplateArgumentList16) {
-  llvm::StringLiteral Code = "template<typename T1, int NT1, typename T2 = "
-                             "bool, int NT2 = 5> struct Z {};";
-  ASSERT_TRUE(PrintedDeclCXX11Matches(Code, "T1", "typename T1"));
-  ASSERT_TRUE(PrintedDeclCXX11Matches(Code, "T2", "typename T2 = bool"));
-  ASSERT_TRUE(PrintedDeclCXX11Matches(Code, "NT1", "int NT1"));
-  ASSERT_TRUE(PrintedDeclCXX11Matches(Code, "NT2", "int NT2 = 5"));
-}
-
-TEST(DeclPrinter, TestStaticAssert1) {
-  ASSERT_TRUE(PrintedDeclCXX17Matches("static_assert(true);",
-                                      staticAssertDecl().bind("id"),
-                                      "static_assert(true)"));
-}
-
-TEST(DeclPrinter, TestObjCMethod1) {
-  ASSERT_TRUE(PrintedDeclObjCMatches(
-    "__attribute__((objc_root_class)) @interface X\n"
-    "- (int)A:(id)anObject inRange:(long)range;\n"
-    "@end\n"
-    "@implementation X\n"
-    "- (int)A:(id)anObject inRange:(long)range { int printThis; return 0; }\n"
-    "@end\n",
-    namedDecl(hasName("A:inRange:"),
-              hasDescendant(namedDecl(hasName("printThis")))).bind("id"),
-    "- (int)A:(id)anObject inRange:(long)range"));
-}
-
-TEST(DeclPrinter, TestObjCProtocol1) {
-  ASSERT_TRUE(PrintedDeclObjCMatches(
-    "@protocol P1, P2;",
-    namedDecl(hasName("P1")).bind("id"),
-    "@protocol P1;\n"));
-  ASSERT_TRUE(PrintedDeclObjCMatches(
-    "@protocol P1, P2;",
-    namedDecl(hasName("P2")).bind("id"),
-    "@protocol P2;\n"));
-}
-
-TEST(DeclPrinter, TestObjCProtocol2) {
-  ASSERT_TRUE(PrintedDeclObjCMatches(
-    "@protocol P2 @end"
-    "@protocol P1<P2> @end",
-    namedDecl(hasName("P1")).bind("id"),
-    "@protocol P1<P2>\n@end"));
-}
-
-TEST(DeclPrinter, TestObjCCategoryInvalidInterface) {
-  ASSERT_TRUE(PrintedDeclObjCMatches(
-      "@interface I (Extension) @end",
-      namedDecl(hasName("Extension")).bind("id"),
-      "@interface <<error-type>>(Extension)\n@end", /*AllowError=*/true));
-}
-
-TEST(DeclPrinter, TestObjCCategoryImplInvalidInterface) {
-  ASSERT_TRUE(PrintedDeclObjCMatches(
-      "@implementation I (Extension) @end",
-      namedDecl(hasName("Extension")).bind("id"),
-      "@implementation <<error-type>>(Extension)\n@end", /*AllowError=*/true));
-}
-
-TEST(DeclPrinter, VarDeclWithInitializer) {
-  ASSERT_TRUE(PrintedDeclCXX17Matches(
-      "int a = 0x15;", namedDecl(hasName("a")).bind("id"), "int a = 21"));
-  ASSERT_TRUE(PrintedDeclCXX17Matches(
-      "int a = 0x15;", namedDecl(hasName("a")).bind("id"), "int a = 0x15",
-      [](PrintingPolicy &Policy) { Policy.ConstantsAsWritten = true; }));
-}
diff --git a/gnu/llvm/clang/unittests/AST/DeclTest.cpp b/gnu/llvm/clang/unittests/AST/DeclTest.cpp
deleted file mode 100644
index 0964080c7a2..00000000000
--- a/gnu/llvm/clang/unittests/AST/DeclTest.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-//===- unittests/AST/DeclTest.cpp --- Declaration tests -------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// Unit tests for Decl nodes in the AST.
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/AST/ASTContext.h"
-#include "clang/AST/Mangle.h"
-#include "clang/ASTMatchers/ASTMatchFinder.h"
-#include "clang/ASTMatchers/ASTMatchers.h"
-#include "clang/Basic/LLVM.h"
-#include "clang/Basic/TargetInfo.h"
-#include "clang/Tooling/Tooling.h"
-#include "llvm/IR/DataLayout.h"
-#include "gtest/gtest.h"
-
-using namespace clang::ast_matchers;
-using namespace clang::tooling;
-using namespace clang;
-
-TEST(Decl, CleansUpAPValues) {
-  MatchFinder Finder;
-  std::unique_ptr<FrontendActionFactory> Factory(
-      newFrontendActionFactory(&Finder));
-
-  // This is a regression test for a memory leak in APValues for structs that
-  // allocate memory. This test only fails if run under valgrind with full leak
-  // checking enabled.
-  std::vector<std::string> Args(1, "-std=c++11");
-  Args.push_back("-fno-ms-extensions");
-  ASSERT_TRUE(runToolOnCodeWithArgs(
-      Factory->create(),
-      "struct X { int a; }; constexpr X x = { 42 };"
-      "union Y { constexpr Y(int a) : a(a) {} int a; }; constexpr Y y = { 42 };"
-      "constexpr int z[2] = { 42, 43 };"
-      "constexpr int __attribute__((vector_size(16))) v1 = {};"
-      "\n#ifdef __SIZEOF_INT128__\n"
-      "constexpr __uint128_t large_int = 0xffffffffffffffff;"
-      "constexpr __uint128_t small_int = 1;"
-      "\n#endif\n"
-      "constexpr double d1 = 42.42;"
-      "constexpr long double d2 = 42.42;"
-      "constexpr _Complex long double c1 = 42.0i;"
-      "constexpr _Complex long double c2 = 42.0;"
-      "template<int N> struct A : A<N-1> {};"
-      "template<> struct A<0> { int n; }; A<50> a;"
-      "constexpr int &r = a.n;"
-      "constexpr int A<50>::*p = &A<50>::n;"
-      "void f() { foo: bar: constexpr int k = __builtin_constant_p(0) ?"
-      "                         (char*)&&foo - (char*)&&bar : 0; }",
-      Args));
-
-  // FIXME: Once this test starts breaking we can test APValue::needsCleanup
-  // for ComplexInt.
-  ASSERT_FALSE(runToolOnCodeWithArgs(
-      Factory->create(),
-      "constexpr _Complex __uint128_t c = 0xffffffffffffffff;",
-      Args));
-}
-
-TEST(Decl, AsmLabelAttr) {
-  // Create two method decls: `f` and `g`.
-  StringRef Code = R"(
-    struct S {
-      void f() {}
-      void g() {}
-    };
-  )";
-  auto AST =
-      tooling::buildASTFromCodeWithArgs(Code, {"-target", "i386-apple-darwin"});
-  ASTContext &Ctx = AST->getASTContext();
-  assert(Ctx.getTargetInfo().getUserLabelPrefix() == StringRef("_") &&
-         "Expected target to have a global prefix");
-  DiagnosticsEngine &Diags = AST->getDiagnostics();
-
-  const auto *DeclS =
-      selectFirst<CXXRecordDecl>("d", match(cxxRecordDecl().bind("d"), Ctx));
-  NamedDecl *DeclF = *DeclS->method_begin();
-  NamedDecl *DeclG = *(++DeclS->method_begin());
-
-  // Attach asm labels to the decls: one literal, and one not.
-  DeclF->addAttr(::new (Ctx) AsmLabelAttr(Ctx, SourceLocation(), "foo",
-                                          /*LiteralLabel=*/true));
-  DeclG->addAttr(::new (Ctx) AsmLabelAttr(Ctx, SourceLocation(), "goo",
-                                          /*LiteralLabel=*/false));
-
-  // Mangle the decl names.
-  std::string MangleF, MangleG;
-  std::unique_ptr<ItaniumMangleContext> MC(
-      ItaniumMangleContext::create(Ctx, Diags));
-  {
-    llvm::raw_string_ostream OS_F(MangleF);
-    llvm::raw_string_ostream OS_G(MangleG);
-    MC->mangleName(DeclF, OS_F);
-    MC->mangleName(DeclG, OS_G);
-  }
-
-  ASSERT_TRUE(0 == MangleF.compare("\x01" "foo"));
-  ASSERT_TRUE(0 == MangleG.compare("goo"));
-}
-
-TEST(Decl, MangleDependentSizedArray) {
-  StringRef Code = R"(
-    template <int ...N>
-    int A[] = {N...};
-
-    template <typename T, int N>
-    struct S {
-      T B[N];
-    };
-  )";
-  auto AST =
-      tooling::buildASTFromCodeWithArgs(Code, {"-target", "i386-apple-darwin"});
-  ASTContext &Ctx = AST->getASTContext();
-  assert(Ctx.getTargetInfo().getUserLabelPrefix() == StringRef("_") &&
-         "Expected target to have a global prefix");
-  DiagnosticsEngine &Diags = AST->getDiagnostics();
-
-  const auto *DeclA =
-      selectFirst<VarDecl>("A", match(varDecl().bind("A"), Ctx));
-  const auto *DeclB =
-      selectFirst<FieldDecl>("B", match(fieldDecl().bind("B"), Ctx));
-
-  std::string MangleA, MangleB;
-  llvm::raw_string_ostream OS_A(MangleA), OS_B(MangleB);
-  std::unique_ptr<ItaniumMangleContext> MC(
-      ItaniumMangleContext::create(Ctx, Diags));
-
-  MC->mangleTypeName(DeclA->getType(), OS_A);
-  MC->mangleTypeName(DeclB->getType(), OS_B);
-
-  ASSERT_TRUE(0 == MangleA.compare("_ZTSA_i"));
-  ASSERT_TRUE(0 == MangleB.compare("_ZTSAT0__T_"));
-}
diff --git a/gnu/llvm/clang/unittests/AST/EvaluateAsRValueTest.cpp b/gnu/llvm/clang/unittests/AST/EvaluateAsRValueTest.cpp
deleted file mode 100644
index 0475330796d..00000000000
--- a/gnu/llvm/clang/unittests/AST/EvaluateAsRValueTest.cpp
+++ /dev/null
@@ -1,110 +0,0 @@
-//===- unittests/AST/EvaluateAsRValueTest.cpp -----------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// \file
-// \brief Unit tests for evaluation of constant initializers.
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/AST/ASTConsumer.h"
-#include "clang/AST/ASTConsumer.h"
-#include "clang/AST/ASTContext.h"
-#include "clang/AST/RecursiveASTVisitor.h"
-#include "clang/Tooling/Tooling.h"
-#include "gtest/gtest.h"
-#include <map>
-#include <string>
-
-using namespace clang::tooling;
-
-namespace {
-// For each variable name encountered, whether its initializer was a
-// constant.
-typedef std::map<std::string, bool> VarInfoMap;
-
-/// \brief Records information on variable initializers to a map.
-class EvaluateConstantInitializersVisitor
-    : public clang::RecursiveASTVisitor<EvaluateConstantInitializersVisitor> {
- public:
-  explicit EvaluateConstantInitializersVisitor(VarInfoMap &VarInfo)
-      : VarInfo(VarInfo) {}
-
-  /// \brief Checks that isConstantInitializer and EvaluateAsRValue agree
-  /// and don't crash.
-  ///
-  /// For each VarDecl with an initializer this also records in VarInfo
-  /// whether the initializer could be evaluated as a constant.
-  bool VisitVarDecl(const clang::VarDecl *VD) {
-    if (const clang::Expr *Init = VD->getInit()) {
-      clang::Expr::EvalResult Result;
-      bool WasEvaluated = Init->EvaluateAsRValue(Result, VD->getASTContext());
-      VarInfo[VD->getNameAsString()] = WasEvaluated;
-      EXPECT_EQ(WasEvaluated, Init->isConstantInitializer(VD->getASTContext(),
-                                                          false /*ForRef*/));
-    }
-    return true;
-  }
-
- private:
-  VarInfoMap &VarInfo;
-};
-
-class EvaluateConstantInitializersAction : public clang::ASTFrontendAction {
- public:
-   std::unique_ptr<clang::ASTConsumer>
-   CreateASTConsumer(clang::CompilerInstance &Compiler,
-                     llvm::StringRef FilePath) override {
-     return std::make_unique<Consumer>();
-  }
-
- private:
-  class Consumer : public clang::ASTConsumer {
-   public:
-    ~Consumer() override {}
-
-    void HandleTranslationUnit(clang::ASTContext &Ctx) override {
-      VarInfoMap VarInfo;
-      EvaluateConstantInitializersVisitor Evaluator(VarInfo);
-      Evaluator.TraverseDecl(Ctx.getTranslationUnitDecl());
-      EXPECT_EQ(2u, VarInfo.size());
-      EXPECT_FALSE(VarInfo["Dependent"]);
-      EXPECT_TRUE(VarInfo["Constant"]);
-      EXPECT_EQ(2u, VarInfo.size());
-    }
-  };
-};
-}
-
-TEST(EvaluateAsRValue, FailsGracefullyForUnknownTypes) {
-  // This is a regression test; the AST library used to trigger assertion
-  // failures because it assumed that the type of initializers was always
-  // known (which is true only after template instantiation).
-  std::string ModesToTest[] = {"-std=c++03", "-std=c++11", "-std=c++1y"};
-  for (std::string const &Mode : ModesToTest) {
-    std::vector<std::string> Args(1, Mode);
-    Args.push_back("-fno-delayed-template-parsing");
-    ASSERT_TRUE(runToolOnCodeWithArgs(
-        std::make_unique<EvaluateConstantInitializersAction>(),
-        "template <typename T>"
-        "struct vector {"
-        "  explicit vector(int size);"
-        "};"
-        "template <typename R>"
-        "struct S {"
-        "  vector<R> intervals() const {"
-        "    vector<R> Dependent(2);"
-        "    return Dependent;"
-        "  }"
-        "};"
-        "void doSomething() {"
-        "  int Constant = 2 + 2;"
-        "  (void) Constant;"
-        "}",
-        Args));
-  }
-}
diff --git a/gnu/llvm/clang/unittests/AST/ExternalASTSourceTest.cpp b/gnu/llvm/clang/unittests/AST/ExternalASTSourceTest.cpp
deleted file mode 100644
index 8b70be664e0..00000000000
--- a/gnu/llvm/clang/unittests/AST/ExternalASTSourceTest.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-//===- unittest/AST/ExternalASTSourceTest.cpp -----------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file contains tests for Clang's ExternalASTSource.
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/AST/ASTConsumer.h"
-#include "clang/AST/ASTContext.h"
-#include "clang/AST/ExternalASTSource.h"
-#include "clang/Frontend/CompilerInstance.h"
-#include "clang/Frontend/CompilerInvocation.h"
-#include "clang/Frontend/FrontendActions.h"
-#include "clang/Lex/PreprocessorOptions.h"
-#include "gtest/gtest.h"
-
-using namespace clang;
-using namespace llvm;
-
-
-class TestFrontendAction : public ASTFrontendAction {
-public:
-  TestFrontendAction(ExternalASTSource *Source) : Source(Source) {}
-
-private:
-  void ExecuteAction() override {
-    getCompilerInstance().getASTContext().setExternalSource(Source);
-    getCompilerInstance().getASTContext().getTranslationUnitDecl()
-        ->setHasExternalVisibleStorage();
-    return ASTFrontendAction::ExecuteAction();
-  }
-
-  std::unique_ptr<ASTConsumer> CreateASTConsumer(CompilerInstance &CI,
-                                                 StringRef InFile) override {
-    return std::make_unique<ASTConsumer>();
-  }
-
-  IntrusiveRefCntPtr<ExternalASTSource> Source;
-};
-
-bool testExternalASTSource(ExternalASTSource *Source,
-                           StringRef FileContents) {
-  CompilerInstance Compiler;
-  Compiler.createDiagnostics();
-
-  auto Invocation = std::make_shared<CompilerInvocation>();
-  Invocation->getPreprocessorOpts().addRemappedFile(
-      "test.cc", MemoryBuffer::getMemBuffer(FileContents).release());
-  const char *Args[] = { "test.cc" };
-  CompilerInvocation::CreateFromArgs(*Invocation, Args,
-                                     Compiler.getDiagnostics());
-  Compiler.setInvocation(std::move(Invocation));
-
-  TestFrontendAction Action(Source);
-  return Compiler.ExecuteAction(Action);
-}
-
-
-// Ensure that a failed name lookup into an external source only occurs once.
-TEST(ExternalASTSourceTest, FailedLookupOccursOnce) {
-  struct TestSource : ExternalASTSource {
-    TestSource(unsigned &Calls) : Calls(Calls) {}
-
-    bool FindExternalVisibleDeclsByName(const DeclContext *,
-                                        DeclarationName Name) override {
-      if (Name.getAsString() == "j")
-        ++Calls;
-      return false;
-    }
-
-    unsigned &Calls;
-  };
-
-  unsigned Calls = 0;
-  ASSERT_TRUE(testExternalASTSource(new TestSource(Calls), "int j, k = j;"));
-  EXPECT_EQ(1u, Calls);
-}
diff --git a/gnu/llvm/clang/unittests/AST/MatchVerifier.h b/gnu/llvm/clang/unittests/AST/MatchVerifier.h
deleted file mode 100644
index c49a2f8221b..00000000000
--- a/gnu/llvm/clang/unittests/AST/MatchVerifier.h
+++ /dev/null
@@ -1,320 +0,0 @@
-//===- unittest/AST/MatchVerifier.h - AST unit test support ---------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-//  Provides MatchVerifier, a base class to implement gtest matchers that
-//  verify things that can be matched on the AST.
-//
-//  Also implements matchers based on MatchVerifier:
-//  LocationVerifier and RangeVerifier to verify whether a matched node has
-//  the expected source location or source range.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_CLANG_UNITTESTS_AST_MATCHVERIFIER_H
-#define LLVM_CLANG_UNITTESTS_AST_MATCHVERIFIER_H
-
-#include "clang/AST/ASTContext.h"
-#include "clang/ASTMatchers/ASTMatchFinder.h"
-#include "clang/ASTMatchers/ASTMatchers.h"
-#include "clang/Testing/CommandLineArgs.h"
-#include "clang/Tooling/Tooling.h"
-#include "gtest/gtest.h"
-
-namespace clang {
-namespace ast_matchers {
-
-/// \brief Base class for verifying some property of nodes found by a matcher.
-template <typename NodeType>
-class MatchVerifier : public MatchFinder::MatchCallback {
-public:
-  template <typename MatcherType>
-  testing::AssertionResult match(const std::string &Code,
-                                 const MatcherType &AMatcher) {
-    std::vector<std::string> Args;
-    return match(Code, AMatcher, Args, Lang_CXX03);
-  }
-
-  template <typename MatcherType>
-  testing::AssertionResult match(const std::string &Code,
-                                 const MatcherType &AMatcher, TestLanguage L) {
-    std::vector<std::string> Args;
-    return match(Code, AMatcher, Args, L);
-  }
-
-  template <typename MatcherType>
-  testing::AssertionResult
-  match(const std::string &Code, const MatcherType &AMatcher,
-        std::vector<std::string> &Args, TestLanguage L);
-
-  template <typename MatcherType>
-  testing::AssertionResult match(const Decl *D, const MatcherType &AMatcher);
-
-protected:
-  void run(const MatchFinder::MatchResult &Result) override;
-  virtual void verify(const MatchFinder::MatchResult &Result,
-                      const NodeType &Node) {}
-
-  void setFailure(const Twine &Result) {
-    Verified = false;
-    VerifyResult = Result.str();
-  }
-
-  void setSuccess() {
-    Verified = true;
-  }
-
-private:
-  bool Verified;
-  std::string VerifyResult;
-};
-
-/// \brief Runs a matcher over some code, and returns the result of the
-/// verifier for the matched node.
-template <typename NodeType>
-template <typename MatcherType>
-testing::AssertionResult
-MatchVerifier<NodeType>::match(const std::string &Code,
-                               const MatcherType &AMatcher,
-                               std::vector<std::string> &Args, TestLanguage L) {
-  MatchFinder Finder;
-  Finder.addMatcher(AMatcher.bind(""), this);
-  std::unique_ptr<tooling::FrontendActionFactory> Factory(
-      tooling::newFrontendActionFactory(&Finder));
-
-  StringRef FileName;
-  switch (L) {
-  case Lang_C89:
-    Args.push_back("-std=c89");
-    FileName = "input.c";
-    break;
-  case Lang_C99:
-    Args.push_back("-std=c99");
-    FileName = "input.c";
-    break;
-  case Lang_CXX03:
-    Args.push_back("-std=c++03");
-    FileName = "input.cc";
-    break;
-  case Lang_CXX11:
-    Args.push_back("-std=c++11");
-    FileName = "input.cc";
-    break;
-  case Lang_CXX14:
-    Args.push_back("-std=c++14");
-    FileName = "input.cc";
-    break;
-  case Lang_CXX17:
-    Args.push_back("-std=c++17");
-    FileName = "input.cc";
-    break;
-  case Lang_CXX20:
-    Args.push_back("-std=c++20");
-    FileName = "input.cc";
-    break;
-  case Lang_OpenCL:
-    Args.push_back("-cl-no-stdinc");
-    FileName = "input.cl";
-    break;
-  case Lang_OBJCXX:
-    FileName = "input.mm";
-    break;
-  }
-
-  // Default to failure in case callback is never called
-  setFailure("Could not find match");
-  if (!tooling::runToolOnCodeWithArgs(Factory->create(), Code, Args, FileName))
-    return testing::AssertionFailure() << "Parsing error";
-  if (!Verified)
-    return testing::AssertionFailure() << VerifyResult;
-  return testing::AssertionSuccess();
-}
-
-/// \brief Runs a matcher over some AST, and returns the result of the
-/// verifier for the matched node.
-template <typename NodeType> template <typename MatcherType>
-testing::AssertionResult MatchVerifier<NodeType>::match(
-    const Decl *D, const MatcherType &AMatcher) {
-  MatchFinder Finder;
-  Finder.addMatcher(AMatcher.bind(""), this);
-
-  setFailure("Could not find match");
-  Finder.match(*D, D->getASTContext());
-
-  if (!Verified)
-    return testing::AssertionFailure() << VerifyResult;
-  return testing::AssertionSuccess();
-}
-
-template <typename NodeType>
-void MatchVerifier<NodeType>::run(const MatchFinder::MatchResult &Result) {
-  const NodeType *Node = Result.Nodes.getNodeAs<NodeType>("");
-  if (!Node) {
-    setFailure("Matched node has wrong type");
-  } else {
-    // Callback has been called, default to success.
-    setSuccess();
-    verify(Result, *Node);
-  }
-}
-
-template <>
-inline void
-MatchVerifier<DynTypedNode>::run(const MatchFinder::MatchResult &Result) {
-  BoundNodes::IDToNodeMap M = Result.Nodes.getMap();
-  BoundNodes::IDToNodeMap::const_iterator I = M.find("");
-  if (I == M.end()) {
-    setFailure("Node was not bound");
-  } else {
-    // Callback has been called, default to success.
-    setSuccess();
-    verify(Result, I->second);
-  }
-}
-
-/// \brief Verify whether a node has the correct source location.
-///
-/// By default, Node.getSourceLocation() is checked. This can be changed
-/// by overriding getLocation().
-template <typename NodeType>
-class LocationVerifier : public MatchVerifier<NodeType> {
-public:
-  void expectLocation(unsigned Line, unsigned Column) {
-    ExpectLine = Line;
-    ExpectColumn = Column;
-  }
-
-protected:
-  void verify(const MatchFinder::MatchResult &Result,
-              const NodeType &Node) override {
-    SourceLocation Loc = getLocation(Node);
-    unsigned Line = Result.SourceManager->getSpellingLineNumber(Loc);
-    unsigned Column = Result.SourceManager->getSpellingColumnNumber(Loc);
-    if (Line != ExpectLine || Column != ExpectColumn) {
-      std::string MsgStr;
-      llvm::raw_string_ostream Msg(MsgStr);
-      Msg << "Expected location <" << ExpectLine << ":" << ExpectColumn
-          << ">, found <";
-      Loc.print(Msg, *Result.SourceManager);
-      Msg << '>';
-      this->setFailure(Msg.str());
-    }
-  }
-
-  virtual SourceLocation getLocation(const NodeType &Node) {
-    return Node.getLocation();
-  }
-
-private:
-  unsigned ExpectLine, ExpectColumn;
-};
-
-/// \brief Verify whether a node has the correct source range.
-///
-/// By default, Node.getSourceRange() is checked. This can be changed
-/// by overriding getRange().
-template <typename NodeType>
-class RangeVerifier : public MatchVerifier<NodeType> {
-public:
-  void expectRange(unsigned BeginLine, unsigned BeginColumn,
-                   unsigned EndLine, unsigned EndColumn) {
-    ExpectBeginLine = BeginLine;
-    ExpectBeginColumn = BeginColumn;
-    ExpectEndLine = EndLine;
-    ExpectEndColumn = EndColumn;
-  }
-
-protected:
-  void verify(const MatchFinder::MatchResult &Result,
-              const NodeType &Node) override {
-    SourceRange R = getRange(Node);
-    SourceLocation Begin = R.getBegin();
-    SourceLocation End = R.getEnd();
-    unsigned BeginLine = Result.SourceManager->getSpellingLineNumber(Begin);
-    unsigned BeginColumn = Result.SourceManager->getSpellingColumnNumber(Begin);
-    unsigned EndLine = Result.SourceManager->getSpellingLineNumber(End);
-    unsigned EndColumn = Result.SourceManager->getSpellingColumnNumber(End);
-    if (BeginLine != ExpectBeginLine || BeginColumn != ExpectBeginColumn ||
-        EndLine != ExpectEndLine || EndColumn != ExpectEndColumn) {
-      std::string MsgStr;
-      llvm::raw_string_ostream Msg(MsgStr);
-      Msg << "Expected range <" << ExpectBeginLine << ":" << ExpectBeginColumn
-          << '-' << ExpectEndLine << ":" << ExpectEndColumn << ">, found <";
-      Begin.print(Msg, *Result.SourceManager);
-      Msg << '-';
-      End.print(Msg, *Result.SourceManager);
-      Msg << '>';
-      this->setFailure(Msg.str());
-    }
-  }
-
-  virtual SourceRange getRange(const NodeType &Node) {
-    return Node.getSourceRange();
-  }
-
-private:
-  unsigned ExpectBeginLine, ExpectBeginColumn, ExpectEndLine, ExpectEndColumn;
-};
-
-/// \brief Verify whether a node's dump contains a given substring.
-class DumpVerifier : public MatchVerifier<DynTypedNode> {
-public:
-  void expectSubstring(const std::string &Str) {
-    ExpectSubstring = Str;
-  }
-
-protected:
-  void verify(const MatchFinder::MatchResult &Result,
-              const DynTypedNode &Node) override {
-    std::string DumpStr;
-    llvm::raw_string_ostream Dump(DumpStr);
-    Node.dump(Dump, *Result.Context);
-
-    if (Dump.str().find(ExpectSubstring) == std::string::npos) {
-      std::string MsgStr;
-      llvm::raw_string_ostream Msg(MsgStr);
-      Msg << "Expected dump substring <" << ExpectSubstring << ">, found <"
-          << Dump.str() << '>';
-      this->setFailure(Msg.str());
-    }
-  }
-
-private:
-  std::string ExpectSubstring;
-};
-
-/// \brief Verify whether a node's pretty print matches a given string.
-class PrintVerifier : public MatchVerifier<DynTypedNode> {
-public:
-  void expectString(const std::string &Str) {
-    ExpectString = Str;
-  }
-
-protected:
-  void verify(const MatchFinder::MatchResult &Result,
-              const DynTypedNode &Node) override {
-    std::string PrintStr;
-    llvm::raw_string_ostream Print(PrintStr);
-    Node.print(Print, Result.Context->getPrintingPolicy());
-
-    if (Print.str() != ExpectString) {
-      std::string MsgStr;
-      llvm::raw_string_ostream Msg(MsgStr);
-      Msg << "Expected pretty print <" << ExpectString << ">, found <"
-          << Print.str() << '>';
-      this->setFailure(Msg.str());
-    }
-  }
-
-private:
-  std::string ExpectString;
-};
-
-} // end namespace ast_matchers
-} // end namespace clang
-
-#endif
diff --git a/gnu/llvm/clang/unittests/AST/NamedDeclPrinterTest.cpp b/gnu/llvm/clang/unittests/AST/NamedDeclPrinterTest.cpp
deleted file mode 100644
index cd833725b44..00000000000
--- a/gnu/llvm/clang/unittests/AST/NamedDeclPrinterTest.cpp
+++ /dev/null
@@ -1,267 +0,0 @@
-//===- unittests/AST/NamedDeclPrinterTest.cpp --- NamedDecl printer tests -===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file contains tests for NamedDecl::printQualifiedName().
-//
-// These tests have a coding convention:
-// * declaration to be printed is named 'A' unless it should have some special
-// name (e.g., 'operator+');
-// * additional helper declarations are 'Z', 'Y', 'X' and so on.
-//
-//===----------------------------------------------------------------------===//
-
-#include "ASTPrint.h"
-#include "clang/AST/ASTContext.h"
-#include "clang/AST/Decl.h"
-#include "clang/AST/PrettyPrinter.h"
-#include "clang/ASTMatchers/ASTMatchFinder.h"
-#include "clang/Tooling/Tooling.h"
-#include "llvm/ADT/SmallString.h"
-#include "llvm/Support/raw_ostream.h"
-#include "gtest/gtest.h"
-
-using namespace clang;
-using namespace ast_matchers;
-using namespace tooling;
-
-namespace {
-
-class PrintMatch : public MatchFinder::MatchCallback {
-  SmallString<1024> Printed;
-  unsigned NumFoundDecls;
-  std::function<void(llvm::raw_ostream &OS, const NamedDecl *)> Printer;
-
-public:
-  explicit PrintMatch(
-      std::function<void(llvm::raw_ostream &OS, const NamedDecl *)> Printer)
-      : NumFoundDecls(0), Printer(std::move(Printer)) {}
-
-  void run(const MatchFinder::MatchResult &Result) override {
-    const NamedDecl *ND = Result.Nodes.getNodeAs<NamedDecl>("id");
-    if (!ND)
-      return;
-    NumFoundDecls++;
-    if (NumFoundDecls > 1)
-      return;
-
-    llvm::raw_svector_ostream Out(Printed);
-    Printer(Out, ND);
-  }
-
-  StringRef getPrinted() const {
-    return Printed;
-  }
-
-  unsigned getNumFoundDecls() const {
-    return NumFoundDecls;
-  }
-};
-
-::testing::AssertionResult PrintedDeclMatches(
-    StringRef Code, const std::vector<std::string> &Args,
-    const DeclarationMatcher &NodeMatch, StringRef ExpectedPrinted,
-    StringRef FileName,
-    std::function<void(llvm::raw_ostream &, const NamedDecl *)> Print) {
-  return PrintedNodeMatches<NamedDecl>(
-      Code, Args, NodeMatch, ExpectedPrinted, FileName,
-      [Print](llvm::raw_ostream &Out, const ASTContext *Context,
-              const NamedDecl *ND,
-              PrintingPolicyAdjuster PolicyAdjuster) { Print(Out, ND); });
-}
-
-::testing::AssertionResult
-PrintedNamedDeclMatches(StringRef Code, const std::vector<std::string> &Args,
-                        bool SuppressUnwrittenScope,
-                        const DeclarationMatcher &NodeMatch,
-                        StringRef ExpectedPrinted, StringRef FileName) {
-  return PrintedDeclMatches(Code, Args, NodeMatch, ExpectedPrinted, FileName,
-                            [=](llvm::raw_ostream &Out, const NamedDecl *ND) {
-                              auto Policy =
-                                  ND->getASTContext().getPrintingPolicy();
-                              Policy.SuppressUnwrittenScope =
-                                  SuppressUnwrittenScope;
-                              ND->printQualifiedName(Out, Policy);
-                            });
-}
-
-::testing::AssertionResult
-PrintedNamedDeclCXX98Matches(StringRef Code, StringRef DeclName,
-                             StringRef ExpectedPrinted) {
-  std::vector<std::string> Args(1, "-std=c++98");
-  return PrintedNamedDeclMatches(Code, Args,
-                                 /*SuppressUnwrittenScope*/ false,
-                                 namedDecl(hasName(DeclName)).bind("id"),
-                                 ExpectedPrinted, "input.cc");
-}
-
-::testing::AssertionResult
-PrintedWrittenNamedDeclCXX11Matches(StringRef Code, StringRef DeclName,
-                                    StringRef ExpectedPrinted) {
-  std::vector<std::string> Args(1, "-std=c++11");
-  return PrintedNamedDeclMatches(Code, Args,
-                                 /*SuppressUnwrittenScope*/ true,
-                                 namedDecl(hasName(DeclName)).bind("id"),
-                                 ExpectedPrinted, "input.cc");
-}
-
-::testing::AssertionResult
-PrintedWrittenPropertyDeclObjCMatches(StringRef Code, StringRef DeclName,
-                                   StringRef ExpectedPrinted) {
-  std::vector<std::string> Args{"-std=c++11", "-xobjective-c++"};
-  return PrintedNamedDeclMatches(Code, Args,
-                                 /*SuppressUnwrittenScope*/ true,
-                                 objcPropertyDecl(hasName(DeclName)).bind("id"),
-                                 ExpectedPrinted, "input.m");
-}
-
-::testing::AssertionResult
-PrintedNestedNameSpecifierMatches(StringRef Code, StringRef DeclName,
-                                  StringRef ExpectedPrinted) {
-  std::vector<std::string> Args{"-std=c++11"};
-  return PrintedDeclMatches(Code, Args, namedDecl(hasName(DeclName)).bind("id"),
-                            ExpectedPrinted, "input.cc",
-                            [](llvm::raw_ostream &Out, const NamedDecl *D) {
-                              D->printNestedNameSpecifier(Out);
-                            });
-}
-
-} // unnamed namespace
-
-TEST(NamedDeclPrinter, TestNamespace1) {
-  ASSERT_TRUE(PrintedNamedDeclCXX98Matches(
-    "namespace { int A; }",
-    "A",
-    "(anonymous namespace)::A"));
-}
-
-TEST(NamedDeclPrinter, TestNamespace2) {
-  ASSERT_TRUE(PrintedWrittenNamedDeclCXX11Matches(
-    "inline namespace Z { namespace { int A; } }",
-    "A",
-    "A"));
-}
-
-TEST(NamedDeclPrinter, TestUnscopedUnnamedEnum) {
-  ASSERT_TRUE(PrintedWrittenNamedDeclCXX11Matches(
-    "enum { A };",
-    "A",
-    "A"));
-}
-
-TEST(NamedDeclPrinter, TestNamedEnum) {
-  ASSERT_TRUE(PrintedWrittenNamedDeclCXX11Matches(
-    "enum X { A };",
-    "A",
-    "A"));
-}
-
-TEST(NamedDeclPrinter, TestScopedNamedEnum) {
-  ASSERT_TRUE(PrintedWrittenNamedDeclCXX11Matches(
-    "enum class X { A };",
-    "A",
-    "X::A"));
-}
-
-TEST(NamedDeclPrinter, TestClassWithUnscopedUnnamedEnum) {
-  ASSERT_TRUE(PrintedWrittenNamedDeclCXX11Matches(
-    "class X { enum { A }; };",
-    "A",
-    "X::A"));
-}
-
-TEST(NamedDeclPrinter, TestClassWithUnscopedNamedEnum) {
-  ASSERT_TRUE(PrintedWrittenNamedDeclCXX11Matches(
-    "class X { enum Y { A }; };",
-    "A",
-    "X::A"));
-}
-
-TEST(NamedDeclPrinter, TestClassWithScopedNamedEnum) {
-  ASSERT_TRUE(PrintedWrittenNamedDeclCXX11Matches(
-    "class X { enum class Y { A }; };",
-    "A",
-    "X::Y::A"));
-}
-
-TEST(NamedDeclPrinter, TestLinkageInNamespace) {
-  ASSERT_TRUE(PrintedWrittenNamedDeclCXX11Matches(
-    "namespace X { extern \"C\" { int A; } }",
-    "A",
-    "X::A"));
-}
-
-TEST(NamedDeclPrinter, TestObjCClassExtension) {
-  const char *Code =
-R"(
-  @interface Obj
-  @end
-
-  @interface Obj ()
-  @property(nonatomic) int property;
-  @end
-)";
-  ASSERT_TRUE(PrintedWrittenPropertyDeclObjCMatches(
-    Code,
-    "property",
-    "Obj::property"));
-}
-
-TEST(NamedDeclPrinter, TestInstanceObjCClassExtension) {
-  const char *Code =
-R"(
-@interface ObjC
-@end
-@interface ObjC () {
-  char data; // legal with non-fragile ABI.
-}
-@end
-)";
-
-  std::vector<std::string> Args{
-      "-std=c++11", "-xobjective-c++",
-      "-fobjc-runtime=macosx" /*force to use non-fragile ABI*/};
-  ASSERT_TRUE(PrintedNamedDeclMatches(Code, Args,
-                                      /*SuppressUnwrittenScope*/ true,
-                                      namedDecl(hasName("data")).bind("id"),
-                                      // not "::data"
-                                      "ObjC::data", "input.mm"));
-}
-
-TEST(NamedDeclPrinter, TestObjCClassExtensionWithGetter) {
-  const char *Code =
-R"(
-  @interface Obj
-  @end
-
-  @interface Obj ()
-  @property(nonatomic, getter=myPropertyGetter) int property;
-  @end
-)";
-  ASSERT_TRUE(PrintedWrittenPropertyDeclObjCMatches(
-    Code,
-    "property",
-    "Obj::property"));
-}
-
-TEST(NamedDeclPrinter, NestedNameSpecifierSimple) {
-  const char *Code =
-      R"(
-  namespace foo { namespace bar { void func(); }  }
-)";
-  ASSERT_TRUE(PrintedNestedNameSpecifierMatches(Code, "func", "foo::bar::"));
-}
-
-TEST(NamedDeclPrinter, NestedNameSpecifierTemplateArgs) {
-  const char *Code =
-      R"(
-        template <class T> struct vector;
-        template <> struct vector<int> { int method(); };
-)";
-  ASSERT_TRUE(
-      PrintedNestedNameSpecifierMatches(Code, "method", "vector<int>::"));
-}
diff --git a/gnu/llvm/clang/unittests/AST/RecursiveASTVisitorTest.cpp b/gnu/llvm/clang/unittests/AST/RecursiveASTVisitorTest.cpp
deleted file mode 100644
index aa8756527d3..00000000000
--- a/gnu/llvm/clang/unittests/AST/RecursiveASTVisitorTest.cpp
+++ /dev/null
@@ -1,105 +0,0 @@
-//===- unittest/AST/RecursiveASTVisitorTest.cpp ---------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/AST/RecursiveASTVisitor.h"
-#include "clang/AST/ASTConsumer.h"
-#include "clang/AST/ASTContext.h"
-#include "clang/AST/Attr.h"
-#include "clang/Frontend/FrontendAction.h"
-#include "clang/Tooling/Tooling.h"
-#include "llvm/ADT/FunctionExtras.h"
-#include "llvm/ADT/STLExtras.h"
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-#include <cassert>
-
-using namespace clang;
-using ::testing::ElementsAre;
-
-namespace {
-class ProcessASTAction : public clang::ASTFrontendAction {
-public:
-  ProcessASTAction(llvm::unique_function<void(clang::ASTContext &)> Process)
-      : Process(std::move(Process)) {
-    assert(this->Process);
-  }
-
-  std::unique_ptr<ASTConsumer> CreateASTConsumer(CompilerInstance &CI,
-                                                 StringRef InFile) {
-    class Consumer : public ASTConsumer {
-    public:
-      Consumer(llvm::function_ref<void(ASTContext &CTx)> Process)
-          : Process(Process) {}
-
-      void HandleTranslationUnit(ASTContext &Ctx) override { Process(Ctx); }
-
-    private:
-      llvm::function_ref<void(ASTContext &CTx)> Process;
-    };
-
-    return std::make_unique<Consumer>(Process);
-  }
-
-private:
-  llvm::unique_function<void(clang::ASTContext &)> Process;
-};
-
-enum class VisitEvent {
-  StartTraverseFunction,
-  EndTraverseFunction,
-  StartTraverseAttr,
-  EndTraverseAttr
-};
-
-class CollectInterestingEvents
-    : public RecursiveASTVisitor<CollectInterestingEvents> {
-public:
-  bool TraverseFunctionDecl(FunctionDecl *D) {
-    Events.push_back(VisitEvent::StartTraverseFunction);
-    bool Ret = RecursiveASTVisitor::TraverseFunctionDecl(D);
-    Events.push_back(VisitEvent::EndTraverseFunction);
-
-    return Ret;
-  }
-
-  bool TraverseAttr(Attr *A) {
-    Events.push_back(VisitEvent::StartTraverseAttr);
-    bool Ret = RecursiveASTVisitor::TraverseAttr(A);
-    Events.push_back(VisitEvent::EndTraverseAttr);
-
-    return Ret;
-  }
-
-  std::vector<VisitEvent> takeEvents() && { return std::move(Events); }
-
-private:
-  std::vector<VisitEvent> Events;
-};
-
-std::vector<VisitEvent> collectEvents(llvm::StringRef Code) {
-  CollectInterestingEvents Visitor;
-  clang::tooling::runToolOnCode(
-      std::make_unique<ProcessASTAction>(
-          [&](clang::ASTContext &Ctx) { Visitor.TraverseAST(Ctx); }),
-      Code);
-  return std::move(Visitor).takeEvents();
-}
-} // namespace
-
-TEST(RecursiveASTVisitorTest, AttributesInsideDecls) {
-  /// Check attributes are traversed inside TraverseFunctionDecl.
-  llvm::StringRef Code = R"cpp(
-__attribute__((annotate("something"))) int foo() { return 10; }
-  )cpp";
-
-  EXPECT_THAT(collectEvents(Code),
-              ElementsAre(VisitEvent::StartTraverseFunction,
-                          VisitEvent::StartTraverseAttr,
-                          VisitEvent::EndTraverseAttr,
-                          VisitEvent::EndTraverseFunction));
-}
diff --git a/gnu/llvm/clang/unittests/AST/SizelessTypesTest.cpp b/gnu/llvm/clang/unittests/AST/SizelessTypesTest.cpp
deleted file mode 100644
index 9ff3a5b09d8..00000000000
--- a/gnu/llvm/clang/unittests/AST/SizelessTypesTest.cpp
+++ /dev/null
@@ -1,86 +0,0 @@
-//===- unittests/AST/SizelessTypesTest.cpp --- Sizeless type tests --------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file contains tests for clang::Type queries related to sizeless types.
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/AST/ASTContext.h"
-#include "clang/AST/Type.h"
-#include "clang/Tooling/Tooling.h"
-#include "gtest/gtest.h"
-
-using namespace clang;
-
-struct SizelessTypeTester : public ::testing::Test {
-  // Declare an incomplete structure type.
-  std::unique_ptr<ASTUnit> AST = tooling::buildASTFromCodeWithArgs(
-      "struct foo;", {"-target", "aarch64-linux-gnu"});
-  ASTContext &Ctx = AST->getASTContext();
-  TranslationUnitDecl &TU = *Ctx.getTranslationUnitDecl();
-  TypeDecl *Foo = cast<TypeDecl>(TU.lookup(&Ctx.Idents.get("foo")).front());
-  const Type *FooTy = Foo->getTypeForDecl();
-};
-
-TEST_F(SizelessTypeTester, TestSizelessBuiltin) {
-  ASSERT_TRUE(Ctx.SveInt8Ty->isSizelessBuiltinType());
-  ASSERT_TRUE(Ctx.SveInt16Ty->isSizelessBuiltinType());
-  ASSERT_TRUE(Ctx.SveInt32Ty->isSizelessBuiltinType());
-  ASSERT_TRUE(Ctx.SveInt64Ty->isSizelessBuiltinType());
-
-  ASSERT_TRUE(Ctx.SveUint8Ty->isSizelessBuiltinType());
-  ASSERT_TRUE(Ctx.SveUint16Ty->isSizelessBuiltinType());
-  ASSERT_TRUE(Ctx.SveUint32Ty->isSizelessBuiltinType());
-  ASSERT_TRUE(Ctx.SveUint64Ty->isSizelessBuiltinType());
-
-  ASSERT_TRUE(Ctx.SveFloat16Ty->isSizelessBuiltinType());
-  ASSERT_TRUE(Ctx.SveFloat32Ty->isSizelessBuiltinType());
-  ASSERT_TRUE(Ctx.SveFloat64Ty->isSizelessBuiltinType());
-
-  ASSERT_TRUE(Ctx.SveBFloat16Ty->isSizelessBuiltinType());
-
-  ASSERT_TRUE(Ctx.SveBoolTy->isSizelessBuiltinType());
-
-  ASSERT_FALSE(Ctx.VoidTy->isSizelessBuiltinType());
-  ASSERT_FALSE(Ctx.PseudoObjectTy->isSizelessBuiltinType());
-  ASSERT_FALSE(FooTy->isSizelessBuiltinType());
-
-  ASSERT_FALSE(Ctx.getPointerType(Ctx.SveBoolTy)->isSizelessBuiltinType());
-  ASSERT_FALSE(
-      Ctx.getLValueReferenceType(Ctx.SveBoolTy)->isSizelessBuiltinType());
-  ASSERT_FALSE(
-      Ctx.getRValueReferenceType(Ctx.SveBoolTy)->isSizelessBuiltinType());
-}
-
-TEST_F(SizelessTypeTester, TestSizeless) {
-  ASSERT_TRUE(Ctx.SveInt8Ty->isSizelessType());
-  ASSERT_TRUE(Ctx.SveInt16Ty->isSizelessType());
-  ASSERT_TRUE(Ctx.SveInt32Ty->isSizelessType());
-  ASSERT_TRUE(Ctx.SveInt64Ty->isSizelessType());
-
-  ASSERT_TRUE(Ctx.SveUint8Ty->isSizelessType());
-  ASSERT_TRUE(Ctx.SveUint16Ty->isSizelessType());
-  ASSERT_TRUE(Ctx.SveUint32Ty->isSizelessType());
-  ASSERT_TRUE(Ctx.SveUint64Ty->isSizelessType());
-
-  ASSERT_TRUE(Ctx.SveFloat16Ty->isSizelessType());
-  ASSERT_TRUE(Ctx.SveFloat32Ty->isSizelessType());
-  ASSERT_TRUE(Ctx.SveFloat64Ty->isSizelessType());
-
-  ASSERT_TRUE(Ctx.SveBFloat16Ty->isSizelessType());
-
-  ASSERT_TRUE(Ctx.SveBoolTy->isSizelessType());
-
-  ASSERT_FALSE(Ctx.VoidTy->isSizelessType());
-  ASSERT_FALSE(Ctx.PseudoObjectTy->isSizelessType());
-  ASSERT_FALSE(FooTy->isSizelessType());
-
-  ASSERT_FALSE(Ctx.getPointerType(Ctx.SveBoolTy)->isSizelessType());
-  ASSERT_FALSE(Ctx.getLValueReferenceType(Ctx.SveBoolTy)->isSizelessType());
-  ASSERT_FALSE(Ctx.getRValueReferenceType(Ctx.SveBoolTy)->isSizelessType());
-}
diff --git a/gnu/llvm/clang/unittests/AST/SourceLocationTest.cpp b/gnu/llvm/clang/unittests/AST/SourceLocationTest.cpp
deleted file mode 100644
index c1565c8f4c3..00000000000
--- a/gnu/llvm/clang/unittests/AST/SourceLocationTest.cpp
+++ /dev/null
@@ -1,914 +0,0 @@
-//===- unittest/AST/SourceLocationTest.cpp - AST source loc unit tests ----===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file contains tests for SourceLocation and SourceRange fields
-// in AST nodes.
-//
-// FIXME: In the long-term, when we test more than source locations, we may
-// want to have a unit test file for an AST node (or group of related nodes),
-// rather than a unit test file for source locations for all AST nodes.
-//
-//===----------------------------------------------------------------------===//
-
-#include "MatchVerifier.h"
-#include "clang/AST/ASTContext.h"
-#include "clang/ASTMatchers/ASTMatchFinder.h"
-#include "clang/ASTMatchers/ASTMatchers.h"
-#include "clang/Tooling/Tooling.h"
-#include "llvm/Testing/Support/Annotations.h"
-#include "gtest/gtest.h"
-
-using namespace clang;
-using namespace clang::ast_matchers;
-
-namespace {
-
-// FIXME: Pull the *Verifier tests into their own test file.
-
-TEST(MatchVerifier, ParseError) {
-  LocationVerifier<VarDecl> Verifier;
-  Verifier.expectLocation(1, 1);
-  EXPECT_FALSE(Verifier.match("int i", varDecl()));
-}
-
-TEST(MatchVerifier, NoMatch) {
-  LocationVerifier<VarDecl> Verifier;
-  Verifier.expectLocation(1, 1);
-  EXPECT_FALSE(Verifier.match("int i;", recordDecl()));
-}
-
-TEST(MatchVerifier, WrongType) {
-  LocationVerifier<RecordDecl> Verifier;
-  Verifier.expectLocation(1, 1);
-  EXPECT_FALSE(Verifier.match("int i;", varDecl()));
-}
-
-TEST(LocationVerifier, WrongLocation) {
-  LocationVerifier<VarDecl> Verifier;
-  Verifier.expectLocation(1, 1);
-  EXPECT_FALSE(Verifier.match("int i;", varDecl()));
-}
-
-TEST(RangeVerifier, WrongRange) {
-  RangeVerifier<VarDecl> Verifier;
-  Verifier.expectRange(1, 1, 1, 1);
-  EXPECT_FALSE(Verifier.match("int i;", varDecl()));
-}
-
-class WhileParenLocationVerifier : public MatchVerifier<WhileStmt> {
-  unsigned ExpectLParenLine = 0, ExpectLParenColumn = 0;
-  unsigned ExpectRParenLine = 0, ExpectRParenColumn = 0;
-
-public:
-  void expectLocations(unsigned LParenLine, unsigned LParenColumn,
-                       unsigned RParenLine, unsigned RParenColumn) {
-    ExpectLParenLine = LParenLine;
-    ExpectLParenColumn = LParenColumn;
-    ExpectRParenLine = RParenLine;
-    ExpectRParenColumn = RParenColumn;
-  }
-
-protected:
-  void verify(const MatchFinder::MatchResult &Result,
-              const WhileStmt &Node) override {
-    SourceLocation LParenLoc = Node.getLParenLoc();
-    SourceLocation RParenLoc = Node.getRParenLoc();
-    unsigned LParenLine =
-        Result.SourceManager->getSpellingLineNumber(LParenLoc);
-    unsigned LParenColumn =
-        Result.SourceManager->getSpellingColumnNumber(LParenLoc);
-    unsigned RParenLine =
-        Result.SourceManager->getSpellingLineNumber(RParenLoc);
-    unsigned RParenColumn =
-        Result.SourceManager->getSpellingColumnNumber(RParenLoc);
-
-    if (LParenLine != ExpectLParenLine || LParenColumn != ExpectLParenColumn ||
-        RParenLine != ExpectRParenLine || RParenColumn != ExpectRParenColumn) {
-      std::string MsgStr;
-      llvm::raw_string_ostream Msg(MsgStr);
-      Msg << "Expected LParen Location <" << ExpectLParenLine << ":"
-          << ExpectLParenColumn << ">, found <";
-      LParenLoc.print(Msg, *Result.SourceManager);
-      Msg << ">\n";
-
-      Msg << "Expected RParen Location <" << ExpectRParenLine << ":"
-          << ExpectRParenColumn << ">, found <";
-      RParenLoc.print(Msg, *Result.SourceManager);
-      Msg << ">";
-
-      this->setFailure(Msg.str());
-    }
-  }
-};
-
-TEST(LocationVerifier, WhileParenLoc) {
-  WhileParenLocationVerifier Verifier;
-  Verifier.expectLocations(1, 17, 1, 38);
-  EXPECT_TRUE(Verifier.match("void f() { while(true/*some comment*/) {} }",
-                             whileStmt()));
-}
-
-class LabelDeclRangeVerifier : public RangeVerifier<LabelStmt> {
-protected:
-  SourceRange getRange(const LabelStmt &Node) override {
-    return Node.getDecl()->getSourceRange();
-  }
-};
-
-TEST(LabelDecl, Range) {
-  LabelDeclRangeVerifier Verifier;
-  Verifier.expectRange(1, 12, 1, 12);
-  EXPECT_TRUE(Verifier.match("void f() { l: return; }", labelStmt()));
-}
-
-TEST(LabelStmt, Range) {
-  RangeVerifier<LabelStmt> Verifier;
-  Verifier.expectRange(1, 12, 1, 15);
-  EXPECT_TRUE(Verifier.match("void f() { l: return; }", labelStmt()));
-}
-
-TEST(ParmVarDecl, KNRLocation) {
-  LocationVerifier<ParmVarDecl> Verifier;
-  Verifier.expectLocation(1, 8);
-  EXPECT_TRUE(Verifier.match("void f(i) {}", varDecl(), Lang_C99));
-}
-
-TEST(ParmVarDecl, KNRRange) {
-  RangeVerifier<ParmVarDecl> Verifier;
-  Verifier.expectRange(1, 8, 1, 8);
-  EXPECT_TRUE(Verifier.match("void f(i) {}", varDecl(), Lang_C99));
-}
-
-TEST(CXXNewExpr, ArrayRange) {
-  RangeVerifier<CXXNewExpr> Verifier;
-  Verifier.expectRange(1, 12, 1, 22);
-  EXPECT_TRUE(Verifier.match("void f() { new int[10]; }", cxxNewExpr()));
-}
-
-TEST(CXXNewExpr, ParenRange) {
-  RangeVerifier<CXXNewExpr> Verifier;
-  Verifier.expectRange(1, 12, 1, 20);
-  EXPECT_TRUE(Verifier.match("void f() { new int(); }", cxxNewExpr()));
-}
-
-TEST(MemberExpr, ImplicitMemberRange) {
-  RangeVerifier<MemberExpr> Verifier;
-  Verifier.expectRange(2, 30, 2, 30);
-  EXPECT_TRUE(Verifier.match("struct S { operator int() const; };\n"
-                             "int foo(const S& s) { return s; }",
-                             memberExpr()));
-}
-
-class MemberExprArrowLocVerifier : public RangeVerifier<MemberExpr> {
-protected:
-  SourceRange getRange(const MemberExpr &Node) override {
-     return Node.getOperatorLoc();
-  }
-};
-
-TEST(MemberExpr, ArrowRange) {
-  MemberExprArrowLocVerifier Verifier;
-  Verifier.expectRange(2, 19, 2, 19);
-  EXPECT_TRUE(Verifier.match("struct S { int x; };\n"
-                             "void foo(S *s) { s->x = 0; }",
-                             memberExpr()));
-}
-
-TEST(MemberExpr, MacroArrowRange) {
-  MemberExprArrowLocVerifier Verifier;
-  Verifier.expectRange(1, 24, 1, 24);
-  EXPECT_TRUE(Verifier.match("#define MEMBER(a, b) (a->b)\n"
-                             "struct S { int x; };\n"
-                             "void foo(S *s) { MEMBER(s, x) = 0; }",
-                             memberExpr()));
-}
-
-TEST(MemberExpr, ImplicitArrowRange) {
-  MemberExprArrowLocVerifier Verifier;
-  Verifier.expectRange(0, 0, 0, 0);
-  EXPECT_TRUE(Verifier.match("struct S { int x; void Test(); };\n"
-                             "void S::Test() { x = 1; }",
-                             memberExpr()));
-}
-
-TEST(VarDecl, VMTypeFixedVarDeclRange) {
-  RangeVerifier<VarDecl> Verifier;
-  Verifier.expectRange(1, 1, 1, 23);
-  EXPECT_TRUE(Verifier.match("int a[(int)(void*)1234];",
-                             varDecl(), Lang_C89));
-}
-
-TEST(TypeLoc, IntRange) {
-  RangeVerifier<TypeLoc> Verifier;
-  Verifier.expectRange(1, 1, 1, 1);
-  EXPECT_TRUE(Verifier.match("int a;", typeLoc()));
-}
-
-TEST(TypeLoc, LongRange) {
-  RangeVerifier<TypeLoc> Verifier;
-  Verifier.expectRange(1, 1, 1, 1);
-  EXPECT_TRUE(Verifier.match("long a;", typeLoc()));
-}
-
-TEST(TypeLoc, LongDoubleRange) {
-  RangeVerifier<TypeLoc> Verifier;
-  Verifier.expectRange(1, 1, 1, 6);
-  EXPECT_TRUE(Verifier.match("long double a;", typeLoc()));
-}
-
-TEST(TypeLoc, DoubleLongRange) {
-  RangeVerifier<TypeLoc> Verifier;
-  Verifier.expectRange(1, 1, 1, 8);
-  EXPECT_TRUE(Verifier.match("double long a;", typeLoc()));
-}
-
-TEST(TypeLoc, LongIntRange) {
-  RangeVerifier<TypeLoc> Verifier;
-  Verifier.expectRange(1, 1, 1, 6);
-  EXPECT_TRUE(Verifier.match("long int a;", typeLoc()));
-}
-
-TEST(TypeLoc, IntLongRange) {
-  RangeVerifier<TypeLoc> Verifier;
-  Verifier.expectRange(1, 1, 1, 5);
-  EXPECT_TRUE(Verifier.match("int long a;", typeLoc()));
-}
-
-TEST(TypeLoc, UnsignedIntRange) {
-  RangeVerifier<TypeLoc> Verifier;
-  Verifier.expectRange(1, 1, 1, 10);
-  EXPECT_TRUE(Verifier.match("unsigned int a;", typeLoc()));
-}
-
-TEST(TypeLoc, IntUnsignedRange) {
-  RangeVerifier<TypeLoc> Verifier;
-  Verifier.expectRange(1, 1, 1, 5);
-  EXPECT_TRUE(Verifier.match("int unsigned a;", typeLoc()));
-}
-
-TEST(TypeLoc, LongLongRange) {
-  RangeVerifier<TypeLoc> Verifier;
-  Verifier.expectRange(1, 1, 1, 6);
-  EXPECT_TRUE(Verifier.match("long long a;", typeLoc()));
-}
-
-TEST(TypeLoc, UnsignedLongLongRange) {
-  RangeVerifier<TypeLoc> Verifier;
-  Verifier.expectRange(1, 1, 1, 15);
-  EXPECT_TRUE(Verifier.match("unsigned long long a;", typeLoc()));
-}
-
-TEST(TypeLoc, LongUnsignedLongRange) {
-  RangeVerifier<TypeLoc> Verifier;
-  Verifier.expectRange(1, 1, 1, 15);
-  EXPECT_TRUE(Verifier.match("long unsigned long a;", typeLoc()));
-}
-
-TEST(TypeLoc, LongLongUnsignedRange) {
-  RangeVerifier<TypeLoc> Verifier;
-  Verifier.expectRange(1, 1, 1, 11);
-  EXPECT_TRUE(Verifier.match("long long unsigned a;", typeLoc()));
-}
-
-TEST(TypeLoc, ConstLongLongRange) {
-  RangeVerifier<TypeLoc> Verifier;
-  Verifier.expectRange(1, 7, 1, 12);
-  EXPECT_TRUE(Verifier.match("const long long a = 0;", typeLoc()));
-}
-
-TEST(TypeLoc, LongConstLongRange) {
-  RangeVerifier<TypeLoc> Verifier;
-  Verifier.expectRange(1, 1, 1, 12);
-  EXPECT_TRUE(Verifier.match("long const long a = 0;", typeLoc()));
-}
-
-TEST(TypeLoc, LongLongConstRange) {
-  RangeVerifier<TypeLoc> Verifier;
-  Verifier.expectRange(1, 1, 1, 6);
-  EXPECT_TRUE(Verifier.match("long long const a = 0;", typeLoc()));
-}
-
-TEST(CXXConstructorDecl, NoRetFunTypeLocRange) {
-  RangeVerifier<CXXConstructorDecl> Verifier;
-  Verifier.expectRange(1, 11, 1, 13);
-  EXPECT_TRUE(Verifier.match("class C { C(); };", functionDecl()));
-}
-
-TEST(CXXConstructorDecl, DefaultedCtorLocRange) {
-  RangeVerifier<CXXConstructorDecl> Verifier;
-  Verifier.expectRange(1, 11, 1, 23);
-  EXPECT_TRUE(Verifier.match("class C { C() = default; };", functionDecl()));
-}
-
-TEST(CXXConstructorDecl, DeletedCtorLocRange) {
-  RangeVerifier<CXXConstructorDecl> Verifier;
-  Verifier.expectRange(1, 11, 1, 22);
-  EXPECT_TRUE(Verifier.match("class C { C() = delete; };", functionDecl()));
-}
-
-TEST(CompoundLiteralExpr, CompoundVectorLiteralRange) {
-  RangeVerifier<CompoundLiteralExpr> Verifier;
-  Verifier.expectRange(2, 11, 2, 22);
-  EXPECT_TRUE(Verifier.match(
-                  "typedef int int2 __attribute__((ext_vector_type(2)));\n"
-                  "int2 i2 = (int2){1, 2};", compoundLiteralExpr()));
-}
-
-TEST(CompoundLiteralExpr, ParensCompoundVectorLiteralRange) {
-  RangeVerifier<CompoundLiteralExpr> Verifier;
-  Verifier.expectRange(2, 20, 2, 31);
-  EXPECT_TRUE(Verifier.match(
-                  "typedef int int2 __attribute__((ext_vector_type(2)));\n"
-                  "constant int2 i2 = (int2)(1, 2);", 
-                  compoundLiteralExpr(), Lang_OpenCL));
-}
-
-TEST(InitListExpr, VectorLiteralListBraceRange) {
-  RangeVerifier<InitListExpr> Verifier;
-  Verifier.expectRange(2, 17, 2, 22);
-  EXPECT_TRUE(Verifier.match(
-                  "typedef int int2 __attribute__((ext_vector_type(2)));\n"
-                  "int2 i2 = (int2){1, 2};", initListExpr()));
-}
-
-TEST(InitListExpr, VectorLiteralInitListParens) {
-  RangeVerifier<InitListExpr> Verifier;
-  Verifier.expectRange(2, 26, 2, 31);
-  EXPECT_TRUE(Verifier.match(
-                  "typedef int int2 __attribute__((ext_vector_type(2)));\n"
-                  "constant int2 i2 = (int2)(1, 2);", initListExpr(), Lang_OpenCL));
-}
-
-class TemplateAngleBracketLocRangeVerifier : public RangeVerifier<TypeLoc> {
-protected:
-  SourceRange getRange(const TypeLoc &Node) override {
-    TemplateSpecializationTypeLoc T =
-        Node.getUnqualifiedLoc().castAs<TemplateSpecializationTypeLoc>();
-    assert(!T.isNull());
-    return SourceRange(T.getLAngleLoc(), T.getRAngleLoc());
-  }
-};
-
-TEST(TemplateSpecializationTypeLoc, AngleBracketLocations) {
-  TemplateAngleBracketLocRangeVerifier Verifier;
-  Verifier.expectRange(2, 8, 2, 10);
-  EXPECT_TRUE(Verifier.match(
-      "template<typename T> struct A {}; struct B{}; void f(\n"
-      "const A<B>&);",
-      loc(templateSpecializationType())));
-}
-
-TEST(CXXNewExpr, TypeParenRange) {
-  RangeVerifier<CXXNewExpr> Verifier;
-  Verifier.expectRange(1, 10, 1, 18);
-  EXPECT_TRUE(Verifier.match("int* a = new (int);", cxxNewExpr()));
-}
-
-class UnaryTransformTypeLocParensRangeVerifier : public RangeVerifier<TypeLoc> {
-protected:
-  SourceRange getRange(const TypeLoc &Node) override {
-    UnaryTransformTypeLoc T =
-        Node.getUnqualifiedLoc().castAs<UnaryTransformTypeLoc>();
-    assert(!T.isNull());
-    return SourceRange(T.getLParenLoc(), T.getRParenLoc());
-  }
-};
-
-TEST(UnaryTransformTypeLoc, ParensRange) {
-  UnaryTransformTypeLocParensRangeVerifier Verifier;
-  Verifier.expectRange(3, 26, 3, 28);
-  EXPECT_TRUE(Verifier.match(
-      "template <typename T>\n"
-      "struct S {\n"
-      "typedef __underlying_type(T) type;\n"
-      "};",
-      loc(unaryTransformType())));
-}
-
-TEST(CXXFunctionalCastExpr, SourceRange) {
-  RangeVerifier<CXXFunctionalCastExpr> Verifier;
-  Verifier.expectRange(2, 10, 2, 14);
-  EXPECT_TRUE(Verifier.match(
-      "int foo() {\n"
-      "  return int{};\n"
-      "}",
-      cxxFunctionalCastExpr(), Lang_CXX11));
-}
-
-TEST(CXXConstructExpr, SourceRange) {
-  RangeVerifier<CXXConstructExpr> Verifier;
-  Verifier.expectRange(3, 14, 3, 19);
-  EXPECT_TRUE(Verifier.match(
-      "struct A { A(int, int); };\n"
-      "void f(A a);\n"
-      "void g() { f({0, 0}); }",
-      cxxConstructExpr(), Lang_CXX11));
-}
-
-TEST(CXXTemporaryObjectExpr, SourceRange) {
-  RangeVerifier<CXXTemporaryObjectExpr> Verifier;
-  Verifier.expectRange(2, 6, 2, 12);
-  EXPECT_TRUE(Verifier.match(
-      "struct A { A(int, int); };\n"
-      "A a( A{0, 0} );",
-      cxxTemporaryObjectExpr(), Lang_CXX11));
-}
-
-TEST(CXXUnresolvedConstructExpr, SourceRange) {
-  RangeVerifier<CXXUnresolvedConstructExpr> Verifier;
-  Verifier.expectRange(3, 10, 3, 12);
-  std::vector<std::string> Args;
-  Args.push_back("-fno-delayed-template-parsing");
-  EXPECT_TRUE(Verifier.match(
-      "template <typename U>\n"
-      "U foo() {\n"
-      "  return U{};\n"
-      "}",
-      cxxUnresolvedConstructExpr(), Args, Lang_CXX11));
-}
-
-TEST(UsingDecl, SourceRange) {
-  RangeVerifier<UsingDecl> Verifier;
-  Verifier.expectRange(2, 22, 2, 25);
-  EXPECT_TRUE(Verifier.match(
-      "class B { protected: int i; };\n"
-      "class D : public B { B::i; };",
-      usingDecl()));
-}
-
-TEST(UnresolvedUsingValueDecl, SourceRange) {
-  RangeVerifier<UnresolvedUsingValueDecl> Verifier;
-  Verifier.expectRange(3, 3, 3, 6);
-  EXPECT_TRUE(Verifier.match(
-      "template <typename B>\n"
-      "class D : public B {\n"
-      "  B::i;\n"
-      "};",
-      unresolvedUsingValueDecl()));
-}
-
-TEST(FriendDecl, FriendNonMemberFunctionLocation) {
-  LocationVerifier<FriendDecl> Verifier;
-  Verifier.expectLocation(2, 13);
-  EXPECT_TRUE(Verifier.match("struct A {\n"
-                             "friend void f();\n"
-                             "};\n",
-                             friendDecl()));
-}
-
-TEST(FriendDecl, FriendNonMemberFunctionRange) {
-  RangeVerifier<FriendDecl> Verifier;
-  Verifier.expectRange(2, 1, 2, 15);
-  EXPECT_TRUE(Verifier.match("struct A {\n"
-                             "friend void f();\n"
-                             "};\n",
-                             friendDecl()));
-}
-
-TEST(FriendDecl, FriendNonMemberFunctionDefinitionLocation) {
-  LocationVerifier<FriendDecl> Verifier;
-  Verifier.expectLocation(2, 12);
-  EXPECT_TRUE(Verifier.match("struct A {\n"
-                             "friend int f() { return 0; }\n"
-                             "};\n",
-                             friendDecl()));
-}
-
-TEST(FriendDecl, FriendNonMemberFunctionDefinitionRange) {
-  RangeVerifier<FriendDecl> Verifier;
-  Verifier.expectRange(2, 1, 2, 28);
-  EXPECT_TRUE(Verifier.match("struct A {\n"
-                             "friend int f() { return 0; }\n"
-                             "};\n",
-                             friendDecl()));
-}
-
-TEST(FriendDecl, FriendElaboratedTypeLocation) {
-  LocationVerifier<FriendDecl> Verifier;
-  Verifier.expectLocation(2, 8);
-  EXPECT_TRUE(Verifier.match("struct A {\n"
-                             "friend class B;\n"
-                             "};\n",
-                             friendDecl()));
-}
-
-TEST(FriendDecl, FriendElaboratedTypeRange) {
-  RangeVerifier<FriendDecl> Verifier;
-  Verifier.expectRange(2, 1, 2, 14);
-  EXPECT_TRUE(Verifier.match("struct A {\n"
-                             "friend class B;\n"
-                             "};\n",
-                             friendDecl()));
-}
-
-TEST(FriendDecl, FriendSimpleTypeLocation) {
-  LocationVerifier<FriendDecl> Verifier;
-  Verifier.expectLocation(3, 8);
-  EXPECT_TRUE(Verifier.match("class B;\n"
-                             "struct A {\n"
-                             "friend B;\n"
-                             "};\n",
-                             friendDecl(), Lang_CXX11));
-}
-
-TEST(FriendDecl, FriendSimpleTypeRange) {
-  RangeVerifier<FriendDecl> Verifier;
-  Verifier.expectRange(3, 1, 3, 8);
-  EXPECT_TRUE(Verifier.match("class B;\n"
-                             "struct A {\n"
-                             "friend B;\n"
-                             "};\n",
-                             friendDecl(), Lang_CXX11));
-}
-
-TEST(FriendDecl, FriendTemplateParameterLocation) {
-  LocationVerifier<FriendDecl> Verifier;
-  Verifier.expectLocation(3, 8);
-  EXPECT_TRUE(Verifier.match("template <typename T>\n"
-                             "struct A {\n"
-                             "friend T;\n"
-                             "};\n",
-                             friendDecl(), Lang_CXX11));
-}
-
-TEST(FriendDecl, FriendTemplateParameterRange) {
-  RangeVerifier<FriendDecl> Verifier;
-  Verifier.expectRange(3, 1, 3, 8);
-  EXPECT_TRUE(Verifier.match("template <typename T>\n"
-                             "struct A {\n"
-                             "friend T;\n"
-                             "};\n",
-                             friendDecl(), Lang_CXX11));
-}
-
-TEST(FriendDecl, FriendDecltypeLocation) {
-  LocationVerifier<FriendDecl> Verifier;
-  Verifier.expectLocation(4, 8);
-  EXPECT_TRUE(Verifier.match("struct A;\n"
-                             "A foo();\n"
-                             "struct A {\n"
-                             "friend decltype(foo());\n"
-                             "};\n",
-                             friendDecl(), Lang_CXX11));
-}
-
-TEST(FriendDecl, FriendDecltypeRange) {
-  RangeVerifier<FriendDecl> Verifier;
-  Verifier.expectRange(4, 1, 4, 8);
-  EXPECT_TRUE(Verifier.match("struct A;\n"
-                             "A foo();\n"
-                             "struct A {\n"
-                             "friend decltype(foo());\n"
-                             "};\n",
-                             friendDecl(), Lang_CXX11));
-}
-
-TEST(FriendDecl, FriendConstructorDestructorLocation) {
-  const std::string Code = "struct B {\n"
-                           "B();\n"
-                           "~B();\n"
-                           "};\n"
-                           "struct A {\n"
-                           "friend B::B(), B::~B();\n"
-                           "};\n";
-  LocationVerifier<FriendDecl> ConstructorVerifier;
-  ConstructorVerifier.expectLocation(6, 11);
-  EXPECT_TRUE(ConstructorVerifier.match(
-      Code, friendDecl(has(cxxConstructorDecl(ofClass(hasName("B")))))));
-  LocationVerifier<FriendDecl> DestructorVerifier;
-  DestructorVerifier.expectLocation(6, 19);
-  EXPECT_TRUE(DestructorVerifier.match(
-      Code, friendDecl(has(cxxDestructorDecl(ofClass(hasName("B")))))));
-}
-
-TEST(FriendDecl, FriendConstructorDestructorRange) {
-  const std::string Code = "struct B {\n"
-                           "B();\n"
-                           "~B();\n"
-                           "};\n"
-                           "struct A {\n"
-                           "friend B::B(), B::~B();\n"
-                           "};\n";
-  RangeVerifier<FriendDecl> ConstructorVerifier;
-  ConstructorVerifier.expectRange(6, 1, 6, 13);
-  EXPECT_TRUE(ConstructorVerifier.match(
-      Code, friendDecl(has(cxxConstructorDecl(ofClass(hasName("B")))))));
-  RangeVerifier<FriendDecl> DestructorVerifier;
-  DestructorVerifier.expectRange(6, 1, 6, 22);
-  EXPECT_TRUE(DestructorVerifier.match(
-      Code, friendDecl(has(cxxDestructorDecl(ofClass(hasName("B")))))));
-}
-
-TEST(FriendDecl, FriendTemplateFunctionLocation) {
-  LocationVerifier<FriendDecl> Verifier;
-  Verifier.expectLocation(3, 13);
-  EXPECT_TRUE(Verifier.match("struct A {\n"
-                             "template <typename T>\n"
-                             "friend void f();\n"
-                             "};\n",
-                             friendDecl()));
-}
-
-TEST(FriendDecl, FriendTemplateFunctionRange) {
-  RangeVerifier<FriendDecl> Verifier;
-  Verifier.expectRange(2, 1, 3, 15);
-  EXPECT_TRUE(Verifier.match("struct A {\n"
-                             "template <typename T>\n"
-                             "friend void f();\n"
-                             "};\n",
-                             friendDecl()));
-}
-
-TEST(FriendDecl, FriendTemplateClassLocation) {
-  LocationVerifier<FriendDecl> Verifier;
-  Verifier.expectLocation(3, 14);
-  EXPECT_TRUE(Verifier.match("struct A {\n"
-                             "template <typename T>\n"
-                             "friend class B;\n"
-                             "};\n",
-                             friendDecl()));
-}
-
-TEST(FriendDecl, FriendTemplateClassRange) {
-  RangeVerifier<FriendDecl> Verifier;
-  Verifier.expectRange(2, 1, 3, 14);
-  EXPECT_TRUE(Verifier.match("struct A {\n"
-                             "template <typename T>\n"
-                             "friend class B;\n"
-                             "};\n",
-                             friendDecl()));
-}
-
-TEST(FriendDecl, FriendInlineFunctionLocation) {
-  LocationVerifier<FriendDecl> Verifier;
-  Verifier.expectLocation(2, 19);
-  EXPECT_TRUE(Verifier.match("struct A {\n"
-                             "int inline friend f() { return 0; }"
-                             "};\n",
-                             friendDecl()));
-}
-
-TEST(FriendDecl, FriendInlineFunctionRange) {
-  RangeVerifier<FriendDecl> Verifier;
-  Verifier.expectRange(2, 1, 2, 35);
-  EXPECT_TRUE(Verifier.match("struct A {\n"
-                             "int inline friend f() { return 0; }"
-                             "};\n",
-                             friendDecl(), Lang_CXX11));
-}
-
-TEST(FriendDecl, InstantiationSourceRange) {
-  RangeVerifier<FriendDecl> Verifier;
-  Verifier.expectRange(4, 3, 4, 35);
-  EXPECT_TRUE(Verifier.match(
-      "template <typename T> class S;\n"
-      "template<class T> void operator+(S<T> x);\n"
-      "template<class T> struct S {\n"
-      "  friend void operator+<>(S<T> src);\n"
-      "};\n"
-      "void test(S<double> s) { +s; }",
-      friendDecl(hasParent(cxxRecordDecl(isTemplateInstantiation())))));
-}
-
-TEST(ObjCMessageExpr, ParenExprRange) {
-  RangeVerifier<ParenExpr> Verifier;
-  Verifier.expectRange(5, 25, 5, 27);
-  EXPECT_TRUE(Verifier.match("struct A { int a; };\n"
-                             "@interface B {}\n"
-                             "+ (void) f1: (A)arg;\n"
-                             "@end\n"
-                             "void f2() { A a; [B f1: (a)]; }\n",
-                             traverse(TK_AsIs, parenExpr()), Lang_OBJCXX));
-}
-
-TEST(FunctionDecl, FunctionDeclWithThrowSpecification) {
-  RangeVerifier<FunctionDecl> Verifier;
-  Verifier.expectRange(1, 1, 1, 16);
-  EXPECT_TRUE(Verifier.match(
-      "void f() throw();\n",
-      functionDecl()));
-}
-
-TEST(FunctionDecl, FunctionDeclWithNoExceptSpecification) {
-  RangeVerifier<FunctionDecl> Verifier;
-  Verifier.expectRange(1, 1, 1, 24);
-  EXPECT_TRUE(Verifier.match("void f() noexcept(false);\n", functionDecl(),
-                             Lang_CXX11));
-}
-
-class FunctionDeclParametersRangeVerifier : public RangeVerifier<FunctionDecl> {
-protected:
-  SourceRange getRange(const FunctionDecl &Function) override {
-    return Function.getParametersSourceRange();
-  }
-};
-
-TEST(FunctionDeclParameters, FunctionDeclOnlyVariadic) {
-  FunctionDeclParametersRangeVerifier Verifier;
-  Verifier.expectRange(1, 8, 1, 8);
-  EXPECT_TRUE(Verifier.match("void f(...);\n", functionDecl()));
-}
-
-TEST(FunctionDeclParameters, FunctionDeclVariadic) {
-  FunctionDeclParametersRangeVerifier Verifier;
-  Verifier.expectRange(1, 8, 1, 15);
-  EXPECT_TRUE(Verifier.match("void f(int a, ...);\n", functionDecl()));
-}
-
-TEST(FunctionDeclParameters, FunctionDeclMacroVariadic) {
-  FunctionDeclParametersRangeVerifier Verifier;
-  Verifier.expectRange(2, 8, 1, 18);
-  EXPECT_TRUE(Verifier.match("#define VARIADIC ...\n"
-                             "void f(int a, VARIADIC);\n",
-                             functionDecl()));
-}
-
-TEST(FunctionDeclParameters, FunctionDeclMacroParams) {
-  FunctionDeclParametersRangeVerifier Verifier;
-  Verifier.expectRange(1, 16, 2, 20);
-  EXPECT_TRUE(Verifier.match("#define PARAMS int a, int b\n"
-                             "void f(PARAMS, int c);",
-                             functionDecl()));
-}
-
-TEST(FunctionDeclParameters, FunctionDeclSingleParameter) {
-  FunctionDeclParametersRangeVerifier Verifier;
-  Verifier.expectRange(1, 8, 1, 12);
-  EXPECT_TRUE(Verifier.match("void f(int a);\n", functionDecl()));
-}
-
-TEST(FunctionDeclParameters, MemberFunctionDecl) {
-  FunctionDeclParametersRangeVerifier Verifier;
-  Verifier.expectRange(2, 8, 2, 12);
-  EXPECT_TRUE(Verifier.match("class A{\n"
-                             "void f(int a);\n"
-                             "};",
-                             functionDecl()));
-}
-
-TEST(FunctionDeclParameters, MemberFunctionDeclVariadic) {
-  FunctionDeclParametersRangeVerifier Verifier;
-  Verifier.expectRange(2, 8, 2, 15);
-  EXPECT_TRUE(Verifier.match("class A{\n"
-                             "void f(int a, ...);\n"
-                             "};",
-                             functionDecl()));
-}
-
-TEST(FunctionDeclParameters, StaticFunctionDecl) {
-  FunctionDeclParametersRangeVerifier Verifier;
-  Verifier.expectRange(2, 15, 2, 19);
-  EXPECT_TRUE(Verifier.match("class A{\n"
-                             "static void f(int a);\n"
-                             "};",
-                             functionDecl()));
-}
-
-TEST(FunctionDeclParameters, FunctionDeclMultipleParameters) {
-  FunctionDeclParametersRangeVerifier Verifier;
-  Verifier.expectRange(1, 8, 1, 28);
-  EXPECT_TRUE(
-      Verifier.match("void f(int a, int b, char *c);\n", functionDecl()));
-}
-
-TEST(FunctionDeclParameters, FunctionDeclWithDefaultValue) {
-  FunctionDeclParametersRangeVerifier Verifier;
-  Verifier.expectRange(1, 8, 1, 16);
-  EXPECT_TRUE(Verifier.match("void f(int a = 5);\n", functionDecl()));
-}
-
-TEST(FunctionDeclParameters, FunctionDeclWithVolatile) {
-  FunctionDeclParametersRangeVerifier Verifier;
-  Verifier.expectRange(1, 8, 1, 22);
-  EXPECT_TRUE(Verifier.match("void f(volatile int *i);", functionDecl()));
-}
-
-TEST(FunctionDeclParameters, FunctionDeclWithConstParam) {
-  FunctionDeclParametersRangeVerifier Verifier;
-  Verifier.expectRange(1, 8, 1, 19);
-  EXPECT_TRUE(Verifier.match("void f(const int *i);", functionDecl()));
-}
-
-TEST(FunctionDeclParameters, FunctionDeclWithConstVolatileParam) {
-  FunctionDeclParametersRangeVerifier Verifier;
-  Verifier.expectRange(1, 8, 1, 28);
-  EXPECT_TRUE(Verifier.match("void f(const volatile int *i);", functionDecl()));
-}
-
-TEST(FunctionDeclParameters, FunctionDeclWithParamAttribute) {
-  FunctionDeclParametersRangeVerifier Verifier;
-  Verifier.expectRange(1, 8, 1, 36);
-  EXPECT_TRUE(Verifier.match("void f(__attribute__((unused)) int a) {}",
-                             functionDecl()));
-}
-
-TEST(CXXMethodDecl, CXXMethodDeclWithThrowSpecification) {
-  RangeVerifier<FunctionDecl> Verifier;
-  Verifier.expectRange(2, 1, 2, 16);
-  EXPECT_TRUE(Verifier.match(
-      "class A {\n"
-      "void f() throw();\n"
-      "};\n",
-      functionDecl()));
-}
-
-TEST(CXXMethodDecl, CXXMethodDeclWithNoExceptSpecification) {
-  RangeVerifier<FunctionDecl> Verifier;
-  Verifier.expectRange(2, 1, 2, 24);
-  EXPECT_TRUE(Verifier.match("class A {\n"
-                             "void f() noexcept(false);\n"
-                             "};\n",
-                             functionDecl(), Lang_CXX11));
-}
-
-class ExceptionSpecRangeVerifier : public RangeVerifier<TypeLoc> {
-protected:
-  SourceRange getRange(const TypeLoc &Node) override {
-    auto T =
-      Node.getUnqualifiedLoc().castAs<FunctionProtoTypeLoc>();
-    assert(!T.isNull());
-    return T.getExceptionSpecRange();
-  }
-};
-
-class ParmVarExceptionSpecRangeVerifier : public RangeVerifier<ParmVarDecl> {
-protected:
-  SourceRange getRange(const ParmVarDecl &Node) override {
-    if (const TypeSourceInfo *TSI = Node.getTypeSourceInfo()) {
-      TypeLoc TL = TSI->getTypeLoc();
-      if (TL.getType()->isPointerType()) {
-        TL = TL.getNextTypeLoc().IgnoreParens();
-        if (auto FPTL = TL.getAs<FunctionProtoTypeLoc>()) {
-          return FPTL.getExceptionSpecRange();
-        }
-      }
-    }
-    return SourceRange();
-  }
-};
-
-TEST(FunctionDecl, ExceptionSpecifications) {
-  ExceptionSpecRangeVerifier Verifier;
-
-  Verifier.expectRange(1, 10, 1, 16);
-  EXPECT_TRUE(Verifier.match("void f() throw();\n", loc(functionType())));
-
-  Verifier.expectRange(1, 10, 1, 34);
-  EXPECT_TRUE(Verifier.match("void f() throw(void(void) throw());\n",
-                             loc(functionType())));
-
-  Verifier.expectRange(1, 10, 1, 19);
-  std::vector<std::string> Args;
-  Args.push_back("-fms-extensions");
-  EXPECT_TRUE(Verifier.match("void f() throw(...);\n", loc(functionType()),
-                             Args, Lang_CXX03));
-
-  Verifier.expectRange(1, 10, 1, 10);
-  EXPECT_TRUE(
-      Verifier.match("void f() noexcept;\n", loc(functionType()), Lang_CXX11));
-
-  Verifier.expectRange(1, 10, 1, 24);
-  EXPECT_TRUE(Verifier.match("void f() noexcept(false);\n", loc(functionType()),
-                             Lang_CXX11));
-
-  Verifier.expectRange(1, 10, 1, 32);
-  EXPECT_TRUE(Verifier.match("void f() noexcept(noexcept(1+1));\n",
-                             loc(functionType()), Lang_CXX11));
-
-  ParmVarExceptionSpecRangeVerifier Verifier2;
-  Verifier2.expectRange(1, 25, 1, 31);
-  EXPECT_TRUE(Verifier2.match("void g(void (*fp)(void) throw());\n",
-                              parmVarDecl(hasType(pointerType(pointee(
-                                  parenType(innerType(functionType()))))))));
-
-  Verifier2.expectRange(1, 25, 1, 38);
-  EXPECT_TRUE(Verifier2.match("void g(void (*fp)(void) noexcept(true));\n",
-                              parmVarDecl(hasType(pointerType(pointee(
-                                  parenType(innerType(functionType())))))),
-                              Lang_CXX11));
-}
-
-TEST(Decl, MemberPointerStarLoc) {
-  llvm::Annotations Example(R"cpp(
-    struct X {};
-    int X::$star^* a;
-  )cpp");
-
-  auto AST = tooling::buildASTFromCode(Example.code());
-  SourceManager &SM = AST->getSourceManager();
-  auto &Ctx = AST->getASTContext();
-
-  auto *VD = selectFirst<VarDecl>("vd", match(varDecl().bind("vd"), Ctx));
-  ASSERT_TRUE(VD != nullptr);
-
-  auto TL =
-      VD->getTypeSourceInfo()->getTypeLoc().castAs<MemberPointerTypeLoc>();
-  ASSERT_EQ(SM.getFileOffset(TL.getStarLoc()), Example.point("star"));
-}
-
-} // end namespace
diff --git a/gnu/llvm/clang/unittests/AST/StmtPrinterTest.cpp b/gnu/llvm/clang/unittests/AST/StmtPrinterTest.cpp
deleted file mode 100644
index 65dfec4cc5b..00000000000
--- a/gnu/llvm/clang/unittests/AST/StmtPrinterTest.cpp
+++ /dev/null
@@ -1,265 +0,0 @@
-//===- unittests/AST/StmtPrinterTest.cpp --- Statement printer tests ------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file contains tests for Stmt::printPretty() and related methods.
-//
-// Search this file for WRONG to see test cases that are producing something
-// completely wrong, invalid C++ or just misleading.
-//
-// These tests have a coding convention:
-// * statements to be printed should be contained within a function named 'A'
-//   unless it should have some special name (e.g., 'operator+');
-// * additional helper declarations are 'Z', 'Y', 'X' and so on.
-//
-//===----------------------------------------------------------------------===//
-
-#include "ASTPrint.h"
-#include "clang/AST/ASTContext.h"
-#include "clang/ASTMatchers/ASTMatchFinder.h"
-#include "clang/Tooling/Tooling.h"
-#include "llvm/ADT/SmallString.h"
-#include "gtest/gtest.h"
-
-using namespace clang;
-using namespace ast_matchers;
-using namespace tooling;
-
-namespace {
-
-enum class StdVer { CXX98, CXX11, CXX14, CXX17, CXX2a };
-
-DeclarationMatcher FunctionBodyMatcher(StringRef ContainingFunction) {
-  return functionDecl(hasName(ContainingFunction),
-                      has(compoundStmt(has(stmt().bind("id")))));
-}
-
-static void PrintStmt(raw_ostream &Out, const ASTContext *Context,
-                      const Stmt *S, PrintingPolicyAdjuster PolicyAdjuster) {
-  assert(S != nullptr && "Expected non-null Stmt");
-  PrintingPolicy Policy = Context->getPrintingPolicy();
-  if (PolicyAdjuster)
-    PolicyAdjuster(Policy);
-  S->printPretty(Out, /*Helper*/ nullptr, Policy);
-}
-
-template <typename Matcher>
-::testing::AssertionResult
-PrintedStmtMatches(StringRef Code, const std::vector<std::string> &Args,
-                   const Matcher &NodeMatch, StringRef ExpectedPrinted,
-                   PrintingPolicyAdjuster PolicyAdjuster = nullptr) {
-  return PrintedNodeMatches<Stmt>(Code, Args, NodeMatch, ExpectedPrinted, "",
-                                  PrintStmt, PolicyAdjuster);
-}
-
-template <typename T>
-::testing::AssertionResult
-PrintedStmtCXXMatches(StdVer Standard, StringRef Code, const T &NodeMatch,
-                      StringRef ExpectedPrinted,
-                      PrintingPolicyAdjuster PolicyAdjuster = nullptr) {
-  const char *StdOpt;
-  switch (Standard) {
-  case StdVer::CXX98: StdOpt = "-std=c++98"; break;
-  case StdVer::CXX11: StdOpt = "-std=c++11"; break;
-  case StdVer::CXX14: StdOpt = "-std=c++14"; break;
-  case StdVer::CXX17: StdOpt = "-std=c++17"; break;
-  case StdVer::CXX2a: StdOpt = "-std=c++2a"; break;
-  }
-
-  std::vector<std::string> Args = {
-    StdOpt,
-    "-Wno-unused-value",
-  };
-  return PrintedStmtMatches(Code, Args, NodeMatch, ExpectedPrinted,
-                            PolicyAdjuster);
-}
-
-template <typename T>
-::testing::AssertionResult
-PrintedStmtMSMatches(StringRef Code, const T &NodeMatch,
-                     StringRef ExpectedPrinted,
-                     PrintingPolicyAdjuster PolicyAdjuster = nullptr) {
-  std::vector<std::string> Args = {
-    "-std=c++98",
-    "-target", "i686-pc-win32",
-    "-fms-extensions",
-    "-Wno-unused-value",
-  };
-  return PrintedStmtMatches(Code, Args, NodeMatch, ExpectedPrinted,
-                            PolicyAdjuster);
-}
-
-template <typename T>
-::testing::AssertionResult
-PrintedStmtObjCMatches(StringRef Code, const T &NodeMatch,
-                       StringRef ExpectedPrinted,
-                       PrintingPolicyAdjuster PolicyAdjuster = nullptr) {
-  std::vector<std::string> Args = {
-    "-ObjC",
-    "-fobjc-runtime=macosx-10.12.0",
-  };
-  return PrintedStmtMatches(Code, Args, NodeMatch, ExpectedPrinted,
-                            PolicyAdjuster);
-}
-
-} // unnamed namespace
-
-TEST(StmtPrinter, TestIntegerLiteral) {
-  ASSERT_TRUE(PrintedStmtCXXMatches(StdVer::CXX98,
-    "void A() {"
-    "  1, -1, 1U, 1u,"
-    "  1L, 1l, -1L, 1UL, 1ul,"
-    "  1LL, -1LL, 1ULL;"
-    "}",
-    FunctionBodyMatcher("A"),
-    "1 , -1 , 1U , 1U , "
-    "1L , 1L , -1L , 1UL , 1UL , "
-    "1LL , -1LL , 1ULL"));
-    // Should be: with semicolon
-}
-
-TEST(StmtPrinter, TestMSIntegerLiteral) {
-  ASSERT_TRUE(PrintedStmtMSMatches(
-    "void A() {"
-    "  1i8, -1i8, 1ui8, "
-    "  1i16, -1i16, 1ui16, "
-    "  1i32, -1i32, 1ui32, "
-    "  1i64, -1i64, 1ui64;"
-    "}",
-    FunctionBodyMatcher("A"),
-    "1i8 , -1i8 , 1Ui8 , "
-    "1i16 , -1i16 , 1Ui16 , "
-    "1 , -1 , 1U , "
-    "1LL , -1LL , 1ULL"));
-    // Should be: with semicolon
-}
-
-TEST(StmtPrinter, TestFloatingPointLiteral) {
-  ASSERT_TRUE(PrintedStmtCXXMatches(StdVer::CXX98,
-    "void A() { 1.0f, -1.0f, 1.0, -1.0, 1.0l, -1.0l; }",
-    FunctionBodyMatcher("A"),
-    "1.F , -1.F , 1. , -1. , 1.L , -1.L"));
-    // Should be: with semicolon
-}
-
-TEST(StmtPrinter, TestCXXConversionDeclImplicit) {
-  ASSERT_TRUE(PrintedStmtCXXMatches(
-      StdVer::CXX98,
-      "struct A {"
-      "operator void *();"
-      "A operator&(A);"
-      "};"
-      "void bar(void *);"
-      "void foo(A a, A b) {"
-      "  bar(a & b);"
-      "}",
-      traverse(TK_AsIs, cxxMemberCallExpr(anything()).bind("id")), "a & b"));
-}
-
-TEST(StmtPrinter, TestCXXConversionDeclExplicit) {
-  ASSERT_TRUE(PrintedStmtCXXMatches(StdVer::CXX11,
-    "struct A {"
-      "operator void *();"
-      "A operator&(A);"
-    "};"
-    "void bar(void *);"
-    "void foo(A a, A b) {"
-    "  auto x = (a & b).operator void *();"
-    "}",
-    cxxMemberCallExpr(anything()).bind("id"),
-    "(a & b)"));
-    // WRONG; Should be: (a & b).operator void *()
-}
-
-TEST(StmtPrinter, TestCXXLamda) {
-  ASSERT_TRUE(PrintedStmtCXXMatches(StdVer::CXX11,
-    "void A() {"
-    "  auto l = [] { };"
-    "}",
-    lambdaExpr(anything()).bind("id"),
-    "[] {\n"
-    "}"));
-
-  ASSERT_TRUE(PrintedStmtCXXMatches(StdVer::CXX11,
-    "void A() {"
-    "  int a = 0, b = 1;"
-    "  auto l = [a,b](int c, float d) { };"
-    "}",
-    lambdaExpr(anything()).bind("id"),
-    "[a, b](int c, float d) {\n"
-    "}"));
-
-  ASSERT_TRUE(PrintedStmtCXXMatches(StdVer::CXX14,
-    "void A() {"
-    "  auto l = [](auto a, int b, auto c, int, auto) { };"
-    "}",
-    lambdaExpr(anything()).bind("id"),
-    "[](auto a, int b, auto c, int, auto) {\n"
-    "}"));
-
-  ASSERT_TRUE(PrintedStmtCXXMatches(StdVer::CXX2a,
-    "void A() {"
-    "  auto l = []<typename T1, class T2, int I,"
-    "              template<class, typename> class T3>"
-    "           (int a, auto, int, auto d) { };"
-    "}",
-    lambdaExpr(anything()).bind("id"),
-    "[]<typename T1, class T2, int I, template <class, typename> class T3>(int a, auto, int, auto d) {\n"
-    "}"));
-}
-
-TEST(StmtPrinter, TestNoImplicitBases) {
-  const char *CPPSource = R"(
-class A {
-  int field;
-  int member() { return field; }
-};
-)";
-  // No implicit 'this'.
-  ASSERT_TRUE(PrintedStmtCXXMatches(
-      StdVer::CXX11, CPPSource, memberExpr(anything()).bind("id"), "field",
-
-      [](PrintingPolicy &PP) { PP.SuppressImplicitBase = true; }));
-  // Print implicit 'this'.
-  ASSERT_TRUE(PrintedStmtCXXMatches(StdVer::CXX11,
-      CPPSource, memberExpr(anything()).bind("id"), "this->field"));
-
-  const char *ObjCSource = R"(
-@interface I {
-   int ivar;
-}
-@end
-@implementation I
-- (int) method {
-  return ivar;
-}
-@end
-      )";
-  // No implicit 'self'.
-  ASSERT_TRUE(PrintedStmtObjCMatches(
-      ObjCSource, returnStmt().bind("id"), "return ivar;\n",
-
-      [](PrintingPolicy &PP) { PP.SuppressImplicitBase = true; }));
-  // Print implicit 'self'.
-  ASSERT_TRUE(PrintedStmtObjCMatches(ObjCSource, returnStmt().bind("id"),
-                                     "return self->ivar;\n"));
-}
-
-TEST(StmtPrinter, TerseOutputWithLambdas) {
-  const char *CPPSource = "auto lamb = []{ return 0; };";
-
-  // body is printed when TerseOutput is off(default).
-  ASSERT_TRUE(PrintedStmtCXXMatches(StdVer::CXX11, CPPSource,
-                                    lambdaExpr(anything()).bind("id"),
-                                    "[] {\n    return 0;\n}"));
-
-  // body not printed when TerseOutput is on.
-  ASSERT_TRUE(PrintedStmtCXXMatches(
-      StdVer::CXX11, CPPSource, lambdaExpr(anything()).bind("id"), "[] {}",
-
-      [](PrintingPolicy &PP) { PP.TerseOutput = true; }));
-}
diff --git a/gnu/llvm/clang/unittests/AST/StructuralEquivalenceTest.cpp b/gnu/llvm/clang/unittests/AST/StructuralEquivalenceTest.cpp
deleted file mode 100644
index d416e9d3012..00000000000
--- a/gnu/llvm/clang/unittests/AST/StructuralEquivalenceTest.cpp
+++ /dev/null
@@ -1,1784 +0,0 @@
-#include "clang/AST/ASTContext.h"
-#include "clang/AST/ASTStructuralEquivalence.h"
-#include "clang/ASTMatchers/ASTMatchers.h"
-#include "clang/Frontend/ASTUnit.h"
-#include "clang/Testing/CommandLineArgs.h"
-#include "clang/Tooling/Tooling.h"
-#include "llvm/Support/Host.h"
-
-#include "DeclMatcher.h"
-
-#include "gtest/gtest.h"
-
-namespace clang {
-namespace ast_matchers {
-
-using std::get;
-
-struct StructuralEquivalenceTest : ::testing::Test {
-  std::unique_ptr<ASTUnit> AST0, AST1;
-  std::string Code0, Code1; // Buffers for SourceManager
-
-  // Parses the source code in the specified language and sets the ASTs of
-  // the current test instance to the parse result.
-  void makeASTUnits(const std::string &SrcCode0, const std::string &SrcCode1,
-                    TestLanguage Lang) {
-    this->Code0 = SrcCode0;
-    this->Code1 = SrcCode1;
-    std::vector<std::string> Args = getCommandLineArgsForTesting(Lang);
-
-    const char *const InputFileName = "input.cc";
-
-    AST0 = tooling::buildASTFromCodeWithArgs(Code0, Args, InputFileName);
-    AST1 = tooling::buildASTFromCodeWithArgs(Code1, Args, InputFileName);
-  }
-
-  // Get a pair of node pointers into the synthesized AST from the given code
-  // snippets. To determine the returned node, a separate matcher is specified
-  // for both snippets. The first matching node is returned.
-  template <typename NodeType, typename MatcherType>
-  std::tuple<NodeType *, NodeType *>
-  makeDecls(const std::string &SrcCode0, const std::string &SrcCode1,
-            TestLanguage Lang, const MatcherType &Matcher0,
-            const MatcherType &Matcher1) {
-    makeASTUnits(SrcCode0, SrcCode1, Lang);
-
-    NodeType *D0 = FirstDeclMatcher<NodeType>().match(
-        AST0->getASTContext().getTranslationUnitDecl(), Matcher0);
-    NodeType *D1 = FirstDeclMatcher<NodeType>().match(
-        AST1->getASTContext().getTranslationUnitDecl(), Matcher1);
-
-    return std::make_tuple(D0, D1);
-  }
-
-  std::tuple<TranslationUnitDecl *, TranslationUnitDecl *>
-  makeTuDecls(const std::string &SrcCode0, const std::string &SrcCode1,
-              TestLanguage Lang) {
-    makeASTUnits(SrcCode0, SrcCode1, Lang);
-
-    return std::make_tuple(AST0->getASTContext().getTranslationUnitDecl(),
-                           AST1->getASTContext().getTranslationUnitDecl());
-  }
-
-  // Get a pair of node pointers into the synthesized AST from the given code
-  // snippets. The same matcher is used for both snippets.
-  template <typename NodeType, typename MatcherType>
-  std::tuple<NodeType *, NodeType *>
-  makeDecls(const std::string &SrcCode0, const std::string &SrcCode1,
-            TestLanguage Lang, const MatcherType &AMatcher) {
-    return makeDecls<NodeType, MatcherType>(
-          SrcCode0, SrcCode1, Lang, AMatcher, AMatcher);
-  }
-
-  // Get a pair of Decl pointers to the synthesized declarations from the given
-  // code snippets. We search for the first NamedDecl with given name in both
-  // snippets.
-  std::tuple<NamedDecl *, NamedDecl *>
-  makeNamedDecls(const std::string &SrcCode0, const std::string &SrcCode1,
-                 TestLanguage Lang, const char *const Identifier = "foo") {
-    auto Matcher = namedDecl(hasName(Identifier));
-    return makeDecls<NamedDecl>(SrcCode0, SrcCode1, Lang, Matcher);
-  }
-
-  // Wraps a Stmt and the ASTContext that contains it.
-  struct StmtWithASTContext {
-    Stmt *S;
-    ASTContext *Context;
-    explicit StmtWithASTContext(Stmt &S, ASTContext &Context)
-        : S(&S), Context(&Context) {}
-    explicit StmtWithASTContext(FunctionDecl *FD)
-        : S(FD->getBody()), Context(&FD->getASTContext()) {}
-  };
-
-  // Get a pair of node pointers into the synthesized AST from the given code
-  // snippets. To determine the returned node, a separate matcher is specified
-  // for both snippets. The first matching node is returned.
-  template <typename MatcherType>
-  std::tuple<StmtWithASTContext, StmtWithASTContext>
-  makeStmts(const std::string &SrcCode0, const std::string &SrcCode1,
-            TestLanguage Lang, const MatcherType &Matcher0,
-            const MatcherType &Matcher1) {
-    makeASTUnits(SrcCode0, SrcCode1, Lang);
-
-    Stmt *S0 = FirstDeclMatcher<Stmt>().match(
-        AST0->getASTContext().getTranslationUnitDecl(), Matcher0);
-    Stmt *S1 = FirstDeclMatcher<Stmt>().match(
-        AST1->getASTContext().getTranslationUnitDecl(), Matcher1);
-
-    return std::make_tuple(StmtWithASTContext(*S0, AST0->getASTContext()),
-                           StmtWithASTContext(*S1, AST1->getASTContext()));
-  }
-
-  // Get a pair of node pointers into the synthesized AST from the given code
-  // snippets. The same matcher is used for both snippets.
-  template <typename MatcherType>
-  std::tuple<StmtWithASTContext, StmtWithASTContext>
-  makeStmts(const std::string &SrcCode0, const std::string &SrcCode1,
-            TestLanguage Lang, const MatcherType &AMatcher) {
-    return makeStmts(SrcCode0, SrcCode1, Lang, AMatcher, AMatcher);
-  }
-
-  // Convenience function for makeStmts that wraps the code inside a function
-  // body.
-  template <typename MatcherType>
-  std::tuple<StmtWithASTContext, StmtWithASTContext>
-  makeWrappedStmts(const std::string &SrcCode0, const std::string &SrcCode1,
-                   TestLanguage Lang, const MatcherType &AMatcher) {
-    auto Wrap = [](const std::string &Src) {
-      return "void wrapped() {" + Src + ";}";
-    };
-    return makeStmts(Wrap(SrcCode0), Wrap(SrcCode1), Lang, AMatcher);
-  }
-
-  bool testStructuralMatch(Decl *D0, Decl *D1) {
-    llvm::DenseSet<std::pair<Decl *, Decl *>> NonEquivalentDecls01;
-    llvm::DenseSet<std::pair<Decl *, Decl *>> NonEquivalentDecls10;
-    StructuralEquivalenceContext Ctx01(
-        D0->getASTContext(), D1->getASTContext(),
-        NonEquivalentDecls01, StructuralEquivalenceKind::Default, false, false);
-    StructuralEquivalenceContext Ctx10(
-        D1->getASTContext(), D0->getASTContext(),
-        NonEquivalentDecls10, StructuralEquivalenceKind::Default, false, false);
-    bool Eq01 = Ctx01.IsEquivalent(D0, D1);
-    bool Eq10 = Ctx10.IsEquivalent(D1, D0);
-    EXPECT_EQ(Eq01, Eq10);
-    return Eq01;
-  }
-
-  bool testStructuralMatch(StmtWithASTContext S0, StmtWithASTContext S1) {
-    llvm::DenseSet<std::pair<Decl *, Decl *>> NonEquivalentDecls01;
-    llvm::DenseSet<std::pair<Decl *, Decl *>> NonEquivalentDecls10;
-    StructuralEquivalenceContext Ctx01(
-        *S0.Context, *S1.Context, NonEquivalentDecls01,
-        StructuralEquivalenceKind::Default, false, false);
-    StructuralEquivalenceContext Ctx10(
-        *S1.Context, *S0.Context, NonEquivalentDecls10,
-        StructuralEquivalenceKind::Default, false, false);
-    bool Eq01 = Ctx01.IsEquivalent(S0.S, S1.S);
-    bool Eq10 = Ctx10.IsEquivalent(S1.S, S0.S);
-    EXPECT_EQ(Eq01, Eq10);
-    return Eq01;
-  }
-
-  bool
-  testStructuralMatch(std::tuple<StmtWithASTContext, StmtWithASTContext> t) {
-    return testStructuralMatch(get<0>(t), get<1>(t));
-  }
-
-  bool testStructuralMatch(std::tuple<Decl *, Decl *> t) {
-    return testStructuralMatch(get<0>(t), get<1>(t));
-  }
-};
-
-TEST_F(StructuralEquivalenceTest, Int) {
-  auto Decls = makeNamedDecls("int foo;", "int foo;", Lang_CXX03);
-  EXPECT_TRUE(testStructuralMatch(Decls));
-}
-
-TEST_F(StructuralEquivalenceTest, IntVsSignedInt) {
-  auto Decls = makeNamedDecls("int foo;", "signed int foo;", Lang_CXX03);
-  EXPECT_TRUE(testStructuralMatch(Decls));
-}
-
-TEST_F(StructuralEquivalenceTest, Char) {
-  auto Decls = makeNamedDecls("char foo;", "char foo;", Lang_CXX03);
-  EXPECT_TRUE(testStructuralMatch(Decls));
-}
-
-// This test is disabled for now.
-// FIXME Whether this is equivalent is dependendant on the target.
-TEST_F(StructuralEquivalenceTest, DISABLED_CharVsSignedChar) {
-  auto Decls = makeNamedDecls("char foo;", "signed char foo;", Lang_CXX03);
-  EXPECT_FALSE(testStructuralMatch(Decls));
-}
-
-TEST_F(StructuralEquivalenceTest, ForwardRecordDecl) {
-  auto Decls = makeNamedDecls("struct foo;", "struct foo;", Lang_CXX03);
-  EXPECT_TRUE(testStructuralMatch(Decls));
-}
-
-TEST_F(StructuralEquivalenceTest, IntVsSignedIntInStruct) {
-  auto Decls = makeNamedDecls("struct foo { int x; };",
-                              "struct foo { signed int x; };", Lang_CXX03);
-  EXPECT_TRUE(testStructuralMatch(Decls));
-}
-
-TEST_F(StructuralEquivalenceTest, CharVsSignedCharInStruct) {
-  auto Decls = makeNamedDecls("struct foo { char x; };",
-                              "struct foo { signed char x; };", Lang_CXX03);
-  EXPECT_FALSE(testStructuralMatch(Decls));
-}
-
-TEST_F(StructuralEquivalenceTest, IntVsSignedIntTemplateSpec) {
-  auto Decls = makeDecls<ClassTemplateSpecializationDecl>(
-      R"(template <class T> struct foo; template<> struct foo<int>{};)",
-      R"(template <class T> struct foo; template<> struct foo<signed int>{};)",
-      Lang_CXX03, classTemplateSpecializationDecl());
-  auto Spec0 = get<0>(Decls);
-  auto Spec1 = get<1>(Decls);
-  EXPECT_TRUE(testStructuralMatch(Spec0, Spec1));
-}
-
-TEST_F(StructuralEquivalenceTest, CharVsSignedCharTemplateSpec) {
-  auto Decls = makeDecls<ClassTemplateSpecializationDecl>(
-      R"(template <class T> struct foo; template<> struct foo<char>{};)",
-      R"(template <class T> struct foo; template<> struct foo<signed char>{};)",
-      Lang_CXX03, classTemplateSpecializationDecl());
-  auto Spec0 = get<0>(Decls);
-  auto Spec1 = get<1>(Decls);
-  EXPECT_FALSE(testStructuralMatch(Spec0, Spec1));
-}
-
-TEST_F(StructuralEquivalenceTest, CharVsSignedCharTemplateSpecWithInheritance) {
-  auto Decls = makeDecls<ClassTemplateSpecializationDecl>(
-      R"(
-      struct true_type{};
-      template <class T> struct foo;
-      template<> struct foo<char> : true_type {};
-      )",
-      R"(
-      struct true_type{};
-      template <class T> struct foo;
-      template<> struct foo<signed char> : true_type {};
-      )",
-      Lang_CXX03, classTemplateSpecializationDecl());
-  EXPECT_FALSE(testStructuralMatch(Decls));
-}
-
-// This test is disabled for now.
-// FIXME Enable it, once the check is implemented.
-TEST_F(StructuralEquivalenceTest, DISABLED_WrongOrderInNamespace) {
-  auto Code =
-      R"(
-      namespace NS {
-      template <class T> class Base {
-          int a;
-      };
-      class Derived : Base<Derived> {
-      };
-      }
-      void foo(NS::Derived &);
-      )";
-  auto Decls = makeNamedDecls(Code, Code, Lang_CXX03);
-
-  NamespaceDecl *NS =
-      LastDeclMatcher<NamespaceDecl>().match(get<1>(Decls), namespaceDecl());
-  ClassTemplateDecl *TD = LastDeclMatcher<ClassTemplateDecl>().match(
-      get<1>(Decls), classTemplateDecl(hasName("Base")));
-
-  // Reorder the decls, move the TD to the last place in the DC.
-  NS->removeDecl(TD);
-  NS->addDeclInternal(TD);
-
-  EXPECT_FALSE(testStructuralMatch(Decls));
-}
-
-TEST_F(StructuralEquivalenceTest, WrongOrderOfFieldsInClass) {
-  auto Code = "class X { int a; int b; };";
-  auto Decls = makeNamedDecls(Code, Code, Lang_CXX03, "X");
-
-  CXXRecordDecl *RD = FirstDeclMatcher<CXXRecordDecl>().match(
-      get<1>(Decls), cxxRecordDecl(hasName("X")));
-  FieldDecl *FD =
-      FirstDeclMatcher<FieldDecl>().match(get<1>(Decls), fieldDecl(hasName("a")));
-
-  // Reorder the FieldDecls
-  RD->removeDecl(FD);
-  RD->addDeclInternal(FD);
-
-  EXPECT_FALSE(testStructuralMatch(Decls));
-}
-
-struct StructuralEquivalenceFunctionTest : StructuralEquivalenceTest {
-};
-
-TEST_F(StructuralEquivalenceFunctionTest, TemplateVsNonTemplate) {
-  auto t = makeNamedDecls("void foo();", "template<class T> void foo();",
-                          Lang_CXX03);
-  EXPECT_FALSE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceFunctionTest, DifferentOperators) {
-  auto t = makeDecls<FunctionDecl>(
-      "struct X{}; bool operator<(X, X);", "struct X{}; bool operator==(X, X);",
-      Lang_CXX03, functionDecl(hasOverloadedOperatorName("<")),
-      functionDecl(hasOverloadedOperatorName("==")));
-  EXPECT_FALSE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceFunctionTest, SameOperators) {
-  auto t = makeDecls<FunctionDecl>(
-      "struct X{}; bool operator<(X, X);", "struct X{}; bool operator<(X, X);",
-      Lang_CXX03, functionDecl(hasOverloadedOperatorName("<")),
-      functionDecl(hasOverloadedOperatorName("<")));
-  EXPECT_TRUE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceFunctionTest, CtorVsDtor) {
-  auto t = makeDecls<FunctionDecl>("struct X{ X(); };", "struct X{ ~X(); };",
-                                   Lang_CXX03, cxxConstructorDecl(),
-                                   cxxDestructorDecl());
-  EXPECT_FALSE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceFunctionTest, ParamConstWithRef) {
-  auto t =
-      makeNamedDecls("void foo(int&);", "void foo(const int&);", Lang_CXX03);
-  EXPECT_FALSE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceFunctionTest, ParamConstSimple) {
-  auto t = makeNamedDecls("void foo(int);", "void foo(const int);", Lang_CXX03);
-  EXPECT_TRUE(testStructuralMatch(t));
-  // consider this OK
-}
-
-TEST_F(StructuralEquivalenceFunctionTest, Throw) {
-  auto t = makeNamedDecls("void foo();", "void foo() throw();", Lang_CXX03);
-  EXPECT_FALSE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceFunctionTest, Noexcept) {
-  auto t = makeNamedDecls("void foo();",
-                          "void foo() noexcept;", Lang_CXX11);
-  EXPECT_FALSE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceFunctionTest, ThrowVsNoexcept) {
-  auto t = makeNamedDecls("void foo() throw();",
-                          "void foo() noexcept;", Lang_CXX11);
-  EXPECT_FALSE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceFunctionTest, ThrowVsNoexceptFalse) {
-  auto t = makeNamedDecls("void foo() throw();",
-                          "void foo() noexcept(false);", Lang_CXX11);
-  EXPECT_FALSE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceFunctionTest, ThrowVsNoexceptTrue) {
-  auto t = makeNamedDecls("void foo() throw();",
-                          "void foo() noexcept(true);", Lang_CXX11);
-  EXPECT_FALSE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceFunctionTest, NoexceptNonMatch) {
-  auto t = makeNamedDecls("void foo() noexcept(false);",
-                          "void foo() noexcept(true);", Lang_CXX11);
-  EXPECT_FALSE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceFunctionTest, NoexceptMatch) {
-  auto t = makeNamedDecls("void foo() noexcept(false);",
-                          "void foo() noexcept(false);", Lang_CXX11);
-  EXPECT_TRUE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceFunctionTest, NoexceptVsNoexceptFalse) {
-  auto t = makeNamedDecls("void foo() noexcept;",
-                          "void foo() noexcept(false);", Lang_CXX11);
-  EXPECT_FALSE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceFunctionTest, NoexceptVsNoexceptTrue) {
-  auto t = makeNamedDecls("void foo() noexcept;",
-                          "void foo() noexcept(true);", Lang_CXX11);
-  EXPECT_FALSE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceFunctionTest, ReturnType) {
-  auto t = makeNamedDecls("char foo();", "int foo();", Lang_CXX03);
-  EXPECT_FALSE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceFunctionTest, ReturnConst) {
-  auto t = makeNamedDecls("char foo();", "const char foo();", Lang_CXX03);
-  EXPECT_FALSE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceFunctionTest, ReturnRef) {
-  auto t = makeNamedDecls("char &foo();",
-                          "char &&foo();", Lang_CXX11);
-  EXPECT_FALSE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceFunctionTest, ParamCount) {
-  auto t = makeNamedDecls("void foo(int);", "void foo(int, int);", Lang_CXX03);
-  EXPECT_FALSE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceFunctionTest, ParamType) {
-  auto t = makeNamedDecls("void foo(int);", "void foo(char);", Lang_CXX03);
-  EXPECT_FALSE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceFunctionTest, ParamName) {
-  auto t = makeNamedDecls("void foo(int a);", "void foo(int b);", Lang_CXX03);
-  EXPECT_TRUE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceFunctionTest, Variadic) {
-  auto t =
-      makeNamedDecls("void foo(int x...);", "void foo(int x);", Lang_CXX03);
-  EXPECT_FALSE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceFunctionTest, ParamPtr) {
-  auto t = makeNamedDecls("void foo(int *);", "void foo(int);", Lang_CXX03);
-  EXPECT_FALSE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceFunctionTest, NameInParen) {
-  auto t = makeNamedDecls("void ((foo))();", "void foo();", Lang_CXX03);
-  EXPECT_TRUE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceFunctionTest, NameInParenWithExceptionSpec) {
-  auto t = makeNamedDecls(
-      "void (foo)() throw(int);",
-      "void (foo)() noexcept;",
-      Lang_CXX11);
-  EXPECT_FALSE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceFunctionTest, NameInParenWithConst) {
-  auto t = makeNamedDecls(
-      "struct A { void (foo)() const; };",
-      "struct A { void (foo)(); };",
-      Lang_CXX11);
-  EXPECT_FALSE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceFunctionTest, FunctionsWithDifferentNoreturnAttr) {
-  auto t = makeNamedDecls("__attribute__((noreturn)) void foo();",
-                          "                          void foo();", Lang_C99);
-  EXPECT_TRUE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceFunctionTest,
-    FunctionsWithDifferentCallingConventions) {
-  // These attributes may not be available on certain platforms.
-  if (llvm::Triple(llvm::sys::getDefaultTargetTriple()).getArch() !=
-      llvm::Triple::x86_64)
-    return;
-  auto t = makeNamedDecls("__attribute__((preserve_all)) void foo();",
-                          "__attribute__((ms_abi))   void foo();", Lang_C99);
-  EXPECT_FALSE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceFunctionTest, FunctionsWithDifferentSavedRegsAttr) {
-  if (llvm::Triple(llvm::sys::getDefaultTargetTriple()).getArch() !=
-      llvm::Triple::x86_64)
-    return;
-  auto t = makeNamedDecls(
-      "__attribute__((no_caller_saved_registers)) void foo();",
-      "                                           void foo();", Lang_C99);
-  EXPECT_FALSE(testStructuralMatch(t));
-}
-
-struct StructuralEquivalenceCXXMethodTest : StructuralEquivalenceTest {
-};
-
-TEST_F(StructuralEquivalenceCXXMethodTest, Virtual) {
-  auto t = makeDecls<CXXMethodDecl>("struct X { void foo(); };",
-                                    "struct X { virtual void foo(); };",
-                                    Lang_CXX03, cxxMethodDecl(hasName("foo")));
-  EXPECT_FALSE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceCXXMethodTest, Pure) {
-  auto t = makeNamedDecls("struct X { virtual void foo(); };",
-                          "struct X { virtual void foo() = 0; };", Lang_CXX03);
-  EXPECT_FALSE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceCXXMethodTest, DISABLED_Final) {
-  // The final-ness is not checked yet.
-  auto t =
-      makeNamedDecls("struct X { virtual void foo(); };",
-                     "struct X { virtual void foo() final; };", Lang_CXX03);
-  EXPECT_FALSE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceCXXMethodTest, Const) {
-  auto t = makeNamedDecls("struct X { void foo(); };",
-                          "struct X { void foo() const; };", Lang_CXX03);
-  EXPECT_FALSE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceCXXMethodTest, Static) {
-  auto t = makeNamedDecls("struct X { void foo(); };",
-                          "struct X { static void foo(); };", Lang_CXX03);
-  EXPECT_FALSE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceCXXMethodTest, Ref1) {
-  auto t = makeNamedDecls("struct X { void foo(); };",
-                          "struct X { void foo() &&; };", Lang_CXX11);
-  EXPECT_FALSE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceCXXMethodTest, Ref2) {
-  auto t = makeNamedDecls("struct X { void foo() &; };",
-                          "struct X { void foo() &&; };", Lang_CXX11);
-  EXPECT_FALSE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceCXXMethodTest, AccessSpecifier) {
-  auto t = makeDecls<CXXMethodDecl>("struct X { public: void foo(); };",
-                                    "struct X { private: void foo(); };",
-                                    Lang_CXX03, cxxMethodDecl(hasName("foo")));
-  EXPECT_FALSE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceCXXMethodTest, Delete) {
-  auto t = makeNamedDecls("struct X { void foo(); };",
-                          "struct X { void foo() = delete; };", Lang_CXX11);
-  EXPECT_FALSE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceCXXMethodTest, Constructor) {
-  auto t = makeDecls<FunctionDecl>("void foo();", "struct foo { foo(); };",
-                                   Lang_CXX03, functionDecl(hasName("foo")),
-                                   cxxConstructorDecl(hasName("foo")));
-  EXPECT_FALSE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceCXXMethodTest, ConstructorParam) {
-  auto t = makeDecls<CXXConstructorDecl>("struct X { X(); };",
-                                         "struct X { X(int); };", Lang_CXX03,
-                                         cxxConstructorDecl(hasName("X")));
-  EXPECT_FALSE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceCXXMethodTest, ConstructorExplicit) {
-  auto t = makeDecls<CXXConstructorDecl>("struct X { X(int); };",
-                                         "struct X { explicit X(int); };",
-                                         Lang_CXX11,
-                                         cxxConstructorDecl(hasName("X")));
-  EXPECT_FALSE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceCXXMethodTest, ConstructorDefault) {
-  auto t = makeDecls<CXXConstructorDecl>("struct X { X(); };",
-                                         "struct X { X() = default; };",
-                                         Lang_CXX11,
-                                         cxxConstructorDecl(hasName("X")));
-  EXPECT_FALSE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceCXXMethodTest, Conversion) {
-  auto t = makeDecls<CXXConversionDecl>("struct X { operator bool(); };",
-                                        "struct X { operator char(); };",
-                                         Lang_CXX11,
-                                         cxxConversionDecl());
-  EXPECT_FALSE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceCXXMethodTest, Operator) {
-  auto t =
-      makeDecls<FunctionDecl>("struct X { int operator +(int); };",
-                              "struct X { int operator -(int); };", Lang_CXX03,
-                              functionDecl(hasOverloadedOperatorName("+")),
-                              functionDecl(hasOverloadedOperatorName("-")));
-  EXPECT_FALSE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceCXXMethodTest, OutOfClass1) {
-  auto t = makeDecls<FunctionDecl>(
-      "struct X { virtual void f(); }; void X::f() { }",
-      "struct X { virtual void f() { }; };", Lang_CXX03,
-      functionDecl(allOf(hasName("f"), isDefinition())));
-  EXPECT_TRUE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceCXXMethodTest, OutOfClass2) {
-  auto t = makeDecls<FunctionDecl>(
-      "struct X { virtual void f(); }; void X::f() { }",
-      "struct X { void f(); }; void X::f() { }", Lang_CXX03,
-      functionDecl(allOf(hasName("f"), isDefinition())));
-  EXPECT_FALSE(testStructuralMatch(t));
-}
-
-struct StructuralEquivalenceRecordTest : StructuralEquivalenceTest {
-  // FIXME Use a common getRecordDecl with ASTImporterTest.cpp!
-  RecordDecl *getRecordDecl(FieldDecl *FD) {
-    auto *ET = cast<ElaboratedType>(FD->getType().getTypePtr());
-    return cast<RecordType>(ET->getNamedType().getTypePtr())->getDecl();
-  };
-};
-
-TEST_F(StructuralEquivalenceRecordTest, Name) {
-  auto t = makeDecls<CXXRecordDecl>("struct A{ };", "struct B{ };", Lang_CXX03,
-                                    cxxRecordDecl(hasName("A")),
-                                    cxxRecordDecl(hasName("B")));
-  EXPECT_FALSE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceRecordTest, Fields) {
-  auto t = makeNamedDecls("struct foo{ int x; };", "struct foo{ char x; };",
-                          Lang_CXX03);
-  EXPECT_FALSE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceRecordTest, DISABLED_Methods) {
-  // Currently, methods of a class are not checked at class equivalence.
-  auto t = makeNamedDecls("struct foo{ int x(); };", "struct foo{ char x(); };",
-                          Lang_CXX03);
-  EXPECT_FALSE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceRecordTest, Bases) {
-  auto t = makeNamedDecls("struct A{ }; struct foo: A { };",
-                          "struct B{ }; struct foo: B { };", Lang_CXX03);
-  EXPECT_FALSE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceRecordTest, InheritanceVirtual) {
-  auto t =
-      makeNamedDecls("struct A{ }; struct foo: A { };",
-                     "struct A{ }; struct foo: virtual A { };", Lang_CXX03);
-  EXPECT_FALSE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceRecordTest, DISABLED_InheritanceType) {
-  // Access specifier in inheritance is not checked yet.
-  auto t =
-      makeNamedDecls("struct A{ }; struct foo: public A { };",
-                     "struct A{ }; struct foo: private A { };", Lang_CXX03);
-  EXPECT_FALSE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceRecordTest, Match) {
-  auto Code = R"(
-      struct A{ };
-      struct B{ };
-      struct foo: A, virtual B {
-        void x();
-        int a;
-      };
-      )";
-  auto t = makeNamedDecls(Code, Code, Lang_CXX03);
-  EXPECT_TRUE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceRecordTest, UnnamedRecordsShouldBeInequivalent) {
-  auto t = makeTuDecls(
-      R"(
-      struct A {
-        struct {
-          struct A *next;
-        } entry0;
-        struct {
-          struct A *next;
-        } entry1;
-      };
-      )",
-      "", Lang_C99);
-  auto *TU = get<0>(t);
-  auto *Entry0 =
-      FirstDeclMatcher<FieldDecl>().match(TU, fieldDecl(hasName("entry0")));
-  auto *Entry1 =
-      FirstDeclMatcher<FieldDecl>().match(TU, fieldDecl(hasName("entry1")));
-  auto *R0 = getRecordDecl(Entry0);
-  auto *R1 = getRecordDecl(Entry1);
-
-  ASSERT_NE(R0, R1);
-  EXPECT_TRUE(testStructuralMatch(R0, R0));
-  EXPECT_TRUE(testStructuralMatch(R1, R1));
-  EXPECT_FALSE(testStructuralMatch(R0, R1));
-}
-
-TEST_F(StructuralEquivalenceRecordTest, AnonymousRecordsShouldBeInequivalent) {
-  auto t = makeTuDecls(
-      R"(
-      struct X {
-        struct {
-          int a;
-        };
-        struct {
-          int b;
-        };
-      };
-      )",
-      "", Lang_C99);
-  auto *TU = get<0>(t);
-  auto *A = FirstDeclMatcher<IndirectFieldDecl>().match(
-      TU, indirectFieldDecl(hasName("a")));
-  auto *FA = cast<FieldDecl>(A->chain().front());
-  RecordDecl *RA = cast<RecordType>(FA->getType().getTypePtr())->getDecl();
-  auto *B = FirstDeclMatcher<IndirectFieldDecl>().match(
-      TU, indirectFieldDecl(hasName("b")));
-  auto *FB = cast<FieldDecl>(B->chain().front());
-  RecordDecl *RB = cast<RecordType>(FB->getType().getTypePtr())->getDecl();
-
-  ASSERT_NE(RA, RB);
-  EXPECT_TRUE(testStructuralMatch(RA, RA));
-  EXPECT_TRUE(testStructuralMatch(RB, RB));
-  EXPECT_FALSE(testStructuralMatch(RA, RB));
-}
-
-TEST_F(StructuralEquivalenceRecordTest,
-       RecordsAreInequivalentIfOrderOfAnonRecordsIsDifferent) {
-  auto t = makeTuDecls(
-      R"(
-      struct X {
-        struct { int a; };
-        struct { int b; };
-      };
-      )",
-      R"(
-      struct X { // The order is reversed.
-        struct { int b; };
-        struct { int a; };
-      };
-      )",
-      Lang_C99);
-
-  auto *TU = get<0>(t);
-  auto *A = FirstDeclMatcher<IndirectFieldDecl>().match(
-      TU, indirectFieldDecl(hasName("a")));
-  auto *FA = cast<FieldDecl>(A->chain().front());
-  RecordDecl *RA = cast<RecordType>(FA->getType().getTypePtr())->getDecl();
-
-  auto *TU1 = get<1>(t);
-  auto *A1 = FirstDeclMatcher<IndirectFieldDecl>().match(
-      TU1, indirectFieldDecl(hasName("a")));
-  auto *FA1 = cast<FieldDecl>(A1->chain().front());
-  RecordDecl *RA1 = cast<RecordType>(FA1->getType().getTypePtr())->getDecl();
-
-  RecordDecl *X =
-      FirstDeclMatcher<RecordDecl>().match(TU, recordDecl(hasName("X")));
-  RecordDecl *X1 =
-      FirstDeclMatcher<RecordDecl>().match(TU1, recordDecl(hasName("X")));
-  ASSERT_NE(X, X1);
-  EXPECT_FALSE(testStructuralMatch(X, X1));
-
-  ASSERT_NE(RA, RA1);
-  EXPECT_TRUE(testStructuralMatch(RA, RA));
-  EXPECT_TRUE(testStructuralMatch(RA1, RA1));
-  EXPECT_FALSE(testStructuralMatch(RA1, RA));
-}
-
-TEST_F(StructuralEquivalenceRecordTest,
-       UnnamedRecordsShouldBeInequivalentEvenIfTheSecondIsBeingDefined) {
-  auto Code =
-      R"(
-      struct A {
-        struct {
-          struct A *next;
-        } entry0;
-        struct {
-          struct A *next;
-        } entry1;
-      };
-      )";
-  auto t = makeTuDecls(Code, Code, Lang_C99);
-
-  auto *FromTU = get<0>(t);
-  auto *Entry1 =
-      FirstDeclMatcher<FieldDecl>().match(FromTU, fieldDecl(hasName("entry1")));
-
-  auto *ToTU = get<1>(t);
-  auto *Entry0 =
-      FirstDeclMatcher<FieldDecl>().match(ToTU, fieldDecl(hasName("entry0")));
-  auto *A =
-      FirstDeclMatcher<RecordDecl>().match(ToTU, recordDecl(hasName("A")));
-  A->startDefinition(); // Set isBeingDefined, getDefinition() will return a
-                        // nullptr. This may be the case during ASTImport.
-
-  auto *R0 = getRecordDecl(Entry0);
-  auto *R1 = getRecordDecl(Entry1);
-
-  ASSERT_NE(R0, R1);
-  EXPECT_TRUE(testStructuralMatch(R0, R0));
-  EXPECT_TRUE(testStructuralMatch(R1, R1));
-  EXPECT_FALSE(testStructuralMatch(R0, R1));
-}
-
-TEST_F(StructuralEquivalenceRecordTest, TemplateVsNonTemplate) {
-  auto t = makeDecls<CXXRecordDecl>("struct A { };",
-                                    "template<class T> struct A { };",
-                                    Lang_CXX03, cxxRecordDecl(hasName("A")));
-  EXPECT_FALSE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceRecordTest,
-    FwdDeclRecordShouldBeEqualWithFwdDeclRecord) {
-  auto t = makeNamedDecls("class foo;", "class foo;", Lang_CXX11);
-  EXPECT_TRUE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceRecordTest,
-       FwdDeclRecordShouldBeEqualWithRecordWhichHasDefinition) {
-  auto t =
-      makeNamedDecls("class foo;", "class foo { int A; };", Lang_CXX11);
-  EXPECT_TRUE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceRecordTest,
-       RecordShouldBeEqualWithRecordWhichHasDefinition) {
-  auto t = makeNamedDecls("class foo { int A; };", "class foo { int A; };",
-                          Lang_CXX11);
-  EXPECT_TRUE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceRecordTest, RecordsWithDifferentBody) {
-  auto t = makeNamedDecls("class foo { int B; };", "class foo { int A; };",
-                          Lang_CXX11);
-  EXPECT_FALSE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceRecordTest, SameFriendMultipleTimes) {
-  auto t = makeNamedDecls("struct foo { friend class X; };",
-                          "struct foo { friend class X; friend class X; };",
-                          Lang_CXX11);
-  EXPECT_FALSE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceRecordTest, SameFriendsDifferentOrder) {
-  auto t = makeNamedDecls("struct foo { friend class X; friend class Y; };",
-                          "struct foo { friend class Y; friend class X; };",
-                          Lang_CXX11);
-  EXPECT_FALSE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceRecordTest, SameFriendsSameOrder) {
-  auto t = makeNamedDecls("struct foo { friend class X; friend class Y; };",
-                          "struct foo { friend class X; friend class Y; };",
-                          Lang_CXX11);
-  EXPECT_TRUE(testStructuralMatch(t));
-}
-
-struct StructuralEquivalenceLambdaTest : StructuralEquivalenceTest {};
-
-TEST_F(StructuralEquivalenceLambdaTest, LambdaClassesWithDifferentMethods) {
-  // Get the LambdaExprs, unfortunately we can't match directly the underlying
-  // implicit CXXRecordDecl of the Lambda classes.
-  auto t = makeDecls<LambdaExpr>(
-      "void f() { auto L0 = [](int){}; }",
-      "void f() { auto L1 = [](){}; }",
-      Lang_CXX11,
-      lambdaExpr(),
-      lambdaExpr());
-  CXXRecordDecl *L0 = get<0>(t)->getLambdaClass();
-  CXXRecordDecl *L1 = get<1>(t)->getLambdaClass();
-  EXPECT_FALSE(testStructuralMatch(L0, L1));
-}
-
-TEST_F(StructuralEquivalenceLambdaTest, LambdaClassesWithEqMethods) {
-  auto t = makeDecls<LambdaExpr>(
-      "void f() { auto L0 = [](int){}; }",
-      "void f() { auto L1 = [](int){}; }",
-      Lang_CXX11,
-      lambdaExpr(),
-      lambdaExpr());
-  CXXRecordDecl *L0 = get<0>(t)->getLambdaClass();
-  CXXRecordDecl *L1 = get<1>(t)->getLambdaClass();
-  EXPECT_TRUE(testStructuralMatch(L0, L1));
-}
-
-TEST_F(StructuralEquivalenceLambdaTest, LambdaClassesWithDifferentFields) {
-  auto t = makeDecls<LambdaExpr>(
-      "void f() { char* X; auto L0 = [X](){}; }",
-      "void f() { float X; auto L1 = [X](){}; }",
-      Lang_CXX11,
-      lambdaExpr(),
-      lambdaExpr());
-  CXXRecordDecl *L0 = get<0>(t)->getLambdaClass();
-  CXXRecordDecl *L1 = get<1>(t)->getLambdaClass();
-  EXPECT_FALSE(testStructuralMatch(L0, L1));
-}
-
-TEST_F(StructuralEquivalenceLambdaTest, LambdaClassesWithEqFields) {
-  auto t = makeDecls<LambdaExpr>(
-      "void f() { float X; auto L0 = [X](){}; }",
-      "void f() { float X; auto L1 = [X](){}; }",
-      Lang_CXX11,
-      lambdaExpr(),
-      lambdaExpr());
-  CXXRecordDecl *L0 = get<0>(t)->getLambdaClass();
-  CXXRecordDecl *L1 = get<1>(t)->getLambdaClass();
-  EXPECT_TRUE(testStructuralMatch(L0, L1));
-}
-
-TEST_F(StructuralEquivalenceTest, CompareSameDeclWithMultiple) {
-  auto t = makeNamedDecls("struct A{ }; struct B{ }; void foo(A a, A b);",
-                          "struct A{ }; struct B{ }; void foo(A a, B b);",
-                          Lang_CXX03);
-  EXPECT_FALSE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceTest, ExplicitBoolDifferent) {
-  auto Decls = makeNamedDecls("struct foo {explicit(false) foo(int);};",
-                              "struct foo {explicit(true) foo(int);};", Lang_CXX20);
-  CXXConstructorDecl *First = FirstDeclMatcher<CXXConstructorDecl>().match(
-      get<0>(Decls), cxxConstructorDecl(hasName("foo")));
-  CXXConstructorDecl *Second = FirstDeclMatcher<CXXConstructorDecl>().match(
-      get<1>(Decls), cxxConstructorDecl(hasName("foo")));
-  EXPECT_FALSE(testStructuralMatch(First, Second));
-}
-
-TEST_F(StructuralEquivalenceTest, ExplicitBoolSame) {
-  auto Decls = makeNamedDecls("struct foo {explicit(true) foo(int);};",
-                              "struct foo {explicit(true) foo(int);};", Lang_CXX20);
-  CXXConstructorDecl *First = FirstDeclMatcher<CXXConstructorDecl>().match(
-      get<0>(Decls), cxxConstructorDecl(hasName("foo")));
-  CXXConstructorDecl *Second = FirstDeclMatcher<CXXConstructorDecl>().match(
-      get<1>(Decls), cxxConstructorDecl(hasName("foo")));
-  EXPECT_TRUE(testStructuralMatch(First, Second));
-}
-
-struct StructuralEquivalenceEnumTest : StructuralEquivalenceTest {};
-
-TEST_F(StructuralEquivalenceEnumTest, FwdDeclEnumShouldBeEqualWithFwdDeclEnum) {
-  auto t = makeNamedDecls("enum class foo;", "enum class foo;", Lang_CXX11);
-  EXPECT_TRUE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceEnumTest,
-       FwdDeclEnumShouldBeEqualWithEnumWhichHasDefinition) {
-  auto t =
-      makeNamedDecls("enum class foo;", "enum class foo { A };", Lang_CXX11);
-  EXPECT_TRUE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceEnumTest,
-       EnumShouldBeEqualWithEnumWhichHasDefinition) {
-  auto t = makeNamedDecls("enum class foo { A };", "enum class foo { A };",
-                          Lang_CXX11);
-  EXPECT_TRUE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceEnumTest, EnumsWithDifferentBody) {
-  auto t = makeNamedDecls("enum class foo { B };", "enum class foo { A };",
-                          Lang_CXX11);
-  EXPECT_FALSE(testStructuralMatch(t));
-}
-
-struct StructuralEquivalenceTemplateTest : StructuralEquivalenceTest {};
-
-TEST_F(StructuralEquivalenceTemplateTest, ExactlySameTemplates) {
-  auto t = makeNamedDecls("template <class T> struct foo;",
-                          "template <class T> struct foo;", Lang_CXX03);
-  EXPECT_TRUE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceTemplateTest, DifferentTemplateArgName) {
-  auto t = makeNamedDecls("template <class T> struct foo;",
-                          "template <class U> struct foo;", Lang_CXX03);
-  EXPECT_TRUE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceTemplateTest, DifferentTemplateArgKind) {
-  auto t = makeNamedDecls("template <class T> struct foo;",
-                          "template <int T> struct foo;", Lang_CXX03);
-  EXPECT_FALSE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceTemplateTest, BitFieldDecl) {
-  const char *Code = "class foo { int a : 2; };";
-  auto t = makeNamedDecls(Code, Code, Lang_CXX03);
-  EXPECT_TRUE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceTemplateTest, BitFieldDeclDifferentWidth) {
-  auto t = makeNamedDecls("class foo { int a : 2; };",
-                          "class foo { int a : 4; };", Lang_CXX03);
-  EXPECT_FALSE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceTemplateTest, DependentBitFieldDecl) {
-  const char *Code = "template <class T> class foo { int a : sizeof(T); };";
-  auto t = makeNamedDecls(Code, Code, Lang_CXX03);
-  EXPECT_TRUE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceTemplateTest, DependentBitFieldDeclDifferentVal) {
-  auto t = makeNamedDecls(
-      "template <class A, class B> class foo { int a : sizeof(A); };",
-      "template <class A, class B> class foo { int a : sizeof(B); };",
-      Lang_CXX03);
-  EXPECT_FALSE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceTemplateTest, DependentBitFieldDeclDifferentVal2) {
-  auto t = makeNamedDecls(
-      "template <class A> class foo { int a : sizeof(A); };",
-      "template <class A> class foo { int a : sizeof(A) + 1; };", Lang_CXX03);
-  EXPECT_FALSE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceTemplateTest, ExplicitBoolSame) {
-  auto Decls = makeNamedDecls(
-      "template <bool b> struct foo {explicit(b) foo(int);};",
-      "template <bool b> struct foo {explicit(b) foo(int);};", Lang_CXX20);
-  CXXConstructorDecl *First = FirstDeclMatcher<CXXConstructorDecl>().match(
-      get<0>(Decls), cxxConstructorDecl(hasName("foo<b>")));
-  CXXConstructorDecl *Second = FirstDeclMatcher<CXXConstructorDecl>().match(
-      get<1>(Decls), cxxConstructorDecl(hasName("foo<b>")));
-  EXPECT_TRUE(testStructuralMatch(First, Second));
-}
-
-TEST_F(StructuralEquivalenceTemplateTest, ExplicitBoolDifference) {
-  auto Decls = makeNamedDecls(
-      "template <bool b> struct foo {explicit(b) foo(int);};",
-      "template <bool b> struct foo {explicit(!b) foo(int);};", Lang_CXX20);
-  CXXConstructorDecl *First = FirstDeclMatcher<CXXConstructorDecl>().match(
-      get<0>(Decls), cxxConstructorDecl(hasName("foo<b>")));
-  CXXConstructorDecl *Second = FirstDeclMatcher<CXXConstructorDecl>().match(
-      get<1>(Decls), cxxConstructorDecl(hasName("foo<b>")));
-  EXPECT_FALSE(testStructuralMatch(First, Second));
-}
-
-TEST_F(StructuralEquivalenceTemplateTest,
-       TemplateVsSubstTemplateTemplateParmInArgEq) {
-  auto t = makeDecls<ClassTemplateSpecializationDecl>(
-      R"(
-template <typename P1> class Arg { };
-template <template <typename PP1> class P1> class Primary { };
-
-void f() {
-  // Make specialization with simple template.
-  Primary <Arg> A;
-}
-      )",
-      R"(
-template <typename P1> class Arg { };
-template <template <typename PP1> class P1> class Primary { };
-
-template <template <typename PP1> class P1> class Templ {
-  void f() {
-    // Make specialization with substituted template template param.
-    Primary <P1> A;
-  };
-};
-
-// Instantiate with substitution Arg into P1.
-template class Templ <Arg>;
-      )",
-      Lang_CXX03, classTemplateSpecializationDecl(hasName("Primary")));
-  EXPECT_TRUE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceTemplateTest,
-       TemplateVsSubstTemplateTemplateParmInArgNotEq) {
-  auto t = makeDecls<ClassTemplateSpecializationDecl>(
-      R"(
-template <typename P1> class Arg { };
-template <template <typename PP1> class P1> class Primary { };
-
-void f() {
-  // Make specialization with simple template.
-  Primary <Arg> A;
-}
-      )",
-      R"(
-// Arg is different from the other, this should cause non-equivalence.
-template <typename P1> class Arg { int X; };
-template <template <typename PP1> class P1> class Primary { };
-
-template <template <typename PP1> class P1> class Templ {
-  void f() {
-    // Make specialization with substituted template template param.
-    Primary <P1> A;
-  };
-};
-
-// Instantiate with substitution Arg into P1.
-template class Templ <Arg>;
-      )",
-      Lang_CXX03, classTemplateSpecializationDecl(hasName("Primary")));
-  EXPECT_FALSE(testStructuralMatch(t));
-}
-
-struct StructuralEquivalenceDependentTemplateArgsTest
-    : StructuralEquivalenceTemplateTest {};
-
-TEST_F(StructuralEquivalenceDependentTemplateArgsTest,
-       SameStructsInDependentArgs) {
-  std::string Code =
-      R"(
-      template <typename>
-      struct S1;
-
-      template <typename>
-      struct enable_if;
-
-      struct S
-      {
-        template <typename T, typename enable_if<S1<T>>::type>
-        void f();
-      };
-      )";
-  auto t = makeDecls<FunctionTemplateDecl>(Code, Code, Lang_CXX11,
-                                           functionTemplateDecl(hasName("f")));
-  EXPECT_TRUE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceDependentTemplateArgsTest,
-       DifferentStructsInDependentArgs) {
-  std::string Code =
-      R"(
-      template <typename>
-      struct S1;
-
-      template <typename>
-      struct S2;
-
-      template <typename>
-      struct enable_if;
-      )";
-  auto t = makeDecls<FunctionTemplateDecl>(Code + R"(
-      struct S
-      {
-        template <typename T, typename enable_if<S1<T>>::type>
-        void f();
-      };
-      )",
-                                           Code + R"(
-      struct S
-      {
-        template <typename T, typename enable_if<S2<T>>::type>
-        void f();
-      };
-      )",
-                                           Lang_CXX11,
-                                           functionTemplateDecl(hasName("f")));
-  EXPECT_FALSE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceDependentTemplateArgsTest,
-       SameStructsInDependentScopeDeclRefExpr) {
-  std::string Code =
-      R"(
-      template <typename>
-      struct S1;
-
-      template <bool>
-      struct enable_if;
-
-      struct S
-      {
-        template <typename T, typename enable_if<S1<T>::value>::type>
-        void f();   // DependentScopeDeclRefExpr:^^^^^^^^^^^^
-      };
-      )";
-  auto t = makeDecls<FunctionTemplateDecl>(Code, Code, Lang_CXX11,
-                                           functionTemplateDecl(hasName("f")));
-  EXPECT_TRUE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceDependentTemplateArgsTest,
-       DifferentStructsInDependentScopeDeclRefExpr) {
-  std::string Code =
-      R"(
-      template <typename>
-      struct S1;
-
-      template <typename>
-      struct S2;
-
-      template <bool>
-      struct enable_if;
-      )";
-  auto t = makeDecls<FunctionTemplateDecl>(Code + R"(
-      struct S
-      {
-        template <typename T, typename enable_if<S1<T>::value>::type>
-        void f();   // DependentScopeDeclRefExpr:^^^^^^^^^^^^
-      };
-      )",
-                                           Code + R"(
-      struct S
-      {
-        template <typename T, typename enable_if<S2<T>::value>::type>
-        void f();
-      };
-      )",
-                                           Lang_CXX03,
-                                           functionTemplateDecl(hasName("f")));
-  EXPECT_FALSE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceDependentTemplateArgsTest,
-       DifferentValueInDependentScopeDeclRefExpr) {
-  std::string Code =
-      R"(
-      template <typename>
-      struct S1;
-
-      template <bool>
-      struct enable_if;
-      )";
-  auto t = makeDecls<FunctionTemplateDecl>(Code + R"(
-      struct S
-      {
-        template <typename T, typename enable_if<S1<T>::value1>::type>
-        void f();   // DependentScopeDeclRefExpr:^^^^^^^^^^^^
-      };
-      )",
-                                           Code + R"(
-      struct S
-      {
-        template <typename T, typename enable_if<S1<T>::value2>::type>
-        void f();
-      };
-      )",
-                                           Lang_CXX03,
-                                           functionTemplateDecl(hasName("f")));
-  EXPECT_FALSE(testStructuralMatch(t));
-}
-
-TEST_F(
-    StructuralEquivalenceTemplateTest,
-    ClassTemplSpecWithQualifiedAndNonQualifiedTypeArgsShouldBeEqual) {
-  auto t = makeDecls<ClassTemplateSpecializationDecl>(
-      R"(
-      template <class T> struct Primary {};
-      namespace N {
-        struct Arg;
-      }
-      // Explicit instantiation with qualified name.
-      template struct Primary<N::Arg>;
-      )",
-      R"(
-      template <class T> struct Primary {};
-      namespace N {
-        struct Arg;
-      }
-      using namespace N;
-      // Explicit instantiation with UNqualified name.
-      template struct Primary<Arg>;
-      )",
-      Lang_CXX03, classTemplateSpecializationDecl(hasName("Primary")));
-  EXPECT_TRUE(testStructuralMatch(t));
-}
-
-TEST_F(
-    StructuralEquivalenceTemplateTest,
-    ClassTemplSpecWithInequivalentQualifiedAndNonQualifiedTypeArgs) {
-  auto t = makeDecls<ClassTemplateSpecializationDecl>(
-      R"(
-      template <class T> struct Primary {};
-      namespace N {
-        struct Arg { int a; };
-      }
-      // Explicit instantiation with qualified name.
-      template struct Primary<N::Arg>;
-      )",
-      R"(
-      template <class T> struct Primary {};
-      namespace N {
-        // This struct is not equivalent with the other in the prev TU.
-        struct Arg { double b; }; // -- Field mismatch.
-      }
-      using namespace N;
-      // Explicit instantiation with UNqualified name.
-      template struct Primary<Arg>;
-      )",
-      Lang_CXX03, classTemplateSpecializationDecl(hasName("Primary")));
-  EXPECT_FALSE(testStructuralMatch(t));
-}
-
-TEST_F(
-    StructuralEquivalenceTemplateTest,
-    ClassTemplSpecWithQualifiedAndNonQualifiedTemplArgsShouldBeEqual) {
-  auto t = makeDecls<ClassTemplateSpecializationDecl>(
-      R"(
-      template <template <class> class T> struct Primary {};
-      namespace N {
-        template <class T> struct Arg;
-      }
-      // Explicit instantiation with qualified name.
-      template struct Primary<N::Arg>;
-      )",
-      R"(
-      template <template <class> class T> struct Primary {};
-      namespace N {
-        template <class T> struct Arg;
-      }
-      using namespace N;
-      // Explicit instantiation with UNqualified name.
-      template struct Primary<Arg>;
-      )",
-      Lang_CXX03, classTemplateSpecializationDecl(hasName("Primary")));
-  EXPECT_TRUE(testStructuralMatch(t));
-}
-
-TEST_F(
-    StructuralEquivalenceTemplateTest,
-    ClassTemplSpecWithInequivalentQualifiedAndNonQualifiedTemplArgs) {
-  auto t = makeDecls<ClassTemplateSpecializationDecl>(
-      R"(
-      template <template <class> class T> struct Primary {};
-      namespace N {
-        template <class T> struct Arg { int a; };
-      }
-      // Explicit instantiation with qualified name.
-      template struct Primary<N::Arg>;
-      )",
-      R"(
-      template <template <class> class T> struct Primary {};
-      namespace N {
-        // This template is not equivalent with the other in the prev TU.
-        template <class T> struct Arg { double b; }; // -- Field mismatch.
-      }
-      using namespace N;
-      // Explicit instantiation with UNqualified name.
-      template struct Primary<Arg>;
-      )",
-      Lang_CXX03, classTemplateSpecializationDecl(hasName("Primary")));
-  EXPECT_FALSE(testStructuralMatch(t));
-}
-
-TEST_F(
-    StructuralEquivalenceTemplateTest,
-    ClassTemplSpecWithInequivalentShadowedTemplArg) {
-  auto t = makeDecls<ClassTemplateSpecializationDecl>(
-      R"(
-      template <template <class> class T> struct Primary {};
-      template <class T> struct Arg { int a; };
-      // Explicit instantiation with ::Arg
-      template struct Primary<Arg>;
-      )",
-      R"(
-      template <template <class> class T> struct Primary {};
-      template <class T> struct Arg { int a; };
-      namespace N {
-        // This template is not equivalent with the other in the global scope.
-        template <class T> struct Arg { double b; }; // -- Field mismatch.
-        // Explicit instantiation with N::Arg which shadows ::Arg
-        template struct Primary<Arg>;
-      }
-      )",
-      Lang_CXX03, classTemplateSpecializationDecl(hasName("Primary")));
-  EXPECT_FALSE(testStructuralMatch(t));
-}
-struct StructuralEquivalenceCacheTest : public StructuralEquivalenceTest {
-  llvm::DenseSet<std::pair<Decl *, Decl *>> NonEquivalentDecls;
-
-  template <typename NodeType, typename MatcherType>
-  std::pair<NodeType *, NodeType *>
-  findDeclPair(std::tuple<TranslationUnitDecl *, TranslationUnitDecl *> TU,
-               MatcherType M) {
-    NodeType *D0 = FirstDeclMatcher<NodeType>().match(get<0>(TU), M);
-    NodeType *D1 = FirstDeclMatcher<NodeType>().match(get<1>(TU), M);
-    return {D0, D1};
-  }
-
-  template <typename NodeType>
-  bool isInNonEqCache(std::pair<NodeType *, NodeType *> D) {
-    return NonEquivalentDecls.count(D) > 0;
-  }
-};
-
-TEST_F(StructuralEquivalenceCacheTest, SimpleNonEq) {
-  auto TU = makeTuDecls(
-      R"(
-      class A {};
-      class B {};
-      void x(A, A);
-      )",
-      R"(
-      class A {};
-      class B {};
-      void x(A, B);
-      )",
-      Lang_CXX03);
-
-  StructuralEquivalenceContext Ctx(
-      get<0>(TU)->getASTContext(), get<1>(TU)->getASTContext(),
-      NonEquivalentDecls, StructuralEquivalenceKind::Default, false, false);
-
-  auto X = findDeclPair<FunctionDecl>(TU, functionDecl(hasName("x")));
-  EXPECT_FALSE(Ctx.IsEquivalent(X.first, X.second));
-
-  EXPECT_FALSE(isInNonEqCache(findDeclPair<CXXRecordDecl>(
-      TU, cxxRecordDecl(hasName("A"), unless(isImplicit())))));
-  EXPECT_FALSE(isInNonEqCache(findDeclPair<CXXRecordDecl>(
-      TU, cxxRecordDecl(hasName("B"), unless(isImplicit())))));
-}
-
-TEST_F(StructuralEquivalenceCacheTest, SpecialNonEq) {
-  auto TU = makeTuDecls(
-      R"(
-      class A {};
-      class B { int i; };
-      void x(A *);
-      void y(A *);
-      class C {
-        friend void x(A *);
-        friend void y(A *);
-      };
-      )",
-      R"(
-      class A {};
-      class B { int i; };
-      void x(A *);
-      void y(B *);
-      class C {
-        friend void x(A *);
-        friend void y(B *);
-      };
-      )",
-      Lang_CXX03);
-
-  StructuralEquivalenceContext Ctx(
-      get<0>(TU)->getASTContext(), get<1>(TU)->getASTContext(),
-      NonEquivalentDecls, StructuralEquivalenceKind::Default, false, false);
-
-  auto C = findDeclPair<CXXRecordDecl>(
-      TU, cxxRecordDecl(hasName("C"), unless(isImplicit())));
-  EXPECT_FALSE(Ctx.IsEquivalent(C.first, C.second));
-
-  EXPECT_FALSE(isInNonEqCache(C));
-  EXPECT_FALSE(isInNonEqCache(findDeclPair<CXXRecordDecl>(
-      TU, cxxRecordDecl(hasName("A"), unless(isImplicit())))));
-  EXPECT_FALSE(isInNonEqCache(findDeclPair<CXXRecordDecl>(
-      TU, cxxRecordDecl(hasName("B"), unless(isImplicit())))));
-  EXPECT_FALSE(isInNonEqCache(
-      findDeclPair<FunctionDecl>(TU, functionDecl(hasName("x")))));
-  EXPECT_FALSE(isInNonEqCache(
-      findDeclPair<FunctionDecl>(TU, functionDecl(hasName("y")))));
-}
-
-TEST_F(StructuralEquivalenceCacheTest, Cycle) {
-  auto TU = makeTuDecls(
-      R"(
-      class C;
-      class A { C *c; };
-      void x(A *);
-      class C {
-        friend void x(A *);
-      };
-      )",
-      R"(
-      class C;
-      class A { C *c; };
-      void x(A *);
-      class C {
-        friend void x(A *);
-      };
-      )",
-      Lang_CXX03);
-
-  StructuralEquivalenceContext Ctx(
-      get<0>(TU)->getASTContext(), get<1>(TU)->getASTContext(),
-      NonEquivalentDecls, StructuralEquivalenceKind::Default, false, false);
-
-  auto C = findDeclPair<CXXRecordDecl>(
-      TU, cxxRecordDecl(hasName("C"), unless(isImplicit())));
-  EXPECT_TRUE(Ctx.IsEquivalent(C.first, C.second));
-
-  EXPECT_FALSE(isInNonEqCache(C));
-  EXPECT_FALSE(isInNonEqCache(findDeclPair<CXXRecordDecl>(
-      TU, cxxRecordDecl(hasName("A"), unless(isImplicit())))));
-  EXPECT_FALSE(isInNonEqCache(
-      findDeclPair<FunctionDecl>(TU, functionDecl(hasName("x")))));
-}
-
-struct StructuralEquivalenceStmtTest : StructuralEquivalenceTest {};
-
-/// Fallback matcher to be used only when there is no specific matcher for a
-/// Expr subclass. Remove this once all Expr subclasses have their own matcher.
-static auto &fallbackExprMatcher = expr;
-
-TEST_F(StructuralEquivalenceStmtTest, AddrLabelExpr) {
-  auto t = makeWrappedStmts("lbl: &&lbl;", "lbl: &&lbl;", Lang_CXX03,
-                            addrLabelExpr());
-  EXPECT_TRUE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceStmtTest, AddrLabelExprDifferentLabel) {
-  auto t = makeWrappedStmts("lbl1: lbl2: &&lbl1;", "lbl1: lbl2: &&lbl2;",
-                            Lang_CXX03, addrLabelExpr());
-  // FIXME: Should be false. LabelDecl are incorrectly matched.
-  EXPECT_TRUE(testStructuralMatch(t));
-}
-
-static const std::string MemoryOrderSrc = R"(
-enum memory_order {
-  memory_order_relaxed,
-  memory_order_consume,
-  memory_order_acquire,
-  memory_order_release,
-  memory_order_acq_rel,
-  memory_order_seq_cst
-};
-)";
-
-TEST_F(StructuralEquivalenceStmtTest, AtomicExpr) {
-  std::string Prefix = "char a, b; " + MemoryOrderSrc;
-  auto t = makeStmts(
-      Prefix +
-          "void wrapped() { __atomic_load(&a, &b, memory_order_seq_cst); }",
-      Prefix +
-          "void wrapped() { __atomic_load(&a, &b, memory_order_seq_cst); }",
-      Lang_CXX03, atomicExpr());
-  EXPECT_TRUE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceStmtTest, AtomicExprDifferentOp) {
-  std::string Prefix = "char a, b; " + MemoryOrderSrc;
-  auto t = makeStmts(
-      Prefix +
-          "void wrapped() { __atomic_load(&a, &b, memory_order_seq_cst); }",
-      Prefix +
-          "void wrapped() { __atomic_store(&a, &b, memory_order_seq_cst); }",
-      Lang_CXX03, atomicExpr());
-  EXPECT_FALSE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceStmtTest, BinaryOperator) {
-  auto t = makeWrappedStmts("1 + 1", "1 + 1", Lang_CXX03, binaryOperator());
-  EXPECT_TRUE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceStmtTest, BinaryOperatorDifferentOps) {
-  auto t = makeWrappedStmts("1 + 1", "1 - 1", Lang_CXX03, binaryOperator());
-  EXPECT_FALSE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceStmtTest, CallExpr) {
-  std::string Src = "int call(); int wrapped() { call(); }";
-  auto t = makeStmts(Src, Src, Lang_CXX03, callExpr());
-  EXPECT_TRUE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceStmtTest, CallExprDifferentCallee) {
-  std::string FunctionSrc = "int func1(); int func2();\n";
-  auto t = makeStmts(FunctionSrc + "void wrapper() { func1(); }",
-                     FunctionSrc + "void wrapper() { func2(); }", Lang_CXX03,
-                     callExpr());
-  EXPECT_FALSE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceStmtTest, CharacterLiteral) {
-  auto t = makeWrappedStmts("'a'", "'a'", Lang_CXX03, characterLiteral());
-  EXPECT_TRUE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceStmtTest, CharacterLiteralDifferentValues) {
-  auto t = makeWrappedStmts("'a'", "'b'", Lang_CXX03, characterLiteral());
-  EXPECT_FALSE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceStmtTest, ExpressionTraitExpr) {
-  auto t = makeWrappedStmts("__is_lvalue_expr(1)", "__is_lvalue_expr(1)",
-                            Lang_CXX03, fallbackExprMatcher());
-  EXPECT_TRUE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceStmtTest, ExpressionTraitExprDifferentKind) {
-  auto t = makeWrappedStmts("__is_lvalue_expr(1)", "__is_rvalue_expr(1)",
-                            Lang_CXX03, fallbackExprMatcher());
-  EXPECT_FALSE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceStmtTest, FloatingLiteral) {
-  auto t = makeWrappedStmts("1.0", "1.0", Lang_CXX03, fallbackExprMatcher());
-  EXPECT_TRUE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceStmtTest, FloatingLiteralDifferentSpelling) {
-  auto t = makeWrappedStmts("0x10.1p0", "16.0625", Lang_CXX17,
-                            fallbackExprMatcher());
-  // Same value but with different spelling is equivalent.
-  EXPECT_TRUE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceStmtTest, FloatingLiteralDifferentType) {
-  auto t = makeWrappedStmts("1.0", "1.0f", Lang_CXX03, fallbackExprMatcher());
-  EXPECT_FALSE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceStmtTest, FloatingLiteralDifferentValue) {
-  auto t = makeWrappedStmts("1.01", "1.0", Lang_CXX03, fallbackExprMatcher());
-  EXPECT_FALSE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceStmtTest, GenericSelectionExprSame) {
-  auto t = makeWrappedStmts("_Generic(0u, unsigned int: 0, float: 1)",
-                            "_Generic(0u, unsigned int: 0, float: 1)", Lang_C99,
-                            genericSelectionExpr());
-  EXPECT_TRUE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceStmtTest, GenericSelectionExprSignsDiffer) {
-  auto t = makeWrappedStmts("_Generic(0u, unsigned int: 0, float: 1)",
-                            "_Generic(0, int: 0, float: 1)", Lang_C99,
-                            genericSelectionExpr());
-  EXPECT_FALSE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceStmtTest, GenericSelectionExprOrderDiffers) {
-  auto t = makeWrappedStmts("_Generic(0u, unsigned int: 0, float: 1)",
-                            "_Generic(0u, float: 1, unsigned int: 0)", Lang_C99,
-                            genericSelectionExpr());
-  EXPECT_FALSE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceStmtTest, GenericSelectionExprDependentResultSame) {
-  auto t = makeStmts(
-      R"(
-      template <typename T>
-      void f() {
-        T x;
-        (void)_Generic(x, int: 0, float: 1);
-      }
-      void g() { f<int>(); }
-      )",
-      R"(
-      template <typename T>
-      void f() {
-        T x;
-        (void)_Generic(x, int: 0, float: 1);
-      }
-      void g() { f<int>(); }
-      )",
-      Lang_CXX03, genericSelectionExpr());
-  EXPECT_TRUE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceStmtTest,
-       GenericSelectionExprDependentResultOrderDiffers) {
-  auto t = makeStmts(
-      R"(
-      template <typename T>
-      void f() {
-        T x;
-        (void)_Generic(x, float: 1, int: 0);
-      }
-      void g() { f<int>(); }
-      )",
-      R"(
-      template <typename T>
-      void f() {
-        T x;
-        (void)_Generic(x, int: 0, float: 1);
-      }
-      void g() { f<int>(); }
-      )",
-      Lang_CXX03, genericSelectionExpr());
-
-  EXPECT_FALSE(testStructuralMatch(t));
-}
-TEST_F(StructuralEquivalenceStmtTest, IntegerLiteral) {
-  auto t = makeWrappedStmts("1", "1", Lang_CXX03, integerLiteral());
-  EXPECT_TRUE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceStmtTest, IntegerLiteralDifferentSpelling) {
-  auto t = makeWrappedStmts("1", "0x1", Lang_CXX03, integerLiteral());
-  // Same value but with different spelling is equivalent.
-  EXPECT_TRUE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceStmtTest, IntegerLiteralDifferentValue) {
-  auto t = makeWrappedStmts("1", "2", Lang_CXX03, integerLiteral());
-  EXPECT_FALSE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceStmtTest, IntegerLiteralDifferentTypes) {
-  auto t = makeWrappedStmts("1", "1L", Lang_CXX03, integerLiteral());
-  EXPECT_FALSE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceStmtTest, MemberExpr) {
-  std::string ClassSrc = "struct C { int a; int b; };";
-  auto t = makeStmts(ClassSrc + "int wrapper() { C c; return c.a; }",
-                     ClassSrc + "int wrapper() { C c; return c.a; }",
-                     Lang_CXX03, memberExpr());
-  EXPECT_TRUE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceStmtTest, MemberExprDifferentMember) {
-  std::string ClassSrc = "struct C { int a; int b; };";
-  auto t = makeStmts(ClassSrc + "int wrapper() { C c; return c.a; }",
-                     ClassSrc + "int wrapper() { C c; return c.b; }",
-                     Lang_CXX03, memberExpr());
-  EXPECT_FALSE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceStmtTest, ObjCStringLiteral) {
-  auto t =
-      makeWrappedStmts("@\"a\"", "@\"a\"", Lang_OBJCXX, fallbackExprMatcher());
-  EXPECT_TRUE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceStmtTest, ObjCStringLiteralDifferentContent) {
-  auto t =
-      makeWrappedStmts("@\"a\"", "@\"b\"", Lang_OBJCXX, fallbackExprMatcher());
-  EXPECT_FALSE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceStmtTest, StringLiteral) {
-  auto t = makeWrappedStmts("\"a\"", "\"a\"", Lang_CXX03, stringLiteral());
-  EXPECT_TRUE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceStmtTest, StringLiteralDifferentContent) {
-  auto t = makeWrappedStmts("\"a\"", "\"b\"", Lang_CXX03, stringLiteral());
-  EXPECT_FALSE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceStmtTest, StringLiteralDifferentLength) {
-  auto t = makeWrappedStmts("\"a\"", "\"aa\"", Lang_CXX03, stringLiteral());
-  EXPECT_FALSE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceStmtTest, TypeTraitExpr) {
-  auto t = makeWrappedStmts("__is_pod(int)", "__is_pod(int)", Lang_CXX03,
-                            fallbackExprMatcher());
-  EXPECT_TRUE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceStmtTest, TypeTraitExprDifferentType) {
-  auto t = makeWrappedStmts("__is_pod(int)", "__is_pod(long)", Lang_CXX03,
-                            fallbackExprMatcher());
-  EXPECT_FALSE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceStmtTest, TypeTraitExprDifferentTrait) {
-  auto t = makeWrappedStmts(
-      "__is_pod(int)", "__is_trivially_constructible(int)", Lang_CXX03, expr());
-  EXPECT_FALSE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceStmtTest, TypeTraitExprDifferentTraits) {
-  auto t = makeWrappedStmts("__is_constructible(int)",
-                            "__is_constructible(int, int)", Lang_CXX03, expr());
-  EXPECT_FALSE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceStmtTest, UnaryExprOrTypeTraitExpr) {
-  auto t = makeWrappedStmts("sizeof(int)", "sizeof(int)", Lang_CXX03,
-                            unaryExprOrTypeTraitExpr());
-  EXPECT_TRUE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceStmtTest, UnaryExprOrTypeTraitExprDifferentKind) {
-  auto t = makeWrappedStmts("sizeof(int)", "alignof(long)", Lang_CXX11,
-                            unaryExprOrTypeTraitExpr());
-  EXPECT_FALSE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceStmtTest, UnaryExprOrTypeTraitExprDifferentType) {
-  auto t = makeWrappedStmts("sizeof(int)", "sizeof(long)", Lang_CXX03,
-                            unaryExprOrTypeTraitExpr());
-  EXPECT_FALSE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceStmtTest, UnaryOperator) {
-  auto t = makeWrappedStmts("+1", "+1", Lang_CXX03, unaryOperator());
-  EXPECT_TRUE(testStructuralMatch(t));
-}
-
-TEST_F(StructuralEquivalenceStmtTest, UnaryOperatorDifferentOps) {
-  auto t = makeWrappedStmts("+1", "-1", Lang_CXX03, unaryOperator());
-  EXPECT_FALSE(testStructuralMatch(t));
-}
-
-} // end namespace ast_matchers
-} // end namespace clang
diff --git a/gnu/llvm/clang/unittests/AST/TypePrinterTest.cpp b/gnu/llvm/clang/unittests/AST/TypePrinterTest.cpp
deleted file mode 100644
index 07dc21a88fb..00000000000
--- a/gnu/llvm/clang/unittests/AST/TypePrinterTest.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-//===- unittests/AST/TypePrinterTest.cpp --- Type printer tests -----------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file contains tests for QualType::print() and related methods.
-//
-//===----------------------------------------------------------------------===//
-
-#include "ASTPrint.h"
-#include "clang/AST/ASTContext.h"
-#include "clang/ASTMatchers/ASTMatchFinder.h"
-#include "clang/Tooling/Tooling.h"
-#include "llvm/ADT/SmallString.h"
-#include "gtest/gtest.h"
-
-using namespace clang;
-using namespace ast_matchers;
-using namespace tooling;
-
-namespace {
-
-static void PrintType(raw_ostream &Out, const ASTContext *Context,
-                      const QualType *T,
-                      PrintingPolicyAdjuster PolicyAdjuster) {
-  assert(T && !T->isNull() && "Expected non-null Type");
-  PrintingPolicy Policy = Context->getPrintingPolicy();
-  if (PolicyAdjuster)
-    PolicyAdjuster(Policy);
-  T->print(Out, Policy);
-}
-
-::testing::AssertionResult
-PrintedTypeMatches(StringRef Code, const std::vector<std::string> &Args,
-                   const DeclarationMatcher &NodeMatch,
-                   StringRef ExpectedPrinted,
-                   PrintingPolicyAdjuster PolicyAdjuster) {
-  return PrintedNodeMatches<QualType>(Code, Args, NodeMatch, ExpectedPrinted,
-                                      "", PrintType, PolicyAdjuster);
-}
-
-} // unnamed namespace
-
-TEST(TypePrinter, TemplateId) {
-  std::string Code = R"cpp(
-    namespace N {
-      template <typename> struct Type {};
-      
-      template <typename T>
-      void Foo(const Type<T> &Param);
-    }
-  )cpp";
-  auto Matcher = parmVarDecl(hasType(qualType().bind("id")));
-
-  ASSERT_TRUE(PrintedTypeMatches(
-      Code, {}, Matcher, "const Type<T> &",
-      [](PrintingPolicy &Policy) { Policy.FullyQualifiedName = false; }));
-
-  ASSERT_TRUE(PrintedTypeMatches(
-      Code, {}, Matcher, "const N::Type<T> &",
-      [](PrintingPolicy &Policy) { Policy.FullyQualifiedName = true; }));
-}
\ No newline at end of file
diff --git a/gnu/llvm/clang/unittests/ASTMatchers/ASTMatchersInternalTest.cpp b/gnu/llvm/clang/unittests/ASTMatchers/ASTMatchersInternalTest.cpp
deleted file mode 100644
index 6fec0d2e736..00000000000
--- a/gnu/llvm/clang/unittests/ASTMatchers/ASTMatchersInternalTest.cpp
+++ /dev/null
@@ -1,252 +0,0 @@
-// unittests/ASTMatchers/ASTMatchersInternalTest.cpp - AST matcher unit tests //
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "ASTMatchersTest.h"
-#include "clang/AST/PrettyPrinter.h"
-#include "clang/ASTMatchers/ASTMatchFinder.h"
-#include "clang/ASTMatchers/ASTMatchers.h"
-#include "clang/Tooling/Tooling.h"
-#include "llvm/ADT/Triple.h"
-#include "llvm/Support/Host.h"
-#include "llvm/Testing/Support/SupportHelpers.h"
-#include "gtest/gtest.h"
-
-namespace clang {
-namespace ast_matchers {
-using internal::DynTypedMatcher;
-
-#if GTEST_HAS_DEATH_TEST
-TEST(HasNameDeathTest, DiesOnEmptyName) {
-  ASSERT_DEBUG_DEATH({
-    DeclarationMatcher HasEmptyName = recordDecl(hasName(""));
-    EXPECT_TRUE(notMatches("class X {};", HasEmptyName));
-  }, "");
-}
-
-TEST(HasNameDeathTest, DiesOnEmptyPattern) {
-  ASSERT_DEBUG_DEATH({
-      DeclarationMatcher HasEmptyName = recordDecl(matchesName(""));
-      EXPECT_TRUE(notMatches("class X {};", HasEmptyName));
-    }, "");
-}
-#endif
-
-TEST(ConstructVariadic, MismatchedTypes_Regression) {
-  EXPECT_TRUE(
-      matches("const int a = 0;", internal::DynTypedMatcher::constructVariadic(
-                                      internal::DynTypedMatcher::VO_AnyOf,
-                                      ASTNodeKind::getFromNodeKind<QualType>(),
-                                      {isConstQualified(), arrayType()})
-                                      .convertTo<QualType>()));
-}
-
-// For testing AST_MATCHER_P().
-AST_MATCHER_P(Decl, just, internal::Matcher<Decl>, AMatcher) {
-  // Make sure all special variables are used: node, match_finder,
-  // bound_nodes_builder, and the parameter named 'AMatcher'.
-  return AMatcher.matches(Node, Finder, Builder);
-}
-
-TEST(AstMatcherPMacro, Works) {
-  DeclarationMatcher HasClassB = just(has(recordDecl(hasName("B")).bind("b")));
-
-  EXPECT_TRUE(matchAndVerifyResultTrue("class A { class B {}; };",
-      HasClassB, std::make_unique<VerifyIdIsBoundTo<Decl>>("b")));
-
-  EXPECT_TRUE(matchAndVerifyResultFalse("class A { class B {}; };",
-      HasClassB, std::make_unique<VerifyIdIsBoundTo<Decl>>("a")));
-
-  EXPECT_TRUE(matchAndVerifyResultFalse("class A { class C {}; };",
-      HasClassB, std::make_unique<VerifyIdIsBoundTo<Decl>>("b")));
-}
-
-AST_POLYMORPHIC_MATCHER_P(polymorphicHas,
-                          AST_POLYMORPHIC_SUPPORTED_TYPES(Decl, Stmt),
-                          internal::Matcher<Decl>, AMatcher) {
-  return Finder->matchesChildOf(
-      Node, AMatcher, Builder,
-      ASTMatchFinder::BK_First);
-}
-
-TEST(AstPolymorphicMatcherPMacro, Works) {
-  DeclarationMatcher HasClassB =
-      polymorphicHas(recordDecl(hasName("B")).bind("b"));
-
-  EXPECT_TRUE(matchAndVerifyResultTrue("class A { class B {}; };",
-      HasClassB, std::make_unique<VerifyIdIsBoundTo<Decl>>("b")));
-
-  EXPECT_TRUE(matchAndVerifyResultFalse("class A { class B {}; };",
-      HasClassB, std::make_unique<VerifyIdIsBoundTo<Decl>>("a")));
-
-  EXPECT_TRUE(matchAndVerifyResultFalse("class A { class C {}; };",
-      HasClassB, std::make_unique<VerifyIdIsBoundTo<Decl>>("b")));
-
-  StatementMatcher StatementHasClassB =
-      polymorphicHas(recordDecl(hasName("B")));
-
-  EXPECT_TRUE(matches("void x() { class B {}; }", StatementHasClassB));
-}
-
-TEST(MatchFinder, CheckProfiling) {
-  MatchFinder::MatchFinderOptions Options;
-  llvm::StringMap<llvm::TimeRecord> Records;
-  Options.CheckProfiling.emplace(Records);
-  MatchFinder Finder(std::move(Options));
-
-  struct NamedCallback : public MatchFinder::MatchCallback {
-    void run(const MatchFinder::MatchResult &Result) override {}
-    StringRef getID() const override { return "MyID"; }
-  } Callback;
-  Finder.addMatcher(decl(), &Callback);
-  std::unique_ptr<FrontendActionFactory> Factory(
-      newFrontendActionFactory(&Finder));
-  ASSERT_TRUE(tooling::runToolOnCode(Factory->create(), "int x;"));
-
-  EXPECT_EQ(1u, Records.size());
-  EXPECT_EQ("MyID", Records.begin()->getKey());
-}
-
-class VerifyStartOfTranslationUnit : public MatchFinder::MatchCallback {
-public:
-  VerifyStartOfTranslationUnit() : Called(false) {}
-  void run(const MatchFinder::MatchResult &Result) override {
-    EXPECT_TRUE(Called);
-  }
-  void onStartOfTranslationUnit() override { Called = true; }
-  bool Called;
-};
-
-TEST(MatchFinder, InterceptsStartOfTranslationUnit) {
-  MatchFinder Finder;
-  VerifyStartOfTranslationUnit VerifyCallback;
-  Finder.addMatcher(decl(), &VerifyCallback);
-  std::unique_ptr<FrontendActionFactory> Factory(
-      newFrontendActionFactory(&Finder));
-  ASSERT_TRUE(tooling::runToolOnCode(Factory->create(), "int x;"));
-  EXPECT_TRUE(VerifyCallback.Called);
-
-  VerifyCallback.Called = false;
-  std::unique_ptr<ASTUnit> AST(tooling::buildASTFromCode("int x;"));
-  ASSERT_TRUE(AST.get());
-  Finder.matchAST(AST->getASTContext());
-  EXPECT_TRUE(VerifyCallback.Called);
-}
-
-class VerifyEndOfTranslationUnit : public MatchFinder::MatchCallback {
-public:
-  VerifyEndOfTranslationUnit() : Called(false) {}
-  void run(const MatchFinder::MatchResult &Result) override {
-    EXPECT_FALSE(Called);
-  }
-  void onEndOfTranslationUnit() override { Called = true; }
-  bool Called;
-};
-
-TEST(MatchFinder, InterceptsEndOfTranslationUnit) {
-  MatchFinder Finder;
-  VerifyEndOfTranslationUnit VerifyCallback;
-  Finder.addMatcher(decl(), &VerifyCallback);
-  std::unique_ptr<FrontendActionFactory> Factory(
-      newFrontendActionFactory(&Finder));
-  ASSERT_TRUE(tooling::runToolOnCode(Factory->create(), "int x;"));
-  EXPECT_TRUE(VerifyCallback.Called);
-
-  VerifyCallback.Called = false;
-  std::unique_ptr<ASTUnit> AST(tooling::buildASTFromCode("int x;"));
-  ASSERT_TRUE(AST.get());
-  Finder.matchAST(AST->getASTContext());
-  EXPECT_TRUE(VerifyCallback.Called);
-}
-
-TEST(Matcher, matchOverEntireASTContext) {
-  std::unique_ptr<ASTUnit> AST =
-      clang::tooling::buildASTFromCode("struct { int *foo; };");
-  ASSERT_TRUE(AST.get());
-  auto PT = selectFirst<PointerType>(
-      "x", match(pointerType().bind("x"), AST->getASTContext()));
-  EXPECT_NE(nullptr, PT);
-}
-
-TEST(DynTypedMatcherTest, TraversalKindForwardsToImpl) {
-  auto M = DynTypedMatcher(decl());
-  EXPECT_FALSE(M.getTraversalKind().hasValue());
-
-  M = DynTypedMatcher(traverse(TK_AsIs, decl()));
-  EXPECT_THAT(M.getTraversalKind(), llvm::ValueIs(TK_AsIs));
-}
-
-TEST(DynTypedMatcherTest, ConstructWithTraversalKindSetsTK) {
-  auto M = DynTypedMatcher(decl()).withTraversalKind(TK_AsIs);
-  EXPECT_THAT(M.getTraversalKind(), llvm::ValueIs(TK_AsIs));
-}
-
-TEST(DynTypedMatcherTest, ConstructWithTraversalKindOverridesNestedTK) {
-  auto M = DynTypedMatcher(decl()).withTraversalKind(TK_AsIs).withTraversalKind(
-      TK_IgnoreUnlessSpelledInSource);
-  EXPECT_THAT(M.getTraversalKind(),
-              llvm::ValueIs(TK_IgnoreUnlessSpelledInSource));
-}
-
-TEST(IsInlineMatcher, IsInline) {
-  EXPECT_TRUE(matches("void g(); inline void f();",
-                      functionDecl(isInline(), hasName("f"))));
-  EXPECT_TRUE(matches("namespace n { inline namespace m {} }",
-                      namespaceDecl(isInline(), hasName("m"))));
-}
-
-// FIXME: Figure out how to specify paths so the following tests pass on
-// Windows.
-#ifndef _WIN32
-
-TEST(Matcher, IsExpansionInMainFileMatcher) {
-  EXPECT_TRUE(matches("class X {};",
-                      recordDecl(hasName("X"), isExpansionInMainFile())));
-  EXPECT_TRUE(notMatches("", recordDecl(isExpansionInMainFile())));
-  FileContentMappings M;
-  M.push_back(std::make_pair("/other", "class X {};"));
-  EXPECT_TRUE(matchesConditionally("#include <other>\n",
-                                   recordDecl(isExpansionInMainFile()), false,
-                                   {"-isystem/"}, M));
-}
-
-TEST(Matcher, IsExpansionInSystemHeader) {
-  FileContentMappings M;
-  M.push_back(std::make_pair("/other", "class X {};"));
-  EXPECT_TRUE(matchesConditionally("#include \"other\"\n",
-                                   recordDecl(isExpansionInSystemHeader()),
-                                   true, {"-isystem/"}, M));
-  EXPECT_TRUE(matchesConditionally("#include \"other\"\n",
-                                   recordDecl(isExpansionInSystemHeader()),
-                                   false, {"-I/"}, M));
-  EXPECT_TRUE(notMatches("class X {};",
-                         recordDecl(isExpansionInSystemHeader())));
-  EXPECT_TRUE(notMatches("", recordDecl(isExpansionInSystemHeader())));
-}
-
-TEST(Matcher, IsExpansionInFileMatching) {
-  FileContentMappings M;
-  M.push_back(std::make_pair("/foo", "class A {};"));
-  M.push_back(std::make_pair("/bar", "class B {};"));
-  EXPECT_TRUE(matchesConditionally(
-      "#include <foo>\n"
-      "#include <bar>\n"
-      "class X {};",
-      recordDecl(isExpansionInFileMatching("b.*"), hasName("B")), true,
-      {"-isystem/"}, M));
-  EXPECT_TRUE(matchesConditionally(
-      "#include <foo>\n"
-      "#include <bar>\n"
-      "class X {};",
-      recordDecl(isExpansionInFileMatching("f.*"), hasName("X")), false,
-      {"-isystem/"}, M));
-}
-
-#endif // _WIN32
-
-} // end namespace ast_matchers
-} // end namespace clang
diff --git a/gnu/llvm/clang/unittests/ASTMatchers/ASTMatchersNarrowingTest.cpp b/gnu/llvm/clang/unittests/ASTMatchers/ASTMatchersNarrowingTest.cpp
deleted file mode 100644
index 877cc6185a4..00000000000
--- a/gnu/llvm/clang/unittests/ASTMatchers/ASTMatchersNarrowingTest.cpp
+++ /dev/null
@@ -1,4449 +0,0 @@
-// unittests/ASTMatchers/ASTMatchersNarrowingTest.cpp - AST matcher unit tests//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "ASTMatchersTest.h"
-#include "clang/AST/PrettyPrinter.h"
-#include "clang/ASTMatchers/ASTMatchFinder.h"
-#include "clang/ASTMatchers/ASTMatchers.h"
-#include "clang/Tooling/Tooling.h"
-#include "llvm/ADT/Triple.h"
-#include "llvm/Support/Host.h"
-#include "gtest/gtest.h"
-
-namespace clang {
-namespace ast_matchers {
-
-TEST_P(ASTMatchersTest, IsExpandedFromMacro_MatchesInFile) {
-  StringRef input = R"cc(
-#define MY_MACRO(a) (4 + (a))
-    void Test() { MY_MACRO(4); }
-  )cc";
-  EXPECT_TRUE(matches(input, binaryOperator(isExpandedFromMacro("MY_MACRO"))));
-}
-
-TEST_P(ASTMatchersTest, IsExpandedFromMacro_MatchesNested) {
-  StringRef input = R"cc(
-#define MY_MACRO(a) (4 + (a))
-#define WRAPPER(a) MY_MACRO(a)
-    void Test() { WRAPPER(4); }
-  )cc";
-  EXPECT_TRUE(matches(input, binaryOperator(isExpandedFromMacro("MY_MACRO"))));
-}
-
-TEST_P(ASTMatchersTest, IsExpandedFromMacro_MatchesIntermediate) {
-  StringRef input = R"cc(
-#define IMPL(a) (4 + (a))
-#define MY_MACRO(a) IMPL(a)
-#define WRAPPER(a) MY_MACRO(a)
-    void Test() { WRAPPER(4); }
-  )cc";
-  EXPECT_TRUE(matches(input, binaryOperator(isExpandedFromMacro("MY_MACRO"))));
-}
-
-TEST_P(ASTMatchersTest, IsExpandedFromMacro_MatchesTransitive) {
-  StringRef input = R"cc(
-#define MY_MACRO(a) (4 + (a))
-#define WRAPPER(a) MY_MACRO(a)
-    void Test() { WRAPPER(4); }
-  )cc";
-  EXPECT_TRUE(matches(input, binaryOperator(isExpandedFromMacro("WRAPPER"))));
-}
-
-TEST_P(ASTMatchersTest, IsExpandedFromMacro_MatchesArgument) {
-  StringRef input = R"cc(
-#define MY_MACRO(a) (4 + (a))
-    void Test() {
-      int x = 5;
-      MY_MACRO(x);
-    }
-  )cc";
-  EXPECT_TRUE(matches(input, declRefExpr(isExpandedFromMacro("MY_MACRO"))));
-}
-
-// Like IsExpandedFromMacro_MatchesArgument, but the argument is itself a
-// macro.
-TEST_P(ASTMatchersTest, IsExpandedFromMacro_MatchesArgumentMacroExpansion) {
-  StringRef input = R"cc(
-#define MY_MACRO(a) (4 + (a))
-#define IDENTITY(a) (a)
-    void Test() {
-      IDENTITY(MY_MACRO(2));
-    }
-  )cc";
-  EXPECT_TRUE(matches(input, binaryOperator(isExpandedFromMacro("IDENTITY"))));
-}
-
-TEST_P(ASTMatchersTest, IsExpandedFromMacro_MatchesWhenInArgument) {
-  StringRef input = R"cc(
-#define MY_MACRO(a) (4 + (a))
-#define IDENTITY(a) (a)
-    void Test() {
-      IDENTITY(MY_MACRO(2));
-    }
-  )cc";
-  EXPECT_TRUE(matches(input, binaryOperator(isExpandedFromMacro("MY_MACRO"))));
-}
-
-TEST_P(ASTMatchersTest, IsExpandedFromMacro_MatchesObjectMacro) {
-  StringRef input = R"cc(
-#define PLUS (2 + 2)
-    void Test() {
-      PLUS;
-    }
-  )cc";
-  EXPECT_TRUE(matches(input, binaryOperator(isExpandedFromMacro("PLUS"))));
-}
-
-TEST(IsExpandedFromMacro, MatchesFromCommandLine) {
-  StringRef input = R"cc(
-    void Test() { FOUR_PLUS_FOUR; }
-  )cc";
-  EXPECT_TRUE(matchesConditionally(
-      input, binaryOperator(isExpandedFromMacro("FOUR_PLUS_FOUR")), true,
-      {"-std=c++11", "-DFOUR_PLUS_FOUR=4+4"}));
-}
-
-TEST_P(ASTMatchersTest, IsExpandedFromMacro_NotMatchesBeginOnly) {
-  StringRef input = R"cc(
-#define ONE_PLUS 1+
-  void Test() { ONE_PLUS 4; }
-  )cc";
-  EXPECT_TRUE(
-      notMatches(input, binaryOperator(isExpandedFromMacro("ONE_PLUS"))));
-}
-
-TEST_P(ASTMatchersTest, IsExpandedFromMacro_NotMatchesEndOnly) {
-  StringRef input = R"cc(
-#define PLUS_ONE +1
-  void Test() { 4 PLUS_ONE; }
-  )cc";
-  EXPECT_TRUE(
-      notMatches(input, binaryOperator(isExpandedFromMacro("PLUS_ONE"))));
-}
-
-TEST_P(ASTMatchersTest, IsExpandedFromMacro_NotMatchesDifferentMacro) {
-  StringRef input = R"cc(
-#define MY_MACRO(a) (4 + (a))
-    void Test() { MY_MACRO(4); }
-  )cc";
-  EXPECT_TRUE(notMatches(input, binaryOperator(isExpandedFromMacro("OTHER"))));
-}
-
-TEST_P(ASTMatchersTest, IsExpandedFromMacro_NotMatchesDifferentInstances) {
-  StringRef input = R"cc(
-#define FOUR 4
-    void Test() { FOUR + FOUR; }
-  )cc";
-  EXPECT_TRUE(notMatches(input, binaryOperator(isExpandedFromMacro("FOUR"))));
-}
-
-TEST(IsExpandedFromMacro, IsExpandedFromMacro_MatchesDecls) {
-  StringRef input = R"cc(
-#define MY_MACRO(a) int i = a;
-    void Test() { MY_MACRO(4); }
-  )cc";
-  EXPECT_TRUE(matches(input, varDecl(isExpandedFromMacro("MY_MACRO"))));
-}
-
-TEST(IsExpandedFromMacro, IsExpandedFromMacro_MatchesTypelocs) {
-  StringRef input = R"cc(
-#define MY_TYPE int
-    void Test() { MY_TYPE i = 4; }
-  )cc";
-  EXPECT_TRUE(matches(input, typeLoc(isExpandedFromMacro("MY_TYPE"))));
-}
-
-TEST_P(ASTMatchersTest, AllOf) {
-  const char Program[] = "struct T { };"
-                         "int f(int, struct T*, int, int);"
-                         "void g(int x) { struct T t; f(x, &t, 3, 4); }";
-  EXPECT_TRUE(matches(
-      Program, callExpr(allOf(callee(functionDecl(hasName("f"))),
-                              hasArgument(0, declRefExpr(to(varDecl())))))));
-  EXPECT_TRUE(matches(
-      Program,
-      callExpr(
-          allOf(callee(functionDecl(hasName("f"))),
-                hasArgument(0, declRefExpr(to(varDecl()))),
-                hasArgument(1, hasType(pointsTo(recordDecl(hasName("T")))))))));
-  EXPECT_TRUE(matches(
-      Program, callExpr(allOf(
-                   callee(functionDecl(hasName("f"))),
-                   hasArgument(0, declRefExpr(to(varDecl()))),
-                   hasArgument(1, hasType(pointsTo(recordDecl(hasName("T"))))),
-                   hasArgument(2, integerLiteral(equals(3)))))));
-  EXPECT_TRUE(matches(
-      Program, callExpr(allOf(
-                   callee(functionDecl(hasName("f"))),
-                   hasArgument(0, declRefExpr(to(varDecl()))),
-                   hasArgument(1, hasType(pointsTo(recordDecl(hasName("T"))))),
-                   hasArgument(2, integerLiteral(equals(3))),
-                   hasArgument(3, integerLiteral(equals(4)))))));
-}
-
-TEST_P(ASTMatchersTest, Has) {
-  if (!GetParam().isCXX()) {
-    // FIXME: Add a test for `has()` that does not depend on C++.
-    return;
-  }
-
-  DeclarationMatcher HasClassX = recordDecl(has(recordDecl(hasName("X"))));
-  EXPECT_TRUE(matches("class Y { class X {}; };", HasClassX));
-  EXPECT_TRUE(matches("class X {};", HasClassX));
-
-  DeclarationMatcher YHasClassX =
-      recordDecl(hasName("Y"), has(recordDecl(hasName("X"))));
-  EXPECT_TRUE(matches("class Y { class X {}; };", YHasClassX));
-  EXPECT_TRUE(notMatches("class X {};", YHasClassX));
-  EXPECT_TRUE(notMatches("class Y { class Z { class X {}; }; };", YHasClassX));
-}
-
-TEST_P(ASTMatchersTest, Has_RecursiveAllOf) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  DeclarationMatcher Recursive =
-      recordDecl(has(recordDecl(has(recordDecl(hasName("X"))),
-                                has(recordDecl(hasName("Y"))), hasName("Z"))),
-                 has(recordDecl(has(recordDecl(hasName("A"))),
-                                has(recordDecl(hasName("B"))), hasName("C"))),
-                 hasName("F"));
-
-  EXPECT_TRUE(matches("class F {"
-                      "  class Z {"
-                      "    class X {};"
-                      "    class Y {};"
-                      "  };"
-                      "  class C {"
-                      "    class A {};"
-                      "    class B {};"
-                      "  };"
-                      "};",
-                      Recursive));
-
-  EXPECT_TRUE(matches("class F {"
-                      "  class Z {"
-                      "    class A {};"
-                      "    class X {};"
-                      "    class Y {};"
-                      "  };"
-                      "  class C {"
-                      "    class X {};"
-                      "    class A {};"
-                      "    class B {};"
-                      "  };"
-                      "};",
-                      Recursive));
-
-  EXPECT_TRUE(matches("class O1 {"
-                      "  class O2 {"
-                      "    class F {"
-                      "      class Z {"
-                      "        class A {};"
-                      "        class X {};"
-                      "        class Y {};"
-                      "      };"
-                      "      class C {"
-                      "        class X {};"
-                      "        class A {};"
-                      "        class B {};"
-                      "      };"
-                      "    };"
-                      "  };"
-                      "};",
-                      Recursive));
-}
-
-TEST_P(ASTMatchersTest, Has_RecursiveAnyOf) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  DeclarationMatcher Recursive = recordDecl(
-      anyOf(has(recordDecl(anyOf(has(recordDecl(hasName("X"))),
-                                 has(recordDecl(hasName("Y"))), hasName("Z")))),
-            has(recordDecl(anyOf(hasName("C"), has(recordDecl(hasName("A"))),
-                                 has(recordDecl(hasName("B")))))),
-            hasName("F")));
-
-  EXPECT_TRUE(matches("class F {};", Recursive));
-  EXPECT_TRUE(matches("class Z {};", Recursive));
-  EXPECT_TRUE(matches("class C {};", Recursive));
-  EXPECT_TRUE(matches("class M { class N { class X {}; }; };", Recursive));
-  EXPECT_TRUE(matches("class M { class N { class B {}; }; };", Recursive));
-  EXPECT_TRUE(matches("class O1 { class O2 {"
-                      "  class M { class N { class B {}; }; }; "
-                      "}; };",
-                      Recursive));
-}
-
-TEST_P(ASTMatchersTest, Unless) {
-  if (!GetParam().isCXX()) {
-    // FIXME: Add a test for `unless()` that does not depend on C++.
-    return;
-  }
-
-  DeclarationMatcher NotClassX =
-      cxxRecordDecl(isDerivedFrom("Y"), unless(hasName("X")));
-  EXPECT_TRUE(notMatches("", NotClassX));
-  EXPECT_TRUE(notMatches("class Y {};", NotClassX));
-  EXPECT_TRUE(matches("class Y {}; class Z : public Y {};", NotClassX));
-  EXPECT_TRUE(notMatches("class Y {}; class X : public Y {};", NotClassX));
-  EXPECT_TRUE(
-      notMatches("class Y {}; class Z {}; class X : public Y {};", NotClassX));
-
-  DeclarationMatcher ClassXHasNotClassY =
-      recordDecl(hasName("X"), has(recordDecl(hasName("Z"))),
-                 unless(has(recordDecl(hasName("Y")))));
-  EXPECT_TRUE(matches("class X { class Z {}; };", ClassXHasNotClassY));
-  EXPECT_TRUE(
-      notMatches("class X { class Y {}; class Z {}; };", ClassXHasNotClassY));
-
-  DeclarationMatcher NamedNotRecord =
-      namedDecl(hasName("Foo"), unless(recordDecl()));
-  EXPECT_TRUE(matches("void Foo(){}", NamedNotRecord));
-  EXPECT_TRUE(notMatches("struct Foo {};", NamedNotRecord));
-}
-
-TEST_P(ASTMatchersTest, HasCastKind) {
-  EXPECT_TRUE(
-      matches("char *p = 0;",
-              traverse(TK_AsIs,
-                       varDecl(has(castExpr(hasCastKind(CK_NullToPointer)))))));
-  EXPECT_TRUE(notMatches(
-      "char *p = 0;",
-      traverse(TK_AsIs,
-               varDecl(has(castExpr(hasCastKind(CK_DerivedToBase)))))));
-  EXPECT_TRUE(matches("char *p = 0;",
-                      traverse(TK_AsIs, varDecl(has(implicitCastExpr(
-                                            hasCastKind(CK_NullToPointer)))))));
-}
-
-TEST_P(ASTMatchersTest, HasDescendant) {
-  if (!GetParam().isCXX()) {
-    // FIXME: Add a test for `hasDescendant()` that does not depend on C++.
-    return;
-  }
-
-  DeclarationMatcher ZDescendantClassX =
-      recordDecl(hasDescendant(recordDecl(hasName("X"))), hasName("Z"));
-  EXPECT_TRUE(matches("class Z { class X {}; };", ZDescendantClassX));
-  EXPECT_TRUE(
-      matches("class Z { class Y { class X {}; }; };", ZDescendantClassX));
-  EXPECT_TRUE(matches("class Z { class A { class Y { class X {}; }; }; };",
-                      ZDescendantClassX));
-  EXPECT_TRUE(
-      matches("class Z { class A { class B { class Y { class X {}; }; }; }; };",
-              ZDescendantClassX));
-  EXPECT_TRUE(notMatches("class Z {};", ZDescendantClassX));
-
-  DeclarationMatcher ZDescendantClassXHasClassY = recordDecl(
-      hasDescendant(recordDecl(has(recordDecl(hasName("Y"))), hasName("X"))),
-      hasName("Z"));
-  EXPECT_TRUE(matches("class Z { class X { class Y {}; }; };",
-                      ZDescendantClassXHasClassY));
-  EXPECT_TRUE(
-      matches("class Z { class A { class B { class X { class Y {}; }; }; }; };",
-              ZDescendantClassXHasClassY));
-  EXPECT_TRUE(notMatches("class Z {"
-                         "  class A {"
-                         "    class B {"
-                         "      class X {"
-                         "        class C {"
-                         "          class Y {};"
-                         "        };"
-                         "      };"
-                         "    }; "
-                         "  };"
-                         "};",
-                         ZDescendantClassXHasClassY));
-
-  DeclarationMatcher ZDescendantClassXDescendantClassY =
-      recordDecl(hasDescendant(recordDecl(
-                     hasDescendant(recordDecl(hasName("Y"))), hasName("X"))),
-                 hasName("Z"));
-  EXPECT_TRUE(
-      matches("class Z { class A { class X { class B { class Y {}; }; }; }; };",
-              ZDescendantClassXDescendantClassY));
-  EXPECT_TRUE(matches("class Z {"
-                      "  class A {"
-                      "    class X {"
-                      "      class B {"
-                      "        class Y {};"
-                      "      };"
-                      "      class Y {};"
-                      "    };"
-                      "  };"
-                      "};",
-                      ZDescendantClassXDescendantClassY));
-}
-
-TEST_P(ASTMatchersTest, HasDescendant_Memoization) {
-  DeclarationMatcher CannotMemoize =
-      decl(hasDescendant(typeLoc().bind("x")), has(decl()));
-  EXPECT_TRUE(matches("void f() { int i; }", CannotMemoize));
-}
-
-TEST_P(ASTMatchersTest, HasDescendant_MemoizationUsesRestrictKind) {
-  auto Name = hasName("i");
-  auto VD = internal::Matcher<VarDecl>(Name).dynCastTo<Decl>();
-  auto RD = internal::Matcher<RecordDecl>(Name).dynCastTo<Decl>();
-  // Matching VD first should not make a cache hit for RD.
-  EXPECT_TRUE(notMatches("void f() { int i; }",
-                         decl(hasDescendant(VD), hasDescendant(RD))));
-  EXPECT_TRUE(notMatches("void f() { int i; }",
-                         decl(hasDescendant(RD), hasDescendant(VD))));
-  // Not matching RD first should not make a cache hit for VD either.
-  EXPECT_TRUE(matches("void f() { int i; }",
-                      decl(anyOf(hasDescendant(RD), hasDescendant(VD)))));
-}
-
-TEST_P(ASTMatchersTest, HasAncestor_Memoization) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  // This triggers an hasAncestor with a TemplateArgument in the bound nodes.
-  // That node can't be memoized so we have to check for it before trying to put
-  // it on the cache.
-  DeclarationMatcher CannotMemoize = classTemplateSpecializationDecl(
-      hasAnyTemplateArgument(templateArgument().bind("targ")),
-      forEach(fieldDecl(hasAncestor(forStmt()))));
-
-  EXPECT_TRUE(notMatches("template <typename T> struct S;"
-                         "template <> struct S<int>{ int i; int j; };",
-                         CannotMemoize));
-}
-
-TEST_P(ASTMatchersTest, HasAttr) {
-  EXPECT_TRUE(matches("struct __attribute__((warn_unused)) X {};",
-                      decl(hasAttr(clang::attr::WarnUnused))));
-  EXPECT_FALSE(matches("struct X {};", decl(hasAttr(clang::attr::WarnUnused))));
-}
-
-TEST_P(ASTMatchersTest, AnyOf) {
-  if (!GetParam().isCXX()) {
-    // FIXME: Add a test for `anyOf()` that does not depend on C++.
-    return;
-  }
-
-  DeclarationMatcher YOrZDerivedFromX = cxxRecordDecl(
-      anyOf(hasName("Y"), allOf(isDerivedFrom("X"), hasName("Z"))));
-  EXPECT_TRUE(matches("class X {}; class Z : public X {};", YOrZDerivedFromX));
-  EXPECT_TRUE(matches("class Y {};", YOrZDerivedFromX));
-  EXPECT_TRUE(
-      notMatches("class X {}; class W : public X {};", YOrZDerivedFromX));
-  EXPECT_TRUE(notMatches("class Z {};", YOrZDerivedFromX));
-
-  DeclarationMatcher XOrYOrZOrU =
-      recordDecl(anyOf(hasName("X"), hasName("Y"), hasName("Z"), hasName("U")));
-  EXPECT_TRUE(matches("class X {};", XOrYOrZOrU));
-  EXPECT_TRUE(notMatches("class V {};", XOrYOrZOrU));
-
-  DeclarationMatcher XOrYOrZOrUOrV = recordDecl(anyOf(
-      hasName("X"), hasName("Y"), hasName("Z"), hasName("U"), hasName("V")));
-  EXPECT_TRUE(matches("class X {};", XOrYOrZOrUOrV));
-  EXPECT_TRUE(matches("class Y {};", XOrYOrZOrUOrV));
-  EXPECT_TRUE(matches("class Z {};", XOrYOrZOrUOrV));
-  EXPECT_TRUE(matches("class U {};", XOrYOrZOrUOrV));
-  EXPECT_TRUE(matches("class V {};", XOrYOrZOrUOrV));
-  EXPECT_TRUE(notMatches("class A {};", XOrYOrZOrUOrV));
-
-  StatementMatcher MixedTypes = stmt(anyOf(ifStmt(), binaryOperator()));
-  EXPECT_TRUE(matches("int F() { return 1 + 2; }", MixedTypes));
-  EXPECT_TRUE(matches("int F() { if (true) return 1; }", MixedTypes));
-  EXPECT_TRUE(notMatches("int F() { return 1; }", MixedTypes));
-
-  EXPECT_TRUE(
-      matches("void f() try { } catch (int) { } catch (...) { }",
-              cxxCatchStmt(anyOf(hasDescendant(varDecl()), isCatchAll()))));
-}
-
-TEST_P(ASTMatchersTest, MapAnyOf) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  if (GetParam().hasDelayedTemplateParsing()) {
-    return;
-  }
-
-  StringRef Code = R"cpp(
-void F() {
-  if (true) {}
-  for ( ; false; ) {}
-}
-)cpp";
-
-  auto trueExpr = cxxBoolLiteral(equals(true));
-  auto falseExpr = cxxBoolLiteral(equals(false));
-
-  EXPECT_TRUE(matches(
-      Code, traverse(TK_IgnoreUnlessSpelledInSource,
-                     mapAnyOf(ifStmt, forStmt).with(hasCondition(trueExpr)))));
-  EXPECT_TRUE(matches(
-      Code, traverse(TK_IgnoreUnlessSpelledInSource,
-                     mapAnyOf(ifStmt, forStmt).with(hasCondition(falseExpr)))));
-
-  EXPECT_TRUE(
-      matches(Code, cxxBoolLiteral(equals(true),
-                                   hasAncestor(mapAnyOf(ifStmt, forStmt)))));
-
-  EXPECT_TRUE(
-      matches(Code, cxxBoolLiteral(equals(false),
-                                   hasAncestor(mapAnyOf(ifStmt, forStmt)))));
-
-  EXPECT_TRUE(
-      notMatches(Code, floatLiteral(hasAncestor(mapAnyOf(ifStmt, forStmt)))));
-
-  Code = R"cpp(
-void func(bool b) {}
-struct S {
-  S(bool b) {}
-};
-void F() {
-  func(false);
-  S s(true);
-}
-)cpp";
-  EXPECT_TRUE(matches(Code, traverse(TK_IgnoreUnlessSpelledInSource,
-                                     mapAnyOf(callExpr, cxxConstructExpr)
-                                         .with(hasArgument(0, trueExpr)))));
-  EXPECT_TRUE(matches(Code, traverse(TK_IgnoreUnlessSpelledInSource,
-                                     mapAnyOf(callExpr, cxxConstructExpr)
-                                         .with(hasArgument(0, falseExpr)))));
-
-  EXPECT_TRUE(
-      matches(Code, traverse(TK_IgnoreUnlessSpelledInSource,
-                             mapAnyOf(callExpr, cxxConstructExpr)
-                                 .with(hasArgument(0, expr()),
-                                       hasDeclaration(functionDecl())))));
-
-  EXPECT_TRUE(matches(Code, traverse(TK_IgnoreUnlessSpelledInSource,
-                                     mapAnyOf(callExpr, cxxConstructExpr))));
-
-  EXPECT_TRUE(matches(
-      Code, traverse(TK_IgnoreUnlessSpelledInSource,
-                     mapAnyOf(callExpr, cxxConstructExpr).bind("call"))));
-
-  Code = R"cpp(
-struct HasOpNeqMem
-{
-    bool operator!=(const HasOpNeqMem& other) const
-    {
-        return true;
-    }
-};
-struct HasOpFree
-{
-};
-bool operator!=(const HasOpFree& lhs, const HasOpFree& rhs)
-{
-    return true;
-}
-
-void binop()
-{
-    int s1;
-    int s2;
-    if (s1 != s2)
-        return;
-}
-
-void opMem()
-{
-    HasOpNeqMem s1;
-    HasOpNeqMem s2;
-    if (s1 != s2)
-        return;
-}
-
-void opFree()
-{
-    HasOpFree s1;
-    HasOpFree s2;
-    if (s1 != s2)
-        return;
-}
-
-template<typename T>
-void templ()
-{
-    T s1;
-    T s2;
-    if (s1 != s2)
-        return;
-}
-)cpp";
-
-  EXPECT_TRUE(matches(
-      Code,
-      traverse(TK_IgnoreUnlessSpelledInSource,
-               mapAnyOf(binaryOperator, cxxOperatorCallExpr)
-                   .with(hasOperatorName("!="),
-                         forFunction(functionDecl(hasName("binop"))),
-                         hasLHS(declRefExpr(to(varDecl(hasName("s1"))))),
-                         hasRHS(declRefExpr(to(varDecl(hasName("s2")))))))));
-
-  EXPECT_TRUE(matches(
-      Code,
-      traverse(TK_IgnoreUnlessSpelledInSource,
-               mapAnyOf(binaryOperator, cxxOperatorCallExpr)
-                   .with(hasOperatorName("!="),
-                         forFunction(functionDecl(hasName("opMem"))),
-                         hasLHS(declRefExpr(to(varDecl(hasName("s1"))))),
-                         hasRHS(declRefExpr(to(varDecl(hasName("s2")))))))));
-
-  EXPECT_TRUE(matches(
-      Code,
-      traverse(TK_IgnoreUnlessSpelledInSource,
-               mapAnyOf(binaryOperator, cxxOperatorCallExpr)
-                   .with(hasOperatorName("!="),
-                         forFunction(functionDecl(hasName("opFree"))),
-                         hasLHS(declRefExpr(to(varDecl(hasName("s1"))))),
-                         hasRHS(declRefExpr(to(varDecl(hasName("s2")))))))));
-
-  EXPECT_TRUE(matches(
-      Code, traverse(TK_IgnoreUnlessSpelledInSource,
-                     mapAnyOf(binaryOperator, cxxOperatorCallExpr)
-                         .with(hasOperatorName("!="),
-                               forFunction(functionDecl(hasName("binop"))),
-                               hasEitherOperand(
-                                   declRefExpr(to(varDecl(hasName("s1"))))),
-                               hasEitherOperand(
-                                   declRefExpr(to(varDecl(hasName("s2")))))))));
-
-  EXPECT_TRUE(matches(
-      Code, traverse(TK_IgnoreUnlessSpelledInSource,
-                     mapAnyOf(binaryOperator, cxxOperatorCallExpr)
-                         .with(hasOperatorName("!="),
-                               forFunction(functionDecl(hasName("opMem"))),
-                               hasEitherOperand(
-                                   declRefExpr(to(varDecl(hasName("s1"))))),
-                               hasEitherOperand(
-                                   declRefExpr(to(varDecl(hasName("s2")))))))));
-
-  EXPECT_TRUE(matches(
-      Code, traverse(TK_IgnoreUnlessSpelledInSource,
-                     mapAnyOf(binaryOperator, cxxOperatorCallExpr)
-                         .with(hasOperatorName("!="),
-                               forFunction(functionDecl(hasName("opFree"))),
-                               hasEitherOperand(
-                                   declRefExpr(to(varDecl(hasName("s1"))))),
-                               hasEitherOperand(
-                                   declRefExpr(to(varDecl(hasName("s2")))))))));
-
-  EXPECT_TRUE(matches(
-      Code,
-      traverse(
-          TK_IgnoreUnlessSpelledInSource,
-          mapAnyOf(binaryOperator, cxxOperatorCallExpr)
-              .with(hasOperatorName("!="),
-                    forFunction(functionDecl(hasName("binop"))),
-                    hasOperands(declRefExpr(to(varDecl(hasName("s1")))),
-                                declRefExpr(to(varDecl(hasName("s2"))))),
-                    hasOperands(declRefExpr(to(varDecl(hasName("s2")))),
-                                declRefExpr(to(varDecl(hasName("s1")))))))));
-
-  EXPECT_TRUE(matches(
-      Code,
-      traverse(
-          TK_IgnoreUnlessSpelledInSource,
-          mapAnyOf(binaryOperator, cxxOperatorCallExpr)
-              .with(hasOperatorName("!="),
-                    forFunction(functionDecl(hasName("opMem"))),
-                    hasOperands(declRefExpr(to(varDecl(hasName("s1")))),
-                                declRefExpr(to(varDecl(hasName("s2"))))),
-                    hasOperands(declRefExpr(to(varDecl(hasName("s2")))),
-                                declRefExpr(to(varDecl(hasName("s1")))))))));
-
-  EXPECT_TRUE(matches(
-      Code,
-      traverse(
-          TK_IgnoreUnlessSpelledInSource,
-          mapAnyOf(binaryOperator, cxxOperatorCallExpr)
-              .with(hasOperatorName("!="),
-                    forFunction(functionDecl(hasName("opFree"))),
-                    hasOperands(declRefExpr(to(varDecl(hasName("s1")))),
-                                declRefExpr(to(varDecl(hasName("s2"))))),
-                    hasOperands(declRefExpr(to(varDecl(hasName("s2")))),
-                                declRefExpr(to(varDecl(hasName("s1")))))))));
-
-  EXPECT_TRUE(matches(
-      Code, traverse(TK_IgnoreUnlessSpelledInSource,
-                     mapAnyOf(binaryOperator, cxxOperatorCallExpr)
-                         .with(hasAnyOperatorName("==", "!="),
-                               forFunction(functionDecl(hasName("binop")))))));
-
-  EXPECT_TRUE(matches(
-      Code, traverse(TK_IgnoreUnlessSpelledInSource,
-                     mapAnyOf(binaryOperator, cxxOperatorCallExpr)
-                         .with(hasAnyOperatorName("==", "!="),
-                               forFunction(functionDecl(hasName("opMem")))))));
-
-  EXPECT_TRUE(matches(
-      Code, traverse(TK_IgnoreUnlessSpelledInSource,
-                     mapAnyOf(binaryOperator, cxxOperatorCallExpr)
-                         .with(hasAnyOperatorName("==", "!="),
-                               forFunction(functionDecl(hasName("opFree")))))));
-
-  EXPECT_TRUE(matches(
-      Code, traverse(TK_IgnoreUnlessSpelledInSource,
-                     binaryOperation(
-                         hasOperatorName("!="),
-                         forFunction(functionDecl(hasName("binop"))),
-                         hasLHS(declRefExpr(to(varDecl(hasName("s1"))))),
-                         hasRHS(declRefExpr(to(varDecl(hasName("s2")))))))));
-
-  EXPECT_TRUE(matches(
-      Code, traverse(TK_IgnoreUnlessSpelledInSource,
-                     binaryOperation(
-                         hasOperatorName("!="),
-                         forFunction(functionDecl(hasName("opMem"))),
-                         hasLHS(declRefExpr(to(varDecl(hasName("s1"))))),
-                         hasRHS(declRefExpr(to(varDecl(hasName("s2")))))))));
-
-  EXPECT_TRUE(matches(
-      Code, traverse(TK_IgnoreUnlessSpelledInSource,
-                     binaryOperation(
-                         hasOperatorName("!="),
-                         forFunction(functionDecl(hasName("opFree"))),
-                         hasLHS(declRefExpr(to(varDecl(hasName("s1"))))),
-                         hasRHS(declRefExpr(to(varDecl(hasName("s2")))))))));
-
-  EXPECT_TRUE(matches(
-      Code, traverse(TK_IgnoreUnlessSpelledInSource,
-                     binaryOperation(
-                         hasOperatorName("!="),
-                         forFunction(functionDecl(hasName("templ"))),
-                         hasLHS(declRefExpr(to(varDecl(hasName("s1"))))),
-                         hasRHS(declRefExpr(to(varDecl(hasName("s2")))))))));
-
-  Code = R"cpp(
-struct HasOpEq
-{
-    bool operator==(const HasOpEq &) const;
-};
-
-void inverse()
-{
-    HasOpEq s1;
-    HasOpEq s2;
-    if (s1 != s2)
-        return;
-}
-
-namespace std {
-struct strong_ordering {
-  int n;
-  constexpr operator int() const { return n; }
-  static const strong_ordering equal, greater, less;
-};
-constexpr strong_ordering strong_ordering::equal = {0};
-constexpr strong_ordering strong_ordering::greater = {1};
-constexpr strong_ordering strong_ordering::less = {-1};
-}
-
-struct HasSpaceshipMem {
-  int a;
-  constexpr auto operator<=>(const HasSpaceshipMem&) const = default;
-};
-
-void rewritten()
-{
-    HasSpaceshipMem s1;
-    HasSpaceshipMem s2;
-    if (s1 != s2)
-        return;
-}
-)cpp";
-
-  EXPECT_TRUE(matchesConditionally(
-      Code,
-      traverse(
-          TK_IgnoreUnlessSpelledInSource,
-          binaryOperation(hasOperatorName("!="),
-                          forFunction(functionDecl(hasName("inverse"))),
-                          hasLHS(declRefExpr(to(varDecl(hasName("s1"))))),
-                          hasRHS(declRefExpr(to(varDecl(hasName("s2"))))))),
-      true, {"-std=c++20"}));
-
-  EXPECT_TRUE(matchesConditionally(
-      Code,
-      traverse(
-          TK_IgnoreUnlessSpelledInSource,
-          binaryOperation(hasOperatorName("!="),
-                          forFunction(functionDecl(hasName("rewritten"))),
-                          hasLHS(declRefExpr(to(varDecl(hasName("s1"))))),
-                          hasRHS(declRefExpr(to(varDecl(hasName("s2"))))))),
-      true, {"-std=c++20"}));
-
-  Code = R"cpp(
-struct HasOpBangMem
-{
-    bool operator!() const
-    {
-        return false;
-    }
-};
-struct HasOpBangFree
-{
-};
-bool operator!(HasOpBangFree const&)
-{
-    return false;
-}
-
-void unop()
-{
-    int s1;
-    if (!s1)
-        return;
-}
-
-void opMem()
-{
-    HasOpBangMem s1;
-    if (!s1)
-        return;
-}
-
-void opFree()
-{
-    HasOpBangFree s1;
-    if (!s1)
-        return;
-}
-)cpp";
-
-  EXPECT_TRUE(matches(
-      Code, traverse(TK_IgnoreUnlessSpelledInSource,
-                     mapAnyOf(unaryOperator, cxxOperatorCallExpr)
-                         .with(hasOperatorName("!"),
-                               forFunction(functionDecl(hasName("unop"))),
-                               hasUnaryOperand(
-                                   declRefExpr(to(varDecl(hasName("s1")))))))));
-
-  EXPECT_TRUE(matches(
-      Code, traverse(TK_IgnoreUnlessSpelledInSource,
-                     mapAnyOf(unaryOperator, cxxOperatorCallExpr)
-                         .with(hasOperatorName("!"),
-                               forFunction(functionDecl(hasName("opMem"))),
-                               hasUnaryOperand(
-                                   declRefExpr(to(varDecl(hasName("s1")))))))));
-
-  EXPECT_TRUE(matches(
-      Code, traverse(TK_IgnoreUnlessSpelledInSource,
-                     mapAnyOf(unaryOperator, cxxOperatorCallExpr)
-                         .with(hasOperatorName("!"),
-                               forFunction(functionDecl(hasName("opFree"))),
-                               hasUnaryOperand(
-                                   declRefExpr(to(varDecl(hasName("s1")))))))));
-
-  EXPECT_TRUE(matches(
-      Code, traverse(TK_IgnoreUnlessSpelledInSource,
-                     mapAnyOf(unaryOperator, cxxOperatorCallExpr)
-                         .with(hasAnyOperatorName("+", "!"),
-                               forFunction(functionDecl(hasName("unop")))))));
-
-  EXPECT_TRUE(matches(
-      Code, traverse(TK_IgnoreUnlessSpelledInSource,
-                     mapAnyOf(unaryOperator, cxxOperatorCallExpr)
-                         .with(hasAnyOperatorName("+", "!"),
-                               forFunction(functionDecl(hasName("opMem")))))));
-
-  EXPECT_TRUE(matches(
-      Code, traverse(TK_IgnoreUnlessSpelledInSource,
-                     mapAnyOf(unaryOperator, cxxOperatorCallExpr)
-                         .with(hasAnyOperatorName("+", "!"),
-                               forFunction(functionDecl(hasName("opFree")))))));
-
-  Code = R"cpp(
-struct ConstructorTakesInt
-{
-  ConstructorTakesInt(int i) {}
-};
-
-void callTakesInt(int i)
-{
-
-}
-
-void doCall()
-{
-  callTakesInt(42);
-}
-
-void doConstruct()
-{
-  ConstructorTakesInt cti(42);
-}
-)cpp";
-
-  EXPECT_TRUE(matches(
-      Code, traverse(TK_IgnoreUnlessSpelledInSource,
-                     invocation(forFunction(functionDecl(hasName("doCall"))),
-                                hasArgument(0, integerLiteral(equals(42))),
-                                hasAnyArgument(integerLiteral(equals(42))),
-                                forEachArgumentWithParam(
-                                    integerLiteral(equals(42)),
-                                    parmVarDecl(hasName("i")))))));
-
-  EXPECT_TRUE(matches(
-      Code,
-      traverse(
-          TK_IgnoreUnlessSpelledInSource,
-          invocation(forFunction(functionDecl(hasName("doConstruct"))),
-                     hasArgument(0, integerLiteral(equals(42))),
-                     hasAnyArgument(integerLiteral(equals(42))),
-                     forEachArgumentWithParam(integerLiteral(equals(42)),
-                                              parmVarDecl(hasName("i")))))));
-}
-
-TEST_P(ASTMatchersTest, IsDerivedFrom) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  DeclarationMatcher IsDerivedFromX = cxxRecordDecl(isDerivedFrom("X"));
-
-  EXPECT_TRUE(matches("class X {}; class Y : public X {};", IsDerivedFromX));
-  EXPECT_TRUE(notMatches("class X {};", IsDerivedFromX));
-  EXPECT_TRUE(notMatches("class X;", IsDerivedFromX));
-  EXPECT_TRUE(notMatches("class Y;", IsDerivedFromX));
-  EXPECT_TRUE(notMatches("", IsDerivedFromX));
-  EXPECT_TRUE(matches("class X {}; template<int N> class Y : Y<N-1>, X {};",
-                      IsDerivedFromX));
-  EXPECT_TRUE(matches("class X {}; template<int N> class Y : X, Y<N-1> {};",
-                      IsDerivedFromX));
-
-  DeclarationMatcher IsZDerivedFromX =
-      cxxRecordDecl(hasName("Z"), isDerivedFrom("X"));
-  EXPECT_TRUE(matches("class X {};"
-                      "template<int N> class Y : Y<N-1> {};"
-                      "template<> class Y<0> : X {};"
-                      "class Z : Y<1> {};",
-                      IsZDerivedFromX));
-
-  DeclarationMatcher IsDirectlyDerivedFromX =
-      cxxRecordDecl(isDirectlyDerivedFrom("X"));
-
-  EXPECT_TRUE(
-      matches("class X {}; class Y : public X {};", IsDirectlyDerivedFromX));
-  EXPECT_TRUE(notMatches("class X {};", IsDirectlyDerivedFromX));
-  EXPECT_TRUE(notMatches("class X;", IsDirectlyDerivedFromX));
-  EXPECT_TRUE(notMatches("class Y;", IsDirectlyDerivedFromX));
-  EXPECT_TRUE(notMatches("", IsDirectlyDerivedFromX));
-
-  DeclarationMatcher IsAX = cxxRecordDecl(isSameOrDerivedFrom("X"));
-
-  EXPECT_TRUE(matches("class X {}; class Y : public X {};", IsAX));
-  EXPECT_TRUE(matches("class X {};", IsAX));
-  EXPECT_TRUE(matches("class X;", IsAX));
-  EXPECT_TRUE(notMatches("class Y;", IsAX));
-  EXPECT_TRUE(notMatches("", IsAX));
-
-  DeclarationMatcher ZIsDerivedFromX =
-      cxxRecordDecl(hasName("Z"), isDerivedFrom("X"));
-  DeclarationMatcher ZIsDirectlyDerivedFromX =
-      cxxRecordDecl(hasName("Z"), isDirectlyDerivedFrom("X"));
-  EXPECT_TRUE(
-      matches("class X {}; class Y : public X {}; class Z : public Y {};",
-              ZIsDerivedFromX));
-  EXPECT_TRUE(
-      notMatches("class X {}; class Y : public X {}; class Z : public Y {};",
-                 ZIsDirectlyDerivedFromX));
-  EXPECT_TRUE(matches("class X {};"
-                      "template<class T> class Y : public X {};"
-                      "class Z : public Y<int> {};",
-                      ZIsDerivedFromX));
-  EXPECT_TRUE(notMatches("class X {};"
-                         "template<class T> class Y : public X {};"
-                         "class Z : public Y<int> {};",
-                         ZIsDirectlyDerivedFromX));
-  EXPECT_TRUE(matches("class X {}; template<class T> class Z : public X {};",
-                      ZIsDerivedFromX));
-  EXPECT_TRUE(matches("template<class T> class X {}; "
-                      "template<class T> class Z : public X<T> {};",
-                      ZIsDerivedFromX));
-  EXPECT_TRUE(matches("template<class T, class U=T> class X {}; "
-                      "template<class T> class Z : public X<T> {};",
-                      ZIsDerivedFromX));
-  EXPECT_TRUE(
-      notMatches("template<class X> class A { class Z : public X {}; };",
-                 ZIsDerivedFromX));
-  EXPECT_TRUE(
-      matches("template<class X> class A { public: class Z : public X {}; }; "
-              "class X{}; void y() { A<X>::Z z; }",
-              ZIsDerivedFromX));
-  EXPECT_TRUE(
-      matches("template <class T> class X {}; "
-              "template<class Y> class A { class Z : public X<Y> {}; };",
-              ZIsDerivedFromX));
-  EXPECT_TRUE(notMatches("template<template<class T> class X> class A { "
-                         "  class Z : public X<int> {}; };",
-                         ZIsDerivedFromX));
-  EXPECT_TRUE(matches("template<template<class T> class X> class A { "
-                      "  public: class Z : public X<int> {}; }; "
-                      "template<class T> class X {}; void y() { A<X>::Z z; }",
-                      ZIsDerivedFromX));
-  EXPECT_TRUE(
-      notMatches("template<class X> class A { class Z : public X::D {}; };",
-                 ZIsDerivedFromX));
-  EXPECT_TRUE(matches("template<class X> class A { public: "
-                      "  class Z : public X::D {}; }; "
-                      "class Y { public: class X {}; typedef X D; }; "
-                      "void y() { A<Y>::Z z; }",
-                      ZIsDerivedFromX));
-  EXPECT_TRUE(matches("class X {}; typedef X Y; class Z : public Y {};",
-                      ZIsDerivedFromX));
-  EXPECT_TRUE(matches("template<class T> class Y { typedef typename T::U X; "
-                      "  class Z : public X {}; };",
-                      ZIsDerivedFromX));
-  EXPECT_TRUE(matches("class X {}; class Z : public ::X {};", ZIsDerivedFromX));
-  EXPECT_TRUE(
-      notMatches("template<class T> class X {}; "
-                 "template<class T> class A { class Z : public X<T>::D {}; };",
-                 ZIsDerivedFromX));
-  EXPECT_TRUE(
-      matches("template<class T> class X { public: typedef X<T> D; }; "
-              "template<class T> class A { public: "
-              "  class Z : public X<T>::D {}; }; void y() { A<int>::Z z; }",
-              ZIsDerivedFromX));
-  EXPECT_TRUE(
-      notMatches("template<class X> class A { class Z : public X::D::E {}; };",
-                 ZIsDerivedFromX));
-  EXPECT_TRUE(
-      matches("class X {}; typedef X V; typedef V W; class Z : public W {};",
-              ZIsDerivedFromX));
-  EXPECT_TRUE(matches("class X {}; class Y : public X {}; "
-                      "typedef Y V; typedef V W; class Z : public W {};",
-                      ZIsDerivedFromX));
-  EXPECT_TRUE(notMatches("class X {}; class Y : public X {}; "
-                         "typedef Y V; typedef V W; class Z : public W {};",
-                         ZIsDirectlyDerivedFromX));
-  EXPECT_TRUE(
-      matches("template<class T, class U> class X {}; "
-              "template<class T> class A { class Z : public X<T, int> {}; };",
-              ZIsDerivedFromX));
-  EXPECT_TRUE(
-      notMatches("template<class X> class D { typedef X A; typedef A B; "
-                 "  typedef B C; class Z : public C {}; };",
-                 ZIsDerivedFromX));
-  EXPECT_TRUE(matches("class X {}; typedef X A; typedef A B; "
-                      "class Z : public B {};",
-                      ZIsDerivedFromX));
-  EXPECT_TRUE(matches("class X {}; typedef X A; typedef A B; typedef B C; "
-                      "class Z : public C {};",
-                      ZIsDerivedFromX));
-  EXPECT_TRUE(matches("class U {}; typedef U X; typedef X V; "
-                      "class Z : public V {};",
-                      ZIsDerivedFromX));
-  EXPECT_TRUE(matches("class Base {}; typedef Base X; "
-                      "class Z : public Base {};",
-                      ZIsDerivedFromX));
-  EXPECT_TRUE(matches("class Base {}; typedef Base Base2; typedef Base2 X; "
-                      "class Z : public Base {};",
-                      ZIsDerivedFromX));
-  EXPECT_TRUE(notMatches("class Base {}; class Base2 {}; typedef Base2 X; "
-                         "class Z : public Base {};",
-                         ZIsDerivedFromX));
-  EXPECT_TRUE(matches("class A {}; typedef A X; typedef A Y; "
-                      "class Z : public Y {};",
-                      ZIsDerivedFromX));
-  EXPECT_TRUE(notMatches("template <typename T> class Z;"
-                         "template <> class Z<void> {};"
-                         "template <typename T> class Z : public Z<void> {};",
-                         IsDerivedFromX));
-  EXPECT_TRUE(matches("template <typename T> class X;"
-                      "template <> class X<void> {};"
-                      "template <typename T> class X : public X<void> {};",
-                      IsDerivedFromX));
-  EXPECT_TRUE(
-      matches("class X {};"
-              "template <typename T> class Z;"
-              "template <> class Z<void> {};"
-              "template <typename T> class Z : public Z<void>, public X {};",
-              ZIsDerivedFromX));
-  EXPECT_TRUE(
-      notMatches("template<int> struct X;"
-                 "template<int i> struct X : public X<i-1> {};",
-                 cxxRecordDecl(isDerivedFrom(recordDecl(hasName("Some"))))));
-  EXPECT_TRUE(matches(
-      "struct A {};"
-      "template<int> struct X;"
-      "template<int i> struct X : public X<i-1> {};"
-      "template<> struct X<0> : public A {};"
-      "struct B : public X<42> {};",
-      cxxRecordDecl(hasName("B"), isDerivedFrom(recordDecl(hasName("A"))))));
-  EXPECT_TRUE(notMatches(
-      "struct A {};"
-      "template<int> struct X;"
-      "template<int i> struct X : public X<i-1> {};"
-      "template<> struct X<0> : public A {};"
-      "struct B : public X<42> {};",
-      cxxRecordDecl(hasName("B"),
-                    isDirectlyDerivedFrom(recordDecl(hasName("A"))))));
-
-  // FIXME: Once we have better matchers for template type matching,
-  // get rid of the Variable(...) matching and match the right template
-  // declarations directly.
-  const char *RecursiveTemplateOneParameter =
-      "class Base1 {}; class Base2 {};"
-      "template <typename T> class Z;"
-      "template <> class Z<void> : public Base1 {};"
-      "template <> class Z<int> : public Base2 {};"
-      "template <> class Z<float> : public Z<void> {};"
-      "template <> class Z<double> : public Z<int> {};"
-      "template <typename T> class Z : public Z<float>, public Z<double> {};"
-      "void f() { Z<float> z_float; Z<double> z_double; Z<char> z_char; }";
-  EXPECT_TRUE(matches(
-      RecursiveTemplateOneParameter,
-      varDecl(hasName("z_float"),
-              hasInitializer(hasType(cxxRecordDecl(isDerivedFrom("Base1")))))));
-  EXPECT_TRUE(notMatches(
-      RecursiveTemplateOneParameter,
-      varDecl(hasName("z_float"),
-              hasInitializer(hasType(cxxRecordDecl(isDerivedFrom("Base2")))))));
-  EXPECT_TRUE(
-      matches(RecursiveTemplateOneParameter,
-              varDecl(hasName("z_char"),
-                      hasInitializer(hasType(cxxRecordDecl(
-                          isDerivedFrom("Base1"), isDerivedFrom("Base2")))))));
-
-  const char *RecursiveTemplateTwoParameters =
-      "class Base1 {}; class Base2 {};"
-      "template <typename T1, typename T2> class Z;"
-      "template <typename T> class Z<void, T> : public Base1 {};"
-      "template <typename T> class Z<int, T> : public Base2 {};"
-      "template <typename T> class Z<float, T> : public Z<void, T> {};"
-      "template <typename T> class Z<double, T> : public Z<int, T> {};"
-      "template <typename T1, typename T2> class Z : "
-      "    public Z<float, T2>, public Z<double, T2> {};"
-      "void f() { Z<float, void> z_float; Z<double, void> z_double; "
-      "           Z<char, void> z_char; }";
-  EXPECT_TRUE(matches(
-      RecursiveTemplateTwoParameters,
-      varDecl(hasName("z_float"),
-              hasInitializer(hasType(cxxRecordDecl(isDerivedFrom("Base1")))))));
-  EXPECT_TRUE(notMatches(
-      RecursiveTemplateTwoParameters,
-      varDecl(hasName("z_float"),
-              hasInitializer(hasType(cxxRecordDecl(isDerivedFrom("Base2")))))));
-  EXPECT_TRUE(
-      matches(RecursiveTemplateTwoParameters,
-              varDecl(hasName("z_char"),
-                      hasInitializer(hasType(cxxRecordDecl(
-                          isDerivedFrom("Base1"), isDerivedFrom("Base2")))))));
-  EXPECT_TRUE(matches("namespace ns { class X {}; class Y : public X {}; }",
-                      cxxRecordDecl(isDerivedFrom("::ns::X"))));
-  EXPECT_TRUE(notMatches("class X {}; class Y : public X {};",
-                         cxxRecordDecl(isDerivedFrom("::ns::X"))));
-
-  EXPECT_TRUE(matches(
-      "class X {}; class Y : public X {};",
-      cxxRecordDecl(isDerivedFrom(recordDecl(hasName("X")).bind("test")))));
-
-  EXPECT_TRUE(matches("template<typename T> class X {};"
-                      "template<typename T> using Z = X<T>;"
-                      "template <typename T> class Y : Z<T> {};",
-                      cxxRecordDecl(isDerivedFrom(namedDecl(hasName("X"))))));
-}
-
-TEST_P(ASTMatchersTest, IsDerivedFrom_EmptyName) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  const char *const Code = "class X {}; class Y : public X {};";
-  EXPECT_TRUE(notMatches(Code, cxxRecordDecl(isDerivedFrom(""))));
-  EXPECT_TRUE(notMatches(Code, cxxRecordDecl(isDirectlyDerivedFrom(""))));
-  EXPECT_TRUE(notMatches(Code, cxxRecordDecl(isSameOrDerivedFrom(""))));
-}
-
-TEST_P(ASTMatchersTest, IsDerivedFrom_ObjC) {
-  DeclarationMatcher IsDerivedFromX = objcInterfaceDecl(isDerivedFrom("X"));
-  EXPECT_TRUE(
-      matchesObjC("@interface X @end @interface Y : X @end", IsDerivedFromX));
-  EXPECT_TRUE(matchesObjC(
-      "@interface X @end @interface Y<__covariant ObjectType> : X @end",
-      IsDerivedFromX));
-  EXPECT_TRUE(matchesObjC(
-      "@interface X @end @compatibility_alias Y X; @interface Z : Y @end",
-      IsDerivedFromX));
-  EXPECT_TRUE(matchesObjC(
-      "@interface X @end typedef X Y; @interface Z : Y @end", IsDerivedFromX));
-  EXPECT_TRUE(notMatchesObjC("@interface X @end", IsDerivedFromX));
-  EXPECT_TRUE(notMatchesObjC("@class X;", IsDerivedFromX));
-  EXPECT_TRUE(notMatchesObjC("@class Y;", IsDerivedFromX));
-  EXPECT_TRUE(notMatchesObjC("@interface X @end @compatibility_alias Y X;",
-                             IsDerivedFromX));
-  EXPECT_TRUE(notMatchesObjC("@interface X @end typedef X Y;", IsDerivedFromX));
-
-  DeclarationMatcher IsDirectlyDerivedFromX =
-      objcInterfaceDecl(isDirectlyDerivedFrom("X"));
-  EXPECT_TRUE(matchesObjC("@interface X @end @interface Y : X @end",
-                          IsDirectlyDerivedFromX));
-  EXPECT_TRUE(matchesObjC(
-      "@interface X @end @interface Y<__covariant ObjectType> : X @end",
-      IsDirectlyDerivedFromX));
-  EXPECT_TRUE(matchesObjC(
-      "@interface X @end @compatibility_alias Y X; @interface Z : Y @end",
-      IsDirectlyDerivedFromX));
-  EXPECT_TRUE(
-      matchesObjC("@interface X @end typedef X Y; @interface Z : Y @end",
-                  IsDirectlyDerivedFromX));
-  EXPECT_TRUE(notMatchesObjC("@interface X @end", IsDirectlyDerivedFromX));
-  EXPECT_TRUE(notMatchesObjC("@class X;", IsDirectlyDerivedFromX));
-  EXPECT_TRUE(notMatchesObjC("@class Y;", IsDirectlyDerivedFromX));
-  EXPECT_TRUE(notMatchesObjC("@interface X @end @compatibility_alias Y X;",
-                             IsDirectlyDerivedFromX));
-  EXPECT_TRUE(
-      notMatchesObjC("@interface X @end typedef X Y;", IsDirectlyDerivedFromX));
-
-  DeclarationMatcher IsAX = objcInterfaceDecl(isSameOrDerivedFrom("X"));
-  EXPECT_TRUE(matchesObjC("@interface X @end @interface Y : X @end", IsAX));
-  EXPECT_TRUE(matchesObjC("@interface X @end", IsAX));
-  EXPECT_TRUE(matchesObjC("@class X;", IsAX));
-  EXPECT_TRUE(notMatchesObjC("@interface Y @end", IsAX));
-  EXPECT_TRUE(notMatchesObjC("@class Y;", IsAX));
-
-  DeclarationMatcher ZIsDerivedFromX =
-      objcInterfaceDecl(hasName("Z"), isDerivedFrom("X"));
-  DeclarationMatcher ZIsDirectlyDerivedFromX =
-      objcInterfaceDecl(hasName("Z"), isDirectlyDerivedFrom("X"));
-  EXPECT_TRUE(matchesObjC(
-      "@interface X @end @interface Y : X @end @interface Z : Y @end",
-      ZIsDerivedFromX));
-  EXPECT_TRUE(matchesObjC("@interface X @end @interface Y : X @end typedef Y "
-                          "V; typedef V W; @interface Z : W @end",
-                          ZIsDerivedFromX));
-  EXPECT_TRUE(matchesObjC(
-      "@interface X @end typedef X Y; @interface Z : Y @end", ZIsDerivedFromX));
-  EXPECT_TRUE(
-      matchesObjC("@interface X @end typedef X Y; @interface Z : Y @end",
-                  ZIsDirectlyDerivedFromX));
-  EXPECT_TRUE(matchesObjC(
-      "@interface A @end typedef A X; typedef A Y; @interface Z : Y @end",
-      ZIsDerivedFromX));
-  EXPECT_TRUE(matchesObjC(
-      "@interface A @end typedef A X; typedef A Y; @interface Z : Y @end",
-      ZIsDirectlyDerivedFromX));
-  EXPECT_TRUE(matchesObjC(
-      "@interface X @end @compatibility_alias Y X; @interface Z : Y @end",
-      ZIsDerivedFromX));
-  EXPECT_TRUE(matchesObjC(
-      "@interface X @end @compatibility_alias Y X; @interface Z : Y @end",
-      ZIsDirectlyDerivedFromX));
-  EXPECT_TRUE(matchesObjC(
-      "@interface Y @end @compatibility_alias X Y; @interface Z : Y @end",
-      ZIsDerivedFromX));
-  EXPECT_TRUE(matchesObjC(
-      "@interface Y @end @compatibility_alias X Y; @interface Z : Y @end",
-      ZIsDirectlyDerivedFromX));
-  EXPECT_TRUE(matchesObjC(
-      "@interface A @end @compatibility_alias X A; @compatibility_alias Y A;"
-      "@interface Z : Y @end",
-      ZIsDerivedFromX));
-  EXPECT_TRUE(matchesObjC(
-      "@interface A @end @compatibility_alias X A; @compatibility_alias Y A;"
-      "@interface Z : Y @end",
-      ZIsDirectlyDerivedFromX));
-  EXPECT_TRUE(matchesObjC(
-      "@interface Y @end typedef Y X; @interface Z : X @end", ZIsDerivedFromX));
-  EXPECT_TRUE(
-      matchesObjC("@interface Y @end typedef Y X; @interface Z : X @end",
-                  ZIsDirectlyDerivedFromX));
-  EXPECT_TRUE(
-      matchesObjC("@interface A @end @compatibility_alias Y A; typedef Y X;"
-                  "@interface Z : A @end",
-                  ZIsDerivedFromX));
-  EXPECT_TRUE(
-      matchesObjC("@interface A @end @compatibility_alias Y A; typedef Y X;"
-                  "@interface Z : A @end",
-                  ZIsDirectlyDerivedFromX));
-  EXPECT_TRUE(
-      matchesObjC("@interface A @end typedef A Y; @compatibility_alias X Y;"
-                  "@interface Z : A @end",
-                  ZIsDerivedFromX));
-  EXPECT_TRUE(
-      matchesObjC("@interface A @end typedef A Y; @compatibility_alias X Y;"
-                  "@interface Z : A @end",
-                  ZIsDirectlyDerivedFromX));
-}
-
-TEST_P(ASTMatchersTest, IsLambda) {
-  if (!GetParam().isCXX11OrLater()) {
-    return;
-  }
-
-  const auto IsLambda = cxxMethodDecl(ofClass(cxxRecordDecl(isLambda())));
-  EXPECT_TRUE(matches("auto x = []{};", IsLambda));
-  EXPECT_TRUE(notMatches("struct S { void operator()() const; };", IsLambda));
-}
-
-TEST_P(ASTMatchersTest, Bind) {
-  DeclarationMatcher ClassX = has(recordDecl(hasName("::X")).bind("x"));
-
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-      "class X {};", ClassX,
-      std::make_unique<VerifyIdIsBoundTo<CXXRecordDecl>>("x")));
-
-  EXPECT_TRUE(matchAndVerifyResultFalse(
-      "class X {};", ClassX,
-      std::make_unique<VerifyIdIsBoundTo<CXXRecordDecl>>("other-id")));
-
-  TypeMatcher TypeAHasClassB = hasDeclaration(
-      recordDecl(hasName("A"), has(recordDecl(hasName("B")).bind("b"))));
-
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-      "class A { public: A *a; class B {}; };", TypeAHasClassB,
-      std::make_unique<VerifyIdIsBoundTo<Decl>>("b")));
-
-  StatementMatcher MethodX =
-      callExpr(callee(cxxMethodDecl(hasName("x")))).bind("x");
-
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-      "class A { void x() { x(); } };", MethodX,
-      std::make_unique<VerifyIdIsBoundTo<CXXMemberCallExpr>>("x")));
-}
-
-TEST_P(ASTMatchersTest, Bind_SameNameInAlternatives) {
-  StatementMatcher matcher = anyOf(
-      binaryOperator(hasOperatorName("+"), hasLHS(expr().bind("x")),
-                     hasRHS(integerLiteral(equals(0)))),
-      binaryOperator(hasOperatorName("+"), hasLHS(integerLiteral(equals(0))),
-                     hasRHS(expr().bind("x"))));
-
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-      // The first branch of the matcher binds x to 0 but then fails.
-      // The second branch binds x to f() and succeeds.
-      "int f() { return 0 + f(); }", matcher,
-      std::make_unique<VerifyIdIsBoundTo<CallExpr>>("x")));
-}
-
-TEST_P(ASTMatchersTest, Bind_BindsIDForMemoizedResults) {
-  // Using the same matcher in two match expressions will make memoization
-  // kick in.
-  DeclarationMatcher ClassX = recordDecl(hasName("X")).bind("x");
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-      "class A { class B { class X {}; }; };",
-      DeclarationMatcher(
-          anyOf(recordDecl(hasName("A"), hasDescendant(ClassX)),
-                recordDecl(hasName("B"), hasDescendant(ClassX)))),
-      std::make_unique<VerifyIdIsBoundTo<Decl>>("x", 2)));
-}
-
-TEST_P(ASTMatchersTest, HasType_MatchesAsString) {
-  if (!GetParam().isCXX()) {
-    // FIXME: Add a test for `hasType()` that does not depend on C++.
-    return;
-  }
-
-  EXPECT_TRUE(
-      matches("class Y { public: void x(); }; void z() {Y* y; y->x(); }",
-              cxxMemberCallExpr(on(hasType(asString("class Y *"))))));
-  EXPECT_TRUE(
-      matches("class X { void x(int x) {} };",
-              cxxMethodDecl(hasParameter(0, hasType(asString("int"))))));
-  EXPECT_TRUE(matches("namespace ns { struct A {}; }  struct B { ns::A a; };",
-                      fieldDecl(hasType(asString("ns::A")))));
-  EXPECT_TRUE(
-      matches("namespace { struct A {}; }  struct B { A a; };",
-              fieldDecl(hasType(asString("struct (anonymous namespace)::A")))));
-}
-
-TEST_P(ASTMatchersTest, HasOverloadedOperatorName) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  StatementMatcher OpCallAndAnd =
-      cxxOperatorCallExpr(hasOverloadedOperatorName("&&"));
-  EXPECT_TRUE(matches("class Y { }; "
-                      "bool operator&&(Y x, Y y) { return true; }; "
-                      "Y a; Y b; bool c = a && b;",
-                      OpCallAndAnd));
-  StatementMatcher OpCallLessLess =
-      cxxOperatorCallExpr(hasOverloadedOperatorName("<<"));
-  EXPECT_TRUE(notMatches("class Y { }; "
-                         "bool operator&&(Y x, Y y) { return true; }; "
-                         "Y a; Y b; bool c = a && b;",
-                         OpCallLessLess));
-  StatementMatcher OpStarCall =
-      cxxOperatorCallExpr(hasOverloadedOperatorName("*"));
-  EXPECT_TRUE(
-      matches("class Y; int operator*(Y &); void f(Y &y) { *y; }", OpStarCall));
-  DeclarationMatcher ClassWithOpStar =
-      cxxRecordDecl(hasMethod(hasOverloadedOperatorName("*")));
-  EXPECT_TRUE(matches("class Y { int operator*(); };", ClassWithOpStar));
-  EXPECT_TRUE(notMatches("class Y { void myOperator(); };", ClassWithOpStar));
-  DeclarationMatcher AnyOpStar = functionDecl(hasOverloadedOperatorName("*"));
-  EXPECT_TRUE(matches("class Y; int operator*(Y &);", AnyOpStar));
-  EXPECT_TRUE(matches("class Y { int operator*(); };", AnyOpStar));
-  DeclarationMatcher AnyAndOp =
-      functionDecl(hasAnyOverloadedOperatorName("&", "&&"));
-  EXPECT_TRUE(matches("class Y; Y operator&(Y &, Y &);", AnyAndOp));
-  EXPECT_TRUE(matches("class Y; Y operator&&(Y &, Y &);", AnyAndOp));
-  EXPECT_TRUE(matches("class Y { Y operator&(Y &); };", AnyAndOp));
-  EXPECT_TRUE(matches("class Y { Y operator&&(Y &); };", AnyAndOp));
-}
-
-TEST_P(ASTMatchersTest, HasOverloadedOperatorName_MatchesNestedCalls) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-      "class Y { }; "
-      "Y& operator&&(Y& x, Y& y) { return x; }; "
-      "Y a; Y b; Y c; Y d = a && b && c;",
-      cxxOperatorCallExpr(hasOverloadedOperatorName("&&")).bind("x"),
-      std::make_unique<VerifyIdIsBoundTo<CXXOperatorCallExpr>>("x", 2)));
-  EXPECT_TRUE(matches("class Y { }; "
-                      "Y& operator&&(Y& x, Y& y) { return x; }; "
-                      "Y a; Y b; Y c; Y d = a && b && c;",
-                      cxxOperatorCallExpr(hasParent(cxxOperatorCallExpr()))));
-  EXPECT_TRUE(
-      matches("class Y { }; "
-              "Y& operator&&(Y& x, Y& y) { return x; }; "
-              "Y a; Y b; Y c; Y d = a && b && c;",
-              cxxOperatorCallExpr(hasDescendant(cxxOperatorCallExpr()))));
-}
-
-TEST_P(ASTMatchersTest, HasLocalStorage) {
-  auto M = varDecl(hasName("X"), hasLocalStorage());
-  EXPECT_TRUE(matches("void f() { int X; }", M));
-  EXPECT_TRUE(notMatches("int X;", M));
-  EXPECT_TRUE(notMatches("void f() { static int X; }", M));
-}
-
-TEST_P(ASTMatchersTest, HasGlobalStorage) {
-  auto M = varDecl(hasName("X"), hasGlobalStorage());
-  EXPECT_TRUE(notMatches("void f() { int X; }", M));
-  EXPECT_TRUE(matches("int X;", M));
-  EXPECT_TRUE(matches("void f() { static int X; }", M));
-}
-
-TEST_P(ASTMatchersTest, IsStaticLocal) {
-  auto M = varDecl(isStaticLocal());
-  EXPECT_TRUE(matches("void f() { static int X; }", M));
-  EXPECT_TRUE(notMatches("static int X;", M));
-  EXPECT_TRUE(notMatches("void f() { int X; }", M));
-  EXPECT_TRUE(notMatches("int X;", M));
-}
-
-TEST_P(ASTMatchersTest, StorageDuration) {
-  StringRef T =
-      "void f() { int x; static int y; } int a;static int b;extern int c;";
-
-  EXPECT_TRUE(matches(T, varDecl(hasName("x"), hasAutomaticStorageDuration())));
-  EXPECT_TRUE(
-      notMatches(T, varDecl(hasName("y"), hasAutomaticStorageDuration())));
-  EXPECT_TRUE(
-      notMatches(T, varDecl(hasName("a"), hasAutomaticStorageDuration())));
-
-  EXPECT_TRUE(matches(T, varDecl(hasName("y"), hasStaticStorageDuration())));
-  EXPECT_TRUE(matches(T, varDecl(hasName("a"), hasStaticStorageDuration())));
-  EXPECT_TRUE(matches(T, varDecl(hasName("b"), hasStaticStorageDuration())));
-  EXPECT_TRUE(matches(T, varDecl(hasName("c"), hasStaticStorageDuration())));
-  EXPECT_TRUE(notMatches(T, varDecl(hasName("x"), hasStaticStorageDuration())));
-
-  // FIXME: Add thread_local variables to the source code snippet.
-  EXPECT_TRUE(notMatches(T, varDecl(hasName("x"), hasThreadStorageDuration())));
-  EXPECT_TRUE(notMatches(T, varDecl(hasName("y"), hasThreadStorageDuration())));
-  EXPECT_TRUE(notMatches(T, varDecl(hasName("a"), hasThreadStorageDuration())));
-}
-
-TEST_P(ASTMatchersTest, VarDecl_MatchesFunctionParameter) {
-  EXPECT_TRUE(matches("void f(int i) {}", varDecl(hasName("i"))));
-}
-
-TEST_P(ASTMatchersTest, SizeOfExpr_MatchesCorrectType) {
-  EXPECT_TRUE(matches("void x() { int a = sizeof(a); }",
-                      sizeOfExpr(hasArgumentOfType(asString("int")))));
-  EXPECT_TRUE(notMatches("void x() { int a = sizeof(a); }",
-                         sizeOfExpr(hasArgumentOfType(asString("float")))));
-  EXPECT_TRUE(matches(
-      "struct A {}; void x() { struct A a; int b = sizeof(a); }",
-      sizeOfExpr(hasArgumentOfType(hasDeclaration(recordDecl(hasName("A")))))));
-  EXPECT_TRUE(notMatches("void x() { int a = sizeof(a); }",
-                         sizeOfExpr(hasArgumentOfType(
-                             hasDeclaration(recordDecl(hasName("string")))))));
-}
-
-TEST_P(ASTMatchersTest, IsInteger_MatchesIntegers) {
-  EXPECT_TRUE(matches("int i = 0;", varDecl(hasType(isInteger()))));
-  EXPECT_TRUE(
-      matches("long long i = 0; void f(long long) { }; void g() {f(i);}",
-              callExpr(hasArgument(
-                  0, declRefExpr(to(varDecl(hasType(isInteger()))))))));
-}
-
-TEST_P(ASTMatchersTest, IsInteger_ReportsNoFalsePositives) {
-  if (!GetParam().isCXX()) {
-    // FIXME: Add a similar negative test for `isInteger()` that does not depend
-    // on C++.
-    return;
-  }
-
-  EXPECT_TRUE(notMatches("int *i;", varDecl(hasType(isInteger()))));
-  EXPECT_TRUE(
-      notMatches("struct T {}; T t; void f(T *) { }; void g() {f(&t);}",
-                 callExpr(hasArgument(
-                     0, declRefExpr(to(varDecl(hasType(isInteger()))))))));
-}
-
-TEST_P(ASTMatchersTest, IsSignedInteger_MatchesSignedIntegers) {
-  EXPECT_TRUE(matches("int i = 0;", varDecl(hasType(isSignedInteger()))));
-  EXPECT_TRUE(
-      notMatches("unsigned i = 0;", varDecl(hasType(isSignedInteger()))));
-}
-
-TEST_P(ASTMatchersTest, IsUnsignedInteger_MatchesUnsignedIntegers) {
-  EXPECT_TRUE(notMatches("int i = 0;", varDecl(hasType(isUnsignedInteger()))));
-  EXPECT_TRUE(
-      matches("unsigned i = 0;", varDecl(hasType(isUnsignedInteger()))));
-}
-
-TEST_P(ASTMatchersTest, IsAnyPointer_MatchesPointers) {
-  if (!GetParam().isCXX11OrLater()) {
-    // FIXME: Add a test for `isAnyPointer()` that does not depend on C++.
-    return;
-  }
-
-  EXPECT_TRUE(matches("int* i = nullptr;", varDecl(hasType(isAnyPointer()))));
-}
-
-TEST_P(ASTMatchersTest, IsAnyPointer_MatchesObjcPointer) {
-  EXPECT_TRUE(matchesObjC("@interface Foo @end Foo *f;",
-                          varDecl(hasType(isAnyPointer()))));
-}
-
-TEST_P(ASTMatchersTest, IsAnyPointer_ReportsNoFalsePositives) {
-  EXPECT_TRUE(notMatches("int i = 0;", varDecl(hasType(isAnyPointer()))));
-}
-
-TEST_P(ASTMatchersTest, IsAnyCharacter_MatchesCharacters) {
-  EXPECT_TRUE(matches("char i = 0;", varDecl(hasType(isAnyCharacter()))));
-}
-
-TEST_P(ASTMatchersTest, IsAnyCharacter_ReportsNoFalsePositives) {
-  EXPECT_TRUE(notMatches("int i;", varDecl(hasType(isAnyCharacter()))));
-}
-
-TEST_P(ASTMatchersTest, IsArrow_MatchesMemberVariablesViaArrow) {
-  if (!GetParam().isCXX()) {
-    // FIXME: Add a test for `isArrow()` that does not depend on C++.
-    return;
-  }
-  if (GetParam().hasDelayedTemplateParsing()) {
-    // FIXME: Fix this test to work with delayed template parsing.
-    return;
-  }
-
-  EXPECT_TRUE(matches("class Y { void x() { this->y; } int y; };",
-                      memberExpr(isArrow())));
-  EXPECT_TRUE(
-      matches("class Y { void x() { y; } int y; };", memberExpr(isArrow())));
-  EXPECT_TRUE(notMatches("class Y { void x() { (*this).y; } int y; };",
-                         memberExpr(isArrow())));
-  EXPECT_TRUE(matches("template <class T> class Y { void x() { this->m; } };",
-                      cxxDependentScopeMemberExpr(isArrow())));
-  EXPECT_TRUE(
-      notMatches("template <class T> class Y { void x() { (*this).m; } };",
-                 cxxDependentScopeMemberExpr(isArrow())));
-}
-
-TEST_P(ASTMatchersTest, IsArrow_MatchesStaticMemberVariablesViaArrow) {
-  if (!GetParam().isCXX()) {
-    // FIXME: Add a test for `isArrow()` that does not depend on C++.
-    return;
-  }
-
-  EXPECT_TRUE(matches("class Y { void x() { this->y; } static int y; };",
-                      memberExpr(isArrow())));
-  EXPECT_TRUE(notMatches("class Y { void x() { y; } static int y; };",
-                         memberExpr(isArrow())));
-  EXPECT_TRUE(notMatches("class Y { void x() { (*this).y; } static int y; };",
-                         memberExpr(isArrow())));
-}
-
-TEST_P(ASTMatchersTest, IsArrow_MatchesMemberCallsViaArrow) {
-  if (!GetParam().isCXX()) {
-    // FIXME: Add a test for `isArrow()` that does not depend on C++.
-    return;
-  }
-  if (GetParam().hasDelayedTemplateParsing()) {
-    // FIXME: Fix this test to work with delayed template parsing.
-    return;
-  }
-
-  EXPECT_TRUE(
-      matches("class Y { void x() { this->x(); } };", memberExpr(isArrow())));
-  EXPECT_TRUE(matches("class Y { void x() { x(); } };", memberExpr(isArrow())));
-  EXPECT_TRUE(notMatches("class Y { void x() { Y y; y.x(); } };",
-                         memberExpr(isArrow())));
-  EXPECT_TRUE(
-      matches("class Y { template <class T> void x() { this->x<T>(); } };",
-              unresolvedMemberExpr(isArrow())));
-  EXPECT_TRUE(matches("class Y { template <class T> void x() { x<T>(); } };",
-                      unresolvedMemberExpr(isArrow())));
-  EXPECT_TRUE(
-      notMatches("class Y { template <class T> void x() { (*this).x<T>(); } };",
-                 unresolvedMemberExpr(isArrow())));
-}
-
-TEST_P(ASTMatchersTest, IsExplicit_CXXConversionDecl) {
-  if (!GetParam().isCXX11OrLater()) {
-    return;
-  }
-
-  EXPECT_TRUE(matches("struct S { explicit operator int(); };",
-                      cxxConversionDecl(isExplicit())));
-  EXPECT_TRUE(notMatches("struct S { operator int(); };",
-                         cxxConversionDecl(isExplicit())));
-}
-
-TEST_P(ASTMatchersTest, IsExplicit_CXXConversionDecl_CXX20) {
-  if (!GetParam().isCXX20OrLater()) {
-    return;
-  }
-
-  EXPECT_TRUE(
-      notMatches("template<bool b> struct S { explicit(b) operator int(); };",
-                 cxxConversionDecl(isExplicit())));
-  EXPECT_TRUE(matches("struct S { explicit(true) operator int(); };",
-                      cxxConversionDecl(isExplicit())));
-  EXPECT_TRUE(notMatches("struct S { explicit(false) operator int(); };",
-                         cxxConversionDecl(isExplicit())));
-}
-
-TEST_P(ASTMatchersTest, ArgumentCountIs_CallExpr) {
-  StatementMatcher Call1Arg = callExpr(argumentCountIs(1));
-
-  EXPECT_TRUE(matches("void x(int) { x(0); }", Call1Arg));
-  EXPECT_TRUE(notMatches("void x(int, int) { x(0, 0); }", Call1Arg));
-}
-
-TEST_P(ASTMatchersTest, ArgumentCountIs_CallExpr_CXX) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  StatementMatcher Call1Arg = callExpr(argumentCountIs(1));
-  EXPECT_TRUE(matches("class X { void x(int) { x(0); } };", Call1Arg));
-}
-
-TEST_P(ASTMatchersTest, ParameterCountIs) {
-  DeclarationMatcher Function1Arg = functionDecl(parameterCountIs(1));
-  EXPECT_TRUE(matches("void f(int i) {}", Function1Arg));
-  EXPECT_TRUE(notMatches("void f() {}", Function1Arg));
-  EXPECT_TRUE(notMatches("void f(int i, int j, int k) {}", Function1Arg));
-  EXPECT_TRUE(matches("void f(int i, ...) {};", Function1Arg));
-}
-
-TEST_P(ASTMatchersTest, ParameterCountIs_CXX) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  DeclarationMatcher Function1Arg = functionDecl(parameterCountIs(1));
-  EXPECT_TRUE(matches("class X { void f(int i) {} };", Function1Arg));
-}
-
-TEST_P(ASTMatchersTest, References) {
-  if (!GetParam().isCXX()) {
-    // FIXME: Add a test for `references()` that does not depend on C++.
-    return;
-  }
-
-  DeclarationMatcher ReferenceClassX =
-      varDecl(hasType(references(recordDecl(hasName("X")))));
-  EXPECT_TRUE(
-      matches("class X {}; void y(X y) { X &x = y; }", ReferenceClassX));
-  EXPECT_TRUE(
-      matches("class X {}; void y(X y) { const X &x = y; }", ReferenceClassX));
-  // The match here is on the implicit copy constructor code for
-  // class X, not on code 'X x = y'.
-  EXPECT_TRUE(matches("class X {}; void y(X y) { X x = y; }", ReferenceClassX));
-  EXPECT_TRUE(notMatches("class X {}; extern X x;", ReferenceClassX));
-  EXPECT_TRUE(
-      notMatches("class X {}; void y(X *y) { X *&x = y; }", ReferenceClassX));
-}
-
-TEST_P(ASTMatchersTest, HasLocalQualifiers) {
-  if (!GetParam().isCXX11OrLater()) {
-    // FIXME: Add a test for `hasLocalQualifiers()` that does not depend on C++.
-    return;
-  }
-
-  EXPECT_TRUE(notMatches("typedef const int const_int; const_int i = 1;",
-                         varDecl(hasType(hasLocalQualifiers()))));
-  EXPECT_TRUE(matches("int *const j = nullptr;",
-                      varDecl(hasType(hasLocalQualifiers()))));
-  EXPECT_TRUE(
-      matches("int *volatile k;", varDecl(hasType(hasLocalQualifiers()))));
-  EXPECT_TRUE(notMatches("int m;", varDecl(hasType(hasLocalQualifiers()))));
-}
-
-TEST_P(ASTMatchersTest, IsExternC_MatchesExternCFunctionDeclarations) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  EXPECT_TRUE(matches("extern \"C\" void f() {}", functionDecl(isExternC())));
-  EXPECT_TRUE(
-      matches("extern \"C\" { void f() {} }", functionDecl(isExternC())));
-  EXPECT_TRUE(notMatches("void f() {}", functionDecl(isExternC())));
-}
-
-TEST_P(ASTMatchersTest, IsExternC_MatchesExternCVariableDeclarations) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  EXPECT_TRUE(matches("extern \"C\" int i;", varDecl(isExternC())));
-  EXPECT_TRUE(matches("extern \"C\" { int i; }", varDecl(isExternC())));
-  EXPECT_TRUE(notMatches("int i;", varDecl(isExternC())));
-}
-
-TEST_P(ASTMatchersTest, IsStaticStorageClass) {
-  EXPECT_TRUE(
-      matches("static void f() {}", functionDecl(isStaticStorageClass())));
-  EXPECT_TRUE(matches("static int i = 1;", varDecl(isStaticStorageClass())));
-  EXPECT_TRUE(notMatches("int i = 1;", varDecl(isStaticStorageClass())));
-  EXPECT_TRUE(notMatches("extern int i;", varDecl(isStaticStorageClass())));
-  EXPECT_TRUE(notMatches("void f() {}", functionDecl(isStaticStorageClass())));
-}
-
-TEST_P(ASTMatchersTest, IsDefaulted) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  EXPECT_TRUE(notMatches("class A { ~A(); };",
-                         functionDecl(hasName("~A"), isDefaulted())));
-  EXPECT_TRUE(matches("class B { ~B() = default; };",
-                      functionDecl(hasName("~B"), isDefaulted())));
-}
-
-TEST_P(ASTMatchersTest, IsDeleted) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  EXPECT_TRUE(
-      notMatches("void Func();", functionDecl(hasName("Func"), isDeleted())));
-  EXPECT_TRUE(matches("void Func() = delete;",
-                      functionDecl(hasName("Func"), isDeleted())));
-}
-
-TEST_P(ASTMatchersTest, IsNoThrow_DynamicExceptionSpec) {
-  if (!GetParam().supportsCXXDynamicExceptionSpecification()) {
-    return;
-  }
-
-  EXPECT_TRUE(notMatches("void f();", functionDecl(isNoThrow())));
-  EXPECT_TRUE(notMatches("void f() throw(int);", functionDecl(isNoThrow())));
-  EXPECT_TRUE(matches("void f() throw();", functionDecl(isNoThrow())));
-
-  EXPECT_TRUE(notMatches("void f();", functionProtoType(isNoThrow())));
-  EXPECT_TRUE(
-      notMatches("void f() throw(int);", functionProtoType(isNoThrow())));
-  EXPECT_TRUE(matches("void f() throw();", functionProtoType(isNoThrow())));
-}
-
-TEST_P(ASTMatchersTest, IsNoThrow_CXX11) {
-  if (!GetParam().isCXX11OrLater()) {
-    return;
-  }
-
-  EXPECT_TRUE(
-      notMatches("void f() noexcept(false);", functionDecl(isNoThrow())));
-  EXPECT_TRUE(matches("void f() noexcept;", functionDecl(isNoThrow())));
-
-  EXPECT_TRUE(
-      notMatches("void f() noexcept(false);", functionProtoType(isNoThrow())));
-  EXPECT_TRUE(matches("void f() noexcept;", functionProtoType(isNoThrow())));
-}
-
-TEST_P(ASTMatchersTest, IsConstexpr) {
-  if (!GetParam().isCXX11OrLater()) {
-    return;
-  }
-
-  EXPECT_TRUE(matches("constexpr int foo = 42;",
-                      varDecl(hasName("foo"), isConstexpr())));
-  EXPECT_TRUE(matches("constexpr int bar();",
-                      functionDecl(hasName("bar"), isConstexpr())));
-}
-
-TEST_P(ASTMatchersTest, IsConstexpr_MatchesIfConstexpr) {
-  if (!GetParam().isCXX17OrLater()) {
-    return;
-  }
-
-  EXPECT_TRUE(
-      matches("void baz() { if constexpr(1 > 0) {} }", ifStmt(isConstexpr())));
-  EXPECT_TRUE(
-      notMatches("void baz() { if (1 > 0) {} }", ifStmt(isConstexpr())));
-}
-
-TEST_P(ASTMatchersTest, HasInitStatement_MatchesSelectionInitializers) {
-  EXPECT_TRUE(notMatches("void baz() { if (1 > 0) {} }",
-                         ifStmt(hasInitStatement(anything()))));
-  EXPECT_TRUE(notMatches("void baz(int i) { switch (i) { default: break; } }",
-                         switchStmt(hasInitStatement(anything()))));
-}
-
-TEST_P(ASTMatchersTest, HasInitStatement_MatchesSelectionInitializers_CXX) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  EXPECT_TRUE(notMatches("void baz() { if (int i = 1) {} }",
-                         ifStmt(hasInitStatement(anything()))));
-}
-
-TEST_P(ASTMatchersTest, HasInitStatement_MatchesSelectionInitializers_CXX17) {
-  if (!GetParam().isCXX17OrLater()) {
-    return;
-  }
-
-  EXPECT_TRUE(matches("void baz() { if (int i = 1; i > 0) {} }",
-                      ifStmt(hasInitStatement(anything()))));
-  EXPECT_TRUE(
-      matches("void baz(int i) { switch (int j = i; j) { default: break; } }",
-              switchStmt(hasInitStatement(anything()))));
-}
-
-TEST_P(ASTMatchersTest, HasInitStatement_MatchesRangeForInitializers) {
-  if (!GetParam().isCXX20OrLater()) {
-    return;
-  }
-
-  EXPECT_TRUE(matches("void baz() {"
-                      "int items[] = {};"
-                      "for (auto &arr = items; auto &item : arr) {}"
-                      "}",
-                      cxxForRangeStmt(hasInitStatement(anything()))));
-  EXPECT_TRUE(notMatches("void baz() {"
-                         "int items[] = {};"
-                         "for (auto &item : items) {}"
-                         "}",
-                         cxxForRangeStmt(hasInitStatement(anything()))));
-}
-
-TEST_P(ASTMatchersTest, TemplateArgumentCountIs) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  EXPECT_TRUE(
-      matches("template<typename T> struct C {}; C<int> c;",
-              classTemplateSpecializationDecl(templateArgumentCountIs(1))));
-  EXPECT_TRUE(
-      notMatches("template<typename T> struct C {}; C<int> c;",
-                 classTemplateSpecializationDecl(templateArgumentCountIs(2))));
-
-  EXPECT_TRUE(matches("template<typename T> struct C {}; C<int> c;",
-                      templateSpecializationType(templateArgumentCountIs(1))));
-  EXPECT_TRUE(
-      notMatches("template<typename T> struct C {}; C<int> c;",
-                 templateSpecializationType(templateArgumentCountIs(2))));
-}
-
-TEST_P(ASTMatchersTest, IsIntegral) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  EXPECT_TRUE(matches(
-      "template<int T> struct C {}; C<42> c;",
-      classTemplateSpecializationDecl(hasAnyTemplateArgument(isIntegral()))));
-  EXPECT_TRUE(notMatches("template<typename T> struct C {}; C<int> c;",
-                         classTemplateSpecializationDecl(hasAnyTemplateArgument(
-                             templateArgument(isIntegral())))));
-}
-
-TEST_P(ASTMatchersTest, EqualsIntegralValue) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  EXPECT_TRUE(matches("template<int T> struct C {}; C<42> c;",
-                      classTemplateSpecializationDecl(
-                          hasAnyTemplateArgument(equalsIntegralValue("42")))));
-  EXPECT_TRUE(matches("template<int T> struct C {}; C<-42> c;",
-                      classTemplateSpecializationDecl(
-                          hasAnyTemplateArgument(equalsIntegralValue("-42")))));
-  EXPECT_TRUE(matches("template<int T> struct C {}; C<-0042> c;",
-                      classTemplateSpecializationDecl(
-                          hasAnyTemplateArgument(equalsIntegralValue("-34")))));
-  EXPECT_TRUE(notMatches("template<int T> struct C {}; C<42> c;",
-                         classTemplateSpecializationDecl(hasAnyTemplateArgument(
-                             equalsIntegralValue("0042")))));
-}
-
-TEST_P(ASTMatchersTest, AccessSpecDecl) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  EXPECT_TRUE(matches("class C { public: int i; };", accessSpecDecl()));
-  EXPECT_TRUE(
-      matches("class C { public: int i; };", accessSpecDecl(isPublic())));
-  EXPECT_TRUE(
-      notMatches("class C { public: int i; };", accessSpecDecl(isProtected())));
-  EXPECT_TRUE(
-      notMatches("class C { public: int i; };", accessSpecDecl(isPrivate())));
-
-  EXPECT_TRUE(notMatches("class C { int i; };", accessSpecDecl()));
-}
-
-TEST_P(ASTMatchersTest, IsFinal) {
-  if (!GetParam().isCXX11OrLater()) {
-    return;
-  }
-
-  EXPECT_TRUE(matches("class X final {};", cxxRecordDecl(isFinal())));
-  EXPECT_TRUE(matches("class X { virtual void f() final; };",
-                      cxxMethodDecl(isFinal())));
-  EXPECT_TRUE(notMatches("class X {};", cxxRecordDecl(isFinal())));
-  EXPECT_TRUE(
-      notMatches("class X { virtual void f(); };", cxxMethodDecl(isFinal())));
-}
-
-TEST_P(ASTMatchersTest, IsVirtual) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  EXPECT_TRUE(matches("class X { virtual int f(); };",
-                      cxxMethodDecl(isVirtual(), hasName("::X::f"))));
-  EXPECT_TRUE(notMatches("class X { int f(); };", cxxMethodDecl(isVirtual())));
-}
-
-TEST_P(ASTMatchersTest, IsVirtualAsWritten) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  EXPECT_TRUE(matches("class A { virtual int f(); };"
-                      "class B : public A { int f(); };",
-                      cxxMethodDecl(isVirtualAsWritten(), hasName("::A::f"))));
-  EXPECT_TRUE(
-      notMatches("class A { virtual int f(); };"
-                 "class B : public A { int f(); };",
-                 cxxMethodDecl(isVirtualAsWritten(), hasName("::B::f"))));
-}
-
-TEST_P(ASTMatchersTest, IsPure) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  EXPECT_TRUE(matches("class X { virtual int f() = 0; };",
-                      cxxMethodDecl(isPure(), hasName("::X::f"))));
-  EXPECT_TRUE(notMatches("class X { int f(); };", cxxMethodDecl(isPure())));
-}
-
-TEST_P(ASTMatchersTest, IsCopyAssignmentOperator) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  auto CopyAssignment =
-      cxxMethodDecl(isCopyAssignmentOperator(), unless(isImplicit()));
-  EXPECT_TRUE(matches("class X { X &operator=(X); };", CopyAssignment));
-  EXPECT_TRUE(matches("class X { X &operator=(X &); };", CopyAssignment));
-  EXPECT_TRUE(matches("class X { X &operator=(const X &); };", CopyAssignment));
-  EXPECT_TRUE(matches("class X { X &operator=(volatile X &); };", //
-                      CopyAssignment));
-  EXPECT_TRUE(matches("class X { X &operator=(const volatile X &); };",
-                      CopyAssignment));
-  EXPECT_TRUE(notMatches("class X { X &operator=(X &&); };", CopyAssignment));
-}
-
-TEST_P(ASTMatchersTest, IsMoveAssignmentOperator) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  auto MoveAssignment =
-      cxxMethodDecl(isMoveAssignmentOperator(), unless(isImplicit()));
-  EXPECT_TRUE(notMatches("class X { X &operator=(X); };", MoveAssignment));
-  EXPECT_TRUE(matches("class X { X &operator=(X &&); };", MoveAssignment));
-  EXPECT_TRUE(matches("class X { X &operator=(const X &&); };", //
-                      MoveAssignment));
-  EXPECT_TRUE(matches("class X { X &operator=(volatile X &&); };", //
-                      MoveAssignment));
-  EXPECT_TRUE(matches("class X { X &operator=(const volatile X &&); };",
-                      MoveAssignment));
-  EXPECT_TRUE(notMatches("class X { X &operator=(X &); };", MoveAssignment));
-}
-
-TEST_P(ASTMatchersTest, IsConst) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  EXPECT_TRUE(
-      matches("struct A { void foo() const; };", cxxMethodDecl(isConst())));
-  EXPECT_TRUE(
-      notMatches("struct A { void foo(); };", cxxMethodDecl(isConst())));
-}
-
-TEST_P(ASTMatchersTest, IsOverride) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  EXPECT_TRUE(matches("class X { virtual int f(); }; "
-                      "class Y : public X { int f(); };",
-                      cxxMethodDecl(isOverride(), hasName("::Y::f"))));
-  EXPECT_TRUE(notMatches("class X { virtual int f(); }; "
-                         "class Y : public X { int f(); };",
-                         cxxMethodDecl(isOverride(), hasName("::X::f"))));
-  EXPECT_TRUE(notMatches("class X { int f(); }; "
-                         "class Y : public X { int f(); };",
-                         cxxMethodDecl(isOverride())));
-  EXPECT_TRUE(notMatches("class X { int f(); int f(int); }; ",
-                         cxxMethodDecl(isOverride())));
-  EXPECT_TRUE(
-      matches("template <typename Base> struct Y : Base { void f() override;};",
-              cxxMethodDecl(isOverride(), hasName("::Y::f"))));
-}
-
-TEST_P(ASTMatchersTest, HasArgument_CXXConstructorDecl) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  auto Constructor = traverse(
-      TK_AsIs,
-      cxxConstructExpr(hasArgument(0, declRefExpr(to(varDecl(hasName("y")))))));
-
-  EXPECT_TRUE(matches(
-      "class X { public: X(int); }; void x() { int y; X x(y); }", Constructor));
-  EXPECT_TRUE(
-      matches("class X { public: X(int); }; void x() { int y; X x = X(y); }",
-              Constructor));
-  EXPECT_TRUE(
-      matches("class X { public: X(int); }; void x() { int y; X x = y; }",
-              Constructor));
-  EXPECT_TRUE(notMatches(
-      "class X { public: X(int); }; void x() { int z; X x(z); }", Constructor));
-
-  StatementMatcher WrongIndex =
-      traverse(TK_AsIs, cxxConstructExpr(hasArgument(
-                            42, declRefExpr(to(varDecl(hasName("y")))))));
-  EXPECT_TRUE(notMatches(
-      "class X { public: X(int); }; void x() { int y; X x(y); }", WrongIndex));
-}
-
-TEST_P(ASTMatchersTest, ArgumentCountIs_CXXConstructExpr) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  auto Constructor1Arg =
-      traverse(TK_AsIs, cxxConstructExpr(argumentCountIs(1)));
-
-  EXPECT_TRUE(matches("class X { public: X(int); }; void x() { X x(0); }",
-                      Constructor1Arg));
-  EXPECT_TRUE(matches("class X { public: X(int); }; void x() { X x = X(0); }",
-                      Constructor1Arg));
-  EXPECT_TRUE(matches("class X { public: X(int); }; void x() { X x = 0; }",
-                      Constructor1Arg));
-  EXPECT_TRUE(
-      notMatches("class X { public: X(int, int); }; void x() { X x(0, 0); }",
-                 Constructor1Arg));
-}
-
-TEST(ASTMatchersTest, NamesMember_CXXDependentScopeMemberExpr) {
-
-  // Member functions:
-  {
-    auto Code = "template <typename T> struct S{ void mem(); }; template "
-                "<typename T> void x() { S<T> s; s.mem(); }";
-
-    EXPECT_TRUE(matches(
-        Code,
-        cxxDependentScopeMemberExpr(
-            hasObjectExpression(declRefExpr(hasType(templateSpecializationType(
-                hasDeclaration(classTemplateDecl(has(cxxRecordDecl(
-                    has(cxxMethodDecl(hasName("mem")).bind("templMem")))))))))),
-            memberHasSameNameAsBoundNode("templMem"))));
-
-    EXPECT_TRUE(
-        matches(Code, cxxDependentScopeMemberExpr(hasMemberName("mem"))));
-  }
-
-  // Member variables:
-  {
-    auto Code = "template <typename T> struct S{ int mem; }; template "
-                "<typename T> void x() { S<T> s; s.mem; }";
-
-    EXPECT_TRUE(
-        matches(Code, cxxDependentScopeMemberExpr(hasMemberName("mem"))));
-
-    EXPECT_TRUE(matches(
-        Code,
-        cxxDependentScopeMemberExpr(
-            hasObjectExpression(declRefExpr(hasType(templateSpecializationType(
-                hasDeclaration(classTemplateDecl(has(cxxRecordDecl(
-                    has(fieldDecl(hasName("mem")).bind("templMem")))))))))),
-            memberHasSameNameAsBoundNode("templMem"))));
-  }
-
-  // static member variables:
-  {
-    auto Code = "template <typename T> struct S{ static int mem; }; template "
-                "<typename T> void x() { S<T> s; s.mem; }";
-
-    EXPECT_TRUE(
-        matches(Code, cxxDependentScopeMemberExpr(hasMemberName("mem"))));
-
-    EXPECT_TRUE(matches(
-        Code,
-        cxxDependentScopeMemberExpr(
-            hasObjectExpression(declRefExpr(hasType(templateSpecializationType(
-                hasDeclaration(classTemplateDecl(has(cxxRecordDecl(
-                    has(varDecl(hasName("mem")).bind("templMem")))))))))),
-            memberHasSameNameAsBoundNode("templMem"))));
-  }
-  {
-    auto Code = R"cpp(
-template <typename T>
-struct S {
-  bool operator==(int) const { return true; }
-};
-
-template <typename T>
-void func(T t) {
-  S<T> s;
-  s.operator==(1);
-}
-)cpp";
-
-    EXPECT_TRUE(matches(
-        Code, cxxDependentScopeMemberExpr(hasMemberName("operator=="))));
-  }
-
-  // other named decl:
-  {
-    auto Code = "template <typename T> struct S{ static int mem; }; struct "
-                "mem{}; template "
-                "<typename T> void x() { S<T> s; s.mem; }";
-
-    EXPECT_TRUE(matches(
-        Code,
-        translationUnitDecl(has(cxxRecordDecl(hasName("mem"))),
-                            hasDescendant(cxxDependentScopeMemberExpr()))));
-
-    EXPECT_FALSE(matches(
-        Code,
-        translationUnitDecl(has(cxxRecordDecl(hasName("mem")).bind("templMem")),
-                            hasDescendant(cxxDependentScopeMemberExpr(
-                                memberHasSameNameAsBoundNode("templMem"))))));
-  }
-}
-
-TEST(ASTMatchersTest, ArgumentCountIs_CXXUnresolvedConstructExpr) {
-  const auto *Code =
-      "template <typename T> struct S{}; template <typename T> void "
-      "x() { auto s = S<T>(); }";
-
-  EXPECT_TRUE(matches(Code, cxxUnresolvedConstructExpr(argumentCountIs(0))));
-  EXPECT_TRUE(notMatches(Code, cxxUnresolvedConstructExpr(argumentCountIs(1))));
-}
-
-TEST(ASTMatchersTest, HasArgument_CXXUnresolvedConstructExpr) {
-  const auto *Code =
-      "template <typename T> struct S{ S(int){} }; template <typename "
-      "T> void x() { int y; auto s = S<T>(y); }";
-  EXPECT_TRUE(matches(Code, cxxUnresolvedConstructExpr(hasArgument(
-                                0, declRefExpr(to(varDecl(hasName("y"))))))));
-  EXPECT_TRUE(
-      notMatches(Code, cxxUnresolvedConstructExpr(hasArgument(
-                           0, declRefExpr(to(varDecl(hasName("x"))))))));
-}
-
-TEST_P(ASTMatchersTest, IsListInitialization) {
-  if (!GetParam().isCXX11OrLater()) {
-    return;
-  }
-
-  auto ConstructorListInit =
-      traverse(TK_AsIs, varDecl(has(cxxConstructExpr(isListInitialization()))));
-
-  EXPECT_TRUE(matches("class X { public: X(int); }; void x() { X x{0}; }",
-                      ConstructorListInit));
-  EXPECT_FALSE(matches("class X { public: X(int); }; void x() { X x(0); }",
-                       ConstructorListInit));
-}
-
-TEST_P(ASTMatchersTest, IsImplicit_CXXConstructorDecl) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  // This one doesn't match because the constructor is not added by the
-  // compiler (it is not needed).
-  EXPECT_TRUE(notMatches("class Foo { };", cxxConstructorDecl(isImplicit())));
-  // The compiler added the implicit default constructor.
-  EXPECT_TRUE(matches("class Foo { }; Foo* f = new Foo();",
-                      cxxConstructorDecl(isImplicit())));
-  EXPECT_TRUE(matches("class Foo { Foo(){} };",
-                      cxxConstructorDecl(unless(isImplicit()))));
-  // The compiler added an implicit assignment operator.
-  EXPECT_TRUE(matches("struct A { int x; } a = {0}, b = a; void f() { a = b; }",
-                      cxxMethodDecl(isImplicit(), hasName("operator="))));
-}
-
-TEST_P(ASTMatchersTest, IsExplicit_CXXConstructorDecl) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  EXPECT_TRUE(matches("struct S { explicit S(int); };",
-                      cxxConstructorDecl(isExplicit())));
-  EXPECT_TRUE(
-      notMatches("struct S { S(int); };", cxxConstructorDecl(isExplicit())));
-}
-
-TEST_P(ASTMatchersTest, IsExplicit_CXXConstructorDecl_CXX20) {
-  if (!GetParam().isCXX20OrLater()) {
-    return;
-  }
-
-  EXPECT_TRUE(notMatches("template<bool b> struct S { explicit(b) S(int);};",
-                         cxxConstructorDecl(isExplicit())));
-  EXPECT_TRUE(matches("struct S { explicit(true) S(int);};",
-                      cxxConstructorDecl(isExplicit())));
-  EXPECT_TRUE(notMatches("struct S { explicit(false) S(int);};",
-                         cxxConstructorDecl(isExplicit())));
-}
-
-TEST_P(ASTMatchersTest, IsExplicit_CXXDeductionGuideDecl) {
-  if (!GetParam().isCXX17OrLater()) {
-    return;
-  }
-
-  EXPECT_TRUE(notMatches("template<typename T> struct S { S(int);};"
-                         "S(int) -> S<int>;",
-                         cxxDeductionGuideDecl(isExplicit())));
-  EXPECT_TRUE(matches("template<typename T> struct S { S(int);};"
-                      "explicit S(int) -> S<int>;",
-                      cxxDeductionGuideDecl(isExplicit())));
-}
-
-TEST_P(ASTMatchersTest, IsExplicit_CXXDeductionGuideDecl_CXX20) {
-  if (!GetParam().isCXX20OrLater()) {
-    return;
-  }
-
-  EXPECT_TRUE(matches("template<typename T> struct S { S(int);};"
-                      "explicit(true) S(int) -> S<int>;",
-                      cxxDeductionGuideDecl(isExplicit())));
-  EXPECT_TRUE(notMatches("template<typename T> struct S { S(int);};"
-                         "explicit(false) S(int) -> S<int>;",
-                         cxxDeductionGuideDecl(isExplicit())));
-  EXPECT_TRUE(
-      notMatches("template<typename T> struct S { S(int);};"
-                 "template<bool b = true> explicit(b) S(int) -> S<int>;",
-                 cxxDeductionGuideDecl(isExplicit())));
-}
-
-TEST_P(ASTMatchersTest, CXXConstructorDecl_Kinds) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  EXPECT_TRUE(
-      matches("struct S { S(); };", cxxConstructorDecl(isDefaultConstructor(),
-                                                       unless(isImplicit()))));
-  EXPECT_TRUE(notMatches(
-      "struct S { S(); };",
-      cxxConstructorDecl(isCopyConstructor(), unless(isImplicit()))));
-  EXPECT_TRUE(notMatches(
-      "struct S { S(); };",
-      cxxConstructorDecl(isMoveConstructor(), unless(isImplicit()))));
-
-  EXPECT_TRUE(notMatches(
-      "struct S { S(const S&); };",
-      cxxConstructorDecl(isDefaultConstructor(), unless(isImplicit()))));
-  EXPECT_TRUE(
-      matches("struct S { S(const S&); };",
-              cxxConstructorDecl(isCopyConstructor(), unless(isImplicit()))));
-  EXPECT_TRUE(notMatches(
-      "struct S { S(const S&); };",
-      cxxConstructorDecl(isMoveConstructor(), unless(isImplicit()))));
-
-  EXPECT_TRUE(notMatches(
-      "struct S { S(S&&); };",
-      cxxConstructorDecl(isDefaultConstructor(), unless(isImplicit()))));
-  EXPECT_TRUE(notMatches(
-      "struct S { S(S&&); };",
-      cxxConstructorDecl(isCopyConstructor(), unless(isImplicit()))));
-  EXPECT_TRUE(
-      matches("struct S { S(S&&); };",
-              cxxConstructorDecl(isMoveConstructor(), unless(isImplicit()))));
-}
-
-TEST_P(ASTMatchersTest, IsUserProvided) {
-  if (!GetParam().isCXX11OrLater()) {
-    return;
-  }
-
-  EXPECT_TRUE(notMatches("struct S { int X = 0; };",
-                         cxxConstructorDecl(isUserProvided())));
-  EXPECT_TRUE(notMatches("struct S { S() = default; };",
-                         cxxConstructorDecl(isUserProvided())));
-  EXPECT_TRUE(notMatches("struct S { S() = delete; };",
-                         cxxConstructorDecl(isUserProvided())));
-  EXPECT_TRUE(
-      matches("struct S { S(); };", cxxConstructorDecl(isUserProvided())));
-  EXPECT_TRUE(matches("struct S { S(); }; S::S(){}",
-                      cxxConstructorDecl(isUserProvided())));
-}
-
-TEST_P(ASTMatchersTest, IsDelegatingConstructor) {
-  if (!GetParam().isCXX11OrLater()) {
-    return;
-  }
-
-  EXPECT_TRUE(notMatches("struct S { S(); S(int); int X; };",
-                         cxxConstructorDecl(isDelegatingConstructor())));
-  EXPECT_TRUE(notMatches("struct S { S(){} S(int X) : X(X) {} int X; };",
-                         cxxConstructorDecl(isDelegatingConstructor())));
-  EXPECT_TRUE(matches(
-      "struct S { S() : S(0) {} S(int X) : X(X) {} int X; };",
-      cxxConstructorDecl(isDelegatingConstructor(), parameterCountIs(0))));
-  EXPECT_TRUE(matches(
-      "struct S { S(); S(int X); int X; }; S::S(int X) : S() {}",
-      cxxConstructorDecl(isDelegatingConstructor(), parameterCountIs(1))));
-}
-
-TEST_P(ASTMatchersTest, HasSize) {
-  StatementMatcher Literal = stringLiteral(hasSize(4));
-  EXPECT_TRUE(matches("const char *s = \"abcd\";", Literal));
-  // with escaped characters
-  EXPECT_TRUE(matches("const char *s = \"\x05\x06\x07\x08\";", Literal));
-  // no matching, too small
-  EXPECT_TRUE(notMatches("const char *s = \"ab\";", Literal));
-}
-
-TEST_P(ASTMatchersTest, HasSize_CXX) {
-  if (!GetParam().isCXX()) {
-    // FIXME: Fix this test to also work in non-C++ language modes.
-    return;
-  }
-
-  StatementMatcher Literal = stringLiteral(hasSize(4));
-  // wide string
-  EXPECT_TRUE(matches("const wchar_t *s = L\"abcd\";", Literal));
-}
-
-TEST_P(ASTMatchersTest, HasName_MatchesNamespaces) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  EXPECT_TRUE(matches("namespace a { namespace b { class C; } }",
-                      recordDecl(hasName("a::b::C"))));
-  EXPECT_TRUE(matches("namespace a { namespace b { class C; } }",
-                      recordDecl(hasName("::a::b::C"))));
-  EXPECT_TRUE(matches("namespace a { namespace b { class C; } }",
-                      recordDecl(hasName("b::C"))));
-  EXPECT_TRUE(matches("namespace a { namespace b { class C; } }",
-                      recordDecl(hasName("C"))));
-  EXPECT_TRUE(notMatches("namespace a { namespace b { class C; } }",
-                         recordDecl(hasName("c::b::C"))));
-  EXPECT_TRUE(notMatches("namespace a { namespace b { class C; } }",
-                         recordDecl(hasName("a::c::C"))));
-  EXPECT_TRUE(notMatches("namespace a { namespace b { class C; } }",
-                         recordDecl(hasName("a::b::A"))));
-  EXPECT_TRUE(notMatches("namespace a { namespace b { class C; } }",
-                         recordDecl(hasName("::C"))));
-  EXPECT_TRUE(notMatches("namespace a { namespace b { class C; } }",
-                         recordDecl(hasName("::b::C"))));
-  EXPECT_TRUE(notMatches("namespace a { namespace b { class C; } }",
-                         recordDecl(hasName("z::a::b::C"))));
-  EXPECT_TRUE(notMatches("namespace a { namespace b { class C; } }",
-                         recordDecl(hasName("a+b::C"))));
-  EXPECT_TRUE(notMatches("namespace a { namespace b { class AC; } }",
-                         recordDecl(hasName("C"))));
-}
-
-TEST_P(ASTMatchersTest, HasName_MatchesOuterClasses) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  EXPECT_TRUE(matches("class A { class B { class C; }; };",
-                      recordDecl(hasName("A::B::C"))));
-  EXPECT_TRUE(matches("class A { class B { class C; }; };",
-                      recordDecl(hasName("::A::B::C"))));
-  EXPECT_TRUE(matches("class A { class B { class C; }; };",
-                      recordDecl(hasName("B::C"))));
-  EXPECT_TRUE(
-      matches("class A { class B { class C; }; };", recordDecl(hasName("C"))));
-  EXPECT_TRUE(notMatches("class A { class B { class C; }; };",
-                         recordDecl(hasName("c::B::C"))));
-  EXPECT_TRUE(notMatches("class A { class B { class C; }; };",
-                         recordDecl(hasName("A::c::C"))));
-  EXPECT_TRUE(notMatches("class A { class B { class C; }; };",
-                         recordDecl(hasName("A::B::A"))));
-  EXPECT_TRUE(notMatches("class A { class B { class C; }; };",
-                         recordDecl(hasName("::C"))));
-  EXPECT_TRUE(notMatches("class A { class B { class C; }; };",
-                         recordDecl(hasName("::B::C"))));
-  EXPECT_TRUE(notMatches("class A { class B { class C; }; };",
-                         recordDecl(hasName("z::A::B::C"))));
-  EXPECT_TRUE(notMatches("class A { class B { class C; }; };",
-                         recordDecl(hasName("A+B::C"))));
-}
-
-TEST_P(ASTMatchersTest, HasName_MatchesInlinedNamespaces) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  StringRef code = "namespace a { inline namespace b { class C; } }";
-  EXPECT_TRUE(matches(code, recordDecl(hasName("a::b::C"))));
-  EXPECT_TRUE(matches(code, recordDecl(hasName("a::C"))));
-  EXPECT_TRUE(matches(code, recordDecl(hasName("::a::b::C"))));
-  EXPECT_TRUE(matches(code, recordDecl(hasName("::a::C"))));
-}
-
-TEST_P(ASTMatchersTest, HasName_MatchesAnonymousNamespaces) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  StringRef code = "namespace a { namespace { class C; } }";
-  EXPECT_TRUE(
-      matches(code, recordDecl(hasName("a::(anonymous namespace)::C"))));
-  EXPECT_TRUE(matches(code, recordDecl(hasName("a::C"))));
-  EXPECT_TRUE(
-      matches(code, recordDecl(hasName("::a::(anonymous namespace)::C"))));
-  EXPECT_TRUE(matches(code, recordDecl(hasName("::a::C"))));
-}
-
-TEST_P(ASTMatchersTest, HasName_MatchesAnonymousOuterClasses) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  EXPECT_TRUE(matches("class A { class { class C; } x; };",
-                      recordDecl(hasName("A::(anonymous class)::C"))));
-  EXPECT_TRUE(matches("class A { class { class C; } x; };",
-                      recordDecl(hasName("::A::(anonymous class)::C"))));
-  EXPECT_FALSE(matches("class A { class { class C; } x; };",
-                       recordDecl(hasName("::A::C"))));
-  EXPECT_TRUE(matches("class A { struct { class C; } x; };",
-                      recordDecl(hasName("A::(anonymous struct)::C"))));
-  EXPECT_TRUE(matches("class A { struct { class C; } x; };",
-                      recordDecl(hasName("::A::(anonymous struct)::C"))));
-  EXPECT_FALSE(matches("class A { struct { class C; } x; };",
-                       recordDecl(hasName("::A::C"))));
-}
-
-TEST_P(ASTMatchersTest, HasName_MatchesFunctionScope) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  StringRef code =
-      "namespace a { void F(int a) { struct S { int m; }; int i; } }";
-  EXPECT_TRUE(matches(code, varDecl(hasName("i"))));
-  EXPECT_FALSE(matches(code, varDecl(hasName("F()::i"))));
-
-  EXPECT_TRUE(matches(code, fieldDecl(hasName("m"))));
-  EXPECT_TRUE(matches(code, fieldDecl(hasName("S::m"))));
-  EXPECT_TRUE(matches(code, fieldDecl(hasName("F(int)::S::m"))));
-  EXPECT_TRUE(matches(code, fieldDecl(hasName("a::F(int)::S::m"))));
-  EXPECT_TRUE(matches(code, fieldDecl(hasName("::a::F(int)::S::m"))));
-}
-
-TEST_P(ASTMatchersTest, HasName_QualifiedStringMatchesThroughLinkage) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  // https://bugs.llvm.org/show_bug.cgi?id=42193
-  StringRef code = R"cpp(namespace foo { extern "C" void test(); })cpp";
-  EXPECT_TRUE(matches(code, functionDecl(hasName("test"))));
-  EXPECT_TRUE(matches(code, functionDecl(hasName("foo::test"))));
-  EXPECT_TRUE(matches(code, functionDecl(hasName("::foo::test"))));
-  EXPECT_TRUE(notMatches(code, functionDecl(hasName("::test"))));
-
-  code = R"cpp(namespace foo { extern "C" { void test(); } })cpp";
-  EXPECT_TRUE(matches(code, functionDecl(hasName("test"))));
-  EXPECT_TRUE(matches(code, functionDecl(hasName("foo::test"))));
-  EXPECT_TRUE(matches(code, functionDecl(hasName("::foo::test"))));
-  EXPECT_TRUE(notMatches(code, functionDecl(hasName("::test"))));
-}
-
-TEST_P(ASTMatchersTest, HasAnyName) {
-  if (!GetParam().isCXX()) {
-    // FIXME: Add a test for `hasAnyName()` that does not depend on C++.
-    return;
-  }
-
-  StringRef Code = "namespace a { namespace b { class C; } }";
-
-  EXPECT_TRUE(matches(Code, recordDecl(hasAnyName("XX", "a::b::C"))));
-  EXPECT_TRUE(matches(Code, recordDecl(hasAnyName("a::b::C", "XX"))));
-  EXPECT_TRUE(matches(Code, recordDecl(hasAnyName("XX::C", "a::b::C"))));
-  EXPECT_TRUE(matches(Code, recordDecl(hasAnyName("XX", "C"))));
-
-  EXPECT_TRUE(notMatches(Code, recordDecl(hasAnyName("::C", "::b::C"))));
-  EXPECT_TRUE(
-      matches(Code, recordDecl(hasAnyName("::C", "::b::C", "::a::b::C"))));
-
-  std::vector<StringRef> Names = {"::C", "::b::C", "::a::b::C"};
-  EXPECT_TRUE(matches(Code, recordDecl(hasAnyName(Names))));
-}
-
-TEST_P(ASTMatchersTest, IsDefinition) {
-  DeclarationMatcher DefinitionOfClassA =
-      recordDecl(hasName("A"), isDefinition());
-  EXPECT_TRUE(matches("struct A {};", DefinitionOfClassA));
-  EXPECT_TRUE(notMatches("struct A;", DefinitionOfClassA));
-
-  DeclarationMatcher DefinitionOfVariableA =
-      varDecl(hasName("a"), isDefinition());
-  EXPECT_TRUE(matches("int a;", DefinitionOfVariableA));
-  EXPECT_TRUE(notMatches("extern int a;", DefinitionOfVariableA));
-}
-
-TEST_P(ASTMatchersTest, IsDefinition_CXX) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  DeclarationMatcher DefinitionOfMethodA =
-      cxxMethodDecl(hasName("a"), isDefinition());
-  EXPECT_TRUE(matches("class A { void a() {} };", DefinitionOfMethodA));
-  EXPECT_TRUE(notMatches("class A { void a(); };", DefinitionOfMethodA));
-
-  DeclarationMatcher DefinitionOfObjCMethodA =
-      objcMethodDecl(hasName("a"), isDefinition());
-  EXPECT_TRUE(matchesObjC("@interface A @end "
-                          "@implementation A; -(void)a {} @end",
-                          DefinitionOfObjCMethodA));
-  EXPECT_TRUE(
-      notMatchesObjC("@interface A; - (void)a; @end", DefinitionOfObjCMethodA));
-}
-
-TEST_P(ASTMatchersTest, HandlesNullQualTypes) {
-  if (!GetParam().isCXX()) {
-    // FIXME: Add an equivalent test that does not depend on C++.
-    return;
-  }
-
-  // FIXME: Add a Type matcher so we can replace uses of this
-  // variable with Type(True())
-  const TypeMatcher AnyType = anything();
-
-  // We don't really care whether this matcher succeeds; we're testing that
-  // it completes without crashing.
-  EXPECT_TRUE(matches(
-      "struct A { };"
-      "template <typename T>"
-      "void f(T t) {"
-      "  T local_t(t /* this becomes a null QualType in the AST */);"
-      "}"
-      "void g() {"
-      "  f(0);"
-      "}",
-      expr(hasType(TypeMatcher(anyOf(TypeMatcher(hasDeclaration(anything())),
-                                     pointsTo(AnyType), references(AnyType)
-                                     // Other QualType matchers should go here.
-                                     ))))));
-}
-
-TEST_P(ASTMatchersTest, ObjCIvarRefExpr) {
-  StringRef ObjCString =
-      "@interface A @end "
-      "@implementation A { A *x; } - (void) func { x = 0; } @end";
-  EXPECT_TRUE(matchesObjC(ObjCString, objcIvarRefExpr()));
-  EXPECT_TRUE(matchesObjC(
-      ObjCString, objcIvarRefExpr(hasDeclaration(namedDecl(hasName("x"))))));
-  EXPECT_FALSE(matchesObjC(
-      ObjCString, objcIvarRefExpr(hasDeclaration(namedDecl(hasName("y"))))));
-}
-
-TEST_P(ASTMatchersTest, BlockExpr) {
-  EXPECT_TRUE(matchesObjC("void f() { ^{}(); }", blockExpr()));
-}
-
-TEST_P(ASTMatchersTest,
-       StatementCountIs_FindsNoStatementsInAnEmptyCompoundStatement) {
-  EXPECT_TRUE(matches("void f() { }", compoundStmt(statementCountIs(0))));
-  EXPECT_TRUE(notMatches("void f() {}", compoundStmt(statementCountIs(1))));
-}
-
-TEST_P(ASTMatchersTest, StatementCountIs_AppearsToMatchOnlyOneCount) {
-  EXPECT_TRUE(matches("void f() { 1; }", compoundStmt(statementCountIs(1))));
-  EXPECT_TRUE(notMatches("void f() { 1; }", compoundStmt(statementCountIs(0))));
-  EXPECT_TRUE(notMatches("void f() { 1; }", compoundStmt(statementCountIs(2))));
-}
-
-TEST_P(ASTMatchersTest, StatementCountIs_WorksWithMultipleStatements) {
-  EXPECT_TRUE(
-      matches("void f() { 1; 2; 3; }", compoundStmt(statementCountIs(3))));
-}
-
-TEST_P(ASTMatchersTest, StatementCountIs_WorksWithNestedCompoundStatements) {
-  EXPECT_TRUE(matches("void f() { { 1; } { 1; 2; 3; 4; } }",
-                      compoundStmt(statementCountIs(1))));
-  EXPECT_TRUE(matches("void f() { { 1; } { 1; 2; 3; 4; } }",
-                      compoundStmt(statementCountIs(2))));
-  EXPECT_TRUE(notMatches("void f() { { 1; } { 1; 2; 3; 4; } }",
-                         compoundStmt(statementCountIs(3))));
-  EXPECT_TRUE(matches("void f() { { 1; } { 1; 2; 3; 4; } }",
-                      compoundStmt(statementCountIs(4))));
-}
-
-TEST_P(ASTMatchersTest, Member_WorksInSimplestCase) {
-  if (!GetParam().isCXX()) {
-    // FIXME: Add a test for `member()` that does not depend on C++.
-    return;
-  }
-  EXPECT_TRUE(matches("struct { int first; } s; int i(s.first);",
-                      memberExpr(member(hasName("first")))));
-}
-
-TEST_P(ASTMatchersTest, Member_DoesNotMatchTheBaseExpression) {
-  if (!GetParam().isCXX()) {
-    // FIXME: Add a test for `member()` that does not depend on C++.
-    return;
-  }
-
-  // Don't pick out the wrong part of the member expression, this should
-  // be checking the member (name) only.
-  EXPECT_TRUE(notMatches("struct { int i; } first; int i(first.i);",
-                         memberExpr(member(hasName("first")))));
-}
-
-TEST_P(ASTMatchersTest, Member_MatchesInMemberFunctionCall) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  EXPECT_TRUE(matches("void f() {"
-                      "  struct { void first() {}; } s;"
-                      "  s.first();"
-                      "};",
-                      memberExpr(member(hasName("first")))));
-}
-
-TEST_P(ASTMatchersTest, FieldDecl) {
-  EXPECT_TRUE(
-      matches("struct A { int i; }; void f() { struct A a; a.i = 2; }",
-              memberExpr(hasDeclaration(fieldDecl(hasType(isInteger()))))));
-  EXPECT_TRUE(
-      notMatches("struct A { float f; }; void f() { struct A a; a.f = 2.0f; }",
-                 memberExpr(hasDeclaration(fieldDecl(hasType(isInteger()))))));
-}
-
-TEST_P(ASTMatchersTest, IsBitField) {
-  EXPECT_TRUE(matches("struct C { int a : 2; int b; };",
-                      fieldDecl(isBitField(), hasName("a"))));
-  EXPECT_TRUE(notMatches("struct C { int a : 2; int b; };",
-                         fieldDecl(isBitField(), hasName("b"))));
-  EXPECT_TRUE(matches("struct C { int a : 2; int b : 4; };",
-                      fieldDecl(isBitField(), hasBitWidth(2), hasName("a"))));
-}
-
-TEST_P(ASTMatchersTest, HasInClassInitializer) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  EXPECT_TRUE(
-      matches("class C { int a = 2; int b; };",
-              fieldDecl(hasInClassInitializer(integerLiteral(equals(2))),
-                        hasName("a"))));
-  EXPECT_TRUE(
-      notMatches("class C { int a = 2; int b; };",
-                 fieldDecl(hasInClassInitializer(anything()), hasName("b"))));
-}
-
-TEST_P(ASTMatchersTest, IsPublic_IsProtected_IsPrivate) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  EXPECT_TRUE(
-      matches("struct A { int i; };", fieldDecl(isPublic(), hasName("i"))));
-  EXPECT_TRUE(notMatches("struct A { int i; };",
-                         fieldDecl(isProtected(), hasName("i"))));
-  EXPECT_TRUE(
-      notMatches("struct A { int i; };", fieldDecl(isPrivate(), hasName("i"))));
-
-  EXPECT_TRUE(
-      notMatches("class A { int i; };", fieldDecl(isPublic(), hasName("i"))));
-  EXPECT_TRUE(notMatches("class A { int i; };",
-                         fieldDecl(isProtected(), hasName("i"))));
-  EXPECT_TRUE(
-      matches("class A { int i; };", fieldDecl(isPrivate(), hasName("i"))));
-
-  EXPECT_TRUE(notMatches("class A { protected: int i; };",
-                         fieldDecl(isPublic(), hasName("i"))));
-  EXPECT_TRUE(matches("class A { protected: int i; };",
-                      fieldDecl(isProtected(), hasName("i"))));
-  EXPECT_TRUE(notMatches("class A { protected: int i; };",
-                         fieldDecl(isPrivate(), hasName("i"))));
-
-  // Non-member decls have the AccessSpecifier AS_none and thus aren't matched.
-  EXPECT_TRUE(notMatches("int i;", varDecl(isPublic(), hasName("i"))));
-  EXPECT_TRUE(notMatches("int i;", varDecl(isProtected(), hasName("i"))));
-  EXPECT_TRUE(notMatches("int i;", varDecl(isPrivate(), hasName("i"))));
-}
-
-TEST_P(ASTMatchersTest,
-       HasDynamicExceptionSpec_MatchesDynamicExceptionSpecifications) {
-  if (!GetParam().supportsCXXDynamicExceptionSpecification()) {
-    return;
-  }
-
-  EXPECT_TRUE(notMatches("void f();", functionDecl(hasDynamicExceptionSpec())));
-  EXPECT_TRUE(
-      matches("void j() throw();", functionDecl(hasDynamicExceptionSpec())));
-  EXPECT_TRUE(
-      matches("void k() throw(int);", functionDecl(hasDynamicExceptionSpec())));
-  EXPECT_TRUE(
-      matches("void l() throw(...);", functionDecl(hasDynamicExceptionSpec())));
-
-  EXPECT_TRUE(
-      notMatches("void f();", functionProtoType(hasDynamicExceptionSpec())));
-  EXPECT_TRUE(matches("void j() throw();",
-                      functionProtoType(hasDynamicExceptionSpec())));
-  EXPECT_TRUE(matches("void k() throw(int);",
-                      functionProtoType(hasDynamicExceptionSpec())));
-  EXPECT_TRUE(matches("void l() throw(...);",
-                      functionProtoType(hasDynamicExceptionSpec())));
-}
-
-TEST_P(ASTMatchersTest,
-       HasDynamicExceptionSpec_MatchesDynamicExceptionSpecifications_CXX11) {
-  if (!GetParam().isCXX11OrLater()) {
-    return;
-  }
-
-  EXPECT_TRUE(notMatches("void g() noexcept;",
-                         functionDecl(hasDynamicExceptionSpec())));
-  EXPECT_TRUE(notMatches("void h() noexcept(true);",
-                         functionDecl(hasDynamicExceptionSpec())));
-  EXPECT_TRUE(notMatches("void i() noexcept(false);",
-                         functionDecl(hasDynamicExceptionSpec())));
-
-  EXPECT_TRUE(notMatches("void g() noexcept;",
-                         functionProtoType(hasDynamicExceptionSpec())));
-  EXPECT_TRUE(notMatches("void h() noexcept(true);",
-                         functionProtoType(hasDynamicExceptionSpec())));
-  EXPECT_TRUE(notMatches("void i() noexcept(false);",
-                         functionProtoType(hasDynamicExceptionSpec())));
-}
-
-TEST_P(ASTMatchersTest, HasObjectExpression_DoesNotMatchMember) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  EXPECT_TRUE(notMatches(
-      "class X {}; struct Z { X m; }; void f(Z z) { z.m; }",
-      memberExpr(hasObjectExpression(hasType(recordDecl(hasName("X")))))));
-}
-
-TEST_P(ASTMatchersTest, HasObjectExpression_MatchesBaseOfVariable) {
-  EXPECT_TRUE(matches(
-      "struct X { int m; }; void f(struct X x) { x.m; }",
-      memberExpr(hasObjectExpression(hasType(recordDecl(hasName("X")))))));
-  EXPECT_TRUE(matches("struct X { int m; }; void f(struct X* x) { x->m; }",
-                      memberExpr(hasObjectExpression(
-                          hasType(pointsTo(recordDecl(hasName("X"))))))));
-}
-
-TEST_P(ASTMatchersTest, HasObjectExpression_MatchesBaseOfVariable_CXX) {
-  if (!GetParam().isCXX() || GetParam().hasDelayedTemplateParsing()) {
-    // FIXME: Fix this test to work with delayed template parsing.
-    return;
-  }
-
-  EXPECT_TRUE(matches("template <class T> struct X { void f() { T t; t.m; } };",
-                      cxxDependentScopeMemberExpr(hasObjectExpression(
-                          declRefExpr(to(namedDecl(hasName("t"))))))));
-  EXPECT_TRUE(
-      matches("template <class T> struct X { void f() { T t; t->m; } };",
-              cxxDependentScopeMemberExpr(hasObjectExpression(
-                  declRefExpr(to(namedDecl(hasName("t"))))))));
-}
-
-TEST_P(ASTMatchersTest, HasObjectExpression_MatchesBaseOfMemberFunc) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  EXPECT_TRUE(matches(
-      "struct X { void f(); }; void g(X x) { x.f(); }",
-      memberExpr(hasObjectExpression(hasType(recordDecl(hasName("X")))))));
-}
-
-TEST_P(ASTMatchersTest, HasObjectExpression_MatchesBaseOfMemberFunc_Template) {
-  if (!GetParam().isCXX() || GetParam().hasDelayedTemplateParsing()) {
-    // FIXME: Fix this test to work with delayed template parsing.
-    return;
-  }
-
-  EXPECT_TRUE(matches("struct X { template <class T> void f(); };"
-                      "template <class T> void g(X x) { x.f<T>(); }",
-                      unresolvedMemberExpr(hasObjectExpression(
-                          hasType(recordDecl(hasName("X")))))));
-  EXPECT_TRUE(matches("template <class T> void f(T t) { t.g(); }",
-                      cxxDependentScopeMemberExpr(hasObjectExpression(
-                          declRefExpr(to(namedDecl(hasName("t"))))))));
-}
-
-TEST_P(ASTMatchersTest, HasObjectExpression_ImplicitlyFormedMemberExpression) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  EXPECT_TRUE(matches("class X {}; struct S { X m; void f() { this->m; } };",
-                      memberExpr(hasObjectExpression(
-                          hasType(pointsTo(recordDecl(hasName("S"))))))));
-  EXPECT_TRUE(matches("class X {}; struct S { X m; void f() { m; } };",
-                      memberExpr(hasObjectExpression(
-                          hasType(pointsTo(recordDecl(hasName("S"))))))));
-}
-
-TEST_P(ASTMatchersTest, FieldDecl_DoesNotMatchNonFieldMembers) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  EXPECT_TRUE(notMatches("class X { void m(); };", fieldDecl(hasName("m"))));
-  EXPECT_TRUE(notMatches("class X { class m {}; };", fieldDecl(hasName("m"))));
-  EXPECT_TRUE(notMatches("class X { enum { m }; };", fieldDecl(hasName("m"))));
-  EXPECT_TRUE(notMatches("class X { enum m {}; };", fieldDecl(hasName("m"))));
-}
-
-TEST_P(ASTMatchersTest, FieldDecl_MatchesField) {
-  EXPECT_TRUE(matches("struct X { int m; };", fieldDecl(hasName("m"))));
-}
-
-TEST_P(ASTMatchersTest, IsVolatileQualified) {
-  EXPECT_TRUE(
-      matches("volatile int i = 42;", varDecl(hasType(isVolatileQualified()))));
-  EXPECT_TRUE(
-      notMatches("volatile int *i;", varDecl(hasType(isVolatileQualified()))));
-  EXPECT_TRUE(matches("typedef volatile int v_int; v_int i = 42;",
-                      varDecl(hasType(isVolatileQualified()))));
-}
-
-TEST_P(ASTMatchersTest, IsConstQualified_MatchesConstInt) {
-  EXPECT_TRUE(
-      matches("const int i = 42;", varDecl(hasType(isConstQualified()))));
-}
-
-TEST_P(ASTMatchersTest, IsConstQualified_MatchesConstPointer) {
-  EXPECT_TRUE(matches("int i = 42; int* const p = &i;",
-                      varDecl(hasType(isConstQualified()))));
-}
-
-TEST_P(ASTMatchersTest, IsConstQualified_MatchesThroughTypedef) {
-  EXPECT_TRUE(matches("typedef const int const_int; const_int i = 42;",
-                      varDecl(hasType(isConstQualified()))));
-  EXPECT_TRUE(matches("typedef int* int_ptr; const int_ptr p = ((int*)0);",
-                      varDecl(hasType(isConstQualified()))));
-}
-
-TEST_P(ASTMatchersTest, IsConstQualified_DoesNotMatchInappropriately) {
-  EXPECT_TRUE(notMatches("typedef int nonconst_int; nonconst_int i = 42;",
-                         varDecl(hasType(isConstQualified()))));
-  EXPECT_TRUE(
-      notMatches("int const* p;", varDecl(hasType(isConstQualified()))));
-}
-
-TEST_P(ASTMatchersTest, DeclCountIs_DeclCountIsCorrect) {
-  EXPECT_TRUE(matches("void f() {int i,j;}", declStmt(declCountIs(2))));
-  EXPECT_TRUE(
-      notMatches("void f() {int i,j; int k;}", declStmt(declCountIs(3))));
-  EXPECT_TRUE(
-      notMatches("void f() {int i,j, k, l;}", declStmt(declCountIs(3))));
-}
-
-TEST_P(ASTMatchersTest, EachOf_TriggersForEachMatch) {
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-      "class A { int a; int b; };",
-      recordDecl(eachOf(has(fieldDecl(hasName("a")).bind("v")),
-                        has(fieldDecl(hasName("b")).bind("v")))),
-      std::make_unique<VerifyIdIsBoundTo<FieldDecl>>("v", 2)));
-}
-
-TEST_P(ASTMatchersTest, EachOf_BehavesLikeAnyOfUnlessBothMatch) {
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-      "struct A { int a; int c; };",
-      recordDecl(eachOf(has(fieldDecl(hasName("a")).bind("v")),
-                        has(fieldDecl(hasName("b")).bind("v")))),
-      std::make_unique<VerifyIdIsBoundTo<FieldDecl>>("v", 1)));
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-      "struct A { int c; int b; };",
-      recordDecl(eachOf(has(fieldDecl(hasName("a")).bind("v")),
-                        has(fieldDecl(hasName("b")).bind("v")))),
-      std::make_unique<VerifyIdIsBoundTo<FieldDecl>>("v", 1)));
-  EXPECT_TRUE(
-      notMatches("struct A { int c; int d; };",
-                 recordDecl(eachOf(has(fieldDecl(hasName("a")).bind("v")),
-                                   has(fieldDecl(hasName("b")).bind("v"))))));
-}
-
-TEST_P(ASTMatchersTest, Optionally_SubmatchersDoNotMatch) {
-  EXPECT_TRUE(matchAndVerifyResultFalse(
-      "class A { int a; int b; };",
-      recordDecl(optionally(has(fieldDecl(hasName("c")).bind("c")))),
-      std::make_unique<VerifyIdIsBoundTo<FieldDecl>>("c")));
-}
-
-// Regression test.
-TEST_P(ASTMatchersTest, Optionally_SubmatchersDoNotMatchButPreserveBindings) {
-  StringRef Code = "class A { int a; int b; };";
-  auto Matcher = recordDecl(decl().bind("decl"),
-                            optionally(has(fieldDecl(hasName("c")).bind("v"))));
-  // "decl" is still bound.
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-      Code, Matcher, std::make_unique<VerifyIdIsBoundTo<RecordDecl>>("decl")));
-  // "v" is not bound, but the match still suceeded.
-  EXPECT_TRUE(matchAndVerifyResultFalse(
-      Code, Matcher, std::make_unique<VerifyIdIsBoundTo<FieldDecl>>("v")));
-}
-
-TEST_P(ASTMatchersTest, Optionally_SubmatchersMatch) {
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-      "class A { int a; int c; };",
-      recordDecl(optionally(has(fieldDecl(hasName("a")).bind("v")))),
-      std::make_unique<VerifyIdIsBoundTo<FieldDecl>>("v")));
-}
-
-TEST_P(ASTMatchersTest,
-       IsTemplateInstantiation_MatchesImplicitClassTemplateInstantiation) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  // Make sure that we can both match the class by name (::X) and by the type
-  // the template was instantiated with (via a field).
-
-  EXPECT_TRUE(
-      matches("template <typename T> class X {}; class A {}; X<A> x;",
-              cxxRecordDecl(hasName("::X"), isTemplateInstantiation())));
-
-  EXPECT_TRUE(matches(
-      "template <typename T> class X { T t; }; class A {}; X<A> x;",
-      cxxRecordDecl(
-          isTemplateInstantiation(),
-          hasDescendant(fieldDecl(hasType(recordDecl(hasName("A"))))))));
-}
-
-TEST_P(ASTMatchersTest,
-       IsTemplateInstantiation_MatchesImplicitFunctionTemplateInstantiation) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  EXPECT_TRUE(matches(
-      "template <typename T> void f(T t) {} class A {}; void g() { f(A()); }",
-      functionDecl(hasParameter(0, hasType(recordDecl(hasName("A")))),
-                   isTemplateInstantiation())));
-}
-
-TEST_P(ASTMatchersTest,
-       IsTemplateInstantiation_MatchesExplicitClassTemplateInstantiation) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  EXPECT_TRUE(matches("template <typename T> class X { T t; }; class A {};"
-                      "template class X<A>;",
-                      cxxRecordDecl(isTemplateInstantiation(),
-                                    hasDescendant(fieldDecl(
-                                        hasType(recordDecl(hasName("A"))))))));
-
-  // Make sure that we match the instantiation instead of the template
-  // definition by checking whether the member function is present.
-  EXPECT_TRUE(
-      matches("template <typename T> class X { void f() { T t; } };"
-              "extern template class X<int>;",
-              cxxRecordDecl(isTemplateInstantiation(),
-                            unless(hasDescendant(varDecl(hasName("t")))))));
-}
-
-TEST_P(
-    ASTMatchersTest,
-    IsTemplateInstantiation_MatchesInstantiationOfPartiallySpecializedClassTemplate) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  EXPECT_TRUE(
-      matches("template <typename T> class X {};"
-              "template <typename T> class X<T*> {}; class A {}; X<A*> x;",
-              cxxRecordDecl(hasName("::X"), isTemplateInstantiation())));
-}
-
-TEST_P(
-    ASTMatchersTest,
-    IsTemplateInstantiation_MatchesInstantiationOfClassTemplateNestedInNonTemplate) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  EXPECT_TRUE(
-      matches("class A {};"
-              "class X {"
-              "  template <typename U> class Y { U u; };"
-              "  Y<A> y;"
-              "};",
-              cxxRecordDecl(hasName("::X::Y"), isTemplateInstantiation())));
-}
-
-TEST_P(
-    ASTMatchersTest,
-    IsTemplateInstantiation_DoesNotMatchInstantiationsInsideOfInstantiation) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  // FIXME: Figure out whether this makes sense. It doesn't affect the
-  // normal use case as long as the uppermost instantiation always is marked
-  // as template instantiation, but it might be confusing as a predicate.
-  EXPECT_TRUE(matches(
-      "class A {};"
-      "template <typename T> class X {"
-      "  template <typename U> class Y { U u; };"
-      "  Y<T> y;"
-      "}; X<A> x;",
-      cxxRecordDecl(hasName("::X<A>::Y"), unless(isTemplateInstantiation()))));
-}
-
-TEST_P(
-    ASTMatchersTest,
-    IsTemplateInstantiation_DoesNotMatchExplicitClassTemplateSpecialization) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  EXPECT_TRUE(
-      notMatches("template <typename T> class X {}; class A {};"
-                 "template <> class X<A> {}; X<A> x;",
-                 cxxRecordDecl(hasName("::X"), isTemplateInstantiation())));
-}
-
-TEST_P(ASTMatchersTest, IsTemplateInstantiation_DoesNotMatchNonTemplate) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  EXPECT_TRUE(notMatches("class A {}; class Y { A a; };",
-                         cxxRecordDecl(isTemplateInstantiation())));
-}
-
-TEST_P(ASTMatchersTest, IsInstantiated_MatchesInstantiation) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  EXPECT_TRUE(
-      matches("template<typename T> class A { T i; }; class Y { A<int> a; };",
-              cxxRecordDecl(isInstantiated())));
-}
-
-TEST_P(ASTMatchersTest, IsInstantiated_NotMatchesDefinition) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  EXPECT_TRUE(notMatches("template<typename T> class A { T i; };",
-                         cxxRecordDecl(isInstantiated())));
-}
-
-TEST_P(ASTMatchersTest, IsInTemplateInstantiation_MatchesInstantiationStmt) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  EXPECT_TRUE(matches("template<typename T> struct A { A() { T i; } };"
-                      "class Y { A<int> a; }; Y y;",
-                      declStmt(isInTemplateInstantiation())));
-}
-
-TEST_P(ASTMatchersTest, IsInTemplateInstantiation_NotMatchesDefinitionStmt) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  EXPECT_TRUE(notMatches("template<typename T> struct A { void x() { T i; } };",
-                         declStmt(isInTemplateInstantiation())));
-}
-
-TEST_P(ASTMatchersTest, IsInstantiated_MatchesFunctionInstantiation) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  EXPECT_TRUE(
-      matches("template<typename T> void A(T t) { T i; } void x() { A(0); }",
-              functionDecl(isInstantiated())));
-}
-
-TEST_P(ASTMatchersTest, IsInstantiated_NotMatchesFunctionDefinition) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  EXPECT_TRUE(notMatches("template<typename T> void A(T t) { T i; }",
-                         varDecl(isInstantiated())));
-}
-
-TEST_P(ASTMatchersTest,
-       IsInTemplateInstantiation_MatchesFunctionInstantiationStmt) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  EXPECT_TRUE(
-      matches("template<typename T> void A(T t) { T i; } void x() { A(0); }",
-              declStmt(isInTemplateInstantiation())));
-}
-
-TEST_P(ASTMatchersTest,
-       IsInTemplateInstantiation_NotMatchesFunctionDefinitionStmt) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  EXPECT_TRUE(notMatches("template<typename T> void A(T t) { T i; }",
-                         declStmt(isInTemplateInstantiation())));
-}
-
-TEST_P(ASTMatchersTest, IsInTemplateInstantiation_Sharing) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  auto Matcher = binaryOperator(unless(isInTemplateInstantiation()));
-  // FIXME: Node sharing is an implementation detail, exposing it is ugly
-  // and makes the matcher behave in non-obvious ways.
-  EXPECT_TRUE(notMatches(
-      "int j; template<typename T> void A(T t) { j += 42; } void x() { A(0); }",
-      Matcher));
-  EXPECT_TRUE(matches(
-      "int j; template<typename T> void A(T t) { j += t; } void x() { A(0); }",
-      Matcher));
-}
-
-TEST_P(ASTMatchersTest, IsInstantiationDependent_MatchesNonValueTypeDependent) {
-  if (!GetParam().isCXX() || GetParam().hasDelayedTemplateParsing()) {
-    // FIXME: Fix this test to work with delayed template parsing.
-    return;
-  }
-
-  EXPECT_TRUE(matches(
-      "template<typename T> void f() { (void) sizeof(sizeof(T() + T())); }",
-      expr(isInstantiationDependent())));
-}
-
-TEST_P(ASTMatchersTest, IsInstantiationDependent_MatchesValueDependent) {
-  if (!GetParam().isCXX() || GetParam().hasDelayedTemplateParsing()) {
-    // FIXME: Fix this test to work with delayed template parsing.
-    return;
-  }
-
-  EXPECT_TRUE(matches("template<int T> int f() { return T; }",
-                      expr(isInstantiationDependent())));
-}
-
-TEST_P(ASTMatchersTest, IsInstantiationDependent_MatchesTypeDependent) {
-  if (!GetParam().isCXX() || GetParam().hasDelayedTemplateParsing()) {
-    // FIXME: Fix this test to work with delayed template parsing.
-    return;
-  }
-
-  EXPECT_TRUE(matches("template<typename T> T f() { return T(); }",
-                      expr(isInstantiationDependent())));
-}
-
-TEST_P(ASTMatchersTest, IsTypeDependent_MatchesTypeDependent) {
-  if (!GetParam().isCXX() || GetParam().hasDelayedTemplateParsing()) {
-    // FIXME: Fix this test to work with delayed template parsing.
-    return;
-  }
-
-  EXPECT_TRUE(matches("template<typename T> T f() { return T(); }",
-                      expr(isTypeDependent())));
-}
-
-TEST_P(ASTMatchersTest, IsTypeDependent_NotMatchesValueDependent) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  EXPECT_TRUE(notMatches("template<int T> int f() { return T; }",
-                         expr(isTypeDependent())));
-}
-
-TEST_P(ASTMatchersTest, IsValueDependent_MatchesValueDependent) {
-  if (!GetParam().isCXX() || GetParam().hasDelayedTemplateParsing()) {
-    // FIXME: Fix this test to work with delayed template parsing.
-    return;
-  }
-
-  EXPECT_TRUE(matches("template<int T> int f() { return T; }",
-                      expr(isValueDependent())));
-}
-
-TEST_P(ASTMatchersTest, IsValueDependent_MatchesTypeDependent) {
-  if (!GetParam().isCXX() || GetParam().hasDelayedTemplateParsing()) {
-    // FIXME: Fix this test to work with delayed template parsing.
-    return;
-  }
-
-  EXPECT_TRUE(matches("template<typename T> T f() { return T(); }",
-                      expr(isValueDependent())));
-}
-
-TEST_P(ASTMatchersTest, IsValueDependent_MatchesInstantiationDependent) {
-  if (!GetParam().isCXX() || GetParam().hasDelayedTemplateParsing()) {
-    // FIXME: Fix this test to work with delayed template parsing.
-    return;
-  }
-
-  EXPECT_TRUE(matches(
-      "template<typename T> void f() { (void) sizeof(sizeof(T() + T())); }",
-      expr(isValueDependent())));
-}
-
-TEST_P(ASTMatchersTest,
-       IsExplicitTemplateSpecialization_DoesNotMatchPrimaryTemplate) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  EXPECT_TRUE(notMatches("template <typename T> class X {};",
-                         cxxRecordDecl(isExplicitTemplateSpecialization())));
-  EXPECT_TRUE(notMatches("template <typename T> void f(T t);",
-                         functionDecl(isExplicitTemplateSpecialization())));
-}
-
-TEST_P(
-    ASTMatchersTest,
-    IsExplicitTemplateSpecialization_DoesNotMatchExplicitTemplateInstantiations) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  EXPECT_TRUE(
-      notMatches("template <typename T> class X {};"
-                 "template class X<int>; extern template class X<long>;",
-                 cxxRecordDecl(isExplicitTemplateSpecialization())));
-  EXPECT_TRUE(
-      notMatches("template <typename T> void f(T t) {}"
-                 "template void f(int t); extern template void f(long t);",
-                 functionDecl(isExplicitTemplateSpecialization())));
-}
-
-TEST_P(
-    ASTMatchersTest,
-    IsExplicitTemplateSpecialization_DoesNotMatchImplicitTemplateInstantiations) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  EXPECT_TRUE(notMatches("template <typename T> class X {}; X<int> x;",
-                         cxxRecordDecl(isExplicitTemplateSpecialization())));
-  EXPECT_TRUE(
-      notMatches("template <typename T> void f(T t); void g() { f(10); }",
-                 functionDecl(isExplicitTemplateSpecialization())));
-}
-
-TEST_P(
-    ASTMatchersTest,
-    IsExplicitTemplateSpecialization_MatchesExplicitTemplateSpecializations) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  EXPECT_TRUE(matches("template <typename T> class X {};"
-                      "template<> class X<int> {};",
-                      cxxRecordDecl(isExplicitTemplateSpecialization())));
-  EXPECT_TRUE(matches("template <typename T> void f(T t) {}"
-                      "template<> void f(int t) {}",
-                      functionDecl(isExplicitTemplateSpecialization())));
-}
-
-TEST_P(ASTMatchersTest, IsNoReturn) {
-  EXPECT_TRUE(notMatches("void func();", functionDecl(isNoReturn())));
-  EXPECT_TRUE(notMatches("void func() {}", functionDecl(isNoReturn())));
-
-  EXPECT_TRUE(matches("__attribute__((noreturn)) void func();",
-                      functionDecl(isNoReturn())));
-  EXPECT_TRUE(matches("__attribute__((noreturn)) void func() {}",
-                      functionDecl(isNoReturn())));
-
-  EXPECT_TRUE(matches("_Noreturn void func();", functionDecl(isNoReturn())));
-  EXPECT_TRUE(matches("_Noreturn void func() {}", functionDecl(isNoReturn())));
-}
-
-TEST_P(ASTMatchersTest, IsNoReturn_CXX) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  EXPECT_TRUE(
-      notMatches("struct S { void func(); };", functionDecl(isNoReturn())));
-  EXPECT_TRUE(
-      notMatches("struct S { void func() {} };", functionDecl(isNoReturn())));
-
-  EXPECT_TRUE(notMatches("struct S { static void func(); };",
-                         functionDecl(isNoReturn())));
-  EXPECT_TRUE(notMatches("struct S { static void func() {} };",
-                         functionDecl(isNoReturn())));
-
-  EXPECT_TRUE(notMatches("struct S { S(); };", functionDecl(isNoReturn())));
-  EXPECT_TRUE(notMatches("struct S { S() {} };", functionDecl(isNoReturn())));
-
-  // ---
-
-  EXPECT_TRUE(matches("struct S { __attribute__((noreturn)) void func(); };",
-                      functionDecl(isNoReturn())));
-  EXPECT_TRUE(matches("struct S { __attribute__((noreturn)) void func() {} };",
-                      functionDecl(isNoReturn())));
-
-  EXPECT_TRUE(
-      matches("struct S { __attribute__((noreturn)) static void func(); };",
-              functionDecl(isNoReturn())));
-  EXPECT_TRUE(
-      matches("struct S { __attribute__((noreturn)) static void func() {} };",
-              functionDecl(isNoReturn())));
-
-  EXPECT_TRUE(matches("struct S { __attribute__((noreturn)) S(); };",
-                      functionDecl(isNoReturn())));
-  EXPECT_TRUE(matches("struct S { __attribute__((noreturn)) S() {} };",
-                      functionDecl(isNoReturn())));
-}
-
-TEST_P(ASTMatchersTest, IsNoReturn_CXX11Attribute) {
-  if (!GetParam().isCXX11OrLater()) {
-    return;
-  }
-
-  EXPECT_TRUE(matches("[[noreturn]] void func();", functionDecl(isNoReturn())));
-  EXPECT_TRUE(
-      matches("[[noreturn]] void func() {}", functionDecl(isNoReturn())));
-
-  EXPECT_TRUE(matches("struct S { [[noreturn]] void func(); };",
-                      functionDecl(isNoReturn())));
-  EXPECT_TRUE(matches("struct S { [[noreturn]] void func() {} };",
-                      functionDecl(isNoReturn())));
-
-  EXPECT_TRUE(matches("struct S { [[noreturn]] static void func(); };",
-                      functionDecl(isNoReturn())));
-  EXPECT_TRUE(matches("struct S { [[noreturn]] static void func() {} };",
-                      functionDecl(isNoReturn())));
-
-  EXPECT_TRUE(
-      matches("struct S { [[noreturn]] S(); };", functionDecl(isNoReturn())));
-  EXPECT_TRUE(
-      matches("struct S { [[noreturn]] S() {} };", functionDecl(isNoReturn())));
-}
-
-TEST_P(ASTMatchersTest, BooleanType) {
-  if (!GetParam().isCXX()) {
-    // FIXME: Add a test for `booleanType()` that does not depend on C++.
-    return;
-  }
-
-  EXPECT_TRUE(matches("struct S { bool func(); };",
-                      cxxMethodDecl(returns(booleanType()))));
-  EXPECT_TRUE(notMatches("struct S { void func(); };",
-                         cxxMethodDecl(returns(booleanType()))));
-}
-
-TEST_P(ASTMatchersTest, VoidType) {
-  if (!GetParam().isCXX()) {
-    // FIXME: Add a test for `voidType()` that does not depend on C++.
-    return;
-  }
-
-  EXPECT_TRUE(matches("struct S { void func(); };",
-                      cxxMethodDecl(returns(voidType()))));
-}
-
-TEST_P(ASTMatchersTest, RealFloatingPointType) {
-  if (!GetParam().isCXX()) {
-    // FIXME: Add a test for `realFloatingPointType()` that does not depend on
-    // C++.
-    return;
-  }
-
-  EXPECT_TRUE(matches("struct S { float func(); };",
-                      cxxMethodDecl(returns(realFloatingPointType()))));
-  EXPECT_TRUE(notMatches("struct S { int func(); };",
-                         cxxMethodDecl(returns(realFloatingPointType()))));
-  EXPECT_TRUE(matches("struct S { long double func(); };",
-                      cxxMethodDecl(returns(realFloatingPointType()))));
-}
-
-TEST_P(ASTMatchersTest, ArrayType) {
-  EXPECT_TRUE(matches("int a[] = {2,3};", arrayType()));
-  EXPECT_TRUE(matches("int a[42];", arrayType()));
-  EXPECT_TRUE(matches("void f(int b) { int a[b]; }", arrayType()));
-
-  EXPECT_TRUE(notMatches("struct A {}; struct A a[7];",
-                         arrayType(hasElementType(builtinType()))));
-
-  EXPECT_TRUE(matches("int const a[] = { 2, 3 };",
-                      qualType(arrayType(hasElementType(builtinType())))));
-  EXPECT_TRUE(matches(
-      "int const a[] = { 2, 3 };",
-      qualType(isConstQualified(), arrayType(hasElementType(builtinType())))));
-  EXPECT_TRUE(matches("typedef const int T; T x[] = { 1, 2 };",
-                      qualType(isConstQualified(), arrayType())));
-
-  EXPECT_TRUE(notMatches(
-      "int a[] = { 2, 3 };",
-      qualType(isConstQualified(), arrayType(hasElementType(builtinType())))));
-  EXPECT_TRUE(notMatches(
-      "int a[] = { 2, 3 };",
-      qualType(arrayType(hasElementType(isConstQualified(), builtinType())))));
-  EXPECT_TRUE(notMatches("int const a[] = { 2, 3 };",
-                         qualType(arrayType(hasElementType(builtinType())),
-                                  unless(isConstQualified()))));
-
-  EXPECT_TRUE(
-      matches("int a[2];", constantArrayType(hasElementType(builtinType()))));
-  EXPECT_TRUE(matches("const int a = 0;", qualType(isInteger())));
-}
-
-TEST_P(ASTMatchersTest, DecayedType) {
-  EXPECT_TRUE(
-      matches("void f(int i[]);",
-              valueDecl(hasType(decayedType(hasDecayedType(pointerType()))))));
-  EXPECT_TRUE(notMatches("int i[7];", decayedType()));
-}
-
-TEST_P(ASTMatchersTest, ComplexType) {
-  EXPECT_TRUE(matches("_Complex float f;", complexType()));
-  EXPECT_TRUE(
-      matches("_Complex float f;", complexType(hasElementType(builtinType()))));
-  EXPECT_TRUE(notMatches("_Complex float f;",
-                         complexType(hasElementType(isInteger()))));
-}
-
-TEST_P(ASTMatchersTest, IsAnonymous) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  EXPECT_TRUE(notMatches("namespace N {}", namespaceDecl(isAnonymous())));
-  EXPECT_TRUE(matches("namespace {}", namespaceDecl(isAnonymous())));
-}
-
-TEST_P(ASTMatchersTest, InStdNamespace) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  EXPECT_TRUE(notMatches("class vector {};"
-                         "namespace foo {"
-                         "  class vector {};"
-                         "}"
-                         "namespace foo {"
-                         "  namespace std {"
-                         "    class vector {};"
-                         "  }"
-                         "}",
-                         cxxRecordDecl(hasName("vector"), isInStdNamespace())));
-
-  EXPECT_TRUE(matches("namespace std {"
-                      "  class vector {};"
-                      "}",
-                      cxxRecordDecl(hasName("vector"), isInStdNamespace())));
-}
-
-TEST_P(ASTMatchersTest, InStdNamespace_CXX11) {
-  if (!GetParam().isCXX11OrLater()) {
-    return;
-  }
-
-  EXPECT_TRUE(matches("namespace std {"
-                      "  inline namespace __1 {"
-                      "    class vector {};"
-                      "  }"
-                      "}",
-                      cxxRecordDecl(hasName("vector"), isInStdNamespace())));
-  EXPECT_TRUE(notMatches("namespace std {"
-                         "  inline namespace __1 {"
-                         "    inline namespace __fs {"
-                         "      namespace filesystem {"
-                         "        inline namespace v1 {"
-                         "          class path {};"
-                         "        }"
-                         "      }"
-                         "    }"
-                         "  }"
-                         "}",
-                         cxxRecordDecl(hasName("path"), isInStdNamespace())));
-  EXPECT_TRUE(
-      matches("namespace std {"
-              "  inline namespace __1 {"
-              "    inline namespace __fs {"
-              "      namespace filesystem {"
-              "        inline namespace v1 {"
-              "          class path {};"
-              "        }"
-              "      }"
-              "    }"
-              "  }"
-              "}",
-              cxxRecordDecl(hasName("path"),
-                            hasAncestor(namespaceDecl(hasName("filesystem"),
-                                                      isInStdNamespace())))));
-}
-
-TEST_P(ASTMatchersTest, EqualsBoundNodeMatcher_QualType) {
-  EXPECT_TRUE(matches(
-      "int i = 1;", varDecl(hasType(qualType().bind("type")),
-                            hasInitializer(ignoringParenImpCasts(
-                                hasType(qualType(equalsBoundNode("type"))))))));
-  EXPECT_TRUE(notMatches("int i = 1.f;",
-                         varDecl(hasType(qualType().bind("type")),
-                                 hasInitializer(ignoringParenImpCasts(hasType(
-                                     qualType(equalsBoundNode("type"))))))));
-}
-
-TEST_P(ASTMatchersTest, EqualsBoundNodeMatcher_NonMatchingTypes) {
-  EXPECT_TRUE(notMatches(
-      "int i = 1;", varDecl(namedDecl(hasName("i")).bind("name"),
-                            hasInitializer(ignoringParenImpCasts(
-                                hasType(qualType(equalsBoundNode("type"))))))));
-}
-
-TEST_P(ASTMatchersTest, EqualsBoundNodeMatcher_Stmt) {
-  EXPECT_TRUE(
-      matches("void f() { if(1) {} }",
-              stmt(allOf(ifStmt().bind("if"),
-                         hasParent(stmt(has(stmt(equalsBoundNode("if")))))))));
-
-  EXPECT_TRUE(notMatches(
-      "void f() { if(1) { if (1) {} } }",
-      stmt(allOf(ifStmt().bind("if"), has(stmt(equalsBoundNode("if")))))));
-}
-
-TEST_P(ASTMatchersTest, EqualsBoundNodeMatcher_Decl) {
-  if (!GetParam().isCXX()) {
-    // FIXME: Add a test for `equalsBoundNode()` for declarations that does not
-    // depend on C++.
-    return;
-  }
-
-  EXPECT_TRUE(matches(
-      "class X { class Y {}; };",
-      decl(allOf(recordDecl(hasName("::X::Y")).bind("record"),
-                 hasParent(decl(has(decl(equalsBoundNode("record")))))))));
-
-  EXPECT_TRUE(notMatches("class X { class Y {}; };",
-                         decl(allOf(recordDecl(hasName("::X")).bind("record"),
-                                    has(decl(equalsBoundNode("record")))))));
-}
-
-TEST_P(ASTMatchersTest, EqualsBoundNodeMatcher_Type) {
-  if (!GetParam().isCXX()) {
-    // FIXME: Add a test for `equalsBoundNode()` for types that does not depend
-    // on C++.
-    return;
-  }
-  EXPECT_TRUE(matches(
-      "class X { int a; int b; };",
-      recordDecl(
-          has(fieldDecl(hasName("a"), hasType(type().bind("t")))),
-          has(fieldDecl(hasName("b"), hasType(type(equalsBoundNode("t"))))))));
-
-  EXPECT_TRUE(notMatches(
-      "class X { int a; double b; };",
-      recordDecl(
-          has(fieldDecl(hasName("a"), hasType(type().bind("t")))),
-          has(fieldDecl(hasName("b"), hasType(type(equalsBoundNode("t"))))))));
-}
-
-TEST_P(ASTMatchersTest, EqualsBoundNodeMatcher_UsingForEachDescendant) {
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-      "int f() {"
-      "  if (1) {"
-      "    int i = 9;"
-      "  }"
-      "  int j = 10;"
-      "  {"
-      "    float k = 9.0;"
-      "  }"
-      "  return 0;"
-      "}",
-      // Look for variable declarations within functions whose type is the same
-      // as the function return type.
-      functionDecl(
-          returns(qualType().bind("type")),
-          forEachDescendant(varDecl(hasType(qualType(equalsBoundNode("type"))))
-                                .bind("decl"))),
-      // Only i and j should match, not k.
-      std::make_unique<VerifyIdIsBoundTo<VarDecl>>("decl", 2)));
-}
-
-TEST_P(ASTMatchersTest, EqualsBoundNodeMatcher_FiltersMatchedCombinations) {
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-      "void f() {"
-      "  int x;"
-      "  double d;"
-      "  x = d + x - d + x;"
-      "}",
-      functionDecl(
-          hasName("f"), forEachDescendant(varDecl().bind("d")),
-          forEachDescendant(declRefExpr(to(decl(equalsBoundNode("d")))))),
-      std::make_unique<VerifyIdIsBoundTo<VarDecl>>("d", 5)));
-}
-
-TEST_P(ASTMatchersTest,
-       EqualsBoundNodeMatcher_UnlessDescendantsOfAncestorsMatch) {
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-      "struct StringRef { int size() const; const char* data() const; };"
-      "void f(StringRef v) {"
-      "  v.data();"
-      "}",
-      cxxMemberCallExpr(
-          callee(cxxMethodDecl(hasName("data"))),
-          on(declRefExpr(to(
-              varDecl(hasType(recordDecl(hasName("StringRef")))).bind("var")))),
-          unless(hasAncestor(stmt(hasDescendant(cxxMemberCallExpr(
-              callee(cxxMethodDecl(anyOf(hasName("size"), hasName("length")))),
-              on(declRefExpr(to(varDecl(equalsBoundNode("var")))))))))))
-          .bind("data"),
-      std::make_unique<VerifyIdIsBoundTo<Expr>>("data", 1)));
-
-  EXPECT_FALSE(matches(
-      "struct StringRef { int size() const; const char* data() const; };"
-      "void f(StringRef v) {"
-      "  v.data();"
-      "  v.size();"
-      "}",
-      cxxMemberCallExpr(
-          callee(cxxMethodDecl(hasName("data"))),
-          on(declRefExpr(to(
-              varDecl(hasType(recordDecl(hasName("StringRef")))).bind("var")))),
-          unless(hasAncestor(stmt(hasDescendant(cxxMemberCallExpr(
-              callee(cxxMethodDecl(anyOf(hasName("size"), hasName("length")))),
-              on(declRefExpr(to(varDecl(equalsBoundNode("var")))))))))))
-          .bind("data")));
-}
-
-TEST_P(ASTMatchersTest, NullPointerConstant) {
-  EXPECT_TRUE(matches("#define NULL ((void *)0)\n"
-                      "void *v1 = NULL;",
-                      expr(nullPointerConstant())));
-  EXPECT_TRUE(matches("char *cp = (char *)0;", expr(nullPointerConstant())));
-  EXPECT_TRUE(matches("int *ip = 0;", expr(nullPointerConstant())));
-  EXPECT_FALSE(matches("int i = 0;", expr(nullPointerConstant())));
-}
-
-TEST_P(ASTMatchersTest, NullPointerConstant_GNUNull) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  EXPECT_TRUE(matches("void *p = __null;", expr(nullPointerConstant())));
-}
-
-TEST_P(ASTMatchersTest, NullPointerConstant_GNUNullInTemplate) {
-  if (!GetParam().isCXX() || GetParam().hasDelayedTemplateParsing()) {
-    // FIXME: Fix this test to work with delayed template parsing.
-    return;
-  }
-
-  const char kTest[] = R"(
-    template <typename T>
-    struct MyTemplate {
-      MyTemplate() : field_(__null) {}
-      T* field_;
-    };
-  )";
-  EXPECT_TRUE(matches(kTest, expr(nullPointerConstant())));
-}
-
-TEST_P(ASTMatchersTest, NullPointerConstant_CXX11Nullptr) {
-  if (!GetParam().isCXX11OrLater()) {
-    return;
-  }
-
-  EXPECT_TRUE(matches("void *p = nullptr;", expr(nullPointerConstant())));
-}
-
-TEST_P(ASTMatchersTest, HasExternalFormalLinkage) {
-  EXPECT_TRUE(matches("int a = 0;",
-                      namedDecl(hasName("a"), hasExternalFormalLinkage())));
-  EXPECT_TRUE(notMatches("static int a = 0;",
-                         namedDecl(hasName("a"), hasExternalFormalLinkage())));
-  EXPECT_TRUE(notMatches("static void f(void) { int a = 0; }",
-                         namedDecl(hasName("a"), hasExternalFormalLinkage())));
-  EXPECT_TRUE(notMatches("void f(void) { int a = 0; }",
-                         namedDecl(hasName("a"), hasExternalFormalLinkage())));
-}
-
-TEST_P(ASTMatchersTest, HasExternalFormalLinkage_CXX) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  EXPECT_TRUE(notMatches("namespace { int a = 0; }",
-                         namedDecl(hasName("a"), hasExternalFormalLinkage())));
-}
-
-TEST_P(ASTMatchersTest, HasDefaultArgument) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  EXPECT_TRUE(
-      matches("void x(int val = 0) {}", parmVarDecl(hasDefaultArgument())));
-  EXPECT_TRUE(
-      notMatches("void x(int val) {}", parmVarDecl(hasDefaultArgument())));
-}
-
-TEST_P(ASTMatchersTest, IsAtPosition) {
-  EXPECT_TRUE(matches("void x(int a, int b) {}", parmVarDecl(isAtPosition(1))));
-  EXPECT_TRUE(matches("void x(int a, int b) {}", parmVarDecl(isAtPosition(0))));
-  EXPECT_TRUE(matches("void x(int a, int b) {}", parmVarDecl(isAtPosition(1))));
-  EXPECT_TRUE(notMatches("void x(int val) {}", parmVarDecl(isAtPosition(1))));
-}
-
-TEST_P(ASTMatchersTest, IsAtPosition_FunctionDecl) {
-  EXPECT_TRUE(matches("void x(int a);", parmVarDecl(isAtPosition(0))));
-  EXPECT_TRUE(matches("void x(int a, int b);", parmVarDecl(isAtPosition(0))));
-  EXPECT_TRUE(matches("void x(int a, int b);", parmVarDecl(isAtPosition(1))));
-  EXPECT_TRUE(notMatches("void x(int val);", parmVarDecl(isAtPosition(1))));
-}
-
-TEST_P(ASTMatchersTest, IsAtPosition_Lambda) {
-  if (!GetParam().isCXX11OrLater()) {
-    return;
-  }
-
-  EXPECT_TRUE(
-      matches("void x() { [](int a) {};  }", parmVarDecl(isAtPosition(0))));
-  EXPECT_TRUE(matches("void x() { [](int a, int b) {}; }",
-                      parmVarDecl(isAtPosition(0))));
-  EXPECT_TRUE(matches("void x() { [](int a, int b) {}; }",
-                      parmVarDecl(isAtPosition(1))));
-  EXPECT_TRUE(
-      notMatches("void x() { [](int val) {}; }", parmVarDecl(isAtPosition(1))));
-}
-
-TEST_P(ASTMatchersTest, IsAtPosition_BlockDecl) {
-  EXPECT_TRUE(matchesObjC(
-      "void func()  { void (^my_block)(int arg) = ^void(int arg) {}; } ",
-      parmVarDecl(isAtPosition(0))));
-
-  EXPECT_TRUE(matchesObjC("void func()  { void (^my_block)(int x, int y) = "
-                          "^void(int x, int y) {}; } ",
-                          parmVarDecl(isAtPosition(1))));
-
-  EXPECT_TRUE(notMatchesObjC(
-      "void func()  { void (^my_block)(int arg) = ^void(int arg) {}; } ",
-      parmVarDecl(isAtPosition(1))));
-}
-
-TEST_P(ASTMatchersTest, IsArray) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  EXPECT_TRUE(matches("struct MyClass {}; MyClass *p1 = new MyClass[10];",
-                      cxxNewExpr(isArray())));
-}
-
-TEST_P(ASTMatchersTest, HasArraySize) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  EXPECT_TRUE(matches("struct MyClass {}; MyClass *p1 = new MyClass[10];",
-                      cxxNewExpr(hasArraySize(
-                          ignoringParenImpCasts(integerLiteral(equals(10)))))));
-}
-
-TEST_P(ASTMatchersTest, HasDefinition_MatchesStructDefinition) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  EXPECT_TRUE(matches("struct x {};", cxxRecordDecl(hasDefinition())));
-  EXPECT_TRUE(notMatches("struct x;", cxxRecordDecl(hasDefinition())));
-}
-
-TEST_P(ASTMatchersTest, HasDefinition_MatchesClassDefinition) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  EXPECT_TRUE(matches("class x {};", cxxRecordDecl(hasDefinition())));
-  EXPECT_TRUE(notMatches("class x;", cxxRecordDecl(hasDefinition())));
-}
-
-TEST_P(ASTMatchersTest, HasDefinition_MatchesUnionDefinition) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  EXPECT_TRUE(matches("union x {};", cxxRecordDecl(hasDefinition())));
-  EXPECT_TRUE(notMatches("union x;", cxxRecordDecl(hasDefinition())));
-}
-
-TEST_P(ASTMatchersTest, IsScoped_MatchesScopedEnum) {
-  if (!GetParam().isCXX11OrLater()) {
-    return;
-  }
-  EXPECT_TRUE(matches("enum class X {};", enumDecl(isScoped())));
-}
-
-TEST_P(ASTMatchersTest, IsScoped_NotMatchesRegularEnum) {
-  EXPECT_TRUE(notMatches("enum E { E1 };", enumDecl(isScoped())));
-}
-
-TEST_P(ASTMatchersTest, IsStruct) {
-  EXPECT_TRUE(matches("struct S {};", tagDecl(isStruct())));
-}
-
-TEST_P(ASTMatchersTest, IsUnion) {
-  EXPECT_TRUE(matches("union U {};", tagDecl(isUnion())));
-}
-
-TEST_P(ASTMatchersTest, IsEnum) {
-  EXPECT_TRUE(matches("enum E { E1 };", tagDecl(isEnum())));
-}
-
-TEST_P(ASTMatchersTest, IsClass) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  EXPECT_TRUE(matches("class C {};", tagDecl(isClass())));
-}
-
-TEST_P(ASTMatchersTest, HasTrailingReturn_MatchesTrailingReturn) {
-  if (!GetParam().isCXX11OrLater()) {
-    return;
-  }
-
-  EXPECT_TRUE(matches("auto Y() -> int { return 0; }",
-                      functionDecl(hasTrailingReturn())));
-  EXPECT_TRUE(matches("auto X() -> int;", functionDecl(hasTrailingReturn())));
-  EXPECT_TRUE(
-      notMatches("int X() { return 0; }", functionDecl(hasTrailingReturn())));
-  EXPECT_TRUE(notMatches("int X();", functionDecl(hasTrailingReturn())));
-  EXPECT_TRUE(notMatches("void X();", functionDecl(hasTrailingReturn())));
-}
-
-TEST_P(ASTMatchersTest, HasTrailingReturn_MatchesLambdaTrailingReturn) {
-  if (!GetParam().isCXX11OrLater()) {
-    return;
-  }
-
-  EXPECT_TRUE(matches(
-      "auto lambda2 = [](double x, double y) -> double {return x + y;};",
-      functionDecl(hasTrailingReturn())));
-  EXPECT_TRUE(
-      notMatches("auto lambda2 = [](double x, double y) {return x + y;};",
-                 functionDecl(hasTrailingReturn())));
-}
-
-TEST_P(ASTMatchersTest, IsAssignmentOperator) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  StatementMatcher BinAsgmtOperator = binaryOperator(isAssignmentOperator());
-  StatementMatcher CXXAsgmtOperator =
-      cxxOperatorCallExpr(isAssignmentOperator());
-
-  EXPECT_TRUE(matches("void x() { int a; a += 1; }", BinAsgmtOperator));
-  EXPECT_TRUE(matches("void x() { int a; a = 2; }", BinAsgmtOperator));
-  EXPECT_TRUE(matches("void x() { int a; a &= 3; }", BinAsgmtOperator));
-  EXPECT_TRUE(matches("struct S { S& operator=(const S&); };"
-                      "void x() { S s1, s2; s1 = s2; }",
-                      CXXAsgmtOperator));
-  EXPECT_TRUE(
-      notMatches("void x() { int a; if(a == 0) return; }", BinAsgmtOperator));
-}
-
-TEST_P(ASTMatchersTest, IsComparisonOperator) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  StatementMatcher BinCompOperator = binaryOperator(isComparisonOperator());
-  StatementMatcher CXXCompOperator =
-      cxxOperatorCallExpr(isComparisonOperator());
-
-  EXPECT_TRUE(matches("void x() { int a; a == 1; }", BinCompOperator));
-  EXPECT_TRUE(matches("void x() { int a; a > 2; }", BinCompOperator));
-  EXPECT_TRUE(matches("struct S { bool operator==(const S&); };"
-                      "void x() { S s1, s2; bool b1 = s1 == s2; }",
-                      CXXCompOperator));
-  EXPECT_TRUE(
-      notMatches("void x() { int a; if(a = 0) return; }", BinCompOperator));
-}
-
-TEST_P(ASTMatchersTest, HasInit) {
-  if (!GetParam().isCXX11OrLater()) {
-    // FIXME: Add a test for `hasInit()` that does not depend on C++.
-    return;
-  }
-
-  EXPECT_TRUE(matches("int x{0};", initListExpr(hasInit(0, expr()))));
-  EXPECT_FALSE(matches("int x{0};", initListExpr(hasInit(1, expr()))));
-  EXPECT_FALSE(matches("int x;", initListExpr(hasInit(0, expr()))));
-}
-
-TEST_P(ASTMatchersTest, IsMain) {
-  EXPECT_TRUE(matches("int main() {}", functionDecl(isMain())));
-
-  EXPECT_TRUE(notMatches("int main2() {}", functionDecl(isMain())));
-}
-
-TEST_P(ASTMatchersTest, OMPExecutableDirective_IsStandaloneDirective) {
-  auto Matcher = ompExecutableDirective(isStandaloneDirective());
-
-  StringRef Source0 = R"(
-void x() {
-#pragma omp parallel
-;
-})";
-  EXPECT_TRUE(notMatchesWithOpenMP(Source0, Matcher));
-
-  StringRef Source1 = R"(
-void x() {
-#pragma omp taskyield
-})";
-  EXPECT_TRUE(matchesWithOpenMP(Source1, Matcher));
-}
-
-TEST_P(ASTMatchersTest, OMPExecutableDirective_HasStructuredBlock) {
-  StringRef Source0 = R"(
-void x() {
-#pragma omp parallel
-;
-})";
-  EXPECT_TRUE(matchesWithOpenMP(
-      Source0, ompExecutableDirective(hasStructuredBlock(nullStmt()))));
-
-  StringRef Source1 = R"(
-void x() {
-#pragma omp parallel
-{;}
-})";
-  EXPECT_TRUE(notMatchesWithOpenMP(
-      Source1, ompExecutableDirective(hasStructuredBlock(nullStmt()))));
-  EXPECT_TRUE(matchesWithOpenMP(
-      Source1, ompExecutableDirective(hasStructuredBlock(compoundStmt()))));
-
-  StringRef Source2 = R"(
-void x() {
-#pragma omp taskyield
-{;}
-})";
-  EXPECT_TRUE(notMatchesWithOpenMP(
-      Source2, ompExecutableDirective(hasStructuredBlock(anything()))));
-}
-
-TEST_P(ASTMatchersTest, OMPExecutableDirective_HasClause) {
-  auto Matcher = ompExecutableDirective(hasAnyClause(anything()));
-
-  StringRef Source0 = R"(
-void x() {
-;
-})";
-  EXPECT_TRUE(notMatchesWithOpenMP(Source0, Matcher));
-
-  StringRef Source1 = R"(
-void x() {
-#pragma omp parallel
-;
-})";
-  EXPECT_TRUE(notMatchesWithOpenMP(Source1, Matcher));
-
-  StringRef Source2 = R"(
-void x() {
-#pragma omp parallel default(none)
-;
-})";
-  EXPECT_TRUE(matchesWithOpenMP(Source2, Matcher));
-
-  StringRef Source3 = R"(
-void x() {
-#pragma omp parallel default(shared)
-;
-})";
-  EXPECT_TRUE(matchesWithOpenMP(Source3, Matcher));
-
-  StringRef Source4 = R"(
-void x() {
-#pragma omp parallel default(firstprivate)
-;
-})";
-  EXPECT_TRUE(matchesWithOpenMP51(Source4, Matcher));
-
-  StringRef Source5 = R"(
-void x(int x) {
-#pragma omp parallel num_threads(x)
-;
-})";
-  EXPECT_TRUE(matchesWithOpenMP(Source5, Matcher));
-}
-
-TEST_P(ASTMatchersTest, OMPDefaultClause_IsNoneKind) {
-  auto Matcher =
-      ompExecutableDirective(hasAnyClause(ompDefaultClause(isNoneKind())));
-
-  StringRef Source0 = R"(
-void x() {
-;
-})";
-  EXPECT_TRUE(notMatchesWithOpenMP(Source0, Matcher));
-
-  StringRef Source1 = R"(
-void x() {
-#pragma omp parallel
-;
-})";
-  EXPECT_TRUE(notMatchesWithOpenMP(Source1, Matcher));
-
-  StringRef Source2 = R"(
-void x() {
-#pragma omp parallel default(none)
-;
-})";
-  EXPECT_TRUE(matchesWithOpenMP(Source2, Matcher));
-
-  StringRef Source3 = R"(
-void x() {
-#pragma omp parallel default(shared)
-;
-})";
-  EXPECT_TRUE(notMatchesWithOpenMP(Source3, Matcher));
-
-  StringRef Source4 = R"(
-void x(int x) {
-#pragma omp parallel default(firstprivate)
-;
-})";
-  EXPECT_TRUE(notMatchesWithOpenMP51(Source4, Matcher));
-
-  const std::string Source5 = R"(
-void x(int x) {
-#pragma omp parallel num_threads(x)
-;
-})";
-  EXPECT_TRUE(notMatchesWithOpenMP(Source5, Matcher));
-}
-
-TEST_P(ASTMatchersTest, OMPDefaultClause_IsSharedKind) {
-  auto Matcher =
-      ompExecutableDirective(hasAnyClause(ompDefaultClause(isSharedKind())));
-
-  StringRef Source0 = R"(
-void x() {
-;
-})";
-  EXPECT_TRUE(notMatchesWithOpenMP(Source0, Matcher));
-
-  StringRef Source1 = R"(
-void x() {
-#pragma omp parallel
-;
-})";
-  EXPECT_TRUE(notMatchesWithOpenMP(Source1, Matcher));
-
-  StringRef Source2 = R"(
-void x() {
-#pragma omp parallel default(shared)
-;
-})";
-  EXPECT_TRUE(matchesWithOpenMP(Source2, Matcher));
-
-  StringRef Source3 = R"(
-void x() {
-#pragma omp parallel default(none)
-;
-})";
-  EXPECT_TRUE(notMatchesWithOpenMP(Source3, Matcher));
-
-  StringRef Source4 = R"(
-void x(int x) {
-#pragma omp parallel default(firstprivate)
-;
-})";
-  EXPECT_TRUE(notMatchesWithOpenMP51(Source4, Matcher));
-
-  const std::string Source5 = R"(
-void x(int x) {
-#pragma omp parallel num_threads(x)
-;
-})";
-  EXPECT_TRUE(notMatchesWithOpenMP(Source5, Matcher));
-}
-
-TEST(OMPDefaultClause, isFirstPrivateKind) {
-  auto Matcher = ompExecutableDirective(
-      hasAnyClause(ompDefaultClause(isFirstPrivateKind())));
-
-  const std::string Source0 = R"(
-void x() {
-;
-})";
-  EXPECT_TRUE(notMatchesWithOpenMP(Source0, Matcher));
-
-  const std::string Source1 = R"(
-void x() {
-#pragma omp parallel
-;
-})";
-  EXPECT_TRUE(notMatchesWithOpenMP(Source1, Matcher));
-
-  const std::string Source2 = R"(
-void x() {
-#pragma omp parallel default(shared)
-;
-})";
-  EXPECT_TRUE(notMatchesWithOpenMP(Source2, Matcher));
-
-  const std::string Source3 = R"(
-void x() {
-#pragma omp parallel default(none)
-;
-})";
-  EXPECT_TRUE(notMatchesWithOpenMP(Source3, Matcher));
-
-  const std::string Source4 = R"(
-void x(int x) {
-#pragma omp parallel default(firstprivate)
-;
-})";
-  EXPECT_TRUE(matchesWithOpenMP51(Source4, Matcher));
-
-  const std::string Source5 = R"(
-void x(int x) {
-#pragma omp parallel num_threads(x)
-;
-})";
-  EXPECT_TRUE(notMatchesWithOpenMP(Source5, Matcher));
-}
-
-TEST_P(ASTMatchersTest, OMPExecutableDirective_IsAllowedToContainClauseKind) {
-  auto Matcher = ompExecutableDirective(
-      isAllowedToContainClauseKind(llvm::omp::OMPC_default));
-
-  StringRef Source0 = R"(
-void x() {
-;
-})";
-  EXPECT_TRUE(notMatchesWithOpenMP(Source0, Matcher));
-
-  StringRef Source1 = R"(
-void x() {
-#pragma omp parallel
-;
-})";
-  EXPECT_TRUE(matchesWithOpenMP(Source1, Matcher));
-
-  StringRef Source2 = R"(
-void x() {
-#pragma omp parallel default(none)
-;
-})";
-  EXPECT_TRUE(matchesWithOpenMP(Source2, Matcher));
-
-  StringRef Source3 = R"(
-void x() {
-#pragma omp parallel default(shared)
-;
-})";
-  EXPECT_TRUE(matchesWithOpenMP(Source3, Matcher));
-
-  StringRef Source4 = R"(
-void x() {
-#pragma omp parallel default(firstprivate)
-;
-})";
-  EXPECT_TRUE(matchesWithOpenMP51(Source4, Matcher));
-
-  StringRef Source5 = R"(
-void x(int x) {
-#pragma omp parallel num_threads(x)
-;
-})";
-  EXPECT_TRUE(matchesWithOpenMP(Source5, Matcher));
-
-  StringRef Source6 = R"(
-void x() {
-#pragma omp taskyield
-})";
-  EXPECT_TRUE(notMatchesWithOpenMP(Source6, Matcher));
-
-  StringRef Source7 = R"(
-void x() {
-#pragma omp task
-;
-})";
-  EXPECT_TRUE(matchesWithOpenMP(Source7, Matcher));
-}
-
-TEST_P(ASTMatchersTest, HasAnyBase_DirectBase) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(matches(
-      "struct Base {};"
-      "struct ExpectedMatch : Base {};",
-      cxxRecordDecl(hasName("ExpectedMatch"),
-                    hasAnyBase(hasType(cxxRecordDecl(hasName("Base")))))));
-}
-
-TEST_P(ASTMatchersTest, HasAnyBase_IndirectBase) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(matches(
-      "struct Base {};"
-      "struct Intermediate : Base {};"
-      "struct ExpectedMatch : Intermediate {};",
-      cxxRecordDecl(hasName("ExpectedMatch"),
-                    hasAnyBase(hasType(cxxRecordDecl(hasName("Base")))))));
-}
-
-TEST_P(ASTMatchersTest, HasAnyBase_NoBase) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(notMatches("struct Foo {};"
-                         "struct Bar {};",
-                         cxxRecordDecl(hasAnyBase(hasType(cxxRecordDecl())))));
-}
-
-TEST_P(ASTMatchersTest, HasAnyBase_IsPublic_Public) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(matches("class Base {};"
-                      "class Derived : public Base {};",
-                      cxxRecordDecl(hasAnyBase(isPublic()))));
-}
-
-TEST_P(ASTMatchersTest, HasAnyBase_IsPublic_DefaultAccessSpecifierPublic) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(matches("class Base {};"
-                      "struct Derived : Base {};",
-                      cxxRecordDecl(hasAnyBase(isPublic()))));
-}
-
-TEST_P(ASTMatchersTest, HasAnyBase_IsPublic_Private) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(notMatches("class Base {};"
-                         "class Derived : private Base {};",
-                         cxxRecordDecl(hasAnyBase(isPublic()))));
-}
-
-TEST_P(ASTMatchersTest, HasAnyBase_IsPublic_DefaultAccessSpecifierPrivate) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(notMatches("class Base {};"
-                         "class Derived : Base {};",
-                         cxxRecordDecl(hasAnyBase(isPublic()))));
-}
-
-TEST_P(ASTMatchersTest, HasAnyBase_IsPublic_Protected) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(notMatches("class Base {};"
-                         "class Derived : protected Base {};",
-                         cxxRecordDecl(hasAnyBase(isPublic()))));
-}
-
-TEST_P(ASTMatchersTest, HasAnyBase_IsPrivate_Private) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(matches("class Base {};"
-                      "class Derived : private Base {};",
-                      cxxRecordDecl(hasAnyBase(isPrivate()))));
-}
-
-TEST_P(ASTMatchersTest, HasAnyBase_IsPrivate_DefaultAccessSpecifierPrivate) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(matches("struct Base {};"
-                      "class Derived : Base {};",
-                      cxxRecordDecl(hasAnyBase(isPrivate()))));
-}
-
-TEST_P(ASTMatchersTest, HasAnyBase_IsPrivate_Public) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(notMatches("class Base {};"
-                         "class Derived : public Base {};",
-                         cxxRecordDecl(hasAnyBase(isPrivate()))));
-}
-
-TEST_P(ASTMatchersTest, HasAnyBase_IsPrivate_DefaultAccessSpecifierPublic) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(notMatches("class Base {};"
-                         "struct Derived : Base {};",
-                         cxxRecordDecl(hasAnyBase(isPrivate()))));
-}
-
-TEST_P(ASTMatchersTest, HasAnyBase_IsPrivate_Protected) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(notMatches("class Base {};"
-                         "class Derived : protected Base {};",
-                         cxxRecordDecl(hasAnyBase(isPrivate()))));
-}
-
-TEST_P(ASTMatchersTest, HasAnyBase_IsProtected_Protected) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(matches("class Base {};"
-                      "class Derived : protected Base {};",
-                      cxxRecordDecl(hasAnyBase(isProtected()))));
-}
-
-TEST_P(ASTMatchersTest, HasAnyBase_IsProtected_Public) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(notMatches("class Base {};"
-                         "class Derived : public Base {};",
-                         cxxRecordDecl(hasAnyBase(isProtected()))));
-}
-
-TEST_P(ASTMatchersTest, HasAnyBase_IsProtected_Private) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(notMatches("class Base {};"
-                         "class Derived : private Base {};",
-                         cxxRecordDecl(hasAnyBase(isProtected()))));
-}
-
-TEST_P(ASTMatchersTest, HasAnyBase_IsVirtual_Directly) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(matches("class Base {};"
-                      "class Derived : virtual Base {};",
-                      cxxRecordDecl(hasAnyBase(isVirtual()))));
-}
-
-TEST_P(ASTMatchersTest, HasAnyBase_IsVirtual_Indirectly) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(
-      matches("class Base {};"
-              "class Intermediate : virtual Base {};"
-              "class Derived : Intermediate {};",
-              cxxRecordDecl(hasName("Derived"), hasAnyBase(isVirtual()))));
-}
-
-TEST_P(ASTMatchersTest, HasAnyBase_IsVirtual_NoVirtualBase) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(notMatches("class Base {};"
-                         "class Derived : Base {};",
-                         cxxRecordDecl(hasAnyBase(isVirtual()))));
-}
-
-TEST_P(ASTMatchersTest, HasDirectBase) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  DeclarationMatcher ClassHasAnyDirectBase =
-      cxxRecordDecl(hasDirectBase(cxxBaseSpecifier()));
-  EXPECT_TRUE(notMatches("class X {};", ClassHasAnyDirectBase));
-  EXPECT_TRUE(matches("class X {}; class Y : X {};", ClassHasAnyDirectBase));
-  EXPECT_TRUE(matches("class X {}; class Y : public virtual X {};",
-                      ClassHasAnyDirectBase));
-
-  EXPECT_TRUE(matches(
-      R"cc(
-    class Base {};
-    class Derived : Base{};
-    )cc",
-      cxxRecordDecl(hasName("Derived"),
-                    hasDirectBase(hasType(cxxRecordDecl(hasName("Base")))))));
-
-  StringRef MultiDerived = R"cc(
-    class Base {};
-    class Base2 {};
-    class Derived : Base, Base2{};
-    )cc";
-
-  EXPECT_TRUE(matches(
-      MultiDerived,
-      cxxRecordDecl(hasName("Derived"),
-                    hasDirectBase(hasType(cxxRecordDecl(hasName("Base")))))));
-  EXPECT_TRUE(matches(
-      MultiDerived,
-      cxxRecordDecl(hasName("Derived"),
-                    hasDirectBase(hasType(cxxRecordDecl(hasName("Base2")))))));
-
-  StringRef Indirect = R"cc(
-    class Base {};
-    class Intermediate : Base {};
-    class Derived : Intermediate{};
-    )cc";
-
-  EXPECT_TRUE(
-      matches(Indirect, cxxRecordDecl(hasName("Derived"),
-                                      hasDirectBase(hasType(cxxRecordDecl(
-                                          hasName("Intermediate")))))));
-  EXPECT_TRUE(notMatches(
-      Indirect,
-      cxxRecordDecl(hasName("Derived"),
-                    hasDirectBase(hasType(cxxRecordDecl(hasName("Base")))))));
-}
-} // namespace ast_matchers
-} // namespace clang
diff --git a/gnu/llvm/clang/unittests/ASTMatchers/ASTMatchersNodeTest.cpp b/gnu/llvm/clang/unittests/ASTMatchers/ASTMatchersNodeTest.cpp
deleted file mode 100644
index 99d4b9bc626..00000000000
--- a/gnu/llvm/clang/unittests/ASTMatchers/ASTMatchersNodeTest.cpp
+++ /dev/null
@@ -1,2325 +0,0 @@
-//== unittests/ASTMatchers/ASTMatchersNodeTest.cpp - AST matcher unit tests ==//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "ASTMatchersTest.h"
-#include "clang/AST/PrettyPrinter.h"
-#include "clang/ASTMatchers/ASTMatchFinder.h"
-#include "clang/ASTMatchers/ASTMatchers.h"
-#include "clang/Tooling/Tooling.h"
-#include "llvm/ADT/Triple.h"
-#include "llvm/Support/Host.h"
-#include "gtest/gtest.h"
-
-namespace clang {
-namespace ast_matchers {
-
-TEST_P(ASTMatchersTest, Decl_CXX) {
-  if (!GetParam().isCXX()) {
-    // FIXME: Add a test for `decl()` that does not depend on C++.
-    return;
-  }
-  EXPECT_TRUE(notMatches("", decl(usingDecl())));
-  EXPECT_TRUE(
-      matches("namespace x { class X {}; } using x::X;", decl(usingDecl())));
-}
-
-TEST_P(ASTMatchersTest, NameableDeclaration_MatchesVariousDecls) {
-  DeclarationMatcher NamedX = namedDecl(hasName("X"));
-  EXPECT_TRUE(matches("typedef int X;", NamedX));
-  EXPECT_TRUE(matches("int X;", NamedX));
-  EXPECT_TRUE(matches("void foo() { int X; }", NamedX));
-  EXPECT_TRUE(matches("enum X { A, B, C };", NamedX));
-
-  EXPECT_TRUE(notMatches("#define X 1", NamedX));
-}
-
-TEST_P(ASTMatchersTest, NamedDecl_CXX) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  DeclarationMatcher NamedX = namedDecl(hasName("X"));
-  EXPECT_TRUE(matches("class foo { virtual void X(); };", NamedX));
-  EXPECT_TRUE(matches("void foo() try { } catch(int X) { }", NamedX));
-  EXPECT_TRUE(matches("namespace X { }", NamedX));
-}
-
-TEST_P(ASTMatchersTest, MatchesNameRE) {
-  DeclarationMatcher NamedX = namedDecl(matchesName("::X"));
-  EXPECT_TRUE(matches("typedef int Xa;", NamedX));
-  EXPECT_TRUE(matches("int Xb;", NamedX));
-  EXPECT_TRUE(matches("void foo() { int Xgh; }", NamedX));
-  EXPECT_TRUE(matches("enum X { A, B, C };", NamedX));
-
-  EXPECT_TRUE(notMatches("#define Xkl 1", NamedX));
-
-  DeclarationMatcher StartsWithNo = namedDecl(matchesName("::no"));
-  EXPECT_TRUE(matches("int no_foo;", StartsWithNo));
-
-  DeclarationMatcher Abc = namedDecl(matchesName("a.*b.*c"));
-  EXPECT_TRUE(matches("int abc;", Abc));
-  EXPECT_TRUE(matches("int aFOObBARc;", Abc));
-  EXPECT_TRUE(notMatches("int cab;", Abc));
-  EXPECT_TRUE(matches("int cabc;", Abc));
-
-  DeclarationMatcher StartsWithK = namedDecl(matchesName(":k[^:]*$"));
-  EXPECT_TRUE(matches("int k;", StartsWithK));
-  EXPECT_TRUE(matches("int kAbc;", StartsWithK));
-}
-
-TEST_P(ASTMatchersTest, MatchesNameRE_CXX) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  DeclarationMatcher NamedX = namedDecl(matchesName("::X"));
-  EXPECT_TRUE(matches("class foo { virtual void Xc(); };", NamedX));
-  EXPECT_TRUE(matches("void foo() try { } catch(int Xdef) { }", NamedX));
-  EXPECT_TRUE(matches("namespace Xij { }", NamedX));
-
-  DeclarationMatcher StartsWithNo = namedDecl(matchesName("::no"));
-  EXPECT_TRUE(matches("class foo { virtual void nobody(); };", StartsWithNo));
-
-  DeclarationMatcher StartsWithK = namedDecl(matchesName(":k[^:]*$"));
-  EXPECT_TRUE(matches("namespace x { int kTest; }", StartsWithK));
-  EXPECT_TRUE(matches("class C { int k; };", StartsWithK));
-  EXPECT_TRUE(notMatches("class C { int ckc; };", StartsWithK));
-  EXPECT_TRUE(notMatches("int K;", StartsWithK));
-
-  DeclarationMatcher StartsWithKIgnoreCase =
-      namedDecl(matchesName(":k[^:]*$", llvm::Regex::IgnoreCase));
-  EXPECT_TRUE(matches("int k;", StartsWithKIgnoreCase));
-  EXPECT_TRUE(matches("int K;", StartsWithKIgnoreCase));
-}
-
-TEST_P(ASTMatchersTest, DeclarationMatcher_MatchClass) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  DeclarationMatcher ClassX = recordDecl(recordDecl(hasName("X")));
-  EXPECT_TRUE(matches("class X;", ClassX));
-  EXPECT_TRUE(matches("class X {};", ClassX));
-  EXPECT_TRUE(matches("template<class T> class X {};", ClassX));
-  EXPECT_TRUE(notMatches("", ClassX));
-}
-
-TEST_P(ASTMatchersTest, TranslationUnitDecl) {
-  if (!GetParam().isCXX()) {
-    // FIXME: Add a test for `translationUnitDecl()` that does not depend on
-    // C++.
-    return;
-  }
-  StringRef Code = "int MyVar1;\n"
-                   "namespace NameSpace {\n"
-                   "int MyVar2;\n"
-                   "}  // namespace NameSpace\n";
-  EXPECT_TRUE(matches(
-      Code, varDecl(hasName("MyVar1"), hasDeclContext(translationUnitDecl()))));
-  EXPECT_FALSE(matches(
-      Code, varDecl(hasName("MyVar2"), hasDeclContext(translationUnitDecl()))));
-  EXPECT_TRUE(matches(
-      Code,
-      varDecl(hasName("MyVar2"),
-              hasDeclContext(decl(hasDeclContext(translationUnitDecl()))))));
-}
-
-TEST_P(ASTMatchersTest, LinkageSpecDecl) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(matches("extern \"C\" { void foo() {}; }", linkageSpecDecl()));
-  EXPECT_TRUE(notMatches("void foo() {};", linkageSpecDecl()));
-}
-
-TEST_P(ASTMatchersTest, ClassTemplateDecl_DoesNotMatchClass) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  DeclarationMatcher ClassX = classTemplateDecl(hasName("X"));
-  EXPECT_TRUE(notMatches("class X;", ClassX));
-  EXPECT_TRUE(notMatches("class X {};", ClassX));
-}
-
-TEST_P(ASTMatchersTest, ClassTemplateDecl_MatchesClassTemplate) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  DeclarationMatcher ClassX = classTemplateDecl(hasName("X"));
-  EXPECT_TRUE(matches("template<typename T> class X {};", ClassX));
-  EXPECT_TRUE(matches("class Z { template<class T> class X {}; };", ClassX));
-}
-
-TEST_P(ASTMatchersTest,
-       ClassTemplateDecl_DoesNotMatchClassTemplateExplicitSpecialization) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(notMatches(
-      "template<typename T> class X { };"
-      "template<> class X<int> { int a; };",
-      classTemplateDecl(hasName("X"), hasDescendant(fieldDecl(hasName("a"))))));
-}
-
-TEST_P(ASTMatchersTest,
-       ClassTemplateDecl_DoesNotMatchClassTemplatePartialSpecialization) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(notMatches(
-      "template<typename T, typename U> class X { };"
-      "template<typename T> class X<T, int> { int a; };",
-      classTemplateDecl(hasName("X"), hasDescendant(fieldDecl(hasName("a"))))));
-}
-
-TEST(ASTMatchersTestCUDA, CUDAKernelCallExpr) {
-  EXPECT_TRUE(matchesWithCuda("__global__ void f() { }"
-                              "void g() { f<<<1, 2>>>(); }",
-                              cudaKernelCallExpr()));
-  EXPECT_TRUE(notMatchesWithCuda("void f() {}", cudaKernelCallExpr()));
-}
-
-TEST(ASTMatchersTestCUDA, HasAttrCUDA) {
-  EXPECT_TRUE(matchesWithCuda("__attribute__((device)) void f() {}",
-                              hasAttr(clang::attr::CUDADevice)));
-  EXPECT_FALSE(notMatchesWithCuda("__attribute__((global)) void f() {}",
-                                  hasAttr(clang::attr::CUDAGlobal)));
-}
-
-TEST_P(ASTMatchersTest, ValueDecl) {
-  if (!GetParam().isCXX()) {
-    // FIXME: Fix this test in non-C++ language modes.
-    return;
-  }
-  EXPECT_TRUE(matches("enum EnumType { EnumValue };",
-                      valueDecl(hasType(asString("enum EnumType")))));
-  EXPECT_TRUE(matches("void FunctionDecl();",
-                      valueDecl(hasType(asString("void (void)")))));
-}
-
-TEST_P(ASTMatchersTest, FriendDecl) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(matches("class Y { friend class X; };",
-                      friendDecl(hasType(asString("class X")))));
-  EXPECT_TRUE(matches("class Y { friend class X; };",
-                      friendDecl(hasType(recordDecl(hasName("X"))))));
-
-  EXPECT_TRUE(matches("class Y { friend void f(); };",
-                      functionDecl(hasName("f"), hasParent(friendDecl()))));
-}
-
-TEST_P(ASTMatchersTest, EnumDecl_DoesNotMatchClasses) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(notMatches("class X {};", enumDecl(hasName("X"))));
-}
-
-TEST_P(ASTMatchersTest, EnumDecl_MatchesEnums) {
-  if (!GetParam().isCXX()) {
-    // FIXME: Fix this test in non-C++ language modes.
-    return;
-  }
-  EXPECT_TRUE(matches("enum X {};", enumDecl(hasName("X"))));
-}
-
-TEST_P(ASTMatchersTest, EnumConstantDecl) {
-  if (!GetParam().isCXX()) {
-    // FIXME: Fix this test in non-C++ language modes.
-    return;
-  }
-  DeclarationMatcher Matcher = enumConstantDecl(hasName("A"));
-  EXPECT_TRUE(matches("enum X{ A };", Matcher));
-  EXPECT_TRUE(notMatches("enum X{ B };", Matcher));
-  EXPECT_TRUE(notMatches("enum X {};", Matcher));
-}
-
-TEST_P(ASTMatchersTest, TagDecl) {
-  if (!GetParam().isCXX()) {
-    // FIXME: Fix this test in non-C++ language modes.
-    return;
-  }
-  EXPECT_TRUE(matches("struct X {};", tagDecl(hasName("X"))));
-  EXPECT_TRUE(matches("union U {};", tagDecl(hasName("U"))));
-  EXPECT_TRUE(matches("enum E {};", tagDecl(hasName("E"))));
-}
-
-TEST_P(ASTMatchersTest, TagDecl_CXX) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(matches("class C {};", tagDecl(hasName("C"))));
-}
-
-TEST_P(ASTMatchersTest, UnresolvedLookupExpr) {
-  if (!GetParam().isCXX() || GetParam().hasDelayedTemplateParsing()) {
-    // FIXME: Fix this test to work with delayed template parsing.
-    return;
-  }
-
-  EXPECT_TRUE(matches("template<typename T>"
-                      "T foo() { T a; return a; }"
-                      "template<typename T>"
-                      "void bar() {"
-                      "  foo<T>();"
-                      "}",
-                      unresolvedLookupExpr()));
-}
-
-TEST_P(ASTMatchersTest, UsesADL) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  StatementMatcher ADLMatch = callExpr(usesADL());
-  StatementMatcher ADLMatchOper = cxxOperatorCallExpr(usesADL());
-  StringRef NS_Str = R"cpp(
-  namespace NS {
-    struct X {};
-    void f(X);
-    void operator+(X, X);
-  }
-  struct MyX {};
-  void f(...);
-  void operator+(MyX, MyX);
-)cpp";
-
-  auto MkStr = [&](StringRef Body) {
-    return (NS_Str + "void test_fn() { " + Body + " }").str();
-  };
-
-  EXPECT_TRUE(matches(MkStr("NS::X x; f(x);"), ADLMatch));
-  EXPECT_TRUE(notMatches(MkStr("NS::X x; NS::f(x);"), ADLMatch));
-  EXPECT_TRUE(notMatches(MkStr("MyX x; f(x);"), ADLMatch));
-  EXPECT_TRUE(notMatches(MkStr("NS::X x; using NS::f; f(x);"), ADLMatch));
-
-  // Operator call expressions
-  EXPECT_TRUE(matches(MkStr("NS::X x; x + x;"), ADLMatch));
-  EXPECT_TRUE(matches(MkStr("NS::X x; x + x;"), ADLMatchOper));
-  EXPECT_TRUE(notMatches(MkStr("MyX x; x + x;"), ADLMatch));
-  EXPECT_TRUE(notMatches(MkStr("MyX x; x + x;"), ADLMatchOper));
-  EXPECT_TRUE(matches(MkStr("NS::X x; operator+(x, x);"), ADLMatch));
-  EXPECT_TRUE(notMatches(MkStr("NS::X x; NS::operator+(x, x);"), ADLMatch));
-}
-
-TEST_P(ASTMatchersTest, CallExpr_CXX) {
-  if (!GetParam().isCXX()) {
-    // FIXME: Add a test for `callExpr()` that does not depend on C++.
-    return;
-  }
-  // FIXME: Do we want to overload Call() to directly take
-  // Matcher<Decl>, too?
-  StatementMatcher MethodX =
-      callExpr(hasDeclaration(cxxMethodDecl(hasName("x"))));
-
-  EXPECT_TRUE(matches("class Y { void x() { x(); } };", MethodX));
-  EXPECT_TRUE(notMatches("class Y { void x() {} };", MethodX));
-
-  StatementMatcher MethodOnY =
-      cxxMemberCallExpr(on(hasType(recordDecl(hasName("Y")))));
-
-  EXPECT_TRUE(matches("class Y { public: void x(); }; void z() { Y y; y.x(); }",
-                      MethodOnY));
-  EXPECT_TRUE(matches("class Y { public: void x(); }; void z(Y &y) { y.x(); }",
-                      MethodOnY));
-  EXPECT_TRUE(notMatches(
-      "class Y { public: void x(); }; void z(Y *&y) { y->x(); }", MethodOnY));
-  EXPECT_TRUE(notMatches(
-      "class Y { public: void x(); }; void z(Y y[]) { y->x(); }", MethodOnY));
-  EXPECT_TRUE(notMatches(
-      "class Y { public: void x(); }; void z() { Y *y; y->x(); }", MethodOnY));
-
-  StatementMatcher MethodOnYPointer =
-      cxxMemberCallExpr(on(hasType(pointsTo(recordDecl(hasName("Y"))))));
-
-  EXPECT_TRUE(
-      matches("class Y { public: void x(); }; void z() { Y *y; y->x(); }",
-              MethodOnYPointer));
-  EXPECT_TRUE(
-      matches("class Y { public: void x(); }; void z(Y *&y) { y->x(); }",
-              MethodOnYPointer));
-  EXPECT_TRUE(
-      matches("class Y { public: void x(); }; void z(Y y[]) { y->x(); }",
-              MethodOnYPointer));
-  EXPECT_TRUE(
-      notMatches("class Y { public: void x(); }; void z() { Y y; y.x(); }",
-                 MethodOnYPointer));
-  EXPECT_TRUE(
-      notMatches("class Y { public: void x(); }; void z(Y &y) { y.x(); }",
-                 MethodOnYPointer));
-}
-
-TEST_P(ASTMatchersTest, LambdaExpr) {
-  if (!GetParam().isCXX11OrLater()) {
-    return;
-  }
-  EXPECT_TRUE(matches("auto f = [] (int i) { return i; };", lambdaExpr()));
-}
-
-TEST_P(ASTMatchersTest, CXXForRangeStmt) {
-  EXPECT_TRUE(
-      notMatches("void f() { for (int i; i<5; ++i); }", cxxForRangeStmt()));
-}
-
-TEST_P(ASTMatchersTest, CXXForRangeStmt_CXX11) {
-  if (!GetParam().isCXX11OrLater()) {
-    return;
-  }
-  EXPECT_TRUE(matches("int as[] = { 1, 2, 3 };"
-                      "void f() { for (auto &a : as); }",
-                      cxxForRangeStmt()));
-}
-
-TEST_P(ASTMatchersTest, SubstNonTypeTemplateParmExpr) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_FALSE(matches("template<int N>\n"
-                       "struct A {  static const int n = 0; };\n"
-                       "struct B : public A<42> {};",
-                       traverse(TK_AsIs, substNonTypeTemplateParmExpr())));
-  EXPECT_TRUE(matches("template<int N>\n"
-                      "struct A {  static const int n = N; };\n"
-                      "struct B : public A<42> {};",
-                      traverse(TK_AsIs, substNonTypeTemplateParmExpr())));
-}
-
-TEST_P(ASTMatchersTest, NonTypeTemplateParmDecl) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(matches("template <int N> void f();",
-                      nonTypeTemplateParmDecl(hasName("N"))));
-  EXPECT_TRUE(
-      notMatches("template <typename T> void f();", nonTypeTemplateParmDecl()));
-}
-
-TEST_P(ASTMatchersTest, TemplateTypeParmDecl) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(matches("template <typename T> void f();",
-                      templateTypeParmDecl(hasName("T"))));
-  EXPECT_TRUE(notMatches("template <int N> void f();", templateTypeParmDecl()));
-}
-
-TEST_P(ASTMatchersTest, TemplateTemplateParmDecl) {
-  if (!GetParam().isCXX())
-    return;
-  EXPECT_TRUE(matches("template <template <typename> class Z> void f();",
-                      templateTemplateParmDecl(hasName("Z"))));
-  EXPECT_TRUE(notMatches("template <typename, int> void f();",
-                         templateTemplateParmDecl()));
-}
-
-TEST_P(ASTMatchersTest, UserDefinedLiteral) {
-  if (!GetParam().isCXX11OrLater()) {
-    return;
-  }
-  EXPECT_TRUE(matches("constexpr char operator \"\" _inc (const char i) {"
-                      "  return i + 1;"
-                      "}"
-                      "char c = 'a'_inc;",
-                      userDefinedLiteral()));
-}
-
-TEST_P(ASTMatchersTest, FlowControl) {
-  EXPECT_TRUE(matches("void f() { while(1) { break; } }", breakStmt()));
-  EXPECT_TRUE(matches("void f() { while(1) { continue; } }", continueStmt()));
-  EXPECT_TRUE(matches("void f() { goto FOO; FOO: ;}", gotoStmt()));
-  EXPECT_TRUE(matches("void f() { goto FOO; FOO: ;}",
-                      labelStmt(hasDeclaration(labelDecl(hasName("FOO"))))));
-  EXPECT_TRUE(matches("void f() { FOO: ; void *ptr = &&FOO; goto *ptr; }",
-                      addrLabelExpr()));
-  EXPECT_TRUE(matches("void f() { return; }", returnStmt()));
-}
-
-TEST_P(ASTMatchersTest, CXXOperatorCallExpr) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  StatementMatcher OpCall = cxxOperatorCallExpr();
-  // Unary operator
-  EXPECT_TRUE(matches("class Y { }; "
-                      "bool operator!(Y x) { return false; }; "
-                      "Y y; bool c = !y;",
-                      OpCall));
-  // No match -- special operators like "new", "delete"
-  // FIXME: operator new takes size_t, for which we need stddef.h, for which
-  // we need to figure out include paths in the test.
-  // EXPECT_TRUE(NotMatches("#include <stddef.h>\n"
-  //             "class Y { }; "
-  //             "void *operator new(size_t size) { return 0; } "
-  //             "Y *y = new Y;", OpCall));
-  EXPECT_TRUE(notMatches("class Y { }; "
-                         "void operator delete(void *p) { } "
-                         "void a() {Y *y = new Y; delete y;}",
-                         OpCall));
-  // Binary operator
-  EXPECT_TRUE(matches("class Y { }; "
-                      "bool operator&&(Y x, Y y) { return true; }; "
-                      "Y a; Y b; bool c = a && b;",
-                      OpCall));
-  // No match -- normal operator, not an overloaded one.
-  EXPECT_TRUE(notMatches("bool x = true, y = true; bool t = x && y;", OpCall));
-  EXPECT_TRUE(notMatches("int t = 5 << 2;", OpCall));
-}
-
-TEST_P(ASTMatchersTest, ThisPointerType) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  StatementMatcher MethodOnY = traverse(
-      TK_AsIs, cxxMemberCallExpr(thisPointerType(recordDecl(hasName("Y")))));
-
-  EXPECT_TRUE(matches("class Y { public: void x(); }; void z() { Y y; y.x(); }",
-                      MethodOnY));
-  EXPECT_TRUE(matches("class Y { public: void x(); }; void z(Y &y) { y.x(); }",
-                      MethodOnY));
-  EXPECT_TRUE(matches(
-      "class Y { public: void x(); }; void z(Y *&y) { y->x(); }", MethodOnY));
-  EXPECT_TRUE(matches(
-      "class Y { public: void x(); }; void z(Y y[]) { y->x(); }", MethodOnY));
-  EXPECT_TRUE(matches(
-      "class Y { public: void x(); }; void z() { Y *y; y->x(); }", MethodOnY));
-
-  EXPECT_TRUE(matches("class Y {"
-                      "  public: virtual void x();"
-                      "};"
-                      "class X : public Y {"
-                      "  public: virtual void x();"
-                      "};"
-                      "void z() { X *x; x->Y::x(); }",
-                      MethodOnY));
-}
-
-TEST_P(ASTMatchersTest, DeclRefExpr) {
-  if (!GetParam().isCXX()) {
-    // FIXME: Add a test for `declRefExpr()` that does not depend on C++.
-    return;
-  }
-  StatementMatcher Reference = declRefExpr(to(varDecl(hasInitializer(
-      cxxMemberCallExpr(thisPointerType(recordDecl(hasName("Y"))))))));
-
-  EXPECT_TRUE(matches("class Y {"
-                      " public:"
-                      "  bool x() const;"
-                      "};"
-                      "void z(const Y &y) {"
-                      "  bool b = y.x();"
-                      "  if (b) {}"
-                      "}",
-                      Reference));
-
-  EXPECT_TRUE(notMatches("class Y {"
-                         " public:"
-                         "  bool x() const;"
-                         "};"
-                         "void z(const Y &y) {"
-                         "  bool b = y.x();"
-                         "}",
-                         Reference));
-}
-
-TEST_P(ASTMatchersTest, CXXMemberCallExpr) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  StatementMatcher CallOnVariableY =
-      cxxMemberCallExpr(on(declRefExpr(to(varDecl(hasName("y"))))));
-
-  EXPECT_TRUE(matches("class Y { public: void x() { Y y; y.x(); } };",
-                      CallOnVariableY));
-  EXPECT_TRUE(matches("class Y { public: void x() const { Y y; y.x(); } };",
-                      CallOnVariableY));
-  EXPECT_TRUE(matches("class Y { public: void x(); };"
-                      "class X : public Y { void z() { X y; y.x(); } };",
-                      CallOnVariableY));
-  EXPECT_TRUE(matches("class Y { public: void x(); };"
-                      "class X : public Y { void z() { X *y; y->x(); } };",
-                      CallOnVariableY));
-  EXPECT_TRUE(notMatches(
-      "class Y { public: void x(); };"
-      "class X : public Y { void z() { unsigned long y; ((X*)y)->x(); } };",
-      CallOnVariableY));
-}
-
-TEST_P(ASTMatchersTest, UnaryExprOrTypeTraitExpr) {
-  EXPECT_TRUE(
-      matches("void x() { int a = sizeof(a); }", unaryExprOrTypeTraitExpr()));
-}
-
-TEST_P(ASTMatchersTest, AlignOfExpr) {
-  EXPECT_TRUE(
-      notMatches("void x() { int a = sizeof(a); }", alignOfExpr(anything())));
-  // FIXME: Uncomment once alignof is enabled.
-  // EXPECT_TRUE(matches("void x() { int a = alignof(a); }",
-  //                     unaryExprOrTypeTraitExpr()));
-  // EXPECT_TRUE(notMatches("void x() { int a = alignof(a); }",
-  //                        sizeOfExpr()));
-}
-
-TEST_P(ASTMatchersTest, MemberExpr_DoesNotMatchClasses) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(notMatches("class Y { void x() {} };", memberExpr()));
-  EXPECT_TRUE(notMatches("class Y { void x() {} };", unresolvedMemberExpr()));
-  EXPECT_TRUE(
-      notMatches("class Y { void x() {} };", cxxDependentScopeMemberExpr()));
-}
-
-TEST_P(ASTMatchersTest, MemberExpr_MatchesMemberFunctionCall) {
-  if (!GetParam().isCXX() || GetParam().hasDelayedTemplateParsing()) {
-    // FIXME: Fix this test to work with delayed template parsing.
-    return;
-  }
-  EXPECT_TRUE(matches("class Y { void x() { x(); } };", memberExpr()));
-  EXPECT_TRUE(matches("class Y { template <class T> void x() { x<T>(); } };",
-                      unresolvedMemberExpr()));
-  EXPECT_TRUE(matches("template <class T> void x() { T t; t.f(); }",
-                      cxxDependentScopeMemberExpr()));
-}
-
-TEST_P(ASTMatchersTest, MemberExpr_MatchesVariable) {
-  if (!GetParam().isCXX() || GetParam().hasDelayedTemplateParsing()) {
-    // FIXME: Fix this test to work with delayed template parsing.
-    return;
-  }
-  EXPECT_TRUE(
-      matches("class Y { void x() { this->y; } int y; };", memberExpr()));
-  EXPECT_TRUE(matches("class Y { void x() { y; } int y; };", memberExpr()));
-  EXPECT_TRUE(
-      matches("class Y { void x() { Y y; y.y; } int y; };", memberExpr()));
-  EXPECT_TRUE(matches("template <class T>"
-                      "class X : T { void f() { this->T::v; } };",
-                      cxxDependentScopeMemberExpr()));
-  EXPECT_TRUE(matches("template <class T> class X : T { void f() { T::v; } };",
-                      cxxDependentScopeMemberExpr()));
-  EXPECT_TRUE(matches("template <class T> void x() { T t; t.v; }",
-                      cxxDependentScopeMemberExpr()));
-}
-
-TEST_P(ASTMatchersTest, MemberExpr_MatchesStaticVariable) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(matches("class Y { void x() { this->y; } static int y; };",
-                      memberExpr()));
-  EXPECT_TRUE(
-      notMatches("class Y { void x() { y; } static int y; };", memberExpr()));
-  EXPECT_TRUE(notMatches("class Y { void x() { Y::y; } static int y; };",
-                         memberExpr()));
-}
-
-TEST_P(ASTMatchersTest, FunctionDecl) {
-  StatementMatcher CallFunctionF = callExpr(callee(functionDecl(hasName("f"))));
-
-  EXPECT_TRUE(matches("void f() { f(); }", CallFunctionF));
-  EXPECT_TRUE(notMatches("void f() { }", CallFunctionF));
-
-  EXPECT_TRUE(notMatches("void f(int);", functionDecl(isVariadic())));
-  EXPECT_TRUE(notMatches("void f();", functionDecl(isVariadic())));
-  EXPECT_TRUE(matches("void f(int, ...);", functionDecl(parameterCountIs(1))));
-}
-
-TEST_P(ASTMatchersTest, FunctionDecl_C) {
-  if (!GetParam().isC()) {
-    return;
-  }
-  EXPECT_TRUE(notMatches("void f();", functionDecl(isVariadic())));
-  EXPECT_TRUE(matches("void f();", functionDecl(parameterCountIs(0))));
-}
-
-TEST_P(ASTMatchersTest, FunctionDecl_CXX) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  StatementMatcher CallFunctionF = callExpr(callee(functionDecl(hasName("f"))));
-
-  if (!GetParam().hasDelayedTemplateParsing()) {
-    // FIXME: Fix this test to work with delayed template parsing.
-    // Dependent contexts, but a non-dependent call.
-    EXPECT_TRUE(
-        matches("void f(); template <int N> void g() { f(); }", CallFunctionF));
-    EXPECT_TRUE(
-        matches("void f(); template <int N> struct S { void g() { f(); } };",
-                CallFunctionF));
-  }
-
-  // Depedent calls don't match.
-  EXPECT_TRUE(
-      notMatches("void f(int); template <typename T> void g(T t) { f(t); }",
-                 CallFunctionF));
-  EXPECT_TRUE(
-      notMatches("void f(int);"
-                 "template <typename T> struct S { void g(T t) { f(t); } };",
-                 CallFunctionF));
-
-  EXPECT_TRUE(matches("void f(...);", functionDecl(isVariadic())));
-  EXPECT_TRUE(matches("void f(...);", functionDecl(parameterCountIs(0))));
-}
-
-TEST_P(ASTMatchersTest, FunctionDecl_CXX11) {
-  if (!GetParam().isCXX11OrLater()) {
-    return;
-  }
-
-  EXPECT_TRUE(notMatches("template <typename... Ts> void f(Ts...);",
-                         functionDecl(isVariadic())));
-}
-
-TEST_P(ASTMatchersTest,
-       FunctionTemplateDecl_MatchesFunctionTemplateDeclarations) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(matches("template <typename T> void f(T t) {}",
-                      functionTemplateDecl(hasName("f"))));
-}
-
-TEST_P(ASTMatchersTest, FunctionTemplate_DoesNotMatchFunctionDeclarations) {
-  EXPECT_TRUE(
-      notMatches("void f(double d);", functionTemplateDecl(hasName("f"))));
-  EXPECT_TRUE(
-      notMatches("void f(int t) {}", functionTemplateDecl(hasName("f"))));
-}
-
-TEST_P(ASTMatchersTest,
-       FunctionTemplateDecl_DoesNotMatchFunctionTemplateSpecializations) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(notMatches(
-      "void g(); template <typename T> void f(T t) {}"
-      "template <> void f(int t) { g(); }",
-      functionTemplateDecl(hasName("f"), hasDescendant(declRefExpr(to(
-                                             functionDecl(hasName("g"))))))));
-}
-
-TEST_P(ASTMatchersTest, ClassTemplateSpecializationDecl) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(matches("template<typename T> struct A {};"
-                      "template<> struct A<int> {};",
-                      classTemplateSpecializationDecl()));
-  EXPECT_TRUE(matches("template<typename T> struct A {}; A<int> a;",
-                      classTemplateSpecializationDecl()));
-  EXPECT_TRUE(notMatches("template<typename T> struct A {};",
-                         classTemplateSpecializationDecl()));
-}
-
-TEST_P(ASTMatchersTest, DeclaratorDecl) {
-  EXPECT_TRUE(matches("int x;", declaratorDecl()));
-  EXPECT_TRUE(notMatches("struct A {};", declaratorDecl()));
-}
-
-TEST_P(ASTMatchersTest, DeclaratorDecl_CXX) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(notMatches("class A {};", declaratorDecl()));
-}
-
-TEST_P(ASTMatchersTest, ParmVarDecl) {
-  EXPECT_TRUE(matches("void f(int x);", parmVarDecl()));
-  EXPECT_TRUE(notMatches("void f();", parmVarDecl()));
-}
-
-TEST_P(ASTMatchersTest, Matcher_ConstructorCall) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  StatementMatcher Constructor = traverse(TK_AsIs, cxxConstructExpr());
-
-  EXPECT_TRUE(
-      matches("class X { public: X(); }; void x() { X x; }", Constructor));
-  EXPECT_TRUE(matches("class X { public: X(); }; void x() { X x = X(); }",
-                      Constructor));
-  EXPECT_TRUE(matches("class X { public: X(int); }; void x() { X x = 0; }",
-                      Constructor));
-  EXPECT_TRUE(matches("class X {}; void x(int) { X x; }", Constructor));
-}
-
-TEST_P(ASTMatchersTest, Match_ConstructorInitializers) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(matches("class C { int i; public: C(int ii) : i(ii) {} };",
-                      cxxCtorInitializer(forField(hasName("i")))));
-}
-
-TEST_P(ASTMatchersTest, Matcher_ThisExpr) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(
-      matches("struct X { int a; int f () { return a; } };", cxxThisExpr()));
-  EXPECT_TRUE(
-      notMatches("struct X { int f () { int a; return a; } };", cxxThisExpr()));
-}
-
-TEST_P(ASTMatchersTest, Matcher_BindTemporaryExpression) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  StatementMatcher TempExpression = traverse(TK_AsIs, cxxBindTemporaryExpr());
-
-  StringRef ClassString = "class string { public: string(); ~string(); }; ";
-
-  EXPECT_TRUE(matches(
-      ClassString + "string GetStringByValue();"
-                    "void FunctionTakesString(string s);"
-                    "void run() { FunctionTakesString(GetStringByValue()); }",
-      TempExpression));
-
-  EXPECT_TRUE(notMatches(ClassString +
-                             "string* GetStringPointer(); "
-                             "void FunctionTakesStringPtr(string* s);"
-                             "void run() {"
-                             "  string* s = GetStringPointer();"
-                             "  FunctionTakesStringPtr(GetStringPointer());"
-                             "  FunctionTakesStringPtr(s);"
-                             "}",
-                         TempExpression));
-
-  EXPECT_TRUE(notMatches("class no_dtor {};"
-                         "no_dtor GetObjByValue();"
-                         "void ConsumeObj(no_dtor param);"
-                         "void run() { ConsumeObj(GetObjByValue()); }",
-                         TempExpression));
-}
-
-TEST_P(ASTMatchersTest, MaterializeTemporaryExpr_MatchesTemporaryCXX11CXX14) {
-  if (GetParam().Language != Lang_CXX11 && GetParam().Language != Lang_CXX14) {
-    return;
-  }
-
-  StatementMatcher TempExpression =
-      traverse(TK_AsIs, materializeTemporaryExpr());
-
-  EXPECT_TRUE(matches("class string { public: string(); }; "
-                      "string GetStringByValue();"
-                      "void FunctionTakesString(string s);"
-                      "void run() { FunctionTakesString(GetStringByValue()); }",
-                      TempExpression));
-}
-
-TEST_P(ASTMatchersTest, MaterializeTemporaryExpr_MatchesTemporary) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  StringRef ClassString = "class string { public: string(); int length(); }; ";
-  StatementMatcher TempExpression =
-      traverse(TK_AsIs, materializeTemporaryExpr());
-
-  EXPECT_TRUE(notMatches(ClassString +
-                             "string* GetStringPointer(); "
-                             "void FunctionTakesStringPtr(string* s);"
-                             "void run() {"
-                             "  string* s = GetStringPointer();"
-                             "  FunctionTakesStringPtr(GetStringPointer());"
-                             "  FunctionTakesStringPtr(s);"
-                             "}",
-                         TempExpression));
-
-  EXPECT_TRUE(matches(ClassString +
-                          "string GetStringByValue();"
-                          "void run() { int k = GetStringByValue().length(); }",
-                      TempExpression));
-
-  EXPECT_TRUE(notMatches(ClassString + "string GetStringByValue();"
-                                       "void run() { GetStringByValue(); }",
-                         TempExpression));
-}
-
-TEST_P(ASTMatchersTest, Matcher_NewExpression) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-
-  StatementMatcher New = cxxNewExpr();
-
-  EXPECT_TRUE(matches("class X { public: X(); }; void x() { new X; }", New));
-  EXPECT_TRUE(matches("class X { public: X(); }; void x() { new X(); }", New));
-  EXPECT_TRUE(
-      matches("class X { public: X(int); }; void x() { new X(0); }", New));
-  EXPECT_TRUE(matches("class X {}; void x(int) { new X; }", New));
-}
-
-TEST_P(ASTMatchersTest, Matcher_DeleteExpression) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(
-      matches("struct A {}; void f(A* a) { delete a; }", cxxDeleteExpr()));
-}
-
-TEST_P(ASTMatchersTest, Matcher_NoexceptExpression) {
-  if (!GetParam().isCXX11OrLater()) {
-    return;
-  }
-  StatementMatcher NoExcept = cxxNoexceptExpr();
-  EXPECT_TRUE(matches("void foo(); bool bar = noexcept(foo());", NoExcept));
-  EXPECT_TRUE(
-      matches("void foo() noexcept; bool bar = noexcept(foo());", NoExcept));
-  EXPECT_TRUE(notMatches("void foo() noexcept;", NoExcept));
-  EXPECT_TRUE(notMatches("void foo() noexcept(1+1);", NoExcept));
-  EXPECT_TRUE(matches("void foo() noexcept(noexcept(1+1));", NoExcept));
-}
-
-TEST_P(ASTMatchersTest, Matcher_DefaultArgument) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  StatementMatcher Arg = cxxDefaultArgExpr();
-  EXPECT_TRUE(matches("void x(int, int = 0) { int y; x(y); }", Arg));
-  EXPECT_TRUE(
-      matches("class X { void x(int, int = 0) { int y; x(y); } };", Arg));
-  EXPECT_TRUE(notMatches("void x(int, int = 0) { int y; x(y, 0); }", Arg));
-}
-
-TEST_P(ASTMatchersTest, StringLiteral) {
-  StatementMatcher Literal = stringLiteral();
-  EXPECT_TRUE(matches("const char *s = \"string\";", Literal));
-  // with escaped characters
-  EXPECT_TRUE(matches("const char *s = \"\x05five\";", Literal));
-  // no matching -- though the data type is the same, there is no string literal
-  EXPECT_TRUE(notMatches("const char s[1] = {'a'};", Literal));
-}
-
-TEST_P(ASTMatchersTest, StringLiteral_CXX) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(matches("const wchar_t *s = L\"string\";", stringLiteral()));
-}
-
-TEST_P(ASTMatchersTest, CharacterLiteral) {
-  EXPECT_TRUE(matches("const char c = 'c';", characterLiteral()));
-  EXPECT_TRUE(notMatches("const char c = 0x1;", characterLiteral()));
-}
-
-TEST_P(ASTMatchersTest, CharacterLiteral_CXX) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  // wide character
-  EXPECT_TRUE(matches("const char c = L'c';", characterLiteral()));
-  // wide character, Hex encoded, NOT MATCHED!
-  EXPECT_TRUE(notMatches("const wchar_t c = 0x2126;", characterLiteral()));
-}
-
-TEST_P(ASTMatchersTest, IntegerLiteral) {
-  StatementMatcher HasIntLiteral = integerLiteral();
-  EXPECT_TRUE(matches("int i = 10;", HasIntLiteral));
-  EXPECT_TRUE(matches("int i = 0x1AB;", HasIntLiteral));
-  EXPECT_TRUE(matches("int i = 10L;", HasIntLiteral));
-  EXPECT_TRUE(matches("int i = 10U;", HasIntLiteral));
-
-  // Non-matching cases (character literals, float and double)
-  EXPECT_TRUE(notMatches("int i = L'a';",
-                         HasIntLiteral)); // this is actually a character
-  // literal cast to int
-  EXPECT_TRUE(notMatches("int i = 'a';", HasIntLiteral));
-  EXPECT_TRUE(notMatches("int i = 1e10;", HasIntLiteral));
-  EXPECT_TRUE(notMatches("int i = 10.0;", HasIntLiteral));
-
-  // Negative integers.
-  EXPECT_TRUE(
-      matches("int i = -10;",
-              unaryOperator(hasOperatorName("-"),
-                            hasUnaryOperand(integerLiteral(equals(10))))));
-}
-
-TEST_P(ASTMatchersTest, FloatLiteral) {
-  StatementMatcher HasFloatLiteral = floatLiteral();
-  EXPECT_TRUE(matches("float i = 10.0;", HasFloatLiteral));
-  EXPECT_TRUE(matches("float i = 10.0f;", HasFloatLiteral));
-  EXPECT_TRUE(matches("double i = 10.0;", HasFloatLiteral));
-  EXPECT_TRUE(matches("double i = 10.0L;", HasFloatLiteral));
-  EXPECT_TRUE(matches("double i = 1e10;", HasFloatLiteral));
-  EXPECT_TRUE(matches("double i = 5.0;", floatLiteral(equals(5.0))));
-  EXPECT_TRUE(matches("double i = 5.0;", floatLiteral(equals(5.0f))));
-  EXPECT_TRUE(
-      matches("double i = 5.0;", floatLiteral(equals(llvm::APFloat(5.0)))));
-
-  EXPECT_TRUE(notMatches("float i = 10;", HasFloatLiteral));
-  EXPECT_TRUE(notMatches("double i = 5.0;", floatLiteral(equals(6.0))));
-  EXPECT_TRUE(notMatches("double i = 5.0;", floatLiteral(equals(6.0f))));
-  EXPECT_TRUE(
-      notMatches("double i = 5.0;", floatLiteral(equals(llvm::APFloat(6.0)))));
-}
-
-TEST_P(ASTMatchersTest, CXXNullPtrLiteralExpr) {
-  if (!GetParam().isCXX11OrLater()) {
-    return;
-  }
-  EXPECT_TRUE(matches("int* i = nullptr;", cxxNullPtrLiteralExpr()));
-}
-
-TEST_P(ASTMatchersTest, ChooseExpr) {
-  EXPECT_TRUE(matches("void f() { (void)__builtin_choose_expr(1, 2, 3); }",
-                      chooseExpr()));
-}
-
-TEST_P(ASTMatchersTest, GNUNullExpr) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(matches("int* i = __null;", gnuNullExpr()));
-}
-
-TEST_P(ASTMatchersTest, GenericSelectionExpr) {
-  EXPECT_TRUE(matches("void f() { (void)_Generic(1, int: 1, float: 2.0); }",
-                      genericSelectionExpr()));
-}
-
-TEST_P(ASTMatchersTest, AtomicExpr) {
-  EXPECT_TRUE(matches("void foo() { int *ptr; __atomic_load_n(ptr, 1); }",
-                      atomicExpr()));
-}
-
-TEST_P(ASTMatchersTest, Initializers_C99) {
-  if (!GetParam().isC99OrLater()) {
-    return;
-  }
-  EXPECT_TRUE(matches(
-      "void foo() { struct point { double x; double y; };"
-      "  struct point ptarray[10] = "
-      "      { [2].y = 1.0, [2].x = 2.0, [0].x = 1.0 }; }",
-      initListExpr(hasSyntacticForm(initListExpr(
-          has(designatedInitExpr(designatorCountIs(2),
-                                 hasDescendant(floatLiteral(equals(1.0))),
-                                 hasDescendant(integerLiteral(equals(2))))),
-          has(designatedInitExpr(designatorCountIs(2),
-                                 hasDescendant(floatLiteral(equals(2.0))),
-                                 hasDescendant(integerLiteral(equals(2))))),
-          has(designatedInitExpr(
-              designatorCountIs(2), hasDescendant(floatLiteral(equals(1.0))),
-              hasDescendant(integerLiteral(equals(0))))))))));
-}
-
-TEST_P(ASTMatchersTest, Initializers_CXX) {
-  if (GetParam().Language != Lang_CXX03) {
-    // FIXME: Make this test pass with other C++ standard versions.
-    return;
-  }
-  EXPECT_TRUE(matches(
-      "void foo() { struct point { double x; double y; };"
-      "  struct point ptarray[10] = "
-      "      { [2].y = 1.0, [2].x = 2.0, [0].x = 1.0 }; }",
-      initListExpr(
-          has(cxxConstructExpr(requiresZeroInitialization())),
-          has(initListExpr(
-              hasType(asString("struct point")), has(floatLiteral(equals(1.0))),
-              has(implicitValueInitExpr(hasType(asString("double")))))),
-          has(initListExpr(hasType(asString("struct point")),
-                           has(floatLiteral(equals(2.0))),
-                           has(floatLiteral(equals(1.0))))))));
-}
-
-TEST_P(ASTMatchersTest, ParenListExpr) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(
-      matches("template<typename T> class foo { void bar() { foo X(*this); } };"
-              "template class foo<int>;",
-              varDecl(hasInitializer(parenListExpr(has(unaryOperator()))))));
-}
-
-TEST_P(ASTMatchersTest, StmtExpr) {
-  EXPECT_TRUE(matches("void declToImport() { int C = ({int X=4; X;}); }",
-                      varDecl(hasInitializer(stmtExpr()))));
-}
-
-TEST_P(ASTMatchersTest, PredefinedExpr) {
-  // __func__ expands as StringLiteral("foo")
-  EXPECT_TRUE(matches("void foo() { __func__; }",
-                      predefinedExpr(hasType(asString("const char [4]")),
-                                     has(stringLiteral()))));
-}
-
-TEST_P(ASTMatchersTest, AsmStatement) {
-  EXPECT_TRUE(matches("void foo() { __asm(\"mov al, 2\"); }", asmStmt()));
-}
-
-TEST_P(ASTMatchersTest, HasCondition) {
-  if (!GetParam().isCXX()) {
-    // FIXME: Add a test for `hasCondition()` that does not depend on C++.
-    return;
-  }
-
-  StatementMatcher Condition =
-      ifStmt(hasCondition(cxxBoolLiteral(equals(true))));
-
-  EXPECT_TRUE(matches("void x() { if (true) {} }", Condition));
-  EXPECT_TRUE(notMatches("void x() { if (false) {} }", Condition));
-  EXPECT_TRUE(notMatches("void x() { bool a = true; if (a) {} }", Condition));
-  EXPECT_TRUE(notMatches("void x() { if (true || false) {} }", Condition));
-  EXPECT_TRUE(notMatches("void x() { if (1) {} }", Condition));
-}
-
-TEST_P(ASTMatchersTest, ConditionalOperator) {
-  if (!GetParam().isCXX()) {
-    // FIXME: Add a test for `conditionalOperator()` that does not depend on
-    // C++.
-    return;
-  }
-
-  StatementMatcher Conditional =
-      conditionalOperator(hasCondition(cxxBoolLiteral(equals(true))),
-                          hasTrueExpression(cxxBoolLiteral(equals(false))));
-
-  EXPECT_TRUE(matches("void x() { true ? false : true; }", Conditional));
-  EXPECT_TRUE(notMatches("void x() { false ? false : true; }", Conditional));
-  EXPECT_TRUE(notMatches("void x() { true ? true : false; }", Conditional));
-
-  StatementMatcher ConditionalFalse =
-      conditionalOperator(hasFalseExpression(cxxBoolLiteral(equals(false))));
-
-  EXPECT_TRUE(matches("void x() { true ? true : false; }", ConditionalFalse));
-  EXPECT_TRUE(
-      notMatches("void x() { true ? false : true; }", ConditionalFalse));
-
-  EXPECT_TRUE(matches("void x() { true ? true : false; }", ConditionalFalse));
-  EXPECT_TRUE(
-      notMatches("void x() { true ? false : true; }", ConditionalFalse));
-}
-
-TEST_P(ASTMatchersTest, BinaryConditionalOperator) {
-  if (!GetParam().isCXX()) {
-    // FIXME: This test should work in non-C++ language modes.
-    return;
-  }
-
-  StatementMatcher AlwaysOne = traverse(
-      TK_AsIs, binaryConditionalOperator(
-                   hasCondition(implicitCastExpr(has(opaqueValueExpr(
-                       hasSourceExpression((integerLiteral(equals(1)))))))),
-                   hasFalseExpression(integerLiteral(equals(0)))));
-
-  EXPECT_TRUE(matches("void x() { 1 ?: 0; }", AlwaysOne));
-
-  StatementMatcher FourNotFive = binaryConditionalOperator(
-      hasTrueExpression(
-          opaqueValueExpr(hasSourceExpression((integerLiteral(equals(4)))))),
-      hasFalseExpression(integerLiteral(equals(5))));
-
-  EXPECT_TRUE(matches("void x() { 4 ?: 5; }", FourNotFive));
-}
-
-TEST_P(ASTMatchersTest, ArraySubscriptExpr) {
-  EXPECT_TRUE(
-      matches("int i[2]; void f() { i[1] = 1; }", arraySubscriptExpr()));
-  EXPECT_TRUE(notMatches("int i; void f() { i = 1; }", arraySubscriptExpr()));
-}
-
-TEST_P(ASTMatchersTest, ForStmt) {
-  EXPECT_TRUE(matches("void f() { for(;;); }", forStmt()));
-  EXPECT_TRUE(matches("void f() { if(1) for(;;); }", forStmt()));
-}
-
-TEST_P(ASTMatchersTest, ForStmt_CXX11) {
-  if (!GetParam().isCXX11OrLater()) {
-    return;
-  }
-  EXPECT_TRUE(notMatches("int as[] = { 1, 2, 3 };"
-                         "void f() { for (auto &a : as); }",
-                         forStmt()));
-}
-
-TEST_P(ASTMatchersTest, ForStmt_NoFalsePositives) {
-  EXPECT_TRUE(notMatches("void f() { ; }", forStmt()));
-  EXPECT_TRUE(notMatches("void f() { if(1); }", forStmt()));
-}
-
-TEST_P(ASTMatchersTest, CompoundStatement) {
-  EXPECT_TRUE(notMatches("void f();", compoundStmt()));
-  EXPECT_TRUE(matches("void f() {}", compoundStmt()));
-  EXPECT_TRUE(matches("void f() {{}}", compoundStmt()));
-}
-
-TEST_P(ASTMatchersTest, CompoundStatement_DoesNotMatchEmptyStruct) {
-  if (!GetParam().isCXX()) {
-    // FIXME: Add a similar test that does not depend on C++.
-    return;
-  }
-  // It's not a compound statement just because there's "{}" in the source
-  // text. This is an AST search, not grep.
-  EXPECT_TRUE(notMatches("namespace n { struct S {}; }", compoundStmt()));
-  EXPECT_TRUE(
-      matches("namespace n { struct S { void f() {{}} }; }", compoundStmt()));
-}
-
-TEST_P(ASTMatchersTest, CastExpr_MatchesExplicitCasts) {
-  EXPECT_TRUE(matches("void *p = (void *)(&p);", castExpr()));
-}
-
-TEST_P(ASTMatchersTest, CastExpr_MatchesExplicitCasts_CXX) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(matches("char *p = reinterpret_cast<char *>(&p);", castExpr()));
-  EXPECT_TRUE(matches("char q, *p = const_cast<char *>(&q);", castExpr()));
-  EXPECT_TRUE(matches("char c = char(0);", castExpr()));
-}
-
-TEST_P(ASTMatchersTest, CastExpression_MatchesImplicitCasts) {
-  // This test creates an implicit cast from int to char.
-  EXPECT_TRUE(matches("char c = 0;", traverse(TK_AsIs, castExpr())));
-  // This test creates an implicit cast from lvalue to rvalue.
-  EXPECT_TRUE(matches("void f() { char c = 0, d = c; }",
-                      traverse(TK_AsIs, castExpr())));
-}
-
-TEST_P(ASTMatchersTest, CastExpr_DoesNotMatchNonCasts) {
-  if (GetParam().Language == Lang_C89 || GetParam().Language == Lang_C99) {
-    // This does have a cast in C
-    EXPECT_TRUE(matches("char c = '0';", implicitCastExpr()));
-  } else {
-    EXPECT_TRUE(notMatches("char c = '0';", castExpr()));
-  }
-  EXPECT_TRUE(notMatches("int i = (0);", castExpr()));
-  EXPECT_TRUE(notMatches("int i = 0;", castExpr()));
-}
-
-TEST_P(ASTMatchersTest, CastExpr_DoesNotMatchNonCasts_CXX) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(notMatches("char c, &q = c;", castExpr()));
-}
-
-TEST_P(ASTMatchersTest, CXXReinterpretCastExpr) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(matches("char* p = reinterpret_cast<char*>(&p);",
-                      cxxReinterpretCastExpr()));
-}
-
-TEST_P(ASTMatchersTest, CXXReinterpretCastExpr_DoesNotMatchOtherCasts) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(notMatches("char* p = (char*)(&p);", cxxReinterpretCastExpr()));
-  EXPECT_TRUE(notMatches("char q, *p = const_cast<char*>(&q);",
-                         cxxReinterpretCastExpr()));
-  EXPECT_TRUE(notMatches("void* p = static_cast<void*>(&p);",
-                         cxxReinterpretCastExpr()));
-  EXPECT_TRUE(notMatches("struct B { virtual ~B() {} }; struct D : B {};"
-                         "B b;"
-                         "D* p = dynamic_cast<D*>(&b);",
-                         cxxReinterpretCastExpr()));
-}
-
-TEST_P(ASTMatchersTest, CXXFunctionalCastExpr_MatchesSimpleCase) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  StringRef foo_class = "class Foo { public: Foo(const char*); };";
-  EXPECT_TRUE(matches(foo_class + "void r() { Foo f = Foo(\"hello world\"); }",
-                      cxxFunctionalCastExpr()));
-}
-
-TEST_P(ASTMatchersTest, CXXFunctionalCastExpr_DoesNotMatchOtherCasts) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  StringRef FooClass = "class Foo { public: Foo(const char*); };";
-  EXPECT_TRUE(
-      notMatches(FooClass + "void r() { Foo f = (Foo) \"hello world\"; }",
-                 cxxFunctionalCastExpr()));
-  EXPECT_TRUE(notMatches(FooClass + "void r() { Foo f = \"hello world\"; }",
-                         cxxFunctionalCastExpr()));
-}
-
-TEST_P(ASTMatchersTest, CXXDynamicCastExpr) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(matches("struct B { virtual ~B() {} }; struct D : B {};"
-                      "B b;"
-                      "D* p = dynamic_cast<D*>(&b);",
-                      cxxDynamicCastExpr()));
-}
-
-TEST_P(ASTMatchersTest, CXXStaticCastExpr_MatchesSimpleCase) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(matches("void* p(static_cast<void*>(&p));", cxxStaticCastExpr()));
-}
-
-TEST_P(ASTMatchersTest, CXXStaticCastExpr_DoesNotMatchOtherCasts) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(notMatches("char* p = (char*)(&p);", cxxStaticCastExpr()));
-  EXPECT_TRUE(
-      notMatches("char q, *p = const_cast<char*>(&q);", cxxStaticCastExpr()));
-  EXPECT_TRUE(notMatches("void* p = reinterpret_cast<char*>(&p);",
-                         cxxStaticCastExpr()));
-  EXPECT_TRUE(notMatches("struct B { virtual ~B() {} }; struct D : B {};"
-                         "B b;"
-                         "D* p = dynamic_cast<D*>(&b);",
-                         cxxStaticCastExpr()));
-}
-
-TEST_P(ASTMatchersTest, CStyleCastExpr_MatchesSimpleCase) {
-  EXPECT_TRUE(matches("int i = (int) 2.2f;", cStyleCastExpr()));
-}
-
-TEST_P(ASTMatchersTest, CStyleCastExpr_DoesNotMatchOtherCasts) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(notMatches("char* p = static_cast<char*>(0);"
-                         "char q, *r = const_cast<char*>(&q);"
-                         "void* s = reinterpret_cast<char*>(&s);"
-                         "struct B { virtual ~B() {} }; struct D : B {};"
-                         "B b;"
-                         "D* t = dynamic_cast<D*>(&b);",
-                         cStyleCastExpr()));
-}
-
-TEST_P(ASTMatchersTest, ImplicitCastExpr_MatchesSimpleCase) {
-  // This test creates an implicit const cast.
-  EXPECT_TRUE(
-      matches("void f() { int x = 0; const int y = x; }",
-              traverse(TK_AsIs, varDecl(hasInitializer(implicitCastExpr())))));
-  // This test creates an implicit cast from int to char.
-  EXPECT_TRUE(
-      matches("char c = 0;",
-              traverse(TK_AsIs, varDecl(hasInitializer(implicitCastExpr())))));
-  // This test creates an implicit array-to-pointer cast.
-  EXPECT_TRUE(
-      matches("int arr[6]; int *p = arr;",
-              traverse(TK_AsIs, varDecl(hasInitializer(implicitCastExpr())))));
-}
-
-TEST_P(ASTMatchersTest, ImplicitCastExpr_DoesNotMatchIncorrectly) {
-  // This test verifies that implicitCastExpr() matches exactly when implicit
-  // casts are present, and that it ignores explicit and paren casts.
-
-  // These two test cases have no casts.
-  EXPECT_TRUE(
-      notMatches("int x = 0;", varDecl(hasInitializer(implicitCastExpr()))));
-  EXPECT_TRUE(
-      notMatches("int x = (0);", varDecl(hasInitializer(implicitCastExpr()))));
-  EXPECT_TRUE(notMatches("void f() { int x = 0; double d = (double) x; }",
-                         varDecl(hasInitializer(implicitCastExpr()))));
-}
-
-TEST_P(ASTMatchersTest, ImplicitCastExpr_DoesNotMatchIncorrectly_CXX) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(notMatches("int x = 0, &y = x;",
-                         varDecl(hasInitializer(implicitCastExpr()))));
-  EXPECT_TRUE(notMatches("const int *p; int *q = const_cast<int *>(p);",
-                         varDecl(hasInitializer(implicitCastExpr()))));
-}
-
-TEST_P(ASTMatchersTest, Stmt_DoesNotMatchDeclarations) {
-  EXPECT_TRUE(notMatches("struct X {};", stmt()));
-}
-
-TEST_P(ASTMatchersTest, Stmt_MatchesCompoundStatments) {
-  EXPECT_TRUE(matches("void x() {}", stmt()));
-}
-
-TEST_P(ASTMatchersTest, DeclStmt_DoesNotMatchCompoundStatements) {
-  EXPECT_TRUE(notMatches("void x() {}", declStmt()));
-}
-
-TEST_P(ASTMatchersTest, DeclStmt_MatchesVariableDeclarationStatements) {
-  EXPECT_TRUE(matches("void x() { int a; }", declStmt()));
-}
-
-TEST_P(ASTMatchersTest, ExprWithCleanups_MatchesExprWithCleanups) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(
-      matches("struct Foo { ~Foo(); };"
-              "const Foo f = Foo();",
-              traverse(TK_AsIs, varDecl(hasInitializer(exprWithCleanups())))));
-  EXPECT_FALSE(
-      matches("struct Foo { }; Foo a;"
-              "const Foo f = a;",
-              traverse(TK_AsIs, varDecl(hasInitializer(exprWithCleanups())))));
-}
-
-TEST_P(ASTMatchersTest, InitListExpr) {
-  EXPECT_TRUE(matches("int a[] = { 1, 2 };",
-                      initListExpr(hasType(asString("int [2]")))));
-  EXPECT_TRUE(matches("struct B { int x, y; }; struct B b = { 5, 6 };",
-                      initListExpr(hasType(recordDecl(hasName("B"))))));
-  EXPECT_TRUE(
-      matches("int i[1] = {42, [0] = 43};", integerLiteral(equals(42))));
-}
-
-TEST_P(ASTMatchersTest, InitListExpr_CXX) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(matches("struct S { S(void (*a)()); };"
-                      "void f();"
-                      "S s[1] = { &f };",
-                      declRefExpr(to(functionDecl(hasName("f"))))));
-}
-
-TEST_P(ASTMatchersTest,
-       CXXStdInitializerListExpression_MatchesCXXStdInitializerListExpression) {
-  if (!GetParam().isCXX11OrLater()) {
-    return;
-  }
-  StringRef code = "namespace std {"
-                   "template <typename> class initializer_list {"
-                   "  public: initializer_list() noexcept {}"
-                   "};"
-                   "}"
-                   "struct A {"
-                   "  A(std::initializer_list<int>) {}"
-                   "};";
-  EXPECT_TRUE(matches(
-      code + "A a{0};",
-      traverse(TK_AsIs, cxxConstructExpr(has(cxxStdInitializerListExpr()),
-                                         hasDeclaration(cxxConstructorDecl(
-                                             ofClass(hasName("A"))))))));
-  EXPECT_TRUE(matches(
-      code + "A a = {0};",
-      traverse(TK_AsIs, cxxConstructExpr(has(cxxStdInitializerListExpr()),
-                                         hasDeclaration(cxxConstructorDecl(
-                                             ofClass(hasName("A"))))))));
-
-  EXPECT_TRUE(notMatches("int a[] = { 1, 2 };", cxxStdInitializerListExpr()));
-  EXPECT_TRUE(notMatches("struct B { int x, y; }; B b = { 5, 6 };",
-                         cxxStdInitializerListExpr()));
-}
-
-TEST_P(ASTMatchersTest, UsingDecl_MatchesUsingDeclarations) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(matches("namespace X { int x; } using X::x;", usingDecl()));
-}
-
-TEST_P(ASTMatchersTest, UsingDecl_MatchesShadowUsingDelcarations) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(matches("namespace f { int a; } using f::a;",
-                      usingDecl(hasAnyUsingShadowDecl(hasName("a")))));
-}
-
-TEST_P(ASTMatchersTest, UsingEnumDecl_MatchesUsingEnumDeclarations) {
-  if (!GetParam().isCXX20OrLater()) {
-    return;
-  }
-  EXPECT_TRUE(
-      matches("namespace X { enum x {}; } using enum X::x;", usingEnumDecl()));
-}
-
-TEST_P(ASTMatchersTest, UsingEnumDecl_MatchesShadowUsingDeclarations) {
-  if (!GetParam().isCXX20OrLater()) {
-    return;
-  }
-  EXPECT_TRUE(matches("namespace f { enum a {b}; } using enum f::a;",
-                      usingEnumDecl(hasAnyUsingShadowDecl(hasName("b")))));
-}
-
-TEST_P(ASTMatchersTest, UsingDirectiveDecl_MatchesUsingNamespace) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(matches("namespace X { int x; } using namespace X;",
-                      usingDirectiveDecl()));
-  EXPECT_FALSE(
-      matches("namespace X { int x; } using X::x;", usingDirectiveDecl()));
-}
-
-TEST_P(ASTMatchersTest, WhileStmt) {
-  EXPECT_TRUE(notMatches("void x() {}", whileStmt()));
-  EXPECT_TRUE(matches("void x() { while(1); }", whileStmt()));
-  EXPECT_TRUE(notMatches("void x() { do {} while(1); }", whileStmt()));
-}
-
-TEST_P(ASTMatchersTest, DoStmt_MatchesDoLoops) {
-  EXPECT_TRUE(matches("void x() { do {} while(1); }", doStmt()));
-  EXPECT_TRUE(matches("void x() { do ; while(0); }", doStmt()));
-}
-
-TEST_P(ASTMatchersTest, DoStmt_DoesNotMatchWhileLoops) {
-  EXPECT_TRUE(notMatches("void x() { while(1) {} }", doStmt()));
-}
-
-TEST_P(ASTMatchersTest, SwitchCase_MatchesCase) {
-  EXPECT_TRUE(matches("void x() { switch(42) { case 42:; } }", switchCase()));
-  EXPECT_TRUE(matches("void x() { switch(42) { default:; } }", switchCase()));
-  EXPECT_TRUE(matches("void x() { switch(42) default:; }", switchCase()));
-  EXPECT_TRUE(notMatches("void x() { switch(42) {} }", switchCase()));
-}
-
-TEST_P(ASTMatchersTest, SwitchCase_MatchesSwitch) {
-  EXPECT_TRUE(matches("void x() { switch(42) { case 42:; } }", switchStmt()));
-  EXPECT_TRUE(matches("void x() { switch(42) { default:; } }", switchStmt()));
-  EXPECT_TRUE(matches("void x() { switch(42) default:; }", switchStmt()));
-  EXPECT_TRUE(notMatches("void x() {}", switchStmt()));
-}
-
-TEST_P(ASTMatchersTest, CxxExceptionHandling_SimpleCases) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(matches("void foo() try { } catch(int X) { }", cxxCatchStmt()));
-  EXPECT_TRUE(matches("void foo() try { } catch(int X) { }", cxxTryStmt()));
-  EXPECT_TRUE(
-      notMatches("void foo() try { } catch(int X) { }", cxxThrowExpr()));
-  EXPECT_TRUE(
-      matches("void foo() try { throw; } catch(int X) { }", cxxThrowExpr()));
-  EXPECT_TRUE(
-      matches("void foo() try { throw 5;} catch(int X) { }", cxxThrowExpr()));
-  EXPECT_TRUE(matches("void foo() try { throw; } catch(...) { }",
-                      cxxCatchStmt(isCatchAll())));
-  EXPECT_TRUE(notMatches("void foo() try { throw; } catch(int) { }",
-                         cxxCatchStmt(isCatchAll())));
-  EXPECT_TRUE(matches("void foo() try {} catch(int X) { }",
-                      varDecl(isExceptionVariable())));
-  EXPECT_TRUE(notMatches("void foo() try { int X; } catch (...) { }",
-                         varDecl(isExceptionVariable())));
-}
-
-TEST_P(ASTMatchersTest, ParenExpr_SimpleCases) {
-  EXPECT_TRUE(matches("int i = (3);", traverse(TK_AsIs, parenExpr())));
-  EXPECT_TRUE(matches("int i = (3 + 7);", traverse(TK_AsIs, parenExpr())));
-  EXPECT_TRUE(notMatches("int i = 3;", traverse(TK_AsIs, parenExpr())));
-  EXPECT_TRUE(notMatches("int f() { return 1; }; void g() { int a = f(); }",
-                         traverse(TK_AsIs, parenExpr())));
-}
-
-TEST_P(ASTMatchersTest, IgnoringParens) {
-  EXPECT_FALSE(matches("const char* str = (\"my-string\");",
-                       traverse(TK_AsIs, implicitCastExpr(hasSourceExpression(
-                                             stringLiteral())))));
-  EXPECT_TRUE(
-      matches("const char* str = (\"my-string\");",
-              traverse(TK_AsIs, implicitCastExpr(hasSourceExpression(
-                                    ignoringParens(stringLiteral()))))));
-}
-
-TEST_P(ASTMatchersTest, QualType) {
-  EXPECT_TRUE(matches("struct S {};", qualType().bind("loc")));
-}
-
-TEST_P(ASTMatchersTest, ConstantArrayType) {
-  EXPECT_TRUE(matches("int a[2];", constantArrayType()));
-  EXPECT_TRUE(notMatches("void f() { int a[] = { 2, 3 }; int b[a[0]]; }",
-                         constantArrayType(hasElementType(builtinType()))));
-
-  EXPECT_TRUE(matches("int a[42];", constantArrayType(hasSize(42))));
-  EXPECT_TRUE(matches("int b[2*21];", constantArrayType(hasSize(42))));
-  EXPECT_TRUE(notMatches("int c[41], d[43];", constantArrayType(hasSize(42))));
-}
-
-TEST_P(ASTMatchersTest, DependentSizedArrayType) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(
-      matches("template <typename T, int Size> class array { T data[Size]; };",
-              dependentSizedArrayType()));
-  EXPECT_TRUE(
-      notMatches("int a[42]; int b[] = { 2, 3 }; void f() { int c[b[0]]; }",
-                 dependentSizedArrayType()));
-}
-
-TEST_P(ASTMatchersTest, IncompleteArrayType) {
-  EXPECT_TRUE(matches("int a[] = { 2, 3 };", incompleteArrayType()));
-  EXPECT_TRUE(matches("void f(int a[]) {}", incompleteArrayType()));
-
-  EXPECT_TRUE(notMatches("int a[42]; void f() { int b[a[0]]; }",
-                         incompleteArrayType()));
-}
-
-TEST_P(ASTMatchersTest, VariableArrayType) {
-  EXPECT_TRUE(matches("void f(int b) { int a[b]; }", variableArrayType()));
-  EXPECT_TRUE(notMatches("int a[] = {2, 3}; int b[42];", variableArrayType()));
-
-  EXPECT_TRUE(matches("void f(int b) { int a[b]; }",
-                      variableArrayType(hasSizeExpr(ignoringImpCasts(
-                          declRefExpr(to(varDecl(hasName("b")))))))));
-}
-
-TEST_P(ASTMatchersTest, AtomicType) {
-  if (llvm::Triple(llvm::sys::getDefaultTargetTriple()).getOS() !=
-      llvm::Triple::Win32) {
-    // FIXME: Make this work for MSVC.
-    EXPECT_TRUE(matches("_Atomic(int) i;", atomicType()));
-
-    EXPECT_TRUE(
-        matches("_Atomic(int) i;", atomicType(hasValueType(isInteger()))));
-    EXPECT_TRUE(
-        notMatches("_Atomic(float) f;", atomicType(hasValueType(isInteger()))));
-  }
-}
-
-TEST_P(ASTMatchersTest, AutoType) {
-  if (!GetParam().isCXX11OrLater()) {
-    return;
-  }
-  EXPECT_TRUE(matches("auto i = 2;", autoType()));
-  EXPECT_TRUE(matches("int v[] = { 2, 3 }; void f() { for (int i : v) {} }",
-                      autoType()));
-
-  EXPECT_TRUE(matches("auto i = 2;", varDecl(hasType(isInteger()))));
-  EXPECT_TRUE(matches("struct X{}; auto x = X{};",
-                      varDecl(hasType(recordDecl(hasName("X"))))));
-
-  // FIXME: Matching against the type-as-written can't work here, because the
-  //        type as written was not deduced.
-  // EXPECT_TRUE(matches("auto a = 1;",
-  //                    autoType(hasDeducedType(isInteger()))));
-  // EXPECT_TRUE(notMatches("auto b = 2.0;",
-  //                       autoType(hasDeducedType(isInteger()))));
-}
-
-TEST_P(ASTMatchersTest, DecltypeType) {
-  if (!GetParam().isCXX11OrLater()) {
-    return;
-  }
-  EXPECT_TRUE(matches("decltype(1 + 1) sum = 1 + 1;", decltypeType()));
-  EXPECT_TRUE(matches("decltype(1 + 1) sum = 1 + 1;",
-                      decltypeType(hasUnderlyingType(isInteger()))));
-}
-
-TEST_P(ASTMatchersTest, FunctionType) {
-  EXPECT_TRUE(matches("int (*f)(int);", functionType()));
-  EXPECT_TRUE(matches("void f(int i) {}", functionType()));
-}
-
-TEST_P(ASTMatchersTest, IgnoringParens_Type) {
-  EXPECT_TRUE(
-      notMatches("void (*fp)(void);", pointerType(pointee(functionType()))));
-  EXPECT_TRUE(matches("void (*fp)(void);",
-                      pointerType(pointee(ignoringParens(functionType())))));
-}
-
-TEST_P(ASTMatchersTest, FunctionProtoType) {
-  EXPECT_TRUE(matches("int (*f)(int);", functionProtoType()));
-  EXPECT_TRUE(matches("void f(int i);", functionProtoType()));
-  EXPECT_TRUE(matches("void f(void);", functionProtoType(parameterCountIs(0))));
-}
-
-TEST_P(ASTMatchersTest, FunctionProtoType_C) {
-  if (!GetParam().isC()) {
-    return;
-  }
-  EXPECT_TRUE(notMatches("void f();", functionProtoType()));
-}
-
-TEST_P(ASTMatchersTest, FunctionProtoType_CXX) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(matches("void f();", functionProtoType(parameterCountIs(0))));
-}
-
-TEST_P(ASTMatchersTest, ParenType) {
-  EXPECT_TRUE(
-      matches("int (*array)[4];", varDecl(hasType(pointsTo(parenType())))));
-  EXPECT_TRUE(notMatches("int *array[4];", varDecl(hasType(parenType()))));
-
-  EXPECT_TRUE(matches(
-      "int (*ptr_to_func)(int);",
-      varDecl(hasType(pointsTo(parenType(innerType(functionType())))))));
-  EXPECT_TRUE(notMatches(
-      "int (*ptr_to_array)[4];",
-      varDecl(hasType(pointsTo(parenType(innerType(functionType())))))));
-}
-
-TEST_P(ASTMatchersTest, PointerType) {
-  // FIXME: Reactive when these tests can be more specific (not matching
-  // implicit code on certain platforms), likely when we have hasDescendant for
-  // Types/TypeLocs.
-  // EXPECT_TRUE(matchAndVerifyResultTrue(
-  //    "int* a;",
-  //    pointerTypeLoc(pointeeLoc(typeLoc().bind("loc"))),
-  //    std::make_unique<VerifyIdIsBoundTo<TypeLoc>>("loc", 1)));
-  // EXPECT_TRUE(matchAndVerifyResultTrue(
-  //    "int* a;",
-  //    pointerTypeLoc().bind("loc"),
-  //    std::make_unique<VerifyIdIsBoundTo<TypeLoc>>("loc", 1)));
-  EXPECT_TRUE(matches("int** a;", loc(pointerType(pointee(qualType())))));
-  EXPECT_TRUE(matches("int** a;", loc(pointerType(pointee(pointerType())))));
-  EXPECT_TRUE(matches("int* b; int* * const a = &b;",
-                      loc(qualType(isConstQualified(), pointerType()))));
-
-  StringRef Fragment = "int *ptr;";
-  EXPECT_TRUE(notMatches(Fragment,
-                         varDecl(hasName("ptr"), hasType(blockPointerType()))));
-  EXPECT_TRUE(notMatches(
-      Fragment, varDecl(hasName("ptr"), hasType(memberPointerType()))));
-  EXPECT_TRUE(
-      matches(Fragment, varDecl(hasName("ptr"), hasType(pointerType()))));
-  EXPECT_TRUE(
-      notMatches(Fragment, varDecl(hasName("ptr"), hasType(referenceType()))));
-}
-
-TEST_P(ASTMatchersTest, PointerType_CXX) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  StringRef Fragment = "struct A { int i; }; int A::* ptr = &A::i;";
-  EXPECT_TRUE(notMatches(Fragment,
-                         varDecl(hasName("ptr"), hasType(blockPointerType()))));
-  EXPECT_TRUE(
-      matches(Fragment, varDecl(hasName("ptr"), hasType(memberPointerType()))));
-  EXPECT_TRUE(
-      notMatches(Fragment, varDecl(hasName("ptr"), hasType(pointerType()))));
-  EXPECT_TRUE(
-      notMatches(Fragment, varDecl(hasName("ptr"), hasType(referenceType()))));
-  EXPECT_TRUE(notMatches(
-      Fragment, varDecl(hasName("ptr"), hasType(lValueReferenceType()))));
-  EXPECT_TRUE(notMatches(
-      Fragment, varDecl(hasName("ptr"), hasType(rValueReferenceType()))));
-
-  Fragment = "int a; int &ref = a;";
-  EXPECT_TRUE(notMatches(Fragment,
-                         varDecl(hasName("ref"), hasType(blockPointerType()))));
-  EXPECT_TRUE(notMatches(
-      Fragment, varDecl(hasName("ref"), hasType(memberPointerType()))));
-  EXPECT_TRUE(
-      notMatches(Fragment, varDecl(hasName("ref"), hasType(pointerType()))));
-  EXPECT_TRUE(
-      matches(Fragment, varDecl(hasName("ref"), hasType(referenceType()))));
-  EXPECT_TRUE(matches(Fragment,
-                      varDecl(hasName("ref"), hasType(lValueReferenceType()))));
-  EXPECT_TRUE(notMatches(
-      Fragment, varDecl(hasName("ref"), hasType(rValueReferenceType()))));
-}
-
-TEST_P(ASTMatchersTest, PointerType_CXX11) {
-  if (!GetParam().isCXX11OrLater()) {
-    return;
-  }
-  StringRef Fragment = "int &&ref = 2;";
-  EXPECT_TRUE(notMatches(Fragment,
-                         varDecl(hasName("ref"), hasType(blockPointerType()))));
-  EXPECT_TRUE(notMatches(
-      Fragment, varDecl(hasName("ref"), hasType(memberPointerType()))));
-  EXPECT_TRUE(
-      notMatches(Fragment, varDecl(hasName("ref"), hasType(pointerType()))));
-  EXPECT_TRUE(
-      matches(Fragment, varDecl(hasName("ref"), hasType(referenceType()))));
-  EXPECT_TRUE(notMatches(
-      Fragment, varDecl(hasName("ref"), hasType(lValueReferenceType()))));
-  EXPECT_TRUE(matches(Fragment,
-                      varDecl(hasName("ref"), hasType(rValueReferenceType()))));
-}
-
-TEST_P(ASTMatchersTest, AutoRefTypes) {
-  if (!GetParam().isCXX11OrLater()) {
-    return;
-  }
-
-  StringRef Fragment = "auto a = 1;"
-                       "auto b = a;"
-                       "auto &c = a;"
-                       "auto &&d = c;"
-                       "auto &&e = 2;";
-  EXPECT_TRUE(
-      notMatches(Fragment, varDecl(hasName("a"), hasType(referenceType()))));
-  EXPECT_TRUE(
-      notMatches(Fragment, varDecl(hasName("b"), hasType(referenceType()))));
-  EXPECT_TRUE(
-      matches(Fragment, varDecl(hasName("c"), hasType(referenceType()))));
-  EXPECT_TRUE(
-      matches(Fragment, varDecl(hasName("c"), hasType(lValueReferenceType()))));
-  EXPECT_TRUE(notMatches(
-      Fragment, varDecl(hasName("c"), hasType(rValueReferenceType()))));
-  EXPECT_TRUE(
-      matches(Fragment, varDecl(hasName("d"), hasType(referenceType()))));
-  EXPECT_TRUE(
-      matches(Fragment, varDecl(hasName("d"), hasType(lValueReferenceType()))));
-  EXPECT_TRUE(notMatches(
-      Fragment, varDecl(hasName("d"), hasType(rValueReferenceType()))));
-  EXPECT_TRUE(
-      matches(Fragment, varDecl(hasName("e"), hasType(referenceType()))));
-  EXPECT_TRUE(notMatches(
-      Fragment, varDecl(hasName("e"), hasType(lValueReferenceType()))));
-  EXPECT_TRUE(
-      matches(Fragment, varDecl(hasName("e"), hasType(rValueReferenceType()))));
-}
-
-TEST_P(ASTMatchersTest, EnumType) {
-  EXPECT_TRUE(
-      matches("enum Color { Green }; enum Color color;", loc(enumType())));
-}
-
-TEST_P(ASTMatchersTest, EnumType_CXX) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(matches("enum Color { Green }; Color color;", loc(enumType())));
-}
-
-TEST_P(ASTMatchersTest, EnumType_CXX11) {
-  if (!GetParam().isCXX11OrLater()) {
-    return;
-  }
-  EXPECT_TRUE(
-      matches("enum class Color { Green }; Color color;", loc(enumType())));
-}
-
-TEST_P(ASTMatchersTest, PointerType_MatchesPointersToConstTypes) {
-  EXPECT_TRUE(matches("int b; int * const a = &b;", loc(pointerType())));
-  EXPECT_TRUE(matches("int b; int * const a = &b;", loc(pointerType())));
-  EXPECT_TRUE(matches("int b; const int * a = &b;",
-                      loc(pointerType(pointee(builtinType())))));
-  EXPECT_TRUE(matches("int b; const int * a = &b;",
-                      pointerType(pointee(builtinType()))));
-}
-
-TEST_P(ASTMatchersTest, TypedefType) {
-  EXPECT_TRUE(matches("typedef int X; X a;",
-                      varDecl(hasName("a"), hasType(typedefType()))));
-}
-
-TEST_P(ASTMatchersTest, TemplateSpecializationType) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(matches("template <typename T> class A{}; A<int> a;",
-                      templateSpecializationType()));
-}
-
-TEST_P(ASTMatchersTest, DeducedTemplateSpecializationType) {
-  if (!GetParam().isCXX17OrLater()) {
-    return;
-  }
-  EXPECT_TRUE(
-      matches("template <typename T> class A{ public: A(T) {} }; A a(1);",
-              deducedTemplateSpecializationType()));
-}
-
-TEST_P(ASTMatchersTest, RecordType) {
-  EXPECT_TRUE(matches("struct S {}; struct S s;",
-                      recordType(hasDeclaration(recordDecl(hasName("S"))))));
-  EXPECT_TRUE(notMatches("int i;",
-                         recordType(hasDeclaration(recordDecl(hasName("S"))))));
-}
-
-TEST_P(ASTMatchersTest, RecordType_CXX) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(matches("class C {}; C c;", recordType()));
-  EXPECT_TRUE(matches("struct S {}; S s;",
-                      recordType(hasDeclaration(recordDecl(hasName("S"))))));
-}
-
-TEST_P(ASTMatchersTest, ElaboratedType) {
-  if (!GetParam().isCXX()) {
-    // FIXME: Add a test for `elaboratedType()` that does not depend on C++.
-    return;
-  }
-  EXPECT_TRUE(matches("namespace N {"
-                      "  namespace M {"
-                      "    class D {};"
-                      "  }"
-                      "}"
-                      "N::M::D d;",
-                      elaboratedType()));
-  EXPECT_TRUE(matches("class C {} c;", elaboratedType()));
-  EXPECT_TRUE(notMatches("class C {}; C c;", elaboratedType()));
-}
-
-TEST_P(ASTMatchersTest, SubstTemplateTypeParmType) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  StringRef code = "template <typename T>"
-                   "int F() {"
-                   "  return 1 + T();"
-                   "}"
-                   "int i = F<int>();";
-  EXPECT_FALSE(matches(code, binaryOperator(hasLHS(
-                                 expr(hasType(substTemplateTypeParmType()))))));
-  EXPECT_TRUE(matches(code, binaryOperator(hasRHS(
-                                expr(hasType(substTemplateTypeParmType()))))));
-}
-
-TEST_P(ASTMatchersTest, NestedNameSpecifier) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(
-      matches("namespace ns { struct A {}; } ns::A a;", nestedNameSpecifier()));
-  EXPECT_TRUE(matches("template <typename T> class A { typename T::B b; };",
-                      nestedNameSpecifier()));
-  EXPECT_TRUE(
-      matches("struct A { void f(); }; void A::f() {}", nestedNameSpecifier()));
-  EXPECT_TRUE(matches("namespace a { namespace b {} } namespace ab = a::b;",
-                      nestedNameSpecifier()));
-
-  EXPECT_TRUE(matches("struct A { static void f() {} }; void g() { A::f(); }",
-                      nestedNameSpecifier()));
-  EXPECT_TRUE(
-      notMatches("struct A { static void f() {} }; void g(A* a) { a->f(); }",
-                 nestedNameSpecifier()));
-}
-
-TEST_P(ASTMatchersTest, NullStmt) {
-  EXPECT_TRUE(matches("void f() {int i;;}", nullStmt()));
-  EXPECT_TRUE(notMatches("void f() {int i;}", nullStmt()));
-}
-
-TEST_P(ASTMatchersTest, NamespaceAliasDecl) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(matches("namespace test {} namespace alias = ::test;",
-                      namespaceAliasDecl(hasName("alias"))));
-}
-
-TEST_P(ASTMatchersTest, NestedNameSpecifier_MatchesTypes) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  NestedNameSpecifierMatcher Matcher = nestedNameSpecifier(
-      specifiesType(hasDeclaration(recordDecl(hasName("A")))));
-  EXPECT_TRUE(matches("struct A { struct B {}; }; A::B b;", Matcher));
-  EXPECT_TRUE(
-      matches("struct A { struct B { struct C {}; }; }; A::B::C c;", Matcher));
-  EXPECT_TRUE(notMatches("namespace A { struct B {}; } A::B b;", Matcher));
-}
-
-TEST_P(ASTMatchersTest, NestedNameSpecifier_MatchesNamespaceDecls) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  NestedNameSpecifierMatcher Matcher =
-      nestedNameSpecifier(specifiesNamespace(hasName("ns")));
-  EXPECT_TRUE(matches("namespace ns { struct A {}; } ns::A a;", Matcher));
-  EXPECT_TRUE(notMatches("namespace xx { struct A {}; } xx::A a;", Matcher));
-  EXPECT_TRUE(notMatches("struct ns { struct A {}; }; ns::A a;", Matcher));
-}
-
-TEST_P(ASTMatchersTest,
-       NestedNameSpecifier_MatchesNestedNameSpecifierPrefixes) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(matches(
-      "struct A { struct B { struct C {}; }; }; A::B::C c;",
-      nestedNameSpecifier(hasPrefix(specifiesType(asString("struct A"))))));
-  EXPECT_TRUE(matches("struct A { struct B { struct C {}; }; }; A::B::C c;",
-                      nestedNameSpecifierLoc(hasPrefix(specifiesTypeLoc(
-                          loc(qualType(asString("struct A"))))))));
-  EXPECT_TRUE(matches(
-      "namespace N { struct A { struct B { struct C {}; }; }; } N::A::B::C c;",
-      nestedNameSpecifierLoc(hasPrefix(
-          specifiesTypeLoc(loc(qualType(asString("struct N::A"))))))));
-}
-
-template <typename T>
-class VerifyAncestorHasChildIsEqual : public BoundNodesCallback {
-public:
-  bool run(const BoundNodes *Nodes) override { return false; }
-
-  bool run(const BoundNodes *Nodes, ASTContext *Context) override {
-    const T *Node = Nodes->getNodeAs<T>("");
-    return verify(*Nodes, *Context, Node);
-  }
-
-  bool verify(const BoundNodes &Nodes, ASTContext &Context, const Stmt *Node) {
-    // Use the original typed pointer to verify we can pass pointers to subtypes
-    // to equalsNode.
-    const T *TypedNode = cast<T>(Node);
-    return selectFirst<T>(
-               "", match(stmt(hasParent(
-                             stmt(has(stmt(equalsNode(TypedNode)))).bind(""))),
-                         *Node, Context)) != nullptr;
-  }
-  bool verify(const BoundNodes &Nodes, ASTContext &Context, const Decl *Node) {
-    // Use the original typed pointer to verify we can pass pointers to subtypes
-    // to equalsNode.
-    const T *TypedNode = cast<T>(Node);
-    return selectFirst<T>(
-               "", match(decl(hasParent(
-                             decl(has(decl(equalsNode(TypedNode)))).bind(""))),
-                         *Node, Context)) != nullptr;
-  }
-  bool verify(const BoundNodes &Nodes, ASTContext &Context, const Type *Node) {
-    // Use the original typed pointer to verify we can pass pointers to subtypes
-    // to equalsNode.
-    const T *TypedNode = cast<T>(Node);
-    const auto *Dec = Nodes.getNodeAs<FieldDecl>("decl");
-    return selectFirst<T>(
-               "", match(fieldDecl(hasParent(decl(has(fieldDecl(
-                             hasType(type(equalsNode(TypedNode)).bind(""))))))),
-                         *Dec, Context)) != nullptr;
-  }
-};
-
-TEST_P(ASTMatchersTest, IsEqualTo_MatchesNodesByIdentity) {
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-      "void f() { if (1) if(1) {} }", ifStmt().bind(""),
-      std::make_unique<VerifyAncestorHasChildIsEqual<IfStmt>>()));
-}
-
-TEST_P(ASTMatchersTest, IsEqualTo_MatchesNodesByIdentity_Cxx) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-      "class X { class Y {}; };", recordDecl(hasName("::X::Y")).bind(""),
-      std::make_unique<VerifyAncestorHasChildIsEqual<CXXRecordDecl>>()));
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-      "class X { class Y {} y; };",
-      fieldDecl(hasName("y"), hasType(type().bind(""))).bind("decl"),
-      std::make_unique<VerifyAncestorHasChildIsEqual<Type>>()));
-}
-
-TEST_P(ASTMatchersTest, TypedefDecl) {
-  EXPECT_TRUE(matches("typedef int typedefDeclTest;",
-                      typedefDecl(hasName("typedefDeclTest"))));
-}
-
-TEST_P(ASTMatchersTest, TypedefDecl_Cxx) {
-  if (!GetParam().isCXX11OrLater()) {
-    return;
-  }
-  EXPECT_TRUE(notMatches("using typedefDeclTest = int;",
-                         typedefDecl(hasName("typedefDeclTest"))));
-}
-
-TEST_P(ASTMatchersTest, TypeAliasDecl) {
-  EXPECT_TRUE(notMatches("typedef int typeAliasTest;",
-                         typeAliasDecl(hasName("typeAliasTest"))));
-}
-
-TEST_P(ASTMatchersTest, TypeAliasDecl_CXX) {
-  if (!GetParam().isCXX11OrLater()) {
-    return;
-  }
-  EXPECT_TRUE(matches("using typeAliasTest = int;",
-                      typeAliasDecl(hasName("typeAliasTest"))));
-}
-
-TEST_P(ASTMatchersTest, TypedefNameDecl) {
-  EXPECT_TRUE(matches("typedef int typedefNameDeclTest1;",
-                      typedefNameDecl(hasName("typedefNameDeclTest1"))));
-}
-
-TEST_P(ASTMatchersTest, TypedefNameDecl_CXX) {
-  if (!GetParam().isCXX11OrLater()) {
-    return;
-  }
-  EXPECT_TRUE(matches("using typedefNameDeclTest = int;",
-                      typedefNameDecl(hasName("typedefNameDeclTest"))));
-}
-
-TEST_P(ASTMatchersTest, TypeAliasTemplateDecl) {
-  if (!GetParam().isCXX11OrLater()) {
-    return;
-  }
-  StringRef Code = R"(
-    template <typename T>
-    class X { T t; };
-
-    template <typename T>
-    using typeAliasTemplateDecl = X<T>;
-
-    using typeAliasDecl = X<int>;
-  )";
-  EXPECT_TRUE(
-      matches(Code, typeAliasTemplateDecl(hasName("typeAliasTemplateDecl"))));
-  EXPECT_TRUE(
-      notMatches(Code, typeAliasTemplateDecl(hasName("typeAliasDecl"))));
-}
-
-TEST(ASTMatchersTestObjC, ObjCMessageExpr) {
-  // Don't find ObjCMessageExpr where none are present.
-  EXPECT_TRUE(notMatchesObjC("", objcMessageExpr(anything())));
-
-  StringRef Objc1String = "@interface Str "
-                          " - (Str *)uppercaseString;"
-                          "@end "
-                          "@interface foo "
-                          "- (void)contents;"
-                          "- (void)meth:(Str *)text;"
-                          "@end "
-                          " "
-                          "@implementation foo "
-                          "- (void) meth:(Str *)text { "
-                          "  [self contents];"
-                          "  Str *up = [text uppercaseString];"
-                          "} "
-                          "@end ";
-  EXPECT_TRUE(matchesObjC(Objc1String, objcMessageExpr(anything())));
-  EXPECT_TRUE(matchesObjC(Objc1String,
-                          objcMessageExpr(hasAnySelector({"contents", "meth:"}))
-
-                              ));
-  EXPECT_TRUE(
-      matchesObjC(Objc1String, objcMessageExpr(hasSelector("contents"))));
-  EXPECT_TRUE(matchesObjC(
-      Objc1String, objcMessageExpr(hasAnySelector("contents", "contentsA"))));
-  EXPECT_FALSE(matchesObjC(
-      Objc1String, objcMessageExpr(hasAnySelector("contentsB", "contentsC"))));
-  EXPECT_TRUE(
-      matchesObjC(Objc1String, objcMessageExpr(matchesSelector("cont*"))));
-  EXPECT_FALSE(
-      matchesObjC(Objc1String, objcMessageExpr(matchesSelector("?cont*"))));
-  EXPECT_TRUE(
-      notMatchesObjC(Objc1String, objcMessageExpr(hasSelector("contents"),
-                                                  hasNullSelector())));
-  EXPECT_TRUE(matchesObjC(Objc1String, objcMessageExpr(hasSelector("contents"),
-                                                       hasUnarySelector())));
-  EXPECT_TRUE(matchesObjC(Objc1String, objcMessageExpr(hasSelector("contents"),
-                                                       numSelectorArgs(0))));
-  EXPECT_TRUE(
-      matchesObjC(Objc1String, objcMessageExpr(matchesSelector("uppercase*"),
-                                               argumentCountIs(0))));
-}
-
-TEST(ASTMatchersTestObjC, ObjCDecls) {
-  StringRef ObjCString = "@protocol Proto "
-                         "- (void)protoDidThing; "
-                         "@end "
-                         "@interface Thing "
-                         "@property int enabled; "
-                         "@end "
-                         "@interface Thing (ABC) "
-                         "- (void)abc_doThing; "
-                         "@end "
-                         "@implementation Thing "
-                         "{ id _ivar; } "
-                         "- (void)anything {} "
-                         "@end "
-                         "@implementation Thing (ABC) "
-                         "- (void)abc_doThing {} "
-                         "@end ";
-
-  EXPECT_TRUE(matchesObjC(ObjCString, objcProtocolDecl(hasName("Proto"))));
-  EXPECT_TRUE(
-      matchesObjC(ObjCString, objcImplementationDecl(hasName("Thing"))));
-  EXPECT_TRUE(matchesObjC(ObjCString, objcCategoryDecl(hasName("ABC"))));
-  EXPECT_TRUE(matchesObjC(ObjCString, objcCategoryImplDecl(hasName("ABC"))));
-  EXPECT_TRUE(
-      matchesObjC(ObjCString, objcMethodDecl(hasName("protoDidThing"))));
-  EXPECT_TRUE(matchesObjC(ObjCString, objcMethodDecl(hasName("abc_doThing"))));
-  EXPECT_TRUE(matchesObjC(ObjCString, objcMethodDecl(hasName("anything"))));
-  EXPECT_TRUE(matchesObjC(ObjCString, objcIvarDecl(hasName("_ivar"))));
-  EXPECT_TRUE(matchesObjC(ObjCString, objcPropertyDecl(hasName("enabled"))));
-}
-
-TEST(ASTMatchersTestObjC, ObjCExceptionStmts) {
-  StringRef ObjCString = "void f(id obj) {"
-                         "  @try {"
-                         "    @throw obj;"
-                         "  } @catch (...) {"
-                         "  } @finally {}"
-                         "}";
-
-  EXPECT_TRUE(matchesObjC(ObjCString, objcTryStmt()));
-  EXPECT_TRUE(matchesObjC(ObjCString, objcThrowStmt()));
-  EXPECT_TRUE(matchesObjC(ObjCString, objcCatchStmt()));
-  EXPECT_TRUE(matchesObjC(ObjCString, objcFinallyStmt()));
-}
-
-TEST(ASTMatchersTest, DecompositionDecl) {
-  StringRef Code = R"cpp(
-void foo()
-{
-    int arr[3];
-    auto &[f, s, t] = arr;
-
-    f = 42;
-}
-  )cpp";
-  EXPECT_TRUE(matchesConditionally(
-      Code, decompositionDecl(hasBinding(0, bindingDecl(hasName("f")))), true,
-      {"-std=c++17"}));
-  EXPECT_FALSE(matchesConditionally(
-      Code, decompositionDecl(hasBinding(42, bindingDecl(hasName("f")))), true,
-      {"-std=c++17"}));
-  EXPECT_FALSE(matchesConditionally(
-      Code, decompositionDecl(hasBinding(0, bindingDecl(hasName("s")))), true,
-      {"-std=c++17"}));
-  EXPECT_TRUE(matchesConditionally(
-      Code, decompositionDecl(hasBinding(1, bindingDecl(hasName("s")))), true,
-      {"-std=c++17"}));
-
-  EXPECT_TRUE(matchesConditionally(
-      Code,
-      bindingDecl(decl().bind("self"), hasName("f"),
-                  forDecomposition(decompositionDecl(
-                      hasAnyBinding(bindingDecl(equalsBoundNode("self")))))),
-      true, {"-std=c++17"}));
-}
-
-TEST(ASTMatchersTestObjC, ObjCAutoreleasePoolStmt) {
-  StringRef ObjCString = "void f() {"
-                         "@autoreleasepool {"
-                         "  int x = 1;"
-                         "}"
-                         "}";
-  EXPECT_TRUE(matchesObjC(ObjCString, autoreleasePoolStmt()));
-  StringRef ObjCStringNoPool = "void f() { int x = 1; }";
-  EXPECT_FALSE(matchesObjC(ObjCStringNoPool, autoreleasePoolStmt()));
-}
-
-TEST(ASTMatchersTestOpenMP, OMPExecutableDirective) {
-  auto Matcher = stmt(ompExecutableDirective());
-
-  StringRef Source0 = R"(
-void x() {
-#pragma omp parallel
-;
-})";
-  EXPECT_TRUE(matchesWithOpenMP(Source0, Matcher));
-
-  StringRef Source1 = R"(
-void x() {
-#pragma omp taskyield
-;
-})";
-  EXPECT_TRUE(matchesWithOpenMP(Source1, Matcher));
-
-  StringRef Source2 = R"(
-void x() {
-;
-})";
-  EXPECT_TRUE(notMatchesWithOpenMP(Source2, Matcher));
-}
-
-TEST(ASTMatchersTestOpenMP, OMPDefaultClause) {
-  auto Matcher = ompExecutableDirective(hasAnyClause(ompDefaultClause()));
-
-  StringRef Source0 = R"(
-void x() {
-;
-})";
-  EXPECT_TRUE(notMatchesWithOpenMP(Source0, Matcher));
-
-  StringRef Source1 = R"(
-void x() {
-#pragma omp parallel
-;
-})";
-  EXPECT_TRUE(notMatchesWithOpenMP(Source1, Matcher));
-
-  StringRef Source2 = R"(
-void x() {
-#pragma omp parallel default(none)
-;
-})";
-  EXPECT_TRUE(matchesWithOpenMP(Source2, Matcher));
-
-  StringRef Source3 = R"(
-void x() {
-#pragma omp parallel default(shared)
-;
-})";
-  EXPECT_TRUE(matchesWithOpenMP(Source3, Matcher));
-
-  StringRef Source4 = R"(
-void x() {
-#pragma omp parallel default(firstprivate)
-;
-})";
-  EXPECT_TRUE(matchesWithOpenMP51(Source4, Matcher));
-
-  StringRef Source5 = R"(
-void x(int x) {
-#pragma omp parallel num_threads(x)
-;
-})";
-  EXPECT_TRUE(notMatchesWithOpenMP(Source5, Matcher));
-}
-
-TEST(ASTMatchersTest, Finder_DynamicOnlyAcceptsSomeMatchers) {
-  MatchFinder Finder;
-  EXPECT_TRUE(Finder.addDynamicMatcher(decl(), nullptr));
-  EXPECT_TRUE(Finder.addDynamicMatcher(callExpr(), nullptr));
-  EXPECT_TRUE(
-      Finder.addDynamicMatcher(constantArrayType(hasSize(42)), nullptr));
-
-  // Do not accept non-toplevel matchers.
-  EXPECT_FALSE(Finder.addDynamicMatcher(isMain(), nullptr));
-  EXPECT_FALSE(Finder.addDynamicMatcher(hasName("x"), nullptr));
-}
-
-TEST(MatchFinderAPI, MatchesDynamic) {
-  StringRef SourceCode = "struct A { void f() {} };";
-  auto Matcher = functionDecl(isDefinition()).bind("method");
-
-  auto astUnit = tooling::buildASTFromCode(SourceCode);
-
-  auto GlobalBoundNodes = matchDynamic(Matcher, astUnit->getASTContext());
-
-  EXPECT_EQ(GlobalBoundNodes.size(), 1u);
-  EXPECT_EQ(GlobalBoundNodes[0].getMap().size(), 1u);
-
-  auto GlobalMethodNode = GlobalBoundNodes[0].getNodeAs<FunctionDecl>("method");
-  EXPECT_TRUE(GlobalMethodNode != nullptr);
-
-  auto MethodBoundNodes =
-      matchDynamic(Matcher, *GlobalMethodNode, astUnit->getASTContext());
-  EXPECT_EQ(MethodBoundNodes.size(), 1u);
-  EXPECT_EQ(MethodBoundNodes[0].getMap().size(), 1u);
-
-  auto MethodNode = MethodBoundNodes[0].getNodeAs<FunctionDecl>("method");
-  EXPECT_EQ(MethodNode, GlobalMethodNode);
-}
-
-static std::vector<TestClangConfig> allTestClangConfigs() {
-  std::vector<TestClangConfig> all_configs;
-  for (TestLanguage lang : {Lang_C89, Lang_C99, Lang_CXX03, Lang_CXX11,
-                            Lang_CXX14, Lang_CXX17, Lang_CXX20}) {
-    TestClangConfig config;
-    config.Language = lang;
-
-    // Use an unknown-unknown triple so we don't instantiate the full system
-    // toolchain.  On Linux, instantiating the toolchain involves stat'ing
-    // large portions of /usr/lib, and this slows down not only this test, but
-    // all other tests, via contention in the kernel.
-    //
-    // FIXME: This is a hack to work around the fact that there's no way to do
-    // the equivalent of runToolOnCodeWithArgs without instantiating a full
-    // Driver.  We should consider having a function, at least for tests, that
-    // invokes cc1.
-    config.Target = "i386-unknown-unknown";
-    all_configs.push_back(config);
-
-    // Windows target is interesting to test because it enables
-    // `-fdelayed-template-parsing`.
-    config.Target = "x86_64-pc-win32-msvc";
-    all_configs.push_back(config);
-  }
-  return all_configs;
-}
-
-INSTANTIATE_TEST_SUITE_P(ASTMatchersTests, ASTMatchersTest,
-                         testing::ValuesIn(allTestClangConfigs()));
-
-} // namespace ast_matchers
-} // namespace clang
diff --git a/gnu/llvm/clang/unittests/ASTMatchers/ASTMatchersTest.h b/gnu/llvm/clang/unittests/ASTMatchers/ASTMatchersTest.h
deleted file mode 100644
index af248906bf6..00000000000
--- a/gnu/llvm/clang/unittests/ASTMatchers/ASTMatchersTest.h
+++ /dev/null
@@ -1,448 +0,0 @@
-//===- unittest/Tooling/ASTMatchersTest.h - Matcher tests helpers ------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_CLANG_UNITTESTS_ASTMATCHERS_ASTMATCHERSTEST_H
-#define LLVM_CLANG_UNITTESTS_ASTMATCHERS_ASTMATCHERSTEST_H
-
-#include "clang/ASTMatchers/ASTMatchFinder.h"
-#include "clang/Frontend/ASTUnit.h"
-#include "clang/Testing/CommandLineArgs.h"
-#include "clang/Testing/TestClangConfig.h"
-#include "clang/Tooling/Tooling.h"
-#include "gtest/gtest.h"
-
-namespace clang {
-namespace ast_matchers {
-
-using clang::tooling::buildASTFromCodeWithArgs;
-using clang::tooling::FileContentMappings;
-using clang::tooling::FrontendActionFactory;
-using clang::tooling::newFrontendActionFactory;
-using clang::tooling::runToolOnCodeWithArgs;
-
-class BoundNodesCallback {
-public:
-  virtual ~BoundNodesCallback() {}
-  virtual bool run(const BoundNodes *BoundNodes) = 0;
-  virtual bool run(const BoundNodes *BoundNodes, ASTContext *Context) = 0;
-  virtual void onEndOfTranslationUnit() {}
-};
-
-// If 'FindResultVerifier' is not NULL, sets *Verified to the result of
-// running 'FindResultVerifier' with the bound nodes as argument.
-// If 'FindResultVerifier' is NULL, sets *Verified to true when Run is called.
-class VerifyMatch : public MatchFinder::MatchCallback {
-public:
-  VerifyMatch(std::unique_ptr<BoundNodesCallback> FindResultVerifier,
-              bool *Verified)
-      : Verified(Verified), FindResultReviewer(std::move(FindResultVerifier)) {}
-
-  void run(const MatchFinder::MatchResult &Result) override {
-    if (FindResultReviewer != nullptr) {
-      *Verified |= FindResultReviewer->run(&Result.Nodes, Result.Context);
-    } else {
-      *Verified = true;
-    }
-  }
-
-  void onEndOfTranslationUnit() override {
-    if (FindResultReviewer)
-      FindResultReviewer->onEndOfTranslationUnit();
-  }
-
-private:
-  bool *const Verified;
-  const std::unique_ptr<BoundNodesCallback> FindResultReviewer;
-};
-
-inline ArrayRef<TestLanguage> langCxx11OrLater() {
-  static const TestLanguage Result[] = {Lang_CXX11, Lang_CXX14, Lang_CXX17,
-                                        Lang_CXX20};
-  return ArrayRef<TestLanguage>(Result);
-}
-
-inline ArrayRef<TestLanguage> langCxx14OrLater() {
-  static const TestLanguage Result[] = {Lang_CXX14, Lang_CXX17, Lang_CXX20};
-  return ArrayRef<TestLanguage>(Result);
-}
-
-inline ArrayRef<TestLanguage> langCxx17OrLater() {
-  static const TestLanguage Result[] = {Lang_CXX17, Lang_CXX20};
-  return ArrayRef<TestLanguage>(Result);
-}
-
-inline ArrayRef<TestLanguage> langCxx20OrLater() {
-  static const TestLanguage Result[] = {Lang_CXX20};
-  return ArrayRef<TestLanguage>(Result);
-}
-
-template <typename T>
-testing::AssertionResult matchesConditionally(
-    const Twine &Code, const T &AMatcher, bool ExpectMatch,
-    ArrayRef<std::string> CompileArgs,
-    const FileContentMappings &VirtualMappedFiles = FileContentMappings(),
-    StringRef Filename = "input.cc") {
-  bool Found = false, DynamicFound = false;
-  MatchFinder Finder;
-  VerifyMatch VerifyFound(nullptr, &Found);
-  Finder.addMatcher(AMatcher, &VerifyFound);
-  VerifyMatch VerifyDynamicFound(nullptr, &DynamicFound);
-  if (!Finder.addDynamicMatcher(AMatcher, &VerifyDynamicFound))
-    return testing::AssertionFailure() << "Could not add dynamic matcher";
-  std::unique_ptr<FrontendActionFactory> Factory(
-      newFrontendActionFactory(&Finder));
-  std::vector<std::string> Args = {
-      // Some tests need rtti/exceptions on.
-      "-frtti", "-fexceptions",
-      // Ensure that tests specify the C++ standard version that they need.
-      "-Werror=c++14-extensions", "-Werror=c++17-extensions",
-      "-Werror=c++20-extensions"};
-  // Append additional arguments at the end to allow overriding the default
-  // choices that we made above.
-  llvm::copy(CompileArgs, std::back_inserter(Args));
-  if (llvm::find(Args, "-target") == Args.end()) {
-    // Use an unknown-unknown triple so we don't instantiate the full system
-    // toolchain.  On Linux, instantiating the toolchain involves stat'ing
-    // large portions of /usr/lib, and this slows down not only this test, but
-    // all other tests, via contention in the kernel.
-    //
-    // FIXME: This is a hack to work around the fact that there's no way to do
-    // the equivalent of runToolOnCodeWithArgs without instantiating a full
-    // Driver.  We should consider having a function, at least for tests, that
-    // invokes cc1.
-    Args.push_back("-target");
-    Args.push_back("i386-unknown-unknown");
-  }
-
-  if (!runToolOnCodeWithArgs(
-          Factory->create(), Code, Args, Filename, "clang-tool",
-          std::make_shared<PCHContainerOperations>(), VirtualMappedFiles)) {
-    return testing::AssertionFailure() << "Parsing error in \"" << Code << "\"";
-  }
-  if (Found != DynamicFound) {
-    return testing::AssertionFailure()
-           << "Dynamic match result (" << DynamicFound
-           << ") does not match static result (" << Found << ")";
-  }
-  if (!Found && ExpectMatch) {
-    return testing::AssertionFailure()
-           << "Could not find match in \"" << Code << "\"";
-  } else if (Found && !ExpectMatch) {
-    return testing::AssertionFailure()
-           << "Found unexpected match in \"" << Code << "\"";
-  }
-  return testing::AssertionSuccess();
-}
-
-template <typename T>
-testing::AssertionResult
-matchesConditionally(const Twine &Code, const T &AMatcher, bool ExpectMatch,
-                     ArrayRef<TestLanguage> TestLanguages) {
-  for (auto Lang : TestLanguages) {
-    auto Result = matchesConditionally(
-        Code, AMatcher, ExpectMatch, getCommandLineArgsForTesting(Lang),
-        FileContentMappings(), getFilenameForTesting(Lang));
-    if (!Result)
-      return Result;
-  }
-
-  return testing::AssertionSuccess();
-}
-
-template <typename T>
-testing::AssertionResult
-matches(const Twine &Code, const T &AMatcher,
-        ArrayRef<TestLanguage> TestLanguages = {Lang_CXX11}) {
-  return matchesConditionally(Code, AMatcher, true, TestLanguages);
-}
-
-template <typename T>
-testing::AssertionResult
-notMatches(const Twine &Code, const T &AMatcher,
-           ArrayRef<TestLanguage> TestLanguages = {Lang_CXX11}) {
-  return matchesConditionally(Code, AMatcher, false, TestLanguages);
-}
-
-template <typename T>
-testing::AssertionResult matchesObjC(const Twine &Code, const T &AMatcher,
-                                     bool ExpectMatch = true) {
-  return matchesConditionally(Code, AMatcher, ExpectMatch,
-                              {"-fobjc-nonfragile-abi", "-Wno-objc-root-class",
-                               "-fblocks", "-Wno-incomplete-implementation"},
-                              FileContentMappings(), "input.m");
-}
-
-template <typename T>
-testing::AssertionResult matchesC(const Twine &Code, const T &AMatcher) {
-  return matchesConditionally(Code, AMatcher, true, {}, FileContentMappings(),
-                              "input.c");
-}
-
-template <typename T>
-testing::AssertionResult notMatchesObjC(const Twine &Code, const T &AMatcher) {
-  return matchesObjC(Code, AMatcher, false);
-}
-
-// Function based on matchesConditionally with "-x cuda" argument added and
-// small CUDA header prepended to the code string.
-template <typename T>
-testing::AssertionResult
-matchesConditionallyWithCuda(const Twine &Code, const T &AMatcher,
-                             bool ExpectMatch, llvm::StringRef CompileArg) {
-  const std::string CudaHeader =
-      "typedef unsigned int size_t;\n"
-      "#define __constant__ __attribute__((constant))\n"
-      "#define __device__ __attribute__((device))\n"
-      "#define __global__ __attribute__((global))\n"
-      "#define __host__ __attribute__((host))\n"
-      "#define __shared__ __attribute__((shared))\n"
-      "struct dim3 {"
-      "  unsigned x, y, z;"
-      "  __host__ __device__ dim3(unsigned x, unsigned y = 1, unsigned z = 1)"
-      "      : x(x), y(y), z(z) {}"
-      "};"
-      "typedef struct cudaStream *cudaStream_t;"
-      "int cudaConfigureCall(dim3 gridSize, dim3 blockSize,"
-      "                      size_t sharedSize = 0,"
-      "                      cudaStream_t stream = 0);"
-      "extern \"C\" unsigned __cudaPushCallConfiguration("
-      "    dim3 gridDim, dim3 blockDim, size_t sharedMem = 0, void *stream = "
-      "0);";
-
-  bool Found = false, DynamicFound = false;
-  MatchFinder Finder;
-  VerifyMatch VerifyFound(nullptr, &Found);
-  Finder.addMatcher(AMatcher, &VerifyFound);
-  VerifyMatch VerifyDynamicFound(nullptr, &DynamicFound);
-  if (!Finder.addDynamicMatcher(AMatcher, &VerifyDynamicFound))
-    return testing::AssertionFailure() << "Could not add dynamic matcher";
-  std::unique_ptr<FrontendActionFactory> Factory(
-      newFrontendActionFactory(&Finder));
-  // Some tests use typeof, which is a gnu extension.  Using an explicit
-  // unknown-unknown triple is good for a large speedup, because it lets us
-  // avoid constructing a full system triple.
-  std::vector<std::string> Args = {
-      "-xcuda",  "-fno-ms-extensions",     "--cuda-host-only",     "-nocudainc",
-      "-target", "x86_64-unknown-unknown", std::string(CompileArg)};
-  if (!runToolOnCodeWithArgs(Factory->create(), CudaHeader + Code, Args)) {
-    return testing::AssertionFailure() << "Parsing error in \"" << Code << "\"";
-  }
-  if (Found != DynamicFound) {
-    return testing::AssertionFailure()
-           << "Dynamic match result (" << DynamicFound
-           << ") does not match static result (" << Found << ")";
-  }
-  if (!Found && ExpectMatch) {
-    return testing::AssertionFailure()
-           << "Could not find match in \"" << Code << "\"";
-  } else if (Found && !ExpectMatch) {
-    return testing::AssertionFailure()
-           << "Found unexpected match in \"" << Code << "\"";
-  }
-  return testing::AssertionSuccess();
-}
-
-template <typename T>
-testing::AssertionResult matchesWithCuda(const Twine &Code, const T &AMatcher) {
-  return matchesConditionallyWithCuda(Code, AMatcher, true, "-std=c++11");
-}
-
-template <typename T>
-testing::AssertionResult notMatchesWithCuda(const Twine &Code,
-                                            const T &AMatcher) {
-  return matchesConditionallyWithCuda(Code, AMatcher, false, "-std=c++11");
-}
-
-template <typename T>
-testing::AssertionResult matchesWithOpenMP(const Twine &Code,
-                                           const T &AMatcher) {
-  return matchesConditionally(Code, AMatcher, true, {"-fopenmp=libomp"});
-}
-
-template <typename T>
-testing::AssertionResult notMatchesWithOpenMP(const Twine &Code,
-                                              const T &AMatcher) {
-  return matchesConditionally(Code, AMatcher, false, {"-fopenmp=libomp"});
-}
-
-template <typename T>
-testing::AssertionResult matchesWithOpenMP51(const Twine &Code,
-                                             const T &AMatcher) {
-  return matchesConditionally(Code, AMatcher, true,
-                              {"-fopenmp=libomp", "-fopenmp-version=51"});
-}
-
-template <typename T>
-testing::AssertionResult notMatchesWithOpenMP51(const Twine &Code,
-                                                const T &AMatcher) {
-  return matchesConditionally(Code, AMatcher, false,
-                              {"-fopenmp=libomp", "-fopenmp-version=51"});
-}
-
-template <typename T>
-testing::AssertionResult matchAndVerifyResultConditionally(
-    const Twine &Code, const T &AMatcher,
-    std::unique_ptr<BoundNodesCallback> FindResultVerifier, bool ExpectResult) {
-  bool VerifiedResult = false;
-  MatchFinder Finder;
-  VerifyMatch VerifyVerifiedResult(std::move(FindResultVerifier),
-                                   &VerifiedResult);
-  Finder.addMatcher(AMatcher, &VerifyVerifiedResult);
-  std::unique_ptr<FrontendActionFactory> Factory(
-      newFrontendActionFactory(&Finder));
-  // Some tests use typeof, which is a gnu extension.  Using an explicit
-  // unknown-unknown triple is good for a large speedup, because it lets us
-  // avoid constructing a full system triple.
-  std::vector<std::string> Args = {"-std=gnu++98", "-target",
-                                   "i386-unknown-unknown"};
-  if (!runToolOnCodeWithArgs(Factory->create(), Code, Args)) {
-    return testing::AssertionFailure() << "Parsing error in \"" << Code << "\"";
-  }
-  if (!VerifiedResult && ExpectResult) {
-    return testing::AssertionFailure()
-           << "Could not verify result in \"" << Code << "\"";
-  } else if (VerifiedResult && !ExpectResult) {
-    return testing::AssertionFailure()
-           << "Verified unexpected result in \"" << Code << "\"";
-  }
-
-  VerifiedResult = false;
-  SmallString<256> Buffer;
-  std::unique_ptr<ASTUnit> AST(
-      buildASTFromCodeWithArgs(Code.toStringRef(Buffer), Args));
-  if (!AST.get())
-    return testing::AssertionFailure()
-           << "Parsing error in \"" << Code << "\" while building AST";
-  Finder.matchAST(AST->getASTContext());
-  if (!VerifiedResult && ExpectResult) {
-    return testing::AssertionFailure()
-           << "Could not verify result in \"" << Code << "\" with AST";
-  } else if (VerifiedResult && !ExpectResult) {
-    return testing::AssertionFailure()
-           << "Verified unexpected result in \"" << Code << "\" with AST";
-  }
-
-  return testing::AssertionSuccess();
-}
-
-// FIXME: Find better names for these functions (or document what they
-// do more precisely).
-template <typename T>
-testing::AssertionResult matchAndVerifyResultTrue(
-    const Twine &Code, const T &AMatcher,
-    std::unique_ptr<BoundNodesCallback> FindResultVerifier) {
-  return matchAndVerifyResultConditionally(Code, AMatcher,
-                                           std::move(FindResultVerifier), true);
-}
-
-template <typename T>
-testing::AssertionResult matchAndVerifyResultFalse(
-    const Twine &Code, const T &AMatcher,
-    std::unique_ptr<BoundNodesCallback> FindResultVerifier) {
-  return matchAndVerifyResultConditionally(
-      Code, AMatcher, std::move(FindResultVerifier), false);
-}
-
-// Implements a run method that returns whether BoundNodes contains a
-// Decl bound to Id that can be dynamically cast to T.
-// Optionally checks that the check succeeded a specific number of times.
-template <typename T> class VerifyIdIsBoundTo : public BoundNodesCallback {
-public:
-  // Create an object that checks that a node of type \c T was bound to \c Id.
-  // Does not check for a certain number of matches.
-  explicit VerifyIdIsBoundTo(llvm::StringRef Id)
-      : Id(std::string(Id)), ExpectedCount(-1), Count(0) {}
-
-  // Create an object that checks that a node of type \c T was bound to \c Id.
-  // Checks that there were exactly \c ExpectedCount matches.
-  VerifyIdIsBoundTo(llvm::StringRef Id, int ExpectedCount)
-      : Id(std::string(Id)), ExpectedCount(ExpectedCount), Count(0) {}
-
-  // Create an object that checks that a node of type \c T was bound to \c Id.
-  // Checks that there was exactly one match with the name \c ExpectedName.
-  // Note that \c T must be a NamedDecl for this to work.
-  VerifyIdIsBoundTo(llvm::StringRef Id, llvm::StringRef ExpectedName,
-                    int ExpectedCount = 1)
-      : Id(std::string(Id)), ExpectedCount(ExpectedCount), Count(0),
-        ExpectedName(std::string(ExpectedName)) {}
-
-  void onEndOfTranslationUnit() override {
-    if (ExpectedCount != -1) {
-      EXPECT_EQ(ExpectedCount, Count);
-    }
-    if (!ExpectedName.empty()) {
-      EXPECT_EQ(ExpectedName, Name);
-    }
-    Count = 0;
-    Name.clear();
-  }
-
-  ~VerifyIdIsBoundTo() override {
-    EXPECT_EQ(0, Count);
-    EXPECT_EQ("", Name);
-  }
-
-  bool run(const BoundNodes *Nodes) override {
-    const BoundNodes::IDToNodeMap &M = Nodes->getMap();
-    if (Nodes->getNodeAs<T>(Id)) {
-      ++Count;
-      if (const NamedDecl *Named = Nodes->getNodeAs<NamedDecl>(Id)) {
-        Name = Named->getNameAsString();
-      } else if (const NestedNameSpecifier *NNS =
-                     Nodes->getNodeAs<NestedNameSpecifier>(Id)) {
-        llvm::raw_string_ostream OS(Name);
-        NNS->print(OS, PrintingPolicy(LangOptions()));
-      }
-      BoundNodes::IDToNodeMap::const_iterator I = M.find(Id);
-      EXPECT_NE(M.end(), I);
-      if (I != M.end()) {
-        EXPECT_EQ(Nodes->getNodeAs<T>(Id), I->second.get<T>());
-      }
-      return true;
-    }
-    EXPECT_TRUE(M.count(Id) == 0 ||
-                M.find(Id)->second.template get<T>() == nullptr);
-    return false;
-  }
-
-  bool run(const BoundNodes *Nodes, ASTContext *Context) override {
-    return run(Nodes);
-  }
-
-private:
-  const std::string Id;
-  const int ExpectedCount;
-  int Count;
-  const std::string ExpectedName;
-  std::string Name;
-};
-
-class ASTMatchersTest : public ::testing::Test,
-                        public ::testing::WithParamInterface<TestClangConfig> {
-protected:
-  template <typename T>
-  testing::AssertionResult matches(const Twine &Code, const T &AMatcher) {
-    const TestClangConfig &TestConfig = GetParam();
-    return clang::ast_matchers::matchesConditionally(
-        Code, AMatcher, /*ExpectMatch=*/true, TestConfig.getCommandLineArgs(),
-        FileContentMappings(), getFilenameForTesting(TestConfig.Language));
-  }
-
-  template <typename T>
-  testing::AssertionResult notMatches(const Twine &Code, const T &AMatcher) {
-    const TestClangConfig &TestConfig = GetParam();
-    return clang::ast_matchers::matchesConditionally(
-        Code, AMatcher, /*ExpectMatch=*/false, TestConfig.getCommandLineArgs(),
-        FileContentMappings(), getFilenameForTesting(TestConfig.Language));
-  }
-};
-
-} // namespace ast_matchers
-} // namespace clang
-
-#endif // LLVM_CLANG_UNITTESTS_AST_MATCHERS_AST_MATCHERS_TEST_H
diff --git a/gnu/llvm/clang/unittests/ASTMatchers/ASTMatchersTraversalTest.cpp b/gnu/llvm/clang/unittests/ASTMatchers/ASTMatchersTraversalTest.cpp
deleted file mode 100644
index 12012d9c699..00000000000
--- a/gnu/llvm/clang/unittests/ASTMatchers/ASTMatchersTraversalTest.cpp
+++ /dev/null
@@ -1,5749 +0,0 @@
-//= unittests/ASTMatchers/ASTMatchersTraversalTest.cpp - matchers unit tests =//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "ASTMatchersTest.h"
-#include "clang/AST/PrettyPrinter.h"
-#include "clang/ASTMatchers/ASTMatchFinder.h"
-#include "clang/ASTMatchers/ASTMatchers.h"
-#include "clang/Tooling/Tooling.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/ADT/Triple.h"
-#include "llvm/Support/Host.h"
-#include "gtest/gtest.h"
-
-namespace clang {
-namespace ast_matchers {
-
-TEST(DeclarationMatcher, hasMethod) {
-  EXPECT_TRUE(matches("class A { void func(); };",
-                      cxxRecordDecl(hasMethod(hasName("func")))));
-  EXPECT_TRUE(notMatches("class A { void func(); };",
-                         cxxRecordDecl(hasMethod(isPublic()))));
-}
-
-TEST(DeclarationMatcher, ClassDerivedFromDependentTemplateSpecialization) {
-  EXPECT_TRUE(matches(
-    "template <typename T> struct A {"
-      "  template <typename T2> struct F {};"
-      "};"
-      "template <typename T> struct B : A<T>::template F<T> {};"
-      "B<int> b;",
-    cxxRecordDecl(hasName("B"), isDerivedFrom(recordDecl()))));
-}
-
-TEST(DeclarationMatcher, hasDeclContext) {
-  EXPECT_TRUE(matches(
-    "namespace N {"
-      "  namespace M {"
-      "    class D {};"
-      "  }"
-      "}",
-    recordDecl(hasDeclContext(namespaceDecl(hasName("M"))))));
-  EXPECT_TRUE(notMatches(
-    "namespace N {"
-      "  namespace M {"
-      "    class D {};"
-      "  }"
-      "}",
-    recordDecl(hasDeclContext(namespaceDecl(hasName("N"))))));
-
-  EXPECT_TRUE(matches("namespace {"
-                        "  namespace M {"
-                        "    class D {};"
-                        "  }"
-                        "}",
-                      recordDecl(hasDeclContext(namespaceDecl(
-                        hasName("M"), hasDeclContext(namespaceDecl()))))));
-
-  EXPECT_TRUE(matches("class D{};", decl(hasDeclContext(decl()))));
-}
-
-TEST(HasDescendant, MatchesDescendantTypes) {
-  EXPECT_TRUE(matches("void f() { int i = 3; }",
-                      decl(hasDescendant(loc(builtinType())))));
-  EXPECT_TRUE(matches("void f() { int i = 3; }",
-                      stmt(hasDescendant(builtinType()))));
-
-  EXPECT_TRUE(matches("void f() { int i = 3; }",
-                      stmt(hasDescendant(loc(builtinType())))));
-  EXPECT_TRUE(matches("void f() { int i = 3; }",
-                      stmt(hasDescendant(qualType(builtinType())))));
-
-  EXPECT_TRUE(notMatches("void f() { float f = 2.0f; }",
-                         stmt(hasDescendant(isInteger()))));
-
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-    "void f() { int a; float c; int d; int e; }",
-    functionDecl(forEachDescendant(
-      varDecl(hasDescendant(isInteger())).bind("x"))),
-    std::make_unique<VerifyIdIsBoundTo<Decl>>("x", 3)));
-}
-
-TEST(HasDescendant, MatchesDescendantsOfTypes) {
-  EXPECT_TRUE(matches("void f() { int*** i; }",
-                      qualType(hasDescendant(builtinType()))));
-  EXPECT_TRUE(matches("void f() { int*** i; }",
-                      qualType(hasDescendant(
-                        pointerType(pointee(builtinType()))))));
-  EXPECT_TRUE(matches("void f() { int*** i; }",
-                      typeLoc(hasDescendant(loc(builtinType())))));
-
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-    "void f() { int*** i; }",
-    qualType(asString("int ***"), forEachDescendant(pointerType().bind("x"))),
-    std::make_unique<VerifyIdIsBoundTo<Type>>("x", 2)));
-}
-
-
-TEST(Has, MatchesChildrenOfTypes) {
-  EXPECT_TRUE(matches("int i;",
-                      varDecl(hasName("i"), has(isInteger()))));
-  EXPECT_TRUE(notMatches("int** i;",
-                         varDecl(hasName("i"), has(isInteger()))));
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-    "int (*f)(float, int);",
-    qualType(functionType(), forEach(qualType(isInteger()).bind("x"))),
-    std::make_unique<VerifyIdIsBoundTo<QualType>>("x", 2)));
-}
-
-TEST(Has, MatchesChildTypes) {
-  EXPECT_TRUE(matches(
-    "int* i;",
-    varDecl(hasName("i"), hasType(qualType(has(builtinType()))))));
-  EXPECT_TRUE(notMatches(
-    "int* i;",
-    varDecl(hasName("i"), hasType(qualType(has(pointerType()))))));
-}
-
-TEST(StatementMatcher, Has) {
-  StatementMatcher HasVariableI =
-      expr(hasType(pointsTo(recordDecl(hasName("X")))),
-           has(ignoringParenImpCasts(declRefExpr(to(varDecl(hasName("i")))))));
-
-  EXPECT_TRUE(matches(
-    "class X; X *x(int); void c() { int i; x(i); }", HasVariableI));
-  EXPECT_TRUE(notMatches(
-    "class X; X *x(int); void c() { int i; x(42); }", HasVariableI));
-}
-
-TEST(StatementMatcher, HasDescendant) {
-  StatementMatcher HasDescendantVariableI =
-    expr(hasType(pointsTo(recordDecl(hasName("X")))),
-         hasDescendant(declRefExpr(to(varDecl(hasName("i"))))));
-
-  EXPECT_TRUE(matches(
-    "class X; X *x(bool); bool b(int); void c() { int i; x(b(i)); }",
-    HasDescendantVariableI));
-  EXPECT_TRUE(notMatches(
-    "class X; X *x(bool); bool b(int); void c() { int i; x(b(42)); }",
-    HasDescendantVariableI));
-}
-
-TEST(TypeMatcher, MatchesClassType) {
-  TypeMatcher TypeA = hasDeclaration(recordDecl(hasName("A")));
-
-  EXPECT_TRUE(matches("class A { public: A *a; };", TypeA));
-  EXPECT_TRUE(notMatches("class A {};", TypeA));
-
-  TypeMatcher TypeDerivedFromA =
-    hasDeclaration(cxxRecordDecl(isDerivedFrom("A")));
-
-  EXPECT_TRUE(matches("class A {}; class B : public A { public: B *b; };",
-                      TypeDerivedFromA));
-  EXPECT_TRUE(notMatches("class A {};", TypeA));
-
-  TypeMatcher TypeAHasClassB = hasDeclaration(
-    recordDecl(hasName("A"), has(recordDecl(hasName("B")))));
-
-  EXPECT_TRUE(
-    matches("class A { public: A *a; class B {}; };", TypeAHasClassB));
-
-  EXPECT_TRUE(matchesC("struct S {}; void f(void) { struct S s; }",
-                       varDecl(hasType(namedDecl(hasName("S"))))));
-}
-
-TEST(TypeMatcher, MatchesDeclTypes) {
-  // TypedefType -> TypedefNameDecl
-  EXPECT_TRUE(matches("typedef int I; void f(I i);",
-                      parmVarDecl(hasType(namedDecl(hasName("I"))))));
-  // ObjCObjectPointerType
-  EXPECT_TRUE(matchesObjC("@interface Foo @end void f(Foo *f);",
-                          parmVarDecl(hasType(objcObjectPointerType()))));
-  // ObjCObjectPointerType -> ObjCInterfaceType -> ObjCInterfaceDecl
-  EXPECT_TRUE(matchesObjC(
-    "@interface Foo @end void f(Foo *f);",
-    parmVarDecl(hasType(pointsTo(objcInterfaceDecl(hasName("Foo")))))));
-  // TemplateTypeParmType
-  EXPECT_TRUE(matches("template <typename T> void f(T t);",
-                      parmVarDecl(hasType(templateTypeParmType()))));
-  // TemplateTypeParmType -> TemplateTypeParmDecl
-  EXPECT_TRUE(matches("template <typename T> void f(T t);",
-                      parmVarDecl(hasType(namedDecl(hasName("T"))))));
-  // InjectedClassNameType
-  EXPECT_TRUE(matches("template <typename T> struct S {"
-                        "  void f(S s);"
-                        "};",
-                      parmVarDecl(hasType(injectedClassNameType()))));
-  EXPECT_TRUE(notMatches("template <typename T> struct S {"
-                           "  void g(S<T> s);"
-                           "};",
-                         parmVarDecl(hasType(injectedClassNameType()))));
-  // InjectedClassNameType -> CXXRecordDecl
-  EXPECT_TRUE(matches("template <typename T> struct S {"
-                        "  void f(S s);"
-                        "};",
-                      parmVarDecl(hasType(namedDecl(hasName("S"))))));
-
-  static const char Using[] = "template <typename T>"
-    "struct Base {"
-    "  typedef T Foo;"
-    "};"
-    ""
-    "template <typename T>"
-    "struct S : private Base<T> {"
-    "  using typename Base<T>::Foo;"
-    "  void f(Foo);"
-    "};";
-  // UnresolvedUsingTypenameDecl
-  EXPECT_TRUE(matches(Using, unresolvedUsingTypenameDecl(hasName("Foo"))));
-  // UnresolvedUsingTypenameType -> UnresolvedUsingTypenameDecl
-  EXPECT_TRUE(matches(Using, parmVarDecl(hasType(namedDecl(hasName("Foo"))))));
-}
-
-TEST(HasDeclaration, HasDeclarationOfEnumType) {
-  EXPECT_TRUE(matches("enum X {}; void y(X *x) { x; }",
-                      expr(hasType(pointsTo(
-                        qualType(hasDeclaration(enumDecl(hasName("X")))))))));
-}
-
-TEST(HasDeclaration, HasGetDeclTraitTest) {
-  static_assert(internal::has_getDecl<TypedefType>::value,
-                "Expected TypedefType to have a getDecl.");
-  static_assert(internal::has_getDecl<RecordType>::value,
-                "Expected RecordType to have a getDecl.");
-  static_assert(!internal::has_getDecl<TemplateSpecializationType>::value,
-                "Expected TemplateSpecializationType to *not* have a getDecl.");
-}
-
-TEST(HasDeclaration, ElaboratedType) {
-  EXPECT_TRUE(matches(
-      "namespace n { template <typename T> struct X {}; }"
-      "void f(n::X<int>);",
-      parmVarDecl(hasType(qualType(hasDeclaration(cxxRecordDecl()))))));
-  EXPECT_TRUE(matches(
-      "namespace n { template <typename T> struct X {}; }"
-      "void f(n::X<int>);",
-      parmVarDecl(hasType(elaboratedType(hasDeclaration(cxxRecordDecl()))))));
-}
-
-TEST(HasDeclaration, HasDeclarationOfTypeWithDecl) {
-  EXPECT_TRUE(matches("typedef int X; X a;",
-                      varDecl(hasName("a"),
-                              hasType(typedefType(hasDeclaration(decl()))))));
-
-  // FIXME: Add tests for other types with getDecl() (e.g. RecordType)
-}
-
-TEST(HasDeclaration, HasDeclarationOfTemplateSpecializationType) {
-  EXPECT_TRUE(matches("template <typename T> class A {}; A<int> a;",
-                      varDecl(hasType(templateSpecializationType(
-                        hasDeclaration(namedDecl(hasName("A"))))))));
-  EXPECT_TRUE(matches("template <typename T> class A {};"
-                      "template <typename T> class B { A<T> a; };",
-                      fieldDecl(hasType(templateSpecializationType(
-                        hasDeclaration(namedDecl(hasName("A"))))))));
-  EXPECT_TRUE(matches("template <typename T> class A {}; A<int> a;",
-                      varDecl(hasType(templateSpecializationType(
-                          hasDeclaration(cxxRecordDecl()))))));
-}
-
-TEST(HasDeclaration, HasDeclarationOfCXXNewExpr) {
-  EXPECT_TRUE(
-      matches("int *A = new int();",
-              cxxNewExpr(hasDeclaration(functionDecl(parameterCountIs(1))))));
-}
-
-TEST(HasDeclaration, HasDeclarationOfTypeAlias) {
-  EXPECT_TRUE(matches("template <typename T> using C = T; C<int> c;",
-                      varDecl(hasType(templateSpecializationType(
-                          hasDeclaration(typeAliasTemplateDecl()))))));
-}
-
-TEST(HasUnqualifiedDesugaredType, DesugarsUsing) {
-  EXPECT_TRUE(
-      matches("struct A {}; using B = A; B b;",
-              varDecl(hasType(hasUnqualifiedDesugaredType(recordType())))));
-  EXPECT_TRUE(
-      matches("struct A {}; using B = A; using C = B; C b;",
-              varDecl(hasType(hasUnqualifiedDesugaredType(recordType())))));
-}
-
-TEST(HasUnderlyingDecl, Matches) {
-  EXPECT_TRUE(matches("namespace N { template <class T> void f(T t); }"
-                      "template <class T> void g() { using N::f; f(T()); }",
-                      unresolvedLookupExpr(hasAnyDeclaration(
-                          namedDecl(hasUnderlyingDecl(hasName("::N::f")))))));
-  EXPECT_TRUE(matches(
-      "namespace N { template <class T> void f(T t); }"
-      "template <class T> void g() { N::f(T()); }",
-      unresolvedLookupExpr(hasAnyDeclaration(namedDecl(hasName("::N::f"))))));
-  EXPECT_TRUE(notMatches(
-      "namespace N { template <class T> void f(T t); }"
-      "template <class T> void g() { using N::f; f(T()); }",
-      unresolvedLookupExpr(hasAnyDeclaration(namedDecl(hasName("::N::f"))))));
-}
-
-TEST(HasType, TakesQualTypeMatcherAndMatchesExpr) {
-  TypeMatcher ClassX = hasDeclaration(recordDecl(hasName("X")));
-  EXPECT_TRUE(
-    matches("class X {}; void y(X &x) { x; }", expr(hasType(ClassX))));
-  EXPECT_TRUE(
-    notMatches("class X {}; void y(X *x) { x; }",
-               expr(hasType(ClassX))));
-  EXPECT_TRUE(
-    matches("class X {}; void y(X *x) { x; }",
-            expr(hasType(pointsTo(ClassX)))));
-}
-
-TEST(HasType, TakesQualTypeMatcherAndMatchesValueDecl) {
-  TypeMatcher ClassX = hasDeclaration(recordDecl(hasName("X")));
-  EXPECT_TRUE(
-    matches("class X {}; void y() { X x; }", varDecl(hasType(ClassX))));
-  EXPECT_TRUE(
-    notMatches("class X {}; void y() { X *x; }", varDecl(hasType(ClassX))));
-  EXPECT_TRUE(
-    matches("class X {}; void y() { X *x; }",
-            varDecl(hasType(pointsTo(ClassX)))));
-}
-
-TEST(HasType, TakesQualTypeMatcherAndMatchesCXXBaseSpecifier) {
-  TypeMatcher ClassX = hasDeclaration(recordDecl(hasName("X")));
-  CXXBaseSpecifierMatcher BaseClassX = cxxBaseSpecifier(hasType(ClassX));
-  DeclarationMatcher ClassHasBaseClassX =
-      cxxRecordDecl(hasDirectBase(BaseClassX));
-  EXPECT_TRUE(matches("class X {}; class Y : X {};", ClassHasBaseClassX));
-  EXPECT_TRUE(notMatches("class Z {}; class Y : Z {};", ClassHasBaseClassX));
-}
-
-TEST(HasType, TakesDeclMatcherAndMatchesExpr) {
-  DeclarationMatcher ClassX = recordDecl(hasName("X"));
-  EXPECT_TRUE(
-    matches("class X {}; void y(X &x) { x; }", expr(hasType(ClassX))));
-  EXPECT_TRUE(
-    notMatches("class X {}; void y(X *x) { x; }",
-               expr(hasType(ClassX))));
-}
-
-TEST(HasType, TakesDeclMatcherAndMatchesValueDecl) {
-  DeclarationMatcher ClassX = recordDecl(hasName("X"));
-  EXPECT_TRUE(
-    matches("class X {}; void y() { X x; }", varDecl(hasType(ClassX))));
-  EXPECT_TRUE(
-    notMatches("class X {}; void y() { X *x; }", varDecl(hasType(ClassX))));
-}
-
-TEST(HasType, TakesDeclMatcherAndMatchesCXXBaseSpecifier) {
-  DeclarationMatcher ClassX = recordDecl(hasName("X"));
-  CXXBaseSpecifierMatcher BaseClassX = cxxBaseSpecifier(hasType(ClassX));
-  DeclarationMatcher ClassHasBaseClassX =
-      cxxRecordDecl(hasDirectBase(BaseClassX));
-  EXPECT_TRUE(matches("class X {}; class Y : X {};", ClassHasBaseClassX));
-  EXPECT_TRUE(notMatches("class Z {}; class Y : Z {};", ClassHasBaseClassX));
-}
-
-TEST(HasType, MatchesTypedefDecl) {
-  EXPECT_TRUE(matches("typedef int X;", typedefDecl(hasType(asString("int")))));
-  EXPECT_TRUE(matches("typedef const int T;",
-                      typedefDecl(hasType(asString("const int")))));
-  EXPECT_TRUE(notMatches("typedef const int T;",
-                         typedefDecl(hasType(asString("int")))));
-  EXPECT_TRUE(matches("typedef int foo; typedef foo bar;",
-                      typedefDecl(hasType(asString("foo")), hasName("bar"))));
-}
-
-TEST(HasType, MatchesTypedefNameDecl) {
-  EXPECT_TRUE(matches("using X = int;", typedefNameDecl(hasType(asString("int")))));
-  EXPECT_TRUE(matches("using T = const int;",
-                      typedefNameDecl(hasType(asString("const int")))));
-  EXPECT_TRUE(notMatches("using T = const int;",
-                         typedefNameDecl(hasType(asString("int")))));
-  EXPECT_TRUE(matches("using foo = int; using bar = foo;",
-                      typedefNameDecl(hasType(asString("foo")), hasName("bar"))));
-}
-
-TEST(HasTypeLoc, MatchesBlockDecl) {
-  EXPECT_TRUE(matchesConditionally(
-      "auto x = ^int (int a, int b) { return a + b; };",
-      blockDecl(hasTypeLoc(loc(asString("int (int, int)")))), true,
-      {"-fblocks"}));
-}
-
-TEST(HasTypeLoc, MatchesCXXBaseSpecifierAndCtorInitializer) {
-  llvm::StringRef code = R"cpp(
-  class Foo {};
-  class Bar : public Foo {
-    Bar() : Foo() {}
-  };
-  )cpp";
-
-  EXPECT_TRUE(matches(
-      code, cxxRecordDecl(hasAnyBase(hasTypeLoc(loc(asString("class Foo")))))));
-  EXPECT_TRUE(matches(
-      code, cxxCtorInitializer(hasTypeLoc(loc(asString("class Foo"))))));
-}
-
-TEST(HasTypeLoc, MatchesCXXFunctionalCastExpr) {
-  EXPECT_TRUE(matches("auto x = int(3);",
-                      cxxFunctionalCastExpr(hasTypeLoc(loc(asString("int"))))));
-}
-
-TEST(HasTypeLoc, MatchesCXXNewExpr) {
-  EXPECT_TRUE(matches("auto* x = new int(3);",
-                      cxxNewExpr(hasTypeLoc(loc(asString("int"))))));
-  EXPECT_TRUE(matches("class Foo{}; auto* x = new Foo();",
-                      cxxNewExpr(hasTypeLoc(loc(asString("class Foo"))))));
-}
-
-TEST(HasTypeLoc, MatchesCXXTemporaryObjectExpr) {
-  EXPECT_TRUE(
-      matches("struct Foo { Foo(int, int); }; auto x = Foo(1, 2);",
-              cxxTemporaryObjectExpr(hasTypeLoc(loc(asString("struct Foo"))))));
-}
-
-TEST(HasTypeLoc, MatchesCXXUnresolvedConstructExpr) {
-  EXPECT_TRUE(
-      matches("template <typename T> T make() { return T(); }",
-              cxxUnresolvedConstructExpr(hasTypeLoc(loc(asString("T"))))));
-}
-
-TEST(HasTypeLoc, MatchesClassTemplateSpecializationDecl) {
-  EXPECT_TRUE(matches(
-      "template <typename T> class Foo; template <> class Foo<int> {};",
-      classTemplateSpecializationDecl(hasTypeLoc(loc(asString("Foo<int>"))))));
-}
-
-TEST(HasTypeLoc, MatchesCompoundLiteralExpr) {
-  EXPECT_TRUE(
-      matches("int* x = (int [2]) { 0, 1 };",
-              compoundLiteralExpr(hasTypeLoc(loc(asString("int [2]"))))));
-}
-
-TEST(HasTypeLoc, MatchesDeclaratorDecl) {
-  EXPECT_TRUE(matches("int x;",
-                      varDecl(hasName("x"), hasTypeLoc(loc(asString("int"))))));
-  EXPECT_TRUE(matches("int x(3);",
-                      varDecl(hasName("x"), hasTypeLoc(loc(asString("int"))))));
-  EXPECT_TRUE(
-      matches("struct Foo { Foo(int, int); }; Foo x(1, 2);",
-              varDecl(hasName("x"), hasTypeLoc(loc(asString("struct Foo"))))));
-
-  // Make sure we don't crash on implicit constructors.
-  EXPECT_TRUE(notMatches("class X {}; X x;",
-                         declaratorDecl(hasTypeLoc(loc(asString("int"))))));
-}
-
-TEST(HasTypeLoc, MatchesExplicitCastExpr) {
-  EXPECT_TRUE(matches("auto x = (int) 3;",
-                      explicitCastExpr(hasTypeLoc(loc(asString("int"))))));
-  EXPECT_TRUE(matches("auto x = static_cast<int>(3);",
-                      explicitCastExpr(hasTypeLoc(loc(asString("int"))))));
-}
-
-TEST(HasTypeLoc, MatchesObjCPropertyDecl) {
-  EXPECT_TRUE(matchesObjC(R"objc(
-      @interface Foo
-      @property int enabled;
-      @end
-    )objc",
-                          objcPropertyDecl(hasTypeLoc(loc(asString("int"))))));
-}
-
-TEST(HasTypeLoc, MatchesTemplateArgumentLoc) {
-  EXPECT_TRUE(matches("template <typename T> class Foo {}; Foo<int> x;",
-                      templateArgumentLoc(hasTypeLoc(loc(asString("int"))))));
-}
-
-TEST(HasTypeLoc, MatchesTypedefNameDecl) {
-  EXPECT_TRUE(matches("typedef int X;",
-                      typedefNameDecl(hasTypeLoc(loc(asString("int"))))));
-  EXPECT_TRUE(matches("using X = int;",
-                      typedefNameDecl(hasTypeLoc(loc(asString("int"))))));
-}
-
-TEST(Callee, MatchesDeclarations) {
-  StatementMatcher CallMethodX = callExpr(callee(cxxMethodDecl(hasName("x"))));
-
-  EXPECT_TRUE(matches("class Y { void x() { x(); } };", CallMethodX));
-  EXPECT_TRUE(notMatches("class Y { void x() {} };", CallMethodX));
-
-  CallMethodX = traverse(TK_AsIs, callExpr(callee(cxxConversionDecl())));
-  EXPECT_TRUE(
-    matches("struct Y { operator int() const; }; int i = Y();", CallMethodX));
-  EXPECT_TRUE(notMatches("struct Y { operator int() const; }; Y y = Y();",
-                         CallMethodX));
-}
-
-TEST(Callee, MatchesMemberExpressions) {
-  EXPECT_TRUE(matches("class Y { void x() { this->x(); } };",
-                      callExpr(callee(memberExpr()))));
-  EXPECT_TRUE(
-    notMatches("class Y { void x() { this->x(); } };", callExpr(callee(callExpr()))));
-}
-
-TEST(Matcher, Argument) {
-  StatementMatcher CallArgumentY = callExpr(
-    hasArgument(0, declRefExpr(to(varDecl(hasName("y"))))));
-
-  EXPECT_TRUE(matches("void x(int) { int y; x(y); }", CallArgumentY));
-  EXPECT_TRUE(
-    matches("class X { void x(int) { int y; x(y); } };", CallArgumentY));
-  EXPECT_TRUE(notMatches("void x(int) { int z; x(z); }", CallArgumentY));
-
-  StatementMatcher WrongIndex = callExpr(
-    hasArgument(42, declRefExpr(to(varDecl(hasName("y"))))));
-  EXPECT_TRUE(notMatches("void x(int) { int y; x(y); }", WrongIndex));
-}
-
-TEST(Matcher, AnyArgument) {
-  auto HasArgumentY = hasAnyArgument(
-      ignoringParenImpCasts(declRefExpr(to(varDecl(hasName("y"))))));
-  StatementMatcher CallArgumentY = callExpr(HasArgumentY);
-  StatementMatcher CtorArgumentY = cxxConstructExpr(HasArgumentY);
-  StatementMatcher UnresolvedCtorArgumentY =
-      cxxUnresolvedConstructExpr(HasArgumentY);
-  StatementMatcher ObjCCallArgumentY = objcMessageExpr(HasArgumentY);
-  EXPECT_TRUE(matches("void x(int, int) { int y; x(1, y); }", CallArgumentY));
-  EXPECT_TRUE(matches("void x(int, int) { int y; x(y, 42); }", CallArgumentY));
-  EXPECT_TRUE(matches("struct Y { Y(int, int); };"
-                      "void x() { int y; (void)Y(1, y); }",
-                      CtorArgumentY));
-  EXPECT_TRUE(matches("struct Y { Y(int, int); };"
-                      "void x() { int y; (void)Y(y, 42); }",
-                      CtorArgumentY));
-  EXPECT_TRUE(matches("template <class Y> void x() { int y; (void)Y(1, y); }",
-                      UnresolvedCtorArgumentY));
-  EXPECT_TRUE(matches("template <class Y> void x() { int y; (void)Y(y, 42); }",
-                      UnresolvedCtorArgumentY));
-  EXPECT_TRUE(matchesObjC("@interface I -(void)f:(int) y; @end "
-                          "void x(I* i) { int y; [i f:y]; }",
-                          ObjCCallArgumentY));
-  EXPECT_FALSE(matchesObjC("@interface I -(void)f:(int) z; @end "
-                           "void x(I* i) { int z; [i f:z]; }",
-                           ObjCCallArgumentY));
-  EXPECT_TRUE(notMatches("void x(int, int) { x(1, 2); }", CallArgumentY));
-  EXPECT_TRUE(notMatches("struct Y { Y(int, int); };"
-                         "void x() { int y; (void)Y(1, 2); }",
-                         CtorArgumentY));
-  EXPECT_TRUE(notMatches("template <class Y>"
-                         "void x() { int y; (void)Y(1, 2); }",
-                         UnresolvedCtorArgumentY));
-
-  StatementMatcher ImplicitCastedArgument =
-      traverse(TK_AsIs, callExpr(hasAnyArgument(implicitCastExpr())));
-  EXPECT_TRUE(matches("void x(long) { int y; x(y); }", ImplicitCastedArgument));
-}
-
-TEST(Matcher, HasReceiver) {
-  EXPECT_TRUE(matchesObjC(
-      "@interface NSString @end "
-      "void f(NSString *x) {"
-      "[x containsString];"
-      "}",
-      objcMessageExpr(hasReceiver(declRefExpr(to(varDecl(hasName("x"))))))));
-
-  EXPECT_FALSE(matchesObjC(
-      "@interface NSString +(NSString *) stringWithFormat; @end "
-      "void f() { [NSString stringWithFormat]; }",
-      objcMessageExpr(hasReceiver(declRefExpr(to(varDecl(hasName("x"))))))));
-}
-
-TEST(Matcher, HasAnyCapture) {
-  auto HasCaptureX = lambdaExpr(hasAnyCapture(varDecl(hasName("x"))));
-  EXPECT_TRUE(matches("void f() { int x = 3; [x](){}; }", HasCaptureX));
-  EXPECT_TRUE(matches("void f() { int x = 3; [&x](){}; }", HasCaptureX));
-  EXPECT_TRUE(notMatches("void f() { [](){}; }", HasCaptureX));
-  EXPECT_TRUE(notMatches("void f() { int z = 3; [&z](){}; }", HasCaptureX));
-  EXPECT_TRUE(
-      notMatches("struct a { void f() { [this](){}; }; };", HasCaptureX));
-}
-
-TEST(Matcher, CapturesThis) {
-  auto HasCaptureThis = lambdaExpr(hasAnyCapture(cxxThisExpr()));
-  EXPECT_TRUE(
-      matches("struct a { void f() { [this](){}; }; };", HasCaptureThis));
-  EXPECT_TRUE(notMatches("void f() { [](){}; }", HasCaptureThis));
-  EXPECT_TRUE(notMatches("void f() { int x = 3; [x](){}; }", HasCaptureThis));
-  EXPECT_TRUE(notMatches("void f() { int x = 3; [&x](){}; }", HasCaptureThis));
-  EXPECT_TRUE(notMatches("void f() { int z = 3; [&z](){}; }", HasCaptureThis));
-}
-
-TEST(Matcher, MatchesMethodsOnLambda) {
-  StringRef Code = R"cpp(
-struct A {
-  ~A() {}
-};
-void foo()
-{
-  A a;
-  auto l = [a] { };
-  auto lCopy = l;
-  auto lPtrDecay = +[] { };
-  (void)lPtrDecay;
-}
-)cpp";
-
-  EXPECT_TRUE(matches(
-      Code, cxxConstructorDecl(
-                hasBody(compoundStmt()),
-                hasAncestor(lambdaExpr(hasAncestor(varDecl(hasName("l"))))),
-                isCopyConstructor())));
-  EXPECT_TRUE(matches(
-      Code, cxxConstructorDecl(
-                hasBody(compoundStmt()),
-                hasAncestor(lambdaExpr(hasAncestor(varDecl(hasName("l"))))),
-                isMoveConstructor())));
-  EXPECT_TRUE(matches(
-      Code, cxxDestructorDecl(
-                hasBody(compoundStmt()),
-                hasAncestor(lambdaExpr(hasAncestor(varDecl(hasName("l"))))))));
-  EXPECT_TRUE(matches(
-      Code, cxxConversionDecl(hasBody(compoundStmt(has(returnStmt(
-                                  hasReturnValue(implicitCastExpr()))))),
-                              hasAncestor(lambdaExpr(hasAncestor(
-                                  varDecl(hasName("lPtrDecay"))))))));
-}
-
-TEST(Matcher, MatchesCoroutine) {
-  FileContentMappings M;
-  M.push_back(std::make_pair("/coro_header", R"cpp(
-namespace std {
-namespace experimental {
-
-template <class... Args>
-struct void_t_imp {
-  using type = void;
-};
-template <class... Args>
-using void_t = typename void_t_imp<Args...>::type;
-
-template <class T, class = void>
-struct traits_sfinae_base {};
-
-template <class T>
-struct traits_sfinae_base<T, void_t<typename T::promise_type>> {
-  using promise_type = typename T::promise_type;
-};
-
-template <class Ret, class... Args>
-struct coroutine_traits : public traits_sfinae_base<Ret> {};
-}}  // namespace std::experimental
-struct awaitable {
-  bool await_ready() noexcept;
-  template <typename F>
-  void await_suspend(F) noexcept;
-  void await_resume() noexcept;
-} a;
-struct promise {
-  void get_return_object();
-  awaitable initial_suspend();
-  awaitable final_suspend() noexcept;
-  awaitable yield_value(int); // expected-note 2{{candidate}}
-  void return_value(int); // expected-note 2{{here}}
-  void unhandled_exception();
-};
-template <typename... T>
-struct std::experimental::coroutine_traits<void, T...> { using promise_type = promise; };
-namespace std {
-namespace experimental {
-template <class PromiseType = void>
-struct coroutine_handle {
-  static coroutine_handle from_address(void *) noexcept;
-};
-}} // namespace std::experimental
-)cpp"));
-  StringRef CoReturnCode = R"cpp(
-#include <coro_header>
-void check_match_co_return() {
-  co_return 1;
-}
-)cpp";
-  EXPECT_TRUE(matchesConditionally(CoReturnCode, 
-                                   coreturnStmt(isExpansionInMainFile()), 
-                                   true, {"-std=c++20", "-I/"}, M));
-  StringRef CoAwaitCode = R"cpp(
-#include <coro_header>
-void check_match_co_await() {
-  co_await a;
-}
-)cpp";
-  EXPECT_TRUE(matchesConditionally(CoAwaitCode, 
-                                   coawaitExpr(isExpansionInMainFile()), 
-                                   true, {"-std=c++20", "-I/"}, M));
-  StringRef CoYieldCode = R"cpp(
-#include <coro_header>
-void check_match_co_yield() {
-  co_yield 1.0;
-}
-)cpp";
-  EXPECT_TRUE(matchesConditionally(CoYieldCode, 
-                                   coyieldExpr(isExpansionInMainFile()), 
-                                   true, {"-std=c++20", "-I/"}, M));
-}
-
-TEST(Matcher, isClassMessage) {
-  EXPECT_TRUE(matchesObjC(
-      "@interface NSString +(NSString *) stringWithFormat; @end "
-      "void f() { [NSString stringWithFormat]; }",
-      objcMessageExpr(isClassMessage())));
-
-  EXPECT_FALSE(matchesObjC(
-      "@interface NSString @end "
-      "void f(NSString *x) {"
-      "[x containsString];"
-      "}",
-      objcMessageExpr(isClassMessage())));
-}
-
-TEST(Matcher, isInstanceMessage) {
-  EXPECT_TRUE(matchesObjC(
-      "@interface NSString @end "
-      "void f(NSString *x) {"
-      "[x containsString];"
-      "}",
-      objcMessageExpr(isInstanceMessage())));
-
-  EXPECT_FALSE(matchesObjC(
-      "@interface NSString +(NSString *) stringWithFormat; @end "
-      "void f() { [NSString stringWithFormat]; }",
-      objcMessageExpr(isInstanceMessage())));
-
-}
-
-TEST(Matcher, isClassMethod) {
-  EXPECT_TRUE(matchesObjC(
-    "@interface Bar + (void)bar; @end",
-    objcMethodDecl(isClassMethod())));
-
-  EXPECT_TRUE(matchesObjC(
-    "@interface Bar @end"
-    "@implementation Bar + (void)bar {} @end",
-    objcMethodDecl(isClassMethod())));
-
-  EXPECT_FALSE(matchesObjC(
-    "@interface Foo - (void)foo; @end",
-    objcMethodDecl(isClassMethod())));
-
-  EXPECT_FALSE(matchesObjC(
-    "@interface Foo @end "
-    "@implementation Foo - (void)foo {} @end",
-    objcMethodDecl(isClassMethod())));
-}
-
-TEST(Matcher, isInstanceMethod) {
-  EXPECT_TRUE(matchesObjC(
-    "@interface Foo - (void)foo; @end",
-    objcMethodDecl(isInstanceMethod())));
-
-  EXPECT_TRUE(matchesObjC(
-    "@interface Foo @end "
-    "@implementation Foo - (void)foo {} @end",
-    objcMethodDecl(isInstanceMethod())));
-
-  EXPECT_FALSE(matchesObjC(
-    "@interface Bar + (void)bar; @end",
-    objcMethodDecl(isInstanceMethod())));
-
-  EXPECT_FALSE(matchesObjC(
-    "@interface Bar @end"
-    "@implementation Bar + (void)bar {} @end",
-    objcMethodDecl(isInstanceMethod())));
-}
-
-TEST(MatcherCXXMemberCallExpr, On) {
-  StringRef Snippet1 = R"cc(
-        struct Y {
-          void m();
-        };
-        void z(Y y) { y.m(); }
-      )cc";
-  StringRef Snippet2 = R"cc(
-        struct Y {
-          void m();
-        };
-        struct X : public Y {};
-        void z(X x) { x.m(); }
-      )cc";
-  auto MatchesY = cxxMemberCallExpr(on(hasType(cxxRecordDecl(hasName("Y")))));
-  EXPECT_TRUE(matches(Snippet1, MatchesY));
-  EXPECT_TRUE(notMatches(Snippet2, MatchesY));
-
-  auto MatchesX = cxxMemberCallExpr(on(hasType(cxxRecordDecl(hasName("X")))));
-  EXPECT_TRUE(matches(Snippet2, MatchesX));
-
-  // Parens are ignored.
-  StringRef Snippet3 = R"cc(
-    struct Y {
-      void m();
-    };
-    Y g();
-    void z(Y y) { (g()).m(); }
-  )cc";
-  auto MatchesCall = cxxMemberCallExpr(on(callExpr()));
-  EXPECT_TRUE(matches(Snippet3, MatchesCall));
-}
-
-TEST(MatcherCXXMemberCallExpr, OnImplicitObjectArgument) {
-  StringRef Snippet1 = R"cc(
-    struct Y {
-      void m();
-    };
-    void z(Y y) { y.m(); }
-  )cc";
-  StringRef Snippet2 = R"cc(
-    struct Y {
-      void m();
-    };
-    struct X : public Y {};
-    void z(X x) { x.m(); }
-  )cc";
-  auto MatchesY = traverse(TK_AsIs, cxxMemberCallExpr(onImplicitObjectArgument(
-                                        hasType(cxxRecordDecl(hasName("Y"))))));
-  EXPECT_TRUE(matches(Snippet1, MatchesY));
-  EXPECT_TRUE(matches(Snippet2, MatchesY));
-
-  auto MatchesX = traverse(TK_AsIs, cxxMemberCallExpr(onImplicitObjectArgument(
-                                        hasType(cxxRecordDecl(hasName("X"))))));
-  EXPECT_TRUE(notMatches(Snippet2, MatchesX));
-
-  // Parens are not ignored.
-  StringRef Snippet3 = R"cc(
-    struct Y {
-      void m();
-    };
-    Y g();
-    void z(Y y) { (g()).m(); }
-  )cc";
-  auto MatchesCall = traverse(
-      TK_AsIs, cxxMemberCallExpr(onImplicitObjectArgument(callExpr())));
-  EXPECT_TRUE(notMatches(Snippet3, MatchesCall));
-}
-
-TEST(Matcher, HasObjectExpr) {
-  StringRef Snippet1 = R"cc(
-        struct X {
-          int m;
-          int f(X x) { return x.m; }
-        };
-      )cc";
-  StringRef Snippet2 = R"cc(
-        struct X {
-          int m;
-          int f(X x) { return m; }
-        };
-      )cc";
-  auto MatchesX =
-      memberExpr(hasObjectExpression(hasType(cxxRecordDecl(hasName("X")))));
-  EXPECT_TRUE(matches(Snippet1, MatchesX));
-  EXPECT_TRUE(notMatches(Snippet2, MatchesX));
-
-  auto MatchesXPointer = memberExpr(
-      hasObjectExpression(hasType(pointsTo(cxxRecordDecl(hasName("X"))))));
-  EXPECT_TRUE(notMatches(Snippet1, MatchesXPointer));
-  EXPECT_TRUE(matches(Snippet2, MatchesXPointer));
-}
-
-TEST(ForEachArgumentWithParam, ReportsNoFalsePositives) {
-  StatementMatcher ArgumentY =
-    declRefExpr(to(varDecl(hasName("y")))).bind("arg");
-  DeclarationMatcher IntParam = parmVarDecl(hasType(isInteger())).bind("param");
-  StatementMatcher CallExpr =
-    callExpr(forEachArgumentWithParam(ArgumentY, IntParam));
-
-  // IntParam does not match.
-  EXPECT_TRUE(notMatches("void f(int* i) { int* y; f(y); }", CallExpr));
-  // ArgumentY does not match.
-  EXPECT_TRUE(notMatches("void f(int i) { int x; f(x); }", CallExpr));
-}
-
-TEST(ForEachArgumentWithParam, MatchesCXXMemberCallExpr) {
-  StatementMatcher ArgumentY =
-    declRefExpr(to(varDecl(hasName("y")))).bind("arg");
-  DeclarationMatcher IntParam = parmVarDecl(hasType(isInteger())).bind("param");
-  StatementMatcher CallExpr =
-    callExpr(forEachArgumentWithParam(ArgumentY, IntParam));
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-    "struct S {"
-      "  const S& operator[](int i) { return *this; }"
-      "};"
-      "void f(S S1) {"
-      "  int y = 1;"
-      "  S1[y];"
-      "}",
-    CallExpr, std::make_unique<VerifyIdIsBoundTo<ParmVarDecl>>("param", 1)));
-
-  StatementMatcher CallExpr2 =
-    callExpr(forEachArgumentWithParam(ArgumentY, IntParam));
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-    "struct S {"
-      "  static void g(int i);"
-      "};"
-      "void f() {"
-      "  int y = 1;"
-      "  S::g(y);"
-      "}",
-    CallExpr2, std::make_unique<VerifyIdIsBoundTo<ParmVarDecl>>("param", 1)));
-}
-
-TEST(ForEachArgumentWithParam, MatchesCallExpr) {
-  StatementMatcher ArgumentY =
-    declRefExpr(to(varDecl(hasName("y")))).bind("arg");
-  DeclarationMatcher IntParam = parmVarDecl(hasType(isInteger())).bind("param");
-  StatementMatcher CallExpr =
-    callExpr(forEachArgumentWithParam(ArgumentY, IntParam));
-
-  EXPECT_TRUE(
-    matchAndVerifyResultTrue("void f(int i) { int y; f(y); }", CallExpr,
-                             std::make_unique<VerifyIdIsBoundTo<ParmVarDecl>>(
-                               "param")));
-  EXPECT_TRUE(
-    matchAndVerifyResultTrue("void f(int i) { int y; f(y); }", CallExpr,
-                             std::make_unique<VerifyIdIsBoundTo<DeclRefExpr>>(
-                               "arg")));
-
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-    "void f(int i, int j) { int y; f(y, y); }", CallExpr,
-    std::make_unique<VerifyIdIsBoundTo<ParmVarDecl>>("param", 2)));
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-    "void f(int i, int j) { int y; f(y, y); }", CallExpr,
-    std::make_unique<VerifyIdIsBoundTo<DeclRefExpr>>("arg", 2)));
-}
-
-TEST(ForEachArgumentWithParam, MatchesConstructExpr) {
-  StatementMatcher ArgumentY =
-    declRefExpr(to(varDecl(hasName("y")))).bind("arg");
-  DeclarationMatcher IntParam = parmVarDecl(hasType(isInteger())).bind("param");
-  StatementMatcher ConstructExpr = traverse(
-      TK_AsIs, cxxConstructExpr(forEachArgumentWithParam(ArgumentY, IntParam)));
-
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-    "struct C {"
-      "  C(int i) {}"
-      "};"
-      "int y = 0;"
-      "C Obj(y);",
-    ConstructExpr,
-    std::make_unique<VerifyIdIsBoundTo<ParmVarDecl>>("param")));
-}
-
-TEST(ForEachArgumentWithParam, HandlesBoundNodesForNonMatches) {
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-    "void g(int i, int j) {"
-      "  int a;"
-      "  int b;"
-      "  int c;"
-      "  g(a, 0);"
-      "  g(a, b);"
-      "  g(0, b);"
-      "}",
-    functionDecl(
-      forEachDescendant(varDecl().bind("v")),
-      forEachDescendant(callExpr(forEachArgumentWithParam(
-        declRefExpr(to(decl(equalsBoundNode("v")))), parmVarDecl())))),
-    std::make_unique<VerifyIdIsBoundTo<VarDecl>>("v", 4)));
-}
-
-TEST(ForEachArgumentWithParamType, ReportsNoFalsePositives) {
-  StatementMatcher ArgumentY =
-      declRefExpr(to(varDecl(hasName("y")))).bind("arg");
-  TypeMatcher IntType = qualType(isInteger()).bind("type");
-  StatementMatcher CallExpr =
-      callExpr(forEachArgumentWithParamType(ArgumentY, IntType));
-
-  // IntParam does not match.
-  EXPECT_TRUE(notMatches("void f(int* i) { int* y; f(y); }", CallExpr));
-  // ArgumentY does not match.
-  EXPECT_TRUE(notMatches("void f(int i) { int x; f(x); }", CallExpr));
-}
-
-TEST(ForEachArgumentWithParamType, MatchesCXXMemberCallExpr) {
-  StatementMatcher ArgumentY =
-      declRefExpr(to(varDecl(hasName("y")))).bind("arg");
-  TypeMatcher IntType = qualType(isInteger()).bind("type");
-  StatementMatcher CallExpr =
-      callExpr(forEachArgumentWithParamType(ArgumentY, IntType));
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-      "struct S {"
-      "  const S& operator[](int i) { return *this; }"
-      "};"
-      "void f(S S1) {"
-      "  int y = 1;"
-      "  S1[y];"
-      "}",
-      CallExpr, std::make_unique<VerifyIdIsBoundTo<QualType>>("type", 1)));
-
-  StatementMatcher CallExpr2 =
-      callExpr(forEachArgumentWithParamType(ArgumentY, IntType));
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-      "struct S {"
-      "  static void g(int i);"
-      "};"
-      "void f() {"
-      "  int y = 1;"
-      "  S::g(y);"
-      "}",
-      CallExpr2, std::make_unique<VerifyIdIsBoundTo<QualType>>("type", 1)));
-}
-
-TEST(ForEachArgumentWithParamType, MatchesCallExpr) {
-  StatementMatcher ArgumentY =
-      declRefExpr(to(varDecl(hasName("y")))).bind("arg");
-  TypeMatcher IntType = qualType(isInteger()).bind("type");
-  StatementMatcher CallExpr =
-      callExpr(forEachArgumentWithParamType(ArgumentY, IntType));
-
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-      "void f(int i) { int y; f(y); }", CallExpr,
-      std::make_unique<VerifyIdIsBoundTo<QualType>>("type")));
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-      "void f(int i) { int y; f(y); }", CallExpr,
-      std::make_unique<VerifyIdIsBoundTo<DeclRefExpr>>("arg")));
-
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-      "void f(int i, int j) { int y; f(y, y); }", CallExpr,
-      std::make_unique<VerifyIdIsBoundTo<QualType>>("type", 2)));
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-      "void f(int i, int j) { int y; f(y, y); }", CallExpr,
-      std::make_unique<VerifyIdIsBoundTo<DeclRefExpr>>("arg", 2)));
-}
-
-TEST(ForEachArgumentWithParamType, MatchesConstructExpr) {
-  StatementMatcher ArgumentY =
-      declRefExpr(to(varDecl(hasName("y")))).bind("arg");
-  TypeMatcher IntType = qualType(isInteger()).bind("type");
-  StatementMatcher ConstructExpr =
-      cxxConstructExpr(forEachArgumentWithParamType(ArgumentY, IntType));
-
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-      "struct C {"
-      "  C(int i) {}"
-      "};"
-      "int y = 0;"
-      "C Obj(y);",
-      ConstructExpr, std::make_unique<VerifyIdIsBoundTo<QualType>>("type")));
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-      "struct C {"
-      "  C(int i) {}"
-      "};"
-      "int y = 0;"
-      "C Obj(y);",
-      ConstructExpr, std::make_unique<VerifyIdIsBoundTo<DeclRefExpr>>("arg")));
-}
-
-TEST(ForEachArgumentWithParamType, HandlesKandRFunctions) {
-  StatementMatcher ArgumentY =
-      declRefExpr(to(varDecl(hasName("y")))).bind("arg");
-  TypeMatcher IntType = qualType(isInteger()).bind("type");
-  StatementMatcher CallExpr =
-      callExpr(forEachArgumentWithParamType(ArgumentY, IntType));
-
-  EXPECT_TRUE(matchesC("void f();\n"
-                       "void call_it(void) { int x, y; f(x, y); }\n"
-                       "void f(a, b) int a, b; {}\n"
-                       "void call_it2(void) { int x, y; f(x, y); }",
-                       CallExpr));
-}
-
-TEST(ForEachArgumentWithParamType, HandlesBoundNodesForNonMatches) {
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-      "void g(int i, int j) {"
-      "  int a;"
-      "  int b;"
-      "  int c;"
-      "  g(a, 0);"
-      "  g(a, b);"
-      "  g(0, b);"
-      "}",
-      functionDecl(
-          forEachDescendant(varDecl().bind("v")),
-          forEachDescendant(callExpr(forEachArgumentWithParamType(
-              declRefExpr(to(decl(equalsBoundNode("v")))), qualType())))),
-      std::make_unique<VerifyIdIsBoundTo<VarDecl>>("v", 4)));
-}
-
-TEST(ForEachArgumentWithParamType, MatchesFunctionPtrCalls) {
-  StatementMatcher ArgumentY =
-      declRefExpr(to(varDecl(hasName("y")))).bind("arg");
-  TypeMatcher IntType = qualType(builtinType()).bind("type");
-  StatementMatcher CallExpr =
-      callExpr(forEachArgumentWithParamType(ArgumentY, IntType));
-
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-      "void f(int i) {"
-      "void (*f_ptr)(int) = f; int y; f_ptr(y); }",
-      CallExpr, std::make_unique<VerifyIdIsBoundTo<QualType>>("type")));
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-      "void f(int i) {"
-      "void (*f_ptr)(int) = f; int y; f_ptr(y); }",
-      CallExpr, std::make_unique<VerifyIdIsBoundTo<DeclRefExpr>>("arg")));
-}
-
-TEST(ForEachArgumentWithParamType, MatchesMemberFunctionPtrCalls) {
-  StatementMatcher ArgumentY =
-      declRefExpr(to(varDecl(hasName("y")))).bind("arg");
-  TypeMatcher IntType = qualType(builtinType()).bind("type");
-  StatementMatcher CallExpr =
-      callExpr(forEachArgumentWithParamType(ArgumentY, IntType));
-
-  StringRef S = "struct A {\n"
-                "  int f(int i) { return i + 1; }\n"
-                "  int (A::*x)(int);\n"
-                "};\n"
-                "void f() {\n"
-                "  int y = 42;\n"
-                "  A a;\n"
-                "  a.x = &A::f;\n"
-                "  (a.*(a.x))(y);\n"
-                "}";
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-      S, CallExpr, std::make_unique<VerifyIdIsBoundTo<QualType>>("type")));
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-      S, CallExpr, std::make_unique<VerifyIdIsBoundTo<DeclRefExpr>>("arg")));
-}
-
-TEST(QualType, hasCanonicalType) {
-  EXPECT_TRUE(notMatches("typedef int &int_ref;"
-                           "int a;"
-                           "int_ref b = a;",
-                         varDecl(hasType(qualType(referenceType())))));
-  EXPECT_TRUE(
-    matches("typedef int &int_ref;"
-              "int a;"
-              "int_ref b = a;",
-            varDecl(hasType(qualType(hasCanonicalType(referenceType()))))));
-}
-
-TEST(HasParameter, CallsInnerMatcher) {
-  EXPECT_TRUE(matches("class X { void x(int) {} };",
-                      cxxMethodDecl(hasParameter(0, varDecl()))));
-  EXPECT_TRUE(notMatches("class X { void x(int) {} };",
-                         cxxMethodDecl(hasParameter(0, hasName("x")))));
-  EXPECT_TRUE(matchesObjC("@interface I -(void)f:(int) x; @end",
-                          objcMethodDecl(hasParameter(0, hasName("x")))));
-  EXPECT_TRUE(matchesObjC("int main() { void (^b)(int) = ^(int p) {}; }",
-                          blockDecl(hasParameter(0, hasName("p")))));
-}
-
-TEST(HasParameter, DoesNotMatchIfIndexOutOfBounds) {
-  EXPECT_TRUE(notMatches("class X { void x(int) {} };",
-                         cxxMethodDecl(hasParameter(42, varDecl()))));
-}
-
-TEST(HasType, MatchesParameterVariableTypesStrictly) {
-  EXPECT_TRUE(matches(
-    "class X { void x(X x) {} };",
-    cxxMethodDecl(hasParameter(0, hasType(recordDecl(hasName("X")))))));
-  EXPECT_TRUE(notMatches(
-    "class X { void x(const X &x) {} };",
-    cxxMethodDecl(hasParameter(0, hasType(recordDecl(hasName("X")))))));
-  EXPECT_TRUE(matches("class X { void x(const X *x) {} };",
-                      cxxMethodDecl(hasParameter(
-                        0, hasType(pointsTo(recordDecl(hasName("X"))))))));
-  EXPECT_TRUE(matches("class X { void x(const X &x) {} };",
-                      cxxMethodDecl(hasParameter(
-                        0, hasType(references(recordDecl(hasName("X"))))))));
-}
-
-TEST(HasAnyParameter, MatchesIndependentlyOfPosition) {
-  EXPECT_TRUE(matches(
-    "class Y {}; class X { void x(X x, Y y) {} };",
-    cxxMethodDecl(hasAnyParameter(hasType(recordDecl(hasName("X")))))));
-  EXPECT_TRUE(matches(
-    "class Y {}; class X { void x(Y y, X x) {} };",
-    cxxMethodDecl(hasAnyParameter(hasType(recordDecl(hasName("X")))))));
-  EXPECT_TRUE(matchesObjC("@interface I -(void)f:(int) x; @end",
-                          objcMethodDecl(hasAnyParameter(hasName("x")))));
-  EXPECT_TRUE(matchesObjC("int main() { void (^b)(int) = ^(int p) {}; }",
-                          blockDecl(hasAnyParameter(hasName("p")))));
-}
-
-TEST(Returns, MatchesReturnTypes) {
-  EXPECT_TRUE(matches("class Y { int f() { return 1; } };",
-                      functionDecl(returns(asString("int")))));
-  EXPECT_TRUE(notMatches("class Y { int f() { return 1; } };",
-                         functionDecl(returns(asString("float")))));
-  EXPECT_TRUE(matches("class Y { Y getMe() { return *this; } };",
-                      functionDecl(returns(hasDeclaration(
-                        recordDecl(hasName("Y")))))));
-}
-
-TEST(HasAnyParameter, DoesntMatchIfInnerMatcherDoesntMatch) {
-  EXPECT_TRUE(notMatches(
-    "class Y {}; class X { void x(int) {} };",
-    cxxMethodDecl(hasAnyParameter(hasType(recordDecl(hasName("X")))))));
-}
-
-TEST(HasAnyParameter, DoesNotMatchThisPointer) {
-  EXPECT_TRUE(notMatches("class Y {}; class X { void x() {} };",
-                         cxxMethodDecl(hasAnyParameter(
-                           hasType(pointsTo(recordDecl(hasName("X"))))))));
-}
-
-TEST(HasName, MatchesParameterVariableDeclarations) {
-  EXPECT_TRUE(matches("class Y {}; class X { void x(int x) {} };",
-                      cxxMethodDecl(hasAnyParameter(hasName("x")))));
-  EXPECT_TRUE(notMatches("class Y {}; class X { void x(int) {} };",
-                         cxxMethodDecl(hasAnyParameter(hasName("x")))));
-}
-
-TEST(Matcher, MatchesTypeTemplateArgument) {
-  EXPECT_TRUE(matches(
-    "template<typename T> struct B {};"
-      "B<int> b;",
-    classTemplateSpecializationDecl(hasAnyTemplateArgument(refersToType(
-      asString("int"))))));
-}
-
-TEST(Matcher, MatchesTemplateTemplateArgument) {
-  EXPECT_TRUE(matches("template<template <typename> class S> class X {};"
-                      "template<typename T> class Y {};"
-                      "X<Y> xi;",
-                      classTemplateSpecializationDecl(hasAnyTemplateArgument(
-                          refersToTemplate(templateName())))));
-}
-
-TEST(Matcher, MatchesDeclarationReferenceTemplateArgument) {
-  EXPECT_TRUE(matches(
-    "struct B { int next; };"
-      "template<int(B::*next_ptr)> struct A {};"
-      "A<&B::next> a;",
-    classTemplateSpecializationDecl(hasAnyTemplateArgument(
-      refersToDeclaration(fieldDecl(hasName("next")))))));
-
-  EXPECT_TRUE(notMatches(
-    "template <typename T> struct A {};"
-      "A<int> a;",
-    classTemplateSpecializationDecl(hasAnyTemplateArgument(
-      refersToDeclaration(decl())))));
-
-  EXPECT_TRUE(matches(
-    "struct B { int next; };"
-      "template<int(B::*next_ptr)> struct A {};"
-      "A<&B::next> a;",
-    templateSpecializationType(hasAnyTemplateArgument(isExpr(
-      hasDescendant(declRefExpr(to(fieldDecl(hasName("next"))))))))));
-
-  EXPECT_TRUE(notMatches(
-    "template <typename T> struct A {};"
-      "A<int> a;",
-    templateSpecializationType(hasAnyTemplateArgument(
-      refersToDeclaration(decl())))));
-}
-
-
-TEST(Matcher, MatchesSpecificArgument) {
-  EXPECT_TRUE(matches(
-    "template<typename T, typename U> class A {};"
-      "A<bool, int> a;",
-    classTemplateSpecializationDecl(hasTemplateArgument(
-      1, refersToType(asString("int"))))));
-  EXPECT_TRUE(notMatches(
-    "template<typename T, typename U> class A {};"
-      "A<int, bool> a;",
-    classTemplateSpecializationDecl(hasTemplateArgument(
-      1, refersToType(asString("int"))))));
-
-  EXPECT_TRUE(matches(
-    "template<typename T, typename U> class A {};"
-      "A<bool, int> a;",
-    templateSpecializationType(hasTemplateArgument(
-      1, refersToType(asString("int"))))));
-  EXPECT_TRUE(notMatches(
-    "template<typename T, typename U> class A {};"
-      "A<int, bool> a;",
-    templateSpecializationType(hasTemplateArgument(
-      1, refersToType(asString("int"))))));
-
-  EXPECT_TRUE(matches(
-    "template<typename T> void f() {};"
-      "void func() { f<int>(); }",
-    functionDecl(hasTemplateArgument(0, refersToType(asString("int"))))));
-  EXPECT_TRUE(notMatches(
-    "template<typename T> void f() {};",
-    functionDecl(hasTemplateArgument(0, refersToType(asString("int"))))));
-}
-
-TEST(TemplateArgument, Matches) {
-  EXPECT_TRUE(matches("template<typename T> struct C {}; C<int> c;",
-                      classTemplateSpecializationDecl(
-                        hasAnyTemplateArgument(templateArgument()))));
-  EXPECT_TRUE(matches(
-    "template<typename T> struct C {}; C<int> c;",
-    templateSpecializationType(hasAnyTemplateArgument(templateArgument()))));
-
-  EXPECT_TRUE(matches(
-    "template<typename T> void f() {};"
-      "void func() { f<int>(); }",
-    functionDecl(hasAnyTemplateArgument(templateArgument()))));
-}
-
-TEST(TemplateTypeParmDecl, CXXMethodDecl) {
-  const char input[] =
-      "template<typename T>\n"
-      "class Class {\n"
-      "  void method();\n"
-      "};\n"
-      "template<typename U>\n"
-      "void Class<U>::method() {}\n";
-  EXPECT_TRUE(matches(input, templateTypeParmDecl(hasName("T"))));
-  EXPECT_TRUE(matches(input, templateTypeParmDecl(hasName("U"))));
-}
-
-TEST(TemplateTypeParmDecl, VarDecl) {
-  const char input[] =
-      "template<typename T>\n"
-      "class Class {\n"
-      "  static T pi;\n"
-      "};\n"
-      "template<typename U>\n"
-      "U Class<U>::pi = U(3.1415926535897932385);\n";
-  EXPECT_TRUE(matches(input, templateTypeParmDecl(hasName("T"))));
-  EXPECT_TRUE(matches(input, templateTypeParmDecl(hasName("U"))));
-}
-
-TEST(TemplateTypeParmDecl, VarTemplatePartialSpecializationDecl) {
-  const char input[] =
-      "template<typename T>\n"
-      "struct Struct {\n"
-      "  template<typename T2> static int field;\n"
-      "};\n"
-      "template<typename U>\n"
-      "template<typename U2>\n"
-      "int Struct<U>::field<U2*> = 123;\n";
-  EXPECT_TRUE(
-      matches(input, templateTypeParmDecl(hasName("T")), langCxx14OrLater()));
-  EXPECT_TRUE(
-      matches(input, templateTypeParmDecl(hasName("T2")), langCxx14OrLater()));
-  EXPECT_TRUE(
-      matches(input, templateTypeParmDecl(hasName("U")), langCxx14OrLater()));
-  EXPECT_TRUE(
-      matches(input, templateTypeParmDecl(hasName("U2")), langCxx14OrLater()));
-}
-
-TEST(TemplateTypeParmDecl, ClassTemplatePartialSpecializationDecl) {
-  const char input[] =
-      "template<typename T>\n"
-      "class Class {\n"
-      "  template<typename T2> struct Struct;\n"
-      "};\n"
-      "template<typename U>\n"
-      "template<typename U2>\n"
-      "struct Class<U>::Struct<U2*> {};\n";
-  EXPECT_TRUE(matches(input, templateTypeParmDecl(hasName("T"))));
-  EXPECT_TRUE(matches(input, templateTypeParmDecl(hasName("T2"))));
-  EXPECT_TRUE(matches(input, templateTypeParmDecl(hasName("U"))));
-  EXPECT_TRUE(matches(input, templateTypeParmDecl(hasName("U2"))));
-}
-
-TEST(TemplateTypeParmDecl, EnumDecl) {
-  const char input[] =
-      "template<typename T>\n"
-      "struct Struct {\n"
-      "  enum class Enum : T;\n"
-      "};\n"
-      "template<typename U>\n"
-      "enum class Struct<U>::Enum : U {\n"
-      "  e1,\n"
-      "  e2\n"
-      "};\n";
-  EXPECT_TRUE(matches(input, templateTypeParmDecl(hasName("T"))));
-  EXPECT_TRUE(matches(input, templateTypeParmDecl(hasName("U"))));
-}
-
-TEST(TemplateTypeParmDecl, RecordDecl) {
-  const char input[] =
-      "template<typename T>\n"
-      "class Class {\n"
-      "  struct Struct;\n"
-      "};\n"
-      "template<typename U>\n"
-      "struct Class<U>::Struct {\n"
-      "  U field;\n"
-      "};\n";
-  EXPECT_TRUE(matches(input, templateTypeParmDecl(hasName("T"))));
-  EXPECT_TRUE(matches(input, templateTypeParmDecl(hasName("U"))));
-}
-
-TEST(RefersToIntegralType, Matches) {
-  EXPECT_TRUE(matches("template<int T> struct C {}; C<42> c;",
-                      classTemplateSpecializationDecl(
-                        hasAnyTemplateArgument(refersToIntegralType(
-                          asString("int"))))));
-  EXPECT_TRUE(notMatches("template<unsigned T> struct C {}; C<42> c;",
-                         classTemplateSpecializationDecl(hasAnyTemplateArgument(
-                           refersToIntegralType(asString("int"))))));
-}
-
-TEST(ConstructorDeclaration, SimpleCase) {
-  EXPECT_TRUE(matches("class Foo { Foo(int i); };",
-                      cxxConstructorDecl(ofClass(hasName("Foo")))));
-  EXPECT_TRUE(notMatches("class Foo { Foo(int i); };",
-                         cxxConstructorDecl(ofClass(hasName("Bar")))));
-}
-
-TEST(DestructorDeclaration, MatchesVirtualDestructor) {
-  EXPECT_TRUE(matches("class Foo { virtual ~Foo(); };",
-                      cxxDestructorDecl(ofClass(hasName("Foo")))));
-}
-
-TEST(DestructorDeclaration, DoesNotMatchImplicitDestructor) {
-  EXPECT_TRUE(notMatches("class Foo {};",
-                         cxxDestructorDecl(ofClass(hasName("Foo")))));
-}
-
-TEST(HasAnyConstructorInitializer, SimpleCase) {
-  EXPECT_TRUE(
-    notMatches("class Foo { Foo() { } };",
-               cxxConstructorDecl(hasAnyConstructorInitializer(anything()))));
-  EXPECT_TRUE(
-    matches("class Foo {"
-              "  Foo() : foo_() { }"
-              "  int foo_;"
-              "};",
-            cxxConstructorDecl(hasAnyConstructorInitializer(anything()))));
-}
-
-TEST(HasAnyConstructorInitializer, ForField) {
-  static const char Code[] =
-    "class Baz { };"
-      "class Foo {"
-      "  Foo() : foo_(), bar_() { }"
-      "  Baz foo_;"
-      "  struct {"
-      "    Baz bar_;"
-      "  };"
-      "};";
-  EXPECT_TRUE(matches(Code, cxxConstructorDecl(hasAnyConstructorInitializer(
-    forField(hasType(recordDecl(hasName("Baz"))))))));
-  EXPECT_TRUE(matches(Code, cxxConstructorDecl(hasAnyConstructorInitializer(
-    forField(hasName("foo_"))))));
-  EXPECT_TRUE(matches(Code, cxxConstructorDecl(hasAnyConstructorInitializer(
-    forField(hasName("bar_"))))));
-  EXPECT_TRUE(notMatches(Code, cxxConstructorDecl(hasAnyConstructorInitializer(
-    forField(hasType(recordDecl(hasName("Bar"))))))));
-}
-
-TEST(HasAnyConstructorInitializer, WithInitializer) {
-  static const char Code[] =
-    "class Foo {"
-      "  Foo() : foo_(0) { }"
-      "  int foo_;"
-      "};";
-  EXPECT_TRUE(matches(Code, cxxConstructorDecl(hasAnyConstructorInitializer(
-    withInitializer(integerLiteral(equals(0)))))));
-  EXPECT_TRUE(notMatches(Code, cxxConstructorDecl(hasAnyConstructorInitializer(
-    withInitializer(integerLiteral(equals(1)))))));
-}
-
-TEST(HasAnyConstructorInitializer, IsWritten) {
-  static const char Code[] =
-    "struct Bar { Bar(){} };"
-      "class Foo {"
-      "  Foo() : foo_() { }"
-      "  Bar foo_;"
-      "  Bar bar_;"
-      "};";
-  EXPECT_TRUE(matches(Code, cxxConstructorDecl(hasAnyConstructorInitializer(
-    allOf(forField(hasName("foo_")), isWritten())))));
-  EXPECT_TRUE(notMatches(Code, cxxConstructorDecl(hasAnyConstructorInitializer(
-    allOf(forField(hasName("bar_")), isWritten())))));
-  EXPECT_TRUE(matches(Code, cxxConstructorDecl(hasAnyConstructorInitializer(
-    allOf(forField(hasName("bar_")), unless(isWritten()))))));
-}
-
-TEST(HasAnyConstructorInitializer, IsBaseInitializer) {
-  static const char Code[] =
-    "struct B {};"
-      "struct D : B {"
-      "  int I;"
-      "  D(int i) : I(i) {}"
-      "};"
-      "struct E : B {"
-      "  E() : B() {}"
-      "};";
-  EXPECT_TRUE(matches(Code, cxxConstructorDecl(allOf(
-    hasAnyConstructorInitializer(allOf(isBaseInitializer(), isWritten())),
-    hasName("E")))));
-  EXPECT_TRUE(notMatches(Code, cxxConstructorDecl(allOf(
-    hasAnyConstructorInitializer(allOf(isBaseInitializer(), isWritten())),
-    hasName("D")))));
-  EXPECT_TRUE(matches(Code, cxxConstructorDecl(allOf(
-    hasAnyConstructorInitializer(allOf(isMemberInitializer(), isWritten())),
-    hasName("D")))));
-  EXPECT_TRUE(notMatches(Code, cxxConstructorDecl(allOf(
-    hasAnyConstructorInitializer(allOf(isMemberInitializer(), isWritten())),
-    hasName("E")))));
-}
-
-TEST(IfStmt, ChildTraversalMatchers) {
-  EXPECT_TRUE(matches("void f() { if (false) true; else false; }",
-                      ifStmt(hasThen(cxxBoolLiteral(equals(true))))));
-  EXPECT_TRUE(notMatches("void f() { if (false) false; else true; }",
-                         ifStmt(hasThen(cxxBoolLiteral(equals(true))))));
-  EXPECT_TRUE(matches("void f() { if (false) false; else true; }",
-                      ifStmt(hasElse(cxxBoolLiteral(equals(true))))));
-  EXPECT_TRUE(notMatches("void f() { if (false) true; else false; }",
-                         ifStmt(hasElse(cxxBoolLiteral(equals(true))))));
-}
-
-TEST(MatchBinaryOperator, HasOperatorName) {
-  StatementMatcher OperatorOr = binaryOperator(hasOperatorName("||"));
-
-  EXPECT_TRUE(matches("void x() { true || false; }", OperatorOr));
-  EXPECT_TRUE(notMatches("void x() { true && false; }", OperatorOr));
-}
-
-TEST(MatchBinaryOperator, HasAnyOperatorName) {
-  StatementMatcher Matcher =
-      binaryOperator(hasAnyOperatorName("+", "-", "*", "/"));
-
-  EXPECT_TRUE(matches("int x(int I) { return I + 2; }", Matcher));
-  EXPECT_TRUE(matches("int x(int I) { return I - 2; }", Matcher));
-  EXPECT_TRUE(matches("int x(int I) { return I * 2; }", Matcher));
-  EXPECT_TRUE(matches("int x(int I) { return I / 2; }", Matcher));
-  EXPECT_TRUE(notMatches("int x(int I) { return I % 2; }", Matcher));
-  // Ensure '+= isn't mistaken.
-  EXPECT_TRUE(notMatches("void x(int &I) { I += 1; }", Matcher));
-}
-
-TEST(MatchBinaryOperator, HasLHSAndHasRHS) {
-  StatementMatcher OperatorTrueFalse =
-    binaryOperator(hasLHS(cxxBoolLiteral(equals(true))),
-                   hasRHS(cxxBoolLiteral(equals(false))));
-
-  EXPECT_TRUE(matches("void x() { true || false; }", OperatorTrueFalse));
-  EXPECT_TRUE(matches("void x() { true && false; }", OperatorTrueFalse));
-  EXPECT_TRUE(notMatches("void x() { false || true; }", OperatorTrueFalse));
-
-  StatementMatcher OperatorIntPointer = arraySubscriptExpr(
-      hasLHS(hasType(isInteger())),
-      traverse(TK_AsIs, hasRHS(hasType(pointsTo(qualType())))));
-  EXPECT_TRUE(matches("void x() { 1[\"abc\"]; }", OperatorIntPointer));
-  EXPECT_TRUE(notMatches("void x() { \"abc\"[1]; }", OperatorIntPointer));
-
-  StringRef Code = R"cpp(
-struct HasOpEqMem
-{
-    bool operator==(const HasOpEqMem& other) const
-    {
-        return true;
-    }
-};
-
-struct HasOpFree
-{
-};
-bool operator==(const HasOpFree& lhs, const HasOpFree& rhs)
-{
-    return true;
-}
-
-void opMem()
-{
-    HasOpEqMem s1;
-    HasOpEqMem s2;
-    if (s1 == s2)
-        return;
-}
-
-void opFree()
-{
-    HasOpFree s1;
-    HasOpFree s2;
-    if (s1 == s2)
-        return;
-}
-)cpp";
-  auto s1Expr = declRefExpr(to(varDecl(hasName("s1"))));
-  auto s2Expr = declRefExpr(to(varDecl(hasName("s2"))));
-  EXPECT_TRUE(matches(
-      Code,
-      traverse(TK_IgnoreUnlessSpelledInSource,
-               cxxOperatorCallExpr(forFunction(functionDecl(hasName("opMem"))),
-                                   hasOperatorName("=="), hasLHS(s1Expr),
-                                   hasRHS(s2Expr)))));
-  EXPECT_TRUE(matches(
-      Code, traverse(TK_IgnoreUnlessSpelledInSource,
-                     cxxOperatorCallExpr(
-                         forFunction(functionDecl(hasName("opMem"))),
-                         hasAnyOperatorName("!=", "=="), hasLHS(s1Expr)))));
-  EXPECT_TRUE(matches(
-      Code, traverse(TK_IgnoreUnlessSpelledInSource,
-                     cxxOperatorCallExpr(
-                         forFunction(functionDecl(hasName("opMem"))),
-                         hasOperatorName("=="), hasOperands(s1Expr, s2Expr)))));
-  EXPECT_TRUE(matches(
-      Code, traverse(TK_IgnoreUnlessSpelledInSource,
-                     cxxOperatorCallExpr(
-                         forFunction(functionDecl(hasName("opMem"))),
-                         hasOperatorName("=="), hasEitherOperand(s2Expr)))));
-
-  EXPECT_TRUE(matches(
-      Code,
-      traverse(TK_IgnoreUnlessSpelledInSource,
-               cxxOperatorCallExpr(forFunction(functionDecl(hasName("opFree"))),
-                                   hasOperatorName("=="), hasLHS(s1Expr),
-                                   hasRHS(s2Expr)))));
-  EXPECT_TRUE(matches(
-      Code, traverse(TK_IgnoreUnlessSpelledInSource,
-                     cxxOperatorCallExpr(
-                         forFunction(functionDecl(hasName("opFree"))),
-                         hasAnyOperatorName("!=", "=="), hasLHS(s1Expr)))));
-  EXPECT_TRUE(matches(
-      Code, traverse(TK_IgnoreUnlessSpelledInSource,
-                     cxxOperatorCallExpr(
-                         forFunction(functionDecl(hasName("opFree"))),
-                         hasOperatorName("=="), hasOperands(s1Expr, s2Expr)))));
-  EXPECT_TRUE(matches(
-      Code, traverse(TK_IgnoreUnlessSpelledInSource,
-                     cxxOperatorCallExpr(
-                         forFunction(functionDecl(hasName("opFree"))),
-                         hasOperatorName("=="), hasEitherOperand(s2Expr)))));
-}
-
-TEST(MatchBinaryOperator, HasEitherOperand) {
-  StatementMatcher HasOperand =
-    binaryOperator(hasEitherOperand(cxxBoolLiteral(equals(false))));
-
-  EXPECT_TRUE(matches("void x() { true || false; }", HasOperand));
-  EXPECT_TRUE(matches("void x() { false && true; }", HasOperand));
-  EXPECT_TRUE(notMatches("void x() { true || true; }", HasOperand));
-}
-
-TEST(MatchBinaryOperator, HasOperands) {
-  StatementMatcher HasOperands = binaryOperator(
-      hasOperands(integerLiteral(equals(1)), integerLiteral(equals(2))));
-  EXPECT_TRUE(matches("void x() { 1 + 2; }", HasOperands));
-  EXPECT_TRUE(matches("void x() { 2 + 1; }", HasOperands));
-  EXPECT_TRUE(notMatches("void x() { 1 + 1; }", HasOperands));
-  EXPECT_TRUE(notMatches("void x() { 2 + 2; }", HasOperands));
-  EXPECT_TRUE(notMatches("void x() { 0 + 0; }", HasOperands));
-  EXPECT_TRUE(notMatches("void x() { 0 + 1; }", HasOperands));
-}
-
-TEST(Matcher, BinaryOperatorTypes) {
-  // Integration test that verifies the AST provides all binary operators in
-  // a way we expect.
-  // FIXME: Operator ','
-  EXPECT_TRUE(
-    matches("void x() { 3, 4; }", binaryOperator(hasOperatorName(","))));
-  EXPECT_TRUE(
-    matches("bool b; bool c = (b = true);",
-            binaryOperator(hasOperatorName("="))));
-  EXPECT_TRUE(
-    matches("bool b = 1 != 2;", binaryOperator(hasOperatorName("!="))));
-  EXPECT_TRUE(
-    matches("bool b = 1 == 2;", binaryOperator(hasOperatorName("=="))));
-  EXPECT_TRUE(matches("bool b = 1 < 2;", binaryOperator(hasOperatorName("<"))));
-  EXPECT_TRUE(
-    matches("bool b = 1 <= 2;", binaryOperator(hasOperatorName("<="))));
-  EXPECT_TRUE(
-    matches("int i = 1 << 2;", binaryOperator(hasOperatorName("<<"))));
-  EXPECT_TRUE(
-    matches("int i = 1; int j = (i <<= 2);",
-            binaryOperator(hasOperatorName("<<="))));
-  EXPECT_TRUE(matches("bool b = 1 > 2;", binaryOperator(hasOperatorName(">"))));
-  EXPECT_TRUE(
-    matches("bool b = 1 >= 2;", binaryOperator(hasOperatorName(">="))));
-  EXPECT_TRUE(
-    matches("int i = 1 >> 2;", binaryOperator(hasOperatorName(">>"))));
-  EXPECT_TRUE(
-    matches("int i = 1; int j = (i >>= 2);",
-            binaryOperator(hasOperatorName(">>="))));
-  EXPECT_TRUE(
-    matches("int i = 42 ^ 23;", binaryOperator(hasOperatorName("^"))));
-  EXPECT_TRUE(
-    matches("int i = 42; int j = (i ^= 42);",
-            binaryOperator(hasOperatorName("^="))));
-  EXPECT_TRUE(
-    matches("int i = 42 % 23;", binaryOperator(hasOperatorName("%"))));
-  EXPECT_TRUE(
-    matches("int i = 42; int j = (i %= 42);",
-            binaryOperator(hasOperatorName("%="))));
-  EXPECT_TRUE(
-    matches("bool b = 42  &23;", binaryOperator(hasOperatorName("&"))));
-  EXPECT_TRUE(
-    matches("bool b = true && false;",
-            binaryOperator(hasOperatorName("&&"))));
-  EXPECT_TRUE(
-    matches("bool b = true; bool c = (b &= false);",
-            binaryOperator(hasOperatorName("&="))));
-  EXPECT_TRUE(
-    matches("bool b = 42 | 23;", binaryOperator(hasOperatorName("|"))));
-  EXPECT_TRUE(
-    matches("bool b = true || false;",
-            binaryOperator(hasOperatorName("||"))));
-  EXPECT_TRUE(
-    matches("bool b = true; bool c = (b |= false);",
-            binaryOperator(hasOperatorName("|="))));
-  EXPECT_TRUE(
-    matches("int i = 42  *23;", binaryOperator(hasOperatorName("*"))));
-  EXPECT_TRUE(
-    matches("int i = 42; int j = (i *= 23);",
-            binaryOperator(hasOperatorName("*="))));
-  EXPECT_TRUE(
-    matches("int i = 42 / 23;", binaryOperator(hasOperatorName("/"))));
-  EXPECT_TRUE(
-    matches("int i = 42; int j = (i /= 23);",
-            binaryOperator(hasOperatorName("/="))));
-  EXPECT_TRUE(
-    matches("int i = 42 + 23;", binaryOperator(hasOperatorName("+"))));
-  EXPECT_TRUE(
-    matches("int i = 42; int j = (i += 23);",
-            binaryOperator(hasOperatorName("+="))));
-  EXPECT_TRUE(
-    matches("int i = 42 - 23;", binaryOperator(hasOperatorName("-"))));
-  EXPECT_TRUE(
-    matches("int i = 42; int j = (i -= 23);",
-            binaryOperator(hasOperatorName("-="))));
-  EXPECT_TRUE(
-    matches("struct A { void x() { void (A::*a)(); (this->*a)(); } };",
-            binaryOperator(hasOperatorName("->*"))));
-  EXPECT_TRUE(
-    matches("struct A { void x() { void (A::*a)(); ((*this).*a)(); } };",
-            binaryOperator(hasOperatorName(".*"))));
-
-  // Member expressions as operators are not supported in matches.
-  EXPECT_TRUE(
-    notMatches("struct A { void x(A *a) { a->x(this); } };",
-               binaryOperator(hasOperatorName("->"))));
-
-  // Initializer assignments are not represented as operator equals.
-  EXPECT_TRUE(
-    notMatches("bool b = true;", binaryOperator(hasOperatorName("="))));
-
-  // Array indexing is not represented as operator.
-  EXPECT_TRUE(notMatches("int a[42]; void x() { a[23]; }", unaryOperator()));
-
-  // Overloaded operators do not match at all.
-  EXPECT_TRUE(notMatches(
-    "struct A { bool operator&&(const A &a) const { return false; } };"
-      "void x() { A a, b; a && b; }",
-    binaryOperator()));
-}
-
-TEST(MatchUnaryOperator, HasOperatorName) {
-  StatementMatcher OperatorNot = unaryOperator(hasOperatorName("!"));
-
-  EXPECT_TRUE(matches("void x() { !true; } ", OperatorNot));
-  EXPECT_TRUE(notMatches("void x() { true; } ", OperatorNot));
-}
-
-TEST(MatchUnaryOperator, HasAnyOperatorName) {
-  StatementMatcher Matcher = unaryOperator(hasAnyOperatorName("-", "*", "++"));
-
-  EXPECT_TRUE(matches("int x(int *I) { return *I; }", Matcher));
-  EXPECT_TRUE(matches("int x(int I) { return -I; }", Matcher));
-  EXPECT_TRUE(matches("void x(int &I) { I++; }", Matcher));
-  EXPECT_TRUE(matches("void x(int &I) { ++I; }", Matcher));
-  EXPECT_TRUE(notMatches("void x(int &I) { I--; }", Matcher));
-  EXPECT_TRUE(notMatches("void x(int &I) { --I; }", Matcher));
-  EXPECT_TRUE(notMatches("int *x(int &I) { return &I; }", Matcher));
-}
-
-TEST(MatchUnaryOperator, HasUnaryOperand) {
-  StatementMatcher OperatorOnFalse =
-    unaryOperator(hasUnaryOperand(cxxBoolLiteral(equals(false))));
-
-  EXPECT_TRUE(matches("void x() { !false; }", OperatorOnFalse));
-  EXPECT_TRUE(notMatches("void x() { !true; }", OperatorOnFalse));
-
-  StringRef Code = R"cpp(
-struct HasOpBangMem
-{
-    bool operator!() const
-    {
-        return false;
-    }
-};
-struct HasOpBangFree
-{
-};
-bool operator!(HasOpBangFree const&)
-{
-    return false;
-}
-
-void opMem()
-{
-    HasOpBangMem s1;
-    if (!s1)
-        return;
-}
-void opFree()
-{
-    HasOpBangFree s1;
-    if (!s1)
-        return;
-}
-)cpp";
-  auto s1Expr = declRefExpr(to(varDecl(hasName("s1"))));
-  EXPECT_TRUE(matches(
-      Code, traverse(TK_IgnoreUnlessSpelledInSource,
-                     cxxOperatorCallExpr(
-                         forFunction(functionDecl(hasName("opMem"))),
-                         hasOperatorName("!"), hasUnaryOperand(s1Expr)))));
-  EXPECT_TRUE(matches(
-      Code,
-      traverse(TK_IgnoreUnlessSpelledInSource,
-               cxxOperatorCallExpr(forFunction(functionDecl(hasName("opMem"))),
-                                   hasAnyOperatorName("+", "!"),
-                                   hasUnaryOperand(s1Expr)))));
-
-  EXPECT_TRUE(matches(
-      Code, traverse(TK_IgnoreUnlessSpelledInSource,
-                     cxxOperatorCallExpr(
-                         forFunction(functionDecl(hasName("opFree"))),
-                         hasOperatorName("!"), hasUnaryOperand(s1Expr)))));
-  EXPECT_TRUE(matches(
-      Code,
-      traverse(TK_IgnoreUnlessSpelledInSource,
-               cxxOperatorCallExpr(forFunction(functionDecl(hasName("opFree"))),
-                                   hasAnyOperatorName("+", "!"),
-                                   hasUnaryOperand(s1Expr)))));
-
-  Code = R"cpp(
-struct HasIncOperatorsMem
-{
-    HasIncOperatorsMem& operator++();
-    HasIncOperatorsMem operator++(int);
-};
-struct HasIncOperatorsFree
-{
-};
-HasIncOperatorsFree& operator++(HasIncOperatorsFree&);
-HasIncOperatorsFree operator++(HasIncOperatorsFree&, int);
-
-void prefixIncOperatorMem()
-{
-    HasIncOperatorsMem s1;
-    ++s1;
-}
-void prefixIncOperatorFree()
-{
-    HasIncOperatorsFree s1;
-    ++s1;
-}
-void postfixIncOperatorMem()
-{
-    HasIncOperatorsMem s1;
-    s1++;
-}
-void postfixIncOperatorFree()
-{
-    HasIncOperatorsFree s1;
-    s1++;
-}
-
-struct HasOpPlusInt
-{
-    HasOpPlusInt& operator+(int);
-};
-void plusIntOperator()
-{
-    HasOpPlusInt s1;
-    s1+1;
-}
-)cpp";
-
-  EXPECT_TRUE(matches(
-      Code,
-      traverse(TK_IgnoreUnlessSpelledInSource,
-               cxxOperatorCallExpr(
-                   forFunction(functionDecl(hasName("prefixIncOperatorMem"))),
-                   hasOperatorName("++"), hasUnaryOperand(declRefExpr())))));
-
-  EXPECT_TRUE(matches(
-      Code,
-      traverse(TK_IgnoreUnlessSpelledInSource,
-               cxxOperatorCallExpr(
-                   forFunction(functionDecl(hasName("prefixIncOperatorFree"))),
-                   hasOperatorName("++"), hasUnaryOperand(declRefExpr())))));
-
-  EXPECT_TRUE(matches(
-      Code,
-      traverse(TK_IgnoreUnlessSpelledInSource,
-               cxxOperatorCallExpr(
-                   forFunction(functionDecl(hasName("postfixIncOperatorMem"))),
-                   hasOperatorName("++"), hasUnaryOperand(declRefExpr())))));
-
-  EXPECT_TRUE(matches(
-      Code,
-      traverse(TK_IgnoreUnlessSpelledInSource,
-               cxxOperatorCallExpr(
-                   forFunction(functionDecl(hasName("postfixIncOperatorFree"))),
-                   hasOperatorName("++"), hasUnaryOperand(declRefExpr())))));
-
-  EXPECT_FALSE(matches(
-      Code, traverse(TK_IgnoreUnlessSpelledInSource,
-                     cxxOperatorCallExpr(
-                         forFunction(functionDecl(hasName("plusIntOperator"))),
-                         hasOperatorName("+"), hasUnaryOperand(expr())))));
-
-  Code = R"cpp(
-struct HasOpArrow
-{
-    int& operator*();
-};
-void foo()
-{
-    HasOpArrow s1;
-    *s1;
-}
-)cpp";
-
-  EXPECT_TRUE(
-      matches(Code, traverse(TK_IgnoreUnlessSpelledInSource,
-                             cxxOperatorCallExpr(hasOperatorName("*"),
-                                                 hasUnaryOperand(expr())))));
-}
-
-TEST(Matcher, UnaryOperatorTypes) {
-  // Integration test that verifies the AST provides all unary operators in
-  // a way we expect.
-  EXPECT_TRUE(matches("bool b = !true;", unaryOperator(hasOperatorName("!"))));
-  EXPECT_TRUE(
-    matches("bool b; bool *p = &b;", unaryOperator(hasOperatorName("&"))));
-  EXPECT_TRUE(matches("int i = ~ 1;", unaryOperator(hasOperatorName("~"))));
-  EXPECT_TRUE(
-    matches("bool *p; bool b = *p;", unaryOperator(hasOperatorName("*"))));
-  EXPECT_TRUE(
-    matches("int i; int j = +i;", unaryOperator(hasOperatorName("+"))));
-  EXPECT_TRUE(
-    matches("int i; int j = -i;", unaryOperator(hasOperatorName("-"))));
-  EXPECT_TRUE(
-    matches("int i; int j = ++i;", unaryOperator(hasOperatorName("++"))));
-  EXPECT_TRUE(
-    matches("int i; int j = i++;", unaryOperator(hasOperatorName("++"))));
-  EXPECT_TRUE(
-    matches("int i; int j = --i;", unaryOperator(hasOperatorName("--"))));
-  EXPECT_TRUE(
-    matches("int i; int j = i--;", unaryOperator(hasOperatorName("--"))));
-
-  // We don't match conversion operators.
-  EXPECT_TRUE(notMatches("int i; double d = (double)i;", unaryOperator()));
-
-  // Function calls are not represented as operator.
-  EXPECT_TRUE(notMatches("void f(); void x() { f(); }", unaryOperator()));
-
-  // Overloaded operators do not match at all.
-  // FIXME: We probably want to add that.
-  EXPECT_TRUE(notMatches(
-    "struct A { bool operator!() const { return false; } };"
-      "void x() { A a; !a; }", unaryOperator(hasOperatorName("!"))));
-}
-
-TEST(ArraySubscriptMatchers, ArrayIndex) {
-  EXPECT_TRUE(matches(
-    "int i[2]; void f() { i[1] = 1; }",
-    arraySubscriptExpr(hasIndex(integerLiteral(equals(1))))));
-  EXPECT_TRUE(matches(
-    "int i[2]; void f() { 1[i] = 1; }",
-    arraySubscriptExpr(hasIndex(integerLiteral(equals(1))))));
-  EXPECT_TRUE(notMatches(
-    "int i[2]; void f() { i[1] = 1; }",
-    arraySubscriptExpr(hasIndex(integerLiteral(equals(0))))));
-}
-
-TEST(ArraySubscriptMatchers, MatchesArrayBase) {
-  EXPECT_TRUE(
-      matches("int i[2]; void f() { i[1] = 2; }",
-              traverse(TK_AsIs, arraySubscriptExpr(hasBase(implicitCastExpr(
-                                    hasSourceExpression(declRefExpr())))))));
-}
-
-TEST(Matcher, OfClass) {
-  StatementMatcher Constructor = cxxConstructExpr(hasDeclaration(cxxMethodDecl(
-    ofClass(hasName("X")))));
-
-  EXPECT_TRUE(
-    matches("class X { public: X(); }; void x(int) { X x; }", Constructor));
-  EXPECT_TRUE(
-    matches("class X { public: X(); }; void x(int) { X x = X(); }",
-            Constructor));
-  EXPECT_TRUE(
-    notMatches("class Y { public: Y(); }; void x(int) { Y y; }",
-               Constructor));
-}
-
-TEST(Matcher, VisitsTemplateInstantiations) {
-  EXPECT_TRUE(matches(
-    "class A { public: void x(); };"
-      "template <typename T> class B { public: void y() { T t; t.x(); } };"
-      "void f() { B<A> b; b.y(); }",
-    callExpr(callee(cxxMethodDecl(hasName("x"))))));
-
-  EXPECT_TRUE(matches(
-    "class A { public: void x(); };"
-      "class C {"
-      " public:"
-      "  template <typename T> class B { public: void y() { T t; t.x(); } };"
-      "};"
-      "void f() {"
-      "  C::B<A> b; b.y();"
-      "}",
-    recordDecl(hasName("C"), hasDescendant(callExpr(
-      callee(cxxMethodDecl(hasName("x"))))))));
-}
-
-TEST(Matcher, HasCondition) {
-  StatementMatcher IfStmt =
-    ifStmt(hasCondition(cxxBoolLiteral(equals(true))));
-  EXPECT_TRUE(matches("void x() { if (true) {} }", IfStmt));
-  EXPECT_TRUE(notMatches("void x() { if (false) {} }", IfStmt));
-
-  StatementMatcher ForStmt =
-    forStmt(hasCondition(cxxBoolLiteral(equals(true))));
-  EXPECT_TRUE(matches("void x() { for (;true;) {} }", ForStmt));
-  EXPECT_TRUE(notMatches("void x() { for (;false;) {} }", ForStmt));
-
-  StatementMatcher WhileStmt =
-    whileStmt(hasCondition(cxxBoolLiteral(equals(true))));
-  EXPECT_TRUE(matches("void x() { while (true) {} }", WhileStmt));
-  EXPECT_TRUE(notMatches("void x() { while (false) {} }", WhileStmt));
-
-  StatementMatcher SwitchStmt =
-    switchStmt(hasCondition(integerLiteral(equals(42))));
-  EXPECT_TRUE(matches("void x() { switch (42) {case 42:;} }", SwitchStmt));
-  EXPECT_TRUE(notMatches("void x() { switch (43) {case 43:;} }", SwitchStmt));
-}
-
-TEST(For, ForLoopInternals) {
-  EXPECT_TRUE(matches("void f(){ int i; for (; i < 3 ; ); }",
-                      forStmt(hasCondition(anything()))));
-  EXPECT_TRUE(matches("void f() { for (int i = 0; ;); }",
-                      forStmt(hasLoopInit(anything()))));
-}
-
-TEST(For, ForRangeLoopInternals) {
-  EXPECT_TRUE(matches("void f(){ int a[] {1, 2}; for (int i : a); }",
-                      cxxForRangeStmt(hasLoopVariable(anything()))));
-  EXPECT_TRUE(matches(
-    "void f(){ int a[] {1, 2}; for (int i : a); }",
-    cxxForRangeStmt(hasRangeInit(declRefExpr(to(varDecl(hasName("a"))))))));
-}
-
-TEST(For, NegativeForLoopInternals) {
-  EXPECT_TRUE(notMatches("void f(){ for (int i = 0; ; ++i); }",
-                         forStmt(hasCondition(expr()))));
-  EXPECT_TRUE(notMatches("void f() {int i; for (; i < 4; ++i) {} }",
-                         forStmt(hasLoopInit(anything()))));
-}
-
-TEST(HasBody, FindsBodyOfForWhileDoLoops) {
-  EXPECT_TRUE(matches("void f() { for(;;) {} }",
-                      forStmt(hasBody(compoundStmt()))));
-  EXPECT_TRUE(notMatches("void f() { for(;;); }",
-                         forStmt(hasBody(compoundStmt()))));
-  EXPECT_TRUE(matches("void f() { while(true) {} }",
-                      whileStmt(hasBody(compoundStmt()))));
-  EXPECT_TRUE(matches("void f() { do {} while(true); }",
-                      doStmt(hasBody(compoundStmt()))));
-  EXPECT_TRUE(matches("void f() { int p[2]; for (auto x : p) {} }",
-                      cxxForRangeStmt(hasBody(compoundStmt()))));
-}
-
-TEST(HasBody, FindsBodyOfFunctions) {
-  EXPECT_TRUE(matches("void f() {}", functionDecl(hasBody(compoundStmt()))));
-  EXPECT_TRUE(notMatches("void f();", functionDecl(hasBody(compoundStmt()))));
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-      "void f(); void f() {}",
-      functionDecl(hasBody(compoundStmt())).bind("func"),
-      std::make_unique<VerifyIdIsBoundTo<FunctionDecl>>("func", 1)));
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-      "class C { void f(); }; void C::f() {}",
-      cxxMethodDecl(hasBody(compoundStmt())).bind("met"),
-      std::make_unique<VerifyIdIsBoundTo<CXXMethodDecl>>("met", 1)));
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-      "class C { C(); }; C::C() {}",
-      cxxConstructorDecl(hasBody(compoundStmt())).bind("ctr"),
-      std::make_unique<VerifyIdIsBoundTo<CXXConstructorDecl>>("ctr", 1)));
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-      "class C { ~C(); }; C::~C() {}",
-      cxxDestructorDecl(hasBody(compoundStmt())).bind("dtr"),
-      std::make_unique<VerifyIdIsBoundTo<CXXDestructorDecl>>("dtr", 1)));
-}
-
-TEST(HasAnyBody, FindsAnyBodyOfFunctions) {
-  EXPECT_TRUE(matches("void f() {}", functionDecl(hasAnyBody(compoundStmt()))));
-  EXPECT_TRUE(notMatches("void f();",
-                         functionDecl(hasAnyBody(compoundStmt()))));
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-      "void f(); void f() {}",
-      functionDecl(hasAnyBody(compoundStmt())).bind("func"),
-      std::make_unique<VerifyIdIsBoundTo<FunctionDecl>>("func", 2)));
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-      "class C { void f(); }; void C::f() {}",
-      cxxMethodDecl(hasAnyBody(compoundStmt())).bind("met"),
-      std::make_unique<VerifyIdIsBoundTo<CXXMethodDecl>>("met", 2)));
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-      "class C { C(); }; C::C() {}",
-      cxxConstructorDecl(hasAnyBody(compoundStmt())).bind("ctr"),
-      std::make_unique<VerifyIdIsBoundTo<CXXConstructorDecl>>("ctr", 2)));
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-      "class C { ~C(); }; C::~C() {}",
-      cxxDestructorDecl(hasAnyBody(compoundStmt())).bind("dtr"),
-      std::make_unique<VerifyIdIsBoundTo<CXXDestructorDecl>>("dtr", 2)));
-}
-
-TEST(HasAnySubstatement, MatchesForTopLevelCompoundStatement) {
-  // The simplest case: every compound statement is in a function
-  // definition, and the function body itself must be a compound
-  // statement.
-  EXPECT_TRUE(matches("void f() { for (;;); }",
-                      compoundStmt(hasAnySubstatement(forStmt()))));
-}
-
-TEST(HasAnySubstatement, IsNotRecursive) {
-  // It's really "has any immediate substatement".
-  EXPECT_TRUE(notMatches("void f() { if (true) for (;;); }",
-                         compoundStmt(hasAnySubstatement(forStmt()))));
-}
-
-TEST(HasAnySubstatement, MatchesInNestedCompoundStatements) {
-  EXPECT_TRUE(matches("void f() { if (true) { for (;;); } }",
-                      compoundStmt(hasAnySubstatement(forStmt()))));
-}
-
-TEST(HasAnySubstatement, FindsSubstatementBetweenOthers) {
-  EXPECT_TRUE(matches("void f() { 1; 2; 3; for (;;); 4; 5; 6; }",
-                      compoundStmt(hasAnySubstatement(forStmt()))));
-}
-
-TEST(Member, MatchesMemberAllocationFunction) {
-  // Fails in C++11 mode
-  EXPECT_TRUE(matchesConditionally(
-      "namespace std { typedef typeof(sizeof(int)) size_t; }"
-      "class X { void *operator new(std::size_t); };",
-      cxxMethodDecl(ofClass(hasName("X"))), true, {"-std=gnu++03"}));
-
-  EXPECT_TRUE(matches("class X { void operator delete(void*); };",
-                      cxxMethodDecl(ofClass(hasName("X")))));
-
-  // Fails in C++11 mode
-  EXPECT_TRUE(matchesConditionally(
-      "namespace std { typedef typeof(sizeof(int)) size_t; }"
-      "class X { void operator delete[](void*, std::size_t); };",
-      cxxMethodDecl(ofClass(hasName("X"))), true, {"-std=gnu++03"}));
-}
-
-TEST(HasDestinationType, MatchesSimpleCase) {
-  EXPECT_TRUE(matches("char* p = static_cast<char*>(0);",
-                      cxxStaticCastExpr(hasDestinationType(
-                        pointsTo(TypeMatcher(anything()))))));
-}
-
-TEST(HasImplicitDestinationType, MatchesSimpleCase) {
-  // This test creates an implicit const cast.
-  EXPECT_TRUE(matches(
-      "int x; const int i = x;",
-      traverse(TK_AsIs,
-               implicitCastExpr(hasImplicitDestinationType(isInteger())))));
-  // This test creates an implicit array-to-pointer cast.
-  EXPECT_TRUE(
-      matches("int arr[3]; int *p = arr;",
-              traverse(TK_AsIs, implicitCastExpr(hasImplicitDestinationType(
-                                    pointsTo(TypeMatcher(anything())))))));
-}
-
-TEST(HasImplicitDestinationType, DoesNotMatchIncorrectly) {
-  // This test creates an implicit cast from int to char.
-  EXPECT_TRUE(notMatches("char c = 0;",
-                         implicitCastExpr(hasImplicitDestinationType(
-                           unless(anything())))));
-  // This test creates an implicit array-to-pointer cast.
-  EXPECT_TRUE(notMatches("int arr[3]; int *p = arr;",
-                         implicitCastExpr(hasImplicitDestinationType(
-                           unless(anything())))));
-}
-
-TEST(Matcher, IgnoresElidableConstructors) {
-  EXPECT_TRUE(
-      matches("struct H {};"
-              "template<typename T> H B(T A);"
-              "void f() {"
-              "  H D1;"
-              "  D1 = B(B(1));"
-              "}",
-              cxxOperatorCallExpr(hasArgument(
-                  1, callExpr(hasArgument(
-                         0, ignoringElidableConstructorCall(callExpr()))))),
-              langCxx11OrLater()));
-  EXPECT_TRUE(
-      matches("struct H {};"
-              "template<typename T> H B(T A);"
-              "void f() {"
-              "  H D1;"
-              "  D1 = B(1);"
-              "}",
-              cxxOperatorCallExpr(hasArgument(
-                  1, callExpr(hasArgument(0, ignoringElidableConstructorCall(
-                                                 integerLiteral()))))),
-              langCxx11OrLater()));
-  EXPECT_TRUE(matches(
-      "struct H {};"
-      "H G();"
-      "void f() {"
-      "  H D = G();"
-      "}",
-      varDecl(hasInitializer(anyOf(
-          ignoringElidableConstructorCall(callExpr()),
-          exprWithCleanups(has(ignoringElidableConstructorCall(callExpr())))))),
-      langCxx11OrLater()));
-}
-
-TEST(Matcher, IgnoresElidableInReturn) {
-  auto matcher = expr(ignoringElidableConstructorCall(declRefExpr()));
-  EXPECT_TRUE(matches("struct H {};"
-                      "H f() {"
-                      "  H g;"
-                      "  return g;"
-                      "}",
-                      matcher, langCxx11OrLater()));
-  EXPECT_TRUE(notMatches("struct H {};"
-                         "H f() {"
-                         "  return H();"
-                         "}",
-                         matcher, langCxx11OrLater()));
-}
-
-TEST(Matcher, IgnoreElidableConstructorDoesNotMatchConstructors) {
-  EXPECT_TRUE(matches("struct H {};"
-                      "void f() {"
-                      "  H D;"
-                      "}",
-                      varDecl(hasInitializer(
-                          ignoringElidableConstructorCall(cxxConstructExpr()))),
-                      langCxx11OrLater()));
-}
-
-TEST(Matcher, IgnoresElidableDoesNotPreventMatches) {
-  EXPECT_TRUE(matches("void f() {"
-                      "  int D = 10;"
-                      "}",
-                      expr(ignoringElidableConstructorCall(integerLiteral())),
-                      langCxx11OrLater()));
-}
-
-TEST(Matcher, IgnoresElidableInVarInit) {
-  auto matcher =
-      varDecl(hasInitializer(ignoringElidableConstructorCall(callExpr())));
-  EXPECT_TRUE(matches("struct H {};"
-                      "H G();"
-                      "void f(H D = G()) {"
-                      "  return;"
-                      "}",
-                      matcher, langCxx11OrLater()));
-  EXPECT_TRUE(matches("struct H {};"
-                      "H G();"
-                      "void f() {"
-                      "  H D = G();"
-                      "}",
-                      matcher, langCxx11OrLater()));
-}
-
-TEST(IgnoringImplicit, MatchesImplicit) {
-  EXPECT_TRUE(matches("class C {}; C a = C();",
-                      varDecl(has(ignoringImplicit(cxxConstructExpr())))));
-}
-
-TEST(IgnoringImplicit, MatchesNestedImplicit) {
-  StringRef Code = R"(
-
-struct OtherType;
-
-struct SomeType
-{
-    SomeType() {}
-    SomeType(const OtherType&) {}
-    SomeType& operator=(OtherType const&) { return *this; }
-};
-
-struct OtherType
-{
-    OtherType() {}
-    ~OtherType() {}
-};
-
-OtherType something()
-{
-    return {};
-}
-
-int main()
-{
-    SomeType i = something();
-}
-)";
-  EXPECT_TRUE(matches(
-      Code,
-      traverse(TK_AsIs,
-               varDecl(hasName("i"),
-                       hasInitializer(exprWithCleanups(has(cxxConstructExpr(
-                           has(expr(ignoringImplicit(cxxConstructExpr(has(
-                               expr(ignoringImplicit(callExpr())))))))))))))));
-}
-
-TEST(IgnoringImplicit, DoesNotMatchIncorrectly) {
-  EXPECT_TRUE(notMatches("class C {}; C a = C();",
-                         traverse(TK_AsIs, varDecl(has(cxxConstructExpr())))));
-}
-
-TEST(Traversal, traverseMatcher) {
-
-  StringRef VarDeclCode = R"cpp(
-void foo()
-{
-  int i = 3.0;
-}
-)cpp";
-
-  auto Matcher = varDecl(hasInitializer(floatLiteral()));
-
-  EXPECT_TRUE(notMatches(VarDeclCode, traverse(TK_AsIs, Matcher)));
-  EXPECT_TRUE(
-      matches(VarDeclCode, traverse(TK_IgnoreUnlessSpelledInSource, Matcher)));
-
-  auto ParentMatcher = floatLiteral(hasParent(varDecl(hasName("i"))));
-
-  EXPECT_TRUE(notMatches(VarDeclCode, traverse(TK_AsIs, ParentMatcher)));
-  EXPECT_TRUE(matches(VarDeclCode,
-                      traverse(TK_IgnoreUnlessSpelledInSource, ParentMatcher)));
-
-  EXPECT_TRUE(matches(
-      VarDeclCode, decl(traverse(TK_AsIs, anyOf(cxxRecordDecl(), varDecl())))));
-
-  EXPECT_TRUE(
-      matches(VarDeclCode,
-              floatLiteral(traverse(TK_AsIs, hasParent(implicitCastExpr())))));
-
-  EXPECT_TRUE(
-      matches(VarDeclCode, floatLiteral(traverse(TK_IgnoreUnlessSpelledInSource,
-                                                 hasParent(varDecl())))));
-
-  EXPECT_TRUE(
-      matches(VarDeclCode, varDecl(traverse(TK_IgnoreUnlessSpelledInSource,
-                                            unless(parmVarDecl())))));
-
-  EXPECT_TRUE(
-      notMatches(VarDeclCode, varDecl(traverse(TK_IgnoreUnlessSpelledInSource,
-                                               has(implicitCastExpr())))));
-
-  EXPECT_TRUE(matches(VarDeclCode,
-                      varDecl(traverse(TK_AsIs, has(implicitCastExpr())))));
-
-  EXPECT_TRUE(matches(
-      VarDeclCode, traverse(TK_IgnoreUnlessSpelledInSource,
-                            // The has() below strips away the ImplicitCastExpr
-                            // before the traverse(AsIs) gets to process it.
-                            varDecl(has(traverse(TK_AsIs, floatLiteral()))))));
-
-  EXPECT_TRUE(
-      matches(VarDeclCode, functionDecl(traverse(TK_AsIs, hasName("foo")))));
-
-  EXPECT_TRUE(matches(
-      VarDeclCode,
-      functionDecl(traverse(TK_IgnoreUnlessSpelledInSource, hasName("foo")))));
-
-  EXPECT_TRUE(matches(
-      VarDeclCode, functionDecl(traverse(TK_AsIs, hasAnyName("foo", "bar")))));
-
-  EXPECT_TRUE(
-      matches(VarDeclCode, functionDecl(traverse(TK_IgnoreUnlessSpelledInSource,
-                                                 hasAnyName("foo", "bar")))));
-
-  StringRef Code = R"cpp(
-void foo(int a)
-{
-  int i = 3.0 + a;
-}
-void bar()
-{
-  foo(7.0);
-}
-)cpp";
-  EXPECT_TRUE(
-      matches(Code, callExpr(traverse(TK_IgnoreUnlessSpelledInSource,
-                                      hasArgument(0, floatLiteral())))));
-
-  EXPECT_TRUE(
-      matches(Code, callExpr(traverse(TK_IgnoreUnlessSpelledInSource,
-                                      hasAnyArgument(floatLiteral())))));
-
-  EXPECT_TRUE(matches(
-      R"cpp(
-void takesBool(bool){}
-
-template <typename T>
-void neverInstantiatedTemplate() {
-  takesBool(T{});
-}
-)cpp",
-      traverse(TK_IgnoreUnlessSpelledInSource,
-               callExpr(unless(callExpr(hasDeclaration(functionDecl())))))));
-
-  EXPECT_TRUE(
-      matches(VarDeclCode, varDecl(traverse(TK_IgnoreUnlessSpelledInSource,
-                                            hasType(builtinType())))));
-
-  EXPECT_TRUE(
-      matches(VarDeclCode,
-              functionDecl(hasName("foo"),
-                           traverse(TK_AsIs, hasDescendant(floatLiteral())))));
-
-  EXPECT_TRUE(notMatches(
-      Code, traverse(TK_AsIs, floatLiteral(hasParent(callExpr(
-                                  callee(functionDecl(hasName("foo")))))))));
-  EXPECT_TRUE(matches(Code, traverse(TK_IgnoreUnlessSpelledInSource,
-                                     floatLiteral(hasParent(callExpr(callee(
-                                         functionDecl(hasName("foo")))))))));
-
-  Code = R"cpp(
-void foo()
-{
-  int i = (3);
-}
-)cpp";
-  EXPECT_TRUE(matches(
-      Code, traverse(TK_IgnoreUnlessSpelledInSource,
-                     varDecl(hasInitializer(integerLiteral(equals(3)))))));
-  EXPECT_TRUE(matches(
-      Code,
-      traverse(TK_IgnoreUnlessSpelledInSource,
-               integerLiteral(equals(3), hasParent(varDecl(hasName("i")))))));
-
-  Code = R"cpp(
-const char *SomeString{"str"};
-)cpp";
-  EXPECT_TRUE(
-      matches(Code, traverse(TK_AsIs, stringLiteral(hasParent(implicitCastExpr(
-                                          hasParent(initListExpr())))))));
-  EXPECT_TRUE(
-      matches(Code, traverse(TK_IgnoreUnlessSpelledInSource,
-                             stringLiteral(hasParent(initListExpr())))));
-
-  Code = R"cpp(
-struct String
-{
-    String(const char*, int = -1) {}
-};
-
-void stringConstruct()
-{
-    String s = "foo";
-    s = "bar";
-}
-)cpp";
-  EXPECT_TRUE(matches(
-      Code,
-      traverse(
-          TK_AsIs,
-          functionDecl(
-              hasName("stringConstruct"),
-              hasDescendant(varDecl(
-                  hasName("s"),
-                  hasInitializer(ignoringImplicit(cxxConstructExpr(hasArgument(
-                      0, ignoringImplicit(cxxConstructExpr(hasArgument(
-                             0, ignoringImplicit(stringLiteral()))))))))))))));
-
-  EXPECT_TRUE(matches(
-      Code,
-      traverse(
-          TK_AsIs,
-          functionDecl(hasName("stringConstruct"),
-                       hasDescendant(cxxOperatorCallExpr(
-                           isAssignmentOperator(),
-                           hasArgument(1, ignoringImplicit(
-                            cxxConstructExpr(hasArgument(
-                               0, ignoringImplicit(stringLiteral())))))
-                           ))))));
-
-  EXPECT_TRUE(matches(
-      Code, traverse(TK_IgnoreUnlessSpelledInSource,
-                     functionDecl(hasName("stringConstruct"),
-                                  hasDescendant(varDecl(
-                                      hasName("s"),
-                                      hasInitializer(stringLiteral())))))));
-
-  EXPECT_TRUE(
-      matches(Code, traverse(TK_IgnoreUnlessSpelledInSource,
-                             functionDecl(hasName("stringConstruct"),
-                                          hasDescendant(cxxOperatorCallExpr(
-                                              isAssignmentOperator(),
-                                              hasArgument(1, stringLiteral())))))));
-
-  Code = R"cpp(
-
-struct C1 {};
-struct C2 { operator C1(); };
-
-void conversionOperator()
-{
-    C2* c2;
-    C1 c1 = (*c2);
-}
-
-)cpp";
-  EXPECT_TRUE(matches(
-      Code,
-      traverse(
-          TK_AsIs,
-          functionDecl(
-              hasName("conversionOperator"),
-              hasDescendant(
-                  varDecl(
-                      hasName("c1"),
-                      hasInitializer(
-                          ignoringImplicit(cxxConstructExpr(hasArgument(
-                              0, ignoringImplicit(
-                                     cxxMemberCallExpr(onImplicitObjectArgument(
-                                         ignoringParenImpCasts(unaryOperator(
-                                             hasOperatorName("*")))))))))))
-                      .bind("c1"))))));
-
-  EXPECT_TRUE(matches(
-      Code,
-      traverse(TK_IgnoreUnlessSpelledInSource,
-               functionDecl(hasName("conversionOperator"),
-                            hasDescendant(varDecl(
-                                hasName("c1"), hasInitializer(unaryOperator(
-                                                   hasOperatorName("*")))))))));
-
-  Code = R"cpp(
-
-template <unsigned alignment>
-void template_test() {
-  static_assert(alignment, "");
-}
-void actual_template_test() {
-  template_test<4>();
-}
-
-)cpp";
-  EXPECT_TRUE(matches(
-      Code,
-      traverse(TK_AsIs,
-               staticAssertDecl(has(implicitCastExpr(has(
-                   substNonTypeTemplateParmExpr(has(integerLiteral())))))))));
-  EXPECT_TRUE(matches(
-      Code, traverse(TK_IgnoreUnlessSpelledInSource,
-                     staticAssertDecl(has(declRefExpr(
-                         to(nonTypeTemplateParmDecl(hasName("alignment"))),
-                         hasType(asString("unsigned int"))))))));
-
-  EXPECT_TRUE(matches(Code, traverse(TK_AsIs, staticAssertDecl(hasDescendant(
-                                                  integerLiteral())))));
-  EXPECT_FALSE(matches(
-      Code, traverse(TK_IgnoreUnlessSpelledInSource,
-                     staticAssertDecl(hasDescendant(integerLiteral())))));
-
-  Code = R"cpp(
-
-struct OneParamCtor {
-  explicit OneParamCtor(int);
-};
-struct TwoParamCtor {
-  explicit TwoParamCtor(int, int);
-};
-
-void varDeclCtors() {
-  {
-  auto var1 = OneParamCtor(5);
-  auto var2 = TwoParamCtor(6, 7);
-  }
-  {
-  OneParamCtor var3(5);
-  TwoParamCtor var4(6, 7);
-  }
-  int i = 0;
-  {
-  auto var5 = OneParamCtor(i);
-  auto var6 = TwoParamCtor(i, 7);
-  }
-  {
-  OneParamCtor var7(i);
-  TwoParamCtor var8(i, 7);
-  }
-}
-
-)cpp";
-  EXPECT_TRUE(matches(
-      Code,
-      traverse(TK_AsIs, varDecl(hasName("var1"), hasInitializer(hasDescendant(
-                                                     cxxConstructExpr()))))));
-  EXPECT_TRUE(matches(
-      Code,
-      traverse(TK_AsIs, varDecl(hasName("var2"), hasInitializer(hasDescendant(
-                                                     cxxConstructExpr()))))));
-  EXPECT_TRUE(matches(
-      Code, traverse(TK_AsIs, varDecl(hasName("var3"),
-                                      hasInitializer(cxxConstructExpr())))));
-  EXPECT_TRUE(matches(
-      Code, traverse(TK_AsIs, varDecl(hasName("var4"),
-                                      hasInitializer(cxxConstructExpr())))));
-  EXPECT_TRUE(matches(
-      Code,
-      traverse(TK_AsIs, varDecl(hasName("var5"), hasInitializer(hasDescendant(
-                                                     cxxConstructExpr()))))));
-  EXPECT_TRUE(matches(
-      Code,
-      traverse(TK_AsIs, varDecl(hasName("var6"), hasInitializer(hasDescendant(
-                                                     cxxConstructExpr()))))));
-  EXPECT_TRUE(matches(
-      Code, traverse(TK_AsIs, varDecl(hasName("var7"),
-                                      hasInitializer(cxxConstructExpr())))));
-  EXPECT_TRUE(matches(
-      Code, traverse(TK_AsIs, varDecl(hasName("var8"),
-                                      hasInitializer(cxxConstructExpr())))));
-
-  EXPECT_TRUE(matches(
-      Code,
-      traverse(TK_IgnoreUnlessSpelledInSource,
-               varDecl(hasName("var1"), hasInitializer(cxxConstructExpr())))));
-  EXPECT_TRUE(matches(
-      Code,
-      traverse(TK_IgnoreUnlessSpelledInSource,
-               varDecl(hasName("var2"), hasInitializer(cxxConstructExpr())))));
-  EXPECT_TRUE(matches(
-      Code,
-      traverse(TK_IgnoreUnlessSpelledInSource,
-               varDecl(hasName("var3"), hasInitializer(cxxConstructExpr())))));
-  EXPECT_TRUE(matches(
-      Code,
-      traverse(TK_IgnoreUnlessSpelledInSource,
-               varDecl(hasName("var4"), hasInitializer(cxxConstructExpr())))));
-  EXPECT_TRUE(matches(
-      Code,
-      traverse(TK_IgnoreUnlessSpelledInSource,
-               varDecl(hasName("var5"), hasInitializer(cxxConstructExpr())))));
-  EXPECT_TRUE(matches(
-      Code,
-      traverse(TK_IgnoreUnlessSpelledInSource,
-               varDecl(hasName("var6"), hasInitializer(cxxConstructExpr())))));
-  EXPECT_TRUE(matches(
-      Code,
-      traverse(TK_IgnoreUnlessSpelledInSource,
-               varDecl(hasName("var7"), hasInitializer(cxxConstructExpr())))));
-  EXPECT_TRUE(matches(
-      Code,
-      traverse(TK_IgnoreUnlessSpelledInSource,
-               varDecl(hasName("var8"), hasInitializer(cxxConstructExpr())))));
-
-  Code = R"cpp(
-
-template<typename T>
-struct TemplStruct {
-  TemplStruct() {}
-  ~TemplStruct() {}
-
-  void outOfLine(T);
-
-private:
-  T m_t;
-};
-
-template<typename T>
-void TemplStruct<T>::outOfLine(T)
-{
-
-}
-
-template<typename T>
-T timesTwo(T input)
-{
-  return input * 2;
-}
-
-void instantiate()
-{
-  TemplStruct<int> ti;
-  TemplStruct<double> td;
-  (void)timesTwo<int>(2);
-  (void)timesTwo<double>(2);
-}
-
-template class TemplStruct<float>;
-
-extern template class TemplStruct<long>;
-
-template<> class TemplStruct<bool> {
-  TemplStruct() {}
-  ~TemplStruct() {}
-
-  void boolSpecializationMethodOnly() {}
-private:
-  bool m_t;
-};
-
-template float timesTwo(float);
-template<> bool timesTwo<bool>(bool){
-  return true;
-}
-)cpp";
-  {
-    auto M = cxxRecordDecl(hasName("TemplStruct"),
-                           has(fieldDecl(hasType(asString("int")))));
-    EXPECT_TRUE(matches(Code, traverse(TK_AsIs, M)));
-    EXPECT_FALSE(matches(Code, traverse(TK_IgnoreUnlessSpelledInSource, M)));
-  }
-  {
-    auto M = cxxRecordDecl(hasName("TemplStruct"),
-                           has(fieldDecl(hasType(asString("double")))));
-    EXPECT_TRUE(matches(Code, traverse(TK_AsIs, M)));
-    EXPECT_FALSE(matches(Code, traverse(TK_IgnoreUnlessSpelledInSource, M)));
-  }
-  {
-    auto M =
-        functionDecl(hasName("timesTwo"),
-                     hasParameter(0, parmVarDecl(hasType(asString("int")))));
-    EXPECT_TRUE(matches(Code, traverse(TK_AsIs, M)));
-    EXPECT_FALSE(matches(Code, traverse(TK_IgnoreUnlessSpelledInSource, M)));
-  }
-  {
-    auto M =
-        functionDecl(hasName("timesTwo"),
-                     hasParameter(0, parmVarDecl(hasType(asString("double")))));
-    EXPECT_TRUE(matches(Code, traverse(TK_AsIs, M)));
-    EXPECT_FALSE(matches(Code, traverse(TK_IgnoreUnlessSpelledInSource, M)));
-  }
-  {
-    // Match on the integer literal in the explicit instantiation:
-    auto MDef =
-        functionDecl(hasName("timesTwo"),
-                     hasParameter(0, parmVarDecl(hasType(asString("float")))),
-                     hasDescendant(integerLiteral(equals(2))));
-    EXPECT_TRUE(matches(Code, traverse(TK_AsIs, MDef)));
-    EXPECT_FALSE(matches(Code, traverse(TK_IgnoreUnlessSpelledInSource, MDef)));
-
-    auto MTempl =
-        functionDecl(hasName("timesTwo"),
-                     hasTemplateArgument(0, refersToType(asString("float"))));
-    EXPECT_TRUE(matches(Code, traverse(TK_AsIs, MTempl)));
-    // TODO: If we could match on explicit instantiations of function templates,
-    // this would be EXPECT_TRUE. See Sema::ActOnExplicitInstantiation.
-    EXPECT_FALSE(
-        matches(Code, traverse(TK_IgnoreUnlessSpelledInSource, MTempl)));
-  }
-  {
-    auto M = functionDecl(hasName("timesTwo"),
-                          hasParameter(0, parmVarDecl(hasType(booleanType()))));
-    EXPECT_TRUE(matches(Code, traverse(TK_AsIs, M)));
-    EXPECT_TRUE(matches(Code, traverse(TK_IgnoreUnlessSpelledInSource, M)));
-  }
-  {
-    // Match on the field within the explicit instantiation:
-    auto MRecord = cxxRecordDecl(hasName("TemplStruct"),
-                                 has(fieldDecl(hasType(asString("float")))));
-    EXPECT_TRUE(matches(Code, traverse(TK_AsIs, MRecord)));
-    EXPECT_FALSE(
-        matches(Code, traverse(TK_IgnoreUnlessSpelledInSource, MRecord)));
-
-    // Match on the explicit template instantiation itself:
-    auto MTempl = classTemplateSpecializationDecl(
-        hasName("TemplStruct"),
-        hasTemplateArgument(0,
-                            templateArgument(refersToType(asString("float")))));
-    EXPECT_TRUE(matches(Code, traverse(TK_AsIs, MTempl)));
-    EXPECT_TRUE(
-        matches(Code, traverse(TK_IgnoreUnlessSpelledInSource, MTempl)));
-  }
-  {
-    // The template argument is matchable, but the instantiation is not:
-    auto M = classTemplateSpecializationDecl(
-        hasName("TemplStruct"),
-        hasTemplateArgument(0,
-                            templateArgument(refersToType(asString("float")))),
-        has(cxxConstructorDecl(hasName("TemplStruct"))));
-    EXPECT_TRUE(matches(Code, traverse(TK_AsIs, M)));
-    EXPECT_FALSE(matches(Code, traverse(TK_IgnoreUnlessSpelledInSource, M)));
-  }
-  {
-    // The template argument is matchable, but the instantiation is not:
-    auto M = classTemplateSpecializationDecl(
-        hasName("TemplStruct"),
-        hasTemplateArgument(0,
-                            templateArgument(refersToType(asString("long")))),
-        has(cxxConstructorDecl(hasName("TemplStruct"))));
-    EXPECT_TRUE(matches(Code, traverse(TK_AsIs, M)));
-    EXPECT_FALSE(matches(Code, traverse(TK_IgnoreUnlessSpelledInSource, M)));
-  }
-  {
-    // Instantiated, out-of-line methods are not matchable.
-    auto M =
-        cxxMethodDecl(hasName("outOfLine"), isDefinition(),
-                      hasParameter(0, parmVarDecl(hasType(asString("float")))));
-    EXPECT_TRUE(matches(Code, traverse(TK_AsIs, M)));
-    EXPECT_FALSE(matches(Code, traverse(TK_IgnoreUnlessSpelledInSource, M)));
-  }
-  {
-    // Explicit specialization is written in source and it matches:
-    auto M = classTemplateSpecializationDecl(
-        hasName("TemplStruct"),
-        hasTemplateArgument(0, templateArgument(refersToType(booleanType()))),
-        has(cxxConstructorDecl(hasName("TemplStruct"))),
-        has(cxxMethodDecl(hasName("boolSpecializationMethodOnly"))));
-    EXPECT_TRUE(matches(Code, traverse(TK_AsIs, M)));
-    EXPECT_TRUE(matches(Code, traverse(TK_IgnoreUnlessSpelledInSource, M)));
-  }
-
-  Code = R"cpp(
-struct B {
-  B(int);
-};
-
-B func1() { return 42; }
-  )cpp";
-  {
-    auto M = expr(ignoringImplicit(integerLiteral(equals(42)).bind("intLit")));
-    EXPECT_TRUE(matchAndVerifyResultTrue(
-        Code, traverse(TK_AsIs, M),
-        std::make_unique<VerifyIdIsBoundTo<Expr>>("intLit", 1)));
-    EXPECT_TRUE(matchAndVerifyResultTrue(
-        Code, traverse(TK_IgnoreUnlessSpelledInSource, M),
-        std::make_unique<VerifyIdIsBoundTo<Expr>>("intLit", 1)));
-  }
-  {
-    auto M = expr(unless(integerLiteral(equals(24)))).bind("intLit");
-    EXPECT_TRUE(matchAndVerifyResultTrue(
-        Code, traverse(TK_AsIs, M),
-        std::make_unique<VerifyIdIsBoundTo<Expr>>("intLit", 7)));
-    EXPECT_TRUE(matchAndVerifyResultTrue(
-        Code, traverse(TK_IgnoreUnlessSpelledInSource, M),
-        std::make_unique<VerifyIdIsBoundTo<Expr>>("intLit", 1)));
-  }
-  {
-    auto M =
-        expr(anyOf(integerLiteral(equals(42)).bind("intLit"), unless(expr())));
-    EXPECT_TRUE(matchAndVerifyResultTrue(
-        Code, traverse(TK_AsIs, M),
-        std::make_unique<VerifyIdIsBoundTo<Expr>>("intLit", 1)));
-    EXPECT_TRUE(matchAndVerifyResultTrue(
-        Code, traverse(TK_IgnoreUnlessSpelledInSource, M),
-        std::make_unique<VerifyIdIsBoundTo<Expr>>("intLit", 1)));
-  }
-  {
-    auto M = expr(allOf(integerLiteral(equals(42)).bind("intLit"), expr()));
-    EXPECT_TRUE(matchAndVerifyResultTrue(
-        Code, traverse(TK_AsIs, M),
-        std::make_unique<VerifyIdIsBoundTo<Expr>>("intLit", 1)));
-    EXPECT_TRUE(matchAndVerifyResultTrue(
-        Code, traverse(TK_IgnoreUnlessSpelledInSource, M),
-        std::make_unique<VerifyIdIsBoundTo<Expr>>("intLit", 1)));
-  }
-  {
-    auto M = expr(integerLiteral(equals(42)).bind("intLit"), expr());
-    EXPECT_TRUE(matchAndVerifyResultTrue(
-        Code, traverse(TK_AsIs, M),
-        std::make_unique<VerifyIdIsBoundTo<Expr>>("intLit", 1)));
-    EXPECT_TRUE(matchAndVerifyResultTrue(
-        Code, traverse(TK_IgnoreUnlessSpelledInSource, M),
-        std::make_unique<VerifyIdIsBoundTo<Expr>>("intLit", 1)));
-  }
-  {
-    auto M = expr(optionally(integerLiteral(equals(42)).bind("intLit")));
-    EXPECT_TRUE(matchAndVerifyResultTrue(
-        Code, traverse(TK_AsIs, M),
-        std::make_unique<VerifyIdIsBoundTo<Expr>>("intLit", 1)));
-    EXPECT_TRUE(matchAndVerifyResultTrue(
-        Code, traverse(TK_IgnoreUnlessSpelledInSource, M),
-        std::make_unique<VerifyIdIsBoundTo<Expr>>("intLit", 1)));
-  }
-  {
-    auto M = expr().bind("allExprs");
-    EXPECT_TRUE(matchAndVerifyResultTrue(
-        Code, traverse(TK_AsIs, M),
-        std::make_unique<VerifyIdIsBoundTo<Expr>>("allExprs", 7)));
-    EXPECT_TRUE(matchAndVerifyResultTrue(
-        Code, traverse(TK_IgnoreUnlessSpelledInSource, M),
-        std::make_unique<VerifyIdIsBoundTo<Expr>>("allExprs", 1)));
-  }
-
-  Code = R"cpp(
-void foo()
-{
-    int arr[3];
-    auto &[f, s, t] = arr;
-
-    f = 42;
-}
-  )cpp";
-  {
-    auto M = bindingDecl(hasName("f"));
-    EXPECT_TRUE(
-        matchesConditionally(Code, traverse(TK_AsIs, M), true, {"-std=c++17"}));
-    EXPECT_TRUE(
-        matchesConditionally(Code, traverse(TK_IgnoreUnlessSpelledInSource, M),
-                             true, {"-std=c++17"}));
-  }
-  {
-    auto M = bindingDecl(hasName("f"), has(expr()));
-    EXPECT_TRUE(
-        matchesConditionally(Code, traverse(TK_AsIs, M), true, {"-std=c++17"}));
-    EXPECT_FALSE(
-        matchesConditionally(Code, traverse(TK_IgnoreUnlessSpelledInSource, M),
-                             true, {"-std=c++17"}));
-  }
-  {
-    auto M = integerLiteral(hasAncestor(bindingDecl(hasName("f"))));
-    EXPECT_TRUE(
-        matchesConditionally(Code, traverse(TK_AsIs, M), true, {"-std=c++17"}));
-    EXPECT_FALSE(
-        matchesConditionally(Code, traverse(TK_IgnoreUnlessSpelledInSource, M),
-                             true, {"-std=c++17"}));
-  }
-  {
-    auto M = declRefExpr(hasAncestor(bindingDecl(hasName("f"))));
-    EXPECT_TRUE(
-        matchesConditionally(Code, traverse(TK_AsIs, M), true, {"-std=c++17"}));
-    EXPECT_FALSE(
-        matchesConditionally(Code, traverse(TK_IgnoreUnlessSpelledInSource, M),
-                             true, {"-std=c++17"}));
-  }
-}
-
-TEST(Traversal, traverseNoImplicit) {
-  StringRef Code = R"cpp(
-struct NonTrivial {
-    NonTrivial() {}
-    NonTrivial(const NonTrivial&) {}
-    NonTrivial& operator=(const NonTrivial&) { return *this; }
-
-    ~NonTrivial() {}
-};
-
-struct NoSpecialMethods {
-    NonTrivial nt;
-};
-
-struct ContainsArray {
-    NonTrivial arr[2];
-    ContainsArray& operator=(const ContainsArray &other) = default;
-};
-
-void copyIt()
-{
-    NoSpecialMethods nc1;
-    NoSpecialMethods nc2(nc1);
-    nc2 = nc1;
-
-    ContainsArray ca;
-    ContainsArray ca2;
-    ca2 = ca;
-}
-
-struct HasCtorInits : NoSpecialMethods, NonTrivial
-{
-  int m_i;
-  NonTrivial m_nt;
-  HasCtorInits() : NoSpecialMethods(), m_i(42) {}
-};
-
-struct CtorInitsNonTrivial : NonTrivial
-{
-  int m_i;
-  NonTrivial m_nt;
-  CtorInitsNonTrivial() : NonTrivial(), m_i(42) {}
-};
-
-)cpp";
-  {
-    auto M = cxxRecordDecl(hasName("NoSpecialMethods"),
-                           has(cxxRecordDecl(hasName("NoSpecialMethods"))));
-    EXPECT_TRUE(matches(Code, traverse(TK_AsIs, M)));
-    EXPECT_FALSE(matches(Code, traverse(TK_IgnoreUnlessSpelledInSource, M)));
-
-    M = cxxRecordDecl(hasName("NoSpecialMethods"),
-                      has(cxxConstructorDecl(isCopyConstructor())));
-    EXPECT_TRUE(matches(Code, traverse(TK_AsIs, M)));
-    EXPECT_FALSE(matches(Code, traverse(TK_IgnoreUnlessSpelledInSource, M)));
-
-    M = cxxRecordDecl(hasName("NoSpecialMethods"),
-                      has(cxxMethodDecl(isCopyAssignmentOperator())));
-    EXPECT_TRUE(matches(Code, traverse(TK_AsIs, M)));
-    EXPECT_FALSE(matches(Code, traverse(TK_IgnoreUnlessSpelledInSource, M)));
-
-    M = cxxRecordDecl(hasName("NoSpecialMethods"),
-                      has(cxxConstructorDecl(isDefaultConstructor())));
-    EXPECT_TRUE(matches(Code, traverse(TK_AsIs, M)));
-    EXPECT_FALSE(matches(Code, traverse(TK_IgnoreUnlessSpelledInSource, M)));
-
-    M = cxxRecordDecl(hasName("NoSpecialMethods"), has(cxxDestructorDecl()));
-    EXPECT_TRUE(matches(Code, traverse(TK_AsIs, M)));
-    EXPECT_FALSE(matches(Code, traverse(TK_IgnoreUnlessSpelledInSource, M)));
-
-    M = cxxRecordDecl(hasName("NoSpecialMethods"),
-                      hasMethod(cxxConstructorDecl(isCopyConstructor())));
-    EXPECT_TRUE(matches(Code, traverse(TK_AsIs, M)));
-    EXPECT_FALSE(matches(Code, traverse(TK_IgnoreUnlessSpelledInSource, M)));
-
-    M = cxxRecordDecl(hasName("NoSpecialMethods"),
-                      hasMethod(cxxMethodDecl(isCopyAssignmentOperator())));
-    EXPECT_TRUE(matches(Code, traverse(TK_AsIs, M)));
-    EXPECT_FALSE(matches(Code, traverse(TK_IgnoreUnlessSpelledInSource, M)));
-
-    M = cxxRecordDecl(hasName("NoSpecialMethods"),
-                      hasMethod(cxxConstructorDecl(isDefaultConstructor())));
-    EXPECT_TRUE(matches(Code, traverse(TK_AsIs, M)));
-    EXPECT_FALSE(matches(Code, traverse(TK_IgnoreUnlessSpelledInSource, M)));
-
-    M = cxxRecordDecl(hasName("NoSpecialMethods"),
-                      hasMethod(cxxDestructorDecl()));
-    EXPECT_TRUE(matches(Code, traverse(TK_AsIs, M)));
-    EXPECT_FALSE(matches(Code, traverse(TK_IgnoreUnlessSpelledInSource, M)));
-  }
-  {
-    // Because the copy-assignment operator is not spelled in the
-    // source (ie, isImplicit()), we don't match it
-    auto M =
-        cxxOperatorCallExpr(hasType(cxxRecordDecl(hasName("NoSpecialMethods"))),
-                            callee(cxxMethodDecl(isCopyAssignmentOperator())));
-    EXPECT_TRUE(matches(Code, traverse(TK_AsIs, M)));
-    EXPECT_FALSE(matches(Code, traverse(TK_IgnoreUnlessSpelledInSource, M)));
-  }
-  {
-    // Compiler generates a forStmt to copy the array
-    EXPECT_TRUE(matches(Code, traverse(TK_AsIs, forStmt())));
-    EXPECT_FALSE(
-        matches(Code, traverse(TK_IgnoreUnlessSpelledInSource, forStmt())));
-  }
-  {
-    // The defaulted method declaration can be matched, but not its
-    // definition, in IgnoreUnlessSpelledInSource mode
-    auto MDecl = cxxMethodDecl(ofClass(cxxRecordDecl(hasName("ContainsArray"))),
-                               isCopyAssignmentOperator(), isDefaulted());
-
-    EXPECT_TRUE(matches(Code, traverse(TK_AsIs, MDecl)));
-    EXPECT_TRUE(matches(Code, traverse(TK_IgnoreUnlessSpelledInSource, MDecl)));
-
-    auto MDef = cxxMethodDecl(MDecl, has(compoundStmt()));
-
-    EXPECT_TRUE(matches(Code, traverse(TK_AsIs, MDef)));
-    EXPECT_FALSE(matches(Code, traverse(TK_IgnoreUnlessSpelledInSource, MDef)));
-
-    auto MBody = cxxMethodDecl(MDecl, hasBody(compoundStmt()));
-
-    EXPECT_TRUE(matches(Code, traverse(TK_AsIs, MBody)));
-    EXPECT_FALSE(
-        matches(Code, traverse(TK_IgnoreUnlessSpelledInSource, MBody)));
-
-    auto MIsDefn = cxxMethodDecl(MDecl, isDefinition());
-
-    EXPECT_TRUE(matches(Code, traverse(TK_AsIs, MIsDefn)));
-    EXPECT_TRUE(
-        matches(Code, traverse(TK_IgnoreUnlessSpelledInSource, MIsDefn)));
-
-    auto MIsInline = cxxMethodDecl(MDecl, isInline());
-
-    EXPECT_FALSE(matches(Code, traverse(TK_AsIs, MIsInline)));
-    EXPECT_FALSE(
-        matches(Code, traverse(TK_IgnoreUnlessSpelledInSource, MIsInline)));
-
-    // The parameter of the defaulted method can still be matched.
-    auto MParm =
-        cxxMethodDecl(MDecl, hasParameter(0, parmVarDecl(hasName("other"))));
-
-    EXPECT_TRUE(matches(Code, traverse(TK_AsIs, MParm)));
-    EXPECT_TRUE(matches(Code, traverse(TK_IgnoreUnlessSpelledInSource, MParm)));
-  }
-  {
-    auto M =
-        cxxConstructorDecl(hasName("HasCtorInits"),
-                           has(cxxCtorInitializer(forField(hasName("m_i")))));
-    EXPECT_TRUE(matches(Code, traverse(TK_AsIs, M)));
-    EXPECT_TRUE(matches(Code, traverse(TK_IgnoreUnlessSpelledInSource, M)));
-  }
-  {
-    auto M =
-        cxxConstructorDecl(hasName("HasCtorInits"),
-                           has(cxxCtorInitializer(forField(hasName("m_nt")))));
-    EXPECT_TRUE(matches(Code, traverse(TK_AsIs, M)));
-    EXPECT_FALSE(matches(Code, traverse(TK_IgnoreUnlessSpelledInSource, M)));
-  }
-  {
-    auto M = cxxConstructorDecl(hasName("HasCtorInits"),
-                                hasAnyConstructorInitializer(cxxCtorInitializer(
-                                    forField(hasName("m_nt")))));
-    EXPECT_TRUE(matches(Code, traverse(TK_AsIs, M)));
-    EXPECT_FALSE(matches(Code, traverse(TK_IgnoreUnlessSpelledInSource, M)));
-  }
-  {
-    auto M =
-        cxxConstructorDecl(hasName("HasCtorInits"),
-                           forEachConstructorInitializer(
-                               cxxCtorInitializer(forField(hasName("m_nt")))));
-    EXPECT_TRUE(matches(Code, traverse(TK_AsIs, M)));
-    EXPECT_FALSE(matches(Code, traverse(TK_IgnoreUnlessSpelledInSource, M)));
-  }
-  {
-    auto M = cxxConstructorDecl(
-        hasName("CtorInitsNonTrivial"),
-        has(cxxCtorInitializer(withInitializer(cxxConstructExpr(
-            hasDeclaration(cxxConstructorDecl(hasName("NonTrivial"))))))));
-    EXPECT_TRUE(matches(Code, traverse(TK_AsIs, M)));
-    EXPECT_TRUE(matches(Code, traverse(TK_IgnoreUnlessSpelledInSource, M)));
-  }
-  {
-    auto M = cxxConstructorDecl(
-        hasName("HasCtorInits"),
-        has(cxxCtorInitializer(withInitializer(cxxConstructExpr(hasDeclaration(
-            cxxConstructorDecl(hasName("NoSpecialMethods"))))))));
-    EXPECT_TRUE(matches(Code, traverse(TK_AsIs, M)));
-    EXPECT_FALSE(matches(Code, traverse(TK_IgnoreUnlessSpelledInSource, M)));
-  }
-  {
-    auto M = cxxCtorInitializer(forField(hasName("m_nt")));
-    EXPECT_TRUE(matches(Code, traverse(TK_AsIs, M)));
-    EXPECT_FALSE(matches(Code, traverse(TK_IgnoreUnlessSpelledInSource, M)));
-  }
-
-  Code = R"cpp(
-  void rangeFor()
-  {
-    int arr[2];
-    for (auto i : arr)
-    {
-      if (true)
-      {
-      }
-    }
-  }
-  )cpp";
-  {
-    auto M = cxxForRangeStmt(has(binaryOperator(hasOperatorName("!="))));
-    EXPECT_TRUE(matches(Code, traverse(TK_AsIs, M)));
-    EXPECT_FALSE(matches(Code, traverse(TK_IgnoreUnlessSpelledInSource, M)));
-  }
-  {
-    auto M =
-        cxxForRangeStmt(hasDescendant(binaryOperator(hasOperatorName("+"))));
-    EXPECT_TRUE(matches(Code, traverse(TK_AsIs, M)));
-    EXPECT_FALSE(matches(Code, traverse(TK_IgnoreUnlessSpelledInSource, M)));
-  }
-  {
-    auto M =
-        cxxForRangeStmt(hasDescendant(unaryOperator(hasOperatorName("++"))));
-    EXPECT_TRUE(matches(Code, traverse(TK_AsIs, M)));
-    EXPECT_FALSE(matches(Code, traverse(TK_IgnoreUnlessSpelledInSource, M)));
-  }
-  {
-    auto M = cxxForRangeStmt(has(declStmt()));
-    EXPECT_TRUE(matches(Code, traverse(TK_AsIs, M)));
-    EXPECT_FALSE(matches(Code, traverse(TK_IgnoreUnlessSpelledInSource, M)));
-  }
-  {
-    auto M =
-        cxxForRangeStmt(hasLoopVariable(varDecl(hasName("i"))),
-                        hasRangeInit(declRefExpr(to(varDecl(hasName("arr"))))));
-    EXPECT_TRUE(matches(Code, traverse(TK_AsIs, M)));
-    EXPECT_TRUE(matches(Code, traverse(TK_IgnoreUnlessSpelledInSource, M)));
-  }
-  {
-    auto M = cxxForRangeStmt(unless(hasInitStatement(stmt())));
-    EXPECT_TRUE(matches(Code, traverse(TK_AsIs, M)));
-    EXPECT_TRUE(matches(Code, traverse(TK_IgnoreUnlessSpelledInSource, M)));
-  }
-  {
-    auto M = cxxForRangeStmt(hasBody(stmt()));
-    EXPECT_TRUE(matches(Code, traverse(TK_AsIs, M)));
-    EXPECT_TRUE(matches(Code, traverse(TK_IgnoreUnlessSpelledInSource, M)));
-  }
-  {
-    auto M = cxxForRangeStmt(hasDescendant(ifStmt()));
-    EXPECT_TRUE(matches(Code, traverse(TK_AsIs, M)));
-    EXPECT_TRUE(matches(Code, traverse(TK_IgnoreUnlessSpelledInSource, M)));
-  }
-  {
-    EXPECT_TRUE(matches(
-        Code, traverse(TK_AsIs, cxxForRangeStmt(has(declStmt(
-                                    hasSingleDecl(varDecl(hasName("i")))))))));
-    EXPECT_TRUE(
-        matches(Code, traverse(TK_IgnoreUnlessSpelledInSource,
-                               cxxForRangeStmt(has(varDecl(hasName("i")))))));
-  }
-  {
-    EXPECT_TRUE(matches(
-        Code, traverse(TK_AsIs, cxxForRangeStmt(has(declStmt(hasSingleDecl(
-                                    varDecl(hasInitializer(declRefExpr(
-                                        to(varDecl(hasName("arr")))))))))))));
-    EXPECT_TRUE(matches(Code, traverse(TK_IgnoreUnlessSpelledInSource,
-                                       cxxForRangeStmt(has(declRefExpr(
-                                           to(varDecl(hasName("arr")))))))));
-  }
-  {
-    auto M = cxxForRangeStmt(has(compoundStmt()));
-    EXPECT_TRUE(matches(Code, traverse(TK_AsIs, M)));
-    EXPECT_TRUE(matches(Code, traverse(TK_IgnoreUnlessSpelledInSource, M)));
-  }
-  {
-    auto M = binaryOperator(hasOperatorName("!="));
-    EXPECT_TRUE(matches(Code, traverse(TK_AsIs, M)));
-    EXPECT_FALSE(matches(Code, traverse(TK_IgnoreUnlessSpelledInSource, M)));
-  }
-  {
-    auto M = unaryOperator(hasOperatorName("++"));
-    EXPECT_TRUE(matches(Code, traverse(TK_AsIs, M)));
-    EXPECT_FALSE(matches(Code, traverse(TK_IgnoreUnlessSpelledInSource, M)));
-  }
-  {
-    auto M = declStmt(hasSingleDecl(varDecl(matchesName("__range"))));
-    EXPECT_TRUE(matches(Code, traverse(TK_AsIs, M)));
-    EXPECT_FALSE(matches(Code, traverse(TK_IgnoreUnlessSpelledInSource, M)));
-  }
-  {
-    auto M = declStmt(hasSingleDecl(varDecl(matchesName("__begin"))));
-    EXPECT_TRUE(matches(Code, traverse(TK_AsIs, M)));
-    EXPECT_FALSE(matches(Code, traverse(TK_IgnoreUnlessSpelledInSource, M)));
-  }
-  {
-    auto M = declStmt(hasSingleDecl(varDecl(matchesName("__end"))));
-    EXPECT_TRUE(matches(Code, traverse(TK_AsIs, M)));
-    EXPECT_FALSE(matches(Code, traverse(TK_IgnoreUnlessSpelledInSource, M)));
-  }
-  {
-    auto M = ifStmt(hasParent(compoundStmt(hasParent(cxxForRangeStmt()))));
-    EXPECT_TRUE(matches(Code, traverse(TK_AsIs, M)));
-    EXPECT_TRUE(matches(Code, traverse(TK_IgnoreUnlessSpelledInSource, M)));
-  }
-  {
-    auto M = cxxForRangeStmt(
-        has(varDecl(hasName("i"), hasParent(cxxForRangeStmt()))));
-    EXPECT_FALSE(matches(Code, traverse(TK_AsIs, M)));
-    EXPECT_TRUE(matches(Code, traverse(TK_IgnoreUnlessSpelledInSource, M)));
-  }
-  {
-    auto M = cxxForRangeStmt(hasDescendant(varDecl(
-        hasName("i"), hasParent(declStmt(hasParent(cxxForRangeStmt()))))));
-    EXPECT_TRUE(matches(Code, traverse(TK_AsIs, M)));
-    EXPECT_FALSE(matches(Code, traverse(TK_IgnoreUnlessSpelledInSource, M)));
-  }
-  {
-    auto M = cxxForRangeStmt(hasRangeInit(declRefExpr(
-        to(varDecl(hasName("arr"))), hasParent(cxxForRangeStmt()))));
-    EXPECT_FALSE(matches(Code, traverse(TK_AsIs, M)));
-    EXPECT_TRUE(matches(Code, traverse(TK_IgnoreUnlessSpelledInSource, M)));
-  }
-
-  {
-    auto M = cxxForRangeStmt(hasRangeInit(declRefExpr(
-        to(varDecl(hasName("arr"))), hasParent(varDecl(hasParent(declStmt(
-                                         hasParent(cxxForRangeStmt()))))))));
-    EXPECT_TRUE(matches(Code, traverse(TK_AsIs, M)));
-    EXPECT_FALSE(matches(Code, traverse(TK_IgnoreUnlessSpelledInSource, M)));
-  }
-
-  Code = R"cpp(
-  struct Range {
-    int* begin() const;
-    int* end() const;
-  };
-  Range getRange(int);
-
-  void rangeFor()
-  {
-    for (auto i : getRange(42))
-    {
-    }
-  }
-  )cpp";
-  {
-    auto M = integerLiteral(equals(42));
-    EXPECT_TRUE(matches(Code, traverse(TK_AsIs, M)));
-    EXPECT_TRUE(matches(Code, traverse(TK_IgnoreUnlessSpelledInSource, M)));
-  }
-  {
-    auto M = callExpr(hasDescendant(integerLiteral(equals(42))));
-    EXPECT_TRUE(matches(Code, traverse(TK_AsIs, M)));
-    EXPECT_TRUE(matches(Code, traverse(TK_IgnoreUnlessSpelledInSource, M)));
-  }
-  {
-    auto M = compoundStmt(hasDescendant(integerLiteral(equals(42))));
-    EXPECT_TRUE(matches(Code, traverse(TK_AsIs, M)));
-    EXPECT_TRUE(matches(Code, traverse(TK_IgnoreUnlessSpelledInSource, M)));
-  }
-
-  Code = R"cpp(
-  void rangeFor()
-  {
-    int arr[2];
-    for (auto& a = arr; auto i : a)
-    {
-
-    }
-  }
-  )cpp";
-  {
-    auto M = cxxForRangeStmt(has(binaryOperator(hasOperatorName("!="))));
-    EXPECT_TRUE(
-        matchesConditionally(Code, traverse(TK_AsIs, M), true, {"-std=c++20"}));
-    EXPECT_FALSE(
-        matchesConditionally(Code, traverse(TK_IgnoreUnlessSpelledInSource, M),
-                             true, {"-std=c++20"}));
-  }
-  {
-    auto M =
-        cxxForRangeStmt(hasDescendant(binaryOperator(hasOperatorName("+"))));
-    EXPECT_TRUE(
-        matchesConditionally(Code, traverse(TK_AsIs, M), true, {"-std=c++20"}));
-    EXPECT_FALSE(
-        matchesConditionally(Code, traverse(TK_IgnoreUnlessSpelledInSource, M),
-                             true, {"-std=c++20"}));
-  }
-  {
-    auto M =
-        cxxForRangeStmt(hasDescendant(unaryOperator(hasOperatorName("++"))));
-    EXPECT_TRUE(
-        matchesConditionally(Code, traverse(TK_AsIs, M), true, {"-std=c++20"}));
-    EXPECT_FALSE(
-        matchesConditionally(Code, traverse(TK_IgnoreUnlessSpelledInSource, M),
-                             true, {"-std=c++20"}));
-  }
-  {
-    auto M =
-        cxxForRangeStmt(has(declStmt(hasSingleDecl(varDecl(hasName("i"))))));
-    EXPECT_TRUE(
-        matchesConditionally(Code, traverse(TK_AsIs, M), true, {"-std=c++20"}));
-    EXPECT_FALSE(
-        matchesConditionally(Code, traverse(TK_IgnoreUnlessSpelledInSource, M),
-                             true, {"-std=c++20"}));
-  }
-  {
-    auto M = cxxForRangeStmt(
-        hasInitStatement(declStmt(hasSingleDecl(varDecl(
-            hasName("a"),
-            hasInitializer(declRefExpr(to(varDecl(hasName("arr"))))))))),
-        hasLoopVariable(varDecl(hasName("i"))),
-        hasRangeInit(declRefExpr(to(varDecl(hasName("a"))))));
-    EXPECT_TRUE(
-        matchesConditionally(Code, traverse(TK_AsIs, M), true, {"-std=c++20"}));
-    EXPECT_TRUE(
-        matchesConditionally(Code, traverse(TK_IgnoreUnlessSpelledInSource, M),
-                             true, {"-std=c++20"}));
-  }
-  {
-    auto M = cxxForRangeStmt(
-        has(declStmt(hasSingleDecl(varDecl(
-            hasName("a"),
-            hasInitializer(declRefExpr(to(varDecl(hasName("arr"))))))))),
-        hasLoopVariable(varDecl(hasName("i"))),
-        hasRangeInit(declRefExpr(to(varDecl(hasName("a"))))));
-    EXPECT_TRUE(
-        matchesConditionally(Code, traverse(TK_AsIs, M), true, {"-std=c++20"}));
-    EXPECT_TRUE(
-        matchesConditionally(Code, traverse(TK_IgnoreUnlessSpelledInSource, M),
-                             true, {"-std=c++20"}));
-  }
-  {
-    auto M = cxxForRangeStmt(hasInitStatement(declStmt(
-        hasSingleDecl(varDecl(hasName("a"))), hasParent(cxxForRangeStmt()))));
-    EXPECT_TRUE(
-        matchesConditionally(Code, traverse(TK_AsIs, M), true, {"-std=c++20"}));
-    EXPECT_TRUE(
-        matchesConditionally(Code, traverse(TK_IgnoreUnlessSpelledInSource, M),
-                             true, {"-std=c++20"}));
-  }
-
-  Code = R"cpp(
-  struct Range {
-    int* begin() const;
-    int* end() const;
-  };
-  Range getRange(int);
-
-  int getNum(int);
-
-  void rangeFor()
-  {
-    for (auto j = getNum(42); auto i : getRange(j))
-    {
-    }
-  }
-  )cpp";
-  {
-    auto M = integerLiteral(equals(42));
-    EXPECT_TRUE(
-        matchesConditionally(Code, traverse(TK_AsIs, M), true, {"-std=c++20"}));
-    EXPECT_TRUE(
-        matchesConditionally(Code, traverse(TK_IgnoreUnlessSpelledInSource, M),
-                             true, {"-std=c++20"}));
-  }
-  {
-    auto M = compoundStmt(hasDescendant(integerLiteral(equals(42))));
-    EXPECT_TRUE(
-        matchesConditionally(Code, traverse(TK_AsIs, M), true, {"-std=c++20"}));
-    EXPECT_TRUE(
-        matchesConditionally(Code, traverse(TK_IgnoreUnlessSpelledInSource, M),
-                             true, {"-std=c++20"}));
-  }
-
-  Code = R"cpp(
-void hasDefaultArg(int i, int j = 0)
-{
-}
-void callDefaultArg()
-{
-  hasDefaultArg(42);
-}
-)cpp";
-  auto hasDefaultArgCall = [](auto InnerMatcher) {
-    return callExpr(callee(functionDecl(hasName("hasDefaultArg"))),
-                    InnerMatcher);
-  };
-  {
-    auto M = hasDefaultArgCall(has(integerLiteral(equals(42))));
-    EXPECT_TRUE(matches(Code, traverse(TK_AsIs, M)));
-    EXPECT_TRUE(matches(Code, traverse(TK_IgnoreUnlessSpelledInSource, M)));
-  }
-  {
-    auto M = hasDefaultArgCall(has(cxxDefaultArgExpr()));
-    EXPECT_TRUE(matches(Code, traverse(TK_AsIs, M)));
-    EXPECT_FALSE(matches(Code, traverse(TK_IgnoreUnlessSpelledInSource, M)));
-  }
-  {
-    auto M = hasDefaultArgCall(argumentCountIs(2));
-    EXPECT_TRUE(matches(Code, traverse(TK_AsIs, M)));
-    EXPECT_FALSE(matches(Code, traverse(TK_IgnoreUnlessSpelledInSource, M)));
-  }
-  {
-    auto M = hasDefaultArgCall(argumentCountIs(1));
-    EXPECT_FALSE(matches(Code, traverse(TK_AsIs, M)));
-    EXPECT_TRUE(matches(Code, traverse(TK_IgnoreUnlessSpelledInSource, M)));
-  }
-  {
-    auto M = hasDefaultArgCall(hasArgument(1, cxxDefaultArgExpr()));
-    EXPECT_TRUE(matches(Code, traverse(TK_AsIs, M)));
-    EXPECT_FALSE(matches(Code, traverse(TK_IgnoreUnlessSpelledInSource, M)));
-  }
-  {
-    auto M = hasDefaultArgCall(hasAnyArgument(cxxDefaultArgExpr()));
-    EXPECT_TRUE(matches(Code, traverse(TK_AsIs, M)));
-    EXPECT_FALSE(matches(Code, traverse(TK_IgnoreUnlessSpelledInSource, M)));
-  }
-  Code = R"cpp(
-struct A
-{
-    ~A();
-private:
-    int i;
-};
-
-A::~A() = default;
-)cpp";
-  {
-    auto M = cxxDestructorDecl(isDefaulted(),
-                               ofClass(cxxRecordDecl(has(fieldDecl()))));
-    EXPECT_TRUE(matches(Code, traverse(TK_AsIs, M)));
-    EXPECT_TRUE(matches(Code, traverse(TK_IgnoreUnlessSpelledInSource, M)));
-  }
-  Code = R"cpp(
-struct S
-{
-    static constexpr bool getTrue() { return true; }
-};
-
-struct A
-{
-    explicit(S::getTrue()) A();
-};
-
-A::A() = default;
-)cpp";
-  {
-    EXPECT_TRUE(matchesConditionally(
-        Code,
-        traverse(TK_AsIs,
-                 cxxConstructorDecl(
-                     isDefaulted(),
-                     hasExplicitSpecifier(expr(ignoringImplicit(
-                         callExpr(has(ignoringImplicit(declRefExpr())))))))),
-        true, {"-std=c++20"}));
-    EXPECT_TRUE(matchesConditionally(
-        Code,
-        traverse(TK_IgnoreUnlessSpelledInSource,
-                 cxxConstructorDecl(
-                     isDefaulted(),
-                     hasExplicitSpecifier(callExpr(has(declRefExpr()))))),
-        true, {"-std=c++20"}));
-  }
-}
-
-template <typename MatcherT>
-bool matcherTemplateWithBinding(StringRef Code, const MatcherT &M) {
-  return matchAndVerifyResultTrue(
-      Code, M.bind("matchedStmt"),
-      std::make_unique<VerifyIdIsBoundTo<ReturnStmt>>("matchedStmt", 1));
-}
-
-TEST(Traversal, traverseWithBinding) {
-  // Some existing matcher code expects to take a matcher as a
-  // template arg and bind to it.  Verify that that works.
-
-  llvm::StringRef Code = R"cpp(
-int foo()
-{
-  return 42.0;
-}
-)cpp";
-  EXPECT_TRUE(matcherTemplateWithBinding(
-      Code, traverse(TK_AsIs,
-                     returnStmt(has(implicitCastExpr(has(floatLiteral())))))));
-}
-
-TEST(Traversal, traverseMatcherNesting) {
-
-  StringRef Code = R"cpp(
-float bar(int i)
-{
-  return i;
-}
-
-void foo()
-{
-  bar(bar(3.0));
-}
-)cpp";
-
-  EXPECT_TRUE(
-      matches(Code, traverse(TK_IgnoreUnlessSpelledInSource,
-                             callExpr(has(callExpr(traverse(
-                                 TK_AsIs, callExpr(has(implicitCastExpr(
-                                              has(floatLiteral())))))))))));
-
-  EXPECT_TRUE(matches(
-      Code,
-      traverse(TK_IgnoreUnlessSpelledInSource,
-               traverse(TK_AsIs, implicitCastExpr(has(floatLiteral()))))));
-}
-
-TEST(Traversal, traverseMatcherThroughImplicit) {
-  StringRef Code = R"cpp(
-struct S {
-  S(int x);
-};
-
-void constructImplicit() {
-  int a = 8;
-  S s(a);
-}
-  )cpp";
-
-  auto Matcher = traverse(TK_IgnoreUnlessSpelledInSource, implicitCastExpr());
-
-  // Verfiy that it does not segfault
-  EXPECT_FALSE(matches(Code, Matcher));
-}
-
-TEST(Traversal, traverseMatcherThroughMemoization) {
-
-  StringRef Code = R"cpp(
-void foo()
-{
-  int i = 3.0;
-}
-  )cpp";
-
-  auto Matcher = varDecl(hasInitializer(floatLiteral()));
-
-  // Matchers such as hasDescendant memoize their result regarding AST
-  // nodes. In the matcher below, the first use of hasDescendant(Matcher)
-  // fails, and the use of it inside the traverse() matcher should pass
-  // causing the overall matcher to be a true match.
-  // This test verifies that the first false result is not re-used, which
-  // would cause the overall matcher to be incorrectly false.
-
-  EXPECT_TRUE(matches(
-      Code,
-      functionDecl(anyOf(hasDescendant(Matcher),
-                         traverse(TK_IgnoreUnlessSpelledInSource,
-                                  functionDecl(hasDescendant(Matcher)))))));
-}
-
-TEST(Traversal, traverseUnlessSpelledInSource) {
-
-  StringRef Code = R"cpp(
-
-struct A
-{
-};
-
-struct B
-{
-  B(int);
-  B(A const& a);
-  B();
-};
-
-struct C
-{
-  operator B();
-};
-
-B func1() {
-  return 42;
-}
-
-B func2() {
-  return B{42};
-}
-
-B func3() {
-  return B(42);
-}
-
-B func4() {
-  return B();
-}
-
-B func5() {
-  return B{};
-}
-
-B func6() {
-  return C();
-}
-
-B func7() {
-  return A();
-}
-
-B func8() {
-  return C{};
-}
-
-B func9() {
-  return A{};
-}
-
-B func10() {
-  A a;
-  return a;
-}
-
-B func11() {
-  B b;
-  return b;
-}
-
-B func12() {
-  C c;
-  return c;
-}
-
-void func13() {
-  int a = 0;
-  int c = 0;
-
-  [a, b = c](int d) { int e = d; };
-}
-
-void func14() {
-  [] <typename TemplateType> (TemplateType t, TemplateType u) { int e = t + u; };
-  float i = 42.0;
-}
-
-void func15() {
-  int count = 0;
-  auto l = [&] { ++count; };
-  (void)l;
-}
-
-)cpp";
-
-  EXPECT_TRUE(
-      matches(Code,
-              traverse(TK_IgnoreUnlessSpelledInSource,
-                       returnStmt(forFunction(functionDecl(hasName("func1"))),
-                                  hasReturnValue(integerLiteral(equals(42))))),
-              langCxx20OrLater()));
-
-  EXPECT_TRUE(
-      matches(Code,
-              traverse(TK_IgnoreUnlessSpelledInSource,
-                       integerLiteral(equals(42),
-                                      hasParent(returnStmt(forFunction(
-                                          functionDecl(hasName("func1"))))))),
-              langCxx20OrLater()));
-
-  EXPECT_TRUE(matches(
-      Code,
-      traverse(TK_IgnoreUnlessSpelledInSource,
-               returnStmt(forFunction(functionDecl(hasName("func2"))),
-                          hasReturnValue(cxxTemporaryObjectExpr(
-                              hasArgument(0, integerLiteral(equals(42))))))),
-      langCxx20OrLater()));
-  EXPECT_TRUE(matches(
-      Code,
-      traverse(
-          TK_IgnoreUnlessSpelledInSource,
-          integerLiteral(equals(42),
-                         hasParent(cxxTemporaryObjectExpr(hasParent(returnStmt(
-                             forFunction(functionDecl(hasName("func2"))))))))),
-      langCxx20OrLater()));
-
-  EXPECT_TRUE(
-      matches(Code,
-              traverse(TK_IgnoreUnlessSpelledInSource,
-                       returnStmt(forFunction(functionDecl(hasName("func3"))),
-                                  hasReturnValue(cxxConstructExpr(hasArgument(
-                                      0, integerLiteral(equals(42))))))),
-              langCxx20OrLater()));
-
-  EXPECT_TRUE(matches(
-      Code,
-      traverse(
-          TK_IgnoreUnlessSpelledInSource,
-          integerLiteral(equals(42),
-                         hasParent(cxxConstructExpr(hasParent(returnStmt(
-                             forFunction(functionDecl(hasName("func3"))))))))),
-      langCxx20OrLater()));
-
-  EXPECT_TRUE(
-      matches(Code,
-              traverse(TK_IgnoreUnlessSpelledInSource,
-                       returnStmt(forFunction(functionDecl(hasName("func4"))),
-                                  hasReturnValue(cxxTemporaryObjectExpr()))),
-              langCxx20OrLater()));
-
-  EXPECT_TRUE(
-      matches(Code,
-              traverse(TK_IgnoreUnlessSpelledInSource,
-                       returnStmt(forFunction(functionDecl(hasName("func5"))),
-                                  hasReturnValue(cxxTemporaryObjectExpr()))),
-              langCxx20OrLater()));
-
-  EXPECT_TRUE(
-      matches(Code,
-              traverse(TK_IgnoreUnlessSpelledInSource,
-                       returnStmt(forFunction(functionDecl(hasName("func6"))),
-                                  hasReturnValue(cxxTemporaryObjectExpr()))),
-              langCxx20OrLater()));
-
-  EXPECT_TRUE(
-      matches(Code,
-              traverse(TK_IgnoreUnlessSpelledInSource,
-                       returnStmt(forFunction(functionDecl(hasName("func7"))),
-                                  hasReturnValue(cxxTemporaryObjectExpr()))),
-              langCxx20OrLater()));
-
-  EXPECT_TRUE(
-      matches(Code,
-              traverse(TK_IgnoreUnlessSpelledInSource,
-                       returnStmt(forFunction(functionDecl(hasName("func8"))),
-                                  hasReturnValue(cxxFunctionalCastExpr(
-                                      hasSourceExpression(initListExpr()))))),
-              langCxx20OrLater()));
-
-  EXPECT_TRUE(
-      matches(Code,
-              traverse(TK_IgnoreUnlessSpelledInSource,
-                       returnStmt(forFunction(functionDecl(hasName("func9"))),
-                                  hasReturnValue(cxxFunctionalCastExpr(
-                                      hasSourceExpression(initListExpr()))))),
-              langCxx20OrLater()));
-
-  EXPECT_TRUE(matches(
-      Code,
-      traverse(
-          TK_IgnoreUnlessSpelledInSource,
-          returnStmt(forFunction(functionDecl(hasName("func10"))),
-                     hasReturnValue(declRefExpr(to(varDecl(hasName("a"))))))),
-      langCxx20OrLater()));
-
-  EXPECT_TRUE(
-      matches(Code,
-              traverse(TK_IgnoreUnlessSpelledInSource,
-                       declRefExpr(to(varDecl(hasName("a"))),
-                                   hasParent(returnStmt(forFunction(
-                                       functionDecl(hasName("func10"))))))),
-              langCxx20OrLater()));
-
-  EXPECT_TRUE(matches(
-      Code,
-      traverse(
-          TK_IgnoreUnlessSpelledInSource,
-          returnStmt(forFunction(functionDecl(hasName("func11"))),
-                     hasReturnValue(declRefExpr(to(varDecl(hasName("b"))))))),
-      langCxx20OrLater()));
-
-  EXPECT_TRUE(
-      matches(Code,
-              traverse(TK_IgnoreUnlessSpelledInSource,
-                       declRefExpr(to(varDecl(hasName("b"))),
-                                   hasParent(returnStmt(forFunction(
-                                       functionDecl(hasName("func11"))))))),
-              langCxx20OrLater()));
-
-  EXPECT_TRUE(matches(
-      Code,
-      traverse(
-          TK_IgnoreUnlessSpelledInSource,
-          returnStmt(forFunction(functionDecl(hasName("func12"))),
-                     hasReturnValue(declRefExpr(to(varDecl(hasName("c"))))))),
-      langCxx20OrLater()));
-
-  EXPECT_TRUE(
-      matches(Code,
-              traverse(TK_IgnoreUnlessSpelledInSource,
-                       declRefExpr(to(varDecl(hasName("c"))),
-                                   hasParent(returnStmt(forFunction(
-                                       functionDecl(hasName("func12"))))))),
-              langCxx20OrLater()));
-
-  EXPECT_TRUE(matches(
-      Code,
-      traverse(
-          TK_IgnoreUnlessSpelledInSource,
-          lambdaExpr(forFunction(functionDecl(hasName("func13"))),
-                     has(compoundStmt(hasDescendant(varDecl(hasName("e"))))),
-                     has(declRefExpr(to(varDecl(hasName("a"))))),
-                     has(varDecl(hasName("b"), hasInitializer(declRefExpr(to(
-                                                   varDecl(hasName("c"))))))),
-                     has(parmVarDecl(hasName("d"))))),
-      langCxx20OrLater()));
-
-  EXPECT_TRUE(
-      matches(Code,
-              traverse(TK_IgnoreUnlessSpelledInSource,
-                       declRefExpr(to(varDecl(hasName("a"))),
-                                   hasParent(lambdaExpr(forFunction(
-                                       functionDecl(hasName("func13"))))))),
-              langCxx20OrLater()));
-
-  EXPECT_TRUE(matches(
-      Code,
-      traverse(TK_IgnoreUnlessSpelledInSource,
-               varDecl(hasName("b"),
-                       hasInitializer(declRefExpr(to(varDecl(hasName("c"))))),
-                       hasParent(lambdaExpr(
-                           forFunction(functionDecl(hasName("func13"))))))),
-      langCxx20OrLater()));
-
-  EXPECT_TRUE(matches(Code,
-                      traverse(TK_IgnoreUnlessSpelledInSource,
-                               compoundStmt(hasParent(lambdaExpr(forFunction(
-                                   functionDecl(hasName("func13"))))))),
-                      langCxx20OrLater()));
-
-  EXPECT_TRUE(matches(
-      Code,
-      traverse(TK_IgnoreUnlessSpelledInSource,
-               templateTypeParmDecl(hasName("TemplateType"),
-                                    hasParent(lambdaExpr(forFunction(
-                                        functionDecl(hasName("func14"))))))),
-      langCxx20OrLater()));
-
-  EXPECT_TRUE(matches(
-      Code,
-      traverse(TK_IgnoreUnlessSpelledInSource,
-               lambdaExpr(forFunction(functionDecl(hasName("func14"))),
-                          has(templateTypeParmDecl(hasName("TemplateType"))))),
-      langCxx20OrLater()));
-
-  EXPECT_TRUE(matches(
-      Code,
-      traverse(TK_IgnoreUnlessSpelledInSource,
-               functionDecl(hasName("func14"), hasDescendant(floatLiteral()))),
-      langCxx20OrLater()));
-
-  EXPECT_TRUE(matches(
-      Code,
-      traverse(TK_IgnoreUnlessSpelledInSource,
-               compoundStmt(
-                   hasDescendant(varDecl(hasName("count")).bind("countVar")),
-                   hasDescendant(
-                       declRefExpr(to(varDecl(equalsBoundNode("countVar"))))))),
-      langCxx20OrLater()));
-
-  Code = R"cpp(
-void foo() {
-    int explicit_captured = 0;
-    int implicit_captured = 0;
-    auto l = [&, explicit_captured](int i) {
-        if (i || explicit_captured || implicit_captured) return;
-    };
-}
-)cpp";
-
-  EXPECT_TRUE(matches(Code, traverse(TK_AsIs, ifStmt())));
-  EXPECT_TRUE(
-      matches(Code, traverse(TK_IgnoreUnlessSpelledInSource, ifStmt())));
-
-  auto lambdaExplicitCapture = declRefExpr(
-      to(varDecl(hasName("explicit_captured"))), unless(hasAncestor(ifStmt())));
-  auto lambdaImplicitCapture = declRefExpr(
-      to(varDecl(hasName("implicit_captured"))), unless(hasAncestor(ifStmt())));
-
-  EXPECT_TRUE(matches(Code, traverse(TK_AsIs, lambdaExplicitCapture)));
-  EXPECT_TRUE(matches(
-      Code, traverse(TK_IgnoreUnlessSpelledInSource, lambdaExplicitCapture)));
-
-  EXPECT_TRUE(matches(Code, traverse(TK_AsIs, lambdaImplicitCapture)));
-  EXPECT_FALSE(matches(
-      Code, traverse(TK_IgnoreUnlessSpelledInSource, lambdaImplicitCapture)));
-
-  Code = R"cpp(
-struct S {};
-
-struct HasOpEq
-{
-    bool operator==(const S& other)
-    {
-        return true;
-    }
-};
-
-void binop()
-{
-    HasOpEq s1;
-    S s2;
-    if (s1 != s2)
-        return;
-}
-)cpp";
-  {
-    auto M = unaryOperator(
-        hasOperatorName("!"),
-        has(cxxOperatorCallExpr(hasOverloadedOperatorName("=="))));
-    EXPECT_TRUE(
-        matchesConditionally(Code, traverse(TK_AsIs, M), true, {"-std=c++20"}));
-    EXPECT_FALSE(
-        matchesConditionally(Code, traverse(TK_IgnoreUnlessSpelledInSource, M),
-                             true, {"-std=c++20"}));
-  }
-  {
-    auto M = declRefExpr(to(varDecl(hasName("s1"))));
-    EXPECT_TRUE(
-        matchesConditionally(Code, traverse(TK_AsIs, M), true, {"-std=c++20"}));
-    EXPECT_TRUE(
-        matchesConditionally(Code, traverse(TK_IgnoreUnlessSpelledInSource, M),
-                             true, {"-std=c++20"}));
-  }
-  {
-    auto M = cxxOperatorCallExpr(hasOverloadedOperatorName("=="));
-    EXPECT_TRUE(
-        matchesConditionally(Code, traverse(TK_AsIs, M), true, {"-std=c++20"}));
-    EXPECT_FALSE(
-        matchesConditionally(Code, traverse(TK_IgnoreUnlessSpelledInSource, M),
-                             true, {"-std=c++20"}));
-  }
-  {
-    auto M = cxxOperatorCallExpr(hasOverloadedOperatorName("!="));
-    EXPECT_FALSE(
-        matchesConditionally(Code, traverse(TK_AsIs, M), true, {"-std=c++20"}));
-    EXPECT_FALSE(
-        matchesConditionally(Code, traverse(TK_IgnoreUnlessSpelledInSource, M),
-                             true, {"-std=c++20"}));
-  }
-  auto withDescendants = [](StringRef lName, StringRef rName) {
-    return stmt(hasDescendant(declRefExpr(to(varDecl(hasName(lName))))),
-                hasDescendant(declRefExpr(to(varDecl(hasName(rName))))));
-  };
-  {
-    auto M = cxxRewrittenBinaryOperator(withDescendants("s1", "s2"));
-    EXPECT_TRUE(
-        matchesConditionally(Code, traverse(TK_AsIs, M), true, {"-std=c++20"}));
-    EXPECT_TRUE(
-        matchesConditionally(Code, traverse(TK_IgnoreUnlessSpelledInSource, M),
-                             true, {"-std=c++20"}));
-  }
-  {
-    auto M = cxxRewrittenBinaryOperator(
-        has(declRefExpr(to(varDecl(hasName("s1"))))),
-        has(declRefExpr(to(varDecl(hasName("s2"))))));
-    EXPECT_FALSE(
-        matchesConditionally(Code, traverse(TK_AsIs, M), true, {"-std=c++20"}));
-    EXPECT_TRUE(
-        matchesConditionally(Code, traverse(TK_IgnoreUnlessSpelledInSource, M),
-                             true, {"-std=c++20"}));
-  }
-  {
-    auto M = cxxRewrittenBinaryOperator(
-        hasLHS(expr(hasParent(cxxRewrittenBinaryOperator()))),
-        hasRHS(expr(hasParent(cxxRewrittenBinaryOperator()))));
-    EXPECT_FALSE(
-        matchesConditionally(Code, traverse(TK_AsIs, M), true, {"-std=c++20"}));
-    EXPECT_TRUE(
-        matchesConditionally(Code, traverse(TK_IgnoreUnlessSpelledInSource, M),
-                             true, {"-std=c++20"}));
-  }
-  {
-    EXPECT_TRUE(matchesConditionally(
-        Code,
-        traverse(TK_AsIs,
-                 cxxRewrittenBinaryOperator(
-                     hasOperatorName("!="), hasAnyOperatorName("<", "!="),
-                     isComparisonOperator(),
-                     hasLHS(ignoringImplicit(
-                         declRefExpr(to(varDecl(hasName("s1")))))),
-                     hasRHS(ignoringImplicit(
-                         declRefExpr(to(varDecl(hasName("s2")))))),
-                     hasEitherOperand(ignoringImplicit(
-                         declRefExpr(to(varDecl(hasName("s2")))))),
-                     hasOperands(ignoringImplicit(
-                                     declRefExpr(to(varDecl(hasName("s1"))))),
-                                 ignoringImplicit(declRefExpr(
-                                     to(varDecl(hasName("s2")))))))),
-        true, {"-std=c++20"}));
-    EXPECT_TRUE(matchesConditionally(
-        Code,
-        traverse(TK_IgnoreUnlessSpelledInSource,
-                 cxxRewrittenBinaryOperator(
-                     hasOperatorName("!="), hasAnyOperatorName("<", "!="),
-                     isComparisonOperator(),
-                     hasLHS(declRefExpr(to(varDecl(hasName("s1"))))),
-                     hasRHS(declRefExpr(to(varDecl(hasName("s2"))))),
-                     hasEitherOperand(declRefExpr(to(varDecl(hasName("s2"))))),
-                     hasOperands(declRefExpr(to(varDecl(hasName("s1")))),
-                                 declRefExpr(to(varDecl(hasName("s2"))))))),
-        true, {"-std=c++20"}));
-  }
-
-  Code = R"cpp(
-namespace std {
-struct strong_ordering {
-  int n;
-  constexpr operator int() const { return n; }
-  static const strong_ordering equal, greater, less;
-};
-constexpr strong_ordering strong_ordering::equal = {0};
-constexpr strong_ordering strong_ordering::greater = {1};
-constexpr strong_ordering strong_ordering::less = {-1};
-}
-
-struct HasSpaceshipMem {
-  int a;
-  constexpr auto operator<=>(const HasSpaceshipMem&) const = default;
-};
-
-void binop()
-{
-    HasSpaceshipMem hs1, hs2;
-    if (hs1 == hs2)
-        return;
-
-    HasSpaceshipMem hs3, hs4;
-    if (hs3 != hs4)
-        return;
-
-    HasSpaceshipMem hs5, hs6;
-    if (hs5 < hs6)
-        return;
-
-    HasSpaceshipMem hs7, hs8;
-    if (hs7 > hs8)
-        return;
-
-    HasSpaceshipMem hs9, hs10;
-    if (hs9 <= hs10)
-        return;
-
-    HasSpaceshipMem hs11, hs12;
-    if (hs11 >= hs12)
-        return;
-}
-)cpp";
-  auto withArgs = [](StringRef lName, StringRef rName) {
-    return cxxOperatorCallExpr(
-        hasArgument(0, declRefExpr(to(varDecl(hasName(lName))))),
-        hasArgument(1, declRefExpr(to(varDecl(hasName(rName))))));
-  };
-  {
-    auto M = ifStmt(hasCondition(cxxOperatorCallExpr(
-        hasOverloadedOperatorName("=="), withArgs("hs1", "hs2"))));
-    EXPECT_TRUE(
-        matchesConditionally(Code, traverse(TK_AsIs, M), true, {"-std=c++20"}));
-    EXPECT_TRUE(
-        matchesConditionally(Code, traverse(TK_IgnoreUnlessSpelledInSource, M),
-                             true, {"-std=c++20"}));
-  }
-  {
-    auto M =
-        unaryOperator(hasOperatorName("!"),
-                      has(cxxOperatorCallExpr(hasOverloadedOperatorName("=="),
-                                              withArgs("hs3", "hs4"))));
-    EXPECT_TRUE(
-        matchesConditionally(Code, traverse(TK_AsIs, M), true, {"-std=c++20"}));
-    EXPECT_FALSE(
-        matchesConditionally(Code, traverse(TK_IgnoreUnlessSpelledInSource, M),
-                             true, {"-std=c++20"}));
-  }
-  {
-    auto M =
-        unaryOperator(hasOperatorName("!"),
-                      has(cxxOperatorCallExpr(hasOverloadedOperatorName("=="),
-                                              withArgs("hs3", "hs4"))));
-    EXPECT_TRUE(
-        matchesConditionally(Code, traverse(TK_AsIs, M), true, {"-std=c++20"}));
-    EXPECT_FALSE(
-        matchesConditionally(Code, traverse(TK_IgnoreUnlessSpelledInSource, M),
-                             true, {"-std=c++20"}));
-  }
-  {
-    auto M = binaryOperator(
-        hasOperatorName("<"),
-        hasLHS(hasDescendant(cxxOperatorCallExpr(
-            hasOverloadedOperatorName("<=>"), withArgs("hs5", "hs6")))),
-        hasRHS(integerLiteral(equals(0))));
-    EXPECT_TRUE(
-        matchesConditionally(Code, traverse(TK_AsIs, M), true, {"-std=c++20"}));
-    EXPECT_FALSE(
-        matchesConditionally(Code, traverse(TK_IgnoreUnlessSpelledInSource, M),
-                             true, {"-std=c++20"}));
-  }
-  {
-    auto M = cxxRewrittenBinaryOperator(withDescendants("hs3", "hs4"));
-    EXPECT_TRUE(
-        matchesConditionally(Code, traverse(TK_AsIs, M), true, {"-std=c++20"}));
-    EXPECT_TRUE(
-        matchesConditionally(Code, traverse(TK_IgnoreUnlessSpelledInSource, M),
-                             true, {"-std=c++20"}));
-  }
-  {
-    auto M = declRefExpr(to(varDecl(hasName("hs3"))));
-    EXPECT_TRUE(
-        matchesConditionally(Code, traverse(TK_AsIs, M), true, {"-std=c++20"}));
-    EXPECT_TRUE(
-        matchesConditionally(Code, traverse(TK_IgnoreUnlessSpelledInSource, M),
-                             true, {"-std=c++20"}));
-  }
-  {
-    auto M = cxxRewrittenBinaryOperator(has(
-        unaryOperator(hasOperatorName("!"), withDescendants("hs3", "hs4"))));
-    EXPECT_TRUE(
-        matchesConditionally(Code, traverse(TK_AsIs, M), true, {"-std=c++20"}));
-    EXPECT_FALSE(
-        matchesConditionally(Code, traverse(TK_IgnoreUnlessSpelledInSource, M),
-                             true, {"-std=c++20"}));
-  }
-  {
-    auto M = cxxRewrittenBinaryOperator(
-        has(declRefExpr(to(varDecl(hasName("hs3"))))),
-        has(declRefExpr(to(varDecl(hasName("hs4"))))));
-    EXPECT_FALSE(
-        matchesConditionally(Code, traverse(TK_AsIs, M), true, {"-std=c++20"}));
-    EXPECT_TRUE(
-        matchesConditionally(Code, traverse(TK_IgnoreUnlessSpelledInSource, M),
-                             true, {"-std=c++20"}));
-  }
-  {
-    EXPECT_TRUE(matchesConditionally(
-        Code,
-        traverse(TK_AsIs,
-                 cxxRewrittenBinaryOperator(
-                     hasOperatorName("!="), hasAnyOperatorName("<", "!="),
-                     isComparisonOperator(),
-                     hasLHS(ignoringImplicit(
-                         declRefExpr(to(varDecl(hasName("hs3")))))),
-                     hasRHS(ignoringImplicit(
-                         declRefExpr(to(varDecl(hasName("hs4")))))),
-                     hasEitherOperand(ignoringImplicit(
-                         declRefExpr(to(varDecl(hasName("hs3")))))),
-                     hasOperands(ignoringImplicit(
-                                     declRefExpr(to(varDecl(hasName("hs3"))))),
-                                 ignoringImplicit(declRefExpr(
-                                     to(varDecl(hasName("hs4")))))))),
-        true, {"-std=c++20"}));
-    EXPECT_TRUE(matchesConditionally(
-        Code,
-        traverse(TK_IgnoreUnlessSpelledInSource,
-                 cxxRewrittenBinaryOperator(
-                     hasOperatorName("!="), hasAnyOperatorName("<", "!="),
-                     isComparisonOperator(),
-                     hasLHS(declRefExpr(to(varDecl(hasName("hs3"))))),
-                     hasRHS(declRefExpr(to(varDecl(hasName("hs4"))))),
-                     hasEitherOperand(declRefExpr(to(varDecl(hasName("hs3"))))),
-                     hasOperands(declRefExpr(to(varDecl(hasName("hs3")))),
-                                 declRefExpr(to(varDecl(hasName("hs4"))))))),
-        true, {"-std=c++20"}));
-  }
-  {
-    EXPECT_TRUE(matchesConditionally(
-        Code,
-        traverse(TK_AsIs,
-                 cxxRewrittenBinaryOperator(
-                     hasOperatorName("<"), hasAnyOperatorName("<", "!="),
-                     isComparisonOperator(),
-                     hasLHS(ignoringImplicit(
-                         declRefExpr(to(varDecl(hasName("hs5")))))),
-                     hasRHS(ignoringImplicit(
-                         declRefExpr(to(varDecl(hasName("hs6")))))),
-                     hasEitherOperand(ignoringImplicit(
-                         declRefExpr(to(varDecl(hasName("hs5")))))),
-                     hasOperands(ignoringImplicit(
-                                     declRefExpr(to(varDecl(hasName("hs5"))))),
-                                 ignoringImplicit(declRefExpr(
-                                     to(varDecl(hasName("hs6")))))))),
-        true, {"-std=c++20"}));
-    EXPECT_TRUE(matchesConditionally(
-        Code,
-        traverse(TK_IgnoreUnlessSpelledInSource,
-                 cxxRewrittenBinaryOperator(
-                     hasOperatorName("<"), hasAnyOperatorName("<", "!="),
-                     isComparisonOperator(),
-                     hasLHS(declRefExpr(to(varDecl(hasName("hs5"))))),
-                     hasRHS(declRefExpr(to(varDecl(hasName("hs6"))))),
-                     hasEitherOperand(declRefExpr(to(varDecl(hasName("hs5"))))),
-                     hasOperands(declRefExpr(to(varDecl(hasName("hs5")))),
-                                 declRefExpr(to(varDecl(hasName("hs6"))))))),
-        true, {"-std=c++20"}));
-  }
-  {
-    EXPECT_TRUE(matchesConditionally(
-        Code,
-        traverse(TK_AsIs,
-                 cxxRewrittenBinaryOperator(
-                     hasOperatorName(">"), hasAnyOperatorName("<", ">"),
-                     isComparisonOperator(),
-                     hasLHS(ignoringImplicit(
-                         declRefExpr(to(varDecl(hasName("hs7")))))),
-                     hasRHS(ignoringImplicit(
-                         declRefExpr(to(varDecl(hasName("hs8")))))),
-                     hasEitherOperand(ignoringImplicit(
-                         declRefExpr(to(varDecl(hasName("hs7")))))),
-                     hasOperands(ignoringImplicit(
-                                     declRefExpr(to(varDecl(hasName("hs7"))))),
-                                 ignoringImplicit(declRefExpr(
-                                     to(varDecl(hasName("hs8")))))))),
-        true, {"-std=c++20"}));
-    EXPECT_TRUE(matchesConditionally(
-        Code,
-        traverse(TK_IgnoreUnlessSpelledInSource,
-                 cxxRewrittenBinaryOperator(
-                     hasOperatorName(">"), hasAnyOperatorName("<", ">"),
-                     isComparisonOperator(),
-                     hasLHS(declRefExpr(to(varDecl(hasName("hs7"))))),
-                     hasRHS(declRefExpr(to(varDecl(hasName("hs8"))))),
-                     hasEitherOperand(declRefExpr(to(varDecl(hasName("hs7"))))),
-                     hasOperands(declRefExpr(to(varDecl(hasName("hs7")))),
-                                 declRefExpr(to(varDecl(hasName("hs8"))))))),
-        true, {"-std=c++20"}));
-  }
-  {
-    EXPECT_TRUE(matchesConditionally(
-        Code,
-        traverse(TK_AsIs,
-                 cxxRewrittenBinaryOperator(
-                     hasOperatorName("<="), hasAnyOperatorName("<", "<="),
-                     isComparisonOperator(),
-                     hasLHS(ignoringImplicit(
-                         declRefExpr(to(varDecl(hasName("hs9")))))),
-                     hasRHS(ignoringImplicit(
-                         declRefExpr(to(varDecl(hasName("hs10")))))),
-                     hasEitherOperand(ignoringImplicit(
-                         declRefExpr(to(varDecl(hasName("hs9")))))),
-                     hasOperands(ignoringImplicit(
-                                     declRefExpr(to(varDecl(hasName("hs9"))))),
-                                 ignoringImplicit(declRefExpr(
-                                     to(varDecl(hasName("hs10")))))))),
-        true, {"-std=c++20"}));
-    EXPECT_TRUE(matchesConditionally(
-        Code,
-        traverse(TK_IgnoreUnlessSpelledInSource,
-                 cxxRewrittenBinaryOperator(
-                     hasOperatorName("<="), hasAnyOperatorName("<", "<="),
-                     isComparisonOperator(),
-                     hasLHS(declRefExpr(to(varDecl(hasName("hs9"))))),
-                     hasRHS(declRefExpr(to(varDecl(hasName("hs10"))))),
-                     hasEitherOperand(declRefExpr(to(varDecl(hasName("hs9"))))),
-                     hasOperands(declRefExpr(to(varDecl(hasName("hs9")))),
-                                 declRefExpr(to(varDecl(hasName("hs10"))))))),
-        true, {"-std=c++20"}));
-  }
-  {
-    EXPECT_TRUE(matchesConditionally(
-        Code,
-        traverse(TK_AsIs,
-                 cxxRewrittenBinaryOperator(
-                     hasOperatorName(">="), hasAnyOperatorName("<", ">="),
-                     isComparisonOperator(),
-                     hasLHS(ignoringImplicit(
-                         declRefExpr(to(varDecl(hasName("hs11")))))),
-                     hasRHS(ignoringImplicit(
-                         declRefExpr(to(varDecl(hasName("hs12")))))),
-                     hasEitherOperand(ignoringImplicit(
-                         declRefExpr(to(varDecl(hasName("hs11")))))),
-                     hasOperands(ignoringImplicit(
-                                     declRefExpr(to(varDecl(hasName("hs11"))))),
-                                 ignoringImplicit(declRefExpr(
-                                     to(varDecl(hasName("hs12")))))))),
-        true, {"-std=c++20"}));
-    EXPECT_TRUE(matchesConditionally(
-        Code,
-        traverse(
-            TK_IgnoreUnlessSpelledInSource,
-            cxxRewrittenBinaryOperator(
-                hasOperatorName(">="), hasAnyOperatorName("<", ">="),
-                isComparisonOperator(),
-                hasLHS(declRefExpr(to(varDecl(hasName("hs11"))))),
-                hasRHS(declRefExpr(to(varDecl(hasName("hs12"))))),
-                hasEitherOperand(declRefExpr(to(varDecl(hasName("hs11"))))),
-                hasOperands(declRefExpr(to(varDecl(hasName("hs11")))),
-                            declRefExpr(to(varDecl(hasName("hs12"))))))),
-        true, {"-std=c++20"}));
-  }
-
-  Code = R"cpp(
-struct S {};
-
-struct HasOpEq
-{
-    bool operator==(const S& other) const
-    {
-        return true;
-    }
-};
-
-struct HasOpEqMem {
-  bool operator==(const HasOpEqMem&) const { return true; }
-};
-
-struct HasOpEqFree {
-};
-bool operator==(const HasOpEqFree&, const HasOpEqFree&) { return true; }
-
-void binop()
-{
-    {
-    HasOpEq s1;
-    S s2;
-    if (s1 != s2)
-        return;
-    }
-
-    {
-      int i1;
-      int i2;
-      if (i1 != i2)
-          return;
-    }
-
-    {
-      HasOpEqMem M1;
-      HasOpEqMem M2;
-      if (M1 == M2)
-          return;
-    }
-
-    {
-      HasOpEqFree F1;
-      HasOpEqFree F2;
-      if (F1 == F2)
-          return;
-    }
-}
-)cpp";
-  {
-    EXPECT_TRUE(matchesConditionally(
-        Code,
-        traverse(TK_AsIs,
-                 binaryOperation(
-                     hasOperatorName("!="), hasAnyOperatorName("<", "!="),
-                     isComparisonOperator(),
-                     hasLHS(ignoringImplicit(
-                         declRefExpr(to(varDecl(hasName("s1")))))),
-                     hasRHS(ignoringImplicit(
-                         declRefExpr(to(varDecl(hasName("s2")))))),
-                     hasEitherOperand(ignoringImplicit(
-                         declRefExpr(to(varDecl(hasName("s2")))))),
-                     hasOperands(ignoringImplicit(
-                                     declRefExpr(to(varDecl(hasName("s1"))))),
-                                 ignoringImplicit(declRefExpr(
-                                     to(varDecl(hasName("s2")))))))),
-        true, {"-std=c++20"}));
-    EXPECT_TRUE(matchesConditionally(
-        Code,
-        traverse(TK_AsIs, binaryOperation(hasOperatorName("!="),
-                                          hasLHS(ignoringImplicit(declRefExpr(
-                                              to(varDecl(hasName("i1")))))),
-                                          hasRHS(ignoringImplicit(declRefExpr(
-                                              to(varDecl(hasName("i2")))))))),
-        true, {"-std=c++20"}));
-    EXPECT_TRUE(matchesConditionally(
-        Code,
-        traverse(TK_AsIs, binaryOperation(hasOperatorName("=="),
-                                          hasLHS(ignoringImplicit(declRefExpr(
-                                              to(varDecl(hasName("M1")))))),
-                                          hasRHS(ignoringImplicit(declRefExpr(
-                                              to(varDecl(hasName("M2")))))))),
-        true, {"-std=c++20"}));
-    EXPECT_TRUE(matchesConditionally(
-        Code,
-        traverse(TK_AsIs, binaryOperation(hasOperatorName("=="),
-                                          hasLHS(ignoringImplicit(declRefExpr(
-                                              to(varDecl(hasName("F1")))))),
-                                          hasRHS(ignoringImplicit(declRefExpr(
-                                              to(varDecl(hasName("F2")))))))),
-        true, {"-std=c++20"}));
-    EXPECT_TRUE(matchesConditionally(
-        Code,
-        traverse(TK_IgnoreUnlessSpelledInSource,
-                 binaryOperation(
-                     hasOperatorName("!="), hasAnyOperatorName("<", "!="),
-                     isComparisonOperator(),
-                     hasLHS(declRefExpr(to(varDecl(hasName("s1"))))),
-                     hasRHS(declRefExpr(to(varDecl(hasName("s2"))))),
-                     hasEitherOperand(declRefExpr(to(varDecl(hasName("s2"))))),
-                     hasOperands(declRefExpr(to(varDecl(hasName("s1")))),
-                                 declRefExpr(to(varDecl(hasName("s2"))))))),
-        true, {"-std=c++20"}));
-    EXPECT_TRUE(matchesConditionally(
-        Code,
-        traverse(
-            TK_IgnoreUnlessSpelledInSource,
-            binaryOperation(hasOperatorName("!="),
-                            hasLHS(declRefExpr(to(varDecl(hasName("i1"))))),
-                            hasRHS(declRefExpr(to(varDecl(hasName("i2"))))))),
-        true, {"-std=c++20"}));
-    EXPECT_TRUE(matchesConditionally(
-        Code,
-        traverse(
-            TK_IgnoreUnlessSpelledInSource,
-            binaryOperation(hasOperatorName("=="),
-                            hasLHS(declRefExpr(to(varDecl(hasName("M1"))))),
-                            hasRHS(declRefExpr(to(varDecl(hasName("M2"))))))),
-        true, {"-std=c++20"}));
-    EXPECT_TRUE(matchesConditionally(
-        Code,
-        traverse(
-            TK_IgnoreUnlessSpelledInSource,
-            binaryOperation(hasOperatorName("=="),
-                            hasLHS(declRefExpr(to(varDecl(hasName("F1"))))),
-                            hasRHS(declRefExpr(to(varDecl(hasName("F2"))))))),
-        true, {"-std=c++20"}));
-  }
-}
-
-TEST(IgnoringImpCasts, PathologicalLambda) {
-
-  // Test that deeply nested lambdas are not a performance penalty
-  StringRef Code = R"cpp(
-void f() {
-  [] {
-  [] {
-  [] {
-  [] {
-  [] {
-  [] {
-  [] {
-  [] {
-  [] {
-  [] {
-  [] {
-  [] {
-  [] {
-  [] {
-  [] {
-  [] {
-  [] {
-  [] {
-  [] {
-  [] {
-  [] {
-  [] {
-  [] {
-  [] {
-  [] {
-  [] {
-  [] {
-  [] {
-  [] {
-    int i = 42;
-    (void)i;
-  }();
-  }();
-  }();
-  }();
-  }();
-  }();
-  }();
-  }();
-  }();
-  }();
-  }();
-  }();
-  }();
-  }();
-  }();
-  }();
-  }();
-  }();
-  }();
-  }();
-  }();
-  }();
-  }();
-  }();
-  }();
-  }();
-  }();
-  }();
-  }();
-}
-  )cpp";
-
-  EXPECT_TRUE(matches(Code, integerLiteral(equals(42))));
-  EXPECT_TRUE(matches(Code, functionDecl(hasDescendant(integerLiteral(equals(42))))));
-}
-
-TEST(IgnoringImpCasts, MatchesImpCasts) {
-  // This test checks that ignoringImpCasts matches when implicit casts are
-  // present and its inner matcher alone does not match.
-  // Note that this test creates an implicit const cast.
-  EXPECT_TRUE(matches("int x = 0; const int y = x;",
-                      varDecl(hasInitializer(ignoringImpCasts(
-                        declRefExpr(to(varDecl(hasName("x")))))))));
-  // This test creates an implict cast from int to char.
-  EXPECT_TRUE(matches("char x = 0;",
-                      varDecl(hasInitializer(ignoringImpCasts(
-                        integerLiteral(equals(0)))))));
-}
-
-TEST(IgnoringImpCasts, DoesNotMatchIncorrectly) {
-  // These tests verify that ignoringImpCasts does not match if the inner
-  // matcher does not match.
-  // Note that the first test creates an implicit const cast.
-  EXPECT_TRUE(notMatches("int x; const int y = x;",
-                         varDecl(hasInitializer(ignoringImpCasts(
-                           unless(anything()))))));
-  EXPECT_TRUE(notMatches("int x; int y = x;",
-                         varDecl(hasInitializer(ignoringImpCasts(
-                           unless(anything()))))));
-
-  // These tests verify that ignoringImplictCasts does not look through explicit
-  // casts or parentheses.
-  EXPECT_TRUE(notMatches("char* p = static_cast<char*>(0);",
-                         varDecl(hasInitializer(ignoringImpCasts(
-                           integerLiteral())))));
-  EXPECT_TRUE(notMatches(
-      "int i = (0);",
-      traverse(TK_AsIs,
-               varDecl(hasInitializer(ignoringImpCasts(integerLiteral()))))));
-  EXPECT_TRUE(notMatches("float i = (float)0;",
-                         varDecl(hasInitializer(ignoringImpCasts(
-                           integerLiteral())))));
-  EXPECT_TRUE(notMatches("float i = float(0);",
-                         varDecl(hasInitializer(ignoringImpCasts(
-                           integerLiteral())))));
-}
-
-TEST(IgnoringImpCasts, MatchesWithoutImpCasts) {
-  // This test verifies that expressions that do not have implicit casts
-  // still match the inner matcher.
-  EXPECT_TRUE(matches("int x = 0; int &y = x;",
-                      varDecl(hasInitializer(ignoringImpCasts(
-                        declRefExpr(to(varDecl(hasName("x")))))))));
-}
-
-TEST(IgnoringParenCasts, MatchesParenCasts) {
-  // This test checks that ignoringParenCasts matches when parentheses and/or
-  // casts are present and its inner matcher alone does not match.
-  EXPECT_TRUE(matches("int x = (0);",
-                      varDecl(hasInitializer(ignoringParenCasts(
-                        integerLiteral(equals(0)))))));
-  EXPECT_TRUE(matches("int x = (((((0)))));",
-                      varDecl(hasInitializer(ignoringParenCasts(
-                        integerLiteral(equals(0)))))));
-
-  // This test creates an implict cast from int to char in addition to the
-  // parentheses.
-  EXPECT_TRUE(matches("char x = (0);",
-                      varDecl(hasInitializer(ignoringParenCasts(
-                        integerLiteral(equals(0)))))));
-
-  EXPECT_TRUE(matches("char x = (char)0;",
-                      varDecl(hasInitializer(ignoringParenCasts(
-                        integerLiteral(equals(0)))))));
-  EXPECT_TRUE(matches("char* p = static_cast<char*>(0);",
-                      varDecl(hasInitializer(ignoringParenCasts(
-                        integerLiteral(equals(0)))))));
-}
-
-TEST(IgnoringParenCasts, MatchesWithoutParenCasts) {
-  // This test verifies that expressions that do not have any casts still match.
-  EXPECT_TRUE(matches("int x = 0;",
-                      varDecl(hasInitializer(ignoringParenCasts(
-                        integerLiteral(equals(0)))))));
-}
-
-TEST(IgnoringParenCasts, DoesNotMatchIncorrectly) {
-  // These tests verify that ignoringImpCasts does not match if the inner
-  // matcher does not match.
-  EXPECT_TRUE(notMatches("int x = ((0));",
-                         varDecl(hasInitializer(ignoringParenCasts(
-                           unless(anything()))))));
-
-  // This test creates an implicit cast from int to char in addition to the
-  // parentheses.
-  EXPECT_TRUE(notMatches("char x = ((0));",
-                         varDecl(hasInitializer(ignoringParenCasts(
-                           unless(anything()))))));
-
-  EXPECT_TRUE(notMatches("char *x = static_cast<char *>((0));",
-                         varDecl(hasInitializer(ignoringParenCasts(
-                           unless(anything()))))));
-}
-
-TEST(IgnoringParenAndImpCasts, MatchesParenImpCasts) {
-  // This test checks that ignoringParenAndImpCasts matches when
-  // parentheses and/or implicit casts are present and its inner matcher alone
-  // does not match.
-  // Note that this test creates an implicit const cast.
-  EXPECT_TRUE(matches("int x = 0; const int y = x;",
-                      varDecl(hasInitializer(ignoringParenImpCasts(
-                        declRefExpr(to(varDecl(hasName("x")))))))));
-  // This test creates an implicit cast from int to char.
-  EXPECT_TRUE(matches("const char x = (0);",
-                      varDecl(hasInitializer(ignoringParenImpCasts(
-                        integerLiteral(equals(0)))))));
-}
-
-TEST(IgnoringParenAndImpCasts, MatchesWithoutParenImpCasts) {
-  // This test verifies that expressions that do not have parentheses or
-  // implicit casts still match.
-  EXPECT_TRUE(matches("int x = 0; int &y = x;",
-                      varDecl(hasInitializer(ignoringParenImpCasts(
-                        declRefExpr(to(varDecl(hasName("x")))))))));
-  EXPECT_TRUE(matches("int x = 0;",
-                      varDecl(hasInitializer(ignoringParenImpCasts(
-                        integerLiteral(equals(0)))))));
-}
-
-TEST(IgnoringParenAndImpCasts, DoesNotMatchIncorrectly) {
-  // These tests verify that ignoringParenImpCasts does not match if
-  // the inner matcher does not match.
-  // This test creates an implicit cast.
-  EXPECT_TRUE(notMatches("char c = ((3));",
-                         varDecl(hasInitializer(ignoringParenImpCasts(
-                           unless(anything()))))));
-  // These tests verify that ignoringParenAndImplictCasts does not look
-  // through explicit casts.
-  EXPECT_TRUE(notMatches("float y = (float(0));",
-                         varDecl(hasInitializer(ignoringParenImpCasts(
-                           integerLiteral())))));
-  EXPECT_TRUE(notMatches("float y = (float)0;",
-                         varDecl(hasInitializer(ignoringParenImpCasts(
-                           integerLiteral())))));
-  EXPECT_TRUE(notMatches("char* p = static_cast<char*>(0);",
-                         varDecl(hasInitializer(ignoringParenImpCasts(
-                           integerLiteral())))));
-}
-
-TEST(HasSourceExpression, MatchesImplicitCasts) {
-  EXPECT_TRUE(matches("class string {}; class URL { public: URL(string s); };"
-                      "void r() {string a_string; URL url = a_string; }",
-                      traverse(TK_AsIs, implicitCastExpr(hasSourceExpression(
-                                            cxxConstructExpr())))));
-}
-
-TEST(HasSourceExpression, MatchesExplicitCasts) {
-  EXPECT_TRUE(
-      matches("float x = static_cast<float>(42);",
-              traverse(TK_AsIs, explicitCastExpr(hasSourceExpression(
-                                    hasDescendant(expr(integerLiteral())))))));
-}
-
-TEST(UsingDeclaration, MatchesSpecificTarget) {
-  EXPECT_TRUE(matches("namespace f { int a; void b(); } using f::b;",
-                      usingDecl(hasAnyUsingShadowDecl(
-                        hasTargetDecl(functionDecl())))));
-  EXPECT_TRUE(notMatches("namespace f { int a; void b(); } using f::a;",
-                         usingDecl(hasAnyUsingShadowDecl(
-                           hasTargetDecl(functionDecl())))));
-}
-
-TEST(UsingDeclaration, ThroughUsingDeclaration) {
-  EXPECT_TRUE(matches(
-    "namespace a { void f(); } using a::f; void g() { f(); }",
-    declRefExpr(throughUsingDecl(anything()))));
-  EXPECT_TRUE(notMatches(
-    "namespace a { void f(); } using a::f; void g() { a::f(); }",
-    declRefExpr(throughUsingDecl(anything()))));
-}
-
-TEST(SingleDecl, IsSingleDecl) {
-  StatementMatcher SingleDeclStmt =
-    declStmt(hasSingleDecl(varDecl(hasInitializer(anything()))));
-  EXPECT_TRUE(matches("void f() {int a = 4;}", SingleDeclStmt));
-  EXPECT_TRUE(notMatches("void f() {int a;}", SingleDeclStmt));
-  EXPECT_TRUE(notMatches("void f() {int a = 4, b = 3;}",
-                         SingleDeclStmt));
-}
-
-TEST(DeclStmt, ContainsDeclaration) {
-  DeclarationMatcher MatchesInit = varDecl(hasInitializer(anything()));
-
-  EXPECT_TRUE(matches("void f() {int a = 4;}",
-                      declStmt(containsDeclaration(0, MatchesInit))));
-  EXPECT_TRUE(matches("void f() {int a = 4, b = 3;}",
-                      declStmt(containsDeclaration(0, MatchesInit),
-                               containsDeclaration(1, MatchesInit))));
-  unsigned WrongIndex = 42;
-  EXPECT_TRUE(notMatches("void f() {int a = 4, b = 3;}",
-                         declStmt(containsDeclaration(WrongIndex,
-                                                      MatchesInit))));
-}
-
-TEST(SwitchCase, MatchesEachCase) {
-  EXPECT_TRUE(notMatches("void x() { switch(42); }",
-                         switchStmt(forEachSwitchCase(caseStmt()))));
-  EXPECT_TRUE(matches("void x() { switch(42) case 42:; }",
-                      switchStmt(forEachSwitchCase(caseStmt()))));
-  EXPECT_TRUE(matches("void x() { switch(42) { case 42:; } }",
-                      switchStmt(forEachSwitchCase(caseStmt()))));
-  EXPECT_TRUE(notMatches(
-    "void x() { if (1) switch(42) { case 42: switch (42) { default:; } } }",
-    ifStmt(has(switchStmt(forEachSwitchCase(defaultStmt()))))));
-  EXPECT_TRUE(matches(
-      "void x() { switch(42) { case 1+1: case 4:; } }",
-      traverse(TK_AsIs, switchStmt(forEachSwitchCase(caseStmt(hasCaseConstant(
-                            constantExpr(has(integerLiteral())))))))));
-  EXPECT_TRUE(notMatches(
-      "void x() { switch(42) { case 1+1: case 2+2:; } }",
-      traverse(TK_AsIs, switchStmt(forEachSwitchCase(caseStmt(hasCaseConstant(
-                            constantExpr(has(integerLiteral())))))))));
-  EXPECT_TRUE(notMatches(
-      "void x() { switch(42) { case 1 ... 2:; } }",
-      traverse(TK_AsIs, switchStmt(forEachSwitchCase(caseStmt(hasCaseConstant(
-                            constantExpr(has(integerLiteral())))))))));
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-    "void x() { switch (42) { case 1: case 2: case 3: default:; } }",
-    switchStmt(forEachSwitchCase(caseStmt().bind("x"))),
-    std::make_unique<VerifyIdIsBoundTo<CaseStmt>>("x", 3)));
-}
-
-TEST(Declaration, HasExplicitSpecifier) {
-
-  EXPECT_TRUE(notMatches("void f();",
-                         functionDecl(hasExplicitSpecifier(constantExpr())),
-                         langCxx20OrLater()));
-  EXPECT_TRUE(
-      notMatches("template<bool b> struct S { explicit operator int(); };",
-                 cxxConversionDecl(
-                     hasExplicitSpecifier(constantExpr(has(cxxBoolLiteral())))),
-                 langCxx20OrLater()));
-  EXPECT_TRUE(
-      notMatches("template<bool b> struct S { explicit(b) operator int(); };",
-                 cxxConversionDecl(
-                     hasExplicitSpecifier(constantExpr(has(cxxBoolLiteral())))),
-                 langCxx20OrLater()));
-  EXPECT_TRUE(
-      matches("struct S { explicit(true) operator int(); };",
-              traverse(TK_AsIs, cxxConversionDecl(hasExplicitSpecifier(
-                                    constantExpr(has(cxxBoolLiteral()))))),
-              langCxx20OrLater()));
-  EXPECT_TRUE(
-      matches("struct S { explicit(false) operator int(); };",
-              traverse(TK_AsIs, cxxConversionDecl(hasExplicitSpecifier(
-                                    constantExpr(has(cxxBoolLiteral()))))),
-              langCxx20OrLater()));
-  EXPECT_TRUE(
-      notMatches("template<bool b> struct S { explicit(b) S(int); };",
-                 traverse(TK_AsIs, cxxConstructorDecl(hasExplicitSpecifier(
-                                       constantExpr(has(cxxBoolLiteral()))))),
-                 langCxx20OrLater()));
-  EXPECT_TRUE(
-      matches("struct S { explicit(true) S(int); };",
-              traverse(TK_AsIs, cxxConstructorDecl(hasExplicitSpecifier(
-                                    constantExpr(has(cxxBoolLiteral()))))),
-              langCxx20OrLater()));
-  EXPECT_TRUE(
-      matches("struct S { explicit(false) S(int); };",
-              traverse(TK_AsIs, cxxConstructorDecl(hasExplicitSpecifier(
-                                    constantExpr(has(cxxBoolLiteral()))))),
-              langCxx20OrLater()));
-  EXPECT_TRUE(
-      notMatches("template<typename T> struct S { S(int); };"
-                 "template<bool b = true> explicit(b) S(int) -> S<int>;",
-                 traverse(TK_AsIs, cxxDeductionGuideDecl(hasExplicitSpecifier(
-                                       constantExpr(has(cxxBoolLiteral()))))),
-                 langCxx20OrLater()));
-  EXPECT_TRUE(
-      matches("template<typename T> struct S { S(int); };"
-              "explicit(true) S(int) -> S<int>;",
-              traverse(TK_AsIs, cxxDeductionGuideDecl(hasExplicitSpecifier(
-                                    constantExpr(has(cxxBoolLiteral()))))),
-              langCxx20OrLater()));
-  EXPECT_TRUE(
-      matches("template<typename T> struct S { S(int); };"
-              "explicit(false) S(int) -> S<int>;",
-              traverse(TK_AsIs, cxxDeductionGuideDecl(hasExplicitSpecifier(
-                                    constantExpr(has(cxxBoolLiteral()))))),
-              langCxx20OrLater()));
-}
-
-TEST(ForEachConstructorInitializer, MatchesInitializers) {
-  EXPECT_TRUE(matches(
-    "struct X { X() : i(42), j(42) {} int i, j; };",
-    cxxConstructorDecl(forEachConstructorInitializer(cxxCtorInitializer()))));
-}
-
-TEST(HasConditionVariableStatement, DoesNotMatchCondition) {
-  EXPECT_TRUE(notMatches(
-    "void x() { if(true) {} }",
-    ifStmt(hasConditionVariableStatement(declStmt()))));
-  EXPECT_TRUE(notMatches(
-    "void x() { int x; if((x = 42)) {} }",
-    ifStmt(hasConditionVariableStatement(declStmt()))));
-}
-
-TEST(HasConditionVariableStatement, MatchesConditionVariables) {
-  EXPECT_TRUE(matches(
-    "void x() { if(int* a = 0) {} }",
-    ifStmt(hasConditionVariableStatement(declStmt()))));
-}
-
-TEST(ForEach, BindsOneNode) {
-  EXPECT_TRUE(matchAndVerifyResultTrue("class C { int x; };",
-                                       recordDecl(hasName("C"), forEach(fieldDecl(hasName("x")).bind("x"))),
-                                       std::make_unique<VerifyIdIsBoundTo<FieldDecl>>("x", 1)));
-}
-
-TEST(ForEach, BindsMultipleNodes) {
-  EXPECT_TRUE(matchAndVerifyResultTrue("class C { int x; int y; int z; };",
-                                       recordDecl(hasName("C"), forEach(fieldDecl().bind("f"))),
-                                       std::make_unique<VerifyIdIsBoundTo<FieldDecl>>("f", 3)));
-}
-
-TEST(ForEach, BindsRecursiveCombinations) {
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-    "class C { class D { int x; int y; }; class E { int y; int z; }; };",
-    recordDecl(hasName("C"),
-               forEach(recordDecl(forEach(fieldDecl().bind("f"))))),
-    std::make_unique<VerifyIdIsBoundTo<FieldDecl>>("f", 4)));
-}
-
-TEST(ForEach, DoesNotIgnoreImplicit) {
-  StringRef Code = R"cpp(
-void foo()
-{
-    int i = 0;
-    int b = 4;
-    i < b;
-}
-)cpp";
-  EXPECT_TRUE(matchAndVerifyResultFalse(
-      Code, binaryOperator(forEach(declRefExpr().bind("dre"))),
-      std::make_unique<VerifyIdIsBoundTo<DeclRefExpr>>("dre", 0)));
-
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-      Code,
-      binaryOperator(forEach(
-          implicitCastExpr(hasSourceExpression(declRefExpr().bind("dre"))))),
-      std::make_unique<VerifyIdIsBoundTo<DeclRefExpr>>("dre", 2)));
-
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-      Code,
-      binaryOperator(
-          forEach(expr(ignoringImplicit(declRefExpr().bind("dre"))))),
-      std::make_unique<VerifyIdIsBoundTo<DeclRefExpr>>("dre", 2)));
-
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-      Code,
-      traverse(TK_IgnoreUnlessSpelledInSource,
-               binaryOperator(forEach(declRefExpr().bind("dre")))),
-      std::make_unique<VerifyIdIsBoundTo<DeclRefExpr>>("dre", 2)));
-}
-
-TEST(ForEachDescendant, BindsOneNode) {
-  EXPECT_TRUE(matchAndVerifyResultTrue("class C { class D { int x; }; };",
-                                       recordDecl(hasName("C"),
-                                                  forEachDescendant(fieldDecl(hasName("x")).bind("x"))),
-                                       std::make_unique<VerifyIdIsBoundTo<FieldDecl>>("x", 1)));
-}
-
-TEST(ForEachDescendant, NestedForEachDescendant) {
-  DeclarationMatcher m = recordDecl(
-    isDefinition(), decl().bind("x"), hasName("C"));
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-    "class A { class B { class C {}; }; };",
-    recordDecl(hasName("A"), anyOf(m, forEachDescendant(m))),
-    std::make_unique<VerifyIdIsBoundTo<Decl>>("x", "C")));
-
-  // Check that a partial match of 'm' that binds 'x' in the
-  // first part of anyOf(m, anything()) will not overwrite the
-  // binding created by the earlier binding in the hasDescendant.
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-    "class A { class B { class C {}; }; };",
-    recordDecl(hasName("A"), allOf(hasDescendant(m), anyOf(m, anything()))),
-    std::make_unique<VerifyIdIsBoundTo<Decl>>("x", "C")));
-}
-
-TEST(ForEachDescendant, BindsMultipleNodes) {
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-    "class C { class D { int x; int y; }; "
-      "          class E { class F { int y; int z; }; }; };",
-    recordDecl(hasName("C"), forEachDescendant(fieldDecl().bind("f"))),
-    std::make_unique<VerifyIdIsBoundTo<FieldDecl>>("f", 4)));
-}
-
-TEST(ForEachDescendant, BindsRecursiveCombinations) {
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-    "class C { class D { "
-      "          class E { class F { class G { int y; int z; }; }; }; }; };",
-    recordDecl(hasName("C"), forEachDescendant(recordDecl(
-      forEachDescendant(fieldDecl().bind("f"))))),
-    std::make_unique<VerifyIdIsBoundTo<FieldDecl>>("f", 8)));
-}
-
-TEST(ForEachDescendant, BindsCombinations) {
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-    "void f() { if(true) {} if (true) {} while (true) {} if (true) {} while "
-      "(true) {} }",
-    compoundStmt(forEachDescendant(ifStmt().bind("if")),
-                 forEachDescendant(whileStmt().bind("while"))),
-    std::make_unique<VerifyIdIsBoundTo<IfStmt>>("if", 6)));
-}
-
-TEST(Has, DoesNotDeleteBindings) {
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-    "class X { int a; };", recordDecl(decl().bind("x"), has(fieldDecl())),
-    std::make_unique<VerifyIdIsBoundTo<Decl>>("x", 1)));
-}
-
-TEST(TemplateArgumentLoc, Matches) {
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-      R"cpp(
-        template <typename A, int B, template <typename> class C> class X {};
-        class A {};
-        const int B = 42;
-        template <typename> class C {};
-        X<A, B, C> x;
-      )cpp",
-      templateArgumentLoc().bind("x"),
-      std::make_unique<VerifyIdIsBoundTo<TemplateArgumentLoc>>("x", 3)));
-}
-
-TEST(LoopingMatchers, DoNotOverwritePreviousMatchResultOnFailure) {
-  // Those matchers cover all the cases where an inner matcher is called
-  // and there is not a 1:1 relationship between the match of the outer
-  // matcher and the match of the inner matcher.
-  // The pattern to look for is:
-  //   ... return InnerMatcher.matches(...); ...
-  // In which case no special handling is needed.
-  //
-  // On the other hand, if there are multiple alternative matches
-  // (for example forEach*) or matches might be discarded (for example has*)
-  // the implementation must make sure that the discarded matches do not
-  // affect the bindings.
-  // When new such matchers are added, add a test here that:
-  // - matches a simple node, and binds it as the first thing in the matcher:
-  //     recordDecl(decl().bind("x"), hasName("X")))
-  // - uses the matcher under test afterwards in a way that not the first
-  //   alternative is matched; for anyOf, that means the first branch
-  //   would need to return false; for hasAncestor, it means that not
-  //   the direct parent matches the inner matcher.
-
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-    "class X { int y; };",
-    recordDecl(
-      recordDecl().bind("x"), hasName("::X"),
-      anyOf(forEachDescendant(recordDecl(hasName("Y"))), anything())),
-    std::make_unique<VerifyIdIsBoundTo<CXXRecordDecl>>("x", 1)));
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-    "class X {};", recordDecl(recordDecl().bind("x"), hasName("::X"),
-                              anyOf(unless(anything()), anything())),
-    std::make_unique<VerifyIdIsBoundTo<CXXRecordDecl>>("x", 1)));
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-    "template<typename T1, typename T2> class X {}; X<float, int> x;",
-    classTemplateSpecializationDecl(
-      decl().bind("x"),
-      hasAnyTemplateArgument(refersToType(asString("int")))),
-    std::make_unique<VerifyIdIsBoundTo<Decl>>("x", 1)));
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-    "class X { void f(); void g(); };",
-    cxxRecordDecl(decl().bind("x"), hasMethod(hasName("g"))),
-    std::make_unique<VerifyIdIsBoundTo<Decl>>("x", 1)));
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-    "class X { X() : a(1), b(2) {} double a; int b; };",
-    recordDecl(decl().bind("x"),
-               has(cxxConstructorDecl(
-                 hasAnyConstructorInitializer(forField(hasName("b")))))),
-    std::make_unique<VerifyIdIsBoundTo<Decl>>("x", 1)));
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-    "void x(int, int) { x(0, 42); }",
-    callExpr(expr().bind("x"), hasAnyArgument(integerLiteral(equals(42)))),
-    std::make_unique<VerifyIdIsBoundTo<Expr>>("x", 1)));
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-    "void x(int, int y) {}",
-    functionDecl(decl().bind("x"), hasAnyParameter(hasName("y"))),
-    std::make_unique<VerifyIdIsBoundTo<Decl>>("x", 1)));
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-    "void x() { return; if (true) {} }",
-    functionDecl(decl().bind("x"),
-                 has(compoundStmt(hasAnySubstatement(ifStmt())))),
-    std::make_unique<VerifyIdIsBoundTo<Decl>>("x", 1)));
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-    "namespace X { void b(int); void b(); }"
-      "using X::b;",
-    usingDecl(decl().bind("x"), hasAnyUsingShadowDecl(hasTargetDecl(
-      functionDecl(parameterCountIs(1))))),
-    std::make_unique<VerifyIdIsBoundTo<Decl>>("x", 1)));
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-    "class A{}; class B{}; class C : B, A {};",
-    cxxRecordDecl(decl().bind("x"), isDerivedFrom("::A")),
-    std::make_unique<VerifyIdIsBoundTo<Decl>>("x", 1)));
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-    "class A{}; typedef A B; typedef A C; typedef A D;"
-      "class E : A {};",
-    cxxRecordDecl(decl().bind("x"), isDerivedFrom("C")),
-    std::make_unique<VerifyIdIsBoundTo<Decl>>("x", 1)));
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-    "class A { class B { void f() {} }; };",
-    functionDecl(decl().bind("x"), hasAncestor(recordDecl(hasName("::A")))),
-    std::make_unique<VerifyIdIsBoundTo<Decl>>("x", 1)));
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-    "template <typename T> struct A { struct B {"
-      "  void f() { if(true) {} }"
-      "}; };"
-      "void t() { A<int>::B b; b.f(); }",
-    ifStmt(stmt().bind("x"), hasAncestor(recordDecl(hasName("::A")))),
-    std::make_unique<VerifyIdIsBoundTo<Stmt>>("x", 2)));
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-    "class A {};",
-    recordDecl(hasName("::A"), decl().bind("x"), unless(hasName("fooble"))),
-    std::make_unique<VerifyIdIsBoundTo<Decl>>("x", 1)));
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-    "class A { A() : s(), i(42) {} const char *s; int i; };",
-    cxxConstructorDecl(hasName("::A::A"), decl().bind("x"),
-                       forEachConstructorInitializer(forField(hasName("i")))),
-    std::make_unique<VerifyIdIsBoundTo<Decl>>("x", 1)));
-}
-
-TEST(ForEachDescendant, BindsCorrectNodes) {
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-    "class C { void f(); int i; };",
-    recordDecl(hasName("C"), forEachDescendant(decl().bind("decl"))),
-    std::make_unique<VerifyIdIsBoundTo<FieldDecl>>("decl", 1)));
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-    "class C { void f() {} int i; };",
-    recordDecl(hasName("C"), forEachDescendant(decl().bind("decl"))),
-    std::make_unique<VerifyIdIsBoundTo<FunctionDecl>>("decl", 1)));
-}
-
-TEST(FindAll, BindsNodeOnMatch) {
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-    "class A {};",
-    recordDecl(hasName("::A"), findAll(recordDecl(hasName("::A")).bind("v"))),
-    std::make_unique<VerifyIdIsBoundTo<CXXRecordDecl>>("v", 1)));
-}
-
-TEST(FindAll, BindsDescendantNodeOnMatch) {
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-    "class A { int a; int b; };",
-    recordDecl(hasName("::A"), findAll(fieldDecl().bind("v"))),
-    std::make_unique<VerifyIdIsBoundTo<FieldDecl>>("v", 2)));
-}
-
-TEST(FindAll, BindsNodeAndDescendantNodesOnOneMatch) {
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-    "class A { int a; int b; };",
-    recordDecl(hasName("::A"),
-               findAll(decl(anyOf(recordDecl(hasName("::A")).bind("v"),
-                                  fieldDecl().bind("v"))))),
-    std::make_unique<VerifyIdIsBoundTo<Decl>>("v", 3)));
-
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-    "class A { class B {}; class C {}; };",
-    recordDecl(hasName("::A"), findAll(recordDecl(isDefinition()).bind("v"))),
-    std::make_unique<VerifyIdIsBoundTo<CXXRecordDecl>>("v", 3)));
-}
-
-TEST(HasAncenstor, MatchesDeclarationAncestors) {
-  EXPECT_TRUE(matches(
-    "class A { class B { class C {}; }; };",
-    recordDecl(hasName("C"), hasAncestor(recordDecl(hasName("A"))))));
-}
-
-TEST(HasAncenstor, FailsIfNoAncestorMatches) {
-  EXPECT_TRUE(notMatches(
-    "class A { class B { class C {}; }; };",
-    recordDecl(hasName("C"), hasAncestor(recordDecl(hasName("X"))))));
-}
-
-TEST(HasAncestor, MatchesDeclarationsThatGetVisitedLater) {
-  EXPECT_TRUE(matches(
-    "class A { class B { void f() { C c; } class C {}; }; };",
-    varDecl(hasName("c"), hasType(recordDecl(hasName("C"),
-                                             hasAncestor(recordDecl(hasName("A"))))))));
-}
-
-TEST(HasAncenstor, MatchesStatementAncestors) {
-  EXPECT_TRUE(matches(
-    "void f() { if (true) { while (false) { 42; } } }",
-    integerLiteral(equals(42), hasAncestor(ifStmt()))));
-}
-
-TEST(HasAncestor, DrillsThroughDifferentHierarchies) {
-  EXPECT_TRUE(matches(
-    "void f() { if (true) { int x = 42; } }",
-    integerLiteral(equals(42), hasAncestor(functionDecl(hasName("f"))))));
-}
-
-TEST(HasAncestor, BindsRecursiveCombinations) {
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-    "class C { class D { class E { class F { int y; }; }; }; };",
-    fieldDecl(hasAncestor(recordDecl(hasAncestor(recordDecl().bind("r"))))),
-    std::make_unique<VerifyIdIsBoundTo<CXXRecordDecl>>("r", 1)));
-}
-
-TEST(HasAncestor, BindsCombinationsWithHasDescendant) {
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-    "class C { class D { class E { class F { int y; }; }; }; };",
-    fieldDecl(hasAncestor(
-      decl(
-        hasDescendant(recordDecl(isDefinition(),
-                                 hasAncestor(recordDecl())))
-      ).bind("d")
-    )),
-    std::make_unique<VerifyIdIsBoundTo<CXXRecordDecl>>("d", "E")));
-}
-
-TEST(HasAncestor, MatchesClosestAncestor) {
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-    "template <typename T> struct C {"
-      "  void f(int) {"
-      "    struct I { void g(T) { int x; } } i; i.g(42);"
-      "  }"
-      "};"
-      "template struct C<int>;",
-    varDecl(hasName("x"),
-            hasAncestor(functionDecl(hasParameter(
-              0, varDecl(hasType(asString("int"))))).bind("f"))).bind("v"),
-    std::make_unique<VerifyIdIsBoundTo<FunctionDecl>>("f", "g", 2)));
-}
-
-TEST(HasAncestor, MatchesInTemplateInstantiations) {
-  EXPECT_TRUE(matches(
-    "template <typename T> struct A { struct B { struct C { T t; }; }; }; "
-      "A<int>::B::C a;",
-    fieldDecl(hasType(asString("int")),
-              hasAncestor(recordDecl(hasName("A"))))));
-}
-
-TEST(HasAncestor, MatchesInImplicitCode) {
-  EXPECT_TRUE(matches(
-    "struct X {}; struct A { A() {} X x; };",
-    cxxConstructorDecl(
-      hasAnyConstructorInitializer(withInitializer(expr(
-        hasAncestor(recordDecl(hasName("A")))))))));
-}
-
-TEST(HasParent, MatchesOnlyParent) {
-  EXPECT_TRUE(matches(
-    "void f() { if (true) { int x = 42; } }",
-    compoundStmt(hasParent(ifStmt()))));
-  EXPECT_TRUE(notMatches(
-    "void f() { for (;;) { int x = 42; } }",
-    compoundStmt(hasParent(ifStmt()))));
-  EXPECT_TRUE(notMatches(
-    "void f() { if (true) for (;;) { int x = 42; } }",
-    compoundStmt(hasParent(ifStmt()))));
-}
-
-TEST(MatcherMemoize, HasParentDiffersFromHas) {
-  // Test introduced after detecting a bug in memoization
-  constexpr auto code = "void f() { throw 1; }";
-  EXPECT_TRUE(notMatches(
-    code,
-    cxxThrowExpr(hasParent(expr()))));
-  EXPECT_TRUE(matches(
-    code,
-    cxxThrowExpr(has(expr()))));
-  EXPECT_TRUE(matches(
-    code,
-    cxxThrowExpr(anyOf(hasParent(expr()), has(expr())))));
-}
-
-TEST(MatcherMemoize, HasDiffersFromHasDescendant) {
-  // Test introduced after detecting a bug in memoization
-  constexpr auto code = "void f() { throw 1+1; }";
-  EXPECT_TRUE(notMatches(
-    code,
-    cxxThrowExpr(has(integerLiteral()))));
-  EXPECT_TRUE(matches(
-    code,
-    cxxThrowExpr(hasDescendant(integerLiteral()))));
-  EXPECT_TRUE(
-      notMatches(code, cxxThrowExpr(allOf(hasDescendant(integerLiteral()),
-                                          has(integerLiteral())))));
-}
-TEST(HasAncestor, MatchesAllAncestors) {
-  EXPECT_TRUE(matches(
-    "template <typename T> struct C { static void f() { 42; } };"
-      "void t() { C<int>::f(); }",
-    integerLiteral(
-      equals(42),
-      allOf(
-        hasAncestor(cxxRecordDecl(isTemplateInstantiation())),
-        hasAncestor(cxxRecordDecl(unless(isTemplateInstantiation())))))));
-}
-
-TEST(HasAncestor, ImplicitArrayCopyCtorDeclRefExpr) {
-  EXPECT_TRUE(matches("struct MyClass {\n"
-                        "  int c[1];\n"
-                        "  static MyClass Create() { return MyClass(); }\n"
-                        "};",
-                      declRefExpr(to(decl(hasAncestor(decl()))))));
-}
-
-TEST(HasAncestor, AnonymousUnionMemberExpr) {
-  EXPECT_TRUE(matches("int F() {\n"
-                        "  union { int i; };\n"
-                        "  return i;\n"
-                        "}\n",
-                      memberExpr(member(hasAncestor(decl())))));
-  EXPECT_TRUE(matches("void f() {\n"
-                        "  struct {\n"
-                        "    struct { int a; int b; };\n"
-                        "  } s;\n"
-                        "  s.a = 4;\n"
-                        "}\n",
-                      memberExpr(member(hasAncestor(decl())))));
-  EXPECT_TRUE(matches("void f() {\n"
-                        "  struct {\n"
-                        "    struct { int a; int b; };\n"
-                        "  } s;\n"
-                        "  s.a = 4;\n"
-                        "}\n",
-                      declRefExpr(to(decl(hasAncestor(decl()))))));
-}
-TEST(HasAncestor, NonParmDependentTemplateParmVarDeclRefExpr) {
-  EXPECT_TRUE(matches("struct PartitionAllocator {\n"
-                        "  template<typename T>\n"
-                        "  static int quantizedSize(int count) {\n"
-                        "    return count;\n"
-                        "  }\n"
-                        "  void f() { quantizedSize<int>(10); }\n"
-                        "};",
-                      declRefExpr(to(decl(hasAncestor(decl()))))));
-}
-
-TEST(HasAncestor, AddressOfExplicitSpecializationFunction) {
-  EXPECT_TRUE(matches("template <class T> void f();\n"
-                        "template <> void f<int>();\n"
-                        "void (*get_f())() { return f<int>; }\n",
-                      declRefExpr(to(decl(hasAncestor(decl()))))));
-}
-
-TEST(HasParent, MatchesAllParents) {
-  EXPECT_TRUE(matches(
-    "template <typename T> struct C { static void f() { 42; } };"
-      "void t() { C<int>::f(); }",
-    integerLiteral(
-      equals(42),
-      hasParent(compoundStmt(hasParent(functionDecl(
-        hasParent(cxxRecordDecl(isTemplateInstantiation())))))))));
-  EXPECT_TRUE(
-    matches("template <typename T> struct C { static void f() { 42; } };"
-              "void t() { C<int>::f(); }",
-            integerLiteral(
-              equals(42),
-              hasParent(compoundStmt(hasParent(functionDecl(hasParent(
-                cxxRecordDecl(unless(isTemplateInstantiation()))))))))));
-  EXPECT_TRUE(matches(
-    "template <typename T> struct C { static void f() { 42; } };"
-      "void t() { C<int>::f(); }",
-    integerLiteral(equals(42),
-                   hasParent(compoundStmt(
-                     allOf(hasParent(functionDecl(hasParent(
-                       cxxRecordDecl(isTemplateInstantiation())))),
-                           hasParent(functionDecl(hasParent(cxxRecordDecl(
-                             unless(isTemplateInstantiation())))))))))));
-  EXPECT_TRUE(
-    notMatches("template <typename T> struct C { static void f() {} };"
-                 "void t() { C<int>::f(); }",
-               compoundStmt(hasParent(recordDecl()))));
-}
-
-TEST(HasParent, NoDuplicateParents) {
-  class HasDuplicateParents : public BoundNodesCallback {
-  public:
-    bool run(const BoundNodes *Nodes) override { return false; }
-    bool run(const BoundNodes *Nodes, ASTContext *Context) override {
-      const Stmt *Node = Nodes->getNodeAs<Stmt>("node");
-      std::set<const void *> Parents;
-      for (const auto &Parent : Context->getParents(*Node)) {
-        if (!Parents.insert(Parent.getMemoizationData()).second) {
-          return true;
-        }
-      }
-      return false;
-    }
-  };
-  EXPECT_FALSE(matchAndVerifyResultTrue(
-    "template <typename T> int Foo() { return 1 + 2; }\n"
-      "int x = Foo<int>() + Foo<unsigned>();",
-    stmt().bind("node"), std::make_unique<HasDuplicateParents>()));
-}
-
-TEST(TypeMatching, PointeeTypes) {
-  EXPECT_TRUE(matches("int b; int &a = b;",
-                      referenceType(pointee(builtinType()))));
-  EXPECT_TRUE(matches("int *a;", pointerType(pointee(builtinType()))));
-
-  EXPECT_TRUE(matches("int *a;",
-                      loc(pointerType(pointee(builtinType())))));
-
-  EXPECT_TRUE(matches(
-    "int const *A;",
-    pointerType(pointee(isConstQualified(), builtinType()))));
-  EXPECT_TRUE(notMatches(
-    "int *A;",
-    pointerType(pointee(isConstQualified(), builtinType()))));
-}
-
-TEST(ElaboratedTypeNarrowing, hasQualifier) {
-  EXPECT_TRUE(matches(
-    "namespace N {"
-      "  namespace M {"
-      "    class D {};"
-      "  }"
-      "}"
-      "N::M::D d;",
-    elaboratedType(hasQualifier(hasPrefix(specifiesNamespace(hasName("N")))))));
-  EXPECT_TRUE(notMatches(
-    "namespace M {"
-      "  class D {};"
-      "}"
-      "M::D d;",
-    elaboratedType(hasQualifier(hasPrefix(specifiesNamespace(hasName("N")))))));
-  EXPECT_TRUE(notMatches(
-    "struct D {"
-      "} d;",
-    elaboratedType(hasQualifier(nestedNameSpecifier()))));
-}
-
-TEST(ElaboratedTypeNarrowing, namesType) {
-  EXPECT_TRUE(matches(
-    "namespace N {"
-      "  namespace M {"
-      "    class D {};"
-      "  }"
-      "}"
-      "N::M::D d;",
-    elaboratedType(elaboratedType(namesType(recordType(
-      hasDeclaration(namedDecl(hasName("D")))))))));
-  EXPECT_TRUE(notMatches(
-    "namespace M {"
-      "  class D {};"
-      "}"
-      "M::D d;",
-    elaboratedType(elaboratedType(namesType(typedefType())))));
-}
-
-TEST(NNS, BindsNestedNameSpecifiers) {
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-    "namespace ns { struct E { struct B {}; }; } ns::E::B b;",
-    nestedNameSpecifier(specifiesType(asString("struct ns::E"))).bind("nns"),
-    std::make_unique<VerifyIdIsBoundTo<NestedNameSpecifier>>(
-      "nns", "ns::struct E::")));
-}
-
-TEST(NNS, BindsNestedNameSpecifierLocs) {
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-    "namespace ns { struct B {}; } ns::B b;",
-    loc(nestedNameSpecifier()).bind("loc"),
-    std::make_unique<VerifyIdIsBoundTo<NestedNameSpecifierLoc>>("loc", 1)));
-}
-
-TEST(NNS, DescendantsOfNestedNameSpecifiers) {
-  StringRef Fragment =
-      "namespace a { struct A { struct B { struct C {}; }; }; };"
-      "void f() { a::A::B::C c; }";
-  EXPECT_TRUE(matches(
-    Fragment,
-    nestedNameSpecifier(specifiesType(asString("struct a::A::B")),
-                        hasDescendant(nestedNameSpecifier(
-                          specifiesNamespace(hasName("a")))))));
-  EXPECT_TRUE(notMatches(
-    Fragment,
-    nestedNameSpecifier(specifiesType(asString("struct a::A::B")),
-                        has(nestedNameSpecifier(
-                          specifiesNamespace(hasName("a")))))));
-  EXPECT_TRUE(matches(
-    Fragment,
-    nestedNameSpecifier(specifiesType(asString("struct a::A")),
-                        has(nestedNameSpecifier(
-                          specifiesNamespace(hasName("a")))))));
-
-  // Not really useful because a NestedNameSpecifier can af at most one child,
-  // but to complete the interface.
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-    Fragment,
-    nestedNameSpecifier(specifiesType(asString("struct a::A::B")),
-                        forEach(nestedNameSpecifier().bind("x"))),
-    std::make_unique<VerifyIdIsBoundTo<NestedNameSpecifier>>("x", 1)));
-}
-
-TEST(NNS, NestedNameSpecifiersAsDescendants) {
-  StringRef Fragment =
-      "namespace a { struct A { struct B { struct C {}; }; }; };"
-      "void f() { a::A::B::C c; }";
-  EXPECT_TRUE(matches(
-    Fragment,
-    decl(hasDescendant(nestedNameSpecifier(specifiesType(
-      asString("struct a::A")))))));
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-    Fragment,
-    functionDecl(hasName("f"),
-                 forEachDescendant(nestedNameSpecifier().bind("x"))),
-    // Nested names: a, a::A and a::A::B.
-    std::make_unique<VerifyIdIsBoundTo<NestedNameSpecifier>>("x", 3)));
-}
-
-TEST(NNSLoc, DescendantsOfNestedNameSpecifierLocs) {
-  StringRef Fragment =
-      "namespace a { struct A { struct B { struct C {}; }; }; };"
-      "void f() { a::A::B::C c; }";
-  EXPECT_TRUE(matches(
-    Fragment,
-    nestedNameSpecifierLoc(loc(specifiesType(asString("struct a::A::B"))),
-                           hasDescendant(loc(nestedNameSpecifier(
-                             specifiesNamespace(hasName("a"))))))));
-  EXPECT_TRUE(notMatches(
-    Fragment,
-    nestedNameSpecifierLoc(loc(specifiesType(asString("struct a::A::B"))),
-                           has(loc(nestedNameSpecifier(
-                             specifiesNamespace(hasName("a"))))))));
-  EXPECT_TRUE(matches(
-    Fragment,
-    nestedNameSpecifierLoc(loc(specifiesType(asString("struct a::A"))),
-                           has(loc(nestedNameSpecifier(
-                             specifiesNamespace(hasName("a"))))))));
-
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-    Fragment,
-    nestedNameSpecifierLoc(loc(specifiesType(asString("struct a::A::B"))),
-                           forEach(nestedNameSpecifierLoc().bind("x"))),
-    std::make_unique<VerifyIdIsBoundTo<NestedNameSpecifierLoc>>("x", 1)));
-}
-
-TEST(NNSLoc, NestedNameSpecifierLocsAsDescendants) {
-  StringRef Fragment =
-      "namespace a { struct A { struct B { struct C {}; }; }; };"
-      "void f() { a::A::B::C c; }";
-  EXPECT_TRUE(matches(
-    Fragment,
-    decl(hasDescendant(loc(nestedNameSpecifier(specifiesType(
-      asString("struct a::A"))))))));
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-    Fragment,
-    functionDecl(hasName("f"),
-                 forEachDescendant(nestedNameSpecifierLoc().bind("x"))),
-    // Nested names: a, a::A and a::A::B.
-    std::make_unique<VerifyIdIsBoundTo<NestedNameSpecifierLoc>>("x", 3)));
-}
-template <typename T> class VerifyMatchOnNode : public BoundNodesCallback {
-public:
-  VerifyMatchOnNode(StringRef Id, const internal::Matcher<T> &InnerMatcher,
-                    StringRef InnerId)
-    : Id(Id), InnerMatcher(InnerMatcher), InnerId(InnerId) {
-  }
-
-  bool run(const BoundNodes *Nodes) override { return false; }
-
-  bool run(const BoundNodes *Nodes, ASTContext *Context) override {
-    const T *Node = Nodes->getNodeAs<T>(Id);
-    return selectFirst<T>(InnerId, match(InnerMatcher, *Node, *Context)) !=
-      nullptr;
-  }
-private:
-  std::string Id;
-  internal::Matcher<T> InnerMatcher;
-  std::string InnerId;
-};
-
-TEST(MatchFinder, CanMatchDeclarationsRecursively) {
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-    "class X { class Y {}; };", recordDecl(hasName("::X")).bind("X"),
-    std::make_unique<VerifyMatchOnNode<Decl>>(
-      "X", decl(hasDescendant(recordDecl(hasName("X::Y")).bind("Y"))),
-      "Y")));
-  EXPECT_TRUE(matchAndVerifyResultFalse(
-    "class X { class Y {}; };", recordDecl(hasName("::X")).bind("X"),
-    std::make_unique<VerifyMatchOnNode<Decl>>(
-      "X", decl(hasDescendant(recordDecl(hasName("X::Z")).bind("Z"))),
-      "Z")));
-}
-
-TEST(MatchFinder, CanMatchStatementsRecursively) {
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-    "void f() { if (1) { for (;;) { } } }", ifStmt().bind("if"),
-    std::make_unique<VerifyMatchOnNode<Stmt>>(
-      "if", stmt(hasDescendant(forStmt().bind("for"))), "for")));
-  EXPECT_TRUE(matchAndVerifyResultFalse(
-    "void f() { if (1) { for (;;) { } } }", ifStmt().bind("if"),
-    std::make_unique<VerifyMatchOnNode<Stmt>>(
-      "if", stmt(hasDescendant(declStmt().bind("decl"))), "decl")));
-}
-
-TEST(MatchFinder, CanMatchSingleNodesRecursively) {
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-    "class X { class Y {}; };", recordDecl(hasName("::X")).bind("X"),
-    std::make_unique<VerifyMatchOnNode<Decl>>(
-      "X", recordDecl(has(recordDecl(hasName("X::Y")).bind("Y"))), "Y")));
-  EXPECT_TRUE(matchAndVerifyResultFalse(
-    "class X { class Y {}; };", recordDecl(hasName("::X")).bind("X"),
-    std::make_unique<VerifyMatchOnNode<Decl>>(
-      "X", recordDecl(has(recordDecl(hasName("X::Z")).bind("Z"))), "Z")));
-}
-
-TEST(StatementMatcher, HasReturnValue) {
-  StatementMatcher RetVal = returnStmt(hasReturnValue(binaryOperator()));
-  EXPECT_TRUE(matches("int F() { int a, b; return a + b; }", RetVal));
-  EXPECT_FALSE(matches("int F() { int a; return a; }", RetVal));
-  EXPECT_FALSE(matches("void F() { return; }", RetVal));
-}
-
-TEST(StatementMatcher, ForFunction) {
-  StringRef CppString1 = "struct PosVec {"
-                         "  PosVec& operator=(const PosVec&) {"
-                         "    auto x = [] { return 1; };"
-                         "    return *this;"
-                         "  }"
-                         "};";
-  StringRef CppString2 = "void F() {"
-                         "  struct S {"
-                         "    void F2() {"
-                         "       return;"
-                         "    }"
-                         "  };"
-                         "}";
-  EXPECT_TRUE(
-    matches(
-      CppString1,
-      returnStmt(forFunction(hasName("operator=")),
-                 has(unaryOperator(hasOperatorName("*"))))));
-  EXPECT_TRUE(
-    notMatches(
-      CppString1,
-      returnStmt(forFunction(hasName("operator=")),
-                 has(integerLiteral()))));
-  EXPECT_TRUE(
-    matches(
-      CppString1,
-      returnStmt(forFunction(hasName("operator()")),
-                 has(integerLiteral()))));
-  EXPECT_TRUE(matches(CppString2, returnStmt(forFunction(hasName("F2")))));
-  EXPECT_TRUE(notMatches(CppString2, returnStmt(forFunction(hasName("F")))));
-}
-
-TEST(StatementMatcher, ForCallable) {
-  // These tests are copied over from the forFunction() test above.
-  StringRef CppString1 = "struct PosVec {"
-                         "  PosVec& operator=(const PosVec&) {"
-                         "    auto x = [] { return 1; };"
-                         "    return *this;"
-                         "  }"
-                         "};";
-  StringRef CppString2 = "void F() {"
-                         "  struct S {"
-                         "    void F2() {"
-                         "       return;"
-                         "    }"
-                         "  };"
-                         "}";
-
-  EXPECT_TRUE(
-    matches(
-      CppString1,
-      returnStmt(forCallable(functionDecl(hasName("operator="))),
-                 has(unaryOperator(hasOperatorName("*"))))));
-  EXPECT_TRUE(
-    notMatches(
-      CppString1,
-      returnStmt(forCallable(functionDecl(hasName("operator="))),
-                 has(integerLiteral()))));
-  EXPECT_TRUE(
-    matches(
-      CppString1,
-      returnStmt(forCallable(functionDecl(hasName("operator()"))),
-                 has(integerLiteral()))));
-  EXPECT_TRUE(matches(CppString2,
-                      returnStmt(forCallable(functionDecl(hasName("F2"))))));
-  EXPECT_TRUE(notMatches(CppString2,
-                         returnStmt(forCallable(functionDecl(hasName("F"))))));
-
-  // These tests are specific to forCallable().
-  StringRef ObjCString1 = "@interface I"
-                          "-(void) foo;"
-                          "@end"
-                          "@implementation I"
-                          "-(void) foo {"
-                          "  void (^block)() = ^{ 0x2b | ~0x2b; };"
-                          "}"
-                          "@end";
-
-  EXPECT_TRUE(
-    matchesObjC(
-      ObjCString1,
-      binaryOperator(forCallable(blockDecl()))));
-
-  EXPECT_TRUE(
-    notMatchesObjC(
-      ObjCString1,
-      binaryOperator(forCallable(objcMethodDecl()))));
-
-  StringRef ObjCString2 = "@interface I"
-                          "-(void) foo;"
-                          "@end"
-                          "@implementation I"
-                          "-(void) foo {"
-                          "  0x2b | ~0x2b;"
-                          "  void (^block)() = ^{};"
-                          "}"
-                          "@end";
-
-  EXPECT_TRUE(
-    matchesObjC(
-      ObjCString2,
-      binaryOperator(forCallable(objcMethodDecl()))));
-
-  EXPECT_TRUE(
-    notMatchesObjC(
-      ObjCString2,
-      binaryOperator(forCallable(blockDecl()))));
-}
-
-TEST(Matcher, ForEachOverriden) {
-  const auto ForEachOverriddenInClass = [](const char *ClassName) {
-    return cxxMethodDecl(ofClass(hasName(ClassName)), isVirtual(),
-                         forEachOverridden(cxxMethodDecl().bind("overridden")))
-        .bind("override");
-  };
-  static const char Code1[] = "class A { virtual void f(); };"
-                              "class B : public A { void f(); };"
-                              "class C : public B { void f(); };";
-  // C::f overrides A::f.
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-      Code1, ForEachOverriddenInClass("C"),
-      std::make_unique<VerifyIdIsBoundTo<CXXMethodDecl>>("override", "f", 1)));
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-      Code1, ForEachOverriddenInClass("C"),
-      std::make_unique<VerifyIdIsBoundTo<CXXMethodDecl>>("overridden", "f",
-                                                          1)));
-  // B::f overrides A::f.
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-      Code1, ForEachOverriddenInClass("B"),
-      std::make_unique<VerifyIdIsBoundTo<CXXMethodDecl>>("override", "f", 1)));
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-      Code1, ForEachOverriddenInClass("B"),
-      std::make_unique<VerifyIdIsBoundTo<CXXMethodDecl>>("overridden", "f",
-                                                          1)));
-  // A::f overrides nothing.
-  EXPECT_TRUE(notMatches(Code1, ForEachOverriddenInClass("A")));
-
-  static const char Code2[] =
-      "class A1 { virtual void f(); };"
-      "class A2 { virtual void f(); };"
-      "class B : public A1, public A2 { void f(); };";
-  // B::f overrides A1::f and A2::f. This produces two matches.
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-      Code2, ForEachOverriddenInClass("B"),
-      std::make_unique<VerifyIdIsBoundTo<CXXMethodDecl>>("override", "f", 2)));
-  EXPECT_TRUE(matchAndVerifyResultTrue(
-      Code2, ForEachOverriddenInClass("B"),
-      std::make_unique<VerifyIdIsBoundTo<CXXMethodDecl>>("overridden", "f",
-                                                          2)));
-  // A1::f overrides nothing.
-  EXPECT_TRUE(notMatches(Code2, ForEachOverriddenInClass("A1")));
-}
-
-TEST(Matcher, HasAnyDeclaration) {
-  StringRef Fragment = "void foo(int p1);"
-                       "void foo(int *p2);"
-                       "void bar(int p3);"
-                       "template <typename T> void baz(T t) { foo(t); }";
-
-  EXPECT_TRUE(
-      matches(Fragment, unresolvedLookupExpr(hasAnyDeclaration(functionDecl(
-                            hasParameter(0, parmVarDecl(hasName("p1"))))))));
-  EXPECT_TRUE(
-      matches(Fragment, unresolvedLookupExpr(hasAnyDeclaration(functionDecl(
-                            hasParameter(0, parmVarDecl(hasName("p2"))))))));
-  EXPECT_TRUE(
-      notMatches(Fragment, unresolvedLookupExpr(hasAnyDeclaration(functionDecl(
-                               hasParameter(0, parmVarDecl(hasName("p3"))))))));
-  EXPECT_TRUE(notMatches(Fragment, unresolvedLookupExpr(hasAnyDeclaration(
-                                       functionDecl(hasName("bar"))))));
-}
-
-TEST(SubstTemplateTypeParmType, HasReplacementType) {
-  StringRef Fragment = "template<typename T>"
-                       "double F(T t);"
-                       "int i;"
-                       "double j = F(i);";
-  EXPECT_TRUE(matches(Fragment, substTemplateTypeParmType(hasReplacementType(
-                                    qualType(asString("int"))))));
-  EXPECT_TRUE(notMatches(Fragment, substTemplateTypeParmType(hasReplacementType(
-                                       qualType(asString("double"))))));
-  EXPECT_TRUE(
-      notMatches("template<int N>"
-                 "double F();"
-                 "double j = F<5>();",
-                 substTemplateTypeParmType(hasReplacementType(qualType()))));
-}
-
-TEST(ClassTemplateSpecializationDecl, HasSpecializedTemplate) {
-  auto Matcher = classTemplateSpecializationDecl(
-      hasSpecializedTemplate(classTemplateDecl()));
-  EXPECT_TRUE(
-      matches("template<typename T> class A {}; typedef A<int> B;", Matcher));
-  EXPECT_TRUE(notMatches("template<typename T> class A {};", Matcher));
-}
-
-TEST(CXXNewExpr, Array) {
-  StatementMatcher NewArray = cxxNewExpr(isArray());
-
-  EXPECT_TRUE(matches("void foo() { int *Ptr = new int[10]; }", NewArray));
-  EXPECT_TRUE(notMatches("void foo() { int *Ptr = new int; }", NewArray));
-
-  StatementMatcher NewArraySize10 =
-      cxxNewExpr(hasArraySize(integerLiteral(equals(10))));
-  EXPECT_TRUE(
-      matches("void foo() { int *Ptr = new int[10]; }", NewArraySize10));
-  EXPECT_TRUE(
-      notMatches("void foo() { int *Ptr = new int[20]; }", NewArraySize10));
-}
-
-TEST(CXXNewExpr, PlacementArgs) {
-  StatementMatcher IsPlacementNew = cxxNewExpr(hasAnyPlacementArg(anything()));
-
-  EXPECT_TRUE(matches(R"(
-    void* operator new(decltype(sizeof(void*)), void*);
-    int *foo(void* Storage) {
-      return new (Storage) int;
-    })",
-                      IsPlacementNew));
-
-  EXPECT_TRUE(matches(R"(
-    void* operator new(decltype(sizeof(void*)), void*, unsigned);
-    int *foo(void* Storage) {
-      return new (Storage, 16) int;
-    })",
-                      cxxNewExpr(hasPlacementArg(
-                          1, ignoringImpCasts(integerLiteral(equals(16)))))));
-
-  EXPECT_TRUE(notMatches(R"(
-    void* operator new(decltype(sizeof(void*)), void*);
-    int *foo(void* Storage) {
-      return new int;
-    })",
-                         IsPlacementNew));
-}
-
-} // namespace ast_matchers
-} // namespace clang
diff --git a/gnu/llvm/clang/unittests/ASTMatchers/CMakeLists.txt b/gnu/llvm/clang/unittests/ASTMatchers/CMakeLists.txt
deleted file mode 100644
index b40b3886dcd..00000000000
--- a/gnu/llvm/clang/unittests/ASTMatchers/CMakeLists.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  FrontendOpenMP
-  Support
-  )
-
-add_clang_unittest(ASTMatchersTests
-  ASTMatchersInternalTest.cpp
-  ASTMatchersNodeTest.cpp
-  ASTMatchersNarrowingTest.cpp
-  ASTMatchersTraversalTest.cpp
-  GtestMatchersTest.cpp
-  )
-
-clang_target_link_libraries(ASTMatchersTests
-  PRIVATE
-  clangAST
-  clangASTMatchers
-  clangBasic
-  clangFrontend
-  clangSerialization
-  clangTesting
-  clangTooling
-  )
-
-target_link_libraries(ASTMatchersTests
-  PRIVATE
-  LLVMTestingSupport
-)
-
-add_subdirectory(Dynamic)
diff --git a/gnu/llvm/clang/unittests/ASTMatchers/Dynamic/CMakeLists.txt b/gnu/llvm/clang/unittests/ASTMatchers/Dynamic/CMakeLists.txt
deleted file mode 100644
index 7a0ba01f838..00000000000
--- a/gnu/llvm/clang/unittests/ASTMatchers/Dynamic/CMakeLists.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  FrontendOpenMP
-  Support
-  )
-
-add_clang_unittest(DynamicASTMatchersTests
-  VariantValueTest.cpp
-  ParserTest.cpp
-  RegistryTest.cpp
-  )
-
-clang_target_link_libraries(DynamicASTMatchersTests
-  PRIVATE
-  clangAST
-  clangASTMatchers
-  clangBasic
-  clangDynamicASTMatchers
-  clangFrontend
-  clangSerialization
-  clangTesting
-  clangTooling
-  )
diff --git a/gnu/llvm/clang/unittests/ASTMatchers/Dynamic/ParserTest.cpp b/gnu/llvm/clang/unittests/ASTMatchers/Dynamic/ParserTest.cpp
deleted file mode 100644
index 255432dc386..00000000000
--- a/gnu/llvm/clang/unittests/ASTMatchers/Dynamic/ParserTest.cpp
+++ /dev/null
@@ -1,644 +0,0 @@
-//===- unittest/ASTMatchers/Dynamic/ParserTest.cpp - Parser unit tests -===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===-------------------------------------------------------------------===//
-
-#include "../ASTMatchersTest.h"
-#include "clang/ASTMatchers/Dynamic/Parser.h"
-#include "clang/ASTMatchers/Dynamic/Registry.h"
-#include "llvm/ADT/Optional.h"
-#include "gtest/gtest.h"
-#include <string>
-#include <vector>
-
-namespace clang {
-namespace ast_matchers {
-namespace dynamic {
-namespace {
-
-class MockSema : public Parser::Sema {
-public:
-  ~MockSema() override {}
-
-  uint64_t expectMatcher(StringRef MatcherName) {
-    // Optimizations on the matcher framework make simple matchers like
-    // 'stmt()' to be all the same matcher.
-    // Use a more complex expression to prevent that.
-    ast_matchers::internal::Matcher<Stmt> M = stmt(stmt(), stmt());
-    ExpectedMatchers.insert(std::make_pair(std::string(MatcherName), M));
-    return M.getID().second;
-  }
-
-  bool isBuilderMatcher(MatcherCtor) const override { return false; }
-
-  ASTNodeKind nodeMatcherType(MatcherCtor) const override { return {}; }
-
-  internal::MatcherDescriptorPtr
-  buildMatcherCtor(MatcherCtor, SourceRange NameRange,
-                   ArrayRef<ParserValue> Args,
-                   Diagnostics *Error) const override {
-    return internal::MatcherDescriptorPtr{nullptr};
-  }
-
-  void parse(StringRef Code) {
-    Diagnostics Error;
-    VariantValue Value;
-    Parser::parseExpression(Code, this, &Value, &Error);
-    Values.push_back(Value);
-    Errors.push_back(Error.toStringFull());
-  }
-
-  llvm::Optional<MatcherCtor>
-  lookupMatcherCtor(StringRef MatcherName) override {
-    const ExpectedMatchersTy::value_type *Matcher =
-        &*ExpectedMatchers.find(std::string(MatcherName));
-    return reinterpret_cast<MatcherCtor>(Matcher);
-  }
-
-  VariantMatcher actOnMatcherExpression(MatcherCtor Ctor,
-                                        SourceRange NameRange,
-                                        StringRef BindID,
-                                        ArrayRef<ParserValue> Args,
-                                        Diagnostics *Error) override {
-    const ExpectedMatchersTy::value_type *Matcher =
-        reinterpret_cast<const ExpectedMatchersTy::value_type *>(Ctor);
-    MatcherInfo ToStore = {Matcher->first, NameRange, Args,
-                           std::string(BindID)};
-    Matchers.push_back(ToStore);
-    return VariantMatcher::SingleMatcher(Matcher->second);
-  }
-
-  struct MatcherInfo {
-    StringRef MatcherName;
-    SourceRange NameRange;
-    std::vector<ParserValue> Args;
-    std::string BoundID;
-  };
-
-  std::vector<std::string> Errors;
-  std::vector<VariantValue> Values;
-  std::vector<MatcherInfo> Matchers;
-  typedef std::map<std::string, ast_matchers::internal::Matcher<Stmt> >
-  ExpectedMatchersTy;
-  ExpectedMatchersTy ExpectedMatchers;
-};
-
-TEST(ParserTest, ParseBoolean) {
-  MockSema Sema;
-  Sema.parse("true");
-  Sema.parse("false");
-  EXPECT_EQ(2U, Sema.Values.size());
-  EXPECT_TRUE(Sema.Values[0].getBoolean());
-  EXPECT_FALSE(Sema.Values[1].getBoolean());
-}
-
-TEST(ParserTest, ParseDouble) {
-  MockSema Sema;
-  Sema.parse("1.0");
-  Sema.parse("2.0f");
-  Sema.parse("34.56e-78");
-  Sema.parse("4.E+6");
-  Sema.parse("1");
-  EXPECT_EQ(5U, Sema.Values.size());
-  EXPECT_EQ(1.0, Sema.Values[0].getDouble());
-  EXPECT_EQ("1:1: Error parsing numeric literal: <2.0f>", Sema.Errors[1]);
-  EXPECT_EQ(34.56e-78, Sema.Values[2].getDouble());
-  EXPECT_EQ(4e+6, Sema.Values[3].getDouble());
-  EXPECT_FALSE(Sema.Values[4].isDouble());
-}
-
-TEST(ParserTest, ParseUnsigned) {
-  MockSema Sema;
-  Sema.parse("0");
-  Sema.parse("123");
-  Sema.parse("0x1f");
-  Sema.parse("12345678901");
-  Sema.parse("1a1");
-  EXPECT_EQ(5U, Sema.Values.size());
-  EXPECT_EQ(0U, Sema.Values[0].getUnsigned());
-  EXPECT_EQ(123U, Sema.Values[1].getUnsigned());
-  EXPECT_EQ(31U, Sema.Values[2].getUnsigned());
-  EXPECT_EQ("1:1: Error parsing numeric literal: <12345678901>", Sema.Errors[3]);
-  EXPECT_EQ("1:1: Error parsing numeric literal: <1a1>", Sema.Errors[4]);
-}
-
-TEST(ParserTest, ParseString) {
-  MockSema Sema;
-  Sema.parse("\"Foo\"");
-  Sema.parse("\"\"");
-  Sema.parse("\"Baz");
-  EXPECT_EQ(3ULL, Sema.Values.size());
-  EXPECT_EQ("Foo", Sema.Values[0].getString());
-  EXPECT_EQ("", Sema.Values[1].getString());
-  EXPECT_EQ("1:1: Error parsing string token: <\"Baz>", Sema.Errors[2]);
-}
-
-bool matchesRange(SourceRange Range, unsigned StartLine,
-                  unsigned EndLine, unsigned StartColumn, unsigned EndColumn) {
-  EXPECT_EQ(StartLine, Range.Start.Line);
-  EXPECT_EQ(EndLine, Range.End.Line);
-  EXPECT_EQ(StartColumn, Range.Start.Column);
-  EXPECT_EQ(EndColumn, Range.End.Column);
-  return Range.Start.Line == StartLine && Range.End.Line == EndLine &&
-         Range.Start.Column == StartColumn && Range.End.Column == EndColumn;
-}
-
-llvm::Optional<DynTypedMatcher> getSingleMatcher(const VariantValue &Value) {
-  llvm::Optional<DynTypedMatcher> Result =
-      Value.getMatcher().getSingleMatcher();
-  EXPECT_TRUE(Result.hasValue());
-  return Result;
-}
-
-TEST(ParserTest, ParseMatcher) {
-  MockSema Sema;
-  const uint64_t ExpectedFoo = Sema.expectMatcher("Foo");
-  const uint64_t ExpectedBar = Sema.expectMatcher("Bar");
-  const uint64_t ExpectedBaz = Sema.expectMatcher("Baz");
-  Sema.parse(" Foo ( Bar ( 17), Baz( \n \"B A,Z\") ) .bind( \"Yo!\") ");
-  for (const auto &E : Sema.Errors) {
-    EXPECT_EQ("", E);
-  }
-
-  EXPECT_NE(ExpectedFoo, ExpectedBar);
-  EXPECT_NE(ExpectedFoo, ExpectedBaz);
-  EXPECT_NE(ExpectedBar, ExpectedBaz);
-
-  EXPECT_EQ(1ULL, Sema.Values.size());
-  EXPECT_EQ(ExpectedFoo, getSingleMatcher(Sema.Values[0])->getID().second);
-
-  EXPECT_EQ(3ULL, Sema.Matchers.size());
-  const MockSema::MatcherInfo Bar = Sema.Matchers[0];
-  EXPECT_EQ("Bar", Bar.MatcherName);
-  EXPECT_TRUE(matchesRange(Bar.NameRange, 1, 1, 8, 17));
-  EXPECT_EQ(1ULL, Bar.Args.size());
-  EXPECT_EQ(17U, Bar.Args[0].Value.getUnsigned());
-
-  const MockSema::MatcherInfo Baz = Sema.Matchers[1];
-  EXPECT_EQ("Baz", Baz.MatcherName);
-  EXPECT_TRUE(matchesRange(Baz.NameRange, 1, 2, 19, 10));
-  EXPECT_EQ(1ULL, Baz.Args.size());
-  EXPECT_EQ("B A,Z", Baz.Args[0].Value.getString());
-
-  const MockSema::MatcherInfo Foo = Sema.Matchers[2];
-  EXPECT_EQ("Foo", Foo.MatcherName);
-  EXPECT_TRUE(matchesRange(Foo.NameRange, 1, 2, 2, 12));
-  EXPECT_EQ(2ULL, Foo.Args.size());
-  EXPECT_EQ(ExpectedBar, getSingleMatcher(Foo.Args[0].Value)->getID().second);
-  EXPECT_EQ(ExpectedBaz, getSingleMatcher(Foo.Args[1].Value)->getID().second);
-  EXPECT_EQ("Yo!", Foo.BoundID);
-}
-
-TEST(ParserTest, ParseComment) {
-  MockSema Sema;
-  Sema.expectMatcher("Foo");
-  Sema.parse(" Foo() # Bar() ");
-  for (const auto &E : Sema.Errors) {
-    EXPECT_EQ("", E);
-  }
-
-  EXPECT_EQ(1ULL, Sema.Matchers.size());
-
-  Sema.parse("Foo(#) ");
-
-  EXPECT_EQ("1:4: Error parsing matcher. Found end-of-code while looking for ')'.", Sema.Errors[1]);
-}
-
-using ast_matchers::internal::Matcher;
-
-Parser::NamedValueMap getTestNamedValues() {
-  Parser::NamedValueMap Values;
-  Values["nameX"] = llvm::StringRef("x");
-  Values["hasParamA"] = VariantMatcher::SingleMatcher(
-      functionDecl(hasParameter(0, hasName("a"))));
-  return Values;
-}
-
-TEST(ParserTest, FullParserTest) {
-  Diagnostics Error;
-
-  StringRef Code =
-      "varDecl(hasInitializer(binaryOperator(hasLHS(integerLiteral()),"
-      "                                      hasOperatorName(\"+\"))))";
-  llvm::Optional<DynTypedMatcher> VarDecl(
-      Parser::parseMatcherExpression(Code, &Error));
-  EXPECT_EQ("", Error.toStringFull());
-  Matcher<Decl> M = VarDecl->unconditionalConvertTo<Decl>();
-  EXPECT_TRUE(matches("int x = 1 + false;", M));
-  EXPECT_FALSE(matches("int x = true + 1;", M));
-  EXPECT_FALSE(matches("int x = 1 - false;", M));
-  EXPECT_FALSE(matches("int x = true - 1;", M));
-
-  Code = "implicitCastExpr(hasCastKind(\"CK_IntegralToBoolean\"))";
-  llvm::Optional<DynTypedMatcher> implicitIntBooleanCast(
-      Parser::parseMatcherExpression(Code, nullptr, nullptr, &Error));
-  EXPECT_EQ("", Error.toStringFull());
-  Matcher<Stmt> MCastStmt =
-      traverse(TK_AsIs, implicitIntBooleanCast->unconditionalConvertTo<Stmt>());
-  EXPECT_TRUE(matches("bool X = 1;", MCastStmt));
-  EXPECT_FALSE(matches("bool X = true;", MCastStmt));
-
-  Code = "functionDecl(hasParameter(1, hasName(\"x\")))";
-  llvm::Optional<DynTypedMatcher> HasParameter(
-      Parser::parseMatcherExpression(Code, &Error));
-  EXPECT_EQ("", Error.toStringFull());
-  M = HasParameter->unconditionalConvertTo<Decl>();
-
-  EXPECT_TRUE(matches("void f(int a, int x);", M));
-  EXPECT_FALSE(matches("void f(int x, int a);", M));
-
-  // Test named values.
-  auto NamedValues = getTestNamedValues();
-
-  Code = "functionDecl(hasParamA, hasParameter(1, hasName(nameX)))";
-  llvm::Optional<DynTypedMatcher> HasParameterWithNamedValues(
-      Parser::parseMatcherExpression(Code, nullptr, &NamedValues, &Error));
-  EXPECT_EQ("", Error.toStringFull());
-  M = HasParameterWithNamedValues->unconditionalConvertTo<Decl>();
-
-  EXPECT_TRUE(matches("void f(int a, int x);", M));
-  EXPECT_FALSE(matches("void f(int x, int a);", M));
-
-  Code = "unaryExprOrTypeTraitExpr(ofKind(\"UETT_SizeOf\"))";
-  llvm::Optional<DynTypedMatcher> UnaryExprSizeOf(
-      Parser::parseMatcherExpression(Code, nullptr, nullptr, &Error));
-  EXPECT_EQ("", Error.toStringFull());
-  Matcher<Stmt> MStmt = UnaryExprSizeOf->unconditionalConvertTo<Stmt>();
-  EXPECT_TRUE(matches("unsigned X = sizeof(int);", MStmt));
-  EXPECT_FALSE(matches("unsigned X = alignof(int);", MStmt));
-
-  Code =
-      R"query(namedDecl(matchesName("^::[ABC]*$", "IgnoreCase | BasicRegex")))query";
-  llvm::Optional<DynTypedMatcher> MatchesName(
-      Parser::parseMatcherExpression(Code, nullptr, nullptr, &Error));
-  EXPECT_EQ("", Error.toStringFull());
-  M = MatchesName->unconditionalConvertTo<Decl>();
-  EXPECT_TRUE(matches("unsigned AAACCBB;", M));
-  EXPECT_TRUE(matches("unsigned aaaccbb;", M));
-
-  Code = "hasInitializer(\n    binaryOperator(hasLHS(\"A\")))";
-  EXPECT_TRUE(!Parser::parseMatcherExpression(Code, &Error).hasValue());
-  EXPECT_EQ("1:1: Error parsing argument 1 for matcher hasInitializer.\n"
-            "2:5: Error parsing argument 1 for matcher binaryOperator.\n"
-            "2:20: Error building matcher hasLHS.\n"
-            "2:27: Incorrect type for arg 1. "
-            "(Expected = Matcher<Expr>) != (Actual = String)",
-            Error.toStringFull());
-}
-
-TEST(ParserTest, VariadicMatchTest) {
-  Diagnostics Error;
-
-  StringRef Code =
-      "stmt(objcMessageExpr(hasAnySelector(\"methodA\", \"methodB:\")))";
-  llvm::Optional<DynTypedMatcher> OM(
-      Parser::parseMatcherExpression(Code, &Error));
-  EXPECT_EQ("", Error.toStringFull());
-  auto M = OM->unconditionalConvertTo<Stmt>();
-  EXPECT_TRUE(matchesObjC("@interface I @end "
-                          "void foo(I* i) { [i methodA]; }", M));
-}
-
-std::string ParseWithError(StringRef Code) {
-  Diagnostics Error;
-  VariantValue Value;
-  Parser::parseExpression(Code, &Value, &Error);
-  return Error.toStringFull();
-}
-
-std::string ParseMatcherWithError(StringRef Code) {
-  Diagnostics Error;
-  Parser::parseMatcherExpression(Code, &Error);
-  return Error.toStringFull();
-}
-
-TEST(ParserTest, Errors) {
-  EXPECT_EQ(
-      "1:5: Error parsing matcher. Found token <123> while looking for '('.",
-      ParseWithError("Foo 123"));
-  EXPECT_EQ(
-      "1:1: Matcher not found: Foo\n"
-      "1:9: Error parsing matcher. Found token <123> while looking for ','.",
-      ParseWithError("Foo(\"A\" 123)"));
-  EXPECT_EQ(
-      "1:1: Error parsing argument 1 for matcher stmt.\n"
-      "1:6: Value not found: someValue",
-      ParseWithError("stmt(someValue)"));
-  EXPECT_EQ(
-      "1:1: Matcher not found: Foo\n"
-      "1:4: Error parsing matcher. Found end-of-code while looking for ')'.",
-      ParseWithError("Foo("));
-  EXPECT_EQ("1:1: End of code found while looking for token.",
-            ParseWithError(""));
-  EXPECT_EQ("Input value is not a matcher expression.",
-            ParseMatcherWithError("\"A\""));
-  EXPECT_EQ("1:1: Matcher not found: Foo\n"
-            "1:1: Error parsing argument 1 for matcher Foo.\n"
-            "1:5: Invalid token <(> found when looking for a value.",
-            ParseWithError("Foo(("));
-  EXPECT_EQ("1:7: Expected end of code.", ParseWithError("expr()a"));
-  EXPECT_EQ("1:11: Period not followed by valid chained call.",
-            ParseWithError("isArrow().biind"));
-  EXPECT_EQ("1:15: Malformed bind() expression.",
-            ParseWithError("isArrow().bind"));
-  EXPECT_EQ("1:16: Malformed bind() expression.",
-            ParseWithError("isArrow().bind(foo"));
-  EXPECT_EQ("1:21: Malformed bind() expression.",
-            ParseWithError("isArrow().bind(\"foo\""));
-  EXPECT_EQ("1:1: Error building matcher isArrow.\n"
-            "1:1: Matcher does not support binding.",
-            ParseWithError("isArrow().bind(\"foo\")"));
-  EXPECT_EQ("1:1: Error building matcher isArrow.\n"
-            "1:11: Matcher does not support with call.",
-            ParseWithError("isArrow().with"));
-  EXPECT_EQ(
-      "1:22: Error parsing matcher. Found token <EOF> while looking for '('.",
-      ParseWithError("mapAnyOf(ifStmt).with"));
-  EXPECT_EQ(
-      "1:22: Error parsing matcher. Found end-of-code while looking for ')'.",
-      ParseWithError("mapAnyOf(ifStmt).with("));
-  EXPECT_EQ("1:1: Failed to build matcher: mapAnyOf.",
-            ParseWithError("mapAnyOf()"));
-  EXPECT_EQ("1:1: Error parsing argument 1 for matcher mapAnyOf.\n1:1: Failed "
-            "to build matcher: mapAnyOf.",
-            ParseWithError("mapAnyOf(\"foo\")"));
-  EXPECT_EQ("Input value has unresolved overloaded type: "
-            "Matcher<DoStmt|ForStmt|WhileStmt|CXXForRangeStmt|FunctionDecl>",
-            ParseMatcherWithError("hasBody(stmt())"));
-  EXPECT_EQ(
-      "1:1: Error parsing argument 1 for matcher decl.\n"
-      "1:6: Error building matcher hasAttr.\n"
-      "1:14: Unknown value 'attr::Fnal' for arg 1; did you mean 'attr::Final'",
-      ParseMatcherWithError(R"query(decl(hasAttr("attr::Fnal")))query"));
-  EXPECT_EQ("1:1: Error parsing argument 1 for matcher decl.\n"
-            "1:6: Error building matcher hasAttr.\n"
-            "1:14: Unknown value 'Final' for arg 1; did you mean 'attr::Final'",
-            ParseMatcherWithError(R"query(decl(hasAttr("Final")))query"));
-  EXPECT_EQ("1:1: Error parsing argument 1 for matcher decl.\n"
-            "1:6: Error building matcher hasAttr.\n"
-            "1:14: Value not found: unrelated",
-            ParseMatcherWithError(R"query(decl(hasAttr("unrelated")))query"));
-  EXPECT_EQ(
-      "1:1: Error parsing argument 1 for matcher namedDecl.\n"
-      "1:11: Error building matcher matchesName.\n"
-      "1:33: Unknown value 'Ignorecase' for arg 2; did you mean 'IgnoreCase'",
-      ParseMatcherWithError(
-          R"query(namedDecl(matchesName("[ABC]*", "Ignorecase")))query"));
-  EXPECT_EQ(
-      "1:1: Error parsing argument 1 for matcher namedDecl.\n"
-      "1:11: Error building matcher matchesName.\n"
-      "1:33: Value not found: IgnoreCase & BasicRegex",
-      ParseMatcherWithError(
-          R"query(namedDecl(matchesName("[ABC]*", "IgnoreCase & BasicRegex")))query"));
-  EXPECT_EQ(
-      "1:1: Error parsing argument 1 for matcher namedDecl.\n"
-      "1:11: Error building matcher matchesName.\n"
-      "1:33: Unknown value 'IgnoreCase | Basicregex' for arg 2; did you mean "
-      "'IgnoreCase | BasicRegex'",
-      ParseMatcherWithError(
-          R"query(namedDecl(matchesName("[ABC]*", "IgnoreCase | Basicregex")))query"));
-}
-
-TEST(ParserTest, OverloadErrors) {
-  EXPECT_EQ("1:1: Error building matcher callee.\n"
-            "1:8: Candidate 1: Incorrect type for arg 1. "
-            "(Expected = Matcher<Stmt>) != (Actual = String)\n"
-            "1:8: Candidate 2: Incorrect type for arg 1. "
-            "(Expected = Matcher<Decl>) != (Actual = String)",
-            ParseWithError("callee(\"A\")"));
-}
-
-TEST(ParserTest, ParseMultiline) {
-  StringRef Code;
-
-  llvm::Optional<DynTypedMatcher> M;
-  {
-    Code = R"matcher(varDecl(
-  hasName("foo")
-  )
-)matcher";
-    Diagnostics Error;
-    EXPECT_TRUE(Parser::parseMatcherExpression(Code, &Error).hasValue());
-  }
-
-  {
-    Code = R"matcher(varDecl(
-  # Internal comment
-  hasName("foo") # Internal comment
-# Internal comment
-  )
-)matcher";
-    Diagnostics Error;
-    EXPECT_TRUE(Parser::parseMatcherExpression(Code, &Error).hasValue());
-  }
-
-  {
-    Code = R"matcher(decl().bind(
-  "paramName")
-)matcher";
-    Diagnostics Error;
-    EXPECT_TRUE(Parser::parseMatcherExpression(Code, &Error).hasValue());
-  }
-
-  {
-    Code = R"matcher(decl().bind(
-  "paramName"
-  )
-)matcher";
-    Diagnostics Error;
-    EXPECT_TRUE(Parser::parseMatcherExpression(Code, &Error).hasValue());
-  }
-
-  {
-    Code = R"matcher(decl(decl()
-, decl()))matcher";
-    Diagnostics Error;
-    EXPECT_TRUE(Parser::parseMatcherExpression(Code, &Error).hasValue());
-  }
-
-  {
-    Code = R"matcher(decl(decl(),
-decl()))matcher";
-    Diagnostics Error;
-    EXPECT_TRUE(Parser::parseMatcherExpression(Code, &Error).hasValue());
-  }
-
-  {
-    Code = "namedDecl(hasName(\"n\"\n))";
-    Diagnostics Error;
-    EXPECT_TRUE(Parser::parseMatcherExpression(Code, &Error).hasValue());
-  }
-
-  {
-    Diagnostics Error;
-
-    auto NamedValues = getTestNamedValues();
-
-    Code = R"matcher(hasParamA.bind
-  ("paramName")
-)matcher";
-    M = Parser::parseMatcherExpression(Code, nullptr, &NamedValues, &Error);
-    EXPECT_FALSE(M.hasValue());
-    EXPECT_EQ("1:15: Malformed bind() expression.", Error.toStringFull());
-  }
-
-  {
-    Diagnostics Error;
-
-    auto NamedValues = getTestNamedValues();
-
-    Code = R"matcher(hasParamA.
-  bind("paramName")
-)matcher";
-    M = Parser::parseMatcherExpression(Code, nullptr, &NamedValues, &Error);
-    EXPECT_FALSE(M.hasValue());
-    EXPECT_EQ("1:11: Period not followed by valid chained call.",
-              Error.toStringFull());
-  }
-
-  {
-    Diagnostics Error;
-
-    Code = R"matcher(varDecl
-()
-)matcher";
-    M = Parser::parseMatcherExpression(Code, nullptr, nullptr, &Error);
-    EXPECT_FALSE(M.hasValue());
-    EXPECT_EQ("1:8: Error parsing matcher. Found token "
-              "<NewLine> while looking for '('.",
-              Error.toStringFull());
-  }
-
-  // Correct line/column numbers
-  {
-    Diagnostics Error;
-
-    Code = R"matcher(varDecl(
-  doesNotExist()
-  )
-)matcher";
-    M = Parser::parseMatcherExpression(Code, nullptr, nullptr, &Error);
-    EXPECT_FALSE(M.hasValue());
-    StringRef Expected = R"error(1:1: Error parsing argument 1 for matcher varDecl.
-2:3: Matcher not found: doesNotExist)error";
-    EXPECT_EQ(Expected, Error.toStringFull());
-  }
-}
-
-TEST(ParserTest, CompletionRegistry) {
-  StringRef Code = "while";
-  std::vector<MatcherCompletion> Comps = Parser::completeExpression(Code, 5);
-  ASSERT_EQ(1u, Comps.size());
-  EXPECT_EQ("Stmt(", Comps[0].TypedText);
-  EXPECT_EQ("Matcher<Stmt> whileStmt(Matcher<WhileStmt>...)",
-            Comps[0].MatcherDecl);
-
-  Code = "whileStmt().";
-  Comps = Parser::completeExpression(Code, 12);
-  ASSERT_EQ(1u, Comps.size());
-  EXPECT_EQ("bind(\"", Comps[0].TypedText);
-  EXPECT_EQ("bind", Comps[0].MatcherDecl);
-
-  Code = "mapAny";
-  Comps = Parser::completeExpression(Code, 6);
-  ASSERT_EQ(1u, Comps.size());
-  EXPECT_EQ("Of(", Comps[0].TypedText);
-  EXPECT_EQ("Matcher<NestedNameSpecifierLoc|QualType|TypeLoc|...> "
-            "mapAnyOf(NestedNameSpecifierLoc|QualType|TypeLoc|"
-            "NestedNameSpecifier|Decl|Stmt|Type...)",
-            Comps[0].MatcherDecl);
-
-  Code = "mapAnyOf(ifStmt).";
-  Comps = Parser::completeExpression(Code, 17);
-  ASSERT_EQ(2u, Comps.size());
-  EXPECT_EQ("bind(\"", Comps[0].TypedText);
-  EXPECT_EQ("bind", Comps[0].MatcherDecl);
-  EXPECT_EQ("with(", Comps[1].TypedText);
-  EXPECT_EQ("with", Comps[1].MatcherDecl);
-
-  Code = "mapAnyOf(ifS";
-  Comps = Parser::completeExpression(Code, 12);
-  ASSERT_EQ(1u, Comps.size());
-  EXPECT_EQ("tmt", Comps[0].TypedText);
-  EXPECT_EQ("ifStmt", Comps[0].MatcherDecl);
-}
-
-TEST(ParserTest, CompletionNamedValues) {
-  // Can complete non-matcher types.
-  auto NamedValues = getTestNamedValues();
-  StringRef Code = "functionDecl(hasName(";
-  std::vector<MatcherCompletion> Comps =
-      Parser::completeExpression(Code, Code.size(), nullptr, &NamedValues);
-  ASSERT_EQ(1u, Comps.size());
-  EXPECT_EQ("nameX", Comps[0].TypedText);
-  EXPECT_EQ("String nameX", Comps[0].MatcherDecl);
-
-  // Can complete if there are names in the expression.
-  Code = "cxxMethodDecl(hasName(nameX), ";
-  Comps = Parser::completeExpression(Code, Code.size(), nullptr, &NamedValues);
-  EXPECT_LT(0u, Comps.size());
-
-  // Can complete names and registry together.
-  Code = "functionDecl(hasP";
-  Comps = Parser::completeExpression(Code, Code.size(), nullptr, &NamedValues);
-  ASSERT_EQ(3u, Comps.size());
-
-  EXPECT_EQ("arameter(", Comps[0].TypedText);
-  EXPECT_EQ(
-      "Matcher<FunctionDecl> hasParameter(unsigned, Matcher<ParmVarDecl>)",
-      Comps[0].MatcherDecl);
-
-  EXPECT_EQ("aramA", Comps[1].TypedText);
-  EXPECT_EQ("Matcher<Decl> hasParamA", Comps[1].MatcherDecl);
-
-  EXPECT_EQ("arent(", Comps[2].TypedText);
-  EXPECT_EQ(
-      "Matcher<Decl> "
-      "hasParent(Matcher<NestedNameSpecifierLoc|TypeLoc|Decl|...>)",
-      Comps[2].MatcherDecl);
-}
-
-TEST(ParserTest, ParseBindOnLet) {
-
-  auto NamedValues = getTestNamedValues();
-
-  Diagnostics Error;
-
-  {
-    StringRef Code = "hasParamA.bind(\"parmABinding\")";
-    llvm::Optional<DynTypedMatcher> TopLevelLetBinding(
-        Parser::parseMatcherExpression(Code, nullptr, &NamedValues, &Error));
-    EXPECT_EQ("", Error.toStringFull());
-    auto M = TopLevelLetBinding->unconditionalConvertTo<Decl>();
-
-    EXPECT_TRUE(matchAndVerifyResultTrue(
-        "void foo(int a);", M,
-        std::make_unique<VerifyIdIsBoundTo<FunctionDecl>>("parmABinding")));
-    EXPECT_TRUE(matchAndVerifyResultFalse(
-        "void foo(int b);", M,
-        std::make_unique<VerifyIdIsBoundTo<FunctionDecl>>("parmABinding")));
-  }
-
-  {
-    StringRef Code = "functionDecl(hasParamA.bind(\"parmABinding\"))";
-    llvm::Optional<DynTypedMatcher> NestedLetBinding(
-        Parser::parseMatcherExpression(Code, nullptr, &NamedValues, &Error));
-    EXPECT_EQ("", Error.toStringFull());
-    auto M = NestedLetBinding->unconditionalConvertTo<Decl>();
-
-    EXPECT_TRUE(matchAndVerifyResultTrue(
-        "void foo(int a);", M,
-        std::make_unique<VerifyIdIsBoundTo<FunctionDecl>>("parmABinding")));
-    EXPECT_TRUE(matchAndVerifyResultFalse(
-        "void foo(int b);", M,
-        std::make_unique<VerifyIdIsBoundTo<FunctionDecl>>("parmABinding")));
-  }
-}
-
-}  // end anonymous namespace
-}  // end namespace dynamic
-}  // end namespace ast_matchers
-}  // end namespace clang
diff --git a/gnu/llvm/clang/unittests/ASTMatchers/Dynamic/RegistryTest.cpp b/gnu/llvm/clang/unittests/ASTMatchers/Dynamic/RegistryTest.cpp
deleted file mode 100644
index 318fd3ad185..00000000000
--- a/gnu/llvm/clang/unittests/ASTMatchers/Dynamic/RegistryTest.cpp
+++ /dev/null
@@ -1,591 +0,0 @@
-//===- unittest/ASTMatchers/Dynamic/RegistryTest.cpp - Registry unit tests -===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===-----------------------------------------------------------------------===//
-
-#include "../ASTMatchersTest.h"
-#include "clang/ASTMatchers/Dynamic/Registry.h"
-#include "gtest/gtest.h"
-#include <vector>
-
-namespace clang {
-namespace ast_matchers {
-namespace dynamic {
-namespace {
-
-using ast_matchers::internal::Matcher;
-
-class RegistryTest : public ::testing::Test {
-public:
-  std::vector<ParserValue> Args() { return std::vector<ParserValue>(); }
-  std::vector<ParserValue> Args(const VariantValue &Arg1) {
-    std::vector<ParserValue> Out(1);
-    Out[0].Value = Arg1;
-    return Out;
-  }
-  std::vector<ParserValue> Args(const VariantValue &Arg1,
-                                const VariantValue &Arg2) {
-    std::vector<ParserValue> Out(2);
-    Out[0].Value = Arg1;
-    Out[1].Value = Arg2;
-    return Out;
-  }
-
-  llvm::Optional<MatcherCtor> lookupMatcherCtor(StringRef MatcherName) {
-    return Registry::lookupMatcherCtor(MatcherName);
-  }
-
-  VariantMatcher constructMatcher(StringRef MatcherName,
-                                  Diagnostics *Error = nullptr) {
-    Diagnostics DummyError;
-    if (!Error) Error = &DummyError;
-    llvm::Optional<MatcherCtor> Ctor = lookupMatcherCtor(MatcherName);
-    VariantMatcher Out;
-    if (Ctor)
-      Out = Registry::constructMatcher(*Ctor, SourceRange(), Args(), Error);
-    EXPECT_EQ("", DummyError.toStringFull());
-    return Out;
-  }
-
-  VariantMatcher constructMatcher(StringRef MatcherName,
-                                  const VariantValue &Arg1,
-                                  Diagnostics *Error = nullptr) {
-    Diagnostics DummyError;
-    if (!Error) Error = &DummyError;
-    llvm::Optional<MatcherCtor> Ctor = lookupMatcherCtor(MatcherName);
-    VariantMatcher Out;
-    if (Ctor)
-      Out = Registry::constructMatcher(*Ctor, SourceRange(), Args(Arg1), Error);
-    EXPECT_EQ("", DummyError.toStringFull()) << MatcherName;
-    return Out;
-  }
-
-  VariantMatcher constructMatcher(StringRef MatcherName,
-                                  const VariantValue &Arg1,
-                                  const VariantValue &Arg2,
-                                  Diagnostics *Error = nullptr) {
-    Diagnostics DummyError;
-    if (!Error) Error = &DummyError;
-    llvm::Optional<MatcherCtor> Ctor = lookupMatcherCtor(MatcherName);
-    VariantMatcher Out;
-    if (Ctor)
-      Out = Registry::constructMatcher(*Ctor, SourceRange(), Args(Arg1, Arg2),
-                                       Error);
-    EXPECT_EQ("", DummyError.toStringFull());
-    return Out;
-  }
-
-  typedef std::vector<MatcherCompletion> CompVector;
-
-  CompVector getCompletions() {
-    std::vector<std::pair<MatcherCtor, unsigned> > Context;
-    return Registry::getMatcherCompletions(
-        Registry::getAcceptedCompletionTypes(Context));
-  }
-
-  CompVector getCompletions(StringRef MatcherName1, unsigned ArgNo1) {
-    std::vector<std::pair<MatcherCtor, unsigned> > Context;
-    llvm::Optional<MatcherCtor> Ctor = lookupMatcherCtor(MatcherName1);
-    if (!Ctor)
-      return CompVector();
-    Context.push_back(std::make_pair(*Ctor, ArgNo1));
-    return Registry::getMatcherCompletions(
-        Registry::getAcceptedCompletionTypes(Context));
-  }
-
-  CompVector getCompletions(StringRef MatcherName1, unsigned ArgNo1,
-                            StringRef MatcherName2, unsigned ArgNo2) {
-    std::vector<std::pair<MatcherCtor, unsigned> > Context;
-    llvm::Optional<MatcherCtor> Ctor = lookupMatcherCtor(MatcherName1);
-    if (!Ctor)
-      return CompVector();
-    Context.push_back(std::make_pair(*Ctor, ArgNo1));
-    Ctor = lookupMatcherCtor(MatcherName2);
-    if (!Ctor)
-      return CompVector();
-    Context.push_back(std::make_pair(*Ctor, ArgNo2));
-    return Registry::getMatcherCompletions(
-        Registry::getAcceptedCompletionTypes(Context));
-  }
-
-  bool hasCompletion(const CompVector &Comps, StringRef TypedText,
-                     StringRef MatcherDecl = StringRef()) {
-    for (CompVector::const_iterator I = Comps.begin(), E = Comps.end(); I != E;
-         ++I) {
-      if (I->TypedText == TypedText &&
-          (MatcherDecl.empty() || I->MatcherDecl == MatcherDecl)) {
-        return true;
-      }
-    }
-    return false;
-  }
-};
-
-TEST_F(RegistryTest, CanConstructNoArgs) {
-  Matcher<Stmt> IsArrowValue = constructMatcher(
-      "memberExpr", constructMatcher("isArrow")).getTypedMatcher<Stmt>();
-  Matcher<Stmt> BoolValue =
-      constructMatcher("cxxBoolLiteral").getTypedMatcher<Stmt>();
-
-  const std::string ClassSnippet = "struct Foo { int x; };\n"
-                                   "Foo *foo = new Foo;\n"
-                                   "int i = foo->x;\n";
-  const std::string BoolSnippet = "bool Foo = true;\n";
-
-  EXPECT_TRUE(matches(ClassSnippet, IsArrowValue));
-  EXPECT_TRUE(matches(BoolSnippet, BoolValue));
-  EXPECT_FALSE(matches(ClassSnippet, BoolValue));
-  EXPECT_FALSE(matches(BoolSnippet, IsArrowValue));
-}
-
-TEST_F(RegistryTest, ConstructWithSimpleArgs) {
-  Matcher<Decl> Value = constructMatcher(
-      "namedDecl", constructMatcher("hasName", StringRef("X")))
-      .getTypedMatcher<Decl>();
-  EXPECT_TRUE(matches("class X {};", Value));
-  EXPECT_FALSE(matches("int x;", Value));
-
-  Value = functionDecl(constructMatcher("parameterCountIs", 2)
-                           .getTypedMatcher<FunctionDecl>());
-  EXPECT_TRUE(matches("void foo(int,int);", Value));
-  EXPECT_FALSE(matches("void foo(int);", Value));
-}
-
-TEST_F(RegistryTest, ConstructWithMatcherArgs) {
-  Matcher<Decl> HasInitializerSimple = constructMatcher(
-      "varDecl", constructMatcher("hasInitializer", constructMatcher("stmt")))
-      .getTypedMatcher<Decl>();
-  Matcher<Decl> HasInitializerComplex = constructMatcher(
-      "varDecl",
-      constructMatcher("hasInitializer", constructMatcher("callExpr")))
-      .getTypedMatcher<Decl>();
-
-  std::string code = "int i;";
-  EXPECT_FALSE(matches(code, HasInitializerSimple));
-  EXPECT_FALSE(matches(code, HasInitializerComplex));
-
-  code = "int i = 1;";
-  EXPECT_TRUE(matches(code, HasInitializerSimple));
-  EXPECT_FALSE(matches(code, HasInitializerComplex));
-
-  code = "int y(); int i = y();";
-  EXPECT_TRUE(matches(code, HasInitializerSimple));
-  EXPECT_TRUE(matches(code, HasInitializerComplex));
-
-  Matcher<Decl> HasParameter =
-      functionDecl(constructMatcher(
-          "hasParameter", 1, constructMatcher("hasName", StringRef("x")))
-                       .getTypedMatcher<FunctionDecl>());
-  EXPECT_TRUE(matches("void f(int a, int x);", HasParameter));
-  EXPECT_FALSE(matches("void f(int x, int a);", HasParameter));
-}
-
-TEST_F(RegistryTest, OverloadedMatchers) {
-  Matcher<Stmt> CallExpr0 = constructMatcher(
-      "callExpr",
-      constructMatcher("callee", constructMatcher("memberExpr",
-                                                  constructMatcher("isArrow"))))
-      .getTypedMatcher<Stmt>();
-
-  Matcher<Stmt> CallExpr1 = constructMatcher(
-      "callExpr",
-      constructMatcher(
-          "callee",
-          constructMatcher("cxxMethodDecl",
-                           constructMatcher("hasName", StringRef("x")))))
-      .getTypedMatcher<Stmt>();
-
-  std::string Code = "class Y { public: void x(); }; void z() { Y y; y.x(); }";
-  EXPECT_FALSE(matches(Code, CallExpr0));
-  EXPECT_TRUE(matches(Code, CallExpr1));
-
-  Code = "class Z { public: void z() { this->z(); } };";
-  EXPECT_TRUE(matches(Code, CallExpr0));
-  EXPECT_FALSE(matches(Code, CallExpr1));
-
-  Matcher<Decl> DeclDecl = declaratorDecl(hasTypeLoc(
-      constructMatcher(
-          "loc", constructMatcher("asString", StringRef("const double *")))
-          .getTypedMatcher<TypeLoc>()));
-
-  Matcher<NestedNameSpecifierLoc> NNSL =
-      constructMatcher(
-          "loc", VariantMatcher::SingleMatcher(nestedNameSpecifier(
-                     specifiesType(hasDeclaration(recordDecl(hasName("A")))))))
-          .getTypedMatcher<NestedNameSpecifierLoc>();
-
-  Code = "const double * x = 0;";
-  EXPECT_TRUE(matches(Code, DeclDecl));
-  EXPECT_FALSE(matches(Code, NNSL));
-
-  Code = "struct A { struct B {}; }; A::B a_b;";
-  EXPECT_FALSE(matches(Code, DeclDecl));
-  EXPECT_TRUE(matches(Code, NNSL));
-}
-
-TEST_F(RegistryTest, PolymorphicMatchers) {
-  const VariantMatcher IsDefinition = constructMatcher("isDefinition");
-  Matcher<Decl> Var =
-      constructMatcher("varDecl", IsDefinition).getTypedMatcher<Decl>();
-  Matcher<Decl> Class =
-      constructMatcher("recordDecl", IsDefinition).getTypedMatcher<Decl>();
-  Matcher<Decl> Func =
-      constructMatcher("functionDecl", IsDefinition).getTypedMatcher<Decl>();
-  EXPECT_TRUE(matches("int a;", Var));
-  EXPECT_FALSE(matches("extern int a;", Var));
-  EXPECT_TRUE(matches("class A {};", Class));
-  EXPECT_FALSE(matches("class A;", Class));
-  EXPECT_TRUE(matches("void f(){};", Func));
-  EXPECT_FALSE(matches("void f();", Func));
-
-  Matcher<Decl> Anything = constructMatcher("anything").getTypedMatcher<Decl>();
-  Matcher<Decl> RecordDecl = constructMatcher(
-      "recordDecl", constructMatcher("hasName", StringRef("Foo")),
-      VariantMatcher::SingleMatcher(Anything)).getTypedMatcher<Decl>();
-
-  EXPECT_TRUE(matches("int Foo;", Anything));
-  EXPECT_TRUE(matches("class Foo {};", Anything));
-  EXPECT_TRUE(matches("void Foo(){};", Anything));
-  EXPECT_FALSE(matches("int Foo;", RecordDecl));
-  EXPECT_TRUE(matches("class Foo {};", RecordDecl));
-  EXPECT_FALSE(matches("void Foo(){};", RecordDecl));
-
-  Matcher<Stmt> ConstructExpr = constructMatcher(
-      "cxxConstructExpr",
-      constructMatcher(
-          "hasDeclaration",
-          constructMatcher(
-              "cxxMethodDecl",
-              constructMatcher(
-                  "ofClass", constructMatcher("hasName", StringRef("Foo"))))))
-                                    .getTypedMatcher<Stmt>();
-  EXPECT_FALSE(matches("class Foo { public: Foo(); };", ConstructExpr));
-  EXPECT_TRUE(
-      matches("class Foo { public: Foo(); }; Foo foo = Foo();", ConstructExpr));
-}
-
-TEST_F(RegistryTest, TemplateArgument) {
-  Matcher<Decl> HasTemplateArgument = constructMatcher(
-      "classTemplateSpecializationDecl",
-      constructMatcher(
-          "hasAnyTemplateArgument",
-          constructMatcher("refersToType",
-                           constructMatcher("asString", StringRef("int")))))
-      .getTypedMatcher<Decl>();
-  EXPECT_TRUE(matches("template<typename T> class A {}; A<int> a;",
-                      HasTemplateArgument));
-  EXPECT_FALSE(matches("template<typename T> class A {}; A<char> a;",
-                       HasTemplateArgument));
-}
-
-TEST_F(RegistryTest, TypeTraversal) {
-  Matcher<Type> M = constructMatcher(
-      "pointerType",
-      constructMatcher("pointee", constructMatcher("isConstQualified"),
-                       constructMatcher("isInteger"))).getTypedMatcher<Type>();
-  EXPECT_FALSE(matches("int *a;", M));
-  EXPECT_TRUE(matches("int const *b;", M));
-
-  M = constructMatcher(
-      "arrayType",
-      constructMatcher("hasElementType", constructMatcher("builtinType")))
-      .getTypedMatcher<Type>();
-  EXPECT_FALSE(matches("struct A{}; A a[7];;", M));
-  EXPECT_TRUE(matches("int b[7];", M));
-}
-
-TEST_F(RegistryTest, CXXBaseSpecifier) {
-  // TODO: rewrite with top-level cxxBaseSpecifier matcher when available
-  DeclarationMatcher ClassHasAnyDirectBase =
-      constructMatcher("cxxRecordDecl",
-                       constructMatcher("hasDirectBase",
-                                        constructMatcher("cxxBaseSpecifier")))
-          .getTypedMatcher<Decl>();
-  EXPECT_TRUE(matches("class X {}; class Y : X {};", ClassHasAnyDirectBase));
-  EXPECT_TRUE(notMatches("class X {};", ClassHasAnyDirectBase));
-}
-
-TEST_F(RegistryTest, CXXCtorInitializer) {
-  Matcher<Decl> CtorDecl = constructMatcher(
-      "cxxConstructorDecl",
-      constructMatcher(
-          "hasAnyConstructorInitializer",
-          constructMatcher("forField",
-                           constructMatcher("hasName", StringRef("foo")))))
-      .getTypedMatcher<Decl>();
-  EXPECT_TRUE(matches("struct Foo { Foo() : foo(1) {} int foo; };", CtorDecl));
-  EXPECT_FALSE(matches("struct Foo { Foo() {} int foo; };", CtorDecl));
-  EXPECT_FALSE(matches("struct Foo { Foo() : bar(1) {} int bar; };", CtorDecl));
-}
-
-TEST_F(RegistryTest, Adaptative) {
-  Matcher<Decl> D = constructMatcher(
-      "recordDecl",
-      constructMatcher(
-          "has",
-          constructMatcher("recordDecl",
-                           constructMatcher("hasName", StringRef("X")))))
-      .getTypedMatcher<Decl>();
-  EXPECT_TRUE(matches("class X {};", D));
-  EXPECT_TRUE(matches("class Y { class X {}; };", D));
-  EXPECT_FALSE(matches("class Y { class Z {}; };", D));
-
-  Matcher<Stmt> S = constructMatcher(
-      "forStmt",
-      constructMatcher(
-          "hasDescendant",
-          constructMatcher("varDecl",
-                           constructMatcher("hasName", StringRef("X")))))
-      .getTypedMatcher<Stmt>();
-  EXPECT_TRUE(matches("void foo() { for(int X;;); }", S));
-  EXPECT_TRUE(matches("void foo() { for(;;) { int X; } }", S));
-  EXPECT_FALSE(matches("void foo() { for(;;); }", S));
-  EXPECT_FALSE(matches("void foo() { if (int X = 0){} }", S));
-
-  S = constructMatcher(
-      "compoundStmt", constructMatcher("hasParent", constructMatcher("ifStmt")))
-      .getTypedMatcher<Stmt>();
-  EXPECT_TRUE(matches("void foo() { if (true) { int x = 42; } }", S));
-  EXPECT_FALSE(matches("void foo() { if (true) return; }", S));
-}
-
-TEST_F(RegistryTest, VariadicOp) {
-  Matcher<Decl> D = constructMatcher(
-      "anyOf",
-      constructMatcher("recordDecl",
-                       constructMatcher("hasName", StringRef("Foo"))),
-      constructMatcher("functionDecl",
-                       constructMatcher("hasName", StringRef("foo"))))
-      .getTypedMatcher<Decl>();
-
-  EXPECT_TRUE(matches("void foo(){}", D));
-  EXPECT_TRUE(matches("struct Foo{};", D));
-  EXPECT_FALSE(matches("int i = 0;", D));
-
-  D = constructMatcher(
-      "allOf", constructMatcher("recordDecl"),
-      constructMatcher(
-          "namedDecl",
-          constructMatcher("anyOf",
-                           constructMatcher("hasName", StringRef("Foo")),
-                           constructMatcher("hasName", StringRef("Bar")))))
-      .getTypedMatcher<Decl>();
-
-  EXPECT_FALSE(matches("void foo(){}", D));
-  EXPECT_TRUE(matches("struct Foo{};", D));
-  EXPECT_FALSE(matches("int i = 0;", D));
-  EXPECT_TRUE(matches("class Bar{};", D));
-  EXPECT_FALSE(matches("class OtherBar{};", D));
-
-  D = recordDecl(
-      has(fieldDecl(hasName("Foo"))),
-      constructMatcher(
-          "unless",
-          constructMatcher("namedDecl",
-                           constructMatcher("hasName", StringRef("Bar"))))
-          .getTypedMatcher<Decl>());
-
-  EXPECT_FALSE(matches("class Bar{ int Foo; };", D));
-  EXPECT_TRUE(matches("class OtherBar{ int Foo; };", D));
-
-  D = constructMatcher(
-          "namedDecl", constructMatcher("hasName", StringRef("Foo")),
-          constructMatcher("unless", constructMatcher("recordDecl")))
-          .getTypedMatcher<Decl>();
-  EXPECT_TRUE(matches("void Foo(){}", D));
-  EXPECT_TRUE(notMatches("struct Foo {};", D));
-}
-
-TEST_F(RegistryTest, Errors) {
-  // Incorrect argument count.
-  std::unique_ptr<Diagnostics> Error(new Diagnostics());
-  EXPECT_TRUE(constructMatcher("hasInitializer", Error.get()).isNull());
-  EXPECT_EQ("Incorrect argument count. (Expected = 1) != (Actual = 0)",
-            Error->toString());
-  Error.reset(new Diagnostics());
-  EXPECT_TRUE(constructMatcher("isArrow", StringRef(), Error.get()).isNull());
-  EXPECT_EQ("Incorrect argument count. (Expected = 0) != (Actual = 1)",
-            Error->toString());
-  Error.reset(new Diagnostics());
-  EXPECT_TRUE(constructMatcher("anyOf", Error.get()).isNull());
-  EXPECT_EQ("Incorrect argument count. (Expected = (2, )) != (Actual = 0)",
-            Error->toString());
-  Error.reset(new Diagnostics());
-  EXPECT_TRUE(constructMatcher("unless", StringRef(), StringRef(),
-                               Error.get()).isNull());
-  EXPECT_EQ("Incorrect argument count. (Expected = (1, 1)) != (Actual = 2)",
-            Error->toString());
-
-  // Bad argument type
-  Error.reset(new Diagnostics());
-  EXPECT_TRUE(constructMatcher("ofClass", StringRef(), Error.get()).isNull());
-  EXPECT_EQ("Incorrect type for arg 1. (Expected = Matcher<CXXRecordDecl>) != "
-            "(Actual = String)",
-            Error->toString());
-  Error.reset(new Diagnostics());
-  EXPECT_TRUE(
-      constructMatcher("cxxRecordDecl", constructMatcher("cxxRecordDecl"),
-                       constructMatcher("parameterCountIs", 3), Error.get())
-          .isNull());
-  EXPECT_EQ("Incorrect type for arg 2. (Expected = Matcher<CXXRecordDecl>) != "
-            "(Actual = Matcher<FunctionDecl|FunctionProtoType>)",
-            Error->toString());
-
-  // Bad argument type with variadic.
-  Error.reset(new Diagnostics());
-  EXPECT_TRUE(constructMatcher("anyOf", StringRef(), StringRef(),
-                               Error.get()).isNull());
-  EXPECT_EQ(
-      "Incorrect type for arg 1. (Expected = Matcher<>) != (Actual = String)",
-      Error->toString());
-  Error.reset(new Diagnostics());
-  EXPECT_TRUE(constructMatcher(
-      "cxxRecordDecl",
-      constructMatcher("allOf",
-                       constructMatcher("isDerivedFrom", StringRef("FOO")),
-                       constructMatcher("isArrow")),
-      Error.get()).isNull());
-  EXPECT_EQ("Incorrect type for arg 1. "
-            "(Expected = Matcher<CXXRecordDecl>) != "
-            "(Actual = Matcher<CXXRecordDecl|ObjCInterfaceDecl>&Matcher"
-            "<MemberExpr|UnresolvedMemberExpr|CXXDependentScopeMemberExpr>)",
-            Error->toString());
-}
-
-TEST_F(RegistryTest, Completion) {
-  CompVector Comps = getCompletions();
-  // Overloaded
-  EXPECT_TRUE(hasCompletion(
-      Comps, "hasParent(",
-      "Matcher<NestedNameSpecifierLoc|TypeLoc|Decl|...> "
-      "hasParent(Matcher<NestedNameSpecifierLoc|TypeLoc|Decl|...>)"));
-  // Variadic.
-  EXPECT_TRUE(hasCompletion(Comps, "whileStmt(",
-                            "Matcher<Stmt> whileStmt(Matcher<WhileStmt>...)"));
-  // Polymorphic.
-  EXPECT_TRUE(hasCompletion(
-      Comps, "hasDescendant(",
-      "Matcher<NestedNameSpecifierLoc|QualType|TypeLoc|...> "
-      "hasDescendant(Matcher<NestedNameSpecifierLoc|QualType|TypeLoc|...>)"));
-
-  CompVector WhileComps = getCompletions("whileStmt", 0);
-
-  EXPECT_TRUE(hasCompletion(WhileComps, "hasBody(",
-                            "Matcher<WhileStmt> hasBody(Matcher<Stmt>)"));
-  EXPECT_TRUE(hasCompletion(
-      WhileComps, "hasParent(",
-      "Matcher<Stmt> "
-      "hasParent(Matcher<NestedNameSpecifierLoc|TypeLoc|Decl|...>)"));
-  EXPECT_TRUE(
-      hasCompletion(WhileComps, "allOf(", "Matcher<T> allOf(Matcher<T>...)"));
-
-  EXPECT_FALSE(hasCompletion(WhileComps, "whileStmt("));
-  EXPECT_FALSE(hasCompletion(WhileComps, "ifStmt("));
-
-  CompVector AllOfWhileComps =
-      getCompletions("allOf", 0, "whileStmt", 0);
-  ASSERT_EQ(AllOfWhileComps.size(), WhileComps.size());
-  EXPECT_TRUE(std::equal(WhileComps.begin(), WhileComps.end(),
-                         AllOfWhileComps.begin()));
-
-  CompVector DeclWhileComps =
-      getCompletions("decl", 0, "whileStmt", 0);
-  EXPECT_EQ(0u, DeclWhileComps.size());
-
-  CompVector NamedDeclComps = getCompletions("namedDecl", 0);
-  EXPECT_TRUE(
-      hasCompletion(NamedDeclComps, "isPublic()", "Matcher<Decl> isPublic()"));
-  EXPECT_TRUE(hasCompletion(NamedDeclComps, "hasName(\"",
-                            "Matcher<NamedDecl> hasName(string)"));
-
-  // Heterogeneous overloads.
-  Comps = getCompletions("classTemplateSpecializationDecl", 0);
-  EXPECT_TRUE(hasCompletion(
-      Comps, "isSameOrDerivedFrom(",
-      "Matcher<CXXRecordDecl> isSameOrDerivedFrom(string|Matcher<NamedDecl>)"));
-}
-
-TEST_F(RegistryTest, MatcherBuilder) {
-  auto Ctor = *lookupMatcherCtor("mapAnyOf");
-  EXPECT_TRUE(Registry::isBuilderMatcher(Ctor));
-  auto BuiltCtor = Registry::buildMatcherCtor(Ctor, {}, Args(ASTNodeKind::getFromNodeKind<WhileStmt>(), ASTNodeKind::getFromNodeKind<ForStmt>()), nullptr);
-  EXPECT_TRUE(BuiltCtor.get());
-  auto LoopMatcher = Registry::constructMatcher(BuiltCtor.get(), SourceRange(), Args(), nullptr).getTypedMatcher<Stmt>();
-  EXPECT_TRUE(matches("void f() { for (;;) {} }", LoopMatcher));
-  EXPECT_TRUE(matches("void f() { while (true) {} }", LoopMatcher));
-  EXPECT_FALSE(matches("void f() { if (true) {} }", LoopMatcher));
-
-  auto NotBuiltCtor = Registry::buildMatcherCtor(Ctor, {}, Args(ASTNodeKind::getFromNodeKind<FunctionDecl>(), ASTNodeKind::getFromNodeKind<ForStmt>()), nullptr);
-  EXPECT_FALSE(NotBuiltCtor.get());
-}
-
-TEST_F(RegistryTest, NodeType) {
-  EXPECT_TRUE(Registry::nodeMatcherType(*lookupMatcherCtor("callExpr")).isSame(ASTNodeKind::getFromNodeKind<CallExpr>()));
-  EXPECT_TRUE(Registry::nodeMatcherType(*lookupMatcherCtor("has")).isNone());
-  EXPECT_TRUE(Registry::nodeMatcherType(*lookupMatcherCtor("allOf")).isNone());
-}
-
-TEST_F(RegistryTest, HasArgs) {
-  Matcher<Decl> Value = constructMatcher(
-      "decl", constructMatcher("hasAttr", StringRef("attr::WarnUnused")))
-      .getTypedMatcher<Decl>();
-  EXPECT_TRUE(matches("struct __attribute__((warn_unused)) X {};", Value));
-  EXPECT_FALSE(matches("struct X {};", Value));
-}
-
-TEST_F(RegistryTest, ParenExpr) {
-  Matcher<Stmt> Value = constructMatcher("parenExpr").getTypedMatcher<Stmt>();
-  EXPECT_TRUE(matches("int i = (1);", traverse(TK_AsIs, Value)));
-  EXPECT_FALSE(matches("int i = 1;", traverse(TK_AsIs, Value)));
-}
-
-TEST_F(RegistryTest, EqualsMatcher) {
-  Matcher<Stmt> BooleanStmt = constructMatcher(
-      "cxxBoolLiteral", constructMatcher("equals", VariantValue(true)))
-      .getTypedMatcher<Stmt>();
-  EXPECT_TRUE(matches("bool x = true;", BooleanStmt));
-  EXPECT_FALSE(matches("bool x = false;", BooleanStmt));
-  EXPECT_FALSE(matches("bool x = 0;", BooleanStmt));
-
-  BooleanStmt = constructMatcher(
-      "cxxBoolLiteral", constructMatcher("equals", VariantValue(0)))
-      .getTypedMatcher<Stmt>();
-  EXPECT_TRUE(matches("bool x = false;", BooleanStmt));
-  EXPECT_FALSE(matches("bool x = true;", BooleanStmt));
-  EXPECT_FALSE(matches("bool x = 0;", BooleanStmt));
-
-  Matcher<Stmt> DoubleStmt = constructMatcher(
-      "floatLiteral", constructMatcher("equals", VariantValue(1.2)))
-      .getTypedMatcher<Stmt>();
-  EXPECT_TRUE(matches("double x = 1.2;", DoubleStmt));
-#if 0
-  // FIXME floatLiteral matching should work regardless of suffix.
-  EXPECT_TRUE(matches("double x = 1.2f;", DoubleStmt));
-  EXPECT_TRUE(matches("double x = 1.2l;", DoubleStmt));
-#endif
-  EXPECT_TRUE(matches("double x = 12e-1;", DoubleStmt));
-  EXPECT_FALSE(matches("double x = 1.23;", DoubleStmt));
-
-  Matcher<Stmt> IntegerStmt = constructMatcher(
-      "integerLiteral", constructMatcher("equals", VariantValue(42)))
-      .getTypedMatcher<Stmt>();
-  EXPECT_TRUE(matches("int x = 42;", IntegerStmt));
-  EXPECT_FALSE(matches("int x = 1;", IntegerStmt));
-
-  Matcher<Stmt> CharStmt = constructMatcher(
-      "characterLiteral", constructMatcher("equals", VariantValue('x')))
-      .getTypedMatcher<Stmt>();
-  EXPECT_TRUE(matches("int x = 'x';", CharStmt));
-  EXPECT_TRUE(matches("int x = L'x';", CharStmt));
-  EXPECT_TRUE(matches("int x = u'x';", CharStmt));
-  EXPECT_TRUE(matches("int x = U'x';", CharStmt));
-  EXPECT_FALSE(matches("int x = 120;", CharStmt));
-}
-
-} // end anonymous namespace
-} // end namespace dynamic
-} // end namespace ast_matchers
-} // end namespace clang
diff --git a/gnu/llvm/clang/unittests/ASTMatchers/Dynamic/VariantValueTest.cpp b/gnu/llvm/clang/unittests/ASTMatchers/Dynamic/VariantValueTest.cpp
deleted file mode 100644
index c62a6b385e2..00000000000
--- a/gnu/llvm/clang/unittests/ASTMatchers/Dynamic/VariantValueTest.cpp
+++ /dev/null
@@ -1,209 +0,0 @@
-//===- unittest/ASTMatchers/Dynamic/VariantValueTest.cpp - VariantValue unit tests -===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===-----------------------------------------------------------------------------===//
-
-#include "../ASTMatchersTest.h"
-#include "clang/ASTMatchers/Dynamic/VariantValue.h"
-#include "gtest/gtest.h"
-
-namespace clang {
-namespace ast_matchers {
-namespace dynamic {
-namespace {
-
-TEST(VariantValueTest, Unsigned) {
-  const unsigned kUnsigned = 17;
-  VariantValue Value = kUnsigned;
-
-  EXPECT_TRUE(Value.isUnsigned());
-  EXPECT_EQ(kUnsigned, Value.getUnsigned());
-
-  EXPECT_TRUE(Value.hasValue());
-  EXPECT_FALSE(Value.isString());
-  EXPECT_FALSE(Value.isMatcher());
-}
-
-TEST(VariantValueTest, String) {
-  const StringRef kString = "string";
-  VariantValue Value = kString;
-
-  EXPECT_TRUE(Value.isString());
-  EXPECT_EQ(kString, Value.getString());
-  EXPECT_EQ("String", Value.getTypeAsString());
-
-  EXPECT_TRUE(Value.hasValue());
-  EXPECT_FALSE(Value.isUnsigned());
-  EXPECT_FALSE(Value.isMatcher());
-}
-
-TEST(VariantValueTest, DynTypedMatcher) {
-  VariantValue Value = VariantMatcher::SingleMatcher(stmt());
-
-  EXPECT_TRUE(Value.hasValue());
-  EXPECT_FALSE(Value.isUnsigned());
-  EXPECT_FALSE(Value.isString());
-
-  EXPECT_TRUE(Value.isMatcher());
-  EXPECT_FALSE(Value.getMatcher().hasTypedMatcher<Decl>());
-  EXPECT_TRUE(Value.getMatcher().hasTypedMatcher<UnaryOperator>());
-  EXPECT_EQ("Matcher<Stmt>", Value.getTypeAsString());
-
-  // Can only convert to compatible matchers.
-  Value = VariantMatcher::SingleMatcher(recordDecl());
-  EXPECT_TRUE(Value.isMatcher());
-  EXPECT_TRUE(Value.getMatcher().hasTypedMatcher<Decl>());
-  EXPECT_FALSE(Value.getMatcher().hasTypedMatcher<UnaryOperator>());
-  EXPECT_EQ("Matcher<Decl>", Value.getTypeAsString());
-
-  Value = VariantMatcher::SingleMatcher(ignoringImpCasts(expr()));
-  EXPECT_TRUE(Value.isMatcher());
-  EXPECT_FALSE(Value.getMatcher().hasTypedMatcher<Decl>());
-  EXPECT_FALSE(Value.getMatcher().hasTypedMatcher<Stmt>());
-  EXPECT_TRUE(Value.getMatcher().hasTypedMatcher<Expr>());
-  EXPECT_TRUE(Value.getMatcher().hasTypedMatcher<IntegerLiteral>());
-  EXPECT_FALSE(Value.getMatcher().hasTypedMatcher<GotoStmt>());
-  EXPECT_EQ("Matcher<Expr>", Value.getTypeAsString());
-}
-
-TEST(VariantValueTest, Assignment) {
-  VariantValue Value = StringRef("A");
-  EXPECT_TRUE(Value.isString());
-  EXPECT_EQ("A", Value.getString());
-  EXPECT_TRUE(Value.hasValue());
-  EXPECT_FALSE(Value.isBoolean());
-  EXPECT_FALSE(Value.isDouble());
-  EXPECT_FALSE(Value.isUnsigned());
-  EXPECT_FALSE(Value.isMatcher());
-  EXPECT_EQ("String", Value.getTypeAsString());
-
-  Value = VariantMatcher::SingleMatcher(recordDecl());
-  EXPECT_TRUE(Value.hasValue());
-  EXPECT_FALSE(Value.isBoolean());
-  EXPECT_FALSE(Value.isDouble());
-  EXPECT_FALSE(Value.isUnsigned());
-  EXPECT_FALSE(Value.isString());
-  EXPECT_TRUE(Value.isMatcher());
-  EXPECT_TRUE(Value.getMatcher().hasTypedMatcher<Decl>());
-  EXPECT_FALSE(Value.getMatcher().hasTypedMatcher<UnaryOperator>());
-  EXPECT_EQ("Matcher<Decl>", Value.getTypeAsString());
-
-  Value = true;
-  EXPECT_TRUE(Value.isBoolean());
-  EXPECT_EQ(true, Value.getBoolean());
-  EXPECT_TRUE(Value.hasValue());
-  EXPECT_FALSE(Value.isUnsigned());
-  EXPECT_FALSE(Value.isMatcher());
-  EXPECT_FALSE(Value.isString());
-
-  Value = 3.14;
-  EXPECT_TRUE(Value.isDouble());
-  EXPECT_EQ(3.14, Value.getDouble());
-  EXPECT_TRUE(Value.hasValue());
-  EXPECT_FALSE(Value.isBoolean());
-  EXPECT_FALSE(Value.isUnsigned());
-  EXPECT_FALSE(Value.isMatcher());
-  EXPECT_FALSE(Value.isString());
-
-  Value = 17;
-  EXPECT_TRUE(Value.isUnsigned());
-  EXPECT_EQ(17U, Value.getUnsigned());
-  EXPECT_FALSE(Value.isBoolean());
-  EXPECT_FALSE(Value.isDouble());
-  EXPECT_TRUE(Value.hasValue());
-  EXPECT_FALSE(Value.isMatcher());
-  EXPECT_FALSE(Value.isString());
-
-  Value = VariantValue();
-  EXPECT_FALSE(Value.hasValue());
-  EXPECT_FALSE(Value.isBoolean());
-  EXPECT_FALSE(Value.isDouble());
-  EXPECT_FALSE(Value.isUnsigned());
-  EXPECT_FALSE(Value.isString());
-  EXPECT_FALSE(Value.isMatcher());
-  EXPECT_EQ("Nothing", Value.getTypeAsString());
-}
-
-TEST(VariantValueTest, ImplicitBool) {
-  VariantValue Value;
-  bool IfTrue = false;
-  if (Value) {
-    IfTrue = true;
-  }
-  EXPECT_FALSE(IfTrue);
-  EXPECT_TRUE(!Value);
-
-  Value = StringRef();
-  IfTrue = false;
-  if (Value) {
-    IfTrue = true;
-  }
-  EXPECT_TRUE(IfTrue);
-  EXPECT_FALSE(!Value);
-}
-
-TEST(VariantValueTest, Matcher) {
-  EXPECT_TRUE(matches("class X {};", VariantValue(VariantMatcher::SingleMatcher(
-                                                      recordDecl(hasName("X"))))
-                                         .getMatcher()
-                                         .getTypedMatcher<Decl>()));
-  EXPECT_TRUE(
-      matches("int x;", VariantValue(VariantMatcher::SingleMatcher(varDecl()))
-                            .getMatcher()
-                            .getTypedMatcher<Decl>()));
-  EXPECT_TRUE(
-      matches("int foo() { return 1 + 1; }",
-              VariantValue(VariantMatcher::SingleMatcher(functionDecl()))
-                  .getMatcher()
-                  .getTypedMatcher<Decl>()));
-  // Can't get the wrong matcher.
-  EXPECT_FALSE(VariantValue(VariantMatcher::SingleMatcher(varDecl()))
-                   .getMatcher()
-                   .hasTypedMatcher<Stmt>());
-#if !defined(NDEBUG) && GTEST_HAS_DEATH_TEST
-  // Trying to get the wrong matcher fails an assertion in Matcher<T>.  We don't
-  // do this test when building with MSVC because its debug C runtime prints the
-  // assertion failure message as a wide string, which gtest doesn't understand.
-  EXPECT_DEATH(VariantValue(VariantMatcher::SingleMatcher(varDecl()))
-                   .getMatcher()
-                   .getTypedMatcher<Stmt>(),
-               "hasTypedMatcher");
-#endif
-
-  EXPECT_FALSE(matches(
-      "int x;", VariantValue(VariantMatcher::SingleMatcher(functionDecl()))
-                    .getMatcher()
-                    .getTypedMatcher<Decl>()));
-  EXPECT_FALSE(
-      matches("int foo() { return 1 + 1; }",
-              VariantValue(VariantMatcher::SingleMatcher(declRefExpr()))
-                  .getMatcher()
-                  .getTypedMatcher<Stmt>()));
-}
-
-TEST(VariantValueTest, NodeKind) {
-  VariantValue Value = ASTNodeKind::getFromNodeKind<Stmt>();
-  EXPECT_TRUE(Value.isNodeKind());
-  EXPECT_TRUE(Value.getNodeKind().isSame(ASTNodeKind::getFromNodeKind<Stmt>()));
-
-  Value = ASTNodeKind::getFromNodeKind<CXXMethodDecl>();
-  EXPECT_TRUE(Value.isNodeKind());
-  EXPECT_TRUE(Value.getNodeKind().isSame(
-      ASTNodeKind::getFromNodeKind<CXXMethodDecl>()));
-
-  Value.setNodeKind(ASTNodeKind::getFromNodeKind<PointerType>());
-  EXPECT_TRUE(Value.isNodeKind());
-  EXPECT_TRUE(
-      Value.getNodeKind().isSame(ASTNodeKind::getFromNodeKind<PointerType>()));
-
-  Value = 42;
-  EXPECT_TRUE(!Value.isNodeKind());
-}
-
-} // end anonymous namespace
-} // end namespace dynamic
-} // end namespace ast_matchers
-} // end namespace clang
diff --git a/gnu/llvm/clang/unittests/ASTMatchers/GtestMatchersTest.cpp b/gnu/llvm/clang/unittests/ASTMatchers/GtestMatchersTest.cpp
deleted file mode 100644
index 5ee67a9e548..00000000000
--- a/gnu/llvm/clang/unittests/ASTMatchers/GtestMatchersTest.cpp
+++ /dev/null
@@ -1,418 +0,0 @@
-//===- unittests/ASTMatchers/GTestMatchersTest.cpp - GTest matcher unit tests //
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "ASTMatchersTest.h"
-#include "clang/ASTMatchers/ASTMatchers.h"
-#include "clang/ASTMatchers/GtestMatchers.h"
-
-namespace clang {
-namespace ast_matchers {
-
-constexpr llvm::StringLiteral GtestMockDecls = R"cc(
-  static int testerr;
-
-#define GTEST_AMBIGUOUS_ELSE_BLOCKER_ \
-    switch (0)                          \
-    case 0:                             \
-    default:  // NOLINT
-
-#define GTEST_NONFATAL_FAILURE_(code) testerr = code
-
-#define GTEST_FATAL_FAILURE_(code) testerr = code
-
-#define GTEST_ASSERT_(expression, on_failure) \
-    GTEST_AMBIGUOUS_ELSE_BLOCKER_               \
-    if (const int gtest_ar = (expression))      \
-      ;                                         \
-    else                                        \
-      on_failure(gtest_ar)
-
-  // Internal macro for implementing {EXPECT|ASSERT}_PRED_FORMAT2.
-  // Don't use this in your code.
-#define GTEST_PRED_FORMAT2_(pred_format, v1, v2, on_failure) \
-    GTEST_ASSERT_(pred_format(#v1, #v2, v1, v2), on_failure)
-
-#define ASSERT_PRED_FORMAT2(pred_format, v1, v2) \
-    GTEST_PRED_FORMAT2_(pred_format, v1, v2, GTEST_FATAL_FAILURE_)
-#define EXPECT_PRED_FORMAT2(pred_format, v1, v2) \
-    GTEST_PRED_FORMAT2_(pred_format, v1, v2, GTEST_NONFATAL_FAILURE_)
-
-#define GTEST_PRED_FORMAT1_(pred_format, v1, on_failure) \
-  GTEST_ASSERT_(pred_format(#v1, v1), on_failure)
-
-#define EXPECT_PRED_FORMAT1(pred_format, v1) \
-  GTEST_PRED_FORMAT1_(pred_format, v1, GTEST_NONFATAL_FAILURE_)
-#define ASSERT_PRED_FORMAT1(pred_format, v1) \
-  GTEST_PRED_FORMAT1_(pred_format, v1, GTEST_FATAL_FAILURE_)
-
-#define EXPECT_EQ(val1, val2) \
-    EXPECT_PRED_FORMAT2(::testing::internal::EqHelper::Compare, val1, val2)
-#define EXPECT_NE(val1, val2) \
-    EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperNE, val1, val2)
-#define EXPECT_GE(val1, val2) \
-    EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperGE, val1, val2)
-#define EXPECT_GT(val1, val2) \
-    EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperGT, val1, val2)
-#define EXPECT_LE(val1, val2) \
-    EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperLE, val1, val2)
-#define EXPECT_LT(val1, val2) \
-    EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperLT, val1, val2)
-
-#define ASSERT_THAT(value, matcher) \
-  ASSERT_PRED_FORMAT1(              \
-      ::testing::internal::MakePredicateFormatterFromMatcher(matcher), value)
-#define EXPECT_THAT(value, matcher) \
-  EXPECT_PRED_FORMAT1(              \
-      ::testing::internal::MakePredicateFormatterFromMatcher(matcher), value)
-
-#define ASSERT_EQ(val1, val2) \
-    ASSERT_PRED_FORMAT2(::testing::internal::EqHelper::Compare, val1, val2)
-#define ASSERT_NE(val1, val2) \
-    ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperNE, val1, val2)
-
-#define GMOCK_ON_CALL_IMPL_(mock_expr, Setter, call)                    \
-  ((mock_expr).gmock_##call)(::testing::internal::GetWithoutMatchers(), \
-                             nullptr)                                   \
-      .Setter(nullptr, 0, #mock_expr, #call)
-
-#define ON_CALL(obj, call) \
-  GMOCK_ON_CALL_IMPL_(obj, InternalDefaultActionSetAt, call)
-
-#define EXPECT_CALL(obj, call) \
-  GMOCK_ON_CALL_IMPL_(obj, InternalExpectedAt, call)
-
-  namespace testing {
-  namespace internal {
-  class EqHelper {
-   public:
-    // This templatized version is for the general case.
-    template <typename T1, typename T2>
-    static int Compare(const char* lhs_expression, const char* rhs_expression,
-                       const T1& lhs, const T2& rhs) {
-      return 0;
-    }
-  };
-  template <typename T1, typename T2>
-  int CmpHelperNE(const char* expr1, const char* expr2, const T1& val1,
-                  const T2& val2) {
-    return 0;
-  }
-  template <typename T1, typename T2>
-  int CmpHelperGE(const char* expr1, const char* expr2, const T1& val1,
-                  const T2& val2) {
-    return 0;
-  }
-  template <typename T1, typename T2>
-  int CmpHelperGT(const char* expr1, const char* expr2, const T1& val1,
-                  const T2& val2) {
-    return 0;
-  }
-  template <typename T1, typename T2>
-  int CmpHelperLE(const char* expr1, const char* expr2, const T1& val1,
-                  const T2& val2) {
-    return 0;
-  }
-  template <typename T1, typename T2>
-  int CmpHelperLT(const char* expr1, const char* expr2, const T1& val1,
-                  const T2& val2) {
-    return 0;
-  }
-
-  // For implementing ASSERT_THAT() and EXPECT_THAT().  The template
-  // argument M must be a type that can be converted to a matcher.
-  template <typename M>
-  class PredicateFormatterFromMatcher {
-   public:
-    explicit PredicateFormatterFromMatcher(M m) : matcher_(m) {}
-
-    // This template () operator allows a PredicateFormatterFromMatcher
-    // object to act as a predicate-formatter suitable for using with
-    // Google Test's EXPECT_PRED_FORMAT1() macro.
-    template <typename T>
-    int operator()(const char* value_text, const T& x) const {
-      return 0;
-    }
-
-   private:
-    const M matcher_;
-  };
-
-  template <typename M>
-  inline PredicateFormatterFromMatcher<M> MakePredicateFormatterFromMatcher(
-      M matcher) {
-    return PredicateFormatterFromMatcher<M>(matcher);
-  }
-
-  bool GetWithoutMatchers() { return false; }
-
-  template <typename F>
-  class MockSpec {
-   public:
-    MockSpec<F>() {}
-
-    bool InternalDefaultActionSetAt(
-        const char* file, int line, const char* obj, const char* call) {
-      return false;
-    }
-
-    bool InternalExpectedAt(
-        const char* file, int line, const char* obj, const char* call) {
-      return false;
-    }
-
-    MockSpec<F> operator()(bool, void*) {
-      return *this;
-    }
-  };  // class MockSpec
-
-  }  // namespace internal
-
-  template <typename T>
-  int StrEq(T val) {
-    return 0;
-  }
-  template <typename T>
-  int Eq(T val) {
-    return 0;
-  }
-
-  }  // namespace testing
-
-  class Mock {
-    public:
-    Mock() {}
-    testing::internal::MockSpec<int> gmock_TwoArgsMethod(int, int) {
-      return testing::internal::MockSpec<int>();
-    }
-    testing::internal::MockSpec<int> gmock_TwoArgsMethod(bool, void*) {
-      return testing::internal::MockSpec<int>();
-    }
-  };  // class Mock
-)cc";
-
-static std::string wrapGtest(llvm::StringRef Input) {
-  return (GtestMockDecls + Input).str();
-}
-
-TEST(GtestAssertTest, ShouldMatchAssert) {
-  std::string Input = R"cc(
-    void Test() { ASSERT_EQ(1010, 4321); }
-  )cc";
-  EXPECT_TRUE(matches(wrapGtest(Input),
-                      gtestAssert(GtestCmp::Eq, integerLiteral(equals(1010)),
-                                  integerLiteral(equals(4321)))));
-}
-
-TEST(GtestAssertTest, ShouldNotMatchExpect) {
-  std::string Input = R"cc(
-    void Test() { EXPECT_EQ(2, 3); }
-  )cc";
-  EXPECT_TRUE(
-      notMatches(wrapGtest(Input), gtestAssert(GtestCmp::Eq, expr(), expr())));
-}
-
-TEST(GtestAssertTest, ShouldMatchNestedAssert) {
-  std::string Input = R"cc(
-    #define WRAPPER(a, b) ASSERT_EQ(a, b)
-    void Test() { WRAPPER(2, 3); }
-  )cc";
-  EXPECT_TRUE(
-      matches(wrapGtest(Input), gtestAssert(GtestCmp::Eq, expr(), expr())));
-}
-
-TEST(GtestExpectTest, ShouldMatchExpect) {
-  std::string Input = R"cc(
-    void Test() { EXPECT_EQ(1010, 4321); }
-  )cc";
-  EXPECT_TRUE(matches(wrapGtest(Input),
-                      gtestExpect(GtestCmp::Eq, integerLiteral(equals(1010)),
-                                  integerLiteral(equals(4321)))));
-}
-
-TEST(GtestExpectTest, ShouldNotMatchAssert) {
-  std::string Input = R"cc(
-    void Test() { ASSERT_EQ(2, 3); }
-  )cc";
-  EXPECT_TRUE(
-      notMatches(wrapGtest(Input), gtestExpect(GtestCmp::Eq, expr(), expr())));
-}
-
-TEST(GtestExpectTest, NeShouldMatchExpectNe) {
-  std::string Input = R"cc(
-    void Test() { EXPECT_NE(2, 3); }
-  )cc";
-  EXPECT_TRUE(
-      matches(wrapGtest(Input), gtestExpect(GtestCmp::Ne, expr(), expr())));
-}
-
-TEST(GtestExpectTest, LeShouldMatchExpectLe) {
-  std::string Input = R"cc(
-    void Test() { EXPECT_LE(2, 3); }
-  )cc";
-  EXPECT_TRUE(
-      matches(wrapGtest(Input), gtestExpect(GtestCmp::Le, expr(), expr())));
-}
-
-TEST(GtestExpectTest, LtShouldMatchExpectLt) {
-  std::string Input = R"cc(
-    void Test() { EXPECT_LT(2, 3); }
-  )cc";
-  EXPECT_TRUE(
-      matches(wrapGtest(Input), gtestExpect(GtestCmp::Lt, expr(), expr())));
-}
-
-TEST(GtestExpectTest, GeShouldMatchExpectGe) {
-  std::string Input = R"cc(
-    void Test() { EXPECT_GE(2, 3); }
-  )cc";
-  EXPECT_TRUE(
-      matches(wrapGtest(Input), gtestExpect(GtestCmp::Ge, expr(), expr())));
-}
-
-TEST(GtestExpectTest, GtShouldMatchExpectGt) {
-  std::string Input = R"cc(
-    void Test() { EXPECT_GT(2, 3); }
-  )cc";
-  EXPECT_TRUE(
-      matches(wrapGtest(Input), gtestExpect(GtestCmp::Gt, expr(), expr())));
-}
-
-TEST(GtestExpectTest, ThatShouldMatchAssertThat) {
-  std::string Input = R"cc(
-    using ::testing::Eq;
-    void Test() { ASSERT_THAT(2, Eq(2)); }
-  )cc";
-  EXPECT_TRUE(matches(
-      wrapGtest(Input),
-      gtestAssertThat(
-          expr(), callExpr(callee(functionDecl(hasName("::testing::Eq")))))));
-}
-
-TEST(GtestExpectTest, ThatShouldMatchExpectThat) {
-  std::string Input = R"cc(
-    using ::testing::Eq;
-    void Test() { EXPECT_THAT(2, Eq(2)); }
-  )cc";
-  EXPECT_TRUE(matches(
-      wrapGtest(Input),
-      gtestExpectThat(
-          expr(), callExpr(callee(functionDecl(hasName("::testing::Eq")))))));
-}
-
-TEST(GtestOnCallTest, CallShouldMatchOnCallWithoutParams1) {
-  std::string Input = R"cc(
-    void Test() {
-      Mock mock;
-      ON_CALL(mock, TwoArgsMethod);
-    }
-  )cc";
-  EXPECT_TRUE(matches(wrapGtest(Input),
-                      gtestOnCall(expr(hasType(cxxRecordDecl(hasName("Mock")))),
-                                  "TwoArgsMethod", MockArgs::None)));
-}
-
-TEST(GtestOnCallTest, CallShouldMatchOnCallWithoutParams2) {
-  std::string Input = R"cc(
-    void Test() {
-      Mock mock;
-      ON_CALL(mock, TwoArgsMethod);
-    }
-  )cc";
-  EXPECT_TRUE(matches(
-      wrapGtest(Input),
-      gtestOnCall(cxxMemberCallExpr(
-                      callee(functionDecl(hasName("gmock_TwoArgsMethod"))))
-                      .bind("mock_call"),
-                  MockArgs::None)));
-}
-
-TEST(GtestOnCallTest, CallShouldMatchOnCallWithParams1) {
-  std::string Input = R"cc(
-    void Test() {
-      Mock mock;
-      ON_CALL(mock, TwoArgsMethod(1, 2));
-    }
-  )cc";
-  EXPECT_TRUE(matches(wrapGtest(Input),
-                      gtestOnCall(expr(hasType(cxxRecordDecl(hasName("Mock")))),
-                                  "TwoArgsMethod", MockArgs::Some)));
-}
-
-TEST(GtestOnCallTest, CallShouldMatchOnCallWithParams2) {
-  std::string Input = R"cc(
-    void Test() {
-      Mock mock;
-      ON_CALL(mock, TwoArgsMethod(1, 2));
-    }
-  )cc";
-  EXPECT_TRUE(matches(
-      wrapGtest(Input),
-      gtestOnCall(cxxMemberCallExpr(
-                      callee(functionDecl(hasName("gmock_TwoArgsMethod"))))
-                      .bind("mock_call"),
-                  MockArgs::Some)));
-}
-
-TEST(GtestExpectCallTest, CallShouldMatchExpectCallWithoutParams1) {
-  std::string Input = R"cc(
-    void Test() {
-      Mock mock;
-      EXPECT_CALL(mock, TwoArgsMethod);
-    }
-  )cc";
-  EXPECT_TRUE(
-      matches(wrapGtest(Input),
-              gtestExpectCall(expr(hasType(cxxRecordDecl(hasName("Mock")))),
-                              "TwoArgsMethod", MockArgs::None)));
-}
-
-TEST(GtestExpectCallTest, CallShouldMatchExpectCallWithoutParams2) {
-  std::string Input = R"cc(
-    void Test() {
-      Mock mock;
-      EXPECT_CALL(mock, TwoArgsMethod);
-    }
-  )cc";
-  EXPECT_TRUE(matches(
-      wrapGtest(Input),
-      gtestExpectCall(cxxMemberCallExpr(
-                          callee(functionDecl(hasName("gmock_TwoArgsMethod"))))
-                          .bind("mock_call"),
-                      MockArgs::None)));
-}
-
-TEST(GtestExpectCallTest, CallShouldMatchExpectCallWithParams1) {
-  std::string Input = R"cc(
-    void Test() {
-      Mock mock;
-      EXPECT_CALL(mock, TwoArgsMethod(1, 2));
-    }
-  )cc";
-  EXPECT_TRUE(
-      matches(wrapGtest(Input),
-              gtestExpectCall(expr(hasType(cxxRecordDecl(hasName("Mock")))),
-                              "TwoArgsMethod", MockArgs::Some)));
-}
-
-TEST(GtestExpectCallTest, CallShouldMatchExpectCallWithParams2) {
-  std::string Input = R"cc(
-    void Test() {
-      Mock mock;
-      EXPECT_CALL(mock, TwoArgsMethod(1, 2));
-    }
-  )cc";
-  EXPECT_TRUE(matches(
-      wrapGtest(Input),
-      gtestExpectCall(cxxMemberCallExpr(
-                          callee(functionDecl(hasName("gmock_TwoArgsMethod"))))
-                          .bind("mock_call"),
-                      MockArgs::Some)));
-}
-
-} // end namespace ast_matchers
-} // end namespace clang
diff --git a/gnu/llvm/clang/unittests/Analysis/CFGBuildResult.h b/gnu/llvm/clang/unittests/Analysis/CFGBuildResult.h
deleted file mode 100644
index 4851d3d7fb6..00000000000
--- a/gnu/llvm/clang/unittests/Analysis/CFGBuildResult.h
+++ /dev/null
@@ -1,82 +0,0 @@
-//===- unittests/Analysis/CFGBuildResult.h - CFG tests --------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/ASTMatchers/ASTMatchFinder.h"
-#include "clang/Analysis/CFG.h"
-#include "clang/Tooling/Tooling.h"
-#include <memory>
-
-namespace clang {
-namespace analysis {
-
-class BuildResult {
-public:
-  enum Status {
-    ToolFailed,
-    ToolRan,
-    SawFunctionBody,
-    BuiltCFG,
-  };
-
-  BuildResult(Status S, const FunctionDecl *Func = nullptr,
-              std::unique_ptr<CFG> Cfg = nullptr,
-              std::unique_ptr<ASTUnit> AST = nullptr)
-      : S(S), Cfg(std::move(Cfg)), AST(std::move(AST)), Func(Func) {}
-
-  Status getStatus() const { return S; }
-  CFG *getCFG() const { return Cfg.get(); }
-  ASTUnit *getAST() const { return AST.get(); }
-  const FunctionDecl *getFunc() const { return Func; }
-
-private:
-  Status S;
-  std::unique_ptr<CFG> Cfg;
-  std::unique_ptr<ASTUnit> AST;
-  const FunctionDecl *Func;
-};
-
-class CFGCallback : public ast_matchers::MatchFinder::MatchCallback {
-public:
-  CFGCallback(std::unique_ptr<ASTUnit> AST) : AST(std::move(AST)) {}
-
-  std::unique_ptr<ASTUnit> AST;
-  BuildResult TheBuildResult = BuildResult::ToolRan;
-  CFG::BuildOptions Options;
-
-  void run(const ast_matchers::MatchFinder::MatchResult &Result) override {
-    const auto *Func = Result.Nodes.getNodeAs<FunctionDecl>("func");
-    Stmt *Body = Func->getBody();
-    if (!Body)
-      return;
-    TheBuildResult = BuildResult::SawFunctionBody;
-    Options.AddImplicitDtors = true;
-    if (std::unique_ptr<CFG> Cfg =
-            CFG::buildCFG(nullptr, Body, Result.Context, Options))
-      TheBuildResult = {BuildResult::BuiltCFG, Func, std::move(Cfg),
-                        std::move(AST)};
-  }
-};
-
-inline BuildResult BuildCFG(const char *Code, CFG::BuildOptions Options = {}) {
-  std::vector<std::string> Args = {"-std=c++11",
-                                   "-fno-delayed-template-parsing"};
-  std::unique_ptr<ASTUnit> AST = tooling::buildASTFromCodeWithArgs(Code, Args);
-  if (!AST)
-    return BuildResult::ToolFailed;
-
-  CFGCallback Callback(std::move(AST));
-  Callback.Options = Options;
-  ast_matchers::MatchFinder Finder;
-  Finder.addMatcher(ast_matchers::functionDecl().bind("func"), &Callback);
-
-  Finder.matchAST(Callback.AST->getASTContext());
-  return std::move(Callback.TheBuildResult);
-}
-
-} // namespace analysis
-} // namespace clang
diff --git a/gnu/llvm/clang/unittests/Analysis/CFGDominatorTree.cpp b/gnu/llvm/clang/unittests/Analysis/CFGDominatorTree.cpp
deleted file mode 100644
index 8cbd72c94e6..00000000000
--- a/gnu/llvm/clang/unittests/Analysis/CFGDominatorTree.cpp
+++ /dev/null
@@ -1,194 +0,0 @@
-//===- unittests/Analysis/CFGDominatorTree.cpp - CFG tests ----------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "CFGBuildResult.h"
-#include "clang/Analysis/Analyses/Dominators.h"
-#include "gtest/gtest.h"
-
-namespace clang {
-namespace analysis {
-namespace {
-
-TEST(CFGDominatorTree, DomTree) {
-  const char *Code = R"(enum Kind {
-                          A
-                        };
-
-                        void f() {
-                          switch(Kind{}) {
-                          case A:
-                            break;
-                          }
-                        })";
-  BuildResult Result = BuildCFG(Code);
-  EXPECT_EQ(BuildResult::BuiltCFG, Result.getStatus());
-
-  //  [B3 (ENTRY)]  -> [B1] -> [B2] -> [B0 (EXIT)]
-  //                  switch  case A
-
-  CFG *cfg = Result.getCFG();
-
-  // Sanity checks.
-  EXPECT_EQ(cfg->size(), 4u);
-
-  CFGBlock *ExitBlock = *cfg->begin();
-  EXPECT_EQ(ExitBlock, &cfg->getExit());
-
-  CFGBlock *SwitchBlock = *(cfg->begin() + 1);
-
-  CFGBlock *CaseABlock = *(cfg->begin() + 2);
-
-  CFGBlock *EntryBlock = *(cfg->begin() + 3);
-  EXPECT_EQ(EntryBlock, &cfg->getEntry());
-
-  // Test the dominator tree.
-  CFGDomTree Dom;
-  Dom.buildDominatorTree(cfg);
-
-  EXPECT_TRUE(Dom.dominates(ExitBlock, ExitBlock));
-  EXPECT_FALSE(Dom.properlyDominates(ExitBlock, ExitBlock));
-  EXPECT_TRUE(Dom.dominates(CaseABlock, ExitBlock));
-  EXPECT_TRUE(Dom.dominates(SwitchBlock, ExitBlock));
-  EXPECT_TRUE(Dom.dominates(EntryBlock, ExitBlock));
-
-  EXPECT_TRUE(Dom.dominates(CaseABlock, CaseABlock));
-  EXPECT_FALSE(Dom.properlyDominates(CaseABlock, CaseABlock));
-  EXPECT_TRUE(Dom.dominates(SwitchBlock, CaseABlock));
-  EXPECT_TRUE(Dom.dominates(EntryBlock, CaseABlock));
-
-  EXPECT_TRUE(Dom.dominates(SwitchBlock, SwitchBlock));
-  EXPECT_FALSE(Dom.properlyDominates(SwitchBlock, SwitchBlock));
-  EXPECT_TRUE(Dom.dominates(EntryBlock, SwitchBlock));
-
-  EXPECT_TRUE(Dom.dominates(EntryBlock, EntryBlock));
-  EXPECT_FALSE(Dom.properlyDominates(EntryBlock, EntryBlock));
-
-  // Test the post dominator tree.
-
-  CFGPostDomTree PostDom;
-  PostDom.buildDominatorTree(cfg);
-
-  EXPECT_TRUE(PostDom.dominates(ExitBlock, EntryBlock));
-  EXPECT_TRUE(PostDom.dominates(CaseABlock, EntryBlock));
-  EXPECT_TRUE(PostDom.dominates(SwitchBlock, EntryBlock));
-  EXPECT_TRUE(PostDom.dominates(EntryBlock, EntryBlock));
-  EXPECT_FALSE(Dom.properlyDominates(EntryBlock, EntryBlock));
-
-  EXPECT_TRUE(PostDom.dominates(ExitBlock, SwitchBlock));
-  EXPECT_TRUE(PostDom.dominates(CaseABlock, SwitchBlock));
-  EXPECT_TRUE(PostDom.dominates(SwitchBlock, SwitchBlock));
-  EXPECT_FALSE(Dom.properlyDominates(SwitchBlock, SwitchBlock));
-
-  EXPECT_TRUE(PostDom.dominates(ExitBlock, CaseABlock));
-  EXPECT_TRUE(PostDom.dominates(CaseABlock, CaseABlock));
-  EXPECT_FALSE(Dom.properlyDominates(CaseABlock, CaseABlock));
-
-  EXPECT_TRUE(PostDom.dominates(ExitBlock, ExitBlock));
-  EXPECT_FALSE(Dom.properlyDominates(ExitBlock, ExitBlock));
-
-  // Tests for the post dominator tree's virtual root.
-  EXPECT_TRUE(PostDom.dominates(nullptr, EntryBlock));
-  EXPECT_TRUE(PostDom.dominates(nullptr, SwitchBlock));
-  EXPECT_TRUE(PostDom.dominates(nullptr, CaseABlock));
-  EXPECT_TRUE(PostDom.dominates(nullptr, ExitBlock));
-}
-
-TEST(CFGDominatorTree, ControlDependency) {
-  const char *Code = R"(bool coin();
-
-                        void funcWithBranch() {
-                          int x = 0;
-                          if (coin()) {
-                            if (coin()) {
-                              x = 5;
-                            }
-                            int j = 10 / x;
-                            (void)j;
-                          }
-                        };)";
-  BuildResult Result = BuildCFG(Code);
-  EXPECT_EQ(BuildResult::BuiltCFG, Result.getStatus());
-
-  //                  1st if  2nd if
-  //  [B5 (ENTRY)]  -> [B4] -> [B3] -> [B2] -> [B1] -> [B0 (EXIT)]
-  //                    \        \              /         /
-  //                     \        ------------->         /
-  //                      ------------------------------>
-
-  CFG *cfg = Result.getCFG();
-
-  // Sanity checks.
-  EXPECT_EQ(cfg->size(), 6u);
-
-  CFGBlock *ExitBlock = *cfg->begin();
-  EXPECT_EQ(ExitBlock, &cfg->getExit());
-
-  CFGBlock *NullDerefBlock = *(cfg->begin() + 1);
-
-  CFGBlock *SecondThenBlock = *(cfg->begin() + 2);
-
-  CFGBlock *SecondIfBlock = *(cfg->begin() + 3);
-
-  CFGBlock *FirstIfBlock = *(cfg->begin() + 4);
-
-  CFGBlock *EntryBlock = *(cfg->begin() + 5);
-  EXPECT_EQ(EntryBlock, &cfg->getEntry());
-
-  ControlDependencyCalculator Control(cfg);
-
-  EXPECT_TRUE(Control.isControlDependent(SecondThenBlock, SecondIfBlock));
-  EXPECT_TRUE(Control.isControlDependent(SecondIfBlock, FirstIfBlock));
-  EXPECT_FALSE(Control.isControlDependent(NullDerefBlock, SecondIfBlock));
-}
-
-TEST(CFGDominatorTree, ControlDependencyWithLoops) {
-  const char *Code = R"(int test3() {
-                          int x,y,z;
-
-                          x = y = z = 1;
-                          if (x > 0) {
-                            while (x >= 0){
-                              while (y >= x) {
-                                x = x-1;
-                                y = y/2;
-                              }
-                            }
-                          }
-                          z = y;
-
-                          return 0;
-                        })";
-  BuildResult Result = BuildCFG(Code);
-  EXPECT_EQ(BuildResult::BuiltCFG, Result.getStatus());
-
-  //                           <- [B2] <-
-  //                          /          \
-  // [B8 (ENTRY)] -> [B7] -> [B6] ---> [B5] -> [B4] -> [B3]
-  //                   \       |         \              /
-  //                    \      |          <-------------
-  //                     \      \
-  //                      --------> [B1] -> [B0 (EXIT)]
-
-  CFG *cfg = Result.getCFG();
-
-  ControlDependencyCalculator Control(cfg);
-
-  auto GetBlock = [cfg] (unsigned Index) -> CFGBlock * {
-    assert(Index < cfg->size());
-    return *(cfg->begin() + Index);
-  };
-
-  // While not immediately obvious, the second block in fact post dominates the
-  // fifth, hence B5 is not a control dependency of 2.
-  EXPECT_FALSE(Control.isControlDependent(GetBlock(5), GetBlock(2)));
-}
-
-
-} // namespace
-} // namespace analysis
-} // namespace clang
diff --git a/gnu/llvm/clang/unittests/Analysis/CFGTest.cpp b/gnu/llvm/clang/unittests/Analysis/CFGTest.cpp
deleted file mode 100644
index 1cce8bade42..00000000000
--- a/gnu/llvm/clang/unittests/Analysis/CFGTest.cpp
+++ /dev/null
@@ -1,273 +0,0 @@
-//===- unittests/Analysis/CFGTest.cpp - CFG tests -------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "CFGBuildResult.h"
-#include "clang/AST/Decl.h"
-#include "clang/ASTMatchers/ASTMatchFinder.h"
-#include "clang/Analysis/AnalysisDeclContext.h"
-#include "clang/Analysis/CFG.h"
-#include "clang/Analysis/FlowSensitive/DataflowWorklist.h"
-#include "clang/Tooling/Tooling.h"
-#include "gtest/gtest.h"
-#include <algorithm>
-#include <string>
-#include <vector>
-
-namespace clang {
-namespace analysis {
-namespace {
-
-// Constructing a CFG for a range-based for over a dependent type fails (but
-// should not crash).
-TEST(CFG, RangeBasedForOverDependentType) {
-  const char *Code = "class Foo;\n"
-                     "template <typename T>\n"
-                     "void f(const T &Range) {\n"
-                     "  for (const Foo *TheFoo : Range) {\n"
-                     "  }\n"
-                     "}\n";
-  EXPECT_EQ(BuildResult::SawFunctionBody, BuildCFG(Code).getStatus());
-}
-
-TEST(CFG, StaticInitializerLastCondition) {
-  const char *Code = "void f() {\n"
-                     "  int i = 5 ;\n"
-                     "  static int j = 3 ;\n"
-                     "}\n";
-  CFG::BuildOptions Options;
-  Options.AddStaticInitBranches = true;
-  Options.setAllAlwaysAdd();
-  BuildResult B = BuildCFG(Code, Options);
-  EXPECT_EQ(BuildResult::BuiltCFG, B.getStatus());
-  EXPECT_EQ(1u, B.getCFG()->getEntry().succ_size());
-  CFGBlock *Block = *B.getCFG()->getEntry().succ_begin();
-  EXPECT_TRUE(isa<DeclStmt>(Block->getTerminatorStmt()));
-  EXPECT_EQ(nullptr, Block->getLastCondition());
-}
-
-// Constructing a CFG containing a delete expression on a dependent type should
-// not crash.
-TEST(CFG, DeleteExpressionOnDependentType) {
-  const char *Code = "template<class T>\n"
-                     "void f(T t) {\n"
-                     "  delete t;\n"
-                     "}\n";
-  EXPECT_EQ(BuildResult::BuiltCFG, BuildCFG(Code).getStatus());
-}
-
-// Constructing a CFG on a function template with a variable of incomplete type
-// should not crash.
-TEST(CFG, VariableOfIncompleteType) {
-  const char *Code = "template<class T> void f() {\n"
-                     "  class Undefined;\n"
-                     "  Undefined u;\n"
-                     "}\n";
-  EXPECT_EQ(BuildResult::BuiltCFG, BuildCFG(Code).getStatus());
-}
-
-TEST(CFG, IsLinear) {
-  auto expectLinear = [](bool IsLinear, const char *Code) {
-    BuildResult B = BuildCFG(Code);
-    EXPECT_EQ(BuildResult::BuiltCFG, B.getStatus());
-    EXPECT_EQ(IsLinear, B.getCFG()->isLinear());
-  };
-
-  expectLinear(true, "void foo() {}");
-  expectLinear(true, "void foo() { if (true) return; }");
-  expectLinear(true, "void foo() { if constexpr (false); }");
-  expectLinear(false, "void foo(bool coin) { if (coin) return; }");
-  expectLinear(false, "void foo() { for(;;); }");
-  expectLinear(false, "void foo() { do {} while (true); }");
-  expectLinear(true, "void foo() { do {} while (false); }");
-  expectLinear(true, "void foo() { foo(); }"); // Recursion is not our problem.
-}
-
-TEST(CFG, ElementRefIterator) {
-  const char *Code = R"(void f() {
-                          int i;
-                          int j;
-                          i = 5;
-                          i = 6;
-                          j = 7;
-                        })";
-
-  BuildResult B = BuildCFG(Code);
-  EXPECT_EQ(BuildResult::BuiltCFG, B.getStatus());
-  CFG *Cfg = B.getCFG();
-
-  // [B2 (ENTRY)]
-  //   Succs (1): B1
-
-  // [B1]
-  //   1: int i;
-  //   2: int j;
-  //   3: i = 5
-  //   4: i = 6
-  //   5: j = 7
-  //   Preds (1): B2
-  //   Succs (1): B0
-
-  // [B0 (EXIT)]
-  //   Preds (1): B1
-  CFGBlock *MainBlock = *(Cfg->begin() + 1);
-
-  constexpr CFGBlock::ref_iterator::difference_type MainBlockSize = 4;
-
-  // The rest of this test looks totally insane, but there iterators are
-  // templates under the hood, to it's important to instantiate everything for
-  // proper converage.
-
-  // Non-reverse, non-const version
-  size_t Index = 0;
-  for (CFGBlock::CFGElementRef ElementRef : MainBlock->refs()) {
-    EXPECT_EQ(ElementRef.getParent(), MainBlock);
-    EXPECT_EQ(ElementRef.getIndexInBlock(), Index);
-    EXPECT_TRUE(ElementRef->getAs<CFGStmt>());
-    EXPECT_TRUE((*ElementRef).getAs<CFGStmt>());
-    EXPECT_EQ(ElementRef.getParent(), MainBlock);
-    ++Index;
-  }
-  EXPECT_TRUE(*MainBlock->ref_begin() < *(MainBlock->ref_begin() + 1));
-  EXPECT_TRUE(*MainBlock->ref_begin() == *MainBlock->ref_begin());
-  EXPECT_FALSE(*MainBlock->ref_begin() != *MainBlock->ref_begin());
-
-  EXPECT_TRUE(MainBlock->ref_begin() < MainBlock->ref_begin() + 1);
-  EXPECT_TRUE(MainBlock->ref_begin() == MainBlock->ref_begin());
-  EXPECT_FALSE(MainBlock->ref_begin() != MainBlock->ref_begin());
-  EXPECT_EQ(MainBlock->ref_end() - MainBlock->ref_begin(), MainBlockSize + 1);
-  EXPECT_EQ(MainBlock->ref_end() - MainBlockSize - 1, MainBlock->ref_begin());
-  EXPECT_EQ(MainBlock->ref_begin() + MainBlockSize + 1, MainBlock->ref_end());
-  EXPECT_EQ(MainBlock->ref_begin()++, MainBlock->ref_begin());
-  EXPECT_EQ(++(MainBlock->ref_begin()), MainBlock->ref_begin() + 1);
-
-  // Non-reverse, non-const version
-  const CFGBlock *CMainBlock = MainBlock;
-  Index = 0;
-  for (CFGBlock::ConstCFGElementRef ElementRef : CMainBlock->refs()) {
-    EXPECT_EQ(ElementRef.getParent(), CMainBlock);
-    EXPECT_EQ(ElementRef.getIndexInBlock(), Index);
-    EXPECT_TRUE(ElementRef->getAs<CFGStmt>());
-    EXPECT_TRUE((*ElementRef).getAs<CFGStmt>());
-    EXPECT_EQ(ElementRef.getParent(), MainBlock);
-    ++Index;
-  }
-  EXPECT_TRUE(*CMainBlock->ref_begin() < *(CMainBlock->ref_begin() + 1));
-  EXPECT_TRUE(*CMainBlock->ref_begin() == *CMainBlock->ref_begin());
-  EXPECT_FALSE(*CMainBlock->ref_begin() != *CMainBlock->ref_begin());
-
-  EXPECT_TRUE(CMainBlock->ref_begin() < CMainBlock->ref_begin() + 1);
-  EXPECT_TRUE(CMainBlock->ref_begin() == CMainBlock->ref_begin());
-  EXPECT_FALSE(CMainBlock->ref_begin() != CMainBlock->ref_begin());
-  EXPECT_EQ(CMainBlock->ref_end() - CMainBlock->ref_begin(), MainBlockSize + 1);
-  EXPECT_EQ(CMainBlock->ref_end() - MainBlockSize - 1, CMainBlock->ref_begin());
-  EXPECT_EQ(CMainBlock->ref_begin() + MainBlockSize + 1, CMainBlock->ref_end());
-  EXPECT_EQ(CMainBlock->ref_begin()++, CMainBlock->ref_begin());
-  EXPECT_EQ(++(CMainBlock->ref_begin()), CMainBlock->ref_begin() + 1);
-
-  // Reverse, non-const version
-  Index = MainBlockSize;
-  for (CFGBlock::CFGElementRef ElementRef : MainBlock->rrefs()) {
-    llvm::errs() << Index << '\n';
-    EXPECT_EQ(ElementRef.getParent(), MainBlock);
-    EXPECT_EQ(ElementRef.getIndexInBlock(), Index);
-    EXPECT_TRUE(ElementRef->getAs<CFGStmt>());
-    EXPECT_TRUE((*ElementRef).getAs<CFGStmt>());
-    EXPECT_EQ(ElementRef.getParent(), MainBlock);
-    --Index;
-  }
-  EXPECT_FALSE(*MainBlock->rref_begin() < *(MainBlock->rref_begin() + 1));
-  EXPECT_TRUE(*MainBlock->rref_begin() == *MainBlock->rref_begin());
-  EXPECT_FALSE(*MainBlock->rref_begin() != *MainBlock->rref_begin());
-
-  EXPECT_TRUE(MainBlock->rref_begin() < MainBlock->rref_begin() + 1);
-  EXPECT_TRUE(MainBlock->rref_begin() == MainBlock->rref_begin());
-  EXPECT_FALSE(MainBlock->rref_begin() != MainBlock->rref_begin());
-  EXPECT_EQ(MainBlock->rref_end() - MainBlock->rref_begin(), MainBlockSize + 1);
-  EXPECT_EQ(MainBlock->rref_end() - MainBlockSize - 1, MainBlock->rref_begin());
-  EXPECT_EQ(MainBlock->rref_begin() + MainBlockSize + 1, MainBlock->rref_end());
-  EXPECT_EQ(MainBlock->rref_begin()++, MainBlock->rref_begin());
-  EXPECT_EQ(++(MainBlock->rref_begin()), MainBlock->rref_begin() + 1);
-
-  // Reverse, const version
-  Index = MainBlockSize;
-  for (CFGBlock::ConstCFGElementRef ElementRef : CMainBlock->rrefs()) {
-    EXPECT_EQ(ElementRef.getParent(), CMainBlock);
-    EXPECT_EQ(ElementRef.getIndexInBlock(), Index);
-    EXPECT_TRUE(ElementRef->getAs<CFGStmt>());
-    EXPECT_TRUE((*ElementRef).getAs<CFGStmt>());
-    EXPECT_EQ(ElementRef.getParent(), MainBlock);
-    --Index;
-  }
-  EXPECT_FALSE(*CMainBlock->rref_begin() < *(CMainBlock->rref_begin() + 1));
-  EXPECT_TRUE(*CMainBlock->rref_begin() == *CMainBlock->rref_begin());
-  EXPECT_FALSE(*CMainBlock->rref_begin() != *CMainBlock->rref_begin());
-
-  EXPECT_TRUE(CMainBlock->rref_begin() < CMainBlock->rref_begin() + 1);
-  EXPECT_TRUE(CMainBlock->rref_begin() == CMainBlock->rref_begin());
-  EXPECT_FALSE(CMainBlock->rref_begin() != CMainBlock->rref_begin());
-  EXPECT_EQ(CMainBlock->rref_end() - CMainBlock->rref_begin(),
-            MainBlockSize + 1);
-  EXPECT_EQ(CMainBlock->rref_end() - MainBlockSize - 1,
-            CMainBlock->rref_begin());
-  EXPECT_EQ(CMainBlock->rref_begin() + MainBlockSize + 1,
-            CMainBlock->rref_end());
-  EXPECT_EQ(CMainBlock->rref_begin()++, CMainBlock->rref_begin());
-  EXPECT_EQ(++(CMainBlock->rref_begin()), CMainBlock->rref_begin() + 1);
-}
-
-TEST(CFG, Worklists) {
-  const char *Code = "int f(bool cond) {\n"
-                     "  int a = 5;\n"
-                     "  if (cond)\n"
-                     "    a += 1;\n"
-                     "  return a;\n"
-                     "}\n";
-  BuildResult B = BuildCFG(Code);
-  EXPECT_EQ(BuildResult::BuiltCFG, B.getStatus());
-  const FunctionDecl *Func = B.getFunc();
-  AnalysisDeclContext AC(nullptr, Func);
-  auto *CFG = AC.getCFG();
-
-  std::vector<const CFGBlock *> ReferenceOrder;
-  for (const auto *B : *AC.getAnalysis<PostOrderCFGView>())
-    ReferenceOrder.push_back(B);
-
-  {
-    ForwardDataflowWorklist ForwardWorklist(*CFG, AC);
-    for (const auto *B : *CFG)
-      ForwardWorklist.enqueueBlock(B);
-
-    std::vector<const CFGBlock *> ForwardNodes;
-    while (const CFGBlock *B = ForwardWorklist.dequeue())
-      ForwardNodes.push_back(B);
-
-    EXPECT_EQ(ForwardNodes.size(), ReferenceOrder.size());
-    EXPECT_TRUE(std::equal(ReferenceOrder.begin(), ReferenceOrder.end(),
-                           ForwardNodes.begin()));
-  }
-
-  std::reverse(ReferenceOrder.begin(), ReferenceOrder.end());
-
-  {
-    BackwardDataflowWorklist BackwardWorklist(*CFG, AC);
-    for (const auto *B : *CFG)
-      BackwardWorklist.enqueueBlock(B);
-
-    std::vector<const CFGBlock *> BackwardNodes;
-    while (const CFGBlock *B = BackwardWorklist.dequeue())
-      BackwardNodes.push_back(B);
-
-    EXPECT_EQ(BackwardNodes.size(), ReferenceOrder.size());
-    EXPECT_TRUE(std::equal(ReferenceOrder.begin(), ReferenceOrder.end(),
-                           BackwardNodes.begin()));
-  }
-}
-
-} // namespace
-} // namespace analysis
-} // namespace clang
diff --git a/gnu/llvm/clang/unittests/Analysis/CMakeLists.txt b/gnu/llvm/clang/unittests/Analysis/CMakeLists.txt
deleted file mode 100644
index 00026874417..00000000000
--- a/gnu/llvm/clang/unittests/Analysis/CMakeLists.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  FrontendOpenMP
-  Support
-  )
-
-add_clang_unittest(ClangAnalysisTests
-  CFGDominatorTree.cpp
-  CFGTest.cpp
-  CloneDetectionTest.cpp
-  ExprMutationAnalyzerTest.cpp
-  MacroExpansionContextTest.cpp
-  )
-
-clang_target_link_libraries(ClangAnalysisTests
-  PRIVATE
-  clangAnalysis
-  clangAST
-  clangASTMatchers
-  clangBasic
-  clangFrontend
-  clangLex
-  clangSerialization
-  clangTesting
-  clangTooling
-  )
-
-target_link_libraries(ClangAnalysisTests
-  PRIVATE
-  LLVMTestingSupport
-  )
diff --git a/gnu/llvm/clang/unittests/Analysis/CloneDetectionTest.cpp b/gnu/llvm/clang/unittests/Analysis/CloneDetectionTest.cpp
deleted file mode 100644
index f8f3602f5a2..00000000000
--- a/gnu/llvm/clang/unittests/Analysis/CloneDetectionTest.cpp
+++ /dev/null
@@ -1,111 +0,0 @@
-//===- unittests/Analysis/CloneDetectionTest.cpp - Clone detection tests --===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/AST/RecursiveASTVisitor.h"
-#include "clang/Analysis/CloneDetection.h"
-#include "clang/Tooling/Tooling.h"
-#include "gtest/gtest.h"
-
-namespace clang {
-namespace analysis {
-namespace {
-
-class CloneDetectionVisitor
-    : public RecursiveASTVisitor<CloneDetectionVisitor> {
-
-  CloneDetector &Detector;
-
-public:
-  explicit CloneDetectionVisitor(CloneDetector &D) : Detector(D) {}
-
-  bool VisitFunctionDecl(FunctionDecl *D) {
-    Detector.analyzeCodeBody(D);
-    return true;
-  }
-};
-
-/// Example constraint for testing purposes.
-/// Filters out all statements that are in a function which name starts with
-/// "bar".
-class NoBarFunctionConstraint {
-public:
-  void constrain(std::vector<CloneDetector::CloneGroup> &CloneGroups) {
-    CloneConstraint::splitCloneGroups(
-        CloneGroups, [](const StmtSequence &A, const StmtSequence &B) {
-          // Check if one of the sequences is in a function which name starts
-          // with "bar".
-          for (const StmtSequence &Arg : {A, B}) {
-            if (const auto *D =
-                    dyn_cast<const FunctionDecl>(Arg.getContainingDecl())) {
-              if (D->getName().startswith("bar"))
-                return false;
-            }
-          }
-          return true;
-        });
-  }
-};
-
-TEST(CloneDetector, FilterFunctionsByName) {
-  auto ASTUnit =
-      clang::tooling::buildASTFromCode("void foo1(int &a1) { a1++; }\n"
-                                       "void foo2(int &a2) { a2++; }\n"
-                                       "void bar1(int &a3) { a3++; }\n"
-                                       "void bar2(int &a4) { a4++; }\n");
-  auto TU = ASTUnit->getASTContext().getTranslationUnitDecl();
-
-  CloneDetector Detector;
-  // Push all the function bodies into the detector.
-  CloneDetectionVisitor Visitor(Detector);
-  Visitor.TraverseTranslationUnitDecl(TU);
-
-  // Find clones with the usual settings, but but we want to filter out
-  // all statements from functions which names start with "bar".
-  std::vector<CloneDetector::CloneGroup> CloneGroups;
-  Detector.findClones(CloneGroups, NoBarFunctionConstraint(),
-                      RecursiveCloneTypeIIHashConstraint(),
-                      MinComplexityConstraint(2), MinGroupSizeConstraint(2),
-                      RecursiveCloneTypeIIVerifyConstraint(),
-                      OnlyLargestCloneConstraint());
-
-  ASSERT_EQ(CloneGroups.size(), 1u);
-  ASSERT_EQ(CloneGroups.front().size(), 2u);
-
-  for (auto &Clone : CloneGroups.front()) {
-    const auto ND = dyn_cast<const FunctionDecl>(Clone.getContainingDecl());
-    ASSERT_TRUE(ND != nullptr);
-    // Check that no function name starting with "bar" is in the results...
-    ASSERT_TRUE(ND->getNameAsString().find("bar") != 0);
-  }
-
-  // Retry above's example without the filter...
-  CloneGroups.clear();
-
-  Detector.findClones(CloneGroups, RecursiveCloneTypeIIHashConstraint(),
-                      MinComplexityConstraint(2), MinGroupSizeConstraint(2),
-                      RecursiveCloneTypeIIVerifyConstraint(),
-                      OnlyLargestCloneConstraint());
-  ASSERT_EQ(CloneGroups.size(), 1u);
-  ASSERT_EQ(CloneGroups.front().size(), 4u);
-
-  // Count how many functions with the bar prefix we have in the results.
-  int FoundFunctionsWithBarPrefix = 0;
-  for (auto &Clone : CloneGroups.front()) {
-    const auto ND = dyn_cast<const FunctionDecl>(Clone.getContainingDecl());
-    ASSERT_TRUE(ND != nullptr);
-    // This time check that we picked up the bar functions from above
-    if (ND->getNameAsString().find("bar") == 0) {
-      FoundFunctionsWithBarPrefix++;
-    }
-  }
-  // We should have found the two functions bar1 and bar2.
-  ASSERT_EQ(FoundFunctionsWithBarPrefix, 2);
-}
-} // namespace
-} // namespace analysis
-} // namespace clang
diff --git a/gnu/llvm/clang/unittests/Analysis/ExprMutationAnalyzerTest.cpp b/gnu/llvm/clang/unittests/Analysis/ExprMutationAnalyzerTest.cpp
deleted file mode 100644
index a4410d330d3..00000000000
--- a/gnu/llvm/clang/unittests/Analysis/ExprMutationAnalyzerTest.cpp
+++ /dev/null
@@ -1,1463 +0,0 @@
-//===---------- ExprMutationAnalyzerTest.cpp ------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/Analysis/Analyses/ExprMutationAnalyzer.h"
-#include "clang/AST/TypeLoc.h"
-#include "clang/ASTMatchers/ASTMatchFinder.h"
-#include "clang/ASTMatchers/ASTMatchers.h"
-#include "clang/Tooling/Tooling.h"
-#include "llvm/ADT/SmallString.h"
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-#include <cctype>
-
-namespace clang {
-
-using namespace clang::ast_matchers;
-using ::testing::ElementsAre;
-using ::testing::ResultOf;
-using ::testing::Values;
-
-namespace {
-
-using ExprMatcher = internal::Matcher<Expr>;
-using StmtMatcher = internal::Matcher<Stmt>;
-
-std::unique_ptr<ASTUnit>
-buildASTFromCodeWithArgs(const Twine &Code,
-                         const std::vector<std::string> &Args) {
-  SmallString<1024> CodeStorage;
-  auto AST =
-      tooling::buildASTFromCodeWithArgs(Code.toStringRef(CodeStorage), Args);
-  EXPECT_FALSE(AST->getDiagnostics().hasErrorOccurred());
-  return AST;
-}
-
-std::unique_ptr<ASTUnit> buildASTFromCode(const Twine &Code) {
-  return buildASTFromCodeWithArgs(Code, {});
-}
-
-ExprMatcher declRefTo(StringRef Name) {
-  return declRefExpr(to(namedDecl(hasName(Name))));
-}
-
-StmtMatcher withEnclosingCompound(ExprMatcher Matcher) {
-  return expr(Matcher, hasAncestor(compoundStmt().bind("stmt"))).bind("expr");
-}
-
-bool isMutated(const SmallVectorImpl<BoundNodes> &Results, ASTUnit *AST) {
-  const auto *const S = selectFirst<Stmt>("stmt", Results);
-  const auto *const E = selectFirst<Expr>("expr", Results);
-  TraversalKindScope RAII(AST->getASTContext(), TK_AsIs);
-  return ExprMutationAnalyzer(*S, AST->getASTContext()).isMutated(E);
-}
-
-SmallVector<std::string, 1>
-mutatedBy(const SmallVectorImpl<BoundNodes> &Results, ASTUnit *AST) {
-  const auto *const S = selectFirst<Stmt>("stmt", Results);
-  SmallVector<std::string, 1> Chain;
-  ExprMutationAnalyzer Analyzer(*S, AST->getASTContext());
-
-  for (const auto *E = selectFirst<Expr>("expr", Results); E != nullptr;) {
-    const Stmt *By = Analyzer.findMutation(E);
-    if (!By)
-      break;
-
-    std::string Buffer;
-    llvm::raw_string_ostream Stream(Buffer);
-    By->printPretty(Stream, nullptr, AST->getASTContext().getPrintingPolicy());
-    Chain.emplace_back(StringRef(Stream.str()).trim().str());
-    E = dyn_cast<DeclRefExpr>(By);
-  }
-  return Chain;
-}
-
-std::string removeSpace(std::string s) {
-  s.erase(std::remove_if(s.begin(), s.end(),
-                         [](char c) { return llvm::isSpace(c); }),
-          s.end());
-  return s;
-}
-
-const std::string StdRemoveReference =
-    "namespace std {"
-    "template<class T> struct remove_reference { typedef T type; };"
-    "template<class T> struct remove_reference<T&> { typedef T type; };"
-    "template<class T> struct remove_reference<T&&> { typedef T type; }; }";
-
-const std::string StdMove =
-    "namespace std {"
-    "template<class T> typename remove_reference<T>::type&& "
-    "move(T&& t) noexcept {"
-    "return static_cast<typename remove_reference<T>::type&&>(t); } }";
-
-const std::string StdForward =
-    "namespace std {"
-    "template<class T> T&& "
-    "forward(typename remove_reference<T>::type& t) noexcept { return t; }"
-    "template<class T> T&& "
-    "forward(typename remove_reference<T>::type&& t) noexcept { return t; } }";
-
-} // namespace
-
-TEST(ExprMutationAnalyzerTest, Trivial) {
-  const auto AST = buildASTFromCode("void f() { int x; x; }");
-  const auto Results =
-      match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_FALSE(isMutated(Results, AST.get()));
-}
-
-class AssignmentTest : public ::testing::TestWithParam<std::string> {};
-
-// This test is for the most basic and direct modification of a variable,
-// assignment to it (e.g. `x = 10;`).
-// It additionally tests that references to a variable are not only captured
-// directly but expressions that result in the variable are handled, too.
-// This includes the comma operator, parens and the ternary operator.
-TEST_P(AssignmentTest, AssignmentModifies) {
-  // Test the detection of the raw expression modifications.
-  {
-    const std::string ModExpr = "x " + GetParam() + " 10";
-    const auto AST = buildASTFromCode("void f() { int x; " + ModExpr + "; }");
-    const auto Results =
-        match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-    EXPECT_THAT(mutatedBy(Results, AST.get()), ElementsAre(ModExpr));
-  }
-
-  // Test the detection if the expression is surrounded by parens.
-  {
-    const std::string ModExpr = "(x) " + GetParam() + " 10";
-    const auto AST = buildASTFromCode("void f() { int x; " + ModExpr + "; }");
-    const auto Results =
-        match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-    EXPECT_THAT(mutatedBy(Results, AST.get()), ElementsAre(ModExpr));
-  }
-
-  // Test the detection if the comma operator yields the expression as result.
-  {
-    const std::string ModExpr = "x " + GetParam() + " 10";
-    const auto AST = buildASTFromCodeWithArgs(
-        "void f() { int x, y; y, " + ModExpr + "; }", {"-Wno-unused-value"});
-    const auto Results =
-        match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-    EXPECT_THAT(mutatedBy(Results, AST.get()), ElementsAre(ModExpr));
-  }
-
-  // Ensure no detection if the comma operator does not yield the expression as
-  // result.
-  {
-    const std::string ModExpr = "y, x, y " + GetParam() + " 10";
-    const auto AST = buildASTFromCodeWithArgs(
-        "void f() { int x, y; " + ModExpr + "; }", {"-Wno-unused-value"});
-    const auto Results =
-        match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-    EXPECT_FALSE(isMutated(Results, AST.get()));
-  }
-
-  // Test the detection if the a ternary operator can result in the expression.
-  {
-    const std::string ModExpr = "(y != 0 ? y : x) " + GetParam() + " 10";
-    const auto AST =
-        buildASTFromCode("void f() { int y = 0, x; " + ModExpr + "; }");
-    const auto Results =
-        match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-    EXPECT_THAT(mutatedBy(Results, AST.get()), ElementsAre(ModExpr));
-  }
-
-  // Test the detection if the a ternary operator can result in the expression
-  // through multiple nesting of ternary operators.
-  {
-    const std::string ModExpr =
-        "(y != 0 ? (y > 5 ? y : x) : (y)) " + GetParam() + " 10";
-    const auto AST =
-        buildASTFromCode("void f() { int y = 0, x; " + ModExpr + "; }");
-    const auto Results =
-        match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-    EXPECT_THAT(mutatedBy(Results, AST.get()), ElementsAre(ModExpr));
-  }
-
-  // Test the detection if the a ternary operator can result in the expression
-  // with additional parens.
-  {
-    const std::string ModExpr = "(y != 0 ? (y) : ((x))) " + GetParam() + " 10";
-    const auto AST =
-        buildASTFromCode("void f() { int y = 0, x; " + ModExpr + "; }");
-    const auto Results =
-        match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-    EXPECT_THAT(mutatedBy(Results, AST.get()), ElementsAre(ModExpr));
-  }
-
-  // Test the detection for the binary conditional operator.
-  {
-    const std::string ModExpr = "(y ?: x) " + GetParam() + " 10";
-    const auto AST =
-        buildASTFromCode("void f() { int y = 0, x; " + ModExpr + "; }");
-    const auto Results =
-        match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-    EXPECT_THAT(mutatedBy(Results, AST.get()), ElementsAre(ModExpr));
-  }
-}
-
-INSTANTIATE_TEST_SUITE_P(AllAssignmentOperators, AssignmentTest,
-                        Values("=", "+=", "-=", "*=", "/=", "%=", "&=", "|=",
-                               "^=", "<<=", ">>=") );
-
-TEST(ExprMutationAnalyzerTest, AssignmentConditionalWithInheritance) {
-  const auto AST = buildASTFromCode("struct Base {void nonconst(); };"
-                                    "struct Derived : Base {};"
-                                    "static void f() {"
-                                    "  Derived x, y;"
-                                    "  Base &b = true ? x : y;"
-                                    "  b.nonconst();"
-                                    "}");
-  const auto Results =
-      match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_THAT(mutatedBy(Results, AST.get()), ElementsAre("b", "b.nonconst()"));
-}
-
-class IncDecTest : public ::testing::TestWithParam<std::string> {};
-
-TEST_P(IncDecTest, IncDecModifies) {
-  const std::string ModExpr = GetParam();
-  const auto AST = buildASTFromCode("void f() { int x; " + ModExpr + "; }");
-  const auto Results =
-      match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_THAT(mutatedBy(Results, AST.get()), ElementsAre(ModExpr));
-}
-
-INSTANTIATE_TEST_SUITE_P(AllIncDecOperators, IncDecTest,
-                        Values("++x", "--x", "x++", "x--", "++(x)", "--(x)",
-                               "(x)++", "(x)--") );
-
-// Section: member functions
-
-TEST(ExprMutationAnalyzerTest, NonConstMemberFunc) {
-  const auto AST = buildASTFromCode(
-      "void f() { struct Foo { void mf(); }; Foo x; x.mf(); }");
-  const auto Results =
-      match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_THAT(mutatedBy(Results, AST.get()), ElementsAre("x.mf()"));
-}
-
-TEST(ExprMutationAnalyzerTest, AssumedNonConstMemberFunc) {
-  auto AST = buildASTFromCodeWithArgs(
-      "struct X { template <class T> void mf(); };"
-      "template <class T> void f() { X x; x.mf<T>(); }",
-      {"-fno-delayed-template-parsing"});
-  auto Results =
-      match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_THAT(mutatedBy(Results, AST.get()), ElementsAre("x.mf<T>()"));
-
-  AST = buildASTFromCodeWithArgs("template <class T> void f() { T x; x.mf(); }",
-                                 {"-fno-delayed-template-parsing"});
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_THAT(mutatedBy(Results, AST.get()), ElementsAre("x.mf()"));
-
-  AST = buildASTFromCodeWithArgs(
-      "template <class T> struct X;"
-      "template <class T> void f() { X<T> x; x.mf(); }",
-      {"-fno-delayed-template-parsing"});
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_THAT(mutatedBy(Results, AST.get()), ElementsAre("x.mf()"));
-}
-
-TEST(ExprMutationAnalyzerTest, ConstMemberFunc) {
-  const auto AST = buildASTFromCode(
-      "void f() { struct Foo { void mf() const; }; Foo x; x.mf(); }");
-  const auto Results =
-      match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_FALSE(isMutated(Results, AST.get()));
-}
-
-TEST(ExprMutationAnalyzerTest, TypeDependentMemberCall) {
-  const auto AST = buildASTFromCodeWithArgs(
-      "template <class T> class vector { void push_back(T); }; "
-      "template <class T> void f() { vector<T> x; x.push_back(T()); }",
-      {"-fno-delayed-template-parsing"});
-  const auto Results =
-      match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_THAT(mutatedBy(Results, AST.get()), ElementsAre("x.push_back(T())"));
-}
-
-// Section: overloaded operators
-
-TEST(ExprMutationAnalyzerTest, NonConstOperator) {
-  const auto AST = buildASTFromCode(
-      "void f() { struct Foo { Foo& operator=(int); }; Foo x; x = 10; }");
-  const auto Results =
-      match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_THAT(mutatedBy(Results, AST.get()), ElementsAre("x = 10"));
-}
-
-TEST(ExprMutationAnalyzerTest, ConstOperator) {
-  const auto AST = buildASTFromCode(
-      "void f() { struct Foo { int operator()() const; }; Foo x; x(); }");
-  const auto Results =
-      match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_FALSE(isMutated(Results, AST.get()));
-}
-
-TEST(ExprMutationAnalyzerTest, UnresolvedOperator) {
-  const auto AST = buildASTFromCodeWithArgs(
-      "template <typename Stream> void input_operator_template() {"
-      "Stream x; unsigned y = 42;"
-      "x >> y; }",
-      {"-fno-delayed-template-parsing"});
-  const auto Results =
-      match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_TRUE(isMutated(Results, AST.get()));
-}
-
-// Section: expression as call argument
-
-TEST(ExprMutationAnalyzerTest, ByValueArgument) {
-  auto AST = buildASTFromCode("void g(int); void f() { int x; g(x); }");
-  auto Results =
-      match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_FALSE(isMutated(Results, AST.get()));
-
-  AST = buildASTFromCode("void g(int*); void f() { int* x; g(x); }");
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_FALSE(isMutated(Results, AST.get()));
-
-  AST = buildASTFromCode("typedef int* IntPtr;"
-                         "void g(IntPtr); void f() { int* x; g(x); }");
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_FALSE(isMutated(Results, AST.get()));
-
-  AST = buildASTFromCode(
-      "struct A {}; A operator+(A, int); void f() { A x; x + 1; }");
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_FALSE(isMutated(Results, AST.get()));
-
-  AST = buildASTFromCode("void f() { struct A { A(int); }; int x; A y(x); }");
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_FALSE(isMutated(Results, AST.get()));
-
-  AST = buildASTFromCode("struct A { A(); A& operator=(A); };"
-                         "void f() { A x, y; y = x; }");
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_FALSE(isMutated(Results, AST.get()));
-
-  AST = buildASTFromCode(
-      "template <int> struct A { A(); A(const A&); static void mf(A) {} };"
-      "void f() { A<0> x; A<0>::mf(x); }");
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_FALSE(isMutated(Results, AST.get()));
-}
-
-TEST(ExprMutationAnalyzerTest, ByConstValueArgument) {
-  auto AST = buildASTFromCode("void g(const int); void f() { int x; g(x); }");
-  auto Results =
-      match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_FALSE(isMutated(Results, AST.get()));
-
-  AST = buildASTFromCode("void g(int* const); void f() { int* x; g(x); }");
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_FALSE(isMutated(Results, AST.get()));
-
-  AST = buildASTFromCode("typedef int* const CIntPtr;"
-                         "void g(CIntPtr); void f() { int* x; g(x); }");
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_FALSE(isMutated(Results, AST.get()));
-
-  AST = buildASTFromCode(
-      "struct A {}; A operator+(const A, int); void f() { A x; x + 1; }");
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_FALSE(isMutated(Results, AST.get()));
-
-  AST = buildASTFromCode(
-      "void f() { struct A { A(const int); }; int x; A y(x); }");
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_FALSE(isMutated(Results, AST.get()));
-
-  AST = buildASTFromCode("template <int> struct A { A(); A(const A&);"
-                         "static void mf(const A&) {} };"
-                         "void f() { A<0> x; A<0>::mf(x); }");
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_FALSE(isMutated(Results, AST.get()));
-}
-
-TEST(ExprMutationAnalyzerTest, ByNonConstRefArgument) {
-  auto AST = buildASTFromCode("void g(int&); void f() { int x; g(x); }");
-  auto Results =
-      match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_THAT(mutatedBy(Results, AST.get()), ElementsAre("g(x)"));
-
-  AST = buildASTFromCode("typedef int& IntRef;"
-                         "void g(IntRef); void f() { int x; g(x); }");
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_THAT(mutatedBy(Results, AST.get()), ElementsAre("g(x)"));
-
-  AST = buildASTFromCode("template <class T> using TRef = T&;"
-                         "void g(TRef<int>); void f() { int x; g(x); }");
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_THAT(mutatedBy(Results, AST.get()), ElementsAre("g(x)"));
-
-  AST = buildASTFromCode(
-      "template <class T> struct identity { using type = T; };"
-      "template <class T, class U = T&> void g(typename identity<U>::type);"
-      "void f() { int x; g<int>(x); }");
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_THAT(mutatedBy(Results, AST.get()), ElementsAre("g<int>(x)"));
-
-  AST = buildASTFromCode("typedef int* IntPtr;"
-                         "void g(IntPtr&); void f() { int* x; g(x); }");
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_THAT(mutatedBy(Results, AST.get()), ElementsAre("g(x)"));
-
-  AST = buildASTFromCode("typedef int* IntPtr; typedef IntPtr& IntPtrRef;"
-                         "void g(IntPtrRef); void f() { int* x; g(x); }");
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_THAT(mutatedBy(Results, AST.get()), ElementsAre("g(x)"));
-
-  AST = buildASTFromCode(
-      "struct A {}; A operator+(A&, int); void f() { A x; x + 1; }");
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_THAT(mutatedBy(Results, AST.get()), ElementsAre("x + 1"));
-
-  AST = buildASTFromCode("void f() { struct A { A(int&); }; int x; A y(x); }");
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_THAT(mutatedBy(Results, AST.get()), ElementsAre("x"));
-
-  AST = buildASTFromCode("void f() { struct A { A(); A(A&); }; A x; A y(x); }");
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_THAT(mutatedBy(Results, AST.get()), ElementsAre("x"));
-
-  AST = buildASTFromCode(
-      "template <int> struct A { A(); A(const A&); static void mf(A&) {} };"
-      "void f() { A<0> x; A<0>::mf(x); }");
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_THAT(mutatedBy(Results, AST.get()), ElementsAre("A<0>::mf(x)"));
-}
-
-TEST(ExprMutationAnalyzerTest, ByNonConstRefArgumentFunctionTypeDependent) {
-  auto AST = buildASTFromCodeWithArgs(
-      "enum MyEnum { foo, bar };"
-      "void tryParser(unsigned& first, MyEnum Type) { first++, (void)Type; }"
-      "template <MyEnum Type> void parse() {"
-      "  auto parser = [](unsigned& first) { first++; tryParser(first, Type); "
-      "};"
-      "  unsigned x = 42;"
-      "  parser(x);"
-      "}",
-      {"-fno-delayed-template-parsing"});
-  auto Results =
-      match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_THAT(mutatedBy(Results, AST.get()), ElementsAre("parser(x)"));
-}
-
-TEST(ExprMutationAnalyzerTest, ByConstRefArgument) {
-  auto AST = buildASTFromCode("void g(const int&); void f() { int x; g(x); }");
-  auto Results =
-      match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_FALSE(isMutated(Results, AST.get()));
-
-  AST = buildASTFromCode("typedef const int& CIntRef;"
-                         "void g(CIntRef); void f() { int x; g(x); }");
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_FALSE(isMutated(Results, AST.get()));
-
-  AST = buildASTFromCode("template <class T> using CTRef = const T&;"
-                         "void g(CTRef<int>); void f() { int x; g(x); }");
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_FALSE(isMutated(Results, AST.get()));
-
-  AST =
-      buildASTFromCode("template <class T> struct identity { using type = T; };"
-                       "template <class T, class U = const T&>"
-                       "void g(typename identity<U>::type);"
-                       "void f() { int x; g<int>(x); }");
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_FALSE(isMutated(Results, AST.get()));
-
-  AST = buildASTFromCode(
-      "struct A {}; A operator+(const A&, int); void f() { A x; x + 1; }");
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_FALSE(isMutated(Results, AST.get()));
-
-  AST = buildASTFromCode(
-      "void f() { struct A { A(const int&); }; int x; A y(x); }");
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_FALSE(isMutated(Results, AST.get()));
-
-  AST = buildASTFromCode(
-      "void f() { struct A { A(); A(const A&); }; A x; A y(x); }");
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_FALSE(isMutated(Results, AST.get()));
-}
-
-TEST(ExprMutationAnalyzerTest, ByNonConstRRefArgument) {
-  auto AST = buildASTFromCode(
-      "void g(int&&); void f() { int x; g(static_cast<int &&>(x)); }");
-  auto Results =
-      match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_THAT(mutatedBy(Results, AST.get()),
-              ElementsAre("g(static_cast<int &&>(x))"));
-
-  AST = buildASTFromCode("struct A {}; A operator+(A&&, int);"
-                         "void f() { A x; static_cast<A &&>(x) + 1; }");
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_THAT(mutatedBy(Results, AST.get()),
-              ElementsAre("static_cast<A &&>(x) + 1"));
-
-  AST = buildASTFromCode("void f() { struct A { A(int&&); }; "
-                         "int x; A y(static_cast<int &&>(x)); }");
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_THAT(mutatedBy(Results, AST.get()),
-              ElementsAre("static_cast<int &&>(x)"));
-
-  AST = buildASTFromCode("void f() { struct A { A(); A(A&&); }; "
-                         "A x; A y(static_cast<A &&>(x)); }");
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_THAT(mutatedBy(Results, AST.get()),
-              ElementsAre("static_cast<A &&>(x)"));
-}
-
-TEST(ExprMutationAnalyzerTest, ByConstRRefArgument) {
-  auto AST = buildASTFromCode(
-      "void g(const int&&); void f() { int x; g(static_cast<int&&>(x)); }");
-  auto Results =
-      match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_THAT(mutatedBy(Results, AST.get()),
-              ElementsAre("static_cast<int &&>(x)"));
-
-  AST = buildASTFromCode("struct A {}; A operator+(const A&&, int);"
-                         "void f() { A x; static_cast<A&&>(x) + 1; }");
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_THAT(mutatedBy(Results, AST.get()),
-              ElementsAre("static_cast<A &&>(x)"));
-
-  AST = buildASTFromCode("void f() { struct A { A(const int&&); }; "
-                         "int x; A y(static_cast<int&&>(x)); }");
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_THAT(mutatedBy(Results, AST.get()),
-              ElementsAre("static_cast<int &&>(x)"));
-
-  AST = buildASTFromCode("void f() { struct A { A(); A(const A&&); }; "
-                         "A x; A y(static_cast<A&&>(x)); }");
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_THAT(mutatedBy(Results, AST.get()),
-              ElementsAre("static_cast<A &&>(x)"));
-}
-
-// section: explicit std::move and std::forward testing
-
-TEST(ExprMutationAnalyzerTest, Move) {
-  auto AST = buildASTFromCode(StdRemoveReference + StdMove +
-                              "void f() { struct A {}; A x; std::move(x); }");
-  auto Results =
-      match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_FALSE(isMutated(Results, AST.get()));
-
-  AST = buildASTFromCode(StdRemoveReference + StdMove +
-                         "void f() { struct A {}; A x, y; std::move(x) = y; }");
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_THAT(mutatedBy(Results, AST.get()), ElementsAre("std::move(x) = y"));
-
-  AST = buildASTFromCode(StdRemoveReference + StdMove +
-                         "void f() { int x, y; y = std::move(x); }");
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_FALSE(isMutated(Results, AST.get()));
-
-  AST =
-      buildASTFromCode(StdRemoveReference + StdMove +
-                       "struct S { S(); S(const S&); S& operator=(const S&); };"
-                       "void f() { S x, y; y = std::move(x); }");
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_FALSE(isMutated(Results, AST.get()));
-
-  AST = buildASTFromCode(StdRemoveReference + StdMove +
-                         "struct S { S(); S(S&&); S& operator=(S&&); };"
-                         "void f() { S x, y; y = std::move(x); }");
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_THAT(mutatedBy(Results, AST.get()), ElementsAre("y = std::move(x)"));
-
-  AST = buildASTFromCode(StdRemoveReference + StdMove +
-                         "struct S { S(); S(const S&); S(S&&);"
-                         "S& operator=(const S&); S& operator=(S&&); };"
-                         "void f() { S x, y; y = std::move(x); }");
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_THAT(mutatedBy(Results, AST.get()), ElementsAre("y = std::move(x)"));
-
-  AST = buildASTFromCode(StdRemoveReference + StdMove +
-                         "struct S { S(); S(const S&); S(S&&);"
-                         "S& operator=(const S&); S& operator=(S&&); };"
-                         "void f() { const S x; S y; y = std::move(x); }");
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_FALSE(isMutated(Results, AST.get()));
-
-  AST = buildASTFromCode(StdRemoveReference + StdMove +
-                         "struct S { S(); S& operator=(S); };"
-                         "void f() { S x, y; y = std::move(x); }");
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_FALSE(isMutated(Results, AST.get()));
-
-  AST = buildASTFromCode(StdRemoveReference + StdMove +
-                         "struct S{}; void f() { S x, y; y = std::move(x); }");
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_THAT(mutatedBy(Results, AST.get()), ElementsAre("y = std::move(x)"));
-
-  AST = buildASTFromCode(
-      StdRemoveReference + StdMove +
-      "struct S{}; void f() { const S x; S y; y = std::move(x); }");
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_FALSE(isMutated(Results, AST.get()));
-}
-
-TEST(ExprMutationAnalyzerTest, Forward) {
-  auto AST =
-      buildASTFromCode(StdRemoveReference + StdForward +
-                       "void f() { struct A {}; A x; std::forward<A &>(x); }");
-  auto Results =
-      match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_FALSE(isMutated(Results, AST.get()));
-
-  AST = buildASTFromCode(
-      StdRemoveReference + StdForward +
-      "void f() { struct A {}; A x, y; std::forward<A &>(x) = y; }");
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_THAT(mutatedBy(Results, AST.get()),
-              ElementsAre("std::forward<A &>(x) = y"));
-}
-
-// section: template constellations that prohibit reasoning about modifications
-//          as it depends on instantiations.
-
-TEST(ExprMutationAnalyzerTest, CallUnresolved) {
-  auto AST =
-      buildASTFromCodeWithArgs("template <class T> void f() { T x; g(x); }",
-                               {"-fno-delayed-template-parsing"});
-  auto Results =
-      match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_THAT(mutatedBy(Results, AST.get()), ElementsAre("g(x)"));
-
-  AST =
-      buildASTFromCodeWithArgs("template <int N> void f() { char x[N]; g(x); }",
-                               {"-fno-delayed-template-parsing"});
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_THAT(mutatedBy(Results, AST.get()), ElementsAre("g(x)"));
-
-  AST = buildASTFromCodeWithArgs(
-      "template <class T> void f(T t) { int x; g(t, x); }",
-      {"-fno-delayed-template-parsing"});
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_THAT(mutatedBy(Results, AST.get()), ElementsAre("g(t, x)"));
-
-  AST = buildASTFromCodeWithArgs(
-      "template <class T> void f(T t) { int x; t.mf(x); }",
-      {"-fno-delayed-template-parsing"});
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_THAT(mutatedBy(Results, AST.get()), ElementsAre("t.mf(x)"));
-
-  AST = buildASTFromCodeWithArgs(
-      "template <class T> struct S;"
-      "template <class T> void f() { S<T> s; int x; s.mf(x); }",
-      {"-fno-delayed-template-parsing"});
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_THAT(mutatedBy(Results, AST.get()), ElementsAre("s.mf(x)"));
-
-  AST = buildASTFromCodeWithArgs(
-      "struct S { template <class T> void mf(); };"
-      "template <class T> void f(S s) { int x; s.mf<T>(x); }",
-      {"-fno-delayed-template-parsing"});
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_THAT(mutatedBy(Results, AST.get()), ElementsAre("s.mf<T>(x)"));
-
-  AST = buildASTFromCodeWithArgs("template <class F>"
-                                 "void g(F f) { int x; f(x); } ",
-                                 {"-fno-delayed-template-parsing"});
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_THAT(mutatedBy(Results, AST.get()), ElementsAre("f(x)"));
-
-  AST = buildASTFromCodeWithArgs(
-      "template <class T> void f() { int x; (void)T(x); }",
-      {"-fno-delayed-template-parsing"});
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_THAT(mutatedBy(Results, AST.get()), ElementsAre("T(x)"));
-}
-
-// section: return values
-
-TEST(ExprMutationAnalyzerTest, ReturnAsValue) {
-  auto AST = buildASTFromCode("int f() { int x; return x; }");
-  auto Results =
-      match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_FALSE(isMutated(Results, AST.get()));
-
-  AST = buildASTFromCode("int* f() { int* x; return x; }");
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_FALSE(isMutated(Results, AST.get()));
-
-  AST = buildASTFromCode("typedef int* IntPtr;"
-                         "IntPtr f() { int* x; return x; }");
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_FALSE(isMutated(Results, AST.get()));
-}
-
-TEST(ExprMutationAnalyzerTest, ReturnAsNonConstRef) {
-  const auto AST = buildASTFromCode("int& f() { int x; return x; }");
-  const auto Results =
-      match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_THAT(mutatedBy(Results, AST.get()), ElementsAre("return x;"));
-}
-
-TEST(ExprMutationAnalyzerTest, ReturnAsConstRef) {
-  const auto AST = buildASTFromCode("const int& f() { int x; return x; }");
-  const auto Results =
-      match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_FALSE(isMutated(Results, AST.get()));
-}
-
-TEST(ExprMutationAnalyzerTest, ReturnAsNonConstRRef) {
-  const auto AST =
-      buildASTFromCode("int&& f() { int x; return static_cast<int &&>(x); }");
-  const auto Results =
-      match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_THAT(mutatedBy(Results, AST.get()),
-              ElementsAre("static_cast<int &&>(x)"));
-}
-
-TEST(ExprMutationAnalyzerTest, ReturnAsConstRRef) {
-  const auto AST = buildASTFromCode(
-      "const int&& f() { int x; return static_cast<int&&>(x); }");
-  const auto Results =
-      match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_THAT(mutatedBy(Results, AST.get()),
-              ElementsAre("static_cast<int &&>(x)"));
-}
-
-// section: taking the address of a variable and pointers
-
-TEST(ExprMutationAnalyzerTest, TakeAddress) {
-  const auto AST = buildASTFromCode("void g(int*); void f() { int x; g(&x); }");
-  const auto Results =
-      match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_THAT(mutatedBy(Results, AST.get()), ElementsAre("&x"));
-}
-
-TEST(ExprMutationAnalyzerTest, ArrayToPointerDecay) {
-  const auto AST =
-      buildASTFromCode("void g(int*); void f() { int x[2]; g(x); }");
-  const auto Results =
-      match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_THAT(mutatedBy(Results, AST.get()), ElementsAre("x"));
-}
-
-TEST(ExprMutationAnalyzerTest, TemplateWithArrayToPointerDecay) {
-  const auto AST = buildASTFromCodeWithArgs(
-      "template <typename T> struct S { static constexpr int v = 8; };"
-      "template <> struct S<int> { static constexpr int v = 4; };"
-      "void g(char*);"
-      "template <typename T> void f() { char x[S<T>::v]; g(x); }"
-      "template <> void f<int>() { char y[S<int>::v]; g(y); }",
-      {"-fno-delayed-template-parsing"});
-  const auto ResultsX =
-      match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_THAT(mutatedBy(ResultsX, AST.get()), ElementsAre("g(x)"));
-  const auto ResultsY =
-      match(withEnclosingCompound(declRefTo("y")), AST->getASTContext());
-  EXPECT_THAT(mutatedBy(ResultsY, AST.get()), ElementsAre("y"));
-}
-
-// section: special case: all created references are non-mutating themself
-//          and therefore all become 'const'/the value is not modified!
-
-TEST(ExprMutationAnalyzerTest, FollowRefModified) {
-  auto AST = buildASTFromCode(
-      "void f() { int x; int& r0 = x; int& r1 = r0; int& r2 = r1; "
-      "int& r3 = r2; r3 = 10; }");
-  auto Results =
-      match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_THAT(mutatedBy(Results, AST.get()),
-              ElementsAre("r0", "r1", "r2", "r3", "r3 = 10"));
-
-  AST = buildASTFromCode("typedef int& IntRefX;"
-                         "using IntRefY = int&;"
-                         "void f() { int x; IntRefX r0 = x; IntRefY r1 = r0;"
-                         "decltype((x)) r2 = r1; r2 = 10; }");
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_THAT(mutatedBy(Results, AST.get()),
-              ElementsAre("r0", "r1", "r2", "r2 = 10"));
-}
-
-TEST(ExprMutationAnalyzerTest, FollowRefNotModified) {
-  auto AST = buildASTFromCode(
-      "void f() { int x; int& r0 = x; int& r1 = r0; int& r2 = r1; "
-      "int& r3 = r2; int& r4 = r3; int& r5 = r4;}");
-  auto Results =
-      match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_FALSE(isMutated(Results, AST.get()));
-
-  AST = buildASTFromCode("void f() { int x; int& r0 = x; const int& r1 = r0;}");
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_FALSE(isMutated(Results, AST.get()));
-
-  AST = buildASTFromCode("typedef const int& CIntRefX;"
-                         "using CIntRefY = const int&;"
-                         "void f() { int x; int& r0 = x; CIntRefX r1 = r0;"
-                         "CIntRefY r2 = r1; decltype((r1)) r3 = r2;}");
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_FALSE(isMutated(Results, AST.get()));
-}
-
-TEST(ExprMutationAnalyzerTest, FollowConditionalRefModified) {
-  const auto AST = buildASTFromCode(
-      "void f() { int x, y; bool b; int &r = b ? x : y; r = 10; }");
-  const auto Results =
-      match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_THAT(mutatedBy(Results, AST.get()), ElementsAre("r", "r = 10"));
-}
-
-TEST(ExprMutationAnalyzerTest, FollowConditionalRefNotModified) {
-  const auto AST =
-      buildASTFromCode("void f() { int x, y; bool b; int& r = b ? x : y; }");
-  const auto Results =
-      match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_FALSE(isMutated(Results, AST.get()));
-}
-
-TEST(ExprMutationAnalyzerTest, FollowFuncArgModified) {
-  auto AST = buildASTFromCode("template <class T> void g(T&& t) { t = 10; }"
-                              "void f() { int x; g(x); }");
-  auto Results =
-      match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_THAT(mutatedBy(Results, AST.get()), ElementsAre("g(x)"));
-
-  AST = buildASTFromCode(
-      "void h(int&);"
-      "template <class... Args> void g(Args&&... args) { h(args...); }"
-      "void f() { int x; g(x); }");
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_THAT(mutatedBy(Results, AST.get()), ElementsAre("g(x)"));
-
-  AST = buildASTFromCode(
-      "void h(int&, int);"
-      "template <class... Args> void g(Args&&... args) { h(args...); }"
-      "void f() { int x, y; g(x, y); }");
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_THAT(mutatedBy(Results, AST.get()), ElementsAre("g(x, y)"));
-  Results = match(withEnclosingCompound(declRefTo("y")), AST->getASTContext());
-  EXPECT_FALSE(isMutated(Results, AST.get()));
-
-  AST = buildASTFromCode(
-      "void h(int, int&);"
-      "template <class... Args> void g(Args&&... args) { h(args...); }"
-      "void f() { int x, y; g(y, x); }");
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_THAT(mutatedBy(Results, AST.get()), ElementsAre("g(y, x)"));
-  Results = match(withEnclosingCompound(declRefTo("y")), AST->getASTContext());
-  EXPECT_FALSE(isMutated(Results, AST.get()));
-
-  AST = buildASTFromCode("struct S { template <class T> S(T&& t) { t = 10; } };"
-                         "void f() { int x; S s(x); }");
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_THAT(mutatedBy(Results, AST.get()), ElementsAre("x"));
-
-  AST = buildASTFromCode(
-      "struct S { template <class T> S(T&& t) : m(++t) { } int m; };"
-      "void f() { int x; S s(x); }");
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_THAT(mutatedBy(Results, AST.get()), ElementsAre("x"));
-
-  AST = buildASTFromCode("template <class U> struct S {"
-                         "template <class T> S(T&& t) : m(++t) { } U m; };"
-                         "void f() { int x; S<int> s(x); }");
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_THAT(mutatedBy(Results, AST.get()), ElementsAre("x"));
-
-  AST = buildASTFromCode(StdRemoveReference + StdForward +
-                         "template <class... Args> void u(Args&...);"
-                         "template <class... Args> void h(Args&&... args)"
-                         "{ u(std::forward<Args>(args)...); }"
-                         "template <class... Args> void g(Args&&... args)"
-                         "{ h(std::forward<Args>(args)...); }"
-                         "void f() { int x; g(x); }");
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_THAT(mutatedBy(Results, AST.get()), ElementsAre("g(x)"));
-}
-
-TEST(ExprMutationAnalyzerTest, FollowFuncArgNotModified) {
-  auto AST = buildASTFromCode("template <class T> void g(T&&) {}"
-                              "void f() { int x; g(x); }");
-  auto Results =
-      match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_FALSE(isMutated(Results, AST.get()));
-
-  AST = buildASTFromCode("template <class T> void g(T&& t) { t; }"
-                         "void f() { int x; g(x); }");
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_FALSE(isMutated(Results, AST.get()));
-
-  AST = buildASTFromCode("template <class... Args> void g(Args&&...) {}"
-                         "void f() { int x; g(x); }");
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_FALSE(isMutated(Results, AST.get()));
-
-  AST = buildASTFromCode("template <class... Args> void g(Args&&...) {}"
-                         "void f() { int y, x; g(y, x); }");
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_FALSE(isMutated(Results, AST.get()));
-
-  AST = buildASTFromCode(
-      "void h(int, int&);"
-      "template <class... Args> void g(Args&&... args) { h(args...); }"
-      "void f() { int x, y; g(x, y); }");
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_FALSE(isMutated(Results, AST.get()));
-
-  AST = buildASTFromCode("struct S { template <class T> S(T&& t) { t; } };"
-                         "void f() { int x; S s(x); }");
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_FALSE(isMutated(Results, AST.get()));
-
-  AST = buildASTFromCode(
-      "struct S { template <class T> S(T&& t) : m(t) { } int m; };"
-      "void f() { int x; S s(x); }");
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_FALSE(isMutated(Results, AST.get()));
-
-  AST = buildASTFromCode("template <class U> struct S {"
-                         "template <class T> S(T&& t) : m(t) { } U m; };"
-                         "void f() { int x; S<int> s(x); }");
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_FALSE(isMutated(Results, AST.get()));
-
-  AST = buildASTFromCode(StdRemoveReference + StdForward +
-                         "template <class... Args> void u(Args...);"
-                         "template <class... Args> void h(Args&&... args)"
-                         "{ u(std::forward<Args>(args)...); }"
-                         "template <class... Args> void g(Args&&... args)"
-                         "{ h(std::forward<Args>(args)...); }"
-                         "void f() { int x; g(x); }");
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_FALSE(isMutated(Results, AST.get()));
-}
-
-// section: builtin arrays
-
-TEST(ExprMutationAnalyzerTest, ArrayElementModified) {
-  const auto AST = buildASTFromCode("void f() { int x[2]; x[0] = 10; }");
-  const auto Results =
-      match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_THAT(mutatedBy(Results, AST.get()), ElementsAre("x[0] = 10"));
-}
-
-TEST(ExprMutationAnalyzerTest, ArrayElementNotModified) {
-  const auto AST = buildASTFromCode("void f() { int x[2]; x[0]; }");
-  const auto Results =
-      match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_FALSE(isMutated(Results, AST.get()));
-}
-
-// section: member modifications
-
-TEST(ExprMutationAnalyzerTest, NestedMemberModified) {
-  auto AST =
-      buildASTFromCode("void f() { struct A { int vi; }; struct B { A va; }; "
-                       "struct C { B vb; }; C x; x.vb.va.vi = 10; }");
-  auto Results =
-      match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_THAT(mutatedBy(Results, AST.get()), ElementsAre("x.vb.va.vi = 10"));
-
-  AST = buildASTFromCodeWithArgs(
-      "template <class T> void f() { T x; x.y.z = 10; }",
-      {"-fno-delayed-template-parsing"});
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_THAT(mutatedBy(Results, AST.get()), ElementsAre("x.y.z = 10"));
-
-  AST = buildASTFromCodeWithArgs(
-      "template <class T> struct S;"
-      "template <class T> void f() { S<T> x; x.y.z = 10; }",
-      {"-fno-delayed-template-parsing"});
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_THAT(mutatedBy(Results, AST.get()), ElementsAre("x.y.z = 10"));
-}
-
-TEST(ExprMutationAnalyzerTest, NestedMemberNotModified) {
-  auto AST =
-      buildASTFromCode("void f() { struct A { int vi; }; struct B { A va; }; "
-                       "struct C { B vb; }; C x; x.vb.va.vi; }");
-  auto Results =
-      match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_FALSE(isMutated(Results, AST.get()));
-
-  AST = buildASTFromCodeWithArgs("template <class T> void f() { T x; x.y.z; }",
-                                 {"-fno-delayed-template-parsing"});
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_FALSE(isMutated(Results, AST.get()));
-
-  AST =
-      buildASTFromCodeWithArgs("template <class T> struct S;"
-                               "template <class T> void f() { S<T> x; x.y.z; }",
-                               {"-fno-delayed-template-parsing"});
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_FALSE(isMutated(Results, AST.get()));
-}
-
-// section: casts
-
-TEST(ExprMutationAnalyzerTest, CastToValue) {
-  const auto AST =
-      buildASTFromCode("void f() { int x; static_cast<double>(x); }");
-  const auto Results =
-      match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_FALSE(isMutated(Results, AST.get()));
-}
-
-TEST(ExprMutationAnalyzerTest, CastToRefModified) {
-  auto AST =
-      buildASTFromCode("void f() { int x; static_cast<int &>(x) = 10; }");
-  auto Results =
-      match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_THAT(mutatedBy(Results, AST.get()),
-              ElementsAre("static_cast<int &>(x)"));
-
-  AST = buildASTFromCode("typedef int& IntRef;"
-                         "void f() { int x; static_cast<IntRef>(x) = 10; }");
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_THAT(mutatedBy(Results, AST.get()),
-              ElementsAre("static_cast<IntRef>(x)"));
-}
-
-TEST(ExprMutationAnalyzerTest, CastToRefNotModified) {
-  const auto AST =
-      buildASTFromCode("void f() { int x; static_cast<int&>(x); }");
-  const auto Results =
-      match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_THAT(mutatedBy(Results, AST.get()),
-              ElementsAre("static_cast<int &>(x)"));
-}
-
-TEST(ExprMutationAnalyzerTest, CastToConstRef) {
-  auto AST =
-      buildASTFromCode("void f() { int x; static_cast<const int&>(x); }");
-  auto Results =
-      match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_FALSE(isMutated(Results, AST.get()));
-
-  AST = buildASTFromCode("typedef const int& CIntRef;"
-                         "void f() { int x; static_cast<CIntRef>(x); }");
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_FALSE(isMutated(Results, AST.get()));
-}
-
-// section: comma expressions
-
-TEST(ExprMutationAnalyzerTest, CommaExprWithAnAssigment) {
-  const auto AST = buildASTFromCodeWithArgs(
-      "void f() { int x; int y; (x, y) = 5; }", {"-Wno-unused-value"});
-  const auto Results =
-      match(withEnclosingCompound(declRefTo("y")), AST->getASTContext());
-  EXPECT_TRUE(isMutated(Results, AST.get()));
-}
-
-TEST(ExprMutationAnalyzerTest, CommaExprWithDecOp) {
-  const auto AST = buildASTFromCodeWithArgs(
-      "void f() { int x; int y; (x, y)++; }", {"-Wno-unused-value"});
-  const auto Results =
-      match(withEnclosingCompound(declRefTo("y")), AST->getASTContext());
-  EXPECT_TRUE(isMutated(Results, AST.get()));
-}
-
-TEST(ExprMutationAnalyzerTest, CommaExprWithNonConstMemberCall) {
-  const auto AST = buildASTFromCodeWithArgs(
-      "class A { public: int mem; void f() { mem ++; } };"
-      "void fn() { A o1, o2; (o1, o2).f(); }",
-      {"-Wno-unused-value"});
-  const auto Results =
-      match(withEnclosingCompound(declRefTo("o2")), AST->getASTContext());
-  EXPECT_TRUE(isMutated(Results, AST.get()));
-}
-
-TEST(ExprMutationAnalyzerTest, CommaExprWithConstMemberCall) {
-  const auto AST = buildASTFromCodeWithArgs(
-      "class A { public: int mem; void f() const  { } };"
-      "void fn() { A o1, o2; (o1, o2).f(); }",
-      {"-Wno-unused-value"});
-  const auto Results =
-      match(withEnclosingCompound(declRefTo("o2")), AST->getASTContext());
-  EXPECT_FALSE(isMutated(Results, AST.get()));
-}
-
-TEST(ExprMutationAnalyzerTest, CommaExprWithCallExpr) {
-  const auto AST =
-      buildASTFromCodeWithArgs("class A { public: int mem; void f(A &O1) {} };"
-                               "void fn() { A o1, o2; o2.f((o2, o1)); }",
-                               {"-Wno-unused-value"});
-  const auto Results =
-      match(withEnclosingCompound(declRefTo("o1")), AST->getASTContext());
-  EXPECT_TRUE(isMutated(Results, AST.get()));
-}
-
-TEST(ExprMutationAnalyzerTest, CommaExprWithCallUnresolved) {
-  auto AST = buildASTFromCodeWithArgs(
-      "template <class T> struct S;"
-      "template <class T> void f() { S<T> s; int x, y; s.mf((y, x)); }",
-      {"-fno-delayed-template-parsing", "-Wno-unused-value"});
-  auto Results =
-      match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_TRUE(isMutated(Results, AST.get()));
-
-  AST = buildASTFromCodeWithArgs(
-      "template <class T> void f(T t) { int x, y; g(t, (y, x)); }",
-      {"-fno-delayed-template-parsing", "-Wno-unused-value"});
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_TRUE(isMutated(Results, AST.get()));
-}
-
-TEST(ExprMutationAnalyzerTest, CommaExprParmRef) {
-  const auto AST =
-      buildASTFromCodeWithArgs("class A { public: int mem;};"
-                               "extern void fn(A &o1);"
-                               "void fn2 () { A o1, o2; fn((o2, o1)); } ",
-                               {"-Wno-unused-value"});
-  const auto Results =
-      match(withEnclosingCompound(declRefTo("o1")), AST->getASTContext());
-  EXPECT_TRUE(isMutated(Results, AST.get()));
-}
-
-TEST(ExprMutationAnalyzerTest, CommaExprWithAmpersandOp) {
-  const auto AST = buildASTFromCodeWithArgs("class A { public: int mem;};"
-                                            "void fn () { A o1, o2;"
-                                            "void *addr = &(o2, o1); } ",
-                                            {"-Wno-unused-value"});
-  const auto Results =
-      match(withEnclosingCompound(declRefTo("o1")), AST->getASTContext());
-  EXPECT_TRUE(isMutated(Results, AST.get()));
-}
-
-TEST(ExprMutationAnalyzerTest, CommaExprAsReturnAsValue) {
-  auto AST = buildASTFromCodeWithArgs("int f() { int x, y; return (x, y); }",
-                                      {"-Wno-unused-value"});
-  auto Results =
-      match(withEnclosingCompound(declRefTo("y")), AST->getASTContext());
-  EXPECT_FALSE(isMutated(Results, AST.get()));
-}
-
-TEST(ExprMutationAnalyzerTest, CommaEpxrAsReturnAsNonConstRef) {
-  const auto AST = buildASTFromCodeWithArgs(
-      "int& f() { int x, y; return (y, x); }", {"-Wno-unused-value"});
-  const auto Results =
-      match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_TRUE(isMutated(Results, AST.get()));
-}
-
-TEST(ExprMutationAnalyzerTest, CommaExprAsArrayToPointerDecay) {
-  const auto AST =
-      buildASTFromCodeWithArgs("void g(int*); "
-                               "void f() { int x[2], y[2]; g((y, x)); }",
-                               {"-Wno-unused-value"});
-  const auto Results =
-      match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_TRUE(isMutated(Results, AST.get()));
-}
-
-TEST(ExprMutationAnalyzerTest, CommaExprAsUniquePtr) {
-  const std::string UniquePtrDef = "template <class T> struct UniquePtr {"
-                                   "  UniquePtr();"
-                                   "  UniquePtr(const UniquePtr&) = delete;"
-                                   "  T& operator*() const;"
-                                   "  T* operator->() const;"
-                                   "};";
-  const auto AST = buildASTFromCodeWithArgs(
-      UniquePtrDef + "template <class T> void f() "
-                     "{ UniquePtr<T> x; UniquePtr<T> y;"
-                     " (y, x)->mf(); }",
-      {"-fno-delayed-template-parsing", "-Wno-unused-value"});
-  const auto Results =
-      match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_TRUE(isMutated(Results, AST.get()));
-}
-
-TEST(ExprMutationAnalyzerTest, CommaNestedConditional) {
-  const std::string Code = "void f() { int x, y = 42;"
-                           " y, (true ? x : y) = 42; }";
-  const auto AST = buildASTFromCodeWithArgs(Code, {"-Wno-unused-value"});
-  const auto Results =
-      match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_THAT(mutatedBy(Results, AST.get()),
-              ElementsAre("(true ? x : y) = 42"));
-}
-
-// section: lambda captures
-
-TEST(ExprMutationAnalyzerTest, LambdaDefaultCaptureByValue) {
-  const auto AST = buildASTFromCode("void f() { int x; [=]() { x; }; }");
-  const auto Results =
-      match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_FALSE(isMutated(Results, AST.get()));
-}
-
-TEST(ExprMutationAnalyzerTest, LambdaExplicitCaptureByValue) {
-  const auto AST = buildASTFromCode("void f() { int x; [x]() { x; }; }");
-  const auto Results =
-      match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_FALSE(isMutated(Results, AST.get()));
-}
-
-TEST(ExprMutationAnalyzerTest, LambdaDefaultCaptureByRef) {
-  const auto AST = buildASTFromCode("void f() { int x; [&]() { x = 10; }; }");
-  const auto Results =
-      match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_THAT(mutatedBy(Results, AST.get()),
-              ElementsAre(ResultOf(removeSpace, "[&](){x=10;}")));
-}
-
-TEST(ExprMutationAnalyzerTest, LambdaExplicitCaptureByRef) {
-  const auto AST = buildASTFromCode("void f() { int x; [&x]() { x = 10; }; }");
-  const auto Results =
-      match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_THAT(mutatedBy(Results, AST.get()),
-              ElementsAre(ResultOf(removeSpace, "[&x](){x=10;}")));
-}
-
-// section: range-for loops
-
-TEST(ExprMutationAnalyzerTest, RangeForArrayByRefModified) {
-  auto AST =
-      buildASTFromCode("void f() { int x[2]; for (int& e : x) e = 10; }");
-  auto Results =
-      match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_THAT(mutatedBy(Results, AST.get()),
-              ElementsAre("for (int &e : x)\n    e = 10;"));
-
-  AST = buildASTFromCode("typedef int& IntRef;"
-                         "void f() { int x[2]; for (IntRef e : x) e = 10; }");
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_THAT(mutatedBy(Results, AST.get()),
-              ElementsAre("for (IntRef e : x)\n    e = 10;"));
-}
-
-TEST(ExprMutationAnalyzerTest, RangeForArrayByRefModifiedByImplicitInit) {
-  const auto AST =
-      buildASTFromCode("void f() { int x[2]; for (int& e : x) e; }");
-  const auto Results =
-      match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_TRUE(isMutated(Results, AST.get()));
-}
-
-TEST(ExprMutationAnalyzerTest, RangeForArrayByValue) {
-  auto AST = buildASTFromCode("void f() { int x[2]; for (int e : x) e = 10; }");
-  auto Results =
-      match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_FALSE(isMutated(Results, AST.get()));
-
-  AST =
-      buildASTFromCode("void f() { int* x[2]; for (int* e : x) e = nullptr; }");
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_FALSE(isMutated(Results, AST.get()));
-
-  AST = buildASTFromCode(
-      "typedef int* IntPtr;"
-      "void f() { int* x[2]; for (IntPtr e : x) e = nullptr; }");
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_FALSE(isMutated(Results, AST.get()));
-}
-
-TEST(ExprMutationAnalyzerTest, RangeForArrayByConstRef) {
-  auto AST =
-      buildASTFromCode("void f() { int x[2]; for (const int& e : x) e; }");
-  auto Results =
-      match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_FALSE(isMutated(Results, AST.get()));
-
-  AST = buildASTFromCode("typedef const int& CIntRef;"
-                         "void f() { int x[2]; for (CIntRef e : x) e; }");
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_FALSE(isMutated(Results, AST.get()));
-}
-
-TEST(ExprMutationAnalyzerTest, RangeForNonArrayByRefModified) {
-  const auto AST =
-      buildASTFromCode("struct V { int* begin(); int* end(); };"
-                       "void f() { V x; for (int& e : x) e = 10; }");
-  const auto Results =
-      match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_THAT(mutatedBy(Results, AST.get()),
-              ElementsAre("for (int &e : x)\n    e = 10;"));
-}
-
-TEST(ExprMutationAnalyzerTest, RangeForNonArrayByRefNotModified) {
-  const auto AST = buildASTFromCode("struct V { int* begin(); int* end(); };"
-                                    "void f() { V x; for (int& e : x) e; }");
-  const auto Results =
-      match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_TRUE(isMutated(Results, AST.get()));
-}
-
-TEST(ExprMutationAnalyzerTest, RangeForNonArrayByValue) {
-  const auto AST = buildASTFromCode(
-      "struct V { const int* begin() const; const int* end() const; };"
-      "void f() { V x; for (int e : x) e; }");
-  const auto Results =
-      match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_FALSE(isMutated(Results, AST.get()));
-}
-
-TEST(ExprMutationAnalyzerTest, RangeForNonArrayByConstRef) {
-  const auto AST = buildASTFromCode(
-      "struct V { const int* begin() const; const int* end() const; };"
-      "void f() { V x; for (const int& e : x) e; }");
-  const auto Results =
-      match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_FALSE(isMutated(Results, AST.get()));
-}
-
-// section: unevaluated expressions
-
-TEST(ExprMutationAnalyzerTest, UnevaluatedExpressions) {
-  auto AST = buildASTFromCode("void f() { int x, y; decltype(x = 10) z = y; }");
-  auto Results =
-      match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_FALSE(isMutated(Results, AST.get()));
-
-  AST = buildASTFromCode("void f() { int x, y; __typeof(x = 10) z = y; }");
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_FALSE(isMutated(Results, AST.get()));
-
-  AST = buildASTFromCode("void f() { int x, y; __typeof__(x = 10) z = y; }");
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_FALSE(isMutated(Results, AST.get()));
-
-  AST = buildASTFromCode("void f() { int x; sizeof(x = 10); }");
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_FALSE(isMutated(Results, AST.get()));
-
-  AST = buildASTFromCode("void f() { int x; alignof(x = 10); }");
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_FALSE(isMutated(Results, AST.get()));
-
-  AST = buildASTFromCode("void f() { int x; noexcept(x = 10); }");
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_FALSE(isMutated(Results, AST.get()));
-
-  AST = buildASTFromCodeWithArgs("namespace std { class type_info; }"
-                                 "void f() { int x; typeid(x = 10); }",
-                                 {"-frtti"});
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_FALSE(isMutated(Results, AST.get()));
-
-  AST = buildASTFromCode(
-      "void f() { int x; _Generic(x = 10, int: 0, default: 1); }");
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_FALSE(isMutated(Results, AST.get()));
-}
-
-TEST(ExprMutationAnalyzerTest, NotUnevaluatedExpressions) {
-  auto AST = buildASTFromCode("void f() { int x; sizeof(int[x++]); }");
-  auto Results =
-      match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_THAT(mutatedBy(Results, AST.get()), ElementsAre("x++"));
-
-  AST = buildASTFromCodeWithArgs(
-      "namespace std { class type_info; }"
-      "struct A { virtual ~A(); }; struct B : A {};"
-      "struct X { A& f(); }; void f() { X x; typeid(x.f()); }",
-      {"-frtti"});
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_THAT(mutatedBy(Results, AST.get()), ElementsAre("x.f()"));
-}
-
-// section: special case: smartpointers
-
-TEST(ExprMutationAnalyzerTest, UniquePtr) {
-  const std::string UniquePtrDef =
-      "template <class T> struct UniquePtr {"
-      "  UniquePtr();"
-      "  UniquePtr(const UniquePtr&) = delete;"
-      "  UniquePtr(UniquePtr&&);"
-      "  UniquePtr& operator=(const UniquePtr&) = delete;"
-      "  UniquePtr& operator=(UniquePtr&&);"
-      "  T& operator*() const;"
-      "  T* operator->() const;"
-      "};";
-
-  auto AST = buildASTFromCode(UniquePtrDef +
-                              "void f() { UniquePtr<int> x; *x = 10; }");
-  auto Results =
-      match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_THAT(mutatedBy(Results, AST.get()), ElementsAre("* x = 10"));
-
-  AST = buildASTFromCode(UniquePtrDef + "void f() { UniquePtr<int> x; *x; }");
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_FALSE(isMutated(Results, AST.get()));
-
-  AST = buildASTFromCode(UniquePtrDef +
-                         "void f() { UniquePtr<const int> x; *x; }");
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_FALSE(isMutated(Results, AST.get()));
-
-  AST = buildASTFromCode(UniquePtrDef + "struct S { int v; };"
-                                        "void f() { UniquePtr<S> x; x->v; }");
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_THAT(mutatedBy(Results, AST.get()), ElementsAre("x"));
-
-  AST = buildASTFromCode(UniquePtrDef +
-                         "struct S { int v; };"
-                         "void f() { UniquePtr<const S> x; x->v; }");
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_FALSE(isMutated(Results, AST.get()));
-
-  AST =
-      buildASTFromCode(UniquePtrDef + "struct S { void mf(); };"
-                                      "void f() { UniquePtr<S> x; x->mf(); }");
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_THAT(mutatedBy(Results, AST.get()), ElementsAre("x"));
-
-  AST = buildASTFromCode(UniquePtrDef +
-                         "struct S { void mf() const; };"
-                         "void f() { UniquePtr<const S> x; x->mf(); }");
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_FALSE(isMutated(Results, AST.get()));
-
-  AST = buildASTFromCodeWithArgs(
-      UniquePtrDef + "template <class T> void f() { UniquePtr<T> x; x->mf(); }",
-      {"-fno-delayed-template-parsing"});
-  Results = match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_THAT(mutatedBy(Results, AST.get()), ElementsAre("x->mf()"));
-}
-
-// section: complex problems detected on real code
-
-TEST(ExprMutationAnalyzerTest, UnevaluatedContext) {
-  const std::string Example =
-      "template <typename T>"
-      "struct to_construct : T { to_construct(int &j) {} };"
-      "template <typename T>"
-      "void placement_new_in_unique_ptr() { int x = 0;"
-      "  new to_construct<T>(x);"
-      "}";
-  auto AST =
-      buildASTFromCodeWithArgs(Example, {"-fno-delayed-template-parsing"});
-  auto Results =
-      match(withEnclosingCompound(declRefTo("x")), AST->getASTContext());
-  EXPECT_TRUE(isMutated(Results, AST.get()));
-  EXPECT_THAT(mutatedBy(Results, AST.get()), ElementsAre("(x)"));
-}
-
-TEST(ExprMutationAnalyzerTest, ReproduceFailureMinimal) {
-  const std::string Reproducer =
-      "namespace std {"
-      "template <class T> T forward(T & A) { return static_cast<T&&>(A); }"
-      "template <class T> struct __bind {"
-      "  T f;"
-      "  template <class V> __bind(T v, V &&) : f(forward(v)) {}"
-      "};"
-      "}"
-      "void f() {"
-      "  int x = 42;"
-      "  auto Lambda = [] {};"
-      "  std::__bind<decltype(Lambda)>(Lambda, x);"
-      "}";
-  auto AST11 = buildASTFromCodeWithArgs(Reproducer, {"-std=c++11"});
-  auto Results11 =
-      match(withEnclosingCompound(declRefTo("x")), AST11->getASTContext());
-  EXPECT_FALSE(isMutated(Results11, AST11.get()));
-}
-} // namespace clang
diff --git a/gnu/llvm/clang/unittests/Analysis/MacroExpansionContextTest.cpp b/gnu/llvm/clang/unittests/Analysis/MacroExpansionContextTest.cpp
deleted file mode 100644
index 2e86457d276..00000000000
--- a/gnu/llvm/clang/unittests/Analysis/MacroExpansionContextTest.cpp
+++ /dev/null
@@ -1,424 +0,0 @@
-//===- unittests/Analysis/MacroExpansionContextTest.cpp - -----------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/Analysis/MacroExpansionContext.h"
-#include "clang/AST/ASTConsumer.h"
-#include "clang/AST/ASTContext.h"
-#include "clang/Basic/Diagnostic.h"
-#include "clang/Basic/DiagnosticOptions.h"
-#include "clang/Basic/FileManager.h"
-#include "clang/Basic/LangOptions.h"
-#include "clang/Basic/SourceManager.h"
-#include "clang/Basic/TargetInfo.h"
-#include "clang/Basic/TargetOptions.h"
-#include "clang/Lex/HeaderSearch.h"
-#include "clang/Lex/HeaderSearchOptions.h"
-#include "clang/Lex/Preprocessor.h"
-#include "clang/Lex/PreprocessorOptions.h"
-#include "clang/Parse/Parser.h"
-#include "llvm/ADT/SmallString.h"
-#include "gtest/gtest.h"
-
-// static bool HACK_EnableDebugInUnitTest = (::llvm::DebugFlag = true);
-
-namespace clang {
-namespace analysis {
-namespace {
-
-class MacroExpansionContextTest : public ::testing::Test {
-protected:
-  MacroExpansionContextTest()
-      : InMemoryFileSystem(new llvm::vfs::InMemoryFileSystem),
-        FileMgr(FileSystemOptions(), InMemoryFileSystem),
-        DiagID(new DiagnosticIDs()), DiagOpts(new DiagnosticOptions()),
-        Diags(DiagID, DiagOpts.get(), new IgnoringDiagConsumer()),
-        SourceMgr(Diags, FileMgr), TargetOpts(new TargetOptions()) {
-    TargetOpts->Triple = "x86_64-pc-linux-unknown";
-    Target = TargetInfo::CreateTargetInfo(Diags, TargetOpts);
-    LangOpts.CPlusPlus20 = 1; // For __VA_OPT__
-  }
-
-  IntrusiveRefCntPtr<llvm::vfs::InMemoryFileSystem> InMemoryFileSystem;
-  FileManager FileMgr;
-  IntrusiveRefCntPtr<DiagnosticIDs> DiagID;
-  IntrusiveRefCntPtr<DiagnosticOptions> DiagOpts;
-  DiagnosticsEngine Diags;
-  SourceManager SourceMgr;
-  LangOptions LangOpts;
-  std::shared_ptr<TargetOptions> TargetOpts;
-  IntrusiveRefCntPtr<TargetInfo> Target;
-
-  std::unique_ptr<MacroExpansionContext>
-  getMacroExpansionContextFor(StringRef SourceText) {
-    std::unique_ptr<llvm::MemoryBuffer> Buf =
-        llvm::MemoryBuffer::getMemBuffer(SourceText);
-    SourceMgr.setMainFileID(SourceMgr.createFileID(std::move(Buf)));
-    TrivialModuleLoader ModLoader;
-    HeaderSearch HeaderInfo(std::make_shared<HeaderSearchOptions>(), SourceMgr,
-                            Diags, LangOpts, Target.get());
-    Preprocessor PP(std::make_shared<PreprocessorOptions>(), Diags, LangOpts,
-                    SourceMgr, HeaderInfo, ModLoader,
-                    /*IILookup =*/nullptr,
-                    /*OwnsHeaderSearch =*/false);
-
-    PP.Initialize(*Target);
-    auto Ctx = std::make_unique<MacroExpansionContext>(LangOpts);
-    Ctx->registerForPreprocessor(PP);
-
-    // Lex source text.
-    PP.EnterMainSourceFile();
-
-    while (true) {
-      Token Tok;
-      PP.Lex(Tok);
-      if (Tok.is(tok::eof))
-        break;
-    }
-
-    // Callbacks have been executed at this point.
-    return Ctx;
-  }
-
-  /// Returns the expansion location to main file at the given row and column.
-  SourceLocation at(unsigned row, unsigned col) const {
-    SourceLocation Loc =
-        SourceMgr.translateLineCol(SourceMgr.getMainFileID(), row, col);
-    return SourceMgr.getExpansionLoc(Loc);
-  }
-
-  static std::string dumpExpandedTexts(const MacroExpansionContext &Ctx) {
-    std::string Buf;
-    llvm::raw_string_ostream OS{Buf};
-    Ctx.dumpExpandedTextsToStream(OS);
-    return OS.str();
-  }
-
-  static std::string dumpExpansionRanges(const MacroExpansionContext &Ctx) {
-    std::string Buf;
-    llvm::raw_string_ostream OS{Buf};
-    Ctx.dumpExpansionRangesToStream(OS);
-    return OS.str();
-  }
-};
-
-TEST_F(MacroExpansionContextTest, IgnoresPragmas) {
-  // No-crash during lexing.
-  const auto Ctx = getMacroExpansionContextFor(R"code(
-  _Pragma("pack(push, 1)")
-  _Pragma("pack(pop, 1)")
-      )code");
-  // After preprocessing:
-  // #pragma pack(push, 1)
-  // #pragma pack(pop, 1)
-
-  EXPECT_EQ("\n=============== ExpandedTokens ===============\n",
-            dumpExpandedTexts(*Ctx));
-  EXPECT_EQ("\n=============== ExpansionRanges ===============\n",
-            dumpExpansionRanges(*Ctx));
-
-  EXPECT_FALSE(Ctx->getExpandedText(at(2, 1)).hasValue());
-  EXPECT_FALSE(Ctx->getOriginalText(at(2, 1)).hasValue());
-
-  EXPECT_FALSE(Ctx->getExpandedText(at(2, 3)).hasValue());
-  EXPECT_FALSE(Ctx->getOriginalText(at(2, 3)).hasValue());
-
-  EXPECT_FALSE(Ctx->getExpandedText(at(3, 3)).hasValue());
-  EXPECT_FALSE(Ctx->getOriginalText(at(3, 3)).hasValue());
-}
-
-TEST_F(MacroExpansionContextTest, NoneForNonExpansionLocations) {
-  const auto Ctx = getMacroExpansionContextFor(R"code(
-  #define EMPTY
-  A b cd EMPTY ef EMPTY gh
-EMPTY zz
-      )code");
-  // After preprocessing:
-  //  A b cd ef gh
-  //      zz
-
-  // That's the beginning of the definition of EMPTY.
-  EXPECT_FALSE(Ctx->getExpandedText(at(2, 11)).hasValue());
-  EXPECT_FALSE(Ctx->getOriginalText(at(2, 11)).hasValue());
-
-  // The space before the first expansion of EMPTY.
-  EXPECT_FALSE(Ctx->getExpandedText(at(3, 9)).hasValue());
-  EXPECT_FALSE(Ctx->getOriginalText(at(3, 9)).hasValue());
-
-  // The beginning of the first expansion of EMPTY.
-  EXPECT_TRUE(Ctx->getExpandedText(at(3, 10)).hasValue());
-  EXPECT_TRUE(Ctx->getOriginalText(at(3, 10)).hasValue());
-
-  // Pointing inside of the token EMPTY, but not at the beginning.
-  // FIXME: We only deal with begin locations.
-  EXPECT_FALSE(Ctx->getExpandedText(at(3, 11)).hasValue());
-  EXPECT_FALSE(Ctx->getOriginalText(at(3, 11)).hasValue());
-
-  // Same here.
-  EXPECT_FALSE(Ctx->getExpandedText(at(3, 12)).hasValue());
-  EXPECT_FALSE(Ctx->getOriginalText(at(3, 12)).hasValue());
-
-  // The beginning of the last expansion of EMPTY.
-  EXPECT_TRUE(Ctx->getExpandedText(at(4, 1)).hasValue());
-  EXPECT_TRUE(Ctx->getOriginalText(at(4, 1)).hasValue());
-
-  // Same as for the 3:11 case.
-  EXPECT_FALSE(Ctx->getExpandedText(at(4, 2)).hasValue());
-  EXPECT_FALSE(Ctx->getOriginalText(at(4, 2)).hasValue());
-}
-
-TEST_F(MacroExpansionContextTest, EmptyExpansions) {
-  const auto Ctx = getMacroExpansionContextFor(R"code(
-  #define EMPTY
-  A b cd EMPTY ef EMPTY gh
-EMPTY zz
-      )code");
-  // After preprocessing:
-  //  A b cd ef gh
-  //      zz
-
-  EXPECT_EQ("", Ctx->getExpandedText(at(3, 10)).getValue());
-  EXPECT_EQ("EMPTY", Ctx->getOriginalText(at(3, 10)).getValue());
-
-  EXPECT_EQ("", Ctx->getExpandedText(at(3, 19)).getValue());
-  EXPECT_EQ("EMPTY", Ctx->getOriginalText(at(3, 19)).getValue());
-
-  EXPECT_EQ("", Ctx->getExpandedText(at(4, 1)).getValue());
-  EXPECT_EQ("EMPTY", Ctx->getOriginalText(at(4, 1)).getValue());
-}
-
-TEST_F(MacroExpansionContextTest, TransitiveExpansions) {
-  const auto Ctx = getMacroExpansionContextFor(R"code(
-  #define EMPTY
-  #define WOOF EMPTY ) EMPTY   1
-  A b cd WOOF ef EMPTY gh
-      )code");
-  // After preprocessing:
-  //  A b cd ) 1 ef gh
-
-  EXPECT_EQ("WOOF", Ctx->getOriginalText(at(4, 10)).getValue());
-
-  EXPECT_EQ("", Ctx->getExpandedText(at(4, 18)).getValue());
-  EXPECT_EQ("EMPTY", Ctx->getOriginalText(at(4, 18)).getValue());
-}
-
-TEST_F(MacroExpansionContextTest, MacroFunctions) {
-  const auto Ctx = getMacroExpansionContextFor(R"code(
-  #define EMPTY
-  #define WOOF(x) x(EMPTY ) )  ) EMPTY   1
-  A b cd WOOF($$ ef) EMPTY gh
-  WOOF(WOOF)
-  WOOF(WOOF(bar barr))),,),')
-      )code");
-  // After preprocessing:
-  //  A b cd $$ ef( ) ) ) 1 gh
-  //  WOOF( ) ) ) 1
-  //  bar barr( ) ) ) 1( ) ) ) 1),,),')
-
-  EXPECT_EQ("$$ ef ()))1", Ctx->getExpandedText(at(4, 10)).getValue());
-  EXPECT_EQ("WOOF($$ ef)", Ctx->getOriginalText(at(4, 10)).getValue());
-
-  EXPECT_EQ("", Ctx->getExpandedText(at(4, 22)).getValue());
-  EXPECT_EQ("EMPTY", Ctx->getOriginalText(at(4, 22)).getValue());
-
-  EXPECT_EQ("WOOF ()))1", Ctx->getExpandedText(at(5, 3)).getValue());
-  EXPECT_EQ("WOOF(WOOF)", Ctx->getOriginalText(at(5, 3)).getValue());
-
-  EXPECT_EQ("bar barr ()))1()))1", Ctx->getExpandedText(at(6, 3)).getValue());
-  EXPECT_EQ("WOOF(WOOF(bar barr))", Ctx->getOriginalText(at(6, 3)).getValue());
-}
-
-TEST_F(MacroExpansionContextTest, VariadicMacros) {
-  // From the GCC website.
-  const auto Ctx = getMacroExpansionContextFor(R"code(
-  #define eprintf(format, ...) fprintf (stderr, format, __VA_ARGS__)
-  eprintf("success!\n", );
-  eprintf("success!\n");
-
-  #define eprintf2(format, ...) \
-    fprintf (stderr, format __VA_OPT__(,) __VA_ARGS__)
-  eprintf2("success!\n", );
-  eprintf2("success!\n");
-      )code");
-  // After preprocessing:
-  //  fprintf (stderr, "success!\n", );
-  //  fprintf (stderr, "success!\n", );
-  //  fprintf (stderr, "success!\n" );
-  //  fprintf (stderr, "success!\n" );
-
-  EXPECT_EQ(R"(fprintf (stderr ,"success!\n",))",
-            Ctx->getExpandedText(at(3, 3)).getValue());
-  EXPECT_EQ(R"(eprintf("success!\n", ))",
-            Ctx->getOriginalText(at(3, 3)).getValue());
-
-  EXPECT_EQ(R"(fprintf (stderr ,"success!\n",))",
-            Ctx->getExpandedText(at(4, 3)).getValue());
-  EXPECT_EQ(R"(eprintf("success!\n"))",
-            Ctx->getOriginalText(at(4, 3)).getValue());
-
-  EXPECT_EQ(R"(fprintf (stderr ,"success!\n"))",
-            Ctx->getExpandedText(at(8, 3)).getValue());
-  EXPECT_EQ(R"(eprintf2("success!\n", ))",
-            Ctx->getOriginalText(at(8, 3)).getValue());
-
-  EXPECT_EQ(R"(fprintf (stderr ,"success!\n"))",
-            Ctx->getExpandedText(at(9, 3)).getValue());
-  EXPECT_EQ(R"(eprintf2("success!\n"))",
-            Ctx->getOriginalText(at(9, 3)).getValue());
-}
-
-TEST_F(MacroExpansionContextTest, ConcatenationMacros) {
-  // From the GCC website.
-  const auto Ctx = getMacroExpansionContextFor(R"code(
-  #define COMMAND(NAME)  { #NAME, NAME ## _command }
-  struct command commands[] = {
-    COMMAND(quit),
-    COMMAND(help),
-  };)code");
-  // After preprocessing:
-  //  struct command commands[] = {
-  //    { "quit", quit_command },
-  //    { "help", help_command },
-  //  };
-
-  EXPECT_EQ(R"({"quit",quit_command })",
-            Ctx->getExpandedText(at(4, 5)).getValue());
-  EXPECT_EQ("COMMAND(quit)", Ctx->getOriginalText(at(4, 5)).getValue());
-
-  EXPECT_EQ(R"({"help",help_command })",
-            Ctx->getExpandedText(at(5, 5)).getValue());
-  EXPECT_EQ("COMMAND(help)", Ctx->getOriginalText(at(5, 5)).getValue());
-}
-
-TEST_F(MacroExpansionContextTest, StringizingMacros) {
-  // From the GCC website.
-  const auto Ctx = getMacroExpansionContextFor(R"code(
-  #define WARN_IF(EXP) \
-  do { if (EXP) \
-          fprintf (stderr, "Warning: " #EXP "\n"); } \
-  while (0)
-  WARN_IF (x == 0);
-
-  #define xstr(s) str(s)
-  #define str(s) #s
-  #define foo 4
-  str (foo)
-  xstr (foo)
-      )code");
-  // After preprocessing:
-  //  do { if (x == 0) fprintf (stderr, "Warning: " "x == 0" "\n"); } while (0);
-  //  "foo"
-  //  "4"
-
-  EXPECT_EQ(
-      R"(do {if (x ==0)fprintf (stderr ,"Warning: ""x == 0""\n");}while (0))",
-      Ctx->getExpandedText(at(6, 3)).getValue());
-  EXPECT_EQ("WARN_IF (x == 0)", Ctx->getOriginalText(at(6, 3)).getValue());
-
-  EXPECT_EQ(R"("foo")", Ctx->getExpandedText(at(11, 3)).getValue());
-  EXPECT_EQ("str (foo)", Ctx->getOriginalText(at(11, 3)).getValue());
-
-  EXPECT_EQ(R"("4")", Ctx->getExpandedText(at(12, 3)).getValue());
-  EXPECT_EQ("xstr (foo)", Ctx->getOriginalText(at(12, 3)).getValue());
-}
-
-TEST_F(MacroExpansionContextTest, StringizingVariadicMacros) {
-  const auto Ctx = getMacroExpansionContextFor(R"code(
-  #define xstr(...) str(__VA_ARGS__)
-  #define str(...) #__VA_ARGS__
-  #define RParen2x ) )
-  #define EMPTY
-  #define f(x, ...) __VA_ARGS__ ! x * x
-  #define g(...) zz EMPTY f(__VA_ARGS__ ! x) f() * y
-  #define h(x, G) G(x) G(x ## x RParen2x
-  #define q(G) h(apple, G(apple)) RParen2x
-
-  q(g)
-  q(xstr)
-  g(RParen2x)
-  f( RParen2x )s
-      )code");
-  // clang-format off
-  // After preprocessing:
-  //  zz ! apple ! x * apple ! x ! * * y(apple) zz ! apple ! x * apple ! x ! * * y(appleapple ) ) ) )
-  //  "apple"(apple) "apple"(appleapple ) ) ) )
-  //  zz ! * ) ! x) ! * * y
-  //  ! ) ) * ) )
-  // clang-format on
-
-  EXPECT_EQ("zz !apple !x *apple !x !**y (apple )zz !apple !x *apple !x !**y "
-            "(appleapple ))))",
-            Ctx->getExpandedText(at(11, 3)).getValue());
-  EXPECT_EQ("q(g)", Ctx->getOriginalText(at(11, 3)).getValue());
-
-  EXPECT_EQ(R"res("apple"(apple )"apple"(appleapple )))))res",
-            Ctx->getExpandedText(at(12, 3)).getValue());
-  EXPECT_EQ("q(xstr)", Ctx->getOriginalText(at(12, 3)).getValue());
-
-  EXPECT_EQ("zz !*)!x )!**y ", Ctx->getExpandedText(at(13, 3)).getValue());
-  EXPECT_EQ("g(RParen2x)", Ctx->getOriginalText(at(13, 3)).getValue());
-
-  EXPECT_EQ("!))*))", Ctx->getExpandedText(at(14, 3)).getValue());
-  EXPECT_EQ("f( RParen2x )", Ctx->getOriginalText(at(14, 3)).getValue());
-}
-
-TEST_F(MacroExpansionContextTest, RedefUndef) {
-  const auto Ctx = getMacroExpansionContextFor(R"code(
-  #define Hi(x) Welcome x
-  Hi(Adam)
-  #define Hi Willkommen
-  Hi Hans
-  #undef Hi
-  Hi(Hi)
-      )code");
-  // After preprocessing:
-  //  Welcome Adam
-  //  Willkommen Hans
-  //  Hi(Hi)
-
-  // FIXME: Extra space follows every identifier.
-  EXPECT_EQ("Welcome Adam ", Ctx->getExpandedText(at(3, 3)).getValue());
-  EXPECT_EQ("Hi(Adam)", Ctx->getOriginalText(at(3, 3)).getValue());
-
-  EXPECT_EQ("Willkommen ", Ctx->getExpandedText(at(5, 3)).getValue());
-  EXPECT_EQ("Hi", Ctx->getOriginalText(at(5, 3)).getValue());
-
-  // There was no macro expansion at 7:3, we should expect None.
-  EXPECT_FALSE(Ctx->getExpandedText(at(7, 3)).hasValue());
-  EXPECT_FALSE(Ctx->getOriginalText(at(7, 3)).hasValue());
-}
-
-TEST_F(MacroExpansionContextTest, UnbalacedParenthesis) {
-  const auto Ctx = getMacroExpansionContextFor(R"code(
-  #define retArg(x) x
-  #define retArgUnclosed retArg(fun()
-  #define BB CC
-  #define applyInt BB(int)
-  #define CC(x) retArgUnclosed
-
-  applyInt );
-
-  #define expandArgUnclosedCommaExpr(x) (x, fun(), 1
-  #define f expandArgUnclosedCommaExpr
-
-  int x =  f(f(1))  ));
-      )code");
-  // After preprocessing:
-  //  fun();
-  //  int x = ((1, fun(), 1, fun(), 1 ));
-
-  EXPECT_EQ("fun ()", Ctx->getExpandedText(at(8, 3)).getValue());
-  EXPECT_EQ("applyInt )", Ctx->getOriginalText(at(8, 3)).getValue());
-
-  EXPECT_EQ("((1,fun (),1,fun (),1",
-            Ctx->getExpandedText(at(13, 12)).getValue());
-  EXPECT_EQ("f(f(1))", Ctx->getOriginalText(at(13, 12)).getValue());
-}
-
-} // namespace
-} // namespace analysis
-} // namespace clang
diff --git a/gnu/llvm/clang/unittests/Basic/CMakeLists.txt b/gnu/llvm/clang/unittests/Basic/CMakeLists.txt
deleted file mode 100644
index cbb18ca87a8..00000000000
--- a/gnu/llvm/clang/unittests/Basic/CMakeLists.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  Support
-  )
-
-add_clang_unittest(BasicTests
-  CharInfoTest.cpp
-  DarwinSDKInfoTest.cpp
-  DiagnosticTest.cpp
-  FileEntryTest.cpp
-  FileManagerTest.cpp
-  LineOffsetMappingTest.cpp
-  SanitizersTest.cpp
-  SourceManagerTest.cpp
-  )
-
-clang_target_link_libraries(BasicTests
-  PRIVATE
-  clangAST
-  clangBasic
-  clangLex
-  )
diff --git a/gnu/llvm/clang/unittests/Basic/CharInfoTest.cpp b/gnu/llvm/clang/unittests/Basic/CharInfoTest.cpp
deleted file mode 100644
index 4f84bebec30..00000000000
--- a/gnu/llvm/clang/unittests/Basic/CharInfoTest.cpp
+++ /dev/null
@@ -1,503 +0,0 @@
-//===- unittests/Basic/CharInfoTest.cpp -- ASCII classification tests -----===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/Basic/CharInfo.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-using namespace clang;
-
-// Check that the CharInfo table has been constructed reasonably.
-TEST(CharInfoTest, validateInfoTable) {
-  using namespace charinfo;
-  EXPECT_EQ((unsigned)CHAR_SPACE,   InfoTable[(unsigned)' ']);
-  EXPECT_EQ((unsigned)CHAR_HORZ_WS, InfoTable[(unsigned)'\t']);
-  EXPECT_EQ((unsigned)CHAR_HORZ_WS, InfoTable[(unsigned)'\f']); // ??
-  EXPECT_EQ((unsigned)CHAR_HORZ_WS, InfoTable[(unsigned)'\v']); // ??
-  EXPECT_EQ((unsigned)CHAR_VERT_WS, InfoTable[(unsigned)'\n']);
-  EXPECT_EQ((unsigned)CHAR_VERT_WS, InfoTable[(unsigned)'\r']);
-  EXPECT_EQ((unsigned)CHAR_UNDER,   InfoTable[(unsigned)'_']);
-  EXPECT_EQ((unsigned)CHAR_PERIOD,  InfoTable[(unsigned)'.']);
-
-  for (unsigned i = 'a'; i <= 'f'; ++i) {
-    EXPECT_EQ((unsigned)CHAR_XLOWER, InfoTable[i]);
-    EXPECT_EQ((unsigned)CHAR_XUPPER, InfoTable[i+'A'-'a']);
-  }
-
-  for (unsigned i = 'g'; i <= 'z'; ++i) {
-    EXPECT_EQ((unsigned)CHAR_LOWER, InfoTable[i]);
-    EXPECT_EQ((unsigned)CHAR_UPPER, InfoTable[i+'A'-'a']);
-  }
-
-  for (unsigned i = '0'; i <= '9'; ++i)
-    EXPECT_EQ((unsigned)CHAR_DIGIT, InfoTable[i]);
-}
-
-// Check various predicates.
-TEST(CharInfoTest, isASCII) {
-  EXPECT_TRUE(isASCII('\0'));
-  EXPECT_TRUE(isASCII('\n'));
-  EXPECT_TRUE(isASCII(' '));
-  EXPECT_TRUE(isASCII('a'));
-  EXPECT_TRUE(isASCII('\x7f'));
-  EXPECT_FALSE(isASCII('\x80'));
-  EXPECT_FALSE(isASCII('\xc2'));
-  EXPECT_FALSE(isASCII('\xff'));
-}
-
-TEST(CharInfoTest, isIdentifierHead) {
-  EXPECT_TRUE(isIdentifierHead('a'));
-  EXPECT_TRUE(isIdentifierHead('A'));
-  EXPECT_TRUE(isIdentifierHead('z'));
-  EXPECT_TRUE(isIdentifierHead('Z'));
-  EXPECT_TRUE(isIdentifierHead('_'));
-
-  EXPECT_FALSE(isIdentifierHead('0'));
-  EXPECT_FALSE(isIdentifierHead('.'));
-  EXPECT_FALSE(isIdentifierHead('`'));
-  EXPECT_FALSE(isIdentifierHead('\0'));
-
-  EXPECT_FALSE(isIdentifierHead('$'));
-  EXPECT_TRUE(isIdentifierHead('$', /*AllowDollar=*/true));
-
-  EXPECT_FALSE(isIdentifierHead('\x80'));
-  EXPECT_FALSE(isIdentifierHead('\xc2'));
-  EXPECT_FALSE(isIdentifierHead('\xff'));
-}
-
-TEST(CharInfoTest, isIdentifierBody) {
-  EXPECT_TRUE(isIdentifierBody('a'));
-  EXPECT_TRUE(isIdentifierBody('A'));
-  EXPECT_TRUE(isIdentifierBody('z'));
-  EXPECT_TRUE(isIdentifierBody('Z'));
-  EXPECT_TRUE(isIdentifierBody('_'));
-
-  EXPECT_TRUE(isIdentifierBody('0'));
-  EXPECT_FALSE(isIdentifierBody('.'));
-  EXPECT_FALSE(isIdentifierBody('`'));
-  EXPECT_FALSE(isIdentifierBody('\0'));
-
-  EXPECT_FALSE(isIdentifierBody('$'));
-  EXPECT_TRUE(isIdentifierBody('$', /*AllowDollar=*/true));
-
-  EXPECT_FALSE(isIdentifierBody('\x80'));
-  EXPECT_FALSE(isIdentifierBody('\xc2'));
-  EXPECT_FALSE(isIdentifierBody('\xff'));
-}
-
-TEST(CharInfoTest, isHorizontalWhitespace) {
-  EXPECT_FALSE(isHorizontalWhitespace('a'));
-  EXPECT_FALSE(isHorizontalWhitespace('_'));
-  EXPECT_FALSE(isHorizontalWhitespace('0'));
-  EXPECT_FALSE(isHorizontalWhitespace('.'));
-  EXPECT_FALSE(isHorizontalWhitespace('`'));
-  EXPECT_FALSE(isHorizontalWhitespace('\0'));
-  EXPECT_FALSE(isHorizontalWhitespace('\x7f'));
-
-  EXPECT_TRUE(isHorizontalWhitespace(' '));
-  EXPECT_TRUE(isHorizontalWhitespace('\t'));
-  EXPECT_TRUE(isHorizontalWhitespace('\f')); // ??
-  EXPECT_TRUE(isHorizontalWhitespace('\v')); // ??
-
-  EXPECT_FALSE(isHorizontalWhitespace('\n'));
-  EXPECT_FALSE(isHorizontalWhitespace('\r'));
-
-  EXPECT_FALSE(isHorizontalWhitespace('\x80'));
-  EXPECT_FALSE(isHorizontalWhitespace('\xc2'));
-  EXPECT_FALSE(isHorizontalWhitespace('\xff'));
-}
-
-TEST(CharInfoTest, isVerticalWhitespace) {
-  EXPECT_FALSE(isVerticalWhitespace('a'));
-  EXPECT_FALSE(isVerticalWhitespace('_'));
-  EXPECT_FALSE(isVerticalWhitespace('0'));
-  EXPECT_FALSE(isVerticalWhitespace('.'));
-  EXPECT_FALSE(isVerticalWhitespace('`'));
-  EXPECT_FALSE(isVerticalWhitespace('\0'));
-  EXPECT_FALSE(isVerticalWhitespace('\x7f'));
-
-  EXPECT_FALSE(isVerticalWhitespace(' '));
-  EXPECT_FALSE(isVerticalWhitespace('\t'));
-  EXPECT_FALSE(isVerticalWhitespace('\f')); // ??
-  EXPECT_FALSE(isVerticalWhitespace('\v')); // ??
-
-  EXPECT_TRUE(isVerticalWhitespace('\n'));
-  EXPECT_TRUE(isVerticalWhitespace('\r'));
-
-  EXPECT_FALSE(isVerticalWhitespace('\x80'));
-  EXPECT_FALSE(isVerticalWhitespace('\xc2'));
-  EXPECT_FALSE(isVerticalWhitespace('\xff'));
-}
-
-TEST(CharInfoTest, isWhitespace) {
-  EXPECT_FALSE(isWhitespace('a'));
-  EXPECT_FALSE(isWhitespace('_'));
-  EXPECT_FALSE(isWhitespace('0'));
-  EXPECT_FALSE(isWhitespace('.'));
-  EXPECT_FALSE(isWhitespace('`'));
-  EXPECT_FALSE(isWhitespace('\0'));
-  EXPECT_FALSE(isWhitespace('\x7f'));
-
-  EXPECT_TRUE(isWhitespace(' '));
-  EXPECT_TRUE(isWhitespace('\t'));
-  EXPECT_TRUE(isWhitespace('\f'));
-  EXPECT_TRUE(isWhitespace('\v'));
-
-  EXPECT_TRUE(isWhitespace('\n'));
-  EXPECT_TRUE(isWhitespace('\r'));
-
-  EXPECT_FALSE(isWhitespace('\x80'));
-  EXPECT_FALSE(isWhitespace('\xc2'));
-  EXPECT_FALSE(isWhitespace('\xff'));
-}
-
-TEST(CharInfoTest, isDigit) {
-  EXPECT_TRUE(isDigit('0'));
-  EXPECT_TRUE(isDigit('9'));
-
-  EXPECT_FALSE(isDigit('a'));
-  EXPECT_FALSE(isDigit('A'));
-
-  EXPECT_FALSE(isDigit('z'));
-  EXPECT_FALSE(isDigit('Z'));
-  
-  EXPECT_FALSE(isDigit('.'));
-  EXPECT_FALSE(isDigit('_'));
-
-  EXPECT_FALSE(isDigit('/'));
-  EXPECT_FALSE(isDigit('\0'));
-
-  EXPECT_FALSE(isDigit('\x80'));
-  EXPECT_FALSE(isDigit('\xc2'));
-  EXPECT_FALSE(isDigit('\xff'));
-}
-
-TEST(CharInfoTest, isHexDigit) {
-  EXPECT_TRUE(isHexDigit('0'));
-  EXPECT_TRUE(isHexDigit('9'));
-
-  EXPECT_TRUE(isHexDigit('a'));
-  EXPECT_TRUE(isHexDigit('A'));
-
-  EXPECT_FALSE(isHexDigit('z'));
-  EXPECT_FALSE(isHexDigit('Z'));
-  
-  EXPECT_FALSE(isHexDigit('.'));
-  EXPECT_FALSE(isHexDigit('_'));
-
-  EXPECT_FALSE(isHexDigit('/'));
-  EXPECT_FALSE(isHexDigit('\0'));
-
-  EXPECT_FALSE(isHexDigit('\x80'));
-  EXPECT_FALSE(isHexDigit('\xc2'));
-  EXPECT_FALSE(isHexDigit('\xff'));
-}
-
-TEST(CharInfoTest, isLetter) {
-  EXPECT_FALSE(isLetter('0'));
-  EXPECT_FALSE(isLetter('9'));
-
-  EXPECT_TRUE(isLetter('a'));
-  EXPECT_TRUE(isLetter('A'));
-
-  EXPECT_TRUE(isLetter('z'));
-  EXPECT_TRUE(isLetter('Z'));
-  
-  EXPECT_FALSE(isLetter('.'));
-  EXPECT_FALSE(isLetter('_'));
-
-  EXPECT_FALSE(isLetter('/'));
-  EXPECT_FALSE(isLetter('('));
-  EXPECT_FALSE(isLetter('\0'));
-
-  EXPECT_FALSE(isLetter('\x80'));
-  EXPECT_FALSE(isLetter('\xc2'));
-  EXPECT_FALSE(isLetter('\xff'));
-}
-
-TEST(CharInfoTest, isLowercase) {
-  EXPECT_FALSE(isLowercase('0'));
-  EXPECT_FALSE(isLowercase('9'));
-
-  EXPECT_TRUE(isLowercase('a'));
-  EXPECT_FALSE(isLowercase('A'));
-
-  EXPECT_TRUE(isLowercase('z'));
-  EXPECT_FALSE(isLowercase('Z'));
-  
-  EXPECT_FALSE(isLowercase('.'));
-  EXPECT_FALSE(isLowercase('_'));
-
-  EXPECT_FALSE(isLowercase('/'));
-  EXPECT_FALSE(isLowercase('('));
-  EXPECT_FALSE(isLowercase('\0'));
-
-  EXPECT_FALSE(isLowercase('\x80'));
-  EXPECT_FALSE(isLowercase('\xc2'));
-  EXPECT_FALSE(isLowercase('\xff'));
-}
-
-TEST(CharInfoTest, isUppercase) {
-  EXPECT_FALSE(isUppercase('0'));
-  EXPECT_FALSE(isUppercase('9'));
-
-  EXPECT_FALSE(isUppercase('a'));
-  EXPECT_TRUE(isUppercase('A'));
-
-  EXPECT_FALSE(isUppercase('z'));
-  EXPECT_TRUE(isUppercase('Z'));
-
-  EXPECT_FALSE(isUppercase('.'));
-  EXPECT_FALSE(isUppercase('_'));
-
-  EXPECT_FALSE(isUppercase('/'));
-  EXPECT_FALSE(isUppercase('('));
-  EXPECT_FALSE(isUppercase('\0'));
-
-  EXPECT_FALSE(isUppercase('\x80'));
-  EXPECT_FALSE(isUppercase('\xc2'));
-  EXPECT_FALSE(isUppercase('\xff'));
-}
-
-TEST(CharInfoTest, isAlphanumeric) {
-  EXPECT_TRUE(isAlphanumeric('0'));
-  EXPECT_TRUE(isAlphanumeric('9'));
-
-  EXPECT_TRUE(isAlphanumeric('a'));
-  EXPECT_TRUE(isAlphanumeric('A'));
-
-  EXPECT_TRUE(isAlphanumeric('z'));
-  EXPECT_TRUE(isAlphanumeric('Z'));
-
-  EXPECT_FALSE(isAlphanumeric('.'));
-  EXPECT_FALSE(isAlphanumeric('_'));
-
-  EXPECT_FALSE(isAlphanumeric('/'));
-  EXPECT_FALSE(isAlphanumeric('('));
-  EXPECT_FALSE(isAlphanumeric('\0'));
-
-  EXPECT_FALSE(isAlphanumeric('\x80'));
-  EXPECT_FALSE(isAlphanumeric('\xc2'));
-  EXPECT_FALSE(isAlphanumeric('\xff'));
-}
-
-TEST(CharInfoTest, isPunctuation) {
-  EXPECT_FALSE(isPunctuation('0'));
-  EXPECT_FALSE(isPunctuation('9'));
-
-  EXPECT_FALSE(isPunctuation('a'));
-  EXPECT_FALSE(isPunctuation('A'));
-
-  EXPECT_FALSE(isPunctuation('z'));
-  EXPECT_FALSE(isPunctuation('Z'));
-
-  EXPECT_TRUE(isPunctuation('.'));
-  EXPECT_TRUE(isPunctuation('_'));
-
-  EXPECT_TRUE(isPunctuation('/'));
-  EXPECT_TRUE(isPunctuation('('));
-
-  EXPECT_FALSE(isPunctuation(' '));
-  EXPECT_FALSE(isPunctuation('\n'));
-  EXPECT_FALSE(isPunctuation('\0'));
-
-  EXPECT_FALSE(isPunctuation('\x80'));
-  EXPECT_FALSE(isPunctuation('\xc2'));
-  EXPECT_FALSE(isPunctuation('\xff'));
-}
-
-TEST(CharInfoTest, isPrintable) {
-  EXPECT_TRUE(isPrintable('0'));
-  EXPECT_TRUE(isPrintable('9'));
-
-  EXPECT_TRUE(isPrintable('a'));
-  EXPECT_TRUE(isPrintable('A'));
-
-  EXPECT_TRUE(isPrintable('z'));
-  EXPECT_TRUE(isPrintable('Z'));
-
-  EXPECT_TRUE(isPrintable('.'));
-  EXPECT_TRUE(isPrintable('_'));
-
-  EXPECT_TRUE(isPrintable('/'));
-  EXPECT_TRUE(isPrintable('('));
-
-  EXPECT_TRUE(isPrintable(' '));
-  EXPECT_FALSE(isPrintable('\t'));
-  EXPECT_FALSE(isPrintable('\n'));
-  EXPECT_FALSE(isPrintable('\0'));
-
-  EXPECT_FALSE(isPrintable('\x80'));
-  EXPECT_FALSE(isPrintable('\xc2'));
-  EXPECT_FALSE(isPrintable('\xff'));
-}
-
-TEST(CharInfoTest, isPreprocessingNumberBody) {
-  EXPECT_TRUE(isPreprocessingNumberBody('0'));
-  EXPECT_TRUE(isPreprocessingNumberBody('9'));
-
-  EXPECT_TRUE(isPreprocessingNumberBody('a'));
-  EXPECT_TRUE(isPreprocessingNumberBody('A'));
-
-  EXPECT_TRUE(isPreprocessingNumberBody('z'));
-  EXPECT_TRUE(isPreprocessingNumberBody('Z'));
-  EXPECT_TRUE(isPreprocessingNumberBody('.'));
-  EXPECT_TRUE(isPreprocessingNumberBody('_'));
-
-  EXPECT_FALSE(isPreprocessingNumberBody('/'));
-  EXPECT_FALSE(isPreprocessingNumberBody('('));
-  EXPECT_FALSE(isPreprocessingNumberBody('\0'));
-
-  EXPECT_FALSE(isPreprocessingNumberBody('\x80'));
-  EXPECT_FALSE(isPreprocessingNumberBody('\xc2'));
-  EXPECT_FALSE(isPreprocessingNumberBody('\xff'));
-}
-
-TEST(CharInfoTest, isRawStringDelimBody) {
-  EXPECT_TRUE(isRawStringDelimBody('0'));
-  EXPECT_TRUE(isRawStringDelimBody('9'));
-
-  EXPECT_TRUE(isRawStringDelimBody('a'));
-  EXPECT_TRUE(isRawStringDelimBody('A'));
-
-  EXPECT_TRUE(isRawStringDelimBody('z'));
-  EXPECT_TRUE(isRawStringDelimBody('Z'));
-  EXPECT_TRUE(isRawStringDelimBody('.'));
-  EXPECT_TRUE(isRawStringDelimBody('_'));
-
-  EXPECT_TRUE(isRawStringDelimBody('/'));
-  EXPECT_FALSE(isRawStringDelimBody('('));
-  EXPECT_FALSE(isRawStringDelimBody('\0'));
-
-  EXPECT_FALSE(isRawStringDelimBody('\x80'));
-  EXPECT_FALSE(isRawStringDelimBody('\xc2'));
-  EXPECT_FALSE(isRawStringDelimBody('\xff'));
-}
-
-TEST(CharInfoTest, toLowercase) {
-  EXPECT_EQ('0', toLowercase('0'));
-  EXPECT_EQ('9', toLowercase('9'));
-
-  EXPECT_EQ('a', toLowercase('a'));
-  EXPECT_EQ('a', toLowercase('A'));
-
-  EXPECT_EQ('z', toLowercase('z'));
-  EXPECT_EQ('z', toLowercase('Z'));
-
-  EXPECT_EQ('.', toLowercase('.'));
-  EXPECT_EQ('_', toLowercase('_'));
-
-  EXPECT_EQ('/', toLowercase('/'));
-  EXPECT_EQ('\0', toLowercase('\0'));
-}
-
-TEST(CharInfoTest, toUppercase) {
-  EXPECT_EQ('0', toUppercase('0'));
-  EXPECT_EQ('9', toUppercase('9'));
-
-  EXPECT_EQ('A', toUppercase('a'));
-  EXPECT_EQ('A', toUppercase('A'));
-
-  EXPECT_EQ('Z', toUppercase('z'));
-  EXPECT_EQ('Z', toUppercase('Z'));
-
-  EXPECT_EQ('.', toUppercase('.'));
-  EXPECT_EQ('_', toUppercase('_'));
-
-  EXPECT_EQ('/', toUppercase('/'));
-  EXPECT_EQ('\0', toUppercase('\0'));
-}
-
-TEST(CharInfoTest, isValidIdentifier) {
-  EXPECT_FALSE(isValidIdentifier(""));
-
-  // 1 character
-  EXPECT_FALSE(isValidIdentifier("."));
-  EXPECT_FALSE(isValidIdentifier("\n"));
-  EXPECT_FALSE(isValidIdentifier(" "));
-  EXPECT_FALSE(isValidIdentifier("\x80"));
-  EXPECT_FALSE(isValidIdentifier("\xc2"));
-  EXPECT_FALSE(isValidIdentifier("\xff"));
-  EXPECT_FALSE(isValidIdentifier("$"));
-  EXPECT_FALSE(isValidIdentifier("1"));
-
-  EXPECT_TRUE(isValidIdentifier("_"));
-  EXPECT_TRUE(isValidIdentifier("a"));
-  EXPECT_TRUE(isValidIdentifier("z"));
-  EXPECT_TRUE(isValidIdentifier("A"));
-  EXPECT_TRUE(isValidIdentifier("Z"));
-  EXPECT_TRUE(isValidIdentifier("$", /*AllowDollar=*/true));
-
-  // 2 characters, '_' suffix
-  EXPECT_FALSE(isValidIdentifier("._"));
-  EXPECT_FALSE(isValidIdentifier("\n_"));
-  EXPECT_FALSE(isValidIdentifier(" _"));
-  EXPECT_FALSE(isValidIdentifier("\x80_"));
-  EXPECT_FALSE(isValidIdentifier("\xc2_"));
-  EXPECT_FALSE(isValidIdentifier("\xff_"));
-  EXPECT_FALSE(isValidIdentifier("$_"));
-  EXPECT_FALSE(isValidIdentifier("1_"));
-
-  EXPECT_TRUE(isValidIdentifier("__"));
-  EXPECT_TRUE(isValidIdentifier("a_"));
-  EXPECT_TRUE(isValidIdentifier("z_"));
-  EXPECT_TRUE(isValidIdentifier("A_"));
-  EXPECT_TRUE(isValidIdentifier("Z_"));
-  EXPECT_TRUE(isValidIdentifier("$_", /*AllowDollar=*/true));
-
-  // 2 characters, '_' prefix
-  EXPECT_FALSE(isValidIdentifier("_."));
-  EXPECT_FALSE(isValidIdentifier("_\n"));
-  EXPECT_FALSE(isValidIdentifier("_ "));
-  EXPECT_FALSE(isValidIdentifier("_\x80"));
-  EXPECT_FALSE(isValidIdentifier("_\xc2"));
-  EXPECT_FALSE(isValidIdentifier("_\xff"));
-  EXPECT_FALSE(isValidIdentifier("_$"));
-  EXPECT_TRUE(isValidIdentifier("_1"));
-
-  EXPECT_TRUE(isValidIdentifier("__"));
-  EXPECT_TRUE(isValidIdentifier("_a"));
-  EXPECT_TRUE(isValidIdentifier("_z"));
-  EXPECT_TRUE(isValidIdentifier("_A"));
-  EXPECT_TRUE(isValidIdentifier("_Z"));
-  EXPECT_TRUE(isValidIdentifier("_$", /*AllowDollar=*/true));
-
-  // 3 characters, '__' prefix
-  EXPECT_FALSE(isValidIdentifier("__."));
-  EXPECT_FALSE(isValidIdentifier("__\n"));
-  EXPECT_FALSE(isValidIdentifier("__ "));
-  EXPECT_FALSE(isValidIdentifier("__\x80"));
-  EXPECT_FALSE(isValidIdentifier("__\xc2"));
-  EXPECT_FALSE(isValidIdentifier("__\xff"));
-  EXPECT_FALSE(isValidIdentifier("__$"));
-  EXPECT_TRUE(isValidIdentifier("__1"));
-
-  EXPECT_TRUE(isValidIdentifier("___"));
-  EXPECT_TRUE(isValidIdentifier("__a"));
-  EXPECT_TRUE(isValidIdentifier("__z"));
-  EXPECT_TRUE(isValidIdentifier("__A"));
-  EXPECT_TRUE(isValidIdentifier("__Z"));
-  EXPECT_TRUE(isValidIdentifier("__$", /*AllowDollar=*/true));
-
-  // 3 characters, '_' prefix and suffix
-  EXPECT_FALSE(isValidIdentifier("_._"));
-  EXPECT_FALSE(isValidIdentifier("_\n_"));
-  EXPECT_FALSE(isValidIdentifier("_ _"));
-  EXPECT_FALSE(isValidIdentifier("_\x80_"));
-  EXPECT_FALSE(isValidIdentifier("_\xc2_"));
-  EXPECT_FALSE(isValidIdentifier("_\xff_"));
-  EXPECT_FALSE(isValidIdentifier("_$_"));
-  EXPECT_TRUE(isValidIdentifier("_1_"));
-
-  EXPECT_TRUE(isValidIdentifier("___"));
-  EXPECT_TRUE(isValidIdentifier("_a_"));
-  EXPECT_TRUE(isValidIdentifier("_z_"));
-  EXPECT_TRUE(isValidIdentifier("_A_"));
-  EXPECT_TRUE(isValidIdentifier("_Z_"));
-  EXPECT_TRUE(isValidIdentifier("_$_", /*AllowDollar=*/true));
-}
diff --git a/gnu/llvm/clang/unittests/Basic/DarwinSDKInfoTest.cpp b/gnu/llvm/clang/unittests/Basic/DarwinSDKInfoTest.cpp
deleted file mode 100644
index f845e1536da..00000000000
--- a/gnu/llvm/clang/unittests/Basic/DarwinSDKInfoTest.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-//===- unittests/Basic/DarwinSDKInfoTest.cpp -- SDKSettings.json test -----===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/Basic/DarwinSDKInfo.h"
-#include "llvm/Support/JSON.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-using namespace clang;
-
-TEST(DarwinSDKInfoTest, ParseAndTestMapping) {
-  llvm::json::Object Obj;
-  Obj["Version"] = "11.0";
-  Obj["MaximumDeploymentTarget"] = "11.99";
-  llvm::json::Object VersionMap;
-  VersionMap["10.15"] = "13.1";
-  VersionMap["11.0"] = "14.0";
-  VersionMap["11.2"] = "14.2";
-  llvm::json::Object MacOS2iOSMac;
-  MacOS2iOSMac["macOS_iOSMac"] = std::move(VersionMap);
-  Obj["VersionMap"] = std::move(MacOS2iOSMac);
-
-  auto SDKInfo = DarwinSDKInfo::parseDarwinSDKSettingsJSON(&Obj);
-  ASSERT_TRUE(SDKInfo);
-  EXPECT_EQ(SDKInfo->getVersion(), VersionTuple(11, 0));
-
-  auto Mapping = SDKInfo->getVersionMapping(
-      DarwinSDKInfo::OSEnvPair::macOStoMacCatalystPair());
-  ASSERT_TRUE(Mapping);
-  // Verify that the macOS versions that are present in the map are translated
-  // directly to their corresponding Mac Catalyst versions.
-  EXPECT_EQ(*Mapping->map(VersionTuple(10, 15), VersionTuple(), None),
-            VersionTuple(13, 1));
-  EXPECT_EQ(*Mapping->map(VersionTuple(11, 0), VersionTuple(), None),
-            VersionTuple(14, 0));
-  EXPECT_EQ(*Mapping->map(VersionTuple(11, 2), VersionTuple(), None),
-            VersionTuple(14, 2));
-
-  // Verify that a macOS version that's not present in the map is translated
-  // like the nearest major OS version.
-  EXPECT_EQ(*Mapping->map(VersionTuple(11, 1), VersionTuple(), None),
-            VersionTuple(14, 0));
-
-  // Verify that the macOS versions that are outside of the mapped version
-  // range map to the min/max values passed to the `map` call.
-  EXPECT_EQ(*Mapping->map(VersionTuple(10, 14), VersionTuple(99, 99), None),
-            VersionTuple(99, 99));
-  EXPECT_EQ(
-      *Mapping->map(VersionTuple(11, 5), VersionTuple(), VersionTuple(99, 99)),
-      VersionTuple(99, 99));
-  EXPECT_EQ(*Mapping->map(VersionTuple(11, 5), VersionTuple(99, 98),
-                          VersionTuple(99, 99)),
-            VersionTuple(99, 99));
-}
-
-TEST(DarwinSDKInfoTest, MissingKeys) {
-  llvm::json::Object Obj;
-  ASSERT_FALSE(DarwinSDKInfo::parseDarwinSDKSettingsJSON(&Obj));
-  Obj["Version"] = "11.0";
-  ASSERT_FALSE(DarwinSDKInfo::parseDarwinSDKSettingsJSON(&Obj));
-}
diff --git a/gnu/llvm/clang/unittests/Basic/DiagnosticTest.cpp b/gnu/llvm/clang/unittests/Basic/DiagnosticTest.cpp
deleted file mode 100644
index 8d018a8b9ce..00000000000
--- a/gnu/llvm/clang/unittests/Basic/DiagnosticTest.cpp
+++ /dev/null
@@ -1,95 +0,0 @@
-//===- unittests/Basic/DiagnosticTest.cpp -- Diagnostic engine tests ------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/Basic/Diagnostic.h"
-#include "clang/Basic/DiagnosticError.h"
-#include "clang/Basic/DiagnosticIDs.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-using namespace clang;
-
-namespace {
-
-// Check that DiagnosticErrorTrap works with SuppressAllDiagnostics.
-TEST(DiagnosticTest, suppressAndTrap) {
-  DiagnosticsEngine Diags(new DiagnosticIDs(),
-                          new DiagnosticOptions,
-                          new IgnoringDiagConsumer());
-  Diags.setSuppressAllDiagnostics(true);
-
-  {
-    DiagnosticErrorTrap trap(Diags);
-
-    // Diag that would set UncompilableErrorOccurred and ErrorOccurred.
-    Diags.Report(diag::err_target_unknown_triple) << "unknown";
-
-    // Diag that would set UnrecoverableErrorOccurred and ErrorOccurred.
-    Diags.Report(diag::err_cannot_open_file) << "file" << "error";
-
-    // Diag that would set FatalErrorOccurred
-    // (via non-note following a fatal error).
-    Diags.Report(diag::warn_mt_message) << "warning";
-
-    EXPECT_TRUE(trap.hasErrorOccurred());
-    EXPECT_TRUE(trap.hasUnrecoverableErrorOccurred());
-  }
-
-  EXPECT_FALSE(Diags.hasErrorOccurred());
-  EXPECT_FALSE(Diags.hasFatalErrorOccurred());
-  EXPECT_FALSE(Diags.hasUncompilableErrorOccurred());
-  EXPECT_FALSE(Diags.hasUnrecoverableErrorOccurred());
-}
-
-// Check that FatalsAsError works as intended
-TEST(DiagnosticTest, fatalsAsError) {
-  for (unsigned FatalsAsError = 0; FatalsAsError != 2; ++FatalsAsError) {
-    DiagnosticsEngine Diags(new DiagnosticIDs(),
-                            new DiagnosticOptions,
-                            new IgnoringDiagConsumer());
-    Diags.setFatalsAsError(FatalsAsError);
-
-    // Diag that would set UnrecoverableErrorOccurred and ErrorOccurred.
-    Diags.Report(diag::err_cannot_open_file) << "file" << "error";
-
-    // Diag that would set FatalErrorOccurred
-    // (via non-note following a fatal error).
-    Diags.Report(diag::warn_mt_message) << "warning";
-
-    EXPECT_TRUE(Diags.hasErrorOccurred());
-    EXPECT_EQ(Diags.hasFatalErrorOccurred(), FatalsAsError ? 0u : 1u);
-    EXPECT_TRUE(Diags.hasUncompilableErrorOccurred());
-    EXPECT_TRUE(Diags.hasUnrecoverableErrorOccurred());
-
-    // The warning should be emitted and counted only if we're not suppressing
-    // after fatal errors.
-    EXPECT_EQ(Diags.getNumWarnings(), FatalsAsError);
-  }
-}
-TEST(DiagnosticTest, diagnosticError) {
-  DiagnosticsEngine Diags(new DiagnosticIDs(), new DiagnosticOptions,
-                          new IgnoringDiagConsumer());
-  PartialDiagnostic::DiagStorageAllocator Alloc;
-  llvm::Expected<std::pair<int, int>> Value = DiagnosticError::create(
-      SourceLocation(), PartialDiagnostic(diag::err_cannot_open_file, Alloc)
-                            << "file"
-                            << "error");
-  ASSERT_TRUE(!Value);
-  llvm::Error Err = Value.takeError();
-  Optional<PartialDiagnosticAt> ErrDiag = DiagnosticError::take(Err);
-  llvm::cantFail(std::move(Err));
-  ASSERT_FALSE(!ErrDiag);
-  EXPECT_EQ(ErrDiag->first, SourceLocation());
-  EXPECT_EQ(ErrDiag->second.getDiagID(), diag::err_cannot_open_file);
-
-  Value = std::make_pair(20, 1);
-  ASSERT_FALSE(!Value);
-  EXPECT_EQ(*Value, std::make_pair(20, 1));
-  EXPECT_EQ(Value->first, 20);
-}
-}
diff --git a/gnu/llvm/clang/unittests/Basic/FileEntryTest.cpp b/gnu/llvm/clang/unittests/Basic/FileEntryTest.cpp
deleted file mode 100644
index 16c8e57d9a1..00000000000
--- a/gnu/llvm/clang/unittests/Basic/FileEntryTest.cpp
+++ /dev/null
@@ -1,207 +0,0 @@
-//===- unittests/Basic/FileEntryTest.cpp - Test FileEntry/FileEntryRef ----===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/Basic/FileEntry.h"
-#include "llvm/ADT/DenseSet.h"
-#include "llvm/ADT/StringMap.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-using namespace clang;
-
-namespace {
-
-using FileMap = StringMap<llvm::ErrorOr<FileEntryRef::MapValue>>;
-using DirMap = StringMap<llvm::ErrorOr<DirectoryEntry &>>;
-
-struct RefMaps {
-  FileMap Files;
-  DirMap Dirs;
-
-  SmallVector<std::unique_ptr<FileEntry>, 5> FEs;
-  SmallVector<std::unique_ptr<DirectoryEntry>, 5> DEs;
-  DirectoryEntryRef DR;
-
-  RefMaps() : DR(addDirectory("dir")) {}
-
-  DirectoryEntryRef addDirectory(StringRef Name) {
-    DEs.push_back(std::make_unique<DirectoryEntry>());
-    return DirectoryEntryRef(*Dirs.insert({Name, *DEs.back()}).first);
-  }
-  DirectoryEntryRef addDirectoryAlias(StringRef Name, DirectoryEntryRef Base) {
-    return DirectoryEntryRef(
-        *Dirs.insert({Name, const_cast<DirectoryEntry &>(Base.getDirEntry())})
-             .first);
-  }
-
-  FileEntryRef addFile(StringRef Name) {
-    FEs.push_back(std::make_unique<FileEntry>());
-    return FileEntryRef(
-        *Files.insert({Name, FileEntryRef::MapValue(*FEs.back().get(), DR)})
-             .first);
-  }
-  FileEntryRef addFileAlias(StringRef Name, FileEntryRef Base) {
-    return FileEntryRef(
-        *Files
-             .insert(
-                 {Name, FileEntryRef::MapValue(
-                            const_cast<FileEntry &>(Base.getFileEntry()), DR)})
-             .first);
-  }
-};
-
-TEST(FileEntryTest, Constructor) {
-  FileEntry FE;
-  EXPECT_EQ(0, FE.getSize());
-  EXPECT_EQ(0, FE.getModificationTime());
-  EXPECT_EQ(nullptr, FE.getDir());
-  EXPECT_EQ(0U, FE.getUniqueID().getDevice());
-  EXPECT_EQ(0U, FE.getUniqueID().getFile());
-  EXPECT_EQ(false, FE.isNamedPipe());
-  EXPECT_EQ(false, FE.isValid());
-}
-
-TEST(FileEntryTest, FileEntryRef) {
-  RefMaps Refs;
-  FileEntryRef R1 = Refs.addFile("1");
-  FileEntryRef R2 = Refs.addFile("2");
-  FileEntryRef R1Also = Refs.addFileAlias("1-also", R1);
-
-  EXPECT_EQ("1", R1.getName());
-  EXPECT_EQ("2", R2.getName());
-  EXPECT_EQ("1-also", R1Also.getName());
-
-  EXPECT_NE(&R1.getFileEntry(), &R2.getFileEntry());
-  EXPECT_EQ(&R1.getFileEntry(), &R1Also.getFileEntry());
-
-  const FileEntry *CE1 = R1;
-  EXPECT_EQ(CE1, &R1.getFileEntry());
-}
-
-TEST(FileEntryTest, OptionalFileEntryRefDegradesToFileEntryPtr) {
-  RefMaps Refs;
-  OptionalFileEntryRefDegradesToFileEntryPtr M0;
-  OptionalFileEntryRefDegradesToFileEntryPtr M1 = Refs.addFile("1");
-  OptionalFileEntryRefDegradesToFileEntryPtr M2 = Refs.addFile("2");
-  OptionalFileEntryRefDegradesToFileEntryPtr M0Also = None;
-  OptionalFileEntryRefDegradesToFileEntryPtr M1Also =
-      Refs.addFileAlias("1-also", *M1);
-
-  EXPECT_EQ(M0, M0Also);
-  EXPECT_EQ(StringRef("1"), M1->getName());
-  EXPECT_EQ(StringRef("2"), M2->getName());
-  EXPECT_EQ(StringRef("1-also"), M1Also->getName());
-
-  const FileEntry *CE1 = M1;
-  EXPECT_EQ(CE1, &M1->getFileEntry());
-}
-
-TEST(FileEntryTest, equals) {
-  RefMaps Refs;
-  FileEntryRef R1 = Refs.addFile("1");
-  FileEntryRef R2 = Refs.addFile("2");
-  FileEntryRef R1Also = Refs.addFileAlias("1-also", R1);
-
-  EXPECT_EQ(R1, &R1.getFileEntry());
-  EXPECT_EQ(&R1.getFileEntry(), R1);
-  EXPECT_EQ(R1, R1Also);
-  EXPECT_NE(R1, &R2.getFileEntry());
-  EXPECT_NE(&R2.getFileEntry(), R1);
-  EXPECT_NE(R1, R2);
-
-  OptionalFileEntryRefDegradesToFileEntryPtr M1 = R1;
-
-  EXPECT_EQ(M1, &R1.getFileEntry());
-  EXPECT_EQ(&R1.getFileEntry(), M1);
-  EXPECT_NE(M1, &R2.getFileEntry());
-  EXPECT_NE(&R2.getFileEntry(), M1);
-}
-
-TEST(FileEntryTest, isSameRef) {
-  RefMaps Refs;
-  FileEntryRef R1 = Refs.addFile("1");
-  FileEntryRef R2 = Refs.addFile("2");
-  FileEntryRef R1Also = Refs.addFileAlias("1-also", R1);
-
-  EXPECT_TRUE(R1.isSameRef(FileEntryRef(R1)));
-  EXPECT_TRUE(R1.isSameRef(FileEntryRef(R1.getMapEntry())));
-  EXPECT_FALSE(R1.isSameRef(R2));
-  EXPECT_FALSE(R1.isSameRef(R1Also));
-}
-
-TEST(FileEntryTest, DenseMapInfo) {
-  RefMaps Refs;
-  FileEntryRef R1 = Refs.addFile("1");
-  FileEntryRef R2 = Refs.addFile("2");
-  FileEntryRef R1Also = Refs.addFileAlias("1-also", R1);
-
-  // Insert R1Also first and confirm it "wins".
-  {
-    SmallDenseSet<FileEntryRef, 8> Set;
-    Set.insert(R1Also);
-    Set.insert(R1);
-    Set.insert(R2);
-    EXPECT_TRUE(Set.find(R1Also)->isSameRef(R1Also));
-    EXPECT_TRUE(Set.find(R1)->isSameRef(R1Also));
-    EXPECT_TRUE(Set.find(R2)->isSameRef(R2));
-  }
-
-  // Insert R1Also second and confirm R1 "wins".
-  {
-    SmallDenseSet<FileEntryRef, 8> Set;
-    Set.insert(R1);
-    Set.insert(R1Also);
-    Set.insert(R2);
-    EXPECT_TRUE(Set.find(R1Also)->isSameRef(R1));
-    EXPECT_TRUE(Set.find(R1)->isSameRef(R1));
-    EXPECT_TRUE(Set.find(R2)->isSameRef(R2));
-  }
-}
-
-TEST(DirectoryEntryTest, isSameRef) {
-  RefMaps Refs;
-  DirectoryEntryRef R1 = Refs.addDirectory("1");
-  DirectoryEntryRef R2 = Refs.addDirectory("2");
-  DirectoryEntryRef R1Also = Refs.addDirectoryAlias("1-also", R1);
-
-  EXPECT_TRUE(R1.isSameRef(DirectoryEntryRef(R1)));
-  EXPECT_TRUE(R1.isSameRef(DirectoryEntryRef(R1.getMapEntry())));
-  EXPECT_FALSE(R1.isSameRef(R2));
-  EXPECT_FALSE(R1.isSameRef(R1Also));
-}
-
-TEST(DirectoryEntryTest, DenseMapInfo) {
-  RefMaps Refs;
-  DirectoryEntryRef R1 = Refs.addDirectory("1");
-  DirectoryEntryRef R2 = Refs.addDirectory("2");
-  DirectoryEntryRef R1Also = Refs.addDirectoryAlias("1-also", R1);
-
-  // Insert R1Also first and confirm it "wins".
-  {
-    SmallDenseSet<DirectoryEntryRef, 8> Set;
-    Set.insert(R1Also);
-    Set.insert(R1);
-    Set.insert(R2);
-    EXPECT_TRUE(Set.find(R1Also)->isSameRef(R1Also));
-    EXPECT_TRUE(Set.find(R1)->isSameRef(R1Also));
-    EXPECT_TRUE(Set.find(R2)->isSameRef(R2));
-  }
-
-  // Insert R1Also second and confirm R1 "wins".
-  {
-    SmallDenseSet<DirectoryEntryRef, 8> Set;
-    Set.insert(R1);
-    Set.insert(R1Also);
-    Set.insert(R2);
-    EXPECT_TRUE(Set.find(R1Also)->isSameRef(R1));
-    EXPECT_TRUE(Set.find(R1)->isSameRef(R1));
-    EXPECT_TRUE(Set.find(R2)->isSameRef(R2));
-  }
-}
-
-} // end namespace
diff --git a/gnu/llvm/clang/unittests/Basic/FileManagerTest.cpp b/gnu/llvm/clang/unittests/Basic/FileManagerTest.cpp
deleted file mode 100644
index 0a1f58f3bb9..00000000000
--- a/gnu/llvm/clang/unittests/Basic/FileManagerTest.cpp
+++ /dev/null
@@ -1,586 +0,0 @@
-//===- unittests/Basic/FileMangerTest.cpp ------------ FileManger tests ---===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/Basic/FileManager.h"
-#include "clang/Basic/FileSystemOptions.h"
-#include "clang/Basic/FileSystemStatCache.h"
-#include "llvm/ADT/STLExtras.h"
-#include "llvm/Support/Path.h"
-#include "llvm/Support/VirtualFileSystem.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-using namespace clang;
-
-namespace {
-
-// Used to create a fake file system for running the tests with such
-// that the tests are not affected by the structure/contents of the
-// file system on the machine running the tests.
-class FakeStatCache : public FileSystemStatCache {
-private:
-  // Maps a file/directory path to its desired stat result.  Anything
-  // not in this map is considered to not exist in the file system.
-  llvm::StringMap<llvm::vfs::Status, llvm::BumpPtrAllocator> StatCalls;
-
-  void InjectFileOrDirectory(const char *Path, ino_t INode, bool IsFile,
-                             const char *StatPath) {
-#ifndef _WIN32
-    SmallString<128> NormalizedPath(Path);
-    llvm::sys::path::native(NormalizedPath);
-    Path = NormalizedPath.c_str();
-
-    SmallString<128> NormalizedStatPath;
-    if (StatPath) {
-      NormalizedStatPath = StatPath;
-      llvm::sys::path::native(NormalizedStatPath);
-      StatPath = NormalizedStatPath.c_str();
-    }
-#endif
-
-    if (!StatPath)
-      StatPath = Path;
-
-    auto fileType = IsFile ?
-      llvm::sys::fs::file_type::regular_file :
-      llvm::sys::fs::file_type::directory_file;
-    llvm::vfs::Status Status(StatPath, llvm::sys::fs::UniqueID(1, INode),
-                             /*MTime*/{}, /*User*/0, /*Group*/0,
-                             /*Size*/0, fileType,
-                             llvm::sys::fs::perms::all_all);
-    StatCalls[Path] = Status;
-  }
-
-public:
-  // Inject a file with the given inode value to the fake file system.
-  void InjectFile(const char *Path, ino_t INode,
-                  const char *StatPath = nullptr) {
-    InjectFileOrDirectory(Path, INode, /*IsFile=*/true, StatPath);
-  }
-
-  // Inject a directory with the given inode value to the fake file system.
-  void InjectDirectory(const char *Path, ino_t INode) {
-    InjectFileOrDirectory(Path, INode, /*IsFile=*/false, nullptr);
-  }
-
-  // Implement FileSystemStatCache::getStat().
-  std::error_code getStat(StringRef Path, llvm::vfs::Status &Status,
-                          bool isFile,
-                          std::unique_ptr<llvm::vfs::File> *F,
-                          llvm::vfs::FileSystem &FS) override {
-#ifndef _WIN32
-    SmallString<128> NormalizedPath(Path);
-    llvm::sys::path::native(NormalizedPath);
-    Path = NormalizedPath.c_str();
-#endif
-
-    if (StatCalls.count(Path) != 0) {
-      Status = StatCalls[Path];
-      return std::error_code();
-    }
-
-    return std::make_error_code(std::errc::no_such_file_or_directory);
-  }
-};
-
-// The test fixture.
-class FileManagerTest : public ::testing::Test {
- protected:
-  FileManagerTest() : manager(options) {
-  }
-
-  FileSystemOptions options;
-  FileManager manager;
-};
-
-// When a virtual file is added, its getDir() field is set correctly
-// (not NULL, correct name).
-TEST_F(FileManagerTest, getVirtualFileSetsTheDirFieldCorrectly) {
-  const FileEntry *file = manager.getVirtualFile("foo.cpp", 42, 0);
-  ASSERT_TRUE(file != nullptr);
-
-  const DirectoryEntry *dir = file->getDir();
-  ASSERT_TRUE(dir != nullptr);
-  EXPECT_EQ(".", dir->getName());
-
-  file = manager.getVirtualFile("x/y/z.cpp", 42, 0);
-  ASSERT_TRUE(file != nullptr);
-
-  dir = file->getDir();
-  ASSERT_TRUE(dir != nullptr);
-  EXPECT_EQ("x/y", dir->getName());
-}
-
-// Before any virtual file is added, no virtual directory exists.
-TEST_F(FileManagerTest, NoVirtualDirectoryExistsBeforeAVirtualFileIsAdded) {
-  // An empty FakeStatCache causes all stat calls made by the
-  // FileManager to report "file/directory doesn't exist".  This
-  // avoids the possibility of the result of this test being affected
-  // by what's in the real file system.
-  manager.setStatCache(std::make_unique<FakeStatCache>());
-
-  ASSERT_FALSE(manager.getDirectory("virtual/dir/foo"));
-  ASSERT_FALSE(manager.getDirectory("virtual/dir"));
-  ASSERT_FALSE(manager.getDirectory("virtual"));
-}
-
-// When a virtual file is added, all of its ancestors should be created.
-TEST_F(FileManagerTest, getVirtualFileCreatesDirectoryEntriesForAncestors) {
-  // Fake an empty real file system.
-  manager.setStatCache(std::make_unique<FakeStatCache>());
-
-  manager.getVirtualFile("virtual/dir/bar.h", 100, 0);
-  ASSERT_FALSE(manager.getDirectory("virtual/dir/foo"));
-
-  auto dir = manager.getDirectory("virtual/dir");
-  ASSERT_TRUE(dir);
-  EXPECT_EQ("virtual/dir", (*dir)->getName());
-
-  dir = manager.getDirectory("virtual");
-  ASSERT_TRUE(dir);
-  EXPECT_EQ("virtual", (*dir)->getName());
-}
-
-// getFile() returns non-NULL if a real file exists at the given path.
-TEST_F(FileManagerTest, getFileReturnsValidFileEntryForExistingRealFile) {
-  // Inject fake files into the file system.
-  auto statCache = std::make_unique<FakeStatCache>();
-  statCache->InjectDirectory("/tmp", 42);
-  statCache->InjectFile("/tmp/test", 43);
-
-#ifdef _WIN32
-  const char *DirName = "C:.";
-  const char *FileName = "C:test";
-  statCache->InjectDirectory(DirName, 44);
-  statCache->InjectFile(FileName, 45);
-#endif
-
-  manager.setStatCache(std::move(statCache));
-
-  auto file = manager.getFile("/tmp/test");
-  ASSERT_TRUE(file);
-  ASSERT_TRUE((*file)->isValid());
-  EXPECT_EQ("/tmp/test", (*file)->getName());
-
-  const DirectoryEntry *dir = (*file)->getDir();
-  ASSERT_TRUE(dir != nullptr);
-  EXPECT_EQ("/tmp", dir->getName());
-
-#ifdef _WIN32
-  file = manager.getFile(FileName);
-  ASSERT_TRUE(file);
-
-  dir = (*file)->getDir();
-  ASSERT_TRUE(dir != NULL);
-  EXPECT_EQ(DirName, dir->getName());
-#endif
-}
-
-// getFile() returns non-NULL if a virtual file exists at the given path.
-TEST_F(FileManagerTest, getFileReturnsValidFileEntryForExistingVirtualFile) {
-  // Fake an empty real file system.
-  manager.setStatCache(std::make_unique<FakeStatCache>());
-
-  manager.getVirtualFile("virtual/dir/bar.h", 100, 0);
-  auto file = manager.getFile("virtual/dir/bar.h");
-  ASSERT_TRUE(file);
-  ASSERT_TRUE((*file)->isValid());
-  EXPECT_EQ("virtual/dir/bar.h", (*file)->getName());
-
-  const DirectoryEntry *dir = (*file)->getDir();
-  ASSERT_TRUE(dir != nullptr);
-  EXPECT_EQ("virtual/dir", dir->getName());
-}
-
-// getFile() returns different FileEntries for different paths when
-// there's no aliasing.
-TEST_F(FileManagerTest, getFileReturnsDifferentFileEntriesForDifferentFiles) {
-  // Inject two fake files into the file system.  Different inodes
-  // mean the files are not symlinked together.
-  auto statCache = std::make_unique<FakeStatCache>();
-  statCache->InjectDirectory(".", 41);
-  statCache->InjectFile("foo.cpp", 42);
-  statCache->InjectFile("bar.cpp", 43);
-  manager.setStatCache(std::move(statCache));
-
-  auto fileFoo = manager.getFile("foo.cpp");
-  auto fileBar = manager.getFile("bar.cpp");
-  ASSERT_TRUE(fileFoo);
-  ASSERT_TRUE((*fileFoo)->isValid());
-  ASSERT_TRUE(fileBar);
-  ASSERT_TRUE((*fileBar)->isValid());
-  EXPECT_NE(*fileFoo, *fileBar);
-}
-
-// getFile() returns an error if neither a real file nor a virtual file
-// exists at the given path.
-TEST_F(FileManagerTest, getFileReturnsErrorForNonexistentFile) {
-  // Inject a fake foo.cpp into the file system.
-  auto statCache = std::make_unique<FakeStatCache>();
-  statCache->InjectDirectory(".", 41);
-  statCache->InjectFile("foo.cpp", 42);
-  statCache->InjectDirectory("MyDirectory", 49);
-  manager.setStatCache(std::move(statCache));
-
-  // Create a virtual bar.cpp file.
-  manager.getVirtualFile("bar.cpp", 200, 0);
-
-  auto file = manager.getFile("xyz.txt");
-  ASSERT_FALSE(file);
-  ASSERT_EQ(file.getError(), std::errc::no_such_file_or_directory);
-
-  auto readingDirAsFile = manager.getFile("MyDirectory");
-  ASSERT_FALSE(readingDirAsFile);
-  ASSERT_EQ(readingDirAsFile.getError(), std::errc::is_a_directory);
-
-  auto readingFileAsDir = manager.getDirectory("foo.cpp");
-  ASSERT_FALSE(readingFileAsDir);
-  ASSERT_EQ(readingFileAsDir.getError(), std::errc::not_a_directory);
-}
-
-// The following tests apply to Unix-like system only.
-
-#ifndef _WIN32
-
-// getFile() returns the same FileEntry for real files that are aliases.
-TEST_F(FileManagerTest, getFileReturnsSameFileEntryForAliasedRealFiles) {
-  // Inject two real files with the same inode.
-  auto statCache = std::make_unique<FakeStatCache>();
-  statCache->InjectDirectory("abc", 41);
-  statCache->InjectFile("abc/foo.cpp", 42);
-  statCache->InjectFile("abc/bar.cpp", 42);
-  manager.setStatCache(std::move(statCache));
-
-  auto f1 = manager.getFile("abc/foo.cpp");
-  auto f2 = manager.getFile("abc/bar.cpp");
-
-  EXPECT_EQ(f1 ? *f1 : nullptr,
-            f2 ? *f2 : nullptr);
-
-  // Check that getFileRef also does the right thing.
-  auto r1 = manager.getFileRef("abc/foo.cpp");
-  auto r2 = manager.getFileRef("abc/bar.cpp");
-  ASSERT_FALSE(!r1);
-  ASSERT_FALSE(!r2);
-
-  EXPECT_EQ("abc/foo.cpp", r1->getName());
-  EXPECT_EQ("abc/bar.cpp", r2->getName());
-  EXPECT_EQ((f1 ? *f1 : nullptr), &r1->getFileEntry());
-  EXPECT_EQ((f2 ? *f2 : nullptr), &r2->getFileEntry());
-}
-
-TEST_F(FileManagerTest, getFileRefReturnsCorrectNameForDifferentStatPath) {
-  // Inject files with the same inode, but where some files have a stat that
-  // gives a different name. This is adding coverage for weird stat behaviour
-  // triggered by the RedirectingFileSystem that FileManager::getFileRef has
-  // special logic for.
-  auto StatCache = std::make_unique<FakeStatCache>();
-  StatCache->InjectDirectory("dir", 40);
-  StatCache->InjectFile("dir/f1.cpp", 41);
-  StatCache->InjectFile("dir/f1-alias.cpp", 41, "dir/f1.cpp");
-  StatCache->InjectFile("dir/f2.cpp", 42);
-  StatCache->InjectFile("dir/f2-alias.cpp", 42, "dir/f2.cpp");
-
-  // This unintuitive rename-the-file-on-stat behaviour supports how the
-  // RedirectingFileSystem VFS layer responds to stats. However, even if you
-  // have two layers, you should only get a single filename back. As such the
-  // following stat cache behaviour is not supported (the correct stat entry
-  // for a double-redirection would be "dir/f1.cpp") and the getFileRef below
-  // should assert.
-  StatCache->InjectFile("dir/f1-alias-alias.cpp", 41, "dir/f1-alias.cpp");
-
-  manager.setStatCache(std::move(StatCache));
-
-  // With F1, test accessing the non-redirected name first.
-  auto F1 = manager.getFileRef("dir/f1.cpp");
-  auto F1Alias = manager.getFileRef("dir/f1-alias.cpp");
-  auto F1Alias2 = manager.getFileRef("dir/f1-alias.cpp");
-  ASSERT_FALSE(!F1);
-  ASSERT_FALSE(!F1Alias);
-  ASSERT_FALSE(!F1Alias2);
-  EXPECT_EQ("dir/f1.cpp", F1->getName());
-  EXPECT_EQ("dir/f1.cpp", F1->getFileEntry().getName());
-  EXPECT_EQ("dir/f1.cpp", F1Alias->getName());
-  EXPECT_EQ("dir/f1.cpp", F1Alias2->getName());
-  EXPECT_EQ(&F1->getFileEntry(), &F1Alias->getFileEntry());
-  EXPECT_EQ(&F1->getFileEntry(), &F1Alias2->getFileEntry());
-
-#if !defined(NDEBUG) && GTEST_HAS_DEATH_TEST
-  EXPECT_DEATH((void)manager.getFileRef("dir/f1-alias-alias.cpp"),
-               "filename redirected to a non-canonical filename?");
-#endif
-
-  // With F2, test accessing the redirected name first.
-  auto F2Alias = manager.getFileRef("dir/f2-alias.cpp");
-  auto F2 = manager.getFileRef("dir/f2.cpp");
-  auto F2Alias2 = manager.getFileRef("dir/f2-alias.cpp");
-  ASSERT_FALSE(!F2);
-  ASSERT_FALSE(!F2Alias);
-  ASSERT_FALSE(!F2Alias2);
-  EXPECT_EQ("dir/f2.cpp", F2->getName());
-  EXPECT_EQ("dir/f2.cpp", F2->getFileEntry().getName());
-  EXPECT_EQ("dir/f2.cpp", F2Alias->getName());
-  EXPECT_EQ("dir/f2.cpp", F2Alias2->getName());
-  EXPECT_EQ(&F2->getFileEntry(), &F2Alias->getFileEntry());
-  EXPECT_EQ(&F2->getFileEntry(), &F2Alias2->getFileEntry());
-}
-
-// getFile() returns the same FileEntry for virtual files that have
-// corresponding real files that are aliases.
-TEST_F(FileManagerTest, getFileReturnsSameFileEntryForAliasedVirtualFiles) {
-  // Inject two real files with the same inode.
-  auto statCache = std::make_unique<FakeStatCache>();
-  statCache->InjectDirectory("abc", 41);
-  statCache->InjectFile("abc/foo.cpp", 42);
-  statCache->InjectFile("abc/bar.cpp", 42);
-  manager.setStatCache(std::move(statCache));
-
-  ASSERT_TRUE(manager.getVirtualFile("abc/foo.cpp", 100, 0)->isValid());
-  ASSERT_TRUE(manager.getVirtualFile("abc/bar.cpp", 200, 0)->isValid());
-
-  auto f1 = manager.getFile("abc/foo.cpp");
-  auto f2 = manager.getFile("abc/bar.cpp");
-
-  EXPECT_EQ(f1 ? *f1 : nullptr,
-            f2 ? *f2 : nullptr);
-}
-
-TEST_F(FileManagerTest, getFileRefEquality) {
-  auto StatCache = std::make_unique<FakeStatCache>();
-  StatCache->InjectDirectory("dir", 40);
-  StatCache->InjectFile("dir/f1.cpp", 41);
-  StatCache->InjectFile("dir/f1-also.cpp", 41);
-  StatCache->InjectFile("dir/f1-redirect.cpp", 41, "dir/f1.cpp");
-  StatCache->InjectFile("dir/f2.cpp", 42);
-  manager.setStatCache(std::move(StatCache));
-
-  auto F1 = manager.getFileRef("dir/f1.cpp");
-  auto F1Again = manager.getFileRef("dir/f1.cpp");
-  auto F1Also = manager.getFileRef("dir/f1-also.cpp");
-  auto F1Redirect = manager.getFileRef("dir/f1-redirect.cpp");
-  auto F2 = manager.getFileRef("dir/f2.cpp");
-
-  // Check Expected<FileEntryRef> for error.
-  ASSERT_FALSE(!F1);
-  ASSERT_FALSE(!F1Also);
-  ASSERT_FALSE(!F1Again);
-  ASSERT_FALSE(!F1Redirect);
-  ASSERT_FALSE(!F2);
-
-  // Check names.
-  EXPECT_EQ("dir/f1.cpp", F1->getName());
-  EXPECT_EQ("dir/f1.cpp", F1Again->getName());
-  EXPECT_EQ("dir/f1-also.cpp", F1Also->getName());
-  EXPECT_EQ("dir/f1.cpp", F1Redirect->getName());
-  EXPECT_EQ("dir/f2.cpp", F2->getName());
-
-  // Compare against FileEntry*.
-  EXPECT_EQ(&F1->getFileEntry(), *F1);
-  EXPECT_EQ(*F1, &F1->getFileEntry());
-  EXPECT_NE(&F2->getFileEntry(), *F1);
-  EXPECT_NE(*F1, &F2->getFileEntry());
-
-  // Compare using ==.
-  EXPECT_EQ(*F1, *F1Also);
-  EXPECT_EQ(*F1, *F1Again);
-  EXPECT_EQ(*F1, *F1Redirect);
-  EXPECT_EQ(*F1Also, *F1Redirect);
-  EXPECT_NE(*F2, *F1);
-  EXPECT_NE(*F2, *F1Also);
-  EXPECT_NE(*F2, *F1Again);
-  EXPECT_NE(*F2, *F1Redirect);
-
-  // Compare using isSameRef.
-  EXPECT_TRUE(F1->isSameRef(*F1Again));
-  EXPECT_TRUE(F1->isSameRef(*F1Redirect));
-  EXPECT_FALSE(F1->isSameRef(*F1Also));
-  EXPECT_FALSE(F1->isSameRef(*F2));
-}
-
-// getFile() Should return the same entry as getVirtualFile if the file actually
-// is a virtual file, even if the name is not exactly the same (but is after
-// normalisation done by the file system, like on Windows). This can be checked
-// here by checking the size.
-TEST_F(FileManagerTest, getVirtualFileWithDifferentName) {
-  // Inject fake files into the file system.
-  auto statCache = std::make_unique<FakeStatCache>();
-  statCache->InjectDirectory("c:\\tmp", 42);
-  statCache->InjectFile("c:\\tmp\\test", 43);
-
-  manager.setStatCache(std::move(statCache));
-
-  // Inject the virtual file:
-  const FileEntry *file1 = manager.getVirtualFile("c:\\tmp\\test", 123, 1);
-  ASSERT_TRUE(file1 != nullptr);
-  ASSERT_TRUE(file1->isValid());
-  EXPECT_EQ(43U, file1->getUniqueID().getFile());
-  EXPECT_EQ(123, file1->getSize());
-
-  // Lookup the virtual file with a different name:
-  auto file2 = manager.getFile("c:/tmp/test", 100, 1);
-  ASSERT_TRUE(file2);
-  ASSERT_TRUE((*file2)->isValid());
-  // Check that it's the same UFE:
-  EXPECT_EQ(file1, *file2);
-  EXPECT_EQ(43U, (*file2)->getUniqueID().getFile());
-  // Check that the contents of the UFE are not overwritten by the entry in the
-  // filesystem:
-  EXPECT_EQ(123, (*file2)->getSize());
-}
-
-#endif  // !_WIN32
-
-TEST_F(FileManagerTest, makeAbsoluteUsesVFS) {
-  SmallString<64> CustomWorkingDir;
-#ifdef _WIN32
-  CustomWorkingDir = "C:";
-#else
-  CustomWorkingDir = "/";
-#endif
-  llvm::sys::path::append(CustomWorkingDir, "some", "weird", "path");
-
-  auto FS = IntrusiveRefCntPtr<llvm::vfs::InMemoryFileSystem>(
-      new llvm::vfs::InMemoryFileSystem);
-  // setCurrentworkingdirectory must finish without error.
-  ASSERT_TRUE(!FS->setCurrentWorkingDirectory(CustomWorkingDir));
-
-  FileSystemOptions Opts;
-  FileManager Manager(Opts, FS);
-
-  SmallString<64> Path("a/foo.cpp");
-
-  SmallString<64> ExpectedResult(CustomWorkingDir);
-  llvm::sys::path::append(ExpectedResult, Path);
-
-  ASSERT_TRUE(Manager.makeAbsolutePath(Path));
-  EXPECT_EQ(Path, ExpectedResult);
-}
-
-// getVirtualFile should always fill the real path.
-TEST_F(FileManagerTest, getVirtualFileFillsRealPathName) {
-  SmallString<64> CustomWorkingDir;
-#ifdef _WIN32
-  CustomWorkingDir = "C:/";
-#else
-  CustomWorkingDir = "/";
-#endif
-
-  auto FS = IntrusiveRefCntPtr<llvm::vfs::InMemoryFileSystem>(
-      new llvm::vfs::InMemoryFileSystem);
-  // setCurrentworkingdirectory must finish without error.
-  ASSERT_TRUE(!FS->setCurrentWorkingDirectory(CustomWorkingDir));
-
-  FileSystemOptions Opts;
-  FileManager Manager(Opts, FS);
-
-  // Inject fake files into the file system.
-  auto statCache = std::make_unique<FakeStatCache>();
-  statCache->InjectDirectory("/tmp", 42);
-  statCache->InjectFile("/tmp/test", 43);
-
-  Manager.setStatCache(std::move(statCache));
-
-  // Check for real path.
-  const FileEntry *file = Manager.getVirtualFile("/tmp/test", 123, 1);
-  ASSERT_TRUE(file != nullptr);
-  ASSERT_TRUE(file->isValid());
-  SmallString<64> ExpectedResult = CustomWorkingDir;
-
-  llvm::sys::path::append(ExpectedResult, "tmp", "test");
-  EXPECT_EQ(file->tryGetRealPathName(), ExpectedResult);
-}
-
-TEST_F(FileManagerTest, getFileDontOpenRealPath) {
-  SmallString<64> CustomWorkingDir;
-#ifdef _WIN32
-  CustomWorkingDir = "C:/";
-#else
-  CustomWorkingDir = "/";
-#endif
-
-  auto FS = IntrusiveRefCntPtr<llvm::vfs::InMemoryFileSystem>(
-      new llvm::vfs::InMemoryFileSystem);
-  // setCurrentworkingdirectory must finish without error.
-  ASSERT_TRUE(!FS->setCurrentWorkingDirectory(CustomWorkingDir));
-
-  FileSystemOptions Opts;
-  FileManager Manager(Opts, FS);
-
-  // Inject fake files into the file system.
-  auto statCache = std::make_unique<FakeStatCache>();
-  statCache->InjectDirectory("/tmp", 42);
-  statCache->InjectFile("/tmp/test", 43);
-
-  Manager.setStatCache(std::move(statCache));
-
-  // Check for real path.
-  auto file = Manager.getFile("/tmp/test", /*OpenFile=*/false);
-  ASSERT_TRUE(file);
-  ASSERT_TRUE((*file)->isValid());
-  SmallString<64> ExpectedResult = CustomWorkingDir;
-
-  llvm::sys::path::append(ExpectedResult, "tmp", "test");
-  EXPECT_EQ((*file)->tryGetRealPathName(), ExpectedResult);
-}
-
-TEST_F(FileManagerTest, getBypassFile) {
-  SmallString<64> CustomWorkingDir;
-#ifdef _WIN32
-  CustomWorkingDir = "C:/";
-#else
-  CustomWorkingDir = "/";
-#endif
-
-  auto FS = IntrusiveRefCntPtr<llvm::vfs::InMemoryFileSystem>(
-      new llvm::vfs::InMemoryFileSystem);
-  // setCurrentworkingdirectory must finish without error.
-  ASSERT_TRUE(!FS->setCurrentWorkingDirectory(CustomWorkingDir));
-
-  FileSystemOptions Opts;
-  FileManager Manager(Opts, FS);
-
-  // Inject fake files into the file system.
-  auto Cache = std::make_unique<FakeStatCache>();
-  Cache->InjectDirectory("/tmp", 42);
-  Cache->InjectFile("/tmp/test", 43);
-  Manager.setStatCache(std::move(Cache));
-
-  // Set up a virtual file with a different size than FakeStatCache uses.
-  const FileEntry *File = Manager.getVirtualFile("/tmp/test", /*Size=*/10, 0);
-  ASSERT_TRUE(File);
-  const FileEntry &FE = *File;
-  EXPECT_TRUE(FE.isValid());
-  EXPECT_EQ(FE.getSize(), 10);
-
-  // Calling a second time should not affect the UID or size.
-  unsigned VirtualUID = FE.getUID();
-  EXPECT_EQ(
-      &FE,
-      &expectedToOptional(Manager.getFileRef("/tmp/test"))->getFileEntry());
-  EXPECT_EQ(FE.getUID(), VirtualUID);
-  EXPECT_EQ(FE.getSize(), 10);
-
-  // Bypass the file.
-  llvm::Optional<FileEntryRef> BypassRef =
-      Manager.getBypassFile(File->getLastRef());
-  ASSERT_TRUE(BypassRef);
-  EXPECT_TRUE(BypassRef->isValid());
-  EXPECT_EQ("/tmp/test", BypassRef->getName());
-
-  // Check that it's different in the right ways.
-  EXPECT_NE(&BypassRef->getFileEntry(), File);
-  EXPECT_NE(BypassRef->getUID(), VirtualUID);
-  EXPECT_NE(BypassRef->getSize(), FE.getSize());
-
-  // The virtual file should still be returned when searching.
-  EXPECT_EQ(
-      &FE,
-      &expectedToOptional(Manager.getFileRef("/tmp/test"))->getFileEntry());
-}
-
-} // anonymous namespace
diff --git a/gnu/llvm/clang/unittests/Basic/LineOffsetMappingTest.cpp b/gnu/llvm/clang/unittests/Basic/LineOffsetMappingTest.cpp
deleted file mode 100644
index b50374a449c..00000000000
--- a/gnu/llvm/clang/unittests/Basic/LineOffsetMappingTest.cpp
+++ /dev/null
@@ -1,79 +0,0 @@
-//===- unittests/Basic/LineOffsetMappingTest.cpp - Test LineOffsetMapping -===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/Basic/SourceManager.h"
-#include "gtest/gtest.h"
-
-using namespace clang;
-using namespace clang::SrcMgr;
-using namespace llvm;
-
-namespace {
-
-TEST(LineOffsetMappingTest, empty) {
-  LineOffsetMapping Mapping;
-  EXPECT_FALSE(Mapping);
-
-#if !defined(NDEBUG) && GTEST_HAS_DEATH_TEST
-  EXPECT_DEATH((void)Mapping.getLines(), "Storage");
-#endif
-}
-
-TEST(LineOffsetMappingTest, construct) {
-  BumpPtrAllocator Alloc;
-  unsigned Offsets[] = {0, 10, 20};
-  LineOffsetMapping Mapping(Offsets, Alloc);
-  EXPECT_EQ(3u, Mapping.size());
-  EXPECT_EQ(0u, Mapping[0]);
-  EXPECT_EQ(10u, Mapping[1]);
-  EXPECT_EQ(20u, Mapping[2]);
-
-#if !defined(NDEBUG) && GTEST_HAS_DEATH_TEST
-  EXPECT_DEATH((void)Mapping[3], "Invalid index");
-#endif
-}
-
-TEST(LineOffsetMappingTest, constructTwo) {
-  // Confirm allocation size is big enough, convering an off-by-one bug.
-  BumpPtrAllocator Alloc;
-  unsigned Offsets1[] = {0, 10};
-  unsigned Offsets2[] = {0, 20};
-  LineOffsetMapping Mapping1(Offsets1, Alloc);
-  LineOffsetMapping Mapping2(Offsets2, Alloc);
-
-  // Need to check Mapping1 *after* building Mapping2.
-  EXPECT_EQ(2u, Mapping1.size());
-  EXPECT_EQ(0u, Mapping1[0]);
-  EXPECT_EQ(10u, Mapping1[1]);
-  EXPECT_EQ(2u, Mapping2.size());
-  EXPECT_EQ(0u, Mapping2[0]);
-  EXPECT_EQ(20u, Mapping2[1]);
-}
-
-TEST(LineOffsetMappingTest, get) {
-  BumpPtrAllocator Alloc;
-  StringRef Source = "first line\n"
-                     "second line\n";
-  auto Mapping = LineOffsetMapping::get(MemoryBufferRef(Source, ""), Alloc);
-  EXPECT_EQ(3u, Mapping.size());
-  EXPECT_EQ(0u, Mapping[0]);
-  EXPECT_EQ(11u, Mapping[1]);
-  EXPECT_EQ(23u, Mapping[2]);
-}
-
-TEST(LineOffsetMappingTest, getMissingFinalNewline) {
-  BumpPtrAllocator Alloc;
-  StringRef Source = "first line\n"
-                     "second line";
-  auto Mapping = LineOffsetMapping::get(MemoryBufferRef(Source, ""), Alloc);
-  EXPECT_EQ(2u, Mapping.size());
-  EXPECT_EQ(0u, Mapping[0]);
-  EXPECT_EQ(11u, Mapping[1]);
-}
-
-} // end namespace
diff --git a/gnu/llvm/clang/unittests/Basic/SanitizersTest.cpp b/gnu/llvm/clang/unittests/Basic/SanitizersTest.cpp
deleted file mode 100644
index c6537cbf71a..00000000000
--- a/gnu/llvm/clang/unittests/Basic/SanitizersTest.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-//===- unittests/Basic/SanitizersTest.cpp - Test Sanitizers ---------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/Basic/Sanitizers.h"
-
-#include "gmock/gmock-matchers.h"
-#include "gtest/gtest.h"
-
-using namespace clang;
-
-using testing::Contains;
-using testing::Not;
-
-TEST(SanitizersTest, serializeSanitizers) {
-  SanitizerSet Set;
-  Set.set(parseSanitizerValue("memory", false), true);
-  Set.set(parseSanitizerValue("nullability-arg", false), true);
-
-  SmallVector<StringRef, 4> Serialized;
-  serializeSanitizerSet(Set, Serialized);
-
-  ASSERT_EQ(Serialized.size(), 2u);
-  ASSERT_THAT(Serialized, Contains("memory"));
-  ASSERT_THAT(Serialized, Contains("nullability-arg"));
-}
-
-TEST(SanitizersTest, serializeSanitizersIndividual) {
-  SanitizerSet Set;
-  Set.set(parseSanitizerValue("memory", false), true);
-  Set.set(parseSanitizerValue("nullability-arg", false), true);
-  Set.set(parseSanitizerValue("nullability-assign", false), true);
-  Set.set(parseSanitizerValue("nullability-return", false), true);
-
-  SmallVector<StringRef, 4> Serialized;
-  serializeSanitizerSet(Set, Serialized);
-
-  ASSERT_EQ(Serialized.size(), 4u);
-  ASSERT_THAT(Serialized, Contains("memory"));
-  ASSERT_THAT(Serialized, Contains("nullability-arg"));
-  ASSERT_THAT(Serialized, Contains("nullability-assign"));
-  ASSERT_THAT(Serialized, Contains("nullability-return"));
-  // Individual sanitizers don't get squashed into a single group.
-  ASSERT_THAT(Serialized, Not(Contains("nullability")));
-}
diff --git a/gnu/llvm/clang/unittests/Basic/SourceManagerTest.cpp b/gnu/llvm/clang/unittests/Basic/SourceManagerTest.cpp
deleted file mode 100644
index dadfcc94ac0..00000000000
--- a/gnu/llvm/clang/unittests/Basic/SourceManagerTest.cpp
+++ /dev/null
@@ -1,519 +0,0 @@
-//===- unittests/Basic/SourceManagerTest.cpp ------ SourceManager tests ---===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/Basic/SourceManager.h"
-#include "clang/Basic/Diagnostic.h"
-#include "clang/Basic/DiagnosticOptions.h"
-#include "clang/Basic/FileManager.h"
-#include "clang/Basic/LangOptions.h"
-#include "clang/Basic/TargetInfo.h"
-#include "clang/Basic/TargetOptions.h"
-#include "clang/Lex/HeaderSearch.h"
-#include "clang/Lex/HeaderSearchOptions.h"
-#include "clang/Lex/ModuleLoader.h"
-#include "clang/Lex/Preprocessor.h"
-#include "clang/Lex/PreprocessorOptions.h"
-#include "llvm/ADT/SmallString.h"
-#include "llvm/Config/llvm-config.h"
-#include "llvm/Support/Process.h"
-#include "gtest/gtest.h"
-#include <cstddef>
-
-using namespace clang;
-
-namespace {
-
-// The test fixture.
-class SourceManagerTest : public ::testing::Test {
-protected:
-  SourceManagerTest()
-    : FileMgr(FileMgrOpts),
-      DiagID(new DiagnosticIDs()),
-      Diags(DiagID, new DiagnosticOptions, new IgnoringDiagConsumer()),
-      SourceMgr(Diags, FileMgr),
-      TargetOpts(new TargetOptions) {
-    TargetOpts->Triple = "x86_64-apple-darwin11.1.0";
-    Target = TargetInfo::CreateTargetInfo(Diags, TargetOpts);
-  }
-
-  FileSystemOptions FileMgrOpts;
-  FileManager FileMgr;
-  IntrusiveRefCntPtr<DiagnosticIDs> DiagID;
-  DiagnosticsEngine Diags;
-  SourceManager SourceMgr;
-  LangOptions LangOpts;
-  std::shared_ptr<TargetOptions> TargetOpts;
-  IntrusiveRefCntPtr<TargetInfo> Target;
-};
-
-TEST_F(SourceManagerTest, isBeforeInTranslationUnit) {
-  const char *source =
-    "#define M(x) [x]\n"
-    "M(foo)";
-  std::unique_ptr<llvm::MemoryBuffer> Buf =
-      llvm::MemoryBuffer::getMemBuffer(source);
-  FileID mainFileID = SourceMgr.createFileID(std::move(Buf));
-  SourceMgr.setMainFileID(mainFileID);
-
-  TrivialModuleLoader ModLoader;
-  HeaderSearch HeaderInfo(std::make_shared<HeaderSearchOptions>(), SourceMgr,
-                          Diags, LangOpts, &*Target);
-  Preprocessor PP(std::make_shared<PreprocessorOptions>(), Diags, LangOpts,
-                  SourceMgr, HeaderInfo, ModLoader,
-                  /*IILookup =*/nullptr,
-                  /*OwnsHeaderSearch =*/false);
-  PP.Initialize(*Target);
-  PP.EnterMainSourceFile();
-
-  std::vector<Token> toks;
-  while (1) {
-    Token tok;
-    PP.Lex(tok);
-    if (tok.is(tok::eof))
-      break;
-    toks.push_back(tok);
-  }
-
-  // Make sure we got the tokens that we expected.
-  ASSERT_EQ(3U, toks.size());
-  ASSERT_EQ(tok::l_square, toks[0].getKind());
-  ASSERT_EQ(tok::identifier, toks[1].getKind());
-  ASSERT_EQ(tok::r_square, toks[2].getKind());
-  
-  SourceLocation lsqrLoc = toks[0].getLocation();
-  SourceLocation idLoc = toks[1].getLocation();
-  SourceLocation rsqrLoc = toks[2].getLocation();
-  
-  SourceLocation macroExpStartLoc = SourceMgr.translateLineCol(mainFileID, 2, 1);
-  SourceLocation macroExpEndLoc = SourceMgr.translateLineCol(mainFileID, 2, 6);
-  ASSERT_TRUE(macroExpStartLoc.isFileID());
-  ASSERT_TRUE(macroExpEndLoc.isFileID());
-
-  SmallString<32> str;
-  ASSERT_EQ("M", PP.getSpelling(macroExpStartLoc, str));
-  ASSERT_EQ(")", PP.getSpelling(macroExpEndLoc, str));
-
-  EXPECT_TRUE(SourceMgr.isBeforeInTranslationUnit(lsqrLoc, idLoc));
-  EXPECT_TRUE(SourceMgr.isBeforeInTranslationUnit(idLoc, rsqrLoc));
-  EXPECT_TRUE(SourceMgr.isBeforeInTranslationUnit(macroExpStartLoc, idLoc));
-  EXPECT_TRUE(SourceMgr.isBeforeInTranslationUnit(idLoc, macroExpEndLoc));
-}
-
-TEST_F(SourceManagerTest, getColumnNumber) {
-  const char *Source =
-    "int x;\n"
-    "int y;";
-
-  std::unique_ptr<llvm::MemoryBuffer> Buf =
-      llvm::MemoryBuffer::getMemBuffer(Source);
-  FileID MainFileID = SourceMgr.createFileID(std::move(Buf));
-  SourceMgr.setMainFileID(MainFileID);
-
-  bool Invalid;
-
-  Invalid = false;
-  EXPECT_EQ(1U, SourceMgr.getColumnNumber(MainFileID, 0, &Invalid));
-  EXPECT_TRUE(!Invalid);
-
-  Invalid = false;
-  EXPECT_EQ(5U, SourceMgr.getColumnNumber(MainFileID, 4, &Invalid));
-  EXPECT_TRUE(!Invalid);
-
-  Invalid = false;
-  EXPECT_EQ(1U, SourceMgr.getColumnNumber(MainFileID, 7, &Invalid));
-  EXPECT_TRUE(!Invalid);
-
-  Invalid = false;
-  EXPECT_EQ(5U, SourceMgr.getColumnNumber(MainFileID, 11, &Invalid));
-  EXPECT_TRUE(!Invalid);
-
-  Invalid = false;
-  EXPECT_EQ(7U, SourceMgr.getColumnNumber(MainFileID, strlen(Source),
-                                         &Invalid));
-  EXPECT_TRUE(!Invalid);
-
-  Invalid = false;
-  SourceMgr.getColumnNumber(MainFileID, strlen(Source)+1, &Invalid);
-  EXPECT_TRUE(Invalid);
-
-  // Test invalid files
-  Invalid = false;
-  SourceMgr.getColumnNumber(FileID(), 0, &Invalid);
-  EXPECT_TRUE(Invalid);
-
-  Invalid = false;
-  SourceMgr.getColumnNumber(FileID(), 1, &Invalid);
-  EXPECT_TRUE(Invalid);
-
-  // Test with no invalid flag.
-  EXPECT_EQ(1U, SourceMgr.getColumnNumber(MainFileID, 0, nullptr));
-}
-
-TEST_F(SourceManagerTest, locationPrintTest) {
-  const char *header = "#define IDENTITY(x) x\n";
-
-  const char *Source = "int x;\n"
-                       "include \"test-header.h\"\n"
-                       "IDENTITY(int y);\n"
-                       "int z;";
-
-  std::unique_ptr<llvm::MemoryBuffer> HeaderBuf =
-      llvm::MemoryBuffer::getMemBuffer(header);
-  std::unique_ptr<llvm::MemoryBuffer> Buf =
-      llvm::MemoryBuffer::getMemBuffer(Source);
-
-  const FileEntry *SourceFile =
-      FileMgr.getVirtualFile("/mainFile.cpp", Buf->getBufferSize(), 0);
-  SourceMgr.overrideFileContents(SourceFile, std::move(Buf));
-
-  const FileEntry *HeaderFile =
-      FileMgr.getVirtualFile("/test-header.h", HeaderBuf->getBufferSize(), 0);
-  SourceMgr.overrideFileContents(HeaderFile, std::move(HeaderBuf));
-
-  FileID MainFileID = SourceMgr.getOrCreateFileID(SourceFile, SrcMgr::C_User);
-  FileID HeaderFileID = SourceMgr.getOrCreateFileID(HeaderFile, SrcMgr::C_User);
-  SourceMgr.setMainFileID(MainFileID);
-
-  auto BeginLoc = SourceMgr.getLocForStartOfFile(MainFileID);
-  auto EndLoc = SourceMgr.getLocForEndOfFile(MainFileID);
-
-  auto BeginEOLLoc = SourceMgr.translateLineCol(MainFileID, 1, 7);
-
-  auto HeaderLoc = SourceMgr.getLocForStartOfFile(HeaderFileID);
-
-  EXPECT_EQ(BeginLoc.printToString(SourceMgr), "/mainFile.cpp:1:1");
-  EXPECT_EQ(EndLoc.printToString(SourceMgr), "/mainFile.cpp:4:7");
-
-  EXPECT_EQ(BeginEOLLoc.printToString(SourceMgr), "/mainFile.cpp:1:7");
-  EXPECT_EQ(HeaderLoc.printToString(SourceMgr), "/test-header.h:1:1");
-
-  EXPECT_EQ(SourceRange(BeginLoc, BeginLoc).printToString(SourceMgr),
-            "</mainFile.cpp:1:1>");
-  EXPECT_EQ(SourceRange(BeginLoc, BeginEOLLoc).printToString(SourceMgr),
-            "</mainFile.cpp:1:1, col:7>");
-  EXPECT_EQ(SourceRange(BeginLoc, EndLoc).printToString(SourceMgr),
-            "</mainFile.cpp:1:1, line:4:7>");
-  EXPECT_EQ(SourceRange(BeginLoc, HeaderLoc).printToString(SourceMgr),
-            "</mainFile.cpp:1:1, /test-header.h:1:1>");
-}
-
-TEST_F(SourceManagerTest, getInvalidBOM) {
-  ASSERT_EQ(SrcMgr::ContentCache::getInvalidBOM(""), nullptr);
-  ASSERT_EQ(SrcMgr::ContentCache::getInvalidBOM("\x00\x00\x00"), nullptr);
-  ASSERT_EQ(SrcMgr::ContentCache::getInvalidBOM("\xFF\xFF\xFF"), nullptr);
-  ASSERT_EQ(SrcMgr::ContentCache::getInvalidBOM("#include <iostream>"),
-            nullptr);
-
-  ASSERT_EQ(StringRef(SrcMgr::ContentCache::getInvalidBOM(
-                "\xFE\xFF#include <iostream>")),
-            "UTF-16 (BE)");
-  ASSERT_EQ(StringRef(SrcMgr::ContentCache::getInvalidBOM(
-                "\xFF\xFE#include <iostream>")),
-            "UTF-16 (LE)");
-  ASSERT_EQ(StringRef(SrcMgr::ContentCache::getInvalidBOM(
-                "\x2B\x2F\x76#include <iostream>")),
-            "UTF-7");
-  ASSERT_EQ(StringRef(SrcMgr::ContentCache::getInvalidBOM(
-                "\xF7\x64\x4C#include <iostream>")),
-            "UTF-1");
-  ASSERT_EQ(StringRef(SrcMgr::ContentCache::getInvalidBOM(
-                "\xDD\x73\x66\x73#include <iostream>")),
-            "UTF-EBCDIC");
-  ASSERT_EQ(StringRef(SrcMgr::ContentCache::getInvalidBOM(
-                "\x0E\xFE\xFF#include <iostream>")),
-            "SCSU");
-  ASSERT_EQ(StringRef(SrcMgr::ContentCache::getInvalidBOM(
-                "\xFB\xEE\x28#include <iostream>")),
-            "BOCU-1");
-  ASSERT_EQ(StringRef(SrcMgr::ContentCache::getInvalidBOM(
-                "\x84\x31\x95\x33#include <iostream>")),
-            "GB-18030");
-  ASSERT_EQ(StringRef(SrcMgr::ContentCache::getInvalidBOM(
-                llvm::StringLiteral::withInnerNUL(
-                    "\x00\x00\xFE\xFF#include <iostream>"))),
-            "UTF-32 (BE)");
-  ASSERT_EQ(StringRef(SrcMgr::ContentCache::getInvalidBOM(
-                llvm::StringLiteral::withInnerNUL(
-                    "\xFF\xFE\x00\x00#include <iostream>"))),
-            "UTF-32 (LE)");
-}
-
-// Regression test - there was an out of bound access for buffers not terminated by zero.
-TEST_F(SourceManagerTest, getLineNumber) {
-  const unsigned pageSize = llvm::sys::Process::getPageSizeEstimate();
-  std::unique_ptr<char[]> source(new char[pageSize]);
-  for(unsigned i = 0; i < pageSize; ++i) {
-    source[i] = 'a';
-  }
-
-  std::unique_ptr<llvm::MemoryBuffer> Buf =
-      llvm::MemoryBuffer::getMemBuffer(
-        llvm::MemoryBufferRef(
-          llvm::StringRef(source.get(), 3), "whatever"
-        ),
-        false
-      );
-
-  FileID mainFileID = SourceMgr.createFileID(std::move(Buf));
-  SourceMgr.setMainFileID(mainFileID);
-
-  ASSERT_NO_FATAL_FAILURE(SourceMgr.getLineNumber(mainFileID, 1, nullptr));
-}
-
-#if defined(LLVM_ON_UNIX)
-
-TEST_F(SourceManagerTest, getMacroArgExpandedLocation) {
-  const char *header =
-    "#define FM(x,y) x\n";
-
-  const char *main =
-    "#include \"/test-header.h\"\n"
-    "#define VAL 0\n"
-    "FM(VAL,0)\n"
-    "FM(0,VAL)\n"
-    "FM(FM(0,VAL),0)\n"
-    "#define CONCAT(X, Y) X##Y\n"
-    "CONCAT(1,1)\n";
-
-  std::unique_ptr<llvm::MemoryBuffer> HeaderBuf =
-      llvm::MemoryBuffer::getMemBuffer(header);
-  std::unique_ptr<llvm::MemoryBuffer> MainBuf =
-      llvm::MemoryBuffer::getMemBuffer(main);
-  FileID mainFileID = SourceMgr.createFileID(std::move(MainBuf));
-  SourceMgr.setMainFileID(mainFileID);
-
-  const FileEntry *headerFile = FileMgr.getVirtualFile("/test-header.h",
-                                                 HeaderBuf->getBufferSize(), 0);
-  SourceMgr.overrideFileContents(headerFile, std::move(HeaderBuf));
-
-  TrivialModuleLoader ModLoader;
-  HeaderSearch HeaderInfo(std::make_shared<HeaderSearchOptions>(), SourceMgr,
-                          Diags, LangOpts, &*Target);
-
-  Preprocessor PP(std::make_shared<PreprocessorOptions>(), Diags, LangOpts,
-                  SourceMgr, HeaderInfo, ModLoader,
-                  /*IILookup =*/nullptr,
-                  /*OwnsHeaderSearch =*/false);
-  // Ensure we can get expanded locations in presence of implicit includes.
-  // These are different than normal includes since predefines buffer doesn't
-  // have a valid insertion location.
-  PP.setPredefines("#include \"/implicit-header.h\"");
-  FileMgr.getVirtualFile("/implicit-header.h", 0, 0);
-  PP.Initialize(*Target);
-  PP.EnterMainSourceFile();
-
-  std::vector<Token> toks;
-  while (1) {
-    Token tok;
-    PP.Lex(tok);
-    if (tok.is(tok::eof))
-      break;
-    toks.push_back(tok);
-  }
-
-  // Make sure we got the tokens that we expected.
-  ASSERT_EQ(4U, toks.size());
-  ASSERT_EQ(tok::numeric_constant, toks[0].getKind());
-  ASSERT_EQ(tok::numeric_constant, toks[1].getKind());
-  ASSERT_EQ(tok::numeric_constant, toks[2].getKind());
-  ASSERT_EQ(tok::numeric_constant, toks[3].getKind());
-
-  SourceLocation defLoc = SourceMgr.translateLineCol(mainFileID, 2, 13);
-  SourceLocation loc1 = SourceMgr.translateLineCol(mainFileID, 3, 8);
-  SourceLocation loc2 = SourceMgr.translateLineCol(mainFileID, 4, 4);
-  SourceLocation loc3 = SourceMgr.translateLineCol(mainFileID, 5, 7);
-  SourceLocation defLoc2 = SourceMgr.translateLineCol(mainFileID, 6, 22);
-  defLoc = SourceMgr.getMacroArgExpandedLocation(defLoc);
-  loc1 = SourceMgr.getMacroArgExpandedLocation(loc1);
-  loc2 = SourceMgr.getMacroArgExpandedLocation(loc2);
-  loc3 = SourceMgr.getMacroArgExpandedLocation(loc3);
-  defLoc2 = SourceMgr.getMacroArgExpandedLocation(defLoc2);
-
-  EXPECT_TRUE(defLoc.isFileID());
-  EXPECT_TRUE(loc1.isFileID());
-  EXPECT_TRUE(SourceMgr.isMacroArgExpansion(loc2));
-  EXPECT_TRUE(SourceMgr.isMacroArgExpansion(loc3));
-  EXPECT_EQ(loc2, toks[1].getLocation());
-  EXPECT_EQ(loc3, toks[2].getLocation());
-  EXPECT_TRUE(defLoc2.isFileID());
-}
-
-namespace {
-
-struct MacroAction {
-  enum Kind { kExpansion, kDefinition, kUnDefinition};
-
-  SourceLocation Loc;
-  std::string Name;
-  unsigned MAKind : 3;
-
-  MacroAction(SourceLocation Loc, StringRef Name, unsigned K)
-      : Loc(Loc), Name(std::string(Name)), MAKind(K) {}
-
-  bool isExpansion() const { return MAKind == kExpansion; }
-  bool isDefinition() const { return MAKind & kDefinition; }
-  bool isUnDefinition() const { return MAKind & kUnDefinition; }
-};
-
-class MacroTracker : public PPCallbacks {
-  std::vector<MacroAction> &Macros;
-
-public:
-  explicit MacroTracker(std::vector<MacroAction> &Macros) : Macros(Macros) { }
-
-  void MacroDefined(const Token &MacroNameTok,
-                    const MacroDirective *MD) override {
-    Macros.push_back(MacroAction(MD->getLocation(),
-                                 MacroNameTok.getIdentifierInfo()->getName(),
-                                 MacroAction::kDefinition));
-  }
-  void MacroUndefined(const Token &MacroNameTok,
-                      const MacroDefinition &MD,
-                      const MacroDirective  *UD) override {
-    Macros.push_back(
-        MacroAction(UD ? UD->getLocation() : SourceLocation(),
-                    MacroNameTok.getIdentifierInfo()->getName(),
-                    UD ? MacroAction::kDefinition | MacroAction::kUnDefinition
-                       : MacroAction::kUnDefinition));
-  }
-  void MacroExpands(const Token &MacroNameTok, const MacroDefinition &MD,
-                    SourceRange Range, const MacroArgs *Args) override {
-    Macros.push_back(MacroAction(MacroNameTok.getLocation(),
-                                 MacroNameTok.getIdentifierInfo()->getName(),
-                                 MacroAction::kExpansion));
-  }
-};
-
-}
-
-TEST_F(SourceManagerTest, isBeforeInTranslationUnitWithMacroInInclude) {
-  const char *header =
-    "#define MACRO_IN_INCLUDE 0\n"
-    "#define MACRO_DEFINED\n"
-    "#undef MACRO_DEFINED\n"
-    "#undef MACRO_UNDEFINED\n";
-
-  const char *main =
-    "#define M(x) x\n"
-    "#define INC \"/test-header.h\"\n"
-    "#include M(INC)\n"
-    "#define INC2 </test-header.h>\n"
-    "#include M(INC2)\n";
-
-  std::unique_ptr<llvm::MemoryBuffer> HeaderBuf =
-      llvm::MemoryBuffer::getMemBuffer(header);
-  std::unique_ptr<llvm::MemoryBuffer> MainBuf =
-      llvm::MemoryBuffer::getMemBuffer(main);
-  SourceMgr.setMainFileID(SourceMgr.createFileID(std::move(MainBuf)));
-
-  const FileEntry *headerFile = FileMgr.getVirtualFile("/test-header.h",
-                                                 HeaderBuf->getBufferSize(), 0);
-  SourceMgr.overrideFileContents(headerFile, std::move(HeaderBuf));
-
-  TrivialModuleLoader ModLoader;
-  HeaderSearch HeaderInfo(std::make_shared<HeaderSearchOptions>(), SourceMgr,
-                          Diags, LangOpts, &*Target);
-  Preprocessor PP(std::make_shared<PreprocessorOptions>(), Diags, LangOpts,
-                  SourceMgr, HeaderInfo, ModLoader,
-                  /*IILookup =*/nullptr,
-                  /*OwnsHeaderSearch =*/false);
-  PP.Initialize(*Target);
-
-  std::vector<MacroAction> Macros;
-  PP.addPPCallbacks(std::make_unique<MacroTracker>(Macros));
-
-  PP.EnterMainSourceFile();
-
-  std::vector<Token> toks;
-  while (1) {
-    Token tok;
-    PP.Lex(tok);
-    if (tok.is(tok::eof))
-      break;
-    toks.push_back(tok);
-  }
-
-  // Make sure we got the tokens that we expected.
-  ASSERT_EQ(0U, toks.size());
-
-  ASSERT_EQ(15U, Macros.size());
-  // #define M(x) x
-  ASSERT_TRUE(Macros[0].isDefinition());
-  ASSERT_EQ("M", Macros[0].Name);
-  // #define INC "/test-header.h"
-  ASSERT_TRUE(Macros[1].isDefinition());
-  ASSERT_EQ("INC", Macros[1].Name);
-  // M expansion in #include M(INC)
-  ASSERT_FALSE(Macros[2].isDefinition());
-  ASSERT_EQ("M", Macros[2].Name);
-  // INC expansion in #include M(INC)
-  ASSERT_TRUE(Macros[3].isExpansion());
-  ASSERT_EQ("INC", Macros[3].Name);
-  // #define MACRO_IN_INCLUDE 0
-  ASSERT_TRUE(Macros[4].isDefinition());
-  ASSERT_EQ("MACRO_IN_INCLUDE", Macros[4].Name);
-  // #define MACRO_DEFINED
-  ASSERT_TRUE(Macros[5].isDefinition());
-  ASSERT_FALSE(Macros[5].isUnDefinition());
-  ASSERT_EQ("MACRO_DEFINED", Macros[5].Name);
-  // #undef MACRO_DEFINED
-  ASSERT_TRUE(Macros[6].isDefinition());
-  ASSERT_TRUE(Macros[6].isUnDefinition());
-  ASSERT_EQ("MACRO_DEFINED", Macros[6].Name);
-  // #undef MACRO_UNDEFINED
-  ASSERT_FALSE(Macros[7].isDefinition());
-  ASSERT_TRUE(Macros[7].isUnDefinition());
-  ASSERT_EQ("MACRO_UNDEFINED", Macros[7].Name);
-  // #define INC2 </test-header.h>
-  ASSERT_TRUE(Macros[8].isDefinition());
-  ASSERT_EQ("INC2", Macros[8].Name);
-  // M expansion in #include M(INC2)
-  ASSERT_FALSE(Macros[9].isDefinition());
-  ASSERT_EQ("M", Macros[9].Name);
-  // INC2 expansion in #include M(INC2)
-  ASSERT_TRUE(Macros[10].isExpansion());
-  ASSERT_EQ("INC2", Macros[10].Name);
-  // #define MACRO_IN_INCLUDE 0
-  ASSERT_TRUE(Macros[11].isDefinition());
-  ASSERT_EQ("MACRO_IN_INCLUDE", Macros[11].Name);
-
-  // The INC expansion in #include M(INC) comes before the first
-  // MACRO_IN_INCLUDE definition of the included file.
-  EXPECT_TRUE(SourceMgr.isBeforeInTranslationUnit(Macros[3].Loc, Macros[4].Loc));
-
-  // The INC2 expansion in #include M(INC2) comes before the second
-  // MACRO_IN_INCLUDE definition of the included file.
-  EXPECT_TRUE(SourceMgr.isBeforeInTranslationUnit(Macros[10].Loc, Macros[11].Loc));
-}
-
-TEST_F(SourceManagerTest, isMainFile) {
-  const char *Source = "int x;";
-
-  std::unique_ptr<llvm::MemoryBuffer> Buf =
-      llvm::MemoryBuffer::getMemBuffer(Source);
-  const FileEntry *SourceFile =
-      FileMgr.getVirtualFile("mainFile.cpp", Buf->getBufferSize(), 0);
-  SourceMgr.overrideFileContents(SourceFile, std::move(Buf));
-
-  std::unique_ptr<llvm::MemoryBuffer> Buf2 =
-      llvm::MemoryBuffer::getMemBuffer(Source);
-  const FileEntry *SecondFile =
-      FileMgr.getVirtualFile("file2.cpp", Buf2->getBufferSize(), 0);
-  SourceMgr.overrideFileContents(SecondFile, std::move(Buf2));
-
-  FileID MainFileID = SourceMgr.getOrCreateFileID(SourceFile, SrcMgr::C_User);
-  SourceMgr.setMainFileID(MainFileID);
-
-  EXPECT_TRUE(SourceMgr.isMainFile(*SourceFile));
-  EXPECT_TRUE(SourceMgr.isMainFile(*SourceFile));
-  EXPECT_FALSE(SourceMgr.isMainFile(*SecondFile));
-}
-
-#endif
-
-} // anonymous namespace
diff --git a/gnu/llvm/clang/unittests/CMakeLists.txt b/gnu/llvm/clang/unittests/CMakeLists.txt
deleted file mode 100644
index 51fe5de9ce6..00000000000
--- a/gnu/llvm/clang/unittests/CMakeLists.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-add_custom_target(ClangUnitTests)
-set_target_properties(ClangUnitTests PROPERTIES FOLDER "Clang tests")
-
-if(CLANG_BUILT_STANDALONE)
-  # LLVMTestingSupport library is needed for some of the unittests.
-  if (EXISTS ${LLVM_MAIN_SRC_DIR}/lib/Testing/Support
-      AND NOT TARGET LLVMTestingSupport)
-    add_subdirectory(${LLVM_MAIN_SRC_DIR}/lib/Testing/Support
-      lib/Testing/Support)
-  endif()
-endif()
-
-# add_clang_unittest(test_dirname file1.cpp file2.cpp)
-#
-# Will compile the list of files together and link against the clang
-# Produces a binary named 'basename(test_dirname)'.
-function(add_clang_unittest test_dirname)
-  add_unittest(ClangUnitTests ${test_dirname} ${ARGN})
-endfunction()
-
-add_subdirectory(Basic)
-add_subdirectory(Lex)
-add_subdirectory(Driver)
-if(CLANG_ENABLE_STATIC_ANALYZER)
-  add_subdirectory(Analysis)
-  add_subdirectory(StaticAnalyzer)
-endif()
-add_subdirectory(ASTMatchers)
-add_subdirectory(AST)
-add_subdirectory(CrossTU)
-add_subdirectory(Tooling)
-add_subdirectory(Introspection)
-add_subdirectory(Format)
-add_subdirectory(Frontend)
-add_subdirectory(Rewrite)
-add_subdirectory(Sema)
-add_subdirectory(CodeGen)
-add_subdirectory(Interpreter)
-# FIXME: libclang unit tests are disabled on Windows due
-# to failures, mostly in libclang.VirtualFileOverlay_*.
-if(NOT WIN32 AND CLANG_TOOL_LIBCLANG_BUILD) 
-  add_subdirectory(libclang)
-endif()
-add_subdirectory(DirectoryWatcher)
-add_subdirectory(Rename)
-add_subdirectory(Index)
-add_subdirectory(Serialization)
diff --git a/gnu/llvm/clang/unittests/CodeGen/BufferSourceTest.cpp b/gnu/llvm/clang/unittests/CodeGen/BufferSourceTest.cpp
deleted file mode 100644
index 3ed688a7218..00000000000
--- a/gnu/llvm/clang/unittests/CodeGen/BufferSourceTest.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-//===- unittests/CodeGen/BufferSourceTest.cpp - MemoryBuffer source tests -===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "TestCompiler.h"
-
-#include "clang/AST/ASTContext.h"
-#include "clang/AST/RecursiveASTVisitor.h"
-#include "clang/Basic/TargetInfo.h"
-#include "clang/CodeGen/ModuleBuilder.h"
-#include "clang/Frontend/CompilerInstance.h"
-#include "clang/Lex/Preprocessor.h"
-#include "clang/Parse/ParseAST.h"
-#include "clang/Sema/Sema.h"
-#include "llvm/ADT/Triple.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/Support/Host.h"
-#include "llvm/Support/MemoryBuffer.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-using namespace clang;
-
-namespace {
-
-TEST(BufferSourceTest, EmitCXXGlobalInitFunc) {
-  // Emitting constructors for global objects involves looking
-  // at the source file name. This makes sure that we don't crash
-  // if the source file is a memory buffer.
-  const char TestProgram[] =
-    "class EmitCXXGlobalInitFunc    "
-    "{                              "
-    "public:                        "
-    "   EmitCXXGlobalInitFunc() {}  "
-    "};                             "
-    "EmitCXXGlobalInitFunc test;    ";
-
-  clang::LangOptions LO;
-  LO.CPlusPlus = 1;
-  LO.CPlusPlus11 = 1;
-  TestCompiler Compiler(LO);
-  Compiler.init(TestProgram);
-
-  clang::ParseAST(Compiler.compiler.getSema(), false, false);
-}
-
-} // end anonymous namespace
diff --git a/gnu/llvm/clang/unittests/CodeGen/CMakeLists.txt b/gnu/llvm/clang/unittests/CodeGen/CMakeLists.txt
deleted file mode 100644
index a9a7b7a1cba..00000000000
--- a/gnu/llvm/clang/unittests/CodeGen/CMakeLists.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  Core
-  Support
-  )
-
-add_clang_unittest(ClangCodeGenTests
-  BufferSourceTest.cpp
-  CodeGenExternalTest.cpp
-  TBAAMetadataTest.cpp
-  CheckTargetFeaturesTest.cpp
-  )
-
-clang_target_link_libraries(ClangCodeGenTests
-  PRIVATE
-  clangAST
-  clangBasic
-  clangCodeGen
-  clangFrontend
-  clangInterpreter
-  clangLex
-  clangParse
-  clangSerialization
-  )
diff --git a/gnu/llvm/clang/unittests/CodeGen/CheckTargetFeaturesTest.cpp b/gnu/llvm/clang/unittests/CodeGen/CheckTargetFeaturesTest.cpp
deleted file mode 100644
index 160b387338d..00000000000
--- a/gnu/llvm/clang/unittests/CodeGen/CheckTargetFeaturesTest.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-#include "../lib/CodeGen/CodeGenFunction.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-
-// These tests are to Check whether CodeGen::TargetFeatures works correctly.
-TEST(CheckTargetFeaturesTest, checkBuiltinFeatures) {
-  auto doCheck = [](StringRef BuiltinFeatures, StringRef FuncFeatures) {
-    SmallVector<StringRef, 1> Features;
-    FuncFeatures.split(Features, ',');
-    StringMap<bool> SM;
-    for (StringRef F : Features)
-      SM.insert(std::make_pair(F, true));
-    clang::CodeGen::TargetFeatures TF(SM);
-    return TF.hasRequiredFeatures(BuiltinFeatures);
-  };
-  // Make sure the basic function ',' and '|' works correctly
-  ASSERT_FALSE(doCheck("A,B,C,D", "A"));
-  ASSERT_TRUE(doCheck("A,B,C,D", "A,B,C,D"));
-  ASSERT_TRUE(doCheck("A|B", "A"));
-  ASSERT_FALSE(doCheck("A|B", "C"));
-
-  // Make sure the ',' has higher priority.
-  ASSERT_TRUE(doCheck("A|B,C|D", "A"));
-
-  // Make sure the parentheses do change the priority of '|'.
-  ASSERT_FALSE(doCheck("(A|B),(C|D)", "A"));
-  ASSERT_TRUE(doCheck("(A|B),(C|D)", "A,C"));
-
-  // Make sure the combination in parentheses works correctly.
-  ASSERT_FALSE(doCheck("(A,B|C),D", "A,C"));
-  ASSERT_FALSE(doCheck("(A,B|C),D", "A,D"));
-  ASSERT_TRUE(doCheck("(A,B|C),D", "C,D"));
-  ASSERT_TRUE(doCheck("(A,B|C),D", "A,B,D"));
-
-  // Make sure nested parentheses works correctly.
-  ASSERT_FALSE(doCheck("(A,(B|C)),D", "C,D"));
-  ASSERT_TRUE(doCheck("(A,(B|C)),D", "A,C,D"));
-}
diff --git a/gnu/llvm/clang/unittests/CodeGen/CodeGenExternalTest.cpp b/gnu/llvm/clang/unittests/CodeGen/CodeGenExternalTest.cpp
deleted file mode 100644
index 4358a9f285b..00000000000
--- a/gnu/llvm/clang/unittests/CodeGen/CodeGenExternalTest.cpp
+++ /dev/null
@@ -1,276 +0,0 @@
-//===- unittests/CodeGen/CodeGenExternalTest.cpp - test external CodeGen -===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "TestCompiler.h"
-
-#include "clang/AST/ASTConsumer.h"
-#include "clang/AST/ASTContext.h"
-#include "clang/AST/GlobalDecl.h"
-#include "clang/AST/RecursiveASTVisitor.h"
-#include "clang/Basic/TargetInfo.h"
-#include "clang/CodeGen/CodeGenABITypes.h"
-#include "clang/CodeGen/ModuleBuilder.h"
-#include "clang/Frontend/CompilerInstance.h"
-#include "clang/Lex/Preprocessor.h"
-#include "clang/Parse/ParseAST.h"
-#include "clang/Sema/Sema.h"
-#include "llvm/ADT/Triple.h"
-#include "llvm/IR/Instructions.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/Support/Debug.h"
-#include "llvm/Support/Host.h"
-#include "llvm/Support/MemoryBuffer.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-using namespace clang;
-
-namespace {
-
-// Mocks up a language using Clang code generation as a library and
-// tests some basic functionality there.
-//   - CodeGen->GetAddrOfGlobal
-//   - CodeGen::convertTypeForMemory
-//   - CodeGen::getLLVMFieldNumber
-
-static const bool DebugThisTest = false;
-
-// forward declarations
-struct MyASTConsumer;
-static void test_codegen_fns(MyASTConsumer *my);
-static bool test_codegen_fns_ran;
-
-// This forwards the calls to the Clang CodeGenerator
-// so that we can test CodeGen functions while it is open.
-// It accumulates toplevel decls in HandleTopLevelDecl and
-// calls test_codegen_fns() in HandleTranslationUnit
-// before forwarding that function to the CodeGenerator.
-
-struct MyASTConsumer : public ASTConsumer {
-  std::unique_ptr<CodeGenerator> Builder;
-  std::vector<Decl*> toplevel_decls;
-
-  MyASTConsumer(std::unique_ptr<CodeGenerator> Builder_in)
-    : ASTConsumer(), Builder(std::move(Builder_in))
-  {
-  }
-
-  ~MyASTConsumer() { }
-
-  void Initialize(ASTContext &Context) override;
-  void HandleCXXStaticMemberVarInstantiation(VarDecl *VD) override;
-  bool HandleTopLevelDecl(DeclGroupRef D) override;
-  void HandleInlineFunctionDefinition(FunctionDecl *D) override;
-  void HandleInterestingDecl(DeclGroupRef D) override;
-  void HandleTranslationUnit(ASTContext &Ctx) override;
-  void HandleTagDeclDefinition(TagDecl *D) override;
-  void HandleTagDeclRequiredDefinition(const TagDecl *D) override;
-  void HandleCXXImplicitFunctionInstantiation(FunctionDecl *D) override;
-  void HandleTopLevelDeclInObjCContainer(DeclGroupRef D) override;
-  void HandleImplicitImportDecl(ImportDecl *D) override;
-  void CompleteTentativeDefinition(VarDecl *D) override;
-  void AssignInheritanceModel(CXXRecordDecl *RD) override;
-  void HandleVTable(CXXRecordDecl *RD) override;
-  ASTMutationListener *GetASTMutationListener() override;
-  ASTDeserializationListener *GetASTDeserializationListener() override;
-  void PrintStats() override;
-  bool shouldSkipFunctionBody(Decl *D) override;
-};
-
-void MyASTConsumer::Initialize(ASTContext &Context) {
-  Builder->Initialize(Context);
-}
-
-bool MyASTConsumer::HandleTopLevelDecl(DeclGroupRef DG) {
-
-  for (DeclGroupRef::iterator I = DG.begin(), E = DG.end(); I != E; ++I) {
-    toplevel_decls.push_back(*I);
-  }
-
-  return Builder->HandleTopLevelDecl(DG);
-}
-
-void MyASTConsumer::HandleInlineFunctionDefinition(FunctionDecl *D) {
-  Builder->HandleInlineFunctionDefinition(D);
-}
-
-void MyASTConsumer::HandleInterestingDecl(DeclGroupRef D) {
-  Builder->HandleInterestingDecl(D);
-}
-
-void MyASTConsumer::HandleTranslationUnit(ASTContext &Context) {
-  test_codegen_fns(this);
-  // HandleTranslationUnit can close the module
-  Builder->HandleTranslationUnit(Context);
-}
-
-void MyASTConsumer::HandleTagDeclDefinition(TagDecl *D) {
-  Builder->HandleTagDeclDefinition(D);
-}
-
-void MyASTConsumer::HandleTagDeclRequiredDefinition(const TagDecl *D) {
-  Builder->HandleTagDeclRequiredDefinition(D);
-}
-
-void MyASTConsumer::HandleCXXImplicitFunctionInstantiation(FunctionDecl *D) {
-  Builder->HandleCXXImplicitFunctionInstantiation(D);
-}
-
-void MyASTConsumer::HandleTopLevelDeclInObjCContainer(DeclGroupRef D) {
-  Builder->HandleTopLevelDeclInObjCContainer(D);
-}
-
-void MyASTConsumer::HandleImplicitImportDecl(ImportDecl *D) {
-  Builder->HandleImplicitImportDecl(D);
-}
-
-void MyASTConsumer::CompleteTentativeDefinition(VarDecl *D) {
-  Builder->CompleteTentativeDefinition(D);
-}
-
-void MyASTConsumer::AssignInheritanceModel(CXXRecordDecl *RD) {
-  Builder->AssignInheritanceModel(RD);
-}
-
-void MyASTConsumer::HandleCXXStaticMemberVarInstantiation(VarDecl *VD) {
-   Builder->HandleCXXStaticMemberVarInstantiation(VD);
-}
-
-void MyASTConsumer::HandleVTable(CXXRecordDecl *RD) {
-   Builder->HandleVTable(RD);
- }
-
-ASTMutationListener *MyASTConsumer::GetASTMutationListener() {
-  return Builder->GetASTMutationListener();
-}
-
-ASTDeserializationListener *MyASTConsumer::GetASTDeserializationListener() {
-  return Builder->GetASTDeserializationListener();
-}
-
-void MyASTConsumer::PrintStats() {
-  Builder->PrintStats();
-}
-
-bool MyASTConsumer::shouldSkipFunctionBody(Decl *D) {
-  return Builder->shouldSkipFunctionBody(D);
-}
-
-const char TestProgram[] =
-    "struct mytest_struct { char x; short y; char p; long z; };\n"
-    "int mytest_fn(int x) { return x; }\n";
-
-// This function has the real test code here
-static void test_codegen_fns(MyASTConsumer *my) {
-
-  bool mytest_fn_ok = false;
-  bool mytest_struct_ok = false;
-
-  CodeGen::CodeGenModule &CGM = my->Builder->CGM();
-
-  for (auto decl : my->toplevel_decls ) {
-    if (FunctionDecl *fd = dyn_cast<FunctionDecl>(decl)) {
-      if (fd->getName() == "mytest_fn") {
-        Constant *c = my->Builder->GetAddrOfGlobal(GlobalDecl(fd), false);
-        // Verify that we got a function.
-        ASSERT_TRUE(c != NULL);
-        if (DebugThisTest) {
-          c->print(dbgs(), true);
-          dbgs() << "\n";
-        }
-        mytest_fn_ok = true;
-      }
-    } else if(clang::RecordDecl *rd = dyn_cast<RecordDecl>(decl)) {
-      if (rd->getName() == "mytest_struct") {
-        RecordDecl *def = rd->getDefinition();
-        ASSERT_TRUE(def != NULL);
-        const clang::Type *clangTy = rd->getCanonicalDecl()->getTypeForDecl();
-        ASSERT_TRUE(clangTy != NULL);
-        QualType qType = clangTy->getCanonicalTypeInternal();
-
-        // Check convertTypeForMemory
-        llvm::Type *llvmTy = CodeGen::convertTypeForMemory(CGM, qType);
-        ASSERT_TRUE(llvmTy != NULL);
-        if (DebugThisTest) {
-          llvmTy->print(dbgs(), true);
-          dbgs() << "\n";
-        }
-
-        auto* structTy = dyn_cast<llvm::StructType>(llvmTy);
-        ASSERT_TRUE(structTy != NULL);
-
-        // Check getLLVMFieldNumber
-        FieldDecl *xField = NULL;
-        FieldDecl *yField = NULL;
-        FieldDecl *zField = NULL;
-
-        for (auto field : rd->fields()) {
-          if (field->getName() == "x") xField = field;
-          if (field->getName() == "y") yField = field;
-          if (field->getName() == "z") zField = field;
-        }
-
-        ASSERT_TRUE(xField != NULL);
-        ASSERT_TRUE(yField != NULL);
-        ASSERT_TRUE(zField != NULL);
-
-        unsigned x = CodeGen::getLLVMFieldNumber(CGM, rd, xField);
-        unsigned y = CodeGen::getLLVMFieldNumber(CGM, rd, yField);
-        unsigned z = CodeGen::getLLVMFieldNumber(CGM, rd, zField);
-
-        ASSERT_NE(x, y);
-        ASSERT_NE(y, z);
-
-        llvm::Type* xTy = structTy->getTypeAtIndex(x);
-        llvm::Type* yTy = structTy->getTypeAtIndex(y);
-        llvm::Type* zTy = structTy->getTypeAtIndex(z);
-
-        ASSERT_TRUE(xTy != NULL);
-        ASSERT_TRUE(yTy != NULL);
-        ASSERT_TRUE(zTy != NULL);
-
-        if (DebugThisTest) {
-          xTy->print(dbgs(), true);
-          dbgs() << "\n";
-          yTy->print(dbgs(), true);
-          dbgs() << "\n";
-          zTy->print(dbgs(), true);
-          dbgs() << "\n";
-        }
-
-        ASSERT_GE(xTy->getPrimitiveSizeInBits(), 1u);
-        ASSERT_GE(yTy->getPrimitiveSizeInBits(), 16u); // short is at least 16b
-        ASSERT_GE(zTy->getPrimitiveSizeInBits(), 32u); // long is at least 32b
-
-        mytest_struct_ok = true;
-      }
-    }
-  }
-
-  ASSERT_TRUE(mytest_fn_ok);
-  ASSERT_TRUE(mytest_struct_ok);
-
-  test_codegen_fns_ran = true;
-}
-
-TEST(CodeGenExternalTest, CodeGenExternalTest) {
-  clang::LangOptions LO;
-  LO.CPlusPlus = 1;
-  LO.CPlusPlus11 = 1;
-  TestCompiler Compiler(LO);
-  auto CustomASTConsumer
-    = std::make_unique<MyASTConsumer>(std::move(Compiler.CG));
-
-  Compiler.init(TestProgram, std::move(CustomASTConsumer));
-
-  clang::ParseAST(Compiler.compiler.getSema(), false, false);
-
-  ASSERT_TRUE(test_codegen_fns_ran);
-}
-
-} // end anonymous namespace
diff --git a/gnu/llvm/clang/unittests/CodeGen/IRMatchers.h b/gnu/llvm/clang/unittests/CodeGen/IRMatchers.h
deleted file mode 100644
index 47e42049803..00000000000
--- a/gnu/llvm/clang/unittests/CodeGen/IRMatchers.h
+++ /dev/null
@@ -1,451 +0,0 @@
-//=== unittests/CodeGen/IRMatchers.h - Match on the LLVM IR -----*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-/// \file
-/// This file provides a simple mechanism for performing search operations over
-/// IR including metadata and types. It allows writing complex search patterns
-/// using understandable syntax. For instance, the code:
-///
-/// \code
-///       const BasicBlock *BB = ...
-///       const Instruction *I = match(BB,
-///           MInstruction(Instruction::Store,
-///               MConstInt(4, 8),
-///               MMTuple(
-///                   MMTuple(
-///                       MMString("omnipotent char"),
-///                       MMTuple(
-///                           MMString("Simple C/C++ TBAA")),
-///                       MConstInt(0, 64)),
-///                   MSameAs(0),
-///                   MConstInt(0))));
-/// \endcode
-///
-/// searches the basic block BB for the 'store' instruction, first argument of
-/// which is 'i8 4', and the attached metadata has an item described by the
-/// given tree.
-//===----------------------------------------------------------------------===//
-
-#ifndef CLANG_UNITTESTS_CODEGEN_IRMATCHERS_H
-#define CLANG_UNITTESTS_CODEGEN_IRMATCHERS_H
-
-#include "llvm/ADT/PointerUnion.h"
-#include "llvm/IR/BasicBlock.h"
-#include "llvm/IR/Constants.h"
-#include "llvm/IR/Instruction.h"
-#include "llvm/IR/Metadata.h"
-#include "llvm/IR/Value.h"
-
-namespace llvm {
-
-/// Keeps information about pending match queries.
-///
-/// This class stores state of all unfinished match actions. It allows to
-/// use queries like "this operand is the same as n-th operand", which are
-/// hard to implement otherwise.
-///
-class MatcherContext {
-public:
-
-  /// Describes pending match query.
-  ///
-  /// The query is represented by the current entity being investigated (type,
-  /// value or metadata). If the entity is a member of a list (like arguments),
-  /// the query also keeps the entity number in that list.
-  ///
-  class Query {
-    PointerUnion<const Value *, const Metadata *, const Type *> Entity;
-    unsigned OperandNo;
-
-  public:
-    Query(const Value *V, unsigned N) : Entity(V), OperandNo(N) {}
-    Query(const Metadata *M, unsigned N) : Entity(M), OperandNo(N) {}
-    Query(const Type *T, unsigned N) : Entity(T), OperandNo(N) {}
-
-    template<typename T>
-    const T *get() const {
-      return Entity.dyn_cast<const T *>();
-    }
-
-    unsigned getOperandNo() const { return OperandNo; }
-  };
-
-  template<typename T>
-  void push(const T *V, unsigned N = ~0) {
-    MatchStack.push_back(Query(V, N));
-  }
-
-  void pop() { MatchStack.pop_back(); }
-
-  template<typename T>
-  const T *top() const { return MatchStack.back().get<T>(); }
-
-  size_t size() const { return MatchStack.size(); }
-
-  unsigned getOperandNo() const { return MatchStack.back().getOperandNo(); }
-
-  /// Returns match query at the given offset from the top of queries.
-  ///
-  /// Offset 0 corresponds to the topmost query.
-  ///
-  const Query &getQuery(unsigned Offset) const {
-    assert(MatchStack.size() > Offset);
-    return MatchStack[MatchStack.size() - 1 - Offset];
-  }
-
-private:
-  SmallVector<Query, 8> MatchStack;
-};
-
-
-/// Base of all matcher classes.
-///
-class Matcher {
-public:
-  virtual ~Matcher() {}
-
-  /// Returns true if the entity on the top of the specified context satisfies
-  /// the matcher condition.
-  ///
-  virtual bool match(MatcherContext &MC) = 0;
-};
-
-
-/// Base class of matchers that test particular entity.
-///
-template<typename T>
-class EntityMatcher : public Matcher {
-public:
-  bool match(MatcherContext &MC) override {
-    if (auto V = MC.top<T>())
-      return matchEntity(*V, MC);
-    return false;
-  }
-  virtual bool matchEntity(const T &M, MatcherContext &C) = 0;
-};
-
-
-/// Matcher that matches any entity of the specified kind.
-///
-template<typename T>
-class AnyMatcher : public EntityMatcher<T> {
-public:
-  bool matchEntity(const T &M, MatcherContext &C) override { return true; }
-};
-
-
-/// Matcher that tests if the current entity satisfies the specified
-/// condition.
-///
-template<typename T>
-class CondMatcher : public EntityMatcher<T> {
-  std::function<bool(const T &)> Condition;
-public:
-  CondMatcher(std::function<bool(const T &)> C) : Condition(C) {}
-  bool matchEntity(const T &V, MatcherContext &C) override {
-    return Condition(V);
-  }
-};
-
-
-/// Matcher that save pointer to the entity that satisfies condition of the
-// specified matcher.
-///
-template<typename T>
-class SavingMatcher : public EntityMatcher<T> {
-  const T *&Var;
-  std::shared_ptr<Matcher> Next;
-public:
-  SavingMatcher(const T *&V, std::shared_ptr<Matcher> N) : Var(V), Next(N) {}
-  bool matchEntity(const T &V, MatcherContext &C) override {
-    bool Result = Next->match(C);
-    if (Result)
-      Var = &V;
-    return Result;
-  }
-};
-
-
-/// Matcher that checks that the entity is identical to another entity in the
-/// same container.
-///
-class SameAsMatcher : public Matcher {
-  unsigned OpNo;
-public:
-  SameAsMatcher(unsigned N) : OpNo(N) {}
-  bool match(MatcherContext &C) override {
-    if (C.getOperandNo() != ~0U) {
-      // Handle all known containers here.
-      const MatcherContext::Query &StackRec = C.getQuery(1);
-      if (const Metadata *MR = StackRec.get<Metadata>()) {
-        if (const auto *MT = dyn_cast<MDTuple>(MR)) {
-          if (OpNo < MT->getNumOperands())
-            return C.top<Metadata>() == MT->getOperand(OpNo).get();
-          return false;
-        }
-        llvm_unreachable("Unknown metadata container");
-      }
-      if (const Value *VR = StackRec.get<Value>()) {
-        if (const auto *Insn = dyn_cast<Instruction>(VR)) {
-          if (OpNo < Insn->getNumOperands())
-            return C.top<Value>() == Insn->getOperand(OpNo);
-          return false;
-        }
-        llvm_unreachable("Unknown value container");
-      }
-      llvm_unreachable("Unknown type container");
-    }
-    return false;
-  }
-};
-
-
-/// Matcher that tests if the entity is a constant integer.
-///
-class ConstantIntMatcher : public Matcher {
-  uint64_t IntValue;
-  unsigned Width;
-public:
-  ConstantIntMatcher(uint64_t V, unsigned W = 0) : IntValue(V), Width(W) {}
-  bool match(MatcherContext &Ctx) override {
-    if (const Value *V = Ctx.top<Value>()) {
-      if (const auto *CI = dyn_cast<ConstantInt>(V))
-        return (Width == 0 || CI->getBitWidth() == Width) &&
-               CI->getLimitedValue() == IntValue;
-    }
-    if (const Metadata *M = Ctx.top<Metadata>()) {
-      if (const auto *MT = dyn_cast<ValueAsMetadata>(M))
-        if (const auto *C = dyn_cast<ConstantInt>(MT->getValue()))
-          return (Width == 0 || C->getBitWidth() == Width) &&
-                 C->getLimitedValue() == IntValue;
-    }
-    return false;
-  }
-};
-
-
-/// Value matcher tuned to test instructions.
-///
-class InstructionMatcher : public EntityMatcher<Value> {
-  SmallVector<std::shared_ptr<Matcher>, 8> OperandMatchers;
-  std::shared_ptr<EntityMatcher<Metadata>> MetaMatcher = nullptr;
-  unsigned Code;
-public:
-  InstructionMatcher(unsigned C) : Code(C) {}
-
-  void push(std::shared_ptr<EntityMatcher<Metadata>> M) {
-    assert(!MetaMatcher && "Only one metadata matcher may be specified");
-    MetaMatcher = M;
-  }
-  void push(std::shared_ptr<Matcher> V) { OperandMatchers.push_back(V); }
-  template<typename... Args>
-  void push(std::shared_ptr<Matcher> V, Args... A) {
-    push(V);
-    push(A...);
-  }
-
-  virtual bool matchInstruction(const Instruction &I) {
-    return I.getOpcode() == Code;
-  }
-
-  bool matchEntity(const Value &V, MatcherContext &C) override {
-    if (const auto *I = dyn_cast<Instruction>(&V)) {
-      if (!matchInstruction(*I))
-        return false;
-      if (OperandMatchers.size() > I->getNumOperands())
-        return false;
-      for (unsigned N = 0, E = OperandMatchers.size(); N != E; ++N) {
-        C.push(I->getOperand(N), N);
-        if (!OperandMatchers[N]->match(C)) {
-          C.pop();
-          return false;
-        }
-        C.pop();
-      }
-      if (MetaMatcher) {
-        SmallVector<std::pair<unsigned, MDNode *>, 8> MDs;
-        I->getAllMetadata(MDs);
-        bool Found = false;
-        for (auto Item : MDs) {
-          C.push(Item.second);
-          if (MetaMatcher->match(C)) {
-            Found = true;
-            C.pop();
-            break;
-          }
-          C.pop();
-        }
-        return Found;
-      }
-      return true;
-    }
-    return false;
-  }
-};
-
-
-/// Matcher that tests type of the current value using the specified
-/// type matcher.
-///
-class ValueTypeMatcher : public EntityMatcher<Value> {
-  std::shared_ptr<EntityMatcher<Type>> TyM;
-public:
-  ValueTypeMatcher(std::shared_ptr<EntityMatcher<Type>> T) : TyM(T) {}
-  ValueTypeMatcher(const Type *T)
-    : TyM(new CondMatcher<Type>([T](const Type &Ty) -> bool {
-                                  return &Ty == T;
-                                })) {}
-  bool matchEntity(const Value &V, MatcherContext &Ctx) override {
-    Type *Ty = V.getType();
-    Ctx.push(Ty);
-    bool Res = TyM->match(Ctx);
-    Ctx.pop();
-    return Res;
-  }
-};
-
-
-/// Matcher that matches string metadata.
-///
-class NameMetaMatcher : public EntityMatcher<Metadata> {
-  StringRef Name;
-public:
-  NameMetaMatcher(StringRef N) : Name(N) {}
-  bool matchEntity(const Metadata &M, MatcherContext &C) override {
-    if (auto *MDS = dyn_cast<MDString>(&M))
-      return MDS->getString().equals(Name);
-    return false;
-  }
-};
-
-
-/// Matcher that matches metadata tuples.
-///
-class MTupleMatcher : public EntityMatcher<Metadata> {
-  SmallVector<std::shared_ptr<Matcher>, 4> Operands;
-public:
-  void push(std::shared_ptr<Matcher> M) { Operands.push_back(M); }
-  template<typename... Args>
-  void push(std::shared_ptr<Matcher> M, Args... A) {
-    push(M);
-    push(A...);
-  }
-  bool matchEntity(const Metadata &M, MatcherContext &C) override {
-    if (const auto *MT = dyn_cast<MDTuple>(&M)) {
-      if (MT->getNumOperands() != Operands.size())
-        return false;
-      for (unsigned I = 0, E = MT->getNumOperands(); I != E; ++I) {
-        const MDOperand &Op = MT->getOperand(I);
-        C.push(Op.get(), I);
-        if (!Operands[I]->match(C)) {
-          C.pop();
-          return false;
-        }
-        C.pop();
-      }
-      return true;
-    }
-    return false;
-  }
-};
-
-
-// Helper function used to construct matchers.
-
-inline std::shared_ptr<Matcher> MSameAs(unsigned N) {
-  return std::shared_ptr<Matcher>(new SameAsMatcher(N));
-}
-
-template<typename... T>
-std::shared_ptr<InstructionMatcher> MInstruction(unsigned C, T... Args) {
-  auto Result = new InstructionMatcher(C);
-  Result->push(Args...);
-  return std::shared_ptr<InstructionMatcher>(Result);
-}
-
-inline std::shared_ptr<Matcher> MConstInt(uint64_t V, unsigned W = 0) {
-  return std::shared_ptr<Matcher>(new ConstantIntMatcher(V, W));
-}
-
-inline std::shared_ptr<EntityMatcher<Value>>
-MValType(std::shared_ptr<EntityMatcher<Type>> T) {
-  return std::shared_ptr<EntityMatcher<Value>>(new ValueTypeMatcher(T));
-}
-
-inline std::shared_ptr<EntityMatcher<Value>> MValType(const Type *T) {
-  return std::shared_ptr<EntityMatcher<Value>>(new ValueTypeMatcher(T));
-}
-
-inline std::shared_ptr<EntityMatcher<Type>>
-MType(std::function<bool(const Type &)> C) {
-  return std::shared_ptr<EntityMatcher<Type>>(new CondMatcher<Type>(C));
-}
-
-inline std::shared_ptr<EntityMatcher<Metadata>> MMAny() {
-  return std::shared_ptr<EntityMatcher<Metadata>>(new AnyMatcher<Metadata>);
-}
-
-inline std::shared_ptr<EntityMatcher<Metadata>>
-MMSave(const Metadata *&V, std::shared_ptr<EntityMatcher<Metadata>> M) {
-  return std::shared_ptr<EntityMatcher<Metadata>>(
-      new SavingMatcher<Metadata>(V, M));
-}
-
-inline std::shared_ptr<EntityMatcher<Metadata>> MMString(const char *Name) {
-  return std::shared_ptr<EntityMatcher<Metadata>>(new NameMetaMatcher(Name));
-}
-
-template<typename... T>
-std::shared_ptr<EntityMatcher<Metadata>> MMTuple(T... Args) {
-  auto Res = new MTupleMatcher();
-  Res->push(Args...);
-  return std::shared_ptr<EntityMatcher<Metadata>>(Res);
-}
-
-
-/// Looks for the instruction that satisfies condition of the specified
-/// matcher inside the given basic block.
-/// \returns Pointer to the found instruction or nullptr if such instruction
-///          was not found.
-///
-inline const Instruction *match(const BasicBlock *BB,
-                                std::shared_ptr<Matcher> M) {
-  MatcherContext MC;
-  for (const auto &I : *BB) {
-    MC.push(&I);
-    if (M->match(MC))
-      return &I;
-    MC.pop();
-  }
-  assert(MC.size() == 0);
-  return nullptr;
-}
-
-/// Looks for the instruction that satisfies condition of the specified
-/// matcher starting from the specified instruction inside the same basic block.
-///
-/// The given instruction is not checked.
-///
-inline const Instruction *matchNext(const Instruction *I, std::shared_ptr<Matcher> M) {
-  if (!I)
-    return nullptr;
-  MatcherContext MC;
-  const BasicBlock *BB = I->getParent();
-  if (!BB)
-    return nullptr;
-  for (auto P = ++BasicBlock::const_iterator(I), E = BB->end(); P != E; ++P) {
-    MC.push(&*P);
-    if (M->match(MC))
-      return &*P;
-    MC.pop();
-  }
-  assert(MC.size() == 0);
-  return nullptr;
-}
-
-}
-#endif
diff --git a/gnu/llvm/clang/unittests/CodeGen/TBAAMetadataTest.cpp b/gnu/llvm/clang/unittests/CodeGen/TBAAMetadataTest.cpp
deleted file mode 100644
index 149a8e074b6..00000000000
--- a/gnu/llvm/clang/unittests/CodeGen/TBAAMetadataTest.cpp
+++ /dev/null
@@ -1,1242 +0,0 @@
-//=== unittests/CodeGen/TBAAMetadataTest.cpp - Checks metadata generation -===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "IRMatchers.h"
-#include "TestCompiler.h"
-#include "clang/AST/ASTConsumer.h"
-#include "clang/AST/ASTContext.h"
-#include "clang/Basic/SourceManager.h"
-#include "clang/Basic/TargetInfo.h"
-#include "llvm/IR/Constants.h"
-#include "llvm/Support/MemoryBuffer.h"
-#include "gtest/gtest.h"
-#include <memory>
-
-using namespace llvm;
-
-namespace {
-
-struct TBAATestCompiler : public TestCompiler {
-  TBAATestCompiler(clang::LangOptions LO, clang::CodeGenOptions CGO)
-    : TestCompiler(LO, CGO) {}
-  static clang::CodeGenOptions getCommonCodeGenOpts() {
-    clang::CodeGenOptions CGOpts;
-    CGOpts.StructPathTBAA = 1;
-    CGOpts.OptimizationLevel = 1;
-    return CGOpts;
-  }
-};
-
-auto OmnipotentCharC = MMTuple(
-  MMString("omnipotent char"),
-  MMTuple(
-    MMString("Simple C/C++ TBAA")),
-  MConstInt(0, 64)
-);
-
-
-auto OmnipotentCharCXX = MMTuple(
-  MMString("omnipotent char"),
-  MMTuple(
-    MMString("Simple C++ TBAA")),
-  MConstInt(0, 64)
-);
-
-
-TEST(TBAAMetadataTest, BasicTypes) {
-  const char TestProgram[] = R"**(
-    void func(char *CP, short *SP, int *IP, long long *LP, void **VPP,
-              int **IPP) {
-      *CP = 4;
-      *SP = 11;
-      *IP = 601;
-      *LP = 604;
-      *VPP = CP;
-      *IPP = IP;
-    }
-  )**";
-
-  clang::LangOptions LO;
-  TBAATestCompiler Compiler(LO, TBAATestCompiler::getCommonCodeGenOpts());
-  Compiler.init(TestProgram);
-  const BasicBlock *BB = Compiler.compile();
-
-  const Instruction *I = match(BB,
-      MInstruction(Instruction::Store,
-        MConstInt(4, 8),
-        MMTuple(
-          OmnipotentCharC,
-          MSameAs(0),
-          MConstInt(0))));
-  ASSERT_TRUE(I);
-
-  I = matchNext(I,
-      MInstruction(Instruction::Store,
-        MConstInt(11, 16),
-        MMTuple(
-          MMTuple(
-            MMString("short"),
-            OmnipotentCharC,
-            MConstInt(0)),
-          MSameAs(0),
-          MConstInt(0))));
-  ASSERT_TRUE(I);
-
-  I = matchNext(I,
-      MInstruction(Instruction::Store,
-        MConstInt(601, 32),
-        MMTuple(
-          MMTuple(
-            MMString("int"),
-            OmnipotentCharC,
-            MConstInt(0)),
-          MSameAs(0),
-          MConstInt(0))));
-  ASSERT_TRUE(I);
-
-  I = matchNext(I,
-      MInstruction(Instruction::Store,
-        MConstInt(604, 64),
-        MMTuple(
-          MMTuple(
-            MMString("long long"),
-            OmnipotentCharC,
-            MConstInt(0)),
-          MSameAs(0),
-          MConstInt(0))));
-  ASSERT_TRUE(I);
-
-  I = matchNext(I,
-      MInstruction(Instruction::Store,
-        MValType(Type::getInt8PtrTy(Compiler.Context)),
-        MMTuple(
-          MMTuple(
-            MMString("any pointer"),
-            OmnipotentCharC,
-            MConstInt(0)),
-          MSameAs(0),
-          MConstInt(0))));
-  ASSERT_TRUE(I);
-
-  I = matchNext(I,
-      MInstruction(Instruction::Store,
-        MValType(Type::getInt32PtrTy(Compiler.Context)),
-        MMTuple(
-          MMTuple(
-            MMString("any pointer"),
-            OmnipotentCharC,
-            MConstInt(0)),
-          MSameAs(0),
-          MConstInt(0))));
-  ASSERT_TRUE(I);
-}
-
-TEST(TBAAMetadataTest, CFields) {
-  const char TestProgram[] = R"**(
-    struct ABC {
-       short f16;
-       int f32;
-       long long f64;
-       unsigned short f16_2;
-       unsigned f32_2;
-       unsigned long long f64_2;
-    };
-
-    void func(struct ABC *A) {
-      A->f32 = 4;
-      A->f16 = 11;
-      A->f64 = 601;
-      A->f16_2 = 22;
-      A->f32_2 = 77;
-      A->f64_2 = 604;
-    }
-  )**";
-
-  clang::LangOptions LO;
-  LO.C11 = 1;
-  TBAATestCompiler Compiler(LO, TBAATestCompiler::getCommonCodeGenOpts());
-  Compiler.init(TestProgram);
-  const BasicBlock *BB = Compiler.compile();
-
-  auto StructABC = MMTuple(
-    MMString("ABC"),
-    MMTuple(
-      MMString("short"),
-      OmnipotentCharC,
-      MConstInt(0)),
-    MConstInt(0),
-    MMTuple(
-      MMString("int"),
-      OmnipotentCharC,
-      MConstInt(0)),
-    MConstInt(4),
-    MMTuple(
-      MMString("long long"),
-      OmnipotentCharC,
-      MConstInt(0)),
-    MConstInt(8),
-    MSameAs(1),
-    MConstInt(16),
-    MSameAs(3),
-    MConstInt(20),
-    MSameAs(5),
-    MConstInt(24));
-
-  const Instruction *I = match(BB,
-      MInstruction(Instruction::Store,
-        MConstInt(4, 32),
-        MMTuple(
-          StructABC,
-          MMTuple(
-            MMString("int"),
-            OmnipotentCharC,
-            MConstInt(0)),
-          MConstInt(4))));
-  ASSERT_TRUE(I);
-
-  I = matchNext(I,
-      MInstruction(Instruction::Store,
-        MConstInt(11, 16),
-        MMTuple(
-          StructABC,
-          MMTuple(
-            MMString("short"),
-            OmnipotentCharC,
-            MConstInt(0)),
-          MConstInt(0))));
-  ASSERT_TRUE(I);
-
-  I = matchNext(I,
-      MInstruction(Instruction::Store,
-        MConstInt(601, 64),
-        MMTuple(
-          StructABC,
-          MMTuple(
-            MMString("long long"),
-            OmnipotentCharC,
-            MConstInt(0)),
-          MConstInt(8))));
-  ASSERT_TRUE(I);
-
-  I = matchNext(I,
-      MInstruction(Instruction::Store,
-        MConstInt(22, 16),
-        MMTuple(
-          StructABC,
-          MMTuple(
-            MMString("short"),
-            OmnipotentCharC,
-            MConstInt(0)),
-          MConstInt(16))));
-  ASSERT_TRUE(I);
-
-  I = matchNext(I,
-      MInstruction(Instruction::Store,
-        MConstInt(77, 32),
-        MMTuple(
-          StructABC,
-          MMTuple(
-            MMString("int"),
-            OmnipotentCharC,
-            MConstInt(0)),
-          MConstInt(20))));
-  ASSERT_TRUE(I);
-
-  I = matchNext(I,
-      MInstruction(Instruction::Store,
-        MConstInt(604, 64),
-        MMTuple(
-          StructABC,
-          MMTuple(
-            MMString("long long"),
-            OmnipotentCharC,
-            MConstInt(0)),
-          MConstInt(24))));
-  ASSERT_TRUE(I);
-}
-
-TEST(TBAAMetadataTest, CTypedefFields) {
-  const char TestProgram[] = R"**(
-    typedef struct {
-       short f16;
-       int f32;
-    } ABC;
-    typedef struct {
-       short value_f16;
-       int value_f32;
-    } CDE;
-
-    void func(ABC *A, CDE *B) {
-      A->f32 = 4;
-      A->f16 = 11;
-      B->value_f32 = 44;
-      B->value_f16 = 111;
-    }
-  )**";
-
-  clang::LangOptions LO;
-  LO.C11 = 1;
-  TBAATestCompiler Compiler(LO, TBAATestCompiler::getCommonCodeGenOpts());
-  Compiler.init(TestProgram);
-  const BasicBlock *BB = Compiler.compile();
-
-  auto NamelessStruct = MMTuple(
-    MMString(""),
-    MMTuple(
-      MMString("short"),
-      OmnipotentCharC,
-      MConstInt(0)),
-    MConstInt(0),
-    MMTuple(
-      MMString("int"),
-      OmnipotentCharC,
-      MConstInt(0)),
-    MConstInt(4));
-
-  const Metadata *MetaABC = nullptr;
-  const Instruction *I = match(BB,
-      MInstruction(Instruction::Store,
-        MConstInt(4, 32),
-        MMTuple(
-          MMSave(MetaABC, NamelessStruct),
-          MMTuple(
-            MMString("int"),
-            OmnipotentCharC,
-            MConstInt(0)),
-          MConstInt(4))));
-  ASSERT_TRUE(I);
-
-  I = matchNext(I,
-      MInstruction(Instruction::Store,
-        MConstInt(11, 16),
-        MMTuple(
-          NamelessStruct,
-          MMTuple(
-            MMString("short"),
-            OmnipotentCharC,
-            MConstInt(0)),
-          MConstInt(0))));
-  ASSERT_TRUE(I);
-
-  const Metadata *MetaCDE = nullptr;
-  I = matchNext(I,
-      MInstruction(Instruction::Store,
-        MConstInt(44, 32),
-        MMTuple(
-          MMSave(MetaCDE, NamelessStruct),
-          MMTuple(
-            MMString("int"),
-            OmnipotentCharC,
-            MConstInt(0)),
-          MConstInt(4))));
-  ASSERT_TRUE(I);
-
-  I = matchNext(I,
-      MInstruction(Instruction::Store,
-        MConstInt(111, 16),
-        MMTuple(
-          NamelessStruct,
-          MMTuple(
-            MMString("short"),
-            OmnipotentCharC,
-            MConstInt(0)),
-          MConstInt(0))));
-  ASSERT_TRUE(I);
-
-  // FIXME: Nameless structures used in definitions of 'ABC' and 'CDE' are
-  // different structures and must be described by different descriptors.
-  //ASSERT_TRUE(MetaABC != MetaCDE);
-}
-
-TEST(TBAAMetadataTest, CTypedefFields2) {
-  const char TestProgram[] = R"**(
-    typedef struct {
-       short f16;
-       int f32;
-    } ABC;
-    typedef struct {
-       short f16;
-       int f32;
-    } CDE;
-
-    void func(ABC *A, CDE *B) {
-      A->f32 = 4;
-      A->f16 = 11;
-      B->f32 = 44;
-      B->f16 = 111;
-    }
-  )**";
-
-  clang::LangOptions LO;
-  LO.C11 = 1;
-  TBAATestCompiler Compiler(LO, TBAATestCompiler::getCommonCodeGenOpts());
-  Compiler.init(TestProgram);
-  const BasicBlock *BB = Compiler.compile();
-
-  auto NamelessStruct = MMTuple(
-    MMString(""),
-    MMTuple(
-      MMString("short"),
-      OmnipotentCharC,
-      MConstInt(0)),
-    MConstInt(0),
-    MMTuple(
-      MMString("int"),
-      OmnipotentCharC,
-      MConstInt(0)),
-    MConstInt(4));
-
-  const Metadata *MetaABC = nullptr;
-  const Instruction *I = match(BB,
-      MInstruction(Instruction::Store,
-        MConstInt(4, 32),
-        MMTuple(
-          MMSave(MetaABC, NamelessStruct),
-          MMTuple(
-            MMString("int"),
-            OmnipotentCharC,
-            MConstInt(0)),
-          MConstInt(4))));
-  ASSERT_TRUE(I);
-
-  I = matchNext(I,
-      MInstruction(Instruction::Store,
-        MConstInt(11, 16),
-        MMTuple(
-          NamelessStruct,
-          MMTuple(
-            MMString("short"),
-            OmnipotentCharC,
-            MConstInt(0)),
-          MConstInt(0))));
-  ASSERT_TRUE(I);
-
-  const Metadata *MetaCDE = nullptr;
-  I = matchNext(I,
-      MInstruction(Instruction::Store,
-        MConstInt(44, 32),
-        MMTuple(
-          MMSave(MetaCDE, NamelessStruct),
-          MMTuple(
-            MMString("int"),
-            OmnipotentCharC,
-            MConstInt(0)),
-          MConstInt(4))));
-  ASSERT_TRUE(I);
-
-  I = matchNext(I,
-      MInstruction(Instruction::Store,
-        MConstInt(111, 16),
-        MMTuple(
-          NamelessStruct,
-          MMTuple(
-            MMString("short"),
-            OmnipotentCharC,
-            MConstInt(0)),
-          MConstInt(0))));
-  ASSERT_TRUE(I);
-
-  // FIXME: Nameless structures used in definitions of 'ABC' and 'CDE' are
-  // different structures, although they have the same field sequence. They must
-  // be described by different descriptors.
-  //ASSERT_TRUE(MetaABC != MetaCDE);
-}
-
-TEST(TBAAMetadataTest, CTypedefFields3) {
-  const char TestProgram[] = R"**(
-    typedef struct {
-       short f16;
-       int f32;
-    } ABC;
-    typedef struct {
-       int f32;
-       short f16;
-    } CDE;
-
-    void func(ABC *A, CDE *B) {
-      A->f32 = 4;
-      A->f16 = 11;
-      B->f32 = 44;
-      B->f16 = 111;
-    }
-  )**";
-
-  clang::LangOptions LO;
-  LO.C11 = 1;
-  TBAATestCompiler Compiler(LO, TBAATestCompiler::getCommonCodeGenOpts());
-  Compiler.init(TestProgram);
-  const BasicBlock *BB = Compiler.compile();
-
-  auto NamelessStruct1 = MMTuple(
-    MMString(""),
-    MMTuple(
-      MMString("short"),
-      OmnipotentCharC,
-      MConstInt(0)),
-    MConstInt(0),
-    MMTuple(
-      MMString("int"),
-      OmnipotentCharC,
-      MConstInt(0)),
-    MConstInt(4));
-
-  auto NamelessStruct2 = MMTuple(
-    MMString(""),
-    MMTuple(
-      MMString("int"),
-      OmnipotentCharC,
-      MConstInt(0)),
-    MConstInt(0),
-    MMTuple(
-      MMString("short"),
-      OmnipotentCharC,
-      MConstInt(0)),
-    MConstInt(4));
-
-  const Instruction *I = match(BB,
-      MInstruction(Instruction::Store,
-        MConstInt(4, 32),
-        MMTuple(
-          NamelessStruct1,
-          MMTuple(
-            MMString("int"),
-            OmnipotentCharC,
-            MConstInt(0)),
-          MConstInt(4))));
-  ASSERT_TRUE(I);
-
-  I = matchNext(I,
-      MInstruction(Instruction::Store,
-        MConstInt(11, 16),
-        MMTuple(
-          NamelessStruct1,
-          MMTuple(
-            MMString("short"),
-            OmnipotentCharC,
-            MConstInt(0)),
-          MConstInt(0))));
-  ASSERT_TRUE(I);
-
-  I = matchNext(I,
-      MInstruction(Instruction::Store,
-        MConstInt(44, 32),
-        MMTuple(
-          NamelessStruct2,
-          MMTuple(
-            MMString("int"),
-            OmnipotentCharC,
-            MConstInt(0)),
-          MConstInt(0))));
-  ASSERT_TRUE(I);
-
-  I = matchNext(I,
-      MInstruction(Instruction::Store,
-        MConstInt(111, 16),
-        MMTuple(
-          NamelessStruct2,
-          MMTuple(
-            MMString("short"),
-            OmnipotentCharC,
-            MConstInt(0)),
-          MConstInt(4))));
-  ASSERT_TRUE(I);
-}
-
-TEST(TBAAMetadataTest, CXXFields) {
-  const char TestProgram[] = R"**(
-    struct ABC {
-       short f16;
-       int f32;
-       long long f64;
-       unsigned short f16_2;
-       unsigned f32_2;
-       unsigned long long f64_2;
-    };
-
-    void func(struct ABC *A) {
-      A->f32 = 4;
-      A->f16 = 11;
-      A->f64 = 601;
-      A->f16_2 = 22;
-      A->f32_2 = 77;
-      A->f64_2 = 604;
-    }
-  )**";
-
-  clang::LangOptions LO;
-  LO.CPlusPlus = 1;
-  LO.CPlusPlus11 = 1;
-  TBAATestCompiler Compiler(LO, TBAATestCompiler::getCommonCodeGenOpts());
-  Compiler.init(TestProgram);
-  const BasicBlock *BB = Compiler.compile();
-
-  auto StructABC = MMTuple(
-    MMString("_ZTS3ABC"),
-    MMTuple(
-      MMString("short"),
-      OmnipotentCharCXX,
-      MConstInt(0)),
-    MConstInt(0),
-    MMTuple(
-      MMString("int"),
-      OmnipotentCharCXX,
-      MConstInt(0)),
-    MConstInt(4),
-    MMTuple(
-      MMString("long long"),
-      OmnipotentCharCXX,
-      MConstInt(0)),
-    MConstInt(8),
-    MSameAs(1),
-    MConstInt(16),
-    MSameAs(3),
-    MConstInt(20),
-    MSameAs(5),
-    MConstInt(24));
-
-  const Instruction *I = match(BB,
-      MInstruction(Instruction::Store,
-        MConstInt(4, 32),
-        MMTuple(
-          StructABC,
-          MMTuple(
-            MMString("int"),
-            OmnipotentCharCXX,
-            MConstInt(0)),
-          MConstInt(4))));
-  ASSERT_TRUE(I);
-
-  I = matchNext(I,
-      MInstruction(Instruction::Store,
-        MConstInt(11, 16),
-        MMTuple(
-          StructABC,
-          MMTuple(
-            MMString("short"),
-            OmnipotentCharCXX,
-            MConstInt(0)),
-          MConstInt(0))));
-  ASSERT_TRUE(I);
-
-  I = matchNext(I,
-      MInstruction(Instruction::Store,
-        MConstInt(601, 64),
-        MMTuple(
-          StructABC,
-          MMTuple(
-            MMString("long long"),
-            OmnipotentCharCXX,
-            MConstInt(0)),
-          MConstInt(8))));
-  ASSERT_TRUE(I);
-
-  I = matchNext(I,
-      MInstruction(Instruction::Store,
-        MConstInt(22, 16),
-        MMTuple(
-          StructABC,
-          MMTuple(
-            MMString("short"),
-            OmnipotentCharCXX,
-            MConstInt(0)),
-          MConstInt(16))));
-  ASSERT_TRUE(I);
-
-  I = matchNext(I,
-      MInstruction(Instruction::Store,
-        MConstInt(77, 32),
-        MMTuple(
-          StructABC,
-          MMTuple(
-            MMString("int"),
-            OmnipotentCharCXX,
-            MConstInt(0)),
-          MConstInt(20))));
-  ASSERT_TRUE(I);
-
-  I = matchNext(I,
-      MInstruction(Instruction::Store,
-        MConstInt(604, 64),
-        MMTuple(
-          StructABC,
-          MMTuple(
-            MMString("long long"),
-            OmnipotentCharCXX,
-            MConstInt(0)),
-          MConstInt(24))));
-  ASSERT_TRUE(I);
-}
-
-TEST(TBAAMetadataTest, CXXTypedefFields) {
-  const char TestProgram[] = R"**(
-    typedef struct {
-       short f16;
-       int f32;
-    } ABC;
-    typedef struct {
-       short value_f16;
-       int value_f32;
-    } CDE;
-
-    void func(ABC *A, CDE *B) {
-      A->f32 = 4;
-      A->f16 = 11;
-      B->value_f32 = 44;
-      B->value_f16 = 111;
-    }
-  )**";
-
-  clang::LangOptions LO;
-  LO.CPlusPlus = 1;
-  LO.CPlusPlus11 = 1;
-  TBAATestCompiler Compiler(LO, TBAATestCompiler::getCommonCodeGenOpts());
-  Compiler.init(TestProgram);
-  const BasicBlock *BB = Compiler.compile();
-
-  auto StructABC = MMTuple(
-    MMString("_ZTS3ABC"),
-    MMTuple(
-      MMString("short"),
-      OmnipotentCharCXX,
-      MConstInt(0)),
-    MConstInt(0),
-    MMTuple(
-      MMString("int"),
-      OmnipotentCharCXX,
-      MConstInt(0)),
-    MConstInt(4));
-
-  auto StructCDE = MMTuple(
-    MMString("_ZTS3CDE"),
-    MMTuple(
-      MMString("short"),
-      OmnipotentCharCXX,
-      MConstInt(0)),
-    MConstInt(0),
-    MMTuple(
-      MMString("int"),
-      OmnipotentCharCXX,
-      MConstInt(0)),
-    MConstInt(4));
-
-  const Instruction *I = match(BB,
-      MInstruction(Instruction::Store,
-        MConstInt(4, 32),
-        MMTuple(
-          StructABC,
-          MMTuple(
-            MMString("int"),
-            OmnipotentCharCXX,
-            MConstInt(0)),
-          MConstInt(4))));
-  ASSERT_TRUE(I);
-
-  I = matchNext(I,
-      MInstruction(Instruction::Store,
-        MConstInt(11, 16),
-        MMTuple(
-          StructABC,
-          MMTuple(
-            MMString("short"),
-            OmnipotentCharCXX,
-            MConstInt(0)),
-          MConstInt(0))));
-  ASSERT_TRUE(I);
-
-  I = matchNext(I,
-      MInstruction(Instruction::Store,
-        MConstInt(44, 32),
-        MMTuple(
-          StructCDE,
-          MMTuple(
-            MMString("int"),
-            OmnipotentCharCXX,
-            MConstInt(0)),
-          MConstInt(4))));
-  ASSERT_TRUE(I);
-
-  I = matchNext(I,
-      MInstruction(Instruction::Store,
-        MConstInt(111, 16),
-        MMTuple(
-          StructCDE,
-          MMTuple(
-            MMString("short"),
-            OmnipotentCharCXX,
-            MConstInt(0)),
-          MConstInt(0))));
-  ASSERT_TRUE(I);
-}
-
-TEST(TBAAMetadataTest, StructureFields) {
-  const char TestProgram[] = R"**(
-    struct Inner {
-      int f32;
-    };
-
-    struct Outer {
-      short f16;
-      Inner b1;
-      Inner b2;
-    };
-
-    void func(Outer *S) {
-      S->f16 = 14;
-      S->b1.f32 = 35;
-      S->b2.f32 = 77;
-    }
-  )**";
-
-  clang::LangOptions LO;
-  LO.CPlusPlus = 1;
-  LO.CPlusPlus11 = 1;
-  TBAATestCompiler Compiler(LO, TBAATestCompiler::getCommonCodeGenOpts());
-  Compiler.init(TestProgram);
-  const BasicBlock *BB = Compiler.compile();
-
-  auto StructInner = MMTuple(
-    MMString("_ZTS5Inner"),
-    MMTuple(
-      MMString("int"),
-      OmnipotentCharCXX,
-      MConstInt(0)),
-    MConstInt(0));
-
-  auto StructOuter = MMTuple(
-    MMString("_ZTS5Outer"),
-    MMTuple(
-      MMString("short"),
-      OmnipotentCharCXX,
-      MConstInt(0)),
-    MConstInt(0),
-    StructInner,
-    MConstInt(4),
-    MSameAs(3),
-    MConstInt(8));
-
-  const Instruction *I = match(BB,
-      MInstruction(Instruction::Store,
-        MConstInt(14, 16),
-        MMTuple(
-          StructOuter,
-          MMTuple(
-            MMString("short"),
-            OmnipotentCharCXX,
-            MConstInt(0)),
-          MConstInt(0))));
-  ASSERT_TRUE(I);
-
-  I = matchNext(I,
-      MInstruction(Instruction::Store,
-        MConstInt(35, 32),
-        MMTuple(
-          StructOuter,
-          MMTuple(
-            MMString("int"),
-            OmnipotentCharCXX,
-            MConstInt(0)),
-          MConstInt(4))));
-  ASSERT_TRUE(I);
-
-  I = matchNext(I,
-      MInstruction(Instruction::Store,
-        MConstInt(77, 32),
-        MMTuple(
-          StructOuter,
-          MMTuple(
-            MMString("int"),
-            OmnipotentCharCXX,
-            MConstInt(0)),
-          MConstInt(8))));
-  ASSERT_TRUE(I);
-}
-
-TEST(TBAAMetadataTest, ArrayFields) {
-  const char TestProgram[] = R"**(
-    struct Inner {
-      int f32;
-    };
-
-    struct Outer {
-      short f16;
-      Inner b1[2];
-    };
-
-    void func(Outer *S) {
-      S->f16 = 14;
-      S->b1[0].f32 = 35;
-      S->b1[1].f32 = 77;
-    }
-  )**";
-
-  clang::LangOptions LO;
-  LO.CPlusPlus = 1;
-  LO.CPlusPlus11 = 1;
-  TBAATestCompiler Compiler(LO, TBAATestCompiler::getCommonCodeGenOpts());
-  Compiler.init(TestProgram);
-  const BasicBlock *BB = Compiler.compile();
-
-  auto StructInner = MMTuple(
-    MMString("_ZTS5Inner"),
-    MMTuple(
-      MMString("int"),
-      OmnipotentCharCXX,
-      MConstInt(0)),
-    MConstInt(0));
-
-  auto StructOuter = MMTuple(
-    MMString("_ZTS5Outer"),
-    MMTuple(
-      MMString("short"),
-      OmnipotentCharCXX,
-      MConstInt(0)),
-    MConstInt(0),
-    OmnipotentCharCXX,    // FIXME: Info about array field is lost.
-    MConstInt(4));
-
-  const Instruction *I = match(BB,
-      MInstruction(Instruction::Store,
-        MConstInt(14, 16),
-        MMTuple(
-          StructOuter,
-          MMTuple(
-            MMString("short"),
-            OmnipotentCharCXX,
-            MConstInt(0)),
-          MConstInt(0))));
-  ASSERT_TRUE(I);
-
-  I = matchNext(I,
-      MInstruction(Instruction::Store,
-        MConstInt(35, 32),
-        MMTuple(
-          StructInner,
-          MMTuple(
-            MMString("int"),
-            OmnipotentCharCXX,
-            MConstInt(0)),
-          MConstInt(0))));
-  ASSERT_TRUE(I);
-
-  I = matchNext(I,
-      MInstruction(Instruction::Store,
-        MConstInt(77, 32),
-        MMTuple(
-          StructInner,
-          MMTuple(
-            MMString("int"),
-            OmnipotentCharCXX,
-            MConstInt(0)),
-          MConstInt(0))));
-  ASSERT_TRUE(I);
-}
-
-TEST(TBAAMetadataTest, BaseClass) {
-  const char TestProgram[] = R"**(
-    struct Base {
-      int f32;
-    };
-
-    struct Derived : public Base {
-      short f16;
-    };
-
-    void func(Base *B, Derived *D) {
-      B->f32 = 14;
-      D->f16 = 35;
-      D->f32 = 77;
-    }
-  )**";
-
-  clang::LangOptions LO;
-  LO.CPlusPlus = 1;
-  LO.CPlusPlus11 = 1;
-  TBAATestCompiler Compiler(LO, TBAATestCompiler::getCommonCodeGenOpts());
-  Compiler.init(TestProgram);
-  const BasicBlock *BB = Compiler.compile();
-
-  auto ClassBase = MMTuple(
-    MMString("_ZTS4Base"),
-    MMTuple(
-      MMString("int"),
-      OmnipotentCharCXX,
-      MConstInt(0)),
-    MConstInt(0));
-
-  auto ClassDerived = MMTuple(
-    MMString("_ZTS7Derived"),
-    MMTuple(
-      MMString("short"),
-      OmnipotentCharCXX,
-      MConstInt(0)),
-    MConstInt(4));
-
-  const Instruction *I = match(BB,
-      MInstruction(Instruction::Store,
-        MConstInt(14, 32),
-        MMTuple(
-          ClassBase,
-          MMTuple(
-            MMString("int"),
-            OmnipotentCharCXX,
-            MConstInt(0)),
-          MConstInt(0))));
-  ASSERT_TRUE(I);
-
-  I = matchNext(I,
-      MInstruction(Instruction::Store,
-        MConstInt(35, 16),
-        MMTuple(
-          ClassDerived,
-          MMTuple(
-            MMString("short"),
-            OmnipotentCharCXX,
-            MConstInt(0)),
-          MConstInt(4))));
-  ASSERT_TRUE(I);
-
-  I = matchNext(I,
-      MInstruction(Instruction::Store,
-        MConstInt(77, 32),
-        MMTuple(
-          ClassBase,
-          MMTuple(
-            MMString("int"),
-            OmnipotentCharCXX,
-            MConstInt(0)),
-          MConstInt(0))));
-  ASSERT_TRUE(I);
-}
-
-TEST(TBAAMetadataTest, PolymorphicClass) {
-  const char TestProgram[] = R"**(
-    struct Base {
-      virtual void m1(int *) = 0;
-      int f32;
-    };
-
-    struct Derived : public Base {
-      virtual void m1(int *) override;
-      short f16;
-    };
-
-    void func(Base *B, Derived *D) {
-      B->f32 = 14;
-      D->f16 = 35;
-      D->f32 = 77;
-    }
-  )**";
-
-  clang::LangOptions LO;
-  LO.CPlusPlus = 1;
-  LO.CPlusPlus11 = 1;
-  TBAATestCompiler Compiler(LO, TBAATestCompiler::getCommonCodeGenOpts());
-  Compiler.init(TestProgram);
-  const BasicBlock *BB = Compiler.compile();
-
-  auto ClassBase = MMTuple(
-    MMString("_ZTS4Base"),
-    MMTuple(
-      MMString("int"),
-      OmnipotentCharCXX,
-      MConstInt(0)),
-    MConstInt(Compiler.PtrSize));
-
-  auto ClassDerived = MMTuple(
-    MMString("_ZTS7Derived"),
-    MMTuple(
-      MMString("short"),
-      OmnipotentCharCXX,
-      MConstInt(0)),
-    MConstInt(Compiler.PtrSize + 4));
-
-  const Instruction *I = match(BB,
-      MInstruction(Instruction::Store,
-        MConstInt(14, 32),
-        MMTuple(
-          ClassBase,
-          MMTuple(
-            MMString("int"),
-            OmnipotentCharCXX,
-            MConstInt(0)),
-          MConstInt(Compiler.PtrSize))));
-  ASSERT_TRUE(I);
-
-  I = matchNext(I,
-      MInstruction(Instruction::Store,
-        MConstInt(35, 16),
-        MMTuple(
-          ClassDerived,
-          MMTuple(
-            MMString("short"),
-            OmnipotentCharCXX,
-            MConstInt(0)),
-          MConstInt(Compiler.PtrSize + 4))));
-  ASSERT_TRUE(I);
-
-  I = matchNext(I,
-      MInstruction(Instruction::Store,
-        MConstInt(77, 32),
-        MMTuple(
-          ClassBase,
-          MMTuple(
-            MMString("int"),
-            OmnipotentCharCXX,
-            MConstInt(0)),
-          MConstInt(Compiler.PtrSize))));
-  ASSERT_TRUE(I);
-}
-
-TEST(TBAAMetadataTest, VirtualBase) {
-  const char TestProgram[] = R"**(
-    struct Base {
-      int f32;
-    };
-
-    struct Derived : public virtual Base {
-      short f16;
-    };
-
-    void func(Base *B, Derived *D) {
-      B->f32 = 14;
-      D->f16 = 35;
-      D->f32 = 77;
-    }
-  )**";
-
-  clang::LangOptions LO;
-  LO.CPlusPlus = 1;
-  LO.CPlusPlus11 = 1;
-  TBAATestCompiler Compiler(LO, TBAATestCompiler::getCommonCodeGenOpts());
-  Compiler.init(TestProgram);
-  const BasicBlock *BB = Compiler.compile();
-
-  auto ClassBase = MMTuple(
-    MMString("_ZTS4Base"),
-    MMTuple(
-      MMString("int"),
-      OmnipotentCharCXX,
-      MConstInt(0)),
-    MConstInt(0));
-
-  auto ClassDerived = MMTuple(
-    MMString("_ZTS7Derived"),
-    MMTuple(
-      MMString("short"),
-      OmnipotentCharCXX,
-      MConstInt(0)),
-    MConstInt(Compiler.PtrSize));
-
-  const Instruction *I = match(BB,
-      MInstruction(Instruction::Store,
-        MConstInt(14, 32),
-        MMTuple(
-          ClassBase,
-          MMTuple(
-            MMString("int"),
-            OmnipotentCharCXX,
-            MConstInt(0)),
-          MConstInt(0))));
-  ASSERT_TRUE(I);
-
-  I = matchNext(I,
-      MInstruction(Instruction::Store,
-        MConstInt(35, 16),
-        MMTuple(
-          ClassDerived,
-          MMTuple(
-            MMString("short"),
-            OmnipotentCharCXX,
-            MConstInt(0)),
-          MConstInt(Compiler.PtrSize))));
-  ASSERT_TRUE(I);
-
-  I = matchNext(I,
-      MInstruction(Instruction::Load,
-        MMTuple(
-          MMTuple(
-            MMString("vtable pointer"),
-            MMTuple(
-              MMString("Simple C++ TBAA")),
-            MConstInt(0)),
-          MSameAs(0),
-          MConstInt(0))));
-  ASSERT_TRUE(I);
-
-  I = matchNext(I,
-      MInstruction(Instruction::Store,
-        MConstInt(77, 32),
-        MMTuple(
-          ClassBase,
-          MMTuple(
-            MMString("int"),
-            OmnipotentCharCXX,
-            MConstInt(0)),
-          MConstInt(0))));
-  ASSERT_TRUE(I);
-}
-
-TEST(TBAAMetadataTest, TemplSpec) {
-  const char TestProgram[] = R"**(
-    template<typename T1, typename T2>
-    struct ABC {
-      T1 f1;
-      T2 f2;
-    };
-
-    void func(ABC<double, int> *p) {
-      p->f1 = 12.1;
-      p->f2 = 44;
-    }
-  )**";
-
-  clang::LangOptions LO;
-  LO.CPlusPlus = 1;
-  LO.CPlusPlus11 = 1;
-  TBAATestCompiler Compiler(LO, TBAATestCompiler::getCommonCodeGenOpts());
-  Compiler.init(TestProgram);
-  const BasicBlock *BB = Compiler.compile();
-
-  auto SpecABC = MMTuple(
-    MMString("_ZTS3ABCIdiE"),
-    MMTuple(
-      MMString("double"),
-      OmnipotentCharCXX,
-      MConstInt(0)),
-    MConstInt(0),
-    MMTuple(
-      MMString("int"),
-      OmnipotentCharCXX,
-      MConstInt(0)),
-    MConstInt(8));
-
-  const Instruction *I = match(BB,
-      MInstruction(Instruction::Store,
-        MValType(MType([](const Type &T)->bool { return T.isDoubleTy(); })),
-        MMTuple(
-          SpecABC,
-          MMTuple(
-            MMString("double"),
-            OmnipotentCharCXX,
-            MConstInt(0)),
-          MConstInt(0))));
-  ASSERT_TRUE(I);
-
-  I = matchNext(I,
-      MInstruction(Instruction::Store,
-        MConstInt(44, 32),
-        MMTuple(
-          SpecABC,
-          MMTuple(
-            MMString("int"),
-            OmnipotentCharCXX,
-            MConstInt(0)),
-          MConstInt(8))));
-  ASSERT_TRUE(I);
-}
-}
diff --git a/gnu/llvm/clang/unittests/CodeGen/TestCompiler.h b/gnu/llvm/clang/unittests/CodeGen/TestCompiler.h
deleted file mode 100644
index c2fd8ac7c13..00000000000
--- a/gnu/llvm/clang/unittests/CodeGen/TestCompiler.h
+++ /dev/null
@@ -1,111 +0,0 @@
-//=== unittests/CodeGen/TestCompiler.h - Match on the LLVM IR ---*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef CLANG_UNITTESTS_CODEGEN_TESTCOMPILER_H
-#define CLANG_UNITTESTS_CODEGEN_TESTCOMPILER_H
-
-
-#include "clang/AST/ASTConsumer.h"
-#include "clang/Basic/TargetInfo.h"
-#include "clang/Basic/TargetOptions.h"
-#include "clang/CodeGen/ModuleBuilder.h"
-#include "clang/Frontend/CompilerInstance.h"
-#include "clang/Parse/ParseAST.h"
-
-#include "llvm/IR/Constants.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/IR/Module.h"
-#include "llvm/Support/Host.h"
-
-namespace llvm {
-
-struct TestCompiler {
-  LLVMContext Context;
-  clang::CompilerInstance compiler;
-  std::unique_ptr<clang::CodeGenerator> CG;
-  llvm::Module *M = nullptr;
-  unsigned PtrSize = 0;
-
-  TestCompiler(clang::LangOptions LO,
-               clang::CodeGenOptions CGO = clang::CodeGenOptions()) {
-    compiler.getLangOpts() = LO;
-    compiler.getCodeGenOpts() = CGO;
-    compiler.createDiagnostics();
-
-    std::string TrStr = llvm::Triple::normalize(llvm::sys::getProcessTriple());
-    llvm::Triple Tr(TrStr);
-    Tr.setOS(Triple::Linux);
-    Tr.setVendor(Triple::VendorType::UnknownVendor);
-    Tr.setEnvironment(Triple::EnvironmentType::UnknownEnvironment);
-    compiler.getTargetOpts().Triple = Tr.getTriple();
-    compiler.setTarget(clang::TargetInfo::CreateTargetInfo(
-        compiler.getDiagnostics(),
-        std::make_shared<clang::TargetOptions>(compiler.getTargetOpts())));
-
-    const clang::TargetInfo &TInfo = compiler.getTarget();
-    PtrSize = TInfo.getPointerWidth(0) / 8;
-
-    compiler.createFileManager();
-    compiler.createSourceManager(compiler.getFileManager());
-    compiler.createPreprocessor(clang::TU_Prefix);
-
-    compiler.createASTContext();
-
-    CG.reset(CreateLLVMCodeGen(compiler.getDiagnostics(),
-                               "main-module",
-                               compiler.getHeaderSearchOpts(),
-                               compiler.getPreprocessorOpts(),
-                               compiler.getCodeGenOpts(),
-                               Context));
-  }
-
-  void init(const char *TestProgram,
-            std::unique_ptr<clang::ASTConsumer> Consumer = nullptr) {
-    if (!Consumer)
-      Consumer = std::move(CG);
-
-    compiler.setASTConsumer(std::move(Consumer));
-
-    compiler.createSema(clang::TU_Prefix, nullptr);
-
-    clang::SourceManager &sm = compiler.getSourceManager();
-    sm.setMainFileID(sm.createFileID(
-        llvm::MemoryBuffer::getMemBuffer(TestProgram), clang::SrcMgr::C_User));
-  }
-
-  const BasicBlock *compile() {
-    clang::ParseAST(compiler.getSema(), false, false);
-    M =
-      static_cast<clang::CodeGenerator&>(compiler.getASTConsumer()).GetModule();
-
-    // Do not expect more than one function definition.
-    auto FuncPtr = M->begin();
-    for (; FuncPtr != M->end(); ++FuncPtr)
-      if (!FuncPtr->isDeclaration())
-        break;
-    assert(FuncPtr != M->end());
-    const llvm::Function &Func = *FuncPtr;
-    ++FuncPtr;
-    for (; FuncPtr != M->end(); ++FuncPtr)
-      if (!FuncPtr->isDeclaration())
-        break;
-    assert(FuncPtr == M->end());
-
-    // The function must consist of single basic block.
-    auto BBPtr = Func.begin();
-    assert(Func.begin() != Func.end());
-    const BasicBlock &BB = *BBPtr;
-    ++BBPtr;
-    assert(BBPtr == Func.end());
-
-    return &BB;
-  }
-};
-
-} // namespace llvm
-#endif // CLANG_UNITTESTS_CODEGEN_TESTCOMPILER_H
diff --git a/gnu/llvm/clang/unittests/CrossTU/CMakeLists.txt b/gnu/llvm/clang/unittests/CrossTU/CMakeLists.txt
deleted file mode 100644
index 222b7e83dc3..00000000000
--- a/gnu/llvm/clang/unittests/CrossTU/CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  ${LLVM_TARGETS_TO_BUILD}
-  Support
-  )
-
-add_clang_unittest(CrossTUTests
-  CrossTranslationUnitTest.cpp
-  )
-
-clang_target_link_libraries(CrossTUTests
-  PRIVATE
-  clangAST
-  clangBasic
-  clangCrossTU
-  clangFrontend
-  clangSerialization
-  clangTooling
-  )
diff --git a/gnu/llvm/clang/unittests/CrossTU/CrossTranslationUnitTest.cpp b/gnu/llvm/clang/unittests/CrossTU/CrossTranslationUnitTest.cpp
deleted file mode 100644
index 03401f933b8..00000000000
--- a/gnu/llvm/clang/unittests/CrossTU/CrossTranslationUnitTest.cpp
+++ /dev/null
@@ -1,277 +0,0 @@
-//===- unittest/Tooling/CrossTranslationUnitTest.cpp - Tooling unit tests -===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/CrossTU/CrossTranslationUnit.h"
-#include "clang/AST/ASTConsumer.h"
-#include "clang/AST/ParentMapContext.h"
-#include "clang/Frontend/CompilerInstance.h"
-#include "clang/Frontend/FrontendAction.h"
-#include "clang/Tooling/Tooling.h"
-#include "llvm/ADT/Optional.h"
-#include "llvm/Support/FileSystem.h"
-#include "llvm/Support/Path.h"
-#include "llvm/Support/ToolOutputFile.h"
-#include "gtest/gtest.h"
-#include <cassert>
-
-namespace clang {
-namespace cross_tu {
-
-namespace {
-
-class CTUASTConsumer : public clang::ASTConsumer {
-public:
-  explicit CTUASTConsumer(clang::CompilerInstance &CI, bool *Success)
-      : CTU(CI), Success(Success) {}
-
-  void HandleTranslationUnit(ASTContext &Ctx) override {
-    auto FindFInTU = [](const TranslationUnitDecl *TU) {
-      const FunctionDecl *FD = nullptr;
-      for (const Decl *D : TU->decls()) {
-        FD = dyn_cast<FunctionDecl>(D);
-        if (FD && FD->getName() == "f")
-          break;
-      }
-      return FD;
-    };
-
-    const TranslationUnitDecl *TU = Ctx.getTranslationUnitDecl();
-    const FunctionDecl *FD = FindFInTU(TU);
-    assert(FD && FD->getName() == "f");
-    bool OrigFDHasBody = FD->hasBody();
-
-    const DynTypedNodeList ParentsBeforeImport =
-        Ctx.getParentMapContext().getParents<Decl>(*FD);
-    ASSERT_FALSE(ParentsBeforeImport.empty());
-
-    // Prepare the index file and the AST file.
-    int ASTFD;
-    llvm::SmallString<256> ASTFileName;
-    ASSERT_FALSE(
-        llvm::sys::fs::createTemporaryFile("f_ast", "ast", ASTFD, ASTFileName));
-    llvm::ToolOutputFile ASTFile(ASTFileName, ASTFD);
-
-    int IndexFD;
-    llvm::SmallString<256> IndexFileName;
-    ASSERT_FALSE(llvm::sys::fs::createTemporaryFile("index", "txt", IndexFD,
-                                                    IndexFileName));
-    llvm::ToolOutputFile IndexFile(IndexFileName, IndexFD);
-    IndexFile.os() << "c:@F@f#I# " << ASTFileName << "\n";
-    IndexFile.os().flush();
-    EXPECT_TRUE(llvm::sys::fs::exists(IndexFileName));
-
-    StringRef SourceText = "int f(int) { return 0; }\n";
-    // This file must exist since the saved ASTFile will reference it.
-    int SourceFD;
-    llvm::SmallString<256> SourceFileName;
-    ASSERT_FALSE(llvm::sys::fs::createTemporaryFile("input", "cpp", SourceFD,
-                                                    SourceFileName));
-    llvm::ToolOutputFile SourceFile(SourceFileName, SourceFD);
-    SourceFile.os() << SourceText;
-    SourceFile.os().flush();
-    EXPECT_TRUE(llvm::sys::fs::exists(SourceFileName));
-
-    std::unique_ptr<ASTUnit> ASTWithDefinition =
-        tooling::buildASTFromCode(SourceText, SourceFileName);
-    ASTWithDefinition->Save(ASTFileName.str());
-    EXPECT_TRUE(llvm::sys::fs::exists(ASTFileName));
-
-    // Load the definition from the AST file.
-    llvm::Expected<const FunctionDecl *> NewFDorError = handleExpected(
-        CTU.getCrossTUDefinition(FD, "", IndexFileName, false),
-        []() { return nullptr; }, [](IndexError &) {});
-
-    if (NewFDorError) {
-      const FunctionDecl *NewFD = *NewFDorError;
-      *Success = NewFD && NewFD->hasBody() && !OrigFDHasBody;
-
-      if (NewFD) {
-        // Check parent map.
-        const DynTypedNodeList ParentsAfterImport =
-            Ctx.getParentMapContext().getParents<Decl>(*FD);
-        const DynTypedNodeList ParentsOfImported =
-            Ctx.getParentMapContext().getParents<Decl>(*NewFD);
-        EXPECT_TRUE(
-            checkParentListsEq(ParentsBeforeImport, ParentsAfterImport));
-        EXPECT_FALSE(ParentsOfImported.empty());
-      }
-    }
-  }
-
-  static bool checkParentListsEq(const DynTypedNodeList &L1,
-                                 const DynTypedNodeList &L2) {
-    if (L1.size() != L2.size())
-      return false;
-    for (unsigned int I = 0; I < L1.size(); ++I)
-      if (L1[I] != L2[I])
-        return false;
-    return true;
-  }
-
-private:
-  CrossTranslationUnitContext CTU;
-  bool *Success;
-};
-
-class CTUAction : public clang::ASTFrontendAction {
-public:
-  CTUAction(bool *Success, unsigned OverrideLimit)
-      : Success(Success), OverrideLimit(OverrideLimit) {}
-
-protected:
-  std::unique_ptr<clang::ASTConsumer>
-  CreateASTConsumer(clang::CompilerInstance &CI, StringRef) override {
-    CI.getAnalyzerOpts()->CTUImportThreshold = OverrideLimit;
-    CI.getAnalyzerOpts()->CTUImportCppThreshold = OverrideLimit;
-    return std::make_unique<CTUASTConsumer>(CI, Success);
-  }
-
-private:
-  bool *Success;
-  const unsigned OverrideLimit;
-};
-
-} // end namespace
-
-TEST(CrossTranslationUnit, CanLoadFunctionDefinition) {
-  bool Success = false;
-  EXPECT_TRUE(tooling::runToolOnCode(std::make_unique<CTUAction>(&Success, 1u),
-                                     "int f(int);"));
-  EXPECT_TRUE(Success);
-}
-
-TEST(CrossTranslationUnit, RespectsLoadThreshold) {
-  bool Success = false;
-  EXPECT_TRUE(tooling::runToolOnCode(std::make_unique<CTUAction>(&Success, 0u),
-                                     "int f(int);"));
-  EXPECT_FALSE(Success);
-}
-
-TEST(CrossTranslationUnit, IndexFormatCanBeParsed) {
-  llvm::StringMap<std::string> Index;
-  Index["a"] = "/b/f1";
-  Index["c"] = "/d/f2";
-  Index["e"] = "/f/f3";
-  std::string IndexText = createCrossTUIndexString(Index);
-
-  int IndexFD;
-  llvm::SmallString<256> IndexFileName;
-  ASSERT_FALSE(llvm::sys::fs::createTemporaryFile("index", "txt", IndexFD,
-                                                  IndexFileName));
-  llvm::ToolOutputFile IndexFile(IndexFileName, IndexFD);
-  IndexFile.os() << IndexText;
-  IndexFile.os().flush();
-  EXPECT_TRUE(llvm::sys::fs::exists(IndexFileName));
-  llvm::Expected<llvm::StringMap<std::string>> IndexOrErr =
-      parseCrossTUIndex(IndexFileName);
-  EXPECT_TRUE((bool)IndexOrErr);
-  llvm::StringMap<std::string> ParsedIndex = IndexOrErr.get();
-  for (const auto &E : Index) {
-    EXPECT_TRUE(ParsedIndex.count(E.getKey()));
-    EXPECT_EQ(ParsedIndex[E.getKey()], E.getValue());
-  }
-  for (const auto &E : ParsedIndex)
-    EXPECT_TRUE(Index.count(E.getKey()));
-}
-
-TEST(CrossTranslationUnit, EmptyInvocationListIsNotValid) {
-  auto Input = "";
-
-  llvm::Expected<InvocationListTy> Result = parseInvocationList(Input);
-  EXPECT_FALSE(static_cast<bool>(Result));
-  bool IsWrongFromatError = false;
-  llvm::handleAllErrors(Result.takeError(), [&](IndexError &Err) {
-    IsWrongFromatError =
-        Err.getCode() == index_error_code::invocation_list_wrong_format;
-  });
-  EXPECT_TRUE(IsWrongFromatError);
-}
-
-TEST(CrossTranslationUnit, AmbiguousInvocationListIsDetected) {
-  // The same source file occurs twice (for two different architecture) in
-  // this test case. The disambiguation is the responsibility of the user.
-  auto Input = R"(
-  /tmp/main.cpp:
-    - clang++
-    - -c
-    - -m32
-    - -o
-    - main32.o
-    - /tmp/main.cpp
-  /tmp/main.cpp:
-    - clang++
-    - -c
-    - -m64
-    - -o
-    - main64.o
-    - /tmp/main.cpp
-  )";
-
-  llvm::Expected<InvocationListTy> Result = parseInvocationList(Input);
-  EXPECT_FALSE(static_cast<bool>(Result));
-  bool IsAmbiguousError = false;
-  llvm::handleAllErrors(Result.takeError(), [&](IndexError &Err) {
-    IsAmbiguousError =
-        Err.getCode() == index_error_code::invocation_list_ambiguous;
-  });
-  EXPECT_TRUE(IsAmbiguousError);
-}
-
-TEST(CrossTranslationUnit, SingleInvocationCanBeParsed) {
-  auto Input = R"(
-  /tmp/main.cpp:
-    - clang++
-    - /tmp/main.cpp
-  )";
-  llvm::Expected<InvocationListTy> Result = parseInvocationList(Input);
-  EXPECT_TRUE(static_cast<bool>(Result));
-
-  EXPECT_EQ(Result->size(), 1u);
-
-  auto It = Result->find("/tmp/main.cpp");
-  EXPECT_TRUE(It != Result->end());
-  EXPECT_EQ(It->getValue()[0], "clang++");
-  EXPECT_EQ(It->getValue()[1], "/tmp/main.cpp");
-}
-
-TEST(CrossTranslationUnit, MultipleInvocationsCanBeParsed) {
-  auto Input = R"(
-  /tmp/main.cpp:
-    - clang++
-    - /tmp/other.o
-    - /tmp/main.cpp
-  /tmp/other.cpp:
-    - g++
-    - -c
-    - -o
-    - /tmp/other.o
-    - /tmp/other.cpp
-  )";
-  llvm::Expected<InvocationListTy> Result = parseInvocationList(Input);
-  EXPECT_TRUE(static_cast<bool>(Result));
-
-  EXPECT_EQ(Result->size(), 2u);
-
-  auto It = Result->find("/tmp/main.cpp");
-  EXPECT_TRUE(It != Result->end());
-  EXPECT_EQ(It->getKey(), "/tmp/main.cpp");
-  EXPECT_EQ(It->getValue()[0], "clang++");
-  EXPECT_EQ(It->getValue()[1], "/tmp/other.o");
-  EXPECT_EQ(It->getValue()[2], "/tmp/main.cpp");
-
-  It = Result->find("/tmp/other.cpp");
-  EXPECT_TRUE(It != Result->end());
-  EXPECT_EQ(It->getValue()[0], "g++");
-  EXPECT_EQ(It->getValue()[1], "-c");
-  EXPECT_EQ(It->getValue()[2], "-o");
-  EXPECT_EQ(It->getValue()[3], "/tmp/other.o");
-  EXPECT_EQ(It->getValue()[4], "/tmp/other.cpp");
-}
-
-} // end namespace cross_tu
-} // end namespace clang
diff --git a/gnu/llvm/clang/unittests/DirectoryWatcher/CMakeLists.txt b/gnu/llvm/clang/unittests/DirectoryWatcher/CMakeLists.txt
deleted file mode 100644
index 84a1a9d40c2..00000000000
--- a/gnu/llvm/clang/unittests/DirectoryWatcher/CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-if(APPLE OR CMAKE_SYSTEM_NAME MATCHES "Linux" OR CMAKE_SYSTEM_NAME STREQUAL Windows)
-
-  set(LLVM_LINK_COMPONENTS
-    Support
-    )
-
-  add_clang_unittest(DirectoryWatcherTests
-    DirectoryWatcherTest.cpp
-    )
-
-  target_link_libraries(DirectoryWatcherTests
-    PRIVATE
-    LLVMTestingSupport
-    clangDirectoryWatcher
-    clangBasic
-    )
-
-endif()
diff --git a/gnu/llvm/clang/unittests/DirectoryWatcher/DirectoryWatcherTest.cpp b/gnu/llvm/clang/unittests/DirectoryWatcher/DirectoryWatcherTest.cpp
deleted file mode 100644
index f0dc55a47bf..00000000000
--- a/gnu/llvm/clang/unittests/DirectoryWatcher/DirectoryWatcherTest.cpp
+++ /dev/null
@@ -1,501 +0,0 @@
-//===- unittests/DirectoryWatcher/DirectoryWatcherTest.cpp ----------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/DirectoryWatcher/DirectoryWatcher.h"
-#include "llvm/Support/FileSystem.h"
-#include "llvm/Support/Path.h"
-#include "llvm/Support/raw_ostream.h"
-#include "llvm/Testing/Support/Error.h"
-#include "gtest/gtest.h"
-#include <condition_variable>
-#include <future>
-#include <mutex>
-#include <thread>
-
-using namespace llvm;
-using namespace llvm::sys;
-using namespace llvm::sys::fs;
-using namespace clang;
-
-namespace clang {
-static bool operator==(const DirectoryWatcher::Event &lhs,
-                       const DirectoryWatcher::Event &rhs) {
-  return lhs.Filename == rhs.Filename &&
-         static_cast<int>(lhs.Kind) == static_cast<int>(rhs.Kind);
-}
-} // namespace clang
-
-namespace {
-
-typedef DirectoryWatcher::Event::EventKind EventKind;
-
-// We've observed this test being significantly flaky when running on a heavily
-// loaded machine (e.g. when it's being run as part of the full check-clang
-// suite). Set a high timeout value to avoid this flakiness. The 60s timeout
-// value was determined empirically. It's a timeout value, not a sleep value,
-// and the test should require much less time in practice the vast majority of
-// instances. The cases where we do come close to (or still end up hitting) the
-// longer timeout are most likely to occur when other tests are also running at
-// the same time (e.g. as part of the full check-clang suite), in which case the
-// latency of the timeout will be masked by the latency of the other tests.
-constexpr std::chrono::seconds EventualResultTimeout(60);
-
-struct DirectoryWatcherTestFixture {
-  std::string TestRootDir;
-  std::string TestWatchedDir;
-
-  DirectoryWatcherTestFixture() {
-    SmallString<128> pathBuf;
-#ifndef NDEBUG
-    std::error_code UniqDirRes =
-#endif
-    createUniqueDirectory("dirwatcher", pathBuf);
-    assert(!UniqDirRes);
-    TestRootDir = std::string(pathBuf.str());
-    path::append(pathBuf, "watch");
-    TestWatchedDir = std::string(pathBuf.str());
-#ifndef NDEBUG
-    std::error_code CreateDirRes =
-#endif
-    create_directory(TestWatchedDir, false);
-    assert(!CreateDirRes);
-  }
-
-  ~DirectoryWatcherTestFixture() { remove_directories(TestRootDir); }
-
-  SmallString<128> getPathInWatched(const std::string &testFile) {
-    SmallString<128> pathBuf;
-    pathBuf = TestWatchedDir;
-    path::append(pathBuf, testFile);
-    return pathBuf;
-  }
-
-  void addFile(const std::string &testFile) {
-    Expected<file_t> ft = openNativeFileForWrite(getPathInWatched(testFile),
-                                                 CD_CreateNew, OF_None);
-    if (ft) {
-      closeFile(*ft);
-    } else {
-      llvm::errs() << llvm::toString(ft.takeError()) << "\n";
-      llvm::errs() << getPathInWatched(testFile) << "\n";
-      llvm_unreachable("Couldn't create test file.");
-    }
-  }
-
-  void deleteFile(const std::string &testFile) {
-    std::error_code EC =
-        remove(getPathInWatched(testFile), /*IgnoreNonExisting=*/false);
-    ASSERT_FALSE(EC);
-  }
-};
-
-std::string eventKindToString(const EventKind K) {
-  switch (K) {
-  case EventKind::Removed:
-    return "Removed";
-  case EventKind::Modified:
-    return "Modified";
-  case EventKind::WatchedDirRemoved:
-    return "WatchedDirRemoved";
-  case EventKind::WatcherGotInvalidated:
-    return "WatcherGotInvalidated";
-  }
-  llvm_unreachable("unknown event kind");
-}
-
-struct VerifyingConsumer {
-  std::vector<DirectoryWatcher::Event> ExpectedInitial;
-  const std::vector<DirectoryWatcher::Event> ExpectedInitialCopy;
-  std::vector<DirectoryWatcher::Event> ExpectedNonInitial;
-  const std::vector<DirectoryWatcher::Event> ExpectedNonInitialCopy;
-  std::vector<DirectoryWatcher::Event> OptionalNonInitial;
-  std::vector<DirectoryWatcher::Event> UnexpectedInitial;
-  std::vector<DirectoryWatcher::Event> UnexpectedNonInitial;
-  std::mutex Mtx;
-  std::condition_variable ResultIsReady;
-
-  VerifyingConsumer(
-      const std::vector<DirectoryWatcher::Event> &ExpectedInitial,
-      const std::vector<DirectoryWatcher::Event> &ExpectedNonInitial,
-      const std::vector<DirectoryWatcher::Event> &OptionalNonInitial = {})
-      : ExpectedInitial(ExpectedInitial), ExpectedInitialCopy(ExpectedInitial),
-        ExpectedNonInitial(ExpectedNonInitial), ExpectedNonInitialCopy(ExpectedNonInitial),
-        OptionalNonInitial(OptionalNonInitial) {}
-
-  // This method is used by DirectoryWatcher.
-  void consume(DirectoryWatcher::Event E, bool IsInitial) {
-    if (IsInitial)
-      consumeInitial(E);
-    else
-      consumeNonInitial(E);
-  }
-
-  void consumeInitial(DirectoryWatcher::Event E) {
-    std::unique_lock<std::mutex> L(Mtx);
-    auto It = std::find(ExpectedInitial.begin(), ExpectedInitial.end(), E);
-    if (It == ExpectedInitial.end()) {
-      UnexpectedInitial.push_back(E);
-    } else {
-      ExpectedInitial.erase(It);
-    }
-    if (result()) {
-      L.unlock();
-      ResultIsReady.notify_one();
-    }
-  }
-
-  void consumeNonInitial(DirectoryWatcher::Event E) {
-    std::unique_lock<std::mutex> L(Mtx);
-    auto It =
-        std::find(ExpectedNonInitial.begin(), ExpectedNonInitial.end(), E);
-    if (It == ExpectedNonInitial.end()) {
-      auto OptIt =
-          std::find(OptionalNonInitial.begin(), OptionalNonInitial.end(), E);
-      if (OptIt != OptionalNonInitial.end()) {
-        OptionalNonInitial.erase(OptIt);
-      } else {
-        UnexpectedNonInitial.push_back(E);
-      }
-    } else {
-      ExpectedNonInitial.erase(It);
-    }
-    if (result()) {
-      L.unlock();
-      ResultIsReady.notify_one();
-    }
-  }
-
-  // This method is used by DirectoryWatcher.
-  void consume(llvm::ArrayRef<DirectoryWatcher::Event> Es, bool IsInitial) {
-    for (const auto &E : Es)
-      consume(E, IsInitial);
-  }
-
-  // Not locking - caller has to lock Mtx.
-  llvm::Optional<bool> result() const {
-    if (ExpectedInitial.empty() && ExpectedNonInitial.empty() &&
-        UnexpectedInitial.empty() && UnexpectedNonInitial.empty())
-      return true;
-    if (!UnexpectedInitial.empty() || !UnexpectedNonInitial.empty())
-      return false;
-    return llvm::None;
-  }
-
-  // This method is used by tests.
-  // \returns true on success
-  bool blockUntilResult() {
-    std::unique_lock<std::mutex> L(Mtx);
-    while (true) {
-      if (result())
-        return *result();
-
-      ResultIsReady.wait(L, [this]() { return result().hasValue(); });
-    }
-    return false; // Just to make compiler happy.
-  }
-
-  void printUnmetExpectations(llvm::raw_ostream &OS) {
-    // If there was any issue, print the expected state
-    if (
-      !ExpectedInitial.empty()
-      ||
-      !ExpectedNonInitial.empty()
-      ||
-      !UnexpectedInitial.empty()
-      ||
-      !UnexpectedNonInitial.empty()
-    ) {
-      OS << "Expected initial events: \n";
-      for (const auto &E : ExpectedInitialCopy) {
-        OS << eventKindToString(E.Kind) << " " << E.Filename << "\n";
-      }
-      OS << "Expected non-initial events: \n";
-      for (const auto &E : ExpectedNonInitialCopy) {
-        OS << eventKindToString(E.Kind) << " " << E.Filename << "\n";
-      }
-    }
-
-    if (!ExpectedInitial.empty()) {
-      OS << "Expected but not seen initial events: \n";
-      for (const auto &E : ExpectedInitial) {
-        OS << eventKindToString(E.Kind) << " " << E.Filename << "\n";
-      }
-    }
-    if (!ExpectedNonInitial.empty()) {
-      OS << "Expected but not seen non-initial events: \n";
-      for (const auto &E : ExpectedNonInitial) {
-        OS << eventKindToString(E.Kind) << " " << E.Filename << "\n";
-      }
-    }
-    if (!UnexpectedInitial.empty()) {
-      OS << "Unexpected initial events seen: \n";
-      for (const auto &E : UnexpectedInitial) {
-        OS << eventKindToString(E.Kind) << " " << E.Filename << "\n";
-      }
-    }
-    if (!UnexpectedNonInitial.empty()) {
-      OS << "Unexpected non-initial events seen: \n";
-      for (const auto &E : UnexpectedNonInitial) {
-        OS << eventKindToString(E.Kind) << " " << E.Filename << "\n";
-      }
-    }
-  }
-};
-
-void checkEventualResultWithTimeout(VerifyingConsumer &TestConsumer) {
-  std::packaged_task<int(void)> task(
-      [&TestConsumer]() { return TestConsumer.blockUntilResult(); });
-  std::future<int> WaitForExpectedStateResult = task.get_future();
-  std::thread worker(std::move(task));
-  worker.detach();
-
-  EXPECT_TRUE(WaitForExpectedStateResult.wait_for(EventualResultTimeout) ==
-              std::future_status::ready)
-      << "The expected result state wasn't reached before the time-out.";
-  std::unique_lock<std::mutex> L(TestConsumer.Mtx);
-  EXPECT_TRUE(TestConsumer.result().hasValue());
-  if (TestConsumer.result().hasValue()) {
-    EXPECT_TRUE(*TestConsumer.result());
-  }
-  if ((TestConsumer.result().hasValue() && !TestConsumer.result().getValue()) ||
-      !TestConsumer.result().hasValue())
-    TestConsumer.printUnmetExpectations(llvm::outs());
-}
-} // namespace
-
-TEST(DirectoryWatcherTest, InitialScanSync) {
-  DirectoryWatcherTestFixture fixture;
-
-  fixture.addFile("a");
-  fixture.addFile("b");
-  fixture.addFile("c");
-
-  VerifyingConsumer TestConsumer{
-      {{EventKind::Modified, "a"},
-       {EventKind::Modified, "b"},
-       {EventKind::Modified, "c"}},
-      {},
-      // We have to ignore these as it's a race between the test process
-      // which is scanning the directory and kernel which is sending
-      // notification.
-      {{EventKind::Modified, "a"},
-       {EventKind::Modified, "b"},
-       {EventKind::Modified, "c"}}
-      };
-
-  llvm::Expected<std::unique_ptr<DirectoryWatcher>> DW =
-      DirectoryWatcher::create(
-          fixture.TestWatchedDir,
-          [&TestConsumer](llvm::ArrayRef<DirectoryWatcher::Event> Events,
-                          bool IsInitial) {
-            TestConsumer.consume(Events, IsInitial);
-          },
-          /*waitForInitialSync=*/true);
-  ASSERT_THAT_ERROR(DW.takeError(), Succeeded());
-
-  checkEventualResultWithTimeout(TestConsumer);
-}
-
-TEST(DirectoryWatcherTest, InitialScanAsync) {
-  DirectoryWatcherTestFixture fixture;
-
-  fixture.addFile("a");
-  fixture.addFile("b");
-  fixture.addFile("c");
-
-  VerifyingConsumer TestConsumer{
-      {{EventKind::Modified, "a"},
-       {EventKind::Modified, "b"},
-       {EventKind::Modified, "c"}},
-      {},
-      // We have to ignore these as it's a race between the test process
-      // which is scanning the directory and kernel which is sending
-      // notification.
-      {{EventKind::Modified, "a"},
-       {EventKind::Modified, "b"},
-       {EventKind::Modified, "c"}}
-       };
-
-  llvm::Expected<std::unique_ptr<DirectoryWatcher>> DW =
-      DirectoryWatcher::create(
-          fixture.TestWatchedDir,
-          [&TestConsumer](llvm::ArrayRef<DirectoryWatcher::Event> Events,
-                          bool IsInitial) {
-            TestConsumer.consume(Events, IsInitial);
-          },
-          /*waitForInitialSync=*/false);
-  ASSERT_THAT_ERROR(DW.takeError(), Succeeded());
-
-  checkEventualResultWithTimeout(TestConsumer);
-}
-
-TEST(DirectoryWatcherTest, AddFiles) {
-  DirectoryWatcherTestFixture fixture;
-
-  VerifyingConsumer TestConsumer{
-      {},
-      {{EventKind::Modified, "a"},
-       {EventKind::Modified, "b"},
-       {EventKind::Modified, "c"}}};
-
-  llvm::Expected<std::unique_ptr<DirectoryWatcher>> DW =
-      DirectoryWatcher::create(
-          fixture.TestWatchedDir,
-          [&TestConsumer](llvm::ArrayRef<DirectoryWatcher::Event> Events,
-                          bool IsInitial) {
-            TestConsumer.consume(Events, IsInitial);
-          },
-          /*waitForInitialSync=*/true);
-  ASSERT_THAT_ERROR(DW.takeError(), Succeeded());
-
-  fixture.addFile("a");
-  fixture.addFile("b");
-  fixture.addFile("c");
-
-  checkEventualResultWithTimeout(TestConsumer);
-}
-
-TEST(DirectoryWatcherTest, ModifyFile) {
-  DirectoryWatcherTestFixture fixture;
-
-  fixture.addFile("a");
-
-  VerifyingConsumer TestConsumer{
-      {{EventKind::Modified, "a"}},
-      {{EventKind::Modified, "a"}},
-      {{EventKind::Modified, "a"}}};
-
-  llvm::Expected<std::unique_ptr<DirectoryWatcher>> DW =
-      DirectoryWatcher::create(
-          fixture.TestWatchedDir,
-          [&TestConsumer](llvm::ArrayRef<DirectoryWatcher::Event> Events,
-                          bool IsInitial) {
-            TestConsumer.consume(Events, IsInitial);
-          },
-          /*waitForInitialSync=*/true);
-  ASSERT_THAT_ERROR(DW.takeError(), Succeeded());
-
-  // modify the file
-  {
-    std::error_code error;
-    llvm::raw_fd_ostream bStream(fixture.getPathInWatched("a"), error,
-                                 CD_OpenExisting);
-    assert(!error);
-    bStream << "foo";
-  }
-
-  checkEventualResultWithTimeout(TestConsumer);
-}
-
-TEST(DirectoryWatcherTest, DeleteFile) {
-  DirectoryWatcherTestFixture fixture;
-
-  fixture.addFile("a");
-
-  VerifyingConsumer TestConsumer{
-      {{EventKind::Modified, "a"}},
-      {{EventKind::Removed, "a"}},
-      {{EventKind::Modified, "a"}, {EventKind::Removed, "a"}}};
-
-  llvm::Expected<std::unique_ptr<DirectoryWatcher>> DW =
-      DirectoryWatcher::create(
-          fixture.TestWatchedDir,
-          [&TestConsumer](llvm::ArrayRef<DirectoryWatcher::Event> Events,
-                          bool IsInitial) {
-            TestConsumer.consume(Events, IsInitial);
-          },
-          /*waitForInitialSync=*/true);
-  ASSERT_THAT_ERROR(DW.takeError(), Succeeded());
-
-  fixture.deleteFile("a");
-
-  checkEventualResultWithTimeout(TestConsumer);
-}
-
-TEST(DirectoryWatcherTest, DeleteWatchedDir) {
-  DirectoryWatcherTestFixture fixture;
-
-  VerifyingConsumer TestConsumer{
-      {},
-      {{EventKind::WatchedDirRemoved, ""},
-       {EventKind::WatcherGotInvalidated, ""}}};
-
-  llvm::Expected<std::unique_ptr<DirectoryWatcher>> DW =
-      DirectoryWatcher::create(
-          fixture.TestWatchedDir,
-          [&TestConsumer](llvm::ArrayRef<DirectoryWatcher::Event> Events,
-                          bool IsInitial) {
-            TestConsumer.consume(Events, IsInitial);
-          },
-          /*waitForInitialSync=*/true);
-  ASSERT_THAT_ERROR(DW.takeError(), Succeeded());
-
-  remove_directories(fixture.TestWatchedDir);
-
-  checkEventualResultWithTimeout(TestConsumer);
-}
-
-TEST(DirectoryWatcherTest, InvalidatedWatcher) {
-  DirectoryWatcherTestFixture fixture;
-
-  VerifyingConsumer TestConsumer{
-      {}, {{EventKind::WatcherGotInvalidated, ""}}};
-
-  {
-    llvm::Expected<std::unique_ptr<DirectoryWatcher>> DW =
-        DirectoryWatcher::create(
-            fixture.TestWatchedDir,
-            [&TestConsumer](llvm::ArrayRef<DirectoryWatcher::Event> Events,
-                            bool IsInitial) {
-              TestConsumer.consume(Events, IsInitial);
-            },
-            /*waitForInitialSync=*/true);
-    ASSERT_THAT_ERROR(DW.takeError(), Succeeded());
-  } // DW is destructed here.
-
-  checkEventualResultWithTimeout(TestConsumer);
-}
-
-TEST(DirectoryWatcherTest, InvalidatedWatcherAsync) {
-  DirectoryWatcherTestFixture fixture;
-  fixture.addFile("a");
-
-  // This test is checking that we get the initial notification for 'a' before
-  // the final 'invalidated'. Strictly speaking, we do not care whether 'a' is
-  // processed or not, only that it is neither racing with, nor after
-  // 'invalidated'. In practice, it is always processed in our implementations.
-  VerifyingConsumer TestConsumer{
-      {{EventKind::Modified, "a"}},
-      {{EventKind::WatcherGotInvalidated, ""}},
-      // We have to ignore these as it's a race between the test process
-      // which is scanning the directory and kernel which is sending
-      // notification.
-      {{EventKind::Modified, "a"}},
-  };
-
-  // A counter that can help detect data races on the event receiver,
-  // particularly if used with TSan. Expected count will be 2 or 3 depending on
-  // whether we get the kernel event or not (see comment above).
-  unsigned Count = 0;
-  {
-    llvm::Expected<std::unique_ptr<DirectoryWatcher>> DW =
-        DirectoryWatcher::create(
-            fixture.TestWatchedDir,
-            [&TestConsumer,
-             &Count](llvm::ArrayRef<DirectoryWatcher::Event> Events,
-                     bool IsInitial) {
-              Count += 1;
-              TestConsumer.consume(Events, IsInitial);
-            },
-            /*waitForInitialSync=*/false);
-    ASSERT_THAT_ERROR(DW.takeError(), Succeeded());
-  } // DW is destructed here.
-
-  checkEventualResultWithTimeout(TestConsumer);
-  ASSERT_TRUE(Count == 2u || Count == 3u);
-}
diff --git a/gnu/llvm/clang/unittests/Driver/CMakeLists.txt b/gnu/llvm/clang/unittests/Driver/CMakeLists.txt
deleted file mode 100644
index d0ab87bd9ea..00000000000
--- a/gnu/llvm/clang/unittests/Driver/CMakeLists.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  ${LLVM_TARGETS_TO_BUILD}
-  Support
-  Option
-  )
-
-add_clang_unittest(ClangDriverTests
-  DistroTest.cpp
-  ToolChainTest.cpp
-  ModuleCacheTest.cpp
-  MultilibTest.cpp
-  SanitizerArgsTest.cpp
-  )
-
-clang_target_link_libraries(ClangDriverTests
-  PRIVATE
-  clangDriver
-  clangBasic
-  clangFrontend # For TextDiagnosticPrinter.
-  )
diff --git a/gnu/llvm/clang/unittests/Driver/DistroTest.cpp b/gnu/llvm/clang/unittests/Driver/DistroTest.cpp
deleted file mode 100644
index b6e4ca9be85..00000000000
--- a/gnu/llvm/clang/unittests/Driver/DistroTest.cpp
+++ /dev/null
@@ -1,396 +0,0 @@
-//===- unittests/Driver/DistroTest.cpp --- ToolChains tests ---------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// Unit tests for Distro detection.
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/Driver/Distro.h"
-#include "llvm/Support/Host.h"
-#include "llvm/Support/VirtualFileSystem.h"
-#include "llvm/Support/raw_ostream.h"
-#include "gtest/gtest.h"
-
-using namespace clang;
-using namespace clang::driver;
-
-namespace {
-
-// The tests include all release-related files for each distribution
-// in the VFS, in order to make sure that earlier tests do not
-// accidentally result in incorrect distribution guess.
-
-TEST(DistroTest, DetectUbuntu) {
-  llvm::vfs::InMemoryFileSystem UbuntuTrustyFileSystem;
-  // Ubuntu uses Debian Sid version.
-  UbuntuTrustyFileSystem.addFile("/etc/debian_version", 0,
-      llvm::MemoryBuffer::getMemBuffer("jessie/sid\n"));
-  UbuntuTrustyFileSystem.addFile("/etc/lsb-release", 0,
-      llvm::MemoryBuffer::getMemBuffer("DISTRIB_ID=Ubuntu\n"
-                                       "DISTRIB_RELEASE=14.04\n"
-                                       "DISTRIB_CODENAME=trusty\n"
-                                       "DISTRIB_DESCRIPTION=\"Ubuntu 14.04 LTS\"\n"));
-  UbuntuTrustyFileSystem.addFile("/etc/os-release", 0,
-      llvm::MemoryBuffer::getMemBuffer("NAME=\"Ubuntu\"\n"
-                                       "VERSION=\"14.04, Trusty Tahr\"\n"
-                                       "ID=ubuntu\n"
-                                       "ID_LIKE=debian\n"
-                                       "PRETTY_NAME=\"Ubuntu 14.04 LTS\"\n"
-                                       "VERSION_ID=\"14.04\"\n"
-                                       "HOME_URL=\"http://www.ubuntu.com/\"\n"
-                                       "SUPPORT_URL=\"http://help.ubuntu.com/\"\n"
-                                       "BUG_REPORT_URL=\"http://bugs.launchpad.net/ubuntu/\"\n"));
-
-  Distro UbuntuTrusty{UbuntuTrustyFileSystem, llvm::Triple("unknown-pc-linux")};
-  ASSERT_EQ(Distro(Distro::UbuntuTrusty), UbuntuTrusty);
-  ASSERT_TRUE(UbuntuTrusty.IsUbuntu());
-  ASSERT_FALSE(UbuntuTrusty.IsRedhat());
-  ASSERT_FALSE(UbuntuTrusty.IsOpenSUSE());
-  ASSERT_FALSE(UbuntuTrusty.IsDebian());
-  ASSERT_FALSE(UbuntuTrusty.IsGentoo());
-
-  Distro UbuntuTrusty2{UbuntuTrustyFileSystem, llvm::Triple("unknown-pc-windows")};
-  ASSERT_EQ(Distro(Distro::UnknownDistro), UbuntuTrusty2);
-
-  llvm::vfs::InMemoryFileSystem UbuntuYakketyFileSystem;
-  UbuntuYakketyFileSystem.addFile("/etc/debian_version", 0,
-      llvm::MemoryBuffer::getMemBuffer("stretch/sid\n"));
-  UbuntuYakketyFileSystem.addFile("/etc/lsb-release", 0,
-      llvm::MemoryBuffer::getMemBuffer("DISTRIB_ID=Ubuntu\n"
-                                       "DISTRIB_RELEASE=16.10\n"
-                                       "DISTRIB_CODENAME=yakkety\n"
-                                       "DISTRIB_DESCRIPTION=\"Ubuntu 16.10\"\n"));
-  UbuntuYakketyFileSystem.addFile("/etc/os-release", 0,
-      llvm::MemoryBuffer::getMemBuffer("NAME=\"Ubuntu\"\n"
-                                       "VERSION=\"16.10 (Yakkety Yak)\"\n"
-                                       "ID=ubuntu\n"
-                                       "ID_LIKE=debian\n"
-                                       "PRETTY_NAME=\"Ubuntu 16.10\"\n"
-                                       "VERSION_ID=\"16.10\"\n"
-                                       "HOME_URL=\"http://www.ubuntu.com/\"\n"
-                                       "SUPPORT_URL=\"http://help.ubuntu.com/\"\n"
-                                       "BUG_REPORT_URL=\"http://bugs.launchpad.net/ubuntu/\"\n"
-                                       "PRIVACY_POLICY_URL=\"http://www.ubuntu.com/legal/terms-and-policies/privacy-policy\"\n"
-                                       "VERSION_CODENAME=yakkety\n"
-                                       "UBUNTU_CODENAME=yakkety\n"));
-
-  Distro UbuntuYakkety{UbuntuYakketyFileSystem, llvm::Triple("unknown-pc-linux")};
-  ASSERT_EQ(Distro(Distro::UbuntuYakkety), UbuntuYakkety);
-  ASSERT_TRUE(UbuntuYakkety.IsUbuntu());
-  ASSERT_FALSE(UbuntuYakkety.IsRedhat());
-  ASSERT_FALSE(UbuntuYakkety.IsOpenSUSE());
-  ASSERT_FALSE(UbuntuYakkety.IsDebian());
-  ASSERT_FALSE(UbuntuYakkety.IsGentoo());
-}
-
-TEST(DistroTest, DetectRedhat) {
-  llvm::vfs::InMemoryFileSystem Fedora25FileSystem;
-  Fedora25FileSystem.addFile("/etc/system-release-cpe", 0,
-      llvm::MemoryBuffer::getMemBuffer("cpe:/o:fedoraproject:fedora:25\n"));
-  // Both files are symlinks to fedora-release.
-  Fedora25FileSystem.addFile("/etc/system-release", 0,
-      llvm::MemoryBuffer::getMemBuffer("Fedora release 25 (Twenty Five)\n"));
-  Fedora25FileSystem.addFile("/etc/redhat-release", 0,
-      llvm::MemoryBuffer::getMemBuffer("Fedora release 25 (Twenty Five)\n"));
-  Fedora25FileSystem.addFile("/etc/fedora-release", 0,
-      llvm::MemoryBuffer::getMemBuffer("Fedora release 25 (Twenty Five)\n"));
-  Fedora25FileSystem.addFile("/etc/os-release", 0,
-      llvm::MemoryBuffer::getMemBuffer("NAME=Fedora\n"
-                                       "VERSION=\"25 (Twenty Five)\"\n"
-                                       "ID=fedora\n"
-                                       "VERSION_ID=25\n"
-                                       "PRETTY_NAME=\"Fedora 25 (Twenty Five)\"\n"
-                                       "ANSI_COLOR=\"0;34\"\n"
-                                       "CPE_NAME=\"cpe:/o:fedoraproject:fedora:25\"\n"
-                                       "HOME_URL=\"https://fedoraproject.org/\"\n"
-                                       "BUG_REPORT_URL=\"https://bugzilla.redhat.com/\"\n"
-                                       "REDHAT_BUGZILLA_PRODUCT=\"Fedora\"\n"
-                                       "REDHAT_BUGZILLA_PRODUCT_VERSION=25\n"
-                                       "REDHAT_SUPPORT_PRODUCT=\"Fedora\"\n"
-                                       "REDHAT_SUPPORT_PRODUCT_VERSION=25\n"
-                                       "PRIVACY_POLICY_URL=https://fedoraproject.org/wiki/Legal:PrivacyPolicy\n"));
-  Distro Fedora25{Fedora25FileSystem, llvm::Triple("unknown-pc-linux")};
-  ASSERT_EQ(Distro(Distro::Fedora), Fedora25);
-  ASSERT_FALSE(Fedora25.IsUbuntu());
-  ASSERT_TRUE(Fedora25.IsRedhat());
-  ASSERT_FALSE(Fedora25.IsOpenSUSE());
-  ASSERT_FALSE(Fedora25.IsDebian());
-  ASSERT_FALSE(Fedora25.IsGentoo());
-
-  llvm::vfs::InMemoryFileSystem CentOS7FileSystem;
-  CentOS7FileSystem.addFile("/etc/system-release-cpe", 0,
-      llvm::MemoryBuffer::getMemBuffer("cpe:/o:centos:centos:7\n"));
-  // Both files are symlinks to centos-release.
-  CentOS7FileSystem.addFile("/etc/system-release", 0,
-      llvm::MemoryBuffer::getMemBuffer("CentOS Linux release 7.2.1511 (Core) \n"));
-  CentOS7FileSystem.addFile("/etc/redhat-release", 0,
-      llvm::MemoryBuffer::getMemBuffer("CentOS Linux release 7.2.1511 (Core) \n"));
-  CentOS7FileSystem.addFile("/etc/centos-release", 0,
-      llvm::MemoryBuffer::getMemBuffer("CentOS Linux release 7.2.1511 (Core) \n"));
-  CentOS7FileSystem.addFile("/etc/centos-release-upstream", 0,
-      llvm::MemoryBuffer::getMemBuffer("Derived from Red Hat Enterprise Linux 7.2 (Source)\n"));
-  CentOS7FileSystem.addFile("/etc/os-release", 0,
-      llvm::MemoryBuffer::getMemBuffer("NAME=\"CentOS Linux\"\n"
-                                       "VERSION=\"7 (Core)\"\n"
-                                       "ID=\"centos\"\n"
-                                       "ID_LIKE=\"rhel fedora\"\n"
-                                       "VERSION_ID=\"7\"\n"
-                                       "PRETTY_NAME=\"CentOS Linux 7 (Core)\"\n"
-                                       "ANSI_COLOR=\"0;31\"\n"
-                                       "CPE_NAME=\"cpe:/o:centos:centos:7\"\n"
-                                       "HOME_URL=\"https://www.centos.org/\"\n"
-                                       "BUG_REPORT_URL=\"https://bugs.centos.org/\"\n"
-                                       "\n"
-                                       "CENTOS_MANTISBT_PROJECT=\"CentOS-7\"\n"
-                                       "CENTOS_MANTISBT_PROJECT_VERSION=\"7\"\n"
-                                       "REDHAT_SUPPORT_PRODUCT=\"centos\"\n"
-                                       "REDHAT_SUPPORT_PRODUCT_VERSION=\"7\"\n"));
-
-  Distro CentOS7{CentOS7FileSystem, llvm::Triple("unknown-pc-linux")};
-  ASSERT_EQ(Distro(Distro::RHEL7), CentOS7);
-  ASSERT_FALSE(CentOS7.IsUbuntu());
-  ASSERT_TRUE(CentOS7.IsRedhat());
-  ASSERT_FALSE(CentOS7.IsOpenSUSE());
-  ASSERT_FALSE(CentOS7.IsDebian());
-  ASSERT_FALSE(CentOS7.IsGentoo());
-}
-
-TEST(DistroTest, DetectOpenSUSE) {
-  llvm::vfs::InMemoryFileSystem OpenSUSELeap421FileSystem;
-  OpenSUSELeap421FileSystem.addFile("/etc/SuSE-release", 0,
-      llvm::MemoryBuffer::getMemBuffer("openSUSE 42.1 (x86_64)\n"
-                                       "VERSION = 42.1\n"
-                                       "CODENAME = Malachite\n"
-                                       "# /etc/SuSE-release is deprecated and will be removed in the future, use /etc/os-release instead\n"));
-  OpenSUSELeap421FileSystem.addFile("/etc/os-release", 0,
-      llvm::MemoryBuffer::getMemBuffer("NAME=\"openSUSE Leap\"\n"
-                                       "VERSION=\"42.1\"\n"
-                                       "VERSION_ID=\"42.1\"\n"
-                                       "PRETTY_NAME=\"openSUSE Leap 42.1 (x86_64)\"\n"
-                                       "ID=opensuse\n"
-                                       "ANSI_COLOR=\"0;32\"\n"
-                                       "CPE_NAME=\"cpe:/o:opensuse:opensuse:42.1\"\n"
-                                       "BUG_REPORT_URL=\"https://bugs.opensuse.org\"\n"
-                                       "HOME_URL=\"https://opensuse.org/\"\n"
-                                       "ID_LIKE=\"suse\"\n"));
-
-  Distro OpenSUSELeap421{OpenSUSELeap421FileSystem, llvm::Triple("unknown-pc-linux")};
-  ASSERT_EQ(Distro(Distro::OpenSUSE), OpenSUSELeap421);
-  ASSERT_FALSE(OpenSUSELeap421.IsUbuntu());
-  ASSERT_FALSE(OpenSUSELeap421.IsRedhat());
-  ASSERT_TRUE(OpenSUSELeap421.IsOpenSUSE());
-  ASSERT_FALSE(OpenSUSELeap421.IsDebian());
-  ASSERT_FALSE(OpenSUSELeap421.IsGentoo());
-
-  llvm::vfs::InMemoryFileSystem OpenSUSE132FileSystem;
-  OpenSUSE132FileSystem.addFile("/etc/SuSE-release", 0,
-      llvm::MemoryBuffer::getMemBuffer("openSUSE 13.2 (x86_64)\n"
-                                       "VERSION = 13.2\n"
-                                       "CODENAME = Harlequin\n"
-                                       "# /etc/SuSE-release is deprecated and will be removed in the future, use /etc/os-release instead\n"));
-  OpenSUSE132FileSystem.addFile("/etc/os-release", 0,
-      llvm::MemoryBuffer::getMemBuffer("NAME=openSUSE\n"
-                                       "VERSION=\"13.2 (Harlequin)\"\n"
-                                       "VERSION_ID=\"13.2\"\n"
-                                       "PRETTY_NAME=\"openSUSE 13.2 (Harlequin) (x86_64)\"\n"
-                                       "ID=opensuse\n"
-                                       "ANSI_COLOR=\"0;32\"\n"
-                                       "CPE_NAME=\"cpe:/o:opensuse:opensuse:13.2\"\n"
-                                       "BUG_REPORT_URL=\"https://bugs.opensuse.org\"\n"
-                                       "HOME_URL=\"https://opensuse.org/\"\n"
-                                       "ID_LIKE=\"suse\"\n"));
-
-  Distro OpenSUSE132{OpenSUSE132FileSystem, llvm::Triple("unknown-pc-linux")};
-  ASSERT_EQ(Distro(Distro::OpenSUSE), OpenSUSE132);
-  ASSERT_FALSE(OpenSUSE132.IsUbuntu());
-  ASSERT_FALSE(OpenSUSE132.IsRedhat());
-  ASSERT_TRUE(OpenSUSE132.IsOpenSUSE());
-  ASSERT_FALSE(OpenSUSE132.IsDebian());
-  ASSERT_FALSE(OpenSUSE132.IsGentoo());
-
-  llvm::vfs::InMemoryFileSystem SLES10FileSystem;
-  SLES10FileSystem.addFile("/etc/SuSE-release", 0,
-      llvm::MemoryBuffer::getMemBuffer("SUSE Linux Enterprise Server 10 (x86_64)\n"
-                                       "VERSION = 10\n"
-                                       "PATCHLEVEL = 4\n"));
-  SLES10FileSystem.addFile("/etc/lsb_release", 0,
-      llvm::MemoryBuffer::getMemBuffer("LSB_VERSION=\"core-2.0-noarch:core-3.0-noarch:core-2.0-x86_64:core-3.0-x86_64\"\n"));
-
-  // SLES10 is unsupported and therefore evaluates to unknown
-  Distro SLES10{SLES10FileSystem, llvm::Triple("unknown-pc-linux")};
-  ASSERT_EQ(Distro(Distro::UnknownDistro), SLES10);
-  ASSERT_FALSE(SLES10.IsUbuntu());
-  ASSERT_FALSE(SLES10.IsRedhat());
-  ASSERT_FALSE(SLES10.IsOpenSUSE());
-  ASSERT_FALSE(SLES10.IsDebian());
-  ASSERT_FALSE(SLES10.IsGentoo());
-}
-
-TEST(DistroTest, DetectDebian) {
-  llvm::vfs::InMemoryFileSystem DebianJessieFileSystem;
-  DebianJessieFileSystem.addFile("/etc/debian_version", 0,
-                                 llvm::MemoryBuffer::getMemBuffer("8.6\n"));
-  DebianJessieFileSystem.addFile("/etc/os-release", 0,
-      llvm::MemoryBuffer::getMemBuffer("PRETTY_NAME=\"Debian GNU/Linux 8 (jessie)\"\n"
-                                       "NAME=\"Debian GNU/Linux\"\n"
-                                       "VERSION_ID=\"8\"\n"
-                                       "VERSION=\"8 (jessie)\"\n"
-                                       "ID=debian\n"
-                                       "HOME_URL=\"http://www.debian.org/\"\n"
-                                       "SUPPORT_URL=\"http://www.debian.org/support\"\n"
-                                       "BUG_REPORT_URL=\"https://bugs.debian.org/\"\n"));
-
-  Distro DebianJessie{DebianJessieFileSystem, llvm::Triple("unknown-pc-linux")};
-  ASSERT_EQ(Distro(Distro::DebianJessie), DebianJessie);
-  ASSERT_FALSE(DebianJessie.IsUbuntu());
-  ASSERT_FALSE(DebianJessie.IsRedhat());
-  ASSERT_FALSE(DebianJessie.IsOpenSUSE());
-  ASSERT_TRUE(DebianJessie.IsDebian());
-  ASSERT_FALSE(DebianJessie.IsGentoo());
-
-  llvm::vfs::InMemoryFileSystem DebianStretchSidFileSystem;
-  DebianStretchSidFileSystem.addFile("/etc/debian_version", 0,
-                                 llvm::MemoryBuffer::getMemBuffer("stretch/sid\n"));
-  DebianStretchSidFileSystem.addFile("/etc/os-release", 0,
-      llvm::MemoryBuffer::getMemBuffer("PRETTY_NAME=\"Debian GNU/Linux stretch/sid\"\n"
-                                       "NAME=\"Debian GNU/Linux\"\n"
-                                       "ID=debian\n"
-                                       "HOME_URL=\"http://www.debian.org/\"\n"
-                                       "SUPPORT_URL=\"http://www.debian.org/support\"\n"
-                                       "BUG_REPORT_URL=\"https://bugs.debian.org/\"\n"));
-
-  Distro DebianStretchSid{DebianStretchSidFileSystem, llvm::Triple("unknown-pc-linux")};
-  ASSERT_EQ(Distro(Distro::DebianStretch), DebianStretchSid);
-  ASSERT_FALSE(DebianStretchSid.IsUbuntu());
-  ASSERT_FALSE(DebianStretchSid.IsRedhat());
-  ASSERT_FALSE(DebianStretchSid.IsOpenSUSE());
-  ASSERT_TRUE(DebianStretchSid.IsDebian());
-  ASSERT_FALSE(DebianStretchSid.IsGentoo());
-}
-
-TEST(DistroTest, DetectExherbo) {
-  llvm::vfs::InMemoryFileSystem ExherboFileSystem;
-  ExherboFileSystem.addFile("/etc/os-release", 0,
-      llvm::MemoryBuffer::getMemBuffer("NAME=\"Exherbo\"\n"
-                                       "PRETTY_NAME=\"Exherbo Linux\"\n"
-                                       "ID=exherbo\n"
-                                       "ANSI_COLOR=\"0;32\"\n"
-                                       "HOME_URL=\"https://www.exherbo.org/\"\n"
-                                       "SUPPORT_URL=\"irc://irc.freenode.net/#exherbo\"\n"
-                                       "BUG_REPORT_URL=\"https://bugs.exherbo.org/\"\n"));
-
-  Distro Exherbo{ExherboFileSystem, llvm::Triple("unknown-pc-linux")};
-  ASSERT_EQ(Distro(Distro::Exherbo), Exherbo);
-  ASSERT_FALSE(Exherbo.IsUbuntu());
-  ASSERT_FALSE(Exherbo.IsRedhat());
-  ASSERT_FALSE(Exherbo.IsOpenSUSE());
-  ASSERT_FALSE(Exherbo.IsDebian());
-  ASSERT_FALSE(Exherbo.IsGentoo());
-}
-
-TEST(DistroTest, DetectArchLinux) {
-  llvm::vfs::InMemoryFileSystem ArchLinuxFileSystem;
-  ArchLinuxFileSystem.addFile("/etc/arch-release", 0, // (empty)
-                                 llvm::MemoryBuffer::getMemBuffer(""));
-  ArchLinuxFileSystem.addFile("/etc/os-release", 0,
-      llvm::MemoryBuffer::getMemBuffer("NAME=\"Arch Linux\"\n"
-                                       "ID=arch\n"
-                                       "PRETTY_NAME=\"Arch Linux\"\n"
-                                       "ANSI_COLOR=\"0;36\"\n"
-                                       "HOME_URL=\"https://www.archlinux.org/\"\n"
-                                       "SUPPORT_URL=\"https://bbs.archlinux.org/\"\n"
-                                       "BUG_REPORT_URL=\"https://bugs.archlinux.org/\"\n"));
-
-  Distro ArchLinux{ArchLinuxFileSystem, llvm::Triple("unknown-pc-linux")};
-  ASSERT_EQ(Distro(Distro::ArchLinux), ArchLinux);
-  ASSERT_FALSE(ArchLinux.IsUbuntu());
-  ASSERT_FALSE(ArchLinux.IsRedhat());
-  ASSERT_FALSE(ArchLinux.IsOpenSUSE());
-  ASSERT_FALSE(ArchLinux.IsDebian());
-  ASSERT_FALSE(ArchLinux.IsGentoo());
-}
-
-TEST(DistroTest, DetectGentoo) {
-  llvm::vfs::InMemoryFileSystem GentooFileSystem;
-  GentooFileSystem.addFile(
-      "/etc/gentoo-release", 0,
-      llvm::MemoryBuffer::getMemBuffer("Gentoo Base System release 2.6"));
-  GentooFileSystem.addFile(
-      "/etc/os-release", 0,
-      llvm::MemoryBuffer::getMemBuffer(
-          "NAME=Gentoo\n"
-          "ID=gentoo\n"
-          "PRETTY_NAME=\"Gentoo/Linux\"\n"
-          "ANSI_COLOR=\"1;32\"\n"
-          "HOME_URL=\"https://www.gentoo.org/\"\n"
-          "SUPPORT_URL=\"https://www.gentoo.org/support/\"\n"
-          "BUG_REPORT_URL=\"https://bugs.gentoo.org/\"\n"));
-
-  Distro Gentoo{GentooFileSystem, llvm::Triple("unknown-pc-linux")};
-  ASSERT_EQ(Distro(Distro::Gentoo), Gentoo);
-  ASSERT_FALSE(Gentoo.IsUbuntu());
-  ASSERT_FALSE(Gentoo.IsRedhat());
-  ASSERT_FALSE(Gentoo.IsOpenSUSE());
-  ASSERT_FALSE(Gentoo.IsDebian());
-  ASSERT_TRUE(Gentoo.IsGentoo());
-}
-
-TEST(DistroTest, DetectWindowsAndCrossCompile) {
-
-  class CountingFileSystem : public llvm::vfs::ProxyFileSystem {
-  public:
-    CountingFileSystem() : ProxyFileSystem(llvm::vfs::getRealFileSystem()) {}
-
-    llvm::ErrorOr<llvm::vfs::Status> status(const llvm::Twine &Path) override {
-      ++Count;
-      return llvm::vfs::ProxyFileSystem::status(Path);
-    }
-
-    llvm::ErrorOr<std::unique_ptr<llvm::vfs::File>>
-    openFileForRead(const llvm::Twine &Path) override {
-      ++Count;
-      return llvm::vfs::ProxyFileSystem::openFileForRead(Path);
-    }
-
-    unsigned Count{};
-  };
-
-  llvm::IntrusiveRefCntPtr<llvm::vfs::FileSystem> RFS =
-      llvm::vfs::getRealFileSystem();
-  llvm::Triple Host(llvm::sys::getProcessTriple());
-
-  CountingFileSystem CFileSystem;
-  Distro LinuxDistro{CFileSystem, llvm::Triple("unknown-pc-linux")};
-  if (Host.isOSWindows()) {
-    ASSERT_EQ(Distro(Distro::UnknownDistro), LinuxDistro);
-    ASSERT_GT(CFileSystem.Count, 0U);
-  }
-
-  Distro WinDistro{CFileSystem, llvm::Triple("unknown-pc-windows")};
-  ASSERT_EQ(Distro(Distro::UnknownDistro), WinDistro);
-  ASSERT_GT(CFileSystem.Count, 0U);
-
-  // When running on Windows along with a real file system, ensure that no
-  // distro is returned if targeting Linux
-  if (Host.isOSWindows()) {
-    Distro LinuxRealDistro{*RFS, llvm::Triple("unknown-pc-linux")};
-    ASSERT_EQ(Distro(Distro::UnknownDistro), LinuxRealDistro);
-  }
-  // When running on Linux, check if the distro is the same as the host when
-  // targeting Linux
-  if (Host.isOSLinux()) {
-    Distro HostDistro{*RFS, Host};
-    Distro LinuxRealDistro{*RFS, llvm::Triple("unknown-pc-linux")};
-    ASSERT_EQ(HostDistro, LinuxRealDistro);
-  }
-
-  Distro WinRealDistro{*RFS, llvm::Triple("unknown-pc-windows")};
-  ASSERT_EQ(Distro(Distro::UnknownDistro), WinRealDistro);
-}
-
-} // end anonymous namespace
diff --git a/gnu/llvm/clang/unittests/Driver/ModuleCacheTest.cpp b/gnu/llvm/clang/unittests/Driver/ModuleCacheTest.cpp
deleted file mode 100644
index 6a0f68f26a6..00000000000
--- a/gnu/llvm/clang/unittests/Driver/ModuleCacheTest.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-//===- unittests/Driver/ModuleCacheTest.cpp -------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// Unit tests for the LLDB module cache API.
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/Driver/Driver.h"
-#include "gtest/gtest.h"
-using namespace clang;
-using namespace clang::driver;
-
-namespace {
-
-TEST(ModuleCacheTest, GetTargetAndMode) {
-  SmallString<128> Buf;
-  Driver::getDefaultModuleCachePath(Buf);
-  StringRef Path = Buf;
-  EXPECT_TRUE(Path.find("clang") != Path.npos);
-  EXPECT_TRUE(Path.endswith("ModuleCache"));  
-}
-} // end anonymous namespace.
diff --git a/gnu/llvm/clang/unittests/Driver/MultilibTest.cpp b/gnu/llvm/clang/unittests/Driver/MultilibTest.cpp
deleted file mode 100644
index 0731c81d9f5..00000000000
--- a/gnu/llvm/clang/unittests/Driver/MultilibTest.cpp
+++ /dev/null
@@ -1,375 +0,0 @@
-//===- unittests/Driver/MultilibTest.cpp --- Multilib tests ---------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// Unit tests for Multilib and MultilibSet
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/Driver/Multilib.h"
-#include "clang/Basic/LLVM.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/ADT/StringSwitch.h"
-#include "gtest/gtest.h"
-
-using namespace clang::driver;
-using namespace clang;
-
-TEST(MultilibTest, MultilibValidity) {
-
-  ASSERT_TRUE(Multilib().isValid()) << "Empty multilib is not valid";
-
-  ASSERT_TRUE(Multilib().flag("+foo").isValid())
-      << "Single indicative flag is not valid";
-
-  ASSERT_TRUE(Multilib().flag("-foo").isValid())
-      << "Single contraindicative flag is not valid";
-
-  ASSERT_FALSE(Multilib().flag("+foo").flag("-foo").isValid())
-      << "Conflicting flags should invalidate the Multilib";
-
-  ASSERT_TRUE(Multilib().flag("+foo").flag("+foo").isValid())
-      << "Multilib should be valid even if it has the same flag twice";
-
-  ASSERT_TRUE(Multilib().flag("+foo").flag("-foobar").isValid())
-      << "Seemingly conflicting prefixes shouldn't actually conflict";
-}
-
-TEST(MultilibTest, OpEqReflexivity1) {
-  Multilib M;
-  ASSERT_TRUE(M == M) << "Multilib::operator==() is not reflexive";
-}
-
-TEST(MultilibTest, OpEqReflexivity2) {
-  ASSERT_TRUE(Multilib() == Multilib())
-      << "Separately constructed default multilibs are not equal";
-}
-
-TEST(MultilibTest, OpEqReflexivity3) {
-  Multilib M1, M2;
-  M1.flag("+foo");
-  M2.flag("+foo");
-  ASSERT_TRUE(M1 == M2) << "Multilibs with the same flag should be the same";
-}
-
-TEST(MultilibTest, OpEqInequivalence1) {
-  Multilib M1, M2;
-  M1.flag("+foo");
-  M2.flag("-foo");
-  ASSERT_FALSE(M1 == M2) << "Multilibs with conflicting flags are not the same";
-  ASSERT_FALSE(M2 == M1)
-      << "Multilibs with conflicting flags are not the same (commuted)";
-}
-
-TEST(MultilibTest, OpEqInequivalence2) {
-  Multilib M1, M2;
-  M2.flag("+foo");
-  ASSERT_FALSE(M1 == M2) << "Flags make Multilibs different";
-}
-
-TEST(MultilibTest, OpEqEquivalence1) {
-  Multilib M1, M2;
-  M1.flag("+foo");
-  M2.flag("+foo").flag("+foo");
-  ASSERT_TRUE(M1 == M2) << "Flag duplication shouldn't affect equivalence";
-  ASSERT_TRUE(M2 == M1)
-      << "Flag duplication shouldn't affect equivalence (commuted)";
-}
-
-TEST(MultilibTest, OpEqEquivalence2) {
-  Multilib M1("64");
-  Multilib M2;
-  M2.gccSuffix("/64");
-  ASSERT_TRUE(M1 == M2)
-      << "Constructor argument must match Multilib::gccSuffix()";
-  ASSERT_TRUE(M2 == M1)
-      << "Constructor argument must match Multilib::gccSuffix() (commuted)";
-}
-
-TEST(MultilibTest, OpEqEquivalence3) {
-  Multilib M1("", "32");
-  Multilib M2;
-  M2.osSuffix("/32");
-  ASSERT_TRUE(M1 == M2)
-      << "Constructor argument must match Multilib::osSuffix()";
-  ASSERT_TRUE(M2 == M1)
-      << "Constructor argument must match Multilib::osSuffix() (commuted)";
-}
-
-TEST(MultilibTest, OpEqEquivalence4) {
-  Multilib M1("", "", "16");
-  Multilib M2;
-  M2.includeSuffix("/16");
-  ASSERT_TRUE(M1 == M2)
-      << "Constructor argument must match Multilib::includeSuffix()";
-  ASSERT_TRUE(M2 == M1)
-      << "Constructor argument must match Multilib::includeSuffix() (commuted)";
-}
-
-TEST(MultilibTest, OpEqInequivalence3) {
-  Multilib M1("foo");
-  Multilib M2("bar");
-  ASSERT_FALSE(M1 == M2) << "Differing gccSuffixes should be different";
-  ASSERT_FALSE(M2 == M1)
-      << "Differing gccSuffixes should be different (commuted)";
-}
-
-TEST(MultilibTest, OpEqInequivalence4) {
-  Multilib M1("", "foo");
-  Multilib M2("", "bar");
-  ASSERT_FALSE(M1 == M2) << "Differing osSuffixes should be different";
-  ASSERT_FALSE(M2 == M1)
-      << "Differing osSuffixes should be different (commuted)";
-}
-
-TEST(MultilibTest, OpEqInequivalence5) {
-  Multilib M1("", "", "foo");
-  Multilib M2("", "", "bar");
-  ASSERT_FALSE(M1 == M2) << "Differing includeSuffixes should be different";
-  ASSERT_FALSE(M2 == M1)
-      << "Differing includeSuffixes should be different (commuted)";
-}
-
-TEST(MultilibTest, Construction1) {
-  Multilib M("gcc64", "os64", "inc64");
-  ASSERT_TRUE(M.gccSuffix() == "/gcc64");
-  ASSERT_TRUE(M.osSuffix() == "/os64");
-  ASSERT_TRUE(M.includeSuffix() == "/inc64");
-}
-
-TEST(MultilibTest, Construction2) {
-  Multilib M1;
-  Multilib M2("");
-  Multilib M3("", "");
-  Multilib M4("", "", "");
-  ASSERT_TRUE(M1 == M2)
-      << "Default arguments to Multilib constructor broken (first argument)";
-  ASSERT_TRUE(M1 == M3)
-      << "Default arguments to Multilib constructor broken (second argument)";
-  ASSERT_TRUE(M1 == M4)
-      << "Default arguments to Multilib constructor broken (third argument)";
-}
-
-TEST(MultilibTest, Construction3) {
-  Multilib M = Multilib().flag("+f1").flag("+f2").flag("-f3");
-  for (Multilib::flags_list::const_iterator I = M.flags().begin(),
-                                            E = M.flags().end();
-       I != E; ++I) {
-    ASSERT_TRUE(llvm::StringSwitch<bool>(*I)
-                    .Cases("+f1", "+f2", "-f3", true)
-                    .Default(false));
-  }
-}
-
-static bool hasFlag(const Multilib &M, StringRef Flag) {
-  for (Multilib::flags_list::const_iterator I = M.flags().begin(),
-                                            E = M.flags().end();
-       I != E; ++I) {
-    if (*I == Flag)
-      return true;
-    else if (StringRef(*I).substr(1) == Flag.substr(1))
-      return false;
-  }
-  return false;
-}
-
-TEST(MultilibTest, SetConstruction1) {
-  // Single maybe
-  MultilibSet MS;
-  ASSERT_TRUE(MS.size() == 0);
-  MS.Maybe(Multilib("64").flag("+m64"));
-  ASSERT_TRUE(MS.size() == 2);
-  for (MultilibSet::const_iterator I = MS.begin(), E = MS.end(); I != E; ++I) {
-    if (I->gccSuffix() == "/64")
-      ASSERT_TRUE(I->flags()[0] == "+m64");
-    else if (I->gccSuffix() == "")
-      ASSERT_TRUE(I->flags()[0] == "-m64");
-    else
-      FAIL() << "Unrecognized gccSufix: " << I->gccSuffix();
-  }
-}
-
-TEST(MultilibTest, SetConstruction2) {
-  // Double maybe
-  MultilibSet MS;
-  MS.Maybe(Multilib("sof").flag("+sof"));
-  MS.Maybe(Multilib("el").flag("+EL"));
-  ASSERT_TRUE(MS.size() == 4);
-  for (MultilibSet::const_iterator I = MS.begin(), E = MS.end(); I != E; ++I) {
-    ASSERT_TRUE(I->isValid()) << "Multilb " << *I << " should be valid";
-    ASSERT_TRUE(llvm::StringSwitch<bool>(I->gccSuffix())
-                    .Cases("", "/sof", "/el", "/sof/el", true)
-                    .Default(false))
-        << "Multilib " << *I << " wasn't expected";
-    ASSERT_TRUE(llvm::StringSwitch<bool>(I->gccSuffix())
-                    .Case("", hasFlag(*I, "-sof"))
-                    .Case("/sof", hasFlag(*I, "+sof"))
-                    .Case("/el", hasFlag(*I, "-sof"))
-                    .Case("/sof/el", hasFlag(*I, "+sof"))
-                    .Default(false))
-        << "Multilib " << *I << " didn't have the appropriate {+,-}sof flag";
-    ASSERT_TRUE(llvm::StringSwitch<bool>(I->gccSuffix())
-                    .Case("", hasFlag(*I, "-EL"))
-                    .Case("/sof", hasFlag(*I, "-EL"))
-                    .Case("/el", hasFlag(*I, "+EL"))
-                    .Case("/sof/el", hasFlag(*I, "+EL"))
-                    .Default(false))
-        << "Multilib " << *I << " didn't have the appropriate {+,-}EL flag";
-  }
-}
-
-TEST(MultilibTest, SetPushback) {
-  MultilibSet MS;
-  MS.push_back(Multilib("one"));
-  MS.push_back(Multilib("two"));
-  ASSERT_TRUE(MS.size() == 2);
-  for (MultilibSet::const_iterator I = MS.begin(), E = MS.end(); I != E; ++I) {
-    ASSERT_TRUE(llvm::StringSwitch<bool>(I->gccSuffix())
-                    .Cases("/one", "/two", true)
-                    .Default(false));
-  }
-  MS.clear();
-  ASSERT_TRUE(MS.size() == 0);
-}
-
-TEST(MultilibTest, SetRegexFilter) {
-  MultilibSet MS;
-  MS.Maybe(Multilib("one"));
-  MS.Maybe(Multilib("two"));
-  MS.Maybe(Multilib("three"));
-  ASSERT_EQ(MS.size(), (unsigned)2 * 2 * 2)
-      << "Size before filter was incorrect. Contents:\n" << MS;
-  MS.FilterOut("/one/two/three");
-  ASSERT_EQ(MS.size(), (unsigned)2 * 2 * 2 - 1)
-      << "Size after filter was incorrect. Contents:\n" << MS;
-  for (MultilibSet::const_iterator I = MS.begin(), E = MS.end(); I != E; ++I) {
-    ASSERT_TRUE(I->gccSuffix() != "/one/two/three")
-        << "The filter should have removed " << *I;
-  }
-}
-
-TEST(MultilibTest, SetFilterObject) {
-  MultilibSet MS;
-  MS.Maybe(Multilib("orange"));
-  MS.Maybe(Multilib("pear"));
-  MS.Maybe(Multilib("plum"));
-  ASSERT_EQ((int)MS.size(), 1 /* Default */ +
-                            1 /* pear */ +
-                            1 /* plum */ +
-                            1 /* pear/plum */ +
-                            1 /* orange */ +
-                            1 /* orange/pear */ +
-                            1 /* orange/plum */ +
-                            1 /* orange/pear/plum */ )
-      << "Size before filter was incorrect. Contents:\n" << MS;
-  MS.FilterOut([](const Multilib &M) {
-    return StringRef(M.gccSuffix()).startswith("/p");
-  });
-  ASSERT_EQ((int)MS.size(), 1 /* Default */ +
-                            1 /* orange */ +
-                            1 /* orange/pear */ +
-                            1 /* orange/plum */ + 
-                            1 /* orange/pear/plum */ )
-      << "Size after filter was incorrect. Contents:\n" << MS;
-  for (MultilibSet::const_iterator I = MS.begin(), E = MS.end(); I != E; ++I) {
-    ASSERT_FALSE(StringRef(I->gccSuffix()).startswith("/p"))
-        << "The filter should have removed " << *I;
-  }
-}
-
-TEST(MultilibTest, SetSelection1) {
-  MultilibSet MS1 = MultilibSet()
-    .Maybe(Multilib("64").flag("+m64"));
-
-  Multilib::flags_list FlagM64;
-  FlagM64.push_back("+m64");
-  Multilib SelectionM64;
-  ASSERT_TRUE(MS1.select(FlagM64, SelectionM64))
-      << "Flag set was {\"+m64\"}, but selection not found";
-  ASSERT_TRUE(SelectionM64.gccSuffix() == "/64")
-      << "Selection picked " << SelectionM64 << " which was not expected";
-
-  Multilib::flags_list FlagNoM64;
-  FlagNoM64.push_back("-m64");
-  Multilib SelectionNoM64;
-  ASSERT_TRUE(MS1.select(FlagNoM64, SelectionNoM64))
-      << "Flag set was {\"-m64\"}, but selection not found";
-  ASSERT_TRUE(SelectionNoM64.gccSuffix() == "")
-      << "Selection picked " << SelectionNoM64 << " which was not expected";
-}
-
-TEST(MultilibTest, SetSelection2) {
-  MultilibSet MS2 = MultilibSet()
-    .Maybe(Multilib("el").flag("+EL"))
-    .Maybe(Multilib("sf").flag("+SF"));
-
-  for (unsigned I = 0; I < 4; ++I) {
-    bool IsEL = I & 0x1;
-    bool IsSF = I & 0x2;
-    Multilib::flags_list Flags;
-    if (IsEL)
-      Flags.push_back("+EL");
-    else
-      Flags.push_back("-EL");
-
-    if (IsSF)
-      Flags.push_back("+SF");
-    else
-      Flags.push_back("-SF");
-
-    Multilib Selection;
-    ASSERT_TRUE(MS2.select(Flags, Selection)) << "Selection failed for "
-                                              << (IsEL ? "+EL" : "-EL") << " "
-                                              << (IsSF ? "+SF" : "-SF");
-
-    std::string Suffix;
-    if (IsEL)
-      Suffix += "/el";
-    if (IsSF)
-      Suffix += "/sf";
-
-    ASSERT_EQ(Selection.gccSuffix(), Suffix) << "Selection picked " << Selection
-                                             << " which was not expected ";
-  }
-}
-
-TEST(MultilibTest, SetCombineWith) {
-  MultilibSet Coffee;
-  Coffee.push_back(Multilib("coffee"));
-  MultilibSet Milk;
-  Milk.push_back(Multilib("milk"));
-  MultilibSet Latte;
-  ASSERT_EQ(Latte.size(), (unsigned)0);
-  Latte.combineWith(Coffee);
-  ASSERT_EQ(Latte.size(), (unsigned)1);
-  Latte.combineWith(Milk);
-  ASSERT_EQ(Latte.size(), (unsigned)2);
-}
-
-TEST(MultilibTest, SetPriority) {
-  MultilibSet MS;
-  MS.push_back(Multilib("foo", {}, {}, 1).flag("+foo"));
-  MS.push_back(Multilib("bar", {}, {}, 2).flag("+bar"));
-
-  Multilib::flags_list Flags1;
-  Flags1.push_back("+foo");
-  Flags1.push_back("-bar");
-  Multilib Selection1;
-  ASSERT_TRUE(MS.select(Flags1, Selection1))
-      << "Flag set was {\"+foo\"}, but selection not found";
-  ASSERT_TRUE(Selection1.gccSuffix() == "/foo")
-      << "Selection picked " << Selection1 << " which was not expected";
-
-  Multilib::flags_list Flags2;
-  Flags2.push_back("+foo");
-  Flags2.push_back("+bar");
-  Multilib Selection2;
-  ASSERT_TRUE(MS.select(Flags2, Selection2))
-      << "Flag set was {\"+bar\"}, but selection not found";
-  ASSERT_TRUE(Selection2.gccSuffix() == "/bar")
-      << "Selection picked " << Selection2 << " which was not expected";
-}
diff --git a/gnu/llvm/clang/unittests/Driver/SanitizerArgsTest.cpp b/gnu/llvm/clang/unittests/Driver/SanitizerArgsTest.cpp
deleted file mode 100644
index 2539330126f..00000000000
--- a/gnu/llvm/clang/unittests/Driver/SanitizerArgsTest.cpp
+++ /dev/null
@@ -1,141 +0,0 @@
-//===- unittests/Driver/SanitizerArgsTest.cpp -----------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/Basic/Diagnostic.h"
-#include "clang/Basic/DiagnosticIDs.h"
-#include "clang/Basic/DiagnosticOptions.h"
-#include "clang/Driver/Compilation.h"
-#include "clang/Driver/Driver.h"
-#include "clang/Driver/Job.h"
-#include "clang/Frontend/TextDiagnosticPrinter.h"
-#include "llvm/ADT/ArrayRef.h"
-#include "llvm/ADT/IntrusiveRefCntPtr.h"
-#include "llvm/ADT/Optional.h"
-#include "llvm/ADT/SmallString.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/Support/Host.h"
-#include "llvm/Support/MemoryBuffer.h"
-#include "llvm/Support/Path.h"
-#include "llvm/Support/VirtualFileSystem.h"
-#include "llvm/Support/raw_ostream.h"
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-#include <cstdlib>
-#include <memory>
-#include <string>
-using namespace clang;
-using namespace clang::driver;
-
-using ::testing::Contains;
-using ::testing::StrEq;
-
-namespace {
-
-static constexpr const char *ClangBinary = "clang";
-static constexpr const char *InputFile = "/sources/foo.c";
-
-std::string concatPaths(llvm::ArrayRef<StringRef> Components) {
-  llvm::SmallString<128> P;
-  for (StringRef C : Components)
-    llvm::sys::path::append(P, C);
-  return std::string(P);
-}
-
-class SanitizerArgsTest : public ::testing::Test {
-protected:
-  const Command &emulateSingleCompilation(std::vector<std::string> ExtraArgs,
-                                          std::vector<std::string> ExtraFiles) {
-    assert(!DriverInstance && "Running twice is not allowed");
-
-    llvm::IntrusiveRefCntPtr<DiagnosticOptions> Opts = new DiagnosticOptions;
-    DiagnosticsEngine Diags(
-        new DiagnosticIDs, Opts,
-        new TextDiagnosticPrinter(llvm::errs(), Opts.get()));
-    DriverInstance.emplace(ClangBinary, "x86_64-unknown-linux-gnu", Diags,
-                           "clang LLVM compiler", prepareFS(ExtraFiles));
-
-    std::vector<const char *> Args = {ClangBinary};
-    for (const auto &A : ExtraArgs)
-      Args.push_back(A.c_str());
-    Args.push_back("-c");
-    Args.push_back(InputFile);
-
-    CompilationJob.reset(DriverInstance->BuildCompilation(Args));
-
-    if (Diags.hasErrorOccurred())
-      ADD_FAILURE() << "Error occurred while parsing compilation arguments. "
-                       "See stderr for details.";
-
-    const auto &Commands = CompilationJob->getJobs().getJobs();
-    assert(Commands.size() == 1);
-    return *Commands.front();
-  }
-
-private:
-  llvm::IntrusiveRefCntPtr<llvm::vfs::InMemoryFileSystem>
-  prepareFS(llvm::ArrayRef<std::string> ExtraFiles) {
-    llvm::IntrusiveRefCntPtr<llvm::vfs::InMemoryFileSystem> FS =
-        new llvm::vfs::InMemoryFileSystem;
-    FS->addFile(ClangBinary, time_t(), llvm::MemoryBuffer::getMemBuffer(""));
-    FS->addFile(InputFile, time_t(), llvm::MemoryBuffer::getMemBuffer(""));
-    for (llvm::StringRef F : ExtraFiles)
-      FS->addFile(F, time_t(), llvm::MemoryBuffer::getMemBuffer(""));
-    return FS;
-  }
-
-  llvm::Optional<Driver> DriverInstance;
-  std::unique_ptr<driver::Compilation> CompilationJob;
-};
-
-TEST_F(SanitizerArgsTest, Ignorelists) {
-  const std::string ResourceDir = "/opt/llvm/lib/resources";
-  const std::string UserIgnorelist = "/source/my_ignorelist.txt";
-  const std::string ASanIgnorelist =
-      concatPaths({ResourceDir, "share", "asan_ignorelist.txt"});
-
-  auto &Command = emulateSingleCompilation(
-      /*ExtraArgs=*/{"-fsanitize=address", "-resource-dir", ResourceDir,
-                     std::string("-fsanitize-ignorelist=") + UserIgnorelist},
-      /*ExtraFiles=*/{ASanIgnorelist, UserIgnorelist});
-
-  // System ignorelists are added based on resource-dir.
-  EXPECT_THAT(Command.getArguments(),
-              Contains(StrEq(std::string("-fsanitize-system-ignorelist=") +
-                             ASanIgnorelist)));
-  // User ignorelists should also be added.
-  EXPECT_THAT(
-      Command.getArguments(),
-      Contains(StrEq(std::string("-fsanitize-ignorelist=") + UserIgnorelist)));
-}
-
-TEST_F(SanitizerArgsTest, XRayLists) {
-  const std::string XRayWhitelist = "/source/xray_whitelist.txt";
-  const std::string XRayIgnorelist = "/source/xray_ignorelist.txt";
-  const std::string XRayAttrList = "/source/xray_attr_list.txt";
-
-  auto &Command = emulateSingleCompilation(
-      /*ExtraArgs=*/
-      {
-          "-fxray-instrument",
-          "-fxray-always-instrument=" + XRayWhitelist,
-          "-fxray-never-instrument=" + XRayIgnorelist,
-          "-fxray-attr-list=" + XRayAttrList,
-      },
-      /*ExtraFiles=*/{XRayWhitelist, XRayIgnorelist, XRayAttrList});
-
-  // Ignorelists exist in the filesystem, so they should be added to the
-  // compilation command, produced by the driver.
-  EXPECT_THAT(Command.getArguments(),
-              Contains(StrEq("-fxray-always-instrument=" + XRayWhitelist)));
-  EXPECT_THAT(Command.getArguments(),
-              Contains(StrEq("-fxray-never-instrument=" + XRayIgnorelist)));
-  EXPECT_THAT(Command.getArguments(),
-              Contains(StrEq("-fxray-attr-list=" + XRayAttrList)));
-}
-
-} // namespace
diff --git a/gnu/llvm/clang/unittests/Driver/ToolChainTest.cpp b/gnu/llvm/clang/unittests/Driver/ToolChainTest.cpp
deleted file mode 100644
index f1174729577..00000000000
--- a/gnu/llvm/clang/unittests/Driver/ToolChainTest.cpp
+++ /dev/null
@@ -1,367 +0,0 @@
-//===- unittests/Driver/ToolChainTest.cpp --- ToolChain tests -------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// Unit tests for ToolChains.
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/Driver/ToolChain.h"
-#include "clang/Basic/DiagnosticIDs.h"
-#include "clang/Basic/DiagnosticOptions.h"
-#include "clang/Basic/LLVM.h"
-#include "clang/Driver/Compilation.h"
-#include "clang/Driver/Driver.h"
-#include "llvm/ADT/ArrayRef.h"
-#include "llvm/Support/TargetRegistry.h"
-#include "llvm/Support/TargetSelect.h"
-#include "llvm/Support/VirtualFileSystem.h"
-#include "llvm/Support/raw_ostream.h"
-#include "gtest/gtest.h"
-using namespace clang;
-using namespace clang::driver;
-
-namespace {
-
-TEST(ToolChainTest, VFSGCCInstallation) {
-  IntrusiveRefCntPtr<DiagnosticOptions> DiagOpts = new DiagnosticOptions();
-
-  IntrusiveRefCntPtr<DiagnosticIDs> DiagID(new DiagnosticIDs());
-  struct TestDiagnosticConsumer : public DiagnosticConsumer {};
-  IntrusiveRefCntPtr<llvm::vfs::InMemoryFileSystem> InMemoryFileSystem(
-      new llvm::vfs::InMemoryFileSystem);
-
-  const char *EmptyFiles[] = {
-      "foo.cpp",
-      "/bin/clang",
-      "/usr/lib/gcc/arm-linux-gnueabi/4.6.1/crtbegin.o",
-      "/usr/lib/gcc/arm-linux-gnueabi/4.6.1/crtend.o",
-      "/usr/lib/gcc/arm-linux-gnueabihf/4.6.3/crtbegin.o",
-      "/usr/lib/gcc/arm-linux-gnueabihf/4.6.3/crtend.o",
-      "/usr/lib/arm-linux-gnueabi/crt1.o",
-      "/usr/lib/arm-linux-gnueabi/crti.o",
-      "/usr/lib/arm-linux-gnueabi/crtn.o",
-      "/usr/lib/arm-linux-gnueabihf/crt1.o",
-      "/usr/lib/arm-linux-gnueabihf/crti.o",
-      "/usr/lib/arm-linux-gnueabihf/crtn.o",
-      "/usr/include/arm-linux-gnueabi/.keep",
-      "/usr/include/arm-linux-gnueabihf/.keep",
-      "/lib/arm-linux-gnueabi/.keep",
-      "/lib/arm-linux-gnueabihf/.keep",
-
-      "/sysroot/usr/lib/gcc/arm-linux-gnueabi/4.5.1/crtbegin.o",
-      "/sysroot/usr/lib/gcc/arm-linux-gnueabi/4.5.1/crtend.o",
-      "/sysroot/usr/lib/gcc/arm-linux-gnueabihf/4.5.3/crtbegin.o",
-      "/sysroot/usr/lib/gcc/arm-linux-gnueabihf/4.5.3/crtend.o",
-      "/sysroot/usr/lib/arm-linux-gnueabi/crt1.o",
-      "/sysroot/usr/lib/arm-linux-gnueabi/crti.o",
-      "/sysroot/usr/lib/arm-linux-gnueabi/crtn.o",
-      "/sysroot/usr/lib/arm-linux-gnueabihf/crt1.o",
-      "/sysroot/usr/lib/arm-linux-gnueabihf/crti.o",
-      "/sysroot/usr/lib/arm-linux-gnueabihf/crtn.o",
-      "/sysroot/usr/include/arm-linux-gnueabi/.keep",
-      "/sysroot/usr/include/arm-linux-gnueabihf/.keep",
-      "/sysroot/lib/arm-linux-gnueabi/.keep",
-      "/sysroot/lib/arm-linux-gnueabihf/.keep",
-  };
-
-  for (const char *Path : EmptyFiles)
-    InMemoryFileSystem->addFile(Path, 0,
-                                llvm::MemoryBuffer::getMemBuffer("\n"));
-
-  {
-    DiagnosticsEngine Diags(DiagID, &*DiagOpts, new TestDiagnosticConsumer);
-    Driver TheDriver("/bin/clang", "arm-linux-gnueabihf", Diags,
-                     "clang LLVM compiler", InMemoryFileSystem);
-    std::unique_ptr<Compilation> C(TheDriver.BuildCompilation(
-        {"-fsyntax-only", "--gcc-toolchain=", "--sysroot=", "foo.cpp"}));
-    ASSERT_TRUE(C);
-    std::string S;
-    {
-      llvm::raw_string_ostream OS(S);
-      C->getDefaultToolChain().printVerboseInfo(OS);
-    }
-#if _WIN32
-    std::replace(S.begin(), S.end(), '\\', '/');
-#endif
-    EXPECT_EQ(
-        "Found candidate GCC installation: "
-        "/usr/lib/gcc/arm-linux-gnueabihf/4.6.3\n"
-        "Selected GCC installation: /usr/lib/gcc/arm-linux-gnueabihf/4.6.3\n"
-        "Candidate multilib: .;@m32\n"
-        "Selected multilib: .;@m32\n",
-        S);
-  }
-
-  {
-    DiagnosticsEngine Diags(DiagID, &*DiagOpts, new TestDiagnosticConsumer);
-    Driver TheDriver("/bin/clang", "arm-linux-gnueabihf", Diags,
-                     "clang LLVM compiler", InMemoryFileSystem);
-    std::unique_ptr<Compilation> C(TheDriver.BuildCompilation(
-        {"-fsyntax-only", "--gcc-toolchain=", "--sysroot=/sysroot",
-         "foo.cpp"}));
-    ASSERT_TRUE(C);
-    std::string S;
-    {
-      llvm::raw_string_ostream OS(S);
-      C->getDefaultToolChain().printVerboseInfo(OS);
-    }
-#if _WIN32
-    std::replace(S.begin(), S.end(), '\\', '/');
-#endif
-    // Test that 4.5.3 from --sysroot is not overridden by 4.6.3 (larger
-    // version) from /usr.
-    EXPECT_EQ("Found candidate GCC installation: "
-              "/sysroot/usr/lib/gcc/arm-linux-gnueabihf/4.5.3\n"
-              "Selected GCC installation: "
-              "/sysroot/usr/lib/gcc/arm-linux-gnueabihf/4.5.3\n"
-              "Candidate multilib: .;@m32\n"
-              "Selected multilib: .;@m32\n",
-              S);
-  }
-}
-
-TEST(ToolChainTest, VFSGCCInstallationRelativeDir) {
-  IntrusiveRefCntPtr<DiagnosticOptions> DiagOpts = new DiagnosticOptions();
-
-  IntrusiveRefCntPtr<DiagnosticIDs> DiagID(new DiagnosticIDs());
-  struct TestDiagnosticConsumer : public DiagnosticConsumer {};
-  DiagnosticsEngine Diags(DiagID, &*DiagOpts, new TestDiagnosticConsumer);
-  IntrusiveRefCntPtr<llvm::vfs::InMemoryFileSystem> InMemoryFileSystem(
-      new llvm::vfs::InMemoryFileSystem);
-  Driver TheDriver("/home/test/bin/clang", "arm-linux-gnueabi", Diags,
-                   "clang LLVM compiler", InMemoryFileSystem);
-
-  const char *EmptyFiles[] = {
-      "foo.cpp", "/home/test/lib/gcc/arm-linux-gnueabi/4.6.1/crtbegin.o",
-      "/home/test/include/arm-linux-gnueabi/.keep"};
-
-  for (const char *Path : EmptyFiles)
-    InMemoryFileSystem->addFile(Path, 0,
-                                llvm::MemoryBuffer::getMemBuffer("\n"));
-
-  std::unique_ptr<Compilation> C(TheDriver.BuildCompilation(
-      {"-fsyntax-only", "--gcc-toolchain=", "foo.cpp"}));
-  EXPECT_TRUE(C);
-
-  std::string S;
-  {
-    llvm::raw_string_ostream OS(S);
-    C->getDefaultToolChain().printVerboseInfo(OS);
-  }
-#if _WIN32
-  std::replace(S.begin(), S.end(), '\\', '/');
-#endif
-  EXPECT_EQ("Found candidate GCC installation: "
-            "/home/test/bin/../lib/gcc/arm-linux-gnueabi/4.6.1\n"
-            "Selected GCC installation: "
-            "/home/test/bin/../lib/gcc/arm-linux-gnueabi/4.6.1\n"
-            "Candidate multilib: .;@m32\n"
-            "Selected multilib: .;@m32\n",
-            S);
-}
-
-TEST(ToolChainTest, DefaultDriverMode) {
-  IntrusiveRefCntPtr<DiagnosticOptions> DiagOpts = new DiagnosticOptions();
-
-  IntrusiveRefCntPtr<DiagnosticIDs> DiagID(new DiagnosticIDs());
-  struct TestDiagnosticConsumer : public DiagnosticConsumer {};
-  DiagnosticsEngine Diags(DiagID, &*DiagOpts, new TestDiagnosticConsumer);
-  IntrusiveRefCntPtr<llvm::vfs::InMemoryFileSystem> InMemoryFileSystem(
-      new llvm::vfs::InMemoryFileSystem);
-
-  Driver CCDriver("/home/test/bin/clang", "arm-linux-gnueabi", Diags,
-                  "clang LLVM compiler", InMemoryFileSystem);
-  CCDriver.setCheckInputsExist(false);
-  Driver CXXDriver("/home/test/bin/clang++", "arm-linux-gnueabi", Diags,
-                   "clang LLVM compiler", InMemoryFileSystem);
-  CXXDriver.setCheckInputsExist(false);
-  Driver CLDriver("/home/test/bin/clang-cl", "arm-linux-gnueabi", Diags,
-                  "clang LLVM compiler", InMemoryFileSystem);
-  CLDriver.setCheckInputsExist(false);
-
-  std::unique_ptr<Compilation> CC(CCDriver.BuildCompilation(
-      { "/home/test/bin/clang", "foo.cpp"}));
-  std::unique_ptr<Compilation> CXX(CXXDriver.BuildCompilation(
-      { "/home/test/bin/clang++", "foo.cpp"}));
-  std::unique_ptr<Compilation> CL(CLDriver.BuildCompilation(
-      { "/home/test/bin/clang-cl", "foo.cpp"}));
-
-  EXPECT_TRUE(CC);
-  EXPECT_TRUE(CXX);
-  EXPECT_TRUE(CL);
-  EXPECT_TRUE(CCDriver.CCCIsCC());
-  EXPECT_TRUE(CXXDriver.CCCIsCXX());
-  EXPECT_TRUE(CLDriver.IsCLMode());
-}
-TEST(ToolChainTest, InvalidArgument) {
-  IntrusiveRefCntPtr<DiagnosticIDs> DiagID(new DiagnosticIDs());
-  struct TestDiagnosticConsumer : public DiagnosticConsumer {};
-  IntrusiveRefCntPtr<DiagnosticOptions> DiagOpts = new DiagnosticOptions();
-  DiagnosticsEngine Diags(DiagID, &*DiagOpts, new TestDiagnosticConsumer);
-  Driver TheDriver("/bin/clang", "arm-linux-gnueabihf", Diags);
-  std::unique_ptr<Compilation> C(TheDriver.BuildCompilation(
-      {"-fsyntax-only", "-fan-unknown-option", "foo.cpp"}));
-  EXPECT_TRUE(C);
-  EXPECT_TRUE(C->containsError());
-}
-
-TEST(ToolChainTest, ParsedClangName) {
-  ParsedClangName Empty;
-  EXPECT_TRUE(Empty.TargetPrefix.empty());
-  EXPECT_TRUE(Empty.ModeSuffix.empty());
-  EXPECT_TRUE(Empty.DriverMode == nullptr);
-  EXPECT_FALSE(Empty.TargetIsValid);
-
-  ParsedClangName DriverOnly("clang", nullptr);
-  EXPECT_TRUE(DriverOnly.TargetPrefix.empty());
-  EXPECT_TRUE(DriverOnly.ModeSuffix == "clang");
-  EXPECT_TRUE(DriverOnly.DriverMode == nullptr);
-  EXPECT_FALSE(DriverOnly.TargetIsValid);
-
-  ParsedClangName DriverOnly2("clang++", "--driver-mode=g++");
-  EXPECT_TRUE(DriverOnly2.TargetPrefix.empty());
-  EXPECT_TRUE(DriverOnly2.ModeSuffix == "clang++");
-  EXPECT_STREQ(DriverOnly2.DriverMode, "--driver-mode=g++");
-  EXPECT_FALSE(DriverOnly2.TargetIsValid);
-
-  ParsedClangName TargetAndMode("i386", "clang-g++", "--driver-mode=g++", true);
-  EXPECT_TRUE(TargetAndMode.TargetPrefix == "i386");
-  EXPECT_TRUE(TargetAndMode.ModeSuffix == "clang-g++");
-  EXPECT_STREQ(TargetAndMode.DriverMode, "--driver-mode=g++");
-  EXPECT_TRUE(TargetAndMode.TargetIsValid);
-}
-
-TEST(ToolChainTest, GetTargetAndMode) {
-  llvm::InitializeAllTargets();
-  std::string IgnoredError;
-  if (!llvm::TargetRegistry::lookupTarget("x86_64", IgnoredError))
-    return;
-
-  ParsedClangName Res = ToolChain::getTargetAndModeFromProgramName("clang");
-  EXPECT_TRUE(Res.TargetPrefix.empty());
-  EXPECT_TRUE(Res.ModeSuffix == "clang");
-  EXPECT_TRUE(Res.DriverMode == nullptr);
-  EXPECT_FALSE(Res.TargetIsValid);
-
-  Res = ToolChain::getTargetAndModeFromProgramName("clang++");
-  EXPECT_TRUE(Res.TargetPrefix.empty());
-  EXPECT_TRUE(Res.ModeSuffix == "clang++");
-  EXPECT_STREQ(Res.DriverMode, "--driver-mode=g++");
-  EXPECT_FALSE(Res.TargetIsValid);
-
-  Res = ToolChain::getTargetAndModeFromProgramName("clang++6.0");
-  EXPECT_TRUE(Res.TargetPrefix.empty());
-  EXPECT_TRUE(Res.ModeSuffix == "clang++");
-  EXPECT_STREQ(Res.DriverMode, "--driver-mode=g++");
-  EXPECT_FALSE(Res.TargetIsValid);
-
-  Res = ToolChain::getTargetAndModeFromProgramName("clang++-release");
-  EXPECT_TRUE(Res.TargetPrefix.empty());
-  EXPECT_TRUE(Res.ModeSuffix == "clang++");
-  EXPECT_STREQ(Res.DriverMode, "--driver-mode=g++");
-  EXPECT_FALSE(Res.TargetIsValid);
-
-  Res = ToolChain::getTargetAndModeFromProgramName("x86_64-clang++");
-  EXPECT_TRUE(Res.TargetPrefix == "x86_64");
-  EXPECT_TRUE(Res.ModeSuffix == "clang++");
-  EXPECT_STREQ(Res.DriverMode, "--driver-mode=g++");
-  EXPECT_TRUE(Res.TargetIsValid);
-
-  Res = ToolChain::getTargetAndModeFromProgramName(
-      "x86_64-linux-gnu-clang-c++");
-  EXPECT_TRUE(Res.TargetPrefix == "x86_64-linux-gnu");
-  EXPECT_TRUE(Res.ModeSuffix == "clang-c++");
-  EXPECT_STREQ(Res.DriverMode, "--driver-mode=g++");
-  EXPECT_TRUE(Res.TargetIsValid);
-
-  Res = ToolChain::getTargetAndModeFromProgramName(
-      "x86_64-linux-gnu-clang-c++-tot");
-  EXPECT_TRUE(Res.TargetPrefix == "x86_64-linux-gnu");
-  EXPECT_TRUE(Res.ModeSuffix == "clang-c++");
-  EXPECT_STREQ(Res.DriverMode, "--driver-mode=g++");
-  EXPECT_TRUE(Res.TargetIsValid);
-
-  Res = ToolChain::getTargetAndModeFromProgramName("qqq");
-  EXPECT_TRUE(Res.TargetPrefix.empty());
-  EXPECT_TRUE(Res.ModeSuffix.empty());
-  EXPECT_TRUE(Res.DriverMode == nullptr);
-  EXPECT_FALSE(Res.TargetIsValid);
-
-  Res = ToolChain::getTargetAndModeFromProgramName("x86_64-qqq");
-  EXPECT_TRUE(Res.TargetPrefix.empty());
-  EXPECT_TRUE(Res.ModeSuffix.empty());
-  EXPECT_TRUE(Res.DriverMode == nullptr);
-  EXPECT_FALSE(Res.TargetIsValid);
-
-  Res = ToolChain::getTargetAndModeFromProgramName("qqq-clang-cl");
-  EXPECT_TRUE(Res.TargetPrefix == "qqq");
-  EXPECT_TRUE(Res.ModeSuffix == "clang-cl");
-  EXPECT_STREQ(Res.DriverMode, "--driver-mode=cl");
-  EXPECT_FALSE(Res.TargetIsValid);
-}
-
-TEST(ToolChainTest, CommandOutput) {
-  IntrusiveRefCntPtr<DiagnosticOptions> DiagOpts = new DiagnosticOptions();
-
-  IntrusiveRefCntPtr<DiagnosticIDs> DiagID(new DiagnosticIDs());
-  struct TestDiagnosticConsumer : public DiagnosticConsumer {};
-  DiagnosticsEngine Diags(DiagID, &*DiagOpts, new TestDiagnosticConsumer);
-  IntrusiveRefCntPtr<llvm::vfs::InMemoryFileSystem> InMemoryFileSystem(
-      new llvm::vfs::InMemoryFileSystem);
-
-  Driver CCDriver("/home/test/bin/clang", "arm-linux-gnueabi", Diags,
-                  "clang LLVM compiler", InMemoryFileSystem);
-  CCDriver.setCheckInputsExist(false);
-  std::unique_ptr<Compilation> CC(
-      CCDriver.BuildCompilation({"/home/test/bin/clang", "foo.cpp"}));
-  const JobList &Jobs = CC->getJobs();
-
-  const auto &CmdCompile = Jobs.getJobs().front();
-  const auto &InFile = CmdCompile->getInputInfos().front().getFilename();
-  EXPECT_STREQ(InFile, "foo.cpp");
-  auto ObjFile = CmdCompile->getOutputFilenames().front();
-  EXPECT_TRUE(StringRef(ObjFile).endswith(".o"));
-
-  const auto &CmdLink = Jobs.getJobs().back();
-  const auto LinkInFile = CmdLink->getInputInfos().front().getFilename();
-  EXPECT_EQ(ObjFile, LinkInFile);
-  auto ExeFile = CmdLink->getOutputFilenames().front();
-  EXPECT_EQ("a.out", ExeFile);
-}
-
-TEST(ToolChainTest, PostCallback) {
-  IntrusiveRefCntPtr<DiagnosticOptions> DiagOpts = new DiagnosticOptions();
-  IntrusiveRefCntPtr<DiagnosticIDs> DiagID(new DiagnosticIDs());
-  struct TestDiagnosticConsumer : public DiagnosticConsumer {};
-  DiagnosticsEngine Diags(DiagID, &*DiagOpts, new TestDiagnosticConsumer);
-  IntrusiveRefCntPtr<llvm::vfs::InMemoryFileSystem> InMemoryFileSystem(
-      new llvm::vfs::InMemoryFileSystem);
-
-  // The executable path must not exist.
-  Driver CCDriver("/home/test/bin/clang", "arm-linux-gnueabi", Diags,
-                  "clang LLVM compiler", InMemoryFileSystem);
-  CCDriver.setCheckInputsExist(false);
-  std::unique_ptr<Compilation> CC(
-      CCDriver.BuildCompilation({"/home/test/bin/clang", "foo.cpp"}));
-  bool CallbackHasCalled = false;
-  CC->setPostCallback(
-      [&](const Command &C, int Ret) { CallbackHasCalled = true; });
-  const JobList &Jobs = CC->getJobs();
-  auto &CmdCompile = Jobs.getJobs().front();
-  const Command *FailingCmd = nullptr;
-  CC->ExecuteCommand(*CmdCompile, FailingCmd);
-  EXPECT_TRUE(CallbackHasCalled);
-}
-
-TEST(GetDriverMode, PrefersLastDriverMode) {
-  static constexpr const char *Args[] = {"clang-cl", "--driver-mode=foo",
-                                         "--driver-mode=bar", "foo.cpp"};
-  EXPECT_EQ(getDriverMode(Args[0], llvm::makeArrayRef(Args).slice(1)), "bar");
-}
-
-} // end anonymous namespace.
diff --git a/gnu/llvm/clang/unittests/Format/CMakeLists.txt b/gnu/llvm/clang/unittests/Format/CMakeLists.txt
deleted file mode 100644
index 5175c49d855..00000000000
--- a/gnu/llvm/clang/unittests/Format/CMakeLists.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  Support
-  )
-
-add_clang_unittest(FormatTests
-  CleanupTest.cpp
-  FormatTest.cpp
-  FormatTestComments.cpp
-  FormatTestCSharp.cpp
-  FormatTestJS.cpp
-  FormatTestJava.cpp
-  FormatTestJson.cpp
-  FormatTestObjC.cpp
-  FormatTestProto.cpp
-  FormatTestRawStrings.cpp
-  FormatTestSelective.cpp
-  FormatTestTableGen.cpp
-  FormatTestTextProto.cpp
-  MacroExpanderTest.cpp
-  NamespaceEndCommentsFixerTest.cpp
-  SortImportsTestJS.cpp
-  SortImportsTestJava.cpp
-  SortIncludesTest.cpp
-  UsingDeclarationsSorterTest.cpp
-  TokenAnnotatorTest.cpp
-  )
-
-clang_target_link_libraries(FormatTests
-  PRIVATE
-  clangBasic
-  clangFormat
-  clangRewrite
-  clangToolingCore
-  )
diff --git a/gnu/llvm/clang/unittests/Format/CleanupTest.cpp b/gnu/llvm/clang/unittests/Format/CleanupTest.cpp
deleted file mode 100644
index dc149b502bc..00000000000
--- a/gnu/llvm/clang/unittests/Format/CleanupTest.cpp
+++ /dev/null
@@ -1,532 +0,0 @@
-//===- unittest/Format/CleanupTest.cpp - Code cleanup unit tests ----------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/Format/Format.h"
-
-#include "../Tooling/ReplacementTest.h"
-#include "clang/Tooling/Core/Replacement.h"
-
-#include "gtest/gtest.h"
-
-using clang::tooling::ReplacementTest;
-using clang::tooling::toReplacements;
-
-namespace clang {
-namespace format {
-namespace {
-
-class CleanupTest : public ::testing::Test {
-protected:
-  std::string cleanup(llvm::StringRef Code,
-                      const std::vector<tooling::Range> &Ranges,
-                      const FormatStyle &Style = getLLVMStyle()) {
-    tooling::Replacements Replaces = format::cleanup(Style, Code, Ranges);
-
-    auto Result = applyAllReplacements(Code, Replaces);
-    EXPECT_TRUE(static_cast<bool>(Result));
-    return *Result;
-  }
-
-  // Returns code after cleanup around \p Offsets.
-  std::string cleanupAroundOffsets(llvm::ArrayRef<unsigned> Offsets,
-                                   llvm::StringRef Code,
-                                   const FormatStyle &Style = getLLVMStyle()) {
-    std::vector<tooling::Range> Ranges;
-    for (auto Offset : Offsets)
-      Ranges.push_back(tooling::Range(Offset, 0));
-    return cleanup(Code, Ranges, Style);
-  }
-};
-
-TEST_F(CleanupTest, DeleteEmptyNamespaces) {
-  std::string Code = "namespace A {\n"
-                     "namespace B {\n"
-                     "} // namespace B\n"
-                     "} // namespace A\n\n"
-                     "namespace C {\n"
-                     "namespace D { int i; }\n"
-                     "inline namespace E { namespace { } }\n"
-                     "}";
-  std::string Expected = "\n\n\n\n\nnamespace C {\n"
-                         "namespace D { int i; }\n   \n"
-                         "}";
-  EXPECT_EQ(Expected, cleanupAroundOffsets({28, 91, 132}, Code));
-}
-
-TEST_F(CleanupTest, NamespaceWithSyntaxError) {
-  std::string Code = "namespace A {\n"
-                     "namespace B {\n" // missing r_brace
-                     "} // namespace A\n\n"
-                     "namespace C {\n"
-                     "namespace D int i; }\n"
-                     "inline namespace E { namespace { } }\n"
-                     "}";
-  std::string Expected = "namespace A {\n"
-                         "\n\n\nnamespace C {\n"
-                         "namespace D int i; }\n   \n"
-                         "}";
-  std::vector<tooling::Range> Ranges(1, tooling::Range(0, Code.size()));
-  EXPECT_EQ(Expected, cleanup(Code, Ranges));
-}
-
-TEST_F(CleanupTest, EmptyNamespaceNotAffected) {
-  std::string Code = "namespace A {\n\n"
-                     "namespace {\n\n}}";
-  // Even though the namespaces are empty, but the inner most empty namespace
-  // block is not affected by the changed ranges.
-  std::string Expected = "namespace A {\n\n"
-                         "namespace {\n\n}}";
-  // Set the changed range to be the second "\n".
-  EXPECT_EQ(Expected, cleanupAroundOffsets({14}, Code));
-}
-
-TEST_F(CleanupTest, EmptyNamespaceWithCommentsNoBreakBeforeBrace) {
-  std::string Code = "namespace A {\n"
-                     "namespace B {\n"
-                     "// Yo\n"
-                     "} // namespace B\n"
-                     "} // namespace A\n"
-                     "namespace C { // Yo\n"
-                     "}";
-  std::string Expected = "\n\n\n\n\n\n";
-  std::vector<tooling::Range> Ranges(1, tooling::Range(0, Code.size()));
-  std::string Result = cleanup(Code, Ranges);
-  EXPECT_EQ(Expected, Result);
-}
-
-TEST_F(CleanupTest, EmptyNamespaceWithCommentsBreakBeforeBrace) {
-  std::string Code = "namespace A\n"
-                     "/* Yo */ {\n"
-                     "namespace B\n"
-                     "{\n"
-                     "// Yo\n"
-                     "} // namespace B\n"
-                     "} // namespace A\n"
-                     "namespace C\n"
-                     "{ // Yo\n"
-                     "}\n";
-  std::string Expected = "\n\n\n\n\n\n\n\n\n\n";
-  std::vector<tooling::Range> Ranges(1, tooling::Range(0, Code.size()));
-  FormatStyle Style = getLLVMStyle();
-  Style.BraceWrapping.AfterNamespace = true;
-  std::string Result = cleanup(Code, Ranges, Style);
-  EXPECT_EQ(Expected, Result);
-}
-
-TEST_F(CleanupTest, EmptyNamespaceAroundConditionalCompilation) {
-  std::string Code = "#ifdef A\n"
-                     "int a;\n"
-                     "int b;\n"
-                     "#else\n"
-                     "#endif\n"
-                     "namespace {}";
-  std::string Expected = "#ifdef A\n"
-                         "int a;\n"
-                         "int b;\n"
-                         "#else\n"
-                         "#endif\n";
-  std::vector<tooling::Range> Ranges(1, tooling::Range(0, Code.size()));
-  FormatStyle Style = getLLVMStyle();
-  std::string Result = cleanup(Code, Ranges, Style);
-  EXPECT_EQ(Expected, Result);
-}
-
-TEST_F(CleanupTest, CtorInitializationSimpleRedundantComma) {
-  std::string Code = "class A {\nA() : , {} };";
-  std::string Expected = "class A {\nA()  {} };";
-  EXPECT_EQ(Expected, cleanupAroundOffsets({17, 19}, Code));
-
-  Code = "class A {\nA() : x(1), {} };";
-  Expected = "class A {\nA() : x(1) {} };";
-  EXPECT_EQ(Expected, cleanupAroundOffsets({23}, Code));
-
-  Code = "class A {\nA() :,,,,{} };";
-  Expected = "class A {\nA() {} };";
-  EXPECT_EQ(Expected, cleanupAroundOffsets({15}, Code));
-}
-
-// regression test for bug 39310
-TEST_F(CleanupTest, CtorInitializationSimpleRedundantCommaInFunctionTryBlock) {
-  std::string Code = "class A {\nA() try : , {} };";
-  std::string Expected = "class A {\nA() try  {} };";
-  EXPECT_EQ(Expected, cleanupAroundOffsets({21, 23}, Code));
-
-  Code = "class A {\nA() try : x(1), {} };";
-  Expected = "class A {\nA() try : x(1) {} };";
-  EXPECT_EQ(Expected, cleanupAroundOffsets({27}, Code));
-
-  Code = "class A {\nA() try :,,,,{} };";
-  Expected = "class A {\nA() try {} };";
-  EXPECT_EQ(Expected, cleanupAroundOffsets({19}, Code));
-
-  Code = "class A {\nA() try : x(1),,, {} };";
-  Expected = "class A {\nA() try : x(1) {} };";
-  EXPECT_EQ(Expected, cleanupAroundOffsets({27}, Code));
-
-  // Do not remove every comma following a colon as it simply doesn't make
-  // sense in some situations.
-  Code = "try : , {}";
-  Expected = "try : , {}";
-  EXPECT_EQ(Expected, cleanupAroundOffsets({8}, Code));
-}
-
-TEST_F(CleanupTest, CtorInitializationSimpleRedundantColon) {
-  std::string Code = "class A {\nA() : =default; };";
-  std::string Expected = "class A {\nA()  =default; };";
-  EXPECT_EQ(Expected, cleanupAroundOffsets({15}, Code));
-
-  Code = "class A {\nA() : , =default; };";
-  Expected = "class A {\nA()  =default; };";
-  EXPECT_EQ(Expected, cleanupAroundOffsets({15}, Code));
-}
-
-TEST_F(CleanupTest, ListRedundantComma) {
-  std::string Code = "void f() { std::vector<int> v = {1,2,,,3,{4,5}}; }";
-  std::string Expected = "void f() { std::vector<int> v = {1,2,3,{4,5}}; }";
-  EXPECT_EQ(Expected, cleanupAroundOffsets({40}, Code));
-
-  Code = "int main() { f(1,,2,3,,4);}";
-  Expected = "int main() { f(1,2,3,4);}";
-  EXPECT_EQ(Expected, cleanupAroundOffsets({17, 22}, Code));
-}
-
-TEST_F(CleanupTest, NoCleanupsForJavaScript) {
-  std::string Code = "function f() { var x = [a, b, , c]; }";
-  std::string Expected = "function f() { var x = [a, b, , c]; }";
-  const FormatStyle &Style = getGoogleStyle(FormatStyle::LK_JavaScript);
-
-  EXPECT_EQ(Expected, cleanupAroundOffsets({30}, Code, Style));
-}
-
-TEST_F(CleanupTest, TrailingCommaInParens) {
-  std::string Code = "int main() { f(,1,,2,3,f(1,2,),4,,);}";
-  std::string Expected = "int main() { f(1,2,3,f(1,2),4);}";
-  EXPECT_EQ(Expected, cleanupAroundOffsets({15, 18, 29, 33}, Code));
-
-  // Lambda contents are also checked for trailing commas.
-  Code = "int main() { [](){f(,1,,2,3,f(1,2,),4,,);}();}";
-  Expected = "int main() { [](){f(1,2,3,f(1,2),4);}();}";
-  EXPECT_EQ(Expected, cleanupAroundOffsets({20, 23, 34, 38}, Code));
-}
-
-TEST_F(CleanupTest, TrailingCommaInBraces) {
-  // Trailing comma is allowed in brace list.
-  // If there was trailing comma in the original code, then trailing comma is
-  // preserved. In this example, element between the last two commas is deleted
-  // causing the second-last comma to be redundant.
-  std::string Code = "void f() { std::vector<int> v = {1,2,3,,}; }";
-  std::string Expected = "void f() { std::vector<int> v = {1,2,3,}; }";
-  EXPECT_EQ(Expected, cleanupAroundOffsets({39}, Code));
-
-  // If there was no trailing comma in the original code, then trailing comma
-  // introduced by replacements should be cleaned up. In this example, the
-  // element after the last comma is deleted causing the last comma to be
-  // redundant.
-  Code = "void f() { std::vector<int> v = {1,2,3,}; }";
-  // FIXME: redundant trailing comma should be removed.
-  Expected = "void f() { std::vector<int> v = {1,2,3,}; }";
-  EXPECT_EQ(Expected, cleanupAroundOffsets({39}, Code));
-
-  // Still no trailing comma in the original code, but two elements are deleted,
-  // which makes it seems like there was trailing comma.
-  Code = "void f() { std::vector<int> v = {1, 2, 3, , }; }";
-  // FIXME: redundant trailing comma should also be removed.
-  Expected = "void f() { std::vector<int> v = {1, 2, 3,  }; }";
-  EXPECT_EQ(Expected, cleanupAroundOffsets({42, 44}, Code));
-}
-
-TEST_F(CleanupTest, CtorInitializationBracesInParens) {
-  std::string Code = "class A {\nA() : x({1}),, {} };";
-  std::string Expected = "class A {\nA() : x({1}) {} };";
-  EXPECT_EQ(Expected, cleanupAroundOffsets({24, 26}, Code));
-}
-
-TEST_F(CleanupTest, RedundantCommaNotInAffectedRanges) {
-  std::string Code =
-      "class A {\nA() : x({1}), /* comment */, { int x = 0; } };";
-  std::string Expected =
-      "class A {\nA() : x({1}), /* comment */, { int x = 0; } };";
-  // Set the affected range to be "int x = 0", which does not intercept the
-  // constructor initialization list.
-  std::vector<tooling::Range> Ranges(1, tooling::Range(42, 9));
-  std::string Result = cleanup(Code, Ranges);
-  EXPECT_EQ(Expected, Result);
-
-  Code = "class A {\nA() : x(1), {} };";
-  Expected = "class A {\nA() : x(1), {} };";
-  // No range. Fixer should do nothing.
-  Ranges.clear();
-  Result = cleanup(Code, Ranges);
-  EXPECT_EQ(Expected, Result);
-}
-
-TEST_F(CleanupTest, RemoveCommentsAroundDeleteCode) {
-  std::string Code =
-      "class A {\nA() : x({1}), /* comment */, /* comment */ {} };";
-  std::string Expected = "class A {\nA() : x({1}) {} };";
-  EXPECT_EQ(Expected, cleanupAroundOffsets({25, 40}, Code));
-
-  Code = "class A {\nA() : x({1}), // comment\n {} };";
-  Expected = "class A {\nA() : x({1})\n {} };";
-  EXPECT_EQ(Expected, cleanupAroundOffsets({25}, Code));
-
-  Code = "class A {\nA() : x({1}), // comment\n , y(1),{} };";
-  Expected = "class A {\nA() : x({1}),  y(1){} };";
-  EXPECT_EQ(Expected, cleanupAroundOffsets({38}, Code));
-
-  Code = "class A {\nA() : x({1}), \n/* comment */, y(1),{} };";
-  Expected = "class A {\nA() : x({1}), \n y(1){} };";
-  EXPECT_EQ(Expected, cleanupAroundOffsets({40}, Code));
-
-  Code = "class A {\nA() : , // comment\n y(1),{} };";
-  Expected = "class A {\nA() :  // comment\n y(1){} };";
-  EXPECT_EQ(Expected, cleanupAroundOffsets({17}, Code));
-
-  Code = "class A {\nA() // comment\n : ,,{} };";
-  Expected = "class A {\nA() // comment\n {} };";
-  EXPECT_EQ(Expected, cleanupAroundOffsets({30}, Code));
-
-  Code = "class A {\nA() // comment\n : ,,=default; };";
-  Expected = "class A {\nA() // comment\n =default; };";
-  EXPECT_EQ(Expected, cleanupAroundOffsets({30}, Code));
-}
-
-TEST_F(CleanupTest, CtorInitializerInNamespace) {
-  std::string Code = "namespace A {\n"
-                     "namespace B {\n" // missing r_brace
-                     "} // namespace A\n\n"
-                     "namespace C {\n"
-                     "class A { A() : x(0),, {} };\n"
-                     "inline namespace E { namespace { } }\n"
-                     "}";
-  std::string Expected = "namespace A {\n"
-                         "\n\n\nnamespace C {\n"
-                         "class A { A() : x(0) {} };\n   \n"
-                         "}";
-  std::vector<tooling::Range> Ranges(1, tooling::Range(0, Code.size()));
-  std::string Result = cleanup(Code, Ranges);
-  EXPECT_EQ(Expected, Result);
-}
-
-class CleanUpReplacementsTest : public ReplacementTest {
-protected:
-  tooling::Replacement createReplacement(unsigned Offset, unsigned Length,
-                                         StringRef Text) {
-    return tooling::Replacement(FileName, Offset, Length, Text);
-  }
-
-  tooling::Replacement createInsertion(StringRef IncludeDirective) {
-    return createReplacement(UINT_MAX, 0, IncludeDirective);
-  }
-
-  tooling::Replacement createDeletion(StringRef HeaderName) {
-    return createReplacement(UINT_MAX, 1, HeaderName);
-  }
-
-  inline std::string apply(StringRef Code,
-                           const tooling::Replacements &Replaces) {
-    auto CleanReplaces = cleanupAroundReplacements(Code, Replaces, Style);
-    EXPECT_TRUE(static_cast<bool>(CleanReplaces))
-        << llvm::toString(CleanReplaces.takeError()) << "\n";
-    auto Result = applyAllReplacements(Code, *CleanReplaces);
-    EXPECT_TRUE(static_cast<bool>(Result));
-    return *Result;
-  }
-
-  inline std::string formatAndApply(StringRef Code,
-                                    const tooling::Replacements &Replaces) {
-    auto CleanReplaces = cleanupAroundReplacements(Code, Replaces, Style);
-    EXPECT_TRUE(static_cast<bool>(CleanReplaces))
-        << llvm::toString(CleanReplaces.takeError()) << "\n";
-    auto FormattedReplaces = formatReplacements(Code, *CleanReplaces, Style);
-    EXPECT_TRUE(static_cast<bool>(FormattedReplaces))
-        << llvm::toString(FormattedReplaces.takeError()) << "\n";
-    auto Result = applyAllReplacements(Code, *FormattedReplaces);
-    EXPECT_TRUE(static_cast<bool>(Result));
-    return *Result;
-  }
-
-  int getOffset(StringRef Code, int Line, int Column) {
-    RewriterTestContext Context;
-    FileID ID = Context.createInMemoryFile(FileName, Code);
-    auto DecomposedLocation =
-        Context.Sources.getDecomposedLoc(Context.getLocation(ID, Line, Column));
-    return DecomposedLocation.second;
-  }
-
-  const std::string FileName = "fix.cpp";
-  FormatStyle Style = getLLVMStyle();
-};
-
-TEST_F(CleanUpReplacementsTest, FixOnlyAffectedCodeAfterReplacements) {
-  std::string Code = "namespace A {\n"
-                     "namespace B {\n"
-                     "  int x;\n"
-                     "} // namespace B\n"
-                     "} // namespace A\n"
-                     "\n"
-                     "namespace C {\n"
-                     "namespace D { int i; }\n"
-                     "inline namespace E { namespace { int y; } }\n"
-                     "int x=     0;"
-                     "}";
-  std::string Expected = "\n\nnamespace C {\n"
-                         "namespace D { int i; }\n\n"
-                         "int x=     0;"
-                         "}";
-  tooling::Replacements Replaces =
-      toReplacements({createReplacement(getOffset(Code, 3, 3), 6, ""),
-                      createReplacement(getOffset(Code, 9, 34), 6, "")});
-
-  EXPECT_EQ(Expected, formatAndApply(Code, Replaces));
-}
-
-TEST_F(CleanUpReplacementsTest, InsertMultipleIncludesLLVMStyle) {
-  std::string Code = "#include \"x/fix.h\"\n"
-                     "#include \"a.h\"\n"
-                     "#include \"b.h\"\n"
-                     "#include \"z.h\"\n"
-                     "#include \"clang/Format/Format.h\"\n"
-                     "#include <memory>\n";
-  std::string Expected = "#include \"x/fix.h\"\n"
-                         "#include \"a.h\"\n"
-                         "#include \"b.h\"\n"
-                         "#include \"new/new.h\"\n"
-                         "#include \"z.h\"\n"
-                         "#include \"clang/Format/Format.h\"\n"
-                         "#include <list>\n"
-                         "#include <memory>\n";
-  tooling::Replacements Replaces =
-      toReplacements({createInsertion("#include <list>"),
-                      createInsertion("#include \"new/new.h\"")});
-  EXPECT_EQ(Expected, apply(Code, Replaces));
-}
-
-TEST_F(CleanUpReplacementsTest, InsertMultipleIncludesGoogleStyle) {
-  std::string Code = "#include \"x/fix.h\"\n"
-                     "\n"
-                     "#include <vector>\n"
-                     "\n"
-                     "#include \"y/a.h\"\n"
-                     "#include \"z/b.h\"\n";
-  std::string Expected = "#include \"x/fix.h\"\n"
-                         "\n"
-                         "#include <list>\n"
-                         "#include <vector>\n"
-                         "\n"
-                         "#include \"x/x.h\"\n"
-                         "#include \"y/a.h\"\n"
-                         "#include \"z/b.h\"\n";
-  tooling::Replacements Replaces =
-      toReplacements({createInsertion("#include <list>"),
-                      createInsertion("#include \"x/x.h\"")});
-  Style = format::getGoogleStyle(format::FormatStyle::LanguageKind::LK_Cpp);
-  EXPECT_EQ(Expected, apply(Code, Replaces));
-}
-
-TEST_F(CleanUpReplacementsTest, InsertMultipleNewHeadersAndSortLLVM) {
-  std::string Code = "\nint x;";
-  std::string Expected = "\n#include \"fix.h\"\n"
-                         "#include \"a.h\"\n"
-                         "#include \"b.h\"\n"
-                         "#include \"c.h\"\n"
-                         "#include <list>\n"
-                         "#include <vector>\n"
-                         "int x;";
-  tooling::Replacements Replaces = toReplacements(
-      {createInsertion("#include \"a.h\""), createInsertion("#include \"c.h\""),
-       createInsertion("#include \"b.h\""),
-       createInsertion("#include <vector>"), createInsertion("#include <list>"),
-       createInsertion("#include \"fix.h\"")});
-  EXPECT_EQ(Expected, formatAndApply(Code, Replaces));
-}
-
-TEST_F(CleanUpReplacementsTest, InsertMultipleNewHeadersAndSortGoogle) {
-  std::string Code = "\nint x;";
-  std::string Expected = "\n#include \"fix.h\"\n"
-                         "\n"
-                         "#include <list>\n"
-                         "#include <vector>\n"
-                         "\n"
-                         "#include \"a.h\"\n"
-                         "#include \"b.h\"\n"
-                         "#include \"c.h\"\n"
-                         "int x;";
-  tooling::Replacements Replaces = toReplacements(
-      {createInsertion("#include \"a.h\""), createInsertion("#include \"c.h\""),
-       createInsertion("#include \"b.h\""),
-       createInsertion("#include <vector>"), createInsertion("#include <list>"),
-       createInsertion("#include \"fix.h\"")});
-  Style = format::getGoogleStyle(format::FormatStyle::LanguageKind::LK_Cpp);
-  EXPECT_EQ(Expected, formatAndApply(Code, Replaces));
-}
-
-TEST_F(CleanUpReplacementsTest, NoNewLineAtTheEndOfCodeMultipleInsertions) {
-  std::string Code = "#include <map>";
-  // FIXME: a better behavior is to only append on newline to Code, but this
-  // case should be rare in practice.
-  std::string Expected =
-      "#include <map>\n#include <string>\n\n#include <vector>\n";
-  tooling::Replacements Replaces =
-      toReplacements({createInsertion("#include <string>"),
-                      createInsertion("#include <vector>")});
-  EXPECT_EQ(Expected, apply(Code, Replaces));
-}
-
-TEST_F(CleanUpReplacementsTest, FormatCorrectLineWhenHeadersAreInserted) {
-  std::string Code = "\n"
-                     "int x;\n"
-                     "int    a;\n"
-                     "int    a;\n"
-                     "int    a;";
-
-  std::string Expected = "\n#include \"x.h\"\n"
-                         "#include \"y.h\"\n"
-                         "#include \"clang/x/x.h\"\n"
-                         "#include <list>\n"
-                         "#include <vector>\n"
-                         "int x;\n"
-                         "int    a;\n"
-                         "int b;\n"
-                         "int    a;";
-  tooling::Replacements Replaces = toReplacements(
-      {createReplacement(getOffset(Code, 4, 8), 1, "b"),
-       createInsertion("#include <vector>"), createInsertion("#include <list>"),
-       createInsertion("#include \"clang/x/x.h\""),
-       createInsertion("#include \"y.h\""),
-       createInsertion("#include \"x.h\"")});
-  EXPECT_EQ(Expected, formatAndApply(Code, Replaces));
-}
-
-TEST_F(CleanUpReplacementsTest, SimpleDeleteIncludes) {
-  std::string Code = "#include \"abc.h\"\n"
-                     "#include \"xyz.h\" // comment\n"
-                     "#include \"xyz\"\n"
-                     "int x;\n";
-  std::string Expected = "#include \"xyz\"\n"
-                         "int x;\n";
-  tooling::Replacements Replaces =
-      toReplacements({createDeletion("abc.h"), createDeletion("xyz.h")});
-  EXPECT_EQ(Expected, apply(Code, Replaces));
-}
-
-TEST_F(CleanUpReplacementsTest, InsertionAndDeleteHeader) {
-  std::string Code = "#include \"a.h\"\n"
-                     "\n"
-                     "#include <vector>\n";
-  std::string Expected = "#include \"a.h\"\n"
-                         "\n"
-                         "#include <map>\n";
-  tooling::Replacements Replaces = toReplacements(
-      {createDeletion("<vector>"), createInsertion("#include <map>")});
-  EXPECT_EQ(Expected, apply(Code, Replaces));
-}
-
-} // end namespace
-} // end namespace format
-} // end namespace clang
diff --git a/gnu/llvm/clang/unittests/Format/FormatTest.cpp b/gnu/llvm/clang/unittests/Format/FormatTest.cpp
deleted file mode 100644
index c575f643b5a..00000000000
--- a/gnu/llvm/clang/unittests/Format/FormatTest.cpp
+++ /dev/null
@@ -1,22252 +0,0 @@
-//===- unittest/Format/FormatTest.cpp - Formatting unit tests -------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/Format/Format.h"
-
-#include "../Tooling/ReplacementTest.h"
-#include "FormatTestUtils.h"
-
-#include "llvm/Support/Debug.h"
-#include "llvm/Support/MemoryBuffer.h"
-#include "gtest/gtest.h"
-
-#define DEBUG_TYPE "format-test"
-
-using clang::tooling::ReplacementTest;
-using clang::tooling::toReplacements;
-using testing::ScopedTrace;
-
-namespace clang {
-namespace format {
-namespace {
-
-FormatStyle getGoogleStyle() { return getGoogleStyle(FormatStyle::LK_Cpp); }
-
-class FormatTest : public ::testing::Test {
-protected:
-  enum StatusCheck { SC_ExpectComplete, SC_ExpectIncomplete, SC_DoNotCheck };
-
-  std::string format(llvm::StringRef Code,
-                     const FormatStyle &Style = getLLVMStyle(),
-                     StatusCheck CheckComplete = SC_ExpectComplete) {
-    LLVM_DEBUG(llvm::errs() << "---\n");
-    LLVM_DEBUG(llvm::errs() << Code << "\n\n");
-    std::vector<tooling::Range> Ranges(1, tooling::Range(0, Code.size()));
-    FormattingAttemptStatus Status;
-    tooling::Replacements Replaces =
-        reformat(Style, Code, Ranges, "<stdin>", &Status);
-    if (CheckComplete != SC_DoNotCheck) {
-      bool ExpectedCompleteFormat = CheckComplete == SC_ExpectComplete;
-      EXPECT_EQ(ExpectedCompleteFormat, Status.FormatComplete)
-          << Code << "\n\n";
-    }
-    ReplacementCount = Replaces.size();
-    auto Result = applyAllReplacements(Code, Replaces);
-    EXPECT_TRUE(static_cast<bool>(Result));
-    LLVM_DEBUG(llvm::errs() << "\n" << *Result << "\n\n");
-    return *Result;
-  }
-
-  FormatStyle getStyleWithColumns(FormatStyle Style, unsigned ColumnLimit) {
-    Style.ColumnLimit = ColumnLimit;
-    return Style;
-  }
-
-  FormatStyle getLLVMStyleWithColumns(unsigned ColumnLimit) {
-    return getStyleWithColumns(getLLVMStyle(), ColumnLimit);
-  }
-
-  FormatStyle getGoogleStyleWithColumns(unsigned ColumnLimit) {
-    return getStyleWithColumns(getGoogleStyle(), ColumnLimit);
-  }
-
-  void _verifyFormat(const char *File, int Line, llvm::StringRef Expected,
-                     llvm::StringRef Code,
-                     const FormatStyle &Style = getLLVMStyle()) {
-    ScopedTrace t(File, Line, ::testing::Message() << Code.str());
-    EXPECT_EQ(Expected.str(), format(Expected, Style))
-        << "Expected code is not stable";
-    EXPECT_EQ(Expected.str(), format(Code, Style));
-    if (Style.Language == FormatStyle::LK_Cpp) {
-      // Objective-C++ is a superset of C++, so everything checked for C++
-      // needs to be checked for Objective-C++ as well.
-      FormatStyle ObjCStyle = Style;
-      ObjCStyle.Language = FormatStyle::LK_ObjC;
-      EXPECT_EQ(Expected.str(), format(test::messUp(Code), ObjCStyle));
-    }
-  }
-
-  void _verifyFormat(const char *File, int Line, llvm::StringRef Code,
-                     const FormatStyle &Style = getLLVMStyle()) {
-    _verifyFormat(File, Line, Code, test::messUp(Code), Style);
-  }
-
-  void _verifyIncompleteFormat(const char *File, int Line, llvm::StringRef Code,
-                               const FormatStyle &Style = getLLVMStyle()) {
-    ScopedTrace t(File, Line, ::testing::Message() << Code.str());
-    EXPECT_EQ(Code.str(),
-              format(test::messUp(Code), Style, SC_ExpectIncomplete));
-  }
-
-  void _verifyIndependentOfContext(const char *File, int Line,
-                                   llvm::StringRef Text,
-                                   const FormatStyle &Style = getLLVMStyle()) {
-    _verifyFormat(File, Line, Text, Style);
-    _verifyFormat(File, Line, llvm::Twine("void f() { " + Text + " }").str(),
-                  Style);
-  }
-
-  /// \brief Verify that clang-format does not crash on the given input.
-  void verifyNoCrash(llvm::StringRef Code,
-                     const FormatStyle &Style = getLLVMStyle()) {
-    format(Code, Style, SC_DoNotCheck);
-  }
-
-  int ReplacementCount;
-};
-
-#define verifyIndependentOfContext(...)                                        \
-  _verifyIndependentOfContext(__FILE__, __LINE__, __VA_ARGS__)
-#define verifyIncompleteFormat(...)                                            \
-  _verifyIncompleteFormat(__FILE__, __LINE__, __VA_ARGS__)
-#define verifyFormat(...) _verifyFormat(__FILE__, __LINE__, __VA_ARGS__)
-#define verifyGoogleFormat(Code) verifyFormat(Code, getGoogleStyle())
-
-TEST_F(FormatTest, MessUp) {
-  EXPECT_EQ("1 2 3", test::messUp("1 2 3"));
-  EXPECT_EQ("1 2 3\n", test::messUp("1\n2\n3\n"));
-  EXPECT_EQ("a\n//b\nc", test::messUp("a\n//b\nc"));
-  EXPECT_EQ("a\n#b\nc", test::messUp("a\n#b\nc"));
-  EXPECT_EQ("a\n#b c d\ne", test::messUp("a\n#b\\\nc\\\nd\ne"));
-}
-
-TEST_F(FormatTest, DefaultLLVMStyleIsCpp) {
-  EXPECT_EQ(FormatStyle::LK_Cpp, getLLVMStyle().Language);
-}
-
-TEST_F(FormatTest, LLVMStyleOverride) {
-  EXPECT_EQ(FormatStyle::LK_Proto,
-            getLLVMStyle(FormatStyle::LK_Proto).Language);
-}
-
-//===----------------------------------------------------------------------===//
-// Basic function tests.
-//===----------------------------------------------------------------------===//
-
-TEST_F(FormatTest, DoesNotChangeCorrectlyFormattedCode) {
-  EXPECT_EQ(";", format(";"));
-}
-
-TEST_F(FormatTest, FormatsGlobalStatementsAt0) {
-  EXPECT_EQ("int i;", format("  int i;"));
-  EXPECT_EQ("\nint i;", format(" \n\t \v \f  int i;"));
-  EXPECT_EQ("int i;\nint j;", format("    int i; int j;"));
-  EXPECT_EQ("int i;\nint j;", format("    int i;\n  int j;"));
-}
-
-TEST_F(FormatTest, FormatsUnwrappedLinesAtFirstFormat) {
-  EXPECT_EQ("int i;", format("int\ni;"));
-}
-
-TEST_F(FormatTest, FormatsNestedBlockStatements) {
-  EXPECT_EQ("{\n  {\n    {}\n  }\n}", format("{{{}}}"));
-}
-
-TEST_F(FormatTest, FormatsNestedCall) {
-  verifyFormat("Method(f1, f2(f3));");
-  verifyFormat("Method(f1(f2, f3()));");
-  verifyFormat("Method(f1(f2, (f3())));");
-}
-
-TEST_F(FormatTest, NestedNameSpecifiers) {
-  verifyFormat("vector<::Type> v;");
-  verifyFormat("::ns::SomeFunction(::ns::SomeOtherFunction())");
-  verifyFormat("static constexpr bool Bar = decltype(bar())::value;");
-  verifyFormat("static constexpr bool Bar = typeof(bar())::value;");
-  verifyFormat("static constexpr bool Bar = __underlying_type(bar())::value;");
-  verifyFormat("static constexpr bool Bar = _Atomic(bar())::value;");
-  verifyFormat("bool a = 2 < ::SomeFunction();");
-  verifyFormat("ALWAYS_INLINE ::std::string getName();");
-  verifyFormat("some::string getName();");
-}
-
-TEST_F(FormatTest, OnlyGeneratesNecessaryReplacements) {
-  EXPECT_EQ("if (a) {\n"
-            "  f();\n"
-            "}",
-            format("if(a){f();}"));
-  EXPECT_EQ(4, ReplacementCount);
-  EXPECT_EQ("if (a) {\n"
-            "  f();\n"
-            "}",
-            format("if (a) {\n"
-                   "  f();\n"
-                   "}"));
-  EXPECT_EQ(0, ReplacementCount);
-  EXPECT_EQ("/*\r\n"
-            "\r\n"
-            "*/\r\n",
-            format("/*\r\n"
-                   "\r\n"
-                   "*/\r\n"));
-  EXPECT_EQ(0, ReplacementCount);
-}
-
-TEST_F(FormatTest, RemovesEmptyLines) {
-  EXPECT_EQ("class C {\n"
-            "  int i;\n"
-            "};",
-            format("class C {\n"
-                   " int i;\n"
-                   "\n"
-                   "};"));
-
-  // Don't remove empty lines at the start of namespaces or extern "C" blocks.
-  EXPECT_EQ("namespace N {\n"
-            "\n"
-            "int i;\n"
-            "}",
-            format("namespace N {\n"
-                   "\n"
-                   "int    i;\n"
-                   "}",
-                   getGoogleStyle()));
-  EXPECT_EQ("/* something */ namespace N {\n"
-            "\n"
-            "int i;\n"
-            "}",
-            format("/* something */ namespace N {\n"
-                   "\n"
-                   "int    i;\n"
-                   "}",
-                   getGoogleStyle()));
-  EXPECT_EQ("inline namespace N {\n"
-            "\n"
-            "int i;\n"
-            "}",
-            format("inline namespace N {\n"
-                   "\n"
-                   "int    i;\n"
-                   "}",
-                   getGoogleStyle()));
-  EXPECT_EQ("/* something */ inline namespace N {\n"
-            "\n"
-            "int i;\n"
-            "}",
-            format("/* something */ inline namespace N {\n"
-                   "\n"
-                   "int    i;\n"
-                   "}",
-                   getGoogleStyle()));
-  EXPECT_EQ("export namespace N {\n"
-            "\n"
-            "int i;\n"
-            "}",
-            format("export namespace N {\n"
-                   "\n"
-                   "int    i;\n"
-                   "}",
-                   getGoogleStyle()));
-  EXPECT_EQ("extern /**/ \"C\" /**/ {\n"
-            "\n"
-            "int i;\n"
-            "}",
-            format("extern /**/ \"C\" /**/ {\n"
-                   "\n"
-                   "int    i;\n"
-                   "}",
-                   getGoogleStyle()));
-
-  auto CustomStyle = clang::format::getLLVMStyle();
-  CustomStyle.BreakBeforeBraces = clang::format::FormatStyle::BS_Custom;
-  CustomStyle.BraceWrapping.AfterNamespace = true;
-  CustomStyle.KeepEmptyLinesAtTheStartOfBlocks = false;
-  EXPECT_EQ("namespace N\n"
-            "{\n"
-            "\n"
-            "int i;\n"
-            "}",
-            format("namespace N\n"
-                   "{\n"
-                   "\n"
-                   "\n"
-                   "int    i;\n"
-                   "}",
-                   CustomStyle));
-  EXPECT_EQ("/* something */ namespace N\n"
-            "{\n"
-            "\n"
-            "int i;\n"
-            "}",
-            format("/* something */ namespace N {\n"
-                   "\n"
-                   "\n"
-                   "int    i;\n"
-                   "}",
-                   CustomStyle));
-  EXPECT_EQ("inline namespace N\n"
-            "{\n"
-            "\n"
-            "int i;\n"
-            "}",
-            format("inline namespace N\n"
-                   "{\n"
-                   "\n"
-                   "\n"
-                   "int    i;\n"
-                   "}",
-                   CustomStyle));
-  EXPECT_EQ("/* something */ inline namespace N\n"
-            "{\n"
-            "\n"
-            "int i;\n"
-            "}",
-            format("/* something */ inline namespace N\n"
-                   "{\n"
-                   "\n"
-                   "int    i;\n"
-                   "}",
-                   CustomStyle));
-  EXPECT_EQ("export namespace N\n"
-            "{\n"
-            "\n"
-            "int i;\n"
-            "}",
-            format("export namespace N\n"
-                   "{\n"
-                   "\n"
-                   "int    i;\n"
-                   "}",
-                   CustomStyle));
-  EXPECT_EQ("namespace a\n"
-            "{\n"
-            "namespace b\n"
-            "{\n"
-            "\n"
-            "class AA {};\n"
-            "\n"
-            "} // namespace b\n"
-            "} // namespace a\n",
-            format("namespace a\n"
-                   "{\n"
-                   "namespace b\n"
-                   "{\n"
-                   "\n"
-                   "\n"
-                   "class AA {};\n"
-                   "\n"
-                   "\n"
-                   "}\n"
-                   "}\n",
-                   CustomStyle));
-  EXPECT_EQ("namespace A /* comment */\n"
-            "{\n"
-            "class B {}\n"
-            "} // namespace A",
-            format("namespace A /* comment */ { class B {} }", CustomStyle));
-  EXPECT_EQ("namespace A\n"
-            "{ /* comment */\n"
-            "class B {}\n"
-            "} // namespace A",
-            format("namespace A {/* comment */ class B {} }", CustomStyle));
-  EXPECT_EQ("namespace A\n"
-            "{ /* comment */\n"
-            "\n"
-            "class B {}\n"
-            "\n"
-            ""
-            "} // namespace A",
-            format("namespace A { /* comment */\n"
-                   "\n"
-                   "\n"
-                   "class B {}\n"
-                   "\n"
-                   "\n"
-                   "}",
-                   CustomStyle));
-  EXPECT_EQ("namespace A /* comment */\n"
-            "{\n"
-            "\n"
-            "class B {}\n"
-            "\n"
-            "} // namespace A",
-            format("namespace A/* comment */ {\n"
-                   "\n"
-                   "\n"
-                   "class B {}\n"
-                   "\n"
-                   "\n"
-                   "}",
-                   CustomStyle));
-
-  // ...but do keep inlining and removing empty lines for non-block extern "C"
-  // functions.
-  verifyFormat("extern \"C\" int f() { return 42; }", getGoogleStyle());
-  EXPECT_EQ("extern \"C\" int f() {\n"
-            "  int i = 42;\n"
-            "  return i;\n"
-            "}",
-            format("extern \"C\" int f() {\n"
-                   "\n"
-                   "  int i = 42;\n"
-                   "  return i;\n"
-                   "}",
-                   getGoogleStyle()));
-
-  // Remove empty lines at the beginning and end of blocks.
-  EXPECT_EQ("void f() {\n"
-            "\n"
-            "  if (a) {\n"
-            "\n"
-            "    f();\n"
-            "  }\n"
-            "}",
-            format("void f() {\n"
-                   "\n"
-                   "  if (a) {\n"
-                   "\n"
-                   "    f();\n"
-                   "\n"
-                   "  }\n"
-                   "\n"
-                   "}",
-                   getLLVMStyle()));
-  EXPECT_EQ("void f() {\n"
-            "  if (a) {\n"
-            "    f();\n"
-            "  }\n"
-            "}",
-            format("void f() {\n"
-                   "\n"
-                   "  if (a) {\n"
-                   "\n"
-                   "    f();\n"
-                   "\n"
-                   "  }\n"
-                   "\n"
-                   "}",
-                   getGoogleStyle()));
-
-  // Don't remove empty lines in more complex control statements.
-  EXPECT_EQ("void f() {\n"
-            "  if (a) {\n"
-            "    f();\n"
-            "\n"
-            "  } else if (b) {\n"
-            "    f();\n"
-            "  }\n"
-            "}",
-            format("void f() {\n"
-                   "  if (a) {\n"
-                   "    f();\n"
-                   "\n"
-                   "  } else if (b) {\n"
-                   "    f();\n"
-                   "\n"
-                   "  }\n"
-                   "\n"
-                   "}"));
-
-  // Don't remove empty lines before namespace endings.
-  FormatStyle LLVMWithNoNamespaceFix = getLLVMStyle();
-  LLVMWithNoNamespaceFix.FixNamespaceComments = false;
-  EXPECT_EQ("namespace {\n"
-            "int i;\n"
-            "\n"
-            "}",
-            format("namespace {\n"
-                   "int i;\n"
-                   "\n"
-                   "}",
-                   LLVMWithNoNamespaceFix));
-  EXPECT_EQ("namespace {\n"
-            "int i;\n"
-            "}",
-            format("namespace {\n"
-                   "int i;\n"
-                   "}",
-                   LLVMWithNoNamespaceFix));
-  EXPECT_EQ("namespace {\n"
-            "int i;\n"
-            "\n"
-            "};",
-            format("namespace {\n"
-                   "int i;\n"
-                   "\n"
-                   "};",
-                   LLVMWithNoNamespaceFix));
-  EXPECT_EQ("namespace {\n"
-            "int i;\n"
-            "};",
-            format("namespace {\n"
-                   "int i;\n"
-                   "};",
-                   LLVMWithNoNamespaceFix));
-  EXPECT_EQ("namespace {\n"
-            "int i;\n"
-            "\n"
-            "}",
-            format("namespace {\n"
-                   "int i;\n"
-                   "\n"
-                   "}"));
-  EXPECT_EQ("namespace {\n"
-            "int i;\n"
-            "\n"
-            "} // namespace",
-            format("namespace {\n"
-                   "int i;\n"
-                   "\n"
-                   "}  // namespace"));
-
-  FormatStyle Style = getLLVMStyle();
-  Style.AllowShortFunctionsOnASingleLine = FormatStyle::SFS_All;
-  Style.MaxEmptyLinesToKeep = 2;
-  Style.BreakBeforeBraces = FormatStyle::BS_Custom;
-  Style.BraceWrapping.AfterClass = true;
-  Style.BraceWrapping.AfterFunction = true;
-  Style.KeepEmptyLinesAtTheStartOfBlocks = false;
-
-  EXPECT_EQ("class Foo\n"
-            "{\n"
-            "  Foo() {}\n"
-            "\n"
-            "  void funk() {}\n"
-            "};",
-            format("class Foo\n"
-                   "{\n"
-                   "  Foo()\n"
-                   "  {\n"
-                   "  }\n"
-                   "\n"
-                   "  void funk() {}\n"
-                   "};",
-                   Style));
-}
-
-TEST_F(FormatTest, RecognizesBinaryOperatorKeywords) {
-  verifyFormat("x = (a) and (b);");
-  verifyFormat("x = (a) or (b);");
-  verifyFormat("x = (a) bitand (b);");
-  verifyFormat("x = (a) bitor (b);");
-  verifyFormat("x = (a) not_eq (b);");
-  verifyFormat("x = (a) and_eq (b);");
-  verifyFormat("x = (a) or_eq (b);");
-  verifyFormat("x = (a) xor (b);");
-}
-
-TEST_F(FormatTest, RecognizesUnaryOperatorKeywords) {
-  verifyFormat("x = compl(a);");
-  verifyFormat("x = not(a);");
-  verifyFormat("x = bitand(a);");
-  // Unary operator must not be merged with the next identifier
-  verifyFormat("x = compl a;");
-  verifyFormat("x = not a;");
-  verifyFormat("x = bitand a;");
-}
-
-//===----------------------------------------------------------------------===//
-// Tests for control statements.
-//===----------------------------------------------------------------------===//
-
-TEST_F(FormatTest, FormatIfWithoutCompoundStatement) {
-  verifyFormat("if (true)\n  f();\ng();");
-  verifyFormat("if (a)\n  if (b)\n    if (c)\n      g();\nh();");
-  verifyFormat("if (a)\n  if (b) {\n    f();\n  }\ng();");
-  verifyFormat("if constexpr (true)\n"
-               "  f();\ng();");
-  verifyFormat("if CONSTEXPR (true)\n"
-               "  f();\ng();");
-  verifyFormat("if constexpr (a)\n"
-               "  if constexpr (b)\n"
-               "    if constexpr (c)\n"
-               "      g();\n"
-               "h();");
-  verifyFormat("if CONSTEXPR (a)\n"
-               "  if CONSTEXPR (b)\n"
-               "    if CONSTEXPR (c)\n"
-               "      g();\n"
-               "h();");
-  verifyFormat("if constexpr (a)\n"
-               "  if constexpr (b) {\n"
-               "    f();\n"
-               "  }\n"
-               "g();");
-  verifyFormat("if CONSTEXPR (a)\n"
-               "  if CONSTEXPR (b) {\n"
-               "    f();\n"
-               "  }\n"
-               "g();");
-
-  verifyFormat("if (a)\n"
-               "  g();");
-  verifyFormat("if (a) {\n"
-               "  g()\n"
-               "};");
-  verifyFormat("if (a)\n"
-               "  g();\n"
-               "else\n"
-               "  g();");
-  verifyFormat("if (a) {\n"
-               "  g();\n"
-               "} else\n"
-               "  g();");
-  verifyFormat("if (a)\n"
-               "  g();\n"
-               "else {\n"
-               "  g();\n"
-               "}");
-  verifyFormat("if (a) {\n"
-               "  g();\n"
-               "} else {\n"
-               "  g();\n"
-               "}");
-  verifyFormat("if (a)\n"
-               "  g();\n"
-               "else if (b)\n"
-               "  g();\n"
-               "else\n"
-               "  g();");
-  verifyFormat("if (a) {\n"
-               "  g();\n"
-               "} else if (b)\n"
-               "  g();\n"
-               "else\n"
-               "  g();");
-  verifyFormat("if (a)\n"
-               "  g();\n"
-               "else if (b) {\n"
-               "  g();\n"
-               "} else\n"
-               "  g();");
-  verifyFormat("if (a)\n"
-               "  g();\n"
-               "else if (b)\n"
-               "  g();\n"
-               "else {\n"
-               "  g();\n"
-               "}");
-  verifyFormat("if (a)\n"
-               "  g();\n"
-               "else if (b) {\n"
-               "  g();\n"
-               "} else {\n"
-               "  g();\n"
-               "}");
-  verifyFormat("if (a) {\n"
-               "  g();\n"
-               "} else if (b) {\n"
-               "  g();\n"
-               "} else {\n"
-               "  g();\n"
-               "}");
-
-  FormatStyle AllowsMergedIf = getLLVMStyle();
-  AllowsMergedIf.IfMacros.push_back("MYIF");
-  AllowsMergedIf.AlignEscapedNewlines = FormatStyle::ENAS_Left;
-  AllowsMergedIf.AllowShortIfStatementsOnASingleLine =
-      FormatStyle::SIS_WithoutElse;
-  verifyFormat("if (a)\n"
-               "  // comment\n"
-               "  f();",
-               AllowsMergedIf);
-  verifyFormat("{\n"
-               "  if (a)\n"
-               "  label:\n"
-               "    f();\n"
-               "}",
-               AllowsMergedIf);
-  verifyFormat("#define A \\\n"
-               "  if (a)  \\\n"
-               "  label:  \\\n"
-               "    f()",
-               AllowsMergedIf);
-  verifyFormat("if (a)\n"
-               "  ;",
-               AllowsMergedIf);
-  verifyFormat("if (a)\n"
-               "  if (b) return;",
-               AllowsMergedIf);
-
-  verifyFormat("if (a) // Can't merge this\n"
-               "  f();\n",
-               AllowsMergedIf);
-  verifyFormat("if (a) /* still don't merge */\n"
-               "  f();",
-               AllowsMergedIf);
-  verifyFormat("if (a) { // Never merge this\n"
-               "  f();\n"
-               "}",
-               AllowsMergedIf);
-  verifyFormat("if (a) { /* Never merge this */\n"
-               "  f();\n"
-               "}",
-               AllowsMergedIf);
-  verifyFormat("MYIF (a)\n"
-               "  // comment\n"
-               "  f();",
-               AllowsMergedIf);
-  verifyFormat("{\n"
-               "  MYIF (a)\n"
-               "  label:\n"
-               "    f();\n"
-               "}",
-               AllowsMergedIf);
-  verifyFormat("#define A  \\\n"
-               "  MYIF (a) \\\n"
-               "  label:   \\\n"
-               "    f()",
-               AllowsMergedIf);
-  verifyFormat("MYIF (a)\n"
-               "  ;",
-               AllowsMergedIf);
-  verifyFormat("MYIF (a)\n"
-               "  MYIF (b) return;",
-               AllowsMergedIf);
-
-  verifyFormat("MYIF (a) // Can't merge this\n"
-               "  f();\n",
-               AllowsMergedIf);
-  verifyFormat("MYIF (a) /* still don't merge */\n"
-               "  f();",
-               AllowsMergedIf);
-  verifyFormat("MYIF (a) { // Never merge this\n"
-               "  f();\n"
-               "}",
-               AllowsMergedIf);
-  verifyFormat("MYIF (a) { /* Never merge this */\n"
-               "  f();\n"
-               "}",
-               AllowsMergedIf);
-
-  AllowsMergedIf.ColumnLimit = 14;
-  // Where line-lengths matter, a 2-letter synonym that maintains line length.
-  // Not IF to avoid any confusion that IF is somehow special.
-  AllowsMergedIf.IfMacros.push_back("FI");
-  verifyFormat("if (a) return;", AllowsMergedIf);
-  verifyFormat("if (aaaaaaaaa)\n"
-               "  return;",
-               AllowsMergedIf);
-  verifyFormat("FI (a) return;", AllowsMergedIf);
-  verifyFormat("FI (aaaaaaaaa)\n"
-               "  return;",
-               AllowsMergedIf);
-
-  AllowsMergedIf.ColumnLimit = 13;
-  verifyFormat("if (a)\n  return;", AllowsMergedIf);
-  verifyFormat("FI (a)\n  return;", AllowsMergedIf);
-
-  FormatStyle AllowsMergedIfElse = getLLVMStyle();
-  AllowsMergedIfElse.IfMacros.push_back("MYIF");
-  AllowsMergedIfElse.AllowShortIfStatementsOnASingleLine =
-      FormatStyle::SIS_AllIfsAndElse;
-  verifyFormat("if (a)\n"
-               "  // comment\n"
-               "  f();\n"
-               "else\n"
-               "  // comment\n"
-               "  f();",
-               AllowsMergedIfElse);
-  verifyFormat("{\n"
-               "  if (a)\n"
-               "  label:\n"
-               "    f();\n"
-               "  else\n"
-               "  label:\n"
-               "    f();\n"
-               "}",
-               AllowsMergedIfElse);
-  verifyFormat("if (a)\n"
-               "  ;\n"
-               "else\n"
-               "  ;",
-               AllowsMergedIfElse);
-  verifyFormat("if (a) {\n"
-               "} else {\n"
-               "}",
-               AllowsMergedIfElse);
-  verifyFormat("if (a) return;\n"
-               "else if (b) return;\n"
-               "else return;",
-               AllowsMergedIfElse);
-  verifyFormat("if (a) {\n"
-               "} else return;",
-               AllowsMergedIfElse);
-  verifyFormat("if (a) {\n"
-               "} else if (b) return;\n"
-               "else return;",
-               AllowsMergedIfElse);
-  verifyFormat("if (a) return;\n"
-               "else if (b) {\n"
-               "} else return;",
-               AllowsMergedIfElse);
-  verifyFormat("if (a)\n"
-               "  if (b) return;\n"
-               "  else return;",
-               AllowsMergedIfElse);
-  verifyFormat("if constexpr (a)\n"
-               "  if constexpr (b) return;\n"
-               "  else if constexpr (c) return;\n"
-               "  else return;",
-               AllowsMergedIfElse);
-  verifyFormat("MYIF (a)\n"
-               "  // comment\n"
-               "  f();\n"
-               "else\n"
-               "  // comment\n"
-               "  f();",
-               AllowsMergedIfElse);
-  verifyFormat("{\n"
-               "  MYIF (a)\n"
-               "  label:\n"
-               "    f();\n"
-               "  else\n"
-               "  label:\n"
-               "    f();\n"
-               "}",
-               AllowsMergedIfElse);
-  verifyFormat("MYIF (a)\n"
-               "  ;\n"
-               "else\n"
-               "  ;",
-               AllowsMergedIfElse);
-  verifyFormat("MYIF (a) {\n"
-               "} else {\n"
-               "}",
-               AllowsMergedIfElse);
-  verifyFormat("MYIF (a) return;\n"
-               "else MYIF (b) return;\n"
-               "else return;",
-               AllowsMergedIfElse);
-  verifyFormat("MYIF (a) {\n"
-               "} else return;",
-               AllowsMergedIfElse);
-  verifyFormat("MYIF (a) {\n"
-               "} else MYIF (b) return;\n"
-               "else return;",
-               AllowsMergedIfElse);
-  verifyFormat("MYIF (a) return;\n"
-               "else MYIF (b) {\n"
-               "} else return;",
-               AllowsMergedIfElse);
-  verifyFormat("MYIF (a)\n"
-               "  MYIF (b) return;\n"
-               "  else return;",
-               AllowsMergedIfElse);
-  verifyFormat("MYIF constexpr (a)\n"
-               "  MYIF constexpr (b) return;\n"
-               "  else MYIF constexpr (c) return;\n"
-               "  else return;",
-               AllowsMergedIfElse);
-}
-
-TEST_F(FormatTest, FormatIfWithoutCompoundStatementButElseWith) {
-  FormatStyle AllowsMergedIf = getLLVMStyle();
-  AllowsMergedIf.IfMacros.push_back("MYIF");
-  AllowsMergedIf.AlignEscapedNewlines = FormatStyle::ENAS_Left;
-  AllowsMergedIf.AllowShortIfStatementsOnASingleLine =
-      FormatStyle::SIS_WithoutElse;
-  verifyFormat("if (a)\n"
-               "  f();\n"
-               "else {\n"
-               "  g();\n"
-               "}",
-               AllowsMergedIf);
-  verifyFormat("if (a)\n"
-               "  f();\n"
-               "else\n"
-               "  g();\n",
-               AllowsMergedIf);
-
-  verifyFormat("if (a) g();", AllowsMergedIf);
-  verifyFormat("if (a) {\n"
-               "  g()\n"
-               "};",
-               AllowsMergedIf);
-  verifyFormat("if (a)\n"
-               "  g();\n"
-               "else\n"
-               "  g();",
-               AllowsMergedIf);
-  verifyFormat("if (a) {\n"
-               "  g();\n"
-               "} else\n"
-               "  g();",
-               AllowsMergedIf);
-  verifyFormat("if (a)\n"
-               "  g();\n"
-               "else {\n"
-               "  g();\n"
-               "}",
-               AllowsMergedIf);
-  verifyFormat("if (a) {\n"
-               "  g();\n"
-               "} else {\n"
-               "  g();\n"
-               "}",
-               AllowsMergedIf);
-  verifyFormat("if (a)\n"
-               "  g();\n"
-               "else if (b)\n"
-               "  g();\n"
-               "else\n"
-               "  g();",
-               AllowsMergedIf);
-  verifyFormat("if (a) {\n"
-               "  g();\n"
-               "} else if (b)\n"
-               "  g();\n"
-               "else\n"
-               "  g();",
-               AllowsMergedIf);
-  verifyFormat("if (a)\n"
-               "  g();\n"
-               "else if (b) {\n"
-               "  g();\n"
-               "} else\n"
-               "  g();",
-               AllowsMergedIf);
-  verifyFormat("if (a)\n"
-               "  g();\n"
-               "else if (b)\n"
-               "  g();\n"
-               "else {\n"
-               "  g();\n"
-               "}",
-               AllowsMergedIf);
-  verifyFormat("if (a)\n"
-               "  g();\n"
-               "else if (b) {\n"
-               "  g();\n"
-               "} else {\n"
-               "  g();\n"
-               "}",
-               AllowsMergedIf);
-  verifyFormat("if (a) {\n"
-               "  g();\n"
-               "} else if (b) {\n"
-               "  g();\n"
-               "} else {\n"
-               "  g();\n"
-               "}",
-               AllowsMergedIf);
-  verifyFormat("MYIF (a)\n"
-               "  f();\n"
-               "else {\n"
-               "  g();\n"
-               "}",
-               AllowsMergedIf);
-  verifyFormat("MYIF (a)\n"
-               "  f();\n"
-               "else\n"
-               "  g();\n",
-               AllowsMergedIf);
-
-  verifyFormat("MYIF (a) g();", AllowsMergedIf);
-  verifyFormat("MYIF (a) {\n"
-               "  g()\n"
-               "};",
-               AllowsMergedIf);
-  verifyFormat("MYIF (a)\n"
-               "  g();\n"
-               "else\n"
-               "  g();",
-               AllowsMergedIf);
-  verifyFormat("MYIF (a) {\n"
-               "  g();\n"
-               "} else\n"
-               "  g();",
-               AllowsMergedIf);
-  verifyFormat("MYIF (a)\n"
-               "  g();\n"
-               "else {\n"
-               "  g();\n"
-               "}",
-               AllowsMergedIf);
-  verifyFormat("MYIF (a) {\n"
-               "  g();\n"
-               "} else {\n"
-               "  g();\n"
-               "}",
-               AllowsMergedIf);
-  verifyFormat("MYIF (a)\n"
-               "  g();\n"
-               "else MYIF (b)\n"
-               "  g();\n"
-               "else\n"
-               "  g();",
-               AllowsMergedIf);
-  verifyFormat("MYIF (a)\n"
-               "  g();\n"
-               "else if (b)\n"
-               "  g();\n"
-               "else\n"
-               "  g();",
-               AllowsMergedIf);
-  verifyFormat("MYIF (a) {\n"
-               "  g();\n"
-               "} else MYIF (b)\n"
-               "  g();\n"
-               "else\n"
-               "  g();",
-               AllowsMergedIf);
-  verifyFormat("MYIF (a) {\n"
-               "  g();\n"
-               "} else if (b)\n"
-               "  g();\n"
-               "else\n"
-               "  g();",
-               AllowsMergedIf);
-  verifyFormat("MYIF (a)\n"
-               "  g();\n"
-               "else MYIF (b) {\n"
-               "  g();\n"
-               "} else\n"
-               "  g();",
-               AllowsMergedIf);
-  verifyFormat("MYIF (a)\n"
-               "  g();\n"
-               "else if (b) {\n"
-               "  g();\n"
-               "} else\n"
-               "  g();",
-               AllowsMergedIf);
-  verifyFormat("MYIF (a)\n"
-               "  g();\n"
-               "else MYIF (b)\n"
-               "  g();\n"
-               "else {\n"
-               "  g();\n"
-               "}",
-               AllowsMergedIf);
-  verifyFormat("MYIF (a)\n"
-               "  g();\n"
-               "else if (b)\n"
-               "  g();\n"
-               "else {\n"
-               "  g();\n"
-               "}",
-               AllowsMergedIf);
-  verifyFormat("MYIF (a)\n"
-               "  g();\n"
-               "else MYIF (b) {\n"
-               "  g();\n"
-               "} else {\n"
-               "  g();\n"
-               "}",
-               AllowsMergedIf);
-  verifyFormat("MYIF (a)\n"
-               "  g();\n"
-               "else if (b) {\n"
-               "  g();\n"
-               "} else {\n"
-               "  g();\n"
-               "}",
-               AllowsMergedIf);
-  verifyFormat("MYIF (a) {\n"
-               "  g();\n"
-               "} else MYIF (b) {\n"
-               "  g();\n"
-               "} else {\n"
-               "  g();\n"
-               "}",
-               AllowsMergedIf);
-  verifyFormat("MYIF (a) {\n"
-               "  g();\n"
-               "} else if (b) {\n"
-               "  g();\n"
-               "} else {\n"
-               "  g();\n"
-               "}",
-               AllowsMergedIf);
-
-  AllowsMergedIf.AllowShortIfStatementsOnASingleLine =
-      FormatStyle::SIS_OnlyFirstIf;
-
-  verifyFormat("if (a) f();\n"
-               "else {\n"
-               "  g();\n"
-               "}",
-               AllowsMergedIf);
-  verifyFormat("if (a) f();\n"
-               "else {\n"
-               "  if (a) f();\n"
-               "  else {\n"
-               "    g();\n"
-               "  }\n"
-               "  g();\n"
-               "}",
-               AllowsMergedIf);
-
-  verifyFormat("if (a) g();", AllowsMergedIf);
-  verifyFormat("if (a) {\n"
-               "  g()\n"
-               "};",
-               AllowsMergedIf);
-  verifyFormat("if (a) g();\n"
-               "else\n"
-               "  g();",
-               AllowsMergedIf);
-  verifyFormat("if (a) {\n"
-               "  g();\n"
-               "} else\n"
-               "  g();",
-               AllowsMergedIf);
-  verifyFormat("if (a) g();\n"
-               "else {\n"
-               "  g();\n"
-               "}",
-               AllowsMergedIf);
-  verifyFormat("if (a) {\n"
-               "  g();\n"
-               "} else {\n"
-               "  g();\n"
-               "}",
-               AllowsMergedIf);
-  verifyFormat("if (a) g();\n"
-               "else if (b)\n"
-               "  g();\n"
-               "else\n"
-               "  g();",
-               AllowsMergedIf);
-  verifyFormat("if (a) {\n"
-               "  g();\n"
-               "} else if (b)\n"
-               "  g();\n"
-               "else\n"
-               "  g();",
-               AllowsMergedIf);
-  verifyFormat("if (a) g();\n"
-               "else if (b) {\n"
-               "  g();\n"
-               "} else\n"
-               "  g();",
-               AllowsMergedIf);
-  verifyFormat("if (a) g();\n"
-               "else if (b)\n"
-               "  g();\n"
-               "else {\n"
-               "  g();\n"
-               "}",
-               AllowsMergedIf);
-  verifyFormat("if (a) g();\n"
-               "else if (b) {\n"
-               "  g();\n"
-               "} else {\n"
-               "  g();\n"
-               "}",
-               AllowsMergedIf);
-  verifyFormat("if (a) {\n"
-               "  g();\n"
-               "} else if (b) {\n"
-               "  g();\n"
-               "} else {\n"
-               "  g();\n"
-               "}",
-               AllowsMergedIf);
-  verifyFormat("MYIF (a) f();\n"
-               "else {\n"
-               "  g();\n"
-               "}",
-               AllowsMergedIf);
-  verifyFormat("MYIF (a) f();\n"
-               "else {\n"
-               "  if (a) f();\n"
-               "  else {\n"
-               "    g();\n"
-               "  }\n"
-               "  g();\n"
-               "}",
-               AllowsMergedIf);
-
-  verifyFormat("MYIF (a) g();", AllowsMergedIf);
-  verifyFormat("MYIF (a) {\n"
-               "  g()\n"
-               "};",
-               AllowsMergedIf);
-  verifyFormat("MYIF (a) g();\n"
-               "else\n"
-               "  g();",
-               AllowsMergedIf);
-  verifyFormat("MYIF (a) {\n"
-               "  g();\n"
-               "} else\n"
-               "  g();",
-               AllowsMergedIf);
-  verifyFormat("MYIF (a) g();\n"
-               "else {\n"
-               "  g();\n"
-               "}",
-               AllowsMergedIf);
-  verifyFormat("MYIF (a) {\n"
-               "  g();\n"
-               "} else {\n"
-               "  g();\n"
-               "}",
-               AllowsMergedIf);
-  verifyFormat("MYIF (a) g();\n"
-               "else MYIF (b)\n"
-               "  g();\n"
-               "else\n"
-               "  g();",
-               AllowsMergedIf);
-  verifyFormat("MYIF (a) g();\n"
-               "else if (b)\n"
-               "  g();\n"
-               "else\n"
-               "  g();",
-               AllowsMergedIf);
-  verifyFormat("MYIF (a) {\n"
-               "  g();\n"
-               "} else MYIF (b)\n"
-               "  g();\n"
-               "else\n"
-               "  g();",
-               AllowsMergedIf);
-  verifyFormat("MYIF (a) {\n"
-               "  g();\n"
-               "} else if (b)\n"
-               "  g();\n"
-               "else\n"
-               "  g();",
-               AllowsMergedIf);
-  verifyFormat("MYIF (a) g();\n"
-               "else MYIF (b) {\n"
-               "  g();\n"
-               "} else\n"
-               "  g();",
-               AllowsMergedIf);
-  verifyFormat("MYIF (a) g();\n"
-               "else if (b) {\n"
-               "  g();\n"
-               "} else\n"
-               "  g();",
-               AllowsMergedIf);
-  verifyFormat("MYIF (a) g();\n"
-               "else MYIF (b)\n"
-               "  g();\n"
-               "else {\n"
-               "  g();\n"
-               "}",
-               AllowsMergedIf);
-  verifyFormat("MYIF (a) g();\n"
-               "else if (b)\n"
-               "  g();\n"
-               "else {\n"
-               "  g();\n"
-               "}",
-               AllowsMergedIf);
-  verifyFormat("MYIF (a) g();\n"
-               "else MYIF (b) {\n"
-               "  g();\n"
-               "} else {\n"
-               "  g();\n"
-               "}",
-               AllowsMergedIf);
-  verifyFormat("MYIF (a) g();\n"
-               "else if (b) {\n"
-               "  g();\n"
-               "} else {\n"
-               "  g();\n"
-               "}",
-               AllowsMergedIf);
-  verifyFormat("MYIF (a) {\n"
-               "  g();\n"
-               "} else MYIF (b) {\n"
-               "  g();\n"
-               "} else {\n"
-               "  g();\n"
-               "}",
-               AllowsMergedIf);
-  verifyFormat("MYIF (a) {\n"
-               "  g();\n"
-               "} else if (b) {\n"
-               "  g();\n"
-               "} else {\n"
-               "  g();\n"
-               "}",
-               AllowsMergedIf);
-
-  AllowsMergedIf.AllowShortIfStatementsOnASingleLine =
-      FormatStyle::SIS_AllIfsAndElse;
-
-  verifyFormat("if (a) f();\n"
-               "else {\n"
-               "  g();\n"
-               "}",
-               AllowsMergedIf);
-  verifyFormat("if (a) f();\n"
-               "else {\n"
-               "  if (a) f();\n"
-               "  else {\n"
-               "    g();\n"
-               "  }\n"
-               "  g();\n"
-               "}",
-               AllowsMergedIf);
-
-  verifyFormat("if (a) g();", AllowsMergedIf);
-  verifyFormat("if (a) {\n"
-               "  g()\n"
-               "};",
-               AllowsMergedIf);
-  verifyFormat("if (a) g();\n"
-               "else g();",
-               AllowsMergedIf);
-  verifyFormat("if (a) {\n"
-               "  g();\n"
-               "} else g();",
-               AllowsMergedIf);
-  verifyFormat("if (a) g();\n"
-               "else {\n"
-               "  g();\n"
-               "}",
-               AllowsMergedIf);
-  verifyFormat("if (a) {\n"
-               "  g();\n"
-               "} else {\n"
-               "  g();\n"
-               "}",
-               AllowsMergedIf);
-  verifyFormat("if (a) g();\n"
-               "else if (b) g();\n"
-               "else g();",
-               AllowsMergedIf);
-  verifyFormat("if (a) {\n"
-               "  g();\n"
-               "} else if (b) g();\n"
-               "else g();",
-               AllowsMergedIf);
-  verifyFormat("if (a) g();\n"
-               "else if (b) {\n"
-               "  g();\n"
-               "} else g();",
-               AllowsMergedIf);
-  verifyFormat("if (a) g();\n"
-               "else if (b) g();\n"
-               "else {\n"
-               "  g();\n"
-               "}",
-               AllowsMergedIf);
-  verifyFormat("if (a) g();\n"
-               "else if (b) {\n"
-               "  g();\n"
-               "} else {\n"
-               "  g();\n"
-               "}",
-               AllowsMergedIf);
-  verifyFormat("if (a) {\n"
-               "  g();\n"
-               "} else if (b) {\n"
-               "  g();\n"
-               "} else {\n"
-               "  g();\n"
-               "}",
-               AllowsMergedIf);
-  verifyFormat("MYIF (a) f();\n"
-               "else {\n"
-               "  g();\n"
-               "}",
-               AllowsMergedIf);
-  verifyFormat("MYIF (a) f();\n"
-               "else {\n"
-               "  if (a) f();\n"
-               "  else {\n"
-               "    g();\n"
-               "  }\n"
-               "  g();\n"
-               "}",
-               AllowsMergedIf);
-
-  verifyFormat("MYIF (a) g();", AllowsMergedIf);
-  verifyFormat("MYIF (a) {\n"
-               "  g()\n"
-               "};",
-               AllowsMergedIf);
-  verifyFormat("MYIF (a) g();\n"
-               "else g();",
-               AllowsMergedIf);
-  verifyFormat("MYIF (a) {\n"
-               "  g();\n"
-               "} else g();",
-               AllowsMergedIf);
-  verifyFormat("MYIF (a) g();\n"
-               "else {\n"
-               "  g();\n"
-               "}",
-               AllowsMergedIf);
-  verifyFormat("MYIF (a) {\n"
-               "  g();\n"
-               "} else {\n"
-               "  g();\n"
-               "}",
-               AllowsMergedIf);
-  verifyFormat("MYIF (a) g();\n"
-               "else MYIF (b) g();\n"
-               "else g();",
-               AllowsMergedIf);
-  verifyFormat("MYIF (a) g();\n"
-               "else if (b) g();\n"
-               "else g();",
-               AllowsMergedIf);
-  verifyFormat("MYIF (a) {\n"
-               "  g();\n"
-               "} else MYIF (b) g();\n"
-               "else g();",
-               AllowsMergedIf);
-  verifyFormat("MYIF (a) {\n"
-               "  g();\n"
-               "} else if (b) g();\n"
-               "else g();",
-               AllowsMergedIf);
-  verifyFormat("MYIF (a) g();\n"
-               "else MYIF (b) {\n"
-               "  g();\n"
-               "} else g();",
-               AllowsMergedIf);
-  verifyFormat("MYIF (a) g();\n"
-               "else if (b) {\n"
-               "  g();\n"
-               "} else g();",
-               AllowsMergedIf);
-  verifyFormat("MYIF (a) g();\n"
-               "else MYIF (b) g();\n"
-               "else {\n"
-               "  g();\n"
-               "}",
-               AllowsMergedIf);
-  verifyFormat("MYIF (a) g();\n"
-               "else if (b) g();\n"
-               "else {\n"
-               "  g();\n"
-               "}",
-               AllowsMergedIf);
-  verifyFormat("MYIF (a) g();\n"
-               "else MYIF (b) {\n"
-               "  g();\n"
-               "} else {\n"
-               "  g();\n"
-               "}",
-               AllowsMergedIf);
-  verifyFormat("MYIF (a) g();\n"
-               "else if (b) {\n"
-               "  g();\n"
-               "} else {\n"
-               "  g();\n"
-               "}",
-               AllowsMergedIf);
-  verifyFormat("MYIF (a) {\n"
-               "  g();\n"
-               "} else MYIF (b) {\n"
-               "  g();\n"
-               "} else {\n"
-               "  g();\n"
-               "}",
-               AllowsMergedIf);
-  verifyFormat("MYIF (a) {\n"
-               "  g();\n"
-               "} else if (b) {\n"
-               "  g();\n"
-               "} else {\n"
-               "  g();\n"
-               "}",
-               AllowsMergedIf);
-}
-
-TEST_F(FormatTest, FormatLoopsWithoutCompoundStatement) {
-  FormatStyle AllowsMergedLoops = getLLVMStyle();
-  AllowsMergedLoops.AllowShortLoopsOnASingleLine = true;
-  verifyFormat("while (true) continue;", AllowsMergedLoops);
-  verifyFormat("for (;;) continue;", AllowsMergedLoops);
-  verifyFormat("for (int &v : vec) v *= 2;", AllowsMergedLoops);
-  verifyFormat("while (true)\n"
-               "  ;",
-               AllowsMergedLoops);
-  verifyFormat("for (;;)\n"
-               "  ;",
-               AllowsMergedLoops);
-  verifyFormat("for (;;)\n"
-               "  for (;;) continue;",
-               AllowsMergedLoops);
-  verifyFormat("for (;;) // Can't merge this\n"
-               "  continue;",
-               AllowsMergedLoops);
-  verifyFormat("for (;;) /* still don't merge */\n"
-               "  continue;",
-               AllowsMergedLoops);
-  verifyFormat("do a++;\n"
-               "while (true);",
-               AllowsMergedLoops);
-  verifyFormat("do /* Don't merge */\n"
-               "  a++;\n"
-               "while (true);",
-               AllowsMergedLoops);
-  verifyFormat("do // Don't merge\n"
-               "  a++;\n"
-               "while (true);",
-               AllowsMergedLoops);
-  verifyFormat("do\n"
-               "  // Don't merge\n"
-               "  a++;\n"
-               "while (true);",
-               AllowsMergedLoops);
-  // Without braces labels are interpreted differently.
-  verifyFormat("{\n"
-               "  do\n"
-               "  label:\n"
-               "    a++;\n"
-               "  while (true);\n"
-               "}",
-               AllowsMergedLoops);
-}
-
-TEST_F(FormatTest, FormatShortBracedStatements) {
-  FormatStyle AllowSimpleBracedStatements = getLLVMStyle();
-  AllowSimpleBracedStatements.IfMacros.push_back("MYIF");
-  // Where line-lengths matter, a 2-letter synonym that maintains line length.
-  // Not IF to avoid any confusion that IF is somehow special.
-  AllowSimpleBracedStatements.IfMacros.push_back("FI");
-  AllowSimpleBracedStatements.ColumnLimit = 40;
-  AllowSimpleBracedStatements.AllowShortBlocksOnASingleLine =
-      FormatStyle::SBS_Always;
-
-  AllowSimpleBracedStatements.AllowShortIfStatementsOnASingleLine =
-      FormatStyle::SIS_WithoutElse;
-  AllowSimpleBracedStatements.AllowShortLoopsOnASingleLine = true;
-
-  AllowSimpleBracedStatements.BreakBeforeBraces = FormatStyle::BS_Custom;
-  AllowSimpleBracedStatements.BraceWrapping.AfterFunction = true;
-  AllowSimpleBracedStatements.BraceWrapping.SplitEmptyRecord = false;
-
-  verifyFormat("if (true) {}", AllowSimpleBracedStatements);
-  verifyFormat("if constexpr (true) {}", AllowSimpleBracedStatements);
-  verifyFormat("if CONSTEXPR (true) {}", AllowSimpleBracedStatements);
-  verifyFormat("MYIF (true) {}", AllowSimpleBracedStatements);
-  verifyFormat("MYIF constexpr (true) {}", AllowSimpleBracedStatements);
-  verifyFormat("MYIF CONSTEXPR (true) {}", AllowSimpleBracedStatements);
-  verifyFormat("while (true) {}", AllowSimpleBracedStatements);
-  verifyFormat("for (;;) {}", AllowSimpleBracedStatements);
-  verifyFormat("if (true) { f(); }", AllowSimpleBracedStatements);
-  verifyFormat("if constexpr (true) { f(); }", AllowSimpleBracedStatements);
-  verifyFormat("if CONSTEXPR (true) { f(); }", AllowSimpleBracedStatements);
-  verifyFormat("MYIF (true) { f(); }", AllowSimpleBracedStatements);
-  verifyFormat("MYIF constexpr (true) { f(); }", AllowSimpleBracedStatements);
-  verifyFormat("MYIF CONSTEXPR (true) { f(); }", AllowSimpleBracedStatements);
-  verifyFormat("while (true) { f(); }", AllowSimpleBracedStatements);
-  verifyFormat("for (;;) { f(); }", AllowSimpleBracedStatements);
-  verifyFormat("if (true) { fffffffffffffffffffffff(); }",
-               AllowSimpleBracedStatements);
-  verifyFormat("if (true) {\n"
-               "  ffffffffffffffffffffffff();\n"
-               "}",
-               AllowSimpleBracedStatements);
-  verifyFormat("if (true) {\n"
-               "  ffffffffffffffffffffffffffffffffffffffffffffffffffffff();\n"
-               "}",
-               AllowSimpleBracedStatements);
-  verifyFormat("if (true) { //\n"
-               "  f();\n"
-               "}",
-               AllowSimpleBracedStatements);
-  verifyFormat("if (true) {\n"
-               "  f();\n"
-               "  f();\n"
-               "}",
-               AllowSimpleBracedStatements);
-  verifyFormat("if (true) {\n"
-               "  f();\n"
-               "} else {\n"
-               "  f();\n"
-               "}",
-               AllowSimpleBracedStatements);
-  verifyFormat("FI (true) { fffffffffffffffffffffff(); }",
-               AllowSimpleBracedStatements);
-  verifyFormat("MYIF (true) {\n"
-               "  ffffffffffffffffffffffff();\n"
-               "}",
-               AllowSimpleBracedStatements);
-  verifyFormat("MYIF (true) {\n"
-               "  ffffffffffffffffffffffffffffffffffffffffffffffffffffff();\n"
-               "}",
-               AllowSimpleBracedStatements);
-  verifyFormat("MYIF (true) { //\n"
-               "  f();\n"
-               "}",
-               AllowSimpleBracedStatements);
-  verifyFormat("MYIF (true) {\n"
-               "  f();\n"
-               "  f();\n"
-               "}",
-               AllowSimpleBracedStatements);
-  verifyFormat("MYIF (true) {\n"
-               "  f();\n"
-               "} else {\n"
-               "  f();\n"
-               "}",
-               AllowSimpleBracedStatements);
-
-  verifyFormat("struct A2 {\n"
-               "  int X;\n"
-               "};",
-               AllowSimpleBracedStatements);
-  verifyFormat("typedef struct A2 {\n"
-               "  int X;\n"
-               "} A2_t;",
-               AllowSimpleBracedStatements);
-  verifyFormat("template <int> struct A2 {\n"
-               "  struct B {};\n"
-               "};",
-               AllowSimpleBracedStatements);
-
-  AllowSimpleBracedStatements.AllowShortIfStatementsOnASingleLine =
-      FormatStyle::SIS_Never;
-  verifyFormat("if (true) {}", AllowSimpleBracedStatements);
-  verifyFormat("if (true) {\n"
-               "  f();\n"
-               "}",
-               AllowSimpleBracedStatements);
-  verifyFormat("if (true) {\n"
-               "  f();\n"
-               "} else {\n"
-               "  f();\n"
-               "}",
-               AllowSimpleBracedStatements);
-  verifyFormat("MYIF (true) {}", AllowSimpleBracedStatements);
-  verifyFormat("MYIF (true) {\n"
-               "  f();\n"
-               "}",
-               AllowSimpleBracedStatements);
-  verifyFormat("MYIF (true) {\n"
-               "  f();\n"
-               "} else {\n"
-               "  f();\n"
-               "}",
-               AllowSimpleBracedStatements);
-
-  AllowSimpleBracedStatements.AllowShortLoopsOnASingleLine = false;
-  verifyFormat("while (true) {}", AllowSimpleBracedStatements);
-  verifyFormat("while (true) {\n"
-               "  f();\n"
-               "}",
-               AllowSimpleBracedStatements);
-  verifyFormat("for (;;) {}", AllowSimpleBracedStatements);
-  verifyFormat("for (;;) {\n"
-               "  f();\n"
-               "}",
-               AllowSimpleBracedStatements);
-
-  AllowSimpleBracedStatements.AllowShortIfStatementsOnASingleLine =
-      FormatStyle::SIS_WithoutElse;
-  AllowSimpleBracedStatements.AllowShortLoopsOnASingleLine = true;
-  AllowSimpleBracedStatements.BraceWrapping.AfterControlStatement =
-      FormatStyle::BWACS_Always;
-
-  verifyFormat("if (true) {}", AllowSimpleBracedStatements);
-  verifyFormat("if constexpr (true) {}", AllowSimpleBracedStatements);
-  verifyFormat("if CONSTEXPR (true) {}", AllowSimpleBracedStatements);
-  verifyFormat("MYIF (true) {}", AllowSimpleBracedStatements);
-  verifyFormat("MYIF constexpr (true) {}", AllowSimpleBracedStatements);
-  verifyFormat("MYIF CONSTEXPR (true) {}", AllowSimpleBracedStatements);
-  verifyFormat("while (true) {}", AllowSimpleBracedStatements);
-  verifyFormat("for (;;) {}", AllowSimpleBracedStatements);
-  verifyFormat("if (true) { f(); }", AllowSimpleBracedStatements);
-  verifyFormat("if constexpr (true) { f(); }", AllowSimpleBracedStatements);
-  verifyFormat("if CONSTEXPR (true) { f(); }", AllowSimpleBracedStatements);
-  verifyFormat("MYIF (true) { f(); }", AllowSimpleBracedStatements);
-  verifyFormat("MYIF constexpr (true) { f(); }", AllowSimpleBracedStatements);
-  verifyFormat("MYIF CONSTEXPR (true) { f(); }", AllowSimpleBracedStatements);
-  verifyFormat("while (true) { f(); }", AllowSimpleBracedStatements);
-  verifyFormat("for (;;) { f(); }", AllowSimpleBracedStatements);
-  verifyFormat("if (true) { fffffffffffffffffffffff(); }",
-               AllowSimpleBracedStatements);
-  verifyFormat("if (true)\n"
-               "{\n"
-               "  ffffffffffffffffffffffff();\n"
-               "}",
-               AllowSimpleBracedStatements);
-  verifyFormat("if (true)\n"
-               "{\n"
-               "  ffffffffffffffffffffffffffffffffffffffffffffffffffffff();\n"
-               "}",
-               AllowSimpleBracedStatements);
-  verifyFormat("if (true)\n"
-               "{ //\n"
-               "  f();\n"
-               "}",
-               AllowSimpleBracedStatements);
-  verifyFormat("if (true)\n"
-               "{\n"
-               "  f();\n"
-               "  f();\n"
-               "}",
-               AllowSimpleBracedStatements);
-  verifyFormat("if (true)\n"
-               "{\n"
-               "  f();\n"
-               "} else\n"
-               "{\n"
-               "  f();\n"
-               "}",
-               AllowSimpleBracedStatements);
-  verifyFormat("FI (true) { fffffffffffffffffffffff(); }",
-               AllowSimpleBracedStatements);
-  verifyFormat("MYIF (true)\n"
-               "{\n"
-               "  ffffffffffffffffffffffff();\n"
-               "}",
-               AllowSimpleBracedStatements);
-  verifyFormat("MYIF (true)\n"
-               "{\n"
-               "  ffffffffffffffffffffffffffffffffffffffffffffffffffffff();\n"
-               "}",
-               AllowSimpleBracedStatements);
-  verifyFormat("MYIF (true)\n"
-               "{ //\n"
-               "  f();\n"
-               "}",
-               AllowSimpleBracedStatements);
-  verifyFormat("MYIF (true)\n"
-               "{\n"
-               "  f();\n"
-               "  f();\n"
-               "}",
-               AllowSimpleBracedStatements);
-  verifyFormat("MYIF (true)\n"
-               "{\n"
-               "  f();\n"
-               "} else\n"
-               "{\n"
-               "  f();\n"
-               "}",
-               AllowSimpleBracedStatements);
-
-  AllowSimpleBracedStatements.AllowShortIfStatementsOnASingleLine =
-      FormatStyle::SIS_Never;
-  verifyFormat("if (true) {}", AllowSimpleBracedStatements);
-  verifyFormat("if (true)\n"
-               "{\n"
-               "  f();\n"
-               "}",
-               AllowSimpleBracedStatements);
-  verifyFormat("if (true)\n"
-               "{\n"
-               "  f();\n"
-               "} else\n"
-               "{\n"
-               "  f();\n"
-               "}",
-               AllowSimpleBracedStatements);
-  verifyFormat("MYIF (true) {}", AllowSimpleBracedStatements);
-  verifyFormat("MYIF (true)\n"
-               "{\n"
-               "  f();\n"
-               "}",
-               AllowSimpleBracedStatements);
-  verifyFormat("MYIF (true)\n"
-               "{\n"
-               "  f();\n"
-               "} else\n"
-               "{\n"
-               "  f();\n"
-               "}",
-               AllowSimpleBracedStatements);
-
-  AllowSimpleBracedStatements.AllowShortLoopsOnASingleLine = false;
-  verifyFormat("while (true) {}", AllowSimpleBracedStatements);
-  verifyFormat("while (true)\n"
-               "{\n"
-               "  f();\n"
-               "}",
-               AllowSimpleBracedStatements);
-  verifyFormat("for (;;) {}", AllowSimpleBracedStatements);
-  verifyFormat("for (;;)\n"
-               "{\n"
-               "  f();\n"
-               "}",
-               AllowSimpleBracedStatements);
-}
-
-TEST_F(FormatTest, ShortBlocksInMacrosDontMergeWithCodeAfterMacro) {
-  FormatStyle Style = getLLVMStyleWithColumns(60);
-  Style.AllowShortBlocksOnASingleLine = FormatStyle::SBS_Always;
-  Style.AllowShortIfStatementsOnASingleLine = FormatStyle::SIS_WithoutElse;
-  Style.BreakBeforeBraces = FormatStyle::BS_Allman;
-  EXPECT_EQ("#define A                                                  \\\n"
-            "  if (HANDLEwernufrnuLwrmviferuvnierv)                     \\\n"
-            "  {                                                        \\\n"
-            "    RET_ERR1_ANUIREUINERUIFNIOAerwfwrvnuier;               \\\n"
-            "  }\n"
-            "X;",
-            format("#define A \\\n"
-                   "   if (HANDLEwernufrnuLwrmviferuvnierv) { \\\n"
-                   "      RET_ERR1_ANUIREUINERUIFNIOAerwfwrvnuier; \\\n"
-                   "   }\n"
-                   "X;",
-                   Style));
-}
-
-TEST_F(FormatTest, ParseIfElse) {
-  verifyFormat("if (true)\n"
-               "  if (true)\n"
-               "    if (true)\n"
-               "      f();\n"
-               "    else\n"
-               "      g();\n"
-               "  else\n"
-               "    h();\n"
-               "else\n"
-               "  i();");
-  verifyFormat("if (true)\n"
-               "  if (true)\n"
-               "    if (true) {\n"
-               "      if (true)\n"
-               "        f();\n"
-               "    } else {\n"
-               "      g();\n"
-               "    }\n"
-               "  else\n"
-               "    h();\n"
-               "else {\n"
-               "  i();\n"
-               "}");
-  verifyFormat("if (true)\n"
-               "  if constexpr (true)\n"
-               "    if (true) {\n"
-               "      if constexpr (true)\n"
-               "        f();\n"
-               "    } else {\n"
-               "      g();\n"
-               "    }\n"
-               "  else\n"
-               "    h();\n"
-               "else {\n"
-               "  i();\n"
-               "}");
-  verifyFormat("if (true)\n"
-               "  if CONSTEXPR (true)\n"
-               "    if (true) {\n"
-               "      if CONSTEXPR (true)\n"
-               "        f();\n"
-               "    } else {\n"
-               "      g();\n"
-               "    }\n"
-               "  else\n"
-               "    h();\n"
-               "else {\n"
-               "  i();\n"
-               "}");
-  verifyFormat("void f() {\n"
-               "  if (a) {\n"
-               "  } else {\n"
-               "  }\n"
-               "}");
-}
-
-TEST_F(FormatTest, ElseIf) {
-  verifyFormat("if (a) {\n} else if (b) {\n}");
-  verifyFormat("if (a)\n"
-               "  f();\n"
-               "else if (b)\n"
-               "  g();\n"
-               "else\n"
-               "  h();");
-  verifyFormat("if (a)\n"
-               "  f();\n"
-               "else // comment\n"
-               "  if (b) {\n"
-               "    g();\n"
-               "    h();\n"
-               "  }");
-  verifyFormat("if constexpr (a)\n"
-               "  f();\n"
-               "else if constexpr (b)\n"
-               "  g();\n"
-               "else\n"
-               "  h();");
-  verifyFormat("if CONSTEXPR (a)\n"
-               "  f();\n"
-               "else if CONSTEXPR (b)\n"
-               "  g();\n"
-               "else\n"
-               "  h();");
-  verifyFormat("if (a) {\n"
-               "  f();\n"
-               "}\n"
-               "// or else ..\n"
-               "else {\n"
-               "  g()\n"
-               "}");
-
-  verifyFormat("if (a) {\n"
-               "} else if (aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(\n"
-               "               aaaaaaaaaaaaaaaaaaaaaaaaaaaa)) {\n"
-               "}");
-  verifyFormat("if (a) {\n"
-               "} else if constexpr (aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(\n"
-               "                         aaaaaaaaaaaaaaaaaaaaaaaaaaaa)) {\n"
-               "}");
-  verifyFormat("if (a) {\n"
-               "} else if CONSTEXPR (aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(\n"
-               "                         aaaaaaaaaaaaaaaaaaaaaaaaaaaa)) {\n"
-               "}");
-  verifyFormat("if (a) {\n"
-               "} else if (\n"
-               "    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa) {\n"
-               "}",
-               getLLVMStyleWithColumns(62));
-  verifyFormat("if (a) {\n"
-               "} else if constexpr (\n"
-               "    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa) {\n"
-               "}",
-               getLLVMStyleWithColumns(62));
-  verifyFormat("if (a) {\n"
-               "} else if CONSTEXPR (\n"
-               "    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa) {\n"
-               "}",
-               getLLVMStyleWithColumns(62));
-}
-
-TEST_F(FormatTest, SeparatePointerReferenceAlignment) {
-  FormatStyle Style = getLLVMStyle();
-  // Check first the default LLVM style
-  // Style.PointerAlignment = FormatStyle::PAS_Right;
-  // Style.ReferenceAlignment = FormatStyle::RAS_Pointer;
-  verifyFormat("int *f1(int *a, int &b, int &&c);", Style);
-  verifyFormat("int &f2(int &&c, int *a, int &b);", Style);
-  verifyFormat("int &&f3(int &b, int &&c, int *a);", Style);
-  verifyFormat("int *f1(int &a) const &;", Style);
-  verifyFormat("int *f1(int &a) const & = 0;", Style);
-  verifyFormat("int *a = f1();", Style);
-  verifyFormat("int &b = f2();", Style);
-  verifyFormat("int &&c = f3();", Style);
-
-  Style.AlignConsecutiveDeclarations = FormatStyle::ACS_Consecutive;
-  verifyFormat("Const unsigned int *c;\n"
-               "const unsigned int *d;\n"
-               "Const unsigned int &e;\n"
-               "const unsigned int &f;\n"
-               "const unsigned    &&g;\n"
-               "Const unsigned      h;",
-               Style);
-
-  Style.PointerAlignment = FormatStyle::PAS_Left;
-  Style.ReferenceAlignment = FormatStyle::RAS_Pointer;
-  verifyFormat("int* f1(int* a, int& b, int&& c);", Style);
-  verifyFormat("int& f2(int&& c, int* a, int& b);", Style);
-  verifyFormat("int&& f3(int& b, int&& c, int* a);", Style);
-  verifyFormat("int* f1(int& a) const& = 0;", Style);
-  verifyFormat("int* a = f1();", Style);
-  verifyFormat("int& b = f2();", Style);
-  verifyFormat("int&& c = f3();", Style);
-
-  Style.AlignConsecutiveDeclarations = FormatStyle::ACS_Consecutive;
-  verifyFormat("Const unsigned int* c;\n"
-               "const unsigned int* d;\n"
-               "Const unsigned int& e;\n"
-               "const unsigned int& f;\n"
-               "const unsigned&&    g;\n"
-               "Const unsigned      h;",
-               Style);
-
-  Style.PointerAlignment = FormatStyle::PAS_Right;
-  Style.ReferenceAlignment = FormatStyle::RAS_Left;
-  verifyFormat("int *f1(int *a, int& b, int&& c);", Style);
-  verifyFormat("int& f2(int&& c, int *a, int& b);", Style);
-  verifyFormat("int&& f3(int& b, int&& c, int *a);", Style);
-  verifyFormat("int *a = f1();", Style);
-  verifyFormat("int& b = f2();", Style);
-  verifyFormat("int&& c = f3();", Style);
-
-  Style.AlignConsecutiveDeclarations = FormatStyle::ACS_Consecutive;
-  verifyFormat("Const unsigned int *c;\n"
-               "const unsigned int *d;\n"
-               "Const unsigned int& e;\n"
-               "const unsigned int& f;\n"
-               "const unsigned      g;\n"
-               "Const unsigned      h;",
-               Style);
-
-  Style.PointerAlignment = FormatStyle::PAS_Left;
-  Style.ReferenceAlignment = FormatStyle::RAS_Middle;
-  verifyFormat("int* f1(int* a, int & b, int && c);", Style);
-  verifyFormat("int & f2(int && c, int* a, int & b);", Style);
-  verifyFormat("int && f3(int & b, int && c, int* a);", Style);
-  verifyFormat("int* a = f1();", Style);
-  verifyFormat("int & b = f2();", Style);
-  verifyFormat("int && c = f3();", Style);
-
-  Style.AlignConsecutiveDeclarations = FormatStyle::ACS_Consecutive;
-  verifyFormat("Const unsigned int*  c;\n"
-               "const unsigned int*  d;\n"
-               "Const unsigned int & e;\n"
-               "const unsigned int & f;\n"
-               "const unsigned &&    g;\n"
-               "Const unsigned       h;",
-               Style);
-
-  Style.PointerAlignment = FormatStyle::PAS_Middle;
-  Style.ReferenceAlignment = FormatStyle::RAS_Right;
-  verifyFormat("int * f1(int * a, int &b, int &&c);", Style);
-  verifyFormat("int &f2(int &&c, int * a, int &b);", Style);
-  verifyFormat("int &&f3(int &b, int &&c, int * a);", Style);
-  verifyFormat("int * a = f1();", Style);
-  verifyFormat("int &b = f2();", Style);
-  verifyFormat("int &&c = f3();", Style);
-
-  // FIXME: we don't handle this yet, so output may be arbitrary until it's
-  // specifically handled
-  // verifyFormat("int Add2(BTree * &Root, char * szToAdd)", Style);
-}
-
-TEST_F(FormatTest, FormatsForLoop) {
-  verifyFormat(
-      "for (int VeryVeryLongLoopVariable = 0; VeryVeryLongLoopVariable < 10;\n"
-      "     ++VeryVeryLongLoopVariable)\n"
-      "  ;");
-  verifyFormat("for (;;)\n"
-               "  f();");
-  verifyFormat("for (;;) {\n}");
-  verifyFormat("for (;;) {\n"
-               "  f();\n"
-               "}");
-  verifyFormat("for (int i = 0; (i < 10); ++i) {\n}");
-
-  verifyFormat(
-      "for (std::vector<UnwrappedLine>::iterator I = UnwrappedLines.begin(),\n"
-      "                                          E = UnwrappedLines.end();\n"
-      "     I != E; ++I) {\n}");
-
-  verifyFormat(
-      "for (MachineFun::iterator IIII = PrevIt, EEEE = F.end(); IIII != EEEE;\n"
-      "     ++IIIII) {\n}");
-  verifyFormat("for (aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaa =\n"
-               "         aaaaaaaaaaaaaaaa.aaaaaaaaaaaaaaa;\n"
-               "     aaaaaaaaaaa != aaaaaaaaaaaaaaaaaaa; ++aaaaaaaaaaa) {\n}");
-  verifyFormat("for (llvm::ArrayRef<NamedDecl *>::iterator\n"
-               "         I = FD->getDeclsInPrototypeScope().begin(),\n"
-               "         E = FD->getDeclsInPrototypeScope().end();\n"
-               "     I != E; ++I) {\n}");
-  verifyFormat("for (SmallVectorImpl<TemplateIdAnnotationn *>::iterator\n"
-               "         I = Container.begin(),\n"
-               "         E = Container.end();\n"
-               "     I != E; ++I) {\n}",
-               getLLVMStyleWithColumns(76));
-
-  verifyFormat(
-      "for (aaaaaaaaaaaaaaaaa aaaaaaaaaaa = aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa;\n"
-      "     aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa !=\n"
-      "     aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(\n"
-      "         aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa);\n"
-      "     ++aaaaaaaaaaa) {\n}");
-  verifyFormat("for (int i = 0; i < aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa ||\n"
-               "                bbbbbbbbbbbbbbbbbbbb < ccccccccccccccc;\n"
-               "     ++i) {\n}");
-  verifyFormat("for (int aaaaaaaaaaa = 1; aaaaaaaaaaa <= bbbbbbbbbbbbbbb;\n"
-               "     aaaaaaaaaaa++, bbbbbbbbbbbbbbbbb++) {\n"
-               "}");
-  verifyFormat("for (some_namespace::SomeIterator iter( // force break\n"
-               "         aaaaaaaaaa);\n"
-               "     iter; ++iter) {\n"
-               "}");
-  verifyFormat("for (auto aaaaaaaaaaaaaaaaaaaaaaaaaaa(\n"
-               "         aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa);\n"
-               "     aaaaaaaaaaaaaaaaaaaaaaaaaaa != bbbbbbbbbbbbbbbbbbbbbbb;\n"
-               "     ++aaaaaaaaaaaaaaaaaaaaaaaaaaa) {");
-
-  // These should not be formatted as Objective-C for-in loops.
-  verifyFormat("for (Foo *x = 0; x != in; x++) {\n}");
-  verifyFormat("Foo *x;\nfor (x = 0; x != in; x++) {\n}");
-  verifyFormat("Foo *x;\nfor (x in y) {\n}");
-  verifyFormat(
-      "for (const Foo<Bar> &baz = in.value(); !baz.at_end(); ++baz) {\n}");
-
-  FormatStyle NoBinPacking = getLLVMStyle();
-  NoBinPacking.BinPackParameters = false;
-  verifyFormat("for (int aaaaaaaaaaa = 1;\n"
-               "     aaaaaaaaaaa <= aaaaaaaaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaaa,\n"
-               "                                           aaaaaaaaaaaaaaaa,\n"
-               "                                           aaaaaaaaaaaaaaaa,\n"
-               "                                           aaaaaaaaaaaaaaaa);\n"
-               "     aaaaaaaaaaa++, bbbbbbbbbbbbbbbbb++) {\n"
-               "}",
-               NoBinPacking);
-  verifyFormat(
-      "for (std::vector<UnwrappedLine>::iterator I = UnwrappedLines.begin(),\n"
-      "                                          E = UnwrappedLines.end();\n"
-      "     I != E;\n"
-      "     ++I) {\n}",
-      NoBinPacking);
-
-  FormatStyle AlignLeft = getLLVMStyle();
-  AlignLeft.PointerAlignment = FormatStyle::PAS_Left;
-  verifyFormat("for (A* a = start; a < end; ++a, ++value) {\n}", AlignLeft);
-}
-
-TEST_F(FormatTest, RangeBasedForLoops) {
-  verifyFormat("for (auto aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa :\n"
-               "     aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa) {\n}");
-  verifyFormat("for (auto aaaaaaaaaaaaaaaaaaaaa :\n"
-               "     aaaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaaa, aaaaaaaaaaaaa)) {\n}");
-  verifyFormat("for (const aaaaaaaaaaaaaaaaaaaaa &aaaaaaaaa :\n"
-               "     aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa) {\n}");
-  verifyFormat("for (aaaaaaaaa aaaaaaaaaaaaaaaaaaaaa :\n"
-               "     aaaaaaaaaaaa.aaaaaaaaaaaa().aaaaaaaaa().a()) {\n}");
-}
-
-TEST_F(FormatTest, ForEachLoops) {
-  verifyFormat("void f() {\n"
-               "  foreach (Item *item, itemlist) {}\n"
-               "  Q_FOREACH (Item *item, itemlist) {}\n"
-               "  BOOST_FOREACH (Item *item, itemlist) {}\n"
-               "  UNKNOWN_FORACH(Item * item, itemlist) {}\n"
-               "}");
-
-  FormatStyle Style = getLLVMStyle();
-  Style.SpaceBeforeParens =
-      FormatStyle::SBPO_ControlStatementsExceptControlMacros;
-  verifyFormat("void f() {\n"
-               "  foreach(Item *item, itemlist) {}\n"
-               "  Q_FOREACH(Item *item, itemlist) {}\n"
-               "  BOOST_FOREACH(Item *item, itemlist) {}\n"
-               "  UNKNOWN_FORACH(Item * item, itemlist) {}\n"
-               "}",
-               Style);
-
-  // As function-like macros.
-  verifyFormat("#define foreach(x, y)\n"
-               "#define Q_FOREACH(x, y)\n"
-               "#define BOOST_FOREACH(x, y)\n"
-               "#define UNKNOWN_FOREACH(x, y)\n");
-
-  // Not as function-like macros.
-  verifyFormat("#define foreach (x, y)\n"
-               "#define Q_FOREACH (x, y)\n"
-               "#define BOOST_FOREACH (x, y)\n"
-               "#define UNKNOWN_FOREACH (x, y)\n");
-
-  // handle microsoft non standard extension
-  verifyFormat("for each (char c in x->MyStringProperty)");
-}
-
-TEST_F(FormatTest, FormatsWhileLoop) {
-  verifyFormat("while (true) {\n}");
-  verifyFormat("while (true)\n"
-               "  f();");
-  verifyFormat("while () {\n}");
-  verifyFormat("while () {\n"
-               "  f();\n"
-               "}");
-}
-
-TEST_F(FormatTest, FormatsDoWhile) {
-  verifyFormat("do {\n"
-               "  do_something();\n"
-               "} while (something());");
-  verifyFormat("do\n"
-               "  do_something();\n"
-               "while (something());");
-}
-
-TEST_F(FormatTest, FormatsSwitchStatement) {
-  verifyFormat("switch (x) {\n"
-               "case 1:\n"
-               "  f();\n"
-               "  break;\n"
-               "case kFoo:\n"
-               "case ns::kBar:\n"
-               "case kBaz:\n"
-               "  break;\n"
-               "default:\n"
-               "  g();\n"
-               "  break;\n"
-               "}");
-  verifyFormat("switch (x) {\n"
-               "case 1: {\n"
-               "  f();\n"
-               "  break;\n"
-               "}\n"
-               "case 2: {\n"
-               "  break;\n"
-               "}\n"
-               "}");
-  verifyFormat("switch (x) {\n"
-               "case 1: {\n"
-               "  f();\n"
-               "  {\n"
-               "    g();\n"
-               "    h();\n"
-               "  }\n"
-               "  break;\n"
-               "}\n"
-               "}");
-  verifyFormat("switch (x) {\n"
-               "case 1: {\n"
-               "  f();\n"
-               "  if (foo) {\n"
-               "    g();\n"
-               "    h();\n"
-               "  }\n"
-               "  break;\n"
-               "}\n"
-               "}");
-  verifyFormat("switch (x) {\n"
-               "case 1: {\n"
-               "  f();\n"
-               "  g();\n"
-               "} break;\n"
-               "}");
-  verifyFormat("switch (test)\n"
-               "  ;");
-  verifyFormat("switch (x) {\n"
-               "default: {\n"
-               "  // Do nothing.\n"
-               "}\n"
-               "}");
-  verifyFormat("switch (x) {\n"
-               "// comment\n"
-               "// if 1, do f()\n"
-               "case 1:\n"
-               "  f();\n"
-               "}");
-  verifyFormat("switch (x) {\n"
-               "case 1:\n"
-               "  // Do amazing stuff\n"
-               "  {\n"
-               "    f();\n"
-               "    g();\n"
-               "  }\n"
-               "  break;\n"
-               "}");
-  verifyFormat("#define A          \\\n"
-               "  switch (x) {     \\\n"
-               "  case a:          \\\n"
-               "    foo = b;       \\\n"
-               "  }",
-               getLLVMStyleWithColumns(20));
-  verifyFormat("#define OPERATION_CASE(name)           \\\n"
-               "  case OP_name:                        \\\n"
-               "    return operations::Operation##name\n",
-               getLLVMStyleWithColumns(40));
-  verifyFormat("switch (x) {\n"
-               "case 1:;\n"
-               "default:;\n"
-               "  int i;\n"
-               "}");
-
-  verifyGoogleFormat("switch (x) {\n"
-                     "  case 1:\n"
-                     "    f();\n"
-                     "    break;\n"
-                     "  case kFoo:\n"
-                     "  case ns::kBar:\n"
-                     "  case kBaz:\n"
-                     "    break;\n"
-                     "  default:\n"
-                     "    g();\n"
-                     "    break;\n"
-                     "}");
-  verifyGoogleFormat("switch (x) {\n"
-                     "  case 1: {\n"
-                     "    f();\n"
-                     "    break;\n"
-                     "  }\n"
-                     "}");
-  verifyGoogleFormat("switch (test)\n"
-                     "  ;");
-
-  verifyGoogleFormat("#define OPERATION_CASE(name) \\\n"
-                     "  case OP_name:              \\\n"
-                     "    return operations::Operation##name\n");
-  verifyGoogleFormat("Operation codeToOperation(OperationCode OpCode) {\n"
-                     "  // Get the correction operation class.\n"
-                     "  switch (OpCode) {\n"
-                     "    CASE(Add);\n"
-                     "    CASE(Subtract);\n"
-                     "    default:\n"
-                     "      return operations::Unknown;\n"
-                     "  }\n"
-                     "#undef OPERATION_CASE\n"
-                     "}");
-  verifyFormat("DEBUG({\n"
-               "  switch (x) {\n"
-               "  case A:\n"
-               "    f();\n"
-               "    break;\n"
-               "    // fallthrough\n"
-               "  case B:\n"
-               "    g();\n"
-               "    break;\n"
-               "  }\n"
-               "});");
-  EXPECT_EQ("DEBUG({\n"
-            "  switch (x) {\n"
-            "  case A:\n"
-            "    f();\n"
-            "    break;\n"
-            "  // On B:\n"
-            "  case B:\n"
-            "    g();\n"
-            "    break;\n"
-            "  }\n"
-            "});",
-            format("DEBUG({\n"
-                   "  switch (x) {\n"
-                   "  case A:\n"
-                   "    f();\n"
-                   "    break;\n"
-                   "  // On B:\n"
-                   "  case B:\n"
-                   "    g();\n"
-                   "    break;\n"
-                   "  }\n"
-                   "});",
-                   getLLVMStyle()));
-  EXPECT_EQ("switch (n) {\n"
-            "case 0: {\n"
-            "  return false;\n"
-            "}\n"
-            "default: {\n"
-            "  return true;\n"
-            "}\n"
-            "}",
-            format("switch (n)\n"
-                   "{\n"
-                   "case 0: {\n"
-                   "  return false;\n"
-                   "}\n"
-                   "default: {\n"
-                   "  return true;\n"
-                   "}\n"
-                   "}",
-                   getLLVMStyle()));
-  verifyFormat("switch (a) {\n"
-               "case (b):\n"
-               "  return;\n"
-               "}");
-
-  verifyFormat("switch (a) {\n"
-               "case some_namespace::\n"
-               "    some_constant:\n"
-               "  return;\n"
-               "}",
-               getLLVMStyleWithColumns(34));
-
-  FormatStyle Style = getLLVMStyle();
-  Style.IndentCaseLabels = true;
-  Style.AllowShortBlocksOnASingleLine = FormatStyle::SBS_Never;
-  Style.BreakBeforeBraces = FormatStyle::BS_Custom;
-  Style.BraceWrapping.AfterCaseLabel = true;
-  Style.BraceWrapping.AfterControlStatement = FormatStyle::BWACS_Always;
-  EXPECT_EQ("switch (n)\n"
-            "{\n"
-            "  case 0:\n"
-            "  {\n"
-            "    return false;\n"
-            "  }\n"
-            "  default:\n"
-            "  {\n"
-            "    return true;\n"
-            "  }\n"
-            "}",
-            format("switch (n) {\n"
-                   "  case 0: {\n"
-                   "    return false;\n"
-                   "  }\n"
-                   "  default: {\n"
-                   "    return true;\n"
-                   "  }\n"
-                   "}",
-                   Style));
-  Style.BraceWrapping.AfterCaseLabel = false;
-  EXPECT_EQ("switch (n)\n"
-            "{\n"
-            "  case 0: {\n"
-            "    return false;\n"
-            "  }\n"
-            "  default: {\n"
-            "    return true;\n"
-            "  }\n"
-            "}",
-            format("switch (n) {\n"
-                   "  case 0:\n"
-                   "  {\n"
-                   "    return false;\n"
-                   "  }\n"
-                   "  default:\n"
-                   "  {\n"
-                   "    return true;\n"
-                   "  }\n"
-                   "}",
-                   Style));
-  Style.IndentCaseLabels = false;
-  Style.IndentCaseBlocks = true;
-  EXPECT_EQ("switch (n)\n"
-            "{\n"
-            "case 0:\n"
-            "  {\n"
-            "    return false;\n"
-            "  }\n"
-            "case 1:\n"
-            "  break;\n"
-            "default:\n"
-            "  {\n"
-            "    return true;\n"
-            "  }\n"
-            "}",
-            format("switch (n) {\n"
-                   "case 0: {\n"
-                   "  return false;\n"
-                   "}\n"
-                   "case 1:\n"
-                   "  break;\n"
-                   "default: {\n"
-                   "  return true;\n"
-                   "}\n"
-                   "}",
-                   Style));
-  Style.IndentCaseLabels = true;
-  Style.IndentCaseBlocks = true;
-  EXPECT_EQ("switch (n)\n"
-            "{\n"
-            "  case 0:\n"
-            "    {\n"
-            "      return false;\n"
-            "    }\n"
-            "  case 1:\n"
-            "    break;\n"
-            "  default:\n"
-            "    {\n"
-            "      return true;\n"
-            "    }\n"
-            "}",
-            format("switch (n) {\n"
-                   "case 0: {\n"
-                   "  return false;\n"
-                   "}\n"
-                   "case 1:\n"
-                   "  break;\n"
-                   "default: {\n"
-                   "  return true;\n"
-                   "}\n"
-                   "}",
-                   Style));
-}
-
-TEST_F(FormatTest, CaseRanges) {
-  verifyFormat("switch (x) {\n"
-               "case 'A' ... 'Z':\n"
-               "case 1 ... 5:\n"
-               "case a ... b:\n"
-               "  break;\n"
-               "}");
-}
-
-TEST_F(FormatTest, ShortEnums) {
-  FormatStyle Style = getLLVMStyle();
-  Style.AllowShortEnumsOnASingleLine = true;
-  verifyFormat("enum { A, B, C } ShortEnum1, ShortEnum2;", Style);
-  Style.AllowShortEnumsOnASingleLine = false;
-  verifyFormat("enum\n"
-               "{\n"
-               "  A,\n"
-               "  B,\n"
-               "  C\n"
-               "} ShortEnum1, ShortEnum2;",
-               Style);
-}
-
-TEST_F(FormatTest, ShortCaseLabels) {
-  FormatStyle Style = getLLVMStyle();
-  Style.AllowShortCaseLabelsOnASingleLine = true;
-  verifyFormat("switch (a) {\n"
-               "case 1: x = 1; break;\n"
-               "case 2: return;\n"
-               "case 3:\n"
-               "case 4:\n"
-               "case 5: return;\n"
-               "case 6: // comment\n"
-               "  return;\n"
-               "case 7:\n"
-               "  // comment\n"
-               "  return;\n"
-               "case 8:\n"
-               "  x = 8; // comment\n"
-               "  break;\n"
-               "default: y = 1; break;\n"
-               "}",
-               Style);
-  verifyFormat("switch (a) {\n"
-               "case 0: return; // comment\n"
-               "case 1: break;  // comment\n"
-               "case 2: return;\n"
-               "// comment\n"
-               "case 3: return;\n"
-               "// comment 1\n"
-               "// comment 2\n"
-               "// comment 3\n"
-               "case 4: break; /* comment */\n"
-               "case 5:\n"
-               "  // comment\n"
-               "  break;\n"
-               "case 6: /* comment */ x = 1; break;\n"
-               "case 7: x = /* comment */ 1; break;\n"
-               "case 8:\n"
-               "  x = 1; /* comment */\n"
-               "  break;\n"
-               "case 9:\n"
-               "  break; // comment line 1\n"
-               "         // comment line 2\n"
-               "}",
-               Style);
-  EXPECT_EQ("switch (a) {\n"
-            "case 1:\n"
-            "  x = 8;\n"
-            "  // fall through\n"
-            "case 2: x = 8;\n"
-            "// comment\n"
-            "case 3:\n"
-            "  return; /* comment line 1\n"
-            "           * comment line 2 */\n"
-            "case 4: i = 8;\n"
-            "// something else\n"
-            "#if FOO\n"
-            "case 5: break;\n"
-            "#endif\n"
-            "}",
-            format("switch (a) {\n"
-                   "case 1: x = 8;\n"
-                   "  // fall through\n"
-                   "case 2:\n"
-                   "  x = 8;\n"
-                   "// comment\n"
-                   "case 3:\n"
-                   "  return; /* comment line 1\n"
-                   "           * comment line 2 */\n"
-                   "case 4:\n"
-                   "  i = 8;\n"
-                   "// something else\n"
-                   "#if FOO\n"
-                   "case 5: break;\n"
-                   "#endif\n"
-                   "}",
-                   Style));
-  EXPECT_EQ("switch (a) {\n"
-            "case 0:\n"
-            "  return; // long long long long long long long long long long "
-            "long long comment\n"
-            "          // line\n"
-            "}",
-            format("switch (a) {\n"
-                   "case 0: return; // long long long long long long long long "
-                   "long long long long comment line\n"
-                   "}",
-                   Style));
-  EXPECT_EQ("switch (a) {\n"
-            "case 0:\n"
-            "  return; /* long long long long long long long long long long "
-            "long long comment\n"
-            "             line */\n"
-            "}",
-            format("switch (a) {\n"
-                   "case 0: return; /* long long long long long long long long "
-                   "long long long long comment line */\n"
-                   "}",
-                   Style));
-  verifyFormat("switch (a) {\n"
-               "#if FOO\n"
-               "case 0: return 0;\n"
-               "#endif\n"
-               "}",
-               Style);
-  verifyFormat("switch (a) {\n"
-               "case 1: {\n"
-               "}\n"
-               "case 2: {\n"
-               "  return;\n"
-               "}\n"
-               "case 3: {\n"
-               "  x = 1;\n"
-               "  return;\n"
-               "}\n"
-               "case 4:\n"
-               "  if (x)\n"
-               "    return;\n"
-               "}",
-               Style);
-  Style.ColumnLimit = 21;
-  verifyFormat("switch (a) {\n"
-               "case 1: x = 1; break;\n"
-               "case 2: return;\n"
-               "case 3:\n"
-               "case 4:\n"
-               "case 5: return;\n"
-               "default:\n"
-               "  y = 1;\n"
-               "  break;\n"
-               "}",
-               Style);
-  Style.ColumnLimit = 80;
-  Style.AllowShortCaseLabelsOnASingleLine = false;
-  Style.IndentCaseLabels = true;
-  EXPECT_EQ("switch (n) {\n"
-            "  default /*comments*/:\n"
-            "    return true;\n"
-            "  case 0:\n"
-            "    return false;\n"
-            "}",
-            format("switch (n) {\n"
-                   "default/*comments*/:\n"
-                   "  return true;\n"
-                   "case 0:\n"
-                   "  return false;\n"
-                   "}",
-                   Style));
-  Style.AllowShortCaseLabelsOnASingleLine = true;
-  Style.BreakBeforeBraces = FormatStyle::BS_Custom;
-  Style.BraceWrapping.AfterCaseLabel = true;
-  Style.BraceWrapping.AfterControlStatement = FormatStyle::BWACS_Always;
-  EXPECT_EQ("switch (n)\n"
-            "{\n"
-            "  case 0:\n"
-            "  {\n"
-            "    return false;\n"
-            "  }\n"
-            "  default:\n"
-            "  {\n"
-            "    return true;\n"
-            "  }\n"
-            "}",
-            format("switch (n) {\n"
-                   "  case 0: {\n"
-                   "    return false;\n"
-                   "  }\n"
-                   "  default:\n"
-                   "  {\n"
-                   "    return true;\n"
-                   "  }\n"
-                   "}",
-                   Style));
-}
-
-TEST_F(FormatTest, FormatsLabels) {
-  verifyFormat("void f() {\n"
-               "  some_code();\n"
-               "test_label:\n"
-               "  some_other_code();\n"
-               "  {\n"
-               "    some_more_code();\n"
-               "  another_label:\n"
-               "    some_more_code();\n"
-               "  }\n"
-               "}");
-  verifyFormat("{\n"
-               "  some_code();\n"
-               "test_label:\n"
-               "  some_other_code();\n"
-               "}");
-  verifyFormat("{\n"
-               "  some_code();\n"
-               "test_label:;\n"
-               "  int i = 0;\n"
-               "}");
-  FormatStyle Style = getLLVMStyle();
-  Style.IndentGotoLabels = false;
-  verifyFormat("void f() {\n"
-               "  some_code();\n"
-               "test_label:\n"
-               "  some_other_code();\n"
-               "  {\n"
-               "    some_more_code();\n"
-               "another_label:\n"
-               "    some_more_code();\n"
-               "  }\n"
-               "}",
-               Style);
-  verifyFormat("{\n"
-               "  some_code();\n"
-               "test_label:\n"
-               "  some_other_code();\n"
-               "}",
-               Style);
-  verifyFormat("{\n"
-               "  some_code();\n"
-               "test_label:;\n"
-               "  int i = 0;\n"
-               "}");
-}
-
-TEST_F(FormatTest, MultiLineControlStatements) {
-  FormatStyle Style = getLLVMStyle();
-  Style.BreakBeforeBraces = FormatStyle::BraceBreakingStyle::BS_Custom;
-  Style.BraceWrapping.AfterControlStatement = FormatStyle::BWACS_MultiLine;
-  Style.ColumnLimit = 20;
-  // Short lines should keep opening brace on same line.
-  EXPECT_EQ("if (foo) {\n"
-            "  bar();\n"
-            "}",
-            format("if(foo){bar();}", Style));
-  EXPECT_EQ("if (foo) {\n"
-            "  bar();\n"
-            "} else {\n"
-            "  baz();\n"
-            "}",
-            format("if(foo){bar();}else{baz();}", Style));
-  EXPECT_EQ("if (foo && bar) {\n"
-            "  baz();\n"
-            "}",
-            format("if(foo&&bar){baz();}", Style));
-  EXPECT_EQ("if (foo) {\n"
-            "  bar();\n"
-            "} else if (baz) {\n"
-            "  quux();\n"
-            "}",
-            format("if(foo){bar();}else if(baz){quux();}", Style));
-  EXPECT_EQ(
-      "if (foo) {\n"
-      "  bar();\n"
-      "} else if (baz) {\n"
-      "  quux();\n"
-      "} else {\n"
-      "  foobar();\n"
-      "}",
-      format("if(foo){bar();}else if(baz){quux();}else{foobar();}", Style));
-  EXPECT_EQ("for (;;) {\n"
-            "  foo();\n"
-            "}",
-            format("for(;;){foo();}"));
-  EXPECT_EQ("while (1) {\n"
-            "  foo();\n"
-            "}",
-            format("while(1){foo();}", Style));
-  EXPECT_EQ("switch (foo) {\n"
-            "case bar:\n"
-            "  return;\n"
-            "}",
-            format("switch(foo){case bar:return;}", Style));
-  EXPECT_EQ("try {\n"
-            "  foo();\n"
-            "} catch (...) {\n"
-            "  bar();\n"
-            "}",
-            format("try{foo();}catch(...){bar();}", Style));
-  EXPECT_EQ("do {\n"
-            "  foo();\n"
-            "} while (bar &&\n"
-            "         baz);",
-            format("do{foo();}while(bar&&baz);", Style));
-  // Long lines should put opening brace on new line.
-  EXPECT_EQ("if (foo && bar &&\n"
-            "    baz)\n"
-            "{\n"
-            "  quux();\n"
-            "}",
-            format("if(foo&&bar&&baz){quux();}", Style));
-  EXPECT_EQ("if (foo && bar &&\n"
-            "    baz)\n"
-            "{\n"
-            "  quux();\n"
-            "}",
-            format("if (foo && bar &&\n"
-                   "    baz) {\n"
-                   "  quux();\n"
-                   "}",
-                   Style));
-  EXPECT_EQ("if (foo) {\n"
-            "  bar();\n"
-            "} else if (baz ||\n"
-            "           quux)\n"
-            "{\n"
-            "  foobar();\n"
-            "}",
-            format("if(foo){bar();}else if(baz||quux){foobar();}", Style));
-  EXPECT_EQ(
-      "if (foo) {\n"
-      "  bar();\n"
-      "} else if (baz ||\n"
-      "           quux)\n"
-      "{\n"
-      "  foobar();\n"
-      "} else {\n"
-      "  barbaz();\n"
-      "}",
-      format("if(foo){bar();}else if(baz||quux){foobar();}else{barbaz();}",
-             Style));
-  EXPECT_EQ("for (int i = 0;\n"
-            "     i < 10; ++i)\n"
-            "{\n"
-            "  foo();\n"
-            "}",
-            format("for(int i=0;i<10;++i){foo();}", Style));
-  EXPECT_EQ("foreach (int i,\n"
-            "         list)\n"
-            "{\n"
-            "  foo();\n"
-            "}",
-            format("foreach(int i, list){foo();}", Style));
-  Style.ColumnLimit =
-      40; // to concentrate at brace wrapping, not line wrap due to column limit
-  EXPECT_EQ("foreach (int i, list) {\n"
-            "  foo();\n"
-            "}",
-            format("foreach(int i, list){foo();}", Style));
-  Style.ColumnLimit =
-      20; // to concentrate at brace wrapping, not line wrap due to column limit
-  EXPECT_EQ("while (foo || bar ||\n"
-            "       baz)\n"
-            "{\n"
-            "  quux();\n"
-            "}",
-            format("while(foo||bar||baz){quux();}", Style));
-  EXPECT_EQ("switch (\n"
-            "    foo = barbaz)\n"
-            "{\n"
-            "case quux:\n"
-            "  return;\n"
-            "}",
-            format("switch(foo=barbaz){case quux:return;}", Style));
-  EXPECT_EQ("try {\n"
-            "  foo();\n"
-            "} catch (\n"
-            "    Exception &bar)\n"
-            "{\n"
-            "  baz();\n"
-            "}",
-            format("try{foo();}catch(Exception&bar){baz();}", Style));
-  Style.ColumnLimit =
-      40; // to concentrate at brace wrapping, not line wrap due to column limit
-  EXPECT_EQ("try {\n"
-            "  foo();\n"
-            "} catch (Exception &bar) {\n"
-            "  baz();\n"
-            "}",
-            format("try{foo();}catch(Exception&bar){baz();}", Style));
-  Style.ColumnLimit =
-      20; // to concentrate at brace wrapping, not line wrap due to column limit
-
-  Style.BraceWrapping.BeforeElse = true;
-  EXPECT_EQ(
-      "if (foo) {\n"
-      "  bar();\n"
-      "}\n"
-      "else if (baz ||\n"
-      "         quux)\n"
-      "{\n"
-      "  foobar();\n"
-      "}\n"
-      "else {\n"
-      "  barbaz();\n"
-      "}",
-      format("if(foo){bar();}else if(baz||quux){foobar();}else{barbaz();}",
-             Style));
-
-  Style.BraceWrapping.BeforeCatch = true;
-  EXPECT_EQ("try {\n"
-            "  foo();\n"
-            "}\n"
-            "catch (...) {\n"
-            "  baz();\n"
-            "}",
-            format("try{foo();}catch(...){baz();}", Style));
-}
-
-TEST_F(FormatTest, BeforeWhile) {
-  FormatStyle Style = getLLVMStyle();
-  Style.BreakBeforeBraces = FormatStyle::BraceBreakingStyle::BS_Custom;
-
-  verifyFormat("do {\n"
-               "  foo();\n"
-               "} while (1);",
-               Style);
-  Style.BraceWrapping.BeforeWhile = true;
-  verifyFormat("do {\n"
-               "  foo();\n"
-               "}\n"
-               "while (1);",
-               Style);
-}
-
-//===----------------------------------------------------------------------===//
-// Tests for classes, namespaces, etc.
-//===----------------------------------------------------------------------===//
-
-TEST_F(FormatTest, DoesNotBreakSemiAfterClassDecl) {
-  verifyFormat("class A {};");
-}
-
-TEST_F(FormatTest, UnderstandsAccessSpecifiers) {
-  verifyFormat("class A {\n"
-               "public:\n"
-               "public: // comment\n"
-               "protected:\n"
-               "private:\n"
-               "  void f() {}\n"
-               "};");
-  verifyFormat("export class A {\n"
-               "public:\n"
-               "public: // comment\n"
-               "protected:\n"
-               "private:\n"
-               "  void f() {}\n"
-               "};");
-  verifyGoogleFormat("class A {\n"
-                     " public:\n"
-                     " protected:\n"
-                     " private:\n"
-                     "  void f() {}\n"
-                     "};");
-  verifyGoogleFormat("export class A {\n"
-                     " public:\n"
-                     " protected:\n"
-                     " private:\n"
-                     "  void f() {}\n"
-                     "};");
-  verifyFormat("class A {\n"
-               "public slots:\n"
-               "  void f1() {}\n"
-               "public Q_SLOTS:\n"
-               "  void f2() {}\n"
-               "protected slots:\n"
-               "  void f3() {}\n"
-               "protected Q_SLOTS:\n"
-               "  void f4() {}\n"
-               "private slots:\n"
-               "  void f5() {}\n"
-               "private Q_SLOTS:\n"
-               "  void f6() {}\n"
-               "signals:\n"
-               "  void g1();\n"
-               "Q_SIGNALS:\n"
-               "  void g2();\n"
-               "};");
-
-  // Don't interpret 'signals' the wrong way.
-  verifyFormat("signals.set();");
-  verifyFormat("for (Signals signals : f()) {\n}");
-  verifyFormat("{\n"
-               "  signals.set(); // This needs indentation.\n"
-               "}");
-  verifyFormat("void f() {\n"
-               "label:\n"
-               "  signals.baz();\n"
-               "}");
-}
-
-TEST_F(FormatTest, SeparatesLogicalBlocks) {
-  EXPECT_EQ("class A {\n"
-            "public:\n"
-            "  void f();\n"
-            "\n"
-            "private:\n"
-            "  void g() {}\n"
-            "  // test\n"
-            "protected:\n"
-            "  int h;\n"
-            "};",
-            format("class A {\n"
-                   "public:\n"
-                   "void f();\n"
-                   "private:\n"
-                   "void g() {}\n"
-                   "// test\n"
-                   "protected:\n"
-                   "int h;\n"
-                   "};"));
-  EXPECT_EQ("class A {\n"
-            "protected:\n"
-            "public:\n"
-            "  void f();\n"
-            "};",
-            format("class A {\n"
-                   "protected:\n"
-                   "\n"
-                   "public:\n"
-                   "\n"
-                   "  void f();\n"
-                   "};"));
-
-  // Even ensure proper spacing inside macros.
-  EXPECT_EQ("#define B     \\\n"
-            "  class A {   \\\n"
-            "   protected: \\\n"
-            "   public:    \\\n"
-            "    void f(); \\\n"
-            "  };",
-            format("#define B     \\\n"
-                   "  class A {   \\\n"
-                   "   protected: \\\n"
-                   "              \\\n"
-                   "   public:    \\\n"
-                   "              \\\n"
-                   "    void f(); \\\n"
-                   "  };",
-                   getGoogleStyle()));
-  // But don't remove empty lines after macros ending in access specifiers.
-  EXPECT_EQ("#define A private:\n"
-            "\n"
-            "int i;",
-            format("#define A         private:\n"
-                   "\n"
-                   "int              i;"));
-}
-
-TEST_F(FormatTest, FormatsClasses) {
-  verifyFormat("class A : public B {};");
-  verifyFormat("class A : public ::B {};");
-
-  verifyFormat(
-      "class AAAAAAAAAAAAAAAAAAAA : public BBBBBBBBBBBBBBBBBBBBBBBBBBBBBB,\n"
-      "                             public CCCCCCCCCCCCCCCCCCCCCCCCCCCCCC {};");
-  verifyFormat("class AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\n"
-               "    : public BBBBBBBBBBBBBBBBBBBBBBBBBBBBBB,\n"
-               "      public CCCCCCCCCCCCCCCCCCCCCCCCCCCCCC {};");
-  verifyFormat(
-      "class A : public B, public C, public D, public E, public F {};");
-  verifyFormat("class AAAAAAAAAAAA : public B,\n"
-               "                     public C,\n"
-               "                     public D,\n"
-               "                     public E,\n"
-               "                     public F,\n"
-               "                     public G {};");
-
-  verifyFormat("class\n"
-               "    ReallyReallyLongClassName {\n"
-               "  int i;\n"
-               "};",
-               getLLVMStyleWithColumns(32));
-  verifyFormat("struct aaaaaaaaaaaaa : public aaaaaaaaaaaaaaaaaaa< // break\n"
-               "                           aaaaaaaaaaaaaaaa> {};");
-  verifyFormat("struct aaaaaaaaaaaaaaaaaaaa\n"
-               "    : public aaaaaaaaaaaaaaaaaaa<aaaaaaaaaaaaaaaaaaaaa,\n"
-               "                                 aaaaaaaaaaaaaaaaaaaaaa> {};");
-  verifyFormat("template <class R, class C>\n"
-               "struct Aaaaaaaaaaaaaaaaa<R (C::*)(int) const>\n"
-               "    : Aaaaaaaaaaaaaaaaa<R (C::*)(int)> {};");
-  verifyFormat("class ::A::B {};");
-}
-
-TEST_F(FormatTest, BreakInheritanceStyle) {
-  FormatStyle StyleWithInheritanceBreakBeforeComma = getLLVMStyle();
-  StyleWithInheritanceBreakBeforeComma.BreakInheritanceList =
-      FormatStyle::BILS_BeforeComma;
-  verifyFormat("class MyClass : public X {};",
-               StyleWithInheritanceBreakBeforeComma);
-  verifyFormat("class MyClass\n"
-               "    : public X\n"
-               "    , public Y {};",
-               StyleWithInheritanceBreakBeforeComma);
-  verifyFormat("class AAAAAAAAAAAAAAAAAAAAAA\n"
-               "    : public BBBBBBBBBBBBBBBBBBBBBBBBBBBBBB\n"
-               "    , public CCCCCCCCCCCCCCCCCCCCCCCCCCCCCC {};",
-               StyleWithInheritanceBreakBeforeComma);
-  verifyFormat("struct aaaaaaaaaaaaa\n"
-               "    : public aaaaaaaaaaaaaaaaaaa< // break\n"
-               "          aaaaaaaaaaaaaaaa> {};",
-               StyleWithInheritanceBreakBeforeComma);
-
-  FormatStyle StyleWithInheritanceBreakAfterColon = getLLVMStyle();
-  StyleWithInheritanceBreakAfterColon.BreakInheritanceList =
-      FormatStyle::BILS_AfterColon;
-  verifyFormat("class MyClass : public X {};",
-               StyleWithInheritanceBreakAfterColon);
-  verifyFormat("class MyClass : public X, public Y {};",
-               StyleWithInheritanceBreakAfterColon);
-  verifyFormat("class AAAAAAAAAAAAAAAAAAAAAA :\n"
-               "    public BBBBBBBBBBBBBBBBBBBBBBBBBBBBBB,\n"
-               "    public CCCCCCCCCCCCCCCCCCCCCCCCCCCCCC {};",
-               StyleWithInheritanceBreakAfterColon);
-  verifyFormat("struct aaaaaaaaaaaaa :\n"
-               "    public aaaaaaaaaaaaaaaaaaa< // break\n"
-               "        aaaaaaaaaaaaaaaa> {};",
-               StyleWithInheritanceBreakAfterColon);
-
-  FormatStyle StyleWithInheritanceBreakAfterComma = getLLVMStyle();
-  StyleWithInheritanceBreakAfterComma.BreakInheritanceList =
-      FormatStyle::BILS_AfterComma;
-  verifyFormat("class MyClass : public X {};",
-               StyleWithInheritanceBreakAfterComma);
-  verifyFormat("class MyClass : public X,\n"
-               "                public Y {};",
-               StyleWithInheritanceBreakAfterComma);
-  verifyFormat(
-      "class AAAAAAAAAAAAAAAAAAAAAA : public BBBBBBBBBBBBBBBBBBBBBBBBBBBBBB,\n"
-      "                               public CCCCCCCCCCCCCCCCCCCCCCCCCCCCCC "
-      "{};",
-      StyleWithInheritanceBreakAfterComma);
-  verifyFormat("struct aaaaaaaaaaaaa : public aaaaaaaaaaaaaaaaaaa< // break\n"
-               "                           aaaaaaaaaaaaaaaa> {};",
-               StyleWithInheritanceBreakAfterComma);
-  verifyFormat("class AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\n"
-               "    : public OnceBreak,\n"
-               "      public AlwaysBreak,\n"
-               "      EvenBasesFitInOneLine {};",
-               StyleWithInheritanceBreakAfterComma);
-}
-
-TEST_F(FormatTest, FormatsVariableDeclarationsAfterStructOrClass) {
-  verifyFormat("class A {\n} a, b;");
-  verifyFormat("struct A {\n} a, b;");
-  verifyFormat("union A {\n} a;");
-}
-
-TEST_F(FormatTest, FormatsEnum) {
-  verifyFormat("enum {\n"
-               "  Zero,\n"
-               "  One = 1,\n"
-               "  Two = One + 1,\n"
-               "  Three = (One + Two),\n"
-               "  Four = (Zero && (One ^ Two)) | (One << Two),\n"
-               "  Five = (One, Two, Three, Four, 5)\n"
-               "};");
-  verifyGoogleFormat("enum {\n"
-                     "  Zero,\n"
-                     "  One = 1,\n"
-                     "  Two = One + 1,\n"
-                     "  Three = (One + Two),\n"
-                     "  Four = (Zero && (One ^ Two)) | (One << Two),\n"
-                     "  Five = (One, Two, Three, Four, 5)\n"
-                     "};");
-  verifyFormat("enum Enum {};");
-  verifyFormat("enum {};");
-  verifyFormat("enum X E {} d;");
-  verifyFormat("enum __attribute__((...)) E {} d;");
-  verifyFormat("enum __declspec__((...)) E {} d;");
-  verifyFormat("enum {\n"
-               "  Bar = Foo<int, int>::value\n"
-               "};",
-               getLLVMStyleWithColumns(30));
-
-  verifyFormat("enum ShortEnum { A, B, C };");
-  verifyGoogleFormat("enum ShortEnum { A, B, C };");
-
-  EXPECT_EQ("enum KeepEmptyLines {\n"
-            "  ONE,\n"
-            "\n"
-            "  TWO,\n"
-            "\n"
-            "  THREE\n"
-            "}",
-            format("enum KeepEmptyLines {\n"
-                   "  ONE,\n"
-                   "\n"
-                   "  TWO,\n"
-                   "\n"
-                   "\n"
-                   "  THREE\n"
-                   "}"));
-  verifyFormat("enum E { // comment\n"
-               "  ONE,\n"
-               "  TWO\n"
-               "};\n"
-               "int i;");
-
-  FormatStyle EightIndent = getLLVMStyle();
-  EightIndent.IndentWidth = 8;
-  verifyFormat("enum {\n"
-               "        VOID,\n"
-               "        CHAR,\n"
-               "        SHORT,\n"
-               "        INT,\n"
-               "        LONG,\n"
-               "        SIGNED,\n"
-               "        UNSIGNED,\n"
-               "        BOOL,\n"
-               "        FLOAT,\n"
-               "        DOUBLE,\n"
-               "        COMPLEX\n"
-               "};",
-               EightIndent);
-
-  // Not enums.
-  verifyFormat("enum X f() {\n"
-               "  a();\n"
-               "  return 42;\n"
-               "}");
-  verifyFormat("enum X Type::f() {\n"
-               "  a();\n"
-               "  return 42;\n"
-               "}");
-  verifyFormat("enum ::X f() {\n"
-               "  a();\n"
-               "  return 42;\n"
-               "}");
-  verifyFormat("enum ns::X f() {\n"
-               "  a();\n"
-               "  return 42;\n"
-               "}");
-}
-
-TEST_F(FormatTest, FormatsEnumsWithErrors) {
-  verifyFormat("enum Type {\n"
-               "  One = 0; // These semicolons should be commas.\n"
-               "  Two = 1;\n"
-               "};");
-  verifyFormat("namespace n {\n"
-               "enum Type {\n"
-               "  One,\n"
-               "  Two, // missing };\n"
-               "  int i;\n"
-               "}\n"
-               "void g() {}");
-}
-
-TEST_F(FormatTest, FormatsEnumStruct) {
-  verifyFormat("enum struct {\n"
-               "  Zero,\n"
-               "  One = 1,\n"
-               "  Two = One + 1,\n"
-               "  Three = (One + Two),\n"
-               "  Four = (Zero && (One ^ Two)) | (One << Two),\n"
-               "  Five = (One, Two, Three, Four, 5)\n"
-               "};");
-  verifyFormat("enum struct Enum {};");
-  verifyFormat("enum struct {};");
-  verifyFormat("enum struct X E {} d;");
-  verifyFormat("enum struct __attribute__((...)) E {} d;");
-  verifyFormat("enum struct __declspec__((...)) E {} d;");
-  verifyFormat("enum struct X f() {\n  a();\n  return 42;\n}");
-}
-
-TEST_F(FormatTest, FormatsEnumClass) {
-  verifyFormat("enum class {\n"
-               "  Zero,\n"
-               "  One = 1,\n"
-               "  Two = One + 1,\n"
-               "  Three = (One + Two),\n"
-               "  Four = (Zero && (One ^ Two)) | (One << Two),\n"
-               "  Five = (One, Two, Three, Four, 5)\n"
-               "};");
-  verifyFormat("enum class Enum {};");
-  verifyFormat("enum class {};");
-  verifyFormat("enum class X E {} d;");
-  verifyFormat("enum class __attribute__((...)) E {} d;");
-  verifyFormat("enum class __declspec__((...)) E {} d;");
-  verifyFormat("enum class X f() {\n  a();\n  return 42;\n}");
-}
-
-TEST_F(FormatTest, FormatsEnumTypes) {
-  verifyFormat("enum X : int {\n"
-               "  A, // Force multiple lines.\n"
-               "  B\n"
-               "};");
-  verifyFormat("enum X : int { A, B };");
-  verifyFormat("enum X : std::uint32_t { A, B };");
-}
-
-TEST_F(FormatTest, FormatsTypedefEnum) {
-  FormatStyle Style = getLLVMStyle();
-  Style.ColumnLimit = 40;
-  verifyFormat("typedef enum {} EmptyEnum;");
-  verifyFormat("typedef enum { A, B, C } ShortEnum;");
-  verifyFormat("typedef enum {\n"
-               "  ZERO = 0,\n"
-               "  ONE = 1,\n"
-               "  TWO = 2,\n"
-               "  THREE = 3\n"
-               "} LongEnum;",
-               Style);
-  Style.BreakBeforeBraces = FormatStyle::BS_Custom;
-  Style.BraceWrapping.AfterEnum = true;
-  verifyFormat("typedef enum {} EmptyEnum;");
-  verifyFormat("typedef enum { A, B, C } ShortEnum;");
-  verifyFormat("typedef enum\n"
-               "{\n"
-               "  ZERO = 0,\n"
-               "  ONE = 1,\n"
-               "  TWO = 2,\n"
-               "  THREE = 3\n"
-               "} LongEnum;",
-               Style);
-}
-
-TEST_F(FormatTest, FormatsNSEnums) {
-  verifyGoogleFormat("typedef NS_ENUM(NSInteger, SomeName) { AAA, BBB }");
-  verifyGoogleFormat(
-      "typedef NS_CLOSED_ENUM(NSInteger, SomeName) { AAA, BBB }");
-  verifyGoogleFormat("typedef NS_ENUM(NSInteger, MyType) {\n"
-                     "  // Information about someDecentlyLongValue.\n"
-                     "  someDecentlyLongValue,\n"
-                     "  // Information about anotherDecentlyLongValue.\n"
-                     "  anotherDecentlyLongValue,\n"
-                     "  // Information about aThirdDecentlyLongValue.\n"
-                     "  aThirdDecentlyLongValue\n"
-                     "};");
-  verifyGoogleFormat("typedef NS_CLOSED_ENUM(NSInteger, MyType) {\n"
-                     "  // Information about someDecentlyLongValue.\n"
-                     "  someDecentlyLongValue,\n"
-                     "  // Information about anotherDecentlyLongValue.\n"
-                     "  anotherDecentlyLongValue,\n"
-                     "  // Information about aThirdDecentlyLongValue.\n"
-                     "  aThirdDecentlyLongValue\n"
-                     "};");
-  verifyGoogleFormat("typedef NS_OPTIONS(NSInteger, MyType) {\n"
-                     "  a = 1,\n"
-                     "  b = 2,\n"
-                     "  c = 3,\n"
-                     "};");
-  verifyGoogleFormat("typedef CF_ENUM(NSInteger, MyType) {\n"
-                     "  a = 1,\n"
-                     "  b = 2,\n"
-                     "  c = 3,\n"
-                     "};");
-  verifyGoogleFormat("typedef CF_CLOSED_ENUM(NSInteger, MyType) {\n"
-                     "  a = 1,\n"
-                     "  b = 2,\n"
-                     "  c = 3,\n"
-                     "};");
-  verifyGoogleFormat("typedef CF_OPTIONS(NSInteger, MyType) {\n"
-                     "  a = 1,\n"
-                     "  b = 2,\n"
-                     "  c = 3,\n"
-                     "};");
-}
-
-TEST_F(FormatTest, FormatsBitfields) {
-  verifyFormat("struct Bitfields {\n"
-               "  unsigned sClass : 8;\n"
-               "  unsigned ValueKind : 2;\n"
-               "};");
-  verifyFormat("struct A {\n"
-               "  int aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa : 1,\n"
-               "      bbbbbbbbbbbbbbbbbbbbbbbbb;\n"
-               "};");
-  verifyFormat("struct MyStruct {\n"
-               "  uchar data;\n"
-               "  uchar : 8;\n"
-               "  uchar : 8;\n"
-               "  uchar other;\n"
-               "};");
-  FormatStyle Style = getLLVMStyle();
-  Style.BitFieldColonSpacing = FormatStyle::BFCS_None;
-  verifyFormat("struct Bitfields {\n"
-               "  unsigned sClass:8;\n"
-               "  unsigned ValueKind:2;\n"
-               "  uchar other;\n"
-               "};",
-               Style);
-  verifyFormat("struct A {\n"
-               "  int aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa:1,\n"
-               "      bbbbbbbbbbbbbbbbbbbbbbbbb:2;\n"
-               "};",
-               Style);
-  Style.BitFieldColonSpacing = FormatStyle::BFCS_Before;
-  verifyFormat("struct Bitfields {\n"
-               "  unsigned sClass :8;\n"
-               "  unsigned ValueKind :2;\n"
-               "  uchar other;\n"
-               "};",
-               Style);
-  Style.BitFieldColonSpacing = FormatStyle::BFCS_After;
-  verifyFormat("struct Bitfields {\n"
-               "  unsigned sClass: 8;\n"
-               "  unsigned ValueKind: 2;\n"
-               "  uchar other;\n"
-               "};",
-               Style);
-}
-
-TEST_F(FormatTest, FormatsNamespaces) {
-  FormatStyle LLVMWithNoNamespaceFix = getLLVMStyle();
-  LLVMWithNoNamespaceFix.FixNamespaceComments = false;
-
-  verifyFormat("namespace some_namespace {\n"
-               "class A {};\n"
-               "void f() { f(); }\n"
-               "}",
-               LLVMWithNoNamespaceFix);
-  verifyFormat("namespace N::inline D {\n"
-               "class A {};\n"
-               "void f() { f(); }\n"
-               "}",
-               LLVMWithNoNamespaceFix);
-  verifyFormat("namespace N::inline D::E {\n"
-               "class A {};\n"
-               "void f() { f(); }\n"
-               "}",
-               LLVMWithNoNamespaceFix);
-  verifyFormat("namespace [[deprecated(\"foo[bar\")]] some_namespace {\n"
-               "class A {};\n"
-               "void f() { f(); }\n"
-               "}",
-               LLVMWithNoNamespaceFix);
-  verifyFormat("/* something */ namespace some_namespace {\n"
-               "class A {};\n"
-               "void f() { f(); }\n"
-               "}",
-               LLVMWithNoNamespaceFix);
-  verifyFormat("namespace {\n"
-               "class A {};\n"
-               "void f() { f(); }\n"
-               "}",
-               LLVMWithNoNamespaceFix);
-  verifyFormat("/* something */ namespace {\n"
-               "class A {};\n"
-               "void f() { f(); }\n"
-               "}",
-               LLVMWithNoNamespaceFix);
-  verifyFormat("inline namespace X {\n"
-               "class A {};\n"
-               "void f() { f(); }\n"
-               "}",
-               LLVMWithNoNamespaceFix);
-  verifyFormat("/* something */ inline namespace X {\n"
-               "class A {};\n"
-               "void f() { f(); }\n"
-               "}",
-               LLVMWithNoNamespaceFix);
-  verifyFormat("export namespace X {\n"
-               "class A {};\n"
-               "void f() { f(); }\n"
-               "}",
-               LLVMWithNoNamespaceFix);
-  verifyFormat("using namespace some_namespace;\n"
-               "class A {};\n"
-               "void f() { f(); }",
-               LLVMWithNoNamespaceFix);
-
-  // This code is more common than we thought; if we
-  // layout this correctly the semicolon will go into
-  // its own line, which is undesirable.
-  verifyFormat("namespace {};", LLVMWithNoNamespaceFix);
-  verifyFormat("namespace {\n"
-               "class A {};\n"
-               "};",
-               LLVMWithNoNamespaceFix);
-
-  verifyFormat("namespace {\n"
-               "int SomeVariable = 0; // comment\n"
-               "} // namespace",
-               LLVMWithNoNamespaceFix);
-  EXPECT_EQ("#ifndef HEADER_GUARD\n"
-            "#define HEADER_GUARD\n"
-            "namespace my_namespace {\n"
-            "int i;\n"
-            "} // my_namespace\n"
-            "#endif // HEADER_GUARD",
-            format("#ifndef HEADER_GUARD\n"
-                   " #define HEADER_GUARD\n"
-                   "   namespace my_namespace {\n"
-                   "int i;\n"
-                   "}    // my_namespace\n"
-                   "#endif    // HEADER_GUARD",
-                   LLVMWithNoNamespaceFix));
-
-  EXPECT_EQ("namespace A::B {\n"
-            "class C {};\n"
-            "}",
-            format("namespace A::B {\n"
-                   "class C {};\n"
-                   "}",
-                   LLVMWithNoNamespaceFix));
-
-  FormatStyle Style = getLLVMStyle();
-  Style.NamespaceIndentation = FormatStyle::NI_All;
-  EXPECT_EQ("namespace out {\n"
-            "  int i;\n"
-            "  namespace in {\n"
-            "    int i;\n"
-            "  } // namespace in\n"
-            "} // namespace out",
-            format("namespace out {\n"
-                   "int i;\n"
-                   "namespace in {\n"
-                   "int i;\n"
-                   "} // namespace in\n"
-                   "} // namespace out",
-                   Style));
-
-  Style.NamespaceIndentation = FormatStyle::NI_Inner;
-  EXPECT_EQ("namespace out {\n"
-            "int i;\n"
-            "namespace in {\n"
-            "  int i;\n"
-            "} // namespace in\n"
-            "} // namespace out",
-            format("namespace out {\n"
-                   "int i;\n"
-                   "namespace in {\n"
-                   "int i;\n"
-                   "} // namespace in\n"
-                   "} // namespace out",
-                   Style));
-}
-
-TEST_F(FormatTest, NamespaceMacros) {
-  FormatStyle Style = getLLVMStyle();
-  Style.NamespaceMacros.push_back("TESTSUITE");
-
-  verifyFormat("TESTSUITE(A) {\n"
-               "int foo();\n"
-               "} // TESTSUITE(A)",
-               Style);
-
-  verifyFormat("TESTSUITE(A, B) {\n"
-               "int foo();\n"
-               "} // TESTSUITE(A)",
-               Style);
-
-  // Properly indent according to NamespaceIndentation style
-  Style.NamespaceIndentation = FormatStyle::NI_All;
-  verifyFormat("TESTSUITE(A) {\n"
-               "  int foo();\n"
-               "} // TESTSUITE(A)",
-               Style);
-  verifyFormat("TESTSUITE(A) {\n"
-               "  namespace B {\n"
-               "    int foo();\n"
-               "  } // namespace B\n"
-               "} // TESTSUITE(A)",
-               Style);
-  verifyFormat("namespace A {\n"
-               "  TESTSUITE(B) {\n"
-               "    int foo();\n"
-               "  } // TESTSUITE(B)\n"
-               "} // namespace A",
-               Style);
-
-  Style.NamespaceIndentation = FormatStyle::NI_Inner;
-  verifyFormat("TESTSUITE(A) {\n"
-               "TESTSUITE(B) {\n"
-               "  int foo();\n"
-               "} // TESTSUITE(B)\n"
-               "} // TESTSUITE(A)",
-               Style);
-  verifyFormat("TESTSUITE(A) {\n"
-               "namespace B {\n"
-               "  int foo();\n"
-               "} // namespace B\n"
-               "} // TESTSUITE(A)",
-               Style);
-  verifyFormat("namespace A {\n"
-               "TESTSUITE(B) {\n"
-               "  int foo();\n"
-               "} // TESTSUITE(B)\n"
-               "} // namespace A",
-               Style);
-
-  // Properly merge namespace-macros blocks in CompactNamespaces mode
-  Style.NamespaceIndentation = FormatStyle::NI_None;
-  Style.CompactNamespaces = true;
-  verifyFormat("TESTSUITE(A) { TESTSUITE(B) {\n"
-               "}} // TESTSUITE(A::B)",
-               Style);
-
-  EXPECT_EQ("TESTSUITE(out) { TESTSUITE(in) {\n"
-            "}} // TESTSUITE(out::in)",
-            format("TESTSUITE(out) {\n"
-                   "TESTSUITE(in) {\n"
-                   "} // TESTSUITE(in)\n"
-                   "} // TESTSUITE(out)",
-                   Style));
-
-  EXPECT_EQ("TESTSUITE(out) { TESTSUITE(in) {\n"
-            "}} // TESTSUITE(out::in)",
-            format("TESTSUITE(out) {\n"
-                   "TESTSUITE(in) {\n"
-                   "} // TESTSUITE(in)\n"
-                   "} // TESTSUITE(out)",
-                   Style));
-
-  // Do not merge different namespaces/macros
-  EXPECT_EQ("namespace out {\n"
-            "TESTSUITE(in) {\n"
-            "} // TESTSUITE(in)\n"
-            "} // namespace out",
-            format("namespace out {\n"
-                   "TESTSUITE(in) {\n"
-                   "} // TESTSUITE(in)\n"
-                   "} // namespace out",
-                   Style));
-  EXPECT_EQ("TESTSUITE(out) {\n"
-            "namespace in {\n"
-            "} // namespace in\n"
-            "} // TESTSUITE(out)",
-            format("TESTSUITE(out) {\n"
-                   "namespace in {\n"
-                   "} // namespace in\n"
-                   "} // TESTSUITE(out)",
-                   Style));
-  Style.NamespaceMacros.push_back("FOOBAR");
-  EXPECT_EQ("TESTSUITE(out) {\n"
-            "FOOBAR(in) {\n"
-            "} // FOOBAR(in)\n"
-            "} // TESTSUITE(out)",
-            format("TESTSUITE(out) {\n"
-                   "FOOBAR(in) {\n"
-                   "} // FOOBAR(in)\n"
-                   "} // TESTSUITE(out)",
-                   Style));
-}
-
-TEST_F(FormatTest, FormatsCompactNamespaces) {
-  FormatStyle Style = getLLVMStyle();
-  Style.CompactNamespaces = true;
-  Style.NamespaceMacros.push_back("TESTSUITE");
-
-  verifyFormat("namespace A { namespace B {\n"
-               "}} // namespace A::B",
-               Style);
-
-  EXPECT_EQ("namespace out { namespace in {\n"
-            "}} // namespace out::in",
-            format("namespace out {\n"
-                   "namespace in {\n"
-                   "} // namespace in\n"
-                   "} // namespace out",
-                   Style));
-
-  // Only namespaces which have both consecutive opening and end get compacted
-  EXPECT_EQ("namespace out {\n"
-            "namespace in1 {\n"
-            "} // namespace in1\n"
-            "namespace in2 {\n"
-            "} // namespace in2\n"
-            "} // namespace out",
-            format("namespace out {\n"
-                   "namespace in1 {\n"
-                   "} // namespace in1\n"
-                   "namespace in2 {\n"
-                   "} // namespace in2\n"
-                   "} // namespace out",
-                   Style));
-
-  EXPECT_EQ("namespace out {\n"
-            "int i;\n"
-            "namespace in {\n"
-            "int j;\n"
-            "} // namespace in\n"
-            "int k;\n"
-            "} // namespace out",
-            format("namespace out { int i;\n"
-                   "namespace in { int j; } // namespace in\n"
-                   "int k; } // namespace out",
-                   Style));
-
-  EXPECT_EQ("namespace A { namespace B { namespace C {\n"
-            "}}} // namespace A::B::C\n",
-            format("namespace A { namespace B {\n"
-                   "namespace C {\n"
-                   "}} // namespace B::C\n"
-                   "} // namespace A\n",
-                   Style));
-
-  Style.ColumnLimit = 40;
-  EXPECT_EQ("namespace aaaaaaaaaa {\n"
-            "namespace bbbbbbbbbb {\n"
-            "}} // namespace aaaaaaaaaa::bbbbbbbbbb",
-            format("namespace aaaaaaaaaa {\n"
-                   "namespace bbbbbbbbbb {\n"
-                   "} // namespace bbbbbbbbbb\n"
-                   "} // namespace aaaaaaaaaa",
-                   Style));
-
-  EXPECT_EQ("namespace aaaaaa { namespace bbbbbb {\n"
-            "namespace cccccc {\n"
-            "}}} // namespace aaaaaa::bbbbbb::cccccc",
-            format("namespace aaaaaa {\n"
-                   "namespace bbbbbb {\n"
-                   "namespace cccccc {\n"
-                   "} // namespace cccccc\n"
-                   "} // namespace bbbbbb\n"
-                   "} // namespace aaaaaa",
-                   Style));
-  Style.ColumnLimit = 80;
-
-  // Extra semicolon after 'inner' closing brace prevents merging
-  EXPECT_EQ("namespace out { namespace in {\n"
-            "}; } // namespace out::in",
-            format("namespace out {\n"
-                   "namespace in {\n"
-                   "}; // namespace in\n"
-                   "} // namespace out",
-                   Style));
-
-  // Extra semicolon after 'outer' closing brace is conserved
-  EXPECT_EQ("namespace out { namespace in {\n"
-            "}}; // namespace out::in",
-            format("namespace out {\n"
-                   "namespace in {\n"
-                   "} // namespace in\n"
-                   "}; // namespace out",
-                   Style));
-
-  Style.NamespaceIndentation = FormatStyle::NI_All;
-  EXPECT_EQ("namespace out { namespace in {\n"
-            "  int i;\n"
-            "}} // namespace out::in",
-            format("namespace out {\n"
-                   "namespace in {\n"
-                   "int i;\n"
-                   "} // namespace in\n"
-                   "} // namespace out",
-                   Style));
-  EXPECT_EQ("namespace out { namespace mid {\n"
-            "  namespace in {\n"
-            "    int j;\n"
-            "  } // namespace in\n"
-            "  int k;\n"
-            "}} // namespace out::mid",
-            format("namespace out { namespace mid {\n"
-                   "namespace in { int j; } // namespace in\n"
-                   "int k; }} // namespace out::mid",
-                   Style));
-
-  Style.NamespaceIndentation = FormatStyle::NI_Inner;
-  EXPECT_EQ("namespace out { namespace in {\n"
-            "  int i;\n"
-            "}} // namespace out::in",
-            format("namespace out {\n"
-                   "namespace in {\n"
-                   "int i;\n"
-                   "} // namespace in\n"
-                   "} // namespace out",
-                   Style));
-  EXPECT_EQ("namespace out { namespace mid { namespace in {\n"
-            "  int i;\n"
-            "}}} // namespace out::mid::in",
-            format("namespace out {\n"
-                   "namespace mid {\n"
-                   "namespace in {\n"
-                   "int i;\n"
-                   "} // namespace in\n"
-                   "} // namespace mid\n"
-                   "} // namespace out",
-                   Style));
-}
-
-TEST_F(FormatTest, FormatsExternC) {
-  verifyFormat("extern \"C\" {\nint a;");
-  verifyFormat("extern \"C\" {}");
-  verifyFormat("extern \"C\" {\n"
-               "int foo();\n"
-               "}");
-  verifyFormat("extern \"C\" int foo() {}");
-  verifyFormat("extern \"C\" int foo();");
-  verifyFormat("extern \"C\" int foo() {\n"
-               "  int i = 42;\n"
-               "  return i;\n"
-               "}");
-
-  FormatStyle Style = getLLVMStyle();
-  Style.BreakBeforeBraces = FormatStyle::BS_Custom;
-  Style.BraceWrapping.AfterFunction = true;
-  verifyFormat("extern \"C\" int foo() {}", Style);
-  verifyFormat("extern \"C\" int foo();", Style);
-  verifyFormat("extern \"C\" int foo()\n"
-               "{\n"
-               "  int i = 42;\n"
-               "  return i;\n"
-               "}",
-               Style);
-
-  Style.BraceWrapping.AfterExternBlock = true;
-  Style.BraceWrapping.SplitEmptyRecord = false;
-  verifyFormat("extern \"C\"\n"
-               "{}",
-               Style);
-  verifyFormat("extern \"C\"\n"
-               "{\n"
-               "  int foo();\n"
-               "}",
-               Style);
-}
-
-TEST_F(FormatTest, IndentExternBlockStyle) {
-  FormatStyle Style = getLLVMStyle();
-  Style.IndentWidth = 2;
-
-  Style.IndentExternBlock = FormatStyle::IEBS_Indent;
-  verifyFormat("extern \"C\" { /*9*/\n}", Style);
-  verifyFormat("extern \"C\" {\n"
-               "  int foo10();\n"
-               "}",
-               Style);
-
-  Style.IndentExternBlock = FormatStyle::IEBS_NoIndent;
-  verifyFormat("extern \"C\" { /*11*/\n}", Style);
-  verifyFormat("extern \"C\" {\n"
-               "int foo12();\n"
-               "}",
-               Style);
-
-  Style.IndentExternBlock = FormatStyle::IEBS_AfterExternBlock;
-  Style.BreakBeforeBraces = FormatStyle::BS_Custom;
-  Style.BraceWrapping.AfterExternBlock = true;
-  verifyFormat("extern \"C\"\n{ /*13*/\n}", Style);
-  verifyFormat("extern \"C\"\n{\n"
-               "  int foo14();\n"
-               "}",
-               Style);
-
-  Style.IndentExternBlock = FormatStyle::IEBS_AfterExternBlock;
-  Style.BreakBeforeBraces = FormatStyle::BS_Custom;
-  Style.BraceWrapping.AfterExternBlock = false;
-  verifyFormat("extern \"C\" { /*15*/\n}", Style);
-  verifyFormat("extern \"C\" {\n"
-               "int foo16();\n"
-               "}",
-               Style);
-}
-
-TEST_F(FormatTest, FormatsInlineASM) {
-  verifyFormat("asm(\"xyz\" : \"=a\"(a), \"=d\"(b) : \"a\"(data));");
-  verifyFormat("asm(\"nop\" ::: \"memory\");");
-  verifyFormat(
-      "asm(\"movq\\t%%rbx, %%rsi\\n\\t\"\n"
-      "    \"cpuid\\n\\t\"\n"
-      "    \"xchgq\\t%%rbx, %%rsi\\n\\t\"\n"
-      "    : \"=a\"(*rEAX), \"=S\"(*rEBX), \"=c\"(*rECX), \"=d\"(*rEDX)\n"
-      "    : \"a\"(value));");
-  EXPECT_EQ(
-      "void NS_InvokeByIndex(void *that, unsigned int methodIndex) {\n"
-      "  __asm {\n"
-      "        mov     edx,[that] // vtable in edx\n"
-      "        mov     eax,methodIndex\n"
-      "        call    [edx][eax*4] // stdcall\n"
-      "  }\n"
-      "}",
-      format("void NS_InvokeByIndex(void *that,   unsigned int methodIndex) {\n"
-             "    __asm {\n"
-             "        mov     edx,[that] // vtable in edx\n"
-             "        mov     eax,methodIndex\n"
-             "        call    [edx][eax*4] // stdcall\n"
-             "    }\n"
-             "}"));
-  EXPECT_EQ("_asm {\n"
-            "  xor eax, eax;\n"
-            "  cpuid;\n"
-            "}",
-            format("_asm {\n"
-                   "  xor eax, eax;\n"
-                   "  cpuid;\n"
-                   "}"));
-  verifyFormat("void function() {\n"
-               "  // comment\n"
-               "  asm(\"\");\n"
-               "}");
-  EXPECT_EQ("__asm {\n"
-            "}\n"
-            "int i;",
-            format("__asm   {\n"
-                   "}\n"
-                   "int   i;"));
-}
-
-TEST_F(FormatTest, FormatTryCatch) {
-  verifyFormat("try {\n"
-               "  throw a * b;\n"
-               "} catch (int a) {\n"
-               "  // Do nothing.\n"
-               "} catch (...) {\n"
-               "  exit(42);\n"
-               "}");
-
-  // Function-level try statements.
-  verifyFormat("int f() try { return 4; } catch (...) {\n"
-               "  return 5;\n"
-               "}");
-  verifyFormat("class A {\n"
-               "  int a;\n"
-               "  A() try : a(0) {\n"
-               "  } catch (...) {\n"
-               "    throw;\n"
-               "  }\n"
-               "};\n");
-  verifyFormat("class A {\n"
-               "  int a;\n"
-               "  A() try : a(0), b{1} {\n"
-               "  } catch (...) {\n"
-               "    throw;\n"
-               "  }\n"
-               "};\n");
-  verifyFormat("class A {\n"
-               "  int a;\n"
-               "  A() try : a(0), b{1}, c{2} {\n"
-               "  } catch (...) {\n"
-               "    throw;\n"
-               "  }\n"
-               "};\n");
-  verifyFormat("class A {\n"
-               "  int a;\n"
-               "  A() try : a(0), b{1}, c{2} {\n"
-               "    { // New scope.\n"
-               "    }\n"
-               "  } catch (...) {\n"
-               "    throw;\n"
-               "  }\n"
-               "};\n");
-
-  // Incomplete try-catch blocks.
-  verifyIncompleteFormat("try {} catch (");
-}
-
-TEST_F(FormatTest, FormatTryAsAVariable) {
-  verifyFormat("int try;");
-  verifyFormat("int try, size;");
-  verifyFormat("try = foo();");
-  verifyFormat("if (try < size) {\n  return true;\n}");
-
-  verifyFormat("int catch;");
-  verifyFormat("int catch, size;");
-  verifyFormat("catch = foo();");
-  verifyFormat("if (catch < size) {\n  return true;\n}");
-
-  FormatStyle Style = getLLVMStyle();
-  Style.BreakBeforeBraces = FormatStyle::BS_Custom;
-  Style.BraceWrapping.AfterFunction = true;
-  Style.BraceWrapping.BeforeCatch = true;
-  verifyFormat("try {\n"
-               "  int bar = 1;\n"
-               "}\n"
-               "catch (...) {\n"
-               "  int bar = 1;\n"
-               "}",
-               Style);
-  verifyFormat("#if NO_EX\n"
-               "try\n"
-               "#endif\n"
-               "{\n"
-               "}\n"
-               "#if NO_EX\n"
-               "catch (...) {\n"
-               "}",
-               Style);
-  verifyFormat("try /* abc */ {\n"
-               "  int bar = 1;\n"
-               "}\n"
-               "catch (...) {\n"
-               "  int bar = 1;\n"
-               "}",
-               Style);
-  verifyFormat("try\n"
-               "// abc\n"
-               "{\n"
-               "  int bar = 1;\n"
-               "}\n"
-               "catch (...) {\n"
-               "  int bar = 1;\n"
-               "}",
-               Style);
-}
-
-TEST_F(FormatTest, FormatSEHTryCatch) {
-  verifyFormat("__try {\n"
-               "  int a = b * c;\n"
-               "} __except (EXCEPTION_EXECUTE_HANDLER) {\n"
-               "  // Do nothing.\n"
-               "}");
-
-  verifyFormat("__try {\n"
-               "  int a = b * c;\n"
-               "} __finally {\n"
-               "  // Do nothing.\n"
-               "}");
-
-  verifyFormat("DEBUG({\n"
-               "  __try {\n"
-               "  } __finally {\n"
-               "  }\n"
-               "});\n");
-}
-
-TEST_F(FormatTest, IncompleteTryCatchBlocks) {
-  verifyFormat("try {\n"
-               "  f();\n"
-               "} catch {\n"
-               "  g();\n"
-               "}");
-  verifyFormat("try {\n"
-               "  f();\n"
-               "} catch (A a) MACRO(x) {\n"
-               "  g();\n"
-               "} catch (B b) MACRO(x) {\n"
-               "  g();\n"
-               "}");
-}
-
-TEST_F(FormatTest, FormatTryCatchBraceStyles) {
-  FormatStyle Style = getLLVMStyle();
-  for (auto BraceStyle : {FormatStyle::BS_Attach, FormatStyle::BS_Mozilla,
-                          FormatStyle::BS_WebKit}) {
-    Style.BreakBeforeBraces = BraceStyle;
-    verifyFormat("try {\n"
-                 "  // something\n"
-                 "} catch (...) {\n"
-                 "  // something\n"
-                 "}",
-                 Style);
-  }
-  Style.BreakBeforeBraces = FormatStyle::BS_Stroustrup;
-  verifyFormat("try {\n"
-               "  // something\n"
-               "}\n"
-               "catch (...) {\n"
-               "  // something\n"
-               "}",
-               Style);
-  verifyFormat("__try {\n"
-               "  // something\n"
-               "}\n"
-               "__finally {\n"
-               "  // something\n"
-               "}",
-               Style);
-  verifyFormat("@try {\n"
-               "  // something\n"
-               "}\n"
-               "@finally {\n"
-               "  // something\n"
-               "}",
-               Style);
-  Style.BreakBeforeBraces = FormatStyle::BS_Allman;
-  verifyFormat("try\n"
-               "{\n"
-               "  // something\n"
-               "}\n"
-               "catch (...)\n"
-               "{\n"
-               "  // something\n"
-               "}",
-               Style);
-  Style.BreakBeforeBraces = FormatStyle::BS_Whitesmiths;
-  verifyFormat("try\n"
-               "  {\n"
-               "  // something white\n"
-               "  }\n"
-               "catch (...)\n"
-               "  {\n"
-               "  // something white\n"
-               "  }",
-               Style);
-  Style.BreakBeforeBraces = FormatStyle::BS_GNU;
-  verifyFormat("try\n"
-               "  {\n"
-               "    // something\n"
-               "  }\n"
-               "catch (...)\n"
-               "  {\n"
-               "    // something\n"
-               "  }",
-               Style);
-  Style.BreakBeforeBraces = FormatStyle::BS_Custom;
-  Style.BraceWrapping.BeforeCatch = true;
-  verifyFormat("try {\n"
-               "  // something\n"
-               "}\n"
-               "catch (...) {\n"
-               "  // something\n"
-               "}",
-               Style);
-}
-
-TEST_F(FormatTest, StaticInitializers) {
-  verifyFormat("static SomeClass SC = {1, 'a'};");
-
-  verifyFormat("static SomeClass WithALoooooooooooooooooooongName = {\n"
-               "    100000000, "
-               "\"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\"};");
-
-  // Here, everything other than the "}" would fit on a line.
-  verifyFormat("static int LooooooooooooooooooooooooongVariable[1] = {\n"
-               "    10000000000000000000000000};");
-  EXPECT_EQ("S s = {a,\n"
-            "\n"
-            "       b};",
-            format("S s = {\n"
-                   "  a,\n"
-                   "\n"
-                   "  b\n"
-                   "};"));
-
-  // FIXME: This would fit into the column limit if we'd fit "{ {" on the first
-  // line. However, the formatting looks a bit off and this probably doesn't
-  // happen often in practice.
-  verifyFormat("static int Variable[1] = {\n"
-               "    {1000000000000000000000000000000000000}};",
-               getLLVMStyleWithColumns(40));
-}
-
-TEST_F(FormatTest, DesignatedInitializers) {
-  verifyFormat("const struct A a = {.a = 1, .b = 2};");
-  verifyFormat("const struct A a = {.aaaaaaaaaa = 1,\n"
-               "                    .bbbbbbbbbb = 2,\n"
-               "                    .cccccccccc = 3,\n"
-               "                    .dddddddddd = 4,\n"
-               "                    .eeeeeeeeee = 5};");
-  verifyFormat("const struct Aaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaa = {\n"
-               "    .aaaaaaaaaaaaaaaaaaaaaaaaaaa = 1,\n"
-               "    .bbbbbbbbbbbbbbbbbbbbbbbbbbb = 2,\n"
-               "    .ccccccccccccccccccccccccccc = 3,\n"
-               "    .ddddddddddddddddddddddddddd = 4,\n"
-               "    .eeeeeeeeeeeeeeeeeeeeeeeeeee = 5};");
-
-  verifyGoogleFormat("const struct A a = {.a = 1, .b = 2};");
-
-  verifyFormat("const struct A a = {[0] = 1, [1] = 2};");
-  verifyFormat("const struct A a = {[1] = aaaaaaaaaa,\n"
-               "                    [2] = bbbbbbbbbb,\n"
-               "                    [3] = cccccccccc,\n"
-               "                    [4] = dddddddddd,\n"
-               "                    [5] = eeeeeeeeee};");
-  verifyFormat("const struct Aaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaa = {\n"
-               "    [1] = aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,\n"
-               "    [2] = bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb,\n"
-               "    [3] = cccccccccccccccccccccccccccccccccccccc,\n"
-               "    [4] = dddddddddddddddddddddddddddddddddddddd,\n"
-               "    [5] = eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee};");
-}
-
-TEST_F(FormatTest, NestedStaticInitializers) {
-  verifyFormat("static A x = {{{}}};\n");
-  verifyFormat("static A x = {{{init1, init2, init3, init4},\n"
-               "               {init1, init2, init3, init4}}};",
-               getLLVMStyleWithColumns(50));
-
-  verifyFormat("somes Status::global_reps[3] = {\n"
-               "    {kGlobalRef, OK_CODE, NULL, NULL, NULL},\n"
-               "    {kGlobalRef, CANCELLED_CODE, NULL, NULL, NULL},\n"
-               "    {kGlobalRef, UNKNOWN_CODE, NULL, NULL, NULL}};",
-               getLLVMStyleWithColumns(60));
-  verifyGoogleFormat("SomeType Status::global_reps[3] = {\n"
-                     "    {kGlobalRef, OK_CODE, NULL, NULL, NULL},\n"
-                     "    {kGlobalRef, CANCELLED_CODE, NULL, NULL, NULL},\n"
-                     "    {kGlobalRef, UNKNOWN_CODE, NULL, NULL, NULL}};");
-  verifyFormat("CGRect cg_rect = {{rect.fLeft, rect.fTop},\n"
-               "                  {rect.fRight - rect.fLeft, rect.fBottom - "
-               "rect.fTop}};");
-
-  verifyFormat(
-      "SomeArrayOfSomeType a = {\n"
-      "    {{1, 2, 3},\n"
-      "     {1, 2, 3},\n"
-      "     {111111111111111111111111111111, 222222222222222222222222222222,\n"
-      "      333333333333333333333333333333},\n"
-      "     {1, 2, 3},\n"
-      "     {1, 2, 3}}};");
-  verifyFormat(
-      "SomeArrayOfSomeType a = {\n"
-      "    {{1, 2, 3}},\n"
-      "    {{1, 2, 3}},\n"
-      "    {{111111111111111111111111111111, 222222222222222222222222222222,\n"
-      "      333333333333333333333333333333}},\n"
-      "    {{1, 2, 3}},\n"
-      "    {{1, 2, 3}}};");
-
-  verifyFormat("struct {\n"
-               "  unsigned bit;\n"
-               "  const char *const name;\n"
-               "} kBitsToOs[] = {{kOsMac, \"Mac\"},\n"
-               "                 {kOsWin, \"Windows\"},\n"
-               "                 {kOsLinux, \"Linux\"},\n"
-               "                 {kOsCrOS, \"Chrome OS\"}};");
-  verifyFormat("struct {\n"
-               "  unsigned bit;\n"
-               "  const char *const name;\n"
-               "} kBitsToOs[] = {\n"
-               "    {kOsMac, \"Mac\"},\n"
-               "    {kOsWin, \"Windows\"},\n"
-               "    {kOsLinux, \"Linux\"},\n"
-               "    {kOsCrOS, \"Chrome OS\"},\n"
-               "};");
-}
-
-TEST_F(FormatTest, FormatsSmallMacroDefinitionsInSingleLine) {
-  verifyFormat("#define ALooooooooooooooooooooooooooooooooooooooongMacro("
-               "                      \\\n"
-               "    aLoooooooooooooooooooooooongFuuuuuuuuuuuuuunctiooooooooo)");
-}
-
-TEST_F(FormatTest, DoesNotBreakPureVirtualFunctionDefinition) {
-  verifyFormat("virtual void write(ELFWriter *writerrr,\n"
-               "                   OwningPtr<FileOutputBuffer> &buffer) = 0;");
-
-  // Do break defaulted and deleted functions.
-  verifyFormat("virtual void ~Deeeeeeeestructor() =\n"
-               "    default;",
-               getLLVMStyleWithColumns(40));
-  verifyFormat("virtual void ~Deeeeeeeestructor() =\n"
-               "    delete;",
-               getLLVMStyleWithColumns(40));
-}
-
-TEST_F(FormatTest, BreaksStringLiteralsOnlyInDefine) {
-  verifyFormat("# 1111 \"/aaaaaaaaa/aaaaaaaaaaaaaaaaaaa/aaaaaaaa.cpp\" 2 3",
-               getLLVMStyleWithColumns(40));
-  verifyFormat("#line 11111 \"/aaaaaaaaa/aaaaaaaaaaaaaaaaaaa/aaaaaaaa.cpp\"",
-               getLLVMStyleWithColumns(40));
-  EXPECT_EQ("#define Q                              \\\n"
-            "  \"/aaaaaaaaa/aaaaaaaaaaaaaaaaaaa/\"    \\\n"
-            "  \"aaaaaaaa.cpp\"",
-            format("#define Q \"/aaaaaaaaa/aaaaaaaaaaaaaaaaaaa/aaaaaaaa.cpp\"",
-                   getLLVMStyleWithColumns(40)));
-}
-
-TEST_F(FormatTest, UnderstandsLinePPDirective) {
-  EXPECT_EQ("# 123 \"A string literal\"",
-            format("   #     123    \"A string literal\""));
-}
-
-TEST_F(FormatTest, LayoutUnknownPPDirective) {
-  EXPECT_EQ("#;", format("#;"));
-  verifyFormat("#\n;\n;\n;");
-}
-
-TEST_F(FormatTest, UnescapedEndOfLineEndsPPDirective) {
-  EXPECT_EQ("#line 42 \"test\"\n",
-            format("#  \\\n  line  \\\n  42  \\\n  \"test\"\n"));
-  EXPECT_EQ("#define A B\n", format("#  \\\n define  \\\n    A  \\\n       B\n",
-                                    getLLVMStyleWithColumns(12)));
-}
-
-TEST_F(FormatTest, EndOfFileEndsPPDirective) {
-  EXPECT_EQ("#line 42 \"test\"",
-            format("#  \\\n  line  \\\n  42  \\\n  \"test\""));
-  EXPECT_EQ("#define A B", format("#  \\\n define  \\\n    A  \\\n       B"));
-}
-
-TEST_F(FormatTest, DoesntRemoveUnknownTokens) {
-  verifyFormat("#define A \\x20");
-  verifyFormat("#define A \\ x20");
-  EXPECT_EQ("#define A \\ x20", format("#define A \\   x20"));
-  verifyFormat("#define A ''");
-  verifyFormat("#define A ''qqq");
-  verifyFormat("#define A `qqq");
-  verifyFormat("f(\"aaaa, bbbb, \"\\\"ccccc\\\"\");");
-  EXPECT_EQ("const char *c = STRINGIFY(\n"
-            "\\na : b);",
-            format("const char * c = STRINGIFY(\n"
-                   "\\na : b);"));
-
-  verifyFormat("a\r\\");
-  verifyFormat("a\v\\");
-  verifyFormat("a\f\\");
-}
-
-TEST_F(FormatTest, IndentsPPDirectiveWithPPIndentWidth) {
-  FormatStyle style = getChromiumStyle(FormatStyle::LK_Cpp);
-  style.IndentWidth = 4;
-  style.PPIndentWidth = 1;
-
-  style.IndentPPDirectives = FormatStyle::PPDIS_None;
-  verifyFormat("#ifdef __linux__\n"
-               "void foo() {\n"
-               "    int x = 0;\n"
-               "}\n"
-               "#define FOO\n"
-               "#endif\n"
-               "void bar() {\n"
-               "    int y = 0;\n"
-               "}\n",
-               style);
-
-  style.IndentPPDirectives = FormatStyle::PPDIS_AfterHash;
-  verifyFormat("#ifdef __linux__\n"
-               "void foo() {\n"
-               "    int x = 0;\n"
-               "}\n"
-               "# define FOO foo\n"
-               "#endif\n"
-               "void bar() {\n"
-               "    int y = 0;\n"
-               "}\n",
-               style);
-
-  style.IndentPPDirectives = FormatStyle::PPDIS_BeforeHash;
-  verifyFormat("#ifdef __linux__\n"
-               "void foo() {\n"
-               "    int x = 0;\n"
-               "}\n"
-               " #define FOO foo\n"
-               "#endif\n"
-               "void bar() {\n"
-               "    int y = 0;\n"
-               "}\n",
-               style);
-}
-
-TEST_F(FormatTest, IndentsPPDirectiveInReducedSpace) {
-  verifyFormat("#define A(BB)", getLLVMStyleWithColumns(13));
-  verifyFormat("#define A( \\\n    BB)", getLLVMStyleWithColumns(12));
-  verifyFormat("#define A( \\\n    A, B)", getLLVMStyleWithColumns(12));
-  // FIXME: We never break before the macro name.
-  verifyFormat("#define AA( \\\n    B)", getLLVMStyleWithColumns(12));
-
-  verifyFormat("#define A A\n#define A A");
-  verifyFormat("#define A(X) A\n#define A A");
-
-  verifyFormat("#define Something Other", getLLVMStyleWithColumns(23));
-  verifyFormat("#define Something    \\\n  Other", getLLVMStyleWithColumns(22));
-}
-
-TEST_F(FormatTest, HandlePreprocessorDirectiveContext) {
-  EXPECT_EQ("// somecomment\n"
-            "#include \"a.h\"\n"
-            "#define A(  \\\n"
-            "    A, B)\n"
-            "#include \"b.h\"\n"
-            "// somecomment\n",
-            format("  // somecomment\n"
-                   "  #include \"a.h\"\n"
-                   "#define A(A,\\\n"
-                   "    B)\n"
-                   "    #include \"b.h\"\n"
-                   " // somecomment\n",
-                   getLLVMStyleWithColumns(13)));
-}
-
-TEST_F(FormatTest, LayoutSingleHash) { EXPECT_EQ("#\na;", format("#\na;")); }
-
-TEST_F(FormatTest, LayoutCodeInMacroDefinitions) {
-  EXPECT_EQ("#define A    \\\n"
-            "  c;         \\\n"
-            "  e;\n"
-            "f;",
-            format("#define A c; e;\n"
-                   "f;",
-                   getLLVMStyleWithColumns(14)));
-}
-
-TEST_F(FormatTest, LayoutRemainingTokens) { EXPECT_EQ("{}", format("{}")); }
-
-TEST_F(FormatTest, MacroDefinitionInsideStatement) {
-  EXPECT_EQ("int x,\n"
-            "#define A\n"
-            "    y;",
-            format("int x,\n#define A\ny;"));
-}
-
-TEST_F(FormatTest, HashInMacroDefinition) {
-  EXPECT_EQ("#define A(c) L#c", format("#define A(c) L#c", getLLVMStyle()));
-  verifyFormat("#define A \\\n  b #c;", getLLVMStyleWithColumns(11));
-  verifyFormat("#define A  \\\n"
-               "  {        \\\n"
-               "    f(#c); \\\n"
-               "  }",
-               getLLVMStyleWithColumns(11));
-
-  verifyFormat("#define A(X)         \\\n"
-               "  void function##X()",
-               getLLVMStyleWithColumns(22));
-
-  verifyFormat("#define A(a, b, c)   \\\n"
-               "  void a##b##c()",
-               getLLVMStyleWithColumns(22));
-
-  verifyFormat("#define A void # ## #", getLLVMStyleWithColumns(22));
-}
-
-TEST_F(FormatTest, RespectWhitespaceInMacroDefinitions) {
-  EXPECT_EQ("#define A (x)", format("#define A (x)"));
-  EXPECT_EQ("#define A(x)", format("#define A(x)"));
-
-  FormatStyle Style = getLLVMStyle();
-  Style.SpaceBeforeParens = FormatStyle::SBPO_Never;
-  verifyFormat("#define true ((foo)1)", Style);
-  Style.SpaceBeforeParens = FormatStyle::SBPO_Always;
-  verifyFormat("#define false((foo)0)", Style);
-}
-
-TEST_F(FormatTest, EmptyLinesInMacroDefinitions) {
-  EXPECT_EQ("#define A b;", format("#define A \\\n"
-                                   "          \\\n"
-                                   "  b;",
-                                   getLLVMStyleWithColumns(25)));
-  EXPECT_EQ("#define A \\\n"
-            "          \\\n"
-            "  a;      \\\n"
-            "  b;",
-            format("#define A \\\n"
-                   "          \\\n"
-                   "  a;      \\\n"
-                   "  b;",
-                   getLLVMStyleWithColumns(11)));
-  EXPECT_EQ("#define A \\\n"
-            "  a;      \\\n"
-            "          \\\n"
-            "  b;",
-            format("#define A \\\n"
-                   "  a;      \\\n"
-                   "          \\\n"
-                   "  b;",
-                   getLLVMStyleWithColumns(11)));
-}
-
-TEST_F(FormatTest, MacroDefinitionsWithIncompleteCode) {
-  verifyIncompleteFormat("#define A :");
-  verifyFormat("#define SOMECASES  \\\n"
-               "  case 1:          \\\n"
-               "  case 2\n",
-               getLLVMStyleWithColumns(20));
-  verifyFormat("#define MACRO(a) \\\n"
-               "  if (a)         \\\n"
-               "    f();         \\\n"
-               "  else           \\\n"
-               "    g()",
-               getLLVMStyleWithColumns(18));
-  verifyFormat("#define A template <typename T>");
-  verifyIncompleteFormat("#define STR(x) #x\n"
-                         "f(STR(this_is_a_string_literal{));");
-  verifyFormat("#pragma omp threadprivate( \\\n"
-               "    y)), // expected-warning",
-               getLLVMStyleWithColumns(28));
-  verifyFormat("#d, = };");
-  verifyFormat("#if \"a");
-  verifyIncompleteFormat("({\n"
-                         "#define b     \\\n"
-                         "  }           \\\n"
-                         "  a\n"
-                         "a",
-                         getLLVMStyleWithColumns(15));
-  verifyFormat("#define A     \\\n"
-               "  {           \\\n"
-               "    {\n"
-               "#define B     \\\n"
-               "  }           \\\n"
-               "  }",
-               getLLVMStyleWithColumns(15));
-  verifyNoCrash("#if a\na(\n#else\n#endif\n{a");
-  verifyNoCrash("a={0,1\n#if a\n#else\n;\n#endif\n}");
-  verifyNoCrash("#if a\na(\n#else\n#endif\n) a {a,b,c,d,f,g};");
-  verifyNoCrash("#ifdef A\n a(\n #else\n #endif\n) = []() {      \n)}");
-}
-
-TEST_F(FormatTest, MacrosWithoutTrailingSemicolon) {
-  verifyFormat("SOME_TYPE_NAME abc;"); // Gated on the newline.
-  EXPECT_EQ("class A : public QObject {\n"
-            "  Q_OBJECT\n"
-            "\n"
-            "  A() {}\n"
-            "};",
-            format("class A  :  public QObject {\n"
-                   "     Q_OBJECT\n"
-                   "\n"
-                   "  A() {\n}\n"
-                   "}  ;"));
-  EXPECT_EQ("MACRO\n"
-            "/*static*/ int i;",
-            format("MACRO\n"
-                   " /*static*/ int   i;"));
-  EXPECT_EQ("SOME_MACRO\n"
-            "namespace {\n"
-            "void f();\n"
-            "} // namespace",
-            format("SOME_MACRO\n"
-                   "  namespace    {\n"
-                   "void   f(  );\n"
-                   "} // namespace"));
-  // Only if the identifier contains at least 5 characters.
-  EXPECT_EQ("HTTP f();", format("HTTP\nf();"));
-  EXPECT_EQ("MACRO\nf();", format("MACRO\nf();"));
-  // Only if everything is upper case.
-  EXPECT_EQ("class A : public QObject {\n"
-            "  Q_Object A() {}\n"
-            "};",
-            format("class A  :  public QObject {\n"
-                   "     Q_Object\n"
-                   "  A() {\n}\n"
-                   "}  ;"));
-
-  // Only if the next line can actually start an unwrapped line.
-  EXPECT_EQ("SOME_WEIRD_LOG_MACRO << SomeThing;",
-            format("SOME_WEIRD_LOG_MACRO\n"
-                   "<< SomeThing;"));
-
-  verifyFormat("VISIT_GL_CALL(GenBuffers, void, (GLsizei n, GLuint* buffers), "
-               "(n, buffers))\n",
-               getChromiumStyle(FormatStyle::LK_Cpp));
-
-  // See PR41483
-  EXPECT_EQ("/**/ FOO(a)\n"
-            "FOO(b)",
-            format("/**/ FOO(a)\n"
-                   "FOO(b)"));
-}
-
-TEST_F(FormatTest, MacroCallsWithoutTrailingSemicolon) {
-  EXPECT_EQ("INITIALIZE_PASS_BEGIN(ScopDetection, \"polly-detect\")\n"
-            "INITIALIZE_AG_DEPENDENCY(AliasAnalysis)\n"
-            "INITIALIZE_PASS_DEPENDENCY(DominatorTree)\n"
-            "class X {};\n"
-            "INITIALIZE_PASS_END(ScopDetection, \"polly-detect\")\n"
-            "int *createScopDetectionPass() { return 0; }",
-            format("  INITIALIZE_PASS_BEGIN(ScopDetection, \"polly-detect\")\n"
-                   "  INITIALIZE_AG_DEPENDENCY(AliasAnalysis)\n"
-                   "  INITIALIZE_PASS_DEPENDENCY(DominatorTree)\n"
-                   "  class X {};\n"
-                   "  INITIALIZE_PASS_END(ScopDetection, \"polly-detect\")\n"
-                   "  int *createScopDetectionPass() { return 0; }"));
-  // FIXME: We could probably treat IPC_BEGIN_MESSAGE_MAP/IPC_END_MESSAGE_MAP as
-  // braces, so that inner block is indented one level more.
-  EXPECT_EQ("int q() {\n"
-            "  IPC_BEGIN_MESSAGE_MAP(WebKitTestController, message)\n"
-            "  IPC_MESSAGE_HANDLER(xxx, qqq)\n"
-            "  IPC_END_MESSAGE_MAP()\n"
-            "}",
-            format("int q() {\n"
-                   "  IPC_BEGIN_MESSAGE_MAP(WebKitTestController, message)\n"
-                   "    IPC_MESSAGE_HANDLER(xxx, qqq)\n"
-                   "  IPC_END_MESSAGE_MAP()\n"
-                   "}"));
-
-  // Same inside macros.
-  EXPECT_EQ("#define LIST(L) \\\n"
-            "  L(A)          \\\n"
-            "  L(B)          \\\n"
-            "  L(C)",
-            format("#define LIST(L) \\\n"
-                   "  L(A) \\\n"
-                   "  L(B) \\\n"
-                   "  L(C)",
-                   getGoogleStyle()));
-
-  // These must not be recognized as macros.
-  EXPECT_EQ("int q() {\n"
-            "  f(x);\n"
-            "  f(x) {}\n"
-            "  f(x)->g();\n"
-            "  f(x)->*g();\n"
-            "  f(x).g();\n"
-            "  f(x) = x;\n"
-            "  f(x) += x;\n"
-            "  f(x) -= x;\n"
-            "  f(x) *= x;\n"
-            "  f(x) /= x;\n"
-            "  f(x) %= x;\n"
-            "  f(x) &= x;\n"
-            "  f(x) |= x;\n"
-            "  f(x) ^= x;\n"
-            "  f(x) >>= x;\n"
-            "  f(x) <<= x;\n"
-            "  f(x)[y].z();\n"
-            "  LOG(INFO) << x;\n"
-            "  ifstream(x) >> x;\n"
-            "}\n",
-            format("int q() {\n"
-                   "  f(x)\n;\n"
-                   "  f(x)\n {}\n"
-                   "  f(x)\n->g();\n"
-                   "  f(x)\n->*g();\n"
-                   "  f(x)\n.g();\n"
-                   "  f(x)\n = x;\n"
-                   "  f(x)\n += x;\n"
-                   "  f(x)\n -= x;\n"
-                   "  f(x)\n *= x;\n"
-                   "  f(x)\n /= x;\n"
-                   "  f(x)\n %= x;\n"
-                   "  f(x)\n &= x;\n"
-                   "  f(x)\n |= x;\n"
-                   "  f(x)\n ^= x;\n"
-                   "  f(x)\n >>= x;\n"
-                   "  f(x)\n <<= x;\n"
-                   "  f(x)\n[y].z();\n"
-                   "  LOG(INFO)\n << x;\n"
-                   "  ifstream(x)\n >> x;\n"
-                   "}\n"));
-  EXPECT_EQ("int q() {\n"
-            "  F(x)\n"
-            "  if (1) {\n"
-            "  }\n"
-            "  F(x)\n"
-            "  while (1) {\n"
-            "  }\n"
-            "  F(x)\n"
-            "  G(x);\n"
-            "  F(x)\n"
-            "  try {\n"
-            "    Q();\n"
-            "  } catch (...) {\n"
-            "  }\n"
-            "}\n",
-            format("int q() {\n"
-                   "F(x)\n"
-                   "if (1) {}\n"
-                   "F(x)\n"
-                   "while (1) {}\n"
-                   "F(x)\n"
-                   "G(x);\n"
-                   "F(x)\n"
-                   "try { Q(); } catch (...) {}\n"
-                   "}\n"));
-  EXPECT_EQ("class A {\n"
-            "  A() : t(0) {}\n"
-            "  A(int i) noexcept() : {}\n"
-            "  A(X x)\n" // FIXME: function-level try blocks are broken.
-            "  try : t(0) {\n"
-            "  } catch (...) {\n"
-            "  }\n"
-            "};",
-            format("class A {\n"
-                   "  A()\n : t(0) {}\n"
-                   "  A(int i)\n noexcept() : {}\n"
-                   "  A(X x)\n"
-                   "  try : t(0) {} catch (...) {}\n"
-                   "};"));
-  FormatStyle Style = getLLVMStyle();
-  Style.BreakBeforeBraces = FormatStyle::BS_Custom;
-  Style.BraceWrapping.AfterControlStatement = FormatStyle::BWACS_Always;
-  Style.BraceWrapping.AfterFunction = true;
-  EXPECT_EQ("void f()\n"
-            "try\n"
-            "{\n"
-            "}",
-            format("void f() try {\n"
-                   "}",
-                   Style));
-  EXPECT_EQ("class SomeClass {\n"
-            "public:\n"
-            "  SomeClass() EXCLUSIVE_LOCK_FUNCTION(mu_);\n"
-            "};",
-            format("class SomeClass {\n"
-                   "public:\n"
-                   "  SomeClass()\n"
-                   "  EXCLUSIVE_LOCK_FUNCTION(mu_);\n"
-                   "};"));
-  EXPECT_EQ("class SomeClass {\n"
-            "public:\n"
-            "  SomeClass()\n"
-            "      EXCLUSIVE_LOCK_FUNCTION(mu_);\n"
-            "};",
-            format("class SomeClass {\n"
-                   "public:\n"
-                   "  SomeClass()\n"
-                   "  EXCLUSIVE_LOCK_FUNCTION(mu_);\n"
-                   "};",
-                   getLLVMStyleWithColumns(40)));
-
-  verifyFormat("MACRO(>)");
-
-  // Some macros contain an implicit semicolon.
-  Style = getLLVMStyle();
-  Style.StatementMacros.push_back("FOO");
-  verifyFormat("FOO(a) int b = 0;");
-  verifyFormat("FOO(a)\n"
-               "int b = 0;",
-               Style);
-  verifyFormat("FOO(a);\n"
-               "int b = 0;",
-               Style);
-  verifyFormat("FOO(argc, argv, \"4.0.2\")\n"
-               "int b = 0;",
-               Style);
-  verifyFormat("FOO()\n"
-               "int b = 0;",
-               Style);
-  verifyFormat("FOO\n"
-               "int b = 0;",
-               Style);
-  verifyFormat("void f() {\n"
-               "  FOO(a)\n"
-               "  return a;\n"
-               "}",
-               Style);
-  verifyFormat("FOO(a)\n"
-               "FOO(b)",
-               Style);
-  verifyFormat("int a = 0;\n"
-               "FOO(b)\n"
-               "int c = 0;",
-               Style);
-  verifyFormat("int a = 0;\n"
-               "int x = FOO(a)\n"
-               "int b = 0;",
-               Style);
-  verifyFormat("void foo(int a) { FOO(a) }\n"
-               "uint32_t bar() {}",
-               Style);
-}
-
-TEST_F(FormatTest, LayoutMacroDefinitionsStatementsSpanningBlocks) {
-  verifyFormat("#define A \\\n"
-               "  f({     \\\n"
-               "    g();  \\\n"
-               "  });",
-               getLLVMStyleWithColumns(11));
-}
-
-TEST_F(FormatTest, IndentPreprocessorDirectives) {
-  FormatStyle Style = getLLVMStyle();
-  Style.IndentPPDirectives = FormatStyle::PPDIS_None;
-  Style.ColumnLimit = 40;
-  verifyFormat("#ifdef _WIN32\n"
-               "#define A 0\n"
-               "#ifdef VAR2\n"
-               "#define B 1\n"
-               "#include <someheader.h>\n"
-               "#define MACRO                          \\\n"
-               "  some_very_long_func_aaaaaaaaaa();\n"
-               "#endif\n"
-               "#else\n"
-               "#define A 1\n"
-               "#endif",
-               Style);
-  Style.IndentPPDirectives = FormatStyle::PPDIS_AfterHash;
-  verifyFormat("#ifdef _WIN32\n"
-               "#  define A 0\n"
-               "#  ifdef VAR2\n"
-               "#    define B 1\n"
-               "#    include <someheader.h>\n"
-               "#    define MACRO                      \\\n"
-               "      some_very_long_func_aaaaaaaaaa();\n"
-               "#  endif\n"
-               "#else\n"
-               "#  define A 1\n"
-               "#endif",
-               Style);
-  verifyFormat("#if A\n"
-               "#  define MACRO                        \\\n"
-               "    void a(int x) {                    \\\n"
-               "      b();                             \\\n"
-               "      c();                             \\\n"
-               "      d();                             \\\n"
-               "      e();                             \\\n"
-               "      f();                             \\\n"
-               "    }\n"
-               "#endif",
-               Style);
-  // Comments before include guard.
-  verifyFormat("// file comment\n"
-               "// file comment\n"
-               "#ifndef HEADER_H\n"
-               "#define HEADER_H\n"
-               "code();\n"
-               "#endif",
-               Style);
-  // Test with include guards.
-  verifyFormat("#ifndef HEADER_H\n"
-               "#define HEADER_H\n"
-               "code();\n"
-               "#endif",
-               Style);
-  // Include guards must have a #define with the same variable immediately
-  // after #ifndef.
-  verifyFormat("#ifndef NOT_GUARD\n"
-               "#  define FOO\n"
-               "code();\n"
-               "#endif",
-               Style);
-
-  // Include guards must cover the entire file.
-  verifyFormat("code();\n"
-               "code();\n"
-               "#ifndef NOT_GUARD\n"
-               "#  define NOT_GUARD\n"
-               "code();\n"
-               "#endif",
-               Style);
-  verifyFormat("#ifndef NOT_GUARD\n"
-               "#  define NOT_GUARD\n"
-               "code();\n"
-               "#endif\n"
-               "code();",
-               Style);
-  // Test with trailing blank lines.
-  verifyFormat("#ifndef HEADER_H\n"
-               "#define HEADER_H\n"
-               "code();\n"
-               "#endif\n",
-               Style);
-  // Include guards don't have #else.
-  verifyFormat("#ifndef NOT_GUARD\n"
-               "#  define NOT_GUARD\n"
-               "code();\n"
-               "#else\n"
-               "#endif",
-               Style);
-  verifyFormat("#ifndef NOT_GUARD\n"
-               "#  define NOT_GUARD\n"
-               "code();\n"
-               "#elif FOO\n"
-               "#endif",
-               Style);
-  // Non-identifier #define after potential include guard.
-  verifyFormat("#ifndef FOO\n"
-               "#  define 1\n"
-               "#endif\n",
-               Style);
-  // #if closes past last non-preprocessor line.
-  verifyFormat("#ifndef FOO\n"
-               "#define FOO\n"
-               "#if 1\n"
-               "int i;\n"
-               "#  define A 0\n"
-               "#endif\n"
-               "#endif\n",
-               Style);
-  // Don't crash if there is an #elif directive without a condition.
-  verifyFormat("#if 1\n"
-               "int x;\n"
-               "#elif\n"
-               "int y;\n"
-               "#else\n"
-               "int z;\n"
-               "#endif",
-               Style);
-  // FIXME: This doesn't handle the case where there's code between the
-  // #ifndef and #define but all other conditions hold. This is because when
-  // the #define line is parsed, UnwrappedLineParser::Lines doesn't hold the
-  // previous code line yet, so we can't detect it.
-  EXPECT_EQ("#ifndef NOT_GUARD\n"
-            "code();\n"
-            "#define NOT_GUARD\n"
-            "code();\n"
-            "#endif",
-            format("#ifndef NOT_GUARD\n"
-                   "code();\n"
-                   "#  define NOT_GUARD\n"
-                   "code();\n"
-                   "#endif",
-                   Style));
-  // FIXME: This doesn't handle cases where legitimate preprocessor lines may
-  // be outside an include guard. Examples are #pragma once and
-  // #pragma GCC diagnostic, or anything else that does not change the meaning
-  // of the file if it's included multiple times.
-  EXPECT_EQ("#ifdef WIN32\n"
-            "#  pragma once\n"
-            "#endif\n"
-            "#ifndef HEADER_H\n"
-            "#  define HEADER_H\n"
-            "code();\n"
-            "#endif",
-            format("#ifdef WIN32\n"
-                   "#  pragma once\n"
-                   "#endif\n"
-                   "#ifndef HEADER_H\n"
-                   "#define HEADER_H\n"
-                   "code();\n"
-                   "#endif",
-                   Style));
-  // FIXME: This does not detect when there is a single non-preprocessor line
-  // in front of an include-guard-like structure where other conditions hold
-  // because ScopedLineState hides the line.
-  EXPECT_EQ("code();\n"
-            "#ifndef HEADER_H\n"
-            "#define HEADER_H\n"
-            "code();\n"
-            "#endif",
-            format("code();\n"
-                   "#ifndef HEADER_H\n"
-                   "#  define HEADER_H\n"
-                   "code();\n"
-                   "#endif",
-                   Style));
-  // Keep comments aligned with #, otherwise indent comments normally. These
-  // tests cannot use verifyFormat because messUp manipulates leading
-  // whitespace.
-  {
-    const char *Expected = ""
-                           "void f() {\n"
-                           "#if 1\n"
-                           "// Preprocessor aligned.\n"
-                           "#  define A 0\n"
-                           "  // Code. Separated by blank line.\n"
-                           "\n"
-                           "#  define B 0\n"
-                           "  // Code. Not aligned with #\n"
-                           "#  define C 0\n"
-                           "#endif";
-    const char *ToFormat = ""
-                           "void f() {\n"
-                           "#if 1\n"
-                           "// Preprocessor aligned.\n"
-                           "#  define A 0\n"
-                           "// Code. Separated by blank line.\n"
-                           "\n"
-                           "#  define B 0\n"
-                           "   // Code. Not aligned with #\n"
-                           "#  define C 0\n"
-                           "#endif";
-    EXPECT_EQ(Expected, format(ToFormat, Style));
-    EXPECT_EQ(Expected, format(Expected, Style));
-  }
-  // Keep block quotes aligned.
-  {
-    const char *Expected = ""
-                           "void f() {\n"
-                           "#if 1\n"
-                           "/* Preprocessor aligned. */\n"
-                           "#  define A 0\n"
-                           "  /* Code. Separated by blank line. */\n"
-                           "\n"
-                           "#  define B 0\n"
-                           "  /* Code. Not aligned with # */\n"
-                           "#  define C 0\n"
-                           "#endif";
-    const char *ToFormat = ""
-                           "void f() {\n"
-                           "#if 1\n"
-                           "/* Preprocessor aligned. */\n"
-                           "#  define A 0\n"
-                           "/* Code. Separated by blank line. */\n"
-                           "\n"
-                           "#  define B 0\n"
-                           "   /* Code. Not aligned with # */\n"
-                           "#  define C 0\n"
-                           "#endif";
-    EXPECT_EQ(Expected, format(ToFormat, Style));
-    EXPECT_EQ(Expected, format(Expected, Style));
-  }
-  // Keep comments aligned with un-indented directives.
-  {
-    const char *Expected = ""
-                           "void f() {\n"
-                           "// Preprocessor aligned.\n"
-                           "#define A 0\n"
-                           "  // Code. Separated by blank line.\n"
-                           "\n"
-                           "#define B 0\n"
-                           "  // Code. Not aligned with #\n"
-                           "#define C 0\n";
-    const char *ToFormat = ""
-                           "void f() {\n"
-                           "// Preprocessor aligned.\n"
-                           "#define A 0\n"
-                           "// Code. Separated by blank line.\n"
-                           "\n"
-                           "#define B 0\n"
-                           "   // Code. Not aligned with #\n"
-                           "#define C 0\n";
-    EXPECT_EQ(Expected, format(ToFormat, Style));
-    EXPECT_EQ(Expected, format(Expected, Style));
-  }
-  // Test AfterHash with tabs.
-  {
-    FormatStyle Tabbed = Style;
-    Tabbed.UseTab = FormatStyle::UT_Always;
-    Tabbed.IndentWidth = 8;
-    Tabbed.TabWidth = 8;
-    verifyFormat("#ifdef _WIN32\n"
-                 "#\tdefine A 0\n"
-                 "#\tifdef VAR2\n"
-                 "#\t\tdefine B 1\n"
-                 "#\t\tinclude <someheader.h>\n"
-                 "#\t\tdefine MACRO          \\\n"
-                 "\t\t\tsome_very_long_func_aaaaaaaaaa();\n"
-                 "#\tendif\n"
-                 "#else\n"
-                 "#\tdefine A 1\n"
-                 "#endif",
-                 Tabbed);
-  }
-
-  // Regression test: Multiline-macro inside include guards.
-  verifyFormat("#ifndef HEADER_H\n"
-               "#define HEADER_H\n"
-               "#define A()        \\\n"
-               "  int i;           \\\n"
-               "  int j;\n"
-               "#endif // HEADER_H",
-               getLLVMStyleWithColumns(20));
-
-  Style.IndentPPDirectives = FormatStyle::PPDIS_BeforeHash;
-  // Basic before hash indent tests
-  verifyFormat("#ifdef _WIN32\n"
-               "  #define A 0\n"
-               "  #ifdef VAR2\n"
-               "    #define B 1\n"
-               "    #include <someheader.h>\n"
-               "    #define MACRO                      \\\n"
-               "      some_very_long_func_aaaaaaaaaa();\n"
-               "  #endif\n"
-               "#else\n"
-               "  #define A 1\n"
-               "#endif",
-               Style);
-  verifyFormat("#if A\n"
-               "  #define MACRO                        \\\n"
-               "    void a(int x) {                    \\\n"
-               "      b();                             \\\n"
-               "      c();                             \\\n"
-               "      d();                             \\\n"
-               "      e();                             \\\n"
-               "      f();                             \\\n"
-               "    }\n"
-               "#endif",
-               Style);
-  // Keep comments aligned with indented directives. These
-  // tests cannot use verifyFormat because messUp manipulates leading
-  // whitespace.
-  {
-    const char *Expected = "void f() {\n"
-                           "// Aligned to preprocessor.\n"
-                           "#if 1\n"
-                           "  // Aligned to code.\n"
-                           "  int a;\n"
-                           "  #if 1\n"
-                           "    // Aligned to preprocessor.\n"
-                           "    #define A 0\n"
-                           "  // Aligned to code.\n"
-                           "  int b;\n"
-                           "  #endif\n"
-                           "#endif\n"
-                           "}";
-    const char *ToFormat = "void f() {\n"
-                           "// Aligned to preprocessor.\n"
-                           "#if 1\n"
-                           "// Aligned to code.\n"
-                           "int a;\n"
-                           "#if 1\n"
-                           "// Aligned to preprocessor.\n"
-                           "#define A 0\n"
-                           "// Aligned to code.\n"
-                           "int b;\n"
-                           "#endif\n"
-                           "#endif\n"
-                           "}";
-    EXPECT_EQ(Expected, format(ToFormat, Style));
-    EXPECT_EQ(Expected, format(Expected, Style));
-  }
-  {
-    const char *Expected = "void f() {\n"
-                           "/* Aligned to preprocessor. */\n"
-                           "#if 1\n"
-                           "  /* Aligned to code. */\n"
-                           "  int a;\n"
-                           "  #if 1\n"
-                           "    /* Aligned to preprocessor. */\n"
-                           "    #define A 0\n"
-                           "  /* Aligned to code. */\n"
-                           "  int b;\n"
-                           "  #endif\n"
-                           "#endif\n"
-                           "}";
-    const char *ToFormat = "void f() {\n"
-                           "/* Aligned to preprocessor. */\n"
-                           "#if 1\n"
-                           "/* Aligned to code. */\n"
-                           "int a;\n"
-                           "#if 1\n"
-                           "/* Aligned to preprocessor. */\n"
-                           "#define A 0\n"
-                           "/* Aligned to code. */\n"
-                           "int b;\n"
-                           "#endif\n"
-                           "#endif\n"
-                           "}";
-    EXPECT_EQ(Expected, format(ToFormat, Style));
-    EXPECT_EQ(Expected, format(Expected, Style));
-  }
-
-  // Test single comment before preprocessor
-  verifyFormat("// Comment\n"
-               "\n"
-               "#if 1\n"
-               "#endif",
-               Style);
-}
-
-TEST_F(FormatTest, FormatHashIfNotAtStartOfLine) {
-  verifyFormat("{\n  { a #c; }\n}");
-}
-
-TEST_F(FormatTest, FormatUnbalancedStructuralElements) {
-  EXPECT_EQ("#define A \\\n  {       \\\n    {\nint i;",
-            format("#define A { {\nint i;", getLLVMStyleWithColumns(11)));
-  EXPECT_EQ("#define A \\\n  }       \\\n  }\nint i;",
-            format("#define A } }\nint i;", getLLVMStyleWithColumns(11)));
-}
-
-TEST_F(FormatTest, EscapedNewlines) {
-  FormatStyle Narrow = getLLVMStyleWithColumns(11);
-  EXPECT_EQ("#define A \\\n  int i;  \\\n  int j;",
-            format("#define A \\\nint i;\\\n  int j;", Narrow));
-  EXPECT_EQ("#define A\n\nint i;", format("#define A \\\n\n int i;"));
-  EXPECT_EQ("template <class T> f();", format("\\\ntemplate <class T> f();"));
-  EXPECT_EQ("/* \\  \\  \\\n */", format("\\\n/* \\  \\  \\\n */"));
-  EXPECT_EQ("<a\n\\\\\n>", format("<a\n\\\\\n>"));
-
-  FormatStyle AlignLeft = getLLVMStyle();
-  AlignLeft.AlignEscapedNewlines = FormatStyle::ENAS_Left;
-  EXPECT_EQ("#define MACRO(x) \\\n"
-            "private:         \\\n"
-            "  int x(int a);\n",
-            format("#define MACRO(x) \\\n"
-                   "private:         \\\n"
-                   "  int x(int a);\n",
-                   AlignLeft));
-
-  // CRLF line endings
-  EXPECT_EQ("#define A \\\r\n  int i;  \\\r\n  int j;",
-            format("#define A \\\r\nint i;\\\r\n  int j;", Narrow));
-  EXPECT_EQ("#define A\r\n\r\nint i;", format("#define A \\\r\n\r\n int i;"));
-  EXPECT_EQ("template <class T> f();", format("\\\ntemplate <class T> f();"));
-  EXPECT_EQ("/* \\  \\  \\\r\n */", format("\\\r\n/* \\  \\  \\\r\n */"));
-  EXPECT_EQ("<a\r\n\\\\\r\n>", format("<a\r\n\\\\\r\n>"));
-  EXPECT_EQ("#define MACRO(x) \\\r\n"
-            "private:         \\\r\n"
-            "  int x(int a);\r\n",
-            format("#define MACRO(x) \\\r\n"
-                   "private:         \\\r\n"
-                   "  int x(int a);\r\n",
-                   AlignLeft));
-
-  FormatStyle DontAlign = getLLVMStyle();
-  DontAlign.AlignEscapedNewlines = FormatStyle::ENAS_DontAlign;
-  DontAlign.MaxEmptyLinesToKeep = 3;
-  // FIXME: can't use verifyFormat here because the newline before
-  // "public:" is not inserted the first time it's reformatted
-  EXPECT_EQ("#define A \\\n"
-            "  class Foo { \\\n"
-            "    void bar(); \\\n"
-            "\\\n"
-            "\\\n"
-            "\\\n"
-            "  public: \\\n"
-            "    void baz(); \\\n"
-            "  };",
-            format("#define A \\\n"
-                   "  class Foo { \\\n"
-                   "    void bar(); \\\n"
-                   "\\\n"
-                   "\\\n"
-                   "\\\n"
-                   "  public: \\\n"
-                   "    void baz(); \\\n"
-                   "  };",
-                   DontAlign));
-}
-
-TEST_F(FormatTest, CalculateSpaceOnConsecutiveLinesInMacro) {
-  verifyFormat("#define A \\\n"
-               "  int v(  \\\n"
-               "      a); \\\n"
-               "  int i;",
-               getLLVMStyleWithColumns(11));
-}
-
-TEST_F(FormatTest, MixingPreprocessorDirectivesAndNormalCode) {
-  EXPECT_EQ(
-      "#define ALooooooooooooooooooooooooooooooooooooooongMacro("
-      "                      \\\n"
-      "    aLoooooooooooooooooooooooongFuuuuuuuuuuuuuunctiooooooooo)\n"
-      "\n"
-      "AlooooooooooooooooooooooooooooooooooooooongCaaaaaaaaaal(\n"
-      "    aLooooooooooooooooooooooonPaaaaaaaaaaaaaaaaaaaaarmmmm);\n",
-      format("  #define   ALooooooooooooooooooooooooooooooooooooooongMacro("
-             "\\\n"
-             "aLoooooooooooooooooooooooongFuuuuuuuuuuuuuunctiooooooooo)\n"
-             "  \n"
-             "   AlooooooooooooooooooooooooooooooooooooooongCaaaaaaaaaal(\n"
-             "  aLooooooooooooooooooooooonPaaaaaaaaaaaaaaaaaaaaarmmmm);\n"));
-}
-
-TEST_F(FormatTest, LayoutStatementsAroundPreprocessorDirectives) {
-  EXPECT_EQ("int\n"
-            "#define A\n"
-            "    a;",
-            format("int\n#define A\na;"));
-  verifyFormat("functionCallTo(\n"
-               "    someOtherFunction(\n"
-               "        withSomeParameters, whichInSequence,\n"
-               "        areLongerThanALine(andAnotherCall,\n"
-               "#define A B\n"
-               "                           withMoreParamters,\n"
-               "                           whichStronglyInfluenceTheLayout),\n"
-               "        andMoreParameters),\n"
-               "    trailing);",
-               getLLVMStyleWithColumns(69));
-  verifyFormat("Foo::Foo()\n"
-               "#ifdef BAR\n"
-               "    : baz(0)\n"
-               "#endif\n"
-               "{\n"
-               "}");
-  verifyFormat("void f() {\n"
-               "  if (true)\n"
-               "#ifdef A\n"
-               "    f(42);\n"
-               "  x();\n"
-               "#else\n"
-               "    g();\n"
-               "  x();\n"
-               "#endif\n"
-               "}");
-  verifyFormat("void f(param1, param2,\n"
-               "       param3,\n"
-               "#ifdef A\n"
-               "       param4(param5,\n"
-               "#ifdef A1\n"
-               "              param6,\n"
-               "#ifdef A2\n"
-               "              param7),\n"
-               "#else\n"
-               "              param8),\n"
-               "       param9,\n"
-               "#endif\n"
-               "       param10,\n"
-               "#endif\n"
-               "       param11)\n"
-               "#else\n"
-               "       param12)\n"
-               "#endif\n"
-               "{\n"
-               "  x();\n"
-               "}",
-               getLLVMStyleWithColumns(28));
-  verifyFormat("#if 1\n"
-               "int i;");
-  verifyFormat("#if 1\n"
-               "#endif\n"
-               "#if 1\n"
-               "#else\n"
-               "#endif\n");
-  verifyFormat("DEBUG({\n"
-               "  return aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +\n"
-               "         aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa;\n"
-               "});\n"
-               "#if a\n"
-               "#else\n"
-               "#endif");
-
-  verifyIncompleteFormat("void f(\n"
-                         "#if A\n"
-                         ");\n"
-                         "#else\n"
-                         "#endif");
-}
-
-TEST_F(FormatTest, GraciouslyHandleIncorrectPreprocessorConditions) {
-  verifyFormat("#endif\n"
-               "#if B");
-}
-
-TEST_F(FormatTest, FormatsJoinedLinesOnSubsequentRuns) {
-  FormatStyle SingleLine = getLLVMStyle();
-  SingleLine.AllowShortIfStatementsOnASingleLine = FormatStyle::SIS_WithoutElse;
-  verifyFormat("#if 0\n"
-               "#elif 1\n"
-               "#endif\n"
-               "void foo() {\n"
-               "  if (test) foo2();\n"
-               "}",
-               SingleLine);
-}
-
-TEST_F(FormatTest, LayoutBlockInsideParens) {
-  verifyFormat("functionCall({ int i; });");
-  verifyFormat("functionCall({\n"
-               "  int i;\n"
-               "  int j;\n"
-               "});");
-  verifyFormat("functionCall(\n"
-               "    {\n"
-               "      int i;\n"
-               "      int j;\n"
-               "    },\n"
-               "    aaaa, bbbb, cccc);");
-  verifyFormat("functionA(functionB({\n"
-               "            int i;\n"
-               "            int j;\n"
-               "          }),\n"
-               "          aaaa, bbbb, cccc);");
-  verifyFormat("functionCall(\n"
-               "    {\n"
-               "      int i;\n"
-               "      int j;\n"
-               "    },\n"
-               "    aaaa, bbbb, // comment\n"
-               "    cccc);");
-  verifyFormat("functionA(functionB({\n"
-               "            int i;\n"
-               "            int j;\n"
-               "          }),\n"
-               "          aaaa, bbbb, // comment\n"
-               "          cccc);");
-  verifyFormat("functionCall(aaaa, bbbb, { int i; });");
-  verifyFormat("functionCall(aaaa, bbbb, {\n"
-               "  int i;\n"
-               "  int j;\n"
-               "});");
-  verifyFormat(
-      "Aaa(\n" // FIXME: There shouldn't be a linebreak here.
-      "    {\n"
-      "      int i; // break\n"
-      "    },\n"
-      "    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb,\n"
-      "                                     ccccccccccccccccc));");
-  verifyFormat("DEBUG({\n"
-               "  if (a)\n"
-               "    f();\n"
-               "});");
-}
-
-TEST_F(FormatTest, LayoutBlockInsideStatement) {
-  EXPECT_EQ("SOME_MACRO { int i; }\n"
-            "int i;",
-            format("  SOME_MACRO  {int i;}  int i;"));
-}
-
-TEST_F(FormatTest, LayoutNestedBlocks) {
-  verifyFormat("void AddOsStrings(unsigned bitmask) {\n"
-               "  struct s {\n"
-               "    int i;\n"
-               "  };\n"
-               "  s kBitsToOs[] = {{10}};\n"
-               "  for (int i = 0; i < 10; ++i)\n"
-               "    return;\n"
-               "}");
-  verifyFormat("call(parameter, {\n"
-               "  something();\n"
-               "  // Comment using all columns.\n"
-               "  somethingelse();\n"
-               "});",
-               getLLVMStyleWithColumns(40));
-  verifyFormat("DEBUG( //\n"
-               "    { f(); }, a);");
-  verifyFormat("DEBUG( //\n"
-               "    {\n"
-               "      f(); //\n"
-               "    },\n"
-               "    a);");
-
-  EXPECT_EQ("call(parameter, {\n"
-            "  something();\n"
-            "  // Comment too\n"
-            "  // looooooooooong.\n"
-            "  somethingElse();\n"
-            "});",
-            format("call(parameter, {\n"
-                   "  something();\n"
-                   "  // Comment too looooooooooong.\n"
-                   "  somethingElse();\n"
-                   "});",
-                   getLLVMStyleWithColumns(29)));
-  EXPECT_EQ("DEBUG({ int i; });", format("DEBUG({ int   i; });"));
-  EXPECT_EQ("DEBUG({ // comment\n"
-            "  int i;\n"
-            "});",
-            format("DEBUG({ // comment\n"
-                   "int  i;\n"
-                   "});"));
-  EXPECT_EQ("DEBUG({\n"
-            "  int i;\n"
-            "\n"
-            "  // comment\n"
-            "  int j;\n"
-            "});",
-            format("DEBUG({\n"
-                   "  int  i;\n"
-                   "\n"
-                   "  // comment\n"
-                   "  int  j;\n"
-                   "});"));
-
-  verifyFormat("DEBUG({\n"
-               "  if (a)\n"
-               "    return;\n"
-               "});");
-  verifyGoogleFormat("DEBUG({\n"
-                     "  if (a) return;\n"
-                     "});");
-  FormatStyle Style = getGoogleStyle();
-  Style.ColumnLimit = 45;
-  verifyFormat("Debug(\n"
-               "    aaaaa,\n"
-               "    {\n"
-               "      if (aaaaaaaaaaaaaaaaaaaaaaaa) return;\n"
-               "    },\n"
-               "    a);",
-               Style);
-
-  verifyFormat("SomeFunction({MACRO({ return output; }), b});");
-
-  verifyNoCrash("^{v^{a}}");
-}
-
-TEST_F(FormatTest, FormatNestedBlocksInMacros) {
-  EXPECT_EQ("#define MACRO()                     \\\n"
-            "  Debug(aaa, /* force line break */ \\\n"
-            "        {                           \\\n"
-            "          int i;                    \\\n"
-            "          int j;                    \\\n"
-            "        })",
-            format("#define   MACRO()   Debug(aaa,  /* force line break */ \\\n"
-                   "          {  int   i;  int  j;   })",
-                   getGoogleStyle()));
-
-  EXPECT_EQ("#define A                                       \\\n"
-            "  [] {                                          \\\n"
-            "    xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx(        \\\n"
-            "        xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx); \\\n"
-            "  }",
-            format("#define A [] { xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx( \\\n"
-                   "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx); }",
-                   getGoogleStyle()));
-}
-
-TEST_F(FormatTest, PutEmptyBlocksIntoOneLine) {
-  EXPECT_EQ("{}", format("{}"));
-  verifyFormat("enum E {};");
-  verifyFormat("enum E {}");
-  FormatStyle Style = getLLVMStyle();
-  Style.SpaceInEmptyBlock = true;
-  EXPECT_EQ("void f() { }", format("void f() {}", Style));
-  Style.AllowShortBlocksOnASingleLine = FormatStyle::SBS_Empty;
-  EXPECT_EQ("while (true) { }", format("while (true) {}", Style));
-}
-
-TEST_F(FormatTest, FormatBeginBlockEndMacros) {
-  FormatStyle Style = getLLVMStyle();
-  Style.MacroBlockBegin = "^[A-Z_]+_BEGIN$";
-  Style.MacroBlockEnd = "^[A-Z_]+_END$";
-  verifyFormat("FOO_BEGIN\n"
-               "  FOO_ENTRY\n"
-               "FOO_END",
-               Style);
-  verifyFormat("FOO_BEGIN\n"
-               "  NESTED_FOO_BEGIN\n"
-               "    NESTED_FOO_ENTRY\n"
-               "  NESTED_FOO_END\n"
-               "FOO_END",
-               Style);
-  verifyFormat("FOO_BEGIN(Foo, Bar)\n"
-               "  int x;\n"
-               "  x = 1;\n"
-               "FOO_END(Baz)",
-               Style);
-}
-
-//===----------------------------------------------------------------------===//
-// Line break tests.
-//===----------------------------------------------------------------------===//
-
-TEST_F(FormatTest, PreventConfusingIndents) {
-  verifyFormat(
-      "void f() {\n"
-      "  SomeLongMethodName(SomeReallyLongMethod(CallOtherReallyLongMethod(\n"
-      "                         parameter, parameter, parameter)),\n"
-      "                     SecondLongCall(parameter));\n"
-      "}");
-  verifyFormat(
-      "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(\n"
-      "    aaaaaaaaaaaaaaaaaaaaaaaa(\n"
-      "        aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa),\n"
-      "    aaaaaaaaaaaaaaaaaaaaaaaa);");
-  verifyFormat(
-      "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-      "    [aaaaaaaaaaaaaaaaaaaaaaaa\n"
-      "         [aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa]\n"
-      "         [aaaaaaaaaaaaaaaaaaaaaaaa]];");
-  verifyFormat(
-      "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa<\n"
-      "    aaaaaaaaaaaaaaaaaaaaaaaa<\n"
-      "        aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa>,\n"
-      "    aaaaaaaaaaaaaaaaaaaaaaaa>;");
-  verifyFormat("int a = bbbb && ccc &&\n"
-               "        fffff(\n"
-               "#define A Just forcing a new line\n"
-               "            ddd);");
-}
-
-TEST_F(FormatTest, LineBreakingInBinaryExpressions) {
-  verifyFormat(
-      "bool aaaaaaa =\n"
-      "    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(aaa).aaaaaaaaaaaaaaaaaaa() ||\n"
-      "    bbbbbbbb();");
-  verifyFormat(
-      "bool aaaaaaa =\n"
-      "    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(aaa).aaaaaaaaaaaaaaaaaaa() or\n"
-      "    bbbbbbbb();");
-
-  verifyFormat("bool aaaaaaaaaaaaaaaaaaaaa =\n"
-               "    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa != bbbbbbbbbbbbbbbbbb &&\n"
-               "    ccccccccc == ddddddddddd;");
-  verifyFormat("bool aaaaaaaaaaaaaaaaaaaaa =\n"
-               "    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa != bbbbbbbbbbbbbbbbbb and\n"
-               "    ccccccccc == ddddddddddd;");
-  verifyFormat(
-      "bool aaaaaaaaaaaaaaaaaaaaa =\n"
-      "    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa not_eq bbbbbbbbbbbbbbbbbb and\n"
-      "    ccccccccc == ddddddddddd;");
-
-  verifyFormat("aaaaaa = aaaaaaa(aaaaaaa, // break\n"
-               "                 aaaaaa) &&\n"
-               "         bbbbbb && cccccc;");
-  verifyFormat("aaaaaa = aaaaaaa(aaaaaaa, // break\n"
-               "                 aaaaaa) >>\n"
-               "         bbbbbb;");
-  verifyFormat("aa = Whitespaces.addUntouchableComment(\n"
-               "    SourceMgr.getSpellingColumnNumber(\n"
-               "        TheLine.Last->FormatTok.Tok.getLocation()) -\n"
-               "    1);");
-
-  verifyFormat("if ((aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa ||\n"
-               "     bbbbbbbbbbbbbbbbbb) && // aaaaaaaaaaaaaaaa\n"
-               "    cccccc) {\n}");
-  verifyFormat("if constexpr ((aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa ||\n"
-               "               bbbbbbbbbbbbbbbbbb) && // aaaaaaaaaaa\n"
-               "              cccccc) {\n}");
-  verifyFormat("if CONSTEXPR ((aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa ||\n"
-               "               bbbbbbbbbbbbbbbbbb) && // aaaaaaaaaaa\n"
-               "              cccccc) {\n}");
-  verifyFormat("b = a &&\n"
-               "    // Comment\n"
-               "    b.c && d;");
-
-  // If the LHS of a comparison is not a binary expression itself, the
-  // additional linebreak confuses many people.
-  verifyFormat(
-      "if (aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(\n"
-      "        aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa) > 5) {\n"
-      "}");
-  verifyFormat(
-      "if (aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(\n"
-      "        aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa) == 5) {\n"
-      "}");
-  verifyFormat(
-      "if (aaaaaaaaaaaaaaaaaaaaaaaaaa.aaaaaaaaaaaaaaaaaaaaaa(\n"
-      "        aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa) == 5) {\n"
-      "}");
-  verifyFormat(
-      "if (aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(\n"
-      "        aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa) <=> 5) {\n"
-      "}");
-  // Even explicit parentheses stress the precedence enough to make the
-  // additional break unnecessary.
-  verifyFormat("if ((aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +\n"
-               "     aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa) == 5) {\n"
-               "}");
-  // This cases is borderline, but with the indentation it is still readable.
-  verifyFormat(
-      "if (aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(\n"
-      "        aaaaaaaaaaaaaaa) > aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +\n"
-      "                               aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa) {\n"
-      "}",
-      getLLVMStyleWithColumns(75));
-
-  // If the LHS is a binary expression, we should still use the additional break
-  // as otherwise the formatting hides the operator precedence.
-  verifyFormat("if (aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +\n"
-               "        aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa ==\n"
-               "    5) {\n"
-               "}");
-  verifyFormat("if (aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +\n"
-               "        aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa <=>\n"
-               "    5) {\n"
-               "}");
-
-  FormatStyle OnePerLine = getLLVMStyle();
-  OnePerLine.BinPackParameters = false;
-  verifyFormat(
-      "if (aaaaaaaaaaaaaaaaaaaaaaaaaaaa || aaaaaaaaaaaaaaaaaaaaaaaaaaaa ||\n"
-      "    aaaaaaaaaaaaaaaaaaaaaaaaaaaa || aaaaaaaaaaaaaaaaaaaaaaaaaaaa ||\n"
-      "    aaaaaaaaaaaaaaaaaaaaaaaaaaaa) {\n}",
-      OnePerLine);
-
-  verifyFormat("int i = someFunction(aaaaaaa, 0)\n"
-               "                .aaa(aaaaaaaaaaaaa) *\n"
-               "            aaaaaaa +\n"
-               "        aaaaaaa;",
-               getLLVMStyleWithColumns(40));
-}
-
-TEST_F(FormatTest, ExpressionIndentation) {
-  verifyFormat("bool value = aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +\n"
-               "                     aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +\n"
-               "                     aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa ==\n"
-               "                 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa *\n"
-               "                         bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb +\n"
-               "                     bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb &&\n"
-               "             aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa *\n"
-               "                     aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa >\n"
-               "                 ccccccccccccccccccccccccccccccccccccccccc;");
-  verifyFormat("if (aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa *\n"
-               "            aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +\n"
-               "        aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa ==\n"
-               "    bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb) {\n}");
-  verifyFormat("if (aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +\n"
-               "        aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa *\n"
-               "            aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa ==\n"
-               "    bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb) {\n}");
-  verifyFormat("if (aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa ==\n"
-               "    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa *\n"
-               "            aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +\n"
-               "        bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb) {\n}");
-  verifyFormat("if () {\n"
-               "} else if (aaaaa && bbbbb > // break\n"
-               "                        ccccc) {\n"
-               "}");
-  verifyFormat("if () {\n"
-               "} else if constexpr (aaaaa && bbbbb > // break\n"
-               "                                  ccccc) {\n"
-               "}");
-  verifyFormat("if () {\n"
-               "} else if CONSTEXPR (aaaaa && bbbbb > // break\n"
-               "                                  ccccc) {\n"
-               "}");
-  verifyFormat("if () {\n"
-               "} else if (aaaaa &&\n"
-               "           bbbbb > // break\n"
-               "               ccccc &&\n"
-               "           ddddd) {\n"
-               "}");
-
-  // Presence of a trailing comment used to change indentation of b.
-  verifyFormat("return aaaaaaaaaaaaaaaaaaa +\n"
-               "       b;\n"
-               "return aaaaaaaaaaaaaaaaaaa +\n"
-               "       b; //",
-               getLLVMStyleWithColumns(30));
-}
-
-TEST_F(FormatTest, ExpressionIndentationBreakingBeforeOperators) {
-  // Not sure what the best system is here. Like this, the LHS can be found
-  // immediately above an operator (everything with the same or a higher
-  // indent). The RHS is aligned right of the operator and so compasses
-  // everything until something with the same indent as the operator is found.
-  // FIXME: Is this a good system?
-  FormatStyle Style = getLLVMStyle();
-  Style.BreakBeforeBinaryOperators = FormatStyle::BOS_All;
-  verifyFormat(
-      "bool value = aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-      "                     + aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-      "                     + aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-      "                 == aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-      "                            * bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb\n"
-      "                        + bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb\n"
-      "             && aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-      "                        * aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-      "                    > ccccccccccccccccccccccccccccccccccccccccc;",
-      Style);
-  verifyFormat("if (aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-               "            * aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-               "        + aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-               "    == bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb) {\n}",
-               Style);
-  verifyFormat("if (aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-               "        + aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-               "              * aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-               "    == bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb) {\n}",
-               Style);
-  verifyFormat("if (aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-               "    == aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-               "               * aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-               "           + bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb) {\n}",
-               Style);
-  verifyFormat("if () {\n"
-               "} else if (aaaaa\n"
-               "           && bbbbb // break\n"
-               "                  > ccccc) {\n"
-               "}",
-               Style);
-  verifyFormat("return aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-               "       && bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb;",
-               Style);
-  verifyFormat("return (a)\n"
-               "       // comment\n"
-               "       + b;",
-               Style);
-  verifyFormat(
-      "int aaaaaa = aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-      "                 * bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb\n"
-      "             + cc;",
-      Style);
-
-  verifyFormat("aaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-               "    = aaaaaaaaaaaaaaaaaaaa + aaaaaaaaaaaaaaaaaaaaaaaaaaaa;",
-               Style);
-
-  // Forced by comments.
-  verifyFormat(
-      "unsigned ContentSize =\n"
-      "    sizeof(int16_t)   // DWARF ARange version number\n"
-      "    + sizeof(int32_t) // Offset of CU in the .debug_info section\n"
-      "    + sizeof(int8_t)  // Pointer Size (in bytes)\n"
-      "    + sizeof(int8_t); // Segment Size (in bytes)");
-
-  verifyFormat("return boost::fusion::at_c<0>(iiii).second\n"
-               "       == boost::fusion::at_c<1>(iiii).second;",
-               Style);
-
-  Style.ColumnLimit = 60;
-  verifyFormat("zzzzzzzzzz\n"
-               "    = bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb\n"
-               "      >> aaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaaaaaaaaaaaaa);",
-               Style);
-
-  Style.ColumnLimit = 80;
-  Style.IndentWidth = 4;
-  Style.TabWidth = 4;
-  Style.UseTab = FormatStyle::UT_Always;
-  Style.AlignAfterOpenBracket = FormatStyle::BAS_DontAlign;
-  Style.AlignOperands = FormatStyle::OAS_DontAlign;
-  EXPECT_EQ("return someVeryVeryLongConditionThatBarelyFitsOnALine\n"
-            "\t&& (someOtherLongishConditionPart1\n"
-            "\t\t|| someOtherEvenLongerNestedConditionPart2);",
-            format("return someVeryVeryLongConditionThatBarelyFitsOnALine && "
-                   "(someOtherLongishConditionPart1 || "
-                   "someOtherEvenLongerNestedConditionPart2);",
-                   Style));
-}
-
-TEST_F(FormatTest, ExpressionIndentationStrictAlign) {
-  FormatStyle Style = getLLVMStyle();
-  Style.BreakBeforeBinaryOperators = FormatStyle::BOS_All;
-  Style.AlignOperands = FormatStyle::OAS_AlignAfterOperator;
-
-  verifyFormat("bool value = aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-               "                   + aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-               "                   + aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-               "              == aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-               "                         * bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb\n"
-               "                     + bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb\n"
-               "          && aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-               "                     * aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-               "                 > ccccccccccccccccccccccccccccccccccccccccc;",
-               Style);
-  verifyFormat("if (aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-               "            * aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-               "        + aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-               "    == bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb) {\n}",
-               Style);
-  verifyFormat("if (aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-               "        + aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-               "              * aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-               "    == bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb) {\n}",
-               Style);
-  verifyFormat("if (aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-               "    == aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-               "               * aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-               "           + bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb) {\n}",
-               Style);
-  verifyFormat("if () {\n"
-               "} else if (aaaaa\n"
-               "           && bbbbb // break\n"
-               "                  > ccccc) {\n"
-               "}",
-               Style);
-  verifyFormat("return aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-               "    && bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb;",
-               Style);
-  verifyFormat("return (a)\n"
-               "     // comment\n"
-               "     + b;",
-               Style);
-  verifyFormat(
-      "int aaaaaa = aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-      "               * bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb\n"
-      "           + cc;",
-      Style);
-  verifyFormat("return aaaaaaaaaaaaaaaa ? 1111111111111111\n"
-               "     : bbbbbbbbbbbbbbbb ? 2222222222222222\n"
-               "                        : 3333333333333333;",
-               Style);
-  verifyFormat(
-      "return aaaaaaaaaaaaaaaa ? (aaaaaaaaaaaaaa    ? bbbbbbbbbbbbbbbbbb\n"
-      "                           : ccccccccccccccc ? dddddddddddddddddd\n"
-      "                                             : eeeeeeeeeeeeeeeeee)\n"
-      "     : bbbbbbbbbbbbbbbb ? 2222222222222222\n"
-      "                        : 3333333333333333;",
-      Style);
-  verifyFormat("aaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-               "    = aaaaaaaaaaaaaaaaaaaa + aaaaaaaaaaaaaaaaaaaaaaaaaaaa;",
-               Style);
-
-  verifyFormat("return boost::fusion::at_c<0>(iiii).second\n"
-               "    == boost::fusion::at_c<1>(iiii).second;",
-               Style);
-
-  Style.ColumnLimit = 60;
-  verifyFormat("zzzzzzzzzzzzz\n"
-               "    = bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb\n"
-               "   >> aaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaaaaaaaaaaaaa);",
-               Style);
-
-  // Forced by comments.
-  Style.ColumnLimit = 80;
-  verifyFormat(
-      "unsigned ContentSize\n"
-      "    = sizeof(int16_t) // DWARF ARange version number\n"
-      "    + sizeof(int32_t) // Offset of CU in the .debug_info section\n"
-      "    + sizeof(int8_t)  // Pointer Size (in bytes)\n"
-      "    + sizeof(int8_t); // Segment Size (in bytes)",
-      Style);
-
-  Style.BreakBeforeBinaryOperators = FormatStyle::BOS_NonAssignment;
-  verifyFormat(
-      "unsigned ContentSize =\n"
-      "    sizeof(int16_t)   // DWARF ARange version number\n"
-      "    + sizeof(int32_t) // Offset of CU in the .debug_info section\n"
-      "    + sizeof(int8_t)  // Pointer Size (in bytes)\n"
-      "    + sizeof(int8_t); // Segment Size (in bytes)",
-      Style);
-
-  Style.BreakBeforeBinaryOperators = FormatStyle::BOS_None;
-  verifyFormat(
-      "unsigned ContentSize =\n"
-      "    sizeof(int16_t)   // DWARF ARange version number\n"
-      "    + sizeof(int32_t) // Offset of CU in the .debug_info section\n"
-      "    + sizeof(int8_t)  // Pointer Size (in bytes)\n"
-      "    + sizeof(int8_t); // Segment Size (in bytes)",
-      Style);
-}
-
-TEST_F(FormatTest, EnforcedOperatorWraps) {
-  // Here we'd like to wrap after the || operators, but a comment is forcing an
-  // earlier wrap.
-  verifyFormat("bool x = aaaaa //\n"
-               "         || bbbbb\n"
-               "         //\n"
-               "         || cccc;");
-}
-
-TEST_F(FormatTest, NoOperandAlignment) {
-  FormatStyle Style = getLLVMStyle();
-  Style.AlignOperands = FormatStyle::OAS_DontAlign;
-  verifyFormat("aaaaaaaaaaaaaa(aaaaaaaaaaaa,\n"
-               "               aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +\n"
-               "                   aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa);",
-               Style);
-  Style.BreakBeforeBinaryOperators = FormatStyle::BOS_NonAssignment;
-  verifyFormat("bool value = aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-               "            + aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-               "            + aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-               "        == aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-               "                * bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb\n"
-               "            + bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb\n"
-               "    && aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-               "            * aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-               "        > ccccccccccccccccccccccccccccccccccccccccc;",
-               Style);
-
-  verifyFormat("int aaaaaa = aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-               "        * bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb\n"
-               "    + cc;",
-               Style);
-  verifyFormat("int a = aa\n"
-               "    + bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb\n"
-               "        * cccccccccccccccccccccccccccccccccccc;\n",
-               Style);
-
-  Style.AlignAfterOpenBracket = FormatStyle::BAS_DontAlign;
-  verifyFormat("return (a > b\n"
-               "    // comment1\n"
-               "    // comment2\n"
-               "    || c);",
-               Style);
-}
-
-TEST_F(FormatTest, BreakingBeforeNonAssigmentOperators) {
-  FormatStyle Style = getLLVMStyle();
-  Style.BreakBeforeBinaryOperators = FormatStyle::BOS_NonAssignment;
-  verifyFormat("int aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa =\n"
-               "    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-               "    + bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb;",
-               Style);
-}
-
-TEST_F(FormatTest, AllowBinPackingInsideArguments) {
-  FormatStyle Style = getLLVMStyle();
-  Style.BreakBeforeBinaryOperators = FormatStyle::BOS_NonAssignment;
-  Style.BinPackArguments = false;
-  Style.ColumnLimit = 40;
-  verifyFormat("void test() {\n"
-               "  someFunction(\n"
-               "      this + argument + is + quite\n"
-               "      + long + so + it + gets + wrapped\n"
-               "      + but + remains + bin - packed);\n"
-               "}",
-               Style);
-  verifyFormat("void test() {\n"
-               "  someFunction(arg1,\n"
-               "               this + argument + is\n"
-               "                   + quite + long + so\n"
-               "                   + it + gets + wrapped\n"
-               "                   + but + remains + bin\n"
-               "                   - packed,\n"
-               "               arg3);\n"
-               "}",
-               Style);
-  verifyFormat("void test() {\n"
-               "  someFunction(\n"
-               "      arg1,\n"
-               "      this + argument + has\n"
-               "          + anotherFunc(nested,\n"
-               "                        calls + whose\n"
-               "                            + arguments\n"
-               "                            + are + also\n"
-               "                            + wrapped,\n"
-               "                        in + addition)\n"
-               "          + to + being + bin - packed,\n"
-               "      arg3);\n"
-               "}",
-               Style);
-
-  Style.BreakBeforeBinaryOperators = FormatStyle::BOS_None;
-  verifyFormat("void test() {\n"
-               "  someFunction(\n"
-               "      arg1,\n"
-               "      this + argument + has +\n"
-               "          anotherFunc(nested,\n"
-               "                      calls + whose +\n"
-               "                          arguments +\n"
-               "                          are + also +\n"
-               "                          wrapped,\n"
-               "                      in + addition) +\n"
-               "          to + being + bin - packed,\n"
-               "      arg3);\n"
-               "}",
-               Style);
-}
-
-TEST_F(FormatTest, ConstructorInitializers) {
-  verifyFormat("Constructor() : Initializer(FitsOnTheLine) {}");
-  verifyFormat("Constructor() : Inttializer(FitsOnTheLine) {}",
-               getLLVMStyleWithColumns(45));
-  verifyFormat("Constructor()\n"
-               "    : Inttializer(FitsOnTheLine) {}",
-               getLLVMStyleWithColumns(44));
-  verifyFormat("Constructor()\n"
-               "    : Inttializer(FitsOnTheLine) {}",
-               getLLVMStyleWithColumns(43));
-
-  verifyFormat("template <typename T>\n"
-               "Constructor() : Initializer(FitsOnTheLine) {}",
-               getLLVMStyleWithColumns(45));
-
-  verifyFormat(
-      "SomeClass::Constructor()\n"
-      "    : aaaaaaaaaaaaa(aaaaaaaaaaaaaa), aaaaaaaaaaaaaaa(aaaaaaaaaaaa) {}");
-
-  verifyFormat(
-      "SomeClass::Constructor()\n"
-      "    : aaaaaaaaaaaaa(aaaaaaaaaaaaaa), aaaaaaaaaaaaa(aaaaaaaaaaaaaa),\n"
-      "      aaaaaaaaaaaaa(aaaaaaaaaaaaaa) {}");
-  verifyFormat(
-      "SomeClass::Constructor()\n"
-      "    : aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa),\n"
-      "      aaaaaaaaaaaaaaa(aaaaaaaaaaaa) {}");
-  verifyFormat("Constructor(aaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,\n"
-               "            aaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa)\n"
-               "    : aaaaaaaaaa(aaaaaa) {}");
-
-  verifyFormat("Constructor()\n"
-               "    : aaaaaaaaaaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaaaaaaaaaaaaaa),\n"
-               "      aaaaaaaaaaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaaaaaaaaaaaaaa,\n"
-               "                               aaaaaaaaaaaaaaaaaaaaaaaaaaa),\n"
-               "      aaaaaaaaaaaaaaaaaaaaaaa() {}");
-
-  verifyFormat("Constructor()\n"
-               "    : aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(\n"
-               "          aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa) {}");
-
-  verifyFormat("Constructor(int Parameter = 0)\n"
-               "    : aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaaaa),\n"
-               "      aaaaaaaaaaaa(aaaaaaaaaaaaaaaaa) {}");
-  verifyFormat("Constructor()\n"
-               "    : aaaaaaaaaaaaaaaaaaaa(a), bbbbbbbbbbbbbbbbbbbbbbbb(b) {\n"
-               "}",
-               getLLVMStyleWithColumns(60));
-  verifyFormat("Constructor()\n"
-               "    : aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(\n"
-               "          aaaaaaaaaaaaaaaaaaaaaaaaa(aaaa, aaaa)) {}");
-
-  // Here a line could be saved by splitting the second initializer onto two
-  // lines, but that is not desirable.
-  verifyFormat("Constructor()\n"
-               "    : aaaaaaaaaaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaaaaaaaaaaa),\n"
-               "      aaaaaaaaaaa(aaaaaaaaaaa),\n"
-               "      aaaaaaaaaaaaaaaaaaaaat(aaaaaaaaaaaaaaaaaaaaaaaaaaaa) {}");
-
-  FormatStyle OnePerLine = getLLVMStyle();
-  OnePerLine.ConstructorInitializerAllOnOneLineOrOnePerLine = true;
-  OnePerLine.AllowAllParametersOfDeclarationOnNextLine = false;
-  verifyFormat("SomeClass::Constructor()\n"
-               "    : aaaaaaaaaaaaa(aaaaaaaaaaaaaa),\n"
-               "      aaaaaaaaaaaaa(aaaaaaaaaaaaaa),\n"
-               "      aaaaaaaaaaaaa(aaaaaaaaaaaaaa) {}",
-               OnePerLine);
-  verifyFormat("SomeClass::Constructor()\n"
-               "    : aaaaaaaaaaaaa(aaaaaaaaaaaaaa), // Some comment\n"
-               "      aaaaaaaaaaaaa(aaaaaaaaaaaaaa),\n"
-               "      aaaaaaaaaaaaa(aaaaaaaaaaaaaa) {}",
-               OnePerLine);
-  verifyFormat("MyClass::MyClass(int var)\n"
-               "    : some_var_(var),            // 4 space indent\n"
-               "      some_other_var_(var + 1) { // lined up\n"
-               "}",
-               OnePerLine);
-  verifyFormat("Constructor()\n"
-               "    : aaaaa(aaaaaa),\n"
-               "      aaaaa(aaaaaa),\n"
-               "      aaaaa(aaaaaa),\n"
-               "      aaaaa(aaaaaa),\n"
-               "      aaaaa(aaaaaa) {}",
-               OnePerLine);
-  verifyFormat("Constructor()\n"
-               "    : aaaaa(aaaaaaaaaaaaaaaaaaaaaa, aaaaaaaaaaaaaaaaaaaaaa,\n"
-               "            aaaaaaaaaaaaaaaaaaaaaa) {}",
-               OnePerLine);
-  OnePerLine.BinPackParameters = false;
-  verifyFormat(
-      "Constructor()\n"
-      "    : aaaaaaaaaaaaaaaaaaaaaaaa(\n"
-      "          aaaaaaaaaaa().aaa(),\n"
-      "          aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa) {}",
-      OnePerLine);
-  OnePerLine.ColumnLimit = 60;
-  verifyFormat("Constructor()\n"
-               "    : aaaaaaaaaaaaaaaaaaaa(a),\n"
-               "      bbbbbbbbbbbbbbbbbbbbbbbb(b) {}",
-               OnePerLine);
-
-  EXPECT_EQ("Constructor()\n"
-            "    : // Comment forcing unwanted break.\n"
-            "      aaaa(aaaa) {}",
-            format("Constructor() :\n"
-                   "    // Comment forcing unwanted break.\n"
-                   "    aaaa(aaaa) {}"));
-}
-
-TEST_F(FormatTest, AllowAllConstructorInitializersOnNextLine) {
-  FormatStyle Style = getLLVMStyle();
-  Style.BreakConstructorInitializers = FormatStyle::BCIS_BeforeComma;
-  Style.ColumnLimit = 60;
-  Style.ConstructorInitializerAllOnOneLineOrOnePerLine = true;
-  Style.AllowAllConstructorInitializersOnNextLine = true;
-  Style.BinPackParameters = false;
-
-  for (int i = 0; i < 4; ++i) {
-    // Test all combinations of parameters that should not have an effect.
-    Style.AllowAllParametersOfDeclarationOnNextLine = i & 1;
-    Style.AllowAllArgumentsOnNextLine = i & 2;
-
-    Style.AllowAllConstructorInitializersOnNextLine = true;
-    Style.BreakConstructorInitializers = FormatStyle::BCIS_BeforeComma;
-    verifyFormat("Constructor()\n"
-                 "    : aaaaaaaaaaaaaaaaaaaa(a), bbbbbbbbbbbbbbbbbbbbb(b) {}",
-                 Style);
-    verifyFormat("Constructor() : a(a), b(b) {}", Style);
-
-    Style.AllowAllConstructorInitializersOnNextLine = false;
-    verifyFormat("Constructor()\n"
-                 "    : aaaaaaaaaaaaaaaaaaaa(a)\n"
-                 "    , bbbbbbbbbbbbbbbbbbbbb(b) {}",
-                 Style);
-    verifyFormat("Constructor() : a(a), b(b) {}", Style);
-
-    Style.BreakConstructorInitializers = FormatStyle::BCIS_BeforeColon;
-    Style.AllowAllConstructorInitializersOnNextLine = true;
-    verifyFormat("Constructor()\n"
-                 "    : aaaaaaaaaaaaaaaaaaaa(a), bbbbbbbbbbbbbbbbbbbbb(b) {}",
-                 Style);
-
-    Style.AllowAllConstructorInitializersOnNextLine = false;
-    verifyFormat("Constructor()\n"
-                 "    : aaaaaaaaaaaaaaaaaaaa(a),\n"
-                 "      bbbbbbbbbbbbbbbbbbbbb(b) {}",
-                 Style);
-
-    Style.BreakConstructorInitializers = FormatStyle::BCIS_AfterColon;
-    Style.AllowAllConstructorInitializersOnNextLine = true;
-    verifyFormat("Constructor() :\n"
-                 "    aaaaaaaaaaaaaaaaaa(a), bbbbbbbbbbbbbbbbbbbbb(b) {}",
-                 Style);
-
-    Style.AllowAllConstructorInitializersOnNextLine = false;
-    verifyFormat("Constructor() :\n"
-                 "    aaaaaaaaaaaaaaaaaa(a),\n"
-                 "    bbbbbbbbbbbbbbbbbbbbb(b) {}",
-                 Style);
-  }
-
-  // Test interactions between AllowAllParametersOfDeclarationOnNextLine and
-  // AllowAllConstructorInitializersOnNextLine in all
-  // BreakConstructorInitializers modes
-  Style.BreakConstructorInitializers = FormatStyle::BCIS_BeforeComma;
-  Style.AllowAllParametersOfDeclarationOnNextLine = true;
-  Style.AllowAllConstructorInitializersOnNextLine = false;
-  verifyFormat("SomeClassWithALongName::Constructor(\n"
-               "    int aaaaaaaaaaaaaaaaaaaaaaaa, int bbbbbbbbbbbbb)\n"
-               "    : aaaaaaaaaaaaaaaaaaaa(a)\n"
-               "    , bbbbbbbbbbbbbbbbbbbbb(b) {}",
-               Style);
-
-  Style.AllowAllConstructorInitializersOnNextLine = true;
-  verifyFormat("SomeClassWithALongName::Constructor(\n"
-               "    int aaaaaaaaaaaaaaaaaaaaaaaa,\n"
-               "    int bbbbbbbbbbbbb,\n"
-               "    int cccccccccccccccc)\n"
-               "    : aaaaaaaaaaaaaaaaaaaa(a), bbbbbbbbbbbbbbbbbbbbb(b) {}",
-               Style);
-
-  Style.AllowAllParametersOfDeclarationOnNextLine = false;
-  Style.AllowAllConstructorInitializersOnNextLine = false;
-  verifyFormat("SomeClassWithALongName::Constructor(\n"
-               "    int aaaaaaaaaaaaaaaaaaaaaaaa,\n"
-               "    int bbbbbbbbbbbbb)\n"
-               "    : aaaaaaaaaaaaaaaaaaaa(a)\n"
-               "    , bbbbbbbbbbbbbbbbbbbbb(b) {}",
-               Style);
-
-  Style.BreakConstructorInitializers = FormatStyle::BCIS_BeforeColon;
-
-  Style.AllowAllParametersOfDeclarationOnNextLine = true;
-  verifyFormat("SomeClassWithALongName::Constructor(\n"
-               "    int aaaaaaaaaaaaaaaaaaaaaaaa, int bbbbbbbbbbbbb)\n"
-               "    : aaaaaaaaaaaaaaaaaaaa(a),\n"
-               "      bbbbbbbbbbbbbbbbbbbbb(b) {}",
-               Style);
-
-  Style.AllowAllConstructorInitializersOnNextLine = true;
-  verifyFormat("SomeClassWithALongName::Constructor(\n"
-               "    int aaaaaaaaaaaaaaaaaaaaaaaa,\n"
-               "    int bbbbbbbbbbbbb,\n"
-               "    int cccccccccccccccc)\n"
-               "    : aaaaaaaaaaaaaaaaaaaa(a), bbbbbbbbbbbbbbbbbbbbb(b) {}",
-               Style);
-
-  Style.AllowAllParametersOfDeclarationOnNextLine = false;
-  Style.AllowAllConstructorInitializersOnNextLine = false;
-  verifyFormat("SomeClassWithALongName::Constructor(\n"
-               "    int aaaaaaaaaaaaaaaaaaaaaaaa,\n"
-               "    int bbbbbbbbbbbbb)\n"
-               "    : aaaaaaaaaaaaaaaaaaaa(a),\n"
-               "      bbbbbbbbbbbbbbbbbbbbb(b) {}",
-               Style);
-
-  Style.BreakConstructorInitializers = FormatStyle::BCIS_AfterColon;
-  Style.AllowAllParametersOfDeclarationOnNextLine = true;
-  verifyFormat("SomeClassWithALongName::Constructor(\n"
-               "    int aaaaaaaaaaaaaaaaaaaaaaaa, int bbbbbbbbbbbbb) :\n"
-               "    aaaaaaaaaaaaaaaaaaaa(a),\n"
-               "    bbbbbbbbbbbbbbbbbbbbb(b) {}",
-               Style);
-
-  Style.AllowAllConstructorInitializersOnNextLine = true;
-  verifyFormat("SomeClassWithALongName::Constructor(\n"
-               "    int aaaaaaaaaaaaaaaaaaaaaaaa,\n"
-               "    int bbbbbbbbbbbbb,\n"
-               "    int cccccccccccccccc) :\n"
-               "    aaaaaaaaaaaaaaaaaaaa(a), bbbbbbbbbbbbbbbbbbbbb(b) {}",
-               Style);
-
-  Style.AllowAllParametersOfDeclarationOnNextLine = false;
-  Style.AllowAllConstructorInitializersOnNextLine = false;
-  verifyFormat("SomeClassWithALongName::Constructor(\n"
-               "    int aaaaaaaaaaaaaaaaaaaaaaaa,\n"
-               "    int bbbbbbbbbbbbb) :\n"
-               "    aaaaaaaaaaaaaaaaaaaa(a),\n"
-               "    bbbbbbbbbbbbbbbbbbbbb(b) {}",
-               Style);
-}
-
-TEST_F(FormatTest, AllowAllArgumentsOnNextLine) {
-  FormatStyle Style = getLLVMStyle();
-  Style.ColumnLimit = 60;
-  Style.BinPackArguments = false;
-  for (int i = 0; i < 4; ++i) {
-    // Test all combinations of parameters that should not have an effect.
-    Style.AllowAllParametersOfDeclarationOnNextLine = i & 1;
-    Style.AllowAllConstructorInitializersOnNextLine = i & 2;
-
-    Style.AllowAllArgumentsOnNextLine = true;
-    verifyFormat("void foo() {\n"
-                 "  FunctionCallWithReallyLongName(\n"
-                 "      aaaaaaaaaaaaaaaaaaaaaaaaaaa, bbbbbbbbbbbb);\n"
-                 "}",
-                 Style);
-    Style.AllowAllArgumentsOnNextLine = false;
-    verifyFormat("void foo() {\n"
-                 "  FunctionCallWithReallyLongName(\n"
-                 "      aaaaaaaaaaaaaaaaaaaaaaaaaaa,\n"
-                 "      bbbbbbbbbbbb);\n"
-                 "}",
-                 Style);
-
-    Style.AllowAllArgumentsOnNextLine = true;
-    verifyFormat("void foo() {\n"
-                 "  auto VariableWithReallyLongName = {\n"
-                 "      aaaaaaaaaaaaaaaaaaaaaaaaaaa, bbbbbbbbbbbb};\n"
-                 "}",
-                 Style);
-    Style.AllowAllArgumentsOnNextLine = false;
-    verifyFormat("void foo() {\n"
-                 "  auto VariableWithReallyLongName = {\n"
-                 "      aaaaaaaaaaaaaaaaaaaaaaaaaaa,\n"
-                 "      bbbbbbbbbbbb};\n"
-                 "}",
-                 Style);
-  }
-
-  // This parameter should not affect declarations.
-  Style.BinPackParameters = false;
-  Style.AllowAllArgumentsOnNextLine = false;
-  Style.AllowAllParametersOfDeclarationOnNextLine = true;
-  verifyFormat("void FunctionCallWithReallyLongName(\n"
-               "    int aaaaaaaaaaaaaaaaaaaaaaa, int bbbbbbbbbbbb);",
-               Style);
-  Style.AllowAllParametersOfDeclarationOnNextLine = false;
-  verifyFormat("void FunctionCallWithReallyLongName(\n"
-               "    int aaaaaaaaaaaaaaaaaaaaaaa,\n"
-               "    int bbbbbbbbbbbb);",
-               Style);
-}
-
-TEST_F(FormatTest, AllowAllArgumentsOnNextLineDontAlign) {
-  // Check that AllowAllArgumentsOnNextLine is respected for both BAS_DontAlign
-  // and BAS_Align.
-  auto Style = getLLVMStyle();
-  Style.ColumnLimit = 35;
-  StringRef Input = "functionCall(paramA, paramB, paramC);\n"
-                    "void functionDecl(int A, int B, int C);";
-  Style.AllowAllArgumentsOnNextLine = false;
-  Style.AlignAfterOpenBracket = FormatStyle::BAS_DontAlign;
-  EXPECT_EQ(StringRef("functionCall(paramA, paramB,\n"
-                      "    paramC);\n"
-                      "void functionDecl(int A, int B,\n"
-                      "    int C);"),
-            format(Input, Style));
-  Style.AlignAfterOpenBracket = FormatStyle::BAS_Align;
-  EXPECT_EQ(StringRef("functionCall(paramA, paramB,\n"
-                      "             paramC);\n"
-                      "void functionDecl(int A, int B,\n"
-                      "                  int C);"),
-            format(Input, Style));
-  // However, BAS_AlwaysBreak should take precedence over
-  // AllowAllArgumentsOnNextLine.
-  Style.AlignAfterOpenBracket = FormatStyle::BAS_AlwaysBreak;
-  EXPECT_EQ(StringRef("functionCall(\n"
-                      "    paramA, paramB, paramC);\n"
-                      "void functionDecl(\n"
-                      "    int A, int B, int C);"),
-            format(Input, Style));
-
-  // When AllowAllArgumentsOnNextLine is set, we prefer breaking before the
-  // first argument.
-  Style.AllowAllArgumentsOnNextLine = true;
-  Style.AlignAfterOpenBracket = FormatStyle::BAS_AlwaysBreak;
-  EXPECT_EQ(StringRef("functionCall(\n"
-                      "    paramA, paramB, paramC);\n"
-                      "void functionDecl(\n"
-                      "    int A, int B, int C);"),
-            format(Input, Style));
-  // It wouldn't fit on one line with aligned parameters so this setting
-  // doesn't change anything for BAS_Align.
-  Style.AlignAfterOpenBracket = FormatStyle::BAS_Align;
-  EXPECT_EQ(StringRef("functionCall(paramA, paramB,\n"
-                      "             paramC);\n"
-                      "void functionDecl(int A, int B,\n"
-                      "                  int C);"),
-            format(Input, Style));
-  Style.AlignAfterOpenBracket = FormatStyle::BAS_DontAlign;
-  EXPECT_EQ(StringRef("functionCall(\n"
-                      "    paramA, paramB, paramC);\n"
-                      "void functionDecl(\n"
-                      "    int A, int B, int C);"),
-            format(Input, Style));
-}
-
-TEST_F(FormatTest, BreakConstructorInitializersAfterColon) {
-  FormatStyle Style = getLLVMStyle();
-  Style.BreakConstructorInitializers = FormatStyle::BCIS_AfterColon;
-
-  verifyFormat("Constructor() : Initializer(FitsOnTheLine) {}");
-  verifyFormat("Constructor() : Initializer(FitsOnTheLine) {}",
-               getStyleWithColumns(Style, 45));
-  verifyFormat("Constructor() :\n"
-               "    Initializer(FitsOnTheLine) {}",
-               getStyleWithColumns(Style, 44));
-  verifyFormat("Constructor() :\n"
-               "    Initializer(FitsOnTheLine) {}",
-               getStyleWithColumns(Style, 43));
-
-  verifyFormat("template <typename T>\n"
-               "Constructor() : Initializer(FitsOnTheLine) {}",
-               getStyleWithColumns(Style, 50));
-  Style.ConstructorInitializerAllOnOneLineOrOnePerLine = true;
-  verifyFormat(
-      "SomeClass::Constructor() :\n"
-      "    aaaaaaaaaaaaa(aaaaaaaaaaaaaa), aaaaaaaaaaaaaaa(aaaaaaaaaaaa) {}",
-      Style);
-
-  Style.ConstructorInitializerAllOnOneLineOrOnePerLine = false;
-  verifyFormat(
-      "SomeClass::Constructor() :\n"
-      "    aaaaaaaaaaaaa(aaaaaaaaaaaaaa), aaaaaaaaaaaaaaa(aaaaaaaaaaaa) {}",
-      Style);
-
-  verifyFormat(
-      "SomeClass::Constructor() :\n"
-      "    aaaaaaaaaaaaa(aaaaaaaaaaaaaa), aaaaaaaaaaaaa(aaaaaaaaaaaaaa),\n"
-      "    aaaaaaaaaaaaa(aaaaaaaaaaaaaa) {}",
-      Style);
-  verifyFormat(
-      "SomeClass::Constructor() :\n"
-      "    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa),\n"
-      "    aaaaaaaaaaaaaaa(aaaaaaaaaaaa) {}",
-      Style);
-  verifyFormat("Constructor(aaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,\n"
-               "            aaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa) :\n"
-               "    aaaaaaaaaa(aaaaaa) {}",
-               Style);
-
-  verifyFormat("Constructor() :\n"
-               "    aaaaaaaaaaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaaaaaaaaaaaaaa),\n"
-               "    aaaaaaaaaaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaaaaaaaaaaaaaa,\n"
-               "                             aaaaaaaaaaaaaaaaaaaaaaaaaaa),\n"
-               "    aaaaaaaaaaaaaaaaaaaaaaa() {}",
-               Style);
-
-  verifyFormat("Constructor() :\n"
-               "    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(\n"
-               "        aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa) {}",
-               Style);
-
-  verifyFormat("Constructor(int Parameter = 0) :\n"
-               "    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaaaa),\n"
-               "    aaaaaaaaaaaa(aaaaaaaaaaaaaaaaa) {}",
-               Style);
-  verifyFormat("Constructor() :\n"
-               "    aaaaaaaaaaaaaaaaaaaaaa(a), bbbbbbbbbbbbbbbbbbbbbbbb(b) {\n"
-               "}",
-               getStyleWithColumns(Style, 60));
-  verifyFormat("Constructor() :\n"
-               "    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(\n"
-               "        aaaaaaaaaaaaaaaaaaaaaaaaa(aaaa, aaaa)) {}",
-               Style);
-
-  // Here a line could be saved by splitting the second initializer onto two
-  // lines, but that is not desirable.
-  verifyFormat("Constructor() :\n"
-               "    aaaaaaaaaaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaaaaaaaaaaa),\n"
-               "    aaaaaaaaaaa(aaaaaaaaaaa),\n"
-               "    aaaaaaaaaaaaaaaaaaaaat(aaaaaaaaaaaaaaaaaaaaaaaaaaaa) {}",
-               Style);
-
-  FormatStyle OnePerLine = Style;
-  OnePerLine.ConstructorInitializerAllOnOneLineOrOnePerLine = true;
-  OnePerLine.AllowAllConstructorInitializersOnNextLine = false;
-  verifyFormat("SomeClass::Constructor() :\n"
-               "    aaaaaaaaaaaaa(aaaaaaaaaaaaaa),\n"
-               "    aaaaaaaaaaaaa(aaaaaaaaaaaaaa),\n"
-               "    aaaaaaaaaaaaa(aaaaaaaaaaaaaa) {}",
-               OnePerLine);
-  verifyFormat("SomeClass::Constructor() :\n"
-               "    aaaaaaaaaaaaa(aaaaaaaaaaaaaa), // Some comment\n"
-               "    aaaaaaaaaaaaa(aaaaaaaaaaaaaa),\n"
-               "    aaaaaaaaaaaaa(aaaaaaaaaaaaaa) {}",
-               OnePerLine);
-  verifyFormat("MyClass::MyClass(int var) :\n"
-               "    some_var_(var),            // 4 space indent\n"
-               "    some_other_var_(var + 1) { // lined up\n"
-               "}",
-               OnePerLine);
-  verifyFormat("Constructor() :\n"
-               "    aaaaa(aaaaaa),\n"
-               "    aaaaa(aaaaaa),\n"
-               "    aaaaa(aaaaaa),\n"
-               "    aaaaa(aaaaaa),\n"
-               "    aaaaa(aaaaaa) {}",
-               OnePerLine);
-  verifyFormat("Constructor() :\n"
-               "    aaaaa(aaaaaaaaaaaaaaaaaaaaaa, aaaaaaaaaaaaaaaaaaaaaa,\n"
-               "          aaaaaaaaaaaaaaaaaaaaaa) {}",
-               OnePerLine);
-  OnePerLine.BinPackParameters = false;
-  verifyFormat("Constructor() :\n"
-               "    aaaaaaaaaaaaaaaaaaaaaaaa(\n"
-               "        aaaaaaaaaaa().aaa(),\n"
-               "        aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa) {}",
-               OnePerLine);
-  OnePerLine.ColumnLimit = 60;
-  verifyFormat("Constructor() :\n"
-               "    aaaaaaaaaaaaaaaaaaaa(a),\n"
-               "    bbbbbbbbbbbbbbbbbbbbbbbb(b) {}",
-               OnePerLine);
-
-  EXPECT_EQ("Constructor() :\n"
-            "    // Comment forcing unwanted break.\n"
-            "    aaaa(aaaa) {}",
-            format("Constructor() :\n"
-                   "    // Comment forcing unwanted break.\n"
-                   "    aaaa(aaaa) {}",
-                   Style));
-
-  Style.ColumnLimit = 0;
-  verifyFormat("SomeClass::Constructor() :\n"
-               "    a(a) {}",
-               Style);
-  verifyFormat("SomeClass::Constructor() noexcept :\n"
-               "    a(a) {}",
-               Style);
-  verifyFormat("SomeClass::Constructor() :\n"
-               "    a(a), b(b), c(c) {}",
-               Style);
-  verifyFormat("SomeClass::Constructor() :\n"
-               "    a(a) {\n"
-               "  foo();\n"
-               "  bar();\n"
-               "}",
-               Style);
-
-  Style.AllowShortFunctionsOnASingleLine = FormatStyle::SFS_None;
-  verifyFormat("SomeClass::Constructor() :\n"
-               "    a(a), b(b), c(c) {\n"
-               "}",
-               Style);
-  verifyFormat("SomeClass::Constructor() :\n"
-               "    a(a) {\n"
-               "}",
-               Style);
-
-  Style.ColumnLimit = 80;
-  Style.AllowShortFunctionsOnASingleLine = FormatStyle::SFS_All;
-  Style.ConstructorInitializerIndentWidth = 2;
-  verifyFormat("SomeClass::Constructor() : a(a), b(b), c(c) {}", Style);
-  verifyFormat("SomeClass::Constructor() :\n"
-               "  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,\n"
-               "  bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb {}",
-               Style);
-
-  // `ConstructorInitializerIndentWidth` actually applies to InheritanceList as
-  // well
-  Style.BreakInheritanceList = FormatStyle::BILS_BeforeColon;
-  verifyFormat(
-      "class SomeClass\n"
-      "  : public aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,\n"
-      "    public bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb {};",
-      Style);
-  Style.BreakInheritanceList = FormatStyle::BILS_BeforeComma;
-  verifyFormat(
-      "class SomeClass\n"
-      "  : public aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-      "  , public bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb {};",
-      Style);
-  Style.BreakInheritanceList = FormatStyle::BILS_AfterColon;
-  verifyFormat(
-      "class SomeClass :\n"
-      "  public aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,\n"
-      "  public bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb {};",
-      Style);
-  Style.BreakInheritanceList = FormatStyle::BILS_AfterComma;
-  verifyFormat(
-      "class SomeClass\n"
-      "  : public aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,\n"
-      "    public bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb {};",
-      Style);
-}
-
-#ifndef EXPENSIVE_CHECKS
-// Expensive checks enables libstdc++ checking which includes validating the
-// state of ranges used in std::priority_queue - this blows out the
-// runtime/scalability of the function and makes this test unacceptably slow.
-TEST_F(FormatTest, MemoizationTests) {
-  // This breaks if the memoization lookup does not take \c Indent and
-  // \c LastSpace into account.
-  verifyFormat(
-      "extern CFRunLoopTimerRef\n"
-      "CFRunLoopTimerCreate(CFAllocatorRef allocato, CFAbsoluteTime fireDate,\n"
-      "                     CFTimeInterval interval, CFOptionFlags flags,\n"
-      "                     CFIndex order, CFRunLoopTimerCallBack callout,\n"
-      "                     CFRunLoopTimerContext *context) {}");
-
-  // Deep nesting somewhat works around our memoization.
-  verifyFormat(
-      "aaaaa(aaaaa(aaaaa(aaaaa(aaaaa(aaaaa(aaaaa(aaaaa(aaaaa(aaaaa(aaaaa(\n"
-      "    aaaaa(aaaaa(aaaaa(aaaaa(aaaaa(aaaaa(aaaaa(aaaaa(aaaaa(aaaaa(\n"
-      "        aaaaa(aaaaa(aaaaa(aaaaa(aaaaa(aaaaa(aaaaa(aaaaa(aaaaa(\n"
-      "            aaaaa(aaaaa(aaaaa(aaaaa(aaaaa(aaaaa(aaaaa(aaaaa(aaaaa(\n"
-      "                aaaaa())))))))))))))))))))))))))))))))))))))));",
-      getLLVMStyleWithColumns(65));
-  verifyFormat(
-      "aaaaa(\n"
-      "    aaaaa,\n"
-      "    aaaaa(\n"
-      "        aaaaa,\n"
-      "        aaaaa(\n"
-      "            aaaaa,\n"
-      "            aaaaa(\n"
-      "                aaaaa,\n"
-      "                aaaaa(\n"
-      "                    aaaaa,\n"
-      "                    aaaaa(\n"
-      "                        aaaaa,\n"
-      "                        aaaaa(\n"
-      "                            aaaaa,\n"
-      "                            aaaaa(\n"
-      "                                aaaaa,\n"
-      "                                aaaaa(\n"
-      "                                    aaaaa,\n"
-      "                                    aaaaa(\n"
-      "                                        aaaaa,\n"
-      "                                        aaaaa(\n"
-      "                                            aaaaa,\n"
-      "                                            aaaaa(\n"
-      "                                                aaaaa,\n"
-      "                                                aaaaa))))))))))));",
-      getLLVMStyleWithColumns(65));
-  verifyFormat(
-      "a(a(a(a(a(a(a(a(a(a(a(a(a(a(a(a(a(a(a(a(a(a(), a), a), a), a),\n"
-      "                                  a),\n"
-      "                                a),\n"
-      "                              a),\n"
-      "                            a),\n"
-      "                          a),\n"
-      "                        a),\n"
-      "                      a),\n"
-      "                    a),\n"
-      "                  a),\n"
-      "                a),\n"
-      "              a),\n"
-      "            a),\n"
-      "          a),\n"
-      "        a),\n"
-      "      a),\n"
-      "    a),\n"
-      "  a)",
-      getLLVMStyleWithColumns(65));
-
-  // This test takes VERY long when memoization is broken.
-  FormatStyle OnePerLine = getLLVMStyle();
-  OnePerLine.ConstructorInitializerAllOnOneLineOrOnePerLine = true;
-  OnePerLine.BinPackParameters = false;
-  std::string input = "Constructor()\n"
-                      "    : aaaa(a,\n";
-  for (unsigned i = 0, e = 80; i != e; ++i) {
-    input += "           a,\n";
-  }
-  input += "           a) {}";
-  verifyFormat(input, OnePerLine);
-}
-#endif
-
-TEST_F(FormatTest, BreaksAsHighAsPossible) {
-  verifyFormat(
-      "void f() {\n"
-      "  if ((aaaaaaaaaaaaaaaaaaaaaaaaaaaaa && aaaaaaaaaaaaaaaaaaaaaaaaaa) ||\n"
-      "      (bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb && bbbbbbbbbbbbbbbbbbbbbbbbbb))\n"
-      "    f();\n"
-      "}");
-  verifyFormat("if (Intervals[i].getRange().getFirst() <\n"
-               "    Intervals[i - 1].getRange().getLast()) {\n}");
-}
-
-TEST_F(FormatTest, BreaksFunctionDeclarations) {
-  // Principially, we break function declarations in a certain order:
-  // 1) break amongst arguments.
-  verifyFormat("Aaaaaaaaaaaaaa bbbbbbbbbbbbbb(Cccccccccccccc cccccccccccccc,\n"
-               "                              Cccccccccccccc cccccccccccccc);");
-  verifyFormat("template <class TemplateIt>\n"
-               "SomeReturnType SomeFunction(TemplateIt begin, TemplateIt end,\n"
-               "                            TemplateIt *stop) {}");
-
-  // 2) break after return type.
-  verifyFormat(
-      "Aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-      "bbbbbbbbbbbbbb(Cccccccccccccc cccccccccccccccccccccccccc);",
-      getGoogleStyle());
-
-  // 3) break after (.
-  verifyFormat(
-      "Aaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbb(\n"
-      "    Cccccccccccccccccccccccccccccc cccccccccccccccccccccccccccccccc);",
-      getGoogleStyle());
-
-  // 4) break before after nested name specifiers.
-  verifyFormat(
-      "Aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-      "SomeClasssssssssssssssssssssssssssssssssssssss::\n"
-      "    bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb(Cccccccccccccc cccccccccc);",
-      getGoogleStyle());
-
-  // However, there are exceptions, if a sufficient amount of lines can be
-  // saved.
-  // FIXME: The precise cut-offs wrt. the number of saved lines might need some
-  // more adjusting.
-  verifyFormat("Aaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbb(Cccccccccccccc cccccccccc,\n"
-               "                                  Cccccccccccccc cccccccccc,\n"
-               "                                  Cccccccccccccc cccccccccc,\n"
-               "                                  Cccccccccccccc cccccccccc,\n"
-               "                                  Cccccccccccccc cccccccccc);");
-  verifyFormat(
-      "Aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-      "bbbbbbbbbbb(Cccccccccccccc cccccccccc, Cccccccccccccc cccccccccc,\n"
-      "            Cccccccccccccc cccccccccc, Cccccccccccccc cccccccccc,\n"
-      "            Cccccccccccccc cccccccccc, Cccccccccccccc cccccccccc);",
-      getGoogleStyle());
-  verifyFormat(
-      "Aaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb(Cccccccccccccc cccccccccc,\n"
-      "                                          Cccccccccccccc cccccccccc,\n"
-      "                                          Cccccccccccccc cccccccccc,\n"
-      "                                          Cccccccccccccc cccccccccc,\n"
-      "                                          Cccccccccccccc cccccccccc,\n"
-      "                                          Cccccccccccccc cccccccccc,\n"
-      "                                          Cccccccccccccc cccccccccc);");
-  verifyFormat("Aaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb(\n"
-               "    Cccccccccccccc cccccccccc, Cccccccccccccc cccccccccc,\n"
-               "    Cccccccccccccc cccccccccc, Cccccccccccccc cccccccccc,\n"
-               "    Cccccccccccccc cccccccccc, Cccccccccccccc cccccccccc,\n"
-               "    Cccccccccccccc cccccccccc, Cccccccccccccc cccccccccc);");
-
-  // Break after multi-line parameters.
-  verifyFormat("void aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(\n"
-               "    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-               "        aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,\n"
-               "    bbbb bbbb);");
-  verifyFormat("void SomeLoooooooooooongFunction(\n"
-               "    std::unique_ptr<aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa>\n"
-               "        aaaaaaaaaaaaaaaaaaaaaaaaaa,\n"
-               "    int bbbbbbbbbbbbb);");
-
-  // Treat overloaded operators like other functions.
-  verifyFormat("SomeLoooooooooooooooooooooooooogType\n"
-               "operator>(const SomeLoooooooooooooooooooooooooogType &other);");
-  verifyFormat("SomeLoooooooooooooooooooooooooogType\n"
-               "operator>>(const SomeLooooooooooooooooooooooooogType &other);");
-  verifyFormat("SomeLoooooooooooooooooooooooooogType\n"
-               "operator<<(const SomeLooooooooooooooooooooooooogType &other);");
-  verifyGoogleFormat(
-      "SomeLoooooooooooooooooooooooooooooogType operator>>(\n"
-      "    const SomeLooooooooogType &a, const SomeLooooooooogType &b);");
-  verifyGoogleFormat(
-      "SomeLoooooooooooooooooooooooooooooogType operator<<(\n"
-      "    const SomeLooooooooogType &a, const SomeLooooooooogType &b);");
-  verifyFormat("void aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(\n"
-               "    int aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa = 1);");
-  verifyFormat("aaaaaaaaaaaaaaaaaaaaaa\n"
-               "aaaaaaaaaaaaaaaaaaaaaaaaa(int aaaaaaaaaaaaaaaaaaaaaaaa = 1);");
-  verifyGoogleFormat(
-      "typename aaaaaaaaaa<aaaaaa>::aaaaaaaaaaa\n"
-      "aaaaaaaaaa<aaaaaa>::aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(\n"
-      "    bool *aaaaaaaaaaaaaaaaaa, bool *aa) {}");
-  verifyGoogleFormat("template <typename T>\n"
-                     "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-                     "aaaaaaaaaaaaaaaaaaaaaaa<T>::aaaaaaaaaaaaa(\n"
-                     "    aaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaa);");
-
-  FormatStyle Style = getLLVMStyle();
-  Style.PointerAlignment = FormatStyle::PAS_Left;
-  verifyFormat("void aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(\n"
-               "    aaaaaaaaaaaaaaaaaaaaaaaaa* const aaaaaaaaaaaa) {}",
-               Style);
-  verifyFormat("void aaaaaaa(aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa*\n"
-               "                 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa) {}",
-               Style);
-}
-
-TEST_F(FormatTest, DontBreakBeforeQualifiedOperator) {
-  // Regression test for https://bugs.llvm.org/show_bug.cgi?id=40516:
-  // Prefer keeping `::` followed by `operator` together.
-  EXPECT_EQ("const aaaa::bbbbbbb &\n"
-            "ccccccccc::operator++() {\n"
-            "  stuff();\n"
-            "}",
-            format("const aaaa::bbbbbbb\n"
-                   "&ccccccccc::operator++() { stuff(); }",
-                   getLLVMStyleWithColumns(40)));
-}
-
-TEST_F(FormatTest, TrailingReturnType) {
-  verifyFormat("auto foo() -> int;\n");
-  // correct trailing return type spacing
-  verifyFormat("auto operator->() -> int;\n");
-  verifyFormat("auto operator++(int) -> int;\n");
-
-  verifyFormat("struct S {\n"
-               "  auto bar() const -> int;\n"
-               "};");
-  verifyFormat("template <size_t Order, typename T>\n"
-               "auto load_img(const std::string &filename)\n"
-               "    -> alias::tensor<Order, T, mem::tag::cpu> {}");
-  verifyFormat("auto SomeFunction(A aaaaaaaaaaaaaaaaaaaaa) const\n"
-               "    -> decltype(f(aaaaaaaaaaaaaaaaaaaaa)) {}");
-  verifyFormat("auto doSomething(Aaaaaa *aaaaaa) -> decltype(aaaaaa->f()) {}");
-  verifyFormat("template <typename T>\n"
-               "auto aaaaaaaaaaaaaaaaaaaaaa(T t)\n"
-               "    -> decltype(eaaaaaaaaaaaaaaa<T>(t.a).aaaaaaaa());");
-
-  // Not trailing return types.
-  verifyFormat("void f() { auto a = b->c(); }");
-}
-
-TEST_F(FormatTest, DeductionGuides) {
-  verifyFormat("template <class T> A(const T &, const T &) -> A<T &>;");
-  verifyFormat("template <class T> explicit A(T &, T &&) -> A<T>;");
-  verifyFormat("template <class... Ts> S(Ts...) -> S<Ts...>;");
-  verifyFormat(
-      "template <class... T>\n"
-      "array(T &&...t) -> array<std::common_type_t<T...>, sizeof...(T)>;");
-  verifyFormat("template <class T> A() -> A<decltype(p->foo<3>())>;");
-  verifyFormat("template <class T> A() -> A<decltype(foo<traits<1>>)>;");
-  verifyFormat("template <class T> A() -> A<sizeof(p->foo<1>)>;");
-  verifyFormat("template <class T> A() -> A<(3 < 2)>;");
-  verifyFormat("template <class T> A() -> A<((3) < (2))>;");
-  verifyFormat("template <class T> x() -> x<1>;");
-  verifyFormat("template <class T> explicit x(T &) -> x<1>;");
-
-  // Ensure not deduction guides.
-  verifyFormat("c()->f<int>();");
-  verifyFormat("x()->foo<1>;");
-  verifyFormat("x = p->foo<3>();");
-  verifyFormat("x()->x<1>();");
-  verifyFormat("x()->x<1>;");
-}
-
-TEST_F(FormatTest, BreaksFunctionDeclarationsWithTrailingTokens) {
-  // Avoid breaking before trailing 'const' or other trailing annotations, if
-  // they are not function-like.
-  FormatStyle Style = getGoogleStyle();
-  Style.ColumnLimit = 47;
-  verifyFormat("void someLongFunction(\n"
-               "    int someLoooooooooooooongParameter) const {\n}",
-               getLLVMStyleWithColumns(47));
-  verifyFormat("LoooooongReturnType\n"
-               "someLoooooooongFunction() const {}",
-               getLLVMStyleWithColumns(47));
-  verifyFormat("LoooooongReturnType someLoooooooongFunction()\n"
-               "    const {}",
-               Style);
-  verifyFormat("void SomeFunction(aaaaa aaaaaaaaaaaaaaaaaaaa,\n"
-               "                  aaaaa aaaaaaaaaaaaaaaaaaaa) OVERRIDE;");
-  verifyFormat("void SomeFunction(aaaaa aaaaaaaaaaaaaaaaaaaa,\n"
-               "                  aaaaa aaaaaaaaaaaaaaaaaaaa) OVERRIDE FINAL;");
-  verifyFormat("void SomeFunction(aaaaa aaaaaaaaaaaaaaaaaaaa,\n"
-               "                  aaaaa aaaaaaaaaaaaaaaaaaaa) override final;");
-  verifyFormat("virtual void aaaaa(aaaaaaaaaaaaaaaaaaaaaaaaaa aaaa,\n"
-               "                   aaaaaaaaaaa aaaaa) const override;");
-  verifyGoogleFormat(
-      "virtual void aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa()\n"
-      "    const override;");
-
-  // Even if the first parameter has to be wrapped.
-  verifyFormat("void someLongFunction(\n"
-               "    int someLongParameter) const {}",
-               getLLVMStyleWithColumns(46));
-  verifyFormat("void someLongFunction(\n"
-               "    int someLongParameter) const {}",
-               Style);
-  verifyFormat("void someLongFunction(\n"
-               "    int someLongParameter) override {}",
-               Style);
-  verifyFormat("void someLongFunction(\n"
-               "    int someLongParameter) OVERRIDE {}",
-               Style);
-  verifyFormat("void someLongFunction(\n"
-               "    int someLongParameter) final {}",
-               Style);
-  verifyFormat("void someLongFunction(\n"
-               "    int someLongParameter) FINAL {}",
-               Style);
-  verifyFormat("void someLongFunction(\n"
-               "    int parameter) const override {}",
-               Style);
-
-  Style.BreakBeforeBraces = FormatStyle::BS_Allman;
-  verifyFormat("void someLongFunction(\n"
-               "    int someLongParameter) const\n"
-               "{\n"
-               "}",
-               Style);
-
-  Style.BreakBeforeBraces = FormatStyle::BS_Whitesmiths;
-  verifyFormat("void someLongFunction(\n"
-               "    int someLongParameter) const\n"
-               "  {\n"
-               "  }",
-               Style);
-
-  // Unless these are unknown annotations.
-  verifyFormat("void SomeFunction(aaaaaaaaaa aaaaaaaaaaaaaaa,\n"
-               "                  aaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa)\n"
-               "    LONG_AND_UGLY_ANNOTATION;");
-
-  // Breaking before function-like trailing annotations is fine to keep them
-  // close to their arguments.
-  verifyFormat("void aaaaaaaaaaaa(int aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa)\n"
-               "    LOCKS_EXCLUDED(aaaaaaaaaaaaa);");
-  verifyFormat("void aaaaaaaaaaaa(int aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa) const\n"
-               "    LOCKS_EXCLUDED(aaaaaaaaaaaaa);");
-  verifyFormat("void aaaaaaaaaaaa(int aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa) const\n"
-               "    LOCKS_EXCLUDED(aaaaaaaaaaaaa) {}");
-  verifyGoogleFormat("void aaaaaaaaaaaaaa(aaaaaaaa aaa) override\n"
-                     "    AAAAAAAAAAAAAAAAAAAAAAAA(aaaaaaaaaaaaaaa);");
-  verifyFormat("SomeFunction([](int i) LOCKS_EXCLUDED(a) {});");
-
-  verifyFormat(
-      "void aaaaaaaaaaaaaaaaaa()\n"
-      "    __attribute__((aaaaaaaaaaaaaaaaaaaaaaaaa, aaaaaaaaaaaaaaaaaaaaaaa,\n"
-      "                   aaaaaaaaaaaaaaaaaaaaaaaaa));");
-  verifyFormat("bool aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-               "    __attribute__((unused));");
-  verifyGoogleFormat(
-      "bool aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-      "    GUARDED_BY(aaaaaaaaaaaa);");
-  verifyGoogleFormat(
-      "bool aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-      "    GUARDED_BY(aaaaaaaaaaaa);");
-  verifyGoogleFormat(
-      "bool aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa GUARDED_BY(aaaaaaaaaaaa) =\n"
-      "    aaaaaaaa::aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa;");
-  verifyGoogleFormat(
-      "bool aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa GUARDED_BY(aaaaaaaaaaaa) =\n"
-      "    aaaaaaaaaaaaaaaaaaaaaaaaa;");
-}
-
-TEST_F(FormatTest, FunctionAnnotations) {
-  verifyFormat("DEPRECATED(\"Use NewClass::NewFunction instead.\")\n"
-               "int OldFunction(const string &parameter) {}");
-  verifyFormat("DEPRECATED(\"Use NewClass::NewFunction instead.\")\n"
-               "string OldFunction(const string &parameter) {}");
-  verifyFormat("template <typename T>\n"
-               "DEPRECATED(\"Use NewClass::NewFunction instead.\")\n"
-               "string OldFunction(const string &parameter) {}");
-
-  // Not function annotations.
-  verifyFormat("ASSERT(\"aaaaa\") << aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-               "                << bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb");
-  verifyFormat("TEST_F(ThisIsATestFixtureeeeeeeeeeeee,\n"
-               "       ThisIsATestWithAReallyReallyReallyReallyLongName) {}");
-  verifyFormat("MACRO(abc).function() // wrap\n"
-               "    << abc;");
-  verifyFormat("MACRO(abc)->function() // wrap\n"
-               "    << abc;");
-  verifyFormat("MACRO(abc)::function() // wrap\n"
-               "    << abc;");
-}
-
-TEST_F(FormatTest, BreaksDesireably) {
-  verifyFormat("if (aaaaaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaa) ||\n"
-               "    aaaaaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaa) ||\n"
-               "    aaaaaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaa)) {\n}");
-  verifyFormat("if (aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(\n"
-               "        aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa)) {\n"
-               "}");
-
-  verifyFormat(
-      "aaaaaaaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,\n"
-      "                      aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa) {}");
-
-  verifyFormat("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(\n"
-               "    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(\n"
-               "        aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa));");
-
-  verifyFormat(
-      "aaaaaaaa(aaaaaaaaaaaaa,\n"
-      "         aaaaaaaaaaaaaaa(aaaaaaaaaaaaaaaaaaaaaaaaaaaaa(\n"
-      "             aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa)),\n"
-      "         aaaaaaaa(aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(\n"
-      "             aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa)));");
-
-  verifyFormat("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa ||\n"
-               "    (aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa);");
-
-  verifyFormat(
-      "void f() {\n"
-      "  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa &&\n"
-      "                                 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa);\n"
-      "}");
-  verifyFormat(
-      "aaaaaa(new Aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(\n"
-      "    aaaaaaaaaaaaaaaaaaaaaaaaaaaaa));");
-  verifyFormat(
-      "aaaaaa(aaa, new Aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(\n"
-      "                aaaaaaaaaaaaaaaaaaaaaaaaaaaaa));");
-  verifyFormat(
-      "aaaaaa(aaa,\n"
-      "       new Aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(\n"
-      "           aaaaaaaaaaaaaaaaaaaaaaaaaaaaa),\n"
-      "       aaaa);");
-  verifyFormat("aaaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +\n"
-               "                      aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,\n"
-               "                  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa);");
-
-  // Indent consistently independent of call expression and unary operator.
-  verifyFormat("aaaaaaaaaaa(bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb(\n"
-               "    dddddddddddddddddddddddddddddd));");
-  verifyFormat("aaaaaaaaaaa(!bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb(\n"
-               "    dddddddddddddddddddddddddddddd));");
-  verifyFormat("aaaaaaaaaaa(bbbbbbbbbbbbbbbbbbbbbbbbb.ccccccccccccccccc(\n"
-               "    dddddddddddddddddddddddddddddd));");
-
-  // This test case breaks on an incorrect memoization, i.e. an optimization not
-  // taking into account the StopAt value.
-  verifyFormat(
-      "return aaaaaaaaaaaaaaaaaaaaaaaa || aaaaaaaaaaaaaaaaaaaaaaa ||\n"
-      "       aaaaaaaaaaa(aaaaaaaaa) || aaaaaaaaaaaaaaaaaaaaaaa ||\n"
-      "       aaaaaaaaaaaaaaaaaaaaaaaaa || aaaaaaaaaaaaaaaaaaaaaaa ||\n"
-      "       (aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa);");
-
-  verifyFormat("{\n  {\n    {\n"
-               "      Annotation.SpaceRequiredBefore =\n"
-               "          Line.Tokens[i - 1].Tok.isNot(tok::l_paren) &&\n"
-               "          Line.Tokens[i - 1].Tok.isNot(tok::l_square);\n"
-               "    }\n  }\n}");
-
-  // Break on an outer level if there was a break on an inner level.
-  EXPECT_EQ("f(g(h(a, // comment\n"
-            "      b, c),\n"
-            "    d, e),\n"
-            "  x, y);",
-            format("f(g(h(a, // comment\n"
-                   "    b, c), d, e), x, y);"));
-
-  // Prefer breaking similar line breaks.
-  verifyFormat(
-      "const int kTrackingOptions = NSTrackingMouseMoved |\n"
-      "                             NSTrackingMouseEnteredAndExited |\n"
-      "                             NSTrackingActiveAlways;");
-}
-
-TEST_F(FormatTest, FormatsDeclarationsOnePerLine) {
-  FormatStyle NoBinPacking = getGoogleStyle();
-  NoBinPacking.BinPackParameters = false;
-  NoBinPacking.BinPackArguments = true;
-  verifyFormat("void f() {\n"
-               "  f(aaaaaaaaaaaaaaaaaaaa, aaaaaaaaaaaaaaaaaaaa,\n"
-               "    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa);\n"
-               "}",
-               NoBinPacking);
-  verifyFormat("void f(int aaaaaaaaaaaaaaaaaaaa,\n"
-               "       int aaaaaaaaaaaaaaaaaaaa,\n"
-               "       int aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa) {}",
-               NoBinPacking);
-
-  NoBinPacking.AllowAllParametersOfDeclarationOnNextLine = false;
-  verifyFormat("void aaaaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaaaaaaaaaaaaaaa,\n"
-               "                        vector<int> bbbbbbbbbbbbbbb);",
-               NoBinPacking);
-  // FIXME: This behavior difference is probably not wanted. However, currently
-  // we cannot distinguish BreakBeforeParameter being set because of the wrapped
-  // template arguments from BreakBeforeParameter being set because of the
-  // one-per-line formatting.
-  verifyFormat(
-      "void fffffffffff(aaaaaaaaaaaaaaaaaaaaaaaaaaa<aaaaaaaaaaaaaaaaaaaaaaa,\n"
-      "                                             aaaaaaaaaa> aaaaaaaaaa);",
-      NoBinPacking);
-  verifyFormat(
-      "void fffffffffff(\n"
-      "    aaaaaaaaaaaaaaaaaaaaaaaaaaa<aaaaaaaaaaaaaaaaaaaaaaa, aaaaaaaaaa>\n"
-      "        aaaaaaaaaa);");
-}
-
-TEST_F(FormatTest, FormatsOneParameterPerLineIfNecessary) {
-  FormatStyle NoBinPacking = getGoogleStyle();
-  NoBinPacking.BinPackParameters = false;
-  NoBinPacking.BinPackArguments = false;
-  verifyFormat("f(aaaaaaaaaaaaaaaaaaaa,\n"
-               "  aaaaaaaaaaaaaaaaaaaa,\n"
-               "  aaaaaaaaaaaaaaaaaaaa + aaaaaaaaaaaaaaaaaaaa);",
-               NoBinPacking);
-  verifyFormat("aaaaaaa(aaaaaaaaaaaaa,\n"
-               "        aaaaaaaaaaaaa,\n"
-               "        aaaaaaaaaaaaa(aaaaaaaaaaaaaaaaa, aaaaaaaaaaaaaaaa));",
-               NoBinPacking);
-  verifyFormat(
-      "aaaaaaaa(aaaaaaaaaaaaa,\n"
-      "         aaaaaaaaaaaaaaa(aaaaaaaaaaaaaaaaaaaaaaaaaaaaa(\n"
-      "             aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa)),\n"
-      "         aaaaaaaa(aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(\n"
-      "             aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa)));",
-      NoBinPacking);
-  verifyFormat("aaaaaaaaaaaaaaa(aaaaaaaaa, aaaaaaaaa, aaaaaaaaaaaaaaaaaaaaa)\n"
-               "    .aaaaaaaaaaaaaaaaaa();",
-               NoBinPacking);
-  verifyFormat("void f() {\n"
-               "  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(\n"
-               "      aaaaaaaaaa, aaaaaaaaaa, aaaaaaaaaa, aaaaaaaaaaa);\n"
-               "}",
-               NoBinPacking);
-
-  verifyFormat(
-      "aaaaaaaaaaaa(aaaaaaaaaaaaaaaaaaaaaaaaaaaa + aaaaaaaaaaaaaaaaaaaaaaaaa,\n"
-      "             aaaaaaaaaaaa,\n"
-      "             aaaaaaaaaaaa);",
-      NoBinPacking);
-  verifyFormat(
-      "somefunction(someotherFunction(ddddddddddddddddddddddddddddddddddd,\n"
-      "                               ddddddddddddddddddddddddddddd),\n"
-      "             test);",
-      NoBinPacking);
-
-  verifyFormat("std::vector<aaaaaaaaaaaaaaaaaaaaaaa,\n"
-               "            aaaaaaaaaaaaaaaaaaaaaaa,\n"
-               "            aaaaaaaaaaaaaaaaaaaaaaa>\n"
-               "    aaaaaaaaaaaaaaaaaa;",
-               NoBinPacking);
-  verifyFormat("a(\"a\"\n"
-               "  \"a\",\n"
-               "  a);");
-
-  NoBinPacking.AllowAllParametersOfDeclarationOnNextLine = false;
-  verifyFormat("void aaaaaaaaaa(aaaaaaaaa,\n"
-               "                aaaaaaaaa,\n"
-               "                aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa);",
-               NoBinPacking);
-  verifyFormat(
-      "void f() {\n"
-      "  aaaaaaaaaaaaaaaaaaaaaaa(aaaaaaaaa, aaaaaaaaa, aaaaaaaaaaaaaaaaaaaaa)\n"
-      "      .aaaaaaa();\n"
-      "}",
-      NoBinPacking);
-  verifyFormat(
-      "template <class SomeType, class SomeOtherType>\n"
-      "SomeType SomeFunction(SomeType Type, SomeOtherType OtherType) {}",
-      NoBinPacking);
-}
-
-TEST_F(FormatTest, AdaptiveOnePerLineFormatting) {
-  FormatStyle Style = getLLVMStyleWithColumns(15);
-  Style.ExperimentalAutoDetectBinPacking = true;
-  EXPECT_EQ("aaa(aaaa,\n"
-            "    aaaa,\n"
-            "    aaaa);\n"
-            "aaa(aaaa,\n"
-            "    aaaa,\n"
-            "    aaaa);",
-            format("aaa(aaaa,\n" // one-per-line
-                   "  aaaa,\n"
-                   "    aaaa  );\n"
-                   "aaa(aaaa,  aaaa,  aaaa);", // inconclusive
-                   Style));
-  EXPECT_EQ("aaa(aaaa, aaaa,\n"
-            "    aaaa);\n"
-            "aaa(aaaa, aaaa,\n"
-            "    aaaa);",
-            format("aaa(aaaa,  aaaa,\n" // bin-packed
-                   "    aaaa  );\n"
-                   "aaa(aaaa,  aaaa,  aaaa);", // inconclusive
-                   Style));
-}
-
-TEST_F(FormatTest, FormatsBuilderPattern) {
-  verifyFormat("return llvm::StringSwitch<Reference::Kind>(name)\n"
-               "    .StartsWith(\".eh_frame_hdr\", ORDER_EH_FRAMEHDR)\n"
-               "    .StartsWith(\".eh_frame\", ORDER_EH_FRAME)\n"
-               "    .StartsWith(\".init\", ORDER_INIT)\n"
-               "    .StartsWith(\".fini\", ORDER_FINI)\n"
-               "    .StartsWith(\".hash\", ORDER_HASH)\n"
-               "    .Default(ORDER_TEXT);\n");
-
-  verifyFormat("return aaaaaaaaaaaaaaaaa->aaaaa().aaaaaaaaaaaaa().aaaaaa() <\n"
-               "       aaaaaaaaaaaaaaa->aaaaa().aaaaaaaaaaaaa().aaaaaa();");
-  verifyFormat("aaaaaaa->aaaaaaa\n"
-               "    ->aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(\n"
-               "        aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa)\n"
-               "    ->aaaaaaaa(aaaaaaaaaaaaaaa);");
-  verifyFormat(
-      "aaaaaaa->aaaaaaa\n"
-      "    ->aaaaaaaaaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa)\n"
-      "    ->aaaaaaaa(aaaaaaaaaaaaaaa);");
-  verifyFormat(
-      "aaaaaaaaaaaaaaaaaaa()->aaaaaa(bbbbb)->aaaaaaaaaaaaaaaaaaa( // break\n"
-      "    aaaaaaaaaaaaaa);");
-  verifyFormat(
-      "aaaaaaaaaaaaaaaaaaaaaaa *aaaaaaaaa =\n"
-      "    aaaaaa->aaaaaaaaaaaa()\n"
-      "        ->aaaaaaaaaaaaaaaa(\n"
-      "            aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa)\n"
-      "        ->aaaaaaaaaaaaaaaaa();");
-  verifyGoogleFormat(
-      "void f() {\n"
-      "  someo->Add((new util::filetools::Handler(dir))\n"
-      "                 ->OnEvent1(NewPermanentCallback(\n"
-      "                     this, &HandlerHolderClass::EventHandlerCBA))\n"
-      "                 ->OnEvent2(NewPermanentCallback(\n"
-      "                     this, &HandlerHolderClass::EventHandlerCBB))\n"
-      "                 ->OnEvent3(NewPermanentCallback(\n"
-      "                     this, &HandlerHolderClass::EventHandlerCBC))\n"
-      "                 ->OnEvent5(NewPermanentCallback(\n"
-      "                     this, &HandlerHolderClass::EventHandlerCBD))\n"
-      "                 ->OnEvent6(NewPermanentCallback(\n"
-      "                     this, &HandlerHolderClass::EventHandlerCBE)));\n"
-      "}");
-
-  verifyFormat(
-      "aaaaaaaaaaa().aaaaaaaaaaa().aaaaaaaaaaa().aaaaaaaaaaa().aaaaaaaaaaa();");
-  verifyFormat("aaaaaaaaaaaaaaa()\n"
-               "    .aaaaaaaaaaaaaaa()\n"
-               "    .aaaaaaaaaaaaaaa()\n"
-               "    .aaaaaaaaaaaaaaa()\n"
-               "    .aaaaaaaaaaaaaaa();");
-  verifyFormat("aaaaaaaaaaaaaaa.aaaaaaaaaaaaaaa()\n"
-               "    .aaaaaaaaaaaaaaa()\n"
-               "    .aaaaaaaaaaaaaaa()\n"
-               "    .aaaaaaaaaaaaaaa();");
-  verifyFormat("aaaaaaaaaaaaaaa.aaaaaaaaaaaaaaa()\n"
-               "    .aaaaaaaaaaaaaaa.aaaaaaaaaaaaaaa()\n"
-               "    .aaaaaaaaaaaaaaa();");
-  verifyFormat("aaaaaaaaaaaaa->aaaaaaaaaaaaaaaaaaaaaaaa()\n"
-               "    ->aaaaaaaaaaaaaae(0)\n"
-               "    ->aaaaaaaaaaaaaaa();");
-
-  // Don't linewrap after very short segments.
-  verifyFormat("a().aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa()\n"
-               "    .aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa()\n"
-               "    .aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa();");
-  verifyFormat("aa().aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa()\n"
-               "    .aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa()\n"
-               "    .aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa();");
-  verifyFormat("aaa()\n"
-               "    .aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa()\n"
-               "    .aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa()\n"
-               "    .aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa();");
-
-  verifyFormat("aaaaaaaaaaaaaaaaaaaaaaaaaaa.aaaaaaaaaaaaa()\n"
-               "    .aaaaaaaaaaaaaaaaaaaaaaaaaa()\n"
-               "    .has<bbbbbbbbbbbbbbbbbbbbb>();");
-  verifyFormat("aaaaaaaaaaaaaaaaaaaaaaaaaaa.aaaaaaaaaaaaa()\n"
-               "    .aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa<\n"
-               "        aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa>();");
-
-  // Prefer not to break after empty parentheses.
-  verifyFormat("FirstToken->WhitespaceRange.getBegin().getLocWithOffset(\n"
-               "    First->LastNewlineOffset);");
-
-  // Prefer not to create "hanging" indents.
-  verifyFormat(
-      "return !soooooooooooooome_map\n"
-      "            .insert(aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa)\n"
-      "            .second;");
-  verifyFormat(
-      "return aaaaaaaaaaaaaaaa\n"
-      "    .aaaaaaaaaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaaaa, aaaaaaaaaaaaaaaaa)\n"
-      "    .aaaa(aaaaaaaaaaaaaa);");
-  // No hanging indent here.
-  verifyFormat("aaaaaaaaaaaaaaaa.aaaaaaaaaaaaaa.aaaaaaaaaaaaaaa(\n"
-               "    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa);");
-  verifyFormat("aaaaaaaaaaaaaaaa.aaaaaaaaaaaaaa().aaaaaaaaaaaaaaa(\n"
-               "    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa);");
-  verifyFormat("aaaaaaaaaaaaaaaaaa.aaaaaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaaaaaaa)\n"
-               "    .aaa(aaaaaaaaaaaaaaaaaaaaaaaaaaaaa);",
-               getLLVMStyleWithColumns(60));
-  verifyFormat("aaaaaaaaaaaaaaaaaa\n"
-               "    .aaaaaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaaaaaaa)\n"
-               "    .aaa(aaaaaaaaaaaaaaaaaaaaaaaaaaaaa);",
-               getLLVMStyleWithColumns(59));
-  verifyFormat("aaaa.aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(\n"
-               "        aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa)\n"
-               "    .aaaaaa(aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa);");
-
-  // Dont break if only closing statements before member call
-  verifyFormat("test() {\n"
-               "  ([]() -> {\n"
-               "    int b = 32;\n"
-               "    return 3;\n"
-               "  }).foo();\n"
-               "}");
-  verifyFormat("test() {\n"
-               "  (\n"
-               "      []() -> {\n"
-               "        int b = 32;\n"
-               "        return 3;\n"
-               "      },\n"
-               "      foo, bar)\n"
-               "      .foo();\n"
-               "}");
-  verifyFormat("test() {\n"
-               "  ([]() -> {\n"
-               "    int b = 32;\n"
-               "    return 3;\n"
-               "  })\n"
-               "      .foo()\n"
-               "      .bar();\n"
-               "}");
-  verifyFormat("test() {\n"
-               "  ([]() -> {\n"
-               "    int b = 32;\n"
-               "    return 3;\n"
-               "  })\n"
-               "      .foo(\"aaaaaaaaaaaaaaaaa\"\n"
-               "           \"bbbb\");\n"
-               "}",
-               getLLVMStyleWithColumns(30));
-}
-
-TEST_F(FormatTest, BreaksAccordingToOperatorPrecedence) {
-  verifyFormat(
-      "if (aaaaaaaaaaaaaaaaaaaaaaaaa ||\n"
-      "    bbbbbbbbbbbbbbbbbbbbbbbbb && ccccccccccccccccccccccccc) {\n}");
-  verifyFormat(
-      "if (aaaaaaaaaaaaaaaaaaaaaaaaa or\n"
-      "    bbbbbbbbbbbbbbbbbbbbbbbbb and cccccccccccccccccccccccc) {\n}");
-
-  verifyFormat("if (aaaaaaaaaaaaaaaaaaaaaaaaa && bbbbbbbbbbbbbbbbbbbbbbbbb ||\n"
-               "    ccccccccccccccccccccccccc) {\n}");
-  verifyFormat("if (aaaaaaaaaaaaaaaaaaaaaaaaa and bbbbbbbbbbbbbbbbbbbbbbbb or\n"
-               "    ccccccccccccccccccccccccc) {\n}");
-
-  verifyFormat("if (aaaaaaaaaaaaaaaaaaaaaaaaa || bbbbbbbbbbbbbbbbbbbbbbbbb ||\n"
-               "    ccccccccccccccccccccccccc) {\n}");
-  verifyFormat("if (aaaaaaaaaaaaaaaaaaaaaaaaa or bbbbbbbbbbbbbbbbbbbbbbbbb or\n"
-               "    ccccccccccccccccccccccccc) {\n}");
-
-  verifyFormat(
-      "if ((aaaaaaaaaaaaaaaaaaaaaaaaa || bbbbbbbbbbbbbbbbbbbbbbbbb) &&\n"
-      "    ccccccccccccccccccccccccc) {\n}");
-  verifyFormat(
-      "if ((aaaaaaaaaaaaaaaaaaaaaaaaa or bbbbbbbbbbbbbbbbbbbbbbbbb) and\n"
-      "    ccccccccccccccccccccccccc) {\n}");
-
-  verifyFormat("return aaaa & AAAAAAAAAAAAAAAAAAAAAAAAAAAAA ||\n"
-               "       bbbb & BBBBBBBBBBBBBBBBBBBBBBBBBBBBB ||\n"
-               "       cccc & CCCCCCCCCCCCCCCCCCCCCCCCCC ||\n"
-               "       dddd & DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD;");
-  verifyFormat("return aaaa & AAAAAAAAAAAAAAAAAAAAAAAAAAAAA or\n"
-               "       bbbb & BBBBBBBBBBBBBBBBBBBBBBBBBBBBB or\n"
-               "       cccc & CCCCCCCCCCCCCCCCCCCCCCCCCC or\n"
-               "       dddd & DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD;");
-
-  verifyFormat("if ((aaaaaaaaaa != aaaaaaaaaaaaaaa ||\n"
-               "     aaaaaaaaaaaaaaaaaaaaaaaa() >= aaaaaaaaaaaaaaaaaaaa) &&\n"
-               "    aaaaaaaaaaaaaaa != aa) {\n}");
-  verifyFormat("if ((aaaaaaaaaa != aaaaaaaaaaaaaaa or\n"
-               "     aaaaaaaaaaaaaaaaaaaaaaaa() >= aaaaaaaaaaaaaaaaaaaa) and\n"
-               "    aaaaaaaaaaaaaaa != aa) {\n}");
-}
-
-TEST_F(FormatTest, BreaksAfterAssignments) {
-  verifyFormat(
-      "unsigned Cost =\n"
-      "    TTI.getMemoryOpCost(I->getOpcode(), VectorTy, SI->getAlignment(),\n"
-      "                        SI->getPointerAddressSpaceee());\n");
-  verifyFormat(
-      "CharSourceRange LineRange = CharSourceRange::getTokenRange(\n"
-      "    Line.Tokens.front().Tok.getLo(), Line.Tokens.back().Tok.getLoc());");
-
-  verifyFormat(
-      "aaaaaaaaaaaaaaaaaaaaaaaaaa aaaa = aaaaaaaaaaaaaa(0).aaaa().aaaaaaaaa(\n"
-      "    aaaaaaaaaaaaaaaaaaa::aaaaaaaaaaaaaaaaaaaaa);");
-  verifyFormat("unsigned OriginalStartColumn =\n"
-               "    SourceMgr.getSpellingColumnNumber(\n"
-               "        Current.FormatTok.getStartOfNonWhitespace()) -\n"
-               "    1;");
-}
-
-TEST_F(FormatTest, ConfigurableBreakAssignmentPenalty) {
-  FormatStyle Style = getLLVMStyle();
-  verifyFormat("int aaaaaaaaaaaaaaaaaaaaaaaaaa =\n"
-               "    bbbbbbbbbbbbbbbbbbbbbbbbbb + cccccccccccccccccccccccccc;",
-               Style);
-
-  Style.PenaltyBreakAssignment = 20;
-  verifyFormat("int aaaaaaaaaaaaaaaaaaaaaaaaaa = bbbbbbbbbbbbbbbbbbbbbbbbbb +\n"
-               "                                 cccccccccccccccccccccccccc;",
-               Style);
-}
-
-TEST_F(FormatTest, AlignsAfterAssignments) {
-  verifyFormat(
-      "int Result = aaaaaaaaaaaaaaaaaaaaaaaaa + aaaaaaaaaaaaaaaaaaaaaaaaa +\n"
-      "             aaaaaaaaaaaaaaaaaaaaaaaaa;");
-  verifyFormat(
-      "Result += aaaaaaaaaaaaaaaaaaaaaaaaa + aaaaaaaaaaaaaaaaaaaaaaaaa +\n"
-      "          aaaaaaaaaaaaaaaaaaaaaaaaa;");
-  verifyFormat(
-      "Result >>= aaaaaaaaaaaaaaaaaaaaaaaaa + aaaaaaaaaaaaaaaaaaaaaaaaa +\n"
-      "           aaaaaaaaaaaaaaaaaaaaaaaaa;");
-  verifyFormat(
-      "int Result = (aaaaaaaaaaaaaaaaaaaaaaaaa + aaaaaaaaaaaaaaaaaaaaaaaaa +\n"
-      "              aaaaaaaaaaaaaaaaaaaaaaaaa);");
-  verifyFormat(
-      "double LooooooooooooooooooooooooongResult = aaaaaaaaaaaaaaaaaaaaaaaa +\n"
-      "                                            aaaaaaaaaaaaaaaaaaaaaaaa +\n"
-      "                                            aaaaaaaaaaaaaaaaaaaaaaaa;");
-}
-
-TEST_F(FormatTest, AlignsAfterReturn) {
-  verifyFormat(
-      "return aaaaaaaaaaaaaaaaaaaaaaaaa + aaaaaaaaaaaaaaaaaaaaaaaaa +\n"
-      "       aaaaaaaaaaaaaaaaaaaaaaaaa;");
-  verifyFormat(
-      "return (aaaaaaaaaaaaaaaaaaaaaaaaa + aaaaaaaaaaaaaaaaaaaaaaaaa +\n"
-      "        aaaaaaaaaaaaaaaaaaaaaaaaa);");
-  verifyFormat(
-      "return aaaaaaaaaaaaaaaaaaaaaa + aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa >=\n"
-      "       aaaaaaaaaaaaaaaaaaaaaa();");
-  verifyFormat(
-      "return (aaaaaaaaaaaaaaaaaaaaaa + aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa >=\n"
-      "        aaaaaaaaaaaaaaaaaaaaaa());");
-  verifyFormat("return aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(\n"
-               "    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa);");
-  verifyFormat("return aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(\n"
-               "           aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa) &&\n"
-               "       aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa;");
-  verifyFormat("return\n"
-               "    // true if code is one of a or b.\n"
-               "    code == a || code == b;");
-}
-
-TEST_F(FormatTest, AlignsAfterOpenBracket) {
-  verifyFormat(
-      "void aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(aaaaaaaaaaa aaaaaaaa,\n"
-      "                                                aaaaaaaaa aaaaaaa) {}");
-  verifyFormat(
-      "SomeLongVariableName->someVeryLongFunctionName(aaaaaaaaaaa aaaaaaaaa,\n"
-      "                                               aaaaaaaaaaa aaaaaaaaa);");
-  verifyFormat(
-      "SomeLongVariableName->someFunction(foooooooo(aaaaaaaaaaaaaaa,\n"
-      "                                             aaaaaaaaaaaaaaaaaaaaa));");
-  FormatStyle Style = getLLVMStyle();
-  Style.AlignAfterOpenBracket = FormatStyle::BAS_DontAlign;
-  verifyFormat("void aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(\n"
-               "    aaaaaaaaaaa aaaaaaaa, aaaaaaaaa aaaaaaa) {}",
-               Style);
-  verifyFormat("SomeLongVariableName->someVeryLongFunctionName(\n"
-               "    aaaaaaaaaaa aaaaaaaaa, aaaaaaaaaaa aaaaaaaaa);",
-               Style);
-  verifyFormat("SomeLongVariableName->someFunction(\n"
-               "    foooooooo(aaaaaaaaaaaaaaa, aaaaaaaaaaaaaaaaaaaaa));",
-               Style);
-  verifyFormat(
-      "void aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(aaaaaaaaaaa aaaaaaaa,\n"
-      "    aaaaaaaaa aaaaaaa, aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa) {}",
-      Style);
-  verifyFormat(
-      "SomeLongVariableName->someVeryLongFunctionName(aaaaaaaaaaa aaaaaaaaa,\n"
-      "    aaaaaaaaaaa aaaaaaaaa, aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa);",
-      Style);
-  verifyFormat(
-      "SomeLongVariableName->someFunction(foooooooo(aaaaaaaaaaaaaaa,\n"
-      "    aaaaaaaaaaaaaaaaaaaaa, aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa));",
-      Style);
-
-  verifyFormat("bbbbbbbbbbbb(aaaaaaaaaaaaaaaaaaaaaaaa, //\n"
-               "    ccccccc(aaaaaaaaaaaaaaaaa,         //\n"
-               "        b));",
-               Style);
-
-  Style.AlignAfterOpenBracket = FormatStyle::BAS_AlwaysBreak;
-  Style.BinPackArguments = false;
-  Style.BinPackParameters = false;
-  verifyFormat("void aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(\n"
-               "    aaaaaaaaaaa aaaaaaaa,\n"
-               "    aaaaaaaaa aaaaaaa,\n"
-               "    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa) {}",
-               Style);
-  verifyFormat("SomeLongVariableName->someVeryLongFunctionName(\n"
-               "    aaaaaaaaaaa aaaaaaaaa,\n"
-               "    aaaaaaaaaaa aaaaaaaaa,\n"
-               "    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa);",
-               Style);
-  verifyFormat("SomeLongVariableName->someFunction(foooooooo(\n"
-               "    aaaaaaaaaaaaaaa,\n"
-               "    aaaaaaaaaaaaaaaaaaaaa,\n"
-               "    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa));",
-               Style);
-  verifyFormat(
-      "aaaaaaaaaaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaaaaaaaa(\n"
-      "    aaaaaaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaaaa, aaaaaaaaaaaaaaaa)));",
-      Style);
-  verifyFormat(
-      "aaaaaaaaaaaaaaaaaaaaaaaa(aaaaaaaaaa.aaaaaaaaaa(\n"
-      "    aaaaaaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaaaa, aaaaaaaaaaaaaaaa)));",
-      Style);
-  verifyFormat(
-      "aaaaaaaaaaaaaaaaaaaaaaaa(\n"
-      "    aaaaaaaaaaaaaaaaaaaaa(\n"
-      "        aaaaaaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaaaa, aaaaaaaaaaaaaaaa)),\n"
-      "    aaaaaaaaaaaaaaaa);",
-      Style);
-  verifyFormat(
-      "aaaaaaaaaaaaaaaaaaaaaaaa(\n"
-      "    aaaaaaaaaaaaaaaaaaaaa(\n"
-      "        aaaaaaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaaaa, aaaaaaaaaaaaaaaa)) &&\n"
-      "    aaaaaaaaaaaaaaaa);",
-      Style);
-}
-
-TEST_F(FormatTest, ParenthesesAndOperandAlignment) {
-  FormatStyle Style = getLLVMStyleWithColumns(40);
-  verifyFormat("int a = f(aaaaaaaaaaaaaaaaaaaaaa &&\n"
-               "          bbbbbbbbbbbbbbbbbbbbbb);",
-               Style);
-  Style.AlignAfterOpenBracket = FormatStyle::BAS_Align;
-  Style.AlignOperands = FormatStyle::OAS_DontAlign;
-  verifyFormat("int a = f(aaaaaaaaaaaaaaaaaaaaaa &&\n"
-               "          bbbbbbbbbbbbbbbbbbbbbb);",
-               Style);
-  Style.AlignAfterOpenBracket = FormatStyle::BAS_DontAlign;
-  Style.AlignOperands = FormatStyle::OAS_Align;
-  verifyFormat("int a = f(aaaaaaaaaaaaaaaaaaaaaa &&\n"
-               "          bbbbbbbbbbbbbbbbbbbbbb);",
-               Style);
-  Style.AlignAfterOpenBracket = FormatStyle::BAS_DontAlign;
-  Style.AlignOperands = FormatStyle::OAS_DontAlign;
-  verifyFormat("int a = f(aaaaaaaaaaaaaaaaaaaaaa &&\n"
-               "    bbbbbbbbbbbbbbbbbbbbbb);",
-               Style);
-}
-
-TEST_F(FormatTest, BreaksConditionalExpressions) {
-  verifyFormat(
-      "aaaa(aaaaaaaaaaaaaaaaaaaa, aaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-      "                               ? aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-      "                               : aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa);");
-  verifyFormat(
-      "aaaa(aaaaaaaaaa, aaaaaaaa,\n"
-      "     aaaaaaaaaaaaaaaaaaaaaaaaaa ? aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-      "                                : aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa);");
-  verifyFormat(
-      "aaaa(aaaaaaaaaaaaaaaaaaaa, aaaaaaa ? aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-      "                                   : aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa);");
-  verifyFormat("aaaa(aaaaaaaaa, aaaaaaaaa,\n"
-               "     aaaaaaa ? aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-               "             : aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa);");
-  verifyFormat(
-      "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaaaaaaa ? aaaa(aaaaaa)\n"
-      "                                                    : aaaaaaaaaaaaa);");
-  verifyFormat(
-      "aaaaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaaaaaaaaaaaa,\n"
-      "                   aaaaaaaaaaaaaaaa ? aaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-      "                                    : aaaaaaaaaaaaaaaaaaaaaaaaaaaa,\n"
-      "                   aaaaaaaaaaaaa);");
-  verifyFormat(
-      "aaaaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaaaaaaaaaaaa,\n"
-      "                   aaaaaaaaaaaaaaaa ?: aaaaaaaaaaaaaaaaaaaaaaaaaaaa,\n"
-      "                   aaaaaaaaaaaaa);");
-  verifyFormat("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-               "    ? aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(\n"
-               "          aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa)\n"
-               "    : aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(\n"
-               "          aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa);");
-  verifyFormat("aaaaaa(aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,\n"
-               "       aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-               "           ? aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(\n"
-               "                 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa)\n"
-               "           : aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(\n"
-               "                 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa),\n"
-               "       aaaaaaaaaaaaaaaaaaaaaaaaaaa);");
-  verifyFormat("aaaaaa(aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,\n"
-               "       aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-               "           ?: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(\n"
-               "                  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa),\n"
-               "       aaaaaaaaaaaaaaaaaaaaaaaaaaa);");
-  verifyFormat("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-               "    ? aaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-               "    : aaaaaaaaaaaaaaaaaaaaaaaaaaa;");
-  verifyFormat("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaa =\n"
-               "    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-               "        ? aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-               "        : aaaaaaaaaaaaaaaa;");
-  verifyFormat(
-      "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa == aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-      "    ? aaaaaaaaaaaaaaa\n"
-      "    : aaaaaaaaaaaaaaa;");
-  verifyFormat("f(aaaaaaaaaaaaaaaa == // force break\n"
-               "          aaaaaaaaa\n"
-               "      ? b\n"
-               "      : c);");
-  verifyFormat("return aaaa == bbbb\n"
-               "           // comment\n"
-               "           ? aaaa\n"
-               "           : bbbb;");
-  verifyFormat("unsigned Indent =\n"
-               "    format(TheLine.First,\n"
-               "           IndentForLevel[TheLine.Level] >= 0\n"
-               "               ? IndentForLevel[TheLine.Level]\n"
-               "               : TheLine * 2,\n"
-               "           TheLine.InPPDirective, PreviousEndOfLineColumn);",
-               getLLVMStyleWithColumns(60));
-  verifyFormat("bool aaaaaa = aaaaaaaaaaaaa //\n"
-               "                  ? aaaaaaaaaaaaaaa\n"
-               "                  : bbbbbbbbbbbbbbb //\n"
-               "                        ? ccccccccccccccc\n"
-               "                        : ddddddddddddddd;");
-  verifyFormat("bool aaaaaa = aaaaaaaaaaaaa //\n"
-               "                  ? aaaaaaaaaaaaaaa\n"
-               "                  : (bbbbbbbbbbbbbbb //\n"
-               "                         ? ccccccccccccccc\n"
-               "                         : ddddddddddddddd);");
-  verifyFormat(
-      "int aaaaaaaaaaaaaaaaaaaaaaaaaaa = aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-      "                                      ? aaaaaaaaaaaaaaaaaaaaaaaaa +\n"
-      "                                            aaaaaaaaaaaaaaaaaaaaa +\n"
-      "                                            aaaaaaaaaaaaaaaaaaaaa\n"
-      "                                      : aaaaaaaaaa;");
-  verifyFormat(
-      "aaaaaa = aaaaaaaaaaaa ? aaaaaaaaaa ? aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-      "                                   : aaaaaaaaaaaaaaaaaaaaaa\n"
-      "                      : aaaaaaaaaaaaaaaaaaaaaaaaaaaa;");
-
-  FormatStyle NoBinPacking = getLLVMStyle();
-  NoBinPacking.BinPackArguments = false;
-  verifyFormat(
-      "void f() {\n"
-      "  g(aaa,\n"
-      "    aaaaaaaaaa == aaaaaaaaaa ? aaaa : aaaaa,\n"
-      "    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa == aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-      "        ? aaaaaaaaaaaaaaa\n"
-      "        : aaaaaaaaaaaaaaa);\n"
-      "}",
-      NoBinPacking);
-  verifyFormat(
-      "void f() {\n"
-      "  g(aaa,\n"
-      "    aaaaaaaaaa == aaaaaaaaaa ? aaaa : aaaaa,\n"
-      "    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa == aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-      "        ?: aaaaaaaaaaaaaaa);\n"
-      "}",
-      NoBinPacking);
-
-  verifyFormat("SomeFunction(aaaaaaaaaaaaaaaaa,\n"
-               "             // comment.\n"
-               "             ccccccccccccccccccccccccccccccccccccccc\n"
-               "                 ? aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-               "                 : bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb);");
-
-  // Assignments in conditional expressions. Apparently not uncommon :-(.
-  verifyFormat("return a != b\n"
-               "           // comment\n"
-               "           ? a = b\n"
-               "           : a = b;");
-  verifyFormat("return a != b\n"
-               "           // comment\n"
-               "           ? a = a != b\n"
-               "                     // comment\n"
-               "                     ? a = b\n"
-               "                     : a\n"
-               "           : a;\n");
-  verifyFormat("return a != b\n"
-               "           // comment\n"
-               "           ? a\n"
-               "           : a = a != b\n"
-               "                     // comment\n"
-               "                     ? a = b\n"
-               "                     : a;");
-
-  // Chained conditionals
-  FormatStyle Style = getLLVMStyle();
-  Style.ColumnLimit = 70;
-  Style.AlignOperands = FormatStyle::OAS_Align;
-  verifyFormat("return aaaaaaaaaaaaaaaa ? 1111111111111111\n"
-               "       : bbbbbbbbbbbbbb ? 2222222222222222\n"
-               "                        : 3333333333333333;",
-               Style);
-  verifyFormat("return aaaaaaaaaaaaaaaa ? 1111111111111111\n"
-               "       : bbbbbbbbbb     ? 2222222222222222\n"
-               "                        : 3333333333333333;",
-               Style);
-  verifyFormat("return aaaaaaaaaa         ? 1111111111111111\n"
-               "       : bbbbbbbbbbbbbbbb ? 2222222222222222\n"
-               "                          : 3333333333333333;",
-               Style);
-  verifyFormat("return aaaaaaaaaaaaaaaa ? 1111111111111111\n"
-               "       : bbbbbbbbbbbbbb ? 222222\n"
-               "                        : 333333;",
-               Style);
-  verifyFormat("return aaaaaaaaaaaaaaaa ? 1111111111111111\n"
-               "       : bbbbbbbbbbbbbb ? 2222222222222222\n"
-               "       : cccccccccccccc ? 3333333333333333\n"
-               "                        : 4444444444444444;",
-               Style);
-  verifyFormat("return aaaaaaaaaaaaaaaa ? (aaa ? bbb : ccc)\n"
-               "       : bbbbbbbbbbbbbb ? 2222222222222222\n"
-               "                        : 3333333333333333;",
-               Style);
-  verifyFormat("return aaaaaaaaaaaaaaaa ? 1111111111111111\n"
-               "       : bbbbbbbbbbbbbb ? 2222222222222222\n"
-               "                        : (aaa ? bbb : ccc);",
-               Style);
-  verifyFormat(
-      "return aaaaaaaaaaaaaaaa ? (aaaaaaaaaaaaaaaaa ? bbbbbbbbbbbbbbbbbb\n"
-      "                                             : cccccccccccccccccc)\n"
-      "       : bbbbbbbbbbbbbb ? 2222222222222222\n"
-      "                        : 3333333333333333;",
-      Style);
-  verifyFormat(
-      "return aaaaaaaaa        ? (aaaaaaaaaaaaaaaaa ? bbbbbbbbbbbbbbbbbb\n"
-      "                                             : cccccccccccccccccc)\n"
-      "       : bbbbbbbbbbbbbb ? 2222222222222222\n"
-      "                        : 3333333333333333;",
-      Style);
-  verifyFormat(
-      "return aaaaaaaaa        ? a = (aaaaaaaaaaaaa ? bbbbbbbbbbbbbbbbbb\n"
-      "                                             : dddddddddddddddddd)\n"
-      "       : bbbbbbbbbbbbbb ? 2222222222222222\n"
-      "                        : 3333333333333333;",
-      Style);
-  verifyFormat(
-      "return aaaaaaaaa        ? a + (aaaaaaaaaaaaa ? bbbbbbbbbbbbbbbbbb\n"
-      "                                             : dddddddddddddddddd)\n"
-      "       : bbbbbbbbbbbbbb ? 2222222222222222\n"
-      "                        : 3333333333333333;",
-      Style);
-  verifyFormat(
-      "return aaaaaaaaa        ? 1111111111111111\n"
-      "       : bbbbbbbbbbbbbb ? 2222222222222222\n"
-      "                        : a + (aaaaaaaaaaaaa ? bbbbbbbbbbbbbbbbbb\n"
-      "                                             : dddddddddddddddddd)\n",
-      Style);
-  verifyFormat(
-      "return aaaaaaaaaaaaaaaa ? 1111111111111111\n"
-      "       : bbbbbbbbbbbbbb ? 2222222222222222\n"
-      "                        : (aaaaaaaaaaaaaaaaa ? bbbbbbbbbbbbbbbbbb\n"
-      "                                             : cccccccccccccccccc);",
-      Style);
-  verifyFormat(
-      "return aaaaaaaaaaaaaaaa ? (aaaaaaaaaaaaaaaaa ? bbbbbbbbbbbbbbbbbb\n"
-      "                           : ccccccccccccccc ? dddddddddddddddddd\n"
-      "                                             : eeeeeeeeeeeeeeeeee)\n"
-      "       : bbbbbbbbbbbbbb ? 2222222222222222\n"
-      "                        : 3333333333333333;",
-      Style);
-  verifyFormat(
-      "return aaaaaaaaaaaaaaaa ? (aaaaaaaaaaaaaa    ? bbbbbbbbbbbbbbbbbb\n"
-      "                           : ccccccccccccccc ? dddddddddddddddddd\n"
-      "                                             : eeeeeeeeeeeeeeeeee)\n"
-      "       : bbbbbbbbbbbbbb ? 2222222222222222\n"
-      "                        : 3333333333333333;",
-      Style);
-  verifyFormat(
-      "return aaaaaaaaaaaaaaaa ? (aaaaaaaaaaaaaaaaa ? bbbbbbbbbbbbbbbbbb\n"
-      "                           : cccccccccccc    ? dddddddddddddddddd\n"
-      "                                             : eeeeeeeeeeeeeeeeee)\n"
-      "       : bbbbbbbbbbbbbb ? 2222222222222222\n"
-      "                        : 3333333333333333;",
-      Style);
-  verifyFormat(
-      "return aaaaaaaaaaaaaaaa ? aaaaaaaaaaaaaaaaaa ? bbbbbbbbbbbbbbbbbb\n"
-      "                                             : cccccccccccccccccc\n"
-      "       : bbbbbbbbbbbbbb ? 2222222222222222\n"
-      "                        : 3333333333333333;",
-      Style);
-  verifyFormat(
-      "return aaaaaaaaaaaaaaaa ? aaaaaaaaaaaaaaaaaa ? bbbbbbbbbbbbbbbbbb\n"
-      "                          : cccccccccccccccc ? dddddddddddddddddd\n"
-      "                                             : eeeeeeeeeeeeeeeeee\n"
-      "       : bbbbbbbbbbbbbb ? 2222222222222222\n"
-      "                        : 3333333333333333;",
-      Style);
-  verifyFormat("return aaaaaaaaaaaaaaaaaaaaa\n"
-               "           ? (aaaaaaaaaaaaaaaaaa   ? bbbbbbbbbbbbbbbbbb\n"
-               "              : cccccccccccccccccc ? dddddddddddddddddd\n"
-               "                                   : eeeeeeeeeeeeeeeeee)\n"
-               "       : bbbbbbbbbbbbbbbbbbb ? 2222222222222222\n"
-               "                             : 3333333333333333;",
-               Style);
-  verifyFormat("return aaaaaaaaaaaaaaaaaaaaaaaaa\n"
-               "           ? aaaaaaaaaaaaaaaaaa ? bbbbbbbbbbbbbbbbbb\n"
-               "             : cccccccccccccccc ? dddddddddddddddddd\n"
-               "                                : eeeeeeeeeeeeeeeeee\n"
-               "       : bbbbbbbbbbbbbbbbbbbbbbb ? 2222222222222222\n"
-               "                                 : 3333333333333333;",
-               Style);
-
-  Style.AlignOperands = FormatStyle::OAS_DontAlign;
-  Style.BreakBeforeTernaryOperators = false;
-  // FIXME: Aligning the question marks is weird given DontAlign.
-  // Consider disabling this alignment in this case. Also check whether this
-  // will render the adjustment from https://reviews.llvm.org/D82199
-  // unnecessary.
-  verifyFormat("int x = aaaaaaaaaaaaaaa ? aaaaaaaaaaaaaaaaaa :\n"
-               "    bbbb                ? cccccccccccccccccc :\n"
-               "                          ddddd;\n",
-               Style);
-
-  EXPECT_EQ(
-      "MMMMMMMMMMMMMMMMMMMMMMMMMMM = A ?\n"
-      "    /*\n"
-      "     */\n"
-      "    function() {\n"
-      "      try {\n"
-      "        return JJJJJJJJJJJJJJ(\n"
-      "            pppppppppppppppppppppppppppppppppppppppppppppppppp);\n"
-      "      }\n"
-      "    } :\n"
-      "    function() {};",
-      format(
-          "MMMMMMMMMMMMMMMMMMMMMMMMMMM = A ?\n"
-          "     /*\n"
-          "      */\n"
-          "     function() {\n"
-          "      try {\n"
-          "        return JJJJJJJJJJJJJJ(\n"
-          "            pppppppppppppppppppppppppppppppppppppppppppppppppp);\n"
-          "      }\n"
-          "    } :\n"
-          "    function() {};",
-          getGoogleStyle(FormatStyle::LK_JavaScript)));
-}
-
-TEST_F(FormatTest, BreaksConditionalExpressionsAfterOperator) {
-  FormatStyle Style = getLLVMStyle();
-  Style.BreakBeforeTernaryOperators = false;
-  Style.ColumnLimit = 70;
-  verifyFormat(
-      "aaaa(aaaaaaaaaaaaaaaaaaaa, aaaaaaaaaaaaaaaaaaaaaaaaaa ?\n"
-      "                               aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa :\n"
-      "                               aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa);",
-      Style);
-  verifyFormat(
-      "aaaa(aaaaaaaaaa, aaaaaaaa,\n"
-      "     aaaaaaaaaaaaaaaaaaaaaaaaaa ? aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa :\n"
-      "                                  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa);",
-      Style);
-  verifyFormat(
-      "aaaa(aaaaaaaaaaaaaaaaaaaa, aaaaaaa ? aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa :\n"
-      "                                     aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa);",
-      Style);
-  verifyFormat("aaaa(aaaaaaaa, aaaaaaaaaa,\n"
-               "     aaaaaaa ? aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa :\n"
-               "               aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa);",
-               Style);
-  verifyFormat(
-      "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaaaaaaa ? aaaa(aaaaaa) :\n"
-      "                                                      aaaaaaaaaaaaa);",
-      Style);
-  verifyFormat(
-      "aaaaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaaaaaaaaaaaa,\n"
-      "                   aaaaaaaaaaaaaaaa ? aaaaaaaaaaaaaaaaaaaaaaaaaaaaa :\n"
-      "                                      aaaaaaaaaaaaaaaaaaaaaaaaaaaa,\n"
-      "                   aaaaaaaaaaaaa);",
-      Style);
-  verifyFormat(
-      "aaaaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaaaaaaaaaaaa,\n"
-      "                   aaaaaaaaaaaaaaaa ?: aaaaaaaaaaaaaaaaaaaaaaaaaaaa,\n"
-      "                   aaaaaaaaaaaaa);",
-      Style);
-  verifyFormat("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa ?\n"
-               "    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(\n"
-               "        aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa) :\n"
-               "    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(\n"
-               "        aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa);",
-               Style);
-  verifyFormat("aaaaaa(aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,\n"
-               "       aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa ?\n"
-               "           aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(\n"
-               "               aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa) :\n"
-               "           aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(\n"
-               "               aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa),\n"
-               "       aaaaaaaaaaaaaaaaaaaaaaaaaaa);",
-               Style);
-  verifyFormat("aaaaaa(aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,\n"
-               "       aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa ?:\n"
-               "           aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(\n"
-               "               aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa),\n"
-               "       aaaaaaaaaaaaaaaaaaaaaaaaaaa);",
-               Style);
-  verifyFormat("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa ?\n"
-               "    aaaaaaaaaaaaaaaaaaaaaaaaaaa :\n"
-               "    aaaaaaaaaaaaaaaaaaaaaaaaaaa;",
-               Style);
-  verifyFormat("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaa =\n"
-               "    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa ?\n"
-               "        aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa :\n"
-               "        aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa;",
-               Style);
-  verifyFormat(
-      "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa == aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa ?\n"
-      "    aaaaaaaaaaaaaaa :\n"
-      "    aaaaaaaaaaaaaaa;",
-      Style);
-  verifyFormat("f(aaaaaaaaaaaaaaaa == // force break\n"
-               "          aaaaaaaaa ?\n"
-               "      b :\n"
-               "      c);",
-               Style);
-  verifyFormat("unsigned Indent =\n"
-               "    format(TheLine.First,\n"
-               "           IndentForLevel[TheLine.Level] >= 0 ?\n"
-               "               IndentForLevel[TheLine.Level] :\n"
-               "               TheLine * 2,\n"
-               "           TheLine.InPPDirective, PreviousEndOfLineColumn);",
-               Style);
-  verifyFormat("bool aaaaaa = aaaaaaaaaaaaa ? //\n"
-               "                  aaaaaaaaaaaaaaa :\n"
-               "                  bbbbbbbbbbbbbbb ? //\n"
-               "                      ccccccccccccccc :\n"
-               "                      ddddddddddddddd;",
-               Style);
-  verifyFormat("bool aaaaaa = aaaaaaaaaaaaa ? //\n"
-               "                  aaaaaaaaaaaaaaa :\n"
-               "                  (bbbbbbbbbbbbbbb ? //\n"
-               "                       ccccccccccccccc :\n"
-               "                       ddddddddddddddd);",
-               Style);
-  verifyFormat("int i = aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa ?\n"
-               "            /*bbbbbbbbbbbbbbb=*/bbbbbbbbbbbbbbbbbbbbbbbbb :\n"
-               "            ccccccccccccccccccccccccccc;",
-               Style);
-  verifyFormat("return aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa ?\n"
-               "           aaaaa :\n"
-               "           bbbbbbbbbbbbbbb + cccccccccccccccc;",
-               Style);
-
-  // Chained conditionals
-  verifyFormat("return aaaaaaaaaaaaaaaa ? 1111111111111111 :\n"
-               "       bbbbbbbbbbbbbbbb ? 2222222222222222 :\n"
-               "                          3333333333333333;",
-               Style);
-  verifyFormat("return aaaaaaaaaaaaaaaa ? 1111111111111111 :\n"
-               "       bbbbbbbbbb       ? 2222222222222222 :\n"
-               "                          3333333333333333;",
-               Style);
-  verifyFormat("return aaaaaaaaaa       ? 1111111111111111 :\n"
-               "       bbbbbbbbbbbbbbbb ? 2222222222222222 :\n"
-               "                          3333333333333333;",
-               Style);
-  verifyFormat("return aaaaaaaaaaaaaaaa ? 1111111111111111 :\n"
-               "       bbbbbbbbbbbbbbbb ? 222222 :\n"
-               "                          333333;",
-               Style);
-  verifyFormat("return aaaaaaaaaaaaaaaa ? 1111111111111111 :\n"
-               "       bbbbbbbbbbbbbbbb ? 2222222222222222 :\n"
-               "       cccccccccccccccc ? 3333333333333333 :\n"
-               "                          4444444444444444;",
-               Style);
-  verifyFormat("return aaaaaaaaaaaaaaaa ? (aaa ? bbb : ccc) :\n"
-               "       bbbbbbbbbbbbbbbb ? 2222222222222222 :\n"
-               "                          3333333333333333;",
-               Style);
-  verifyFormat("return aaaaaaaaaaaaaaaa ? 1111111111111111 :\n"
-               "       bbbbbbbbbbbbbbbb ? 2222222222222222 :\n"
-               "                          (aaa ? bbb : ccc);",
-               Style);
-  verifyFormat(
-      "return aaaaaaaaaaaaaaaa ? (aaaaaaaaaaaaaaaaa ? bbbbbbbbbbbbbbbbbb :\n"
-      "                                               cccccccccccccccccc) :\n"
-      "       bbbbbbbbbbbbbbbb ? 2222222222222222 :\n"
-      "                          3333333333333333;",
-      Style);
-  verifyFormat(
-      "return aaaaaaaaa        ? (aaaaaaaaaaaaaaaaa ? bbbbbbbbbbbbbbbbbb :\n"
-      "                                               cccccccccccccccccc) :\n"
-      "       bbbbbbbbbbbbbbbb ? 2222222222222222 :\n"
-      "                          3333333333333333;",
-      Style);
-  verifyFormat(
-      "return aaaaaaaaa        ? a = (aaaaaaaaaaaaa ? bbbbbbbbbbbbbbbbbb :\n"
-      "                                               dddddddddddddddddd) :\n"
-      "       bbbbbbbbbbbbbbbb ? 2222222222222222 :\n"
-      "                          3333333333333333;",
-      Style);
-  verifyFormat(
-      "return aaaaaaaaa        ? a + (aaaaaaaaaaaaa ? bbbbbbbbbbbbbbbbbb :\n"
-      "                                               dddddddddddddddddd) :\n"
-      "       bbbbbbbbbbbbbbbb ? 2222222222222222 :\n"
-      "                          3333333333333333;",
-      Style);
-  verifyFormat(
-      "return aaaaaaaaa        ? 1111111111111111 :\n"
-      "       bbbbbbbbbbbbbbbb ? 2222222222222222 :\n"
-      "                          a + (aaaaaaaaaaaaa ? bbbbbbbbbbbbbbbbbb :\n"
-      "                                               dddddddddddddddddd)\n",
-      Style);
-  verifyFormat(
-      "return aaaaaaaaaaaaaaaa ? 1111111111111111 :\n"
-      "       bbbbbbbbbbbbbbbb ? 2222222222222222 :\n"
-      "                          (aaaaaaaaaaaaaaaaa ? bbbbbbbbbbbbbbbbbb :\n"
-      "                                               cccccccccccccccccc);",
-      Style);
-  verifyFormat(
-      "return aaaaaaaaaaaaaaaa ? (aaaaaaaaaaaaaaaaa ? bbbbbbbbbbbbbbbbbb :\n"
-      "                           ccccccccccccccccc ? dddddddddddddddddd :\n"
-      "                                               eeeeeeeeeeeeeeeeee) :\n"
-      "       bbbbbbbbbbbbbbbb ? 2222222222222222 :\n"
-      "                          3333333333333333;",
-      Style);
-  verifyFormat(
-      "return aaaaaaaaaaaaaaaa ? (aaaaaaaaaaaaaaaaa ? bbbbbbbbbbbbbbbbbb :\n"
-      "                           ccccccccccccc     ? dddddddddddddddddd :\n"
-      "                                               eeeeeeeeeeeeeeeeee) :\n"
-      "       bbbbbbbbbbbbbbbb ? 2222222222222222 :\n"
-      "                          3333333333333333;",
-      Style);
-  verifyFormat(
-      "return aaaaaaaaaaaaaaaa ? (aaaaaaaaaaaaa     ? bbbbbbbbbbbbbbbbbb :\n"
-      "                           ccccccccccccccccc ? dddddddddddddddddd :\n"
-      "                                               eeeeeeeeeeeeeeeeee) :\n"
-      "       bbbbbbbbbbbbbbbb ? 2222222222222222 :\n"
-      "                          3333333333333333;",
-      Style);
-  verifyFormat(
-      "return aaaaaaaaaaaaaaaa ? aaaaaaaaaaaaaaaaaa ? bbbbbbbbbbbbbbbbbb :\n"
-      "                                               cccccccccccccccccc :\n"
-      "       bbbbbbbbbbbbbbbb ? 2222222222222222 :\n"
-      "                          3333333333333333;",
-      Style);
-  verifyFormat(
-      "return aaaaaaaaaaaaaaaa ? aaaaaaaaaaaaaaaaaa ? bbbbbbbbbbbbbbbbbb :\n"
-      "                          cccccccccccccccccc ? dddddddddddddddddd :\n"
-      "                                               eeeeeeeeeeeeeeeeee :\n"
-      "       bbbbbbbbbbbbbbbb ? 2222222222222222 :\n"
-      "                          3333333333333333;",
-      Style);
-  verifyFormat("return aaaaaaaaaaaaaaaaaaaaa ?\n"
-               "           (aaaaaaaaaaaaaaaaaa ? bbbbbbbbbbbbbbbbbb :\n"
-               "            cccccccccccccccccc ? dddddddddddddddddd :\n"
-               "                                 eeeeeeeeeeeeeeeeee) :\n"
-               "       bbbbbbbbbbbbbbbbbbbbb ? 2222222222222222 :\n"
-               "                               3333333333333333;",
-               Style);
-  verifyFormat("return aaaaaaaaaaaaaaaaaaaaa ?\n"
-               "           aaaaaaaaaaaaaaaaaaaa ? bbbbbbbbbbbbbbbbbb :\n"
-               "           cccccccccccccccccccc ? dddddddddddddddddd :\n"
-               "                                  eeeeeeeeeeeeeeeeee :\n"
-               "       bbbbbbbbbbbbbbbbbbbbb ? 2222222222222222 :\n"
-               "                               3333333333333333;",
-               Style);
-}
-
-TEST_F(FormatTest, DeclarationsOfMultipleVariables) {
-  verifyFormat("bool aaaaaaaaaaaaaaaaa = aaaaaa->aaaaaaaaaaaaaaaaa(),\n"
-               "     aaaaaaaaaaa = aaaaaa->aaaaaaaaaaa();");
-  verifyFormat("bool a = true, b = false;");
-
-  verifyFormat("bool aaaaaaaaaaaaaaaaaaaaaaaaa =\n"
-               "         aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaaa),\n"
-               "     bbbbbbbbbbbbbbbbbbbbbbbbb =\n"
-               "         bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb(bbbbbbbbbbbbbbbb);");
-  verifyFormat(
-      "bool aaaaaaaaaaaaaaaaaaaaa =\n"
-      "         bbbbbbbbbbbbbbbbbbbbbbbbbbbb && cccccccccccccccccccccccccccc,\n"
-      "     d = e && f;");
-  verifyFormat("aaaaaaaaa a = aaaaaaaaaaaaaaaaaaaa, b = bbbbbbbbbbbbbbbbbbbb,\n"
-               "          c = cccccccccccccccccccc, d = dddddddddddddddddddd;");
-  verifyFormat("aaaaaaaaa *a = aaaaaaaaaaaaaaaaaaa, *b = bbbbbbbbbbbbbbbbbbb,\n"
-               "          *c = ccccccccccccccccccc, *d = ddddddddddddddddddd;");
-  verifyFormat("aaaaaaaaa ***a = aaaaaaaaaaaaaaaaaaa, ***b = bbbbbbbbbbbbbbb,\n"
-               "          ***c = ccccccccccccccccccc, ***d = ddddddddddddddd;");
-
-  FormatStyle Style = getGoogleStyle();
-  Style.PointerAlignment = FormatStyle::PAS_Left;
-  Style.DerivePointerAlignment = false;
-  verifyFormat("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-               "    *aaaaaaaaaaaaaaaaaaaaaaaaaaaaa = aaaaaaaaaaaaaaaaaaa,\n"
-               "    *b = bbbbbbbbbbbbbbbbbbb;",
-               Style);
-  verifyFormat("aaaaaaaaa *a = aaaaaaaaaaaaaaaaaaa, *b = bbbbbbbbbbbbbbbbbbb,\n"
-               "          *b = bbbbbbbbbbbbbbbbbbb, *d = ddddddddddddddddddd;",
-               Style);
-  verifyFormat("vector<int*> a, b;", Style);
-  verifyFormat("for (int *p, *q; p != q; p = p->next) {\n}", Style);
-}
-
-TEST_F(FormatTest, ConditionalExpressionsInBrackets) {
-  verifyFormat("arr[foo ? bar : baz];");
-  verifyFormat("f()[foo ? bar : baz];");
-  verifyFormat("(a + b)[foo ? bar : baz];");
-  verifyFormat("arr[foo ? (4 > 5 ? 4 : 5) : 5 < 5 ? 5 : 7];");
-}
-
-TEST_F(FormatTest, AlignsStringLiterals) {
-  verifyFormat("loooooooooooooooooooooooooongFunction(\"short literal \"\n"
-               "                                      \"short literal\");");
-  verifyFormat(
-      "looooooooooooooooooooooooongFunction(\n"
-      "    \"short literal\"\n"
-      "    \"looooooooooooooooooooooooooooooooooooooooooooooooong literal\");");
-  verifyFormat("someFunction(\"Always break between multi-line\"\n"
-               "             \" string literals\",\n"
-               "             and, other, parameters);");
-  EXPECT_EQ("fun + \"1243\" /* comment */\n"
-            "      \"5678\";",
-            format("fun + \"1243\" /* comment */\n"
-                   "    \"5678\";",
-                   getLLVMStyleWithColumns(28)));
-  EXPECT_EQ(
-      "aaaaaa = \"aaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaa \"\n"
-      "         \"aaaaaaaaaaaaaaaaaaaaa\"\n"
-      "         \"aaaaaaaaaaaaaaaa\";",
-      format("aaaaaa ="
-             "\"aaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaa "
-             "aaaaaaaaaaaaaaaaaaaaa\" "
-             "\"aaaaaaaaaaaaaaaa\";"));
-  verifyFormat("a = a + \"a\"\n"
-               "        \"a\"\n"
-               "        \"a\";");
-  verifyFormat("f(\"a\", \"b\"\n"
-               "       \"c\");");
-
-  verifyFormat(
-      "#define LL_FORMAT \"ll\"\n"
-      "printf(\"aaaaa: %d, bbbbbb: %\" LL_FORMAT \"d, cccccccc: %\" LL_FORMAT\n"
-      "       \"d, ddddddddd: %\" LL_FORMAT \"d\");");
-
-  verifyFormat("#define A(X)          \\\n"
-               "  \"aaaaa\" #X \"bbbbbb\" \\\n"
-               "  \"ccccc\"",
-               getLLVMStyleWithColumns(23));
-  verifyFormat("#define A \"def\"\n"
-               "f(\"abc\" A \"ghi\"\n"
-               "  \"jkl\");");
-
-  verifyFormat("f(L\"a\"\n"
-               "  L\"b\");");
-  verifyFormat("#define A(X)            \\\n"
-               "  L\"aaaaa\" #X L\"bbbbbb\" \\\n"
-               "  L\"ccccc\"",
-               getLLVMStyleWithColumns(25));
-
-  verifyFormat("f(@\"a\"\n"
-               "  @\"b\");");
-  verifyFormat("NSString s = @\"a\"\n"
-               "             @\"b\"\n"
-               "             @\"c\";");
-  verifyFormat("NSString s = @\"a\"\n"
-               "              \"b\"\n"
-               "              \"c\";");
-}
-
-TEST_F(FormatTest, ReturnTypeBreakingStyle) {
-  FormatStyle Style = getLLVMStyle();
-  // No declarations or definitions should be moved to own line.
-  Style.AlwaysBreakAfterReturnType = FormatStyle::RTBS_None;
-  verifyFormat("class A {\n"
-               "  int f() { return 1; }\n"
-               "  int g();\n"
-               "};\n"
-               "int f() { return 1; }\n"
-               "int g();\n",
-               Style);
-
-  // All declarations and definitions should have the return type moved to its
-  // own line.
-  Style.AlwaysBreakAfterReturnType = FormatStyle::RTBS_All;
-  Style.TypenameMacros = {"LIST"};
-  verifyFormat("SomeType\n"
-               "funcdecl(LIST(uint64_t));",
-               Style);
-  verifyFormat("class E {\n"
-               "  int\n"
-               "  f() {\n"
-               "    return 1;\n"
-               "  }\n"
-               "  int\n"
-               "  g();\n"
-               "};\n"
-               "int\n"
-               "f() {\n"
-               "  return 1;\n"
-               "}\n"
-               "int\n"
-               "g();\n",
-               Style);
-
-  // Top-level definitions, and no kinds of declarations should have the
-  // return type moved to its own line.
-  Style.AlwaysBreakAfterReturnType = FormatStyle::RTBS_TopLevelDefinitions;
-  verifyFormat("class B {\n"
-               "  int f() { return 1; }\n"
-               "  int g();\n"
-               "};\n"
-               "int\n"
-               "f() {\n"
-               "  return 1;\n"
-               "}\n"
-               "int g();\n",
-               Style);
-
-  // Top-level definitions and declarations should have the return type moved
-  // to its own line.
-  Style.AlwaysBreakAfterReturnType = FormatStyle::RTBS_TopLevel;
-  verifyFormat("class C {\n"
-               "  int f() { return 1; }\n"
-               "  int g();\n"
-               "};\n"
-               "int\n"
-               "f() {\n"
-               "  return 1;\n"
-               "}\n"
-               "int\n"
-               "g();\n",
-               Style);
-
-  // All definitions should have the return type moved to its own line, but no
-  // kinds of declarations.
-  Style.AlwaysBreakAfterReturnType = FormatStyle::RTBS_AllDefinitions;
-  verifyFormat("class D {\n"
-               "  int\n"
-               "  f() {\n"
-               "    return 1;\n"
-               "  }\n"
-               "  int g();\n"
-               "};\n"
-               "int\n"
-               "f() {\n"
-               "  return 1;\n"
-               "}\n"
-               "int g();\n",
-               Style);
-  verifyFormat("const char *\n"
-               "f(void) {\n" // Break here.
-               "  return \"\";\n"
-               "}\n"
-               "const char *bar(void);\n", // No break here.
-               Style);
-  verifyFormat("template <class T>\n"
-               "T *\n"
-               "f(T &c) {\n" // Break here.
-               "  return NULL;\n"
-               "}\n"
-               "template <class T> T *f(T &c);\n", // No break here.
-               Style);
-  verifyFormat("class C {\n"
-               "  int\n"
-               "  operator+() {\n"
-               "    return 1;\n"
-               "  }\n"
-               "  int\n"
-               "  operator()() {\n"
-               "    return 1;\n"
-               "  }\n"
-               "};\n",
-               Style);
-  verifyFormat("void\n"
-               "A::operator()() {}\n"
-               "void\n"
-               "A::operator>>() {}\n"
-               "void\n"
-               "A::operator+() {}\n"
-               "void\n"
-               "A::operator*() {}\n"
-               "void\n"
-               "A::operator->() {}\n"
-               "void\n"
-               "A::operator void *() {}\n"
-               "void\n"
-               "A::operator void &() {}\n"
-               "void\n"
-               "A::operator void &&() {}\n"
-               "void\n"
-               "A::operator char *() {}\n"
-               "void\n"
-               "A::operator[]() {}\n"
-               "void\n"
-               "A::operator!() {}\n"
-               "void\n"
-               "A::operator**() {}\n"
-               "void\n"
-               "A::operator<Foo> *() {}\n"
-               "void\n"
-               "A::operator<Foo> **() {}\n"
-               "void\n"
-               "A::operator<Foo> &() {}\n"
-               "void\n"
-               "A::operator void **() {}\n",
-               Style);
-  verifyFormat("constexpr auto\n"
-               "operator()() const -> reference {}\n"
-               "constexpr auto\n"
-               "operator>>() const -> reference {}\n"
-               "constexpr auto\n"
-               "operator+() const -> reference {}\n"
-               "constexpr auto\n"
-               "operator*() const -> reference {}\n"
-               "constexpr auto\n"
-               "operator->() const -> reference {}\n"
-               "constexpr auto\n"
-               "operator++() const -> reference {}\n"
-               "constexpr auto\n"
-               "operator void *() const -> reference {}\n"
-               "constexpr auto\n"
-               "operator void **() const -> reference {}\n"
-               "constexpr auto\n"
-               "operator void *() const -> reference {}\n"
-               "constexpr auto\n"
-               "operator void &() const -> reference {}\n"
-               "constexpr auto\n"
-               "operator void &&() const -> reference {}\n"
-               "constexpr auto\n"
-               "operator char *() const -> reference {}\n"
-               "constexpr auto\n"
-               "operator!() const -> reference {}\n"
-               "constexpr auto\n"
-               "operator[]() const -> reference {}\n",
-               Style);
-  verifyFormat("void *operator new(std::size_t s);", // No break here.
-               Style);
-  verifyFormat("void *\n"
-               "operator new(std::size_t s) {}",
-               Style);
-  verifyFormat("void *\n"
-               "operator delete[](void *ptr) {}",
-               Style);
-  Style.BreakBeforeBraces = FormatStyle::BS_Stroustrup;
-  verifyFormat("const char *\n"
-               "f(void)\n" // Break here.
-               "{\n"
-               "  return \"\";\n"
-               "}\n"
-               "const char *bar(void);\n", // No break here.
-               Style);
-  verifyFormat("template <class T>\n"
-               "T *\n"     // Problem here: no line break
-               "f(T &c)\n" // Break here.
-               "{\n"
-               "  return NULL;\n"
-               "}\n"
-               "template <class T> T *f(T &c);\n", // No break here.
-               Style);
-  verifyFormat("int\n"
-               "foo(A<bool> a)\n"
-               "{\n"
-               "  return a;\n"
-               "}\n",
-               Style);
-  verifyFormat("int\n"
-               "foo(A<8> a)\n"
-               "{\n"
-               "  return a;\n"
-               "}\n",
-               Style);
-  verifyFormat("int\n"
-               "foo(A<B<bool>, 8> a)\n"
-               "{\n"
-               "  return a;\n"
-               "}\n",
-               Style);
-  verifyFormat("int\n"
-               "foo(A<B<8>, bool> a)\n"
-               "{\n"
-               "  return a;\n"
-               "}\n",
-               Style);
-  verifyFormat("int\n"
-               "foo(A<B<bool>, bool> a)\n"
-               "{\n"
-               "  return a;\n"
-               "}\n",
-               Style);
-  verifyFormat("int\n"
-               "foo(A<B<8>, 8> a)\n"
-               "{\n"
-               "  return a;\n"
-               "}\n",
-               Style);
-
-  Style.BreakBeforeBraces = FormatStyle::BS_Custom;
-  Style.BraceWrapping.AfterFunction = true;
-  verifyFormat("int f(i);\n" // No break here.
-               "int\n"       // Break here.
-               "f(i)\n"
-               "{\n"
-               "  return i + 1;\n"
-               "}\n"
-               "int\n" // Break here.
-               "f(i)\n"
-               "{\n"
-               "  return i + 1;\n"
-               "};",
-               Style);
-  verifyFormat("int f(a, b, c);\n" // No break here.
-               "int\n"             // Break here.
-               "f(a, b, c)\n"      // Break here.
-               "short a, b;\n"
-               "float c;\n"
-               "{\n"
-               "  return a + b < c;\n"
-               "}\n"
-               "int\n"        // Break here.
-               "f(a, b, c)\n" // Break here.
-               "short a, b;\n"
-               "float c;\n"
-               "{\n"
-               "  return a + b < c;\n"
-               "};",
-               Style);
-  verifyFormat("byte *\n" // Break here.
-               "f(a)\n"   // Break here.
-               "byte a[];\n"
-               "{\n"
-               "  return a;\n"
-               "}",
-               Style);
-  verifyFormat("bool f(int a, int) override;\n"
-               "Bar g(int a, Bar) final;\n"
-               "Bar h(a, Bar) final;",
-               Style);
-  verifyFormat("int\n"
-               "f(a)",
-               Style);
-  verifyFormat("bool\n"
-               "f(size_t = 0, bool b = false)\n"
-               "{\n"
-               "  return !b;\n"
-               "}",
-               Style);
-
-  // The return breaking style doesn't affect:
-  // * function and object definitions with attribute-like macros
-  verifyFormat("Tttttttttttttttttttttttt ppppppppppppppp\n"
-               "    ABSL_GUARDED_BY(mutex) = {};",
-               getGoogleStyleWithColumns(40));
-  verifyFormat("Tttttttttttttttttttttttt ppppppppppppppp\n"
-               "    ABSL_GUARDED_BY(mutex);  // comment",
-               getGoogleStyleWithColumns(40));
-  verifyFormat("Tttttttttttttttttttttttt ppppppppppppppp\n"
-               "    ABSL_GUARDED_BY(mutex1)\n"
-               "        ABSL_GUARDED_BY(mutex2);",
-               getGoogleStyleWithColumns(40));
-  verifyFormat("Tttttt f(int a, int b)\n"
-               "    ABSL_GUARDED_BY(mutex1)\n"
-               "        ABSL_GUARDED_BY(mutex2);",
-               getGoogleStyleWithColumns(40));
-  // * typedefs
-  verifyFormat("typedef ATTR(X) char x;", getGoogleStyle());
-
-  Style = getGNUStyle();
-
-  // Test for comments at the end of function declarations.
-  verifyFormat("void\n"
-               "foo (int a, /*abc*/ int b) // def\n"
-               "{\n"
-               "}\n",
-               Style);
-
-  verifyFormat("void\n"
-               "foo (int a, /* abc */ int b) /* def */\n"
-               "{\n"
-               "}\n",
-               Style);
-
-  // Definitions that should not break after return type
-  verifyFormat("void foo (int a, int b); // def\n", Style);
-  verifyFormat("void foo (int a, int b); /* def */\n", Style);
-  verifyFormat("void foo (int a, int b);\n", Style);
-}
-
-TEST_F(FormatTest, AlwaysBreakBeforeMultilineStrings) {
-  FormatStyle NoBreak = getLLVMStyle();
-  NoBreak.AlwaysBreakBeforeMultilineStrings = false;
-  FormatStyle Break = getLLVMStyle();
-  Break.AlwaysBreakBeforeMultilineStrings = true;
-  verifyFormat("aaaa = \"bbbb\"\n"
-               "       \"cccc\";",
-               NoBreak);
-  verifyFormat("aaaa =\n"
-               "    \"bbbb\"\n"
-               "    \"cccc\";",
-               Break);
-  verifyFormat("aaaa(\"bbbb\"\n"
-               "     \"cccc\");",
-               NoBreak);
-  verifyFormat("aaaa(\n"
-               "    \"bbbb\"\n"
-               "    \"cccc\");",
-               Break);
-  verifyFormat("aaaa(qqq, \"bbbb\"\n"
-               "          \"cccc\");",
-               NoBreak);
-  verifyFormat("aaaa(qqq,\n"
-               "     \"bbbb\"\n"
-               "     \"cccc\");",
-               Break);
-  verifyFormat("aaaa(qqq,\n"
-               "     L\"bbbb\"\n"
-               "     L\"cccc\");",
-               Break);
-  verifyFormat("aaaaa(aaaaaa, aaaaaaa(\"aaaa\"\n"
-               "                      \"bbbb\"));",
-               Break);
-  verifyFormat("string s = someFunction(\n"
-               "    \"abc\"\n"
-               "    \"abc\");",
-               Break);
-
-  // As we break before unary operators, breaking right after them is bad.
-  verifyFormat("string foo = abc ? \"x\"\n"
-               "                   \"blah blah blah blah blah blah\"\n"
-               "                 : \"y\";",
-               Break);
-
-  // Don't break if there is no column gain.
-  verifyFormat("f(\"aaaa\"\n"
-               "  \"bbbb\");",
-               Break);
-
-  // Treat literals with escaped newlines like multi-line string literals.
-  EXPECT_EQ("x = \"a\\\n"
-            "b\\\n"
-            "c\";",
-            format("x = \"a\\\n"
-                   "b\\\n"
-                   "c\";",
-                   NoBreak));
-  EXPECT_EQ("xxxx =\n"
-            "    \"a\\\n"
-            "b\\\n"
-            "c\";",
-            format("xxxx = \"a\\\n"
-                   "b\\\n"
-                   "c\";",
-                   Break));
-
-  EXPECT_EQ("NSString *const kString =\n"
-            "    @\"aaaa\"\n"
-            "    @\"bbbb\";",
-            format("NSString *const kString = @\"aaaa\"\n"
-                   "@\"bbbb\";",
-                   Break));
-
-  Break.ColumnLimit = 0;
-  verifyFormat("const char *hello = \"hello llvm\";", Break);
-}
-
-TEST_F(FormatTest, AlignsPipes) {
-  verifyFormat(
-      "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-      "    << aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-      "    << aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa;");
-  verifyFormat(
-      "aaaaaaaaaaaaaaaaaaaa << aaaaaaaaaaaaaaaaaaaa << aaaaaaaaaaaaaaaaaaaa\n"
-      "                     << aaaaaaaaaaaaaaaaaaaa;");
-  verifyFormat(
-      "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa << aaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-      "                                 << aaaaaaaaaaaaaaaaaaaaaaaaaaaa;");
-  verifyFormat(
-      "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa()\n"
-      "    << aaaaaaaaaaaaaaaaaaaaaaaaaaaa << aaaaaaaaaaaaaaaaaaaaaaaaaaaa;");
-  verifyFormat(
-      "llvm::outs() << \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\"\n"
-      "                \"bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb\"\n"
-      "             << \"ccccccccccccccccccccccccccccccccccccccccccccccccc\";");
-  verifyFormat(
-      "aaaaaaaa << (aaaaaaaaaaaaaaaaaaa << aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-      "                                 << aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa)\n"
-      "         << aaaaaaaaaaaaaaaaaaaaaaaaaaaaa;");
-  verifyFormat("llvm::errs() << aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(\n"
-               "                    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,\n"
-               "                    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa)\n"
-               "             << bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb;");
-  verifyFormat("llvm::errs() << \"aaaaaaaaaaaaaaaaaaaaaaa: \"\n"
-               "             << aaaaaaaaaaaaaaaaa(aaaaaaaa, aaaaaaaaaaa);");
-  verifyFormat(
-      "llvm::errs() << aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(\n"
-      "    aaaaaaaaaaaaaaaaaaaaaaaaaaaa, aaaaaaaaaaaaaaaaaaaaaaaaaaaa);");
-  verifyFormat(
-      "auto Diag = diag() << aaaaaaaaaaaaaaaa(aaaaaaaaaaaa, aaaaaaaaaaaaa,\n"
-      "                                       aaaaaaaaaaaaaaaaaaaaaaaaaa);");
-
-  verifyFormat("llvm::outs() << \"aaaaaaaaaaaaaaaa: \"\n"
-               "             << aaaaaaaa.aaaaaaaaaaaa(aaa)->aaaaaaaaaaaaaa();");
-  verifyFormat("llvm::errs() << aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(\n"
-               "                    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,\n"
-               "                    aaaaaaaaaaaaaaaaaaaaa)\n"
-               "             << aaaaaaaaaaaaaaaaaaaaaaaaaa;");
-  verifyFormat("LOG_IF(aaa == //\n"
-               "       bbb)\n"
-               "    << a << b;");
-
-  // But sometimes, breaking before the first "<<" is desirable.
-  verifyFormat("Diag(aaaaaaaaaaaaaaaaaaaa, aaaaaaaa)\n"
-               "    << aaaaaaaaaaaaaaaaaaaaaaaaa(aaaaaaaaaaaaa);");
-  verifyFormat("Diag(aaaaaaaaaaaaaaaaaaaaaaaaaaaaa, bbbbbbbbb)\n"
-               "    << aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-               "    << aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa;");
-  verifyFormat("SemaRef.Diag(Loc, diag::note_for_range_begin_end)\n"
-               "    << BEF << IsTemplate << Description << E->getType();");
-  verifyFormat("Diag(aaaaaaaaaaaaaaaaaaaa, aaaaaaaa)\n"
-               "    << aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(\n"
-               "           aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa);");
-  verifyFormat("Diag(aaaaaaaaaaaaaaaaaaaa, aaaaaaaa)\n"
-               "    << aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(\n"
-               "           aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa)\n"
-               "    << aaa;");
-
-  verifyFormat(
-      "llvm::errs() << aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-      "                    .aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa();");
-
-  // Incomplete string literal.
-  EXPECT_EQ("llvm::errs() << \"\n"
-            "             << a;",
-            format("llvm::errs() << \"\n<<a;"));
-
-  verifyFormat("void f() {\n"
-               "  CHECK_EQ(aaaa, (*bbbbbbbbb)->cccccc)\n"
-               "      << \"qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq\";\n"
-               "}");
-
-  // Handle 'endl'.
-  verifyFormat("llvm::errs() << aaaaaaaaaaaaaaaaaaaaaa << endl\n"
-               "             << bbbbbbbbbbbbbbbbbbbbbb << endl;");
-  verifyFormat("llvm::errs() << endl << bbbbbbbbbbbbbbbbbbbbbb << endl;");
-
-  // Handle '\n'.
-  verifyFormat("llvm::errs() << aaaaaaaaaaaaaaaaaaaaaa << \"\\n\"\n"
-               "             << bbbbbbbbbbbbbbbbbbbbbb << \"\\n\";");
-  verifyFormat("llvm::errs() << aaaaaaaaaaaaaaaaaaaaaa << \'\\n\'\n"
-               "             << bbbbbbbbbbbbbbbbbbbbbb << \'\\n\';");
-  verifyFormat("llvm::errs() << aaaa << \"aaaaaaaaaaaaaaaaaa\\n\"\n"
-               "             << bbbb << \"bbbbbbbbbbbbbbbbbb\\n\";");
-  verifyFormat("llvm::errs() << \"\\n\" << bbbbbbbbbbbbbbbbbbbbbb << \"\\n\";");
-}
-
-TEST_F(FormatTest, KeepStringLabelValuePairsOnALine) {
-  verifyFormat("return out << \"somepacket = {\\n\"\n"
-               "           << \" aaaaaa = \" << pkt.aaaaaa << \"\\n\"\n"
-               "           << \" bbbb = \" << pkt.bbbb << \"\\n\"\n"
-               "           << \" cccccc = \" << pkt.cccccc << \"\\n\"\n"
-               "           << \" ddd = [\" << pkt.ddd << \"]\\n\"\n"
-               "           << \"}\";");
-
-  verifyFormat("llvm::outs() << \"aaaaaaaaaaaaaaaa: \" << aaaaaaaaaaaaaaaa\n"
-               "             << \"aaaaaaaaaaaaaaaa: \" << aaaaaaaaaaaaaaaa\n"
-               "             << \"aaaaaaaaaaaaaaaa: \" << aaaaaaaaaaaaaaaa;");
-  verifyFormat(
-      "llvm::outs() << \"aaaaaaaaaaaaaaaaa = \" << aaaaaaaaaaaaaaaaa\n"
-      "             << \"bbbbbbbbbbbbbbbbb = \" << bbbbbbbbbbbbbbbbb\n"
-      "             << \"ccccccccccccccccc = \" << ccccccccccccccccc\n"
-      "             << \"ddddddddddddddddd = \" << ddddddddddddddddd\n"
-      "             << \"eeeeeeeeeeeeeeeee = \" << eeeeeeeeeeeeeeeee;");
-  verifyFormat("llvm::outs() << aaaaaaaaaaaaaaaaaaaaaaaa << \"=\"\n"
-               "             << bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb;");
-  verifyFormat(
-      "void f() {\n"
-      "  llvm::outs() << \"aaaaaaaaaaaaaaaaaaaa: \"\n"
-      "               << aaaaaaaaaaaaa(aaaaaaaaaaaaaaaaaaaaaaaaaaaa);\n"
-      "}");
-
-  // Breaking before the first "<<" is generally not desirable.
-  verifyFormat(
-      "llvm::errs()\n"
-      "    << \"aaaaaaaaaaaaaaaaaaa: \" << aaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-      "    << \"aaaaaaaaaaaaaaaaaaa: \" << aaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-      "    << \"aaaaaaaaaaaaaaaaaaa: \" << aaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-      "    << \"aaaaaaaaaaaaaaaaaaa: \" << aaaaaaaaaaaaaaaaaaaaaaaaaaaa;",
-      getLLVMStyleWithColumns(70));
-  verifyFormat("llvm::errs() << \"aaaaaaaaaaaaaaaaaaa: \"\n"
-               "             << aaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-               "             << \"aaaaaaaaaaaaaaaaaaa: \"\n"
-               "             << aaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-               "             << \"aaaaaaaaaaaaaaaaaaa: \"\n"
-               "             << aaaaaaaaaaaaaaaaaaaaaaaaaaaa;",
-               getLLVMStyleWithColumns(70));
-
-  verifyFormat("string v = \"aaaaaaaaaaaaaaaa: \" + aaaaaaaaaaaaaaaa +\n"
-               "           \"aaaaaaaaaaaaaaaa: \" + aaaaaaaaaaaaaaaa +\n"
-               "           \"aaaaaaaaaaaaaaaa: \" + aaaaaaaaaaaaaaaa;");
-  verifyFormat("string v = StrCat(\"aaaaaaaaaaaaaaaa: \", aaaaaaaaaaaaaaaa,\n"
-               "                  \"aaaaaaaaaaaaaaaa: \", aaaaaaaaaaaaaaaa,\n"
-               "                  \"aaaaaaaaaaaaaaaa: \", aaaaaaaaaaaaaaaa);");
-  verifyFormat("string v = \"aaaaaaaaaaaaaaaa: \" +\n"
-               "           (aaaa + aaaa);",
-               getLLVMStyleWithColumns(40));
-  verifyFormat("string v = StrCat(\"aaaaaaaaaaaa: \" +\n"
-               "                  (aaaaaaa + aaaaa));",
-               getLLVMStyleWithColumns(40));
-  verifyFormat(
-      "string v = StrCat(\"aaaaaaaaaaaaaaaaaaaaaaaaaaa: \",\n"
-      "                  SomeFunction(aaaaaaaaaaaa, aaaaaaaa.aaaaaaa),\n"
-      "                  bbbbbbbbbbbbbbbbbbbbbbb);");
-}
-
-TEST_F(FormatTest, UnderstandsEquals) {
-  verifyFormat(
-      "aaaaaaaaaaaaaaaaa =\n"
-      "    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa;");
-  verifyFormat(
-      "if (aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa =\n"
-      "        aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa) {\n}");
-  verifyFormat(
-      "if (a) {\n"
-      "  f();\n"
-      "} else if (aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa =\n"
-      "               aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa) {\n"
-      "}");
-
-  verifyFormat("if (int aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa =\n"
-               "        100000000 + 10000000) {\n}");
-}
-
-TEST_F(FormatTest, WrapsAtFunctionCallsIfNecessary) {
-  verifyFormat("LoooooooooooooooooooooooooooooooooooooongObject\n"
-               "    .looooooooooooooooooooooooooooooooooooooongFunction();");
-
-  verifyFormat("LoooooooooooooooooooooooooooooooooooooongObject\n"
-               "    ->looooooooooooooooooooooooooooooooooooooongFunction();");
-
-  verifyFormat(
-      "LooooooooooooooooooooooooooooooooongObject->shortFunction(Parameter1,\n"
-      "                                                          Parameter2);");
-
-  verifyFormat(
-      "ShortObject->shortFunction(\n"
-      "    LooooooooooooooooooooooooooooooooooooooooooooooongParameter1,\n"
-      "    LooooooooooooooooooooooooooooooooooooooooooooooongParameter2);");
-
-  verifyFormat("loooooooooooooongFunction(\n"
-               "    LoooooooooooooongObject->looooooooooooooooongFunction());");
-
-  verifyFormat(
-      "function(LoooooooooooooooooooooooooooooooooooongObject\n"
-      "             ->loooooooooooooooooooooooooooooooooooooooongFunction());");
-
-  verifyFormat("EXPECT_CALL(SomeObject, SomeFunction(Parameter))\n"
-               "    .WillRepeatedly(Return(SomeValue));");
-  verifyFormat("void f() {\n"
-               "  EXPECT_CALL(SomeObject, SomeFunction(Parameter))\n"
-               "      .Times(2)\n"
-               "      .WillRepeatedly(Return(SomeValue));\n"
-               "}");
-  verifyFormat("SomeMap[std::pair(aaaaaaaaaaaa, bbbbbbbbbbbbbbb)].insert(\n"
-               "    ccccccccccccccccccccccc);");
-  verifyFormat("aaaaa(aaaaa(aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,\n"
-               "            aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa)\n"
-               "          .aaaaa(aaaaa),\n"
-               "      aaaaaaaaaaaaaaaaaaaaa);");
-  verifyFormat("void f() {\n"
-               "  aaaaaaaaaaaaaaaaaaaaaaaaa(\n"
-               "      aaaaaaaaaaaaa(aaaaaaaaaaaaaaaaaaaaaaaaa)->aaaaaaaaa());\n"
-               "}");
-  verifyFormat("aaaaa(aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,\n"
-               "      aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa)\n"
-               "    .aaaaaaaaaaaaaaa(aa(aaaaaaaaaaaaaaaaaaaaaaaaaaa,\n"
-               "                        aaaaaaaaaaaaaaaaaaaaaaaaaaa,\n"
-               "                        aaaaaaaaaaaaaaaaaaaaaaaaaaa));");
-  verifyFormat("if (aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-               "        .aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-               "        .aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-               "        .aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa()) {\n"
-               "}");
-
-  // Here, it is not necessary to wrap at "." or "->".
-  verifyFormat("if (aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(aaaaaaaaaaaa) ||\n"
-               "    aaaa.aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa) {\n}");
-  verifyFormat(
-      "aaaaaaaaaaa->aaaaaaaaa(\n"
-      "    aaaaaaaaaaaaaaaaaaaaaaaaa,\n"
-      "    aaaaaaaaaaaaaaaaaa->aaaaaaaaa(aaaaaaaaaaaaaaaaaaaaaaaaa));\n");
-
-  verifyFormat(
-      "aaaaaaaaaaaaaaaaaaaaaaaaa(\n"
-      "    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa().aaaaaaaaaaaaaaaaa());");
-  verifyFormat("a->aaaaaa()->aaaaaaaaaaa(aaaaaaaa()->aaaaaa()->aaaaa() *\n"
-               "                         aaaaaaaaa()->aaaaaa()->aaaaa());");
-  verifyFormat("a->aaaaaa()->aaaaaaaaaaa(aaaaaaaa()->aaaaaa()->aaaaa() ||\n"
-               "                         aaaaaaaaa()->aaaaaa()->aaaaa());");
-
-  verifyFormat("aaaaa(aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,\n"
-               "      aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa)\n"
-               "    .a();");
-
-  FormatStyle NoBinPacking = getLLVMStyle();
-  NoBinPacking.BinPackParameters = false;
-  verifyFormat("aaaaaaaaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaaaaaaaa)\n"
-               "    .aaaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaaaaaaaa)\n"
-               "    .aaaaaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaaaaaa,\n"
-               "                         aaaaaaaaaaaaaaaaaaa,\n"
-               "                         aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa);",
-               NoBinPacking);
-
-  // If there is a subsequent call, change to hanging indentation.
-  verifyFormat(
-      "aaaaaaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(\n"
-      "                         aaaaaaaaaaaaaaaaaa, aaaaaaaaaaaaaaaaa))\n"
-      "    .aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa();");
-  verifyFormat(
-      "aaaaaaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(\n"
-      "    aaaaaaaaaaaaaaaaaa, aaaaaaaaaaaaaaaaa));");
-  verifyFormat("aaaaaaaaaa = aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(\n"
-               "                 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa)\n"
-               "                 .aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa();");
-  verifyFormat("aaaaaaaaaa(aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(\n"
-               "               aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa)\n"
-               "               .aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa());");
-}
-
-TEST_F(FormatTest, WrapsTemplateDeclarations) {
-  verifyFormat("template <typename T>\n"
-               "virtual void loooooooooooongFunction(int Param1, int Param2);");
-  verifyFormat("template <typename T>\n"
-               "// T should be one of {A, B}.\n"
-               "virtual void loooooooooooongFunction(int Param1, int Param2);");
-  verifyFormat(
-      "template <typename T>\n"
-      "using comment_to_xml_conversion = comment_to_xml_conversion<T, int>;");
-  verifyFormat("template <typename T>\n"
-               "void f(int Paaaaaaaaaaaaaaaaaaaaaaaaaaaaaaram1,\n"
-               "       int Paaaaaaaaaaaaaaaaaaaaaaaaaaaaaaram2);");
-  verifyFormat(
-      "template <typename T>\n"
-      "void looooooooooooooooooooongFunction(int Paaaaaaaaaaaaaaaaaaaaram1,\n"
-      "                                      int Paaaaaaaaaaaaaaaaaaaaram2);");
-  verifyFormat(
-      "template <typename T>\n"
-      "aaaaaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaaaaa,\n"
-      "                    aaaaaaaaaaaaaaaaaaaaaaaaaa<T>::aaaaaaaaaa,\n"
-      "                    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa);");
-  verifyFormat("template <typename T>\n"
-               "void aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(\n"
-               "    int aaaaaaaaaaaaaaaaaaaaaa);");
-  verifyFormat(
-      "template <typename T1, typename T2 = char, typename T3 = char,\n"
-      "          typename T4 = char>\n"
-      "void f();");
-  verifyFormat("template <typename aaaaaaaaaaa, typename bbbbbbbbbbbbb,\n"
-               "          template <typename> class cccccccccccccccccccccc,\n"
-               "          typename ddddddddddddd>\n"
-               "class C {};");
-  verifyFormat(
-      "aaaaaaaaaaaaaaaaaaaaaaaa<aaaaaaaaaaaaaaaaa, aaaaaaaaaaaaaaaaa>(\n"
-      "    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa);");
-
-  verifyFormat("void f() {\n"
-               "  a<aaaaaaaaaaaaaaaaaaaaa, aaaaaaaaaaaaaaaaaaa>(\n"
-               "      a(aaaaaaaaaaaaaaaaaa, aaaaaaaaaaaaaaaa));\n"
-               "}");
-
-  verifyFormat("template <typename T> class C {};");
-  verifyFormat("template <typename T> void f();");
-  verifyFormat("template <typename T> void f() {}");
-  verifyFormat(
-      "aaaaaaaaaaaaa<aaaaaaaaaa, aaaaaaaaaaa,\n"
-      "              aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,\n"
-      "              aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa> *aaaa =\n"
-      "    new aaaaaaaaaaaaa<aaaaaaaaaa, aaaaaaaaaaa,\n"
-      "                      aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,\n"
-      "                      aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa>(\n"
-      "        bbbbbbbbbbbbbbbbbbbbbbbb);",
-      getLLVMStyleWithColumns(72));
-  EXPECT_EQ("static_cast<A< //\n"
-            "    B> *>(\n"
-            "\n"
-            ");",
-            format("static_cast<A<//\n"
-                   "    B>*>(\n"
-                   "\n"
-                   "    );"));
-  verifyFormat("int aaaaaaaaaaaaaaaaaaaaaaaaaaaaa(\n"
-               "    const typename aaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaa);");
-
-  FormatStyle AlwaysBreak = getLLVMStyle();
-  AlwaysBreak.AlwaysBreakTemplateDeclarations = FormatStyle::BTDS_Yes;
-  verifyFormat("template <typename T>\nclass C {};", AlwaysBreak);
-  verifyFormat("template <typename T>\nvoid f();", AlwaysBreak);
-  verifyFormat("template <typename T>\nvoid f() {}", AlwaysBreak);
-  verifyFormat("void aaaaaaaaaaaaaaaaaaa<aaaaaaaaaaaaaaaaaaaaaaaaaaaaa,\n"
-               "                         bbbbbbbbbbbbbbbbbbbbbbbbbbbb>(\n"
-               "    ccccccccccccccccccccccccccccccccccccccccccccccc);");
-  verifyFormat("template <template <typename> class Fooooooo,\n"
-               "          template <typename> class Baaaaaaar>\n"
-               "struct C {};",
-               AlwaysBreak);
-  verifyFormat("template <typename T> // T can be A, B or C.\n"
-               "struct C {};",
-               AlwaysBreak);
-  verifyFormat("template <enum E> class A {\n"
-               "public:\n"
-               "  E *f();\n"
-               "};");
-
-  FormatStyle NeverBreak = getLLVMStyle();
-  NeverBreak.AlwaysBreakTemplateDeclarations = FormatStyle::BTDS_No;
-  verifyFormat("template <typename T> class C {};", NeverBreak);
-  verifyFormat("template <typename T> void f();", NeverBreak);
-  verifyFormat("template <typename T> void f() {}", NeverBreak);
-  verifyFormat("template <typename T>\nvoid foo(aaaaaaaaaaaaaaaaaaaaaaaaaa "
-               "bbbbbbbbbbbbbbbbbbbb) {}",
-               NeverBreak);
-  verifyFormat("void aaaaaaaaaaaaaaaaaaa<aaaaaaaaaaaaaaaaaaaaaaaaaaaaa,\n"
-               "                         bbbbbbbbbbbbbbbbbbbbbbbbbbbb>(\n"
-               "    ccccccccccccccccccccccccccccccccccccccccccccccc);",
-               NeverBreak);
-  verifyFormat("template <template <typename> class Fooooooo,\n"
-               "          template <typename> class Baaaaaaar>\n"
-               "struct C {};",
-               NeverBreak);
-  verifyFormat("template <typename T> // T can be A, B or C.\n"
-               "struct C {};",
-               NeverBreak);
-  verifyFormat("template <enum E> class A {\n"
-               "public:\n"
-               "  E *f();\n"
-               "};",
-               NeverBreak);
-  NeverBreak.PenaltyBreakTemplateDeclaration = 100;
-  verifyFormat("template <typename T> void\nfoo(aaaaaaaaaaaaaaaaaaaaaaaaaa "
-               "bbbbbbbbbbbbbbbbbbbb) {}",
-               NeverBreak);
-}
-
-TEST_F(FormatTest, WrapsTemplateDeclarationsWithComments) {
-  FormatStyle Style = getGoogleStyle(FormatStyle::LK_Cpp);
-  Style.ColumnLimit = 60;
-  EXPECT_EQ("// Baseline - no comments.\n"
-            "template <\n"
-            "    typename aaaaaaaaaaaaaaaaaaaaaa<bbbbbbbbbbbb>::value>\n"
-            "void f() {}",
-            format("// Baseline - no comments.\n"
-                   "template <\n"
-                   "    typename aaaaaaaaaaaaaaaaaaaaaa<bbbbbbbbbbbb>::value>\n"
-                   "void f() {}",
-                   Style));
-
-  EXPECT_EQ("template <\n"
-            "    typename aaaaaaaaaa<bbbbbbbbbbbb>::value>  // trailing\n"
-            "void f() {}",
-            format("template <\n"
-                   "    typename aaaaaaaaaa<bbbbbbbbbbbb>::value> // trailing\n"
-                   "void f() {}",
-                   Style));
-
-  EXPECT_EQ(
-      "template <\n"
-      "    typename aaaaaaaaaa<bbbbbbbbbbbb>::value> /* line */\n"
-      "void f() {}",
-      format("template <typename aaaaaaaaaa<bbbbbbbbbbbb>::value>  /* line */\n"
-             "void f() {}",
-             Style));
-
-  EXPECT_EQ(
-      "template <\n"
-      "    typename aaaaaaaaaa<bbbbbbbbbbbb>::value>  // trailing\n"
-      "                                               // multiline\n"
-      "void f() {}",
-      format("template <\n"
-             "    typename aaaaaaaaaa<bbbbbbbbbbbb>::value> // trailing\n"
-             "                                              // multiline\n"
-             "void f() {}",
-             Style));
-
-  EXPECT_EQ(
-      "template <typename aaaaaaaaaa<\n"
-      "    bbbbbbbbbbbb>::value>  // trailing loooong\n"
-      "void f() {}",
-      format(
-          "template <\n"
-          "    typename aaaaaaaaaa<bbbbbbbbbbbb>::value> // trailing loooong\n"
-          "void f() {}",
-          Style));
-}
-
-TEST_F(FormatTest, WrapsTemplateParameters) {
-  FormatStyle Style = getLLVMStyle();
-  Style.AlignAfterOpenBracket = FormatStyle::BAS_DontAlign;
-  Style.BreakBeforeBinaryOperators = FormatStyle::BOS_None;
-  verifyFormat(
-      "template <typename... a> struct q {};\n"
-      "extern q<aaaaaaaaaaaaaaaaa, aaaaaaaaaaaaaaaaa, aaaaaaaaaaaaaaaaa,\n"
-      "    aaaaaaaaaaaaaaaaa, aaaaaaaaaaaaaaaaa, aaaaaaaaaaaaaaaaa>\n"
-      "    y;",
-      Style);
-  Style.AlignAfterOpenBracket = FormatStyle::BAS_DontAlign;
-  Style.BreakBeforeBinaryOperators = FormatStyle::BOS_All;
-  verifyFormat(
-      "template <typename... a> struct r {};\n"
-      "extern r<aaaaaaaaaaaaaaaaa, aaaaaaaaaaaaaaaaa, aaaaaaaaaaaaaaaaa,\n"
-      "    aaaaaaaaaaaaaaaaa, aaaaaaaaaaaaaaaaa, aaaaaaaaaaaaaaaaa>\n"
-      "    y;",
-      Style);
-  Style.AlignAfterOpenBracket = FormatStyle::BAS_AlwaysBreak;
-  Style.BreakBeforeBinaryOperators = FormatStyle::BOS_None;
-  verifyFormat("template <typename... a> struct s {};\n"
-               "extern s<\n"
-               "    aaaaaaaaaaaaaaaaaaaaaa, aaaaaaaaaaaaaaaaaaaaaa, "
-               "aaaaaaaaaaaaaaaaaaaaaa,\n"
-               "    aaaaaaaaaaaaaaaaaaaaaa, aaaaaaaaaaaaaaaaaaaaaa, "
-               "aaaaaaaaaaaaaaaaaaaaaa>\n"
-               "    y;",
-               Style);
-  Style.AlignAfterOpenBracket = FormatStyle::BAS_AlwaysBreak;
-  Style.BreakBeforeBinaryOperators = FormatStyle::BOS_All;
-  verifyFormat("template <typename... a> struct t {};\n"
-               "extern t<\n"
-               "    aaaaaaaaaaaaaaaaaaaaaa, aaaaaaaaaaaaaaaaaaaaaa, "
-               "aaaaaaaaaaaaaaaaaaaaaa,\n"
-               "    aaaaaaaaaaaaaaaaaaaaaa, aaaaaaaaaaaaaaaaaaaaaa, "
-               "aaaaaaaaaaaaaaaaaaaaaa>\n"
-               "    y;",
-               Style);
-}
-
-TEST_F(FormatTest, WrapsAtNestedNameSpecifiers) {
-  verifyFormat(
-      "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa::\n"
-      "    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa();");
-  verifyFormat(
-      "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa::\n"
-      "    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(\n"
-      "        aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa());");
-
-  // FIXME: Should we have the extra indent after the second break?
-  verifyFormat(
-      "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa::\n"
-      "    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa::\n"
-      "        aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa();");
-
-  verifyFormat(
-      "aaaaaaaaaaaaaaa(bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb::\n"
-      "                    cccccccccccccccccccccccccccccccccccccccccccccc());");
-
-  // Breaking at nested name specifiers is generally not desirable.
-  verifyFormat(
-      "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa::aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(\n"
-      "    aaaaaaaaaaaaaaaaaaaaaaa);");
-
-  verifyFormat("aaaaaaaaaaaaaaaaaa(aaaaaaaa,\n"
-               "                   aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa::\n"
-               "                       aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,\n"
-               "                   aaaaaaaaaaaaaaaaaaaaa);",
-               getLLVMStyleWithColumns(74));
-
-  verifyFormat("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa::\n"
-               "    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-               "        .aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa();");
-}
-
-TEST_F(FormatTest, UnderstandsTemplateParameters) {
-  verifyFormat("A<int> a;");
-  verifyFormat("A<A<A<int>>> a;");
-  verifyFormat("A<A<A<int, 2>, 3>, 4> a;");
-  verifyFormat("bool x = a < 1 || 2 > a;");
-  verifyFormat("bool x = 5 < f<int>();");
-  verifyFormat("bool x = f<int>() > 5;");
-  verifyFormat("bool x = 5 < a<int>::x;");
-  verifyFormat("bool x = a < 4 ? a > 2 : false;");
-  verifyFormat("bool x = f() ? a < 2 : a > 2;");
-
-  verifyGoogleFormat("A<A<int>> a;");
-  verifyGoogleFormat("A<A<A<int>>> a;");
-  verifyGoogleFormat("A<A<A<A<int>>>> a;");
-  verifyGoogleFormat("A<A<int> > a;");
-  verifyGoogleFormat("A<A<A<int> > > a;");
-  verifyGoogleFormat("A<A<A<A<int> > > > a;");
-  verifyGoogleFormat("A<::A<int>> a;");
-  verifyGoogleFormat("A<::A> a;");
-  verifyGoogleFormat("A< ::A> a;");
-  verifyGoogleFormat("A< ::A<int> > a;");
-  EXPECT_EQ("A<A<A<A>>> a;", format("A<A<A<A> >> a;", getGoogleStyle()));
-  EXPECT_EQ("A<A<A<A>>> a;", format("A<A<A<A>> > a;", getGoogleStyle()));
-  EXPECT_EQ("A<::A<int>> a;", format("A< ::A<int>> a;", getGoogleStyle()));
-  EXPECT_EQ("A<::A<int>> a;", format("A<::A<int> > a;", getGoogleStyle()));
-  EXPECT_EQ("auto x = [] { A<A<A<A>>> a; };",
-            format("auto x=[]{A<A<A<A> >> a;};", getGoogleStyle()));
-
-  verifyFormat("A<A<int>> a;", getChromiumStyle(FormatStyle::LK_Cpp));
-
-  // template closer followed by a token that starts with > or =
-  verifyFormat("bool b = a<1> > 1;");
-  verifyFormat("bool b = a<1> >= 1;");
-  verifyFormat("int i = a<1> >> 1;");
-  FormatStyle Style = getLLVMStyle();
-  Style.SpaceBeforeAssignmentOperators = false;
-  verifyFormat("bool b= a<1> == 1;", Style);
-  verifyFormat("a<int> = 1;", Style);
-  verifyFormat("a<int> >>= 1;", Style);
-
-  verifyFormat("test < a | b >> c;");
-  verifyFormat("test<test<a | b>> c;");
-  verifyFormat("test >> a >> b;");
-  verifyFormat("test << a >> b;");
-
-  verifyFormat("f<int>();");
-  verifyFormat("template <typename T> void f() {}");
-  verifyFormat("struct A<std::enable_if<sizeof(T2) < sizeof(int32)>::type>;");
-  verifyFormat("struct A<std::enable_if<sizeof(T2) ? sizeof(int32) : "
-               "sizeof(char)>::type>;");
-  verifyFormat("template <class T> struct S<std::is_arithmetic<T>{}> {};");
-  verifyFormat("f(a.operator()<A>());");
-  verifyFormat("f(aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-               "      .template operator()<A>());",
-               getLLVMStyleWithColumns(35));
-
-  // Not template parameters.
-  verifyFormat("return a < b && c > d;");
-  verifyFormat("void f() {\n"
-               "  while (a < b && c > d) {\n"
-               "  }\n"
-               "}");
-  verifyFormat("template <typename... Types>\n"
-               "typename enable_if<0 < sizeof...(Types)>::type Foo() {}");
-
-  verifyFormat("aaaaaaaaaaaaaaaaaaaaaaaaaaaa(\n"
-               "    aaaaaaaaaaaaaaaaaaaaaaaaaaaaa >> aaaaa);",
-               getLLVMStyleWithColumns(60));
-  verifyFormat("static_assert(is_convertible<A &&, B>::value, \"AAA\");");
-  verifyFormat("Constructor(A... a) : a_(X<A>{std::forward<A>(a)}...) {}");
-  verifyFormat("< < < < < < < < < < < < < < < < < < < < < < < < < < < < < <");
-  verifyFormat("some_templated_type<decltype([](int i) { return i; })>");
-}
-
-TEST_F(FormatTest, UnderstandsShiftOperators) {
-  verifyFormat("if (i < x >> 1)");
-  verifyFormat("while (i < x >> 1)");
-  verifyFormat("for (unsigned i = 0; i < i; ++i, v = v >> 1)");
-  verifyFormat("for (unsigned i = 0; i < x >> 1; ++i, v = v >> 1)");
-  verifyFormat(
-      "for (std::vector<int>::iterator i = 0; i < x >> 1; ++i, v = v >> 1)");
-  verifyFormat("Foo.call<Bar<Function>>()");
-  verifyFormat("if (Foo.call<Bar<Function>>() == 0)");
-  verifyFormat("for (std::vector<std::pair<int>>::iterator i = 0; i < x >> 1; "
-               "++i, v = v >> 1)");
-  verifyFormat("if (w<u<v<x>>, 1>::t)");
-}
-
-TEST_F(FormatTest, BitshiftOperatorWidth) {
-  EXPECT_EQ("int a = 1 << 2; /* foo\n"
-            "                   bar */",
-            format("int    a=1<<2;  /* foo\n"
-                   "                   bar */"));
-
-  EXPECT_EQ("int b = 256 >> 1; /* foo\n"
-            "                     bar */",
-            format("int  b  =256>>1 ;  /* foo\n"
-                   "                      bar */"));
-}
-
-TEST_F(FormatTest, UnderstandsBinaryOperators) {
-  verifyFormat("COMPARE(a, ==, b);");
-  verifyFormat("auto s = sizeof...(Ts) - 1;");
-}
-
-TEST_F(FormatTest, UnderstandsPointersToMembers) {
-  verifyFormat("int A::*x;");
-  verifyFormat("int (S::*func)(void *);");
-  verifyFormat("void f() { int (S::*func)(void *); }");
-  verifyFormat("typedef bool *(Class::*Member)() const;");
-  verifyFormat("void f() {\n"
-               "  (a->*f)();\n"
-               "  a->*x;\n"
-               "  (a.*f)();\n"
-               "  ((*a).*f)();\n"
-               "  a.*x;\n"
-               "}");
-  verifyFormat("void f() {\n"
-               "  (a->*aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa)(\n"
-               "      aaaa, bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb);\n"
-               "}");
-  verifyFormat(
-      "(aaaaaaaaaa->*bbbbbbb)(\n"
-      "    aaaaaaaaaaaaaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaaaaaaaaaaaaaa));");
-  FormatStyle Style = getLLVMStyle();
-  Style.PointerAlignment = FormatStyle::PAS_Left;
-  verifyFormat("typedef bool* (Class::*Member)() const;", Style);
-}
-
-TEST_F(FormatTest, UnderstandsUnaryOperators) {
-  verifyFormat("int a = -2;");
-  verifyFormat("f(-1, -2, -3);");
-  verifyFormat("a[-1] = 5;");
-  verifyFormat("int a = 5 + -2;");
-  verifyFormat("if (i == -1) {\n}");
-  verifyFormat("if (i != -1) {\n}");
-  verifyFormat("if (i > -1) {\n}");
-  verifyFormat("if (i < -1) {\n}");
-  verifyFormat("++(a->f());");
-  verifyFormat("--(a->f());");
-  verifyFormat("(a->f())++;");
-  verifyFormat("a[42]++;");
-  verifyFormat("if (!(a->f())) {\n}");
-  verifyFormat("if (!+i) {\n}");
-  verifyFormat("~&a;");
-
-  verifyFormat("a-- > b;");
-  verifyFormat("b ? -a : c;");
-  verifyFormat("n * sizeof char16;");
-  verifyFormat("n * alignof char16;", getGoogleStyle());
-  verifyFormat("sizeof(char);");
-  verifyFormat("alignof(char);", getGoogleStyle());
-
-  verifyFormat("return -1;");
-  verifyFormat("throw -1;");
-  verifyFormat("switch (a) {\n"
-               "case -1:\n"
-               "  break;\n"
-               "}");
-  verifyFormat("#define X -1");
-  verifyFormat("#define X -kConstant");
-
-  verifyFormat("const NSPoint kBrowserFrameViewPatternOffset = {-5, +3};");
-  verifyFormat("const NSPoint kBrowserFrameViewPatternOffset = {+5, -3};");
-
-  verifyFormat("int a = /* confusing comment */ -1;");
-  // FIXME: The space after 'i' is wrong, but hopefully, this is a rare case.
-  verifyFormat("int a = i /* confusing comment */++;");
-
-  verifyFormat("co_yield -1;");
-  verifyFormat("co_return -1;");
-
-  // Check that * is not treated as a binary operator when we set
-  // PointerAlignment as PAS_Left after a keyword and not a declaration.
-  FormatStyle PASLeftStyle = getLLVMStyle();
-  PASLeftStyle.PointerAlignment = FormatStyle::PAS_Left;
-  verifyFormat("co_return *a;", PASLeftStyle);
-  verifyFormat("co_await *a;", PASLeftStyle);
-  verifyFormat("co_yield *a", PASLeftStyle);
-  verifyFormat("return *a;", PASLeftStyle);
-}
-
-TEST_F(FormatTest, DoesNotIndentRelativeToUnaryOperators) {
-  verifyFormat("if (!aaaaaaaaaa( // break\n"
-               "        aaaaa)) {\n"
-               "}");
-  verifyFormat("aaaaaaaaaa(!aaaaaaaaaa( // break\n"
-               "    aaaaa));");
-  verifyFormat("*aaa = aaaaaaa( // break\n"
-               "    bbbbbb);");
-}
-
-TEST_F(FormatTest, UnderstandsOverloadedOperators) {
-  verifyFormat("bool operator<();");
-  verifyFormat("bool operator>();");
-  verifyFormat("bool operator=();");
-  verifyFormat("bool operator==();");
-  verifyFormat("bool operator!=();");
-  verifyFormat("int operator+();");
-  verifyFormat("int operator++();");
-  verifyFormat("int operator++(int) volatile noexcept;");
-  verifyFormat("bool operator,();");
-  verifyFormat("bool operator();");
-  verifyFormat("bool operator()();");
-  verifyFormat("bool operator[]();");
-  verifyFormat("operator bool();");
-  verifyFormat("operator int();");
-  verifyFormat("operator void *();");
-  verifyFormat("operator SomeType<int>();");
-  verifyFormat("operator SomeType<int, int>();");
-  verifyFormat("operator SomeType<SomeType<int>>();");
-  verifyFormat("void *operator new(std::size_t size);");
-  verifyFormat("void *operator new[](std::size_t size);");
-  verifyFormat("void operator delete(void *ptr);");
-  verifyFormat("void operator delete[](void *ptr);");
-  verifyFormat("template <typename AAAAAAA, typename BBBBBBB>\n"
-               "AAAAAAA operator/(const AAAAAAA &a, BBBBBBB &b);");
-  verifyFormat("aaaaaaaaaaaaaaaaaaaaaa operator,(\n"
-               "    aaaaaaaaaaaaaaaaaaaaa &aaaaaaaaaaaaaaaaaaaaaaaaaa) const;");
-
-  verifyFormat(
-      "ostream &operator<<(ostream &OutputStream,\n"
-      "                    SomeReallyLongType WithSomeReallyLongValue);");
-  verifyFormat("bool operator<(const aaaaaaaaaaaaaaaaaaaaa &left,\n"
-               "               const aaaaaaaaaaaaaaaaaaaaa &right) {\n"
-               "  return left.group < right.group;\n"
-               "}");
-  verifyFormat("SomeType &operator=(const SomeType &S);");
-  verifyFormat("f.template operator()<int>();");
-
-  verifyGoogleFormat("operator void*();");
-  verifyGoogleFormat("operator SomeType<SomeType<int>>();");
-  verifyGoogleFormat("operator ::A();");
-
-  verifyFormat("using A::operator+;");
-  verifyFormat("inline A operator^(const A &lhs, const A &rhs) {}\n"
-               "int i;");
-
-  // Calling an operator as a member function.
-  verifyFormat("void f() { a.operator*(); }");
-  verifyFormat("void f() { a.operator*(b & b); }");
-  verifyFormat("void f() { a->operator&(a * b); }");
-  verifyFormat("void f() { NS::a.operator+(*b * *b); }");
-  // TODO: Calling an operator as a non-member function is hard to distinguish.
-  // https://llvm.org/PR50629
-  // verifyFormat("void f() { operator*(a & a); }");
-  // verifyFormat("void f() { operator&(a, b * b); }");
-}
-
-TEST_F(FormatTest, UnderstandsFunctionRefQualification) {
-  verifyFormat("Deleted &operator=(const Deleted &) & = default;");
-  verifyFormat("Deleted &operator=(const Deleted &) && = delete;");
-  verifyFormat("SomeType MemberFunction(const Deleted &) & = delete;");
-  verifyFormat("SomeType MemberFunction(const Deleted &) && = delete;");
-  verifyFormat("Deleted &operator=(const Deleted &) &;");
-  verifyFormat("Deleted &operator=(const Deleted &) &&;");
-  verifyFormat("SomeType MemberFunction(const Deleted &) &;");
-  verifyFormat("SomeType MemberFunction(const Deleted &) &&;");
-  verifyFormat("SomeType MemberFunction(const Deleted &) && {}");
-  verifyFormat("SomeType MemberFunction(const Deleted &) && final {}");
-  verifyFormat("SomeType MemberFunction(const Deleted &) && override {}");
-  verifyFormat("void Fn(T const &) const &;");
-  verifyFormat("void Fn(T const volatile &&) const volatile &&;");
-  verifyFormat("template <typename T>\n"
-               "void F(T) && = delete;",
-               getGoogleStyle());
-
-  FormatStyle AlignLeft = getLLVMStyle();
-  AlignLeft.PointerAlignment = FormatStyle::PAS_Left;
-  verifyFormat("void A::b() && {}", AlignLeft);
-  verifyFormat("Deleted& operator=(const Deleted&) & = default;", AlignLeft);
-  verifyFormat("SomeType MemberFunction(const Deleted&) & = delete;",
-               AlignLeft);
-  verifyFormat("Deleted& operator=(const Deleted&) &;", AlignLeft);
-  verifyFormat("SomeType MemberFunction(const Deleted&) &;", AlignLeft);
-  verifyFormat("auto Function(T t) & -> void {}", AlignLeft);
-  verifyFormat("auto Function(T... t) & -> void {}", AlignLeft);
-  verifyFormat("auto Function(T) & -> void {}", AlignLeft);
-  verifyFormat("auto Function(T) & -> void;", AlignLeft);
-  verifyFormat("void Fn(T const&) const&;", AlignLeft);
-  verifyFormat("void Fn(T const volatile&&) const volatile&&;", AlignLeft);
-
-  FormatStyle Spaces = getLLVMStyle();
-  Spaces.SpacesInCStyleCastParentheses = true;
-  verifyFormat("Deleted &operator=(const Deleted &) & = default;", Spaces);
-  verifyFormat("SomeType MemberFunction(const Deleted &) & = delete;", Spaces);
-  verifyFormat("Deleted &operator=(const Deleted &) &;", Spaces);
-  verifyFormat("SomeType MemberFunction(const Deleted &) &;", Spaces);
-
-  Spaces.SpacesInCStyleCastParentheses = false;
-  Spaces.SpacesInParentheses = true;
-  verifyFormat("Deleted &operator=( const Deleted & ) & = default;", Spaces);
-  verifyFormat("SomeType MemberFunction( const Deleted & ) & = delete;",
-               Spaces);
-  verifyFormat("Deleted &operator=( const Deleted & ) &;", Spaces);
-  verifyFormat("SomeType MemberFunction( const Deleted & ) &;", Spaces);
-
-  FormatStyle BreakTemplate = getLLVMStyle();
-  BreakTemplate.AlwaysBreakTemplateDeclarations = FormatStyle::BTDS_Yes;
-
-  verifyFormat("struct f {\n"
-               "  template <class T>\n"
-               "  int &foo(const std::string &str) &noexcept {}\n"
-               "};",
-               BreakTemplate);
-
-  verifyFormat("struct f {\n"
-               "  template <class T>\n"
-               "  int &foo(const std::string &str) &&noexcept {}\n"
-               "};",
-               BreakTemplate);
-
-  verifyFormat("struct f {\n"
-               "  template <class T>\n"
-               "  int &foo(const std::string &str) const &noexcept {}\n"
-               "};",
-               BreakTemplate);
-
-  verifyFormat("struct f {\n"
-               "  template <class T>\n"
-               "  int &foo(const std::string &str) const &noexcept {}\n"
-               "};",
-               BreakTemplate);
-
-  verifyFormat("struct f {\n"
-               "  template <class T>\n"
-               "  auto foo(const std::string &str) &&noexcept -> int & {}\n"
-               "};",
-               BreakTemplate);
-
-  FormatStyle AlignLeftBreakTemplate = getLLVMStyle();
-  AlignLeftBreakTemplate.AlwaysBreakTemplateDeclarations =
-      FormatStyle::BTDS_Yes;
-  AlignLeftBreakTemplate.PointerAlignment = FormatStyle::PAS_Left;
-
-  verifyFormat("struct f {\n"
-               "  template <class T>\n"
-               "  int& foo(const std::string& str) & noexcept {}\n"
-               "};",
-               AlignLeftBreakTemplate);
-
-  verifyFormat("struct f {\n"
-               "  template <class T>\n"
-               "  int& foo(const std::string& str) && noexcept {}\n"
-               "};",
-               AlignLeftBreakTemplate);
-
-  verifyFormat("struct f {\n"
-               "  template <class T>\n"
-               "  int& foo(const std::string& str) const& noexcept {}\n"
-               "};",
-               AlignLeftBreakTemplate);
-
-  verifyFormat("struct f {\n"
-               "  template <class T>\n"
-               "  int& foo(const std::string& str) const&& noexcept {}\n"
-               "};",
-               AlignLeftBreakTemplate);
-
-  verifyFormat("struct f {\n"
-               "  template <class T>\n"
-               "  auto foo(const std::string& str) && noexcept -> int& {}\n"
-               "};",
-               AlignLeftBreakTemplate);
-
-  // The `&` in `Type&` should not be confused with a trailing `&` of
-  // DEPRECATED(reason) member function.
-  verifyFormat("struct f {\n"
-               "  template <class T>\n"
-               "  DEPRECATED(reason)\n"
-               "  Type &foo(arguments) {}\n"
-               "};",
-               BreakTemplate);
-
-  verifyFormat("struct f {\n"
-               "  template <class T>\n"
-               "  DEPRECATED(reason)\n"
-               "  Type& foo(arguments) {}\n"
-               "};",
-               AlignLeftBreakTemplate);
-
-  verifyFormat("void (*foopt)(int) = &func;");
-}
-
-TEST_F(FormatTest, UnderstandsNewAndDelete) {
-  verifyFormat("void f() {\n"
-               "  A *a = new A;\n"
-               "  A *a = new (placement) A;\n"
-               "  delete a;\n"
-               "  delete (A *)a;\n"
-               "}");
-  verifyFormat("new (aaaaaaaaaaaaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaaaaaaaaaa))\n"
-               "    typename aaaaaaaaaaaaaaaaaaaaaaaa();");
-  verifyFormat("auto aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa =\n"
-               "    new (aaaaaaaaaaaaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaaaaaaaaaa))\n"
-               "        typename aaaaaaaaaaaaaaaaaaaaaaaa();");
-  verifyFormat("delete[] h->p;");
-}
-
-TEST_F(FormatTest, UnderstandsUsesOfStarAndAmp) {
-  verifyFormat("int *f(int *a) {}");
-  verifyFormat("int main(int argc, char **argv) {}");
-  verifyFormat("Test::Test(int b) : a(b * b) {}");
-  verifyIndependentOfContext("f(a, *a);");
-  verifyFormat("void g() { f(*a); }");
-  verifyIndependentOfContext("int a = b * 10;");
-  verifyIndependentOfContext("int a = 10 * b;");
-  verifyIndependentOfContext("int a = b * c;");
-  verifyIndependentOfContext("int a += b * c;");
-  verifyIndependentOfContext("int a -= b * c;");
-  verifyIndependentOfContext("int a *= b * c;");
-  verifyIndependentOfContext("int a /= b * c;");
-  verifyIndependentOfContext("int a = *b;");
-  verifyIndependentOfContext("int a = *b * c;");
-  verifyIndependentOfContext("int a = b * *c;");
-  verifyIndependentOfContext("int a = b * (10);");
-  verifyIndependentOfContext("S << b * (10);");
-  verifyIndependentOfContext("return 10 * b;");
-  verifyIndependentOfContext("return *b * *c;");
-  verifyIndependentOfContext("return a & ~b;");
-  verifyIndependentOfContext("f(b ? *c : *d);");
-  verifyIndependentOfContext("int a = b ? *c : *d;");
-  verifyIndependentOfContext("*b = a;");
-  verifyIndependentOfContext("a * ~b;");
-  verifyIndependentOfContext("a * !b;");
-  verifyIndependentOfContext("a * +b;");
-  verifyIndependentOfContext("a * -b;");
-  verifyIndependentOfContext("a * ++b;");
-  verifyIndependentOfContext("a * --b;");
-  verifyIndependentOfContext("a[4] * b;");
-  verifyIndependentOfContext("a[a * a] = 1;");
-  verifyIndependentOfContext("f() * b;");
-  verifyIndependentOfContext("a * [self dostuff];");
-  verifyIndependentOfContext("int x = a * (a + b);");
-  verifyIndependentOfContext("(a *)(a + b);");
-  verifyIndependentOfContext("*(int *)(p & ~3UL) = 0;");
-  verifyIndependentOfContext("int *pa = (int *)&a;");
-  verifyIndependentOfContext("return sizeof(int **);");
-  verifyIndependentOfContext("return sizeof(int ******);");
-  verifyIndependentOfContext("return (int **&)a;");
-  verifyIndependentOfContext("f((*PointerToArray)[10]);");
-  verifyFormat("void f(Type (*parameter)[10]) {}");
-  verifyFormat("void f(Type (&parameter)[10]) {}");
-  verifyGoogleFormat("return sizeof(int**);");
-  verifyIndependentOfContext("Type **A = static_cast<Type **>(P);");
-  verifyGoogleFormat("Type** A = static_cast<Type**>(P);");
-  verifyFormat("auto a = [](int **&, int ***) {};");
-  verifyFormat("auto PointerBinding = [](const char *S) {};");
-  verifyFormat("typedef typeof(int(int, int)) *MyFunc;");
-  verifyFormat("[](const decltype(*a) &value) {}");
-  verifyFormat("[](const typeof(*a) &value) {}");
-  verifyFormat("[](const _Atomic(a *) &value) {}");
-  verifyFormat("[](const __underlying_type(a) &value) {}");
-  verifyFormat("decltype(a * b) F();");
-  verifyFormat("typeof(a * b) F();");
-  verifyFormat("#define MACRO() [](A *a) { return 1; }");
-  verifyFormat("Constructor() : member([](A *a, B *b) {}) {}");
-  verifyIndependentOfContext("typedef void (*f)(int *a);");
-  verifyIndependentOfContext("int i{a * b};");
-  verifyIndependentOfContext("aaa && aaa->f();");
-  verifyIndependentOfContext("int x = ~*p;");
-  verifyFormat("Constructor() : a(a), area(width * height) {}");
-  verifyFormat("Constructor() : a(a), area(a, width * height) {}");
-  verifyGoogleFormat("MACRO Constructor(const int& i) : a(a), b(b) {}");
-  verifyFormat("void f() { f(a, c * d); }");
-  verifyFormat("void f() { f(new a(), c * d); }");
-  verifyFormat("void f(const MyOverride &override);");
-  verifyFormat("void f(const MyFinal &final);");
-  verifyIndependentOfContext("bool a = f() && override.f();");
-  verifyIndependentOfContext("bool a = f() && final.f();");
-
-  verifyIndependentOfContext("InvalidRegions[*R] = 0;");
-
-  verifyIndependentOfContext("A<int *> a;");
-  verifyIndependentOfContext("A<int **> a;");
-  verifyIndependentOfContext("A<int *, int *> a;");
-  verifyIndependentOfContext("A<int *[]> a;");
-  verifyIndependentOfContext(
-      "const char *const p = reinterpret_cast<const char *const>(q);");
-  verifyIndependentOfContext("A<int **, int **> a;");
-  verifyIndependentOfContext("void f(int *a = d * e, int *b = c * d);");
-  verifyFormat("for (char **a = b; *a; ++a) {\n}");
-  verifyFormat("for (; a && b;) {\n}");
-  verifyFormat("bool foo = true && [] { return false; }();");
-
-  verifyFormat(
-      "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(\n"
-      "    aaaaaaaaaaaaaaaaaaaaaaaaaaaa, *aaaaaaaaaaaaaaaaaaaaaaaaaaaaa);");
-
-  verifyGoogleFormat("int const* a = &b;");
-  verifyGoogleFormat("**outparam = 1;");
-  verifyGoogleFormat("*outparam = a * b;");
-  verifyGoogleFormat("int main(int argc, char** argv) {}");
-  verifyGoogleFormat("A<int*> a;");
-  verifyGoogleFormat("A<int**> a;");
-  verifyGoogleFormat("A<int*, int*> a;");
-  verifyGoogleFormat("A<int**, int**> a;");
-  verifyGoogleFormat("f(b ? *c : *d);");
-  verifyGoogleFormat("int a = b ? *c : *d;");
-  verifyGoogleFormat("Type* t = **x;");
-  verifyGoogleFormat("Type* t = *++*x;");
-  verifyGoogleFormat("*++*x;");
-  verifyGoogleFormat("Type* t = const_cast<T*>(&*x);");
-  verifyGoogleFormat("Type* t = x++ * y;");
-  verifyGoogleFormat(
-      "const char* const p = reinterpret_cast<const char* const>(q);");
-  verifyGoogleFormat("void f(int i = 0, SomeType** temps = NULL);");
-  verifyGoogleFormat("void f(Bar* a = nullptr, Bar* b);");
-  verifyGoogleFormat("template <typename T>\n"
-                     "void f(int i = 0, SomeType** temps = NULL);");
-
-  FormatStyle Left = getLLVMStyle();
-  Left.PointerAlignment = FormatStyle::PAS_Left;
-  verifyFormat("x = *a(x) = *a(y);", Left);
-  verifyFormat("for (;; *a = b) {\n}", Left);
-  verifyFormat("return *this += 1;", Left);
-  verifyFormat("throw *x;", Left);
-  verifyFormat("delete *x;", Left);
-  verifyFormat("typedef typeof(int(int, int))* MyFuncPtr;", Left);
-  verifyFormat("[](const decltype(*a)* ptr) {}", Left);
-  verifyFormat("[](const typeof(*a)* ptr) {}", Left);
-  verifyFormat("[](const _Atomic(a*)* ptr) {}", Left);
-  verifyFormat("[](const __underlying_type(a)* ptr) {}", Left);
-  verifyFormat("typedef typeof /*comment*/ (int(int, int))* MyFuncPtr;", Left);
-  verifyFormat("auto x(A&&, B&&, C&&) -> D;", Left);
-  verifyFormat("auto x = [](A&&, B&&, C&&) -> D {};", Left);
-  verifyFormat("template <class T> X(T&&, T&&, T&&) -> X<T>;", Left);
-
-  verifyIndependentOfContext("a = *(x + y);");
-  verifyIndependentOfContext("a = &(x + y);");
-  verifyIndependentOfContext("*(x + y).call();");
-  verifyIndependentOfContext("&(x + y)->call();");
-  verifyFormat("void f() { &(*I).first; }");
-
-  verifyIndependentOfContext("f(b * /* confusing comment */ ++c);");
-  verifyFormat(
-      "int *MyValues = {\n"
-      "    *A, // Operator detection might be confused by the '{'\n"
-      "    *BB // Operator detection might be confused by previous comment\n"
-      "};");
-
-  verifyIndependentOfContext("if (int *a = &b)");
-  verifyIndependentOfContext("if (int &a = *b)");
-  verifyIndependentOfContext("if (a & b[i])");
-  verifyIndependentOfContext("if constexpr (a & b[i])");
-  verifyIndependentOfContext("if CONSTEXPR (a & b[i])");
-  verifyIndependentOfContext("if (a * (b * c))");
-  verifyIndependentOfContext("if constexpr (a * (b * c))");
-  verifyIndependentOfContext("if CONSTEXPR (a * (b * c))");
-  verifyIndependentOfContext("if (a::b::c::d & b[i])");
-  verifyIndependentOfContext("if (*b[i])");
-  verifyIndependentOfContext("if (int *a = (&b))");
-  verifyIndependentOfContext("while (int *a = &b)");
-  verifyIndependentOfContext("while (a * (b * c))");
-  verifyIndependentOfContext("size = sizeof *a;");
-  verifyIndependentOfContext("if (a && (b = c))");
-  verifyFormat("void f() {\n"
-               "  for (const int &v : Values) {\n"
-               "  }\n"
-               "}");
-  verifyFormat("for (int i = a * a; i < 10; ++i) {\n}");
-  verifyFormat("for (int i = 0; i < a * a; ++i) {\n}");
-  verifyGoogleFormat("for (int i = 0; i * 2 < z; i *= 2) {\n}");
-
-  verifyFormat("#define A (!a * b)");
-  verifyFormat("#define MACRO     \\\n"
-               "  int *i = a * b; \\\n"
-               "  void f(a *b);",
-               getLLVMStyleWithColumns(19));
-
-  verifyIndependentOfContext("A = new SomeType *[Length];");
-  verifyIndependentOfContext("A = new SomeType *[Length]();");
-  verifyIndependentOfContext("T **t = new T *;");
-  verifyIndependentOfContext("T **t = new T *();");
-  verifyGoogleFormat("A = new SomeType*[Length]();");
-  verifyGoogleFormat("A = new SomeType*[Length];");
-  verifyGoogleFormat("T** t = new T*;");
-  verifyGoogleFormat("T** t = new T*();");
-
-  verifyFormat("STATIC_ASSERT((a & b) == 0);");
-  verifyFormat("STATIC_ASSERT(0 == (a & b));");
-  verifyFormat("template <bool a, bool b> "
-               "typename t::if<x && y>::type f() {}");
-  verifyFormat("template <int *y> f() {}");
-  verifyFormat("vector<int *> v;");
-  verifyFormat("vector<int *const> v;");
-  verifyFormat("vector<int *const **const *> v;");
-  verifyFormat("vector<int *volatile> v;");
-  verifyFormat("vector<a *_Nonnull> v;");
-  verifyFormat("vector<a *_Nullable> v;");
-  verifyFormat("vector<a *_Null_unspecified> v;");
-  verifyFormat("vector<a *__ptr32> v;");
-  verifyFormat("vector<a *__ptr64> v;");
-  verifyFormat("vector<a *__capability> v;");
-  FormatStyle TypeMacros = getLLVMStyle();
-  TypeMacros.TypenameMacros = {"LIST"};
-  verifyFormat("vector<LIST(uint64_t)> v;", TypeMacros);
-  verifyFormat("vector<LIST(uint64_t) *> v;", TypeMacros);
-  verifyFormat("vector<LIST(uint64_t) **> v;", TypeMacros);
-  verifyFormat("vector<LIST(uint64_t) *attr> v;", TypeMacros);
-  verifyFormat("vector<A(uint64_t) * attr> v;", TypeMacros); // multiplication
-
-  FormatStyle CustomQualifier = getLLVMStyle();
-  // Add identifiers that should not be parsed as a qualifier by default.
-  CustomQualifier.AttributeMacros.push_back("__my_qualifier");
-  CustomQualifier.AttributeMacros.push_back("_My_qualifier");
-  CustomQualifier.AttributeMacros.push_back("my_other_qualifier");
-  verifyFormat("vector<a * __my_qualifier> parse_as_multiply;");
-  verifyFormat("vector<a *__my_qualifier> v;", CustomQualifier);
-  verifyFormat("vector<a * _My_qualifier> parse_as_multiply;");
-  verifyFormat("vector<a *_My_qualifier> v;", CustomQualifier);
-  verifyFormat("vector<a * my_other_qualifier> parse_as_multiply;");
-  verifyFormat("vector<a *my_other_qualifier> v;", CustomQualifier);
-  verifyFormat("vector<a * _NotAQualifier> v;");
-  verifyFormat("vector<a * __not_a_qualifier> v;");
-  verifyFormat("vector<a * b> v;");
-  verifyFormat("foo<b && false>();");
-  verifyFormat("foo<b & 1>();");
-  verifyFormat("decltype(*::std::declval<const T &>()) void F();");
-  verifyFormat("typeof(*::std::declval<const T &>()) void F();");
-  verifyFormat("_Atomic(*::std::declval<const T &>()) void F();");
-  verifyFormat("__underlying_type(*::std::declval<const T &>()) void F();");
-  verifyFormat(
-      "template <class T, class = typename std::enable_if<\n"
-      "                       std::is_integral<T>::value &&\n"
-      "                       (sizeof(T) > 1 || sizeof(T) < 8)>::type>\n"
-      "void F();",
-      getLLVMStyleWithColumns(70));
-  verifyFormat("template <class T,\n"
-               "          class = typename std::enable_if<\n"
-               "              std::is_integral<T>::value &&\n"
-               "              (sizeof(T) > 1 || sizeof(T) < 8)>::type,\n"
-               "          class U>\n"
-               "void F();",
-               getLLVMStyleWithColumns(70));
-  verifyFormat(
-      "template <class T,\n"
-      "          class = typename ::std::enable_if<\n"
-      "              ::std::is_array<T>{} && ::std::is_array<T>{}>::type>\n"
-      "void F();",
-      getGoogleStyleWithColumns(68));
-
-  verifyIndependentOfContext("MACRO(int *i);");
-  verifyIndependentOfContext("MACRO(auto *a);");
-  verifyIndependentOfContext("MACRO(const A *a);");
-  verifyIndependentOfContext("MACRO(_Atomic(A) *a);");
-  verifyIndependentOfContext("MACRO(decltype(A) *a);");
-  verifyIndependentOfContext("MACRO(typeof(A) *a);");
-  verifyIndependentOfContext("MACRO(__underlying_type(A) *a);");
-  verifyIndependentOfContext("MACRO(A *const a);");
-  verifyIndependentOfContext("MACRO(A *restrict a);");
-  verifyIndependentOfContext("MACRO(A *__restrict__ a);");
-  verifyIndependentOfContext("MACRO(A *__restrict a);");
-  verifyIndependentOfContext("MACRO(A *volatile a);");
-  verifyIndependentOfContext("MACRO(A *__volatile a);");
-  verifyIndependentOfContext("MACRO(A *__volatile__ a);");
-  verifyIndependentOfContext("MACRO(A *_Nonnull a);");
-  verifyIndependentOfContext("MACRO(A *_Nullable a);");
-  verifyIndependentOfContext("MACRO(A *_Null_unspecified a);");
-  verifyIndependentOfContext("MACRO(A *__attribute__((foo)) a);");
-  verifyIndependentOfContext("MACRO(A *__attribute((foo)) a);");
-  verifyIndependentOfContext("MACRO(A *[[clang::attr]] a);");
-  verifyIndependentOfContext("MACRO(A *[[clang::attr(\"foo\")]] a);");
-  verifyIndependentOfContext("MACRO(A *__ptr32 a);");
-  verifyIndependentOfContext("MACRO(A *__ptr64 a);");
-  verifyIndependentOfContext("MACRO(A *__capability);");
-  verifyIndependentOfContext("MACRO(A &__capability);");
-  verifyFormat("MACRO(A *__my_qualifier);");               // type declaration
-  verifyFormat("void f() { MACRO(A * __my_qualifier); }"); // multiplication
-  // If we add __my_qualifier to AttributeMacros it should always be parsed as
-  // a type declaration:
-  verifyFormat("MACRO(A *__my_qualifier);", CustomQualifier);
-  verifyFormat("void f() { MACRO(A *__my_qualifier); }", CustomQualifier);
-  // Also check that TypenameMacros prevents parsing it as multiplication:
-  verifyIndependentOfContext("MACRO(LIST(uint64_t) * a);"); // multiplication
-  verifyIndependentOfContext("MACRO(LIST(uint64_t) *a);", TypeMacros); // type
-
-  verifyIndependentOfContext("MACRO('0' <= c && c <= '9');");
-  verifyFormat("void f() { f(float{1}, a * a); }");
-  verifyFormat("void f() { f(float(1), a * a); }");
-
-  verifyFormat("f((void (*)(int))g);");
-  verifyFormat("f((void (&)(int))g);");
-  verifyFormat("f((void (^)(int))g);");
-
-  // FIXME: Is there a way to make this work?
-  // verifyIndependentOfContext("MACRO(A *a);");
-  verifyFormat("MACRO(A &B);");
-  verifyFormat("MACRO(A *B);");
-  verifyFormat("void f() { MACRO(A * B); }");
-  verifyFormat("void f() { MACRO(A & B); }");
-
-  // This lambda was mis-formatted after D88956 (treating it as a binop):
-  verifyFormat("auto x = [](const decltype(x) &ptr) {};");
-  verifyFormat("auto x = [](const decltype(x) *ptr) {};");
-  verifyFormat("#define lambda [](const decltype(x) &ptr) {}");
-  verifyFormat("#define lambda [](const decltype(x) *ptr) {}");
-
-  verifyFormat("DatumHandle const *operator->() const { return input_; }");
-  verifyFormat("return options != nullptr && operator==(*options);");
-
-  EXPECT_EQ("#define OP(x)                                    \\\n"
-            "  ostream &operator<<(ostream &s, const A &a) {  \\\n"
-            "    return s << a.DebugString();                 \\\n"
-            "  }",
-            format("#define OP(x) \\\n"
-                   "  ostream &operator<<(ostream &s, const A &a) { \\\n"
-                   "    return s << a.DebugString(); \\\n"
-                   "  }",
-                   getLLVMStyleWithColumns(50)));
-
-  // FIXME: We cannot handle this case yet; we might be able to figure out that
-  // foo<x> d > v; doesn't make sense.
-  verifyFormat("foo<a<b && c> d> v;");
-
-  FormatStyle PointerMiddle = getLLVMStyle();
-  PointerMiddle.PointerAlignment = FormatStyle::PAS_Middle;
-  verifyFormat("delete *x;", PointerMiddle);
-  verifyFormat("int * x;", PointerMiddle);
-  verifyFormat("int *[] x;", PointerMiddle);
-  verifyFormat("template <int * y> f() {}", PointerMiddle);
-  verifyFormat("int * f(int * a) {}", PointerMiddle);
-  verifyFormat("int main(int argc, char ** argv) {}", PointerMiddle);
-  verifyFormat("Test::Test(int b) : a(b * b) {}", PointerMiddle);
-  verifyFormat("A<int *> a;", PointerMiddle);
-  verifyFormat("A<int **> a;", PointerMiddle);
-  verifyFormat("A<int *, int *> a;", PointerMiddle);
-  verifyFormat("A<int *[]> a;", PointerMiddle);
-  verifyFormat("A = new SomeType *[Length]();", PointerMiddle);
-  verifyFormat("A = new SomeType *[Length];", PointerMiddle);
-  verifyFormat("T ** t = new T *;", PointerMiddle);
-
-  // Member function reference qualifiers aren't binary operators.
-  verifyFormat("string // break\n"
-               "operator()() & {}");
-  verifyFormat("string // break\n"
-               "operator()() && {}");
-  verifyGoogleFormat("template <typename T>\n"
-                     "auto x() & -> int {}");
-
-  // Should be binary operators when used as an argument expression (overloaded
-  // operator invoked as a member function).
-  verifyFormat("void f() { a.operator()(a * a); }");
-  verifyFormat("void f() { a->operator()(a & a); }");
-  verifyFormat("void f() { a.operator()(*a & *a); }");
-  verifyFormat("void f() { a->operator()(*a * *a); }");
-}
-
-TEST_F(FormatTest, UnderstandsAttributes) {
-  verifyFormat("SomeType s __attribute__((unused)) (InitValue);");
-  verifyFormat("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa __attribute__((unused))\n"
-               "aaaaaaaaaaaaaaaaaaaaaaa(int i);");
-  FormatStyle AfterType = getLLVMStyle();
-  AfterType.AlwaysBreakAfterReturnType = FormatStyle::RTBS_All;
-  verifyFormat("__attribute__((nodebug)) void\n"
-               "foo() {}\n",
-               AfterType);
-  verifyFormat("__unused void\n"
-               "foo() {}",
-               AfterType);
-
-  FormatStyle CustomAttrs = getLLVMStyle();
-  CustomAttrs.AttributeMacros.push_back("__unused");
-  CustomAttrs.AttributeMacros.push_back("__attr1");
-  CustomAttrs.AttributeMacros.push_back("__attr2");
-  CustomAttrs.AttributeMacros.push_back("no_underscore_attr");
-  verifyFormat("vector<SomeType *__attribute((foo))> v;");
-  verifyFormat("vector<SomeType *__attribute__((foo))> v;");
-  verifyFormat("vector<SomeType * __not_attribute__((foo))> v;");
-  // Check that it is parsed as a multiplication without AttributeMacros and
-  // as a pointer qualifier when we add __attr1/__attr2 to AttributeMacros.
-  verifyFormat("vector<SomeType * __attr1> v;");
-  verifyFormat("vector<SomeType __attr1 *> v;");
-  verifyFormat("vector<SomeType __attr1 *const> v;");
-  verifyFormat("vector<SomeType __attr1 * __attr2> v;");
-  verifyFormat("vector<SomeType *__attr1> v;", CustomAttrs);
-  verifyFormat("vector<SomeType *__attr2> v;", CustomAttrs);
-  verifyFormat("vector<SomeType *no_underscore_attr> v;", CustomAttrs);
-  verifyFormat("vector<SomeType __attr1 *> v;", CustomAttrs);
-  verifyFormat("vector<SomeType __attr1 *const> v;", CustomAttrs);
-  verifyFormat("vector<SomeType __attr1 *__attr2> v;", CustomAttrs);
-  verifyFormat("vector<SomeType __attr1 *no_underscore_attr> v;", CustomAttrs);
-
-  // Check that these are not parsed as function declarations:
-  CustomAttrs.AllowShortFunctionsOnASingleLine = FormatStyle::SFS_None;
-  CustomAttrs.BreakBeforeBraces = FormatStyle::BS_Allman;
-  verifyFormat("SomeType s(InitValue);", CustomAttrs);
-  verifyFormat("SomeType s{InitValue};", CustomAttrs);
-  verifyFormat("SomeType *__unused s(InitValue);", CustomAttrs);
-  verifyFormat("SomeType *__unused s{InitValue};", CustomAttrs);
-  verifyFormat("SomeType s __unused(InitValue);", CustomAttrs);
-  verifyFormat("SomeType s __unused{InitValue};", CustomAttrs);
-  verifyFormat("SomeType *__capability s(InitValue);", CustomAttrs);
-  verifyFormat("SomeType *__capability s{InitValue};", CustomAttrs);
-}
-
-TEST_F(FormatTest, UnderstandsPointerQualifiersInCast) {
-  // Check that qualifiers on pointers don't break parsing of casts.
-  verifyFormat("x = (foo *const)*v;");
-  verifyFormat("x = (foo *volatile)*v;");
-  verifyFormat("x = (foo *restrict)*v;");
-  verifyFormat("x = (foo *__attribute__((foo)))*v;");
-  verifyFormat("x = (foo *_Nonnull)*v;");
-  verifyFormat("x = (foo *_Nullable)*v;");
-  verifyFormat("x = (foo *_Null_unspecified)*v;");
-  verifyFormat("x = (foo *_Nonnull)*v;");
-  verifyFormat("x = (foo *[[clang::attr]])*v;");
-  verifyFormat("x = (foo *[[clang::attr(\"foo\")]])*v;");
-  verifyFormat("x = (foo *__ptr32)*v;");
-  verifyFormat("x = (foo *__ptr64)*v;");
-  verifyFormat("x = (foo *__capability)*v;");
-
-  // Check that we handle multiple trailing qualifiers and skip them all to
-  // determine that the expression is a cast to a pointer type.
-  FormatStyle LongPointerRight = getLLVMStyleWithColumns(999);
-  FormatStyle LongPointerLeft = getLLVMStyleWithColumns(999);
-  LongPointerLeft.PointerAlignment = FormatStyle::PAS_Left;
-  StringRef AllQualifiers =
-      "const volatile restrict __attribute__((foo)) _Nonnull _Null_unspecified "
-      "_Nonnull [[clang::attr]] __ptr32 __ptr64 __capability";
-  verifyFormat(("x = (foo *" + AllQualifiers + ")*v;").str(), LongPointerRight);
-  verifyFormat(("x = (foo* " + AllQualifiers + ")*v;").str(), LongPointerLeft);
-
-  // Also check that address-of is not parsed as a binary bitwise-and:
-  verifyFormat("x = (foo *const)&v;");
-  verifyFormat(("x = (foo *" + AllQualifiers + ")&v;").str(), LongPointerRight);
-  verifyFormat(("x = (foo* " + AllQualifiers + ")&v;").str(), LongPointerLeft);
-
-  // Check custom qualifiers:
-  FormatStyle CustomQualifier = getLLVMStyleWithColumns(999);
-  CustomQualifier.AttributeMacros.push_back("__my_qualifier");
-  verifyFormat("x = (foo * __my_qualifier) * v;"); // not parsed as qualifier.
-  verifyFormat("x = (foo *__my_qualifier)*v;", CustomQualifier);
-  verifyFormat(("x = (foo *" + AllQualifiers + " __my_qualifier)*v;").str(),
-               CustomQualifier);
-  verifyFormat(("x = (foo *" + AllQualifiers + " __my_qualifier)&v;").str(),
-               CustomQualifier);
-
-  // Check that unknown identifiers result in binary operator parsing:
-  verifyFormat("x = (foo * __unknown_qualifier) * v;");
-  verifyFormat("x = (foo * __unknown_qualifier) & v;");
-}
-
-TEST_F(FormatTest, UnderstandsSquareAttributes) {
-  verifyFormat("SomeType s [[unused]] (InitValue);");
-  verifyFormat("SomeType s [[gnu::unused]] (InitValue);");
-  verifyFormat("SomeType s [[using gnu: unused]] (InitValue);");
-  verifyFormat("[[gsl::suppress(\"clang-tidy-check-name\")]] void f() {}");
-  verifyFormat("void f() [[deprecated(\"so sorry\")]];");
-  verifyFormat("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-               "    [[unused]] aaaaaaaaaaaaaaaaaaaaaaa(int i);");
-  verifyFormat("[[nodiscard]] bool f() { return false; }");
-  verifyFormat("class [[nodiscard]] f {\npublic:\n  f() {}\n}");
-  verifyFormat("class [[deprecated(\"so sorry\")]] f {\npublic:\n  f() {}\n}");
-  verifyFormat("class [[gnu::unused]] f {\npublic:\n  f() {}\n}");
-
-  // Make sure we do not mistake attributes for array subscripts.
-  verifyFormat("int a() {}\n"
-               "[[unused]] int b() {}\n");
-  verifyFormat("NSArray *arr;\n"
-               "arr[[Foo() bar]];");
-
-  // On the other hand, we still need to correctly find array subscripts.
-  verifyFormat("int a = std::vector<int>{1, 2, 3}[0];");
-
-  // Make sure that we do not mistake Objective-C method inside array literals
-  // as attributes, even if those method names are also keywords.
-  verifyFormat("@[ [foo bar] ];");
-  verifyFormat("@[ [NSArray class] ];");
-  verifyFormat("@[ [foo enum] ];");
-
-  verifyFormat("template <typename T> [[nodiscard]] int a() { return 1; }");
-
-  // Make sure we do not parse attributes as lambda introducers.
-  FormatStyle MultiLineFunctions = getLLVMStyle();
-  MultiLineFunctions.AllowShortFunctionsOnASingleLine = FormatStyle::SFS_None;
-  verifyFormat("[[unused]] int b() {\n"
-               "  return 42;\n"
-               "}\n",
-               MultiLineFunctions);
-}
-
-TEST_F(FormatTest, AttributeClass) {
-  FormatStyle Style = getChromiumStyle(FormatStyle::LK_Cpp);
-  verifyFormat("class S {\n"
-               "  S(S&&) = default;\n"
-               "};",
-               Style);
-  verifyFormat("class [[nodiscard]] S {\n"
-               "  S(S&&) = default;\n"
-               "};",
-               Style);
-  verifyFormat("class __attribute((maybeunused)) S {\n"
-               "  S(S&&) = default;\n"
-               "};",
-               Style);
-  verifyFormat("struct S {\n"
-               "  S(S&&) = default;\n"
-               "};",
-               Style);
-  verifyFormat("struct [[nodiscard]] S {\n"
-               "  S(S&&) = default;\n"
-               "};",
-               Style);
-}
-
-TEST_F(FormatTest, AttributesAfterMacro) {
-  FormatStyle Style = getLLVMStyle();
-  verifyFormat("MACRO;\n"
-               "__attribute__((maybe_unused)) int foo() {\n"
-               "  //...\n"
-               "}");
-
-  verifyFormat("MACRO;\n"
-               "[[nodiscard]] int foo() {\n"
-               "  //...\n"
-               "}");
-
-  EXPECT_EQ("MACRO\n\n"
-            "__attribute__((maybe_unused)) int foo() {\n"
-            "  //...\n"
-            "}",
-            format("MACRO\n\n"
-                   "__attribute__((maybe_unused)) int foo() {\n"
-                   "  //...\n"
-                   "}"));
-
-  EXPECT_EQ("MACRO\n\n"
-            "[[nodiscard]] int foo() {\n"
-            "  //...\n"
-            "}",
-            format("MACRO\n\n"
-                   "[[nodiscard]] int foo() {\n"
-                   "  //...\n"
-                   "}"));
-}
-
-TEST_F(FormatTest, AttributePenaltyBreaking) {
-  FormatStyle Style = getLLVMStyle();
-  verifyFormat("void ABCDEFGH::ABCDEFGHIJKLMN(\n"
-               "    [[maybe_unused]] const shared_ptr<ALongTypeName> &C d) {}",
-               Style);
-  verifyFormat("void ABCDEFGH::ABCDEFGHIJK(\n"
-               "    [[maybe_unused]] const shared_ptr<ALongTypeName> &C d) {}",
-               Style);
-  verifyFormat("void ABCDEFGH::ABCDEFGH([[maybe_unused]] const "
-               "shared_ptr<ALongTypeName> &C d) {\n}",
-               Style);
-}
-
-TEST_F(FormatTest, UnderstandsEllipsis) {
-  FormatStyle Style = getLLVMStyle();
-  verifyFormat("int printf(const char *fmt, ...);");
-  verifyFormat("template <class... Ts> void Foo(Ts... ts) { Foo(ts...); }");
-  verifyFormat("template <class... Ts> void Foo(Ts *...ts) {}");
-
-  verifyFormat("template <int *...PP> a;", Style);
-
-  Style.PointerAlignment = FormatStyle::PAS_Left;
-  verifyFormat("template <class... Ts> void Foo(Ts*... ts) {}", Style);
-
-  verifyFormat("template <int*... PP> a;", Style);
-
-  Style.PointerAlignment = FormatStyle::PAS_Middle;
-  verifyFormat("template <int *... PP> a;", Style);
-}
-
-TEST_F(FormatTest, AdaptivelyFormatsPointersAndReferences) {
-  EXPECT_EQ("int *a;\n"
-            "int *a;\n"
-            "int *a;",
-            format("int *a;\n"
-                   "int* a;\n"
-                   "int *a;",
-                   getGoogleStyle()));
-  EXPECT_EQ("int* a;\n"
-            "int* a;\n"
-            "int* a;",
-            format("int* a;\n"
-                   "int* a;\n"
-                   "int *a;",
-                   getGoogleStyle()));
-  EXPECT_EQ("int *a;\n"
-            "int *a;\n"
-            "int *a;",
-            format("int *a;\n"
-                   "int * a;\n"
-                   "int *  a;",
-                   getGoogleStyle()));
-  EXPECT_EQ("auto x = [] {\n"
-            "  int *a;\n"
-            "  int *a;\n"
-            "  int *a;\n"
-            "};",
-            format("auto x=[]{int *a;\n"
-                   "int * a;\n"
-                   "int *  a;};",
-                   getGoogleStyle()));
-}
-
-TEST_F(FormatTest, UnderstandsRvalueReferences) {
-  verifyFormat("int f(int &&a) {}");
-  verifyFormat("int f(int a, char &&b) {}");
-  verifyFormat("void f() { int &&a = b; }");
-  verifyGoogleFormat("int f(int a, char&& b) {}");
-  verifyGoogleFormat("void f() { int&& a = b; }");
-
-  verifyIndependentOfContext("A<int &&> a;");
-  verifyIndependentOfContext("A<int &&, int &&> a;");
-  verifyGoogleFormat("A<int&&> a;");
-  verifyGoogleFormat("A<int&&, int&&> a;");
-
-  // Not rvalue references:
-  verifyFormat("template <bool B, bool C> class A {\n"
-               "  static_assert(B && C, \"Something is wrong\");\n"
-               "};");
-  verifyGoogleFormat("#define IF(a, b, c) if (a && (b == c))");
-  verifyGoogleFormat("#define WHILE(a, b, c) while (a && (b == c))");
-  verifyFormat("#define A(a, b) (a && b)");
-}
-
-TEST_F(FormatTest, FormatsBinaryOperatorsPrecedingEquals) {
-  verifyFormat("void f() {\n"
-               "  x[aaaaaaaaa -\n"
-               "    b] = 23;\n"
-               "}",
-               getLLVMStyleWithColumns(15));
-}
-
-TEST_F(FormatTest, FormatsCasts) {
-  verifyFormat("Type *A = static_cast<Type *>(P);");
-  verifyFormat("Type *A = (Type *)P;");
-  verifyFormat("Type *A = (vector<Type *, int *>)P;");
-  verifyFormat("int a = (int)(2.0f);");
-  verifyFormat("int a = (int)2.0f;");
-  verifyFormat("x[(int32)y];");
-  verifyFormat("x = (int32)y;");
-  verifyFormat("#define AA(X) sizeof(((X *)NULL)->a)");
-  verifyFormat("int a = (int)*b;");
-  verifyFormat("int a = (int)2.0f;");
-  verifyFormat("int a = (int)~0;");
-  verifyFormat("int a = (int)++a;");
-  verifyFormat("int a = (int)sizeof(int);");
-  verifyFormat("int a = (int)+2;");
-  verifyFormat("my_int a = (my_int)2.0f;");
-  verifyFormat("my_int a = (my_int)sizeof(int);");
-  verifyFormat("return (my_int)aaa;");
-  verifyFormat("#define x ((int)-1)");
-  verifyFormat("#define LENGTH(x, y) (x) - (y) + 1");
-  verifyFormat("#define p(q) ((int *)&q)");
-  verifyFormat("fn(a)(b) + 1;");
-
-  verifyFormat("void f() { my_int a = (my_int)*b; }");
-  verifyFormat("void f() { return P ? (my_int)*P : (my_int)0; }");
-  verifyFormat("my_int a = (my_int)~0;");
-  verifyFormat("my_int a = (my_int)++a;");
-  verifyFormat("my_int a = (my_int)-2;");
-  verifyFormat("my_int a = (my_int)1;");
-  verifyFormat("my_int a = (my_int *)1;");
-  verifyFormat("my_int a = (const my_int)-1;");
-  verifyFormat("my_int a = (const my_int *)-1;");
-  verifyFormat("my_int a = (my_int)(my_int)-1;");
-  verifyFormat("my_int a = (ns::my_int)-2;");
-  verifyFormat("case (my_int)ONE:");
-  verifyFormat("auto x = (X)this;");
-  // Casts in Obj-C style calls used to not be recognized as such.
-  verifyFormat("int a = [(type*)[((type*)val) arg] arg];", getGoogleStyle());
-
-  // FIXME: single value wrapped with paren will be treated as cast.
-  verifyFormat("void f(int i = (kValue)*kMask) {}");
-
-  verifyFormat("{ (void)F; }");
-
-  // Don't break after a cast's
-  verifyFormat("int aaaaaaaaaaaaaaaaaaaaaaaaaaa =\n"
-               "    (aaaaaaaaaaaaaaaaaaaaaaaaaa *)(aaaaaaaaaaaaaaaaaaaaaa +\n"
-               "                                   bbbbbbbbbbbbbbbbbbbbbb);");
-
-  // These are not casts.
-  verifyFormat("void f(int *) {}");
-  verifyFormat("f(foo)->b;");
-  verifyFormat("f(foo).b;");
-  verifyFormat("f(foo)(b);");
-  verifyFormat("f(foo)[b];");
-  verifyFormat("[](foo) { return 4; }(bar);");
-  verifyFormat("(*funptr)(foo)[4];");
-  verifyFormat("funptrs[4](foo)[4];");
-  verifyFormat("void f(int *);");
-  verifyFormat("void f(int *) = 0;");
-  verifyFormat("void f(SmallVector<int>) {}");
-  verifyFormat("void f(SmallVector<int>);");
-  verifyFormat("void f(SmallVector<int>) = 0;");
-  verifyFormat("void f(int i = (kA * kB) & kMask) {}");
-  verifyFormat("int a = sizeof(int) * b;");
-  verifyFormat("int a = alignof(int) * b;", getGoogleStyle());
-  verifyFormat("template <> void f<int>(int i) SOME_ANNOTATION;");
-  verifyFormat("f(\"%\" SOME_MACRO(ll) \"d\");");
-  verifyFormat("aaaaa &operator=(const aaaaa &) LLVM_DELETED_FUNCTION;");
-
-  // These are not casts, but at some point were confused with casts.
-  verifyFormat("virtual void foo(int *) override;");
-  verifyFormat("virtual void foo(char &) const;");
-  verifyFormat("virtual void foo(int *a, char *) const;");
-  verifyFormat("int a = sizeof(int *) + b;");
-  verifyFormat("int a = alignof(int *) + b;", getGoogleStyle());
-  verifyFormat("bool b = f(g<int>) && c;");
-  verifyFormat("typedef void (*f)(int i) func;");
-  verifyFormat("void operator++(int) noexcept;");
-  verifyFormat("void operator++(int &) noexcept;");
-  verifyFormat("void operator delete(void *, std::size_t, const std::nothrow_t "
-               "&) noexcept;");
-  verifyFormat(
-      "void operator delete(std::size_t, const std::nothrow_t &) noexcept;");
-  verifyFormat("void operator delete(const std::nothrow_t &) noexcept;");
-  verifyFormat("void operator delete(std::nothrow_t &) noexcept;");
-  verifyFormat("void operator delete(nothrow_t &) noexcept;");
-  verifyFormat("void operator delete(foo &) noexcept;");
-  verifyFormat("void operator delete(foo) noexcept;");
-  verifyFormat("void operator delete(int) noexcept;");
-  verifyFormat("void operator delete(int &) noexcept;");
-  verifyFormat("void operator delete(int &) volatile noexcept;");
-  verifyFormat("void operator delete(int &) const");
-  verifyFormat("void operator delete(int &) = default");
-  verifyFormat("void operator delete(int &) = delete");
-  verifyFormat("void operator delete(int &) [[noreturn]]");
-  verifyFormat("void operator delete(int &) throw();");
-  verifyFormat("void operator delete(int &) throw(int);");
-  verifyFormat("auto operator delete(int &) -> int;");
-  verifyFormat("auto operator delete(int &) override");
-  verifyFormat("auto operator delete(int &) final");
-
-  verifyFormat("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa *foo = (aaaaaaaaaaaaaaaaa *)\n"
-               "    bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb;");
-  // FIXME: The indentation here is not ideal.
-  verifyFormat(
-      "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-      "    [bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb] = (*cccccccccccccccc)\n"
-      "        [dddddddddddddddddddddddddddddddddddddddddddddddddddddddd];");
-}
-
-TEST_F(FormatTest, FormatsFunctionTypes) {
-  verifyFormat("A<bool()> a;");
-  verifyFormat("A<SomeType()> a;");
-  verifyFormat("A<void (*)(int, std::string)> a;");
-  verifyFormat("A<void *(int)>;");
-  verifyFormat("void *(*a)(int *, SomeType *);");
-  verifyFormat("int (*func)(void *);");
-  verifyFormat("void f() { int (*func)(void *); }");
-  verifyFormat("template <class CallbackClass>\n"
-               "using MyCallback = void (CallbackClass::*)(SomeObject *Data);");
-
-  verifyGoogleFormat("A<void*(int*, SomeType*)>;");
-  verifyGoogleFormat("void* (*a)(int);");
-  verifyGoogleFormat(
-      "template <class CallbackClass>\n"
-      "using MyCallback = void (CallbackClass::*)(SomeObject* Data);");
-
-  // Other constructs can look somewhat like function types:
-  verifyFormat("A<sizeof(*x)> a;");
-  verifyFormat("#define DEREF_AND_CALL_F(x) f(*x)");
-  verifyFormat("some_var = function(*some_pointer_var)[0];");
-  verifyFormat("void f() { function(*some_pointer_var)[0] = 10; }");
-  verifyFormat("int x = f(&h)();");
-  verifyFormat("returnsFunction(&param1, &param2)(param);");
-  verifyFormat("std::function<\n"
-               "    LooooooooooongTemplatedType<\n"
-               "        SomeType>*(\n"
-               "        LooooooooooooooooongType type)>\n"
-               "    function;",
-               getGoogleStyleWithColumns(40));
-}
-
-TEST_F(FormatTest, FormatsPointersToArrayTypes) {
-  verifyFormat("A (*foo_)[6];");
-  verifyFormat("vector<int> (*foo_)[6];");
-}
-
-TEST_F(FormatTest, BreaksLongVariableDeclarations) {
-  verifyFormat("LoooooooooooooooooooooooooooooooooooooooongType\n"
-               "    LoooooooooooooooooooooooooooooooooooooooongVariable;");
-  verifyFormat("LoooooooooooooooooooooooooooooooooooooooongType const\n"
-               "    LoooooooooooooooooooooooooooooooooooooooongVariable;");
-  verifyFormat("LoooooooooooooooooooooooooooooooooooooooongType\n"
-               "    *LoooooooooooooooooooooooooooooooooooooooongVariable;");
-
-  // Different ways of ()-initializiation.
-  verifyFormat("LoooooooooooooooooooooooooooooooooooooooongType\n"
-               "    LoooooooooooooooooooooooooooooooooooooooongVariable(1);");
-  verifyFormat("LoooooooooooooooooooooooooooooooooooooooongType\n"
-               "    LoooooooooooooooooooooooooooooooooooooooongVariable(a);");
-  verifyFormat("LoooooooooooooooooooooooooooooooooooooooongType\n"
-               "    LoooooooooooooooooooooooooooooooooooooooongVariable({});");
-  verifyFormat("LoooooooooooooooooooooooooooooooooooooooongType\n"
-               "    LoooooooooooooooooooooooooooooooooooooongVariable([A a]);");
-
-  // Lambdas should not confuse the variable declaration heuristic.
-  verifyFormat("LooooooooooooooooongType\n"
-               "    variable(nullptr, [](A *a) {});",
-               getLLVMStyleWithColumns(40));
-}
-
-TEST_F(FormatTest, BreaksLongDeclarations) {
-  verifyFormat("typedef LoooooooooooooooooooooooooooooooooooooooongType\n"
-               "    AnotherNameForTheLongType;");
-  verifyFormat("typedef LongTemplateType<aaaaaaaaaaaaaaaaaaa()>\n"
-               "    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa;");
-  verifyFormat("LoooooooooooooooooooooooooooooooooooooooongReturnType\n"
-               "LoooooooooooooooooooooooooooooooongFunctionDeclaration();");
-  verifyFormat("LoooooooooooooooooooooooooooooooooooooooongReturnType *\n"
-               "LoooooooooooooooooooooooooooooooongFunctionDeclaration();");
-  verifyFormat("LoooooooooooooooooooooooooooooooooooooooongReturnType\n"
-               "LooooooooooooooooooooooooooooooooooongFunctionDefinition() {}");
-  verifyFormat("LoooooooooooooooooooooooooooooooooooooooongReturnType MACRO\n"
-               "LooooooooooooooooooooooooooooooooooongFunctionDefinition() {}");
-  verifyFormat("LoooooooooooooooooooooooooooooooooooooooongReturnType const\n"
-               "LooooooooooooooooooooooooooooooooooongFunctionDefinition() {}");
-  verifyFormat("decltype(LoooooooooooooooooooooooooooooooooooooooongName)\n"
-               "LooooooooooooooooooooooooooooooooooongFunctionDefinition() {}");
-  verifyFormat("typeof(LoooooooooooooooooooooooooooooooooooooooooongName)\n"
-               "LooooooooooooooooooooooooooooooooooongFunctionDefinition() {}");
-  verifyFormat("_Atomic(LooooooooooooooooooooooooooooooooooooooooongName)\n"
-               "LooooooooooooooooooooooooooooooooooongFunctionDefinition() {}");
-  verifyFormat("__underlying_type(LooooooooooooooooooooooooooooooongName)\n"
-               "LooooooooooooooooooooooooooooooooooongFunctionDefinition() {}");
-  verifyFormat("LoooooooooooooooooooooooooooooooooooooooongReturnType\n"
-               "LooooooooooooooooooooooooooongFunctionDeclaration(T... t);");
-  verifyFormat("LoooooooooooooooooooooooooooooooooooooooongReturnType\n"
-               "LooooooooooooooooooooooooooongFunctionDeclaration(T /*t*/) {}");
-  FormatStyle Indented = getLLVMStyle();
-  Indented.IndentWrappedFunctionNames = true;
-  verifyFormat("LoooooooooooooooooooooooooooooooooooooooongReturnType\n"
-               "    LoooooooooooooooooooooooooooooooongFunctionDeclaration();",
-               Indented);
-  verifyFormat(
-      "LoooooooooooooooooooooooooooooooooooooooongReturnType\n"
-      "    LooooooooooooooooooooooooooooooooooongFunctionDefinition() {}",
-      Indented);
-  verifyFormat(
-      "LoooooooooooooooooooooooooooooooooooooooongReturnType const\n"
-      "    LooooooooooooooooooooooooooooooooooongFunctionDefinition() {}",
-      Indented);
-  verifyFormat(
-      "decltype(LoooooooooooooooooooooooooooooooooooooooongName)\n"
-      "    LooooooooooooooooooooooooooooooooooongFunctionDefinition() {}",
-      Indented);
-
-  // FIXME: Without the comment, this breaks after "(".
-  verifyFormat("LoooooooooooooooooooooooooooooooooooooooongType  // break\n"
-               "    (*LoooooooooooooooooooooooooooongFunctionTypeVarialbe)();",
-               getGoogleStyle());
-
-  verifyFormat("int *someFunction(int LoooooooooooooooooooongParam1,\n"
-               "                  int LoooooooooooooooooooongParam2) {}");
-  verifyFormat(
-      "TypeSpecDecl *TypeSpecDecl::Create(ASTContext &C, DeclContext *DC,\n"
-      "                                   SourceLocation L, IdentifierIn *II,\n"
-      "                                   Type *T) {}");
-  verifyFormat("ReallyLongReturnType<TemplateParam1, TemplateParam2>\n"
-               "ReallyReaaallyLongFunctionName(\n"
-               "    const std::string &SomeParameter,\n"
-               "    const SomeType<string, SomeOtherTemplateParameter>\n"
-               "        &ReallyReallyLongParameterName,\n"
-               "    const SomeType<string, SomeOtherTemplateParameter>\n"
-               "        &AnotherLongParameterName) {}");
-  verifyFormat("template <typename A>\n"
-               "SomeLoooooooooooooooooooooongType<\n"
-               "    typename some_namespace::SomeOtherType<A>::Type>\n"
-               "Function() {}");
-
-  verifyGoogleFormat(
-      "aaaaaaaaaaaaaaaa::aaaaaaaaaaaaaaaa<aaaaaaaaaaaaa, aaaaaaaaaaaa>\n"
-      "    aaaaaaaaaaaaaaaaaaaaaaa;");
-  verifyGoogleFormat(
-      "TypeSpecDecl* TypeSpecDecl::Create(ASTContext& C, DeclContext* DC,\n"
-      "                                   SourceLocation L) {}");
-  verifyGoogleFormat(
-      "some_namespace::LongReturnType\n"
-      "long_namespace::SomeVeryLongClass::SomeVeryLongFunction(\n"
-      "    int first_long_parameter, int second_parameter) {}");
-
-  verifyGoogleFormat("template <typename T>\n"
-                     "aaaaaaaa::aaaaa::aaaaaa<T, aaaaaaaaaaaaaaaaaaaaaaaaa>\n"
-                     "aaaaaaaaaaaaaaaaaaaaaaaa<T>::aaaaaaa() {}");
-  verifyGoogleFormat("A<A<A>> aaaaaaaaaa(int aaaaaaaaaaaaaaaaaaaaaaaaaaa,\n"
-                     "                   int aaaaaaaaaaaaaaaaaaaaaaa);");
-
-  verifyFormat("typedef size_t (*aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa)(\n"
-               "    const aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-               "        *aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa);");
-  verifyFormat("void aaaaaaaaaaaaaaaaaaaaaaaaaaaaa(\n"
-               "    vector<aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa>\n"
-               "        aaaaaaaaaaaaaaaaaaaaaaaa);");
-  verifyFormat("void aaaaaaaaaaaaaaaaaaaaaaaaaaaaa(\n"
-               "    vector<aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa<\n"
-               "        aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa>>\n"
-               "        aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa);");
-
-  verifyFormat("template <typename T> // Templates on own line.\n"
-               "static int            // Some comment.\n"
-               "MyFunction(int a);",
-               getLLVMStyle());
-}
-
-TEST_F(FormatTest, FormatsAccessModifiers) {
-  FormatStyle Style = getLLVMStyle();
-  EXPECT_EQ(Style.EmptyLineBeforeAccessModifier,
-            FormatStyle::ELBAMS_LogicalBlock);
-  verifyFormat("struct foo {\n"
-               "private:\n"
-               "  void f() {}\n"
-               "\n"
-               "private:\n"
-               "  int i;\n"
-               "\n"
-               "protected:\n"
-               "  int j;\n"
-               "};\n",
-               Style);
-  verifyFormat("struct foo {\n"
-               "private:\n"
-               "  void f() {}\n"
-               "\n"
-               "private:\n"
-               "  int i;\n"
-               "\n"
-               "protected:\n"
-               "  int j;\n"
-               "};\n",
-               "struct foo {\n"
-               "private:\n"
-               "  void f() {}\n"
-               "private:\n"
-               "  int i;\n"
-               "protected:\n"
-               "  int j;\n"
-               "};\n",
-               Style);
-  verifyFormat("struct foo { /* comment */\n"
-               "private:\n"
-               "  int i;\n"
-               "  // comment\n"
-               "private:\n"
-               "  int j;\n"
-               "};\n",
-               Style);
-  verifyFormat("struct foo {\n"
-               "#ifdef FOO\n"
-               "#endif\n"
-               "private:\n"
-               "  int i;\n"
-               "#ifdef FOO\n"
-               "private:\n"
-               "#endif\n"
-               "  int j;\n"
-               "};\n",
-               Style);
-  Style.EmptyLineBeforeAccessModifier = FormatStyle::ELBAMS_Never;
-  verifyFormat("struct foo {\n"
-               "private:\n"
-               "  void f() {}\n"
-               "private:\n"
-               "  int i;\n"
-               "protected:\n"
-               "  int j;\n"
-               "};\n",
-               Style);
-  verifyFormat("struct foo {\n"
-               "private:\n"
-               "  void f() {}\n"
-               "private:\n"
-               "  int i;\n"
-               "protected:\n"
-               "  int j;\n"
-               "};\n",
-               "struct foo {\n"
-               "\n"
-               "private:\n"
-               "  void f() {}\n"
-               "\n"
-               "private:\n"
-               "  int i;\n"
-               "\n"
-               "protected:\n"
-               "  int j;\n"
-               "};\n",
-               Style);
-  verifyFormat("struct foo { /* comment */\n"
-               "private:\n"
-               "  int i;\n"
-               "  // comment\n"
-               "private:\n"
-               "  int j;\n"
-               "};\n",
-               "struct foo { /* comment */\n"
-               "\n"
-               "private:\n"
-               "  int i;\n"
-               "  // comment\n"
-               "\n"
-               "private:\n"
-               "  int j;\n"
-               "};\n",
-               Style);
-  verifyFormat("struct foo {\n"
-               "#ifdef FOO\n"
-               "#endif\n"
-               "private:\n"
-               "  int i;\n"
-               "#ifdef FOO\n"
-               "private:\n"
-               "#endif\n"
-               "  int j;\n"
-               "};\n",
-               "struct foo {\n"
-               "#ifdef FOO\n"
-               "#endif\n"
-               "\n"
-               "private:\n"
-               "  int i;\n"
-               "#ifdef FOO\n"
-               "\n"
-               "private:\n"
-               "#endif\n"
-               "  int j;\n"
-               "};\n",
-               Style);
-  Style.EmptyLineBeforeAccessModifier = FormatStyle::ELBAMS_Always;
-  verifyFormat("struct foo {\n"
-               "private:\n"
-               "  void f() {}\n"
-               "\n"
-               "private:\n"
-               "  int i;\n"
-               "\n"
-               "protected:\n"
-               "  int j;\n"
-               "};\n",
-               Style);
-  verifyFormat("struct foo {\n"
-               "private:\n"
-               "  void f() {}\n"
-               "\n"
-               "private:\n"
-               "  int i;\n"
-               "\n"
-               "protected:\n"
-               "  int j;\n"
-               "};\n",
-               "struct foo {\n"
-               "private:\n"
-               "  void f() {}\n"
-               "private:\n"
-               "  int i;\n"
-               "protected:\n"
-               "  int j;\n"
-               "};\n",
-               Style);
-  verifyFormat("struct foo { /* comment */\n"
-               "private:\n"
-               "  int i;\n"
-               "  // comment\n"
-               "\n"
-               "private:\n"
-               "  int j;\n"
-               "};\n",
-               "struct foo { /* comment */\n"
-               "private:\n"
-               "  int i;\n"
-               "  // comment\n"
-               "\n"
-               "private:\n"
-               "  int j;\n"
-               "};\n",
-               Style);
-  verifyFormat("struct foo {\n"
-               "#ifdef FOO\n"
-               "#endif\n"
-               "\n"
-               "private:\n"
-               "  int i;\n"
-               "#ifdef FOO\n"
-               "\n"
-               "private:\n"
-               "#endif\n"
-               "  int j;\n"
-               "};\n",
-               "struct foo {\n"
-               "#ifdef FOO\n"
-               "#endif\n"
-               "private:\n"
-               "  int i;\n"
-               "#ifdef FOO\n"
-               "private:\n"
-               "#endif\n"
-               "  int j;\n"
-               "};\n",
-               Style);
-  Style.EmptyLineBeforeAccessModifier = FormatStyle::ELBAMS_Leave;
-  EXPECT_EQ("struct foo {\n"
-            "\n"
-            "private:\n"
-            "  void f() {}\n"
-            "\n"
-            "private:\n"
-            "  int i;\n"
-            "\n"
-            "protected:\n"
-            "  int j;\n"
-            "};\n",
-            format("struct foo {\n"
-                   "\n"
-                   "private:\n"
-                   "  void f() {}\n"
-                   "\n"
-                   "private:\n"
-                   "  int i;\n"
-                   "\n"
-                   "protected:\n"
-                   "  int j;\n"
-                   "};\n",
-                   Style));
-  verifyFormat("struct foo {\n"
-               "private:\n"
-               "  void f() {}\n"
-               "private:\n"
-               "  int i;\n"
-               "protected:\n"
-               "  int j;\n"
-               "};\n",
-               Style);
-  EXPECT_EQ("struct foo { /* comment */\n"
-            "\n"
-            "private:\n"
-            "  int i;\n"
-            "  // comment\n"
-            "\n"
-            "private:\n"
-            "  int j;\n"
-            "};\n",
-            format("struct foo { /* comment */\n"
-                   "\n"
-                   "private:\n"
-                   "  int i;\n"
-                   "  // comment\n"
-                   "\n"
-                   "private:\n"
-                   "  int j;\n"
-                   "};\n",
-                   Style));
-  verifyFormat("struct foo { /* comment */\n"
-               "private:\n"
-               "  int i;\n"
-               "  // comment\n"
-               "private:\n"
-               "  int j;\n"
-               "};\n",
-               Style);
-  EXPECT_EQ("struct foo {\n"
-            "#ifdef FOO\n"
-            "#endif\n"
-            "\n"
-            "private:\n"
-            "  int i;\n"
-            "#ifdef FOO\n"
-            "\n"
-            "private:\n"
-            "#endif\n"
-            "  int j;\n"
-            "};\n",
-            format("struct foo {\n"
-                   "#ifdef FOO\n"
-                   "#endif\n"
-                   "\n"
-                   "private:\n"
-                   "  int i;\n"
-                   "#ifdef FOO\n"
-                   "\n"
-                   "private:\n"
-                   "#endif\n"
-                   "  int j;\n"
-                   "};\n",
-                   Style));
-  verifyFormat("struct foo {\n"
-               "#ifdef FOO\n"
-               "#endif\n"
-               "private:\n"
-               "  int i;\n"
-               "#ifdef FOO\n"
-               "private:\n"
-               "#endif\n"
-               "  int j;\n"
-               "};\n",
-               Style);
-
-  FormatStyle NoEmptyLines = getLLVMStyle();
-  NoEmptyLines.MaxEmptyLinesToKeep = 0;
-  verifyFormat("struct foo {\n"
-               "private:\n"
-               "  void f() {}\n"
-               "\n"
-               "private:\n"
-               "  int i;\n"
-               "\n"
-               "public:\n"
-               "protected:\n"
-               "  int j;\n"
-               "};\n",
-               NoEmptyLines);
-
-  NoEmptyLines.EmptyLineBeforeAccessModifier = FormatStyle::ELBAMS_Never;
-  verifyFormat("struct foo {\n"
-               "private:\n"
-               "  void f() {}\n"
-               "private:\n"
-               "  int i;\n"
-               "public:\n"
-               "protected:\n"
-               "  int j;\n"
-               "};\n",
-               NoEmptyLines);
-
-  NoEmptyLines.EmptyLineBeforeAccessModifier = FormatStyle::ELBAMS_Always;
-  verifyFormat("struct foo {\n"
-               "private:\n"
-               "  void f() {}\n"
-               "\n"
-               "private:\n"
-               "  int i;\n"
-               "\n"
-               "public:\n"
-               "\n"
-               "protected:\n"
-               "  int j;\n"
-               "};\n",
-               NoEmptyLines);
-}
-
-TEST_F(FormatTest, FormatsAfterAccessModifiers) {
-
-  FormatStyle Style = getLLVMStyle();
-  EXPECT_EQ(Style.EmptyLineAfterAccessModifier, FormatStyle::ELAAMS_Never);
-  verifyFormat("struct foo {\n"
-               "private:\n"
-               "  void f() {}\n"
-               "\n"
-               "private:\n"
-               "  int i;\n"
-               "\n"
-               "protected:\n"
-               "  int j;\n"
-               "};\n",
-               Style);
-
-  // Check if lines are removed.
-  verifyFormat("struct foo {\n"
-               "private:\n"
-               "  void f() {}\n"
-               "\n"
-               "private:\n"
-               "  int i;\n"
-               "\n"
-               "protected:\n"
-               "  int j;\n"
-               "};\n",
-               "struct foo {\n"
-               "private:\n"
-               "\n"
-               "  void f() {}\n"
-               "\n"
-               "private:\n"
-               "\n"
-               "  int i;\n"
-               "\n"
-               "protected:\n"
-               "\n"
-               "  int j;\n"
-               "};\n",
-               Style);
-
-  Style.EmptyLineAfterAccessModifier = FormatStyle::ELAAMS_Always;
-  verifyFormat("struct foo {\n"
-               "private:\n"
-               "\n"
-               "  void f() {}\n"
-               "\n"
-               "private:\n"
-               "\n"
-               "  int i;\n"
-               "\n"
-               "protected:\n"
-               "\n"
-               "  int j;\n"
-               "};\n",
-               Style);
-
-  // Check if lines are added.
-  verifyFormat("struct foo {\n"
-               "private:\n"
-               "\n"
-               "  void f() {}\n"
-               "\n"
-               "private:\n"
-               "\n"
-               "  int i;\n"
-               "\n"
-               "protected:\n"
-               "\n"
-               "  int j;\n"
-               "};\n",
-               "struct foo {\n"
-               "private:\n"
-               "  void f() {}\n"
-               "\n"
-               "private:\n"
-               "  int i;\n"
-               "\n"
-               "protected:\n"
-               "  int j;\n"
-               "};\n",
-               Style);
-
-  // Leave tests rely on the code layout, test::messUp can not be used.
-  Style.EmptyLineAfterAccessModifier = FormatStyle::ELAAMS_Leave;
-  Style.MaxEmptyLinesToKeep = 0u;
-  verifyFormat("struct foo {\n"
-               "private:\n"
-               "  void f() {}\n"
-               "\n"
-               "private:\n"
-               "  int i;\n"
-               "\n"
-               "protected:\n"
-               "  int j;\n"
-               "};\n",
-               Style);
-
-  // Check if MaxEmptyLinesToKeep is respected.
-  EXPECT_EQ("struct foo {\n"
-            "private:\n"
-            "  void f() {}\n"
-            "\n"
-            "private:\n"
-            "  int i;\n"
-            "\n"
-            "protected:\n"
-            "  int j;\n"
-            "};\n",
-            format("struct foo {\n"
-                   "private:\n"
-                   "\n\n\n"
-                   "  void f() {}\n"
-                   "\n"
-                   "private:\n"
-                   "\n\n\n"
-                   "  int i;\n"
-                   "\n"
-                   "protected:\n"
-                   "\n\n\n"
-                   "  int j;\n"
-                   "};\n",
-                   Style));
-
-  Style.MaxEmptyLinesToKeep = 1u;
-  EXPECT_EQ("struct foo {\n"
-            "private:\n"
-            "\n"
-            "  void f() {}\n"
-            "\n"
-            "private:\n"
-            "\n"
-            "  int i;\n"
-            "\n"
-            "protected:\n"
-            "\n"
-            "  int j;\n"
-            "};\n",
-            format("struct foo {\n"
-                   "private:\n"
-                   "\n"
-                   "  void f() {}\n"
-                   "\n"
-                   "private:\n"
-                   "\n"
-                   "  int i;\n"
-                   "\n"
-                   "protected:\n"
-                   "\n"
-                   "  int j;\n"
-                   "};\n",
-                   Style));
-  // Check if no lines are kept.
-  EXPECT_EQ("struct foo {\n"
-            "private:\n"
-            "  void f() {}\n"
-            "\n"
-            "private:\n"
-            "  int i;\n"
-            "\n"
-            "protected:\n"
-            "  int j;\n"
-            "};\n",
-            format("struct foo {\n"
-                   "private:\n"
-                   "  void f() {}\n"
-                   "\n"
-                   "private:\n"
-                   "  int i;\n"
-                   "\n"
-                   "protected:\n"
-                   "  int j;\n"
-                   "};\n",
-                   Style));
-  // Check if MaxEmptyLinesToKeep is respected.
-  EXPECT_EQ("struct foo {\n"
-            "private:\n"
-            "\n"
-            "  void f() {}\n"
-            "\n"
-            "private:\n"
-            "\n"
-            "  int i;\n"
-            "\n"
-            "protected:\n"
-            "\n"
-            "  int j;\n"
-            "};\n",
-            format("struct foo {\n"
-                   "private:\n"
-                   "\n\n\n"
-                   "  void f() {}\n"
-                   "\n"
-                   "private:\n"
-                   "\n\n\n"
-                   "  int i;\n"
-                   "\n"
-                   "protected:\n"
-                   "\n\n\n"
-                   "  int j;\n"
-                   "};\n",
-                   Style));
-
-  Style.MaxEmptyLinesToKeep = 10u;
-  EXPECT_EQ("struct foo {\n"
-            "private:\n"
-            "\n\n\n"
-            "  void f() {}\n"
-            "\n"
-            "private:\n"
-            "\n\n\n"
-            "  int i;\n"
-            "\n"
-            "protected:\n"
-            "\n\n\n"
-            "  int j;\n"
-            "};\n",
-            format("struct foo {\n"
-                   "private:\n"
-                   "\n\n\n"
-                   "  void f() {}\n"
-                   "\n"
-                   "private:\n"
-                   "\n\n\n"
-                   "  int i;\n"
-                   "\n"
-                   "protected:\n"
-                   "\n\n\n"
-                   "  int j;\n"
-                   "};\n",
-                   Style));
-
-  // Test with comments.
-  Style = getLLVMStyle();
-  verifyFormat("struct foo {\n"
-               "private:\n"
-               "  // comment\n"
-               "  void f() {}\n"
-               "\n"
-               "private: /* comment */\n"
-               "  int i;\n"
-               "};\n",
-               Style);
-  verifyFormat("struct foo {\n"
-               "private:\n"
-               "  // comment\n"
-               "  void f() {}\n"
-               "\n"
-               "private: /* comment */\n"
-               "  int i;\n"
-               "};\n",
-               "struct foo {\n"
-               "private:\n"
-               "\n"
-               "  // comment\n"
-               "  void f() {}\n"
-               "\n"
-               "private: /* comment */\n"
-               "\n"
-               "  int i;\n"
-               "};\n",
-               Style);
-
-  Style.EmptyLineAfterAccessModifier = FormatStyle::ELAAMS_Always;
-  verifyFormat("struct foo {\n"
-               "private:\n"
-               "\n"
-               "  // comment\n"
-               "  void f() {}\n"
-               "\n"
-               "private: /* comment */\n"
-               "\n"
-               "  int i;\n"
-               "};\n",
-               "struct foo {\n"
-               "private:\n"
-               "  // comment\n"
-               "  void f() {}\n"
-               "\n"
-               "private: /* comment */\n"
-               "  int i;\n"
-               "};\n",
-               Style);
-  verifyFormat("struct foo {\n"
-               "private:\n"
-               "\n"
-               "  // comment\n"
-               "  void f() {}\n"
-               "\n"
-               "private: /* comment */\n"
-               "\n"
-               "  int i;\n"
-               "};\n",
-               Style);
-
-  // Test with preprocessor defines.
-  Style = getLLVMStyle();
-  verifyFormat("struct foo {\n"
-               "private:\n"
-               "#ifdef FOO\n"
-               "#endif\n"
-               "  void f() {}\n"
-               "};\n",
-               Style);
-  verifyFormat("struct foo {\n"
-               "private:\n"
-               "#ifdef FOO\n"
-               "#endif\n"
-               "  void f() {}\n"
-               "};\n",
-               "struct foo {\n"
-               "private:\n"
-               "\n"
-               "#ifdef FOO\n"
-               "#endif\n"
-               "  void f() {}\n"
-               "};\n",
-               Style);
-
-  Style.EmptyLineAfterAccessModifier = FormatStyle::ELAAMS_Always;
-  verifyFormat("struct foo {\n"
-               "private:\n"
-               "\n"
-               "#ifdef FOO\n"
-               "#endif\n"
-               "  void f() {}\n"
-               "};\n",
-               "struct foo {\n"
-               "private:\n"
-               "#ifdef FOO\n"
-               "#endif\n"
-               "  void f() {}\n"
-               "};\n",
-               Style);
-  verifyFormat("struct foo {\n"
-               "private:\n"
-               "\n"
-               "#ifdef FOO\n"
-               "#endif\n"
-               "  void f() {}\n"
-               "};\n",
-               Style);
-}
-
-TEST_F(FormatTest, FormatsAfterAndBeforeAccessModifiersInteraction) {
-  // Combined tests of EmptyLineAfterAccessModifier and
-  // EmptyLineBeforeAccessModifier.
-  FormatStyle Style = getLLVMStyle();
-  Style.EmptyLineBeforeAccessModifier = FormatStyle::ELBAMS_Always;
-  Style.EmptyLineAfterAccessModifier = FormatStyle::ELAAMS_Always;
-  verifyFormat("struct foo {\n"
-               "private:\n"
-               "\n"
-               "protected:\n"
-               "};\n",
-               Style);
-
-  Style.MaxEmptyLinesToKeep = 10u;
-  // Both remove all new lines.
-  Style.EmptyLineBeforeAccessModifier = FormatStyle::ELBAMS_Never;
-  Style.EmptyLineAfterAccessModifier = FormatStyle::ELAAMS_Never;
-  verifyFormat("struct foo {\n"
-               "private:\n"
-               "protected:\n"
-               "};\n",
-               "struct foo {\n"
-               "private:\n"
-               "\n\n\n"
-               "protected:\n"
-               "};\n",
-               Style);
-
-  // Leave tests rely on the code layout, test::messUp can not be used.
-  Style.EmptyLineBeforeAccessModifier = FormatStyle::ELBAMS_Leave;
-  Style.EmptyLineAfterAccessModifier = FormatStyle::ELAAMS_Leave;
-  Style.MaxEmptyLinesToKeep = 10u;
-  EXPECT_EQ("struct foo {\n"
-            "private:\n"
-            "\n\n\n"
-            "protected:\n"
-            "};\n",
-            format("struct foo {\n"
-                   "private:\n"
-                   "\n\n\n"
-                   "protected:\n"
-                   "};\n",
-                   Style));
-  Style.MaxEmptyLinesToKeep = 3u;
-  EXPECT_EQ("struct foo {\n"
-            "private:\n"
-            "\n\n\n"
-            "protected:\n"
-            "};\n",
-            format("struct foo {\n"
-                   "private:\n"
-                   "\n\n\n"
-                   "protected:\n"
-                   "};\n",
-                   Style));
-  Style.MaxEmptyLinesToKeep = 1u;
-  EXPECT_EQ("struct foo {\n"
-            "private:\n"
-            "\n\n\n"
-            "protected:\n"
-            "};\n",
-            format("struct foo {\n"
-                   "private:\n"
-                   "\n\n\n"
-                   "protected:\n"
-                   "};\n",
-                   Style)); // Based on new lines in original document and not
-                            // on the setting.
-
-  Style.MaxEmptyLinesToKeep = 10u;
-  Style.EmptyLineBeforeAccessModifier = FormatStyle::ELBAMS_Always;
-  Style.EmptyLineAfterAccessModifier = FormatStyle::ELAAMS_Leave;
-  // Newlines are kept if they are greater than zero,
-  // test::messUp removes all new lines which changes the logic
-  EXPECT_EQ("struct foo {\n"
-            "private:\n"
-            "\n\n\n"
-            "protected:\n"
-            "};\n",
-            format("struct foo {\n"
-                   "private:\n"
-                   "\n\n\n"
-                   "protected:\n"
-                   "};\n",
-                   Style));
-
-  Style.EmptyLineBeforeAccessModifier = FormatStyle::ELBAMS_Leave;
-  Style.EmptyLineAfterAccessModifier = FormatStyle::ELAAMS_Always;
-  // test::messUp removes all new lines which changes the logic
-  EXPECT_EQ("struct foo {\n"
-            "private:\n"
-            "\n\n\n"
-            "protected:\n"
-            "};\n",
-            format("struct foo {\n"
-                   "private:\n"
-                   "\n\n\n"
-                   "protected:\n"
-                   "};\n",
-                   Style));
-
-  Style.EmptyLineBeforeAccessModifier = FormatStyle::ELBAMS_Leave;
-  Style.EmptyLineAfterAccessModifier = FormatStyle::ELAAMS_Never;
-  EXPECT_EQ("struct foo {\n"
-            "private:\n"
-            "\n\n\n"
-            "protected:\n"
-            "};\n",
-            format("struct foo {\n"
-                   "private:\n"
-                   "\n\n\n"
-                   "protected:\n"
-                   "};\n",
-                   Style)); // test::messUp removes all new lines which changes
-                            // the logic.
-
-  Style.EmptyLineBeforeAccessModifier = FormatStyle::ELBAMS_Never;
-  Style.EmptyLineAfterAccessModifier = FormatStyle::ELAAMS_Leave;
-  verifyFormat("struct foo {\n"
-               "private:\n"
-               "protected:\n"
-               "};\n",
-               "struct foo {\n"
-               "private:\n"
-               "\n\n\n"
-               "protected:\n"
-               "};\n",
-               Style);
-
-  Style.EmptyLineBeforeAccessModifier = FormatStyle::ELBAMS_Always;
-  Style.EmptyLineAfterAccessModifier = FormatStyle::ELAAMS_Never;
-  EXPECT_EQ("struct foo {\n"
-            "private:\n"
-            "\n\n\n"
-            "protected:\n"
-            "};\n",
-            format("struct foo {\n"
-                   "private:\n"
-                   "\n\n\n"
-                   "protected:\n"
-                   "};\n",
-                   Style)); // test::messUp removes all new lines which changes
-                            // the logic.
-
-  Style.EmptyLineBeforeAccessModifier = FormatStyle::ELBAMS_Never;
-  Style.EmptyLineAfterAccessModifier = FormatStyle::ELAAMS_Always;
-  verifyFormat("struct foo {\n"
-               "private:\n"
-               "protected:\n"
-               "};\n",
-               "struct foo {\n"
-               "private:\n"
-               "\n\n\n"
-               "protected:\n"
-               "};\n",
-               Style);
-
-  Style.EmptyLineBeforeAccessModifier = FormatStyle::ELBAMS_LogicalBlock;
-  Style.EmptyLineAfterAccessModifier = FormatStyle::ELAAMS_Always;
-  verifyFormat("struct foo {\n"
-               "private:\n"
-               "protected:\n"
-               "};\n",
-               "struct foo {\n"
-               "private:\n"
-               "\n\n\n"
-               "protected:\n"
-               "};\n",
-               Style);
-
-  Style.EmptyLineBeforeAccessModifier = FormatStyle::ELBAMS_LogicalBlock;
-  Style.EmptyLineAfterAccessModifier = FormatStyle::ELAAMS_Leave;
-  verifyFormat("struct foo {\n"
-               "private:\n"
-               "protected:\n"
-               "};\n",
-               "struct foo {\n"
-               "private:\n"
-               "\n\n\n"
-               "protected:\n"
-               "};\n",
-               Style);
-
-  Style.EmptyLineBeforeAccessModifier = FormatStyle::ELBAMS_LogicalBlock;
-  Style.EmptyLineAfterAccessModifier = FormatStyle::ELAAMS_Never;
-  verifyFormat("struct foo {\n"
-               "private:\n"
-               "protected:\n"
-               "};\n",
-               "struct foo {\n"
-               "private:\n"
-               "\n\n\n"
-               "protected:\n"
-               "};\n",
-               Style);
-}
-
-TEST_F(FormatTest, FormatsArrays) {
-  verifyFormat("aaaaaaaaaaaaaaaaaaaaaaaaa[aaaaaaaaaaaaaaaaaaaaaaaaa]\n"
-               "                         [bbbbbbbbbbbbbbbbbbbbbbbbb] = c;");
-  verifyFormat("aaaaaaaaaaaaaaaaaaaaaaaaa[aaaaaaaaaaa(aaaaaaaaaaaa)]\n"
-               "                         [bbbbbbbbbbb(bbbbbbbbbbbb)] = c;");
-  verifyFormat("if (aaaaaaaaaaaaaaaaaaaaaaaa &&\n"
-               "    aaaaaaaaaaaaaaaaaaa[aaaaaaaaaaaaa][aaaaaaaaaaaaa]) {\n}");
-  verifyFormat("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-               "    [bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb] = ccccccccccc;");
-  verifyFormat("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-               "    [a][bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb] = cccccccc;");
-  verifyFormat("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-               "    [aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa]\n"
-               "    [bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb] = ccccccccccc;");
-  verifyFormat(
-      "llvm::outs() << \"aaaaaaaaaaaa: \"\n"
-      "             << (*aaaaaaaiaaaaaaa)[aaaaaaaaaaaaaaaaaaaaaaaaa]\n"
-      "                                  [aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa];");
-  verifyFormat("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa[aaaaaaaaaaaaaaaaa][a]\n"
-               "    .aaaaaaaaaaaaaaaaaaaaaa();");
-
-  verifyGoogleFormat("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa<int>\n"
-                     "    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa[aaaaaaaaaaaa];");
-  verifyFormat(
-      "aaaaaaaaaaa aaaaaaaaaaaaaaa = aaaaaaaaaaaaaaaaaaaaaaaaaa->aaaaaaaaa[0]\n"
-      "                                  .aaaaaaa[0]\n"
-      "                                  .aaaaaaaaaaaaaaaaaaaaaa();");
-  verifyFormat("a[::b::c];");
-
-  verifyNoCrash("a[,Y?)]", getLLVMStyleWithColumns(10));
-
-  FormatStyle NoColumnLimit = getLLVMStyleWithColumns(0);
-  verifyFormat("aaaaa[bbbbbb].cccccc()", NoColumnLimit);
-}
-
-TEST_F(FormatTest, LineStartsWithSpecialCharacter) {
-  verifyFormat("(a)->b();");
-  verifyFormat("--a;");
-}
-
-TEST_F(FormatTest, HandlesIncludeDirectives) {
-  verifyFormat("#include <string>\n"
-               "#include <a/b/c.h>\n"
-               "#include \"a/b/string\"\n"
-               "#include \"string.h\"\n"
-               "#include \"string.h\"\n"
-               "#include <a-a>\n"
-               "#include < path with space >\n"
-               "#include_next <test.h>"
-               "#include \"abc.h\" // this is included for ABC\n"
-               "#include \"some long include\" // with a comment\n"
-               "#include \"some very long include path\"\n"
-               "#include <some/very/long/include/path>\n",
-               getLLVMStyleWithColumns(35));
-  EXPECT_EQ("#include \"a.h\"", format("#include  \"a.h\""));
-  EXPECT_EQ("#include <a>", format("#include<a>"));
-
-  verifyFormat("#import <string>");
-  verifyFormat("#import <a/b/c.h>");
-  verifyFormat("#import \"a/b/string\"");
-  verifyFormat("#import \"string.h\"");
-  verifyFormat("#import \"string.h\"");
-  verifyFormat("#if __has_include(<strstream>)\n"
-               "#include <strstream>\n"
-               "#endif");
-
-  verifyFormat("#define MY_IMPORT <a/b>");
-
-  verifyFormat("#if __has_include(<a/b>)");
-  verifyFormat("#if __has_include_next(<a/b>)");
-  verifyFormat("#define F __has_include(<a/b>)");
-  verifyFormat("#define F __has_include_next(<a/b>)");
-
-  // Protocol buffer definition or missing "#".
-  verifyFormat("import \"aaaaaaaaaaaaaaaaa/aaaaaaaaaaaaaaa\";",
-               getLLVMStyleWithColumns(30));
-
-  FormatStyle Style = getLLVMStyle();
-  Style.AlwaysBreakBeforeMultilineStrings = true;
-  Style.ColumnLimit = 0;
-  verifyFormat("#import \"abc.h\"", Style);
-
-  // But 'import' might also be a regular C++ namespace.
-  verifyFormat("import::SomeFunction(aaaaaaaaaaaaaaaaaaaaaaaaaaa,\n"
-               "                     aaaaaaaaaaaaaaaaaaaaaaaaaaaaa);");
-}
-
-//===----------------------------------------------------------------------===//
-// Error recovery tests.
-//===----------------------------------------------------------------------===//
-
-TEST_F(FormatTest, IncompleteParameterLists) {
-  FormatStyle NoBinPacking = getLLVMStyle();
-  NoBinPacking.BinPackParameters = false;
-  verifyFormat("void aaaaaaaaaaaaaaaaaa(int level,\n"
-               "                        double *min_x,\n"
-               "                        double *max_x,\n"
-               "                        double *min_y,\n"
-               "                        double *max_y,\n"
-               "                        double *min_z,\n"
-               "                        double *max_z, ) {}",
-               NoBinPacking);
-}
-
-TEST_F(FormatTest, IncorrectCodeTrailingStuff) {
-  verifyFormat("void f() { return; }\n42");
-  verifyFormat("void f() {\n"
-               "  if (0)\n"
-               "    return;\n"
-               "}\n"
-               "42");
-  verifyFormat("void f() { return }\n42");
-  verifyFormat("void f() {\n"
-               "  if (0)\n"
-               "    return\n"
-               "}\n"
-               "42");
-}
-
-TEST_F(FormatTest, IncorrectCodeMissingSemicolon) {
-  EXPECT_EQ("void f() { return }", format("void  f ( )  {  return  }"));
-  EXPECT_EQ("void f() {\n"
-            "  if (a)\n"
-            "    return\n"
-            "}",
-            format("void  f  (  )  {  if  ( a )  return  }"));
-  EXPECT_EQ("namespace N {\n"
-            "void f()\n"
-            "}",
-            format("namespace  N  {  void f()  }"));
-  EXPECT_EQ("namespace N {\n"
-            "void f() {}\n"
-            "void g()\n"
-            "} // namespace N",
-            format("namespace N  { void f( ) { } void g( ) }"));
-}
-
-TEST_F(FormatTest, IndentationWithinColumnLimitNotPossible) {
-  verifyFormat("int aaaaaaaa =\n"
-               "    // Overlylongcomment\n"
-               "    b;",
-               getLLVMStyleWithColumns(20));
-  verifyFormat("function(\n"
-               "    ShortArgument,\n"
-               "    LoooooooooooongArgument);\n",
-               getLLVMStyleWithColumns(20));
-}
-
-TEST_F(FormatTest, IncorrectAccessSpecifier) {
-  verifyFormat("public:");
-  verifyFormat("class A {\n"
-               "public\n"
-               "  void f() {}\n"
-               "};");
-  verifyFormat("public\n"
-               "int qwerty;");
-  verifyFormat("public\n"
-               "B {}");
-  verifyFormat("public\n"
-               "{}");
-  verifyFormat("public\n"
-               "B { int x; }");
-}
-
-TEST_F(FormatTest, IncorrectCodeUnbalancedBraces) {
-  verifyFormat("{");
-  verifyFormat("#})");
-  verifyNoCrash("(/**/[:!] ?[).");
-}
-
-TEST_F(FormatTest, IncorrectUnbalancedBracesInMacrosWithUnicode) {
-  // Found by oss-fuzz:
-  // https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8212
-  FormatStyle Style = getGoogleStyle(FormatStyle::LK_Cpp);
-  Style.ColumnLimit = 60;
-  verifyNoCrash(
-      "\x23\x47\xff\x20\x28\xff\x3c\xff\x3f\xff\x20\x2f\x7b\x7a\xff\x20"
-      "\xff\xff\xff\xca\xb5\xff\xff\xff\xff\x3a\x7b\x7d\xff\x20\xff\x20"
-      "\xff\x74\xff\x20\x7d\x7d\xff\x7b\x3a\xff\x20\x71\xff\x20\xff\x0a",
-      Style);
-}
-
-TEST_F(FormatTest, IncorrectCodeDoNoWhile) {
-  verifyFormat("do {\n}");
-  verifyFormat("do {\n}\n"
-               "f();");
-  verifyFormat("do {\n}\n"
-               "wheeee(fun);");
-  verifyFormat("do {\n"
-               "  f();\n"
-               "}");
-}
-
-TEST_F(FormatTest, IncorrectCodeMissingParens) {
-  verifyFormat("if {\n  foo;\n  foo();\n}");
-  verifyFormat("switch {\n  foo;\n  foo();\n}");
-  verifyIncompleteFormat("for {\n  foo;\n  foo();\n}");
-  verifyFormat("while {\n  foo;\n  foo();\n}");
-  verifyFormat("do {\n  foo;\n  foo();\n} while;");
-}
-
-TEST_F(FormatTest, DoesNotTouchUnwrappedLinesWithErrors) {
-  verifyIncompleteFormat("namespace {\n"
-                         "class Foo { Foo (\n"
-                         "};\n"
-                         "} // namespace");
-}
-
-TEST_F(FormatTest, IncorrectCodeErrorDetection) {
-  EXPECT_EQ("{\n  {}\n", format("{\n{\n}\n"));
-  EXPECT_EQ("{\n  {}\n", format("{\n  {\n}\n"));
-  EXPECT_EQ("{\n  {}\n", format("{\n  {\n  }\n"));
-  EXPECT_EQ("{\n  {}\n}\n}\n", format("{\n  {\n    }\n  }\n}\n"));
-
-  EXPECT_EQ("{\n"
-            "  {\n"
-            "    breakme(\n"
-            "        qwe);\n"
-            "  }\n",
-            format("{\n"
-                   "    {\n"
-                   " breakme(qwe);\n"
-                   "}\n",
-                   getLLVMStyleWithColumns(10)));
-}
-
-TEST_F(FormatTest, LayoutCallsInsideBraceInitializers) {
-  verifyFormat("int x = {\n"
-               "    avariable,\n"
-               "    b(alongervariable)};",
-               getLLVMStyleWithColumns(25));
-}
-
-TEST_F(FormatTest, LayoutBraceInitializersInReturnStatement) {
-  verifyFormat("return (a)(b){1, 2, 3};");
-}
-
-TEST_F(FormatTest, LayoutCxx11BraceInitializers) {
-  verifyFormat("vector<int> x{1, 2, 3, 4};");
-  verifyFormat("vector<int> x{\n"
-               "    1,\n"
-               "    2,\n"
-               "    3,\n"
-               "    4,\n"
-               "};");
-  verifyFormat("vector<T> x{{}, {}, {}, {}};");
-  verifyFormat("f({1, 2});");
-  verifyFormat("auto v = Foo{-1};");
-  verifyFormat("f({1, 2}, {{2, 3}, {4, 5}}, c, {d});");
-  verifyFormat("Class::Class : member{1, 2, 3} {}");
-  verifyFormat("new vector<int>{1, 2, 3};");
-  verifyFormat("new int[3]{1, 2, 3};");
-  verifyFormat("new int{1};");
-  verifyFormat("return {arg1, arg2};");
-  verifyFormat("return {arg1, SomeType{parameter}};");
-  verifyFormat("int count = set<int>{f(), g(), h()}.size();");
-  verifyFormat("new T{arg1, arg2};");
-  verifyFormat("f(MyMap[{composite, key}]);");
-  verifyFormat("class Class {\n"
-               "  T member = {arg1, arg2};\n"
-               "};");
-  verifyFormat("vector<int> foo = {::SomeGlobalFunction()};");
-  verifyFormat("const struct A a = {.a = 1, .b = 2};");
-  verifyFormat("const struct A a = {[0] = 1, [1] = 2};");
-  verifyFormat("static_assert(std::is_integral<int>{} + 0, \"\");");
-  verifyFormat("int a = std::is_integral<int>{} + 0;");
-
-  verifyFormat("int foo(int i) { return fo1{}(i); }");
-  verifyFormat("int foo(int i) { return fo1{}(i); }");
-  verifyFormat("auto i = decltype(x){};");
-  verifyFormat("auto i = typeof(x){};");
-  verifyFormat("auto i = _Atomic(x){};");
-  verifyFormat("std::vector<int> v = {1, 0 /* comment */};");
-  verifyFormat("Node n{1, Node{1000}, //\n"
-               "       2};");
-  verifyFormat("Aaaa aaaaaaa{\n"
-               "    {\n"
-               "        aaaa,\n"
-               "    },\n"
-               "};");
-  verifyFormat("class C : public D {\n"
-               "  SomeClass SC{2};\n"
-               "};");
-  verifyFormat("class C : public A {\n"
-               "  class D : public B {\n"
-               "    void f() { int i{2}; }\n"
-               "  };\n"
-               "};");
-  verifyFormat("#define A {a, a},");
-
-  // Avoid breaking between equal sign and opening brace
-  FormatStyle AvoidBreakingFirstArgument = getLLVMStyle();
-  AvoidBreakingFirstArgument.PenaltyBreakBeforeFirstCallParameter = 200;
-  verifyFormat("const std::unordered_map<std::string, int> MyHashTable =\n"
-               "    {{\"aaaaaaaaaaaaaaaaaaaaa\", 0},\n"
-               "     {\"bbbbbbbbbbbbbbbbbbbbb\", 1},\n"
-               "     {\"ccccccccccccccccccccc\", 2}};",
-               AvoidBreakingFirstArgument);
-
-  // Binpacking only if there is no trailing comma
-  verifyFormat("const Aaaaaa aaaaa = {aaaaaaaaaa, bbbbbbbbbb,\n"
-               "                      cccccccccc, dddddddddd};",
-               getLLVMStyleWithColumns(50));
-  verifyFormat("const Aaaaaa aaaaa = {\n"
-               "    aaaaaaaaaaa,\n"
-               "    bbbbbbbbbbb,\n"
-               "    ccccccccccc,\n"
-               "    ddddddddddd,\n"
-               "};",
-               getLLVMStyleWithColumns(50));
-
-  // Cases where distinguising braced lists and blocks is hard.
-  verifyFormat("vector<int> v{12} GUARDED_BY(mutex);");
-  verifyFormat("void f() {\n"
-               "  return; // comment\n"
-               "}\n"
-               "SomeType t;");
-  verifyFormat("void f() {\n"
-               "  if (a) {\n"
-               "    f();\n"
-               "  }\n"
-               "}\n"
-               "SomeType t;");
-
-  // In combination with BinPackArguments = false.
-  FormatStyle NoBinPacking = getLLVMStyle();
-  NoBinPacking.BinPackArguments = false;
-  verifyFormat("const Aaaaaa aaaaa = {aaaaa,\n"
-               "                      bbbbb,\n"
-               "                      ccccc,\n"
-               "                      ddddd,\n"
-               "                      eeeee,\n"
-               "                      ffffff,\n"
-               "                      ggggg,\n"
-               "                      hhhhhh,\n"
-               "                      iiiiii,\n"
-               "                      jjjjjj,\n"
-               "                      kkkkkk};",
-               NoBinPacking);
-  verifyFormat("const Aaaaaa aaaaa = {\n"
-               "    aaaaa,\n"
-               "    bbbbb,\n"
-               "    ccccc,\n"
-               "    ddddd,\n"
-               "    eeeee,\n"
-               "    ffffff,\n"
-               "    ggggg,\n"
-               "    hhhhhh,\n"
-               "    iiiiii,\n"
-               "    jjjjjj,\n"
-               "    kkkkkk,\n"
-               "};",
-               NoBinPacking);
-  verifyFormat(
-      "const Aaaaaa aaaaa = {\n"
-      "    aaaaa,  bbbbb,  ccccc,  ddddd,  eeeee,  ffffff, ggggg, hhhhhh,\n"
-      "    iiiiii, jjjjjj, kkkkkk, aaaaa,  bbbbb,  ccccc,  ddddd, eeeee,\n"
-      "    ffffff, ggggg,  hhhhhh, iiiiii, jjjjjj, kkkkkk,\n"
-      "};",
-      NoBinPacking);
-
-  NoBinPacking.AlignAfterOpenBracket = FormatStyle::BAS_AlwaysBreak;
-  EXPECT_EQ("static uint8 CddDp83848Reg[] = {\n"
-            "    CDDDP83848_BMCR_REGISTER,\n"
-            "    CDDDP83848_BMSR_REGISTER,\n"
-            "    CDDDP83848_RBR_REGISTER};",
-            format("static uint8 CddDp83848Reg[] = {CDDDP83848_BMCR_REGISTER,\n"
-                   "                                CDDDP83848_BMSR_REGISTER,\n"
-                   "                                CDDDP83848_RBR_REGISTER};",
-                   NoBinPacking));
-
-  // FIXME: The alignment of these trailing comments might be bad. Then again,
-  // this might be utterly useless in real code.
-  verifyFormat("Constructor::Constructor()\n"
-               "    : some_value{         //\n"
-               "                 aaaaaaa, //\n"
-               "                 bbbbbbb} {}");
-
-  // In braced lists, the first comment is always assumed to belong to the
-  // first element. Thus, it can be moved to the next or previous line as
-  // appropriate.
-  EXPECT_EQ("function({// First element:\n"
-            "          1,\n"
-            "          // Second element:\n"
-            "          2});",
-            format("function({\n"
-                   "    // First element:\n"
-                   "    1,\n"
-                   "    // Second element:\n"
-                   "    2});"));
-  EXPECT_EQ("std::vector<int> MyNumbers{\n"
-            "    // First element:\n"
-            "    1,\n"
-            "    // Second element:\n"
-            "    2};",
-            format("std::vector<int> MyNumbers{// First element:\n"
-                   "                           1,\n"
-                   "                           // Second element:\n"
-                   "                           2};",
-                   getLLVMStyleWithColumns(30)));
-  // A trailing comma should still lead to an enforced line break and no
-  // binpacking.
-  EXPECT_EQ("vector<int> SomeVector = {\n"
-            "    // aaa\n"
-            "    1,\n"
-            "    2,\n"
-            "};",
-            format("vector<int> SomeVector = { // aaa\n"
-                   "    1, 2, };"));
-
-  // C++11 brace initializer list l-braces should not be treated any differently
-  // when breaking before lambda bodies is enabled
-  FormatStyle BreakBeforeLambdaBody = getLLVMStyle();
-  BreakBeforeLambdaBody.BreakBeforeBraces = FormatStyle::BS_Custom;
-  BreakBeforeLambdaBody.BraceWrapping.BeforeLambdaBody = true;
-  BreakBeforeLambdaBody.AlwaysBreakBeforeMultilineStrings = true;
-  verifyFormat(
-      "std::runtime_error{\n"
-      "    \"Long string which will force a break onto the next line...\"};",
-      BreakBeforeLambdaBody);
-
-  FormatStyle ExtraSpaces = getLLVMStyle();
-  ExtraSpaces.Cpp11BracedListStyle = false;
-  ExtraSpaces.ColumnLimit = 75;
-  verifyFormat("vector<int> x{ 1, 2, 3, 4 };", ExtraSpaces);
-  verifyFormat("vector<T> x{ {}, {}, {}, {} };", ExtraSpaces);
-  verifyFormat("f({ 1, 2 });", ExtraSpaces);
-  verifyFormat("auto v = Foo{ 1 };", ExtraSpaces);
-  verifyFormat("f({ 1, 2 }, { { 2, 3 }, { 4, 5 } }, c, { d });", ExtraSpaces);
-  verifyFormat("Class::Class : member{ 1, 2, 3 } {}", ExtraSpaces);
-  verifyFormat("new vector<int>{ 1, 2, 3 };", ExtraSpaces);
-  verifyFormat("new int[3]{ 1, 2, 3 };", ExtraSpaces);
-  verifyFormat("return { arg1, arg2 };", ExtraSpaces);
-  verifyFormat("return { arg1, SomeType{ parameter } };", ExtraSpaces);
-  verifyFormat("int count = set<int>{ f(), g(), h() }.size();", ExtraSpaces);
-  verifyFormat("new T{ arg1, arg2 };", ExtraSpaces);
-  verifyFormat("f(MyMap[{ composite, key }]);", ExtraSpaces);
-  verifyFormat("class Class {\n"
-               "  T member = { arg1, arg2 };\n"
-               "};",
-               ExtraSpaces);
-  verifyFormat(
-      "foo = aaaaaaaaaaa ? vector<int>{ aaaaaaaaaaaaaaaaaaaaaaaaaaa,\n"
-      "                                 aaaaaaaaaaaaaaaaaaaa, aaaaa }\n"
-      "                  : vector<int>{ bbbbbbbbbbbbbbbbbbbbbbbbbbb,\n"
-      "                                 bbbbbbbbbbbbbbbbbbbb, bbbbb };",
-      ExtraSpaces);
-  verifyFormat("DoSomethingWithVector({} /* No data */);", ExtraSpaces);
-  verifyFormat("DoSomethingWithVector({ {} /* No data */ }, { { 1, 2 } });",
-               ExtraSpaces);
-  verifyFormat(
-      "someFunction(OtherParam,\n"
-      "             BracedList{ // comment 1 (Forcing interesting break)\n"
-      "                         param1, param2,\n"
-      "                         // comment 2\n"
-      "                         param3, param4 });",
-      ExtraSpaces);
-  verifyFormat(
-      "std::this_thread::sleep_for(\n"
-      "    std::chrono::nanoseconds{ std::chrono::seconds{ 1 } } / 5);",
-      ExtraSpaces);
-  verifyFormat("std::vector<MyValues> aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa{\n"
-               "    aaaaaaa,\n"
-               "    aaaaaaaaaa,\n"
-               "    aaaaa,\n"
-               "    aaaaaaaaaaaaaaa,\n"
-               "    aaa,\n"
-               "    aaaaaaaaaa,\n"
-               "    a,\n"
-               "    aaaaaaaaaaaaaaaaaaaaa,\n"
-               "    aaaaaaaaaaaa,\n"
-               "    aaaaaaaaaaaaaaaaaaa + aaaaaaaaaaaaaaaaaaa,\n"
-               "    aaaaaaa,\n"
-               "    a};");
-  verifyFormat("vector<int> foo = { ::SomeGlobalFunction() };", ExtraSpaces);
-  verifyFormat("const struct A a = { .a = 1, .b = 2 };", ExtraSpaces);
-  verifyFormat("const struct A a = { [0] = 1, [1] = 2 };", ExtraSpaces);
-
-  // Avoid breaking between initializer/equal sign and opening brace
-  ExtraSpaces.PenaltyBreakBeforeFirstCallParameter = 200;
-  verifyFormat("const std::unordered_map<std::string, int> MyHashTable = {\n"
-               "  { \"aaaaaaaaaaaaaaaaaaaaa\", 0 },\n"
-               "  { \"bbbbbbbbbbbbbbbbbbbbb\", 1 },\n"
-               "  { \"ccccccccccccccccccccc\", 2 }\n"
-               "};",
-               ExtraSpaces);
-  verifyFormat("const std::unordered_map<std::string, int> MyHashTable{\n"
-               "  { \"aaaaaaaaaaaaaaaaaaaaa\", 0 },\n"
-               "  { \"bbbbbbbbbbbbbbbbbbbbb\", 1 },\n"
-               "  { \"ccccccccccccccccccccc\", 2 }\n"
-               "};",
-               ExtraSpaces);
-
-  FormatStyle SpaceBeforeBrace = getLLVMStyle();
-  SpaceBeforeBrace.SpaceBeforeCpp11BracedList = true;
-  verifyFormat("vector<int> x {1, 2, 3, 4};", SpaceBeforeBrace);
-  verifyFormat("f({}, {{}, {}}, MyMap[{k, v}]);", SpaceBeforeBrace);
-
-  FormatStyle SpaceBetweenBraces = getLLVMStyle();
-  SpaceBetweenBraces.SpacesInAngles = FormatStyle::SIAS_Always;
-  SpaceBetweenBraces.SpacesInParentheses = true;
-  SpaceBetweenBraces.SpacesInSquareBrackets = true;
-  verifyFormat("vector< int > x{ 1, 2, 3, 4 };", SpaceBetweenBraces);
-  verifyFormat("f( {}, { {}, {} }, MyMap[ { k, v } ] );", SpaceBetweenBraces);
-  verifyFormat("vector< int > x{ // comment 1\n"
-               "                 1, 2, 3, 4 };",
-               SpaceBetweenBraces);
-  SpaceBetweenBraces.ColumnLimit = 20;
-  EXPECT_EQ("vector< int > x{\n"
-            "    1, 2, 3, 4 };",
-            format("vector<int>x{1,2,3,4};", SpaceBetweenBraces));
-  SpaceBetweenBraces.ColumnLimit = 24;
-  EXPECT_EQ("vector< int > x{ 1, 2,\n"
-            "                 3, 4 };",
-            format("vector<int>x{1,2,3,4};", SpaceBetweenBraces));
-  EXPECT_EQ("vector< int > x{\n"
-            "    1,\n"
-            "    2,\n"
-            "    3,\n"
-            "    4,\n"
-            "};",
-            format("vector<int>x{1,2,3,4,};", SpaceBetweenBraces));
-  verifyFormat("vector< int > x{};", SpaceBetweenBraces);
-  SpaceBetweenBraces.SpaceInEmptyParentheses = true;
-  verifyFormat("vector< int > x{ };", SpaceBetweenBraces);
-}
-
-TEST_F(FormatTest, FormatsBracedListsInColumnLayout) {
-  verifyFormat("vector<int> x = {1, 22, 333, 4444, 55555, 666666, 7777777,\n"
-               "                 1, 22, 333, 4444, 55555, 666666, 7777777,\n"
-               "                 1, 22, 333, 4444, 55555, 666666, 7777777,\n"
-               "                 1, 22, 333, 4444, 55555, 666666, 7777777,\n"
-               "                 1, 22, 333, 4444, 55555, 666666, 7777777,\n"
-               "                 1, 22, 333, 4444, 55555, 666666, 7777777};");
-  verifyFormat("vector<int> x = {1, 22, 333, 4444, 55555, 666666, 7777777, //\n"
-               "                 1, 22, 333, 4444, 55555, 666666, 7777777,\n"
-               "                 1, 22, 333, 4444, 55555, //\n"
-               "                 1, 22, 333, 4444, 55555, 666666, 7777777,\n"
-               "                 1, 22, 333, 4444, 55555, 666666, 7777777};");
-  verifyFormat(
-      "vector<int> x = {1,       22, 333, 4444, 55555, 666666, 7777777,\n"
-      "                 1,       22, 333, 4444, 55555, 666666, 7777777,\n"
-      "                 1,       22, 333, 4444, 55555, 666666, // comment\n"
-      "                 7777777, 1,  22,  333,  4444,  55555,  666666,\n"
-      "                 7777777, 1,  22,  333,  4444,  55555,  666666,\n"
-      "                 7777777, 1,  22,  333,  4444,  55555,  666666,\n"
-      "                 7777777};");
-  verifyFormat("static const uint16_t CallerSavedRegs64Bittttt[] = {\n"
-               "    X86::RAX, X86::RDX, X86::RCX, X86::RSI, X86::RDI,\n"
-               "    X86::R8,  X86::R9,  X86::R10, X86::R11, 0};");
-  verifyFormat("static const uint16_t CallerSavedRegs64Bittttt[] = {\n"
-               "    X86::RAX, X86::RDX, X86::RCX, X86::RSI, X86::RDI,\n"
-               "    // Separating comment.\n"
-               "    X86::R8, X86::R9, X86::R10, X86::R11, 0};");
-  verifyFormat("static const uint16_t CallerSavedRegs64Bittttt[] = {\n"
-               "    // Leading comment\n"
-               "    X86::RAX, X86::RDX, X86::RCX, X86::RSI, X86::RDI,\n"
-               "    X86::R8,  X86::R9,  X86::R10, X86::R11, 0};");
-  verifyFormat("vector<int> x = {1, 1, 1, 1,\n"
-               "                 1, 1, 1, 1};",
-               getLLVMStyleWithColumns(39));
-  verifyFormat("vector<int> x = {1, 1, 1, 1,\n"
-               "                 1, 1, 1, 1};",
-               getLLVMStyleWithColumns(38));
-  verifyFormat("vector<int> aaaaaaaaaaaaaaaaaaaaaa = {\n"
-               "    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1};",
-               getLLVMStyleWithColumns(43));
-  verifyFormat(
-      "static unsigned SomeValues[10][3] = {\n"
-      "    {1, 4, 0},  {4, 9, 0},  {4, 5, 9},  {8, 5, 4}, {1, 8, 4},\n"
-      "    {10, 1, 6}, {11, 0, 9}, {2, 11, 9}, {5, 2, 9}, {11, 2, 7}};");
-  verifyFormat("static auto fields = new vector<string>{\n"
-               "    \"aaaaaaaaaaaaa\",\n"
-               "    \"aaaaaaaaaaaaa\",\n"
-               "    \"aaaaaaaaaaaa\",\n"
-               "    \"aaaaaaaaaaaaaa\",\n"
-               "    \"aaaaaaaaaaaaaaaaaaaaaaaaa\",\n"
-               "    \"aaaaaaaaaaaa\",\n"
-               "    \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",\n"
-               "};");
-  verifyFormat("vector<int> x = {1, 2, 3, 4, aaaaaaaaaaaaaaaaa, 6};");
-  verifyFormat("vector<int> x = {1, aaaaaaaaaaaaaaaaaaaaaa,\n"
-               "                 2, bbbbbbbbbbbbbbbbbbbbbb,\n"
-               "                 3, cccccccccccccccccccccc};",
-               getLLVMStyleWithColumns(60));
-
-  // Trailing commas.
-  verifyFormat("vector<int> x = {\n"
-               "    1, 1, 1, 1, 1, 1, 1, 1,\n"
-               "};",
-               getLLVMStyleWithColumns(39));
-  verifyFormat("vector<int> x = {\n"
-               "    1, 1, 1, 1, 1, 1, 1, 1, //\n"
-               "};",
-               getLLVMStyleWithColumns(39));
-  verifyFormat("vector<int> x = {1, 1, 1, 1,\n"
-               "                 1, 1, 1, 1,\n"
-               "                 /**/ /**/};",
-               getLLVMStyleWithColumns(39));
-
-  // Trailing comment in the first line.
-  verifyFormat("vector<int> iiiiiiiiiiiiiii = {                      //\n"
-               "    1111111111, 2222222222, 33333333333, 4444444444, //\n"
-               "    111111111,  222222222,  3333333333,  444444444,  //\n"
-               "    11111111,   22222222,   333333333,   44444444};");
-  // Trailing comment in the last line.
-  verifyFormat("int aaaaa[] = {\n"
-               "    1, 2, 3, // comment\n"
-               "    4, 5, 6  // comment\n"
-               "};");
-
-  // With nested lists, we should either format one item per line or all nested
-  // lists one on line.
-  // FIXME: For some nested lists, we can do better.
-  verifyFormat("return {{aaaaaaaaaaaaaaaaaaaaa},\n"
-               "        {aaaaaaaaaaaaaaaaaaa},\n"
-               "        {aaaaaaaaaaaaaaaaaaaaa},\n"
-               "        {aaaaaaaaaaaaaaaaa}};",
-               getLLVMStyleWithColumns(60));
-  verifyFormat(
-      "SomeStruct my_struct_array = {\n"
-      "    {aaaaaa, aaaaaaaa, aaaaaaaaaa, aaaaaaaaa, aaaaaaaaa, aaaaaaaaaa,\n"
-      "     aaaaaaaaaaaaa, aaaaaaa, aaa},\n"
-      "    {aaa, aaa},\n"
-      "    {aaa, aaa},\n"
-      "    {aaaa, aaaa, aaaa, aaaa, aaaa, aaaa, aaaa, aaa},\n"
-      "    {aaaaaaaaaaaaaaaaa, aaaaaaaaaaaaaaaaa, aaaaaaaaaaaaaaaaaaaaaaaa,\n"
-      "     aaaaaaaaaaaa, a, aaaaaaaaaa, aaaaaaaaa, aaa}};");
-
-  // No column layout should be used here.
-  verifyFormat("aaaaaaaaaaaaaaa = {aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa, 0, 0,\n"
-               "                   bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb};");
-
-  verifyNoCrash("a<,");
-
-  // No braced initializer here.
-  verifyFormat("void f() {\n"
-               "  struct Dummy {};\n"
-               "  f(v);\n"
-               "}");
-
-  // Long lists should be formatted in columns even if they are nested.
-  verifyFormat(
-      "vector<int> x = function({1, 22, 333, 4444, 55555, 666666, 7777777,\n"
-      "                          1, 22, 333, 4444, 55555, 666666, 7777777,\n"
-      "                          1, 22, 333, 4444, 55555, 666666, 7777777,\n"
-      "                          1, 22, 333, 4444, 55555, 666666, 7777777,\n"
-      "                          1, 22, 333, 4444, 55555, 666666, 7777777,\n"
-      "                          1, 22, 333, 4444, 55555, 666666, 7777777});");
-
-  // Allow "single-column" layout even if that violates the column limit. There
-  // isn't going to be a better way.
-  verifyFormat("std::vector<int> a = {\n"
-               "    aaaaaaaa,\n"
-               "    aaaaaaaa,\n"
-               "    aaaaaaaa,\n"
-               "    aaaaaaaa,\n"
-               "    aaaaaaaaaa,\n"
-               "    aaaaaaaa,\n"
-               "    aaaaaaaaaaaaaaaaaaaaaaaaaaa};",
-               getLLVMStyleWithColumns(30));
-  verifyFormat("vector<int> aaaa = {\n"
-               "    aaaaaa.aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,\n"
-               "    aaaaaa.aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,\n"
-               "    aaaaaa.aaaaaaa,\n"
-               "    aaaaaa.aaaaaaa,\n"
-               "    aaaaaa.aaaaaaa,\n"
-               "    aaaaaa.aaaaaaa,\n"
-               "};");
-
-  // Don't create hanging lists.
-  verifyFormat("someFunction(Param, {List1, List2,\n"
-               "                     List3});",
-               getLLVMStyleWithColumns(35));
-  verifyFormat("someFunction(Param, Param,\n"
-               "             {List1, List2,\n"
-               "              List3});",
-               getLLVMStyleWithColumns(35));
-  verifyFormat("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaaaaaa, {},\n"
-               "                               aaaaaaaaaaaaaaaaaaaaaaa);");
-}
-
-TEST_F(FormatTest, PullTrivialFunctionDefinitionsIntoSingleLine) {
-  FormatStyle DoNotMerge = getLLVMStyle();
-  DoNotMerge.AllowShortFunctionsOnASingleLine = FormatStyle::SFS_None;
-
-  verifyFormat("void f() { return 42; }");
-  verifyFormat("void f() {\n"
-               "  return 42;\n"
-               "}",
-               DoNotMerge);
-  verifyFormat("void f() {\n"
-               "  // Comment\n"
-               "}");
-  verifyFormat("{\n"
-               "#error {\n"
-               "  int a;\n"
-               "}");
-  verifyFormat("{\n"
-               "  int a;\n"
-               "#error {\n"
-               "}");
-  verifyFormat("void f() {} // comment");
-  verifyFormat("void f() { int a; } // comment");
-  verifyFormat("void f() {\n"
-               "} // comment",
-               DoNotMerge);
-  verifyFormat("void f() {\n"
-               "  int a;\n"
-               "} // comment",
-               DoNotMerge);
-  verifyFormat("void f() {\n"
-               "} // comment",
-               getLLVMStyleWithColumns(15));
-
-  verifyFormat("void f() { return 42; }", getLLVMStyleWithColumns(23));
-  verifyFormat("void f() {\n  return 42;\n}", getLLVMStyleWithColumns(22));
-
-  verifyFormat("void f() {}", getLLVMStyleWithColumns(11));
-  verifyFormat("void f() {\n}", getLLVMStyleWithColumns(10));
-  verifyFormat("class C {\n"
-               "  C()\n"
-               "      : iiiiiiii(nullptr),\n"
-               "        kkkkkkk(nullptr),\n"
-               "        mmmmmmm(nullptr),\n"
-               "        nnnnnnn(nullptr) {}\n"
-               "};",
-               getGoogleStyle());
-
-  FormatStyle NoColumnLimit = getLLVMStyle();
-  NoColumnLimit.ColumnLimit = 0;
-  EXPECT_EQ("A() : b(0) {}", format("A():b(0){}", NoColumnLimit));
-  EXPECT_EQ("class C {\n"
-            "  A() : b(0) {}\n"
-            "};",
-            format("class C{A():b(0){}};", NoColumnLimit));
-  EXPECT_EQ("A()\n"
-            "    : b(0) {\n"
-            "}",
-            format("A()\n:b(0)\n{\n}", NoColumnLimit));
-
-  FormatStyle DoNotMergeNoColumnLimit = NoColumnLimit;
-  DoNotMergeNoColumnLimit.AllowShortFunctionsOnASingleLine =
-      FormatStyle::SFS_None;
-  EXPECT_EQ("A()\n"
-            "    : b(0) {\n"
-            "}",
-            format("A():b(0){}", DoNotMergeNoColumnLimit));
-  EXPECT_EQ("A()\n"
-            "    : b(0) {\n"
-            "}",
-            format("A()\n:b(0)\n{\n}", DoNotMergeNoColumnLimit));
-
-  verifyFormat("#define A          \\\n"
-               "  void f() {       \\\n"
-               "    int i;         \\\n"
-               "  }",
-               getLLVMStyleWithColumns(20));
-  verifyFormat("#define A           \\\n"
-               "  void f() { int i; }",
-               getLLVMStyleWithColumns(21));
-  verifyFormat("#define A            \\\n"
-               "  void f() {         \\\n"
-               "    int i;           \\\n"
-               "  }                  \\\n"
-               "  int j;",
-               getLLVMStyleWithColumns(22));
-  verifyFormat("#define A             \\\n"
-               "  void f() { int i; } \\\n"
-               "  int j;",
-               getLLVMStyleWithColumns(23));
-}
-
-TEST_F(FormatTest, PullEmptyFunctionDefinitionsIntoSingleLine) {
-  FormatStyle MergeEmptyOnly = getLLVMStyle();
-  MergeEmptyOnly.AllowShortFunctionsOnASingleLine = FormatStyle::SFS_Empty;
-  verifyFormat("class C {\n"
-               "  int f() {}\n"
-               "};",
-               MergeEmptyOnly);
-  verifyFormat("class C {\n"
-               "  int f() {\n"
-               "    return 42;\n"
-               "  }\n"
-               "};",
-               MergeEmptyOnly);
-  verifyFormat("int f() {}", MergeEmptyOnly);
-  verifyFormat("int f() {\n"
-               "  return 42;\n"
-               "}",
-               MergeEmptyOnly);
-
-  // Also verify behavior when BraceWrapping.AfterFunction = true
-  MergeEmptyOnly.BreakBeforeBraces = FormatStyle::BS_Custom;
-  MergeEmptyOnly.BraceWrapping.AfterFunction = true;
-  verifyFormat("int f() {}", MergeEmptyOnly);
-  verifyFormat("class C {\n"
-               "  int f() {}\n"
-               "};",
-               MergeEmptyOnly);
-}
-
-TEST_F(FormatTest, PullInlineFunctionDefinitionsIntoSingleLine) {
-  FormatStyle MergeInlineOnly = getLLVMStyle();
-  MergeInlineOnly.AllowShortFunctionsOnASingleLine = FormatStyle::SFS_Inline;
-  verifyFormat("class C {\n"
-               "  int f() { return 42; }\n"
-               "};",
-               MergeInlineOnly);
-  verifyFormat("int f() {\n"
-               "  return 42;\n"
-               "}",
-               MergeInlineOnly);
-
-  // SFS_Inline implies SFS_Empty
-  verifyFormat("class C {\n"
-               "  int f() {}\n"
-               "};",
-               MergeInlineOnly);
-  verifyFormat("int f() {}", MergeInlineOnly);
-
-  // Also verify behavior when BraceWrapping.AfterFunction = true
-  MergeInlineOnly.BreakBeforeBraces = FormatStyle::BS_Custom;
-  MergeInlineOnly.BraceWrapping.AfterFunction = true;
-  verifyFormat("class C {\n"
-               "  int f() { return 42; }\n"
-               "};",
-               MergeInlineOnly);
-  verifyFormat("int f()\n"
-               "{\n"
-               "  return 42;\n"
-               "}",
-               MergeInlineOnly);
-
-  // SFS_Inline implies SFS_Empty
-  verifyFormat("int f() {}", MergeInlineOnly);
-  verifyFormat("class C {\n"
-               "  int f() {}\n"
-               "};",
-               MergeInlineOnly);
-}
-
-TEST_F(FormatTest, PullInlineOnlyFunctionDefinitionsIntoSingleLine) {
-  FormatStyle MergeInlineOnly = getLLVMStyle();
-  MergeInlineOnly.AllowShortFunctionsOnASingleLine =
-      FormatStyle::SFS_InlineOnly;
-  verifyFormat("class C {\n"
-               "  int f() { return 42; }\n"
-               "};",
-               MergeInlineOnly);
-  verifyFormat("int f() {\n"
-               "  return 42;\n"
-               "}",
-               MergeInlineOnly);
-
-  // SFS_InlineOnly does not imply SFS_Empty
-  verifyFormat("class C {\n"
-               "  int f() {}\n"
-               "};",
-               MergeInlineOnly);
-  verifyFormat("int f() {\n"
-               "}",
-               MergeInlineOnly);
-
-  // Also verify behavior when BraceWrapping.AfterFunction = true
-  MergeInlineOnly.BreakBeforeBraces = FormatStyle::BS_Custom;
-  MergeInlineOnly.BraceWrapping.AfterFunction = true;
-  verifyFormat("class C {\n"
-               "  int f() { return 42; }\n"
-               "};",
-               MergeInlineOnly);
-  verifyFormat("int f()\n"
-               "{\n"
-               "  return 42;\n"
-               "}",
-               MergeInlineOnly);
-
-  // SFS_InlineOnly does not imply SFS_Empty
-  verifyFormat("int f()\n"
-               "{\n"
-               "}",
-               MergeInlineOnly);
-  verifyFormat("class C {\n"
-               "  int f() {}\n"
-               "};",
-               MergeInlineOnly);
-}
-
-TEST_F(FormatTest, SplitEmptyFunction) {
-  FormatStyle Style = getLLVMStyle();
-  Style.AllowShortFunctionsOnASingleLine = FormatStyle::SFS_None;
-  Style.BreakBeforeBraces = FormatStyle::BS_Custom;
-  Style.BraceWrapping.AfterFunction = true;
-  Style.BraceWrapping.SplitEmptyFunction = false;
-  Style.ColumnLimit = 40;
-
-  verifyFormat("int f()\n"
-               "{}",
-               Style);
-  verifyFormat("int f()\n"
-               "{\n"
-               "  return 42;\n"
-               "}",
-               Style);
-  verifyFormat("int f()\n"
-               "{\n"
-               "  // some comment\n"
-               "}",
-               Style);
-
-  Style.AllowShortFunctionsOnASingleLine = FormatStyle::SFS_Empty;
-  verifyFormat("int f() {}", Style);
-  verifyFormat("int aaaaaaaaaaaaaa(int bbbbbbbbbbbbbb)\n"
-               "{}",
-               Style);
-  verifyFormat("int f()\n"
-               "{\n"
-               "  return 0;\n"
-               "}",
-               Style);
-
-  Style.AllowShortFunctionsOnASingleLine = FormatStyle::SFS_Inline;
-  verifyFormat("class Foo {\n"
-               "  int f() {}\n"
-               "};\n",
-               Style);
-  verifyFormat("class Foo {\n"
-               "  int f() { return 0; }\n"
-               "};\n",
-               Style);
-  verifyFormat("class Foo {\n"
-               "  int aaaaaaaaaaaaaa(int bbbbbbbbbbbbbb)\n"
-               "  {}\n"
-               "};\n",
-               Style);
-  verifyFormat("class Foo {\n"
-               "  int aaaaaaaaaaaaaa(int bbbbbbbbbbbbbb)\n"
-               "  {\n"
-               "    return 0;\n"
-               "  }\n"
-               "};\n",
-               Style);
-
-  Style.AllowShortFunctionsOnASingleLine = FormatStyle::SFS_All;
-  verifyFormat("int f() {}", Style);
-  verifyFormat("int f() { return 0; }", Style);
-  verifyFormat("int aaaaaaaaaaaaaa(int bbbbbbbbbbbbbb)\n"
-               "{}",
-               Style);
-  verifyFormat("int aaaaaaaaaaaaaa(int bbbbbbbbbbbbbb)\n"
-               "{\n"
-               "  return 0;\n"
-               "}",
-               Style);
-}
-TEST_F(FormatTest, KeepShortFunctionAfterPPElse) {
-  FormatStyle Style = getLLVMStyle();
-  Style.AllowShortFunctionsOnASingleLine = FormatStyle::SFS_All;
-  verifyFormat("#ifdef A\n"
-               "int f() {}\n"
-               "#else\n"
-               "int g() {}\n"
-               "#endif",
-               Style);
-}
-
-TEST_F(FormatTest, SplitEmptyClass) {
-  FormatStyle Style = getLLVMStyle();
-  Style.BreakBeforeBraces = FormatStyle::BS_Custom;
-  Style.BraceWrapping.AfterClass = true;
-  Style.BraceWrapping.SplitEmptyRecord = false;
-
-  verifyFormat("class Foo\n"
-               "{};",
-               Style);
-  verifyFormat("/* something */ class Foo\n"
-               "{};",
-               Style);
-  verifyFormat("template <typename X> class Foo\n"
-               "{};",
-               Style);
-  verifyFormat("class Foo\n"
-               "{\n"
-               "  Foo();\n"
-               "};",
-               Style);
-  verifyFormat("typedef class Foo\n"
-               "{\n"
-               "} Foo_t;",
-               Style);
-
-  Style.BraceWrapping.SplitEmptyRecord = true;
-  Style.BraceWrapping.AfterStruct = true;
-  verifyFormat("class rep\n"
-               "{\n"
-               "};",
-               Style);
-  verifyFormat("struct rep\n"
-               "{\n"
-               "};",
-               Style);
-  verifyFormat("template <typename T> class rep\n"
-               "{\n"
-               "};",
-               Style);
-  verifyFormat("template <typename T> struct rep\n"
-               "{\n"
-               "};",
-               Style);
-  verifyFormat("class rep\n"
-               "{\n"
-               "  int x;\n"
-               "};",
-               Style);
-  verifyFormat("struct rep\n"
-               "{\n"
-               "  int x;\n"
-               "};",
-               Style);
-  verifyFormat("template <typename T> class rep\n"
-               "{\n"
-               "  int x;\n"
-               "};",
-               Style);
-  verifyFormat("template <typename T> struct rep\n"
-               "{\n"
-               "  int x;\n"
-               "};",
-               Style);
-  verifyFormat("template <typename T> class rep // Foo\n"
-               "{\n"
-               "  int x;\n"
-               "};",
-               Style);
-  verifyFormat("template <typename T> struct rep // Bar\n"
-               "{\n"
-               "  int x;\n"
-               "};",
-               Style);
-
-  verifyFormat("template <typename T> class rep<T>\n"
-               "{\n"
-               "  int x;\n"
-               "};",
-               Style);
-
-  verifyFormat("template <typename T> class rep<std::complex<T>>\n"
-               "{\n"
-               "  int x;\n"
-               "};",
-               Style);
-  verifyFormat("template <typename T> class rep<std::complex<T>>\n"
-               "{\n"
-               "};",
-               Style);
-
-  verifyFormat("#include \"stdint.h\"\n"
-               "namespace rep {}",
-               Style);
-  verifyFormat("#include <stdint.h>\n"
-               "namespace rep {}",
-               Style);
-  verifyFormat("#include <stdint.h>\n"
-               "namespace rep {}",
-               "#include <stdint.h>\n"
-               "namespace rep {\n"
-               "\n"
-               "\n"
-               "}",
-               Style);
-}
-
-TEST_F(FormatTest, SplitEmptyStruct) {
-  FormatStyle Style = getLLVMStyle();
-  Style.BreakBeforeBraces = FormatStyle::BS_Custom;
-  Style.BraceWrapping.AfterStruct = true;
-  Style.BraceWrapping.SplitEmptyRecord = false;
-
-  verifyFormat("struct Foo\n"
-               "{};",
-               Style);
-  verifyFormat("/* something */ struct Foo\n"
-               "{};",
-               Style);
-  verifyFormat("template <typename X> struct Foo\n"
-               "{};",
-               Style);
-  verifyFormat("struct Foo\n"
-               "{\n"
-               "  Foo();\n"
-               "};",
-               Style);
-  verifyFormat("typedef struct Foo\n"
-               "{\n"
-               "} Foo_t;",
-               Style);
-  // typedef struct Bar {} Bar_t;
-}
-
-TEST_F(FormatTest, SplitEmptyUnion) {
-  FormatStyle Style = getLLVMStyle();
-  Style.BreakBeforeBraces = FormatStyle::BS_Custom;
-  Style.BraceWrapping.AfterUnion = true;
-  Style.BraceWrapping.SplitEmptyRecord = false;
-
-  verifyFormat("union Foo\n"
-               "{};",
-               Style);
-  verifyFormat("/* something */ union Foo\n"
-               "{};",
-               Style);
-  verifyFormat("union Foo\n"
-               "{\n"
-               "  A,\n"
-               "};",
-               Style);
-  verifyFormat("typedef union Foo\n"
-               "{\n"
-               "} Foo_t;",
-               Style);
-}
-
-TEST_F(FormatTest, SplitEmptyNamespace) {
-  FormatStyle Style = getLLVMStyle();
-  Style.BreakBeforeBraces = FormatStyle::BS_Custom;
-  Style.BraceWrapping.AfterNamespace = true;
-  Style.BraceWrapping.SplitEmptyNamespace = false;
-
-  verifyFormat("namespace Foo\n"
-               "{};",
-               Style);
-  verifyFormat("/* something */ namespace Foo\n"
-               "{};",
-               Style);
-  verifyFormat("inline namespace Foo\n"
-               "{};",
-               Style);
-  verifyFormat("/* something */ inline namespace Foo\n"
-               "{};",
-               Style);
-  verifyFormat("export namespace Foo\n"
-               "{};",
-               Style);
-  verifyFormat("namespace Foo\n"
-               "{\n"
-               "void Bar();\n"
-               "};",
-               Style);
-}
-
-TEST_F(FormatTest, NeverMergeShortRecords) {
-  FormatStyle Style = getLLVMStyle();
-
-  verifyFormat("class Foo {\n"
-               "  Foo();\n"
-               "};",
-               Style);
-  verifyFormat("typedef class Foo {\n"
-               "  Foo();\n"
-               "} Foo_t;",
-               Style);
-  verifyFormat("struct Foo {\n"
-               "  Foo();\n"
-               "};",
-               Style);
-  verifyFormat("typedef struct Foo {\n"
-               "  Foo();\n"
-               "} Foo_t;",
-               Style);
-  verifyFormat("union Foo {\n"
-               "  A,\n"
-               "};",
-               Style);
-  verifyFormat("typedef union Foo {\n"
-               "  A,\n"
-               "} Foo_t;",
-               Style);
-  verifyFormat("namespace Foo {\n"
-               "void Bar();\n"
-               "};",
-               Style);
-
-  Style.BreakBeforeBraces = FormatStyle::BS_Custom;
-  Style.BraceWrapping.AfterClass = true;
-  Style.BraceWrapping.AfterStruct = true;
-  Style.BraceWrapping.AfterUnion = true;
-  Style.BraceWrapping.AfterNamespace = true;
-  verifyFormat("class Foo\n"
-               "{\n"
-               "  Foo();\n"
-               "};",
-               Style);
-  verifyFormat("typedef class Foo\n"
-               "{\n"
-               "  Foo();\n"
-               "} Foo_t;",
-               Style);
-  verifyFormat("struct Foo\n"
-               "{\n"
-               "  Foo();\n"
-               "};",
-               Style);
-  verifyFormat("typedef struct Foo\n"
-               "{\n"
-               "  Foo();\n"
-               "} Foo_t;",
-               Style);
-  verifyFormat("union Foo\n"
-               "{\n"
-               "  A,\n"
-               "};",
-               Style);
-  verifyFormat("typedef union Foo\n"
-               "{\n"
-               "  A,\n"
-               "} Foo_t;",
-               Style);
-  verifyFormat("namespace Foo\n"
-               "{\n"
-               "void Bar();\n"
-               "};",
-               Style);
-}
-
-TEST_F(FormatTest, UnderstandContextOfRecordTypeKeywords) {
-  // Elaborate type variable declarations.
-  verifyFormat("struct foo a = {bar};\nint n;");
-  verifyFormat("class foo a = {bar};\nint n;");
-  verifyFormat("union foo a = {bar};\nint n;");
-
-  // Elaborate types inside function definitions.
-  verifyFormat("struct foo f() {}\nint n;");
-  verifyFormat("class foo f() {}\nint n;");
-  verifyFormat("union foo f() {}\nint n;");
-
-  // Templates.
-  verifyFormat("template <class X> void f() {}\nint n;");
-  verifyFormat("template <struct X> void f() {}\nint n;");
-  verifyFormat("template <union X> void f() {}\nint n;");
-
-  // Actual definitions...
-  verifyFormat("struct {\n} n;");
-  verifyFormat(
-      "template <template <class T, class Y>, class Z> class X {\n} n;");
-  verifyFormat("union Z {\n  int n;\n} x;");
-  verifyFormat("class MACRO Z {\n} n;");
-  verifyFormat("class MACRO(X) Z {\n} n;");
-  verifyFormat("class __attribute__(X) Z {\n} n;");
-  verifyFormat("class __declspec(X) Z {\n} n;");
-  verifyFormat("class A##B##C {\n} n;");
-  verifyFormat("class alignas(16) Z {\n} n;");
-  verifyFormat("class MACRO(X) alignas(16) Z {\n} n;");
-  verifyFormat("class MACROA MACRO(X) Z {\n} n;");
-
-  // Redefinition from nested context:
-  verifyFormat("class A::B::C {\n} n;");
-
-  // Template definitions.
-  verifyFormat(
-      "template <typename F>\n"
-      "Matcher(const Matcher<F> &Other,\n"
-      "        typename enable_if_c<is_base_of<F, T>::value &&\n"
-      "                             !is_same<F, T>::value>::type * = 0)\n"
-      "    : Implementation(new ImplicitCastMatcher<F>(Other)) {}");
-
-  // FIXME: This is still incorrectly handled at the formatter side.
-  verifyFormat("template <> struct X < 15, i<3 && 42 < 50 && 33 < 28> {};");
-  verifyFormat("int i = SomeFunction(a<b, a> b);");
-
-  // FIXME:
-  // This now gets parsed incorrectly as class definition.
-  // verifyFormat("class A<int> f() {\n}\nint n;");
-
-  // Elaborate types where incorrectly parsing the structural element would
-  // break the indent.
-  verifyFormat("if (true)\n"
-               "  class X x;\n"
-               "else\n"
-               "  f();\n");
-
-  // This is simply incomplete. Formatting is not important, but must not crash.
-  verifyFormat("class A:");
-}
-
-TEST_F(FormatTest, DoNotInterfereWithErrorAndWarning) {
-  EXPECT_EQ("#error Leave     all         white!!!!! space* alone!\n",
-            format("#error Leave     all         white!!!!! space* alone!\n"));
-  EXPECT_EQ(
-      "#warning Leave     all         white!!!!! space* alone!\n",
-      format("#warning Leave     all         white!!!!! space* alone!\n"));
-  EXPECT_EQ("#error 1", format("  #  error   1"));
-  EXPECT_EQ("#warning 1", format("  #  warning 1"));
-}
-
-TEST_F(FormatTest, FormatHashIfExpressions) {
-  verifyFormat("#if AAAA && BBBB");
-  verifyFormat("#if (AAAA && BBBB)");
-  verifyFormat("#elif (AAAA && BBBB)");
-  // FIXME: Come up with a better indentation for #elif.
-  verifyFormat(
-      "#if !defined(AAAAAAA) && (defined CCCCCC || defined DDDDDD) &&  \\\n"
-      "    defined(BBBBBBBB)\n"
-      "#elif !defined(AAAAAA) && (defined CCCCC || defined DDDDDD) &&  \\\n"
-      "    defined(BBBBBBBB)\n"
-      "#endif",
-      getLLVMStyleWithColumns(65));
-}
-
-TEST_F(FormatTest, MergeHandlingInTheFaceOfPreprocessorDirectives) {
-  FormatStyle AllowsMergedIf = getGoogleStyle();
-  AllowsMergedIf.AllowShortIfStatementsOnASingleLine =
-      FormatStyle::SIS_WithoutElse;
-  verifyFormat("void f() { f(); }\n#error E", AllowsMergedIf);
-  verifyFormat("if (true) return 42;\n#error E", AllowsMergedIf);
-  verifyFormat("if (true)\n#error E\n  return 42;", AllowsMergedIf);
-  EXPECT_EQ("if (true) return 42;",
-            format("if (true)\nreturn 42;", AllowsMergedIf));
-  FormatStyle ShortMergedIf = AllowsMergedIf;
-  ShortMergedIf.ColumnLimit = 25;
-  verifyFormat("#define A \\\n"
-               "  if (true) return 42;",
-               ShortMergedIf);
-  verifyFormat("#define A \\\n"
-               "  f();    \\\n"
-               "  if (true)\n"
-               "#define B",
-               ShortMergedIf);
-  verifyFormat("#define A \\\n"
-               "  f();    \\\n"
-               "  if (true)\n"
-               "g();",
-               ShortMergedIf);
-  verifyFormat("{\n"
-               "#ifdef A\n"
-               "  // Comment\n"
-               "  if (true) continue;\n"
-               "#endif\n"
-               "  // Comment\n"
-               "  if (true) continue;\n"
-               "}",
-               ShortMergedIf);
-  ShortMergedIf.ColumnLimit = 33;
-  verifyFormat("#define A \\\n"
-               "  if constexpr (true) return 42;",
-               ShortMergedIf);
-  verifyFormat("#define A \\\n"
-               "  if CONSTEXPR (true) return 42;",
-               ShortMergedIf);
-  ShortMergedIf.ColumnLimit = 29;
-  verifyFormat("#define A                   \\\n"
-               "  if (aaaaaaaaaa) return 1; \\\n"
-               "  return 2;",
-               ShortMergedIf);
-  ShortMergedIf.ColumnLimit = 28;
-  verifyFormat("#define A         \\\n"
-               "  if (aaaaaaaaaa) \\\n"
-               "    return 1;     \\\n"
-               "  return 2;",
-               ShortMergedIf);
-  verifyFormat("#define A                \\\n"
-               "  if constexpr (aaaaaaa) \\\n"
-               "    return 1;            \\\n"
-               "  return 2;",
-               ShortMergedIf);
-  verifyFormat("#define A                \\\n"
-               "  if CONSTEXPR (aaaaaaa) \\\n"
-               "    return 1;            \\\n"
-               "  return 2;",
-               ShortMergedIf);
-}
-
-TEST_F(FormatTest, FormatStarDependingOnContext) {
-  verifyFormat("void f(int *a);");
-  verifyFormat("void f() { f(fint * b); }");
-  verifyFormat("class A {\n  void f(int *a);\n};");
-  verifyFormat("class A {\n  int *a;\n};");
-  verifyFormat("namespace a {\n"
-               "namespace b {\n"
-               "class A {\n"
-               "  void f() {}\n"
-               "  int *a;\n"
-               "};\n"
-               "} // namespace b\n"
-               "} // namespace a");
-}
-
-TEST_F(FormatTest, SpecialTokensAtEndOfLine) {
-  verifyFormat("while");
-  verifyFormat("operator");
-}
-
-TEST_F(FormatTest, SkipsDeeplyNestedLines) {
-  // This code would be painfully slow to format if we didn't skip it.
-  std::string Code("A(A(A(A(A(A(A(A(A(A(A(A(A(A(A(A(A(A(A(A(\n" // 20x
-                   "A(A(A(A(A(A(A(A(A(A(A(A(A(A(A(A(A(A(A(A(\n"
-                   "A(A(A(A(A(A(A(A(A(A(A(A(A(A(A(A(A(A(A(A(\n"
-                   "A(A(A(A(A(A(A(A(A(A(A(A(A(A(A(A(A(A(A(A(\n"
-                   "A(A(A(A(A(A(A(A(A(A(A(A(A(A(A(A(A(A(A(A(\n"
-                   "A(1, 1)\n"
-                   ", 1), 1), 1), 1), 1), 1), 1), 1), 1), 1)\n" // 10x
-                   ", 1), 1), 1), 1), 1), 1), 1), 1), 1), 1)\n"
-                   ", 1), 1), 1), 1), 1), 1), 1), 1), 1), 1)\n"
-                   ", 1), 1), 1), 1), 1), 1), 1), 1), 1), 1)\n"
-                   ", 1), 1), 1), 1), 1), 1), 1), 1), 1), 1)\n"
-                   ", 1), 1), 1), 1), 1), 1), 1), 1), 1), 1)\n"
-                   ", 1), 1), 1), 1), 1), 1), 1), 1), 1), 1)\n"
-                   ", 1), 1), 1), 1), 1), 1), 1), 1), 1), 1)\n"
-                   ", 1), 1), 1), 1), 1), 1), 1), 1), 1), 1)\n"
-                   ", 1), 1), 1), 1), 1), 1), 1), 1), 1), 1);\n");
-  // Deeply nested part is untouched, rest is formatted.
-  EXPECT_EQ(std::string("int i;\n") + Code + "int j;\n",
-            format(std::string("int    i;\n") + Code + "int    j;\n",
-                   getLLVMStyle(), SC_ExpectIncomplete));
-}
-
-//===----------------------------------------------------------------------===//
-// Objective-C tests.
-//===----------------------------------------------------------------------===//
-
-TEST_F(FormatTest, FormatForObjectiveCMethodDecls) {
-  verifyFormat("- (void)sendAction:(SEL)aSelector to:(BOOL)anObject;");
-  EXPECT_EQ("- (NSUInteger)indexOfObject:(id)anObject;",
-            format("-(NSUInteger)indexOfObject:(id)anObject;"));
-  EXPECT_EQ("- (NSInteger)Mthod1;", format("-(NSInteger)Mthod1;"));
-  EXPECT_EQ("+ (id)Mthod2;", format("+(id)Mthod2;"));
-  EXPECT_EQ("- (NSInteger)Method3:(id)anObject;",
-            format("-(NSInteger)Method3:(id)anObject;"));
-  EXPECT_EQ("- (NSInteger)Method4:(id)anObject;",
-            format("-(NSInteger)Method4:(id)anObject;"));
-  EXPECT_EQ("- (NSInteger)Method5:(id)anObject:(id)AnotherObject;",
-            format("-(NSInteger)Method5:(id)anObject:(id)AnotherObject;"));
-  EXPECT_EQ("- (id)Method6:(id)A:(id)B:(id)C:(id)D;",
-            format("- (id)Method6:(id)A:(id)B:(id)C:(id)D;"));
-  EXPECT_EQ("- (void)sendAction:(SEL)aSelector to:(id)anObject "
-            "forAllCells:(BOOL)flag;",
-            format("- (void)sendAction:(SEL)aSelector to:(id)anObject "
-                   "forAllCells:(BOOL)flag;"));
-
-  // Very long objectiveC method declaration.
-  verifyFormat("- (void)aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa:\n"
-               "    (SoooooooooooooooooooooomeType *)bbbbbbbbbb;");
-  verifyFormat("- (NSUInteger)indexOfObject:(id)anObject\n"
-               "                    inRange:(NSRange)range\n"
-               "                   outRange:(NSRange)out_range\n"
-               "                  outRange1:(NSRange)out_range1\n"
-               "                  outRange2:(NSRange)out_range2\n"
-               "                  outRange3:(NSRange)out_range3\n"
-               "                  outRange4:(NSRange)out_range4\n"
-               "                  outRange5:(NSRange)out_range5\n"
-               "                  outRange6:(NSRange)out_range6\n"
-               "                  outRange7:(NSRange)out_range7\n"
-               "                  outRange8:(NSRange)out_range8\n"
-               "                  outRange9:(NSRange)out_range9;");
-
-  // When the function name has to be wrapped.
-  FormatStyle Style = getLLVMStyle();
-  // ObjC ignores IndentWrappedFunctionNames when wrapping methods
-  // and always indents instead.
-  Style.IndentWrappedFunctionNames = false;
-  verifyFormat("- (SomeLooooooooooooooooooooongType *)\n"
-               "    veryLooooooooooongName:(NSString)aaaaaaaaaaaaaa\n"
-               "               anotherName:(NSString)bbbbbbbbbbbbbb {\n"
-               "}",
-               Style);
-  Style.IndentWrappedFunctionNames = true;
-  verifyFormat("- (SomeLooooooooooooooooooooongType *)\n"
-               "    veryLooooooooooongName:(NSString)cccccccccccccc\n"
-               "               anotherName:(NSString)dddddddddddddd {\n"
-               "}",
-               Style);
-
-  verifyFormat("- (int)sum:(vector<int>)numbers;");
-  verifyGoogleFormat("- (void)setDelegate:(id<Protocol>)delegate;");
-  // FIXME: In LLVM style, there should be a space in front of a '<' for ObjC
-  // protocol lists (but not for template classes):
-  // verifyFormat("- (void)setDelegate:(id <Protocol>)delegate;");
-
-  verifyFormat("- (int (*)())foo:(int (*)())f;");
-  verifyGoogleFormat("- (int (*)())foo:(int (*)())foo;");
-
-  // If there's no return type (very rare in practice!), LLVM and Google style
-  // agree.
-  verifyFormat("- foo;");
-  verifyFormat("- foo:(int)f;");
-  verifyGoogleFormat("- foo:(int)foo;");
-}
-
-TEST_F(FormatTest, BreaksStringLiterals) {
-  EXPECT_EQ("\"some text \"\n"
-            "\"other\";",
-            format("\"some text other\";", getLLVMStyleWithColumns(12)));
-  EXPECT_EQ("\"some text \"\n"
-            "\"other\";",
-            format("\\\n\"some text other\";", getLLVMStyleWithColumns(12)));
-  EXPECT_EQ(
-      "#define A  \\\n"
-      "  \"some \"  \\\n"
-      "  \"text \"  \\\n"
-      "  \"other\";",
-      format("#define A \"some text other\";", getLLVMStyleWithColumns(12)));
-  EXPECT_EQ(
-      "#define A  \\\n"
-      "  \"so \"    \\\n"
-      "  \"text \"  \\\n"
-      "  \"other\";",
-      format("#define A \"so text other\";", getLLVMStyleWithColumns(12)));
-
-  EXPECT_EQ("\"some text\"",
-            format("\"some text\"", getLLVMStyleWithColumns(1)));
-  EXPECT_EQ("\"some text\"",
-            format("\"some text\"", getLLVMStyleWithColumns(11)));
-  EXPECT_EQ("\"some \"\n"
-            "\"text\"",
-            format("\"some text\"", getLLVMStyleWithColumns(10)));
-  EXPECT_EQ("\"some \"\n"
-            "\"text\"",
-            format("\"some text\"", getLLVMStyleWithColumns(7)));
-  EXPECT_EQ("\"some\"\n"
-            "\" tex\"\n"
-            "\"t\"",
-            format("\"some text\"", getLLVMStyleWithColumns(6)));
-  EXPECT_EQ("\"some\"\n"
-            "\" tex\"\n"
-            "\" and\"",
-            format("\"some tex and\"", getLLVMStyleWithColumns(6)));
-  EXPECT_EQ("\"some\"\n"
-            "\"/tex\"\n"
-            "\"/and\"",
-            format("\"some/tex/and\"", getLLVMStyleWithColumns(6)));
-
-  EXPECT_EQ("variable =\n"
-            "    \"long string \"\n"
-            "    \"literal\";",
-            format("variable = \"long string literal\";",
-                   getLLVMStyleWithColumns(20)));
-
-  EXPECT_EQ("variable = f(\n"
-            "    \"long string \"\n"
-            "    \"literal\",\n"
-            "    short,\n"
-            "    loooooooooooooooooooong);",
-            format("variable = f(\"long string literal\", short, "
-                   "loooooooooooooooooooong);",
-                   getLLVMStyleWithColumns(20)));
-
-  EXPECT_EQ(
-      "f(g(\"long string \"\n"
-      "    \"literal\"),\n"
-      "  b);",
-      format("f(g(\"long string literal\"), b);", getLLVMStyleWithColumns(20)));
-  EXPECT_EQ("f(g(\"long string \"\n"
-            "    \"literal\",\n"
-            "    a),\n"
-            "  b);",
-            format("f(g(\"long string literal\", a), b);",
-                   getLLVMStyleWithColumns(20)));
-  EXPECT_EQ(
-      "f(\"one two\".split(\n"
-      "    variable));",
-      format("f(\"one two\".split(variable));", getLLVMStyleWithColumns(20)));
-  EXPECT_EQ("f(\"one two three four five six \"\n"
-            "  \"seven\".split(\n"
-            "      really_looooong_variable));",
-            format("f(\"one two three four five six seven\"."
-                   "split(really_looooong_variable));",
-                   getLLVMStyleWithColumns(33)));
-
-  EXPECT_EQ("f(\"some \"\n"
-            "  \"text\",\n"
-            "  other);",
-            format("f(\"some text\", other);", getLLVMStyleWithColumns(10)));
-
-  // Only break as a last resort.
-  verifyFormat(
-      "aaaaaaaaaaaaaaaaaaaa(\n"
-      "    aaaaaaaaaaaaaaaaaaaa,\n"
-      "    aaaaaa(\"aaa aaaaa aaa aaa aaaaa aaa aaaaa aaa aaa aaaaaa\"));");
-
-  EXPECT_EQ("\"splitmea\"\n"
-            "\"trandomp\"\n"
-            "\"oint\"",
-            format("\"splitmeatrandompoint\"", getLLVMStyleWithColumns(10)));
-
-  EXPECT_EQ("\"split/\"\n"
-            "\"pathat/\"\n"
-            "\"slashes\"",
-            format("\"split/pathat/slashes\"", getLLVMStyleWithColumns(10)));
-
-  EXPECT_EQ("\"split/\"\n"
-            "\"pathat/\"\n"
-            "\"slashes\"",
-            format("\"split/pathat/slashes\"", getLLVMStyleWithColumns(10)));
-  EXPECT_EQ("\"split at \"\n"
-            "\"spaces/at/\"\n"
-            "\"slashes.at.any$\"\n"
-            "\"non-alphanumeric%\"\n"
-            "\"1111111111characte\"\n"
-            "\"rs\"",
-            format("\"split at "
-                   "spaces/at/"
-                   "slashes.at."
-                   "any$non-"
-                   "alphanumeric%"
-                   "1111111111characte"
-                   "rs\"",
-                   getLLVMStyleWithColumns(20)));
-
-  // Verify that splitting the strings understands
-  // Style::AlwaysBreakBeforeMultilineStrings.
-  EXPECT_EQ("aaaaaaaaaaaa(\n"
-            "    \"aaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaa \"\n"
-            "    \"aaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaa\");",
-            format("aaaaaaaaaaaa(\"aaaaaaaaaaaaaaaaaaaaaaaaaa "
-                   "aaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaa "
-                   "aaaaaaaaaaaaaaaaaaaaaa\");",
-                   getGoogleStyle()));
-  EXPECT_EQ("return \"aaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaa \"\n"
-            "       \"aaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaa\";",
-            format("return \"aaaaaaaaaaaaaaaaaaaaaa "
-                   "aaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaa "
-                   "aaaaaaaaaaaaaaaaaaaaaa\";",
-                   getGoogleStyle()));
-  EXPECT_EQ("llvm::outs() << \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa \"\n"
-            "                \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\";",
-            format("llvm::outs() << "
-                   "\"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaa"
-                   "aaaaaaaaaaaaaaaaaaa\";"));
-  EXPECT_EQ("ffff(\n"
-            "    {\"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa \"\n"
-            "     \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\"});",
-            format("ffff({\"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa "
-                   "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\"});",
-                   getGoogleStyle()));
-
-  FormatStyle Style = getLLVMStyleWithColumns(12);
-  Style.BreakStringLiterals = false;
-  EXPECT_EQ("\"some text other\";", format("\"some text other\";", Style));
-
-  FormatStyle AlignLeft = getLLVMStyleWithColumns(12);
-  AlignLeft.AlignEscapedNewlines = FormatStyle::ENAS_Left;
-  EXPECT_EQ("#define A \\\n"
-            "  \"some \" \\\n"
-            "  \"text \" \\\n"
-            "  \"other\";",
-            format("#define A \"some text other\";", AlignLeft));
-}
-
-TEST_F(FormatTest, BreaksStringLiteralsAtColumnLimit) {
-  EXPECT_EQ("C a = \"some more \"\n"
-            "      \"text\";",
-            format("C a = \"some more text\";", getLLVMStyleWithColumns(18)));
-}
-
-TEST_F(FormatTest, FullyRemoveEmptyLines) {
-  FormatStyle NoEmptyLines = getLLVMStyleWithColumns(80);
-  NoEmptyLines.MaxEmptyLinesToKeep = 0;
-  EXPECT_EQ("int i = a(b());",
-            format("int i=a(\n\n b(\n\n\n )\n\n);", NoEmptyLines));
-}
-
-TEST_F(FormatTest, BreaksStringLiteralsWithTabs) {
-  EXPECT_EQ(
-      "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
-      "(\n"
-      "    \"x\t\");",
-      format("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
-             "aaaaaaa("
-             "\"x\t\");"));
-}
-
-TEST_F(FormatTest, BreaksWideAndNSStringLiterals) {
-  EXPECT_EQ(
-      "u8\"utf8 string \"\n"
-      "u8\"literal\";",
-      format("u8\"utf8 string literal\";", getGoogleStyleWithColumns(16)));
-  EXPECT_EQ(
-      "u\"utf16 string \"\n"
-      "u\"literal\";",
-      format("u\"utf16 string literal\";", getGoogleStyleWithColumns(16)));
-  EXPECT_EQ(
-      "U\"utf32 string \"\n"
-      "U\"literal\";",
-      format("U\"utf32 string literal\";", getGoogleStyleWithColumns(16)));
-  EXPECT_EQ("L\"wide string \"\n"
-            "L\"literal\";",
-            format("L\"wide string literal\";", getGoogleStyleWithColumns(16)));
-  EXPECT_EQ("@\"NSString \"\n"
-            "@\"literal\";",
-            format("@\"NSString literal\";", getGoogleStyleWithColumns(19)));
-  verifyFormat(R"(NSString *s = @"那那那那";)", getLLVMStyleWithColumns(26));
-
-  // This input makes clang-format try to split the incomplete unicode escape
-  // sequence, which used to lead to a crasher.
-  verifyNoCrash(
-      "aaaaaaaaaaaaaaaaaaaa = L\"\\udff\"'; // aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
-      getLLVMStyleWithColumns(60));
-}
-
-TEST_F(FormatTest, DoesNotBreakRawStringLiterals) {
-  FormatStyle Style = getGoogleStyleWithColumns(15);
-  EXPECT_EQ("R\"x(raw literal)x\";", format("R\"x(raw literal)x\";", Style));
-  EXPECT_EQ("uR\"x(raw literal)x\";", format("uR\"x(raw literal)x\";", Style));
-  EXPECT_EQ("LR\"x(raw literal)x\";", format("LR\"x(raw literal)x\";", Style));
-  EXPECT_EQ("UR\"x(raw literal)x\";", format("UR\"x(raw literal)x\";", Style));
-  EXPECT_EQ("u8R\"x(raw literal)x\";",
-            format("u8R\"x(raw literal)x\";", Style));
-}
-
-TEST_F(FormatTest, BreaksStringLiteralsWithin_TMacro) {
-  FormatStyle Style = getLLVMStyleWithColumns(20);
-  EXPECT_EQ(
-      "_T(\"aaaaaaaaaaaaaa\")\n"
-      "_T(\"aaaaaaaaaaaaaa\")\n"
-      "_T(\"aaaaaaaaaaaa\")",
-      format("  _T(\"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\")", Style));
-  EXPECT_EQ("f(x,\n"
-            "  _T(\"aaaaaaaaaaaa\")\n"
-            "  _T(\"aaa\"),\n"
-            "  z);",
-            format("f(x, _T(\"aaaaaaaaaaaaaaa\"), z);", Style));
-
-  // FIXME: Handle embedded spaces in one iteration.
-  //  EXPECT_EQ("_T(\"aaaaaaaaaaaaa\")\n"
-  //            "_T(\"aaaaaaaaaaaaa\")\n"
-  //            "_T(\"aaaaaaaaaaaaa\")\n"
-  //            "_T(\"a\")",
-  //            format("  _T ( \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\" )",
-  //                   getLLVMStyleWithColumns(20)));
-  EXPECT_EQ(
-      "_T ( \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\" )",
-      format("  _T ( \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\" )", Style));
-  EXPECT_EQ("f(\n"
-            "#if !TEST\n"
-            "    _T(\"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXn\")\n"
-            "#endif\n"
-            ");",
-            format("f(\n"
-                   "#if !TEST\n"
-                   "_T(\"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXn\")\n"
-                   "#endif\n"
-                   ");"));
-  EXPECT_EQ("f(\n"
-            "\n"
-            "    _T(\"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXn\"));",
-            format("f(\n"
-                   "\n"
-                   "_T(\"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXn\"));"));
-}
-
-TEST_F(FormatTest, BreaksStringLiteralOperands) {
-  // In a function call with two operands, the second can be broken with no line
-  // break before it.
-  EXPECT_EQ(
-      "func(a, \"long long \"\n"
-      "        \"long long\");",
-      format("func(a, \"long long long long\");", getLLVMStyleWithColumns(24)));
-  // In a function call with three operands, the second must be broken with a
-  // line break before it.
-  EXPECT_EQ("func(a,\n"
-            "     \"long long long \"\n"
-            "     \"long\",\n"
-            "     c);",
-            format("func(a, \"long long long long\", c);",
-                   getLLVMStyleWithColumns(24)));
-  // In a function call with three operands, the third must be broken with a
-  // line break before it.
-  EXPECT_EQ("func(a, b,\n"
-            "     \"long long long \"\n"
-            "     \"long\");",
-            format("func(a, b, \"long long long long\");",
-                   getLLVMStyleWithColumns(24)));
-  // In a function call with three operands, both the second and the third must
-  // be broken with a line break before them.
-  EXPECT_EQ("func(a,\n"
-            "     \"long long long \"\n"
-            "     \"long\",\n"
-            "     \"long long long \"\n"
-            "     \"long\");",
-            format("func(a, \"long long long long\", \"long long long long\");",
-                   getLLVMStyleWithColumns(24)));
-  // In a chain of << with two operands, the second can be broken with no line
-  // break before it.
-  EXPECT_EQ("a << \"line line \"\n"
-            "     \"line\";",
-            format("a << \"line line line\";", getLLVMStyleWithColumns(20)));
-  // In a chain of << with three operands, the second can be broken with no line
-  // break before it.
-  EXPECT_EQ(
-      "abcde << \"line \"\n"
-      "         \"line line\"\n"
-      "      << c;",
-      format("abcde << \"line line line\" << c;", getLLVMStyleWithColumns(20)));
-  // In a chain of << with three operands, the third must be broken with a line
-  // break before it.
-  EXPECT_EQ(
-      "a << b\n"
-      "  << \"line line \"\n"
-      "     \"line\";",
-      format("a << b << \"line line line\";", getLLVMStyleWithColumns(20)));
-  // In a chain of << with three operands, the second can be broken with no line
-  // break before it and the third must be broken with a line break before it.
-  EXPECT_EQ("abcd << \"line line \"\n"
-            "        \"line\"\n"
-            "     << \"line line \"\n"
-            "        \"line\";",
-            format("abcd << \"line line line\" << \"line line line\";",
-                   getLLVMStyleWithColumns(20)));
-  // In a chain of binary operators with two operands, the second can be broken
-  // with no line break before it.
-  EXPECT_EQ(
-      "abcd + \"line line \"\n"
-      "       \"line line\";",
-      format("abcd + \"line line line line\";", getLLVMStyleWithColumns(20)));
-  // In a chain of binary operators with three operands, the second must be
-  // broken with a line break before it.
-  EXPECT_EQ("abcd +\n"
-            "    \"line line \"\n"
-            "    \"line line\" +\n"
-            "    e;",
-            format("abcd + \"line line line line\" + e;",
-                   getLLVMStyleWithColumns(20)));
-  // In a function call with two operands, with AlignAfterOpenBracket enabled,
-  // the first must be broken with a line break before it.
-  FormatStyle Style = getLLVMStyleWithColumns(25);
-  Style.AlignAfterOpenBracket = FormatStyle::BAS_AlwaysBreak;
-  EXPECT_EQ("someFunction(\n"
-            "    \"long long long \"\n"
-            "    \"long\",\n"
-            "    a);",
-            format("someFunction(\"long long long long\", a);", Style));
-}
-
-TEST_F(FormatTest, DontSplitStringLiteralsWithEscapedNewlines) {
-  EXPECT_EQ(
-      "aaaaaaaaaaa = \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\\\n"
-      "  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\\\n"
-      "  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\";",
-      format("aaaaaaaaaaa  =  \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\\\n"
-             "  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\\\n"
-             "  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\";"));
-}
-
-TEST_F(FormatTest, CountsCharactersInMultilineRawStringLiterals) {
-  EXPECT_EQ("f(g(R\"x(raw literal)x\", a), b);",
-            format("f(g(R\"x(raw literal)x\",   a), b);", getGoogleStyle()));
-  EXPECT_EQ("fffffffffff(g(R\"x(\n"
-            "multiline raw string literal xxxxxxxxxxxxxx\n"
-            ")x\",\n"
-            "              a),\n"
-            "            b);",
-            format("fffffffffff(g(R\"x(\n"
-                   "multiline raw string literal xxxxxxxxxxxxxx\n"
-                   ")x\", a), b);",
-                   getGoogleStyleWithColumns(20)));
-  EXPECT_EQ("fffffffffff(\n"
-            "    g(R\"x(qqq\n"
-            "multiline raw string literal xxxxxxxxxxxxxx\n"
-            ")x\",\n"
-            "      a),\n"
-            "    b);",
-            format("fffffffffff(g(R\"x(qqq\n"
-                   "multiline raw string literal xxxxxxxxxxxxxx\n"
-                   ")x\", a), b);",
-                   getGoogleStyleWithColumns(20)));
-
-  EXPECT_EQ("fffffffffff(R\"x(\n"
-            "multiline raw string literal xxxxxxxxxxxxxx\n"
-            ")x\");",
-            format("fffffffffff(R\"x(\n"
-                   "multiline raw string literal xxxxxxxxxxxxxx\n"
-                   ")x\");",
-                   getGoogleStyleWithColumns(20)));
-  EXPECT_EQ("fffffffffff(R\"x(\n"
-            "multiline raw string literal xxxxxxxxxxxxxx\n"
-            ")x\" + bbbbbb);",
-            format("fffffffffff(R\"x(\n"
-                   "multiline raw string literal xxxxxxxxxxxxxx\n"
-                   ")x\" +   bbbbbb);",
-                   getGoogleStyleWithColumns(20)));
-  EXPECT_EQ("fffffffffff(\n"
-            "    R\"x(\n"
-            "multiline raw string literal xxxxxxxxxxxxxx\n"
-            ")x\" +\n"
-            "    bbbbbb);",
-            format("fffffffffff(\n"
-                   " R\"x(\n"
-                   "multiline raw string literal xxxxxxxxxxxxxx\n"
-                   ")x\" + bbbbbb);",
-                   getGoogleStyleWithColumns(20)));
-  EXPECT_EQ("fffffffffff(R\"(single line raw string)\" + bbbbbb);",
-            format("fffffffffff(\n"
-                   " R\"(single line raw string)\" + bbbbbb);"));
-}
-
-TEST_F(FormatTest, SkipsUnknownStringLiterals) {
-  verifyFormat("string a = \"unterminated;");
-  EXPECT_EQ("function(\"unterminated,\n"
-            "         OtherParameter);",
-            format("function(  \"unterminated,\n"
-                   "    OtherParameter);"));
-}
-
-TEST_F(FormatTest, DoesNotTryToParseUDLiteralsInPreCpp11Code) {
-  FormatStyle Style = getLLVMStyle();
-  Style.Standard = FormatStyle::LS_Cpp03;
-  EXPECT_EQ("#define x(_a) printf(\"foo\" _a);",
-            format("#define x(_a) printf(\"foo\"_a);", Style));
-}
-
-TEST_F(FormatTest, CppLexVersion) {
-  FormatStyle Style = getLLVMStyle();
-  // Formatting of x * y differs if x is a type.
-  verifyFormat("void foo() { MACRO(a * b); }", Style);
-  verifyFormat("void foo() { MACRO(int *b); }", Style);
-
-  // LLVM style uses latest lexer.
-  verifyFormat("void foo() { MACRO(char8_t *b); }", Style);
-  Style.Standard = FormatStyle::LS_Cpp17;
-  // But in c++17, char8_t isn't a keyword.
-  verifyFormat("void foo() { MACRO(char8_t * b); }", Style);
-}
-
-TEST_F(FormatTest, UnderstandsCpp1y) { verifyFormat("int bi{1'000'000};"); }
-
-TEST_F(FormatTest, BreakStringLiteralsBeforeUnbreakableTokenSequence) {
-  EXPECT_EQ("someFunction(\"aaabbbcccd\"\n"
-            "             \"ddeeefff\");",
-            format("someFunction(\"aaabbbcccdddeeefff\");",
-                   getLLVMStyleWithColumns(25)));
-  EXPECT_EQ("someFunction1234567890(\n"
-            "    \"aaabbbcccdddeeefff\");",
-            format("someFunction1234567890(\"aaabbbcccdddeeefff\");",
-                   getLLVMStyleWithColumns(26)));
-  EXPECT_EQ("someFunction1234567890(\n"
-            "    \"aaabbbcccdddeeeff\"\n"
-            "    \"f\");",
-            format("someFunction1234567890(\"aaabbbcccdddeeefff\");",
-                   getLLVMStyleWithColumns(25)));
-  EXPECT_EQ("someFunction1234567890(\n"
-            "    \"aaabbbcccdddeeeff\"\n"
-            "    \"f\");",
-            format("someFunction1234567890(\"aaabbbcccdddeeefff\");",
-                   getLLVMStyleWithColumns(24)));
-  EXPECT_EQ("someFunction(\n"
-            "    \"aaabbbcc ddde \"\n"
-            "    \"efff\");",
-            format("someFunction(\"aaabbbcc ddde efff\");",
-                   getLLVMStyleWithColumns(25)));
-  EXPECT_EQ("someFunction(\"aaabbbccc \"\n"
-            "             \"ddeeefff\");",
-            format("someFunction(\"aaabbbccc ddeeefff\");",
-                   getLLVMStyleWithColumns(25)));
-  EXPECT_EQ("someFunction1234567890(\n"
-            "    \"aaabb \"\n"
-            "    \"cccdddeeefff\");",
-            format("someFunction1234567890(\"aaabb cccdddeeefff\");",
-                   getLLVMStyleWithColumns(25)));
-  EXPECT_EQ("#define A          \\\n"
-            "  string s =       \\\n"
-            "      \"123456789\"  \\\n"
-            "      \"0\";         \\\n"
-            "  int i;",
-            format("#define A string s = \"1234567890\"; int i;",
-                   getLLVMStyleWithColumns(20)));
-  EXPECT_EQ("someFunction(\n"
-            "    \"aaabbbcc \"\n"
-            "    \"dddeeefff\");",
-            format("someFunction(\"aaabbbcc dddeeefff\");",
-                   getLLVMStyleWithColumns(25)));
-}
-
-TEST_F(FormatTest, DoNotBreakStringLiteralsInEscapeSequence) {
-  EXPECT_EQ("\"\\a\"", format("\"\\a\"", getLLVMStyleWithColumns(3)));
-  EXPECT_EQ("\"\\\"", format("\"\\\"", getLLVMStyleWithColumns(2)));
-  EXPECT_EQ("\"test\"\n"
-            "\"\\n\"",
-            format("\"test\\n\"", getLLVMStyleWithColumns(7)));
-  EXPECT_EQ("\"tes\\\\\"\n"
-            "\"n\"",
-            format("\"tes\\\\n\"", getLLVMStyleWithColumns(7)));
-  EXPECT_EQ("\"\\\\\\\\\"\n"
-            "\"\\n\"",
-            format("\"\\\\\\\\\\n\"", getLLVMStyleWithColumns(7)));
-  EXPECT_EQ("\"\\uff01\"", format("\"\\uff01\"", getLLVMStyleWithColumns(7)));
-  EXPECT_EQ("\"\\uff01\"\n"
-            "\"test\"",
-            format("\"\\uff01test\"", getLLVMStyleWithColumns(8)));
-  EXPECT_EQ("\"\\Uff01ff02\"",
-            format("\"\\Uff01ff02\"", getLLVMStyleWithColumns(11)));
-  EXPECT_EQ("\"\\x000000000001\"\n"
-            "\"next\"",
-            format("\"\\x000000000001next\"", getLLVMStyleWithColumns(16)));
-  EXPECT_EQ("\"\\x000000000001next\"",
-            format("\"\\x000000000001next\"", getLLVMStyleWithColumns(15)));
-  EXPECT_EQ("\"\\x000000000001\"",
-            format("\"\\x000000000001\"", getLLVMStyleWithColumns(7)));
-  EXPECT_EQ("\"test\"\n"
-            "\"\\000000\"\n"
-            "\"000001\"",
-            format("\"test\\000000000001\"", getLLVMStyleWithColumns(9)));
-  EXPECT_EQ("\"test\\000\"\n"
-            "\"00000000\"\n"
-            "\"1\"",
-            format("\"test\\000000000001\"", getLLVMStyleWithColumns(10)));
-}
-
-TEST_F(FormatTest, DoNotCreateUnreasonableUnwrappedLines) {
-  verifyFormat("void f() {\n"
-               "  return g() {}\n"
-               "  void h() {}");
-  verifyFormat("int a[] = {void forgot_closing_brace(){f();\n"
-               "g();\n"
-               "}");
-}
-
-TEST_F(FormatTest, DoNotPrematurelyEndUnwrappedLineForReturnStatements) {
-  verifyFormat(
-      "void f() { return C{param1, param2}.SomeCall(param1, param2); }");
-}
-
-TEST_F(FormatTest, FormatsClosingBracesInEmptyNestedBlocks) {
-  verifyFormat("class X {\n"
-               "  void f() {\n"
-               "  }\n"
-               "};",
-               getLLVMStyleWithColumns(12));
-}
-
-TEST_F(FormatTest, ConfigurableIndentWidth) {
-  FormatStyle EightIndent = getLLVMStyleWithColumns(18);
-  EightIndent.IndentWidth = 8;
-  EightIndent.ContinuationIndentWidth = 8;
-  verifyFormat("void f() {\n"
-               "        someFunction();\n"
-               "        if (true) {\n"
-               "                f();\n"
-               "        }\n"
-               "}",
-               EightIndent);
-  verifyFormat("class X {\n"
-               "        void f() {\n"
-               "        }\n"
-               "};",
-               EightIndent);
-  verifyFormat("int x[] = {\n"
-               "        call(),\n"
-               "        call()};",
-               EightIndent);
-}
-
-TEST_F(FormatTest, ConfigurableFunctionDeclarationIndentAfterType) {
-  verifyFormat("double\n"
-               "f();",
-               getLLVMStyleWithColumns(8));
-}
-
-TEST_F(FormatTest, ConfigurableUseOfTab) {
-  FormatStyle Tab = getLLVMStyleWithColumns(42);
-  Tab.IndentWidth = 8;
-  Tab.UseTab = FormatStyle::UT_Always;
-  Tab.AlignEscapedNewlines = FormatStyle::ENAS_Left;
-
-  EXPECT_EQ("if (aaaaaaaa && // q\n"
-            "    bb)\t\t// w\n"
-            "\t;",
-            format("if (aaaaaaaa &&// q\n"
-                   "bb)// w\n"
-                   ";",
-                   Tab));
-  EXPECT_EQ("if (aaa && bbb) // w\n"
-            "\t;",
-            format("if(aaa&&bbb)// w\n"
-                   ";",
-                   Tab));
-
-  verifyFormat("class X {\n"
-               "\tvoid f() {\n"
-               "\t\tsomeFunction(parameter1,\n"
-               "\t\t\t     parameter2);\n"
-               "\t}\n"
-               "};",
-               Tab);
-  verifyFormat("#define A                        \\\n"
-               "\tvoid f() {               \\\n"
-               "\t\tsomeFunction(    \\\n"
-               "\t\t    parameter1,  \\\n"
-               "\t\t    parameter2); \\\n"
-               "\t}",
-               Tab);
-  verifyFormat("int a;\t      // x\n"
-               "int bbbbbbbb; // x\n",
-               Tab);
-
-  Tab.TabWidth = 4;
-  Tab.IndentWidth = 8;
-  verifyFormat("class TabWidth4Indent8 {\n"
-               "\t\tvoid f() {\n"
-               "\t\t\t\tsomeFunction(parameter1,\n"
-               "\t\t\t\t\t\t\t parameter2);\n"
-               "\t\t}\n"
-               "};",
-               Tab);
-
-  Tab.TabWidth = 4;
-  Tab.IndentWidth = 4;
-  verifyFormat("class TabWidth4Indent4 {\n"
-               "\tvoid f() {\n"
-               "\t\tsomeFunction(parameter1,\n"
-               "\t\t\t\t\t parameter2);\n"
-               "\t}\n"
-               "};",
-               Tab);
-
-  Tab.TabWidth = 8;
-  Tab.IndentWidth = 4;
-  verifyFormat("class TabWidth8Indent4 {\n"
-               "    void f() {\n"
-               "\tsomeFunction(parameter1,\n"
-               "\t\t     parameter2);\n"
-               "    }\n"
-               "};",
-               Tab);
-
-  Tab.TabWidth = 8;
-  Tab.IndentWidth = 8;
-  EXPECT_EQ("/*\n"
-            "\t      a\t\tcomment\n"
-            "\t      in multiple lines\n"
-            "       */",
-            format("   /*\t \t \n"
-                   " \t \t a\t\tcomment\t \t\n"
-                   " \t \t in multiple lines\t\n"
-                   " \t  */",
-                   Tab));
-
-  Tab.UseTab = FormatStyle::UT_ForIndentation;
-  verifyFormat("{\n"
-               "\taaaaaaaaaaaaaaaaaaaaaaaaaaaa();\n"
-               "\taaaaaaaaaaaaaaaaaaaaaaaaaaaa();\n"
-               "\taaaaaaaaaaaaaaaaaaaaaaaaaaaa();\n"
-               "\taaaaaaaaaaaaaaaaaaaaaaaaaaaa();\n"
-               "\taaaaaaaaaaaaaaaaaaaaaaaaaaaa();\n"
-               "\taaaaaaaaaaaaaaaaaaaaaaaaaaaa();\n"
-               "};",
-               Tab);
-  verifyFormat("enum AA {\n"
-               "\ta1, // Force multiple lines\n"
-               "\ta2,\n"
-               "\ta3\n"
-               "};",
-               Tab);
-  EXPECT_EQ("if (aaaaaaaa && // q\n"
-            "    bb)         // w\n"
-            "\t;",
-            format("if (aaaaaaaa &&// q\n"
-                   "bb)// w\n"
-                   ";",
-                   Tab));
-  verifyFormat("class X {\n"
-               "\tvoid f() {\n"
-               "\t\tsomeFunction(parameter1,\n"
-               "\t\t             parameter2);\n"
-               "\t}\n"
-               "};",
-               Tab);
-  verifyFormat("{\n"
-               "\tQ(\n"
-               "\t    {\n"
-               "\t\t    int a;\n"
-               "\t\t    someFunction(aaaaaaaa,\n"
-               "\t\t                 bbbbbbb);\n"
-               "\t    },\n"
-               "\t    p);\n"
-               "}",
-               Tab);
-  EXPECT_EQ("{\n"
-            "\t/* aaaa\n"
-            "\t   bbbb */\n"
-            "}",
-            format("{\n"
-                   "/* aaaa\n"
-                   "   bbbb */\n"
-                   "}",
-                   Tab));
-  EXPECT_EQ("{\n"
-            "\t/*\n"
-            "\t  aaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-            "\t  bbbbbbbbbbbbb\n"
-            "\t*/\n"
-            "}",
-            format("{\n"
-                   "/*\n"
-                   "  aaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbb\n"
-                   "*/\n"
-                   "}",
-                   Tab));
-  EXPECT_EQ("{\n"
-            "\t// aaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-            "\t// bbbbbbbbbbbbb\n"
-            "}",
-            format("{\n"
-                   "\t// aaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbb\n"
-                   "}",
-                   Tab));
-  EXPECT_EQ("{\n"
-            "\t/*\n"
-            "\t  aaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-            "\t  bbbbbbbbbbbbb\n"
-            "\t*/\n"
-            "}",
-            format("{\n"
-                   "\t/*\n"
-                   "\t  aaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbb\n"
-                   "\t*/\n"
-                   "}",
-                   Tab));
-  EXPECT_EQ("{\n"
-            "\t/*\n"
-            "\n"
-            "\t*/\n"
-            "}",
-            format("{\n"
-                   "\t/*\n"
-                   "\n"
-                   "\t*/\n"
-                   "}",
-                   Tab));
-  EXPECT_EQ("{\n"
-            "\t/*\n"
-            " asdf\n"
-            "\t*/\n"
-            "}",
-            format("{\n"
-                   "\t/*\n"
-                   " asdf\n"
-                   "\t*/\n"
-                   "}",
-                   Tab));
-
-  Tab.UseTab = FormatStyle::UT_Never;
-  EXPECT_EQ("/*\n"
-            "              a\t\tcomment\n"
-            "              in multiple lines\n"
-            "       */",
-            format("   /*\t \t \n"
-                   " \t \t a\t\tcomment\t \t\n"
-                   " \t \t in multiple lines\t\n"
-                   " \t  */",
-                   Tab));
-  EXPECT_EQ("/* some\n"
-            "   comment */",
-            format(" \t \t /* some\n"
-                   " \t \t    comment */",
-                   Tab));
-  EXPECT_EQ("int a; /* some\n"
-            "   comment */",
-            format(" \t \t int a; /* some\n"
-                   " \t \t    comment */",
-                   Tab));
-
-  EXPECT_EQ("int a; /* some\n"
-            "comment */",
-            format(" \t \t int\ta; /* some\n"
-                   " \t \t    comment */",
-                   Tab));
-  EXPECT_EQ("f(\"\t\t\"); /* some\n"
-            "    comment */",
-            format(" \t \t f(\"\t\t\"); /* some\n"
-                   " \t \t    comment */",
-                   Tab));
-  EXPECT_EQ("{\n"
-            "        /*\n"
-            "         * Comment\n"
-            "         */\n"
-            "        int i;\n"
-            "}",
-            format("{\n"
-                   "\t/*\n"
-                   "\t * Comment\n"
-                   "\t */\n"
-                   "\t int i;\n"
-                   "}",
-                   Tab));
-
-  Tab.UseTab = FormatStyle::UT_ForContinuationAndIndentation;
-  Tab.TabWidth = 8;
-  Tab.IndentWidth = 8;
-  EXPECT_EQ("if (aaaaaaaa && // q\n"
-            "    bb)         // w\n"
-            "\t;",
-            format("if (aaaaaaaa &&// q\n"
-                   "bb)// w\n"
-                   ";",
-                   Tab));
-  EXPECT_EQ("if (aaa && bbb) // w\n"
-            "\t;",
-            format("if(aaa&&bbb)// w\n"
-                   ";",
-                   Tab));
-  verifyFormat("class X {\n"
-               "\tvoid f() {\n"
-               "\t\tsomeFunction(parameter1,\n"
-               "\t\t\t     parameter2);\n"
-               "\t}\n"
-               "};",
-               Tab);
-  verifyFormat("#define A                        \\\n"
-               "\tvoid f() {               \\\n"
-               "\t\tsomeFunction(    \\\n"
-               "\t\t    parameter1,  \\\n"
-               "\t\t    parameter2); \\\n"
-               "\t}",
-               Tab);
-  Tab.TabWidth = 4;
-  Tab.IndentWidth = 8;
-  verifyFormat("class TabWidth4Indent8 {\n"
-               "\t\tvoid f() {\n"
-               "\t\t\t\tsomeFunction(parameter1,\n"
-               "\t\t\t\t\t\t\t parameter2);\n"
-               "\t\t}\n"
-               "};",
-               Tab);
-  Tab.TabWidth = 4;
-  Tab.IndentWidth = 4;
-  verifyFormat("class TabWidth4Indent4 {\n"
-               "\tvoid f() {\n"
-               "\t\tsomeFunction(parameter1,\n"
-               "\t\t\t\t\t parameter2);\n"
-               "\t}\n"
-               "};",
-               Tab);
-  Tab.TabWidth = 8;
-  Tab.IndentWidth = 4;
-  verifyFormat("class TabWidth8Indent4 {\n"
-               "    void f() {\n"
-               "\tsomeFunction(parameter1,\n"
-               "\t\t     parameter2);\n"
-               "    }\n"
-               "};",
-               Tab);
-  Tab.TabWidth = 8;
-  Tab.IndentWidth = 8;
-  EXPECT_EQ("/*\n"
-            "\t      a\t\tcomment\n"
-            "\t      in multiple lines\n"
-            "       */",
-            format("   /*\t \t \n"
-                   " \t \t a\t\tcomment\t \t\n"
-                   " \t \t in multiple lines\t\n"
-                   " \t  */",
-                   Tab));
-  verifyFormat("{\n"
-               "\taaaaaaaaaaaaaaaaaaaaaaaaaaaa();\n"
-               "\taaaaaaaaaaaaaaaaaaaaaaaaaaaa();\n"
-               "\taaaaaaaaaaaaaaaaaaaaaaaaaaaa();\n"
-               "\taaaaaaaaaaaaaaaaaaaaaaaaaaaa();\n"
-               "\taaaaaaaaaaaaaaaaaaaaaaaaaaaa();\n"
-               "\taaaaaaaaaaaaaaaaaaaaaaaaaaaa();\n"
-               "};",
-               Tab);
-  verifyFormat("enum AA {\n"
-               "\ta1, // Force multiple lines\n"
-               "\ta2,\n"
-               "\ta3\n"
-               "};",
-               Tab);
-  EXPECT_EQ("if (aaaaaaaa && // q\n"
-            "    bb)         // w\n"
-            "\t;",
-            format("if (aaaaaaaa &&// q\n"
-                   "bb)// w\n"
-                   ";",
-                   Tab));
-  verifyFormat("class X {\n"
-               "\tvoid f() {\n"
-               "\t\tsomeFunction(parameter1,\n"
-               "\t\t\t     parameter2);\n"
-               "\t}\n"
-               "};",
-               Tab);
-  verifyFormat("{\n"
-               "\tQ(\n"
-               "\t    {\n"
-               "\t\t    int a;\n"
-               "\t\t    someFunction(aaaaaaaa,\n"
-               "\t\t\t\t bbbbbbb);\n"
-               "\t    },\n"
-               "\t    p);\n"
-               "}",
-               Tab);
-  EXPECT_EQ("{\n"
-            "\t/* aaaa\n"
-            "\t   bbbb */\n"
-            "}",
-            format("{\n"
-                   "/* aaaa\n"
-                   "   bbbb */\n"
-                   "}",
-                   Tab));
-  EXPECT_EQ("{\n"
-            "\t/*\n"
-            "\t  aaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-            "\t  bbbbbbbbbbbbb\n"
-            "\t*/\n"
-            "}",
-            format("{\n"
-                   "/*\n"
-                   "  aaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbb\n"
-                   "*/\n"
-                   "}",
-                   Tab));
-  EXPECT_EQ("{\n"
-            "\t// aaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-            "\t// bbbbbbbbbbbbb\n"
-            "}",
-            format("{\n"
-                   "\t// aaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbb\n"
-                   "}",
-                   Tab));
-  EXPECT_EQ("{\n"
-            "\t/*\n"
-            "\t  aaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-            "\t  bbbbbbbbbbbbb\n"
-            "\t*/\n"
-            "}",
-            format("{\n"
-                   "\t/*\n"
-                   "\t  aaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbb\n"
-                   "\t*/\n"
-                   "}",
-                   Tab));
-  EXPECT_EQ("{\n"
-            "\t/*\n"
-            "\n"
-            "\t*/\n"
-            "}",
-            format("{\n"
-                   "\t/*\n"
-                   "\n"
-                   "\t*/\n"
-                   "}",
-                   Tab));
-  EXPECT_EQ("{\n"
-            "\t/*\n"
-            " asdf\n"
-            "\t*/\n"
-            "}",
-            format("{\n"
-                   "\t/*\n"
-                   " asdf\n"
-                   "\t*/\n"
-                   "}",
-                   Tab));
-  EXPECT_EQ("/* some\n"
-            "   comment */",
-            format(" \t \t /* some\n"
-                   " \t \t    comment */",
-                   Tab));
-  EXPECT_EQ("int a; /* some\n"
-            "   comment */",
-            format(" \t \t int a; /* some\n"
-                   " \t \t    comment */",
-                   Tab));
-  EXPECT_EQ("int a; /* some\n"
-            "comment */",
-            format(" \t \t int\ta; /* some\n"
-                   " \t \t    comment */",
-                   Tab));
-  EXPECT_EQ("f(\"\t\t\"); /* some\n"
-            "    comment */",
-            format(" \t \t f(\"\t\t\"); /* some\n"
-                   " \t \t    comment */",
-                   Tab));
-  EXPECT_EQ("{\n"
-            "\t/*\n"
-            "\t * Comment\n"
-            "\t */\n"
-            "\tint i;\n"
-            "}",
-            format("{\n"
-                   "\t/*\n"
-                   "\t * Comment\n"
-                   "\t */\n"
-                   "\t int i;\n"
-                   "}",
-                   Tab));
-  Tab.TabWidth = 2;
-  Tab.IndentWidth = 2;
-  EXPECT_EQ("{\n"
-            "\t/* aaaa\n"
-            "\t\t bbbb */\n"
-            "}",
-            format("{\n"
-                   "/* aaaa\n"
-                   "\t bbbb */\n"
-                   "}",
-                   Tab));
-  EXPECT_EQ("{\n"
-            "\t/*\n"
-            "\t\taaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-            "\t\tbbbbbbbbbbbbb\n"
-            "\t*/\n"
-            "}",
-            format("{\n"
-                   "/*\n"
-                   "\taaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbb\n"
-                   "*/\n"
-                   "}",
-                   Tab));
-  Tab.AlignConsecutiveAssignments = FormatStyle::ACS_Consecutive;
-  Tab.AlignConsecutiveDeclarations = FormatStyle::ACS_Consecutive;
-  Tab.TabWidth = 4;
-  Tab.IndentWidth = 4;
-  verifyFormat("class Assign {\n"
-               "\tvoid f() {\n"
-               "\t\tint         x      = 123;\n"
-               "\t\tint         random = 4;\n"
-               "\t\tstd::string alphabet =\n"
-               "\t\t\t\"abcdefghijklmnopqrstuvwxyz\";\n"
-               "\t}\n"
-               "};",
-               Tab);
-
-  Tab.UseTab = FormatStyle::UT_AlignWithSpaces;
-  Tab.TabWidth = 8;
-  Tab.IndentWidth = 8;
-  EXPECT_EQ("if (aaaaaaaa && // q\n"
-            "    bb)         // w\n"
-            "\t;",
-            format("if (aaaaaaaa &&// q\n"
-                   "bb)// w\n"
-                   ";",
-                   Tab));
-  EXPECT_EQ("if (aaa && bbb) // w\n"
-            "\t;",
-            format("if(aaa&&bbb)// w\n"
-                   ";",
-                   Tab));
-  verifyFormat("class X {\n"
-               "\tvoid f() {\n"
-               "\t\tsomeFunction(parameter1,\n"
-               "\t\t             parameter2);\n"
-               "\t}\n"
-               "};",
-               Tab);
-  verifyFormat("#define A                        \\\n"
-               "\tvoid f() {               \\\n"
-               "\t\tsomeFunction(    \\\n"
-               "\t\t    parameter1,  \\\n"
-               "\t\t    parameter2); \\\n"
-               "\t}",
-               Tab);
-  Tab.TabWidth = 4;
-  Tab.IndentWidth = 8;
-  verifyFormat("class TabWidth4Indent8 {\n"
-               "\t\tvoid f() {\n"
-               "\t\t\t\tsomeFunction(parameter1,\n"
-               "\t\t\t\t             parameter2);\n"
-               "\t\t}\n"
-               "};",
-               Tab);
-  Tab.TabWidth = 4;
-  Tab.IndentWidth = 4;
-  verifyFormat("class TabWidth4Indent4 {\n"
-               "\tvoid f() {\n"
-               "\t\tsomeFunction(parameter1,\n"
-               "\t\t             parameter2);\n"
-               "\t}\n"
-               "};",
-               Tab);
-  Tab.TabWidth = 8;
-  Tab.IndentWidth = 4;
-  verifyFormat("class TabWidth8Indent4 {\n"
-               "    void f() {\n"
-               "\tsomeFunction(parameter1,\n"
-               "\t             parameter2);\n"
-               "    }\n"
-               "};",
-               Tab);
-  Tab.TabWidth = 8;
-  Tab.IndentWidth = 8;
-  EXPECT_EQ("/*\n"
-            "              a\t\tcomment\n"
-            "              in multiple lines\n"
-            "       */",
-            format("   /*\t \t \n"
-                   " \t \t a\t\tcomment\t \t\n"
-                   " \t \t in multiple lines\t\n"
-                   " \t  */",
-                   Tab));
-  verifyFormat("{\n"
-               "\taaaaaaaaaaaaaaaaaaaaaaaaaaaa();\n"
-               "\taaaaaaaaaaaaaaaaaaaaaaaaaaaa();\n"
-               "\taaaaaaaaaaaaaaaaaaaaaaaaaaaa();\n"
-               "\taaaaaaaaaaaaaaaaaaaaaaaaaaaa();\n"
-               "\taaaaaaaaaaaaaaaaaaaaaaaaaaaa();\n"
-               "\taaaaaaaaaaaaaaaaaaaaaaaaaaaa();\n"
-               "};",
-               Tab);
-  verifyFormat("enum AA {\n"
-               "\ta1, // Force multiple lines\n"
-               "\ta2,\n"
-               "\ta3\n"
-               "};",
-               Tab);
-  EXPECT_EQ("if (aaaaaaaa && // q\n"
-            "    bb)         // w\n"
-            "\t;",
-            format("if (aaaaaaaa &&// q\n"
-                   "bb)// w\n"
-                   ";",
-                   Tab));
-  verifyFormat("class X {\n"
-               "\tvoid f() {\n"
-               "\t\tsomeFunction(parameter1,\n"
-               "\t\t             parameter2);\n"
-               "\t}\n"
-               "};",
-               Tab);
-  verifyFormat("{\n"
-               "\tQ(\n"
-               "\t    {\n"
-               "\t\t    int a;\n"
-               "\t\t    someFunction(aaaaaaaa,\n"
-               "\t\t                 bbbbbbb);\n"
-               "\t    },\n"
-               "\t    p);\n"
-               "}",
-               Tab);
-  EXPECT_EQ("{\n"
-            "\t/* aaaa\n"
-            "\t   bbbb */\n"
-            "}",
-            format("{\n"
-                   "/* aaaa\n"
-                   "   bbbb */\n"
-                   "}",
-                   Tab));
-  EXPECT_EQ("{\n"
-            "\t/*\n"
-            "\t  aaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-            "\t  bbbbbbbbbbbbb\n"
-            "\t*/\n"
-            "}",
-            format("{\n"
-                   "/*\n"
-                   "  aaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbb\n"
-                   "*/\n"
-                   "}",
-                   Tab));
-  EXPECT_EQ("{\n"
-            "\t// aaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-            "\t// bbbbbbbbbbbbb\n"
-            "}",
-            format("{\n"
-                   "\t// aaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbb\n"
-                   "}",
-                   Tab));
-  EXPECT_EQ("{\n"
-            "\t/*\n"
-            "\t  aaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-            "\t  bbbbbbbbbbbbb\n"
-            "\t*/\n"
-            "}",
-            format("{\n"
-                   "\t/*\n"
-                   "\t  aaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbb\n"
-                   "\t*/\n"
-                   "}",
-                   Tab));
-  EXPECT_EQ("{\n"
-            "\t/*\n"
-            "\n"
-            "\t*/\n"
-            "}",
-            format("{\n"
-                   "\t/*\n"
-                   "\n"
-                   "\t*/\n"
-                   "}",
-                   Tab));
-  EXPECT_EQ("{\n"
-            "\t/*\n"
-            " asdf\n"
-            "\t*/\n"
-            "}",
-            format("{\n"
-                   "\t/*\n"
-                   " asdf\n"
-                   "\t*/\n"
-                   "}",
-                   Tab));
-  EXPECT_EQ("/* some\n"
-            "   comment */",
-            format(" \t \t /* some\n"
-                   " \t \t    comment */",
-                   Tab));
-  EXPECT_EQ("int a; /* some\n"
-            "   comment */",
-            format(" \t \t int a; /* some\n"
-                   " \t \t    comment */",
-                   Tab));
-  EXPECT_EQ("int a; /* some\n"
-            "comment */",
-            format(" \t \t int\ta; /* some\n"
-                   " \t \t    comment */",
-                   Tab));
-  EXPECT_EQ("f(\"\t\t\"); /* some\n"
-            "    comment */",
-            format(" \t \t f(\"\t\t\"); /* some\n"
-                   " \t \t    comment */",
-                   Tab));
-  EXPECT_EQ("{\n"
-            "\t/*\n"
-            "\t * Comment\n"
-            "\t */\n"
-            "\tint i;\n"
-            "}",
-            format("{\n"
-                   "\t/*\n"
-                   "\t * Comment\n"
-                   "\t */\n"
-                   "\t int i;\n"
-                   "}",
-                   Tab));
-  Tab.TabWidth = 2;
-  Tab.IndentWidth = 2;
-  EXPECT_EQ("{\n"
-            "\t/* aaaa\n"
-            "\t   bbbb */\n"
-            "}",
-            format("{\n"
-                   "/* aaaa\n"
-                   "   bbbb */\n"
-                   "}",
-                   Tab));
-  EXPECT_EQ("{\n"
-            "\t/*\n"
-            "\t  aaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-            "\t  bbbbbbbbbbbbb\n"
-            "\t*/\n"
-            "}",
-            format("{\n"
-                   "/*\n"
-                   "  aaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbb\n"
-                   "*/\n"
-                   "}",
-                   Tab));
-  Tab.AlignConsecutiveAssignments = FormatStyle::ACS_Consecutive;
-  Tab.AlignConsecutiveDeclarations = FormatStyle::ACS_Consecutive;
-  Tab.TabWidth = 4;
-  Tab.IndentWidth = 4;
-  verifyFormat("class Assign {\n"
-               "\tvoid f() {\n"
-               "\t\tint         x      = 123;\n"
-               "\t\tint         random = 4;\n"
-               "\t\tstd::string alphabet =\n"
-               "\t\t\t\"abcdefghijklmnopqrstuvwxyz\";\n"
-               "\t}\n"
-               "};",
-               Tab);
-  Tab.AlignOperands = FormatStyle::OAS_Align;
-  verifyFormat("int aaaaaaaaaa = bbbbbbbbbbbbbbbbbbbb +\n"
-               "                 cccccccccccccccccccc;",
-               Tab);
-  // no alignment
-  verifyFormat("int aaaaaaaaaa =\n"
-               "\tbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb;",
-               Tab);
-  verifyFormat("return aaaaaaaaaaaaaaaa ? 111111111111111\n"
-               "       : bbbbbbbbbbbbbb ? 222222222222222\n"
-               "                        : 333333333333333;",
-               Tab);
-  Tab.BreakBeforeBinaryOperators = FormatStyle::BOS_All;
-  Tab.AlignOperands = FormatStyle::OAS_AlignAfterOperator;
-  verifyFormat("int aaaaaaaaaa = bbbbbbbbbbbbbbbbbbbb\n"
-               "               + cccccccccccccccccccc;",
-               Tab);
-}
-
-TEST_F(FormatTest, ZeroTabWidth) {
-  FormatStyle Tab = getLLVMStyleWithColumns(42);
-  Tab.IndentWidth = 8;
-  Tab.UseTab = FormatStyle::UT_Never;
-  Tab.TabWidth = 0;
-  EXPECT_EQ("void a(){\n"
-            "    // line starts with '\t'\n"
-            "};",
-            format("void a(){\n"
-                   "\t// line starts with '\t'\n"
-                   "};",
-                   Tab));
-
-  EXPECT_EQ("void a(){\n"
-            "    // line starts with '\t'\n"
-            "};",
-            format("void a(){\n"
-                   "\t\t// line starts with '\t'\n"
-                   "};",
-                   Tab));
-
-  Tab.UseTab = FormatStyle::UT_ForIndentation;
-  EXPECT_EQ("void a(){\n"
-            "    // line starts with '\t'\n"
-            "};",
-            format("void a(){\n"
-                   "\t// line starts with '\t'\n"
-                   "};",
-                   Tab));
-
-  EXPECT_EQ("void a(){\n"
-            "    // line starts with '\t'\n"
-            "};",
-            format("void a(){\n"
-                   "\t\t// line starts with '\t'\n"
-                   "};",
-                   Tab));
-
-  Tab.UseTab = FormatStyle::UT_ForContinuationAndIndentation;
-  EXPECT_EQ("void a(){\n"
-            "    // line starts with '\t'\n"
-            "};",
-            format("void a(){\n"
-                   "\t// line starts with '\t'\n"
-                   "};",
-                   Tab));
-
-  EXPECT_EQ("void a(){\n"
-            "    // line starts with '\t'\n"
-            "};",
-            format("void a(){\n"
-                   "\t\t// line starts with '\t'\n"
-                   "};",
-                   Tab));
-
-  Tab.UseTab = FormatStyle::UT_AlignWithSpaces;
-  EXPECT_EQ("void a(){\n"
-            "    // line starts with '\t'\n"
-            "};",
-            format("void a(){\n"
-                   "\t// line starts with '\t'\n"
-                   "};",
-                   Tab));
-
-  EXPECT_EQ("void a(){\n"
-            "    // line starts with '\t'\n"
-            "};",
-            format("void a(){\n"
-                   "\t\t// line starts with '\t'\n"
-                   "};",
-                   Tab));
-
-  Tab.UseTab = FormatStyle::UT_Always;
-  EXPECT_EQ("void a(){\n"
-            "// line starts with '\t'\n"
-            "};",
-            format("void a(){\n"
-                   "\t// line starts with '\t'\n"
-                   "};",
-                   Tab));
-
-  EXPECT_EQ("void a(){\n"
-            "// line starts with '\t'\n"
-            "};",
-            format("void a(){\n"
-                   "\t\t// line starts with '\t'\n"
-                   "};",
-                   Tab));
-}
-
-TEST_F(FormatTest, CalculatesOriginalColumn) {
-  EXPECT_EQ("\"qqqqqqqqqqqqqqqqqqqqqqqqqq\\\n"
-            "q\"; /* some\n"
-            "       comment */",
-            format("  \"qqqqqqqqqqqqqqqqqqqqqqqqqq\\\n"
-                   "q\"; /* some\n"
-                   "       comment */",
-                   getLLVMStyle()));
-  EXPECT_EQ("// qqqqqqqqqqqqqqqqqqqqqqqqqq\n"
-            "/* some\n"
-            "   comment */",
-            format("// qqqqqqqqqqqqqqqqqqqqqqqqqq\n"
-                   " /* some\n"
-                   "    comment */",
-                   getLLVMStyle()));
-  EXPECT_EQ("// qqqqqqqqqqqqqqqqqqqqqqqqqq\\\n"
-            "qqq\n"
-            "/* some\n"
-            "   comment */",
-            format("// qqqqqqqqqqqqqqqqqqqqqqqqqq\\\n"
-                   "qqq\n"
-                   " /* some\n"
-                   "    comment */",
-                   getLLVMStyle()));
-  EXPECT_EQ("inttt qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq\\\n"
-            "wwww; /* some\n"
-            "         comment */",
-            format("  inttt qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq\\\n"
-                   "wwww; /* some\n"
-                   "         comment */",
-                   getLLVMStyle()));
-}
-
-TEST_F(FormatTest, ConfigurableSpaceBeforeParens) {
-  FormatStyle NoSpace = getLLVMStyle();
-  NoSpace.SpaceBeforeParens = FormatStyle::SBPO_Never;
-
-  verifyFormat("while(true)\n"
-               "  continue;",
-               NoSpace);
-  verifyFormat("for(;;)\n"
-               "  continue;",
-               NoSpace);
-  verifyFormat("if(true)\n"
-               "  f();\n"
-               "else if(true)\n"
-               "  f();",
-               NoSpace);
-  verifyFormat("do {\n"
-               "  do_something();\n"
-               "} while(something());",
-               NoSpace);
-  verifyFormat("switch(x) {\n"
-               "default:\n"
-               "  break;\n"
-               "}",
-               NoSpace);
-  verifyFormat("auto i = std::make_unique<int>(5);", NoSpace);
-  verifyFormat("size_t x = sizeof(x);", NoSpace);
-  verifyFormat("auto f(int x) -> decltype(x);", NoSpace);
-  verifyFormat("auto f(int x) -> typeof(x);", NoSpace);
-  verifyFormat("auto f(int x) -> _Atomic(x);", NoSpace);
-  verifyFormat("auto f(int x) -> __underlying_type(x);", NoSpace);
-  verifyFormat("int f(T x) noexcept(x.create());", NoSpace);
-  verifyFormat("alignas(128) char a[128];", NoSpace);
-  verifyFormat("size_t x = alignof(MyType);", NoSpace);
-  verifyFormat("static_assert(sizeof(char) == 1, \"Impossible!\");", NoSpace);
-  verifyFormat("int f() throw(Deprecated);", NoSpace);
-  verifyFormat("typedef void (*cb)(int);", NoSpace);
-  verifyFormat("T A::operator()();", NoSpace);
-  verifyFormat("X A::operator++(T);", NoSpace);
-  verifyFormat("auto lambda = []() { return 0; };", NoSpace);
-
-  FormatStyle Space = getLLVMStyle();
-  Space.SpaceBeforeParens = FormatStyle::SBPO_Always;
-
-  verifyFormat("int f ();", Space);
-  verifyFormat("void f (int a, T b) {\n"
-               "  while (true)\n"
-               "    continue;\n"
-               "}",
-               Space);
-  verifyFormat("if (true)\n"
-               "  f ();\n"
-               "else if (true)\n"
-               "  f ();",
-               Space);
-  verifyFormat("do {\n"
-               "  do_something ();\n"
-               "} while (something ());",
-               Space);
-  verifyFormat("switch (x) {\n"
-               "default:\n"
-               "  break;\n"
-               "}",
-               Space);
-  verifyFormat("A::A () : a (1) {}", Space);
-  verifyFormat("void f () __attribute__ ((asdf));", Space);
-  verifyFormat("*(&a + 1);\n"
-               "&((&a)[1]);\n"
-               "a[(b + c) * d];\n"
-               "(((a + 1) * 2) + 3) * 4;",
-               Space);
-  verifyFormat("#define A(x) x", Space);
-  verifyFormat("#define A (x) x", Space);
-  verifyFormat("#if defined(x)\n"
-               "#endif",
-               Space);
-  verifyFormat("auto i = std::make_unique<int> (5);", Space);
-  verifyFormat("size_t x = sizeof (x);", Space);
-  verifyFormat("auto f (int x) -> decltype (x);", Space);
-  verifyFormat("auto f (int x) -> typeof (x);", Space);
-  verifyFormat("auto f (int x) -> _Atomic (x);", Space);
-  verifyFormat("auto f (int x) -> __underlying_type (x);", Space);
-  verifyFormat("int f (T x) noexcept (x.create ());", Space);
-  verifyFormat("alignas (128) char a[128];", Space);
-  verifyFormat("size_t x = alignof (MyType);", Space);
-  verifyFormat("static_assert (sizeof (char) == 1, \"Impossible!\");", Space);
-  verifyFormat("int f () throw (Deprecated);", Space);
-  verifyFormat("typedef void (*cb) (int);", Space);
-  verifyFormat("T A::operator() ();", Space);
-  verifyFormat("X A::operator++ (T);", Space);
-  verifyFormat("auto lambda = [] () { return 0; };", Space);
-  verifyFormat("int x = int (y);", Space);
-
-  FormatStyle SomeSpace = getLLVMStyle();
-  SomeSpace.SpaceBeforeParens = FormatStyle::SBPO_NonEmptyParentheses;
-
-  verifyFormat("[]() -> float {}", SomeSpace);
-  verifyFormat("[] (auto foo) {}", SomeSpace);
-  verifyFormat("[foo]() -> int {}", SomeSpace);
-  verifyFormat("int f();", SomeSpace);
-  verifyFormat("void f (int a, T b) {\n"
-               "  while (true)\n"
-               "    continue;\n"
-               "}",
-               SomeSpace);
-  verifyFormat("if (true)\n"
-               "  f();\n"
-               "else if (true)\n"
-               "  f();",
-               SomeSpace);
-  verifyFormat("do {\n"
-               "  do_something();\n"
-               "} while (something());",
-               SomeSpace);
-  verifyFormat("switch (x) {\n"
-               "default:\n"
-               "  break;\n"
-               "}",
-               SomeSpace);
-  verifyFormat("A::A() : a (1) {}", SomeSpace);
-  verifyFormat("void f() __attribute__ ((asdf));", SomeSpace);
-  verifyFormat("*(&a + 1);\n"
-               "&((&a)[1]);\n"
-               "a[(b + c) * d];\n"
-               "(((a + 1) * 2) + 3) * 4;",
-               SomeSpace);
-  verifyFormat("#define A(x) x", SomeSpace);
-  verifyFormat("#define A (x) x", SomeSpace);
-  verifyFormat("#if defined(x)\n"
-               "#endif",
-               SomeSpace);
-  verifyFormat("auto i = std::make_unique<int> (5);", SomeSpace);
-  verifyFormat("size_t x = sizeof (x);", SomeSpace);
-  verifyFormat("auto f (int x) -> decltype (x);", SomeSpace);
-  verifyFormat("auto f (int x) -> typeof (x);", SomeSpace);
-  verifyFormat("auto f (int x) -> _Atomic (x);", SomeSpace);
-  verifyFormat("auto f (int x) -> __underlying_type (x);", SomeSpace);
-  verifyFormat("int f (T x) noexcept (x.create());", SomeSpace);
-  verifyFormat("alignas (128) char a[128];", SomeSpace);
-  verifyFormat("size_t x = alignof (MyType);", SomeSpace);
-  verifyFormat("static_assert (sizeof (char) == 1, \"Impossible!\");",
-               SomeSpace);
-  verifyFormat("int f() throw (Deprecated);", SomeSpace);
-  verifyFormat("typedef void (*cb) (int);", SomeSpace);
-  verifyFormat("T A::operator()();", SomeSpace);
-  verifyFormat("X A::operator++ (T);", SomeSpace);
-  verifyFormat("int x = int (y);", SomeSpace);
-  verifyFormat("auto lambda = []() { return 0; };", SomeSpace);
-}
-
-TEST_F(FormatTest, SpaceAfterLogicalNot) {
-  FormatStyle Spaces = getLLVMStyle();
-  Spaces.SpaceAfterLogicalNot = true;
-
-  verifyFormat("bool x = ! y", Spaces);
-  verifyFormat("if (! isFailure())", Spaces);
-  verifyFormat("if (! (a && b))", Spaces);
-  verifyFormat("\"Error!\"", Spaces);
-  verifyFormat("! ! x", Spaces);
-}
-
-TEST_F(FormatTest, ConfigurableSpacesInParentheses) {
-  FormatStyle Spaces = getLLVMStyle();
-
-  Spaces.SpacesInParentheses = true;
-  verifyFormat("do_something( ::globalVar );", Spaces);
-  verifyFormat("call( x, y, z );", Spaces);
-  verifyFormat("call();", Spaces);
-  verifyFormat("std::function<void( int, int )> callback;", Spaces);
-  verifyFormat("void inFunction() { std::function<void( int, int )> fct; }",
-               Spaces);
-  verifyFormat("while ( (bool)1 )\n"
-               "  continue;",
-               Spaces);
-  verifyFormat("for ( ;; )\n"
-               "  continue;",
-               Spaces);
-  verifyFormat("if ( true )\n"
-               "  f();\n"
-               "else if ( true )\n"
-               "  f();",
-               Spaces);
-  verifyFormat("do {\n"
-               "  do_something( (int)i );\n"
-               "} while ( something() );",
-               Spaces);
-  verifyFormat("switch ( x ) {\n"
-               "default:\n"
-               "  break;\n"
-               "}",
-               Spaces);
-
-  Spaces.SpacesInParentheses = false;
-  Spaces.SpacesInCStyleCastParentheses = true;
-  verifyFormat("Type *A = ( Type * )P;", Spaces);
-  verifyFormat("Type *A = ( vector<Type *, int *> )P;", Spaces);
-  verifyFormat("x = ( int32 )y;", Spaces);
-  verifyFormat("int a = ( int )(2.0f);", Spaces);
-  verifyFormat("#define AA(X) sizeof((( X * )NULL)->a)", Spaces);
-  verifyFormat("my_int a = ( my_int )sizeof(int);", Spaces);
-  verifyFormat("#define x (( int )-1)", Spaces);
-
-  // Run the first set of tests again with:
-  Spaces.SpacesInParentheses = false;
-  Spaces.SpaceInEmptyParentheses = true;
-  Spaces.SpacesInCStyleCastParentheses = true;
-  verifyFormat("call(x, y, z);", Spaces);
-  verifyFormat("call( );", Spaces);
-  verifyFormat("std::function<void(int, int)> callback;", Spaces);
-  verifyFormat("while (( bool )1)\n"
-               "  continue;",
-               Spaces);
-  verifyFormat("for (;;)\n"
-               "  continue;",
-               Spaces);
-  verifyFormat("if (true)\n"
-               "  f( );\n"
-               "else if (true)\n"
-               "  f( );",
-               Spaces);
-  verifyFormat("do {\n"
-               "  do_something(( int )i);\n"
-               "} while (something( ));",
-               Spaces);
-  verifyFormat("switch (x) {\n"
-               "default:\n"
-               "  break;\n"
-               "}",
-               Spaces);
-
-  // Run the first set of tests again with:
-  Spaces.SpaceAfterCStyleCast = true;
-  verifyFormat("call(x, y, z);", Spaces);
-  verifyFormat("call( );", Spaces);
-  verifyFormat("std::function<void(int, int)> callback;", Spaces);
-  verifyFormat("while (( bool ) 1)\n"
-               "  continue;",
-               Spaces);
-  verifyFormat("for (;;)\n"
-               "  continue;",
-               Spaces);
-  verifyFormat("if (true)\n"
-               "  f( );\n"
-               "else if (true)\n"
-               "  f( );",
-               Spaces);
-  verifyFormat("do {\n"
-               "  do_something(( int ) i);\n"
-               "} while (something( ));",
-               Spaces);
-  verifyFormat("switch (x) {\n"
-               "default:\n"
-               "  break;\n"
-               "}",
-               Spaces);
-
-  // Run subset of tests again with:
-  Spaces.SpacesInCStyleCastParentheses = false;
-  Spaces.SpaceAfterCStyleCast = true;
-  verifyFormat("while ((bool) 1)\n"
-               "  continue;",
-               Spaces);
-  verifyFormat("do {\n"
-               "  do_something((int) i);\n"
-               "} while (something( ));",
-               Spaces);
-
-  verifyFormat("size_t idx = (size_t) (ptr - ((char *) file));", Spaces);
-  verifyFormat("size_t idx = (size_t) a;", Spaces);
-  verifyFormat("size_t idx = (size_t) (a - 1);", Spaces);
-  verifyFormat("size_t idx = (a->*foo)(a - 1);", Spaces);
-  verifyFormat("size_t idx = (a->foo)(a - 1);", Spaces);
-  verifyFormat("size_t idx = (*foo)(a - 1);", Spaces);
-  verifyFormat("size_t idx = (*(foo))(a - 1);", Spaces);
-  Spaces.ColumnLimit = 80;
-  Spaces.IndentWidth = 4;
-  Spaces.AlignAfterOpenBracket = FormatStyle::BAS_AlwaysBreak;
-  verifyFormat("void foo( ) {\n"
-               "    size_t foo = (*(function))(\n"
-               "        Foooo, Barrrrr, Foooo, Barrrr, FoooooooooLooooong, "
-               "BarrrrrrrrrrrrLong,\n"
-               "        FoooooooooLooooong);\n"
-               "}",
-               Spaces);
-  Spaces.SpaceAfterCStyleCast = false;
-  verifyFormat("size_t idx = (size_t)(ptr - ((char *)file));", Spaces);
-  verifyFormat("size_t idx = (size_t)a;", Spaces);
-  verifyFormat("size_t idx = (size_t)(a - 1);", Spaces);
-  verifyFormat("size_t idx = (a->*foo)(a - 1);", Spaces);
-  verifyFormat("size_t idx = (a->foo)(a - 1);", Spaces);
-  verifyFormat("size_t idx = (*foo)(a - 1);", Spaces);
-  verifyFormat("size_t idx = (*(foo))(a - 1);", Spaces);
-
-  verifyFormat("void foo( ) {\n"
-               "    size_t foo = (*(function))(\n"
-               "        Foooo, Barrrrr, Foooo, Barrrr, FoooooooooLooooong, "
-               "BarrrrrrrrrrrrLong,\n"
-               "        FoooooooooLooooong);\n"
-               "}",
-               Spaces);
-}
-
-TEST_F(FormatTest, ConfigurableSpacesInSquareBrackets) {
-  verifyFormat("int a[5];");
-  verifyFormat("a[3] += 42;");
-
-  FormatStyle Spaces = getLLVMStyle();
-  Spaces.SpacesInSquareBrackets = true;
-  // Not lambdas.
-  verifyFormat("int a[ 5 ];", Spaces);
-  verifyFormat("a[ 3 ] += 42;", Spaces);
-  verifyFormat("constexpr char hello[]{\"hello\"};", Spaces);
-  verifyFormat("double &operator[](int i) { return 0; }\n"
-               "int i;",
-               Spaces);
-  verifyFormat("std::unique_ptr<int[]> foo() {}", Spaces);
-  verifyFormat("int i = a[ a ][ a ]->f();", Spaces);
-  verifyFormat("int i = (*b)[ a ]->f();", Spaces);
-  // Lambdas.
-  verifyFormat("int c = []() -> int { return 2; }();\n", Spaces);
-  verifyFormat("return [ i, args... ] {};", Spaces);
-  verifyFormat("int foo = [ &bar ]() {};", Spaces);
-  verifyFormat("int foo = [ = ]() {};", Spaces);
-  verifyFormat("int foo = [ & ]() {};", Spaces);
-  verifyFormat("int foo = [ =, &bar ]() {};", Spaces);
-  verifyFormat("int foo = [ &bar, = ]() {};", Spaces);
-}
-
-TEST_F(FormatTest, ConfigurableSpaceBeforeBrackets) {
-  FormatStyle NoSpaceStyle = getLLVMStyle();
-  verifyFormat("int a[5];", NoSpaceStyle);
-  verifyFormat("a[3] += 42;", NoSpaceStyle);
-
-  verifyFormat("int a[1];", NoSpaceStyle);
-  verifyFormat("int 1 [a];", NoSpaceStyle);
-  verifyFormat("int a[1][2];", NoSpaceStyle);
-  verifyFormat("a[7] = 5;", NoSpaceStyle);
-  verifyFormat("int a = (f())[23];", NoSpaceStyle);
-  verifyFormat("f([] {})", NoSpaceStyle);
-
-  FormatStyle Space = getLLVMStyle();
-  Space.SpaceBeforeSquareBrackets = true;
-  verifyFormat("int c = []() -> int { return 2; }();\n", Space);
-  verifyFormat("return [i, args...] {};", Space);
-
-  verifyFormat("int a [5];", Space);
-  verifyFormat("a [3] += 42;", Space);
-  verifyFormat("constexpr char hello []{\"hello\"};", Space);
-  verifyFormat("double &operator[](int i) { return 0; }\n"
-               "int i;",
-               Space);
-  verifyFormat("std::unique_ptr<int []> foo() {}", Space);
-  verifyFormat("int i = a [a][a]->f();", Space);
-  verifyFormat("int i = (*b) [a]->f();", Space);
-
-  verifyFormat("int a [1];", Space);
-  verifyFormat("int 1 [a];", Space);
-  verifyFormat("int a [1][2];", Space);
-  verifyFormat("a [7] = 5;", Space);
-  verifyFormat("int a = (f()) [23];", Space);
-  verifyFormat("f([] {})", Space);
-}
-
-TEST_F(FormatTest, ConfigurableSpaceBeforeAssignmentOperators) {
-  verifyFormat("int a = 5;");
-  verifyFormat("a += 42;");
-  verifyFormat("a or_eq 8;");
-
-  FormatStyle Spaces = getLLVMStyle();
-  Spaces.SpaceBeforeAssignmentOperators = false;
-  verifyFormat("int a= 5;", Spaces);
-  verifyFormat("a+= 42;", Spaces);
-  verifyFormat("a or_eq 8;", Spaces);
-}
-
-TEST_F(FormatTest, ConfigurableSpaceBeforeColon) {
-  verifyFormat("class Foo : public Bar {};");
-  verifyFormat("Foo::Foo() : foo(1) {}");
-  verifyFormat("for (auto a : b) {\n}");
-  verifyFormat("int x = a ? b : c;");
-  verifyFormat("{\n"
-               "label0:\n"
-               "  int x = 0;\n"
-               "}");
-  verifyFormat("switch (x) {\n"
-               "case 1:\n"
-               "default:\n"
-               "}");
-  verifyFormat("switch (allBraces) {\n"
-               "case 1: {\n"
-               "  break;\n"
-               "}\n"
-               "case 2: {\n"
-               "  [[fallthrough]];\n"
-               "}\n"
-               "default: {\n"
-               "  break;\n"
-               "}\n"
-               "}");
-
-  FormatStyle CtorInitializerStyle = getLLVMStyleWithColumns(30);
-  CtorInitializerStyle.SpaceBeforeCtorInitializerColon = false;
-  verifyFormat("class Foo : public Bar {};", CtorInitializerStyle);
-  verifyFormat("Foo::Foo(): foo(1) {}", CtorInitializerStyle);
-  verifyFormat("for (auto a : b) {\n}", CtorInitializerStyle);
-  verifyFormat("int x = a ? b : c;", CtorInitializerStyle);
-  verifyFormat("{\n"
-               "label1:\n"
-               "  int x = 0;\n"
-               "}",
-               CtorInitializerStyle);
-  verifyFormat("switch (x) {\n"
-               "case 1:\n"
-               "default:\n"
-               "}",
-               CtorInitializerStyle);
-  verifyFormat("switch (allBraces) {\n"
-               "case 1: {\n"
-               "  break;\n"
-               "}\n"
-               "case 2: {\n"
-               "  [[fallthrough]];\n"
-               "}\n"
-               "default: {\n"
-               "  break;\n"
-               "}\n"
-               "}",
-               CtorInitializerStyle);
-  CtorInitializerStyle.BreakConstructorInitializers =
-      FormatStyle::BCIS_AfterColon;
-  verifyFormat("Fooooooooooo::Fooooooooooo():\n"
-               "    aaaaaaaaaaaaaaaa(1),\n"
-               "    bbbbbbbbbbbbbbbb(2) {}",
-               CtorInitializerStyle);
-  CtorInitializerStyle.BreakConstructorInitializers =
-      FormatStyle::BCIS_BeforeComma;
-  verifyFormat("Fooooooooooo::Fooooooooooo()\n"
-               "    : aaaaaaaaaaaaaaaa(1)\n"
-               "    , bbbbbbbbbbbbbbbb(2) {}",
-               CtorInitializerStyle);
-  CtorInitializerStyle.BreakConstructorInitializers =
-      FormatStyle::BCIS_BeforeColon;
-  verifyFormat("Fooooooooooo::Fooooooooooo()\n"
-               "    : aaaaaaaaaaaaaaaa(1),\n"
-               "      bbbbbbbbbbbbbbbb(2) {}",
-               CtorInitializerStyle);
-  CtorInitializerStyle.ConstructorInitializerIndentWidth = 0;
-  verifyFormat("Fooooooooooo::Fooooooooooo()\n"
-               ": aaaaaaaaaaaaaaaa(1),\n"
-               "  bbbbbbbbbbbbbbbb(2) {}",
-               CtorInitializerStyle);
-
-  FormatStyle InheritanceStyle = getLLVMStyleWithColumns(30);
-  InheritanceStyle.SpaceBeforeInheritanceColon = false;
-  verifyFormat("class Foo: public Bar {};", InheritanceStyle);
-  verifyFormat("Foo::Foo() : foo(1) {}", InheritanceStyle);
-  verifyFormat("for (auto a : b) {\n}", InheritanceStyle);
-  verifyFormat("int x = a ? b : c;", InheritanceStyle);
-  verifyFormat("{\n"
-               "label2:\n"
-               "  int x = 0;\n"
-               "}",
-               InheritanceStyle);
-  verifyFormat("switch (x) {\n"
-               "case 1:\n"
-               "default:\n"
-               "}",
-               InheritanceStyle);
-  verifyFormat("switch (allBraces) {\n"
-               "case 1: {\n"
-               "  break;\n"
-               "}\n"
-               "case 2: {\n"
-               "  [[fallthrough]];\n"
-               "}\n"
-               "default: {\n"
-               "  break;\n"
-               "}\n"
-               "}",
-               InheritanceStyle);
-  InheritanceStyle.BreakInheritanceList = FormatStyle::BILS_AfterComma;
-  verifyFormat("class Foooooooooooooooooooooo\n"
-               "    : public aaaaaaaaaaaaaaaaaa,\n"
-               "      public bbbbbbbbbbbbbbbbbb {\n"
-               "}",
-               InheritanceStyle);
-  InheritanceStyle.BreakInheritanceList = FormatStyle::BILS_AfterColon;
-  verifyFormat("class Foooooooooooooooooooooo:\n"
-               "    public aaaaaaaaaaaaaaaaaa,\n"
-               "    public bbbbbbbbbbbbbbbbbb {\n"
-               "}",
-               InheritanceStyle);
-  InheritanceStyle.BreakInheritanceList = FormatStyle::BILS_BeforeComma;
-  verifyFormat("class Foooooooooooooooooooooo\n"
-               "    : public aaaaaaaaaaaaaaaaaa\n"
-               "    , public bbbbbbbbbbbbbbbbbb {\n"
-               "}",
-               InheritanceStyle);
-  InheritanceStyle.BreakInheritanceList = FormatStyle::BILS_BeforeColon;
-  verifyFormat("class Foooooooooooooooooooooo\n"
-               "    : public aaaaaaaaaaaaaaaaaa,\n"
-               "      public bbbbbbbbbbbbbbbbbb {\n"
-               "}",
-               InheritanceStyle);
-  InheritanceStyle.ConstructorInitializerIndentWidth = 0;
-  verifyFormat("class Foooooooooooooooooooooo\n"
-               ": public aaaaaaaaaaaaaaaaaa,\n"
-               "  public bbbbbbbbbbbbbbbbbb {}",
-               InheritanceStyle);
-
-  FormatStyle ForLoopStyle = getLLVMStyle();
-  ForLoopStyle.SpaceBeforeRangeBasedForLoopColon = false;
-  verifyFormat("class Foo : public Bar {};", ForLoopStyle);
-  verifyFormat("Foo::Foo() : foo(1) {}", ForLoopStyle);
-  verifyFormat("for (auto a: b) {\n}", ForLoopStyle);
-  verifyFormat("int x = a ? b : c;", ForLoopStyle);
-  verifyFormat("{\n"
-               "label2:\n"
-               "  int x = 0;\n"
-               "}",
-               ForLoopStyle);
-  verifyFormat("switch (x) {\n"
-               "case 1:\n"
-               "default:\n"
-               "}",
-               ForLoopStyle);
-  verifyFormat("switch (allBraces) {\n"
-               "case 1: {\n"
-               "  break;\n"
-               "}\n"
-               "case 2: {\n"
-               "  [[fallthrough]];\n"
-               "}\n"
-               "default: {\n"
-               "  break;\n"
-               "}\n"
-               "}",
-               ForLoopStyle);
-
-  FormatStyle CaseStyle = getLLVMStyle();
-  CaseStyle.SpaceBeforeCaseColon = true;
-  verifyFormat("class Foo : public Bar {};", CaseStyle);
-  verifyFormat("Foo::Foo() : foo(1) {}", CaseStyle);
-  verifyFormat("for (auto a : b) {\n}", CaseStyle);
-  verifyFormat("int x = a ? b : c;", CaseStyle);
-  verifyFormat("switch (x) {\n"
-               "case 1 :\n"
-               "default :\n"
-               "}",
-               CaseStyle);
-  verifyFormat("switch (allBraces) {\n"
-               "case 1 : {\n"
-               "  break;\n"
-               "}\n"
-               "case 2 : {\n"
-               "  [[fallthrough]];\n"
-               "}\n"
-               "default : {\n"
-               "  break;\n"
-               "}\n"
-               "}",
-               CaseStyle);
-
-  FormatStyle NoSpaceStyle = getLLVMStyle();
-  EXPECT_EQ(NoSpaceStyle.SpaceBeforeCaseColon, false);
-  NoSpaceStyle.SpaceBeforeCtorInitializerColon = false;
-  NoSpaceStyle.SpaceBeforeInheritanceColon = false;
-  NoSpaceStyle.SpaceBeforeRangeBasedForLoopColon = false;
-  verifyFormat("class Foo: public Bar {};", NoSpaceStyle);
-  verifyFormat("Foo::Foo(): foo(1) {}", NoSpaceStyle);
-  verifyFormat("for (auto a: b) {\n}", NoSpaceStyle);
-  verifyFormat("int x = a ? b : c;", NoSpaceStyle);
-  verifyFormat("{\n"
-               "label3:\n"
-               "  int x = 0;\n"
-               "}",
-               NoSpaceStyle);
-  verifyFormat("switch (x) {\n"
-               "case 1:\n"
-               "default:\n"
-               "}",
-               NoSpaceStyle);
-  verifyFormat("switch (allBraces) {\n"
-               "case 1: {\n"
-               "  break;\n"
-               "}\n"
-               "case 2: {\n"
-               "  [[fallthrough]];\n"
-               "}\n"
-               "default: {\n"
-               "  break;\n"
-               "}\n"
-               "}",
-               NoSpaceStyle);
-
-  FormatStyle InvertedSpaceStyle = getLLVMStyle();
-  InvertedSpaceStyle.SpaceBeforeCaseColon = true;
-  InvertedSpaceStyle.SpaceBeforeCtorInitializerColon = false;
-  InvertedSpaceStyle.SpaceBeforeInheritanceColon = false;
-  InvertedSpaceStyle.SpaceBeforeRangeBasedForLoopColon = false;
-  verifyFormat("class Foo: public Bar {};", InvertedSpaceStyle);
-  verifyFormat("Foo::Foo(): foo(1) {}", InvertedSpaceStyle);
-  verifyFormat("for (auto a: b) {\n}", InvertedSpaceStyle);
-  verifyFormat("int x = a ? b : c;", InvertedSpaceStyle);
-  verifyFormat("{\n"
-               "label3:\n"
-               "  int x = 0;\n"
-               "}",
-               InvertedSpaceStyle);
-  verifyFormat("switch (x) {\n"
-               "case 1 :\n"
-               "case 2 : {\n"
-               "  break;\n"
-               "}\n"
-               "default :\n"
-               "  break;\n"
-               "}",
-               InvertedSpaceStyle);
-  verifyFormat("switch (allBraces) {\n"
-               "case 1 : {\n"
-               "  break;\n"
-               "}\n"
-               "case 2 : {\n"
-               "  [[fallthrough]];\n"
-               "}\n"
-               "default : {\n"
-               "  break;\n"
-               "}\n"
-               "}",
-               InvertedSpaceStyle);
-}
-
-TEST_F(FormatTest, ConfigurableSpaceAroundPointerQualifiers) {
-  FormatStyle Style = getLLVMStyle();
-
-  Style.PointerAlignment = FormatStyle::PAS_Left;
-  Style.SpaceAroundPointerQualifiers = FormatStyle::SAPQ_Default;
-  verifyFormat("void* const* x = NULL;", Style);
-
-#define verifyQualifierSpaces(Code, Pointers, Qualifiers)                      \
-  do {                                                                         \
-    Style.PointerAlignment = FormatStyle::Pointers;                            \
-    Style.SpaceAroundPointerQualifiers = FormatStyle::Qualifiers;              \
-    verifyFormat(Code, Style);                                                 \
-  } while (false)
-
-  verifyQualifierSpaces("void* const* x = NULL;", PAS_Left, SAPQ_Default);
-  verifyQualifierSpaces("void *const *x = NULL;", PAS_Right, SAPQ_Default);
-  verifyQualifierSpaces("void * const * x = NULL;", PAS_Middle, SAPQ_Default);
-
-  verifyQualifierSpaces("void* const* x = NULL;", PAS_Left, SAPQ_Before);
-  verifyQualifierSpaces("void * const *x = NULL;", PAS_Right, SAPQ_Before);
-  verifyQualifierSpaces("void * const * x = NULL;", PAS_Middle, SAPQ_Before);
-
-  verifyQualifierSpaces("void* const * x = NULL;", PAS_Left, SAPQ_After);
-  verifyQualifierSpaces("void *const *x = NULL;", PAS_Right, SAPQ_After);
-  verifyQualifierSpaces("void * const * x = NULL;", PAS_Middle, SAPQ_After);
-
-  verifyQualifierSpaces("void* const * x = NULL;", PAS_Left, SAPQ_Both);
-  verifyQualifierSpaces("void * const *x = NULL;", PAS_Right, SAPQ_Both);
-  verifyQualifierSpaces("void * const * x = NULL;", PAS_Middle, SAPQ_Both);
-
-  verifyQualifierSpaces("Foo::operator void const*();", PAS_Left, SAPQ_Default);
-  verifyQualifierSpaces("Foo::operator void const *();", PAS_Right,
-                        SAPQ_Default);
-  verifyQualifierSpaces("Foo::operator void const *();", PAS_Middle,
-                        SAPQ_Default);
-
-  verifyQualifierSpaces("Foo::operator void const*();", PAS_Left, SAPQ_Before);
-  verifyQualifierSpaces("Foo::operator void const *();", PAS_Right,
-                        SAPQ_Before);
-  verifyQualifierSpaces("Foo::operator void const *();", PAS_Middle,
-                        SAPQ_Before);
-
-  verifyQualifierSpaces("Foo::operator void const *();", PAS_Left, SAPQ_After);
-  verifyQualifierSpaces("Foo::operator void const *();", PAS_Right, SAPQ_After);
-  verifyQualifierSpaces("Foo::operator void const *();", PAS_Middle,
-                        SAPQ_After);
-
-  verifyQualifierSpaces("Foo::operator void const *();", PAS_Left, SAPQ_Both);
-  verifyQualifierSpaces("Foo::operator void const *();", PAS_Right, SAPQ_Both);
-  verifyQualifierSpaces("Foo::operator void const *();", PAS_Middle, SAPQ_Both);
-
-#undef verifyQualifierSpaces
-
-  FormatStyle Spaces = getLLVMStyle();
-  Spaces.AttributeMacros.push_back("qualified");
-  Spaces.PointerAlignment = FormatStyle::PAS_Right;
-  Spaces.SpaceAroundPointerQualifiers = FormatStyle::SAPQ_Default;
-  verifyFormat("SomeType *volatile *a = NULL;", Spaces);
-  verifyFormat("SomeType *__attribute__((attr)) *a = NULL;", Spaces);
-  verifyFormat("std::vector<SomeType *const *> x;", Spaces);
-  verifyFormat("std::vector<SomeType *qualified *> x;", Spaces);
-  verifyFormat("std::vector<SomeVar * NotAQualifier> x;", Spaces);
-  Spaces.SpaceAroundPointerQualifiers = FormatStyle::SAPQ_Before;
-  verifyFormat("SomeType * volatile *a = NULL;", Spaces);
-  verifyFormat("SomeType * __attribute__((attr)) *a = NULL;", Spaces);
-  verifyFormat("std::vector<SomeType * const *> x;", Spaces);
-  verifyFormat("std::vector<SomeType * qualified *> x;", Spaces);
-  verifyFormat("std::vector<SomeVar * NotAQualifier> x;", Spaces);
-
-  // Check that SAPQ_Before doesn't result in extra spaces for PAS_Left.
-  Spaces.PointerAlignment = FormatStyle::PAS_Left;
-  Spaces.SpaceAroundPointerQualifiers = FormatStyle::SAPQ_Before;
-  verifyFormat("SomeType* volatile* a = NULL;", Spaces);
-  verifyFormat("SomeType* __attribute__((attr))* a = NULL;", Spaces);
-  verifyFormat("std::vector<SomeType* const*> x;", Spaces);
-  verifyFormat("std::vector<SomeType* qualified*> x;", Spaces);
-  verifyFormat("std::vector<SomeVar * NotAQualifier> x;", Spaces);
-  // However, setting it to SAPQ_After should add spaces after __attribute, etc.
-  Spaces.SpaceAroundPointerQualifiers = FormatStyle::SAPQ_After;
-  verifyFormat("SomeType* volatile * a = NULL;", Spaces);
-  verifyFormat("SomeType* __attribute__((attr)) * a = NULL;", Spaces);
-  verifyFormat("std::vector<SomeType* const *> x;", Spaces);
-  verifyFormat("std::vector<SomeType* qualified *> x;", Spaces);
-  verifyFormat("std::vector<SomeVar * NotAQualifier> x;", Spaces);
-
-  // PAS_Middle should not have any noticeable changes even for SAPQ_Both
-  Spaces.PointerAlignment = FormatStyle::PAS_Middle;
-  Spaces.SpaceAroundPointerQualifiers = FormatStyle::SAPQ_After;
-  verifyFormat("SomeType * volatile * a = NULL;", Spaces);
-  verifyFormat("SomeType * __attribute__((attr)) * a = NULL;", Spaces);
-  verifyFormat("std::vector<SomeType * const *> x;", Spaces);
-  verifyFormat("std::vector<SomeType * qualified *> x;", Spaces);
-  verifyFormat("std::vector<SomeVar * NotAQualifier> x;", Spaces);
-}
-
-TEST_F(FormatTest, AlignConsecutiveMacros) {
-  FormatStyle Style = getLLVMStyle();
-  Style.AlignConsecutiveAssignments = FormatStyle::ACS_Consecutive;
-  Style.AlignConsecutiveDeclarations = FormatStyle::ACS_Consecutive;
-  Style.AlignConsecutiveMacros = FormatStyle::ACS_None;
-
-  verifyFormat("#define a 3\n"
-               "#define bbbb 4\n"
-               "#define ccc (5)",
-               Style);
-
-  verifyFormat("#define f(x) (x * x)\n"
-               "#define fff(x, y, z) (x * y + z)\n"
-               "#define ffff(x, y) (x - y)",
-               Style);
-
-  verifyFormat("#define foo(x, y) (x + y)\n"
-               "#define bar (5, 6)(2 + 2)",
-               Style);
-
-  verifyFormat("#define a 3\n"
-               "#define bbbb 4\n"
-               "#define ccc (5)\n"
-               "#define f(x) (x * x)\n"
-               "#define fff(x, y, z) (x * y + z)\n"
-               "#define ffff(x, y) (x - y)",
-               Style);
-
-  Style.AlignConsecutiveMacros = FormatStyle::ACS_Consecutive;
-  verifyFormat("#define a    3\n"
-               "#define bbbb 4\n"
-               "#define ccc  (5)",
-               Style);
-
-  verifyFormat("#define f(x)         (x * x)\n"
-               "#define fff(x, y, z) (x * y + z)\n"
-               "#define ffff(x, y)   (x - y)",
-               Style);
-
-  verifyFormat("#define foo(x, y) (x + y)\n"
-               "#define bar       (5, 6)(2 + 2)",
-               Style);
-
-  verifyFormat("#define a            3\n"
-               "#define bbbb         4\n"
-               "#define ccc          (5)\n"
-               "#define f(x)         (x * x)\n"
-               "#define fff(x, y, z) (x * y + z)\n"
-               "#define ffff(x, y)   (x - y)",
-               Style);
-
-  verifyFormat("#define a         5\n"
-               "#define foo(x, y) (x + y)\n"
-               "#define CCC       (6)\n"
-               "auto lambda = []() {\n"
-               "  auto  ii = 0;\n"
-               "  float j  = 0;\n"
-               "  return 0;\n"
-               "};\n"
-               "int   i  = 0;\n"
-               "float i2 = 0;\n"
-               "auto  v  = type{\n"
-               "    i = 1,   //\n"
-               "    (i = 2), //\n"
-               "    i = 3    //\n"
-               "};",
-               Style);
-
-  Style.AlignConsecutiveMacros = FormatStyle::ACS_None;
-  Style.ColumnLimit = 20;
-
-  verifyFormat("#define a          \\\n"
-               "  \"aabbbbbbbbbbbb\"\n"
-               "#define D          \\\n"
-               "  \"aabbbbbbbbbbbb\" \\\n"
-               "  \"ccddeeeeeeeee\"\n"
-               "#define B          \\\n"
-               "  \"QQQQQQQQQQQQQ\"  \\\n"
-               "  \"FFFFFFFFFFFFF\"  \\\n"
-               "  \"LLLLLLLL\"\n",
-               Style);
-
-  Style.AlignConsecutiveMacros = FormatStyle::ACS_Consecutive;
-  verifyFormat("#define a          \\\n"
-               "  \"aabbbbbbbbbbbb\"\n"
-               "#define D          \\\n"
-               "  \"aabbbbbbbbbbbb\" \\\n"
-               "  \"ccddeeeeeeeee\"\n"
-               "#define B          \\\n"
-               "  \"QQQQQQQQQQQQQ\"  \\\n"
-               "  \"FFFFFFFFFFFFF\"  \\\n"
-               "  \"LLLLLLLL\"\n",
-               Style);
-
-  // Test across comments
-  Style.MaxEmptyLinesToKeep = 10;
-  Style.ReflowComments = false;
-  Style.AlignConsecutiveMacros = FormatStyle::ACS_AcrossComments;
-  EXPECT_EQ("#define a    3\n"
-            "// line comment\n"
-            "#define bbbb 4\n"
-            "#define ccc  (5)",
-            format("#define a 3\n"
-                   "// line comment\n"
-                   "#define bbbb 4\n"
-                   "#define ccc (5)",
-                   Style));
-
-  EXPECT_EQ("#define a    3\n"
-            "/* block comment */\n"
-            "#define bbbb 4\n"
-            "#define ccc  (5)",
-            format("#define a  3\n"
-                   "/* block comment */\n"
-                   "#define bbbb 4\n"
-                   "#define ccc (5)",
-                   Style));
-
-  EXPECT_EQ("#define a    3\n"
-            "/* multi-line *\n"
-            " * block comment */\n"
-            "#define bbbb 4\n"
-            "#define ccc  (5)",
-            format("#define a 3\n"
-                   "/* multi-line *\n"
-                   " * block comment */\n"
-                   "#define bbbb 4\n"
-                   "#define ccc (5)",
-                   Style));
-
-  EXPECT_EQ("#define a    3\n"
-            "// multi-line line comment\n"
-            "//\n"
-            "#define bbbb 4\n"
-            "#define ccc  (5)",
-            format("#define a  3\n"
-                   "// multi-line line comment\n"
-                   "//\n"
-                   "#define bbbb 4\n"
-                   "#define ccc (5)",
-                   Style));
-
-  EXPECT_EQ("#define a 3\n"
-            "// empty lines still break.\n"
-            "\n"
-            "#define bbbb 4\n"
-            "#define ccc  (5)",
-            format("#define a     3\n"
-                   "// empty lines still break.\n"
-                   "\n"
-                   "#define bbbb     4\n"
-                   "#define ccc  (5)",
-                   Style));
-
-  // Test across empty lines
-  Style.AlignConsecutiveMacros = FormatStyle::ACS_AcrossEmptyLines;
-  EXPECT_EQ("#define a    3\n"
-            "\n"
-            "#define bbbb 4\n"
-            "#define ccc  (5)",
-            format("#define a 3\n"
-                   "\n"
-                   "#define bbbb 4\n"
-                   "#define ccc (5)",
-                   Style));
-
-  EXPECT_EQ("#define a    3\n"
-            "\n"
-            "\n"
-            "\n"
-            "#define bbbb 4\n"
-            "#define ccc  (5)",
-            format("#define a        3\n"
-                   "\n"
-                   "\n"
-                   "\n"
-                   "#define bbbb 4\n"
-                   "#define ccc (5)",
-                   Style));
-
-  EXPECT_EQ("#define a 3\n"
-            "// comments should break alignment\n"
-            "//\n"
-            "#define bbbb 4\n"
-            "#define ccc  (5)",
-            format("#define a        3\n"
-                   "// comments should break alignment\n"
-                   "//\n"
-                   "#define bbbb 4\n"
-                   "#define ccc (5)",
-                   Style));
-
-  // Test across empty lines and comments
-  Style.AlignConsecutiveMacros = FormatStyle::ACS_AcrossEmptyLinesAndComments;
-  verifyFormat("#define a    3\n"
-               "\n"
-               "// line comment\n"
-               "#define bbbb 4\n"
-               "#define ccc  (5)",
-               Style);
-
-  EXPECT_EQ("#define a    3\n"
-            "\n"
-            "\n"
-            "/* multi-line *\n"
-            " * block comment */\n"
-            "\n"
-            "\n"
-            "#define bbbb 4\n"
-            "#define ccc  (5)",
-            format("#define a 3\n"
-                   "\n"
-                   "\n"
-                   "/* multi-line *\n"
-                   " * block comment */\n"
-                   "\n"
-                   "\n"
-                   "#define bbbb 4\n"
-                   "#define ccc (5)",
-                   Style));
-
-  EXPECT_EQ("#define a    3\n"
-            "\n"
-            "\n"
-            "/* multi-line *\n"
-            " * block comment */\n"
-            "\n"
-            "\n"
-            "#define bbbb 4\n"
-            "#define ccc  (5)",
-            format("#define a 3\n"
-                   "\n"
-                   "\n"
-                   "/* multi-line *\n"
-                   " * block comment */\n"
-                   "\n"
-                   "\n"
-                   "#define bbbb 4\n"
-                   "#define ccc       (5)",
-                   Style));
-}
-
-TEST_F(FormatTest, AlignConsecutiveAssignmentsAcrossEmptyLines) {
-  FormatStyle Alignment = getLLVMStyle();
-  Alignment.AlignConsecutiveMacros = FormatStyle::ACS_Consecutive;
-  Alignment.AlignConsecutiveAssignments = FormatStyle::ACS_AcrossEmptyLines;
-
-  Alignment.MaxEmptyLinesToKeep = 10;
-  /* Test alignment across empty lines */
-  EXPECT_EQ("int a           = 5;\n"
-            "\n"
-            "int oneTwoThree = 123;",
-            format("int a       = 5;\n"
-                   "\n"
-                   "int oneTwoThree= 123;",
-                   Alignment));
-  EXPECT_EQ("int a           = 5;\n"
-            "int one         = 1;\n"
-            "\n"
-            "int oneTwoThree = 123;",
-            format("int a = 5;\n"
-                   "int one = 1;\n"
-                   "\n"
-                   "int oneTwoThree = 123;",
-                   Alignment));
-  EXPECT_EQ("int a           = 5;\n"
-            "int one         = 1;\n"
-            "\n"
-            "int oneTwoThree = 123;\n"
-            "int oneTwo      = 12;",
-            format("int a = 5;\n"
-                   "int one = 1;\n"
-                   "\n"
-                   "int oneTwoThree = 123;\n"
-                   "int oneTwo = 12;",
-                   Alignment));
-
-  /* Test across comments */
-  EXPECT_EQ("int a = 5;\n"
-            "/* block comment */\n"
-            "int oneTwoThree = 123;",
-            format("int a = 5;\n"
-                   "/* block comment */\n"
-                   "int oneTwoThree=123;",
-                   Alignment));
-
-  EXPECT_EQ("int a = 5;\n"
-            "// line comment\n"
-            "int oneTwoThree = 123;",
-            format("int a = 5;\n"
-                   "// line comment\n"
-                   "int oneTwoThree=123;",
-                   Alignment));
-
-  /* Test across comments and newlines */
-  EXPECT_EQ("int a = 5;\n"
-            "\n"
-            "/* block comment */\n"
-            "int oneTwoThree = 123;",
-            format("int a = 5;\n"
-                   "\n"
-                   "/* block comment */\n"
-                   "int oneTwoThree=123;",
-                   Alignment));
-
-  EXPECT_EQ("int a = 5;\n"
-            "\n"
-            "// line comment\n"
-            "int oneTwoThree = 123;",
-            format("int a = 5;\n"
-                   "\n"
-                   "// line comment\n"
-                   "int oneTwoThree=123;",
-                   Alignment));
-}
-
-TEST_F(FormatTest, AlignConsecutiveDeclarationsAcrossEmptyLinesAndComments) {
-  FormatStyle Alignment = getLLVMStyle();
-  Alignment.AlignConsecutiveDeclarations =
-      FormatStyle::ACS_AcrossEmptyLinesAndComments;
-  Alignment.AlignConsecutiveAssignments = FormatStyle::ACS_None;
-
-  Alignment.MaxEmptyLinesToKeep = 10;
-  /* Test alignment across empty lines */
-  EXPECT_EQ("int         a = 5;\n"
-            "\n"
-            "float const oneTwoThree = 123;",
-            format("int a = 5;\n"
-                   "\n"
-                   "float const oneTwoThree = 123;",
-                   Alignment));
-  EXPECT_EQ("int         a = 5;\n"
-            "float const one = 1;\n"
-            "\n"
-            "int         oneTwoThree = 123;",
-            format("int a = 5;\n"
-                   "float const one = 1;\n"
-                   "\n"
-                   "int oneTwoThree = 123;",
-                   Alignment));
-
-  /* Test across comments */
-  EXPECT_EQ("float const a = 5;\n"
-            "/* block comment */\n"
-            "int         oneTwoThree = 123;",
-            format("float const a = 5;\n"
-                   "/* block comment */\n"
-                   "int oneTwoThree=123;",
-                   Alignment));
-
-  EXPECT_EQ("float const a = 5;\n"
-            "// line comment\n"
-            "int         oneTwoThree = 123;",
-            format("float const a = 5;\n"
-                   "// line comment\n"
-                   "int oneTwoThree=123;",
-                   Alignment));
-
-  /* Test across comments and newlines */
-  EXPECT_EQ("float const a = 5;\n"
-            "\n"
-            "/* block comment */\n"
-            "int         oneTwoThree = 123;",
-            format("float const a = 5;\n"
-                   "\n"
-                   "/* block comment */\n"
-                   "int         oneTwoThree=123;",
-                   Alignment));
-
-  EXPECT_EQ("float const a = 5;\n"
-            "\n"
-            "// line comment\n"
-            "int         oneTwoThree = 123;",
-            format("float const a = 5;\n"
-                   "\n"
-                   "// line comment\n"
-                   "int oneTwoThree=123;",
-                   Alignment));
-}
-
-TEST_F(FormatTest, AlignConsecutiveBitFieldsAcrossEmptyLinesAndComments) {
-  FormatStyle Alignment = getLLVMStyle();
-  Alignment.AlignConsecutiveBitFields =
-      FormatStyle::ACS_AcrossEmptyLinesAndComments;
-
-  Alignment.MaxEmptyLinesToKeep = 10;
-  /* Test alignment across empty lines */
-  EXPECT_EQ("int a            : 5;\n"
-            "\n"
-            "int longbitfield : 6;",
-            format("int a : 5;\n"
-                   "\n"
-                   "int longbitfield : 6;",
-                   Alignment));
-  EXPECT_EQ("int a            : 5;\n"
-            "int one          : 1;\n"
-            "\n"
-            "int longbitfield : 6;",
-            format("int a : 5;\n"
-                   "int one : 1;\n"
-                   "\n"
-                   "int longbitfield : 6;",
-                   Alignment));
-
-  /* Test across comments */
-  EXPECT_EQ("int a            : 5;\n"
-            "/* block comment */\n"
-            "int longbitfield : 6;",
-            format("int a : 5;\n"
-                   "/* block comment */\n"
-                   "int longbitfield : 6;",
-                   Alignment));
-  EXPECT_EQ("int a            : 5;\n"
-            "int one          : 1;\n"
-            "// line comment\n"
-            "int longbitfield : 6;",
-            format("int a : 5;\n"
-                   "int one : 1;\n"
-                   "// line comment\n"
-                   "int longbitfield : 6;",
-                   Alignment));
-
-  /* Test across comments and newlines */
-  EXPECT_EQ("int a            : 5;\n"
-            "/* block comment */\n"
-            "\n"
-            "int longbitfield : 6;",
-            format("int a : 5;\n"
-                   "/* block comment */\n"
-                   "\n"
-                   "int longbitfield : 6;",
-                   Alignment));
-  EXPECT_EQ("int a            : 5;\n"
-            "int one          : 1;\n"
-            "\n"
-            "// line comment\n"
-            "\n"
-            "int longbitfield : 6;",
-            format("int a : 5;\n"
-                   "int one : 1;\n"
-                   "\n"
-                   "// line comment \n"
-                   "\n"
-                   "int longbitfield : 6;",
-                   Alignment));
-}
-
-TEST_F(FormatTest, AlignConsecutiveAssignmentsAcrossComments) {
-  FormatStyle Alignment = getLLVMStyle();
-  Alignment.AlignConsecutiveMacros = FormatStyle::ACS_Consecutive;
-  Alignment.AlignConsecutiveAssignments = FormatStyle::ACS_AcrossComments;
-
-  Alignment.MaxEmptyLinesToKeep = 10;
-  /* Test alignment across empty lines */
-  EXPECT_EQ("int a = 5;\n"
-            "\n"
-            "int oneTwoThree = 123;",
-            format("int a       = 5;\n"
-                   "\n"
-                   "int oneTwoThree= 123;",
-                   Alignment));
-  EXPECT_EQ("int a   = 5;\n"
-            "int one = 1;\n"
-            "\n"
-            "int oneTwoThree = 123;",
-            format("int a = 5;\n"
-                   "int one = 1;\n"
-                   "\n"
-                   "int oneTwoThree = 123;",
-                   Alignment));
-
-  /* Test across comments */
-  EXPECT_EQ("int a           = 5;\n"
-            "/* block comment */\n"
-            "int oneTwoThree = 123;",
-            format("int a = 5;\n"
-                   "/* block comment */\n"
-                   "int oneTwoThree=123;",
-                   Alignment));
-
-  EXPECT_EQ("int a           = 5;\n"
-            "// line comment\n"
-            "int oneTwoThree = 123;",
-            format("int a = 5;\n"
-                   "// line comment\n"
-                   "int oneTwoThree=123;",
-                   Alignment));
-
-  EXPECT_EQ("int a           = 5;\n"
-            "/*\n"
-            " * multi-line block comment\n"
-            " */\n"
-            "int oneTwoThree = 123;",
-            format("int a = 5;\n"
-                   "/*\n"
-                   " * multi-line block comment\n"
-                   " */\n"
-                   "int oneTwoThree=123;",
-                   Alignment));
-
-  EXPECT_EQ("int a           = 5;\n"
-            "//\n"
-            "// multi-line line comment\n"
-            "//\n"
-            "int oneTwoThree = 123;",
-            format("int a = 5;\n"
-                   "//\n"
-                   "// multi-line line comment\n"
-                   "//\n"
-                   "int oneTwoThree=123;",
-                   Alignment));
-
-  /* Test across comments and newlines */
-  EXPECT_EQ("int a = 5;\n"
-            "\n"
-            "/* block comment */\n"
-            "int oneTwoThree = 123;",
-            format("int a = 5;\n"
-                   "\n"
-                   "/* block comment */\n"
-                   "int oneTwoThree=123;",
-                   Alignment));
-
-  EXPECT_EQ("int a = 5;\n"
-            "\n"
-            "// line comment\n"
-            "int oneTwoThree = 123;",
-            format("int a = 5;\n"
-                   "\n"
-                   "// line comment\n"
-                   "int oneTwoThree=123;",
-                   Alignment));
-}
-
-TEST_F(FormatTest, AlignConsecutiveAssignmentsAcrossEmptyLinesAndComments) {
-  FormatStyle Alignment = getLLVMStyle();
-  Alignment.AlignConsecutiveMacros = FormatStyle::ACS_Consecutive;
-  Alignment.AlignConsecutiveAssignments =
-      FormatStyle::ACS_AcrossEmptyLinesAndComments;
-  verifyFormat("int a           = 5;\n"
-               "int oneTwoThree = 123;",
-               Alignment);
-  verifyFormat("int a           = method();\n"
-               "int oneTwoThree = 133;",
-               Alignment);
-  verifyFormat("a &= 5;\n"
-               "bcd *= 5;\n"
-               "ghtyf += 5;\n"
-               "dvfvdb -= 5;\n"
-               "a /= 5;\n"
-               "vdsvsv %= 5;\n"
-               "sfdbddfbdfbb ^= 5;\n"
-               "dvsdsv |= 5;\n"
-               "int dsvvdvsdvvv = 123;",
-               Alignment);
-  verifyFormat("int i = 1, j = 10;\n"
-               "something = 2000;",
-               Alignment);
-  verifyFormat("something = 2000;\n"
-               "int i = 1, j = 10;\n",
-               Alignment);
-  verifyFormat("something = 2000;\n"
-               "another   = 911;\n"
-               "int i = 1, j = 10;\n"
-               "oneMore = 1;\n"
-               "i       = 2;",
-               Alignment);
-  verifyFormat("int a   = 5;\n"
-               "int one = 1;\n"
-               "method();\n"
-               "int oneTwoThree = 123;\n"
-               "int oneTwo      = 12;",
-               Alignment);
-  verifyFormat("int oneTwoThree = 123;\n"
-               "int oneTwo      = 12;\n"
-               "method();\n",
-               Alignment);
-  verifyFormat("int oneTwoThree = 123; // comment\n"
-               "int oneTwo      = 12;  // comment",
-               Alignment);
-
-  // Bug 25167
-  /* Uncomment when fixed
-    verifyFormat("#if A\n"
-                 "#else\n"
-                 "int aaaaaaaa = 12;\n"
-                 "#endif\n"
-                 "#if B\n"
-                 "#else\n"
-                 "int a = 12;\n"
-                 "#endif\n",
-                 Alignment);
-    verifyFormat("enum foo {\n"
-                 "#if A\n"
-                 "#else\n"
-                 "  aaaaaaaa = 12;\n"
-                 "#endif\n"
-                 "#if B\n"
-                 "#else\n"
-                 "  a = 12;\n"
-                 "#endif\n"
-                 "};\n",
-                 Alignment);
-  */
-
-  Alignment.MaxEmptyLinesToKeep = 10;
-  /* Test alignment across empty lines */
-  EXPECT_EQ("int a           = 5;\n"
-            "\n"
-            "int oneTwoThree = 123;",
-            format("int a       = 5;\n"
-                   "\n"
-                   "int oneTwoThree= 123;",
-                   Alignment));
-  EXPECT_EQ("int a           = 5;\n"
-            "int one         = 1;\n"
-            "\n"
-            "int oneTwoThree = 123;",
-            format("int a = 5;\n"
-                   "int one = 1;\n"
-                   "\n"
-                   "int oneTwoThree = 123;",
-                   Alignment));
-  EXPECT_EQ("int a           = 5;\n"
-            "int one         = 1;\n"
-            "\n"
-            "int oneTwoThree = 123;\n"
-            "int oneTwo      = 12;",
-            format("int a = 5;\n"
-                   "int one = 1;\n"
-                   "\n"
-                   "int oneTwoThree = 123;\n"
-                   "int oneTwo = 12;",
-                   Alignment));
-
-  /* Test across comments */
-  EXPECT_EQ("int a           = 5;\n"
-            "/* block comment */\n"
-            "int oneTwoThree = 123;",
-            format("int a = 5;\n"
-                   "/* block comment */\n"
-                   "int oneTwoThree=123;",
-                   Alignment));
-
-  EXPECT_EQ("int a           = 5;\n"
-            "// line comment\n"
-            "int oneTwoThree = 123;",
-            format("int a = 5;\n"
-                   "// line comment\n"
-                   "int oneTwoThree=123;",
-                   Alignment));
-
-  /* Test across comments and newlines */
-  EXPECT_EQ("int a           = 5;\n"
-            "\n"
-            "/* block comment */\n"
-            "int oneTwoThree = 123;",
-            format("int a = 5;\n"
-                   "\n"
-                   "/* block comment */\n"
-                   "int oneTwoThree=123;",
-                   Alignment));
-
-  EXPECT_EQ("int a           = 5;\n"
-            "\n"
-            "// line comment\n"
-            "int oneTwoThree = 123;",
-            format("int a = 5;\n"
-                   "\n"
-                   "// line comment\n"
-                   "int oneTwoThree=123;",
-                   Alignment));
-
-  EXPECT_EQ("int a           = 5;\n"
-            "//\n"
-            "// multi-line line comment\n"
-            "//\n"
-            "int oneTwoThree = 123;",
-            format("int a = 5;\n"
-                   "//\n"
-                   "// multi-line line comment\n"
-                   "//\n"
-                   "int oneTwoThree=123;",
-                   Alignment));
-
-  EXPECT_EQ("int a           = 5;\n"
-            "/*\n"
-            " *  multi-line block comment\n"
-            " */\n"
-            "int oneTwoThree = 123;",
-            format("int a = 5;\n"
-                   "/*\n"
-                   " *  multi-line block comment\n"
-                   " */\n"
-                   "int oneTwoThree=123;",
-                   Alignment));
-
-  EXPECT_EQ("int a           = 5;\n"
-            "\n"
-            "/* block comment */\n"
-            "\n"
-            "\n"
-            "\n"
-            "int oneTwoThree = 123;",
-            format("int a = 5;\n"
-                   "\n"
-                   "/* block comment */\n"
-                   "\n"
-                   "\n"
-                   "\n"
-                   "int oneTwoThree=123;",
-                   Alignment));
-
-  EXPECT_EQ("int a           = 5;\n"
-            "\n"
-            "// line comment\n"
-            "\n"
-            "\n"
-            "\n"
-            "int oneTwoThree = 123;",
-            format("int a = 5;\n"
-                   "\n"
-                   "// line comment\n"
-                   "\n"
-                   "\n"
-                   "\n"
-                   "int oneTwoThree=123;",
-                   Alignment));
-
-  Alignment.AlignEscapedNewlines = FormatStyle::ENAS_DontAlign;
-  verifyFormat("#define A \\\n"
-               "  int aaaa       = 12; \\\n"
-               "  int b          = 23; \\\n"
-               "  int ccc        = 234; \\\n"
-               "  int dddddddddd = 2345;",
-               Alignment);
-  Alignment.AlignEscapedNewlines = FormatStyle::ENAS_Left;
-  verifyFormat("#define A               \\\n"
-               "  int aaaa       = 12;  \\\n"
-               "  int b          = 23;  \\\n"
-               "  int ccc        = 234; \\\n"
-               "  int dddddddddd = 2345;",
-               Alignment);
-  Alignment.AlignEscapedNewlines = FormatStyle::ENAS_Right;
-  verifyFormat("#define A                                                      "
-               "                \\\n"
-               "  int aaaa       = 12;                                         "
-               "                \\\n"
-               "  int b          = 23;                                         "
-               "                \\\n"
-               "  int ccc        = 234;                                        "
-               "                \\\n"
-               "  int dddddddddd = 2345;",
-               Alignment);
-  verifyFormat("void SomeFunction(int parameter = 1, int i = 2, int j = 3, int "
-               "k = 4, int l = 5,\n"
-               "                  int m = 6) {\n"
-               "  int j      = 10;\n"
-               "  otherThing = 1;\n"
-               "}",
-               Alignment);
-  verifyFormat("void SomeFunction(int parameter = 0) {\n"
-               "  int i   = 1;\n"
-               "  int j   = 2;\n"
-               "  int big = 10000;\n"
-               "}",
-               Alignment);
-  verifyFormat("class C {\n"
-               "public:\n"
-               "  int i            = 1;\n"
-               "  virtual void f() = 0;\n"
-               "};",
-               Alignment);
-  verifyFormat("int i = 1;\n"
-               "if (SomeType t = getSomething()) {\n"
-               "}\n"
-               "int j   = 2;\n"
-               "int big = 10000;",
-               Alignment);
-  verifyFormat("int j = 7;\n"
-               "for (int k = 0; k < N; ++k) {\n"
-               "}\n"
-               "int j   = 2;\n"
-               "int big = 10000;\n"
-               "}",
-               Alignment);
-  Alignment.BreakBeforeBinaryOperators = FormatStyle::BOS_All;
-  verifyFormat("int i = 1;\n"
-               "LooooooooooongType loooooooooooooooooooooongVariable\n"
-               "    = someLooooooooooooooooongFunction();\n"
-               "int j = 2;",
-               Alignment);
-  Alignment.BreakBeforeBinaryOperators = FormatStyle::BOS_None;
-  verifyFormat("int i = 1;\n"
-               "LooooooooooongType loooooooooooooooooooooongVariable =\n"
-               "    someLooooooooooooooooongFunction();\n"
-               "int j = 2;",
-               Alignment);
-
-  verifyFormat("auto lambda = []() {\n"
-               "  auto i = 0;\n"
-               "  return 0;\n"
-               "};\n"
-               "int i  = 0;\n"
-               "auto v = type{\n"
-               "    i = 1,   //\n"
-               "    (i = 2), //\n"
-               "    i = 3    //\n"
-               "};",
-               Alignment);
-
-  verifyFormat(
-      "int i      = 1;\n"
-      "SomeType a = SomeFunction(looooooooooooooooooooooongParameterA,\n"
-      "                          loooooooooooooooooooooongParameterB);\n"
-      "int j      = 2;",
-      Alignment);
-
-  verifyFormat("template <typename T, typename T_0 = very_long_type_name_0,\n"
-               "          typename B   = very_long_type_name_1,\n"
-               "          typename T_2 = very_long_type_name_2>\n"
-               "auto foo() {}\n",
-               Alignment);
-  verifyFormat("int a, b = 1;\n"
-               "int c  = 2;\n"
-               "int dd = 3;\n",
-               Alignment);
-  verifyFormat("int aa       = ((1 > 2) ? 3 : 4);\n"
-               "float b[1][] = {{3.f}};\n",
-               Alignment);
-  verifyFormat("for (int i = 0; i < 1; i++)\n"
-               "  int x = 1;\n",
-               Alignment);
-  verifyFormat("for (i = 0; i < 1; i++)\n"
-               "  x = 1;\n"
-               "y = 1;\n",
-               Alignment);
-
-  Alignment.ReflowComments = true;
-  Alignment.ColumnLimit = 50;
-  EXPECT_EQ("int x   = 0;\n"
-            "int yy  = 1; /// specificlennospace\n"
-            "int zzz = 2;\n",
-            format("int x   = 0;\n"
-                   "int yy  = 1; ///specificlennospace\n"
-                   "int zzz = 2;\n",
-                   Alignment));
-}
-
-TEST_F(FormatTest, AlignConsecutiveAssignments) {
-  FormatStyle Alignment = getLLVMStyle();
-  Alignment.AlignConsecutiveMacros = FormatStyle::ACS_Consecutive;
-  Alignment.AlignConsecutiveAssignments = FormatStyle::ACS_None;
-  verifyFormat("int a = 5;\n"
-               "int oneTwoThree = 123;",
-               Alignment);
-  verifyFormat("int a = 5;\n"
-               "int oneTwoThree = 123;",
-               Alignment);
-
-  Alignment.AlignConsecutiveAssignments = FormatStyle::ACS_Consecutive;
-  verifyFormat("int a           = 5;\n"
-               "int oneTwoThree = 123;",
-               Alignment);
-  verifyFormat("int a           = method();\n"
-               "int oneTwoThree = 133;",
-               Alignment);
-  verifyFormat("a &= 5;\n"
-               "bcd *= 5;\n"
-               "ghtyf += 5;\n"
-               "dvfvdb -= 5;\n"
-               "a /= 5;\n"
-               "vdsvsv %= 5;\n"
-               "sfdbddfbdfbb ^= 5;\n"
-               "dvsdsv |= 5;\n"
-               "int dsvvdvsdvvv = 123;",
-               Alignment);
-  verifyFormat("int i = 1, j = 10;\n"
-               "something = 2000;",
-               Alignment);
-  verifyFormat("something = 2000;\n"
-               "int i = 1, j = 10;\n",
-               Alignment);
-  verifyFormat("something = 2000;\n"
-               "another   = 911;\n"
-               "int i = 1, j = 10;\n"
-               "oneMore = 1;\n"
-               "i       = 2;",
-               Alignment);
-  verifyFormat("int a   = 5;\n"
-               "int one = 1;\n"
-               "method();\n"
-               "int oneTwoThree = 123;\n"
-               "int oneTwo      = 12;",
-               Alignment);
-  verifyFormat("int oneTwoThree = 123;\n"
-               "int oneTwo      = 12;\n"
-               "method();\n",
-               Alignment);
-  verifyFormat("int oneTwoThree = 123; // comment\n"
-               "int oneTwo      = 12;  // comment",
-               Alignment);
-
-  // Bug 25167
-  /* Uncomment when fixed
-    verifyFormat("#if A\n"
-                 "#else\n"
-                 "int aaaaaaaa = 12;\n"
-                 "#endif\n"
-                 "#if B\n"
-                 "#else\n"
-                 "int a = 12;\n"
-                 "#endif\n",
-                 Alignment);
-    verifyFormat("enum foo {\n"
-                 "#if A\n"
-                 "#else\n"
-                 "  aaaaaaaa = 12;\n"
-                 "#endif\n"
-                 "#if B\n"
-                 "#else\n"
-                 "  a = 12;\n"
-                 "#endif\n"
-                 "};\n",
-                 Alignment);
-  */
-
-  EXPECT_EQ("int a = 5;\n"
-            "\n"
-            "int oneTwoThree = 123;",
-            format("int a       = 5;\n"
-                   "\n"
-                   "int oneTwoThree= 123;",
-                   Alignment));
-  EXPECT_EQ("int a   = 5;\n"
-            "int one = 1;\n"
-            "\n"
-            "int oneTwoThree = 123;",
-            format("int a = 5;\n"
-                   "int one = 1;\n"
-                   "\n"
-                   "int oneTwoThree = 123;",
-                   Alignment));
-  EXPECT_EQ("int a   = 5;\n"
-            "int one = 1;\n"
-            "\n"
-            "int oneTwoThree = 123;\n"
-            "int oneTwo      = 12;",
-            format("int a = 5;\n"
-                   "int one = 1;\n"
-                   "\n"
-                   "int oneTwoThree = 123;\n"
-                   "int oneTwo = 12;",
-                   Alignment));
-  Alignment.AlignEscapedNewlines = FormatStyle::ENAS_DontAlign;
-  verifyFormat("#define A \\\n"
-               "  int aaaa       = 12; \\\n"
-               "  int b          = 23; \\\n"
-               "  int ccc        = 234; \\\n"
-               "  int dddddddddd = 2345;",
-               Alignment);
-  Alignment.AlignEscapedNewlines = FormatStyle::ENAS_Left;
-  verifyFormat("#define A               \\\n"
-               "  int aaaa       = 12;  \\\n"
-               "  int b          = 23;  \\\n"
-               "  int ccc        = 234; \\\n"
-               "  int dddddddddd = 2345;",
-               Alignment);
-  Alignment.AlignEscapedNewlines = FormatStyle::ENAS_Right;
-  verifyFormat("#define A                                                      "
-               "                \\\n"
-               "  int aaaa       = 12;                                         "
-               "                \\\n"
-               "  int b          = 23;                                         "
-               "                \\\n"
-               "  int ccc        = 234;                                        "
-               "                \\\n"
-               "  int dddddddddd = 2345;",
-               Alignment);
-  verifyFormat("void SomeFunction(int parameter = 1, int i = 2, int j = 3, int "
-               "k = 4, int l = 5,\n"
-               "                  int m = 6) {\n"
-               "  int j      = 10;\n"
-               "  otherThing = 1;\n"
-               "}",
-               Alignment);
-  verifyFormat("void SomeFunction(int parameter = 0) {\n"
-               "  int i   = 1;\n"
-               "  int j   = 2;\n"
-               "  int big = 10000;\n"
-               "}",
-               Alignment);
-  verifyFormat("class C {\n"
-               "public:\n"
-               "  int i            = 1;\n"
-               "  virtual void f() = 0;\n"
-               "};",
-               Alignment);
-  verifyFormat("int i = 1;\n"
-               "if (SomeType t = getSomething()) {\n"
-               "}\n"
-               "int j   = 2;\n"
-               "int big = 10000;",
-               Alignment);
-  verifyFormat("int j = 7;\n"
-               "for (int k = 0; k < N; ++k) {\n"
-               "}\n"
-               "int j   = 2;\n"
-               "int big = 10000;\n"
-               "}",
-               Alignment);
-  Alignment.BreakBeforeBinaryOperators = FormatStyle::BOS_All;
-  verifyFormat("int i = 1;\n"
-               "LooooooooooongType loooooooooooooooooooooongVariable\n"
-               "    = someLooooooooooooooooongFunction();\n"
-               "int j = 2;",
-               Alignment);
-  Alignment.BreakBeforeBinaryOperators = FormatStyle::BOS_None;
-  verifyFormat("int i = 1;\n"
-               "LooooooooooongType loooooooooooooooooooooongVariable =\n"
-               "    someLooooooooooooooooongFunction();\n"
-               "int j = 2;",
-               Alignment);
-
-  verifyFormat("auto lambda = []() {\n"
-               "  auto i = 0;\n"
-               "  return 0;\n"
-               "};\n"
-               "int i  = 0;\n"
-               "auto v = type{\n"
-               "    i = 1,   //\n"
-               "    (i = 2), //\n"
-               "    i = 3    //\n"
-               "};",
-               Alignment);
-
-  verifyFormat(
-      "int i      = 1;\n"
-      "SomeType a = SomeFunction(looooooooooooooooooooooongParameterA,\n"
-      "                          loooooooooooooooooooooongParameterB);\n"
-      "int j      = 2;",
-      Alignment);
-
-  verifyFormat("template <typename T, typename T_0 = very_long_type_name_0,\n"
-               "          typename B   = very_long_type_name_1,\n"
-               "          typename T_2 = very_long_type_name_2>\n"
-               "auto foo() {}\n",
-               Alignment);
-  verifyFormat("int a, b = 1;\n"
-               "int c  = 2;\n"
-               "int dd = 3;\n",
-               Alignment);
-  verifyFormat("int aa       = ((1 > 2) ? 3 : 4);\n"
-               "float b[1][] = {{3.f}};\n",
-               Alignment);
-  verifyFormat("for (int i = 0; i < 1; i++)\n"
-               "  int x = 1;\n",
-               Alignment);
-  verifyFormat("for (i = 0; i < 1; i++)\n"
-               "  x = 1;\n"
-               "y = 1;\n",
-               Alignment);
-
-  Alignment.ReflowComments = true;
-  Alignment.ColumnLimit = 50;
-  EXPECT_EQ("int x   = 0;\n"
-            "int yy  = 1; /// specificlennospace\n"
-            "int zzz = 2;\n",
-            format("int x   = 0;\n"
-                   "int yy  = 1; ///specificlennospace\n"
-                   "int zzz = 2;\n",
-                   Alignment));
-}
-
-TEST_F(FormatTest, AlignConsecutiveBitFields) {
-  FormatStyle Alignment = getLLVMStyle();
-  Alignment.AlignConsecutiveBitFields = FormatStyle::ACS_Consecutive;
-  verifyFormat("int const a     : 5;\n"
-               "int oneTwoThree : 23;",
-               Alignment);
-
-  // Initializers are allowed starting with c++2a
-  verifyFormat("int const a     : 5 = 1;\n"
-               "int oneTwoThree : 23 = 0;",
-               Alignment);
-
-  Alignment.AlignConsecutiveDeclarations = FormatStyle::ACS_Consecutive;
-  verifyFormat("int const a           : 5;\n"
-               "int       oneTwoThree : 23;",
-               Alignment);
-
-  verifyFormat("int const a           : 5;  // comment\n"
-               "int       oneTwoThree : 23; // comment",
-               Alignment);
-
-  verifyFormat("int const a           : 5 = 1;\n"
-               "int       oneTwoThree : 23 = 0;",
-               Alignment);
-
-  Alignment.AlignConsecutiveAssignments = FormatStyle::ACS_Consecutive;
-  verifyFormat("int const a           : 5  = 1;\n"
-               "int       oneTwoThree : 23 = 0;",
-               Alignment);
-  verifyFormat("int const a           : 5  = {1};\n"
-               "int       oneTwoThree : 23 = 0;",
-               Alignment);
-
-  Alignment.BitFieldColonSpacing = FormatStyle::BFCS_None;
-  verifyFormat("int const a          :5;\n"
-               "int       oneTwoThree:23;",
-               Alignment);
-
-  Alignment.BitFieldColonSpacing = FormatStyle::BFCS_Before;
-  verifyFormat("int const a           :5;\n"
-               "int       oneTwoThree :23;",
-               Alignment);
-
-  Alignment.BitFieldColonSpacing = FormatStyle::BFCS_After;
-  verifyFormat("int const a          : 5;\n"
-               "int       oneTwoThree: 23;",
-               Alignment);
-
-  // Known limitations: ':' is only recognized as a bitfield colon when
-  // followed by a number.
-  /*
-  verifyFormat("int oneTwoThree : SOME_CONSTANT;\n"
-               "int a           : 5;",
-               Alignment);
-  */
-}
-
-TEST_F(FormatTest, AlignConsecutiveDeclarations) {
-  FormatStyle Alignment = getLLVMStyle();
-  Alignment.AlignConsecutiveMacros = FormatStyle::ACS_Consecutive;
-  Alignment.AlignConsecutiveDeclarations = FormatStyle::ACS_None;
-  Alignment.PointerAlignment = FormatStyle::PAS_Right;
-  verifyFormat("float const a = 5;\n"
-               "int oneTwoThree = 123;",
-               Alignment);
-  verifyFormat("int a = 5;\n"
-               "float const oneTwoThree = 123;",
-               Alignment);
-
-  Alignment.AlignConsecutiveDeclarations = FormatStyle::ACS_Consecutive;
-  verifyFormat("float const a = 5;\n"
-               "int         oneTwoThree = 123;",
-               Alignment);
-  verifyFormat("int         a = method();\n"
-               "float const oneTwoThree = 133;",
-               Alignment);
-  verifyFormat("int i = 1, j = 10;\n"
-               "something = 2000;",
-               Alignment);
-  verifyFormat("something = 2000;\n"
-               "int i = 1, j = 10;\n",
-               Alignment);
-  verifyFormat("float      something = 2000;\n"
-               "double     another = 911;\n"
-               "int        i = 1, j = 10;\n"
-               "const int *oneMore = 1;\n"
-               "unsigned   i = 2;",
-               Alignment);
-  verifyFormat("float a = 5;\n"
-               "int   one = 1;\n"
-               "method();\n"
-               "const double       oneTwoThree = 123;\n"
-               "const unsigned int oneTwo = 12;",
-               Alignment);
-  verifyFormat("int      oneTwoThree{0}; // comment\n"
-               "unsigned oneTwo;         // comment",
-               Alignment);
-  verifyFormat("unsigned int       *a;\n"
-               "int                *b;\n"
-               "unsigned int Const *c;\n"
-               "unsigned int const *d;\n"
-               "unsigned int Const &e;\n"
-               "unsigned int const &f;",
-               Alignment);
-  verifyFormat("Const unsigned int *c;\n"
-               "const unsigned int *d;\n"
-               "Const unsigned int &e;\n"
-               "const unsigned int &f;\n"
-               "const unsigned      g;\n"
-               "Const unsigned      h;",
-               Alignment);
-  EXPECT_EQ("float const a = 5;\n"
-            "\n"
-            "int oneTwoThree = 123;",
-            format("float const   a = 5;\n"
-                   "\n"
-                   "int           oneTwoThree= 123;",
-                   Alignment));
-  EXPECT_EQ("float a = 5;\n"
-            "int   one = 1;\n"
-            "\n"
-            "unsigned oneTwoThree = 123;",
-            format("float    a = 5;\n"
-                   "int      one = 1;\n"
-                   "\n"
-                   "unsigned oneTwoThree = 123;",
-                   Alignment));
-  EXPECT_EQ("float a = 5;\n"
-            "int   one = 1;\n"
-            "\n"
-            "unsigned oneTwoThree = 123;\n"
-            "int      oneTwo = 12;",
-            format("float    a = 5;\n"
-                   "int one = 1;\n"
-                   "\n"
-                   "unsigned oneTwoThree = 123;\n"
-                   "int oneTwo = 12;",
-                   Alignment));
-  // Function prototype alignment
-  verifyFormat("int    a();\n"
-               "double b();",
-               Alignment);
-  verifyFormat("int    a(int x);\n"
-               "double b();",
-               Alignment);
-  unsigned OldColumnLimit = Alignment.ColumnLimit;
-  // We need to set ColumnLimit to zero, in order to stress nested alignments,
-  // otherwise the function parameters will be re-flowed onto a single line.
-  Alignment.ColumnLimit = 0;
-  EXPECT_EQ("int    a(int   x,\n"
-            "         float y);\n"
-            "double b(int    x,\n"
-            "         double y);",
-            format("int a(int x,\n"
-                   " float y);\n"
-                   "double b(int x,\n"
-                   " double y);",
-                   Alignment));
-  // This ensures that function parameters of function declarations are
-  // correctly indented when their owning functions are indented.
-  // The failure case here is for 'double y' to not be indented enough.
-  EXPECT_EQ("double a(int x);\n"
-            "int    b(int    y,\n"
-            "         double z);",
-            format("double a(int x);\n"
-                   "int b(int y,\n"
-                   " double z);",
-                   Alignment));
-  // Set ColumnLimit low so that we induce wrapping immediately after
-  // the function name and opening paren.
-  Alignment.ColumnLimit = 13;
-  verifyFormat("int function(\n"
-               "    int  x,\n"
-               "    bool y);",
-               Alignment);
-  Alignment.ColumnLimit = OldColumnLimit;
-  // Ensure function pointers don't screw up recursive alignment
-  verifyFormat("int    a(int x, void (*fp)(int y));\n"
-               "double b();",
-               Alignment);
-  Alignment.AlignConsecutiveAssignments = FormatStyle::ACS_Consecutive;
-  // Ensure recursive alignment is broken by function braces, so that the
-  // "a = 1" does not align with subsequent assignments inside the function
-  // body.
-  verifyFormat("int func(int a = 1) {\n"
-               "  int b  = 2;\n"
-               "  int cc = 3;\n"
-               "}",
-               Alignment);
-  verifyFormat("float      something = 2000;\n"
-               "double     another   = 911;\n"
-               "int        i = 1, j = 10;\n"
-               "const int *oneMore = 1;\n"
-               "unsigned   i       = 2;",
-               Alignment);
-  verifyFormat("int      oneTwoThree = {0}; // comment\n"
-               "unsigned oneTwo      = 0;   // comment",
-               Alignment);
-  // Make sure that scope is correctly tracked, in the absence of braces
-  verifyFormat("for (int i = 0; i < n; i++)\n"
-               "  j = i;\n"
-               "double x = 1;\n",
-               Alignment);
-  verifyFormat("if (int i = 0)\n"
-               "  j = i;\n"
-               "double x = 1;\n",
-               Alignment);
-  // Ensure operator[] and operator() are comprehended
-  verifyFormat("struct test {\n"
-               "  long long int foo();\n"
-               "  int           operator[](int a);\n"
-               "  double        bar();\n"
-               "};\n",
-               Alignment);
-  verifyFormat("struct test {\n"
-               "  long long int foo();\n"
-               "  int           operator()(int a);\n"
-               "  double        bar();\n"
-               "};\n",
-               Alignment);
-
-  // PAS_Right
-  EXPECT_EQ("void SomeFunction(int parameter = 0) {\n"
-            "  int const i   = 1;\n"
-            "  int      *j   = 2;\n"
-            "  int       big = 10000;\n"
-            "\n"
-            "  unsigned oneTwoThree = 123;\n"
-            "  int      oneTwo      = 12;\n"
-            "  method();\n"
-            "  float k  = 2;\n"
-            "  int   ll = 10000;\n"
-            "}",
-            format("void SomeFunction(int parameter= 0) {\n"
-                   " int const  i= 1;\n"
-                   "  int *j=2;\n"
-                   " int big  =  10000;\n"
-                   "\n"
-                   "unsigned oneTwoThree  =123;\n"
-                   "int oneTwo = 12;\n"
-                   "  method();\n"
-                   "float k= 2;\n"
-                   "int ll=10000;\n"
-                   "}",
-                   Alignment));
-  EXPECT_EQ("void SomeFunction(int parameter = 0) {\n"
-            "  int const i   = 1;\n"
-            "  int     **j   = 2, ***k;\n"
-            "  int      &k   = i;\n"
-            "  int     &&l   = i + j;\n"
-            "  int       big = 10000;\n"
-            "\n"
-            "  unsigned oneTwoThree = 123;\n"
-            "  int      oneTwo      = 12;\n"
-            "  method();\n"
-            "  float k  = 2;\n"
-            "  int   ll = 10000;\n"
-            "}",
-            format("void SomeFunction(int parameter= 0) {\n"
-                   " int const  i= 1;\n"
-                   "  int **j=2,***k;\n"
-                   "int &k=i;\n"
-                   "int &&l=i+j;\n"
-                   " int big  =  10000;\n"
-                   "\n"
-                   "unsigned oneTwoThree  =123;\n"
-                   "int oneTwo = 12;\n"
-                   "  method();\n"
-                   "float k= 2;\n"
-                   "int ll=10000;\n"
-                   "}",
-                   Alignment));
-  // variables are aligned at their name, pointers are at the right most
-  // position
-  verifyFormat("int   *a;\n"
-               "int  **b;\n"
-               "int ***c;\n"
-               "int    foobar;\n",
-               Alignment);
-
-  // PAS_Left
-  FormatStyle AlignmentLeft = Alignment;
-  AlignmentLeft.PointerAlignment = FormatStyle::PAS_Left;
-  EXPECT_EQ("void SomeFunction(int parameter = 0) {\n"
-            "  int const i   = 1;\n"
-            "  int*      j   = 2;\n"
-            "  int       big = 10000;\n"
-            "\n"
-            "  unsigned oneTwoThree = 123;\n"
-            "  int      oneTwo      = 12;\n"
-            "  method();\n"
-            "  float k  = 2;\n"
-            "  int   ll = 10000;\n"
-            "}",
-            format("void SomeFunction(int parameter= 0) {\n"
-                   " int const  i= 1;\n"
-                   "  int *j=2;\n"
-                   " int big  =  10000;\n"
-                   "\n"
-                   "unsigned oneTwoThree  =123;\n"
-                   "int oneTwo = 12;\n"
-                   "  method();\n"
-                   "float k= 2;\n"
-                   "int ll=10000;\n"
-                   "}",
-                   AlignmentLeft));
-  EXPECT_EQ("void SomeFunction(int parameter = 0) {\n"
-            "  int const i   = 1;\n"
-            "  int**     j   = 2;\n"
-            "  int&      k   = i;\n"
-            "  int&&     l   = i + j;\n"
-            "  int       big = 10000;\n"
-            "\n"
-            "  unsigned oneTwoThree = 123;\n"
-            "  int      oneTwo      = 12;\n"
-            "  method();\n"
-            "  float k  = 2;\n"
-            "  int   ll = 10000;\n"
-            "}",
-            format("void SomeFunction(int parameter= 0) {\n"
-                   " int const  i= 1;\n"
-                   "  int **j=2;\n"
-                   "int &k=i;\n"
-                   "int &&l=i+j;\n"
-                   " int big  =  10000;\n"
-                   "\n"
-                   "unsigned oneTwoThree  =123;\n"
-                   "int oneTwo = 12;\n"
-                   "  method();\n"
-                   "float k= 2;\n"
-                   "int ll=10000;\n"
-                   "}",
-                   AlignmentLeft));
-  // variables are aligned at their name, pointers are at the left most position
-  verifyFormat("int*   a;\n"
-               "int**  b;\n"
-               "int*** c;\n"
-               "int    foobar;\n",
-               AlignmentLeft);
-
-  // PAS_Middle
-  FormatStyle AlignmentMiddle = Alignment;
-  AlignmentMiddle.PointerAlignment = FormatStyle::PAS_Middle;
-  EXPECT_EQ("void SomeFunction(int parameter = 0) {\n"
-            "  int const i   = 1;\n"
-            "  int *     j   = 2;\n"
-            "  int       big = 10000;\n"
-            "\n"
-            "  unsigned oneTwoThree = 123;\n"
-            "  int      oneTwo      = 12;\n"
-            "  method();\n"
-            "  float k  = 2;\n"
-            "  int   ll = 10000;\n"
-            "}",
-            format("void SomeFunction(int parameter= 0) {\n"
-                   " int const  i= 1;\n"
-                   "  int *j=2;\n"
-                   " int big  =  10000;\n"
-                   "\n"
-                   "unsigned oneTwoThree  =123;\n"
-                   "int oneTwo = 12;\n"
-                   "  method();\n"
-                   "float k= 2;\n"
-                   "int ll=10000;\n"
-                   "}",
-                   AlignmentMiddle));
-  EXPECT_EQ("void SomeFunction(int parameter = 0) {\n"
-            "  int const i   = 1;\n"
-            "  int **    j   = 2, ***k;\n"
-            "  int &     k   = i;\n"
-            "  int &&    l   = i + j;\n"
-            "  int       big = 10000;\n"
-            "\n"
-            "  unsigned oneTwoThree = 123;\n"
-            "  int      oneTwo      = 12;\n"
-            "  method();\n"
-            "  float k  = 2;\n"
-            "  int   ll = 10000;\n"
-            "}",
-            format("void SomeFunction(int parameter= 0) {\n"
-                   " int const  i= 1;\n"
-                   "  int **j=2,***k;\n"
-                   "int &k=i;\n"
-                   "int &&l=i+j;\n"
-                   " int big  =  10000;\n"
-                   "\n"
-                   "unsigned oneTwoThree  =123;\n"
-                   "int oneTwo = 12;\n"
-                   "  method();\n"
-                   "float k= 2;\n"
-                   "int ll=10000;\n"
-                   "}",
-                   AlignmentMiddle));
-  // variables are aligned at their name, pointers are in the middle
-  verifyFormat("int *   a;\n"
-               "int *   b;\n"
-               "int *** c;\n"
-               "int     foobar;\n",
-               AlignmentMiddle);
-
-  Alignment.AlignConsecutiveAssignments = FormatStyle::ACS_None;
-  Alignment.AlignEscapedNewlines = FormatStyle::ENAS_DontAlign;
-  verifyFormat("#define A \\\n"
-               "  int       aaaa = 12; \\\n"
-               "  float     b = 23; \\\n"
-               "  const int ccc = 234; \\\n"
-               "  unsigned  dddddddddd = 2345;",
-               Alignment);
-  Alignment.AlignEscapedNewlines = FormatStyle::ENAS_Left;
-  verifyFormat("#define A              \\\n"
-               "  int       aaaa = 12; \\\n"
-               "  float     b = 23;    \\\n"
-               "  const int ccc = 234; \\\n"
-               "  unsigned  dddddddddd = 2345;",
-               Alignment);
-  Alignment.AlignEscapedNewlines = FormatStyle::ENAS_Right;
-  Alignment.ColumnLimit = 30;
-  verifyFormat("#define A                    \\\n"
-               "  int       aaaa = 12;       \\\n"
-               "  float     b = 23;          \\\n"
-               "  const int ccc = 234;       \\\n"
-               "  int       dddddddddd = 2345;",
-               Alignment);
-  Alignment.ColumnLimit = 80;
-  verifyFormat("void SomeFunction(int parameter = 1, int i = 2, int j = 3, int "
-               "k = 4, int l = 5,\n"
-               "                  int m = 6) {\n"
-               "  const int j = 10;\n"
-               "  otherThing = 1;\n"
-               "}",
-               Alignment);
-  verifyFormat("void SomeFunction(int parameter = 0) {\n"
-               "  int const i = 1;\n"
-               "  int      *j = 2;\n"
-               "  int       big = 10000;\n"
-               "}",
-               Alignment);
-  verifyFormat("class C {\n"
-               "public:\n"
-               "  int          i = 1;\n"
-               "  virtual void f() = 0;\n"
-               "};",
-               Alignment);
-  verifyFormat("float i = 1;\n"
-               "if (SomeType t = getSomething()) {\n"
-               "}\n"
-               "const unsigned j = 2;\n"
-               "int            big = 10000;",
-               Alignment);
-  verifyFormat("float j = 7;\n"
-               "for (int k = 0; k < N; ++k) {\n"
-               "}\n"
-               "unsigned j = 2;\n"
-               "int      big = 10000;\n"
-               "}",
-               Alignment);
-  Alignment.BreakBeforeBinaryOperators = FormatStyle::BOS_All;
-  verifyFormat("float              i = 1;\n"
-               "LooooooooooongType loooooooooooooooooooooongVariable\n"
-               "    = someLooooooooooooooooongFunction();\n"
-               "int j = 2;",
-               Alignment);
-  Alignment.BreakBeforeBinaryOperators = FormatStyle::BOS_None;
-  verifyFormat("int                i = 1;\n"
-               "LooooooooooongType loooooooooooooooooooooongVariable =\n"
-               "    someLooooooooooooooooongFunction();\n"
-               "int j = 2;",
-               Alignment);
-
-  Alignment.AlignConsecutiveAssignments = FormatStyle::ACS_Consecutive;
-  verifyFormat("auto lambda = []() {\n"
-               "  auto  ii = 0;\n"
-               "  float j  = 0;\n"
-               "  return 0;\n"
-               "};\n"
-               "int   i  = 0;\n"
-               "float i2 = 0;\n"
-               "auto  v  = type{\n"
-               "    i = 1,   //\n"
-               "    (i = 2), //\n"
-               "    i = 3    //\n"
-               "};",
-               Alignment);
-  Alignment.AlignConsecutiveAssignments = FormatStyle::ACS_None;
-
-  verifyFormat(
-      "int      i = 1;\n"
-      "SomeType a = SomeFunction(looooooooooooooooooooooongParameterA,\n"
-      "                          loooooooooooooooooooooongParameterB);\n"
-      "int      j = 2;",
-      Alignment);
-
-  // Test interactions with ColumnLimit and AlignConsecutiveAssignments:
-  // We expect declarations and assignments to align, as long as it doesn't
-  // exceed the column limit, starting a new alignment sequence whenever it
-  // happens.
-  Alignment.AlignConsecutiveAssignments = FormatStyle::ACS_Consecutive;
-  Alignment.ColumnLimit = 30;
-  verifyFormat("float    ii              = 1;\n"
-               "unsigned j               = 2;\n"
-               "int someVerylongVariable = 1;\n"
-               "AnotherLongType  ll = 123456;\n"
-               "VeryVeryLongType k  = 2;\n"
-               "int              myvar = 1;",
-               Alignment);
-  Alignment.ColumnLimit = 80;
-  Alignment.AlignConsecutiveAssignments = FormatStyle::ACS_None;
-
-  verifyFormat(
-      "template <typename LongTemplate, typename VeryLongTemplateTypeName,\n"
-      "          typename LongType, typename B>\n"
-      "auto foo() {}\n",
-      Alignment);
-  verifyFormat("float a, b = 1;\n"
-               "int   c = 2;\n"
-               "int   dd = 3;\n",
-               Alignment);
-  verifyFormat("int   aa = ((1 > 2) ? 3 : 4);\n"
-               "float b[1][] = {{3.f}};\n",
-               Alignment);
-  Alignment.AlignConsecutiveAssignments = FormatStyle::ACS_Consecutive;
-  verifyFormat("float a, b = 1;\n"
-               "int   c  = 2;\n"
-               "int   dd = 3;\n",
-               Alignment);
-  verifyFormat("int   aa     = ((1 > 2) ? 3 : 4);\n"
-               "float b[1][] = {{3.f}};\n",
-               Alignment);
-  Alignment.AlignConsecutiveAssignments = FormatStyle::ACS_None;
-
-  Alignment.ColumnLimit = 30;
-  Alignment.BinPackParameters = false;
-  verifyFormat("void foo(float     a,\n"
-               "         float     b,\n"
-               "         int       c,\n"
-               "         uint32_t *d) {\n"
-               "  int   *e = 0;\n"
-               "  float  f = 0;\n"
-               "  double g = 0;\n"
-               "}\n"
-               "void bar(ino_t     a,\n"
-               "         int       b,\n"
-               "         uint32_t *c,\n"
-               "         bool      d) {}\n",
-               Alignment);
-  Alignment.BinPackParameters = true;
-  Alignment.ColumnLimit = 80;
-
-  // Bug 33507
-  Alignment.PointerAlignment = FormatStyle::PAS_Middle;
-  verifyFormat(
-      "auto found = range::find_if(vsProducts, [&](auto * aProduct) {\n"
-      "  static const Version verVs2017;\n"
-      "  return true;\n"
-      "});\n",
-      Alignment);
-  Alignment.PointerAlignment = FormatStyle::PAS_Right;
-
-  // See llvm.org/PR35641
-  Alignment.AlignConsecutiveDeclarations = FormatStyle::ACS_Consecutive;
-  verifyFormat("int func() { //\n"
-               "  int      b;\n"
-               "  unsigned c;\n"
-               "}",
-               Alignment);
-
-  // See PR37175
-  FormatStyle Style = getMozillaStyle();
-  Style.AlignConsecutiveDeclarations = FormatStyle::ACS_Consecutive;
-  EXPECT_EQ("DECOR1 /**/ int8_t /**/ DECOR2 /**/\n"
-            "foo(int a);",
-            format("DECOR1 /**/ int8_t /**/ DECOR2 /**/ foo (int a);", Style));
-
-  Alignment.PointerAlignment = FormatStyle::PAS_Left;
-  verifyFormat("unsigned int*       a;\n"
-               "int*                b;\n"
-               "unsigned int Const* c;\n"
-               "unsigned int const* d;\n"
-               "unsigned int Const& e;\n"
-               "unsigned int const& f;",
-               Alignment);
-  verifyFormat("Const unsigned int* c;\n"
-               "const unsigned int* d;\n"
-               "Const unsigned int& e;\n"
-               "const unsigned int& f;\n"
-               "const unsigned      g;\n"
-               "Const unsigned      h;",
-               Alignment);
-
-  Alignment.PointerAlignment = FormatStyle::PAS_Middle;
-  verifyFormat("unsigned int *       a;\n"
-               "int *                b;\n"
-               "unsigned int Const * c;\n"
-               "unsigned int const * d;\n"
-               "unsigned int Const & e;\n"
-               "unsigned int const & f;",
-               Alignment);
-  verifyFormat("Const unsigned int * c;\n"
-               "const unsigned int * d;\n"
-               "Const unsigned int & e;\n"
-               "const unsigned int & f;\n"
-               "const unsigned       g;\n"
-               "Const unsigned       h;",
-               Alignment);
-}
-
-TEST_F(FormatTest, AlignWithLineBreaks) {
-  auto Style = getLLVMStyleWithColumns(120);
-
-  EXPECT_EQ(Style.AlignConsecutiveAssignments, FormatStyle::ACS_None);
-  EXPECT_EQ(Style.AlignConsecutiveDeclarations, FormatStyle::ACS_None);
-  verifyFormat("void foo() {\n"
-               "  int myVar = 5;\n"
-               "  double x = 3.14;\n"
-               "  auto str = \"Hello \"\n"
-               "             \"World\";\n"
-               "  auto s = \"Hello \"\n"
-               "           \"Again\";\n"
-               "}",
-               Style);
-
-  // clang-format off
-  verifyFormat("void foo() {\n"
-               "  const int capacityBefore = Entries.capacity();\n"
-               "  const auto newEntry = Entries.emplaceHint(std::piecewise_construct, std::forward_as_tuple(uniqueId),\n"
-               "                                            std::forward_as_tuple(id, uniqueId, name, threadCreation));\n"
-               "  const X newEntry2 = Entries.emplaceHint(std::piecewise_construct, std::forward_as_tuple(uniqueId),\n"
-               "                                          std::forward_as_tuple(id, uniqueId, name, threadCreation));\n"
-               "}",
-               Style);
-  // clang-format on
-
-  Style.AlignConsecutiveAssignments = FormatStyle::ACS_Consecutive;
-  verifyFormat("void foo() {\n"
-               "  int myVar = 5;\n"
-               "  double x  = 3.14;\n"
-               "  auto str  = \"Hello \"\n"
-               "              \"World\";\n"
-               "  auto s    = \"Hello \"\n"
-               "              \"Again\";\n"
-               "}",
-               Style);
-
-  // clang-format off
-  verifyFormat("void foo() {\n"
-               "  const int capacityBefore = Entries.capacity();\n"
-               "  const auto newEntry      = Entries.emplaceHint(std::piecewise_construct, std::forward_as_tuple(uniqueId),\n"
-               "                                                 std::forward_as_tuple(id, uniqueId, name, threadCreation));\n"
-               "  const X newEntry2        = Entries.emplaceHint(std::piecewise_construct, std::forward_as_tuple(uniqueId),\n"
-               "                                                 std::forward_as_tuple(id, uniqueId, name, threadCreation));\n"
-               "}",
-               Style);
-  // clang-format on
-
-  Style.AlignConsecutiveAssignments = FormatStyle::ACS_None;
-  Style.AlignConsecutiveDeclarations = FormatStyle::ACS_Consecutive;
-  verifyFormat("void foo() {\n"
-               "  int    myVar = 5;\n"
-               "  double x = 3.14;\n"
-               "  auto   str = \"Hello \"\n"
-               "               \"World\";\n"
-               "  auto   s = \"Hello \"\n"
-               "             \"Again\";\n"
-               "}",
-               Style);
-
-  // clang-format off
-  verifyFormat("void foo() {\n"
-               "  const int  capacityBefore = Entries.capacity();\n"
-               "  const auto newEntry = Entries.emplaceHint(std::piecewise_construct, std::forward_as_tuple(uniqueId),\n"
-               "                                            std::forward_as_tuple(id, uniqueId, name, threadCreation));\n"
-               "  const X    newEntry2 = Entries.emplaceHint(std::piecewise_construct, std::forward_as_tuple(uniqueId),\n"
-               "                                             std::forward_as_tuple(id, uniqueId, name, threadCreation));\n"
-               "}",
-               Style);
-  // clang-format on
-
-  Style.AlignConsecutiveAssignments = FormatStyle::ACS_Consecutive;
-  Style.AlignConsecutiveDeclarations = FormatStyle::ACS_Consecutive;
-
-  verifyFormat("void foo() {\n"
-               "  int    myVar = 5;\n"
-               "  double x     = 3.14;\n"
-               "  auto   str   = \"Hello \"\n"
-               "                 \"World\";\n"
-               "  auto   s     = \"Hello \"\n"
-               "                 \"Again\";\n"
-               "}",
-               Style);
-
-  // clang-format off
-  verifyFormat("void foo() {\n"
-               "  const int  capacityBefore = Entries.capacity();\n"
-               "  const auto newEntry       = Entries.emplaceHint(std::piecewise_construct, std::forward_as_tuple(uniqueId),\n"
-               "                                                  std::forward_as_tuple(id, uniqueId, name, threadCreation));\n"
-               "  const X    newEntry2      = Entries.emplaceHint(std::piecewise_construct, std::forward_as_tuple(uniqueId),\n"
-               "                                                  std::forward_as_tuple(id, uniqueId, name, threadCreation));\n"
-               "}",
-               Style);
-  // clang-format on
-
-  Style = getLLVMStyleWithColumns(120);
-  Style.AlignConsecutiveAssignments = FormatStyle::ACS_Consecutive;
-  Style.ContinuationIndentWidth = 4;
-  Style.IndentWidth = 4;
-
-  // clang-format off
-  verifyFormat("void SomeFunc() {\n"
-               "    newWatcher.maxAgeUsec = ToLegacyTimestamp(GetMaxAge(FromLegacyTimestamp<milliseconds>(monitorFrequencyUsec),\n"
-               "                                                        seconds(std::uint64_t(maxSampleAge)), maxKeepSamples));\n"
-               "    newWatcher.maxAge     = ToLegacyTimestamp(GetMaxAge(FromLegacyTimestamp<milliseconds>(monitorFrequencyUsec),\n"
-               "                                                        seconds(std::uint64_t(maxSampleAge)), maxKeepSamples));\n"
-               "    newWatcher.max        = ToLegacyTimestamp(GetMaxAge(FromLegacyTimestamp<milliseconds>(monitorFrequencyUsec),\n"
-               "                                                        seconds(std::uint64_t(maxSampleAge)), maxKeepSamples));\n"
-               "}",
-               Style);
-  // clang-format on
-
-  Style.BinPackArguments = false;
-
-  // clang-format off
-  verifyFormat("void SomeFunc() {\n"
-               "    newWatcher.maxAgeUsec = ToLegacyTimestamp(GetMaxAge(\n"
-               "        FromLegacyTimestamp<milliseconds>(monitorFrequencyUsec), seconds(std::uint64_t(maxSampleAge)), maxKeepSamples));\n"
-               "    newWatcher.maxAge     = ToLegacyTimestamp(GetMaxAge(\n"
-               "        FromLegacyTimestamp<milliseconds>(monitorFrequencyUsec), seconds(std::uint64_t(maxSampleAge)), maxKeepSamples));\n"
-               "    newWatcher.max        = ToLegacyTimestamp(GetMaxAge(\n"
-               "        FromLegacyTimestamp<milliseconds>(monitorFrequencyUsec), seconds(std::uint64_t(maxSampleAge)), maxKeepSamples));\n"
-               "}",
-               Style);
-  // clang-format on
-}
-
-TEST_F(FormatTest, AlignWithInitializerPeriods) {
-  auto Style = getLLVMStyleWithColumns(60);
-
-  verifyFormat("void foo1(void) {\n"
-               "  BYTE p[1] = 1;\n"
-               "  A B = {.one_foooooooooooooooo = 2,\n"
-               "         .two_fooooooooooooo = 3,\n"
-               "         .three_fooooooooooooo = 4};\n"
-               "  BYTE payload = 2;\n"
-               "}",
-               Style);
-
-  Style.AlignConsecutiveAssignments = FormatStyle::ACS_Consecutive;
-  Style.AlignConsecutiveDeclarations = FormatStyle::ACS_None;
-  verifyFormat("void foo2(void) {\n"
-               "  BYTE p[1]    = 1;\n"
-               "  A B          = {.one_foooooooooooooooo = 2,\n"
-               "                  .two_fooooooooooooo    = 3,\n"
-               "                  .three_fooooooooooooo  = 4};\n"
-               "  BYTE payload = 2;\n"
-               "}",
-               Style);
-
-  Style.AlignConsecutiveAssignments = FormatStyle::ACS_None;
-  Style.AlignConsecutiveDeclarations = FormatStyle::ACS_Consecutive;
-  verifyFormat("void foo3(void) {\n"
-               "  BYTE p[1] = 1;\n"
-               "  A    B = {.one_foooooooooooooooo = 2,\n"
-               "            .two_fooooooooooooo = 3,\n"
-               "            .three_fooooooooooooo = 4};\n"
-               "  BYTE payload = 2;\n"
-               "}",
-               Style);
-
-  Style.AlignConsecutiveAssignments = FormatStyle::ACS_Consecutive;
-  Style.AlignConsecutiveDeclarations = FormatStyle::ACS_Consecutive;
-  verifyFormat("void foo4(void) {\n"
-               "  BYTE p[1]    = 1;\n"
-               "  A    B       = {.one_foooooooooooooooo = 2,\n"
-               "                  .two_fooooooooooooo    = 3,\n"
-               "                  .three_fooooooooooooo  = 4};\n"
-               "  BYTE payload = 2;\n"
-               "}",
-               Style);
-}
-
-TEST_F(FormatTest, LinuxBraceBreaking) {
-  FormatStyle LinuxBraceStyle = getLLVMStyle();
-  LinuxBraceStyle.BreakBeforeBraces = FormatStyle::BS_Linux;
-  verifyFormat("namespace a\n"
-               "{\n"
-               "class A\n"
-               "{\n"
-               "  void f()\n"
-               "  {\n"
-               "    if (true) {\n"
-               "      a();\n"
-               "      b();\n"
-               "    } else {\n"
-               "      a();\n"
-               "    }\n"
-               "  }\n"
-               "  void g() { return; }\n"
-               "};\n"
-               "struct B {\n"
-               "  int x;\n"
-               "};\n"
-               "} // namespace a\n",
-               LinuxBraceStyle);
-  verifyFormat("enum X {\n"
-               "  Y = 0,\n"
-               "}\n",
-               LinuxBraceStyle);
-  verifyFormat("struct S {\n"
-               "  int Type;\n"
-               "  union {\n"
-               "    int x;\n"
-               "    double y;\n"
-               "  } Value;\n"
-               "  class C\n"
-               "  {\n"
-               "    MyFavoriteType Value;\n"
-               "  } Class;\n"
-               "}\n",
-               LinuxBraceStyle);
-}
-
-TEST_F(FormatTest, MozillaBraceBreaking) {
-  FormatStyle MozillaBraceStyle = getLLVMStyle();
-  MozillaBraceStyle.BreakBeforeBraces = FormatStyle::BS_Mozilla;
-  MozillaBraceStyle.FixNamespaceComments = false;
-  verifyFormat("namespace a {\n"
-               "class A\n"
-               "{\n"
-               "  void f()\n"
-               "  {\n"
-               "    if (true) {\n"
-               "      a();\n"
-               "      b();\n"
-               "    }\n"
-               "  }\n"
-               "  void g() { return; }\n"
-               "};\n"
-               "enum E\n"
-               "{\n"
-               "  A,\n"
-               "  // foo\n"
-               "  B,\n"
-               "  C\n"
-               "};\n"
-               "struct B\n"
-               "{\n"
-               "  int x;\n"
-               "};\n"
-               "}\n",
-               MozillaBraceStyle);
-  verifyFormat("struct S\n"
-               "{\n"
-               "  int Type;\n"
-               "  union\n"
-               "  {\n"
-               "    int x;\n"
-               "    double y;\n"
-               "  } Value;\n"
-               "  class C\n"
-               "  {\n"
-               "    MyFavoriteType Value;\n"
-               "  } Class;\n"
-               "}\n",
-               MozillaBraceStyle);
-}
-
-TEST_F(FormatTest, StroustrupBraceBreaking) {
-  FormatStyle StroustrupBraceStyle = getLLVMStyle();
-  StroustrupBraceStyle.BreakBeforeBraces = FormatStyle::BS_Stroustrup;
-  verifyFormat("namespace a {\n"
-               "class A {\n"
-               "  void f()\n"
-               "  {\n"
-               "    if (true) {\n"
-               "      a();\n"
-               "      b();\n"
-               "    }\n"
-               "  }\n"
-               "  void g() { return; }\n"
-               "};\n"
-               "struct B {\n"
-               "  int x;\n"
-               "};\n"
-               "} // namespace a\n",
-               StroustrupBraceStyle);
-
-  verifyFormat("void foo()\n"
-               "{\n"
-               "  if (a) {\n"
-               "    a();\n"
-               "  }\n"
-               "  else {\n"
-               "    b();\n"
-               "  }\n"
-               "}\n",
-               StroustrupBraceStyle);
-
-  verifyFormat("#ifdef _DEBUG\n"
-               "int foo(int i = 0)\n"
-               "#else\n"
-               "int foo(int i = 5)\n"
-               "#endif\n"
-               "{\n"
-               "  return i;\n"
-               "}",
-               StroustrupBraceStyle);
-
-  verifyFormat("void foo() {}\n"
-               "void bar()\n"
-               "#ifdef _DEBUG\n"
-               "{\n"
-               "  foo();\n"
-               "}\n"
-               "#else\n"
-               "{\n"
-               "}\n"
-               "#endif",
-               StroustrupBraceStyle);
-
-  verifyFormat("void foobar() { int i = 5; }\n"
-               "#ifdef _DEBUG\n"
-               "void bar() {}\n"
-               "#else\n"
-               "void bar() { foobar(); }\n"
-               "#endif",
-               StroustrupBraceStyle);
-}
-
-TEST_F(FormatTest, AllmanBraceBreaking) {
-  FormatStyle AllmanBraceStyle = getLLVMStyle();
-  AllmanBraceStyle.BreakBeforeBraces = FormatStyle::BS_Allman;
-
-  EXPECT_EQ("namespace a\n"
-            "{\n"
-            "void f();\n"
-            "void g();\n"
-            "} // namespace a\n",
-            format("namespace a\n"
-                   "{\n"
-                   "void f();\n"
-                   "void g();\n"
-                   "}\n",
-                   AllmanBraceStyle));
-
-  verifyFormat("namespace a\n"
-               "{\n"
-               "class A\n"
-               "{\n"
-               "  void f()\n"
-               "  {\n"
-               "    if (true)\n"
-               "    {\n"
-               "      a();\n"
-               "      b();\n"
-               "    }\n"
-               "  }\n"
-               "  void g() { return; }\n"
-               "};\n"
-               "struct B\n"
-               "{\n"
-               "  int x;\n"
-               "};\n"
-               "union C\n"
-               "{\n"
-               "};\n"
-               "} // namespace a",
-               AllmanBraceStyle);
-
-  verifyFormat("void f()\n"
-               "{\n"
-               "  if (true)\n"
-               "  {\n"
-               "    a();\n"
-               "  }\n"
-               "  else if (false)\n"
-               "  {\n"
-               "    b();\n"
-               "  }\n"
-               "  else\n"
-               "  {\n"
-               "    c();\n"
-               "  }\n"
-               "}\n",
-               AllmanBraceStyle);
-
-  verifyFormat("void f()\n"
-               "{\n"
-               "  for (int i = 0; i < 10; ++i)\n"
-               "  {\n"
-               "    a();\n"
-               "  }\n"
-               "  while (false)\n"
-               "  {\n"
-               "    b();\n"
-               "  }\n"
-               "  do\n"
-               "  {\n"
-               "    c();\n"
-               "  } while (false)\n"
-               "}\n",
-               AllmanBraceStyle);
-
-  verifyFormat("void f(int a)\n"
-               "{\n"
-               "  switch (a)\n"
-               "  {\n"
-               "  case 0:\n"
-               "    break;\n"
-               "  case 1:\n"
-               "  {\n"
-               "    break;\n"
-               "  }\n"
-               "  case 2:\n"
-               "  {\n"
-               "  }\n"
-               "  break;\n"
-               "  default:\n"
-               "    break;\n"
-               "  }\n"
-               "}\n",
-               AllmanBraceStyle);
-
-  verifyFormat("enum X\n"
-               "{\n"
-               "  Y = 0,\n"
-               "}\n",
-               AllmanBraceStyle);
-  verifyFormat("enum X\n"
-               "{\n"
-               "  Y = 0\n"
-               "}\n",
-               AllmanBraceStyle);
-
-  verifyFormat("@interface BSApplicationController ()\n"
-               "{\n"
-               "@private\n"
-               "  id _extraIvar;\n"
-               "}\n"
-               "@end\n",
-               AllmanBraceStyle);
-
-  verifyFormat("#ifdef _DEBUG\n"
-               "int foo(int i = 0)\n"
-               "#else\n"
-               "int foo(int i = 5)\n"
-               "#endif\n"
-               "{\n"
-               "  return i;\n"
-               "}",
-               AllmanBraceStyle);
-
-  verifyFormat("void foo() {}\n"
-               "void bar()\n"
-               "#ifdef _DEBUG\n"
-               "{\n"
-               "  foo();\n"
-               "}\n"
-               "#else\n"
-               "{\n"
-               "}\n"
-               "#endif",
-               AllmanBraceStyle);
-
-  verifyFormat("void foobar() { int i = 5; }\n"
-               "#ifdef _DEBUG\n"
-               "void bar() {}\n"
-               "#else\n"
-               "void bar() { foobar(); }\n"
-               "#endif",
-               AllmanBraceStyle);
-
-  EXPECT_EQ(AllmanBraceStyle.AllowShortLambdasOnASingleLine,
-            FormatStyle::SLS_All);
-
-  verifyFormat("[](int i) { return i + 2; };\n"
-               "[](int i, int j)\n"
-               "{\n"
-               "  auto x = i + j;\n"
-               "  auto y = i * j;\n"
-               "  return x ^ y;\n"
-               "};\n"
-               "void foo()\n"
-               "{\n"
-               "  auto shortLambda = [](int i) { return i + 2; };\n"
-               "  auto longLambda = [](int i, int j)\n"
-               "  {\n"
-               "    auto x = i + j;\n"
-               "    auto y = i * j;\n"
-               "    return x ^ y;\n"
-               "  };\n"
-               "}",
-               AllmanBraceStyle);
-
-  AllmanBraceStyle.AllowShortLambdasOnASingleLine = FormatStyle::SLS_None;
-
-  verifyFormat("[](int i)\n"
-               "{\n"
-               "  return i + 2;\n"
-               "};\n"
-               "[](int i, int j)\n"
-               "{\n"
-               "  auto x = i + j;\n"
-               "  auto y = i * j;\n"
-               "  return x ^ y;\n"
-               "};\n"
-               "void foo()\n"
-               "{\n"
-               "  auto shortLambda = [](int i)\n"
-               "  {\n"
-               "    return i + 2;\n"
-               "  };\n"
-               "  auto longLambda = [](int i, int j)\n"
-               "  {\n"
-               "    auto x = i + j;\n"
-               "    auto y = i * j;\n"
-               "    return x ^ y;\n"
-               "  };\n"
-               "}",
-               AllmanBraceStyle);
-
-  // Reset
-  AllmanBraceStyle.AllowShortLambdasOnASingleLine = FormatStyle::SLS_All;
-
-  // This shouldn't affect ObjC blocks..
-  verifyFormat("[self doSomeThingWithACompletionHandler:^{\n"
-               "  // ...\n"
-               "  int i;\n"
-               "}];",
-               AllmanBraceStyle);
-  verifyFormat("void (^block)(void) = ^{\n"
-               "  // ...\n"
-               "  int i;\n"
-               "};",
-               AllmanBraceStyle);
-  // .. or dict literals.
-  verifyFormat("void f()\n"
-               "{\n"
-               "  // ...\n"
-               "  [object someMethod:@{@\"a\" : @\"b\"}];\n"
-               "}",
-               AllmanBraceStyle);
-  verifyFormat("void f()\n"
-               "{\n"
-               "  // ...\n"
-               "  [object someMethod:@{a : @\"b\"}];\n"
-               "}",
-               AllmanBraceStyle);
-  verifyFormat("int f()\n"
-               "{ // comment\n"
-               "  return 42;\n"
-               "}",
-               AllmanBraceStyle);
-
-  AllmanBraceStyle.ColumnLimit = 19;
-  verifyFormat("void f() { int i; }", AllmanBraceStyle);
-  AllmanBraceStyle.ColumnLimit = 18;
-  verifyFormat("void f()\n"
-               "{\n"
-               "  int i;\n"
-               "}",
-               AllmanBraceStyle);
-  AllmanBraceStyle.ColumnLimit = 80;
-
-  FormatStyle BreakBeforeBraceShortIfs = AllmanBraceStyle;
-  BreakBeforeBraceShortIfs.AllowShortIfStatementsOnASingleLine =
-      FormatStyle::SIS_WithoutElse;
-  BreakBeforeBraceShortIfs.AllowShortLoopsOnASingleLine = true;
-  verifyFormat("void f(bool b)\n"
-               "{\n"
-               "  if (b)\n"
-               "  {\n"
-               "    return;\n"
-               "  }\n"
-               "}\n",
-               BreakBeforeBraceShortIfs);
-  verifyFormat("void f(bool b)\n"
-               "{\n"
-               "  if constexpr (b)\n"
-               "  {\n"
-               "    return;\n"
-               "  }\n"
-               "}\n",
-               BreakBeforeBraceShortIfs);
-  verifyFormat("void f(bool b)\n"
-               "{\n"
-               "  if CONSTEXPR (b)\n"
-               "  {\n"
-               "    return;\n"
-               "  }\n"
-               "}\n",
-               BreakBeforeBraceShortIfs);
-  verifyFormat("void f(bool b)\n"
-               "{\n"
-               "  if (b) return;\n"
-               "}\n",
-               BreakBeforeBraceShortIfs);
-  verifyFormat("void f(bool b)\n"
-               "{\n"
-               "  if constexpr (b) return;\n"
-               "}\n",
-               BreakBeforeBraceShortIfs);
-  verifyFormat("void f(bool b)\n"
-               "{\n"
-               "  if CONSTEXPR (b) return;\n"
-               "}\n",
-               BreakBeforeBraceShortIfs);
-  verifyFormat("void f(bool b)\n"
-               "{\n"
-               "  while (b)\n"
-               "  {\n"
-               "    return;\n"
-               "  }\n"
-               "}\n",
-               BreakBeforeBraceShortIfs);
-}
-
-TEST_F(FormatTest, WhitesmithsBraceBreaking) {
-  FormatStyle WhitesmithsBraceStyle = getLLVMStyle();
-  WhitesmithsBraceStyle.BreakBeforeBraces = FormatStyle::BS_Whitesmiths;
-
-  // Make a few changes to the style for testing purposes
-  WhitesmithsBraceStyle.AllowShortFunctionsOnASingleLine =
-      FormatStyle::SFS_Empty;
-  WhitesmithsBraceStyle.AllowShortLambdasOnASingleLine = FormatStyle::SLS_None;
-  WhitesmithsBraceStyle.ColumnLimit = 0;
-
-  // FIXME: this test case can't decide whether there should be a blank line
-  // after the ~D() line or not. It adds one if one doesn't exist in the test
-  // and it removes the line if one exists.
-  /*
-  verifyFormat("class A;\n"
-               "namespace B\n"
-               "  {\n"
-               "class C;\n"
-               "// Comment\n"
-               "class D\n"
-               "  {\n"
-               "public:\n"
-               "  D();\n"
-               "  ~D() {}\n"
-               "private:\n"
-               "  enum E\n"
-               "    {\n"
-               "    F\n"
-               "    }\n"
-               "  };\n"
-               "  } // namespace B\n",
-               WhitesmithsBraceStyle);
-  */
-
-  WhitesmithsBraceStyle.NamespaceIndentation = FormatStyle::NI_None;
-  verifyFormat("namespace a\n"
-               "  {\n"
-               "class A\n"
-               "  {\n"
-               "  void f()\n"
-               "    {\n"
-               "    if (true)\n"
-               "      {\n"
-               "      a();\n"
-               "      b();\n"
-               "      }\n"
-               "    }\n"
-               "  void g()\n"
-               "    {\n"
-               "    return;\n"
-               "    }\n"
-               "  };\n"
-               "struct B\n"
-               "  {\n"
-               "  int x;\n"
-               "  };\n"
-               "  } // namespace a",
-               WhitesmithsBraceStyle);
-
-  verifyFormat("namespace a\n"
-               "  {\n"
-               "namespace b\n"
-               "  {\n"
-               "class A\n"
-               "  {\n"
-               "  void f()\n"
-               "    {\n"
-               "    if (true)\n"
-               "      {\n"
-               "      a();\n"
-               "      b();\n"
-               "      }\n"
-               "    }\n"
-               "  void g()\n"
-               "    {\n"
-               "    return;\n"
-               "    }\n"
-               "  };\n"
-               "struct B\n"
-               "  {\n"
-               "  int x;\n"
-               "  };\n"
-               "  } // namespace b\n"
-               "  } // namespace a",
-               WhitesmithsBraceStyle);
-
-  WhitesmithsBraceStyle.NamespaceIndentation = FormatStyle::NI_Inner;
-  verifyFormat("namespace a\n"
-               "  {\n"
-               "namespace b\n"
-               "  {\n"
-               "  class A\n"
-               "    {\n"
-               "    void f()\n"
-               "      {\n"
-               "      if (true)\n"
-               "        {\n"
-               "        a();\n"
-               "        b();\n"
-               "        }\n"
-               "      }\n"
-               "    void g()\n"
-               "      {\n"
-               "      return;\n"
-               "      }\n"
-               "    };\n"
-               "  struct B\n"
-               "    {\n"
-               "    int x;\n"
-               "    };\n"
-               "  } // namespace b\n"
-               "  } // namespace a",
-               WhitesmithsBraceStyle);
-
-  WhitesmithsBraceStyle.NamespaceIndentation = FormatStyle::NI_All;
-  verifyFormat("namespace a\n"
-               "  {\n"
-               "  namespace b\n"
-               "    {\n"
-               "    class A\n"
-               "      {\n"
-               "      void f()\n"
-               "        {\n"
-               "        if (true)\n"
-               "          {\n"
-               "          a();\n"
-               "          b();\n"
-               "          }\n"
-               "        }\n"
-               "      void g()\n"
-               "        {\n"
-               "        return;\n"
-               "        }\n"
-               "      };\n"
-               "    struct B\n"
-               "      {\n"
-               "      int x;\n"
-               "      };\n"
-               "    } // namespace b\n"
-               "  }   // namespace a",
-               WhitesmithsBraceStyle);
-
-  verifyFormat("void f()\n"
-               "  {\n"
-               "  if (true)\n"
-               "    {\n"
-               "    a();\n"
-               "    }\n"
-               "  else if (false)\n"
-               "    {\n"
-               "    b();\n"
-               "    }\n"
-               "  else\n"
-               "    {\n"
-               "    c();\n"
-               "    }\n"
-               "  }\n",
-               WhitesmithsBraceStyle);
-
-  verifyFormat("void f()\n"
-               "  {\n"
-               "  for (int i = 0; i < 10; ++i)\n"
-               "    {\n"
-               "    a();\n"
-               "    }\n"
-               "  while (false)\n"
-               "    {\n"
-               "    b();\n"
-               "    }\n"
-               "  do\n"
-               "    {\n"
-               "    c();\n"
-               "    } while (false)\n"
-               "  }\n",
-               WhitesmithsBraceStyle);
-
-  WhitesmithsBraceStyle.IndentCaseLabels = true;
-  verifyFormat("void switchTest1(int a)\n"
-               "  {\n"
-               "  switch (a)\n"
-               "    {\n"
-               "    case 2:\n"
-               "      {\n"
-               "      }\n"
-               "      break;\n"
-               "    }\n"
-               "  }\n",
-               WhitesmithsBraceStyle);
-
-  verifyFormat("void switchTest2(int a)\n"
-               "  {\n"
-               "  switch (a)\n"
-               "    {\n"
-               "    case 0:\n"
-               "      break;\n"
-               "    case 1:\n"
-               "      {\n"
-               "      break;\n"
-               "      }\n"
-               "    case 2:\n"
-               "      {\n"
-               "      }\n"
-               "      break;\n"
-               "    default:\n"
-               "      break;\n"
-               "    }\n"
-               "  }\n",
-               WhitesmithsBraceStyle);
-
-  verifyFormat("void switchTest3(int a)\n"
-               "  {\n"
-               "  switch (a)\n"
-               "    {\n"
-               "    case 0:\n"
-               "      {\n"
-               "      foo(x);\n"
-               "      }\n"
-               "      break;\n"
-               "    default:\n"
-               "      {\n"
-               "      foo(1);\n"
-               "      }\n"
-               "      break;\n"
-               "    }\n"
-               "  }\n",
-               WhitesmithsBraceStyle);
-
-  WhitesmithsBraceStyle.IndentCaseLabels = false;
-
-  verifyFormat("void switchTest4(int a)\n"
-               "  {\n"
-               "  switch (a)\n"
-               "    {\n"
-               "  case 2:\n"
-               "    {\n"
-               "    }\n"
-               "    break;\n"
-               "    }\n"
-               "  }\n",
-               WhitesmithsBraceStyle);
-
-  verifyFormat("void switchTest5(int a)\n"
-               "  {\n"
-               "  switch (a)\n"
-               "    {\n"
-               "  case 0:\n"
-               "    break;\n"
-               "  case 1:\n"
-               "    {\n"
-               "    foo();\n"
-               "    break;\n"
-               "    }\n"
-               "  case 2:\n"
-               "    {\n"
-               "    }\n"
-               "    break;\n"
-               "  default:\n"
-               "    break;\n"
-               "    }\n"
-               "  }\n",
-               WhitesmithsBraceStyle);
-
-  verifyFormat("void switchTest6(int a)\n"
-               "  {\n"
-               "  switch (a)\n"
-               "    {\n"
-               "  case 0:\n"
-               "    {\n"
-               "    foo(x);\n"
-               "    }\n"
-               "    break;\n"
-               "  default:\n"
-               "    {\n"
-               "    foo(1);\n"
-               "    }\n"
-               "    break;\n"
-               "    }\n"
-               "  }\n",
-               WhitesmithsBraceStyle);
-
-  verifyFormat("enum X\n"
-               "  {\n"
-               "  Y = 0, // testing\n"
-               "  }\n",
-               WhitesmithsBraceStyle);
-
-  verifyFormat("enum X\n"
-               "  {\n"
-               "  Y = 0\n"
-               "  }\n",
-               WhitesmithsBraceStyle);
-  verifyFormat("enum X\n"
-               "  {\n"
-               "  Y = 0,\n"
-               "  Z = 1\n"
-               "  };\n",
-               WhitesmithsBraceStyle);
-
-  verifyFormat("@interface BSApplicationController ()\n"
-               "  {\n"
-               "@private\n"
-               "  id _extraIvar;\n"
-               "  }\n"
-               "@end\n",
-               WhitesmithsBraceStyle);
-
-  verifyFormat("#ifdef _DEBUG\n"
-               "int foo(int i = 0)\n"
-               "#else\n"
-               "int foo(int i = 5)\n"
-               "#endif\n"
-               "  {\n"
-               "  return i;\n"
-               "  }",
-               WhitesmithsBraceStyle);
-
-  verifyFormat("void foo() {}\n"
-               "void bar()\n"
-               "#ifdef _DEBUG\n"
-               "  {\n"
-               "  foo();\n"
-               "  }\n"
-               "#else\n"
-               "  {\n"
-               "  }\n"
-               "#endif",
-               WhitesmithsBraceStyle);
-
-  verifyFormat("void foobar()\n"
-               "  {\n"
-               "  int i = 5;\n"
-               "  }\n"
-               "#ifdef _DEBUG\n"
-               "void bar()\n"
-               "  {\n"
-               "  }\n"
-               "#else\n"
-               "void bar()\n"
-               "  {\n"
-               "  foobar();\n"
-               "  }\n"
-               "#endif",
-               WhitesmithsBraceStyle);
-
-  // This shouldn't affect ObjC blocks..
-  verifyFormat("[self doSomeThingWithACompletionHandler:^{\n"
-               "  // ...\n"
-               "  int i;\n"
-               "}];",
-               WhitesmithsBraceStyle);
-  verifyFormat("void (^block)(void) = ^{\n"
-               "  // ...\n"
-               "  int i;\n"
-               "};",
-               WhitesmithsBraceStyle);
-  // .. or dict literals.
-  verifyFormat("void f()\n"
-               "  {\n"
-               "  [object someMethod:@{@\"a\" : @\"b\"}];\n"
-               "  }",
-               WhitesmithsBraceStyle);
-
-  verifyFormat("int f()\n"
-               "  { // comment\n"
-               "  return 42;\n"
-               "  }",
-               WhitesmithsBraceStyle);
-
-  FormatStyle BreakBeforeBraceShortIfs = WhitesmithsBraceStyle;
-  BreakBeforeBraceShortIfs.AllowShortIfStatementsOnASingleLine =
-      FormatStyle::SIS_OnlyFirstIf;
-  BreakBeforeBraceShortIfs.AllowShortLoopsOnASingleLine = true;
-  verifyFormat("void f(bool b)\n"
-               "  {\n"
-               "  if (b)\n"
-               "    {\n"
-               "    return;\n"
-               "    }\n"
-               "  }\n",
-               BreakBeforeBraceShortIfs);
-  verifyFormat("void f(bool b)\n"
-               "  {\n"
-               "  if (b) return;\n"
-               "  }\n",
-               BreakBeforeBraceShortIfs);
-  verifyFormat("void f(bool b)\n"
-               "  {\n"
-               "  while (b)\n"
-               "    {\n"
-               "    return;\n"
-               "    }\n"
-               "  }\n",
-               BreakBeforeBraceShortIfs);
-}
-
-TEST_F(FormatTest, GNUBraceBreaking) {
-  FormatStyle GNUBraceStyle = getLLVMStyle();
-  GNUBraceStyle.BreakBeforeBraces = FormatStyle::BS_GNU;
-  verifyFormat("namespace a\n"
-               "{\n"
-               "class A\n"
-               "{\n"
-               "  void f()\n"
-               "  {\n"
-               "    int a;\n"
-               "    {\n"
-               "      int b;\n"
-               "    }\n"
-               "    if (true)\n"
-               "      {\n"
-               "        a();\n"
-               "        b();\n"
-               "      }\n"
-               "  }\n"
-               "  void g() { return; }\n"
-               "}\n"
-               "} // namespace a",
-               GNUBraceStyle);
-
-  verifyFormat("void f()\n"
-               "{\n"
-               "  if (true)\n"
-               "    {\n"
-               "      a();\n"
-               "    }\n"
-               "  else if (false)\n"
-               "    {\n"
-               "      b();\n"
-               "    }\n"
-               "  else\n"
-               "    {\n"
-               "      c();\n"
-               "    }\n"
-               "}\n",
-               GNUBraceStyle);
-
-  verifyFormat("void f()\n"
-               "{\n"
-               "  for (int i = 0; i < 10; ++i)\n"
-               "    {\n"
-               "      a();\n"
-               "    }\n"
-               "  while (false)\n"
-               "    {\n"
-               "      b();\n"
-               "    }\n"
-               "  do\n"
-               "    {\n"
-               "      c();\n"
-               "    }\n"
-               "  while (false);\n"
-               "}\n",
-               GNUBraceStyle);
-
-  verifyFormat("void f(int a)\n"
-               "{\n"
-               "  switch (a)\n"
-               "    {\n"
-               "    case 0:\n"
-               "      break;\n"
-               "    case 1:\n"
-               "      {\n"
-               "        break;\n"
-               "      }\n"
-               "    case 2:\n"
-               "      {\n"
-               "      }\n"
-               "      break;\n"
-               "    default:\n"
-               "      break;\n"
-               "    }\n"
-               "}\n",
-               GNUBraceStyle);
-
-  verifyFormat("enum X\n"
-               "{\n"
-               "  Y = 0,\n"
-               "}\n",
-               GNUBraceStyle);
-
-  verifyFormat("@interface BSApplicationController ()\n"
-               "{\n"
-               "@private\n"
-               "  id _extraIvar;\n"
-               "}\n"
-               "@end\n",
-               GNUBraceStyle);
-
-  verifyFormat("#ifdef _DEBUG\n"
-               "int foo(int i = 0)\n"
-               "#else\n"
-               "int foo(int i = 5)\n"
-               "#endif\n"
-               "{\n"
-               "  return i;\n"
-               "}",
-               GNUBraceStyle);
-
-  verifyFormat("void foo() {}\n"
-               "void bar()\n"
-               "#ifdef _DEBUG\n"
-               "{\n"
-               "  foo();\n"
-               "}\n"
-               "#else\n"
-               "{\n"
-               "}\n"
-               "#endif",
-               GNUBraceStyle);
-
-  verifyFormat("void foobar() { int i = 5; }\n"
-               "#ifdef _DEBUG\n"
-               "void bar() {}\n"
-               "#else\n"
-               "void bar() { foobar(); }\n"
-               "#endif",
-               GNUBraceStyle);
-}
-
-TEST_F(FormatTest, WebKitBraceBreaking) {
-  FormatStyle WebKitBraceStyle = getLLVMStyle();
-  WebKitBraceStyle.BreakBeforeBraces = FormatStyle::BS_WebKit;
-  WebKitBraceStyle.FixNamespaceComments = false;
-  verifyFormat("namespace a {\n"
-               "class A {\n"
-               "  void f()\n"
-               "  {\n"
-               "    if (true) {\n"
-               "      a();\n"
-               "      b();\n"
-               "    }\n"
-               "  }\n"
-               "  void g() { return; }\n"
-               "};\n"
-               "enum E {\n"
-               "  A,\n"
-               "  // foo\n"
-               "  B,\n"
-               "  C\n"
-               "};\n"
-               "struct B {\n"
-               "  int x;\n"
-               "};\n"
-               "}\n",
-               WebKitBraceStyle);
-  verifyFormat("struct S {\n"
-               "  int Type;\n"
-               "  union {\n"
-               "    int x;\n"
-               "    double y;\n"
-               "  } Value;\n"
-               "  class C {\n"
-               "    MyFavoriteType Value;\n"
-               "  } Class;\n"
-               "};\n",
-               WebKitBraceStyle);
-}
-
-TEST_F(FormatTest, CatchExceptionReferenceBinding) {
-  verifyFormat("void f() {\n"
-               "  try {\n"
-               "  } catch (const Exception &e) {\n"
-               "  }\n"
-               "}\n",
-               getLLVMStyle());
-}
-
-TEST_F(FormatTest, CatchAlignArrayOfStructuresRightAlignment) {
-  auto Style = getLLVMStyle();
-  Style.AlignArrayOfStructures = FormatStyle::AIAS_Right;
-  Style.AlignConsecutiveAssignments =
-      FormatStyle::AlignConsecutiveStyle::ACS_Consecutive;
-  Style.AlignConsecutiveDeclarations =
-      FormatStyle::AlignConsecutiveStyle::ACS_Consecutive;
-  verifyFormat("struct test demo[] = {\n"
-               "    {56,    23, \"hello\"},\n"
-               "    {-1, 93463, \"world\"},\n"
-               "    { 7,     5,    \"!!\"}\n"
-               "};\n",
-               Style);
-
-  verifyFormat("struct test demo[] = {\n"
-               "    {56,    23, \"hello\"}, // first line\n"
-               "    {-1, 93463, \"world\"}, // second line\n"
-               "    { 7,     5,    \"!!\"}  // third line\n"
-               "};\n",
-               Style);
-
-  verifyFormat("struct test demo[4] = {\n"
-               "    { 56,    23, 21,       \"oh\"}, // first line\n"
-               "    { -1, 93463, 22,       \"my\"}, // second line\n"
-               "    {  7,     5,  1, \"goodness\"}  // third line\n"
-               "    {234,     5,  1, \"gracious\"}  // fourth line\n"
-               "};\n",
-               Style);
-
-  verifyFormat("struct test demo[3] = {\n"
-               "    {56,    23, \"hello\"},\n"
-               "    {-1, 93463, \"world\"},\n"
-               "    { 7,     5,    \"!!\"}\n"
-               "};\n",
-               Style);
-
-  verifyFormat("struct test demo[3] = {\n"
-               "    {int{56},    23, \"hello\"},\n"
-               "    {int{-1}, 93463, \"world\"},\n"
-               "    { int{7},     5,    \"!!\"}\n"
-               "};\n",
-               Style);
-
-  verifyFormat("struct test demo[] = {\n"
-               "    {56,    23, \"hello\"},\n"
-               "    {-1, 93463, \"world\"},\n"
-               "    { 7,     5,    \"!!\"},\n"
-               "};\n",
-               Style);
-
-  verifyFormat("test demo[] = {\n"
-               "    {56,    23, \"hello\"},\n"
-               "    {-1, 93463, \"world\"},\n"
-               "    { 7,     5,    \"!!\"},\n"
-               "};\n",
-               Style);
-
-  verifyFormat("demo = std::array<struct test, 3>{\n"
-               "    test{56,    23, \"hello\"},\n"
-               "    test{-1, 93463, \"world\"},\n"
-               "    test{ 7,     5,    \"!!\"},\n"
-               "};\n",
-               Style);
-
-  verifyFormat("test demo[] = {\n"
-               "    {56,    23, \"hello\"},\n"
-               "#if X\n"
-               "    {-1, 93463, \"world\"},\n"
-               "#endif\n"
-               "    { 7,     5,    \"!!\"}\n"
-               "};\n",
-               Style);
-
-  verifyFormat(
-      "test demo[] = {\n"
-      "    { 7,    23,\n"
-      "     \"hello world i am a very long line that really, in any\"\n"
-      "     \"just world, ought to be split over multiple lines\"},\n"
-      "    {-1, 93463,                                  \"world\"},\n"
-      "    {56,     5,                                     \"!!\"}\n"
-      "};\n",
-      Style);
-
-  verifyFormat("return GradForUnaryCwise(g, {\n"
-               "                                {{\"sign\"}, \"Sign\",  "
-               "  {\"x\", \"dy\"}},\n"
-               "                                {  {\"dx\"},  \"Mul\", {\"dy\""
-               ", \"sign\"}},\n"
-               "});\n",
-               Style);
-
-  Style.ColumnLimit = 0;
-  EXPECT_EQ(
-      "test demo[] = {\n"
-      "    {56,    23, \"hello world i am a very long line that really, "
-      "in any just world, ought to be split over multiple lines\"},\n"
-      "    {-1, 93463,                                                  "
-      "                                                 \"world\"},\n"
-      "    { 7,     5,                                                  "
-      "                                                    \"!!\"},\n"
-      "};",
-      format("test demo[] = {{56, 23, \"hello world i am a very long line "
-             "that really, in any just world, ought to be split over multiple "
-             "lines\"},{-1, 93463, \"world\"},{7, 5, \"!!\"},};",
-             Style));
-
-  Style.ColumnLimit = 80;
-  verifyFormat("test demo[] = {\n"
-               "    {56,    23, /* a comment */ \"hello\"},\n"
-               "    {-1, 93463,                 \"world\"},\n"
-               "    { 7,     5,                    \"!!\"}\n"
-               "};\n",
-               Style);
-
-  verifyFormat("test demo[] = {\n"
-               "    {56,    23,                    \"hello\"},\n"
-               "    {-1, 93463, \"world\" /* comment here */},\n"
-               "    { 7,     5,                       \"!!\"}\n"
-               "};\n",
-               Style);
-
-  verifyFormat("test demo[] = {\n"
-               "    {56, /* a comment */ 23, \"hello\"},\n"
-               "    {-1,              93463, \"world\"},\n"
-               "    { 7,                  5,    \"!!\"}\n"
-               "};\n",
-               Style);
-
-  Style.ColumnLimit = 20;
-  EXPECT_EQ(
-      "demo = std::array<\n"
-      "    struct test, 3>{\n"
-      "    test{\n"
-      "         56,    23,\n"
-      "         \"hello \"\n"
-      "         \"world i \"\n"
-      "         \"am a very \"\n"
-      "         \"long line \"\n"
-      "         \"that \"\n"
-      "         \"really, \"\n"
-      "         \"in any \"\n"
-      "         \"just \"\n"
-      "         \"world, \"\n"
-      "         \"ought to \"\n"
-      "         \"be split \"\n"
-      "         \"over \"\n"
-      "         \"multiple \"\n"
-      "         \"lines\"},\n"
-      "    test{-1, 93463,\n"
-      "         \"world\"},\n"
-      "    test{ 7,     5,\n"
-      "         \"!!\"   },\n"
-      "};",
-      format("demo = std::array<struct test, 3>{test{56, 23, \"hello world "
-             "i am a very long line that really, in any just world, ought "
-             "to be split over multiple lines\"},test{-1, 93463, \"world\"},"
-             "test{7, 5, \"!!\"},};",
-             Style));
-  // This caused a core dump by enabling Alignment in the LLVMStyle globally
-  Style = getLLVMStyleWithColumns(50);
-  Style.AlignArrayOfStructures = FormatStyle::AIAS_Right;
-  verifyFormat("static A x = {\n"
-               "    {{init1, init2, init3, init4},\n"
-               "     {init1, init2, init3, init4}}\n"
-               "};",
-               Style);
-  Style.ColumnLimit = 100;
-  EXPECT_EQ(
-      "test demo[] = {\n"
-      "    {56,    23,\n"
-      "     \"hello world i am a very long line that really, in any just world"
-      ", ought to be split over \"\n"
-      "     \"multiple lines\"  },\n"
-      "    {-1, 93463, \"world\"},\n"
-      "    { 7,     5,    \"!!\"},\n"
-      "};",
-      format("test demo[] = {{56, 23, \"hello world i am a very long line "
-             "that really, in any just world, ought to be split over multiple "
-             "lines\"},{-1, 93463, \"world\"},{7, 5, \"!!\"},};",
-             Style));
-
-  Style = getLLVMStyleWithColumns(50);
-  Style.AlignArrayOfStructures = FormatStyle::AIAS_Right;
-  Style.AlignConsecutiveAssignments =
-      FormatStyle::AlignConsecutiveStyle::ACS_Consecutive;
-  Style.AlignConsecutiveDeclarations =
-      FormatStyle::AlignConsecutiveStyle::ACS_Consecutive;
-  verifyFormat("struct test demo[] = {\n"
-               "    {56,    23, \"hello\"},\n"
-               "    {-1, 93463, \"world\"},\n"
-               "    { 7,     5,    \"!!\"}\n"
-               "};\n"
-               "static A x = {\n"
-               "    {{init1, init2, init3, init4},\n"
-               "     {init1, init2, init3, init4}}\n"
-               "};",
-               Style);
-  Style.ColumnLimit = 100;
-  Style.AlignConsecutiveAssignments =
-      FormatStyle::AlignConsecutiveStyle::ACS_AcrossComments;
-  Style.AlignConsecutiveDeclarations =
-      FormatStyle::AlignConsecutiveStyle::ACS_AcrossComments;
-  verifyFormat("struct test demo[] = {\n"
-               "    {56,    23, \"hello\"},\n"
-               "    {-1, 93463, \"world\"},\n"
-               "    { 7,     5,    \"!!\"}\n"
-               "};\n"
-               "struct test demo[4] = {\n"
-               "    { 56,    23, 21,       \"oh\"}, // first line\n"
-               "    { -1, 93463, 22,       \"my\"}, // second line\n"
-               "    {  7,     5,  1, \"goodness\"}  // third line\n"
-               "    {234,     5,  1, \"gracious\"}  // fourth line\n"
-               "};\n",
-               Style);
-  EXPECT_EQ(
-      "test demo[] = {\n"
-      "    {56,\n"
-      "     \"hello world i am a very long line that really, in any just world"
-      ", ought to be split over \"\n"
-      "     \"multiple lines\",    23},\n"
-      "    {-1,      \"world\", 93463},\n"
-      "    { 7,         \"!!\",     5},\n"
-      "};",
-      format("test demo[] = {{56, \"hello world i am a very long line "
-             "that really, in any just world, ought to be split over multiple "
-             "lines\", 23},{-1, \"world\", 93463},{7, \"!!\", 5},};",
-             Style));
-}
-
-TEST_F(FormatTest, CatchAlignArrayOfStructuresLeftAlignment) {
-  auto Style = getLLVMStyle();
-  Style.AlignArrayOfStructures = FormatStyle::AIAS_Left;
-  verifyFormat("struct test demo[] = {\n"
-               "    {56, 23,    \"hello\"},\n"
-               "    {-1, 93463, \"world\"},\n"
-               "    {7,  5,     \"!!\"   }\n"
-               "};\n",
-               Style);
-
-  verifyFormat("struct test demo[] = {\n"
-               "    {56, 23,    \"hello\"}, // first line\n"
-               "    {-1, 93463, \"world\"}, // second line\n"
-               "    {7,  5,     \"!!\"   }  // third line\n"
-               "};\n",
-               Style);
-  verifyFormat("struct test demo[4] = {\n"
-               "    {56,  23,    21, \"oh\"      }, // first line\n"
-               "    {-1,  93463, 22, \"my\"      }, // second line\n"
-               "    {7,   5,     1,  \"goodness\"}  // third line\n"
-               "    {234, 5,     1,  \"gracious\"}  // fourth line\n"
-               "};\n",
-               Style);
-  verifyFormat("struct test demo[3] = {\n"
-               "    {56, 23,    \"hello\"},\n"
-               "    {-1, 93463, \"world\"},\n"
-               "    {7,  5,     \"!!\"   }\n"
-               "};\n",
-               Style);
-
-  verifyFormat("struct test demo[3] = {\n"
-               "    {int{56}, 23,    \"hello\"},\n"
-               "    {int{-1}, 93463, \"world\"},\n"
-               "    {int{7},  5,     \"!!\"   }\n"
-               "};\n",
-               Style);
-  verifyFormat("struct test demo[] = {\n"
-               "    {56, 23,    \"hello\"},\n"
-               "    {-1, 93463, \"world\"},\n"
-               "    {7,  5,     \"!!\"   },\n"
-               "};\n",
-               Style);
-  verifyFormat("test demo[] = {\n"
-               "    {56, 23,    \"hello\"},\n"
-               "    {-1, 93463, \"world\"},\n"
-               "    {7,  5,     \"!!\"   },\n"
-               "};\n",
-               Style);
-  verifyFormat("demo = std::array<struct test, 3>{\n"
-               "    test{56, 23,    \"hello\"},\n"
-               "    test{-1, 93463, \"world\"},\n"
-               "    test{7,  5,     \"!!\"   },\n"
-               "};\n",
-               Style);
-  verifyFormat("test demo[] = {\n"
-               "    {56, 23,    \"hello\"},\n"
-               "#if X\n"
-               "    {-1, 93463, \"world\"},\n"
-               "#endif\n"
-               "    {7,  5,     \"!!\"   }\n"
-               "};\n",
-               Style);
-  verifyFormat(
-      "test demo[] = {\n"
-      "    {7,  23,\n"
-      "     \"hello world i am a very long line that really, in any\"\n"
-      "     \"just world, ought to be split over multiple lines\"},\n"
-      "    {-1, 93463, \"world\"                                 },\n"
-      "    {56, 5,     \"!!\"                                    }\n"
-      "};\n",
-      Style);
-
-  verifyFormat("return GradForUnaryCwise(g, {\n"
-               "                                {{\"sign\"}, \"Sign\", {\"x\", "
-               "\"dy\"}   },\n"
-               "                                {{\"dx\"},   \"Mul\",  "
-               "{\"dy\", \"sign\"}},\n"
-               "});\n",
-               Style);
-
-  Style.ColumnLimit = 0;
-  EXPECT_EQ(
-      "test demo[] = {\n"
-      "    {56, 23,    \"hello world i am a very long line that really, in any "
-      "just world, ought to be split over multiple lines\"},\n"
-      "    {-1, 93463, \"world\"                                               "
-      "                                                   },\n"
-      "    {7,  5,     \"!!\"                                                  "
-      "                                                   },\n"
-      "};",
-      format("test demo[] = {{56, 23, \"hello world i am a very long line "
-             "that really, in any just world, ought to be split over multiple "
-             "lines\"},{-1, 93463, \"world\"},{7, 5, \"!!\"},};",
-             Style));
-
-  Style.ColumnLimit = 80;
-  verifyFormat("test demo[] = {\n"
-               "    {56, 23,    /* a comment */ \"hello\"},\n"
-               "    {-1, 93463, \"world\"                },\n"
-               "    {7,  5,     \"!!\"                   }\n"
-               "};\n",
-               Style);
-
-  verifyFormat("test demo[] = {\n"
-               "    {56, 23,    \"hello\"                   },\n"
-               "    {-1, 93463, \"world\" /* comment here */},\n"
-               "    {7,  5,     \"!!\"                      }\n"
-               "};\n",
-               Style);
-
-  verifyFormat("test demo[] = {\n"
-               "    {56, /* a comment */ 23, \"hello\"},\n"
-               "    {-1, 93463,              \"world\"},\n"
-               "    {7,  5,                  \"!!\"   }\n"
-               "};\n",
-               Style);
-
-  Style.ColumnLimit = 20;
-  EXPECT_EQ(
-      "demo = std::array<\n"
-      "    struct test, 3>{\n"
-      "    test{\n"
-      "         56, 23,\n"
-      "         \"hello \"\n"
-      "         \"world i \"\n"
-      "         \"am a very \"\n"
-      "         \"long line \"\n"
-      "         \"that \"\n"
-      "         \"really, \"\n"
-      "         \"in any \"\n"
-      "         \"just \"\n"
-      "         \"world, \"\n"
-      "         \"ought to \"\n"
-      "         \"be split \"\n"
-      "         \"over \"\n"
-      "         \"multiple \"\n"
-      "         \"lines\"},\n"
-      "    test{-1, 93463,\n"
-      "         \"world\"},\n"
-      "    test{7,  5,\n"
-      "         \"!!\"   },\n"
-      "};",
-      format("demo = std::array<struct test, 3>{test{56, 23, \"hello world "
-             "i am a very long line that really, in any just world, ought "
-             "to be split over multiple lines\"},test{-1, 93463, \"world\"},"
-             "test{7, 5, \"!!\"},};",
-             Style));
-
-  // This caused a core dump by enabling Alignment in the LLVMStyle globally
-  Style = getLLVMStyleWithColumns(50);
-  Style.AlignArrayOfStructures = FormatStyle::AIAS_Left;
-  verifyFormat("static A x = {\n"
-               "    {{init1, init2, init3, init4},\n"
-               "     {init1, init2, init3, init4}}\n"
-               "};",
-               Style);
-  Style.ColumnLimit = 100;
-  EXPECT_EQ(
-      "test demo[] = {\n"
-      "    {56, 23,\n"
-      "     \"hello world i am a very long line that really, in any just world"
-      ", ought to be split over \"\n"
-      "     \"multiple lines\"  },\n"
-      "    {-1, 93463, \"world\"},\n"
-      "    {7,  5,     \"!!\"   },\n"
-      "};",
-      format("test demo[] = {{56, 23, \"hello world i am a very long line "
-             "that really, in any just world, ought to be split over multiple "
-             "lines\"},{-1, 93463, \"world\"},{7, 5, \"!!\"},};",
-             Style));
-}
-
-TEST_F(FormatTest, UnderstandsPragmas) {
-  verifyFormat("#pragma omp reduction(| : var)");
-  verifyFormat("#pragma omp reduction(+ : var)");
-
-  EXPECT_EQ("#pragma mark Any non-hyphenated or hyphenated string "
-            "(including parentheses).",
-            format("#pragma    mark   Any non-hyphenated or hyphenated string "
-                   "(including parentheses)."));
-}
-
-TEST_F(FormatTest, UnderstandPragmaOption) {
-  verifyFormat("#pragma option -C -A");
-
-  EXPECT_EQ("#pragma option -C -A", format("#pragma    option   -C   -A"));
-}
-
-TEST_F(FormatTest, OptimizeBreakPenaltyVsExcess) {
-  FormatStyle Style = getLLVMStyle();
-  Style.ColumnLimit = 20;
-
-  // See PR41213
-  EXPECT_EQ("/*\n"
-            " *\t9012345\n"
-            " * /8901\n"
-            " */",
-            format("/*\n"
-                   " *\t9012345 /8901\n"
-                   " */",
-                   Style));
-  EXPECT_EQ("/*\n"
-            " *345678\n"
-            " *\t/8901\n"
-            " */",
-            format("/*\n"
-                   " *345678\t/8901\n"
-                   " */",
-                   Style));
-
-  verifyFormat("int a; // the\n"
-               "       // comment",
-               Style);
-  EXPECT_EQ("int a; /* first line\n"
-            "        * second\n"
-            "        * line third\n"
-            "        * line\n"
-            "        */",
-            format("int a; /* first line\n"
-                   "        * second\n"
-                   "        * line third\n"
-                   "        * line\n"
-                   "        */",
-                   Style));
-  EXPECT_EQ("int a; // first line\n"
-            "       // second\n"
-            "       // line third\n"
-            "       // line",
-            format("int a; // first line\n"
-                   "       // second line\n"
-                   "       // third line",
-                   Style));
-
-  Style.PenaltyExcessCharacter = 90;
-  verifyFormat("int a; // the comment", Style);
-  EXPECT_EQ("int a; // the comment\n"
-            "       // aaa",
-            format("int a; // the comment aaa", Style));
-  EXPECT_EQ("int a; /* first line\n"
-            "        * second line\n"
-            "        * third line\n"
-            "        */",
-            format("int a; /* first line\n"
-                   "        * second line\n"
-                   "        * third line\n"
-                   "        */",
-                   Style));
-  EXPECT_EQ("int a; // first line\n"
-            "       // second line\n"
-            "       // third line",
-            format("int a; // first line\n"
-                   "       // second line\n"
-                   "       // third line",
-                   Style));
-  // FIXME: Investigate why this is not getting the same layout as the test
-  // above.
-  EXPECT_EQ("int a; /* first line\n"
-            "        * second line\n"
-            "        * third line\n"
-            "        */",
-            format("int a; /* first line second line third line"
-                   "\n*/",
-                   Style));
-
-  EXPECT_EQ("// foo bar baz bazfoo\n"
-            "// foo bar foo bar\n",
-            format("// foo bar baz bazfoo\n"
-                   "// foo bar foo           bar\n",
-                   Style));
-  EXPECT_EQ("// foo bar baz bazfoo\n"
-            "// foo bar foo bar\n",
-            format("// foo bar baz      bazfoo\n"
-                   "// foo            bar foo bar\n",
-                   Style));
-
-  // FIXME: Optimally, we'd keep bazfoo on the first line and reflow bar to the
-  // next one.
-  EXPECT_EQ("// foo bar baz bazfoo\n"
-            "// bar foo bar\n",
-            format("// foo bar baz      bazfoo bar\n"
-                   "// foo            bar\n",
-                   Style));
-
-  EXPECT_EQ("// foo bar baz bazfoo\n"
-            "// foo bar baz bazfoo\n"
-            "// bar foo bar\n",
-            format("// foo bar baz      bazfoo\n"
-                   "// foo bar baz      bazfoo bar\n"
-                   "// foo bar\n",
-                   Style));
-
-  EXPECT_EQ("// foo bar baz bazfoo\n"
-            "// foo bar baz bazfoo\n"
-            "// bar foo bar\n",
-            format("// foo bar baz      bazfoo\n"
-                   "// foo bar baz      bazfoo bar\n"
-                   "// foo           bar\n",
-                   Style));
-
-  // Make sure we do not keep protruding characters if strict mode reflow is
-  // cheaper than keeping protruding characters.
-  Style.ColumnLimit = 21;
-  EXPECT_EQ(
-      "// foo foo foo foo\n"
-      "// foo foo foo foo\n"
-      "// foo foo foo foo\n",
-      format("// foo foo foo foo foo foo foo foo foo foo foo foo\n", Style));
-
-  EXPECT_EQ("int a = /* long block\n"
-            "           comment */\n"
-            "    42;",
-            format("int a = /* long block comment */ 42;", Style));
-}
-
-#define EXPECT_ALL_STYLES_EQUAL(Styles)                                        \
-  for (size_t i = 1; i < Styles.size(); ++i)                                   \
-  EXPECT_EQ(Styles[0], Styles[i])                                              \
-      << "Style #" << i << " of " << Styles.size() << " differs from Style #0"
-
-TEST_F(FormatTest, GetsPredefinedStyleByName) {
-  SmallVector<FormatStyle, 3> Styles;
-  Styles.resize(3);
-
-  Styles[0] = getLLVMStyle();
-  EXPECT_TRUE(getPredefinedStyle("LLVM", FormatStyle::LK_Cpp, &Styles[1]));
-  EXPECT_TRUE(getPredefinedStyle("lLvM", FormatStyle::LK_Cpp, &Styles[2]));
-  EXPECT_ALL_STYLES_EQUAL(Styles);
-
-  Styles[0] = getGoogleStyle();
-  EXPECT_TRUE(getPredefinedStyle("Google", FormatStyle::LK_Cpp, &Styles[1]));
-  EXPECT_TRUE(getPredefinedStyle("gOOgle", FormatStyle::LK_Cpp, &Styles[2]));
-  EXPECT_ALL_STYLES_EQUAL(Styles);
-
-  Styles[0] = getGoogleStyle(FormatStyle::LK_JavaScript);
-  EXPECT_TRUE(
-      getPredefinedStyle("Google", FormatStyle::LK_JavaScript, &Styles[1]));
-  EXPECT_TRUE(
-      getPredefinedStyle("gOOgle", FormatStyle::LK_JavaScript, &Styles[2]));
-  EXPECT_ALL_STYLES_EQUAL(Styles);
-
-  Styles[0] = getChromiumStyle(FormatStyle::LK_Cpp);
-  EXPECT_TRUE(getPredefinedStyle("Chromium", FormatStyle::LK_Cpp, &Styles[1]));
-  EXPECT_TRUE(getPredefinedStyle("cHRoMiUM", FormatStyle::LK_Cpp, &Styles[2]));
-  EXPECT_ALL_STYLES_EQUAL(Styles);
-
-  Styles[0] = getMozillaStyle();
-  EXPECT_TRUE(getPredefinedStyle("Mozilla", FormatStyle::LK_Cpp, &Styles[1]));
-  EXPECT_TRUE(getPredefinedStyle("moZILla", FormatStyle::LK_Cpp, &Styles[2]));
-  EXPECT_ALL_STYLES_EQUAL(Styles);
-
-  Styles[0] = getWebKitStyle();
-  EXPECT_TRUE(getPredefinedStyle("WebKit", FormatStyle::LK_Cpp, &Styles[1]));
-  EXPECT_TRUE(getPredefinedStyle("wEbKit", FormatStyle::LK_Cpp, &Styles[2]));
-  EXPECT_ALL_STYLES_EQUAL(Styles);
-
-  Styles[0] = getGNUStyle();
-  EXPECT_TRUE(getPredefinedStyle("GNU", FormatStyle::LK_Cpp, &Styles[1]));
-  EXPECT_TRUE(getPredefinedStyle("gnU", FormatStyle::LK_Cpp, &Styles[2]));
-  EXPECT_ALL_STYLES_EQUAL(Styles);
-
-  EXPECT_FALSE(getPredefinedStyle("qwerty", FormatStyle::LK_Cpp, &Styles[0]));
-}
-
-TEST_F(FormatTest, GetsCorrectBasedOnStyle) {
-  SmallVector<FormatStyle, 8> Styles;
-  Styles.resize(2);
-
-  Styles[0] = getGoogleStyle();
-  Styles[1] = getLLVMStyle();
-  EXPECT_EQ(0, parseConfiguration("BasedOnStyle: Google", &Styles[1]).value());
-  EXPECT_ALL_STYLES_EQUAL(Styles);
-
-  Styles.resize(5);
-  Styles[0] = getGoogleStyle(FormatStyle::LK_JavaScript);
-  Styles[1] = getLLVMStyle();
-  Styles[1].Language = FormatStyle::LK_JavaScript;
-  EXPECT_EQ(0, parseConfiguration("BasedOnStyle: Google", &Styles[1]).value());
-
-  Styles[2] = getLLVMStyle();
-  Styles[2].Language = FormatStyle::LK_JavaScript;
-  EXPECT_EQ(0, parseConfiguration("Language: JavaScript\n"
-                                  "BasedOnStyle: Google",
-                                  &Styles[2])
-                   .value());
-
-  Styles[3] = getLLVMStyle();
-  Styles[3].Language = FormatStyle::LK_JavaScript;
-  EXPECT_EQ(0, parseConfiguration("BasedOnStyle: Google\n"
-                                  "Language: JavaScript",
-                                  &Styles[3])
-                   .value());
-
-  Styles[4] = getLLVMStyle();
-  Styles[4].Language = FormatStyle::LK_JavaScript;
-  EXPECT_EQ(0, parseConfiguration("---\n"
-                                  "BasedOnStyle: LLVM\n"
-                                  "IndentWidth: 123\n"
-                                  "---\n"
-                                  "BasedOnStyle: Google\n"
-                                  "Language: JavaScript",
-                                  &Styles[4])
-                   .value());
-  EXPECT_ALL_STYLES_EQUAL(Styles);
-}
-
-#define CHECK_PARSE_BOOL_FIELD(FIELD, CONFIG_NAME)                             \
-  Style.FIELD = false;                                                         \
-  EXPECT_EQ(0, parseConfiguration(CONFIG_NAME ": true", &Style).value());      \
-  EXPECT_TRUE(Style.FIELD);                                                    \
-  EXPECT_EQ(0, parseConfiguration(CONFIG_NAME ": false", &Style).value());     \
-  EXPECT_FALSE(Style.FIELD);
-
-#define CHECK_PARSE_BOOL(FIELD) CHECK_PARSE_BOOL_FIELD(FIELD, #FIELD)
-
-#define CHECK_PARSE_NESTED_BOOL_FIELD(STRUCT, FIELD, CONFIG_NAME)              \
-  Style.STRUCT.FIELD = false;                                                  \
-  EXPECT_EQ(0,                                                                 \
-            parseConfiguration(#STRUCT ":\n  " CONFIG_NAME ": true", &Style)   \
-                .value());                                                     \
-  EXPECT_TRUE(Style.STRUCT.FIELD);                                             \
-  EXPECT_EQ(0,                                                                 \
-            parseConfiguration(#STRUCT ":\n  " CONFIG_NAME ": false", &Style)  \
-                .value());                                                     \
-  EXPECT_FALSE(Style.STRUCT.FIELD);
-
-#define CHECK_PARSE_NESTED_BOOL(STRUCT, FIELD)                                 \
-  CHECK_PARSE_NESTED_BOOL_FIELD(STRUCT, FIELD, #FIELD)
-
-#define CHECK_PARSE(TEXT, FIELD, VALUE)                                        \
-  EXPECT_NE(VALUE, Style.FIELD) << "Initial value already the same!";          \
-  EXPECT_EQ(0, parseConfiguration(TEXT, &Style).value());                      \
-  EXPECT_EQ(VALUE, Style.FIELD) << "Unexpected value after parsing!"
-
-TEST_F(FormatTest, ParsesConfigurationBools) {
-  FormatStyle Style = {};
-  Style.Language = FormatStyle::LK_Cpp;
-  CHECK_PARSE_BOOL(AlignTrailingComments);
-  CHECK_PARSE_BOOL(AllowAllArgumentsOnNextLine);
-  CHECK_PARSE_BOOL(AllowAllConstructorInitializersOnNextLine);
-  CHECK_PARSE_BOOL(AllowAllParametersOfDeclarationOnNextLine);
-  CHECK_PARSE_BOOL(AllowShortCaseLabelsOnASingleLine);
-  CHECK_PARSE_BOOL(AllowShortEnumsOnASingleLine);
-  CHECK_PARSE_BOOL(AllowShortLoopsOnASingleLine);
-  CHECK_PARSE_BOOL(BinPackArguments);
-  CHECK_PARSE_BOOL(BinPackParameters);
-  CHECK_PARSE_BOOL(BreakAfterJavaFieldAnnotations);
-  CHECK_PARSE_BOOL(BreakBeforeConceptDeclarations);
-  CHECK_PARSE_BOOL(BreakBeforeTernaryOperators);
-  CHECK_PARSE_BOOL(BreakStringLiterals);
-  CHECK_PARSE_BOOL(CompactNamespaces);
-  CHECK_PARSE_BOOL(ConstructorInitializerAllOnOneLineOrOnePerLine);
-  CHECK_PARSE_BOOL(DeriveLineEnding);
-  CHECK_PARSE_BOOL(DerivePointerAlignment);
-  CHECK_PARSE_BOOL_FIELD(DerivePointerAlignment, "DerivePointerBinding");
-  CHECK_PARSE_BOOL(DisableFormat);
-  CHECK_PARSE_BOOL(IndentAccessModifiers);
-  CHECK_PARSE_BOOL(IndentCaseLabels);
-  CHECK_PARSE_BOOL(IndentCaseBlocks);
-  CHECK_PARSE_BOOL(IndentGotoLabels);
-  CHECK_PARSE_BOOL(IndentRequires);
-  CHECK_PARSE_BOOL(IndentWrappedFunctionNames);
-  CHECK_PARSE_BOOL(KeepEmptyLinesAtTheStartOfBlocks);
-  CHECK_PARSE_BOOL(ObjCSpaceAfterProperty);
-  CHECK_PARSE_BOOL(ObjCSpaceBeforeProtocolList);
-  CHECK_PARSE_BOOL(Cpp11BracedListStyle);
-  CHECK_PARSE_BOOL(ReflowComments);
-  CHECK_PARSE_BOOL(SortUsingDeclarations);
-  CHECK_PARSE_BOOL(SpacesInParentheses);
-  CHECK_PARSE_BOOL(SpacesInSquareBrackets);
-  CHECK_PARSE_BOOL(SpacesInConditionalStatement);
-  CHECK_PARSE_BOOL(SpaceInEmptyBlock);
-  CHECK_PARSE_BOOL(SpaceInEmptyParentheses);
-  CHECK_PARSE_BOOL(SpacesInContainerLiterals);
-  CHECK_PARSE_BOOL(SpacesInCStyleCastParentheses);
-  CHECK_PARSE_BOOL(SpaceAfterCStyleCast);
-  CHECK_PARSE_BOOL(SpaceAfterTemplateKeyword);
-  CHECK_PARSE_BOOL(SpaceAfterLogicalNot);
-  CHECK_PARSE_BOOL(SpaceBeforeAssignmentOperators);
-  CHECK_PARSE_BOOL(SpaceBeforeCaseColon);
-  CHECK_PARSE_BOOL(SpaceBeforeCpp11BracedList);
-  CHECK_PARSE_BOOL(SpaceBeforeCtorInitializerColon);
-  CHECK_PARSE_BOOL(SpaceBeforeInheritanceColon);
-  CHECK_PARSE_BOOL(SpaceBeforeRangeBasedForLoopColon);
-  CHECK_PARSE_BOOL(SpaceBeforeSquareBrackets);
-  CHECK_PARSE_BOOL(UseCRLF);
-
-  CHECK_PARSE_NESTED_BOOL(BraceWrapping, AfterCaseLabel);
-  CHECK_PARSE_NESTED_BOOL(BraceWrapping, AfterClass);
-  CHECK_PARSE_NESTED_BOOL(BraceWrapping, AfterEnum);
-  CHECK_PARSE_NESTED_BOOL(BraceWrapping, AfterFunction);
-  CHECK_PARSE_NESTED_BOOL(BraceWrapping, AfterNamespace);
-  CHECK_PARSE_NESTED_BOOL(BraceWrapping, AfterObjCDeclaration);
-  CHECK_PARSE_NESTED_BOOL(BraceWrapping, AfterStruct);
-  CHECK_PARSE_NESTED_BOOL(BraceWrapping, AfterUnion);
-  CHECK_PARSE_NESTED_BOOL(BraceWrapping, AfterExternBlock);
-  CHECK_PARSE_NESTED_BOOL(BraceWrapping, BeforeCatch);
-  CHECK_PARSE_NESTED_BOOL(BraceWrapping, BeforeElse);
-  CHECK_PARSE_NESTED_BOOL(BraceWrapping, BeforeLambdaBody);
-  CHECK_PARSE_NESTED_BOOL(BraceWrapping, BeforeWhile);
-  CHECK_PARSE_NESTED_BOOL(BraceWrapping, IndentBraces);
-  CHECK_PARSE_NESTED_BOOL(BraceWrapping, SplitEmptyFunction);
-  CHECK_PARSE_NESTED_BOOL(BraceWrapping, SplitEmptyRecord);
-  CHECK_PARSE_NESTED_BOOL(BraceWrapping, SplitEmptyNamespace);
-}
-
-#undef CHECK_PARSE_BOOL
-
-TEST_F(FormatTest, ParsesConfiguration) {
-  FormatStyle Style = {};
-  Style.Language = FormatStyle::LK_Cpp;
-  CHECK_PARSE("AccessModifierOffset: -1234", AccessModifierOffset, -1234);
-  CHECK_PARSE("ConstructorInitializerIndentWidth: 1234",
-              ConstructorInitializerIndentWidth, 1234u);
-  CHECK_PARSE("ObjCBlockIndentWidth: 1234", ObjCBlockIndentWidth, 1234u);
-  CHECK_PARSE("ColumnLimit: 1234", ColumnLimit, 1234u);
-  CHECK_PARSE("MaxEmptyLinesToKeep: 1234", MaxEmptyLinesToKeep, 1234u);
-  CHECK_PARSE("PenaltyBreakAssignment: 1234", PenaltyBreakAssignment, 1234u);
-  CHECK_PARSE("PenaltyBreakBeforeFirstCallParameter: 1234",
-              PenaltyBreakBeforeFirstCallParameter, 1234u);
-  CHECK_PARSE("PenaltyBreakTemplateDeclaration: 1234",
-              PenaltyBreakTemplateDeclaration, 1234u);
-  CHECK_PARSE("PenaltyExcessCharacter: 1234", PenaltyExcessCharacter, 1234u);
-  CHECK_PARSE("PenaltyReturnTypeOnItsOwnLine: 1234",
-              PenaltyReturnTypeOnItsOwnLine, 1234u);
-  CHECK_PARSE("SpacesBeforeTrailingComments: 1234",
-              SpacesBeforeTrailingComments, 1234u);
-  CHECK_PARSE("IndentWidth: 32", IndentWidth, 32u);
-  CHECK_PARSE("ContinuationIndentWidth: 11", ContinuationIndentWidth, 11u);
-  CHECK_PARSE("CommentPragmas: '// abc$'", CommentPragmas, "// abc$");
-
-  Style.AlignConsecutiveAssignments = FormatStyle::ACS_Consecutive;
-  CHECK_PARSE("AlignConsecutiveAssignments: None", AlignConsecutiveAssignments,
-              FormatStyle::ACS_None);
-  CHECK_PARSE("AlignConsecutiveAssignments: Consecutive",
-              AlignConsecutiveAssignments, FormatStyle::ACS_Consecutive);
-  CHECK_PARSE("AlignConsecutiveAssignments: AcrossEmptyLines",
-              AlignConsecutiveAssignments, FormatStyle::ACS_AcrossEmptyLines);
-  CHECK_PARSE("AlignConsecutiveAssignments: AcrossEmptyLinesAndComments",
-              AlignConsecutiveAssignments,
-              FormatStyle::ACS_AcrossEmptyLinesAndComments);
-  // For backwards compability, false / true should still parse
-  CHECK_PARSE("AlignConsecutiveAssignments: false", AlignConsecutiveAssignments,
-              FormatStyle::ACS_None);
-  CHECK_PARSE("AlignConsecutiveAssignments: true", AlignConsecutiveAssignments,
-              FormatStyle::ACS_Consecutive);
-
-  Style.AlignConsecutiveBitFields = FormatStyle::ACS_Consecutive;
-  CHECK_PARSE("AlignConsecutiveBitFields: None", AlignConsecutiveBitFields,
-              FormatStyle::ACS_None);
-  CHECK_PARSE("AlignConsecutiveBitFields: Consecutive",
-              AlignConsecutiveBitFields, FormatStyle::ACS_Consecutive);
-  CHECK_PARSE("AlignConsecutiveBitFields: AcrossEmptyLines",
-              AlignConsecutiveBitFields, FormatStyle::ACS_AcrossEmptyLines);
-  CHECK_PARSE("AlignConsecutiveBitFields: AcrossEmptyLinesAndComments",
-              AlignConsecutiveBitFields,
-              FormatStyle::ACS_AcrossEmptyLinesAndComments);
-  // For backwards compability, false / true should still parse
-  CHECK_PARSE("AlignConsecutiveBitFields: false", AlignConsecutiveBitFields,
-              FormatStyle::ACS_None);
-  CHECK_PARSE("AlignConsecutiveBitFields: true", AlignConsecutiveBitFields,
-              FormatStyle::ACS_Consecutive);
-
-  Style.AlignConsecutiveMacros = FormatStyle::ACS_Consecutive;
-  CHECK_PARSE("AlignConsecutiveMacros: None", AlignConsecutiveMacros,
-              FormatStyle::ACS_None);
-  CHECK_PARSE("AlignConsecutiveMacros: Consecutive", AlignConsecutiveMacros,
-              FormatStyle::ACS_Consecutive);
-  CHECK_PARSE("AlignConsecutiveMacros: AcrossEmptyLines",
-              AlignConsecutiveMacros, FormatStyle::ACS_AcrossEmptyLines);
-  CHECK_PARSE("AlignConsecutiveMacros: AcrossEmptyLinesAndComments",
-              AlignConsecutiveMacros,
-              FormatStyle::ACS_AcrossEmptyLinesAndComments);
-  // For backwards compability, false / true should still parse
-  CHECK_PARSE("AlignConsecutiveMacros: false", AlignConsecutiveMacros,
-              FormatStyle::ACS_None);
-  CHECK_PARSE("AlignConsecutiveMacros: true", AlignConsecutiveMacros,
-              FormatStyle::ACS_Consecutive);
-
-  Style.AlignConsecutiveDeclarations = FormatStyle::ACS_Consecutive;
-  CHECK_PARSE("AlignConsecutiveDeclarations: None",
-              AlignConsecutiveDeclarations, FormatStyle::ACS_None);
-  CHECK_PARSE("AlignConsecutiveDeclarations: Consecutive",
-              AlignConsecutiveDeclarations, FormatStyle::ACS_Consecutive);
-  CHECK_PARSE("AlignConsecutiveDeclarations: AcrossEmptyLines",
-              AlignConsecutiveDeclarations, FormatStyle::ACS_AcrossEmptyLines);
-  CHECK_PARSE("AlignConsecutiveDeclarations: AcrossEmptyLinesAndComments",
-              AlignConsecutiveDeclarations,
-              FormatStyle::ACS_AcrossEmptyLinesAndComments);
-  // For backwards compability, false / true should still parse
-  CHECK_PARSE("AlignConsecutiveDeclarations: false",
-              AlignConsecutiveDeclarations, FormatStyle::ACS_None);
-  CHECK_PARSE("AlignConsecutiveDeclarations: true",
-              AlignConsecutiveDeclarations, FormatStyle::ACS_Consecutive);
-
-  Style.PointerAlignment = FormatStyle::PAS_Middle;
-  CHECK_PARSE("PointerAlignment: Left", PointerAlignment,
-              FormatStyle::PAS_Left);
-  CHECK_PARSE("PointerAlignment: Right", PointerAlignment,
-              FormatStyle::PAS_Right);
-  CHECK_PARSE("PointerAlignment: Middle", PointerAlignment,
-              FormatStyle::PAS_Middle);
-  Style.ReferenceAlignment = FormatStyle::RAS_Middle;
-  CHECK_PARSE("ReferenceAlignment: Pointer", ReferenceAlignment,
-              FormatStyle::RAS_Pointer);
-  CHECK_PARSE("ReferenceAlignment: Left", ReferenceAlignment,
-              FormatStyle::RAS_Left);
-  CHECK_PARSE("ReferenceAlignment: Right", ReferenceAlignment,
-              FormatStyle::RAS_Right);
-  CHECK_PARSE("ReferenceAlignment: Middle", ReferenceAlignment,
-              FormatStyle::RAS_Middle);
-  // For backward compatibility:
-  CHECK_PARSE("PointerBindsToType: Left", PointerAlignment,
-              FormatStyle::PAS_Left);
-  CHECK_PARSE("PointerBindsToType: Right", PointerAlignment,
-              FormatStyle::PAS_Right);
-  CHECK_PARSE("PointerBindsToType: Middle", PointerAlignment,
-              FormatStyle::PAS_Middle);
-
-  Style.Standard = FormatStyle::LS_Auto;
-  CHECK_PARSE("Standard: c++03", Standard, FormatStyle::LS_Cpp03);
-  CHECK_PARSE("Standard: c++11", Standard, FormatStyle::LS_Cpp11);
-  CHECK_PARSE("Standard: c++14", Standard, FormatStyle::LS_Cpp14);
-  CHECK_PARSE("Standard: c++17", Standard, FormatStyle::LS_Cpp17);
-  CHECK_PARSE("Standard: c++20", Standard, FormatStyle::LS_Cpp20);
-  CHECK_PARSE("Standard: Auto", Standard, FormatStyle::LS_Auto);
-  CHECK_PARSE("Standard: Latest", Standard, FormatStyle::LS_Latest);
-  // Legacy aliases:
-  CHECK_PARSE("Standard: Cpp03", Standard, FormatStyle::LS_Cpp03);
-  CHECK_PARSE("Standard: Cpp11", Standard, FormatStyle::LS_Latest);
-  CHECK_PARSE("Standard: C++03", Standard, FormatStyle::LS_Cpp03);
-  CHECK_PARSE("Standard: C++11", Standard, FormatStyle::LS_Cpp11);
-
-  Style.BreakBeforeBinaryOperators = FormatStyle::BOS_All;
-  CHECK_PARSE("BreakBeforeBinaryOperators: NonAssignment",
-              BreakBeforeBinaryOperators, FormatStyle::BOS_NonAssignment);
-  CHECK_PARSE("BreakBeforeBinaryOperators: None", BreakBeforeBinaryOperators,
-              FormatStyle::BOS_None);
-  CHECK_PARSE("BreakBeforeBinaryOperators: All", BreakBeforeBinaryOperators,
-              FormatStyle::BOS_All);
-  // For backward compatibility:
-  CHECK_PARSE("BreakBeforeBinaryOperators: false", BreakBeforeBinaryOperators,
-              FormatStyle::BOS_None);
-  CHECK_PARSE("BreakBeforeBinaryOperators: true", BreakBeforeBinaryOperators,
-              FormatStyle::BOS_All);
-
-  Style.BreakConstructorInitializers = FormatStyle::BCIS_BeforeColon;
-  CHECK_PARSE("BreakConstructorInitializers: BeforeComma",
-              BreakConstructorInitializers, FormatStyle::BCIS_BeforeComma);
-  CHECK_PARSE("BreakConstructorInitializers: AfterColon",
-              BreakConstructorInitializers, FormatStyle::BCIS_AfterColon);
-  CHECK_PARSE("BreakConstructorInitializers: BeforeColon",
-              BreakConstructorInitializers, FormatStyle::BCIS_BeforeColon);
-  // For backward compatibility:
-  CHECK_PARSE("BreakConstructorInitializersBeforeComma: true",
-              BreakConstructorInitializers, FormatStyle::BCIS_BeforeComma);
-
-  Style.BreakInheritanceList = FormatStyle::BILS_BeforeColon;
-  CHECK_PARSE("BreakInheritanceList: AfterComma", BreakInheritanceList,
-              FormatStyle::BILS_AfterComma);
-  CHECK_PARSE("BreakInheritanceList: BeforeComma", BreakInheritanceList,
-              FormatStyle::BILS_BeforeComma);
-  CHECK_PARSE("BreakInheritanceList: AfterColon", BreakInheritanceList,
-              FormatStyle::BILS_AfterColon);
-  CHECK_PARSE("BreakInheritanceList: BeforeColon", BreakInheritanceList,
-              FormatStyle::BILS_BeforeColon);
-  // For backward compatibility:
-  CHECK_PARSE("BreakBeforeInheritanceComma: true", BreakInheritanceList,
-              FormatStyle::BILS_BeforeComma);
-
-  Style.EmptyLineBeforeAccessModifier = FormatStyle::ELBAMS_LogicalBlock;
-  CHECK_PARSE("EmptyLineBeforeAccessModifier: Never",
-              EmptyLineBeforeAccessModifier, FormatStyle::ELBAMS_Never);
-  CHECK_PARSE("EmptyLineBeforeAccessModifier: Leave",
-              EmptyLineBeforeAccessModifier, FormatStyle::ELBAMS_Leave);
-  CHECK_PARSE("EmptyLineBeforeAccessModifier: LogicalBlock",
-              EmptyLineBeforeAccessModifier, FormatStyle::ELBAMS_LogicalBlock);
-  CHECK_PARSE("EmptyLineBeforeAccessModifier: Always",
-              EmptyLineBeforeAccessModifier, FormatStyle::ELBAMS_Always);
-
-  Style.AlignAfterOpenBracket = FormatStyle::BAS_AlwaysBreak;
-  CHECK_PARSE("AlignAfterOpenBracket: Align", AlignAfterOpenBracket,
-              FormatStyle::BAS_Align);
-  CHECK_PARSE("AlignAfterOpenBracket: DontAlign", AlignAfterOpenBracket,
-              FormatStyle::BAS_DontAlign);
-  CHECK_PARSE("AlignAfterOpenBracket: AlwaysBreak", AlignAfterOpenBracket,
-              FormatStyle::BAS_AlwaysBreak);
-  // For backward compatibility:
-  CHECK_PARSE("AlignAfterOpenBracket: false", AlignAfterOpenBracket,
-              FormatStyle::BAS_DontAlign);
-  CHECK_PARSE("AlignAfterOpenBracket: true", AlignAfterOpenBracket,
-              FormatStyle::BAS_Align);
-
-  Style.AlignEscapedNewlines = FormatStyle::ENAS_Left;
-  CHECK_PARSE("AlignEscapedNewlines: DontAlign", AlignEscapedNewlines,
-              FormatStyle::ENAS_DontAlign);
-  CHECK_PARSE("AlignEscapedNewlines: Left", AlignEscapedNewlines,
-              FormatStyle::ENAS_Left);
-  CHECK_PARSE("AlignEscapedNewlines: Right", AlignEscapedNewlines,
-              FormatStyle::ENAS_Right);
-  // For backward compatibility:
-  CHECK_PARSE("AlignEscapedNewlinesLeft: true", AlignEscapedNewlines,
-              FormatStyle::ENAS_Left);
-  CHECK_PARSE("AlignEscapedNewlinesLeft: false", AlignEscapedNewlines,
-              FormatStyle::ENAS_Right);
-
-  Style.AlignOperands = FormatStyle::OAS_Align;
-  CHECK_PARSE("AlignOperands: DontAlign", AlignOperands,
-              FormatStyle::OAS_DontAlign);
-  CHECK_PARSE("AlignOperands: Align", AlignOperands, FormatStyle::OAS_Align);
-  CHECK_PARSE("AlignOperands: AlignAfterOperator", AlignOperands,
-              FormatStyle::OAS_AlignAfterOperator);
-  // For backward compatibility:
-  CHECK_PARSE("AlignOperands: false", AlignOperands,
-              FormatStyle::OAS_DontAlign);
-  CHECK_PARSE("AlignOperands: true", AlignOperands, FormatStyle::OAS_Align);
-
-  Style.UseTab = FormatStyle::UT_ForIndentation;
-  CHECK_PARSE("UseTab: Never", UseTab, FormatStyle::UT_Never);
-  CHECK_PARSE("UseTab: ForIndentation", UseTab, FormatStyle::UT_ForIndentation);
-  CHECK_PARSE("UseTab: Always", UseTab, FormatStyle::UT_Always);
-  CHECK_PARSE("UseTab: ForContinuationAndIndentation", UseTab,
-              FormatStyle::UT_ForContinuationAndIndentation);
-  CHECK_PARSE("UseTab: AlignWithSpaces", UseTab,
-              FormatStyle::UT_AlignWithSpaces);
-  // For backward compatibility:
-  CHECK_PARSE("UseTab: false", UseTab, FormatStyle::UT_Never);
-  CHECK_PARSE("UseTab: true", UseTab, FormatStyle::UT_Always);
-
-  Style.AllowShortBlocksOnASingleLine = FormatStyle::SBS_Empty;
-  CHECK_PARSE("AllowShortBlocksOnASingleLine: Never",
-              AllowShortBlocksOnASingleLine, FormatStyle::SBS_Never);
-  CHECK_PARSE("AllowShortBlocksOnASingleLine: Empty",
-              AllowShortBlocksOnASingleLine, FormatStyle::SBS_Empty);
-  CHECK_PARSE("AllowShortBlocksOnASingleLine: Always",
-              AllowShortBlocksOnASingleLine, FormatStyle::SBS_Always);
-  // For backward compatibility:
-  CHECK_PARSE("AllowShortBlocksOnASingleLine: false",
-              AllowShortBlocksOnASingleLine, FormatStyle::SBS_Never);
-  CHECK_PARSE("AllowShortBlocksOnASingleLine: true",
-              AllowShortBlocksOnASingleLine, FormatStyle::SBS_Always);
-
-  Style.AllowShortFunctionsOnASingleLine = FormatStyle::SFS_Inline;
-  CHECK_PARSE("AllowShortFunctionsOnASingleLine: None",
-              AllowShortFunctionsOnASingleLine, FormatStyle::SFS_None);
-  CHECK_PARSE("AllowShortFunctionsOnASingleLine: Inline",
-              AllowShortFunctionsOnASingleLine, FormatStyle::SFS_Inline);
-  CHECK_PARSE("AllowShortFunctionsOnASingleLine: Empty",
-              AllowShortFunctionsOnASingleLine, FormatStyle::SFS_Empty);
-  CHECK_PARSE("AllowShortFunctionsOnASingleLine: All",
-              AllowShortFunctionsOnASingleLine, FormatStyle::SFS_All);
-  // For backward compatibility:
-  CHECK_PARSE("AllowShortFunctionsOnASingleLine: false",
-              AllowShortFunctionsOnASingleLine, FormatStyle::SFS_None);
-  CHECK_PARSE("AllowShortFunctionsOnASingleLine: true",
-              AllowShortFunctionsOnASingleLine, FormatStyle::SFS_All);
-
-  Style.SpaceAroundPointerQualifiers = FormatStyle::SAPQ_Both;
-  CHECK_PARSE("SpaceAroundPointerQualifiers: Default",
-              SpaceAroundPointerQualifiers, FormatStyle::SAPQ_Default);
-  CHECK_PARSE("SpaceAroundPointerQualifiers: Before",
-              SpaceAroundPointerQualifiers, FormatStyle::SAPQ_Before);
-  CHECK_PARSE("SpaceAroundPointerQualifiers: After",
-              SpaceAroundPointerQualifiers, FormatStyle::SAPQ_After);
-  CHECK_PARSE("SpaceAroundPointerQualifiers: Both",
-              SpaceAroundPointerQualifiers, FormatStyle::SAPQ_Both);
-
-  Style.SpaceBeforeParens = FormatStyle::SBPO_Always;
-  CHECK_PARSE("SpaceBeforeParens: Never", SpaceBeforeParens,
-              FormatStyle::SBPO_Never);
-  CHECK_PARSE("SpaceBeforeParens: Always", SpaceBeforeParens,
-              FormatStyle::SBPO_Always);
-  CHECK_PARSE("SpaceBeforeParens: ControlStatements", SpaceBeforeParens,
-              FormatStyle::SBPO_ControlStatements);
-  CHECK_PARSE("SpaceBeforeParens: ControlStatementsExceptControlMacros",
-              SpaceBeforeParens,
-              FormatStyle::SBPO_ControlStatementsExceptControlMacros);
-  CHECK_PARSE("SpaceBeforeParens: NonEmptyParentheses", SpaceBeforeParens,
-              FormatStyle::SBPO_NonEmptyParentheses);
-  // For backward compatibility:
-  CHECK_PARSE("SpaceAfterControlStatementKeyword: false", SpaceBeforeParens,
-              FormatStyle::SBPO_Never);
-  CHECK_PARSE("SpaceAfterControlStatementKeyword: true", SpaceBeforeParens,
-              FormatStyle::SBPO_ControlStatements);
-  CHECK_PARSE("SpaceBeforeParens: ControlStatementsExceptForEachMacros",
-              SpaceBeforeParens,
-              FormatStyle::SBPO_ControlStatementsExceptControlMacros);
-
-  Style.ColumnLimit = 123;
-  FormatStyle BaseStyle = getLLVMStyle();
-  CHECK_PARSE("BasedOnStyle: LLVM", ColumnLimit, BaseStyle.ColumnLimit);
-  CHECK_PARSE("BasedOnStyle: LLVM\nColumnLimit: 1234", ColumnLimit, 1234u);
-
-  Style.BreakBeforeBraces = FormatStyle::BS_Stroustrup;
-  CHECK_PARSE("BreakBeforeBraces: Attach", BreakBeforeBraces,
-              FormatStyle::BS_Attach);
-  CHECK_PARSE("BreakBeforeBraces: Linux", BreakBeforeBraces,
-              FormatStyle::BS_Linux);
-  CHECK_PARSE("BreakBeforeBraces: Mozilla", BreakBeforeBraces,
-              FormatStyle::BS_Mozilla);
-  CHECK_PARSE("BreakBeforeBraces: Stroustrup", BreakBeforeBraces,
-              FormatStyle::BS_Stroustrup);
-  CHECK_PARSE("BreakBeforeBraces: Allman", BreakBeforeBraces,
-              FormatStyle::BS_Allman);
-  CHECK_PARSE("BreakBeforeBraces: Whitesmiths", BreakBeforeBraces,
-              FormatStyle::BS_Whitesmiths);
-  CHECK_PARSE("BreakBeforeBraces: GNU", BreakBeforeBraces, FormatStyle::BS_GNU);
-  CHECK_PARSE("BreakBeforeBraces: WebKit", BreakBeforeBraces,
-              FormatStyle::BS_WebKit);
-  CHECK_PARSE("BreakBeforeBraces: Custom", BreakBeforeBraces,
-              FormatStyle::BS_Custom);
-
-  Style.BraceWrapping.AfterControlStatement = FormatStyle::BWACS_Never;
-  CHECK_PARSE("BraceWrapping:\n"
-              "  AfterControlStatement: MultiLine",
-              BraceWrapping.AfterControlStatement,
-              FormatStyle::BWACS_MultiLine);
-  CHECK_PARSE("BraceWrapping:\n"
-              "  AfterControlStatement: Always",
-              BraceWrapping.AfterControlStatement, FormatStyle::BWACS_Always);
-  CHECK_PARSE("BraceWrapping:\n"
-              "  AfterControlStatement: Never",
-              BraceWrapping.AfterControlStatement, FormatStyle::BWACS_Never);
-  // For backward compatibility:
-  CHECK_PARSE("BraceWrapping:\n"
-              "  AfterControlStatement: true",
-              BraceWrapping.AfterControlStatement, FormatStyle::BWACS_Always);
-  CHECK_PARSE("BraceWrapping:\n"
-              "  AfterControlStatement: false",
-              BraceWrapping.AfterControlStatement, FormatStyle::BWACS_Never);
-
-  Style.AlwaysBreakAfterReturnType = FormatStyle::RTBS_All;
-  CHECK_PARSE("AlwaysBreakAfterReturnType: None", AlwaysBreakAfterReturnType,
-              FormatStyle::RTBS_None);
-  CHECK_PARSE("AlwaysBreakAfterReturnType: All", AlwaysBreakAfterReturnType,
-              FormatStyle::RTBS_All);
-  CHECK_PARSE("AlwaysBreakAfterReturnType: TopLevel",
-              AlwaysBreakAfterReturnType, FormatStyle::RTBS_TopLevel);
-  CHECK_PARSE("AlwaysBreakAfterReturnType: AllDefinitions",
-              AlwaysBreakAfterReturnType, FormatStyle::RTBS_AllDefinitions);
-  CHECK_PARSE("AlwaysBreakAfterReturnType: TopLevelDefinitions",
-              AlwaysBreakAfterReturnType,
-              FormatStyle::RTBS_TopLevelDefinitions);
-
-  Style.AlwaysBreakTemplateDeclarations = FormatStyle::BTDS_Yes;
-  CHECK_PARSE("AlwaysBreakTemplateDeclarations: No",
-              AlwaysBreakTemplateDeclarations, FormatStyle::BTDS_No);
-  CHECK_PARSE("AlwaysBreakTemplateDeclarations: MultiLine",
-              AlwaysBreakTemplateDeclarations, FormatStyle::BTDS_MultiLine);
-  CHECK_PARSE("AlwaysBreakTemplateDeclarations: Yes",
-              AlwaysBreakTemplateDeclarations, FormatStyle::BTDS_Yes);
-  CHECK_PARSE("AlwaysBreakTemplateDeclarations: false",
-              AlwaysBreakTemplateDeclarations, FormatStyle::BTDS_MultiLine);
-  CHECK_PARSE("AlwaysBreakTemplateDeclarations: true",
-              AlwaysBreakTemplateDeclarations, FormatStyle::BTDS_Yes);
-
-  Style.AlwaysBreakAfterDefinitionReturnType = FormatStyle::DRTBS_All;
-  CHECK_PARSE("AlwaysBreakAfterDefinitionReturnType: None",
-              AlwaysBreakAfterDefinitionReturnType, FormatStyle::DRTBS_None);
-  CHECK_PARSE("AlwaysBreakAfterDefinitionReturnType: All",
-              AlwaysBreakAfterDefinitionReturnType, FormatStyle::DRTBS_All);
-  CHECK_PARSE("AlwaysBreakAfterDefinitionReturnType: TopLevel",
-              AlwaysBreakAfterDefinitionReturnType,
-              FormatStyle::DRTBS_TopLevel);
-
-  Style.NamespaceIndentation = FormatStyle::NI_All;
-  CHECK_PARSE("NamespaceIndentation: None", NamespaceIndentation,
-              FormatStyle::NI_None);
-  CHECK_PARSE("NamespaceIndentation: Inner", NamespaceIndentation,
-              FormatStyle::NI_Inner);
-  CHECK_PARSE("NamespaceIndentation: All", NamespaceIndentation,
-              FormatStyle::NI_All);
-
-  Style.AllowShortIfStatementsOnASingleLine = FormatStyle::SIS_OnlyFirstIf;
-  CHECK_PARSE("AllowShortIfStatementsOnASingleLine: Never",
-              AllowShortIfStatementsOnASingleLine, FormatStyle::SIS_Never);
-  CHECK_PARSE("AllowShortIfStatementsOnASingleLine: WithoutElse",
-              AllowShortIfStatementsOnASingleLine,
-              FormatStyle::SIS_WithoutElse);
-  CHECK_PARSE("AllowShortIfStatementsOnASingleLine: OnlyFirstIf",
-              AllowShortIfStatementsOnASingleLine,
-              FormatStyle::SIS_OnlyFirstIf);
-  CHECK_PARSE("AllowShortIfStatementsOnASingleLine: AllIfsAndElse",
-              AllowShortIfStatementsOnASingleLine,
-              FormatStyle::SIS_AllIfsAndElse);
-  CHECK_PARSE("AllowShortIfStatementsOnASingleLine: Always",
-              AllowShortIfStatementsOnASingleLine,
-              FormatStyle::SIS_OnlyFirstIf);
-  CHECK_PARSE("AllowShortIfStatementsOnASingleLine: false",
-              AllowShortIfStatementsOnASingleLine, FormatStyle::SIS_Never);
-  CHECK_PARSE("AllowShortIfStatementsOnASingleLine: true",
-              AllowShortIfStatementsOnASingleLine,
-              FormatStyle::SIS_WithoutElse);
-
-  Style.IndentExternBlock = FormatStyle::IEBS_NoIndent;
-  CHECK_PARSE("IndentExternBlock: AfterExternBlock", IndentExternBlock,
-              FormatStyle::IEBS_AfterExternBlock);
-  CHECK_PARSE("IndentExternBlock: Indent", IndentExternBlock,
-              FormatStyle::IEBS_Indent);
-  CHECK_PARSE("IndentExternBlock: NoIndent", IndentExternBlock,
-              FormatStyle::IEBS_NoIndent);
-  CHECK_PARSE("IndentExternBlock: true", IndentExternBlock,
-              FormatStyle::IEBS_Indent);
-  CHECK_PARSE("IndentExternBlock: false", IndentExternBlock,
-              FormatStyle::IEBS_NoIndent);
-
-  Style.BitFieldColonSpacing = FormatStyle::BFCS_None;
-  CHECK_PARSE("BitFieldColonSpacing: Both", BitFieldColonSpacing,
-              FormatStyle::BFCS_Both);
-  CHECK_PARSE("BitFieldColonSpacing: None", BitFieldColonSpacing,
-              FormatStyle::BFCS_None);
-  CHECK_PARSE("BitFieldColonSpacing: Before", BitFieldColonSpacing,
-              FormatStyle::BFCS_Before);
-  CHECK_PARSE("BitFieldColonSpacing: After", BitFieldColonSpacing,
-              FormatStyle::BFCS_After);
-
-  Style.SortJavaStaticImport = FormatStyle::SJSIO_Before;
-  CHECK_PARSE("SortJavaStaticImport: After", SortJavaStaticImport,
-              FormatStyle::SJSIO_After);
-  CHECK_PARSE("SortJavaStaticImport: Before", SortJavaStaticImport,
-              FormatStyle::SJSIO_Before);
-
-  // FIXME: This is required because parsing a configuration simply overwrites
-  // the first N elements of the list instead of resetting it.
-  Style.ForEachMacros.clear();
-  std::vector<std::string> BoostForeach;
-  BoostForeach.push_back("BOOST_FOREACH");
-  CHECK_PARSE("ForEachMacros: [BOOST_FOREACH]", ForEachMacros, BoostForeach);
-  std::vector<std::string> BoostAndQForeach;
-  BoostAndQForeach.push_back("BOOST_FOREACH");
-  BoostAndQForeach.push_back("Q_FOREACH");
-  CHECK_PARSE("ForEachMacros: [BOOST_FOREACH, Q_FOREACH]", ForEachMacros,
-              BoostAndQForeach);
-
-  Style.IfMacros.clear();
-  std::vector<std::string> CustomIfs;
-  CustomIfs.push_back("MYIF");
-  CHECK_PARSE("IfMacros: [MYIF]", IfMacros, CustomIfs);
-
-  Style.AttributeMacros.clear();
-  CHECK_PARSE("BasedOnStyle: LLVM", AttributeMacros,
-              std::vector<std::string>{"__capability"});
-  CHECK_PARSE("AttributeMacros: [attr1, attr2]", AttributeMacros,
-              std::vector<std::string>({"attr1", "attr2"}));
-
-  Style.StatementAttributeLikeMacros.clear();
-  CHECK_PARSE("StatementAttributeLikeMacros: [emit,Q_EMIT]",
-              StatementAttributeLikeMacros,
-              std::vector<std::string>({"emit", "Q_EMIT"}));
-
-  Style.StatementMacros.clear();
-  CHECK_PARSE("StatementMacros: [QUNUSED]", StatementMacros,
-              std::vector<std::string>{"QUNUSED"});
-  CHECK_PARSE("StatementMacros: [QUNUSED, QT_REQUIRE_VERSION]", StatementMacros,
-              std::vector<std::string>({"QUNUSED", "QT_REQUIRE_VERSION"}));
-
-  Style.NamespaceMacros.clear();
-  CHECK_PARSE("NamespaceMacros: [TESTSUITE]", NamespaceMacros,
-              std::vector<std::string>{"TESTSUITE"});
-  CHECK_PARSE("NamespaceMacros: [TESTSUITE, SUITE]", NamespaceMacros,
-              std::vector<std::string>({"TESTSUITE", "SUITE"}));
-
-  Style.WhitespaceSensitiveMacros.clear();
-  CHECK_PARSE("WhitespaceSensitiveMacros: [STRINGIZE]",
-              WhitespaceSensitiveMacros, std::vector<std::string>{"STRINGIZE"});
-  CHECK_PARSE("WhitespaceSensitiveMacros: [STRINGIZE, ASSERT]",
-              WhitespaceSensitiveMacros,
-              std::vector<std::string>({"STRINGIZE", "ASSERT"}));
-  Style.WhitespaceSensitiveMacros.clear();
-  CHECK_PARSE("WhitespaceSensitiveMacros: ['STRINGIZE']",
-              WhitespaceSensitiveMacros, std::vector<std::string>{"STRINGIZE"});
-  CHECK_PARSE("WhitespaceSensitiveMacros: ['STRINGIZE', 'ASSERT']",
-              WhitespaceSensitiveMacros,
-              std::vector<std::string>({"STRINGIZE", "ASSERT"}));
-
-  Style.IncludeStyle.IncludeCategories.clear();
-  std::vector<tooling::IncludeStyle::IncludeCategory> ExpectedCategories = {
-      {"abc/.*", 2, 0, false}, {".*", 1, 0, true}};
-  CHECK_PARSE("IncludeCategories:\n"
-              "  - Regex: abc/.*\n"
-              "    Priority: 2\n"
-              "  - Regex: .*\n"
-              "    Priority: 1\n"
-              "    CaseSensitive: true\n",
-              IncludeStyle.IncludeCategories, ExpectedCategories);
-  CHECK_PARSE("IncludeIsMainRegex: 'abc$'", IncludeStyle.IncludeIsMainRegex,
-              "abc$");
-  CHECK_PARSE("IncludeIsMainSourceRegex: 'abc$'",
-              IncludeStyle.IncludeIsMainSourceRegex, "abc$");
-
-  Style.SortIncludes = FormatStyle::SI_Never;
-  CHECK_PARSE("SortIncludes: true", SortIncludes,
-              FormatStyle::SI_CaseSensitive);
-  CHECK_PARSE("SortIncludes: false", SortIncludes, FormatStyle::SI_Never);
-  CHECK_PARSE("SortIncludes: CaseInsensitive", SortIncludes,
-              FormatStyle::SI_CaseInsensitive);
-  CHECK_PARSE("SortIncludes: CaseSensitive", SortIncludes,
-              FormatStyle::SI_CaseSensitive);
-  CHECK_PARSE("SortIncludes: Never", SortIncludes, FormatStyle::SI_Never);
-
-  Style.RawStringFormats.clear();
-  std::vector<FormatStyle::RawStringFormat> ExpectedRawStringFormats = {
-      {
-          FormatStyle::LK_TextProto,
-          {"pb", "proto"},
-          {"PARSE_TEXT_PROTO"},
-          /*CanonicalDelimiter=*/"",
-          "llvm",
-      },
-      {
-          FormatStyle::LK_Cpp,
-          {"cc", "cpp"},
-          {"C_CODEBLOCK", "CPPEVAL"},
-          /*CanonicalDelimiter=*/"cc",
-          /*BasedOnStyle=*/"",
-      },
-  };
-
-  CHECK_PARSE("RawStringFormats:\n"
-              "  - Language: TextProto\n"
-              "    Delimiters:\n"
-              "      - 'pb'\n"
-              "      - 'proto'\n"
-              "    EnclosingFunctions:\n"
-              "      - 'PARSE_TEXT_PROTO'\n"
-              "    BasedOnStyle: llvm\n"
-              "  - Language: Cpp\n"
-              "    Delimiters:\n"
-              "      - 'cc'\n"
-              "      - 'cpp'\n"
-              "    EnclosingFunctions:\n"
-              "      - 'C_CODEBLOCK'\n"
-              "      - 'CPPEVAL'\n"
-              "    CanonicalDelimiter: 'cc'",
-              RawStringFormats, ExpectedRawStringFormats);
-
-  CHECK_PARSE("SpacesInLineCommentPrefix:\n"
-              "  Minimum: 0\n"
-              "  Maximum: 0",
-              SpacesInLineCommentPrefix.Minimum, 0u);
-  EXPECT_EQ(Style.SpacesInLineCommentPrefix.Maximum, 0u);
-  Style.SpacesInLineCommentPrefix.Minimum = 1;
-  CHECK_PARSE("SpacesInLineCommentPrefix:\n"
-              "  Minimum: 2",
-              SpacesInLineCommentPrefix.Minimum, 0u);
-  CHECK_PARSE("SpacesInLineCommentPrefix:\n"
-              "  Maximum: -1",
-              SpacesInLineCommentPrefix.Maximum, -1u);
-  CHECK_PARSE("SpacesInLineCommentPrefix:\n"
-              "  Minimum: 2",
-              SpacesInLineCommentPrefix.Minimum, 2u);
-  CHECK_PARSE("SpacesInLineCommentPrefix:\n"
-              "  Maximum: 1",
-              SpacesInLineCommentPrefix.Maximum, 1u);
-  EXPECT_EQ(Style.SpacesInLineCommentPrefix.Minimum, 1u);
-
-  Style.SpacesInAngles = FormatStyle::SIAS_Always;
-  CHECK_PARSE("SpacesInAngles: Never", SpacesInAngles, FormatStyle::SIAS_Never);
-  CHECK_PARSE("SpacesInAngles: Always", SpacesInAngles,
-              FormatStyle::SIAS_Always);
-  CHECK_PARSE("SpacesInAngles: Leave", SpacesInAngles, FormatStyle::SIAS_Leave);
-  // For backward compatibility:
-  CHECK_PARSE("SpacesInAngles: false", SpacesInAngles, FormatStyle::SIAS_Never);
-  CHECK_PARSE("SpacesInAngles: true", SpacesInAngles, FormatStyle::SIAS_Always);
-}
-
-TEST_F(FormatTest, ParsesConfigurationWithLanguages) {
-  FormatStyle Style = {};
-  Style.Language = FormatStyle::LK_Cpp;
-  CHECK_PARSE("Language: Cpp\n"
-              "IndentWidth: 12",
-              IndentWidth, 12u);
-  EXPECT_EQ(parseConfiguration("Language: JavaScript\n"
-                               "IndentWidth: 34",
-                               &Style),
-            ParseError::Unsuitable);
-  FormatStyle BinPackedTCS = {};
-  BinPackedTCS.Language = FormatStyle::LK_JavaScript;
-  EXPECT_EQ(parseConfiguration("BinPackArguments: true\n"
-                               "InsertTrailingCommas: Wrapped",
-                               &BinPackedTCS),
-            ParseError::BinPackTrailingCommaConflict);
-  EXPECT_EQ(12u, Style.IndentWidth);
-  CHECK_PARSE("IndentWidth: 56", IndentWidth, 56u);
-  EXPECT_EQ(FormatStyle::LK_Cpp, Style.Language);
-
-  Style.Language = FormatStyle::LK_JavaScript;
-  CHECK_PARSE("Language: JavaScript\n"
-              "IndentWidth: 12",
-              IndentWidth, 12u);
-  CHECK_PARSE("IndentWidth: 23", IndentWidth, 23u);
-  EXPECT_EQ(parseConfiguration("Language: Cpp\n"
-                               "IndentWidth: 34",
-                               &Style),
-            ParseError::Unsuitable);
-  EXPECT_EQ(23u, Style.IndentWidth);
-  CHECK_PARSE("IndentWidth: 56", IndentWidth, 56u);
-  EXPECT_EQ(FormatStyle::LK_JavaScript, Style.Language);
-
-  CHECK_PARSE("BasedOnStyle: LLVM\n"
-              "IndentWidth: 67",
-              IndentWidth, 67u);
-
-  CHECK_PARSE("---\n"
-              "Language: JavaScript\n"
-              "IndentWidth: 12\n"
-              "---\n"
-              "Language: Cpp\n"
-              "IndentWidth: 34\n"
-              "...\n",
-              IndentWidth, 12u);
-
-  Style.Language = FormatStyle::LK_Cpp;
-  CHECK_PARSE("---\n"
-              "Language: JavaScript\n"
-              "IndentWidth: 12\n"
-              "---\n"
-              "Language: Cpp\n"
-              "IndentWidth: 34\n"
-              "...\n",
-              IndentWidth, 34u);
-  CHECK_PARSE("---\n"
-              "IndentWidth: 78\n"
-              "---\n"
-              "Language: JavaScript\n"
-              "IndentWidth: 56\n"
-              "...\n",
-              IndentWidth, 78u);
-
-  Style.ColumnLimit = 123;
-  Style.IndentWidth = 234;
-  Style.BreakBeforeBraces = FormatStyle::BS_Linux;
-  Style.TabWidth = 345;
-  EXPECT_FALSE(parseConfiguration("---\n"
-                                  "IndentWidth: 456\n"
-                                  "BreakBeforeBraces: Allman\n"
-                                  "---\n"
-                                  "Language: JavaScript\n"
-                                  "IndentWidth: 111\n"
-                                  "TabWidth: 111\n"
-                                  "---\n"
-                                  "Language: Cpp\n"
-                                  "BreakBeforeBraces: Stroustrup\n"
-                                  "TabWidth: 789\n"
-                                  "...\n",
-                                  &Style));
-  EXPECT_EQ(123u, Style.ColumnLimit);
-  EXPECT_EQ(456u, Style.IndentWidth);
-  EXPECT_EQ(FormatStyle::BS_Stroustrup, Style.BreakBeforeBraces);
-  EXPECT_EQ(789u, Style.TabWidth);
-
-  EXPECT_EQ(parseConfiguration("---\n"
-                               "Language: JavaScript\n"
-                               "IndentWidth: 56\n"
-                               "---\n"
-                               "IndentWidth: 78\n"
-                               "...\n",
-                               &Style),
-            ParseError::Error);
-  EXPECT_EQ(parseConfiguration("---\n"
-                               "Language: JavaScript\n"
-                               "IndentWidth: 56\n"
-                               "---\n"
-                               "Language: JavaScript\n"
-                               "IndentWidth: 78\n"
-                               "...\n",
-                               &Style),
-            ParseError::Error);
-
-  EXPECT_EQ(FormatStyle::LK_Cpp, Style.Language);
-}
-
-#undef CHECK_PARSE
-
-TEST_F(FormatTest, UsesLanguageForBasedOnStyle) {
-  FormatStyle Style = {};
-  Style.Language = FormatStyle::LK_JavaScript;
-  Style.BreakBeforeTernaryOperators = true;
-  EXPECT_EQ(0, parseConfiguration("BasedOnStyle: Google", &Style).value());
-  EXPECT_FALSE(Style.BreakBeforeTernaryOperators);
-
-  Style.BreakBeforeTernaryOperators = true;
-  EXPECT_EQ(0, parseConfiguration("---\n"
-                                  "BasedOnStyle: Google\n"
-                                  "---\n"
-                                  "Language: JavaScript\n"
-                                  "IndentWidth: 76\n"
-                                  "...\n",
-                                  &Style)
-                   .value());
-  EXPECT_FALSE(Style.BreakBeforeTernaryOperators);
-  EXPECT_EQ(76u, Style.IndentWidth);
-  EXPECT_EQ(FormatStyle::LK_JavaScript, Style.Language);
-}
-
-TEST_F(FormatTest, ConfigurationRoundTripTest) {
-  FormatStyle Style = getLLVMStyle();
-  std::string YAML = configurationAsText(Style);
-  FormatStyle ParsedStyle = {};
-  ParsedStyle.Language = FormatStyle::LK_Cpp;
-  EXPECT_EQ(0, parseConfiguration(YAML, &ParsedStyle).value());
-  EXPECT_EQ(Style, ParsedStyle);
-}
-
-TEST_F(FormatTest, WorksFor8bitEncodings) {
-  EXPECT_EQ("\"\xce\xe4\xed\xe0\xe6\xe4\xfb \xe2 \"\n"
-            "\"\xf1\xf2\xf3\xe4\xb8\xed\xf3\xfe \"\n"
-            "\"\xe7\xe8\xec\xed\xfe\xfe \"\n"
-            "\"\xef\xee\xf0\xf3...\"",
-            format("\"\xce\xe4\xed\xe0\xe6\xe4\xfb \xe2 "
-                   "\xf1\xf2\xf3\xe4\xb8\xed\xf3\xfe \xe7\xe8\xec\xed\xfe\xfe "
-                   "\xef\xee\xf0\xf3...\"",
-                   getLLVMStyleWithColumns(12)));
-}
-
-TEST_F(FormatTest, HandlesUTF8BOM) {
-  EXPECT_EQ("\xef\xbb\xbf", format("\xef\xbb\xbf"));
-  EXPECT_EQ("\xef\xbb\xbf#include <iostream>",
-            format("\xef\xbb\xbf#include <iostream>"));
-  EXPECT_EQ("\xef\xbb\xbf\n#include <iostream>",
-            format("\xef\xbb\xbf\n#include <iostream>"));
-}
-
-// FIXME: Encode Cyrillic and CJK characters below to appease MS compilers.
-#if !defined(_MSC_VER)
-
-TEST_F(FormatTest, CountsUTF8CharactersProperly) {
-  verifyFormat("\"Однажды в студёную зимнюю пору...\"",
-               getLLVMStyleWithColumns(35));
-  verifyFormat("\"一 二 三 四 五 六 七 八 九 十\"",
-               getLLVMStyleWithColumns(31));
-  verifyFormat("// Однажды в студёную зимнюю пору...",
-               getLLVMStyleWithColumns(36));
-  verifyFormat("// 一 二 三 四 五 六 七 八 九 十", getLLVMStyleWithColumns(32));
-  verifyFormat("/* Однажды в студёную зимнюю пору... */",
-               getLLVMStyleWithColumns(39));
-  verifyFormat("/* 一 二 三 四 五 六 七 八 九 十 */",
-               getLLVMStyleWithColumns(35));
-}
-
-TEST_F(FormatTest, SplitsUTF8Strings) {
-  // Non-printable characters' width is currently considered to be the length in
-  // bytes in UTF8. The characters can be displayed in very different manner
-  // (zero-width, single width with a substitution glyph, expanded to their code
-  // (e.g. "<8d>"), so there's no single correct way to handle them.
-  EXPECT_EQ("\"aaaaÄ\"\n"
-            "\"\xc2\x8d\";",
-            format("\"aaaaÄ\xc2\x8d\";", getLLVMStyleWithColumns(10)));
-  EXPECT_EQ("\"aaaaaaaÄ\"\n"
-            "\"\xc2\x8d\";",
-            format("\"aaaaaaaÄ\xc2\x8d\";", getLLVMStyleWithColumns(10)));
-  EXPECT_EQ("\"Однажды, в \"\n"
-            "\"студёную \"\n"
-            "\"зимнюю \"\n"
-            "\"пору,\"",
-            format("\"Однажды, в студёную зимнюю пору,\"",
-                   getLLVMStyleWithColumns(13)));
-  EXPECT_EQ(
-      "\"一 二 三 \"\n"
-      "\"四 五六 \"\n"
-      "\"七 八 九 \"\n"
-      "\"十\"",
-      format("\"一 二 三 四 五六 七 八 九 十\"", getLLVMStyleWithColumns(11)));
-  EXPECT_EQ("\"一\t\"\n"
-            "\"二 \t\"\n"
-            "\"三 四 \"\n"
-            "\"五\t\"\n"
-            "\"六 \t\"\n"
-            "\"七 \"\n"
-            "\"八九十\tqq\"",
-            format("\"一\t二 \t三 四 五\t六 \t七 八九十\tqq\"",
-                   getLLVMStyleWithColumns(11)));
-
-  // UTF8 character in an escape sequence.
-  EXPECT_EQ("\"aaaaaa\"\n"
-            "\"\\\xC2\x8D\"",
-            format("\"aaaaaa\\\xC2\x8D\"", getLLVMStyleWithColumns(10)));
-}
-
-TEST_F(FormatTest, HandlesDoubleWidthCharsInMultiLineStrings) {
-  EXPECT_EQ("const char *sssss =\n"
-            "    \"一二三四五六七八\\\n"
-            " 九 十\";",
-            format("const char *sssss = \"一二三四五六七八\\\n"
-                   " 九 十\";",
-                   getLLVMStyleWithColumns(30)));
-}
-
-TEST_F(FormatTest, SplitsUTF8LineComments) {
-  EXPECT_EQ("// aaaaÄ\xc2\x8d",
-            format("// aaaaÄ\xc2\x8d", getLLVMStyleWithColumns(10)));
-  EXPECT_EQ("// Я из лесу\n"
-            "// вышел; был\n"
-            "// сильный\n"
-            "// мороз.",
-            format("// Я из лесу вышел; был сильный мороз.",
-                   getLLVMStyleWithColumns(13)));
-  EXPECT_EQ("// 一二三\n"
-            "// 四五六七\n"
-            "// 八  九\n"
-            "// 十",
-            format("// 一二三 四五六七 八  九 十", getLLVMStyleWithColumns(9)));
-}
-
-TEST_F(FormatTest, SplitsUTF8BlockComments) {
-  EXPECT_EQ("/* Гляжу,\n"
-            " * поднимается\n"
-            " * медленно в\n"
-            " * гору\n"
-            " * Лошадка,\n"
-            " * везущая\n"
-            " * хворосту\n"
-            " * воз. */",
-            format("/* Гляжу, поднимается медленно в гору\n"
-                   " * Лошадка, везущая хворосту воз. */",
-                   getLLVMStyleWithColumns(13)));
-  EXPECT_EQ(
-      "/* 一二三\n"
-      " * 四五六七\n"
-      " * 八  九\n"
-      " * 十  */",
-      format("/* 一二三 四五六七 八  九 十  */", getLLVMStyleWithColumns(9)));
-  EXPECT_EQ("/* 𝓣𝓮𝓼𝓽 𝔣𝔬𝔲𝔯\n"
-            " * 𝕓𝕪𝕥𝕖\n"
-            " * 𝖀𝕿𝕱-𝟠 */",
-            format("/* 𝓣𝓮𝓼𝓽 𝔣𝔬𝔲𝔯 𝕓𝕪𝕥𝕖 𝖀𝕿𝕱-𝟠 */", getLLVMStyleWithColumns(12)));
-}
-
-#endif // _MSC_VER
-
-TEST_F(FormatTest, ConstructorInitializerIndentWidth) {
-  FormatStyle Style = getLLVMStyle();
-
-  Style.ConstructorInitializerIndentWidth = 4;
-  verifyFormat(
-      "SomeClass::Constructor()\n"
-      "    : aaaaaaaaaaaaa(aaaaaaaaaaaaaa), aaaaaaaaaaaaa(aaaaaaaaaaaaaa),\n"
-      "      aaaaaaaaaaaaa(aaaaaaaaaaaaaa) {}",
-      Style);
-
-  Style.ConstructorInitializerIndentWidth = 2;
-  verifyFormat(
-      "SomeClass::Constructor()\n"
-      "  : aaaaaaaaaaaaa(aaaaaaaaaaaaaa), aaaaaaaaaaaaa(aaaaaaaaaaaaaa),\n"
-      "    aaaaaaaaaaaaa(aaaaaaaaaaaaaa) {}",
-      Style);
-
-  Style.ConstructorInitializerIndentWidth = 0;
-  verifyFormat(
-      "SomeClass::Constructor()\n"
-      ": aaaaaaaaaaaaa(aaaaaaaaaaaaaa), aaaaaaaaaaaaa(aaaaaaaaaaaaaa),\n"
-      "  aaaaaaaaaaaaa(aaaaaaaaaaaaaa) {}",
-      Style);
-  Style.AlignAfterOpenBracket = FormatStyle::BAS_AlwaysBreak;
-  verifyFormat(
-      "SomeLongTemplateVariableName<\n"
-      "    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa, aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa>",
-      Style);
-  verifyFormat("bool smaller = 1 < "
-               "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb(\n"
-               "                       "
-               "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa);",
-               Style);
-
-  Style.BreakConstructorInitializers = FormatStyle::BCIS_AfterColon;
-  verifyFormat("SomeClass::Constructor() :\n"
-               "aaaaaaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaaaaaaa),\n"
-               "aaaaaaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaaaaaaa) {}",
-               Style);
-}
-
-TEST_F(FormatTest, BreakConstructorInitializersBeforeComma) {
-  FormatStyle Style = getLLVMStyle();
-  Style.BreakConstructorInitializers = FormatStyle::BCIS_BeforeComma;
-  Style.ConstructorInitializerIndentWidth = 4;
-  verifyFormat("SomeClass::Constructor()\n"
-               "    : a(a)\n"
-               "    , b(b)\n"
-               "    , c(c) {}",
-               Style);
-  verifyFormat("SomeClass::Constructor()\n"
-               "    : a(a) {}",
-               Style);
-
-  Style.ColumnLimit = 0;
-  verifyFormat("SomeClass::Constructor()\n"
-               "    : a(a) {}",
-               Style);
-  verifyFormat("SomeClass::Constructor() noexcept\n"
-               "    : a(a) {}",
-               Style);
-  verifyFormat("SomeClass::Constructor()\n"
-               "    : a(a)\n"
-               "    , b(b)\n"
-               "    , c(c) {}",
-               Style);
-  verifyFormat("SomeClass::Constructor()\n"
-               "    : a(a) {\n"
-               "  foo();\n"
-               "  bar();\n"
-               "}",
-               Style);
-
-  Style.AllowShortFunctionsOnASingleLine = FormatStyle::SFS_None;
-  verifyFormat("SomeClass::Constructor()\n"
-               "    : a(a)\n"
-               "    , b(b)\n"
-               "    , c(c) {\n}",
-               Style);
-  verifyFormat("SomeClass::Constructor()\n"
-               "    : a(a) {\n}",
-               Style);
-
-  Style.ColumnLimit = 80;
-  Style.AllowShortFunctionsOnASingleLine = FormatStyle::SFS_All;
-  Style.ConstructorInitializerIndentWidth = 2;
-  verifyFormat("SomeClass::Constructor()\n"
-               "  : a(a)\n"
-               "  , b(b)\n"
-               "  , c(c) {}",
-               Style);
-
-  Style.ConstructorInitializerIndentWidth = 0;
-  verifyFormat("SomeClass::Constructor()\n"
-               ": a(a)\n"
-               ", b(b)\n"
-               ", c(c) {}",
-               Style);
-
-  Style.ConstructorInitializerAllOnOneLineOrOnePerLine = true;
-  Style.ConstructorInitializerIndentWidth = 4;
-  verifyFormat("SomeClass::Constructor() : aaaaaaaa(aaaaaaaa) {}", Style);
-  verifyFormat(
-      "SomeClass::Constructor() : aaaaa(aaaaa), aaaaa(aaaaa), aaaaa(aaaaa)\n",
-      Style);
-  verifyFormat(
-      "SomeClass::Constructor()\n"
-      "    : aaaaaaaa(aaaaaaaa), aaaaaaaa(aaaaaaaa), aaaaaaaa(aaaaaaaa) {}",
-      Style);
-  Style.ConstructorInitializerIndentWidth = 4;
-  Style.ColumnLimit = 60;
-  verifyFormat("SomeClass::Constructor()\n"
-               "    : aaaaaaaa(aaaaaaaa)\n"
-               "    , aaaaaaaa(aaaaaaaa)\n"
-               "    , aaaaaaaa(aaaaaaaa) {}",
-               Style);
-}
-
-TEST_F(FormatTest, Destructors) {
-  verifyFormat("void F(int &i) { i.~int(); }");
-  verifyFormat("void F(int &i) { i->~int(); }");
-}
-
-TEST_F(FormatTest, FormatsWithWebKitStyle) {
-  FormatStyle Style = getWebKitStyle();
-
-  // Don't indent in outer namespaces.
-  verifyFormat("namespace outer {\n"
-               "int i;\n"
-               "namespace inner {\n"
-               "    int i;\n"
-               "} // namespace inner\n"
-               "} // namespace outer\n"
-               "namespace other_outer {\n"
-               "int i;\n"
-               "}",
-               Style);
-
-  // Don't indent case labels.
-  verifyFormat("switch (variable) {\n"
-               "case 1:\n"
-               "case 2:\n"
-               "    doSomething();\n"
-               "    break;\n"
-               "default:\n"
-               "    ++variable;\n"
-               "}",
-               Style);
-
-  // Wrap before binary operators.
-  EXPECT_EQ("void f()\n"
-            "{\n"
-            "    if (aaaaaaaaaaaaaaaa\n"
-            "        && bbbbbbbbbbbbbbbbbbbbbbbb\n"
-            "        && (cccccccccccccccccccccccccc || dddddddddddddddddddd))\n"
-            "        return;\n"
-            "}",
-            format("void f() {\n"
-                   "if (aaaaaaaaaaaaaaaa\n"
-                   "&& bbbbbbbbbbbbbbbbbbbbbbbb\n"
-                   "&& (cccccccccccccccccccccccccc || dddddddddddddddddddd))\n"
-                   "return;\n"
-                   "}",
-                   Style));
-
-  // Allow functions on a single line.
-  verifyFormat("void f() { return; }", Style);
-
-  // Allow empty blocks on a single line and insert a space in empty blocks.
-  EXPECT_EQ("void f() { }", format("void f() {}", Style));
-  EXPECT_EQ("while (true) { }", format("while (true) {}", Style));
-  // However, don't merge non-empty short loops.
-  EXPECT_EQ("while (true) {\n"
-            "    continue;\n"
-            "}",
-            format("while (true) { continue; }", Style));
-
-  // Constructor initializers are formatted one per line with the "," on the
-  // new line.
-  verifyFormat("Constructor()\n"
-               "    : aaaaaaaaaaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaaaaaaaaaaaaaa)\n"
-               "    , aaaaaaaaaaaaaaaaaaaaaaaa(aaaaaaaaaaaaaa, // break\n"
-               "          aaaaaaaaaaaaaa)\n"
-               "    , aaaaaaaaaaaaaaaaaaaaaaa()\n"
-               "{\n"
-               "}",
-               Style);
-  verifyFormat("SomeClass::Constructor()\n"
-               "    : a(a)\n"
-               "{\n"
-               "}",
-               Style);
-  EXPECT_EQ("SomeClass::Constructor()\n"
-            "    : a(a)\n"
-            "{\n"
-            "}",
-            format("SomeClass::Constructor():a(a){}", Style));
-  verifyFormat("SomeClass::Constructor()\n"
-               "    : a(a)\n"
-               "    , b(b)\n"
-               "    , c(c)\n"
-               "{\n"
-               "}",
-               Style);
-  verifyFormat("SomeClass::Constructor()\n"
-               "    : a(a)\n"
-               "{\n"
-               "    foo();\n"
-               "    bar();\n"
-               "}",
-               Style);
-
-  // Access specifiers should be aligned left.
-  verifyFormat("class C {\n"
-               "public:\n"
-               "    int i;\n"
-               "};",
-               Style);
-
-  // Do not align comments.
-  verifyFormat("int a; // Do not\n"
-               "double b; // align comments.",
-               Style);
-
-  // Do not align operands.
-  EXPECT_EQ("ASSERT(aaaa\n"
-            "    || bbbb);",
-            format("ASSERT ( aaaa\n||bbbb);", Style));
-
-  // Accept input's line breaks.
-  EXPECT_EQ("if (aaaaaaaaaaaaaaa\n"
-            "    || bbbbbbbbbbbbbbb) {\n"
-            "    i++;\n"
-            "}",
-            format("if (aaaaaaaaaaaaaaa\n"
-                   "|| bbbbbbbbbbbbbbb) { i++; }",
-                   Style));
-  EXPECT_EQ("if (aaaaaaaaaaaaaaa || bbbbbbbbbbbbbbb) {\n"
-            "    i++;\n"
-            "}",
-            format("if (aaaaaaaaaaaaaaa || bbbbbbbbbbbbbbb) { i++; }", Style));
-
-  // Don't automatically break all macro definitions (llvm.org/PR17842).
-  verifyFormat("#define aNumber 10", Style);
-  // However, generally keep the line breaks that the user authored.
-  EXPECT_EQ("#define aNumber \\\n"
-            "    10",
-            format("#define aNumber \\\n"
-                   " 10",
-                   Style));
-
-  // Keep empty and one-element array literals on a single line.
-  EXPECT_EQ("NSArray* a = [[NSArray alloc] initWithArray:@[]\n"
-            "                                  copyItems:YES];",
-            format("NSArray*a=[[NSArray alloc] initWithArray:@[]\n"
-                   "copyItems:YES];",
-                   Style));
-  EXPECT_EQ("NSArray* a = [[NSArray alloc] initWithArray:@[ @\"a\" ]\n"
-            "                                  copyItems:YES];",
-            format("NSArray*a=[[NSArray alloc]initWithArray:@[ @\"a\" ]\n"
-                   "             copyItems:YES];",
-                   Style));
-  // FIXME: This does not seem right, there should be more indentation before
-  // the array literal's entries. Nested blocks have the same problem.
-  EXPECT_EQ("NSArray* a = [[NSArray alloc] initWithArray:@[\n"
-            "    @\"a\",\n"
-            "    @\"a\"\n"
-            "]\n"
-            "                                  copyItems:YES];",
-            format("NSArray* a = [[NSArray alloc] initWithArray:@[\n"
-                   "     @\"a\",\n"
-                   "     @\"a\"\n"
-                   "     ]\n"
-                   "       copyItems:YES];",
-                   Style));
-  EXPECT_EQ(
-      "NSArray* a = [[NSArray alloc] initWithArray:@[ @\"a\", @\"a\" ]\n"
-      "                                  copyItems:YES];",
-      format("NSArray* a = [[NSArray alloc] initWithArray:@[ @\"a\", @\"a\" ]\n"
-             "   copyItems:YES];",
-             Style));
-
-  verifyFormat("[self.a b:c c:d];", Style);
-  EXPECT_EQ("[self.a b:c\n"
-            "        c:d];",
-            format("[self.a b:c\n"
-                   "c:d];",
-                   Style));
-}
-
-TEST_F(FormatTest, FormatsLambdas) {
-  verifyFormat("int c = [b]() mutable { return [&b] { return b++; }(); }();\n");
-  verifyFormat(
-      "int c = [b]() mutable noexcept { return [&b] { return b++; }(); }();\n");
-  verifyFormat("int c = [&] { [=] { return b++; }(); }();\n");
-  verifyFormat("int c = [&, &a, a] { [=, c, &d] { return b++; }(); }();\n");
-  verifyFormat("int c = [&a, &a, a] { [=, a, b, &c] { return b++; }(); }();\n");
-  verifyFormat("auto c = {[&a, &a, a] { [=, a, b, &c] { return b++; }(); }}\n");
-  verifyFormat("auto c = {[&a, &a, a] { [=, a, b, &c] {}(); }}\n");
-  verifyFormat("auto c = [a = [b = 42] {}] {};\n");
-  verifyFormat("auto c = [a = &i + 10, b = [] {}] {};\n");
-  verifyFormat("int x = f(*+[] {});");
-  verifyFormat("void f() {\n"
-               "  other(x.begin(), x.end(), [&](int, int) { return 1; });\n"
-               "}\n");
-  verifyFormat("void f() {\n"
-               "  other(x.begin(), //\n"
-               "        x.end(),   //\n"
-               "        [&](int, int) { return 1; });\n"
-               "}\n");
-  verifyFormat("void f() {\n"
-               "  other.other.other.other.other(\n"
-               "      x.begin(), x.end(),\n"
-               "      [something, rather](int, int, int, int, int, int, int) { "
-               "return 1; });\n"
-               "}\n");
-  verifyFormat(
-      "void f() {\n"
-      "  other.other.other.other.other(\n"
-      "      x.begin(), x.end(),\n"
-      "      [something, rather](int, int, int, int, int, int, int) {\n"
-      "        //\n"
-      "      });\n"
-      "}\n");
-  verifyFormat("SomeFunction([]() { // A cool function...\n"
-               "  return 43;\n"
-               "});");
-  EXPECT_EQ("SomeFunction([]() {\n"
-            "#define A a\n"
-            "  return 43;\n"
-            "});",
-            format("SomeFunction([](){\n"
-                   "#define A a\n"
-                   "return 43;\n"
-                   "});"));
-  verifyFormat("void f() {\n"
-               "  SomeFunction([](decltype(x), A *a) {});\n"
-               "  SomeFunction([](typeof(x), A *a) {});\n"
-               "  SomeFunction([](_Atomic(x), A *a) {});\n"
-               "  SomeFunction([](__underlying_type(x), A *a) {});\n"
-               "}");
-  verifyFormat("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(\n"
-               "    [](const aaaaaaaaaa &a) { return a; });");
-  verifyFormat("string abc = SomeFunction(aaaaaaaaaaaaa, aaaaa, []() {\n"
-               "  SomeOtherFunctioooooooooooooooooooooooooon();\n"
-               "});");
-  verifyFormat("Constructor()\n"
-               "    : Field([] { // comment\n"
-               "        int i;\n"
-               "      }) {}");
-  verifyFormat("auto my_lambda = [](const string &some_parameter) {\n"
-               "  return some_parameter.size();\n"
-               "};");
-  verifyFormat("std::function<std::string(const std::string &)> my_lambda =\n"
-               "    [](const string &s) { return s; };");
-  verifyFormat("int i = aaaaaa ? 1 //\n"
-               "               : [] {\n"
-               "                   return 2; //\n"
-               "                 }();");
-  verifyFormat("llvm::errs() << \"number of twos is \"\n"
-               "             << std::count_if(v.begin(), v.end(), [](int x) {\n"
-               "                  return x == 2; // force break\n"
-               "                });");
-  verifyFormat("return aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(\n"
-               "    [=](int iiiiiiiiiiii) {\n"
-               "      return aaaaaaaaaaaaaaaaaaaaaaa !=\n"
-               "             aaaaaaaaaaaaaaaaaaaaaaa;\n"
-               "    });",
-               getLLVMStyleWithColumns(60));
-
-  verifyFormat("SomeFunction({[&] {\n"
-               "                // comment\n"
-               "              },\n"
-               "              [&] {\n"
-               "                // comment\n"
-               "              }});");
-  verifyFormat("SomeFunction({[&] {\n"
-               "  // comment\n"
-               "}});");
-  verifyFormat(
-      "virtual aaaaaaaaaaaaaaaa(\n"
-      "    std::function<bool()> bbbbbbbbbbbb = [&]() { return true; },\n"
-      "    aaaaa aaaaaaaaa);");
-
-  // Lambdas with return types.
-  verifyFormat("int c = []() -> int { return 2; }();\n");
-  verifyFormat("int c = []() -> int * { return 2; }();\n");
-  verifyFormat("int c = []() -> vector<int> { return {2}; }();\n");
-  verifyFormat("Foo([]() -> std::vector<int> { return {2}; }());");
-  verifyGoogleFormat("auto a = [&b, c](D* d) -> D* {};");
-  verifyGoogleFormat("auto a = [&b, c](D* d) -> pair<D*, D*> {};");
-  verifyGoogleFormat("auto a = [&b, c](D* d) -> D& {};");
-  verifyGoogleFormat("auto a = [&b, c](D* d) -> const D* {};");
-  verifyFormat("[a, a]() -> a<1> {};");
-  verifyFormat("[]() -> foo<5 + 2> { return {}; };");
-  verifyFormat("[]() -> foo<5 - 2> { return {}; };");
-  verifyFormat("[]() -> foo<5 / 2> { return {}; };");
-  verifyFormat("[]() -> foo<5 * 2> { return {}; };");
-  verifyFormat("[]() -> foo<5 % 2> { return {}; };");
-  verifyFormat("[]() -> foo<5 << 2> { return {}; };");
-  verifyFormat("[]() -> foo<!5> { return {}; };");
-  verifyFormat("[]() -> foo<~5> { return {}; };");
-  verifyFormat("[]() -> foo<5 | 2> { return {}; };");
-  verifyFormat("[]() -> foo<5 || 2> { return {}; };");
-  verifyFormat("[]() -> foo<5 & 2> { return {}; };");
-  verifyFormat("[]() -> foo<5 && 2> { return {}; };");
-  verifyFormat("[]() -> foo<5 == 2> { return {}; };");
-  verifyFormat("[]() -> foo<5 != 2> { return {}; };");
-  verifyFormat("[]() -> foo<5 >= 2> { return {}; };");
-  verifyFormat("[]() -> foo<5 <= 2> { return {}; };");
-  verifyFormat("[]() -> foo<5 < 2> { return {}; };");
-  verifyFormat("[]() -> foo<2 ? 1 : 0> { return {}; };");
-  verifyFormat("namespace bar {\n"
-               "// broken:\n"
-               "auto foo{[]() -> foo<5 + 2> { return {}; }};\n"
-               "} // namespace bar");
-  verifyFormat("namespace bar {\n"
-               "// broken:\n"
-               "auto foo{[]() -> foo<5 - 2> { return {}; }};\n"
-               "} // namespace bar");
-  verifyFormat("namespace bar {\n"
-               "// broken:\n"
-               "auto foo{[]() -> foo<5 / 2> { return {}; }};\n"
-               "} // namespace bar");
-  verifyFormat("namespace bar {\n"
-               "// broken:\n"
-               "auto foo{[]() -> foo<5 * 2> { return {}; }};\n"
-               "} // namespace bar");
-  verifyFormat("namespace bar {\n"
-               "// broken:\n"
-               "auto foo{[]() -> foo<5 % 2> { return {}; }};\n"
-               "} // namespace bar");
-  verifyFormat("namespace bar {\n"
-               "// broken:\n"
-               "auto foo{[]() -> foo<5 << 2> { return {}; }};\n"
-               "} // namespace bar");
-  verifyFormat("namespace bar {\n"
-               "// broken:\n"
-               "auto foo{[]() -> foo<!5> { return {}; }};\n"
-               "} // namespace bar");
-  verifyFormat("namespace bar {\n"
-               "// broken:\n"
-               "auto foo{[]() -> foo<~5> { return {}; }};\n"
-               "} // namespace bar");
-  verifyFormat("namespace bar {\n"
-               "// broken:\n"
-               "auto foo{[]() -> foo<5 | 2> { return {}; }};\n"
-               "} // namespace bar");
-  verifyFormat("namespace bar {\n"
-               "// broken:\n"
-               "auto foo{[]() -> foo<5 || 2> { return {}; }};\n"
-               "} // namespace bar");
-  verifyFormat("namespace bar {\n"
-               "// broken:\n"
-               "auto foo{[]() -> foo<5 & 2> { return {}; }};\n"
-               "} // namespace bar");
-  verifyFormat("namespace bar {\n"
-               "// broken:\n"
-               "auto foo{[]() -> foo<5 && 2> { return {}; }};\n"
-               "} // namespace bar");
-  verifyFormat("namespace bar {\n"
-               "// broken:\n"
-               "auto foo{[]() -> foo<5 == 2> { return {}; }};\n"
-               "} // namespace bar");
-  verifyFormat("namespace bar {\n"
-               "// broken:\n"
-               "auto foo{[]() -> foo<5 != 2> { return {}; }};\n"
-               "} // namespace bar");
-  verifyFormat("namespace bar {\n"
-               "// broken:\n"
-               "auto foo{[]() -> foo<5 >= 2> { return {}; }};\n"
-               "} // namespace bar");
-  verifyFormat("namespace bar {\n"
-               "// broken:\n"
-               "auto foo{[]() -> foo<5 <= 2> { return {}; }};\n"
-               "} // namespace bar");
-  verifyFormat("namespace bar {\n"
-               "// broken:\n"
-               "auto foo{[]() -> foo<5 < 2> { return {}; }};\n"
-               "} // namespace bar");
-  verifyFormat("namespace bar {\n"
-               "// broken:\n"
-               "auto foo{[]() -> foo<2 ? 1 : 0> { return {}; }};\n"
-               "} // namespace bar");
-  verifyFormat("[]() -> a<1> {};");
-  verifyFormat("[]() -> a<1> { ; };");
-  verifyFormat("[]() -> a<1> { ; }();");
-  verifyFormat("[a, a]() -> a<true> {};");
-  verifyFormat("[]() -> a<true> {};");
-  verifyFormat("[]() -> a<true> { ; };");
-  verifyFormat("[]() -> a<true> { ; }();");
-  verifyFormat("[a, a]() -> a<false> {};");
-  verifyFormat("[]() -> a<false> {};");
-  verifyFormat("[]() -> a<false> { ; };");
-  verifyFormat("[]() -> a<false> { ; }();");
-  verifyFormat("auto foo{[]() -> foo<false> { ; }};");
-  verifyFormat("namespace bar {\n"
-               "auto foo{[]() -> foo<false> { ; }};\n"
-               "} // namespace bar");
-  verifyFormat("auto aaaaaaaa = [](int i, // break for some reason\n"
-               "                   int j) -> int {\n"
-               "  return ffffffffffffffffffffffffffffffffffffffffffff(i * j);\n"
-               "};");
-  verifyFormat(
-      "aaaaaaaaaaaaaaaaaaaaaa(\n"
-      "    [](aaaaaaaaaaaaaaaaaaaaaaaaaaa &aaa) -> aaaaaaaaaaaaaaaa {\n"
-      "      return aaaaaaaaaaaaaaaaa;\n"
-      "    });",
-      getLLVMStyleWithColumns(70));
-  verifyFormat("[]() //\n"
-               "    -> int {\n"
-               "  return 1; //\n"
-               "};");
-  verifyFormat("[]() -> Void<T...> {};");
-  verifyFormat("[a, b]() -> Tuple<T...> { return {}; };");
-
-  // Lambdas with explicit template argument lists.
-  verifyFormat(
-      "auto L = []<template <typename> class T, class U>(T<U> &&a) {};\n");
-
-  // Multiple lambdas in the same parentheses change indentation rules. These
-  // lambdas are forced to start on new lines.
-  verifyFormat("SomeFunction(\n"
-               "    []() {\n"
-               "      //\n"
-               "    },\n"
-               "    []() {\n"
-               "      //\n"
-               "    });");
-
-  // A lambda passed as arg0 is always pushed to the next line.
-  verifyFormat("SomeFunction(\n"
-               "    [this] {\n"
-               "      //\n"
-               "    },\n"
-               "    1);\n");
-
-  // A multi-line lambda passed as arg1 forces arg0 to be pushed out, just like
-  // the arg0 case above.
-  auto Style = getGoogleStyle();
-  Style.BinPackArguments = false;
-  verifyFormat("SomeFunction(\n"
-               "    a,\n"
-               "    [this] {\n"
-               "      //\n"
-               "    },\n"
-               "    b);\n",
-               Style);
-  verifyFormat("SomeFunction(\n"
-               "    a,\n"
-               "    [this] {\n"
-               "      //\n"
-               "    },\n"
-               "    b);\n");
-
-  // A lambda with a very long line forces arg0 to be pushed out irrespective of
-  // the BinPackArguments value (as long as the code is wide enough).
-  verifyFormat(
-      "something->SomeFunction(\n"
-      "    a,\n"
-      "    [this] {\n"
-      "      "
-      "D0000000000000000000000000000000000000000000000000000000000001();\n"
-      "    },\n"
-      "    b);\n");
-
-  // A multi-line lambda is pulled up as long as the introducer fits on the
-  // previous line and there are no further args.
-  verifyFormat("function(1, [this, that] {\n"
-               "  //\n"
-               "});\n");
-  verifyFormat("function([this, that] {\n"
-               "  //\n"
-               "});\n");
-  // FIXME: this format is not ideal and we should consider forcing the first
-  // arg onto its own line.
-  verifyFormat("function(a, b, c, //\n"
-               "         d, [this, that] {\n"
-               "           //\n"
-               "         });\n");
-
-  // Multiple lambdas are treated correctly even when there is a short arg0.
-  verifyFormat("SomeFunction(\n"
-               "    1,\n"
-               "    [this] {\n"
-               "      //\n"
-               "    },\n"
-               "    [this] {\n"
-               "      //\n"
-               "    },\n"
-               "    1);\n");
-
-  // More complex introducers.
-  verifyFormat("return [i, args...] {};");
-
-  // Not lambdas.
-  verifyFormat("constexpr char hello[]{\"hello\"};");
-  verifyFormat("double &operator[](int i) { return 0; }\n"
-               "int i;");
-  verifyFormat("std::unique_ptr<int[]> foo() {}");
-  verifyFormat("int i = a[a][a]->f();");
-  verifyFormat("int i = (*b)[a]->f();");
-
-  // Other corner cases.
-  verifyFormat("void f() {\n"
-               "  bar([]() {} // Did not respect SpacesBeforeTrailingComments\n"
-               "  );\n"
-               "}");
-
-  // Lambdas created through weird macros.
-  verifyFormat("void f() {\n"
-               "  MACRO((const AA &a) { return 1; });\n"
-               "  MACRO((AA &a) { return 1; });\n"
-               "}");
-
-  verifyFormat("if (blah_blah(whatever, whatever, [] {\n"
-               "      doo_dah();\n"
-               "      doo_dah();\n"
-               "    })) {\n"
-               "}");
-  verifyFormat("if constexpr (blah_blah(whatever, whatever, [] {\n"
-               "                doo_dah();\n"
-               "                doo_dah();\n"
-               "              })) {\n"
-               "}");
-  verifyFormat("if CONSTEXPR (blah_blah(whatever, whatever, [] {\n"
-               "                doo_dah();\n"
-               "                doo_dah();\n"
-               "              })) {\n"
-               "}");
-  verifyFormat("auto lambda = []() {\n"
-               "  int a = 2\n"
-               "#if A\n"
-               "          + 2\n"
-               "#endif\n"
-               "      ;\n"
-               "};");
-
-  // Lambdas with complex multiline introducers.
-  verifyFormat(
-      "aaaaaaaaa.aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(\n"
-      "    [aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa]()\n"
-      "        -> ::std::unordered_set<\n"
-      "            aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa> {\n"
-      "      //\n"
-      "    });");
-
-  FormatStyle DoNotMerge = getLLVMStyle();
-  DoNotMerge.AllowShortLambdasOnASingleLine = FormatStyle::SLS_None;
-  verifyFormat("auto c = []() {\n"
-               "  return b;\n"
-               "};",
-               "auto c = []() { return b; };", DoNotMerge);
-  verifyFormat("auto c = []() {\n"
-               "};",
-               " auto c = []() {};", DoNotMerge);
-
-  FormatStyle MergeEmptyOnly = getLLVMStyle();
-  MergeEmptyOnly.AllowShortLambdasOnASingleLine = FormatStyle::SLS_Empty;
-  verifyFormat("auto c = []() {\n"
-               "  return b;\n"
-               "};",
-               "auto c = []() {\n"
-               "  return b;\n"
-               " };",
-               MergeEmptyOnly);
-  verifyFormat("auto c = []() {};",
-               "auto c = []() {\n"
-               "};",
-               MergeEmptyOnly);
-
-  FormatStyle MergeInline = getLLVMStyle();
-  MergeInline.AllowShortLambdasOnASingleLine = FormatStyle::SLS_Inline;
-  verifyFormat("auto c = []() {\n"
-               "  return b;\n"
-               "};",
-               "auto c = []() { return b; };", MergeInline);
-  verifyFormat("function([]() { return b; })", "function([]() { return b; })",
-               MergeInline);
-  verifyFormat("function([]() { return b; }, a)",
-               "function([]() { return b; }, a)", MergeInline);
-  verifyFormat("function(a, []() { return b; })",
-               "function(a, []() { return b; })", MergeInline);
-
-  // Check option "BraceWrapping.BeforeLambdaBody" and different state of
-  // AllowShortLambdasOnASingleLine
-  FormatStyle LLVMWithBeforeLambdaBody = getLLVMStyle();
-  LLVMWithBeforeLambdaBody.BreakBeforeBraces = FormatStyle::BS_Custom;
-  LLVMWithBeforeLambdaBody.BraceWrapping.BeforeLambdaBody = true;
-  LLVMWithBeforeLambdaBody.AllowShortLambdasOnASingleLine =
-      FormatStyle::ShortLambdaStyle::SLS_None;
-  verifyFormat("FctWithOneNestedLambdaInline_SLS_None(\n"
-               "    []()\n"
-               "    {\n"
-               "      return 17;\n"
-               "    });",
-               LLVMWithBeforeLambdaBody);
-  verifyFormat("FctWithOneNestedLambdaEmpty_SLS_None(\n"
-               "    []()\n"
-               "    {\n"
-               "    });",
-               LLVMWithBeforeLambdaBody);
-  verifyFormat("auto fct_SLS_None = []()\n"
-               "{\n"
-               "  return 17;\n"
-               "};",
-               LLVMWithBeforeLambdaBody);
-  verifyFormat("TwoNestedLambdas_SLS_None(\n"
-               "    []()\n"
-               "    {\n"
-               "      return Call(\n"
-               "          []()\n"
-               "          {\n"
-               "            return 17;\n"
-               "          });\n"
-               "    });",
-               LLVMWithBeforeLambdaBody);
-  verifyFormat("void Fct() {\n"
-               "  return {[]()\n"
-               "          {\n"
-               "            return 17;\n"
-               "          }};\n"
-               "}",
-               LLVMWithBeforeLambdaBody);
-
-  LLVMWithBeforeLambdaBody.AllowShortLambdasOnASingleLine =
-      FormatStyle::ShortLambdaStyle::SLS_Empty;
-  verifyFormat("FctWithOneNestedLambdaInline_SLS_Empty(\n"
-               "    []()\n"
-               "    {\n"
-               "      return 17;\n"
-               "    });",
-               LLVMWithBeforeLambdaBody);
-  verifyFormat("FctWithOneNestedLambdaEmpty_SLS_Empty([]() {});",
-               LLVMWithBeforeLambdaBody);
-  verifyFormat("FctWithOneNestedLambdaEmptyInsideAVeryVeryVeryVeryVeryVeryVeryL"
-               "ongFunctionName_SLS_Empty(\n"
-               "    []() {});",
-               LLVMWithBeforeLambdaBody);
-  verifyFormat("FctWithMultipleParams_SLS_Empty(A, B,\n"
-               "                                []()\n"
-               "                                {\n"
-               "                                  return 17;\n"
-               "                                });",
-               LLVMWithBeforeLambdaBody);
-  verifyFormat("auto fct_SLS_Empty = []()\n"
-               "{\n"
-               "  return 17;\n"
-               "};",
-               LLVMWithBeforeLambdaBody);
-  verifyFormat("TwoNestedLambdas_SLS_Empty(\n"
-               "    []()\n"
-               "    {\n"
-               "      return Call([]() {});\n"
-               "    });",
-               LLVMWithBeforeLambdaBody);
-  verifyFormat("TwoNestedLambdas_SLS_Empty(A,\n"
-               "                           []()\n"
-               "                           {\n"
-               "                             return Call([]() {});\n"
-               "                           });",
-               LLVMWithBeforeLambdaBody);
-  verifyFormat(
-      "FctWithLongLineInLambda_SLS_Empty(\n"
-      "    []()\n"
-      "    {\n"
-      "      return HereAVeryLongLine(ThatWillBeFormatted, OnMultipleLine,\n"
-      "                               AndShouldNotBeConsiderAsInline,\n"
-      "                               LambdaBodyMustBeBreak);\n"
-      "    });",
-      LLVMWithBeforeLambdaBody);
-
-  LLVMWithBeforeLambdaBody.AllowShortLambdasOnASingleLine =
-      FormatStyle::ShortLambdaStyle::SLS_Inline;
-  verifyFormat("FctWithOneNestedLambdaInline_SLS_Inline([]() { return 17; });",
-               LLVMWithBeforeLambdaBody);
-  verifyFormat("FctWithOneNestedLambdaEmpty_SLS_Inline([]() {});",
-               LLVMWithBeforeLambdaBody);
-  verifyFormat("auto fct_SLS_Inline = []()\n"
-               "{\n"
-               "  return 17;\n"
-               "};",
-               LLVMWithBeforeLambdaBody);
-  verifyFormat("TwoNestedLambdas_SLS_Inline([]() { return Call([]() { return "
-               "17; }); });",
-               LLVMWithBeforeLambdaBody);
-  verifyFormat(
-      "FctWithLongLineInLambda_SLS_Inline(\n"
-      "    []()\n"
-      "    {\n"
-      "      return HereAVeryLongLine(ThatWillBeFormatted, OnMultipleLine,\n"
-      "                               AndShouldNotBeConsiderAsInline,\n"
-      "                               LambdaBodyMustBeBreak);\n"
-      "    });",
-      LLVMWithBeforeLambdaBody);
-  verifyFormat("FctWithMultipleParams_SLS_Inline("
-               "VeryLongParameterThatShouldAskToBeOnMultiLine,\n"
-               "                                 []() { return 17; });",
-               LLVMWithBeforeLambdaBody);
-  verifyFormat(
-      "FctWithMultipleParams_SLS_Inline(FirstParam, []() { return 17; });",
-      LLVMWithBeforeLambdaBody);
-
-  LLVMWithBeforeLambdaBody.AllowShortLambdasOnASingleLine =
-      FormatStyle::ShortLambdaStyle::SLS_All;
-  verifyFormat("FctWithOneNestedLambdaInline_SLS_All([]() { return 17; });",
-               LLVMWithBeforeLambdaBody);
-  verifyFormat("FctWithOneNestedLambdaEmpty_SLS_All([]() {});",
-               LLVMWithBeforeLambdaBody);
-  verifyFormat("auto fct_SLS_All = []() { return 17; };",
-               LLVMWithBeforeLambdaBody);
-  verifyFormat("FctWithOneParam_SLS_All(\n"
-               "    []()\n"
-               "    {\n"
-               "      // A cool function...\n"
-               "      return 43;\n"
-               "    });",
-               LLVMWithBeforeLambdaBody);
-  verifyFormat("FctWithMultipleParams_SLS_All("
-               "VeryLongParameterThatShouldAskToBeOnMultiLine,\n"
-               "                              []() { return 17; });",
-               LLVMWithBeforeLambdaBody);
-  verifyFormat("FctWithMultipleParams_SLS_All(A, []() { return 17; });",
-               LLVMWithBeforeLambdaBody);
-  verifyFormat("FctWithMultipleParams_SLS_All(A, B, []() { return 17; });",
-               LLVMWithBeforeLambdaBody);
-  verifyFormat(
-      "FctWithLongLineInLambda_SLS_All(\n"
-      "    []()\n"
-      "    {\n"
-      "      return HereAVeryLongLine(ThatWillBeFormatted, OnMultipleLine,\n"
-      "                               AndShouldNotBeConsiderAsInline,\n"
-      "                               LambdaBodyMustBeBreak);\n"
-      "    });",
-      LLVMWithBeforeLambdaBody);
-  verifyFormat(
-      "auto fct_SLS_All = []()\n"
-      "{\n"
-      "  return HereAVeryLongLine(ThatWillBeFormatted, OnMultipleLine,\n"
-      "                           AndShouldNotBeConsiderAsInline,\n"
-      "                           LambdaBodyMustBeBreak);\n"
-      "};",
-      LLVMWithBeforeLambdaBody);
-  LLVMWithBeforeLambdaBody.BinPackParameters = false;
-  verifyFormat("FctAllOnSameLine_SLS_All([]() { return S; }, Fst, Second);",
-               LLVMWithBeforeLambdaBody);
-  verifyFormat(
-      "FctWithLongLineInLambda_SLS_All([]() { return SomeValueNotSoLong; },\n"
-      "                                FirstParam,\n"
-      "                                SecondParam,\n"
-      "                                ThirdParam,\n"
-      "                                FourthParam);",
-      LLVMWithBeforeLambdaBody);
-  verifyFormat("FctWithLongLineInLambda_SLS_All(\n"
-               "    []() { return "
-               "SomeValueVeryVeryVeryVeryVeryVeryVeryVeryVeryLong; },\n"
-               "    FirstParam,\n"
-               "    SecondParam,\n"
-               "    ThirdParam,\n"
-               "    FourthParam);",
-               LLVMWithBeforeLambdaBody);
-  verifyFormat(
-      "FctWithLongLineInLambda_SLS_All(FirstParam,\n"
-      "                                SecondParam,\n"
-      "                                ThirdParam,\n"
-      "                                FourthParam,\n"
-      "                                []() { return SomeValueNotSoLong; });",
-      LLVMWithBeforeLambdaBody);
-  verifyFormat("FctWithLongLineInLambda_SLS_All(\n"
-               "    []()\n"
-               "    {\n"
-               "      return "
-               "HereAVeryLongLineThatWillBeFormattedOnMultipleLineAndShouldNotB"
-               "eConsiderAsInline;\n"
-               "    });",
-               LLVMWithBeforeLambdaBody);
-  verifyFormat(
-      "FctWithLongLineInLambda_SLS_All(\n"
-      "    []()\n"
-      "    {\n"
-      "      return HereAVeryLongLine(ThatWillBeFormatted, OnMultipleLine,\n"
-      "                               AndShouldNotBeConsiderAsInline,\n"
-      "                               LambdaBodyMustBeBreak);\n"
-      "    });",
-      LLVMWithBeforeLambdaBody);
-  verifyFormat("FctWithTwoParams_SLS_All(\n"
-               "    []()\n"
-               "    {\n"
-               "      // A cool function...\n"
-               "      return 43;\n"
-               "    },\n"
-               "    87);",
-               LLVMWithBeforeLambdaBody);
-  verifyFormat("FctWithTwoParams_SLS_All([]() { return 43; }, 87);",
-               LLVMWithBeforeLambdaBody);
-  verifyFormat("FctWithOneNestedLambdas_SLS_All([]() { return 17; });",
-               LLVMWithBeforeLambdaBody);
-  verifyFormat(
-      "TwoNestedLambdas_SLS_All([]() { return Call([]() { return 17; }); });",
-      LLVMWithBeforeLambdaBody);
-  verifyFormat("TwoNestedLambdas_SLS_All([]() { return Call([]() { return 17; "
-               "}); }, x);",
-               LLVMWithBeforeLambdaBody);
-  verifyFormat("TwoNestedLambdas_SLS_All(\n"
-               "    []()\n"
-               "    {\n"
-               "      // A cool function...\n"
-               "      return Call([]() { return 17; });\n"
-               "    });",
-               LLVMWithBeforeLambdaBody);
-  verifyFormat("TwoNestedLambdas_SLS_All(\n"
-               "    []()\n"
-               "    {\n"
-               "      return Call(\n"
-               "          []()\n"
-               "          {\n"
-               "            // A cool function...\n"
-               "            return 17;\n"
-               "          });\n"
-               "    });",
-               LLVMWithBeforeLambdaBody);
-
-  LLVMWithBeforeLambdaBody.AllowShortLambdasOnASingleLine =
-      FormatStyle::ShortLambdaStyle::SLS_None;
-
-  verifyFormat("auto select = [this]() -> const Library::Object *\n"
-               "{\n"
-               "  return MyAssignment::SelectFromList(this);\n"
-               "};\n",
-               LLVMWithBeforeLambdaBody);
-
-  verifyFormat("auto select = [this]() -> const Library::Object &\n"
-               "{\n"
-               "  return MyAssignment::SelectFromList(this);\n"
-               "};\n",
-               LLVMWithBeforeLambdaBody);
-
-  verifyFormat("auto select = [this]() -> std::unique_ptr<Object>\n"
-               "{\n"
-               "  return MyAssignment::SelectFromList(this);\n"
-               "};\n",
-               LLVMWithBeforeLambdaBody);
-
-  verifyFormat("namespace test {\n"
-               "class Test {\n"
-               "public:\n"
-               "  Test() = default;\n"
-               "};\n"
-               "} // namespace test",
-               LLVMWithBeforeLambdaBody);
-
-  // Lambdas with different indentation styles.
-  Style = getLLVMStyleWithColumns(100);
-  EXPECT_EQ("SomeResult doSomething(SomeObject promise) {\n"
-            "  return promise.then(\n"
-            "      [this, &someVariable, someObject = "
-            "std::mv(s)](std::vector<int> evaluated) mutable {\n"
-            "        return someObject.startAsyncAction().then(\n"
-            "            [this, &someVariable](AsyncActionResult result) "
-            "mutable { result.processMore(); });\n"
-            "      });\n"
-            "}\n",
-            format("SomeResult doSomething(SomeObject promise) {\n"
-                   "  return promise.then([this, &someVariable, someObject = "
-                   "std::mv(s)](std::vector<int> evaluated) mutable {\n"
-                   "    return someObject.startAsyncAction().then([this, "
-                   "&someVariable](AsyncActionResult result) mutable {\n"
-                   "      result.processMore();\n"
-                   "    });\n"
-                   "  });\n"
-                   "}\n",
-                   Style));
-  Style.LambdaBodyIndentation = FormatStyle::LBI_OuterScope;
-  verifyFormat("test() {\n"
-               "  ([]() -> {\n"
-               "    int b = 32;\n"
-               "    return 3;\n"
-               "  }).foo();\n"
-               "}",
-               Style);
-  verifyFormat("test() {\n"
-               "  []() -> {\n"
-               "    int b = 32;\n"
-               "    return 3;\n"
-               "  }\n"
-               "}",
-               Style);
-  verifyFormat("std::sort(v.begin(), v.end(),\n"
-               "          [](const auto &someLongArgumentName, const auto "
-               "&someOtherLongArgumentName) {\n"
-               "  return someLongArgumentName.someMemberVariable < "
-               "someOtherLongArgumentName.someMemberVariable;\n"
-               "});",
-               Style);
-  verifyFormat("test() {\n"
-               "  (\n"
-               "      []() -> {\n"
-               "        int b = 32;\n"
-               "        return 3;\n"
-               "      },\n"
-               "      foo, bar)\n"
-               "      .foo();\n"
-               "}",
-               Style);
-  verifyFormat("test() {\n"
-               "  ([]() -> {\n"
-               "    int b = 32;\n"
-               "    return 3;\n"
-               "  })\n"
-               "      .foo()\n"
-               "      .bar();\n"
-               "}",
-               Style);
-  EXPECT_EQ("SomeResult doSomething(SomeObject promise) {\n"
-            "  return promise.then(\n"
-            "      [this, &someVariable, someObject = "
-            "std::mv(s)](std::vector<int> evaluated) mutable {\n"
-            "    return someObject.startAsyncAction().then(\n"
-            "        [this, &someVariable](AsyncActionResult result) mutable { "
-            "result.processMore(); });\n"
-            "  });\n"
-            "}\n",
-            format("SomeResult doSomething(SomeObject promise) {\n"
-                   "  return promise.then([this, &someVariable, someObject = "
-                   "std::mv(s)](std::vector<int> evaluated) mutable {\n"
-                   "    return someObject.startAsyncAction().then([this, "
-                   "&someVariable](AsyncActionResult result) mutable {\n"
-                   "      result.processMore();\n"
-                   "    });\n"
-                   "  });\n"
-                   "}\n",
-                   Style));
-  EXPECT_EQ("SomeResult doSomething(SomeObject promise) {\n"
-            "  return promise.then([this, &someVariable] {\n"
-            "    return someObject.startAsyncAction().then(\n"
-            "        [this, &someVariable](AsyncActionResult result) mutable { "
-            "result.processMore(); });\n"
-            "  });\n"
-            "}\n",
-            format("SomeResult doSomething(SomeObject promise) {\n"
-                   "  return promise.then([this, &someVariable] {\n"
-                   "    return someObject.startAsyncAction().then([this, "
-                   "&someVariable](AsyncActionResult result) mutable {\n"
-                   "      result.processMore();\n"
-                   "    });\n"
-                   "  });\n"
-                   "}\n",
-                   Style));
-  Style = getGoogleStyle();
-  Style.LambdaBodyIndentation = FormatStyle::LBI_OuterScope;
-  EXPECT_EQ("#define A                                       \\\n"
-            "  [] {                                          \\\n"
-            "    xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx(        \\\n"
-            "        xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx); \\\n"
-            "      }",
-            format("#define A [] { xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx( \\\n"
-                   "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx); }",
-                   Style));
-  // TODO: The current formatting has a minor issue that's not worth fixing
-  // right now whereby the closing brace is indented relative to the signature
-  // instead of being aligned. This only happens with macros.
-}
-
-TEST_F(FormatTest, LambdaWithLineComments) {
-  FormatStyle LLVMWithBeforeLambdaBody = getLLVMStyle();
-  LLVMWithBeforeLambdaBody.BreakBeforeBraces = FormatStyle::BS_Custom;
-  LLVMWithBeforeLambdaBody.BraceWrapping.BeforeLambdaBody = true;
-  LLVMWithBeforeLambdaBody.AllowShortLambdasOnASingleLine =
-      FormatStyle::ShortLambdaStyle::SLS_All;
-
-  verifyFormat("auto k = []() { return; }", LLVMWithBeforeLambdaBody);
-  verifyFormat("auto k = []() // comment\n"
-               "{ return; }",
-               LLVMWithBeforeLambdaBody);
-  verifyFormat("auto k = []() /* comment */ { return; }",
-               LLVMWithBeforeLambdaBody);
-  verifyFormat("auto k = []() /* comment */ /* comment */ { return; }",
-               LLVMWithBeforeLambdaBody);
-  verifyFormat("auto k = []() // X\n"
-               "{ return; }",
-               LLVMWithBeforeLambdaBody);
-  verifyFormat(
-      "auto k = []() // XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX\n"
-      "{ return; }",
-      LLVMWithBeforeLambdaBody);
-}
-
-TEST_F(FormatTest, EmptyLinesInLambdas) {
-  verifyFormat("auto lambda = []() {\n"
-               "  x(); //\n"
-               "};",
-               "auto lambda = []() {\n"
-               "\n"
-               "  x(); //\n"
-               "\n"
-               "};");
-}
-
-TEST_F(FormatTest, FormatsBlocks) {
-  FormatStyle ShortBlocks = getLLVMStyle();
-  ShortBlocks.AllowShortBlocksOnASingleLine = FormatStyle::SBS_Always;
-  verifyFormat("int (^Block)(int, int);", ShortBlocks);
-  verifyFormat("int (^Block1)(int, int) = ^(int i, int j)", ShortBlocks);
-  verifyFormat("void (^block)(int) = ^(id test) { int i; };", ShortBlocks);
-  verifyFormat("void (^block)(int) = ^(int test) { int i; };", ShortBlocks);
-  verifyFormat("void (^block)(int) = ^id(int test) { int i; };", ShortBlocks);
-  verifyFormat("void (^block)(int) = ^int(int test) { int i; };", ShortBlocks);
-
-  verifyFormat("foo(^{ bar(); });", ShortBlocks);
-  verifyFormat("foo(a, ^{ bar(); });", ShortBlocks);
-  verifyFormat("{ void (^block)(Object *x); }", ShortBlocks);
-
-  verifyFormat("[operation setCompletionBlock:^{\n"
-               "  [self onOperationDone];\n"
-               "}];");
-  verifyFormat("int i = {[operation setCompletionBlock:^{\n"
-               "  [self onOperationDone];\n"
-               "}]};");
-  verifyFormat("[operation setCompletionBlock:^(int *i) {\n"
-               "  f();\n"
-               "}];");
-  verifyFormat("int a = [operation block:^int(int *i) {\n"
-               "  return 1;\n"
-               "}];");
-  verifyFormat("[myObject doSomethingWith:arg1\n"
-               "                      aaa:^int(int *a) {\n"
-               "                        return 1;\n"
-               "                      }\n"
-               "                      bbb:f(a * bbbbbbbb)];");
-
-  verifyFormat("[operation setCompletionBlock:^{\n"
-               "  [self.delegate newDataAvailable];\n"
-               "}];",
-               getLLVMStyleWithColumns(60));
-  verifyFormat("dispatch_async(_fileIOQueue, ^{\n"
-               "  NSString *path = [self sessionFilePath];\n"
-               "  if (path) {\n"
-               "    // ...\n"
-               "  }\n"
-               "});");
-  verifyFormat("[[SessionService sharedService]\n"
-               "    loadWindowWithCompletionBlock:^(SessionWindow *window) {\n"
-               "      if (window) {\n"
-               "        [self windowDidLoad:window];\n"
-               "      } else {\n"
-               "        [self errorLoadingWindow];\n"
-               "      }\n"
-               "    }];");
-  verifyFormat("void (^largeBlock)(void) = ^{\n"
-               "  // ...\n"
-               "};\n",
-               getLLVMStyleWithColumns(40));
-  verifyFormat("[[SessionService sharedService]\n"
-               "    loadWindowWithCompletionBlock: //\n"
-               "        ^(SessionWindow *window) {\n"
-               "          if (window) {\n"
-               "            [self windowDidLoad:window];\n"
-               "          } else {\n"
-               "            [self errorLoadingWindow];\n"
-               "          }\n"
-               "        }];",
-               getLLVMStyleWithColumns(60));
-  verifyFormat("[myObject doSomethingWith:arg1\n"
-               "    firstBlock:^(Foo *a) {\n"
-               "      // ...\n"
-               "      int i;\n"
-               "    }\n"
-               "    secondBlock:^(Bar *b) {\n"
-               "      // ...\n"
-               "      int i;\n"
-               "    }\n"
-               "    thirdBlock:^Foo(Bar *b) {\n"
-               "      // ...\n"
-               "      int i;\n"
-               "    }];");
-  verifyFormat("[myObject doSomethingWith:arg1\n"
-               "               firstBlock:-1\n"
-               "              secondBlock:^(Bar *b) {\n"
-               "                // ...\n"
-               "                int i;\n"
-               "              }];");
-
-  verifyFormat("f(^{\n"
-               "  @autoreleasepool {\n"
-               "    if (a) {\n"
-               "      g();\n"
-               "    }\n"
-               "  }\n"
-               "});");
-  verifyFormat("Block b = ^int *(A *a, B *b) {}");
-  verifyFormat("BOOL (^aaa)(void) = ^BOOL {\n"
-               "};");
-
-  FormatStyle FourIndent = getLLVMStyle();
-  FourIndent.ObjCBlockIndentWidth = 4;
-  verifyFormat("[operation setCompletionBlock:^{\n"
-               "    [self onOperationDone];\n"
-               "}];",
-               FourIndent);
-}
-
-TEST_F(FormatTest, FormatsBlocksWithZeroColumnWidth) {
-  FormatStyle ZeroColumn = getLLVMStyle();
-  ZeroColumn.ColumnLimit = 0;
-
-  verifyFormat("[[SessionService sharedService] "
-               "loadWindowWithCompletionBlock:^(SessionWindow *window) {\n"
-               "  if (window) {\n"
-               "    [self windowDidLoad:window];\n"
-               "  } else {\n"
-               "    [self errorLoadingWindow];\n"
-               "  }\n"
-               "}];",
-               ZeroColumn);
-  EXPECT_EQ("[[SessionService sharedService]\n"
-            "    loadWindowWithCompletionBlock:^(SessionWindow *window) {\n"
-            "      if (window) {\n"
-            "        [self windowDidLoad:window];\n"
-            "      } else {\n"
-            "        [self errorLoadingWindow];\n"
-            "      }\n"
-            "    }];",
-            format("[[SessionService sharedService]\n"
-                   "loadWindowWithCompletionBlock:^(SessionWindow *window) {\n"
-                   "                if (window) {\n"
-                   "    [self windowDidLoad:window];\n"
-                   "  } else {\n"
-                   "    [self errorLoadingWindow];\n"
-                   "  }\n"
-                   "}];",
-                   ZeroColumn));
-  verifyFormat("[myObject doSomethingWith:arg1\n"
-               "    firstBlock:^(Foo *a) {\n"
-               "      // ...\n"
-               "      int i;\n"
-               "    }\n"
-               "    secondBlock:^(Bar *b) {\n"
-               "      // ...\n"
-               "      int i;\n"
-               "    }\n"
-               "    thirdBlock:^Foo(Bar *b) {\n"
-               "      // ...\n"
-               "      int i;\n"
-               "    }];",
-               ZeroColumn);
-  verifyFormat("f(^{\n"
-               "  @autoreleasepool {\n"
-               "    if (a) {\n"
-               "      g();\n"
-               "    }\n"
-               "  }\n"
-               "});",
-               ZeroColumn);
-  verifyFormat("void (^largeBlock)(void) = ^{\n"
-               "  // ...\n"
-               "};",
-               ZeroColumn);
-
-  ZeroColumn.AllowShortBlocksOnASingleLine = FormatStyle::SBS_Always;
-  EXPECT_EQ("void (^largeBlock)(void) = ^{ int i; };",
-            format("void   (^largeBlock)(void) = ^{ int   i; };", ZeroColumn));
-  ZeroColumn.AllowShortBlocksOnASingleLine = FormatStyle::SBS_Never;
-  EXPECT_EQ("void (^largeBlock)(void) = ^{\n"
-            "  int i;\n"
-            "};",
-            format("void   (^largeBlock)(void) = ^{ int   i; };", ZeroColumn));
-}
-
-TEST_F(FormatTest, SupportsCRLF) {
-  EXPECT_EQ("int a;\r\n"
-            "int b;\r\n"
-            "int c;\r\n",
-            format("int a;\r\n"
-                   "  int b;\r\n"
-                   "    int c;\r\n",
-                   getLLVMStyle()));
-  EXPECT_EQ("int a;\r\n"
-            "int b;\r\n"
-            "int c;\r\n",
-            format("int a;\r\n"
-                   "  int b;\n"
-                   "    int c;\r\n",
-                   getLLVMStyle()));
-  EXPECT_EQ("int a;\n"
-            "int b;\n"
-            "int c;\n",
-            format("int a;\r\n"
-                   "  int b;\n"
-                   "    int c;\n",
-                   getLLVMStyle()));
-  EXPECT_EQ("\"aaaaaaa \"\r\n"
-            "\"bbbbbbb\";\r\n",
-            format("\"aaaaaaa bbbbbbb\";\r\n", getLLVMStyleWithColumns(10)));
-  EXPECT_EQ("#define A \\\r\n"
-            "  b;      \\\r\n"
-            "  c;      \\\r\n"
-            "  d;\r\n",
-            format("#define A \\\r\n"
-                   "  b; \\\r\n"
-                   "  c; d; \r\n",
-                   getGoogleStyle()));
-
-  EXPECT_EQ("/*\r\n"
-            "multi line block comments\r\n"
-            "should not introduce\r\n"
-            "an extra carriage return\r\n"
-            "*/\r\n",
-            format("/*\r\n"
-                   "multi line block comments\r\n"
-                   "should not introduce\r\n"
-                   "an extra carriage return\r\n"
-                   "*/\r\n"));
-  EXPECT_EQ("/*\r\n"
-            "\r\n"
-            "*/",
-            format("/*\r\n"
-                   "    \r\r\r\n"
-                   "*/"));
-
-  FormatStyle style = getLLVMStyle();
-
-  style.DeriveLineEnding = true;
-  style.UseCRLF = false;
-  EXPECT_EQ("union FooBarBazQux {\n"
-            "  int foo;\n"
-            "  int bar;\n"
-            "  int baz;\n"
-            "};",
-            format("union FooBarBazQux {\r\n"
-                   "  int foo;\n"
-                   "  int bar;\r\n"
-                   "  int baz;\n"
-                   "};",
-                   style));
-  style.UseCRLF = true;
-  EXPECT_EQ("union FooBarBazQux {\r\n"
-            "  int foo;\r\n"
-            "  int bar;\r\n"
-            "  int baz;\r\n"
-            "};",
-            format("union FooBarBazQux {\r\n"
-                   "  int foo;\n"
-                   "  int bar;\r\n"
-                   "  int baz;\n"
-                   "};",
-                   style));
-
-  style.DeriveLineEnding = false;
-  style.UseCRLF = false;
-  EXPECT_EQ("union FooBarBazQux {\n"
-            "  int foo;\n"
-            "  int bar;\n"
-            "  int baz;\n"
-            "  int qux;\n"
-            "};",
-            format("union FooBarBazQux {\r\n"
-                   "  int foo;\n"
-                   "  int bar;\r\n"
-                   "  int baz;\n"
-                   "  int qux;\r\n"
-                   "};",
-                   style));
-  style.UseCRLF = true;
-  EXPECT_EQ("union FooBarBazQux {\r\n"
-            "  int foo;\r\n"
-            "  int bar;\r\n"
-            "  int baz;\r\n"
-            "  int qux;\r\n"
-            "};",
-            format("union FooBarBazQux {\r\n"
-                   "  int foo;\n"
-                   "  int bar;\r\n"
-                   "  int baz;\n"
-                   "  int qux;\n"
-                   "};",
-                   style));
-
-  style.DeriveLineEnding = true;
-  style.UseCRLF = false;
-  EXPECT_EQ("union FooBarBazQux {\r\n"
-            "  int foo;\r\n"
-            "  int bar;\r\n"
-            "  int baz;\r\n"
-            "  int qux;\r\n"
-            "};",
-            format("union FooBarBazQux {\r\n"
-                   "  int foo;\n"
-                   "  int bar;\r\n"
-                   "  int baz;\n"
-                   "  int qux;\r\n"
-                   "};",
-                   style));
-  style.UseCRLF = true;
-  EXPECT_EQ("union FooBarBazQux {\n"
-            "  int foo;\n"
-            "  int bar;\n"
-            "  int baz;\n"
-            "  int qux;\n"
-            "};",
-            format("union FooBarBazQux {\r\n"
-                   "  int foo;\n"
-                   "  int bar;\r\n"
-                   "  int baz;\n"
-                   "  int qux;\n"
-                   "};",
-                   style));
-}
-
-TEST_F(FormatTest, MunchSemicolonAfterBlocks) {
-  verifyFormat("MY_CLASS(C) {\n"
-               "  int i;\n"
-               "  int j;\n"
-               "};");
-}
-
-TEST_F(FormatTest, ConfigurableContinuationIndentWidth) {
-  FormatStyle TwoIndent = getLLVMStyleWithColumns(15);
-  TwoIndent.ContinuationIndentWidth = 2;
-
-  EXPECT_EQ("int i =\n"
-            "  longFunction(\n"
-            "    arg);",
-            format("int i = longFunction(arg);", TwoIndent));
-
-  FormatStyle SixIndent = getLLVMStyleWithColumns(20);
-  SixIndent.ContinuationIndentWidth = 6;
-
-  EXPECT_EQ("int i =\n"
-            "      longFunction(\n"
-            "            arg);",
-            format("int i = longFunction(arg);", SixIndent));
-}
-
-TEST_F(FormatTest, WrappedClosingParenthesisIndent) {
-  FormatStyle Style = getLLVMStyle();
-  verifyFormat("int Foo::getter(\n"
-               "    //\n"
-               ") const {\n"
-               "  return foo;\n"
-               "}",
-               Style);
-  verifyFormat("void Foo::setter(\n"
-               "    //\n"
-               ") {\n"
-               "  foo = 1;\n"
-               "}",
-               Style);
-}
-
-TEST_F(FormatTest, SpacesInAngles) {
-  FormatStyle Spaces = getLLVMStyle();
-  Spaces.SpacesInAngles = FormatStyle::SIAS_Always;
-
-  verifyFormat("vector< ::std::string > x1;", Spaces);
-  verifyFormat("Foo< int, Bar > x2;", Spaces);
-  verifyFormat("Foo< ::int, ::Bar > x3;", Spaces);
-
-  verifyFormat("static_cast< int >(arg);", Spaces);
-  verifyFormat("template < typename T0, typename T1 > void f() {}", Spaces);
-  verifyFormat("f< int, float >();", Spaces);
-  verifyFormat("template <> g() {}", Spaces);
-  verifyFormat("template < std::vector< int > > f() {}", Spaces);
-  verifyFormat("std::function< void(int, int) > fct;", Spaces);
-  verifyFormat("void inFunction() { std::function< void(int, int) > fct; }",
-               Spaces);
-
-  Spaces.Standard = FormatStyle::LS_Cpp03;
-  Spaces.SpacesInAngles = FormatStyle::SIAS_Always;
-  verifyFormat("A< A< int > >();", Spaces);
-
-  Spaces.SpacesInAngles = FormatStyle::SIAS_Never;
-  verifyFormat("A<A<int> >();", Spaces);
-
-  Spaces.SpacesInAngles = FormatStyle::SIAS_Leave;
-  verifyFormat("vector< ::std::string> x4;", "vector<::std::string> x4;",
-               Spaces);
-  verifyFormat("vector< ::std::string > x4;", "vector<::std::string > x4;",
-               Spaces);
-
-  verifyFormat("A<A<int> >();", Spaces);
-  verifyFormat("A<A<int> >();", "A<A<int>>();", Spaces);
-  verifyFormat("A< A< int > >();", Spaces);
-
-  Spaces.Standard = FormatStyle::LS_Cpp11;
-  Spaces.SpacesInAngles = FormatStyle::SIAS_Always;
-  verifyFormat("A< A< int > >();", Spaces);
-
-  Spaces.SpacesInAngles = FormatStyle::SIAS_Never;
-  verifyFormat("vector<::std::string> x4;", Spaces);
-  verifyFormat("vector<int> x5;", Spaces);
-  verifyFormat("Foo<int, Bar> x6;", Spaces);
-  verifyFormat("Foo<::int, ::Bar> x7;", Spaces);
-
-  verifyFormat("A<A<int>>();", Spaces);
-
-  Spaces.SpacesInAngles = FormatStyle::SIAS_Leave;
-  verifyFormat("vector<::std::string> x4;", Spaces);
-  verifyFormat("vector< ::std::string > x4;", Spaces);
-  verifyFormat("vector<int> x5;", Spaces);
-  verifyFormat("vector< int > x5;", Spaces);
-  verifyFormat("Foo<int, Bar> x6;", Spaces);
-  verifyFormat("Foo< int, Bar > x6;", Spaces);
-  verifyFormat("Foo<::int, ::Bar> x7;", Spaces);
-  verifyFormat("Foo< ::int, ::Bar > x7;", Spaces);
-
-  verifyFormat("A<A<int>>();", Spaces);
-  verifyFormat("A< A< int > >();", Spaces);
-  verifyFormat("A<A<int > >();", Spaces);
-  verifyFormat("A< A< int>>();", Spaces);
-}
-
-TEST_F(FormatTest, SpaceAfterTemplateKeyword) {
-  FormatStyle Style = getLLVMStyle();
-  Style.SpaceAfterTemplateKeyword = false;
-  verifyFormat("template<int> void foo();", Style);
-}
-
-TEST_F(FormatTest, TripleAngleBrackets) {
-  verifyFormat("f<<<1, 1>>>();");
-  verifyFormat("f<<<1, 1, 1, s>>>();");
-  verifyFormat("f<<<a, b, c, d>>>();");
-  EXPECT_EQ("f<<<1, 1>>>();", format("f <<< 1, 1 >>> ();"));
-  verifyFormat("f<param><<<1, 1>>>();");
-  verifyFormat("f<1><<<1, 1>>>();");
-  EXPECT_EQ("f<param><<<1, 1>>>();", format("f< param > <<< 1, 1 >>> ();"));
-  verifyFormat("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
-               "aaaaaaaaaaa<<<\n    1, 1>>>();");
-  verifyFormat("aaaaaaaaaaaaaaa<aaaaaaaaa, aaaaaaaaaa, aaaaaaaaaaaaaa>\n"
-               "    <<<aaaaaaaaa, aaaaaaaaaa, aaaaaaaaaaaaaaaaaa>>>();");
-}
-
-TEST_F(FormatTest, MergeLessLessAtEnd) {
-  verifyFormat("<<");
-  EXPECT_EQ("< < <", format("\\\n<<<"));
-  verifyFormat("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
-               "aaallvm::outs() <<");
-  verifyFormat("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
-               "aaaallvm::outs()\n    <<");
-}
-
-TEST_F(FormatTest, HandleUnbalancedImplicitBracesAcrossPPBranches) {
-  std::string code = "#if A\n"
-                     "#if B\n"
-                     "a.\n"
-                     "#endif\n"
-                     "    a = 1;\n"
-                     "#else\n"
-                     "#endif\n"
-                     "#if C\n"
-                     "#else\n"
-                     "#endif\n";
-  EXPECT_EQ(code, format(code));
-}
-
-TEST_F(FormatTest, HandleConflictMarkers) {
-  // Git/SVN conflict markers.
-  EXPECT_EQ("int a;\n"
-            "void f() {\n"
-            "  callme(some(parameter1,\n"
-            "<<<<<<< text by the vcs\n"
-            "              parameter2),\n"
-            "||||||| text by the vcs\n"
-            "              parameter2),\n"
-            "         parameter3,\n"
-            "======= text by the vcs\n"
-            "              parameter2, parameter3),\n"
-            ">>>>>>> text by the vcs\n"
-            "         otherparameter);\n",
-            format("int a;\n"
-                   "void f() {\n"
-                   "  callme(some(parameter1,\n"
-                   "<<<<<<< text by the vcs\n"
-                   "  parameter2),\n"
-                   "||||||| text by the vcs\n"
-                   "  parameter2),\n"
-                   "  parameter3,\n"
-                   "======= text by the vcs\n"
-                   "  parameter2,\n"
-                   "  parameter3),\n"
-                   ">>>>>>> text by the vcs\n"
-                   "  otherparameter);\n"));
-
-  // Perforce markers.
-  EXPECT_EQ("void f() {\n"
-            "  function(\n"
-            ">>>> text by the vcs\n"
-            "      parameter,\n"
-            "==== text by the vcs\n"
-            "      parameter,\n"
-            "==== text by the vcs\n"
-            "      parameter,\n"
-            "<<<< text by the vcs\n"
-            "      parameter);\n",
-            format("void f() {\n"
-                   "  function(\n"
-                   ">>>> text by the vcs\n"
-                   "  parameter,\n"
-                   "==== text by the vcs\n"
-                   "  parameter,\n"
-                   "==== text by the vcs\n"
-                   "  parameter,\n"
-                   "<<<< text by the vcs\n"
-                   "  parameter);\n"));
-
-  EXPECT_EQ("<<<<<<<\n"
-            "|||||||\n"
-            "=======\n"
-            ">>>>>>>",
-            format("<<<<<<<\n"
-                   "|||||||\n"
-                   "=======\n"
-                   ">>>>>>>"));
-
-  EXPECT_EQ("<<<<<<<\n"
-            "|||||||\n"
-            "int i;\n"
-            "=======\n"
-            ">>>>>>>",
-            format("<<<<<<<\n"
-                   "|||||||\n"
-                   "int i;\n"
-                   "=======\n"
-                   ">>>>>>>"));
-
-  // FIXME: Handle parsing of macros around conflict markers correctly:
-  EXPECT_EQ("#define Macro \\\n"
-            "<<<<<<<\n"
-            "Something \\\n"
-            "|||||||\n"
-            "Else \\\n"
-            "=======\n"
-            "Other \\\n"
-            ">>>>>>>\n"
-            "    End int i;\n",
-            format("#define Macro \\\n"
-                   "<<<<<<<\n"
-                   "  Something \\\n"
-                   "|||||||\n"
-                   "  Else \\\n"
-                   "=======\n"
-                   "  Other \\\n"
-                   ">>>>>>>\n"
-                   "  End\n"
-                   "int i;\n"));
-}
-
-TEST_F(FormatTest, DisableRegions) {
-  EXPECT_EQ("int i;\n"
-            "// clang-format off\n"
-            "  int j;\n"
-            "// clang-format on\n"
-            "int k;",
-            format(" int  i;\n"
-                   "   // clang-format off\n"
-                   "  int j;\n"
-                   " // clang-format on\n"
-                   "   int   k;"));
-  EXPECT_EQ("int i;\n"
-            "/* clang-format off */\n"
-            "  int j;\n"
-            "/* clang-format on */\n"
-            "int k;",
-            format(" int  i;\n"
-                   "   /* clang-format off */\n"
-                   "  int j;\n"
-                   " /* clang-format on */\n"
-                   "   int   k;"));
-
-  // Don't reflow comments within disabled regions.
-  EXPECT_EQ("// clang-format off\n"
-            "// long long long long long long line\n"
-            "/* clang-format on */\n"
-            "/* long long long\n"
-            " * long long long\n"
-            " * line */\n"
-            "int i;\n"
-            "/* clang-format off */\n"
-            "/* long long long long long long line */\n",
-            format("// clang-format off\n"
-                   "// long long long long long long line\n"
-                   "/* clang-format on */\n"
-                   "/* long long long long long long line */\n"
-                   "int i;\n"
-                   "/* clang-format off */\n"
-                   "/* long long long long long long line */\n",
-                   getLLVMStyleWithColumns(20)));
-}
-
-TEST_F(FormatTest, DoNotCrashOnInvalidInput) {
-  format("? ) =");
-  verifyNoCrash("#define a\\\n /**/}");
-}
-
-TEST_F(FormatTest, FormatsTableGenCode) {
-  FormatStyle Style = getLLVMStyle();
-  Style.Language = FormatStyle::LK_TableGen;
-  verifyFormat("include \"a.td\"\ninclude \"b.td\"", Style);
-}
-
-TEST_F(FormatTest, ArrayOfTemplates) {
-  EXPECT_EQ("auto a = new unique_ptr<int>[10];",
-            format("auto a = new unique_ptr<int > [ 10];"));
-
-  FormatStyle Spaces = getLLVMStyle();
-  Spaces.SpacesInSquareBrackets = true;
-  EXPECT_EQ("auto a = new unique_ptr<int>[ 10 ];",
-            format("auto a = new unique_ptr<int > [10];", Spaces));
-}
-
-TEST_F(FormatTest, ArrayAsTemplateType) {
-  EXPECT_EQ("auto a = unique_ptr<Foo<Bar>[10]>;",
-            format("auto a = unique_ptr < Foo < Bar>[ 10]> ;"));
-
-  FormatStyle Spaces = getLLVMStyle();
-  Spaces.SpacesInSquareBrackets = true;
-  EXPECT_EQ("auto a = unique_ptr<Foo<Bar>[ 10 ]>;",
-            format("auto a = unique_ptr < Foo < Bar>[10]> ;", Spaces));
-}
-
-TEST_F(FormatTest, NoSpaceAfterSuper) { verifyFormat("__super::FooBar();"); }
-
-TEST(FormatStyle, GetStyleWithEmptyFileName) {
-  llvm::vfs::InMemoryFileSystem FS;
-  auto Style1 = getStyle("file", "", "Google", "", &FS);
-  ASSERT_TRUE((bool)Style1);
-  ASSERT_EQ(*Style1, getGoogleStyle());
-}
-
-TEST(FormatStyle, GetStyleOfFile) {
-  llvm::vfs::InMemoryFileSystem FS;
-  // Test 1: format file in the same directory.
-  ASSERT_TRUE(
-      FS.addFile("/a/.clang-format", 0,
-                 llvm::MemoryBuffer::getMemBuffer("BasedOnStyle: LLVM")));
-  ASSERT_TRUE(
-      FS.addFile("/a/test.cpp", 0, llvm::MemoryBuffer::getMemBuffer("int i;")));
-  auto Style1 = getStyle("file", "/a/.clang-format", "Google", "", &FS);
-  ASSERT_TRUE((bool)Style1);
-  ASSERT_EQ(*Style1, getLLVMStyle());
-
-  // Test 2.1: fallback to default.
-  ASSERT_TRUE(
-      FS.addFile("/b/test.cpp", 0, llvm::MemoryBuffer::getMemBuffer("int i;")));
-  auto Style2 = getStyle("file", "/b/test.cpp", "Mozilla", "", &FS);
-  ASSERT_TRUE((bool)Style2);
-  ASSERT_EQ(*Style2, getMozillaStyle());
-
-  // Test 2.2: no format on 'none' fallback style.
-  Style2 = getStyle("file", "/b/test.cpp", "none", "", &FS);
-  ASSERT_TRUE((bool)Style2);
-  ASSERT_EQ(*Style2, getNoStyle());
-
-  // Test 2.3: format if config is found with no based style while fallback is
-  // 'none'.
-  ASSERT_TRUE(FS.addFile("/b/.clang-format", 0,
-                         llvm::MemoryBuffer::getMemBuffer("IndentWidth: 2")));
-  Style2 = getStyle("file", "/b/test.cpp", "none", "", &FS);
-  ASSERT_TRUE((bool)Style2);
-  ASSERT_EQ(*Style2, getLLVMStyle());
-
-  // Test 2.4: format if yaml with no based style, while fallback is 'none'.
-  Style2 = getStyle("{}", "a.h", "none", "", &FS);
-  ASSERT_TRUE((bool)Style2);
-  ASSERT_EQ(*Style2, getLLVMStyle());
-
-  // Test 3: format file in parent directory.
-  ASSERT_TRUE(
-      FS.addFile("/c/.clang-format", 0,
-                 llvm::MemoryBuffer::getMemBuffer("BasedOnStyle: Google")));
-  ASSERT_TRUE(FS.addFile("/c/sub/sub/sub/test.cpp", 0,
-                         llvm::MemoryBuffer::getMemBuffer("int i;")));
-  auto Style3 = getStyle("file", "/c/sub/sub/sub/test.cpp", "LLVM", "", &FS);
-  ASSERT_TRUE((bool)Style3);
-  ASSERT_EQ(*Style3, getGoogleStyle());
-
-  // Test 4: error on invalid fallback style
-  auto Style4 = getStyle("file", "a.h", "KungFu", "", &FS);
-  ASSERT_FALSE((bool)Style4);
-  llvm::consumeError(Style4.takeError());
-
-  // Test 5: error on invalid yaml on command line
-  auto Style5 = getStyle("{invalid_key=invalid_value}", "a.h", "LLVM", "", &FS);
-  ASSERT_FALSE((bool)Style5);
-  llvm::consumeError(Style5.takeError());
-
-  // Test 6: error on invalid style
-  auto Style6 = getStyle("KungFu", "a.h", "LLVM", "", &FS);
-  ASSERT_FALSE((bool)Style6);
-  llvm::consumeError(Style6.takeError());
-
-  // Test 7: found config file, error on parsing it
-  ASSERT_TRUE(
-      FS.addFile("/d/.clang-format", 0,
-                 llvm::MemoryBuffer::getMemBuffer("BasedOnStyle: LLVM\n"
-                                                  "InvalidKey: InvalidValue")));
-  ASSERT_TRUE(
-      FS.addFile("/d/test.cpp", 0, llvm::MemoryBuffer::getMemBuffer("int i;")));
-  auto Style7a = getStyle("file", "/d/.clang-format", "LLVM", "", &FS);
-  ASSERT_FALSE((bool)Style7a);
-  llvm::consumeError(Style7a.takeError());
-
-  auto Style7b = getStyle("file", "/d/.clang-format", "LLVM", "", &FS, true);
-  ASSERT_TRUE((bool)Style7b);
-
-  // Test 8: inferred per-language defaults apply.
-  auto StyleTd = getStyle("file", "x.td", "llvm", "", &FS);
-  ASSERT_TRUE((bool)StyleTd);
-  ASSERT_EQ(*StyleTd, getLLVMStyle(FormatStyle::LK_TableGen));
-
-  // Test 9.1: overwriting a file style, when parent no file exists with no
-  // fallback style
-  ASSERT_TRUE(FS.addFile(
-      "/e/sub/.clang-format", 0,
-      llvm::MemoryBuffer::getMemBuffer("BasedOnStyle: InheritParentConfig\n"
-                                       "ColumnLimit: 20")));
-  ASSERT_TRUE(FS.addFile("/e/sub/code.cpp", 0,
-                         llvm::MemoryBuffer::getMemBuffer("int i;")));
-  auto Style9 = getStyle("file", "/e/sub/code.cpp", "none", "", &FS);
-  ASSERT_TRUE(static_cast<bool>(Style9));
-  ASSERT_EQ(*Style9, [] {
-    auto Style = getNoStyle();
-    Style.ColumnLimit = 20;
-    return Style;
-  }());
-
-  // Test 9.2: with LLVM fallback style
-  Style9 = getStyle("file", "/e/sub/code.cpp", "LLVM", "", &FS);
-  ASSERT_TRUE(static_cast<bool>(Style9));
-  ASSERT_EQ(*Style9, [] {
-    auto Style = getLLVMStyle();
-    Style.ColumnLimit = 20;
-    return Style;
-  }());
-
-  // Test 9.3: with a parent file
-  ASSERT_TRUE(
-      FS.addFile("/e/.clang-format", 0,
-                 llvm::MemoryBuffer::getMemBuffer("BasedOnStyle: Google\n"
-                                                  "UseTab: Always")));
-  Style9 = getStyle("file", "/e/sub/code.cpp", "none", "", &FS);
-  ASSERT_TRUE(static_cast<bool>(Style9));
-  ASSERT_EQ(*Style9, [] {
-    auto Style = getGoogleStyle();
-    Style.ColumnLimit = 20;
-    Style.UseTab = FormatStyle::UT_Always;
-    return Style;
-  }());
-
-  // Test 9.4: propagate more than one level
-  ASSERT_TRUE(FS.addFile("/e/sub/sub/code.cpp", 0,
-                         llvm::MemoryBuffer::getMemBuffer("int i;")));
-  ASSERT_TRUE(FS.addFile("/e/sub/sub/.clang-format", 0,
-                         llvm::MemoryBuffer::getMemBuffer(
-                             "BasedOnStyle: InheritParentConfig\n"
-                             "WhitespaceSensitiveMacros: ['FOO', 'BAR']")));
-  std::vector<std::string> NonDefaultWhiteSpaceMacros{"FOO", "BAR"};
-
-  const auto SubSubStyle = [&NonDefaultWhiteSpaceMacros] {
-    auto Style = getGoogleStyle();
-    Style.ColumnLimit = 20;
-    Style.UseTab = FormatStyle::UT_Always;
-    Style.WhitespaceSensitiveMacros = NonDefaultWhiteSpaceMacros;
-    return Style;
-  }();
-
-  ASSERT_NE(Style9->WhitespaceSensitiveMacros, NonDefaultWhiteSpaceMacros);
-  Style9 = getStyle("file", "/e/sub/sub/code.cpp", "none", "", &FS);
-  ASSERT_TRUE(static_cast<bool>(Style9));
-  ASSERT_EQ(*Style9, SubSubStyle);
-
-  // Test 9.5: use InheritParentConfig as style name
-  Style9 =
-      getStyle("inheritparentconfig", "/e/sub/sub/code.cpp", "none", "", &FS);
-  ASSERT_TRUE(static_cast<bool>(Style9));
-  ASSERT_EQ(*Style9, SubSubStyle);
-
-  // Test 9.6: use command line style with inheritance
-  Style9 = getStyle("{BasedOnStyle: InheritParentConfig}", "/e/sub/code.cpp",
-                    "none", "", &FS);
-  ASSERT_TRUE(static_cast<bool>(Style9));
-  ASSERT_EQ(*Style9, SubSubStyle);
-
-  // Test 9.7: use command line style with inheritance and own config
-  Style9 = getStyle("{BasedOnStyle: InheritParentConfig, "
-                    "WhitespaceSensitiveMacros: ['FOO', 'BAR']}",
-                    "/e/sub/code.cpp", "none", "", &FS);
-  ASSERT_TRUE(static_cast<bool>(Style9));
-  ASSERT_EQ(*Style9, SubSubStyle);
-
-  // Test 9.8: use inheritance from a file without BasedOnStyle
-  ASSERT_TRUE(FS.addFile("/e/withoutbase/.clang-format", 0,
-                         llvm::MemoryBuffer::getMemBuffer("ColumnLimit: 123")));
-  ASSERT_TRUE(
-      FS.addFile("/e/withoutbase/sub/.clang-format", 0,
-                 llvm::MemoryBuffer::getMemBuffer(
-                     "BasedOnStyle: InheritParentConfig\nIndentWidth: 7")));
-  // Make sure we do not use the fallback style
-  Style9 = getStyle("file", "/e/withoutbase/code.cpp", "google", "", &FS);
-  ASSERT_TRUE(static_cast<bool>(Style9));
-  ASSERT_EQ(*Style9, [] {
-    auto Style = getLLVMStyle();
-    Style.ColumnLimit = 123;
-    return Style;
-  }());
-
-  Style9 = getStyle("file", "/e/withoutbase/sub/code.cpp", "google", "", &FS);
-  ASSERT_TRUE(static_cast<bool>(Style9));
-  ASSERT_EQ(*Style9, [] {
-    auto Style = getLLVMStyle();
-    Style.ColumnLimit = 123;
-    Style.IndentWidth = 7;
-    return Style;
-  }());
-}
-
-TEST_F(ReplacementTest, FormatCodeAfterReplacements) {
-  // Column limit is 20.
-  std::string Code = "Type *a =\n"
-                     "    new Type();\n"
-                     "g(iiiii, 0, jjjjj,\n"
-                     "  0, kkkkk, 0, mm);\n"
-                     "int  bad     = format   ;";
-  std::string Expected = "auto a = new Type();\n"
-                         "g(iiiii, nullptr,\n"
-                         "  jjjjj, nullptr,\n"
-                         "  kkkkk, nullptr,\n"
-                         "  mm);\n"
-                         "int  bad     = format   ;";
-  FileID ID = Context.createInMemoryFile("format.cpp", Code);
-  tooling::Replacements Replaces = toReplacements(
-      {tooling::Replacement(Context.Sources, Context.getLocation(ID, 1, 1), 6,
-                            "auto "),
-       tooling::Replacement(Context.Sources, Context.getLocation(ID, 3, 10), 1,
-                            "nullptr"),
-       tooling::Replacement(Context.Sources, Context.getLocation(ID, 4, 3), 1,
-                            "nullptr"),
-       tooling::Replacement(Context.Sources, Context.getLocation(ID, 4, 13), 1,
-                            "nullptr")});
-
-  format::FormatStyle Style = format::getLLVMStyle();
-  Style.ColumnLimit = 20; // Set column limit to 20 to increase readibility.
-  auto FormattedReplaces = formatReplacements(Code, Replaces, Style);
-  EXPECT_TRUE(static_cast<bool>(FormattedReplaces))
-      << llvm::toString(FormattedReplaces.takeError()) << "\n";
-  auto Result = applyAllReplacements(Code, *FormattedReplaces);
-  EXPECT_TRUE(static_cast<bool>(Result));
-  EXPECT_EQ(Expected, *Result);
-}
-
-TEST_F(ReplacementTest, SortIncludesAfterReplacement) {
-  std::string Code = "#include \"a.h\"\n"
-                     "#include \"c.h\"\n"
-                     "\n"
-                     "int main() {\n"
-                     "  return 0;\n"
-                     "}";
-  std::string Expected = "#include \"a.h\"\n"
-                         "#include \"b.h\"\n"
-                         "#include \"c.h\"\n"
-                         "\n"
-                         "int main() {\n"
-                         "  return 0;\n"
-                         "}";
-  FileID ID = Context.createInMemoryFile("fix.cpp", Code);
-  tooling::Replacements Replaces = toReplacements(
-      {tooling::Replacement(Context.Sources, Context.getLocation(ID, 1, 1), 0,
-                            "#include \"b.h\"\n")});
-
-  format::FormatStyle Style = format::getLLVMStyle();
-  Style.SortIncludes = FormatStyle::SI_CaseSensitive;
-  auto FormattedReplaces = formatReplacements(Code, Replaces, Style);
-  EXPECT_TRUE(static_cast<bool>(FormattedReplaces))
-      << llvm::toString(FormattedReplaces.takeError()) << "\n";
-  auto Result = applyAllReplacements(Code, *FormattedReplaces);
-  EXPECT_TRUE(static_cast<bool>(Result));
-  EXPECT_EQ(Expected, *Result);
-}
-
-TEST_F(FormatTest, FormatSortsUsingDeclarations) {
-  EXPECT_EQ("using std::cin;\n"
-            "using std::cout;",
-            format("using std::cout;\n"
-                   "using std::cin;",
-                   getGoogleStyle()));
-}
-
-TEST_F(FormatTest, UTF8CharacterLiteralCpp03) {
-  format::FormatStyle Style = format::getLLVMStyle();
-  Style.Standard = FormatStyle::LS_Cpp03;
-  // cpp03 recognize this string as identifier u8 and literal character 'a'
-  EXPECT_EQ("auto c = u8 'a';", format("auto c = u8'a';", Style));
-}
-
-TEST_F(FormatTest, UTF8CharacterLiteralCpp11) {
-  // u8'a' is a C++17 feature, utf8 literal character, LS_Cpp11 covers
-  // all modes, including C++11, C++14 and C++17
-  EXPECT_EQ("auto c = u8'a';", format("auto c = u8'a';"));
-}
-
-TEST_F(FormatTest, DoNotFormatLikelyXml) {
-  EXPECT_EQ("<!-- ;> -->", format("<!-- ;> -->", getGoogleStyle()));
-  EXPECT_EQ(" <!-- >; -->", format(" <!-- >; -->", getGoogleStyle()));
-}
-
-TEST_F(FormatTest, StructuredBindings) {
-  // Structured bindings is a C++17 feature.
-  // all modes, including C++11, C++14 and C++17
-  verifyFormat("auto [a, b] = f();");
-  EXPECT_EQ("auto [a, b] = f();", format("auto[a, b] = f();"));
-  EXPECT_EQ("const auto [a, b] = f();", format("const   auto[a, b] = f();"));
-  EXPECT_EQ("auto const [a, b] = f();", format("auto  const[a, b] = f();"));
-  EXPECT_EQ("auto const volatile [a, b] = f();",
-            format("auto  const   volatile[a, b] = f();"));
-  EXPECT_EQ("auto [a, b, c] = f();", format("auto   [  a  ,  b,c   ] = f();"));
-  EXPECT_EQ("auto &[a, b, c] = f();",
-            format("auto   &[  a  ,  b,c   ] = f();"));
-  EXPECT_EQ("auto &&[a, b, c] = f();",
-            format("auto   &&[  a  ,  b,c   ] = f();"));
-  EXPECT_EQ("auto const &[a, b] = f();", format("auto  const&[a, b] = f();"));
-  EXPECT_EQ("auto const volatile &&[a, b] = f();",
-            format("auto  const  volatile  &&[a, b] = f();"));
-  EXPECT_EQ("auto const &&[a, b] = f();",
-            format("auto  const   &&  [a, b] = f();"));
-  EXPECT_EQ("const auto &[a, b] = f();",
-            format("const  auto  &  [a, b] = f();"));
-  EXPECT_EQ("const auto volatile &&[a, b] = f();",
-            format("const  auto   volatile  &&[a, b] = f();"));
-  EXPECT_EQ("volatile const auto &&[a, b] = f();",
-            format("volatile  const  auto   &&[a, b] = f();"));
-  EXPECT_EQ("const auto &&[a, b] = f();",
-            format("const  auto  &&  [a, b] = f();"));
-
-  // Make sure we don't mistake structured bindings for lambdas.
-  FormatStyle PointerMiddle = getLLVMStyle();
-  PointerMiddle.PointerAlignment = FormatStyle::PAS_Middle;
-  verifyFormat("auto [a1, b]{A * i};", getGoogleStyle());
-  verifyFormat("auto [a2, b]{A * i};", getLLVMStyle());
-  verifyFormat("auto [a3, b]{A * i};", PointerMiddle);
-  verifyFormat("auto const [a1, b]{A * i};", getGoogleStyle());
-  verifyFormat("auto const [a2, b]{A * i};", getLLVMStyle());
-  verifyFormat("auto const [a3, b]{A * i};", PointerMiddle);
-  verifyFormat("auto const& [a1, b]{A * i};", getGoogleStyle());
-  verifyFormat("auto const &[a2, b]{A * i};", getLLVMStyle());
-  verifyFormat("auto const & [a3, b]{A * i};", PointerMiddle);
-  verifyFormat("auto const&& [a1, b]{A * i};", getGoogleStyle());
-  verifyFormat("auto const &&[a2, b]{A * i};", getLLVMStyle());
-  verifyFormat("auto const && [a3, b]{A * i};", PointerMiddle);
-
-  EXPECT_EQ("for (const auto &&[a, b] : some_range) {\n}",
-            format("for (const auto   &&   [a, b] : some_range) {\n}"));
-  EXPECT_EQ("for (const auto &[a, b] : some_range) {\n}",
-            format("for (const auto   &   [a, b] : some_range) {\n}"));
-  EXPECT_EQ("for (const auto [a, b] : some_range) {\n}",
-            format("for (const auto[a, b] : some_range) {\n}"));
-  EXPECT_EQ("auto [x, y](expr);", format("auto[x,y]  (expr);"));
-  EXPECT_EQ("auto &[x, y](expr);", format("auto  &  [x,y]  (expr);"));
-  EXPECT_EQ("auto &&[x, y](expr);", format("auto  &&  [x,y]  (expr);"));
-  EXPECT_EQ("auto const &[x, y](expr);",
-            format("auto  const  &  [x,y]  (expr);"));
-  EXPECT_EQ("auto const &&[x, y](expr);",
-            format("auto  const  &&  [x,y]  (expr);"));
-  EXPECT_EQ("auto [x, y]{expr};", format("auto[x,y]     {expr};"));
-  EXPECT_EQ("auto const &[x, y]{expr};",
-            format("auto  const  &  [x,y]  {expr};"));
-  EXPECT_EQ("auto const &&[x, y]{expr};",
-            format("auto  const  &&  [x,y]  {expr};"));
-
-  format::FormatStyle Spaces = format::getLLVMStyle();
-  Spaces.SpacesInSquareBrackets = true;
-  verifyFormat("auto [ a, b ] = f();", Spaces);
-  verifyFormat("auto &&[ a, b ] = f();", Spaces);
-  verifyFormat("auto &[ a, b ] = f();", Spaces);
-  verifyFormat("auto const &&[ a, b ] = f();", Spaces);
-  verifyFormat("auto const &[ a, b ] = f();", Spaces);
-}
-
-TEST_F(FormatTest, FileAndCode) {
-  EXPECT_EQ(FormatStyle::LK_Cpp, guessLanguage("foo.cc", ""));
-  EXPECT_EQ(FormatStyle::LK_ObjC, guessLanguage("foo.m", ""));
-  EXPECT_EQ(FormatStyle::LK_ObjC, guessLanguage("foo.mm", ""));
-  EXPECT_EQ(FormatStyle::LK_Cpp, guessLanguage("foo.h", ""));
-  EXPECT_EQ(FormatStyle::LK_ObjC,
-            guessLanguage("foo.h", "@interface Foo\n@end\n"));
-  EXPECT_EQ(
-      FormatStyle::LK_ObjC,
-      guessLanguage("foo.h", "#define TRY(x, y) @try { x; } @finally { y; }"));
-  EXPECT_EQ(FormatStyle::LK_ObjC,
-            guessLanguage("foo.h", "#define AVAIL(x) @available(x, *))"));
-  EXPECT_EQ(FormatStyle::LK_ObjC, guessLanguage("foo.h", "@class Foo;"));
-  EXPECT_EQ(FormatStyle::LK_Cpp, guessLanguage("foo", ""));
-  EXPECT_EQ(FormatStyle::LK_ObjC,
-            guessLanguage("foo", "@interface Foo\n@end\n"));
-  EXPECT_EQ(FormatStyle::LK_ObjC,
-            guessLanguage("foo.h", "int DoStuff(CGRect rect);\n"));
-  EXPECT_EQ(
-      FormatStyle::LK_ObjC,
-      guessLanguage("foo.h",
-                    "#define MY_POINT_MAKE(x, y) CGPointMake((x), (y));\n"));
-  EXPECT_EQ(
-      FormatStyle::LK_Cpp,
-      guessLanguage("foo.h", "#define FOO(...) auto bar = [] __VA_ARGS__;"));
-}
-
-TEST_F(FormatTest, GuessLanguageWithCpp11AttributeSpecifiers) {
-  EXPECT_EQ(FormatStyle::LK_Cpp, guessLanguage("foo.h", "[[noreturn]];"));
-  EXPECT_EQ(FormatStyle::LK_ObjC,
-            guessLanguage("foo.h", "array[[calculator getIndex]];"));
-  EXPECT_EQ(FormatStyle::LK_Cpp,
-            guessLanguage("foo.h", "[[noreturn, deprecated(\"so sorry\")]];"));
-  EXPECT_EQ(
-      FormatStyle::LK_Cpp,
-      guessLanguage("foo.h", "[[noreturn, deprecated(\"gone, sorry\")]];"));
-  EXPECT_EQ(FormatStyle::LK_ObjC,
-            guessLanguage("foo.h", "[[noreturn foo] bar];"));
-  EXPECT_EQ(FormatStyle::LK_Cpp,
-            guessLanguage("foo.h", "[[clang::fallthrough]];"));
-  EXPECT_EQ(FormatStyle::LK_ObjC,
-            guessLanguage("foo.h", "[[clang:fallthrough] foo];"));
-  EXPECT_EQ(FormatStyle::LK_Cpp,
-            guessLanguage("foo.h", "[[gsl::suppress(\"type\")]];"));
-  EXPECT_EQ(FormatStyle::LK_Cpp,
-            guessLanguage("foo.h", "[[using clang: fallthrough]];"));
-  EXPECT_EQ(FormatStyle::LK_ObjC,
-            guessLanguage("foo.h", "[[abusing clang:fallthrough] bar];"));
-  EXPECT_EQ(FormatStyle::LK_Cpp,
-            guessLanguage("foo.h", "[[using gsl: suppress(\"type\")]];"));
-  EXPECT_EQ(
-      FormatStyle::LK_Cpp,
-      guessLanguage("foo.h", "for (auto &&[endpoint, stream] : streams_)"));
-  EXPECT_EQ(
-      FormatStyle::LK_Cpp,
-      guessLanguage("foo.h",
-                    "[[clang::callable_when(\"unconsumed\", \"unknown\")]]"));
-  EXPECT_EQ(FormatStyle::LK_Cpp, guessLanguage("foo.h", "[[foo::bar, ...]]"));
-}
-
-TEST_F(FormatTest, GuessLanguageWithCaret) {
-  EXPECT_EQ(FormatStyle::LK_Cpp, guessLanguage("foo.h", "FOO(^);"));
-  EXPECT_EQ(FormatStyle::LK_Cpp, guessLanguage("foo.h", "FOO(^, Bar);"));
-  EXPECT_EQ(FormatStyle::LK_ObjC,
-            guessLanguage("foo.h", "int(^)(char, float);"));
-  EXPECT_EQ(FormatStyle::LK_ObjC,
-            guessLanguage("foo.h", "int(^foo)(char, float);"));
-  EXPECT_EQ(FormatStyle::LK_ObjC,
-            guessLanguage("foo.h", "int(^foo[10])(char, float);"));
-  EXPECT_EQ(FormatStyle::LK_ObjC,
-            guessLanguage("foo.h", "int(^foo[kNumEntries])(char, float);"));
-  EXPECT_EQ(
-      FormatStyle::LK_ObjC,
-      guessLanguage("foo.h", "int(^foo[(kNumEntries + 10)])(char, float);"));
-}
-
-TEST_F(FormatTest, GuessLanguageWithPragmas) {
-  EXPECT_EQ(FormatStyle::LK_Cpp,
-            guessLanguage("foo.h", "__pragma(warning(disable:))"));
-  EXPECT_EQ(FormatStyle::LK_Cpp,
-            guessLanguage("foo.h", "#pragma(warning(disable:))"));
-  EXPECT_EQ(FormatStyle::LK_Cpp,
-            guessLanguage("foo.h", "_Pragma(warning(disable:))"));
-}
-
-TEST_F(FormatTest, FormatsInlineAsmSymbolicNames) {
-  // ASM symbolic names are identifiers that must be surrounded by [] without
-  // space in between:
-  // https://gcc.gnu.org/onlinedocs/gcc/Extended-Asm.html#InputOperands
-
-  // Example from https://bugs.llvm.org/show_bug.cgi?id=45108.
-  verifyFormat(R"(//
-asm volatile("mrs %x[result], FPCR" : [result] "=r"(result));
-)");
-
-  // A list of several ASM symbolic names.
-  verifyFormat(R"(asm("mov %[e], %[d]" : [d] "=rm"(d), [e] "rm"(*e));)");
-
-  // ASM symbolic names in inline ASM with inputs and outputs.
-  verifyFormat(R"(//
-asm("cmoveq %1, %2, %[result]"
-    : [result] "=r"(result)
-    : "r"(test), "r"(new), "[result]"(old));
-)");
-
-  // ASM symbolic names in inline ASM with no outputs.
-  verifyFormat(R"(asm("mov %[e], %[d]" : : [d] "=rm"(d), [e] "rm"(*e));)");
-}
-
-TEST_F(FormatTest, GuessedLanguageWithInlineAsmClobbers) {
-  EXPECT_EQ(FormatStyle::LK_Cpp,
-            guessLanguage("foo.h", "void f() {\n"
-                                   "  asm (\"mov %[e], %[d]\"\n"
-                                   "     : [d] \"=rm\" (d)\n"
-                                   "       [e] \"rm\" (*e));\n"
-                                   "}"));
-  EXPECT_EQ(FormatStyle::LK_Cpp,
-            guessLanguage("foo.h", "void f() {\n"
-                                   "  _asm (\"mov %[e], %[d]\"\n"
-                                   "     : [d] \"=rm\" (d)\n"
-                                   "       [e] \"rm\" (*e));\n"
-                                   "}"));
-  EXPECT_EQ(FormatStyle::LK_Cpp,
-            guessLanguage("foo.h", "void f() {\n"
-                                   "  __asm (\"mov %[e], %[d]\"\n"
-                                   "     : [d] \"=rm\" (d)\n"
-                                   "       [e] \"rm\" (*e));\n"
-                                   "}"));
-  EXPECT_EQ(FormatStyle::LK_Cpp,
-            guessLanguage("foo.h", "void f() {\n"
-                                   "  __asm__ (\"mov %[e], %[d]\"\n"
-                                   "     : [d] \"=rm\" (d)\n"
-                                   "       [e] \"rm\" (*e));\n"
-                                   "}"));
-  EXPECT_EQ(FormatStyle::LK_Cpp,
-            guessLanguage("foo.h", "void f() {\n"
-                                   "  asm (\"mov %[e], %[d]\"\n"
-                                   "     : [d] \"=rm\" (d),\n"
-                                   "       [e] \"rm\" (*e));\n"
-                                   "}"));
-  EXPECT_EQ(FormatStyle::LK_Cpp,
-            guessLanguage("foo.h", "void f() {\n"
-                                   "  asm volatile (\"mov %[e], %[d]\"\n"
-                                   "     : [d] \"=rm\" (d)\n"
-                                   "       [e] \"rm\" (*e));\n"
-                                   "}"));
-}
-
-TEST_F(FormatTest, GuessLanguageWithChildLines) {
-  EXPECT_EQ(FormatStyle::LK_Cpp,
-            guessLanguage("foo.h", "#define FOO ({ std::string s; })"));
-  EXPECT_EQ(FormatStyle::LK_ObjC,
-            guessLanguage("foo.h", "#define FOO ({ NSString *s; })"));
-  EXPECT_EQ(
-      FormatStyle::LK_Cpp,
-      guessLanguage("foo.h", "#define FOO ({ foo(); ({ std::string s; }) })"));
-  EXPECT_EQ(
-      FormatStyle::LK_ObjC,
-      guessLanguage("foo.h", "#define FOO ({ foo(); ({ NSString *s; }) })"));
-}
-
-TEST_F(FormatTest, TypenameMacros) {
-  std::vector<std::string> TypenameMacros = {"STACK_OF", "LIST", "TAILQ_ENTRY"};
-
-  // Test case reported in https://bugs.llvm.org/show_bug.cgi?id=30353
-  FormatStyle Google = getGoogleStyleWithColumns(0);
-  Google.TypenameMacros = TypenameMacros;
-  verifyFormat("struct foo {\n"
-               "  int bar;\n"
-               "  TAILQ_ENTRY(a) bleh;\n"
-               "};",
-               Google);
-
-  FormatStyle Macros = getLLVMStyle();
-  Macros.TypenameMacros = TypenameMacros;
-
-  verifyFormat("STACK_OF(int) a;", Macros);
-  verifyFormat("STACK_OF(int) *a;", Macros);
-  verifyFormat("STACK_OF(int const *) *a;", Macros);
-  verifyFormat("STACK_OF(int *const) *a;", Macros);
-  verifyFormat("STACK_OF(int, string) a;", Macros);
-  verifyFormat("STACK_OF(LIST(int)) a;", Macros);
-  verifyFormat("STACK_OF(LIST(int)) a, b;", Macros);
-  verifyFormat("for (LIST(int) *a = NULL; a;) {\n}", Macros);
-  verifyFormat("STACK_OF(int) f(LIST(int) *arg);", Macros);
-  verifyFormat("vector<LIST(uint64_t) *attr> x;", Macros);
-  verifyFormat("vector<LIST(uint64_t) *const> f(LIST(uint64_t) *arg);", Macros);
-
-  Macros.PointerAlignment = FormatStyle::PAS_Left;
-  verifyFormat("STACK_OF(int)* a;", Macros);
-  verifyFormat("STACK_OF(int*)* a;", Macros);
-  verifyFormat("x = (STACK_OF(uint64_t))*a;", Macros);
-  verifyFormat("x = (STACK_OF(uint64_t))&a;", Macros);
-  verifyFormat("vector<STACK_OF(uint64_t)* attr> x;", Macros);
-}
-
-TEST_F(FormatTest, AtomicQualifier) {
-  // Check that we treate _Atomic as a type and not a function call
-  FormatStyle Google = getGoogleStyleWithColumns(0);
-  verifyFormat("struct foo {\n"
-               "  int a1;\n"
-               "  _Atomic(a) a2;\n"
-               "  _Atomic(_Atomic(int) *const) a3;\n"
-               "};",
-               Google);
-  verifyFormat("_Atomic(uint64_t) a;");
-  verifyFormat("_Atomic(uint64_t) *a;");
-  verifyFormat("_Atomic(uint64_t const *) *a;");
-  verifyFormat("_Atomic(uint64_t *const) *a;");
-  verifyFormat("_Atomic(const uint64_t *) *a;");
-  verifyFormat("_Atomic(uint64_t) a;");
-  verifyFormat("_Atomic(_Atomic(uint64_t)) a;");
-  verifyFormat("_Atomic(_Atomic(uint64_t)) a, b;");
-  verifyFormat("for (_Atomic(uint64_t) *a = NULL; a;) {\n}");
-  verifyFormat("_Atomic(uint64_t) f(_Atomic(uint64_t) *arg);");
-
-  verifyFormat("_Atomic(uint64_t) *s(InitValue);");
-  verifyFormat("_Atomic(uint64_t) *s{InitValue};");
-  FormatStyle Style = getLLVMStyle();
-  Style.PointerAlignment = FormatStyle::PAS_Left;
-  verifyFormat("_Atomic(uint64_t)* s(InitValue);", Style);
-  verifyFormat("_Atomic(uint64_t)* s{InitValue};", Style);
-  verifyFormat("_Atomic(int)* a;", Style);
-  verifyFormat("_Atomic(int*)* a;", Style);
-  verifyFormat("vector<_Atomic(uint64_t)* attr> x;", Style);
-
-  Style.SpacesInCStyleCastParentheses = true;
-  Style.SpacesInParentheses = false;
-  verifyFormat("x = ( _Atomic(uint64_t) )*a;", Style);
-  Style.SpacesInCStyleCastParentheses = false;
-  Style.SpacesInParentheses = true;
-  verifyFormat("x = (_Atomic( uint64_t ))*a;", Style);
-  verifyFormat("x = (_Atomic( uint64_t ))&a;", Style);
-}
-
-TEST_F(FormatTest, AmbersandInLamda) {
-  // Test case reported in https://bugs.llvm.org/show_bug.cgi?id=41899
-  FormatStyle AlignStyle = getLLVMStyle();
-  AlignStyle.PointerAlignment = FormatStyle::PAS_Left;
-  verifyFormat("auto lambda = [&a = a]() { a = 2; };", AlignStyle);
-  AlignStyle.PointerAlignment = FormatStyle::PAS_Right;
-  verifyFormat("auto lambda = [&a = a]() { a = 2; };", AlignStyle);
-}
-
-TEST_F(FormatTest, SpacesInConditionalStatement) {
-  FormatStyle Spaces = getLLVMStyle();
-  Spaces.IfMacros.clear();
-  Spaces.IfMacros.push_back("MYIF");
-  Spaces.SpacesInConditionalStatement = true;
-  verifyFormat("for ( int i = 0; i; i++ )\n  continue;", Spaces);
-  verifyFormat("if ( !a )\n  return;", Spaces);
-  verifyFormat("if ( a )\n  return;", Spaces);
-  verifyFormat("if constexpr ( a )\n  return;", Spaces);
-  verifyFormat("MYIF ( a )\n  return;", Spaces);
-  verifyFormat("MYIF ( a )\n  return;\nelse MYIF ( b )\n  return;", Spaces);
-  verifyFormat("MYIF ( a )\n  return;\nelse\n  return;", Spaces);
-  verifyFormat("switch ( a )\ncase 1:\n  return;", Spaces);
-  verifyFormat("while ( a )\n  return;", Spaces);
-  verifyFormat("while ( (a && b) )\n  return;", Spaces);
-  verifyFormat("do {\n} while ( 1 != 0 );", Spaces);
-  verifyFormat("try {\n} catch ( const std::exception & ) {\n}", Spaces);
-  // Check that space on the left of "::" is inserted as expected at beginning
-  // of condition.
-  verifyFormat("while ( ::func() )\n  return;", Spaces);
-
-  // Check impact of ControlStatementsExceptControlMacros is honored.
-  Spaces.SpaceBeforeParens =
-      FormatStyle::SBPO_ControlStatementsExceptControlMacros;
-  verifyFormat("MYIF( a )\n  return;", Spaces);
-  verifyFormat("MYIF( a )\n  return;\nelse MYIF( b )\n  return;", Spaces);
-  verifyFormat("MYIF( a )\n  return;\nelse\n  return;", Spaces);
-}
-
-TEST_F(FormatTest, AlternativeOperators) {
-  // Test case for ensuring alternate operators are not
-  // combined with their right most neighbour.
-  verifyFormat("int a and b;");
-  verifyFormat("int a and_eq b;");
-  verifyFormat("int a bitand b;");
-  verifyFormat("int a bitor b;");
-  verifyFormat("int a compl b;");
-  verifyFormat("int a not b;");
-  verifyFormat("int a not_eq b;");
-  verifyFormat("int a or b;");
-  verifyFormat("int a xor b;");
-  verifyFormat("int a xor_eq b;");
-  verifyFormat("return this not_eq bitand other;");
-  verifyFormat("bool operator not_eq(const X bitand other)");
-
-  verifyFormat("int a and 5;");
-  verifyFormat("int a and_eq 5;");
-  verifyFormat("int a bitand 5;");
-  verifyFormat("int a bitor 5;");
-  verifyFormat("int a compl 5;");
-  verifyFormat("int a not 5;");
-  verifyFormat("int a not_eq 5;");
-  verifyFormat("int a or 5;");
-  verifyFormat("int a xor 5;");
-  verifyFormat("int a xor_eq 5;");
-
-  verifyFormat("int a compl(5);");
-  verifyFormat("int a not(5);");
-
-  /* FIXME handle alternate tokens
-   * https://en.cppreference.com/w/cpp/language/operator_alternative
-  // alternative tokens
-  verifyFormat("compl foo();");     //  ~foo();
-  verifyFormat("foo() <%%>;");      // foo();
-  verifyFormat("void foo() <%%>;"); // void foo(){}
-  verifyFormat("int a <:1:>;");     // int a[1];[
-  verifyFormat("%:define ABC abc"); // #define ABC abc
-  verifyFormat("%:%:");             // ##
-  */
-}
-
-TEST_F(FormatTest, STLWhileNotDefineChed) {
-  verifyFormat("#if defined(while)\n"
-               "#define while EMIT WARNING C4005\n"
-               "#endif // while");
-}
-
-TEST_F(FormatTest, OperatorSpacing) {
-  FormatStyle Style = getLLVMStyle();
-  Style.PointerAlignment = FormatStyle::PAS_Right;
-  verifyFormat("Foo::operator*();", Style);
-  verifyFormat("Foo::operator void *();", Style);
-  verifyFormat("Foo::operator void **();", Style);
-  verifyFormat("Foo::operator void *&();", Style);
-  verifyFormat("Foo::operator void *&&();", Style);
-  verifyFormat("Foo::operator void const *();", Style);
-  verifyFormat("Foo::operator void const **();", Style);
-  verifyFormat("Foo::operator void const *&();", Style);
-  verifyFormat("Foo::operator void const *&&();", Style);
-  verifyFormat("Foo::operator()(void *);", Style);
-  verifyFormat("Foo::operator*(void *);", Style);
-  verifyFormat("Foo::operator*();", Style);
-  verifyFormat("Foo::operator**();", Style);
-  verifyFormat("Foo::operator&();", Style);
-  verifyFormat("Foo::operator<int> *();", Style);
-  verifyFormat("Foo::operator<Foo> *();", Style);
-  verifyFormat("Foo::operator<int> **();", Style);
-  verifyFormat("Foo::operator<Foo> **();", Style);
-  verifyFormat("Foo::operator<int> &();", Style);
-  verifyFormat("Foo::operator<Foo> &();", Style);
-  verifyFormat("Foo::operator<int> &&();", Style);
-  verifyFormat("Foo::operator<Foo> &&();", Style);
-  verifyFormat("Foo::operator<int> *&();", Style);
-  verifyFormat("Foo::operator<Foo> *&();", Style);
-  verifyFormat("Foo::operator<int> *&&();", Style);
-  verifyFormat("Foo::operator<Foo> *&&();", Style);
-  verifyFormat("operator*(int (*)(), class Foo);", Style);
-
-  verifyFormat("Foo::operator&();", Style);
-  verifyFormat("Foo::operator void &();", Style);
-  verifyFormat("Foo::operator void const &();", Style);
-  verifyFormat("Foo::operator()(void &);", Style);
-  verifyFormat("Foo::operator&(void &);", Style);
-  verifyFormat("Foo::operator&();", Style);
-  verifyFormat("operator&(int (&)(), class Foo);", Style);
-
-  verifyFormat("Foo::operator&&();", Style);
-  verifyFormat("Foo::operator**();", Style);
-  verifyFormat("Foo::operator void &&();", Style);
-  verifyFormat("Foo::operator void const &&();", Style);
-  verifyFormat("Foo::operator()(void &&);", Style);
-  verifyFormat("Foo::operator&&(void &&);", Style);
-  verifyFormat("Foo::operator&&();", Style);
-  verifyFormat("operator&&(int(&&)(), class Foo);", Style);
-  verifyFormat("operator const nsTArrayRight<E> &()", Style);
-  verifyFormat("[[nodiscard]] operator const nsTArrayRight<E, Allocator> &()",
-               Style);
-  verifyFormat("operator void **()", Style);
-  verifyFormat("operator const FooRight<Object> &()", Style);
-  verifyFormat("operator const FooRight<Object> *()", Style);
-  verifyFormat("operator const FooRight<Object> **()", Style);
-  verifyFormat("operator const FooRight<Object> *&()", Style);
-  verifyFormat("operator const FooRight<Object> *&&()", Style);
-
-  Style.PointerAlignment = FormatStyle::PAS_Left;
-  verifyFormat("Foo::operator*();", Style);
-  verifyFormat("Foo::operator**();", Style);
-  verifyFormat("Foo::operator void*();", Style);
-  verifyFormat("Foo::operator void**();", Style);
-  verifyFormat("Foo::operator void*&();", Style);
-  verifyFormat("Foo::operator void*&&();", Style);
-  verifyFormat("Foo::operator void const*();", Style);
-  verifyFormat("Foo::operator void const**();", Style);
-  verifyFormat("Foo::operator void const*&();", Style);
-  verifyFormat("Foo::operator void const*&&();", Style);
-  verifyFormat("Foo::operator/*comment*/ void*();", Style);
-  verifyFormat("Foo::operator/*a*/ const /*b*/ void*();", Style);
-  verifyFormat("Foo::operator/*a*/ volatile /*b*/ void*();", Style);
-  verifyFormat("Foo::operator()(void*);", Style);
-  verifyFormat("Foo::operator*(void*);", Style);
-  verifyFormat("Foo::operator*();", Style);
-  verifyFormat("Foo::operator<int>*();", Style);
-  verifyFormat("Foo::operator<Foo>*();", Style);
-  verifyFormat("Foo::operator<int>**();", Style);
-  verifyFormat("Foo::operator<Foo>**();", Style);
-  verifyFormat("Foo::operator<Foo>*&();", Style);
-  verifyFormat("Foo::operator<int>&();", Style);
-  verifyFormat("Foo::operator<Foo>&();", Style);
-  verifyFormat("Foo::operator<int>&&();", Style);
-  verifyFormat("Foo::operator<Foo>&&();", Style);
-  verifyFormat("Foo::operator<int>*&();", Style);
-  verifyFormat("Foo::operator<Foo>*&();", Style);
-  verifyFormat("operator*(int (*)(), class Foo);", Style);
-
-  verifyFormat("Foo::operator&();", Style);
-  verifyFormat("Foo::operator void&();", Style);
-  verifyFormat("Foo::operator void const&();", Style);
-  verifyFormat("Foo::operator/*comment*/ void&();", Style);
-  verifyFormat("Foo::operator/*a*/ const /*b*/ void&();", Style);
-  verifyFormat("Foo::operator/*a*/ volatile /*b*/ void&();", Style);
-  verifyFormat("Foo::operator()(void&);", Style);
-  verifyFormat("Foo::operator&(void&);", Style);
-  verifyFormat("Foo::operator&();", Style);
-  verifyFormat("operator&(int (&)(), class Foo);", Style);
-
-  verifyFormat("Foo::operator&&();", Style);
-  verifyFormat("Foo::operator void&&();", Style);
-  verifyFormat("Foo::operator void const&&();", Style);
-  verifyFormat("Foo::operator/*comment*/ void&&();", Style);
-  verifyFormat("Foo::operator/*a*/ const /*b*/ void&&();", Style);
-  verifyFormat("Foo::operator/*a*/ volatile /*b*/ void&&();", Style);
-  verifyFormat("Foo::operator()(void&&);", Style);
-  verifyFormat("Foo::operator&&(void&&);", Style);
-  verifyFormat("Foo::operator&&();", Style);
-  verifyFormat("operator&&(int(&&)(), class Foo);", Style);
-  verifyFormat("operator const nsTArrayLeft<E>&()", Style);
-  verifyFormat("[[nodiscard]] operator const nsTArrayLeft<E, Allocator>&()",
-               Style);
-  verifyFormat("operator void**()", Style);
-  verifyFormat("operator const FooLeft<Object>&()", Style);
-  verifyFormat("operator const FooLeft<Object>*()", Style);
-  verifyFormat("operator const FooLeft<Object>**()", Style);
-  verifyFormat("operator const FooLeft<Object>*&()", Style);
-  verifyFormat("operator const FooLeft<Object>*&&()", Style);
-
-  // PR45107
-  verifyFormat("operator Vector<String>&();", Style);
-  verifyFormat("operator const Vector<String>&();", Style);
-  verifyFormat("operator foo::Bar*();", Style);
-  verifyFormat("operator const Foo<X>::Bar<Y>*();", Style);
-  verifyFormat("operator/*a*/ const /*b*/ Foo /*c*/<X> /*d*/ ::Bar<Y>*();",
-               Style);
-
-  Style.PointerAlignment = FormatStyle::PAS_Middle;
-  verifyFormat("Foo::operator*();", Style);
-  verifyFormat("Foo::operator void *();", Style);
-  verifyFormat("Foo::operator()(void *);", Style);
-  verifyFormat("Foo::operator*(void *);", Style);
-  verifyFormat("Foo::operator*();", Style);
-  verifyFormat("operator*(int (*)(), class Foo);", Style);
-
-  verifyFormat("Foo::operator&();", Style);
-  verifyFormat("Foo::operator void &();", Style);
-  verifyFormat("Foo::operator void const &();", Style);
-  verifyFormat("Foo::operator()(void &);", Style);
-  verifyFormat("Foo::operator&(void &);", Style);
-  verifyFormat("Foo::operator&();", Style);
-  verifyFormat("operator&(int (&)(), class Foo);", Style);
-
-  verifyFormat("Foo::operator&&();", Style);
-  verifyFormat("Foo::operator void &&();", Style);
-  verifyFormat("Foo::operator void const &&();", Style);
-  verifyFormat("Foo::operator()(void &&);", Style);
-  verifyFormat("Foo::operator&&(void &&);", Style);
-  verifyFormat("Foo::operator&&();", Style);
-  verifyFormat("operator&&(int(&&)(), class Foo);", Style);
-}
-
-TEST_F(FormatTest, OperatorPassedAsAFunctionPtr) {
-  FormatStyle Style = getLLVMStyle();
-  // PR46157
-  verifyFormat("foo(operator+, -42);", Style);
-  verifyFormat("foo(operator++, -42);", Style);
-  verifyFormat("foo(operator--, -42);", Style);
-  verifyFormat("foo(-42, operator--);", Style);
-  verifyFormat("foo(-42, operator, );", Style);
-  verifyFormat("foo(operator, , -42);", Style);
-}
-
-TEST_F(FormatTest, WhitespaceSensitiveMacros) {
-  FormatStyle Style = getLLVMStyle();
-  Style.WhitespaceSensitiveMacros.push_back("FOO");
-
-  // Don't use the helpers here, since 'mess up' will change the whitespace
-  // and these are all whitespace sensitive by definition
-  EXPECT_EQ("FOO(String-ized&Messy+But(: :Still)=Intentional);",
-            format("FOO(String-ized&Messy+But(: :Still)=Intentional);", Style));
-  EXPECT_EQ(
-      "FOO(String-ized&Messy+But\\(: :Still)=Intentional);",
-      format("FOO(String-ized&Messy+But\\(: :Still)=Intentional);", Style));
-  EXPECT_EQ("FOO(String-ized&Messy+But,: :Still=Intentional);",
-            format("FOO(String-ized&Messy+But,: :Still=Intentional);", Style));
-  EXPECT_EQ("FOO(String-ized&Messy+But,: :\n"
-            "       Still=Intentional);",
-            format("FOO(String-ized&Messy+But,: :\n"
-                   "       Still=Intentional);",
-                   Style));
-  Style.AlignConsecutiveAssignments = FormatStyle::ACS_Consecutive;
-  EXPECT_EQ("FOO(String-ized=&Messy+But,: :\n"
-            "       Still=Intentional);",
-            format("FOO(String-ized=&Messy+But,: :\n"
-                   "       Still=Intentional);",
-                   Style));
-
-  Style.ColumnLimit = 21;
-  EXPECT_EQ("FOO(String-ized&Messy+But: :Still=Intentional);",
-            format("FOO(String-ized&Messy+But: :Still=Intentional);", Style));
-}
-
-TEST_F(FormatTest, VeryLongNamespaceCommentSplit) {
-  // These tests are not in NamespaceFixer because that doesn't
-  // test its interaction with line wrapping
-  FormatStyle Style = getLLVMStyle();
-  Style.ColumnLimit = 80;
-  verifyFormat("namespace {\n"
-               "int i;\n"
-               "int j;\n"
-               "} // namespace",
-               Style);
-
-  verifyFormat("namespace AAA {\n"
-               "int i;\n"
-               "int j;\n"
-               "} // namespace AAA",
-               Style);
-
-  EXPECT_EQ("namespace Averyveryveryverylongnamespace {\n"
-            "int i;\n"
-            "int j;\n"
-            "} // namespace Averyveryveryverylongnamespace",
-            format("namespace Averyveryveryverylongnamespace {\n"
-                   "int i;\n"
-                   "int j;\n"
-                   "}",
-                   Style));
-
-  EXPECT_EQ(
-      "namespace "
-      "would::it::save::you::a::lot::of::time::if_::i::just::gave::up::and_::\n"
-      "    went::mad::now {\n"
-      "int i;\n"
-      "int j;\n"
-      "} // namespace\n"
-      "  // "
-      "would::it::save::you::a::lot::of::time::if_::i::just::gave::up::and_::"
-      "went::mad::now",
-      format("namespace "
-             "would::it::save::you::a::lot::of::time::if_::i::"
-             "just::gave::up::and_::went::mad::now {\n"
-             "int i;\n"
-             "int j;\n"
-             "}",
-             Style));
-
-  // This used to duplicate the comment again and again on subsequent runs
-  EXPECT_EQ(
-      "namespace "
-      "would::it::save::you::a::lot::of::time::if_::i::just::gave::up::and_::\n"
-      "    went::mad::now {\n"
-      "int i;\n"
-      "int j;\n"
-      "} // namespace\n"
-      "  // "
-      "would::it::save::you::a::lot::of::time::if_::i::just::gave::up::and_::"
-      "went::mad::now",
-      format("namespace "
-             "would::it::save::you::a::lot::of::time::if_::i::"
-             "just::gave::up::and_::went::mad::now {\n"
-             "int i;\n"
-             "int j;\n"
-             "} // namespace\n"
-             "  // "
-             "would::it::save::you::a::lot::of::time::if_::i::just::gave::up::"
-             "and_::went::mad::now",
-             Style));
-}
-
-TEST_F(FormatTest, LikelyUnlikely) {
-  FormatStyle Style = getLLVMStyle();
-
-  verifyFormat("if (argc > 5) [[unlikely]] {\n"
-               "  return 29;\n"
-               "}",
-               Style);
-
-  verifyFormat("if (argc > 5) [[likely]] {\n"
-               "  return 29;\n"
-               "}",
-               Style);
-
-  verifyFormat("if (argc > 5) [[unlikely]] {\n"
-               "  return 29;\n"
-               "} else [[likely]] {\n"
-               "  return 42;\n"
-               "}\n",
-               Style);
-
-  verifyFormat("if (argc > 5) [[unlikely]] {\n"
-               "  return 29;\n"
-               "} else if (argc > 10) [[likely]] {\n"
-               "  return 99;\n"
-               "} else {\n"
-               "  return 42;\n"
-               "}\n",
-               Style);
-
-  verifyFormat("if (argc > 5) [[gnu::unused]] {\n"
-               "  return 29;\n"
-               "}",
-               Style);
-}
-
-TEST_F(FormatTest, PenaltyIndentedWhitespace) {
-  verifyFormat("Constructor()\n"
-               "    : aaaaaa(aaaaaa), aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(\n"
-               "                          aaaa(aaaaaaaaaaaaaaaaaa, "
-               "aaaaaaaaaaaaaaaaaat))");
-  verifyFormat("Constructor()\n"
-               "    : aaaaaaaaaaaaa(aaaaaa), "
-               "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaaaaa)");
-
-  FormatStyle StyleWithWhitespacePenalty = getLLVMStyle();
-  StyleWithWhitespacePenalty.PenaltyIndentedWhitespace = 5;
-  verifyFormat("Constructor()\n"
-               "    : aaaaaa(aaaaaa),\n"
-               "      aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(\n"
-               "          aaaa(aaaaaaaaaaaaaaaaaa, aaaaaaaaaaaaaaaaaat))",
-               StyleWithWhitespacePenalty);
-  verifyFormat("Constructor()\n"
-               "    : aaaaaaaaaaaaa(aaaaaa), "
-               "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaaaaa)",
-               StyleWithWhitespacePenalty);
-}
-
-TEST_F(FormatTest, LLVMDefaultStyle) {
-  FormatStyle Style = getLLVMStyle();
-  verifyFormat("extern \"C\" {\n"
-               "int foo();\n"
-               "}",
-               Style);
-}
-TEST_F(FormatTest, GNUDefaultStyle) {
-  FormatStyle Style = getGNUStyle();
-  verifyFormat("extern \"C\"\n"
-               "{\n"
-               "  int foo ();\n"
-               "}",
-               Style);
-}
-TEST_F(FormatTest, MozillaDefaultStyle) {
-  FormatStyle Style = getMozillaStyle();
-  verifyFormat("extern \"C\"\n"
-               "{\n"
-               "  int foo();\n"
-               "}",
-               Style);
-}
-TEST_F(FormatTest, GoogleDefaultStyle) {
-  FormatStyle Style = getGoogleStyle();
-  verifyFormat("extern \"C\" {\n"
-               "int foo();\n"
-               "}",
-               Style);
-}
-TEST_F(FormatTest, ChromiumDefaultStyle) {
-  FormatStyle Style = getChromiumStyle(FormatStyle::LanguageKind::LK_Cpp);
-  verifyFormat("extern \"C\" {\n"
-               "int foo();\n"
-               "}",
-               Style);
-}
-TEST_F(FormatTest, MicrosoftDefaultStyle) {
-  FormatStyle Style = getMicrosoftStyle(FormatStyle::LanguageKind::LK_Cpp);
-  verifyFormat("extern \"C\"\n"
-               "{\n"
-               "    int foo();\n"
-               "}",
-               Style);
-}
-TEST_F(FormatTest, WebKitDefaultStyle) {
-  FormatStyle Style = getWebKitStyle();
-  verifyFormat("extern \"C\" {\n"
-               "int foo();\n"
-               "}",
-               Style);
-}
-
-TEST_F(FormatTest, ConceptsAndRequires) {
-  FormatStyle Style = getLLVMStyle();
-  Style.AllowShortFunctionsOnASingleLine = FormatStyle::SFS_None;
-
-  verifyFormat("template <typename T>\n"
-               "concept Hashable = requires(T a) {\n"
-               "  { std::hash<T>{}(a) } -> std::convertible_to<std::size_t>;\n"
-               "};",
-               Style);
-  verifyFormat("template <typename T>\n"
-               "concept EqualityComparable = requires(T a, T b) {\n"
-               "  { a == b } -> bool;\n"
-               "};",
-               Style);
-  verifyFormat("template <typename T>\n"
-               "concept EqualityComparable = requires(T a, T b) {\n"
-               "  { a == b } -> bool;\n"
-               "  { a != b } -> bool;\n"
-               "};",
-               Style);
-  verifyFormat("template <typename T>\n"
-               "concept EqualityComparable = requires(T a, T b) {\n"
-               "  { a == b } -> bool;\n"
-               "  { a != b } -> bool;\n"
-               "};",
-               Style);
-
-  verifyFormat("template <typename It>\n"
-               "requires Iterator<It>\n"
-               "void sort(It begin, It end) {\n"
-               "  //....\n"
-               "}",
-               Style);
-
-  verifyFormat("template <typename T>\n"
-               "concept Large = sizeof(T) > 10;",
-               Style);
-
-  verifyFormat("template <typename T, typename U>\n"
-               "concept FooableWith = requires(T t, U u) {\n"
-               "  typename T::foo_type;\n"
-               "  { t.foo(u) } -> typename T::foo_type;\n"
-               "  t++;\n"
-               "};\n"
-               "void doFoo(FooableWith<int> auto t) {\n"
-               "  t.foo(3);\n"
-               "}",
-               Style);
-  verifyFormat("template <typename T>\n"
-               "concept Context = sizeof(T) == 1;",
-               Style);
-  verifyFormat("template <typename T>\n"
-               "concept Context = is_specialization_of_v<context, T>;",
-               Style);
-  verifyFormat("template <typename T>\n"
-               "concept Node = std::is_object_v<T>;",
-               Style);
-  verifyFormat("template <typename T>\n"
-               "concept Tree = true;",
-               Style);
-
-  verifyFormat("template <typename T> int g(T i) requires Concept1<I> {\n"
-               "  //...\n"
-               "}",
-               Style);
-
-  verifyFormat(
-      "template <typename T> int g(T i) requires Concept1<I> && Concept2<I> {\n"
-      "  //...\n"
-      "}",
-      Style);
-
-  verifyFormat(
-      "template <typename T> int g(T i) requires Concept1<I> || Concept2<I> {\n"
-      "  //...\n"
-      "}",
-      Style);
-
-  verifyFormat("template <typename T>\n"
-               "veryveryvery_long_return_type g(T i) requires Concept1<I> || "
-               "Concept2<I> {\n"
-               "  //...\n"
-               "}",
-               Style);
-
-  verifyFormat("template <typename T>\n"
-               "veryveryvery_long_return_type g(T i) requires Concept1<I> && "
-               "Concept2<I> {\n"
-               "  //...\n"
-               "}",
-               Style);
-
-  verifyFormat(
-      "template <typename T>\n"
-      "veryveryvery_long_return_type g(T i) requires Concept1 && Concept2 {\n"
-      "  //...\n"
-      "}",
-      Style);
-
-  verifyFormat(
-      "template <typename T>\n"
-      "veryveryvery_long_return_type g(T i) requires Concept1 || Concept2 {\n"
-      "  //...\n"
-      "}",
-      Style);
-
-  verifyFormat("template <typename It>\n"
-               "requires Foo<It>() && Bar<It> {\n"
-               "  //....\n"
-               "}",
-               Style);
-
-  verifyFormat("template <typename It>\n"
-               "requires Foo<Bar<It>>() && Bar<Foo<It, It>> {\n"
-               "  //....\n"
-               "}",
-               Style);
-
-  verifyFormat("template <typename It>\n"
-               "requires Foo<Bar<It, It>>() && Bar<Foo<It, It>> {\n"
-               "  //....\n"
-               "}",
-               Style);
-
-  verifyFormat(
-      "template <typename It>\n"
-      "requires Foo<Bar<It>, Baz<It>>() && Bar<Foo<It>, Baz<It, It>> {\n"
-      "  //....\n"
-      "}",
-      Style);
-
-  Style.IndentRequires = true;
-  verifyFormat("template <typename It>\n"
-               "  requires Iterator<It>\n"
-               "void sort(It begin, It end) {\n"
-               "  //....\n"
-               "}",
-               Style);
-  verifyFormat("template <std::size index_>\n"
-               "  requires(index_ < sizeof...(Children_))\n"
-               "Tree auto &child() {\n"
-               "  // ...\n"
-               "}",
-               Style);
-
-  Style.SpaceBeforeParens = FormatStyle::SBPO_Always;
-  verifyFormat("template <typename T>\n"
-               "concept Hashable = requires (T a) {\n"
-               "  { std::hash<T>{}(a) } -> std::convertible_to<std::size_t>;\n"
-               "};",
-               Style);
-
-  verifyFormat("template <class T = void>\n"
-               "  requires EqualityComparable<T> || Same<T, void>\n"
-               "struct equal_to;",
-               Style);
-
-  verifyFormat("template <class T>\n"
-               "  requires requires {\n"
-               "    T{};\n"
-               "    T (int);\n"
-               "  }\n",
-               Style);
-
-  Style.ColumnLimit = 78;
-  verifyFormat("template <typename T>\n"
-               "concept Context = Traits<typename T::traits_type> and\n"
-               "    Interface<typename T::interface_type> and\n"
-               "    Request<typename T::request_type> and\n"
-               "    Response<typename T::response_type> and\n"
-               "    ContextExtension<typename T::extension_type> and\n"
-               "    ::std::is_copy_constructable<T> and "
-               "::std::is_move_constructable<T> and\n"
-               "    requires (T c) {\n"
-               "  { c.response; } -> Response;\n"
-               "} and requires (T c) {\n"
-               "  { c.request; } -> Request;\n"
-               "}\n",
-               Style);
-
-  verifyFormat("template <typename T>\n"
-               "concept Context = Traits<typename T::traits_type> or\n"
-               "    Interface<typename T::interface_type> or\n"
-               "    Request<typename T::request_type> or\n"
-               "    Response<typename T::response_type> or\n"
-               "    ContextExtension<typename T::extension_type> or\n"
-               "    ::std::is_copy_constructable<T> or "
-               "::std::is_move_constructable<T> or\n"
-               "    requires (T c) {\n"
-               "  { c.response; } -> Response;\n"
-               "} or requires (T c) {\n"
-               "  { c.request; } -> Request;\n"
-               "}\n",
-               Style);
-
-  verifyFormat("template <typename T>\n"
-               "concept Context = Traits<typename T::traits_type> &&\n"
-               "    Interface<typename T::interface_type> &&\n"
-               "    Request<typename T::request_type> &&\n"
-               "    Response<typename T::response_type> &&\n"
-               "    ContextExtension<typename T::extension_type> &&\n"
-               "    ::std::is_copy_constructable<T> && "
-               "::std::is_move_constructable<T> &&\n"
-               "    requires (T c) {\n"
-               "  { c.response; } -> Response;\n"
-               "} && requires (T c) {\n"
-               "  { c.request; } -> Request;\n"
-               "}\n",
-               Style);
-
-  verifyFormat("template <typename T>\nconcept someConcept = Constraint1<T> && "
-               "Constraint2<T>;");
-
-  Style.BreakBeforeBraces = FormatStyle::BS_Custom;
-  Style.BraceWrapping.AfterFunction = true;
-  Style.BraceWrapping.AfterClass = true;
-  Style.AlwaysBreakTemplateDeclarations = FormatStyle::BTDS_Yes;
-  Style.BreakConstructorInitializers = FormatStyle::BCIS_BeforeColon;
-  verifyFormat("void Foo () requires (std::copyable<T>)\n"
-               "{\n"
-               "  return\n"
-               "}\n",
-               Style);
-
-  verifyFormat("void Foo () requires std::copyable<T>\n"
-               "{\n"
-               "  return\n"
-               "}\n",
-               Style);
-
-  verifyFormat("template <std::semiregular F, std::semiregular... Args>\n"
-               "  requires (std::invocable<F, std::invoke_result_t<Args>...>)\n"
-               "struct constant;",
-               Style);
-
-  verifyFormat("template <std::semiregular F, std::semiregular... Args>\n"
-               "  requires std::invocable<F, std::invoke_result_t<Args>...>\n"
-               "struct constant;",
-               Style);
-
-  verifyFormat("template <class T>\n"
-               "class plane_with_very_very_very_long_name\n"
-               "{\n"
-               "  constexpr plane_with_very_very_very_long_name () requires "
-               "std::copyable<T>\n"
-               "      : plane_with_very_very_very_long_name (1)\n"
-               "  {\n"
-               "  }\n"
-               "}\n",
-               Style);
-
-  verifyFormat("template <class T>\n"
-               "class plane_with_long_name\n"
-               "{\n"
-               "  constexpr plane_with_long_name () requires std::copyable<T>\n"
-               "      : plane_with_long_name (1)\n"
-               "  {\n"
-               "  }\n"
-               "}\n",
-               Style);
-
-  Style.BreakBeforeConceptDeclarations = false;
-  verifyFormat("template <typename T> concept Tree = true;", Style);
-
-  Style.IndentRequires = false;
-  verifyFormat("template <std::semiregular F, std::semiregular... Args>\n"
-               "requires (std::invocable<F, std::invoke_result_t<Args>...>) "
-               "struct constant;",
-               Style);
-}
-
-TEST_F(FormatTest, StatementAttributeLikeMacros) {
-  FormatStyle Style = getLLVMStyle();
-  StringRef Source = "void Foo::slot() {\n"
-                     "  unsigned char MyChar = 'x';\n"
-                     "  emit signal(MyChar);\n"
-                     "  Q_EMIT signal(MyChar);\n"
-                     "}";
-
-  EXPECT_EQ(Source, format(Source, Style));
-
-  Style.AlignConsecutiveDeclarations = FormatStyle::ACS_Consecutive;
-  EXPECT_EQ("void Foo::slot() {\n"
-            "  unsigned char MyChar = 'x';\n"
-            "  emit          signal(MyChar);\n"
-            "  Q_EMIT signal(MyChar);\n"
-            "}",
-            format(Source, Style));
-
-  Style.StatementAttributeLikeMacros.push_back("emit");
-  EXPECT_EQ(Source, format(Source, Style));
-
-  Style.StatementAttributeLikeMacros = {};
-  EXPECT_EQ("void Foo::slot() {\n"
-            "  unsigned char MyChar = 'x';\n"
-            "  emit          signal(MyChar);\n"
-            "  Q_EMIT        signal(MyChar);\n"
-            "}",
-            format(Source, Style));
-}
-
-TEST_F(FormatTest, IndentAccessModifiers) {
-  FormatStyle Style = getLLVMStyle();
-  Style.IndentAccessModifiers = true;
-  // Members are *two* levels below the record;
-  // Style.IndentWidth == 2, thus yielding a 4 spaces wide indentation.
-  verifyFormat("class C {\n"
-               "    int i;\n"
-               "};\n",
-               Style);
-  verifyFormat("union C {\n"
-               "    int i;\n"
-               "    unsigned u;\n"
-               "};\n",
-               Style);
-  // Access modifiers should be indented one level below the record.
-  verifyFormat("class C {\n"
-               "  public:\n"
-               "    int i;\n"
-               "};\n",
-               Style);
-  verifyFormat("struct S {\n"
-               "  private:\n"
-               "    class C {\n"
-               "        int j;\n"
-               "\n"
-               "      public:\n"
-               "        C();\n"
-               "    };\n"
-               "\n"
-               "  public:\n"
-               "    int i;\n"
-               "};\n",
-               Style);
-  // Enumerations are not records and should be unaffected.
-  Style.AllowShortEnumsOnASingleLine = false;
-  verifyFormat("enum class E\n"
-               "{\n"
-               "  A,\n"
-               "  B\n"
-               "};\n",
-               Style);
-  // Test with a different indentation width;
-  // also proves that the result is Style.AccessModifierOffset agnostic.
-  Style.IndentWidth = 3;
-  verifyFormat("class C {\n"
-               "   public:\n"
-               "      int i;\n"
-               "};\n",
-               Style);
-}
-
-TEST_F(FormatTest, LimitlessStringsAndComments) {
-  auto Style = getLLVMStyleWithColumns(0);
-  constexpr StringRef Code =
-      "/**\n"
-      " * This is a multiline comment with quite some long lines, at least for "
-      "the LLVM Style.\n"
-      " * We will redo this with strings and line comments. Just to  check if "
-      "everything is working.\n"
-      " */\n"
-      "bool foo() {\n"
-      "  /* Single line multi line comment. */\n"
-      "  const std::string String = \"This is a multiline string with quite "
-      "some long lines, at least for the LLVM Style.\"\n"
-      "                             \"We already did it with multi line "
-      "comments, and we will do it with line comments. Just to check if "
-      "everything is working.\";\n"
-      "  // This is a line comment (block) with quite some long lines, at "
-      "least for the LLVM Style.\n"
-      "  // We already did this with multi line comments and strings. Just to "
-      "check if everything is working.\n"
-      "  const std::string SmallString = \"Hello World\";\n"
-      "  // Small line comment\n"
-      "  return String.size() > SmallString.size();\n"
-      "}";
-  EXPECT_EQ(Code, format(Code, Style));
-}
-} // namespace
-} // namespace format
-} // namespace clang
diff --git a/gnu/llvm/clang/unittests/Format/FormatTestCSharp.cpp b/gnu/llvm/clang/unittests/Format/FormatTestCSharp.cpp
deleted file mode 100644
index 3c990339cf7..00000000000
--- a/gnu/llvm/clang/unittests/Format/FormatTestCSharp.cpp
+++ /dev/null
@@ -1,1104 +0,0 @@
-//===- unittest/Format/FormatTestCSharp.cpp - Formatting tests for CSharp -===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "FormatTestUtils.h"
-#include "clang/Format/Format.h"
-#include "llvm/Support/Debug.h"
-#include "gtest/gtest.h"
-
-#define DEBUG_TYPE "format-test"
-
-namespace clang {
-namespace format {
-
-class FormatTestCSharp : public ::testing::Test {
-protected:
-  static std::string format(llvm::StringRef Code, unsigned Offset,
-                            unsigned Length, const FormatStyle &Style) {
-    LLVM_DEBUG(llvm::errs() << "---\n");
-    LLVM_DEBUG(llvm::errs() << Code << "\n\n");
-    std::vector<tooling::Range> Ranges(1, tooling::Range(Offset, Length));
-    tooling::Replacements Replaces = reformat(Style, Code, Ranges);
-    auto Result = applyAllReplacements(Code, Replaces);
-    EXPECT_TRUE(static_cast<bool>(Result));
-    LLVM_DEBUG(llvm::errs() << "\n" << *Result << "\n\n");
-    return *Result;
-  }
-
-  static std::string
-  format(llvm::StringRef Code,
-         const FormatStyle &Style = getMicrosoftStyle(FormatStyle::LK_CSharp)) {
-    return format(Code, 0, Code.size(), Style);
-  }
-
-  static FormatStyle getStyleWithColumns(unsigned ColumnLimit) {
-    FormatStyle Style = getMicrosoftStyle(FormatStyle::LK_CSharp);
-    Style.ColumnLimit = ColumnLimit;
-    return Style;
-  }
-
-  static void verifyFormat(
-      llvm::StringRef Code,
-      const FormatStyle &Style = getMicrosoftStyle(FormatStyle::LK_CSharp)) {
-    EXPECT_EQ(Code.str(), format(Code, Style)) << "Expected code is not stable";
-    EXPECT_EQ(Code.str(), format(test::messUp(Code), Style));
-  }
-};
-
-TEST_F(FormatTestCSharp, CSharpClass) {
-  verifyFormat("public class SomeClass\n"
-               "{\n"
-               "    void f()\n"
-               "    {\n"
-               "    }\n"
-               "    int g()\n"
-               "    {\n"
-               "        return 0;\n"
-               "    }\n"
-               "    void h()\n"
-               "    {\n"
-               "        while (true)\n"
-               "            f();\n"
-               "        for (;;)\n"
-               "            f();\n"
-               "        if (true)\n"
-               "            f();\n"
-               "    }\n"
-               "}");
-
-  // Ensure that small and empty classes are handled correctly with condensed
-  // (Google C++-like) brace-breaking style.
-  FormatStyle Style = getGoogleStyle(FormatStyle::LK_CSharp);
-  Style.BreakBeforeBraces = FormatStyle::BS_Attach;
-
-  verifyFormat("public class SomeEmptyClass {}", Style);
-
-  verifyFormat("public class SomeTinyClass {\n"
-               "  int X;\n"
-               "}",
-               Style);
-  verifyFormat("private class SomeTinyClass {\n"
-               "  int X;\n"
-               "}",
-               Style);
-  verifyFormat("protected class SomeTinyClass {\n"
-               "  int X;\n"
-               "}",
-               Style);
-  verifyFormat("internal class SomeTinyClass {\n"
-               "  int X;\n"
-               "}",
-               Style);
-}
-
-TEST_F(FormatTestCSharp, AccessModifiers) {
-  verifyFormat("public String toString()\n"
-               "{\n"
-               "}");
-  verifyFormat("private String toString()\n"
-               "{\n"
-               "}");
-  verifyFormat("protected String toString()\n"
-               "{\n"
-               "}");
-  verifyFormat("internal String toString()\n"
-               "{\n"
-               "}");
-
-  verifyFormat("public override String toString()\n"
-               "{\n"
-               "}");
-  verifyFormat("private override String toString()\n"
-               "{\n"
-               "}");
-  verifyFormat("protected override String toString()\n"
-               "{\n"
-               "}");
-  verifyFormat("internal override String toString()\n"
-               "{\n"
-               "}");
-
-  verifyFormat("internal static String toString()\n"
-               "{\n"
-               "}");
-}
-
-TEST_F(FormatTestCSharp, NoStringLiteralBreaks) {
-  verifyFormat("foo("
-               "\"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
-               "aaaaaa\");");
-}
-
-TEST_F(FormatTestCSharp, CSharpVerbatiumStringLiterals) {
-  verifyFormat("foo(@\"aaaaaaaa\\abc\\aaaa\");");
-  // @"ABC\" + ToString("B") - handle embedded \ in literal string at
-  // the end
-  //
-  /*
-   * After removal of Lexer change we are currently not able
-   * To handle these cases
-   verifyFormat("string s = @\"ABC\\\" + ToString(\"B\");");
-   verifyFormat("string s = @\"ABC\"\"DEF\"\"GHI\"");
-   verifyFormat("string s = @\"ABC\"\"DEF\"\"\"");
-   verifyFormat("string s = @\"ABC\"\"DEF\"\"\" + abc");
-  */
-}
-
-TEST_F(FormatTestCSharp, CSharpInterpolatedStringLiterals) {
-  verifyFormat("foo($\"aaaaaaaa{aaa}aaaa\");");
-  verifyFormat("foo($\"aaaa{A}\");");
-  verifyFormat(
-      "foo($\"aaaa{A}"
-      "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\");");
-  verifyFormat("Name = $\"{firstName} {lastName}\";");
-
-  // $"ABC\" + ToString("B") - handle embedded \ in literal string at
-  // the end
-  verifyFormat("string s = $\"A{abc}BC\" + ToString(\"B\");");
-  verifyFormat("$\"{domain}\\\\{user}\"");
-  verifyFormat(
-      "var verbatimInterpolated = $@\"C:\\Users\\{userName}\\Documents\\\";");
-}
-
-TEST_F(FormatTestCSharp, CSharpFatArrows) {
-  verifyFormat("Task serverTask = Task.Run(async() => {");
-  verifyFormat("public override string ToString() => \"{Name}\\{Age}\";");
-}
-
-TEST_F(FormatTestCSharp, CSharpConditionalExpressions) {
-  FormatStyle Style = getGoogleStyle(FormatStyle::LK_CSharp);
-  // conditional expression is not seen as a NullConditional.
-  verifyFormat("var y = A < B ? -1 : 1;", Style);
-}
-
-TEST_F(FormatTestCSharp, CSharpNullConditional) {
-  FormatStyle Style = getGoogleStyle(FormatStyle::LK_CSharp);
-  Style.SpaceBeforeParens = FormatStyle::SBPO_Always;
-
-  verifyFormat(
-      "public Person(string firstName, string lastName, int? age = null)");
-
-  verifyFormat("foo () {\n"
-               "  switch (args?.Length) {}\n"
-               "}",
-               Style);
-
-  verifyFormat("switch (args?.Length) {}", Style);
-
-  verifyFormat("public static void Main(string[] args)\n"
-               "{\n"
-               "    string dirPath = args?[0];\n"
-               "}");
-
-  Style.SpaceBeforeParens = FormatStyle::SBPO_Never;
-
-  verifyFormat("switch(args?.Length) {}", Style);
-}
-
-TEST_F(FormatTestCSharp, Attributes) {
-  verifyFormat("[STAThread]\n"
-               "static void Main(string[] args)\n"
-               "{\n"
-               "}");
-
-  verifyFormat("[TestMethod]\n"
-               "private class Test\n"
-               "{\n"
-               "}");
-
-  verifyFormat("[TestMethod]\n"
-               "protected class Test\n"
-               "{\n"
-               "}");
-
-  verifyFormat("[TestMethod]\n"
-               "internal class Test\n"
-               "{\n"
-               "}");
-
-  verifyFormat("[TestMethod]\n"
-               "class Test\n"
-               "{\n"
-               "}");
-
-  verifyFormat("[TestMethod]\n"
-               "[DeploymentItem(\"Test.txt\")]\n"
-               "public class Test\n"
-               "{\n"
-               "}");
-
-  verifyFormat("[System.AttributeUsage(System.AttributeTargets.Method)]\n"
-               "[System.Runtime.InteropServices.ComVisible(true)]\n"
-               "public sealed class STAThreadAttribute : Attribute\n"
-               "{\n"
-               "}");
-
-  verifyFormat("[Verb(\"start\", HelpText = \"Starts the server listening on "
-               "provided port\")]\n"
-               "class Test\n"
-               "{\n"
-               "}");
-
-  verifyFormat("[TestMethod]\n"
-               "public string Host { set; get; }");
-
-  // Adjacent properties should not cause line wrapping issues
-  verifyFormat("[JsonProperty(\"foo\")]\n"
-               "public string Foo { set; get; }\n"
-               "[JsonProperty(\"bar\")]\n"
-               "public string Bar { set; get; }\n"
-               "[JsonProperty(\"bar\")]\n"
-               "protected string Bar { set; get; }\n"
-               "[JsonProperty(\"bar\")]\n"
-               "internal string Bar { set; get; }");
-
-  // Multiple attributes should always be split (not just the first ones)
-  verifyFormat("[XmlIgnore]\n"
-               "[JsonProperty(\"foo\")]\n"
-               "public string Foo { set; get; }");
-
-  verifyFormat("[XmlIgnore]\n"
-               "[JsonProperty(\"foo\")]\n"
-               "public string Foo { set; get; }\n"
-               "[XmlIgnore]\n"
-               "[JsonProperty(\"bar\")]\n"
-               "public string Bar { set; get; }");
-
-  verifyFormat("[XmlIgnore]\n"
-               "[ScriptIgnore]\n"
-               "[JsonProperty(\"foo\")]\n"
-               "public string Foo { set; get; }\n"
-               "[XmlIgnore]\n"
-               "[ScriptIgnore]\n"
-               "[JsonProperty(\"bar\")]\n"
-               "public string Bar { set; get; }");
-
-  verifyFormat("[TestMethod(\"start\", HelpText = \"Starts the server "
-               "listening on provided host\")]\n"
-               "public string Host { set; get; }");
-
-  verifyFormat(
-      "[DllImport(\"Hello\", EntryPoint = \"hello_world\")]\n"
-      "// The const char* returned by hello_world must not be deleted.\n"
-      "private static extern IntPtr HelloFromCpp();)");
-
-  // Class attributes go on their own line and do not affect layout of
-  // interfaces. Line wrapping decisions previously caused each interface to be
-  // on its own line.
-  verifyFormat("[SomeAttribute]\n"
-               "[SomeOtherAttribute]\n"
-               "public class A : IShape, IAnimal, IVehicle\n"
-               "{\n"
-               "    int X;\n"
-               "}");
-
-  // Attributes in a method declaration do not cause line wrapping.
-  verifyFormat("void MethodA([In][Out] ref double x)\n"
-               "{\n"
-               "}");
-
-  verifyFormat("void MethodA([In, Out] ref double x)\n"
-               "{\n"
-               "}");
-
-  verifyFormat("void MethodA([In, Out] double[] x)\n"
-               "{\n"
-               "}");
-
-  verifyFormat("void MethodA([In] double[] x)\n"
-               "{\n"
-               "}");
-
-  verifyFormat("void MethodA(int[] x)\n"
-               "{\n"
-               "}");
-  verifyFormat("void MethodA(int[][] x)\n"
-               "{\n"
-               "}");
-  verifyFormat("void MethodA([] x)\n"
-               "{\n"
-               "}");
-
-  verifyFormat("public void Log([CallerLineNumber] int line = -1, "
-               "[CallerFilePath] string path = null,\n"
-               "                [CallerMemberName] string name = null)\n"
-               "{\n"
-               "}");
-
-  // [] in an attribute do not cause premature line wrapping or indenting.
-  verifyFormat(R"(//
-public class A
-{
-    [SomeAttribute(new[] { RED, GREEN, BLUE }, -1.0f, 1.0f)]
-    [DoNotSerialize]
-    public Data MemberVariable;
-})");
-
-  //  Unwrappable lines go on a line of their own.
-  // 'target:' is not treated as a label.
-  // Modify Style to enforce a column limit.
-  FormatStyle Style = getGoogleStyle(FormatStyle::LK_CSharp);
-  Style.ColumnLimit = 10;
-  verifyFormat(R"([assembly:InternalsVisibleTo(
-    "SomeAssembly, PublicKey=SomePublicKeyThatExceedsTheColumnLimit")])",
-               Style);
-}
-
-TEST_F(FormatTestCSharp, CSharpUsing) {
-  FormatStyle Style = getGoogleStyle(FormatStyle::LK_CSharp);
-  Style.SpaceBeforeParens = FormatStyle::SBPO_Always;
-  verifyFormat("public void foo () {\n"
-               "  using (StreamWriter sw = new StreamWriter (filenameA)) {}\n"
-               "  using () {}\n"
-               "}",
-               Style);
-
-  // Ensure clang-format affects top-level snippets correctly.
-  verifyFormat("using (StreamWriter sw = new StreamWriter (filenameB)) {}",
-               Style);
-
-  Style.SpaceBeforeParens = FormatStyle::SBPO_Never;
-  verifyFormat("public void foo() {\n"
-               "  using(StreamWriter sw = new StreamWriter(filenameB)) {}\n"
-               "  using() {}\n"
-               "}",
-               Style);
-
-  // Ensure clang-format affects top-level snippets correctly.
-  verifyFormat("using(StreamWriter sw = new StreamWriter(filenameB)) {}",
-               Style);
-
-  Style.SpaceBeforeParens = FormatStyle::SBPO_ControlStatements;
-  verifyFormat("public void foo() {\n"
-               "  using (StreamWriter sw = new StreamWriter(filenameA)) {}\n"
-               "  using () {}\n"
-               "}",
-               Style);
-
-  // Ensure clang-format affects top-level snippets correctly.
-  verifyFormat("using (StreamWriter sw = new StreamWriter(filenameB)) {}",
-               Style);
-
-  Style.SpaceBeforeParens = FormatStyle::SBPO_NonEmptyParentheses;
-  verifyFormat("public void foo() {\n"
-               "  using (StreamWriter sw = new StreamWriter (filenameA)) {}\n"
-               "  using() {}\n"
-               "}",
-               Style);
-
-  // Ensure clang-format affects top-level snippets correctly.
-  verifyFormat("using (StreamWriter sw = new StreamWriter (filenameB)) {}",
-               Style);
-}
-
-TEST_F(FormatTestCSharp, CSharpRegions) {
-  verifyFormat("#region aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaa "
-               "aaaaaaaaaaaaaaa long region");
-}
-
-TEST_F(FormatTestCSharp, CSharpKeyWordEscaping) {
-  verifyFormat("public enum var\n"
-               "{\n"
-               "    none,\n"
-               "    @string,\n"
-               "    bool,\n"
-               "    @enum\n"
-               "}");
-}
-
-TEST_F(FormatTestCSharp, CSharpNullCoalescing) {
-  verifyFormat("var test = ABC ?? DEF");
-  verifyFormat("string myname = name ?? \"ABC\";");
-  verifyFormat("return _name ?? \"DEF\";");
-}
-
-TEST_F(FormatTestCSharp, CSharpNullCoalescingAssignment) {
-  FormatStyle Style = getGoogleStyle(FormatStyle::LK_CSharp);
-  Style.SpaceBeforeAssignmentOperators = true;
-
-  verifyFormat(R"(test ??= ABC;)", Style);
-  verifyFormat(R"(test ??= true;)", Style);
-
-  Style.SpaceBeforeAssignmentOperators = false;
-
-  verifyFormat(R"(test??= ABC;)", Style);
-  verifyFormat(R"(test??= true;)", Style);
-}
-
-TEST_F(FormatTestCSharp, CSharpNullForgiving) {
-  FormatStyle Style = getGoogleStyle(FormatStyle::LK_CSharp);
-
-  verifyFormat("var test = null!;", Style);
-  verifyFormat("string test = someFunctionCall()! + \"ABC\"!", Style);
-  verifyFormat("int test = (1! + 2 + bar! + foo())!", Style);
-  verifyFormat(R"(test ??= !foo!;)", Style);
-  verifyFormat("test = !bar! ?? !foo!;", Style);
-  verifyFormat("bool test = !(!true && !true! || !null && !null! || !false && "
-               "!false! && !bar()! + (!foo()))!",
-               Style);
-
-  // Check that line break keeps identifier with the bang.
-  Style.ColumnLimit = 14;
-
-  verifyFormat("var test =\n"
-               "    foo!;",
-               Style);
-}
-
-TEST_F(FormatTestCSharp, AttributesIndentation) {
-  FormatStyle Style = getMicrosoftStyle(FormatStyle::LK_CSharp);
-  Style.AlwaysBreakAfterReturnType = FormatStyle::RTBS_None;
-
-  verifyFormat("[STAThread]\n"
-               "static void Main(string[] args)\n"
-               "{\n"
-               "}",
-               Style);
-
-  verifyFormat("[STAThread]\n"
-               "void "
-               "veryLooooooooooooooongFunctionName(string[] args)\n"
-               "{\n"
-               "}",
-               Style);
-
-  verifyFormat("[STAThread]\n"
-               "veryLoooooooooooooooooooongReturnType "
-               "veryLooooooooooooooongFunctionName(string[] args)\n"
-               "{\n"
-               "}",
-               Style);
-
-  verifyFormat("[SuppressMessage(\"A\", \"B\", Justification = \"C\")]\n"
-               "public override X Y()\n"
-               "{\n"
-               "}\n",
-               Style);
-
-  verifyFormat("[SuppressMessage]\n"
-               "public X Y()\n"
-               "{\n"
-               "}\n",
-               Style);
-
-  verifyFormat("[SuppressMessage]\n"
-               "public override X Y()\n"
-               "{\n"
-               "}\n",
-               Style);
-
-  verifyFormat("public A(B b) : base(b)\n"
-               "{\n"
-               "    [SuppressMessage]\n"
-               "    public override X Y()\n"
-               "    {\n"
-               "    }\n"
-               "}\n",
-               Style);
-
-  verifyFormat("public A : Base\n"
-               "{\n"
-               "}\n"
-               "[Test]\n"
-               "public Foo()\n"
-               "{\n"
-               "}\n",
-               Style);
-
-  verifyFormat("namespace\n"
-               "{\n"
-               "public A : Base\n"
-               "{\n"
-               "}\n"
-               "[Test]\n"
-               "public Foo()\n"
-               "{\n"
-               "}\n"
-               "}\n",
-               Style);
-}
-
-TEST_F(FormatTestCSharp, CSharpSpaceBefore) {
-  FormatStyle Style = getGoogleStyle(FormatStyle::LK_CSharp);
-  Style.SpaceBeforeParens = FormatStyle::SBPO_Always;
-
-  verifyFormat("List<string> list;", Style);
-  verifyFormat("Dictionary<string, string> dict;", Style);
-
-  verifyFormat("for (int i = 0; i < size (); i++) {\n"
-               "}",
-               Style);
-  verifyFormat("foreach (var x in y) {\n"
-               "}",
-               Style);
-  verifyFormat("switch (x) {}", Style);
-  verifyFormat("do {\n"
-               "} while (x);",
-               Style);
-
-  Style.SpaceBeforeParens = FormatStyle::SBPO_Never;
-
-  verifyFormat("List<string> list;", Style);
-  verifyFormat("Dictionary<string, string> dict;", Style);
-
-  verifyFormat("for(int i = 0; i < size(); i++) {\n"
-               "}",
-               Style);
-  verifyFormat("foreach(var x in y) {\n"
-               "}",
-               Style);
-  verifyFormat("switch(x) {}", Style);
-  verifyFormat("do {\n"
-               "} while(x);",
-               Style);
-}
-
-TEST_F(FormatTestCSharp, CSharpSpaceAfterCStyleCast) {
-  FormatStyle Style = getGoogleStyle(FormatStyle::LK_CSharp);
-
-  verifyFormat("(int)x / y;", Style);
-
-  Style.SpaceAfterCStyleCast = true;
-  verifyFormat("(int) x / y;", Style);
-}
-
-TEST_F(FormatTestCSharp, CSharpEscapedQuotesInVerbatimStrings) {
-  FormatStyle Style = getGoogleStyle(FormatStyle::LK_CSharp);
-
-  verifyFormat(R"(string str = @"""";)", Style);
-  verifyFormat(R"(string str = @"""Hello world""";)", Style);
-  verifyFormat(R"(string str = $@"""Hello {friend}""";)", Style);
-}
-
-TEST_F(FormatTestCSharp, CSharpQuotesInInterpolatedStrings) {
-  FormatStyle Style = getGoogleStyle(FormatStyle::LK_CSharp);
-
-  verifyFormat(R"(string str1 = $"{null ?? "null"}";)", Style);
-  verifyFormat(R"(string str2 = $"{{{braceCount} braces";)", Style);
-  verifyFormat(R"(string str3 = $"{braceCount}}} braces";)", Style);
-}
-
-TEST_F(FormatTestCSharp, CSharpNewlinesInVerbatimStrings) {
-  // Use MS style as Google Style inserts a line break before multiline strings.
-
-  // verifyFormat does not understand multiline C# string-literals
-  // so check the format explicitly.
-
-  FormatStyle Style = getMicrosoftStyle(FormatStyle::LK_CSharp);
-
-  std::string Code = R"(string s1 = $@"some code:
-  class {className} {{
-    {className}() {{}}
-  }}";)";
-
-  EXPECT_EQ(Code, format(Code, Style));
-
-  // Multiline string in the middle of a function call.
-  Code = R"(
-var x = foo(className, $@"some code:
-  class {className} {{
-    {className}() {{}}
-  }}",
-            y);)"; // y aligned with `className` arg.
-
-  EXPECT_EQ(Code, format(Code, Style));
-
-  // Interpolated string with embedded multiline string.
-  Code = R"(Console.WriteLine($"{string.Join(@",
-		", values)}");)";
-
-  EXPECT_EQ(Code, format(Code, Style));
-}
-
-TEST_F(FormatTestCSharp, CSharpLambdas) {
-  FormatStyle GoogleStyle = getGoogleStyle(FormatStyle::LK_CSharp);
-  FormatStyle MicrosoftStyle = getMicrosoftStyle(FormatStyle::LK_CSharp);
-
-  verifyFormat(R"(//
-class MyClass {
-  Action<string> greet = name => {
-    string greeting = $"Hello {name}!";
-    Console.WriteLine(greeting);
-  };
-})",
-               GoogleStyle);
-
-  // Microsoft Style:
-  // https://docs.microsoft.com/en-us/dotnet/csharp/programming-guide/statements-expressions-operators/lambda-expressions#statement-lambdas
-  verifyFormat(R"(//
-class MyClass
-{
-    Action<string> greet = name =>
-    {
-        string greeting = $"Hello {name}!";
-        Console.WriteLine(greeting);
-    };
-})",
-               MicrosoftStyle);
-
-  verifyFormat("void bar()\n"
-               "{\n"
-               "    Function(Val, (Action)(() =>\n"
-               "                           {\n"
-               "                               lock (mylock)\n"
-               "                               {\n"
-               "                                   if (true)\n"
-               "                                   {\n"
-               "                                       A.Remove(item);\n"
-               "                                   }\n"
-               "                               }\n"
-               "                           }));\n"
-               "}",
-               MicrosoftStyle);
-
-  verifyFormat("void baz()\n"
-               "{\n"
-               "    Function(Val, (Action)(() =>\n"
-               "                           {\n"
-               "                               using (var a = new Lock())\n"
-               "                               {\n"
-               "                                   if (true)\n"
-               "                                   {\n"
-               "                                       A.Remove(item);\n"
-               "                                   }\n"
-               "                               }\n"
-               "                           }));\n"
-               "}",
-               MicrosoftStyle);
-
-  verifyFormat("void baz()\n"
-               "{\n"
-               "    Function(Val, (Action)(() =>\n"
-               "                           {\n"
-               "                               if (true)\n"
-               "                               {\n"
-               "                                   A.Remove(item);\n"
-               "                               }\n"
-               "                           }));\n"
-               "}",
-               MicrosoftStyle);
-
-  verifyFormat("void baz()\n"
-               "{\n"
-               "    Function(Val, (Action)(() =>\n"
-               "                           {\n"
-               "                               do\n"
-               "                               {\n"
-               "                                   A.Remove(item);\n"
-               "                               } while (true)\n"
-               "                           }));\n"
-               "}",
-               MicrosoftStyle);
-
-  verifyFormat("void baz()\n"
-               "{\n"
-               "    Function(Val, (Action)(() =>\n"
-               "                           { A.Remove(item); }));\n"
-               "}",
-               MicrosoftStyle);
-
-  verifyFormat("void bar()\n"
-               "{\n"
-               "    Function(Val, (() =>\n"
-               "                   {\n"
-               "                       lock (mylock)\n"
-               "                       {\n"
-               "                           if (true)\n"
-               "                           {\n"
-               "                               A.Remove(item);\n"
-               "                           }\n"
-               "                       }\n"
-               "                   }));\n"
-               "}",
-               MicrosoftStyle);
-  verifyFormat("void bar()\n"
-               "{\n"
-               "    Function((() =>\n"
-               "              {\n"
-               "                  lock (mylock)\n"
-               "                  {\n"
-               "                      if (true)\n"
-               "                      {\n"
-               "                          A.Remove(item);\n"
-               "                      }\n"
-               "                  }\n"
-               "              }));\n"
-               "}",
-               MicrosoftStyle);
-
-  MicrosoftStyle.IndentWidth = 2;
-  verifyFormat("void bar()\n"
-               "{\n"
-               "  Function((() =>\n"
-               "            {\n"
-               "              lock (mylock)\n"
-               "              {\n"
-               "                if (true)\n"
-               "                {\n"
-               "                  A.Remove(item);\n"
-               "                }\n"
-               "              }\n"
-               "            }));\n"
-               "}",
-               MicrosoftStyle);
-  verifyFormat("void bar() {\n"
-               "  Function((() => {\n"
-               "    lock (mylock) {\n"
-               "      if (true) {\n"
-               "        A.Remove(item);\n"
-               "      }\n"
-               "    }\n"
-               "  }));\n"
-               "}",
-               GoogleStyle);
-}
-
-TEST_F(FormatTestCSharp, CSharpObjectInitializers) {
-  FormatStyle Style = getGoogleStyle(FormatStyle::LK_CSharp);
-
-  // Start code fragments with a comment line so that C++ raw string literals
-  // as seen are identical to expected formatted code.
-
-  verifyFormat(R"(//
-Shape[] shapes = new[] {
-  new Circle {
-    Radius = 2.7281,
-    Colour = Colours.Red,
-  },
-  new Square {
-    Side = 101.1,
-    Colour = Colours.Yellow,
-  },
-};)",
-               Style);
-
-  // Omitted final `,`s will change the formatting.
-  verifyFormat(R"(//
-Shape[] shapes = new[] { new Circle { Radius = 2.7281, Colour = Colours.Red },
-                         new Square { Side = 101.1, Colour = Colours.Yellow } };)",
-               Style);
-
-  // Lambdas can be supplied as initialiser arguments.
-  verifyFormat(R"(//
-private Transformer _transformer = new X.Y {
-  Filler = (Shape shape) => { return new Transform.Fill(shape, RED); },
-  Scaler = (Shape shape) => { return new Transform.Resize(shape, 0.1); },
-};)",
-               Style);
-
-  // Dictionary initialisation.
-  verifyFormat(R"(//
-var myDict = new Dictionary<string, string> {
-  ["name"] = _donald,
-  ["age"] = Convert.ToString(DateTime.Today.Year - 1934),
-  ["type"] = _duck,
-};)",
-               Style);
-}
-
-TEST_F(FormatTestCSharp, CSharpArrayInitializers) {
-  FormatStyle Style = getGoogleStyle(FormatStyle::LK_CSharp);
-
-  verifyFormat(R"(//
-private MySet<Node>[] setPoints = {
-  new Point<Node>(),
-  new Point<Node>(),
-};)",
-               Style);
-}
-
-TEST_F(FormatTestCSharp, CSharpNamedArguments) {
-  FormatStyle Style = getGoogleStyle(FormatStyle::LK_CSharp);
-
-  verifyFormat(R"(//
-PrintOrderDetails(orderNum: 31, productName: "Red Mug", sellerName: "Gift Shop");)",
-               Style);
-
-  // Ensure that trailing comments do not cause problems.
-  verifyFormat(R"(//
-PrintOrderDetails(orderNum: 31, productName: "Red Mug",  // comment
-                  sellerName: "Gift Shop");)",
-               Style);
-
-  verifyFormat(R"(foreach (var tickCount in task.Begin(seed: 0)) {)", Style);
-}
-
-TEST_F(FormatTestCSharp, CSharpPropertyAccessors) {
-  FormatStyle Style = getGoogleStyle(FormatStyle::LK_CSharp);
-
-  verifyFormat("int Value { get }", Style);
-  verifyFormat("int Value { get; }", Style);
-  verifyFormat("int Value { internal get; }", Style);
-  verifyFormat("int Value { get; } = 0", Style);
-  verifyFormat("int Value { set }", Style);
-  verifyFormat("int Value { set; }", Style);
-  verifyFormat("int Value { internal set; }", Style);
-  verifyFormat("int Value { set; } = 0", Style);
-  verifyFormat("int Value { get; set }", Style);
-  verifyFormat("int Value { set; get }", Style);
-  verifyFormat("int Value { get; private set; }", Style);
-  verifyFormat("int Value { get; set; }", Style);
-  verifyFormat("int Value { get; set; } = 0", Style);
-  verifyFormat("int Value { internal get; internal set; }", Style);
-
-  // Do not wrap expression body definitions.
-  verifyFormat(R"(//
-public string Name {
-  get => _name;
-  set => _name = value;
-})",
-               Style);
-
-  // Examples taken from
-  // https://docs.microsoft.com/en-us/dotnet/csharp/programming-guide/classes-and-structs/properties
-  verifyFormat(R"(
-// Expression body definitions
-public class SaleItem {
-  public decimal Price {
-    get => _cost;
-    set => _cost = value;
-  }
-})",
-               Style);
-
-  verifyFormat(R"(
-// Properties with backing fields
-class TimePeriod {
-  public double Hours {
-    get { return _seconds / 3600; }
-    set {
-      if (value < 0 || value > 24)
-        throw new ArgumentOutOfRangeException($"{nameof(value)} must be between 0 and 24.");
-      _seconds = value * 3600;
-    }
-  }
-})",
-               Style);
-
-  verifyFormat(R"(
-// Auto-implemented properties
-public class SaleItem {
-  public decimal Price { get; set; }
-})",
-               Style);
-
-  // Add column limit to wrap long lines.
-  Style.ColumnLimit = 100;
-
-  // Examples with assignment to default value.
-  verifyFormat(R"(
-// Long assignment to default value
-class MyClass {
-  public override VeryLongNamedTypeIndeed VeryLongNamedValue { get; set } =
-      VeryLongNamedTypeIndeed.Create(DefaultFirstArgument, DefaultSecondArgument,
-                                     DefaultThirdArgument);
-})",
-               Style);
-
-  verifyFormat(R"(
-// Long assignment to default value with expression body
-class MyClass {
-  public override VeryLongNamedTypeIndeed VeryLongNamedValue {
-    get => veryLongNamedField;
-    set => veryLongNamedField = value;
-  } = VeryLongNamedTypeIndeed.Create(DefaultFirstArgument, DefaultSecondArgument,
-                                     DefaultThirdArgument);
-})",
-               Style);
-
-  // Brace wrapping and single-lining of accessor can be controlled by config.
-  Style.AllowShortBlocksOnASingleLine = FormatStyle::SBS_Never;
-  Style.BreakBeforeBraces = FormatStyle::BS_Custom;
-  Style.BraceWrapping.AfterFunction = true;
-
-  verifyFormat(R"(//
-class TimePeriod {
-  public double Hours
-  {
-    get {
-      return _seconds / 3600;
-    }
-    set {
-      _seconds = value * 3600;
-    }
-  }
-})",
-               Style);
-
-  // Microsoft style trivial property accessors have no line break before the
-  // opening brace.
-  auto MicrosoftStyle = getMicrosoftStyle(FormatStyle::LK_CSharp);
-  verifyFormat(R"(//
-public class SaleItem
-{
-    public decimal Price { get; set; }
-})",
-               MicrosoftStyle);
-}
-
-TEST_F(FormatTestCSharp, CSharpSpaces) {
-  FormatStyle Style = getGoogleStyle(FormatStyle::LK_CSharp);
-  Style.SpaceBeforeSquareBrackets = false;
-  Style.SpacesInSquareBrackets = false;
-  Style.SpaceBeforeCpp11BracedList = true;
-  Style.Cpp11BracedListStyle = false;
-  Style.SpacesInContainerLiterals = false;
-  Style.SpaceAfterCStyleCast = false;
-
-  verifyFormat(R"(new Car { "Door", 0.1 })", Style);
-  verifyFormat(R"(new Car { 0.1, "Door" })", Style);
-  verifyFormat(R"(new string[] { "A" })", Style);
-  verifyFormat(R"(new string[] {})", Style);
-  verifyFormat(R"(new Car { someVariableName })", Style);
-  verifyFormat(R"(new Car { someVariableName })", Style);
-  verifyFormat(R"(new Dictionary<string, string> { ["Key"] = "Value" };)",
-               Style);
-  verifyFormat(R"(Apply(x => x.Name, x => () => x.ID);)", Style);
-  verifyFormat(R"(bool[] xs = { true, true };)", Style);
-  verifyFormat(R"(taskContext.Factory.Run(async () => doThing(args);)", Style);
-  verifyFormat(R"(catch (TestException) when (innerFinallyExecuted))", Style);
-  verifyFormat(R"(private float[,] Values;)", Style);
-  verifyFormat(R"(Result this[Index x] => Foo(x);)", Style);
-
-  verifyFormat(R"(char[,,] rawCharArray = MakeCharacterGrid();)", Style);
-  verifyFormat(R"(var (key, value))", Style);
-
-  // `&&` is not seen as a reference.
-  verifyFormat(R"(A == typeof(X) && someBool)", Style);
-
-  // Not seen as a C-style cast.
-  verifyFormat(R"(//
-foreach ((A a, B b) in someList) {
-})",
-               Style);
-
-  // space after lock in `lock (processes)`.
-  verifyFormat("lock (process)", Style);
-
-  Style.SpacesInSquareBrackets = true;
-  verifyFormat(R"(private float[ , ] Values;)", Style);
-  verifyFormat(R"(string dirPath = args?[ 0 ];)", Style);
-  verifyFormat(R"(char[ ,, ] rawCharArray = MakeCharacterGrid();)", Style);
-
-  // Method returning tuple
-  verifyFormat(R"(public (string name, int age) methodTuple() {})", Style);
-  verifyFormat(R"(private (string name, int age) methodTuple() {})", Style);
-  verifyFormat(R"(protected (string name, int age) methodTuple() {})", Style);
-  verifyFormat(R"(virtual (string name, int age) methodTuple() {})", Style);
-  verifyFormat(R"(extern (string name, int age) methodTuple() {})", Style);
-  verifyFormat(R"(static (string name, int age) methodTuple() {})", Style);
-  verifyFormat(R"(internal (string name, int age) methodTuple() {})", Style);
-  verifyFormat(R"(abstract (string name, int age) methodTuple() {})", Style);
-  verifyFormat(R"(sealed (string name, int age) methodTuple() {})", Style);
-  verifyFormat(R"(override (string name, int age) methodTuple() {})", Style);
-  verifyFormat(R"(async (string name, int age) methodTuple() {})", Style);
-  verifyFormat(R"(unsafe (string name, int age) methodTuple() {})", Style);
-}
-
-TEST_F(FormatTestCSharp, CSharpNullableTypes) {
-  FormatStyle Style = getGoogleStyle(FormatStyle::LK_CSharp);
-  Style.SpacesInSquareBrackets = false;
-
-  verifyFormat(R"(//
-public class A {
-  void foo() {
-    int? value = some.bar();
-  }
-})",
-               Style); // int? is nullable not a conditional expression.
-
-  verifyFormat(R"(void foo(int? x, int? y, int? z) {})",
-               Style); // Nullables in function definitions.
-
-  verifyFormat(R"(public float? Value;)", Style); // no space before `?`.
-
-  verifyFormat(R"(int?[] arr = new int?[10];)",
-               Style); // An array of a nullable type.
-
-  verifyFormat(R"(var x = (int?)y;)", Style); // Cast to a nullable type.
-
-  verifyFormat(R"(var x = new MyContainer<int?>();)", Style); // Generics.
-
-  verifyFormat(R"(//
-public interface I {
-  int? Function();
-})",
-               Style); // Interface methods.
-
-  Style.ColumnLimit = 10;
-  verifyFormat(R"(//
-public VeryLongType? Function(
-    int arg1,
-    int arg2) {
-  //
-})",
-               Style); // ? sticks with identifier.
-}
-
-TEST_F(FormatTestCSharp, CSharpArraySubscripts) {
-  FormatStyle Style = getGoogleStyle(FormatStyle::LK_CSharp);
-
-  // Do not format array subscript operators as attributes.
-  verifyFormat(R"(//
-if (someThings[index].Contains(myThing)) {
-})",
-               Style);
-
-  verifyFormat(R"(//
-if (someThings[i][j][k].Contains(myThing)) {
-})",
-               Style);
-}
-
-TEST_F(FormatTestCSharp, CSharpGenericTypeConstraints) {
-  FormatStyle Style = getGoogleStyle(FormatStyle::LK_CSharp);
-
-  EXPECT_TRUE(Style.BraceWrapping.SplitEmptyRecord);
-
-  verifyFormat("class ItemFactory<T>\n"
-               "    where T : new() {\n"
-               "}",
-               Style);
-
-  verifyFormat("class Dictionary<TKey, TVal>\n"
-               "    where TKey : IComparable<TKey>\n"
-               "    where TVal : IMyInterface {\n"
-               "  public void MyMethod<T>(T t)\n"
-               "      where T : IMyInterface {\n"
-               "    doThing();\n"
-               "  }\n"
-               "}",
-               Style);
-
-  verifyFormat("class ItemFactory<T>\n"
-               "    where T : new(), IAnInterface<T>, IAnotherInterface<T>, "
-               "IAnotherInterfaceStill<T> {\n"
-               "}",
-               Style);
-
-  Style.ColumnLimit = 50; // Force lines to be wrapped.
-  verifyFormat(R"(//
-class ItemFactory<T, U>
-    where T : new(),
-              IAnInterface<T>,
-              IAnotherInterface<T, U>,
-              IAnotherInterfaceStill<T, U> {
-})",
-               Style);
-
-  // In other languages `where` can be used as a normal identifier.
-  // This example is in C++!
-  verifyFormat(R"(//
-class A {
-  int f(int where) {}
-};)",
-               getGoogleStyle(FormatStyle::LK_Cpp));
-}
-
-} // namespace format
-} // end namespace clang
diff --git a/gnu/llvm/clang/unittests/Format/FormatTestComments.cpp b/gnu/llvm/clang/unittests/Format/FormatTestComments.cpp
deleted file mode 100644
index 2a7ead62ba5..00000000000
--- a/gnu/llvm/clang/unittests/Format/FormatTestComments.cpp
+++ /dev/null
@@ -1,3983 +0,0 @@
-//===- unittest/Format/FormatTestComments.cpp - Formatting unit tests -----===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/Format/Format.h"
-
-#include "../Tooling/ReplacementTest.h"
-#include "FormatTestUtils.h"
-
-#include "llvm/Support/Debug.h"
-#include "llvm/Support/MemoryBuffer.h"
-#include "gtest/gtest.h"
-
-#define DEBUG_TYPE "format-test"
-
-using clang::tooling::ReplacementTest;
-
-namespace clang {
-namespace format {
-namespace {
-
-FormatStyle getGoogleStyle() { return getGoogleStyle(FormatStyle::LK_Cpp); }
-
-class FormatTestComments : public ::testing::Test {
-protected:
-  enum StatusCheck { SC_ExpectComplete, SC_ExpectIncomplete, SC_DoNotCheck };
-
-  std::string format(llvm::StringRef Code,
-                     const FormatStyle &Style = getLLVMStyle(),
-                     StatusCheck CheckComplete = SC_ExpectComplete) {
-    LLVM_DEBUG(llvm::errs() << "---\n");
-    LLVM_DEBUG(llvm::errs() << Code << "\n\n");
-    std::vector<tooling::Range> Ranges(1, tooling::Range(0, Code.size()));
-    FormattingAttemptStatus Status;
-    tooling::Replacements Replaces =
-        reformat(Style, Code, Ranges, "<stdin>", &Status);
-    if (CheckComplete != SC_DoNotCheck) {
-      bool ExpectedCompleteFormat = CheckComplete == SC_ExpectComplete;
-      EXPECT_EQ(ExpectedCompleteFormat, Status.FormatComplete)
-          << Code << "\n\n";
-    }
-    ReplacementCount = Replaces.size();
-    auto Result = applyAllReplacements(Code, Replaces);
-    EXPECT_TRUE(static_cast<bool>(Result));
-    LLVM_DEBUG(llvm::errs() << "\n" << *Result << "\n\n");
-    return *Result;
-  }
-
-  FormatStyle getLLVMStyleWithColumns(unsigned ColumnLimit) {
-    FormatStyle Style = getLLVMStyle();
-    Style.ColumnLimit = ColumnLimit;
-    return Style;
-  }
-
-  FormatStyle getTextProtoStyleWithColumns(unsigned ColumnLimit) {
-    FormatStyle Style = getGoogleStyle(FormatStyle::FormatStyle::LK_TextProto);
-    Style.ColumnLimit = ColumnLimit;
-    return Style;
-  }
-
-  void verifyFormat(llvm::StringRef Code,
-                    const FormatStyle &Style = getLLVMStyle()) {
-    EXPECT_EQ(Code.str(), format(Code, Style)) << "Expected code is not stable";
-    EXPECT_EQ(Code.str(), format(test::messUp(Code), Style));
-  }
-
-  void verifyGoogleFormat(llvm::StringRef Code) {
-    verifyFormat(Code, getGoogleStyle());
-  }
-
-  /// \brief Verify that clang-format does not crash on the given input.
-  void verifyNoCrash(llvm::StringRef Code,
-                     const FormatStyle &Style = getLLVMStyle()) {
-    format(Code, Style, SC_DoNotCheck);
-  }
-
-  int ReplacementCount;
-};
-
-//===----------------------------------------------------------------------===//
-// Tests for comments.
-//===----------------------------------------------------------------------===//
-
-TEST_F(FormatTestComments, UnderstandsSingleLineComments) {
-  verifyFormat("//* */");
-  verifyFormat("// line 1\n"
-               "// line 2\n"
-               "void f() {}\n");
-
-  verifyFormat("void f() {\n"
-               "  // Doesn't do anything\n"
-               "}");
-  verifyFormat("SomeObject\n"
-               "    // Calling someFunction on SomeObject\n"
-               "    .someFunction();");
-  verifyFormat("auto result = SomeObject\n"
-               "                  // Calling someFunction on SomeObject\n"
-               "                  .someFunction();");
-  verifyFormat("void f(int i,  // some comment (probably for i)\n"
-               "       int j,  // some comment (probably for j)\n"
-               "       int k); // some comment (probably for k)");
-  verifyFormat("void f(int i,\n"
-               "       // some comment (probably for j)\n"
-               "       int j,\n"
-               "       // some comment (probably for k)\n"
-               "       int k);");
-
-  verifyFormat("int i    // This is a fancy variable\n"
-               "    = 5; // with nicely aligned comment.");
-
-  verifyFormat("// Leading comment.\n"
-               "int a; // Trailing comment.");
-  verifyFormat("int a; // Trailing comment\n"
-               "       // on 2\n"
-               "       // or 3 lines.\n"
-               "int b;");
-  verifyFormat("int a; // Trailing comment\n"
-               "\n"
-               "// Leading comment.\n"
-               "int b;");
-  verifyFormat("int a;    // Comment.\n"
-               "          // More details.\n"
-               "int bbbb; // Another comment.");
-  verifyFormat(
-      "int aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa; // comment\n"
-      "int bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb;   // comment\n"
-      "int cccccccccccccccccccccccccccccc;       // comment\n"
-      "int ddd;                     // looooooooooooooooooooooooong comment\n"
-      "int aaaaaaaaaaaaaaaaaaaaaaa; // comment\n"
-      "int bbbbbbbbbbbbbbbbbbbbb;   // comment\n"
-      "int ccccccccccccccccccc;     // comment");
-
-  verifyFormat("#include \"a\"     // comment\n"
-               "#include \"a/b/c\" // comment");
-  verifyFormat("#include <a>     // comment\n"
-               "#include <a/b/c> // comment");
-  EXPECT_EQ("#include \"a\"     // comment\n"
-            "#include \"a/b/c\" // comment",
-            format("#include \\\n"
-                   "  \"a\" // comment\n"
-                   "#include \"a/b/c\" // comment"));
-
-  verifyFormat("enum E {\n"
-               "  // comment\n"
-               "  VAL_A, // comment\n"
-               "  VAL_B\n"
-               "};");
-
-  EXPECT_EQ("enum A {\n"
-            "  // line a\n"
-            "  a,\n"
-            "  b, // line b\n"
-            "\n"
-            "  // line c\n"
-            "  c\n"
-            "};",
-            format("enum A {\n"
-                   "  // line a\n"
-                   "  a,\n"
-                   "  b, // line b\n"
-                   "\n"
-                   "  // line c\n"
-                   "  c\n"
-                   "};",
-                   getLLVMStyleWithColumns(20)));
-  EXPECT_EQ("enum A {\n"
-            "  a, // line 1\n"
-            "  // line 2\n"
-            "};",
-            format("enum A {\n"
-                   "  a, // line 1\n"
-                   "  // line 2\n"
-                   "};",
-                   getLLVMStyleWithColumns(20)));
-  EXPECT_EQ("enum A {\n"
-            "  a, // line 1\n"
-            "     // line 2\n"
-            "};",
-            format("enum A {\n"
-                   "  a, // line 1\n"
-                   "   // line 2\n"
-                   "};",
-                   getLLVMStyleWithColumns(20)));
-  EXPECT_EQ("enum A {\n"
-            "  a, // line 1\n"
-            "  // line 2\n"
-            "  b\n"
-            "};",
-            format("enum A {\n"
-                   "  a, // line 1\n"
-                   "  // line 2\n"
-                   "  b\n"
-                   "};",
-                   getLLVMStyleWithColumns(20)));
-  EXPECT_EQ("enum A {\n"
-            "  a, // line 1\n"
-            "     // line 2\n"
-            "  b\n"
-            "};",
-            format("enum A {\n"
-                   "  a, // line 1\n"
-                   "   // line 2\n"
-                   "  b\n"
-                   "};",
-                   getLLVMStyleWithColumns(20)));
-  verifyFormat(
-      "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa =\n"
-      "    bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb; // Trailing comment");
-  verifyFormat("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa =\n"
-               "    // Comment inside a statement.\n"
-               "    bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb;");
-  verifyFormat("SomeFunction(a,\n"
-               "             // comment\n"
-               "             b + x);");
-  verifyFormat("SomeFunction(a, a,\n"
-               "             // comment\n"
-               "             b + x);");
-  verifyFormat(
-      "bool aaaaaaaaaaaaa = // comment\n"
-      "    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa || aaaaaaaaaaaaaaaaaaaaaaaaaaaa ||\n"
-      "    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa || aaaaaaaaaaaaaaaaaaaaaaaaaaaaa;");
-
-  verifyFormat("int aaaa; // aaaaa\n"
-               "int aa;   // aaaaaaa",
-               getLLVMStyleWithColumns(20));
-
-  EXPECT_EQ("void f() { // This does something ..\n"
-            "}\n"
-            "int a; // This is unrelated",
-            format("void f()    {     // This does something ..\n"
-                   "  }\n"
-                   "int   a;     // This is unrelated"));
-  EXPECT_EQ("class C {\n"
-            "  void f() { // This does something ..\n"
-            "  }          // awesome..\n"
-            "\n"
-            "  int a; // This is unrelated\n"
-            "};",
-            format("class C{void f()    { // This does something ..\n"
-                   "      } // awesome..\n"
-                   " \n"
-                   "int a;    // This is unrelated\n"
-                   "};"));
-
-  EXPECT_EQ("int i; // single line trailing comment",
-            format("int i;\\\n// single line trailing comment"));
-
-  verifyGoogleFormat("int a;  // Trailing comment.");
-
-  verifyFormat("someFunction(anotherFunction( // Force break.\n"
-               "    parameter));");
-
-  verifyGoogleFormat("#endif  // HEADER_GUARD");
-
-  verifyFormat("const char *test[] = {\n"
-               "    // A\n"
-               "    \"aaaa\",\n"
-               "    // B\n"
-               "    \"aaaaa\"};");
-  verifyGoogleFormat(
-      "aaaaaaaaaaaaaaaaaaaaaaaaaa(\n"
-      "    aaaaaaaaaaaaaaaaaaaaaa);  // 81_cols_with_this_comment");
-  EXPECT_EQ("D(a, {\n"
-            "  // test\n"
-            "  int a;\n"
-            "});",
-            format("D(a, {\n"
-                   "// test\n"
-                   "int a;\n"
-                   "});"));
-
-  EXPECT_EQ("lineWith(); // comment\n"
-            "// at start\n"
-            "otherLine();",
-            format("lineWith();   // comment\n"
-                   "// at start\n"
-                   "otherLine();"));
-  EXPECT_EQ("lineWith(); // comment\n"
-            "/*\n"
-            " * at start */\n"
-            "otherLine();",
-            format("lineWith();   // comment\n"
-                   "/*\n"
-                   " * at start */\n"
-                   "otherLine();"));
-  EXPECT_EQ("lineWith(); // comment\n"
-            "            // at start\n"
-            "otherLine();",
-            format("lineWith();   // comment\n"
-                   " // at start\n"
-                   "otherLine();"));
-
-  EXPECT_EQ("lineWith(); // comment\n"
-            "// at start\n"
-            "otherLine(); // comment",
-            format("lineWith();   // comment\n"
-                   "// at start\n"
-                   "otherLine();   // comment"));
-  EXPECT_EQ("lineWith();\n"
-            "// at start\n"
-            "otherLine(); // comment",
-            format("lineWith();\n"
-                   " // at start\n"
-                   "otherLine();   // comment"));
-  EXPECT_EQ("// first\n"
-            "// at start\n"
-            "otherLine(); // comment",
-            format("// first\n"
-                   " // at start\n"
-                   "otherLine();   // comment"));
-  EXPECT_EQ("f();\n"
-            "// first\n"
-            "// at start\n"
-            "otherLine(); // comment",
-            format("f();\n"
-                   "// first\n"
-                   " // at start\n"
-                   "otherLine();   // comment"));
-  verifyFormat("f(); // comment\n"
-               "// first\n"
-               "// at start\n"
-               "otherLine();");
-  EXPECT_EQ("f(); // comment\n"
-            "// first\n"
-            "// at start\n"
-            "otherLine();",
-            format("f();   // comment\n"
-                   "// first\n"
-                   " // at start\n"
-                   "otherLine();"));
-  EXPECT_EQ("f(); // comment\n"
-            "     // first\n"
-            "// at start\n"
-            "otherLine();",
-            format("f();   // comment\n"
-                   " // first\n"
-                   "// at start\n"
-                   "otherLine();"));
-  EXPECT_EQ("void f() {\n"
-            "  lineWith(); // comment\n"
-            "  // at start\n"
-            "}",
-            format("void              f() {\n"
-                   "  lineWith(); // comment\n"
-                   "  // at start\n"
-                   "}"));
-  EXPECT_EQ("int xy; // a\n"
-            "int z;  // b",
-            format("int xy;    // a\n"
-                   "int z;    //b"));
-  EXPECT_EQ("int xy; // a\n"
-            "int z; // bb",
-            format("int xy;    // a\n"
-                   "int z;    //bb",
-                   getLLVMStyleWithColumns(12)));
-
-  verifyFormat("#define A                                                  \\\n"
-               "  int i; /* iiiiiiiiiiiiiiiiiiiii */                       \\\n"
-               "  int jjjjjjjjjjjjjjjjjjjjjjjj; /* */",
-               getLLVMStyleWithColumns(60));
-  verifyFormat(
-      "#define A                                                   \\\n"
-      "  int i;                        /* iiiiiiiiiiiiiiiiiiiii */ \\\n"
-      "  int jjjjjjjjjjjjjjjjjjjjjjjj; /* */",
-      getLLVMStyleWithColumns(61));
-
-  verifyFormat("if ( // This is some comment\n"
-               "    x + 3) {\n"
-               "}");
-  EXPECT_EQ("if ( // This is some comment\n"
-            "     // spanning two lines\n"
-            "    x + 3) {\n"
-            "}",
-            format("if( // This is some comment\n"
-                   "     // spanning two lines\n"
-                   " x + 3) {\n"
-                   "}"));
-
-  verifyNoCrash("/\\\n/");
-  verifyNoCrash("/\\\n* */");
-  // The 0-character somehow makes the lexer return a proper comment.
-  verifyNoCrash(StringRef("/*\\\0\n/", 6));
-}
-
-TEST_F(FormatTestComments, KeepsParameterWithTrailingCommentsOnTheirOwnLine) {
-  EXPECT_EQ("SomeFunction(a,\n"
-            "             b, // comment\n"
-            "             c);",
-            format("SomeFunction(a,\n"
-                   "          b, // comment\n"
-                   "      c);"));
-  EXPECT_EQ("SomeFunction(a, b,\n"
-            "             // comment\n"
-            "             c);",
-            format("SomeFunction(a,\n"
-                   "          b,\n"
-                   "  // comment\n"
-                   "      c);"));
-  EXPECT_EQ("SomeFunction(a, b, // comment (unclear relation)\n"
-            "             c);",
-            format("SomeFunction(a, b, // comment (unclear relation)\n"
-                   "      c);"));
-  EXPECT_EQ("SomeFunction(a, // comment\n"
-            "             b,\n"
-            "             c); // comment",
-            format("SomeFunction(a,     // comment\n"
-                   "          b,\n"
-                   "      c); // comment"));
-  EXPECT_EQ("aaaaaaaaaa(aaaa(aaaa,\n"
-            "                aaaa), //\n"
-            "           aaaa, bbbbb);",
-            format("aaaaaaaaaa(aaaa(aaaa,\n"
-                   "aaaa), //\n"
-                   "aaaa, bbbbb);"));
-}
-
-TEST_F(FormatTestComments, RemovesTrailingWhitespaceOfComments) {
-  EXPECT_EQ("// comment", format("// comment  "));
-  EXPECT_EQ("int aaaaaaa, bbbbbbb; // comment",
-            format("int aaaaaaa, bbbbbbb; // comment                   ",
-                   getLLVMStyleWithColumns(33)));
-  EXPECT_EQ("// comment\\\n", format("// comment\\\n  \t \v   \f   "));
-  EXPECT_EQ("// comment    \\\n", format("// comment    \\\n  \t \v   \f   "));
-}
-
-TEST_F(FormatTestComments, UnderstandsBlockComments) {
-  verifyFormat("f(/*noSpaceAfterParameterNamingComment=*/true);");
-  verifyFormat("void f() { g(/*aaa=*/x, /*bbb=*/!y, /*c=*/::c); }");
-  EXPECT_EQ("f(aaaaaaaaaaaaaaaaaaaaaaaaa, /* Trailing comment for aa... */\n"
-            "  bbbbbbbbbbbbbbbbbbbbbbbbb);",
-            format("f(aaaaaaaaaaaaaaaaaaaaaaaaa ,   \\\n"
-                   "/* Trailing comment for aa... */\n"
-                   "  bbbbbbbbbbbbbbbbbbbbbbbbb);"));
-  EXPECT_EQ(
-      "f(aaaaaaaaaaaaaaaaaaaaaaaaa,\n"
-      "  /* Leading comment for bb... */ bbbbbbbbbbbbbbbbbbbbbbbbb);",
-      format("f(aaaaaaaaaaaaaaaaaaaaaaaaa    ,   \n"
-             "/* Leading comment for bb... */   bbbbbbbbbbbbbbbbbbbbbbbbb);"));
-  EXPECT_EQ(
-      "void aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(\n"
-      "    aaaaaaaaaaaaaaaaaa,\n"
-      "    aaaaaaaaaaaaaaaaaa) { /*aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa*/\n"
-      "}",
-      format("void      aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(\n"
-             "                      aaaaaaaaaaaaaaaaaa  ,\n"
-             "    aaaaaaaaaaaaaaaaaa) {   /*aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa*/\n"
-             "}"));
-  verifyFormat("f(/* aaaaaaaaaaaaaaaaaa = */\n"
-               "  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa);");
-
-  FormatStyle NoBinPacking = getLLVMStyle();
-  NoBinPacking.BinPackParameters = false;
-  verifyFormat("aaaaaaaa(/* parameter 1 */ aaaaaa,\n"
-               "         /* parameter 2 */ aaaaaa,\n"
-               "         /* parameter 3 */ aaaaaa,\n"
-               "         /* parameter 4 */ aaaaaa);",
-               NoBinPacking);
-
-  // Aligning block comments in macros.
-  verifyGoogleFormat("#define A        \\\n"
-                     "  int i;   /*a*/ \\\n"
-                     "  int jjj; /*b*/");
-}
-
-TEST_F(FormatTestComments, AlignsBlockComments) {
-  EXPECT_EQ("/*\n"
-            " * Really multi-line\n"
-            " * comment.\n"
-            " */\n"
-            "void f() {}",
-            format("  /*\n"
-                   "   * Really multi-line\n"
-                   "   * comment.\n"
-                   "   */\n"
-                   "  void f() {}"));
-  EXPECT_EQ("class C {\n"
-            "  /*\n"
-            "   * Another multi-line\n"
-            "   * comment.\n"
-            "   */\n"
-            "  void f() {}\n"
-            "};",
-            format("class C {\n"
-                   "/*\n"
-                   " * Another multi-line\n"
-                   " * comment.\n"
-                   " */\n"
-                   "void f() {}\n"
-                   "};"));
-  EXPECT_EQ("/*\n"
-            "  1. This is a comment with non-trivial formatting.\n"
-            "     1.1. We have to indent/outdent all lines equally\n"
-            "         1.1.1. to keep the formatting.\n"
-            " */",
-            format("  /*\n"
-                   "    1. This is a comment with non-trivial formatting.\n"
-                   "       1.1. We have to indent/outdent all lines equally\n"
-                   "           1.1.1. to keep the formatting.\n"
-                   "   */"));
-  EXPECT_EQ("/*\n"
-            "Don't try to outdent if there's not enough indentation.\n"
-            "*/",
-            format("  /*\n"
-                   " Don't try to outdent if there's not enough indentation.\n"
-                   " */"));
-
-  EXPECT_EQ("int i; /* Comment with empty...\n"
-            "        *\n"
-            "        * line. */",
-            format("int i; /* Comment with empty...\n"
-                   "        *\n"
-                   "        * line. */"));
-  EXPECT_EQ("int foobar = 0; /* comment */\n"
-            "int bar = 0;    /* multiline\n"
-            "                   comment 1 */\n"
-            "int baz = 0;    /* multiline\n"
-            "                   comment 2 */\n"
-            "int bzz = 0;    /* multiline\n"
-            "                   comment 3 */",
-            format("int foobar = 0; /* comment */\n"
-                   "int bar = 0;    /* multiline\n"
-                   "                   comment 1 */\n"
-                   "int baz = 0; /* multiline\n"
-                   "                comment 2 */\n"
-                   "int bzz = 0;         /* multiline\n"
-                   "                        comment 3 */"));
-  EXPECT_EQ("int foobar = 0; /* comment */\n"
-            "int bar = 0;    /* multiline\n"
-            "   comment */\n"
-            "int baz = 0;    /* multiline\n"
-            "comment */",
-            format("int foobar = 0; /* comment */\n"
-                   "int bar = 0; /* multiline\n"
-                   "comment */\n"
-                   "int baz = 0;        /* multiline\n"
-                   "comment */"));
-}
-
-TEST_F(FormatTestComments, CommentReflowingCanBeTurnedOff) {
-  FormatStyle Style = getLLVMStyleWithColumns(20);
-  Style.ReflowComments = false;
-  verifyFormat("// aaaaaaaaa aaaaaaaaaa aaaaaaaaaa", Style);
-  verifyFormat("/* aaaaaaaaa aaaaaaaaaa aaaaaaaaaa */", Style);
-}
-
-TEST_F(FormatTestComments, CorrectlyHandlesLengthOfBlockComments) {
-  EXPECT_EQ("double *x; /* aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-            "              aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa */",
-            format("double *x; /* aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-                   "              aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa */"));
-  EXPECT_EQ(
-      "void ffffffffffff(\n"
-      "    int aaaaaaaa, int bbbbbbbb,\n"
-      "    int cccccccccccc) { /*\n"
-      "                           aaaaaaaaaa\n"
-      "                           aaaaaaaaaaaaa\n"
-      "                           bbbbbbbbbbbbbb\n"
-      "                           bbbbbbbbbb\n"
-      "                         */\n"
-      "}",
-      format("void ffffffffffff(int aaaaaaaa, int bbbbbbbb, int cccccccccccc)\n"
-             "{ /*\n"
-             "     aaaaaaaaaa aaaaaaaaaaaaa\n"
-             "     bbbbbbbbbbbbbb bbbbbbbbbb\n"
-             "   */\n"
-             "}",
-             getLLVMStyleWithColumns(40)));
-}
-
-TEST_F(FormatTestComments, DontBreakNonTrailingBlockComments) {
-  EXPECT_EQ("void ffffffffff(\n"
-            "    int aaaaa /* test */);",
-            format("void ffffffffff(int aaaaa /* test */);",
-                   getLLVMStyleWithColumns(35)));
-}
-
-TEST_F(FormatTestComments, SplitsLongCxxComments) {
-  EXPECT_EQ("// A comment that\n"
-            "// doesn't fit on\n"
-            "// one line",
-            format("// A comment that doesn't fit on one line",
-                   getLLVMStyleWithColumns(20)));
-  EXPECT_EQ("/// A comment that\n"
-            "/// doesn't fit on\n"
-            "/// one line",
-            format("/// A comment that doesn't fit on one line",
-                   getLLVMStyleWithColumns(20)));
-  EXPECT_EQ("//! A comment that\n"
-            "//! doesn't fit on\n"
-            "//! one line",
-            format("//! A comment that doesn't fit on one line",
-                   getLLVMStyleWithColumns(20)));
-  EXPECT_EQ("// a b c d\n"
-            "// e f  g\n"
-            "// h i j k",
-            format("// a b c d e f  g h i j k", getLLVMStyleWithColumns(10)));
-  EXPECT_EQ(
-      "// a b c d\n"
-      "// e f  g\n"
-      "// h i j k",
-      format("\\\n// a b c d e f  g h i j k", getLLVMStyleWithColumns(10)));
-  EXPECT_EQ("if (true) // A comment that\n"
-            "          // doesn't fit on\n"
-            "          // one line",
-            format("if (true) // A comment that doesn't fit on one line   ",
-                   getLLVMStyleWithColumns(30)));
-  EXPECT_EQ("//    Don't_touch_leading_whitespace",
-            format("//    Don't_touch_leading_whitespace",
-                   getLLVMStyleWithColumns(20)));
-  EXPECT_EQ("// Add leading\n"
-            "// whitespace",
-            format("//Add leading whitespace", getLLVMStyleWithColumns(20)));
-  EXPECT_EQ("/// Add leading\n"
-            "/// whitespace",
-            format("///Add leading whitespace", getLLVMStyleWithColumns(20)));
-  EXPECT_EQ("//! Add leading\n"
-            "//! whitespace",
-            format("//!Add leading whitespace", getLLVMStyleWithColumns(20)));
-  EXPECT_EQ("// whitespace", format("//whitespace", getLLVMStyle()));
-  EXPECT_EQ("// Even if it makes the line exceed the column\n"
-            "// limit",
-            format("//Even if it makes the line exceed the column limit",
-                   getLLVMStyleWithColumns(51)));
-  EXPECT_EQ("//--But not here", format("//--But not here", getLLVMStyle()));
-  EXPECT_EQ("/// line 1\n"
-            "// add leading whitespace",
-            format("/// line 1\n"
-                   "//add leading whitespace",
-                   getLLVMStyleWithColumns(30)));
-  EXPECT_EQ("/// line 1\n"
-            "/// line 2\n"
-            "//! line 3\n"
-            "//! line 4\n"
-            "//! line 5\n"
-            "// line 6\n"
-            "// line 7",
-            format("///line 1\n"
-                   "///line 2\n"
-                   "//! line 3\n"
-                   "//!line 4\n"
-                   "//!line 5\n"
-                   "// line 6\n"
-                   "//line 7",
-                   getLLVMStyleWithColumns(20)));
-
-  EXPECT_EQ("// aa bb cc dd",
-            format("// aa bb             cc dd                   ",
-                   getLLVMStyleWithColumns(15)));
-
-  EXPECT_EQ("// A comment before\n"
-            "// a macro\n"
-            "// definition\n"
-            "#define a b",
-            format("// A comment before a macro definition\n"
-                   "#define a b",
-                   getLLVMStyleWithColumns(20)));
-  EXPECT_EQ("void ffffff(\n"
-            "    int aaaaaaaaa,  // wwww\n"
-            "    int bbbbbbbbbb, // xxxxxxx\n"
-            "                    // yyyyyyyyyy\n"
-            "    int c, int d, int e) {}",
-            format("void ffffff(\n"
-                   "    int aaaaaaaaa, // wwww\n"
-                   "    int bbbbbbbbbb, // xxxxxxx yyyyyyyyyy\n"
-                   "    int c, int d, int e) {}",
-                   getLLVMStyleWithColumns(40)));
-  EXPECT_EQ("//\t aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
-            format("//\t aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
-                   getLLVMStyleWithColumns(20)));
-  EXPECT_EQ(
-      "#define XXX // a b c d\n"
-      "            // e f g h",
-      format("#define XXX // a b c d e f g h", getLLVMStyleWithColumns(22)));
-  EXPECT_EQ(
-      "#define XXX // q w e r\n"
-      "            // t y u i",
-      format("#define XXX //q w e r t y u i", getLLVMStyleWithColumns(22)));
-  EXPECT_EQ("{\n"
-            "  //\n"
-            "  //\\\n"
-            "  // long 1 2 3 4 5\n"
-            "}",
-            format("{\n"
-                   "  //\n"
-                   "  //\\\n"
-                   "  // long 1 2 3 4 5\n"
-                   "}",
-                   getLLVMStyleWithColumns(20)));
-  EXPECT_EQ("{\n"
-            "  //\n"
-            "  //\\\n"
-            "  // long 1 2 3 4 5\n"
-            "  // 6\n"
-            "}",
-            format("{\n"
-                   "  //\n"
-                   "  //\\\n"
-                   "  // long 1 2 3 4 5 6\n"
-                   "}",
-                   getLLVMStyleWithColumns(20)));
-
-  EXPECT_EQ("//: A comment that\n"
-            "//: doesn't fit on\n"
-            "//: one line",
-            format("//: A comment that doesn't fit on one line",
-                   getLLVMStyleWithColumns(20)));
-}
-
-TEST_F(FormatTestComments, PreservesHangingIndentInCxxComments) {
-  EXPECT_EQ("//     A comment\n"
-            "//     that doesn't\n"
-            "//     fit on one\n"
-            "//     line",
-            format("//     A comment that doesn't fit on one line",
-                   getLLVMStyleWithColumns(20)));
-  EXPECT_EQ("///     A comment\n"
-            "///     that doesn't\n"
-            "///     fit on one\n"
-            "///     line",
-            format("///     A comment that doesn't fit on one line",
-                   getLLVMStyleWithColumns(20)));
-}
-
-TEST_F(FormatTestComments, DontSplitLineCommentsWithEscapedNewlines) {
-  EXPECT_EQ("// aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\\\n"
-            "// aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\\\n"
-            "// aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
-            format("// aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\\\n"
-                   "// aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\\\n"
-                   "// aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"));
-  EXPECT_EQ("int a; // AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\\\n"
-            "       // AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\\\n"
-            "       // AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-            format("int a; // AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\\\n"
-                   "       // AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\\\n"
-                   "       // AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-                   getLLVMStyleWithColumns(50)));
-  // FIXME: One day we might want to implement adjustment of leading whitespace
-  // of the consecutive lines in this kind of comment:
-  EXPECT_EQ("double\n"
-            "    a; // AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\\\n"
-            "          // AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\\\n"
-            "          // AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-            format("double a; // AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\\\n"
-                   "          // AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\\\n"
-                   "          // AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-                   getLLVMStyleWithColumns(49)));
-}
-
-TEST_F(FormatTestComments, DontIntroduceMultilineComments) {
-  // Avoid introducing a multiline comment by breaking after `\`.
-  for (int ColumnLimit = 15; ColumnLimit <= 17; ++ColumnLimit) {
-    EXPECT_EQ(
-        "// aaaaaaaaaa\n"
-        "// \\ bb",
-        format("// aaaaaaaaaa \\ bb", getLLVMStyleWithColumns(ColumnLimit)));
-    EXPECT_EQ(
-        "// aaaaaaaaa\n"
-        "// \\  bb",
-        format("// aaaaaaaaa \\  bb", getLLVMStyleWithColumns(ColumnLimit)));
-    EXPECT_EQ(
-        "// aaaaaaaaa\n"
-        "// \\  \\ bb",
-        format("// aaaaaaaaa \\  \\ bb", getLLVMStyleWithColumns(ColumnLimit)));
-  }
-}
-
-TEST_F(FormatTestComments, DontSplitLineCommentsWithPragmas) {
-  FormatStyle Pragmas = getLLVMStyleWithColumns(30);
-  Pragmas.CommentPragmas = "^ IWYU pragma:";
-  EXPECT_EQ(
-      "// IWYU pragma: aaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbb",
-      format("// IWYU pragma: aaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbb", Pragmas));
-  EXPECT_EQ(
-      "/* IWYU pragma: aaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbb */",
-      format("/* IWYU pragma: aaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbb */", Pragmas));
-}
-
-TEST_F(FormatTestComments, PriorityOfCommentBreaking) {
-  EXPECT_EQ("if (xxx ==\n"
-            "        yyy && // aaaaaaaaaaaa bbbbbbbbb\n"
-            "    zzz)\n"
-            "  q();",
-            format("if (xxx == yyy && // aaaaaaaaaaaa bbbbbbbbb\n"
-                   "    zzz) q();",
-                   getLLVMStyleWithColumns(40)));
-  EXPECT_EQ("if (xxxxxxxxxx ==\n"
-            "        yyy && // aaaaaa bbbbbbbb cccc\n"
-            "    zzz)\n"
-            "  q();",
-            format("if (xxxxxxxxxx == yyy && // aaaaaa bbbbbbbb cccc\n"
-                   "    zzz) q();",
-                   getLLVMStyleWithColumns(40)));
-  EXPECT_EQ("if (xxxxxxxxxx &&\n"
-            "        yyy || // aaaaaa bbbbbbbb cccc\n"
-            "    zzz)\n"
-            "  q();",
-            format("if (xxxxxxxxxx && yyy || // aaaaaa bbbbbbbb cccc\n"
-                   "    zzz) q();",
-                   getLLVMStyleWithColumns(40)));
-  EXPECT_EQ("fffffffff(\n"
-            "    &xxx, // aaaaaaaaaaaa bbbbbbbbbbb\n"
-            "    zzz);",
-            format("fffffffff(&xxx, // aaaaaaaaaaaa bbbbbbbbbbb\n"
-                   " zzz);",
-                   getLLVMStyleWithColumns(40)));
-}
-
-TEST_F(FormatTestComments, MultiLineCommentsInDefines) {
-  EXPECT_EQ("#define A(x) /* \\\n"
-            "  a comment     \\\n"
-            "  inside */     \\\n"
-            "  f();",
-            format("#define A(x) /* \\\n"
-                   "  a comment     \\\n"
-                   "  inside */     \\\n"
-                   "  f();",
-                   getLLVMStyleWithColumns(17)));
-  EXPECT_EQ("#define A(      \\\n"
-            "    x) /*       \\\n"
-            "  a comment     \\\n"
-            "  inside */     \\\n"
-            "  f();",
-            format("#define A(      \\\n"
-                   "    x) /*       \\\n"
-                   "  a comment     \\\n"
-                   "  inside */     \\\n"
-                   "  f();",
-                   getLLVMStyleWithColumns(17)));
-}
-
-TEST_F(FormatTestComments, ParsesCommentsAdjacentToPPDirectives) {
-  EXPECT_EQ("namespace {}\n// Test\n#define A",
-            format("namespace {}\n   // Test\n#define A"));
-  EXPECT_EQ("namespace {}\n/* Test */\n#define A",
-            format("namespace {}\n   /* Test */\n#define A"));
-  EXPECT_EQ("namespace {}\n/* Test */ #define A",
-            format("namespace {}\n   /* Test */    #define A"));
-}
-
-TEST_F(FormatTestComments, KeepsLevelOfCommentBeforePPDirective) {
-  // Keep the current level if the comment was originally not aligned with
-  // the preprocessor directive.
-  EXPECT_EQ("void f() {\n"
-            "  int i;\n"
-            "  /* comment */\n"
-            "#ifdef A\n"
-            "  int j;\n"
-            "}",
-            format("void f() {\n"
-                   "  int i;\n"
-                   "  /* comment */\n"
-                   "#ifdef A\n"
-                   "  int j;\n"
-                   "}"));
-
-  EXPECT_EQ("void f() {\n"
-            "  int i;\n"
-            "  /* comment */\n"
-            "\n"
-            "#ifdef A\n"
-            "  int j;\n"
-            "}",
-            format("void f() {\n"
-                   "  int i;\n"
-                   "  /* comment */\n"
-                   "\n"
-                   "#ifdef A\n"
-                   "  int j;\n"
-                   "}"));
-
-  EXPECT_EQ("int f(int i) {\n"
-            "  if (true) {\n"
-            "    ++i;\n"
-            "  }\n"
-            "  // comment\n"
-            "#ifdef A\n"
-            "  int j;\n"
-            "#endif\n"
-            "}",
-            format("int f(int i) {\n"
-                   "  if (true) {\n"
-                   "    ++i;\n"
-                   "  }\n"
-                   "  // comment\n"
-                   "#ifdef A\n"
-                   "int j;\n"
-                   "#endif\n"
-                   "}"));
-
-  EXPECT_EQ("int f(int i) {\n"
-            "  if (true) {\n"
-            "    i++;\n"
-            "  } else {\n"
-            "    // comment in else\n"
-            "#ifdef A\n"
-            "    j++;\n"
-            "#endif\n"
-            "  }\n"
-            "}",
-            format("int f(int i) {\n"
-                   "  if (true) {\n"
-                   "    i++;\n"
-                   "  } else {\n"
-                   "  // comment in else\n"
-                   "#ifdef A\n"
-                   "    j++;\n"
-                   "#endif\n"
-                   "  }\n"
-                   "}"));
-
-  EXPECT_EQ("int f(int i) {\n"
-            "  if (true) {\n"
-            "    i++;\n"
-            "  } else {\n"
-            "    /* comment in else */\n"
-            "#ifdef A\n"
-            "    j++;\n"
-            "#endif\n"
-            "  }\n"
-            "}",
-            format("int f(int i) {\n"
-                   "  if (true) {\n"
-                   "    i++;\n"
-                   "  } else {\n"
-                   "  /* comment in else */\n"
-                   "#ifdef A\n"
-                   "    j++;\n"
-                   "#endif\n"
-                   "  }\n"
-                   "}"));
-
-  // Keep the current level if there is an empty line between the comment and
-  // the preprocessor directive.
-  EXPECT_EQ("void f() {\n"
-            "  int i;\n"
-            "  /* comment */\n"
-            "\n"
-            "#ifdef A\n"
-            "  int j;\n"
-            "}",
-            format("void f() {\n"
-                   "  int i;\n"
-                   "/* comment */\n"
-                   "\n"
-                   "#ifdef A\n"
-                   "  int j;\n"
-                   "}"));
-
-  EXPECT_EQ("void f() {\n"
-            "  int i;\n"
-            "  return i;\n"
-            "}\n"
-            "// comment\n"
-            "\n"
-            "#ifdef A\n"
-            "int i;\n"
-            "#endif // A",
-            format("void f() {\n"
-                   "   int i;\n"
-                   "  return i;\n"
-                   "}\n"
-                   "// comment\n"
-                   "\n"
-                   "#ifdef A\n"
-                   "int i;\n"
-                   "#endif // A"));
-
-  EXPECT_EQ("int f(int i) {\n"
-            "  if (true) {\n"
-            "    ++i;\n"
-            "  }\n"
-            "  // comment\n"
-            "\n"
-            "#ifdef A\n"
-            "  int j;\n"
-            "#endif\n"
-            "}",
-            format("int f(int i) {\n"
-                   "   if (true) {\n"
-                   "    ++i;\n"
-                   "  }\n"
-                   "  // comment\n"
-                   "\n"
-                   "#ifdef A\n"
-                   "  int j;\n"
-                   "#endif\n"
-                   "}"));
-
-  EXPECT_EQ("int f(int i) {\n"
-            "  if (true) {\n"
-            "    i++;\n"
-            "  } else {\n"
-            "    // comment in else\n"
-            "\n"
-            "#ifdef A\n"
-            "    j++;\n"
-            "#endif\n"
-            "  }\n"
-            "}",
-            format("int f(int i) {\n"
-                   "  if (true) {\n"
-                   "    i++;\n"
-                   "  } else {\n"
-                   "// comment in else\n"
-                   "\n"
-                   "#ifdef A\n"
-                   "    j++;\n"
-                   "#endif\n"
-                   "  }\n"
-                   "}"));
-
-  EXPECT_EQ("int f(int i) {\n"
-            "  if (true) {\n"
-            "    i++;\n"
-            "  } else {\n"
-            "    /* comment in else */\n"
-            "\n"
-            "#ifdef A\n"
-            "    j++;\n"
-            "#endif\n"
-            "  }\n"
-            "}",
-            format("int f(int i) {\n"
-                   "  if (true) {\n"
-                   "    i++;\n"
-                   "  } else {\n"
-                   "/* comment in else */\n"
-                   "\n"
-                   "#ifdef A\n"
-                   "    j++;\n"
-                   "#endif\n"
-                   "  }\n"
-                   "}"));
-
-  // Align with the preprocessor directive if the comment was originally aligned
-  // with the preprocessor directive and there is no newline between the comment
-  // and the preprocessor directive.
-  EXPECT_EQ("void f() {\n"
-            "  int i;\n"
-            "/* comment */\n"
-            "#ifdef A\n"
-            "  int j;\n"
-            "}",
-            format("void f() {\n"
-                   "  int i;\n"
-                   "/* comment */\n"
-                   "#ifdef A\n"
-                   "  int j;\n"
-                   "}"));
-
-  EXPECT_EQ("int f(int i) {\n"
-            "  if (true) {\n"
-            "    ++i;\n"
-            "  }\n"
-            "// comment\n"
-            "#ifdef A\n"
-            "  int j;\n"
-            "#endif\n"
-            "}",
-            format("int f(int i) {\n"
-                   "   if (true) {\n"
-                   "    ++i;\n"
-                   "  }\n"
-                   "// comment\n"
-                   "#ifdef A\n"
-                   "  int j;\n"
-                   "#endif\n"
-                   "}"));
-
-  EXPECT_EQ("int f(int i) {\n"
-            "  if (true) {\n"
-            "    i++;\n"
-            "  } else {\n"
-            "// comment in else\n"
-            "#ifdef A\n"
-            "    j++;\n"
-            "#endif\n"
-            "  }\n"
-            "}",
-            format("int f(int i) {\n"
-                   "  if (true) {\n"
-                   "    i++;\n"
-                   "  } else {\n"
-                   " // comment in else\n"
-                   " #ifdef A\n"
-                   "    j++;\n"
-                   "#endif\n"
-                   "  }\n"
-                   "}"));
-
-  EXPECT_EQ("int f(int i) {\n"
-            "  if (true) {\n"
-            "    i++;\n"
-            "  } else {\n"
-            "/* comment in else */\n"
-            "#ifdef A\n"
-            "    j++;\n"
-            "#endif\n"
-            "  }\n"
-            "}",
-            format("int f(int i) {\n"
-                   "  if (true) {\n"
-                   "    i++;\n"
-                   "  } else {\n"
-                   " /* comment in else */\n"
-                   " #ifdef A\n"
-                   "    j++;\n"
-                   "#endif\n"
-                   "  }\n"
-                   "}"));
-}
-
-TEST_F(FormatTestComments, SplitsLongLinesInComments) {
-  // FIXME: Do we need to fix up the "  */" at the end?
-  // It doesn't look like any of our current logic triggers this.
-  EXPECT_EQ("/* This is a long\n"
-            " * comment that\n"
-            " * doesn't fit on\n"
-            " * one line.  */",
-            format("/* "
-                   "This is a long                                         "
-                   "comment that "
-                   "doesn't                                    "
-                   "fit on one line.  */",
-                   getLLVMStyleWithColumns(20)));
-  EXPECT_EQ(
-      "/* a b c d\n"
-      " * e f  g\n"
-      " * h i j k\n"
-      " */",
-      format("/* a b c d e f  g h i j k */", getLLVMStyleWithColumns(10)));
-  EXPECT_EQ(
-      "/* a b c d\n"
-      " * e f  g\n"
-      " * h i j k\n"
-      " */",
-      format("\\\n/* a b c d e f  g h i j k */", getLLVMStyleWithColumns(10)));
-  EXPECT_EQ("/*\n"
-            "This is a long\n"
-            "comment that doesn't\n"
-            "fit on one line.\n"
-            "*/",
-            format("/*\n"
-                   "This is a long                                         "
-                   "comment that doesn't                                    "
-                   "fit on one line.                                      \n"
-                   "*/",
-                   getLLVMStyleWithColumns(20)));
-  EXPECT_EQ("/*\n"
-            " * This is a long\n"
-            " * comment that\n"
-            " * doesn't fit on\n"
-            " * one line.\n"
-            " */",
-            format("/*      \n"
-                   " * This is a long "
-                   "   comment that     "
-                   "   doesn't fit on   "
-                   "   one line.                                            \n"
-                   " */",
-                   getLLVMStyleWithColumns(20)));
-  EXPECT_EQ("/*\n"
-            " * This_is_a_comment_with_words_that_dont_fit_on_one_line\n"
-            " * so_it_should_be_broken\n"
-            " * wherever_a_space_occurs\n"
-            " */",
-            format("/*\n"
-                   " * This_is_a_comment_with_words_that_dont_fit_on_one_line "
-                   "   so_it_should_be_broken "
-                   "   wherever_a_space_occurs                             \n"
-                   " */",
-                   getLLVMStyleWithColumns(20)));
-  EXPECT_EQ("/*\n"
-            " *    This_comment_can_not_be_broken_into_lines\n"
-            " */",
-            format("/*\n"
-                   " *    This_comment_can_not_be_broken_into_lines\n"
-                   " */",
-                   getLLVMStyleWithColumns(20)));
-  EXPECT_EQ("{\n"
-            "  /*\n"
-            "  This is another\n"
-            "  long comment that\n"
-            "  doesn't fit on one\n"
-            "  line    1234567890\n"
-            "  */\n"
-            "}",
-            format("{\n"
-                   "/*\n"
-                   "This is another     "
-                   "  long comment that "
-                   "  doesn't fit on one"
-                   "  line    1234567890\n"
-                   "*/\n"
-                   "}",
-                   getLLVMStyleWithColumns(20)));
-  EXPECT_EQ("{\n"
-            "  /*\n"
-            "   * This        i s\n"
-            "   * another comment\n"
-            "   * t hat  doesn' t\n"
-            "   * fit on one l i\n"
-            "   * n e\n"
-            "   */\n"
-            "}",
-            format("{\n"
-                   "/*\n"
-                   " * This        i s"
-                   "   another comment"
-                   "   t hat  doesn' t"
-                   "   fit on one l i"
-                   "   n e\n"
-                   " */\n"
-                   "}",
-                   getLLVMStyleWithColumns(20)));
-  EXPECT_EQ("/*\n"
-            " * This is a long\n"
-            " * comment that\n"
-            " * doesn't fit on\n"
-            " * one line\n"
-            " */",
-            format("   /*\n"
-                   "    * This is a long comment that doesn't fit on one line\n"
-                   "    */",
-                   getLLVMStyleWithColumns(20)));
-  EXPECT_EQ("{\n"
-            "  if (something) /* This is a\n"
-            "                    long\n"
-            "                    comment */\n"
-            "    ;\n"
-            "}",
-            format("{\n"
-                   "  if (something) /* This is a long comment */\n"
-                   "    ;\n"
-                   "}",
-                   getLLVMStyleWithColumns(30)));
-
-  EXPECT_EQ("/* A comment before\n"
-            " * a macro\n"
-            " * definition */\n"
-            "#define a b",
-            format("/* A comment before a macro definition */\n"
-                   "#define a b",
-                   getLLVMStyleWithColumns(20)));
-
-  EXPECT_EQ("/* some comment\n"
-            " *   a comment that\n"
-            " * we break another\n"
-            " * comment we have\n"
-            " * to break a left\n"
-            " * comment\n"
-            " */",
-            format("  /* some comment\n"
-                   "       *   a comment that we break\n"
-                   "   * another comment we have to break\n"
-                   "* a left comment\n"
-                   "   */",
-                   getLLVMStyleWithColumns(20)));
-
-  EXPECT_EQ("/**\n"
-            " * multiline block\n"
-            " * comment\n"
-            " *\n"
-            " */",
-            format("/**\n"
-                   " * multiline block comment\n"
-                   " *\n"
-                   " */",
-                   getLLVMStyleWithColumns(20)));
-
-  // This reproduces a crashing bug where both adaptStartOfLine and
-  // getCommentSplit were trying to wrap after the "/**".
-  EXPECT_EQ("/** multilineblockcommentwithnowrapopportunity */",
-            format("/** multilineblockcommentwithnowrapopportunity */",
-                   getLLVMStyleWithColumns(20)));
-
-  EXPECT_EQ("/*\n"
-            "\n"
-            "\n"
-            "    */\n",
-            format("  /*       \n"
-                   "      \n"
-                   "               \n"
-                   "      */\n"));
-
-  EXPECT_EQ("/* a a */",
-            format("/* a a            */", getLLVMStyleWithColumns(15)));
-  EXPECT_EQ("/* a a bc  */",
-            format("/* a a            bc  */", getLLVMStyleWithColumns(15)));
-  EXPECT_EQ("/* aaa aaa\n"
-            " * aaaaa */",
-            format("/* aaa aaa aaaaa       */", getLLVMStyleWithColumns(15)));
-  EXPECT_EQ("/* aaa aaa\n"
-            " * aaaaa     */",
-            format("/* aaa aaa aaaaa     */", getLLVMStyleWithColumns(15)));
-}
-
-TEST_F(FormatTestComments, SplitsLongLinesInCommentsInPreprocessor) {
-  EXPECT_EQ("#define X          \\\n"
-            "  /*               \\\n"
-            "   Test            \\\n"
-            "   Macro comment   \\\n"
-            "   with a long     \\\n"
-            "   line            \\\n"
-            "   */              \\\n"
-            "  A + B",
-            format("#define X \\\n"
-                   "  /*\n"
-                   "   Test\n"
-                   "   Macro comment with a long  line\n"
-                   "   */ \\\n"
-                   "  A + B",
-                   getLLVMStyleWithColumns(20)));
-  EXPECT_EQ("#define X          \\\n"
-            "  /* Macro comment \\\n"
-            "     with a long   \\\n"
-            "     line */       \\\n"
-            "  A + B",
-            format("#define X \\\n"
-                   "  /* Macro comment with a long\n"
-                   "     line */ \\\n"
-                   "  A + B",
-                   getLLVMStyleWithColumns(20)));
-  EXPECT_EQ("#define X          \\\n"
-            "  /* Macro comment \\\n"
-            "   * with a long   \\\n"
-            "   * line */       \\\n"
-            "  A + B",
-            format("#define X \\\n"
-                   "  /* Macro comment with a long  line */ \\\n"
-                   "  A + B",
-                   getLLVMStyleWithColumns(20)));
-}
-
-TEST_F(FormatTestComments, KeepsTrailingPPCommentsAndSectionCommentsSeparate) {
-  verifyFormat("#ifdef A // line about A\n"
-               "// section comment\n"
-               "#endif",
-               getLLVMStyleWithColumns(80));
-  verifyFormat("#ifdef A // line 1 about A\n"
-               "         // line 2 about A\n"
-               "// section comment\n"
-               "#endif",
-               getLLVMStyleWithColumns(80));
-  EXPECT_EQ("#ifdef A // line 1 about A\n"
-            "         // line 2 about A\n"
-            "// section comment\n"
-            "#endif",
-            format("#ifdef A // line 1 about A\n"
-                   "          // line 2 about A\n"
-                   "// section comment\n"
-                   "#endif",
-                   getLLVMStyleWithColumns(80)));
-  verifyFormat("int f() {\n"
-               "  int i;\n"
-               "#ifdef A // comment about A\n"
-               "  // section comment 1\n"
-               "  // section comment 2\n"
-               "  i = 2;\n"
-               "#else // comment about #else\n"
-               "  // section comment 3\n"
-               "  i = 4;\n"
-               "#endif\n"
-               "}",
-               getLLVMStyleWithColumns(80));
-}
-
-TEST_F(FormatTestComments, AlignsPPElseEndifComments) {
-  verifyFormat("#if A\n"
-               "#else  // A\n"
-               "int iiii;\n"
-               "#endif // B",
-               getLLVMStyleWithColumns(20));
-  verifyFormat("#if A\n"
-               "#else  // A\n"
-               "int iiii; // CC\n"
-               "#endif // B",
-               getLLVMStyleWithColumns(20));
-  EXPECT_EQ("#if A\n"
-            "#else  // A1\n"
-            "       // A2\n"
-            "int ii;\n"
-            "#endif // B",
-            format("#if A\n"
-                   "#else  // A1\n"
-                   "       // A2\n"
-                   "int ii;\n"
-                   "#endif // B",
-                   getLLVMStyleWithColumns(20)));
-}
-
-TEST_F(FormatTestComments, CommentsInStaticInitializers) {
-  EXPECT_EQ(
-      "static SomeType type = {aaaaaaaaaaaaaaaaaaaa, /* comment */\n"
-      "                        aaaaaaaaaaaaaaaaaaaa /* comment */,\n"
-      "                        /* comment */ aaaaaaaaaaaaaaaaaaaa,\n"
-      "                        aaaaaaaaaaaaaaaaaaaa, // comment\n"
-      "                        aaaaaaaaaaaaaaaaaaaa};",
-      format("static SomeType type = { aaaaaaaaaaaaaaaaaaaa  ,  /* comment */\n"
-             "                   aaaaaaaaaaaaaaaaaaaa   /* comment */ ,\n"
-             "                     /* comment */   aaaaaaaaaaaaaaaaaaaa ,\n"
-             "              aaaaaaaaaaaaaaaaaaaa ,   // comment\n"
-             "                  aaaaaaaaaaaaaaaaaaaa };"));
-  verifyFormat("static SomeType type = {aaaaaaaaaaa, // comment for aa...\n"
-               "                        bbbbbbbbbbb, ccccccccccc};");
-  verifyFormat("static SomeType type = {aaaaaaaaaaa,\n"
-               "                        // comment for bb....\n"
-               "                        bbbbbbbbbbb, ccccccccccc};");
-  verifyGoogleFormat(
-      "static SomeType type = {aaaaaaaaaaa,  // comment for aa...\n"
-      "                        bbbbbbbbbbb, ccccccccccc};");
-  verifyGoogleFormat("static SomeType type = {aaaaaaaaaaa,\n"
-                     "                        // comment for bb....\n"
-                     "                        bbbbbbbbbbb, ccccccccccc};");
-
-  verifyFormat("S s = {{a, b, c},  // Group #1\n"
-               "       {d, e, f},  // Group #2\n"
-               "       {g, h, i}}; // Group #3");
-  verifyFormat("S s = {{// Group #1\n"
-               "        a, b, c},\n"
-               "       {// Group #2\n"
-               "        d, e, f},\n"
-               "       {// Group #3\n"
-               "        g, h, i}};");
-
-  EXPECT_EQ("S s = {\n"
-            "    // Some comment\n"
-            "    a,\n"
-            "\n"
-            "    // Comment after empty line\n"
-            "    b}",
-            format("S s =    {\n"
-                   "      // Some comment\n"
-                   "  a,\n"
-                   "  \n"
-                   "     // Comment after empty line\n"
-                   "      b\n"
-                   "}"));
-  EXPECT_EQ("S s = {\n"
-            "    /* Some comment */\n"
-            "    a,\n"
-            "\n"
-            "    /* Comment after empty line */\n"
-            "    b}",
-            format("S s =    {\n"
-                   "      /* Some comment */\n"
-                   "  a,\n"
-                   "  \n"
-                   "     /* Comment after empty line */\n"
-                   "      b\n"
-                   "}"));
-  verifyFormat("const uint8_t aaaaaaaaaaaaaaaaaaaaaa[0] = {\n"
-               "    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // comment\n"
-               "    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // comment\n"
-               "    0x00, 0x00, 0x00, 0x00};            // comment\n");
-}
-
-TEST_F(FormatTestComments, LineCommentsAfterRightBrace) {
-  EXPECT_EQ("if (true) { // comment about branch\n"
-            "  // comment about f\n"
-            "  f();\n"
-            "}",
-            format("if (true) { // comment about branch\n"
-                   "  // comment about f\n"
-                   "  f();\n"
-                   "}",
-                   getLLVMStyleWithColumns(80)));
-  EXPECT_EQ("if (1) { // if line 1\n"
-            "         // if line 2\n"
-            "         // if line 3\n"
-            "  // f line 1\n"
-            "  // f line 2\n"
-            "  f();\n"
-            "} else { // else line 1\n"
-            "         // else line 2\n"
-            "         // else line 3\n"
-            "  // g line 1\n"
-            "  g();\n"
-            "}",
-            format("if (1) { // if line 1\n"
-                   "          // if line 2\n"
-                   "        // if line 3\n"
-                   "  // f line 1\n"
-                   "    // f line 2\n"
-                   "  f();\n"
-                   "} else { // else line 1\n"
-                   "        // else line 2\n"
-                   "         // else line 3\n"
-                   "  // g line 1\n"
-                   "  g();\n"
-                   "}"));
-  EXPECT_EQ("do { // line 1\n"
-            "     // line 2\n"
-            "     // line 3\n"
-            "  f();\n"
-            "} while (true);",
-            format("do { // line 1\n"
-                   "     // line 2\n"
-                   "   // line 3\n"
-                   "  f();\n"
-                   "} while (true);",
-                   getLLVMStyleWithColumns(80)));
-  EXPECT_EQ("while (a < b) { // line 1\n"
-            "  // line 2\n"
-            "  // line 3\n"
-            "  f();\n"
-            "}",
-            format("while (a < b) {// line 1\n"
-                   "  // line 2\n"
-                   "  // line 3\n"
-                   "  f();\n"
-                   "}",
-                   getLLVMStyleWithColumns(80)));
-}
-
-TEST_F(FormatTestComments, ReflowsComments) {
-  // Break a long line and reflow with the full next line.
-  EXPECT_EQ("// long long long\n"
-            "// long long",
-            format("// long long long long\n"
-                   "// long",
-                   getLLVMStyleWithColumns(20)));
-
-  // Keep the trailing newline while reflowing.
-  EXPECT_EQ("// long long long\n"
-            "// long long\n",
-            format("// long long long long\n"
-                   "// long\n",
-                   getLLVMStyleWithColumns(20)));
-
-  // Break a long line and reflow with a part of the next line.
-  EXPECT_EQ("// long long long\n"
-            "// long long\n"
-            "// long_long",
-            format("// long long long long\n"
-                   "// long long_long",
-                   getLLVMStyleWithColumns(20)));
-
-  // Break but do not reflow if the first word from the next line is too long.
-  EXPECT_EQ("// long long long\n"
-            "// long\n"
-            "// long_long_long\n",
-            format("// long long long long\n"
-                   "// long_long_long\n",
-                   getLLVMStyleWithColumns(20)));
-
-  // Don't break or reflow short lines.
-  verifyFormat("// long\n"
-               "// long long long lo\n"
-               "// long long long lo\n"
-               "// long",
-               getLLVMStyleWithColumns(20));
-
-  // Keep prefixes and decorations while reflowing.
-  EXPECT_EQ("/// long long long\n"
-            "/// long long\n",
-            format("/// long long long long\n"
-                   "/// long\n",
-                   getLLVMStyleWithColumns(20)));
-  EXPECT_EQ("//! long long long\n"
-            "//! long long\n",
-            format("//! long long long long\n"
-                   "//! long\n",
-                   getLLVMStyleWithColumns(20)));
-  EXPECT_EQ("/* long long long\n"
-            " * long long */",
-            format("/* long long long long\n"
-                   " * long */",
-                   getLLVMStyleWithColumns(20)));
-  EXPECT_EQ("///< long long long\n"
-            "///< long long\n",
-            format("///< long long long long\n"
-                   "///< long\n",
-                   getLLVMStyleWithColumns(20)));
-  EXPECT_EQ("//!< long long long\n"
-            "//!< long long\n",
-            format("//!< long long long long\n"
-                   "//!< long\n",
-                   getLLVMStyleWithColumns(20)));
-
-  // Don't bring leading whitespace up while reflowing.
-  EXPECT_EQ("/*  long long long\n"
-            " * long long long\n"
-            " */",
-            format("/*  long long long long\n"
-                   " *  long long\n"
-                   " */",
-                   getLLVMStyleWithColumns(20)));
-
-  // Reflow the last line of a block comment with its trailing '*/'.
-  EXPECT_EQ("/* long long long\n"
-            "   long long */",
-            format("/* long long long long\n"
-                   "   long */",
-                   getLLVMStyleWithColumns(20)));
-
-  // Reflow two short lines; keep the postfix of the last one.
-  EXPECT_EQ("/* long long long\n"
-            " * long long long */",
-            format("/* long long long long\n"
-                   " * long\n"
-                   " * long */",
-                   getLLVMStyleWithColumns(20)));
-
-  // Put the postfix of the last short reflow line on a newline if it doesn't
-  // fit.
-  EXPECT_EQ("/* long long long\n"
-            " * long long longg\n"
-            " */",
-            format("/* long long long long\n"
-                   " * long\n"
-                   " * longg */",
-                   getLLVMStyleWithColumns(20)));
-
-  // Reflow lines with leading whitespace.
-  EXPECT_EQ("{\n"
-            "  /*\n"
-            "   * long long long\n"
-            "   * long long long\n"
-            "   * long long long\n"
-            "   */\n"
-            "}",
-            format("{\n"
-                   "/*\n"
-                   " * long long long long\n"
-                   " *   long\n"
-                   " * long long long long\n"
-                   " */\n"
-                   "}",
-                   getLLVMStyleWithColumns(20)));
-
-  // Break single line block comments that are first in the line with ' *'
-  // decoration.
-  EXPECT_EQ("/* long long long\n"
-            " * long */",
-            format("/* long long long long */", getLLVMStyleWithColumns(20)));
-
-  // Break single line block comment that are not first in the line with '  '
-  // decoration.
-  EXPECT_EQ("int i; /* long long\n"
-            "          long */",
-            format("int i; /* long long long */", getLLVMStyleWithColumns(20)));
-
-  // Reflow a line that goes just over the column limit.
-  EXPECT_EQ("// long long long\n"
-            "// lon long",
-            format("// long long long lon\n"
-                   "// long",
-                   getLLVMStyleWithColumns(20)));
-
-  // Stop reflowing if the next line has a different indentation than the
-  // previous line.
-  EXPECT_EQ("// long long long\n"
-            "// long\n"
-            "//  long long\n"
-            "//  long",
-            format("// long long long long\n"
-                   "//  long long\n"
-                   "//  long",
-                   getLLVMStyleWithColumns(20)));
-
-  // Reflow into the last part of a really long line that has been broken into
-  // multiple lines.
-  EXPECT_EQ("// long long long\n"
-            "// long long long\n"
-            "// long long long\n",
-            format("// long long long long long long long long\n"
-                   "// long\n",
-                   getLLVMStyleWithColumns(20)));
-
-  // Break the first line, then reflow the beginning of the second and third
-  // line up.
-  EXPECT_EQ("// long long long\n"
-            "// lon1 lon2 lon2\n"
-            "// lon2 lon3 lon3",
-            format("// long long long lon1\n"
-                   "// lon2 lon2 lon2\n"
-                   "// lon3 lon3",
-                   getLLVMStyleWithColumns(20)));
-
-  // Reflow the beginning of the second line, then break the rest.
-  EXPECT_EQ("// long long long\n"
-            "// lon1 lon2 lon2\n"
-            "// lon2 lon2 lon2\n"
-            "// lon3",
-            format("// long long long lon1\n"
-                   "// lon2 lon2 lon2 lon2 lon2 lon3",
-                   getLLVMStyleWithColumns(20)));
-
-  // Shrink the first line, then reflow the second line up.
-  EXPECT_EQ("// long long long", format("// long              long\n"
-                                        "// long",
-                                        getLLVMStyleWithColumns(20)));
-
-  // Don't shrink leading whitespace.
-  EXPECT_EQ("int i; ///           a",
-            format("int i; ///           a", getLLVMStyleWithColumns(20)));
-
-  // Shrink trailing whitespace if there is no postfix and reflow.
-  EXPECT_EQ("// long long long\n"
-            "// long long",
-            format("// long long long long    \n"
-                   "// long",
-                   getLLVMStyleWithColumns(20)));
-
-  // Shrink trailing whitespace to a single one if there is postfix.
-  EXPECT_EQ("/* long long long */",
-            format("/* long long long     */", getLLVMStyleWithColumns(20)));
-
-  // Break a block comment postfix if exceeding the line limit.
-  EXPECT_EQ("/*               long\n"
-            " */",
-            format("/*               long */", getLLVMStyleWithColumns(20)));
-
-  // Reflow indented comments.
-  EXPECT_EQ("{\n"
-            "  // long long long\n"
-            "  // long long\n"
-            "  int i; /* long lon\n"
-            "            g long\n"
-            "          */\n"
-            "}",
-            format("{\n"
-                   "  // long long long long\n"
-                   "  // long\n"
-                   "  int i; /* long lon g\n"
-                   "            long */\n"
-                   "}",
-                   getLLVMStyleWithColumns(20)));
-
-  // Don't realign trailing comments after reflow has happened.
-  EXPECT_EQ("// long long long\n"
-            "// long long\n"
-            "long i; // long",
-            format("// long long long long\n"
-                   "// long\n"
-                   "long i; // long",
-                   getLLVMStyleWithColumns(20)));
-  EXPECT_EQ("// long long long\n"
-            "// longng long long\n"
-            "// long lo",
-            format("// long long long longng\n"
-                   "// long long long\n"
-                   "// lo",
-                   getLLVMStyleWithColumns(20)));
-
-  // Reflow lines after a broken line.
-  EXPECT_EQ("int a; // Trailing\n"
-            "       // comment on\n"
-            "       // 2 or 3\n"
-            "       // lines.\n",
-            format("int a; // Trailing comment\n"
-                   "       // on 2\n"
-                   "       // or 3\n"
-                   "       // lines.\n",
-                   getLLVMStyleWithColumns(20)));
-  EXPECT_EQ("/// This long line\n"
-            "/// gets reflown.\n",
-            format("/// This long line gets\n"
-                   "/// reflown.\n",
-                   getLLVMStyleWithColumns(20)));
-  EXPECT_EQ("//! This long line\n"
-            "//! gets reflown.\n",
-            format(" //! This long line gets\n"
-                   " //! reflown.\n",
-                   getLLVMStyleWithColumns(20)));
-  EXPECT_EQ("/* This long line\n"
-            " * gets reflown.\n"
-            " */\n",
-            format("/* This long line gets\n"
-                   " * reflown.\n"
-                   " */\n",
-                   getLLVMStyleWithColumns(20)));
-
-  // Reflow after indentation makes a line too long.
-  EXPECT_EQ("{\n"
-            "  // long long long\n"
-            "  // lo long\n"
-            "}\n",
-            format("{\n"
-                   "// long long long lo\n"
-                   "// long\n"
-                   "}\n",
-                   getLLVMStyleWithColumns(20)));
-
-  // Break and reflow multiple lines.
-  EXPECT_EQ("/*\n"
-            " * Reflow the end of\n"
-            " * line by 11 22 33\n"
-            " * 4.\n"
-            " */\n",
-            format("/*\n"
-                   " * Reflow the end of line\n"
-                   " * by\n"
-                   " * 11\n"
-                   " * 22\n"
-                   " * 33\n"
-                   " * 4.\n"
-                   " */\n",
-                   getLLVMStyleWithColumns(20)));
-  EXPECT_EQ("/// First line gets\n"
-            "/// broken. Second\n"
-            "/// line gets\n"
-            "/// reflown and\n"
-            "/// broken. Third\n"
-            "/// gets reflown.\n",
-            format("/// First line gets broken.\n"
-                   "/// Second line gets reflown and broken.\n"
-                   "/// Third gets reflown.\n",
-                   getLLVMStyleWithColumns(20)));
-  EXPECT_EQ("int i; // first long\n"
-            "       // long snd\n"
-            "       // long.\n",
-            format("int i; // first long long\n"
-                   "       // snd long.\n",
-                   getLLVMStyleWithColumns(20)));
-  EXPECT_EQ("{\n"
-            "  // first long line\n"
-            "  // line second\n"
-            "  // long line line\n"
-            "  // third long line\n"
-            "  // line\n"
-            "}\n",
-            format("{\n"
-                   "  // first long line line\n"
-                   "  // second long line line\n"
-                   "  // third long line line\n"
-                   "}\n",
-                   getLLVMStyleWithColumns(20)));
-  EXPECT_EQ("int i; /* first line\n"
-            "        * second\n"
-            "        * line third\n"
-            "        * line\n"
-            "        */",
-            format("int i; /* first line\n"
-                   "        * second line\n"
-                   "        * third line\n"
-                   "        */",
-                   getLLVMStyleWithColumns(20)));
-
-  // Reflow the last two lines of a section that starts with a line having
-  // different indentation.
-  EXPECT_EQ("//     long\n"
-            "// long long long\n"
-            "// long long",
-            format("//     long\n"
-                   "// long long long long\n"
-                   "// long",
-                   getLLVMStyleWithColumns(20)));
-
-  // Keep the block comment endling '*/' while reflowing.
-  EXPECT_EQ("/* Long long long\n"
-            " * line short */\n",
-            format("/* Long long long line\n"
-                   " * short */\n",
-                   getLLVMStyleWithColumns(20)));
-
-  // Don't reflow between separate blocks of comments.
-  EXPECT_EQ("/* First comment\n"
-            " * block will */\n"
-            "/* Snd\n"
-            " */\n",
-            format("/* First comment block\n"
-                   " * will */\n"
-                   "/* Snd\n"
-                   " */\n",
-                   getLLVMStyleWithColumns(20)));
-
-  // Don't reflow across blank comment lines.
-  EXPECT_EQ("int i; // This long\n"
-            "       // line gets\n"
-            "       // broken.\n"
-            "       //\n"
-            "       // keep.\n",
-            format("int i; // This long line gets broken.\n"
-                   "       //  \n"
-                   "       // keep.\n",
-                   getLLVMStyleWithColumns(20)));
-  EXPECT_EQ("{\n"
-            "  /// long long long\n"
-            "  /// long long\n"
-            "  ///\n"
-            "  /// long\n"
-            "}",
-            format("{\n"
-                   "  /// long long long long\n"
-                   "  /// long\n"
-                   "  ///\n"
-                   "  /// long\n"
-                   "}",
-                   getLLVMStyleWithColumns(20)));
-  EXPECT_EQ("//! long long long\n"
-            "//! long\n"
-            "\n"
-            "//! long",
-            format("//! long long long long\n"
-                   "\n"
-                   "//! long",
-                   getLLVMStyleWithColumns(20)));
-  EXPECT_EQ("/* long long long\n"
-            "   long\n"
-            "\n"
-            "   long */",
-            format("/* long long long long\n"
-                   "\n"
-                   "   long */",
-                   getLLVMStyleWithColumns(20)));
-  EXPECT_EQ("/* long long long\n"
-            " * long\n"
-            " *\n"
-            " * long */",
-            format("/* long long long long\n"
-                   " *\n"
-                   " * long */",
-                   getLLVMStyleWithColumns(20)));
-
-  // Don't reflow lines having content that is a single character.
-  EXPECT_EQ("// long long long\n"
-            "// long\n"
-            "// l",
-            format("// long long long long\n"
-                   "// l",
-                   getLLVMStyleWithColumns(20)));
-
-  // Don't reflow lines starting with two punctuation characters.
-  EXPECT_EQ("// long long long\n"
-            "// long\n"
-            "// ... --- ...",
-            format("// long long long long\n"
-                   "// ... --- ...",
-                   getLLVMStyleWithColumns(20)));
-
-  // Don't reflow lines starting with '@'.
-  EXPECT_EQ("// long long long\n"
-            "// long\n"
-            "// @param arg",
-            format("// long long long long\n"
-                   "// @param arg",
-                   getLLVMStyleWithColumns(20)));
-
-  // Don't reflow lines starting with 'TODO'.
-  EXPECT_EQ("// long long long\n"
-            "// long\n"
-            "// TODO: long",
-            format("// long long long long\n"
-                   "// TODO: long",
-                   getLLVMStyleWithColumns(20)));
-
-  // Don't reflow lines starting with 'FIXME'.
-  EXPECT_EQ("// long long long\n"
-            "// long\n"
-            "// FIXME: long",
-            format("// long long long long\n"
-                   "// FIXME: long",
-                   getLLVMStyleWithColumns(20)));
-
-  // Don't reflow lines starting with 'XXX'.
-  EXPECT_EQ("// long long long\n"
-            "// long\n"
-            "// XXX: long",
-            format("// long long long long\n"
-                   "// XXX: long",
-                   getLLVMStyleWithColumns(20)));
-
-  // Don't reflow comment pragmas.
-  EXPECT_EQ("// long long long\n"
-            "// long\n"
-            "// IWYU pragma:",
-            format("// long long long long\n"
-                   "// IWYU pragma:",
-                   getLLVMStyleWithColumns(20)));
-  EXPECT_EQ("/* long long long\n"
-            " * long\n"
-            " * IWYU pragma:\n"
-            " */",
-            format("/* long long long long\n"
-                   " * IWYU pragma:\n"
-                   " */",
-                   getLLVMStyleWithColumns(20)));
-
-  // Reflow lines that have a non-punctuation character among their first 2
-  // characters.
-  EXPECT_EQ("// long long long\n"
-            "// long 'long'",
-            format("// long long long long\n"
-                   "// 'long'",
-                   getLLVMStyleWithColumns(20)));
-
-  // Don't reflow between separate blocks of comments.
-  EXPECT_EQ("/* First comment\n"
-            " * block will */\n"
-            "/* Snd\n"
-            " */\n",
-            format("/* First comment block\n"
-                   " * will */\n"
-                   "/* Snd\n"
-                   " */\n",
-                   getLLVMStyleWithColumns(20)));
-
-  // Don't reflow lines having different indentation.
-  EXPECT_EQ("// long long long\n"
-            "// long\n"
-            "//  long",
-            format("// long long long long\n"
-                   "//  long",
-                   getLLVMStyleWithColumns(20)));
-
-  // Don't reflow separate bullets in list
-  EXPECT_EQ("// - long long long\n"
-            "// long\n"
-            "// - long",
-            format("// - long long long long\n"
-                   "// - long",
-                   getLLVMStyleWithColumns(20)));
-  EXPECT_EQ("// * long long long\n"
-            "// long\n"
-            "// * long",
-            format("// * long long long long\n"
-                   "// * long",
-                   getLLVMStyleWithColumns(20)));
-  EXPECT_EQ("// + long long long\n"
-            "// long\n"
-            "// + long",
-            format("// + long long long long\n"
-                   "// + long",
-                   getLLVMStyleWithColumns(20)));
-  EXPECT_EQ("// 1. long long long\n"
-            "// long\n"
-            "// 2. long",
-            format("// 1. long long long long\n"
-                   "// 2. long",
-                   getLLVMStyleWithColumns(20)));
-  EXPECT_EQ("// -# long long long\n"
-            "// long\n"
-            "// -# long",
-            format("// -# long long long long\n"
-                   "// -# long",
-                   getLLVMStyleWithColumns(20)));
-
-  EXPECT_EQ("// - long long long\n"
-            "// long long long\n"
-            "// - long",
-            format("// - long long long long\n"
-                   "// long long\n"
-                   "// - long",
-                   getLLVMStyleWithColumns(20)));
-  EXPECT_EQ("// - long long long\n"
-            "// long long long\n"
-            "// long\n"
-            "// - long",
-            format("// - long long long long\n"
-                   "// long long long\n"
-                   "// - long",
-                   getLLVMStyleWithColumns(20)));
-
-  // Large number (>2 digits) are not list items
-  EXPECT_EQ("// long long long\n"
-            "// long 1024. long.",
-            format("// long long long long\n"
-                   "// 1024. long.",
-                   getLLVMStyleWithColumns(20)));
-
-  // Do not break before number, to avoid introducing a non-reflowable doxygen
-  // list item.
-  EXPECT_EQ("// long long\n"
-            "// long 10. long.",
-            format("// long long long 10.\n"
-                   "// long.",
-                   getLLVMStyleWithColumns(20)));
-
-  // Don't break or reflow after implicit string literals.
-  verifyFormat("#include <t> // l l l\n"
-               "             // l",
-               getLLVMStyleWithColumns(20));
-
-  // Don't break or reflow comments on import lines.
-  EXPECT_EQ("#include \"t\" /* l l l\n"
-            "                * l */",
-            format("#include \"t\" /* l l l\n"
-                   "                * l */",
-                   getLLVMStyleWithColumns(20)));
-
-  // Don't reflow between different trailing comment sections.
-  EXPECT_EQ("int i; // long long\n"
-            "       // long\n"
-            "int j; // long long\n"
-            "       // long\n",
-            format("int i; // long long long\n"
-                   "int j; // long long long\n",
-                   getLLVMStyleWithColumns(20)));
-
-  // Don't reflow if the first word on the next line is longer than the
-  // available space at current line.
-  EXPECT_EQ("int i; // trigger\n"
-            "       // reflow\n"
-            "       // longsec\n",
-            format("int i; // trigger reflow\n"
-                   "       // longsec\n",
-                   getLLVMStyleWithColumns(20)));
-
-  // Simple case that correctly handles reflow in parameter lists.
-  EXPECT_EQ("a = f(/* looooooooong\n"
-            "       * long long\n"
-            "       */\n"
-            "      a);",
-            format("a = f(/* looooooooong long\n* long\n*/ a);",
-                   getLLVMStyleWithColumns(22)));
-  // Tricky case that has fewer lines if we reflow the comment, ending up with
-  // fewer lines.
-  EXPECT_EQ("a = f(/* loooooong\n"
-            "       * long long\n"
-            "       */\n"
-            "      a);",
-            format("a = f(/* loooooong long\n* long\n*/ a);",
-                   getLLVMStyleWithColumns(22)));
-
-  // Keep empty comment lines.
-  EXPECT_EQ("/**/", format(" /**/", getLLVMStyleWithColumns(20)));
-  EXPECT_EQ("/* */", format(" /* */", getLLVMStyleWithColumns(20)));
-  EXPECT_EQ("/*  */", format(" /*  */", getLLVMStyleWithColumns(20)));
-  EXPECT_EQ("//", format(" //  ", getLLVMStyleWithColumns(20)));
-  EXPECT_EQ("///", format(" ///  ", getLLVMStyleWithColumns(20)));
-}
-
-TEST_F(FormatTestComments, ReflowsCommentsPrecise) {
-  // FIXME: This assumes we do not continue compressing whitespace once we are
-  // in reflow mode. Consider compressing whitespace.
-
-  // Test that we stop reflowing precisely at the column limit.
-  // After reflowing, "// reflows into   foo" does not fit the column limit,
-  // so we compress the whitespace.
-  EXPECT_EQ("// some text that\n"
-            "// reflows into foo\n",
-            format("// some text that reflows\n"
-                   "// into   foo\n",
-                   getLLVMStyleWithColumns(20)));
-  // Given one more column, "// reflows into   foo" does fit the limit, so we
-  // do not compress the whitespace.
-  EXPECT_EQ("// some text that\n"
-            "// reflows into   foo\n",
-            format("// some text that reflows\n"
-                   "// into   foo\n",
-                   getLLVMStyleWithColumns(21)));
-
-  // Make sure that we correctly account for the space added in the reflow case
-  // when making the reflowing decision.
-  // First, when the next line ends precisely one column over the limit, do not
-  // reflow.
-  EXPECT_EQ("// some text that\n"
-            "// reflows\n"
-            "// into1234567\n",
-            format("// some text that reflows\n"
-                   "// into1234567\n",
-                   getLLVMStyleWithColumns(21)));
-  // Secondly, when the next line ends later, but the first word in that line
-  // is precisely one column over the limit, do not reflow.
-  EXPECT_EQ("// some text that\n"
-            "// reflows\n"
-            "// into1234567 f\n",
-            format("// some text that reflows\n"
-                   "// into1234567 f\n",
-                   getLLVMStyleWithColumns(21)));
-}
-
-TEST_F(FormatTestComments, ReflowsCommentsWithExtraWhitespace) {
-  // Baseline.
-  EXPECT_EQ("// some text\n"
-            "// that re flows\n",
-            format("// some text that\n"
-                   "// re flows\n",
-                   getLLVMStyleWithColumns(16)));
-  EXPECT_EQ("// some text\n"
-            "// that re flows\n",
-            format("// some text that\n"
-                   "// re    flows\n",
-                   getLLVMStyleWithColumns(16)));
-  EXPECT_EQ("/* some text\n"
-            " * that re flows\n"
-            " */\n",
-            format("/* some text that\n"
-                   "*      re       flows\n"
-                   "*/\n",
-                   getLLVMStyleWithColumns(16)));
-  // FIXME: We do not reflow if the indent of two subsequent lines differs;
-  // given that this is different behavior from block comments, do we want
-  // to keep this?
-  EXPECT_EQ("// some text\n"
-            "// that\n"
-            "//     re flows\n",
-            format("// some text that\n"
-                   "//     re       flows\n",
-                   getLLVMStyleWithColumns(16)));
-  // Space within parts of a line that fit.
-  // FIXME: Use the earliest possible split while reflowing to compress the
-  // whitespace within the line.
-  EXPECT_EQ("// some text that\n"
-            "// does re   flow\n"
-            "// more  here\n",
-            format("// some text that does\n"
-                   "// re   flow  more  here\n",
-                   getLLVMStyleWithColumns(21)));
-}
-
-TEST_F(FormatTestComments, IgnoresIf0Contents) {
-  EXPECT_EQ("#if 0\n"
-            "}{)(&*(^%%#%@! fsadj f;ldjs ,:;| <<<>>>][)(][\n"
-            "#endif\n"
-            "void f() {}",
-            format("#if 0\n"
-                   "}{)(&*(^%%#%@! fsadj f;ldjs ,:;| <<<>>>][)(][\n"
-                   "#endif\n"
-                   "void f(  ) {  }"));
-  EXPECT_EQ("#if false\n"
-            "void f(  ) {  }\n"
-            "#endif\n"
-            "void g() {}\n",
-            format("#if false\n"
-                   "void f(  ) {  }\n"
-                   "#endif\n"
-                   "void g(  ) {  }\n"));
-  EXPECT_EQ("enum E {\n"
-            "  One,\n"
-            "  Two,\n"
-            "#if 0\n"
-            "Three,\n"
-            "      Four,\n"
-            "#endif\n"
-            "  Five\n"
-            "};",
-            format("enum E {\n"
-                   "  One,Two,\n"
-                   "#if 0\n"
-                   "Three,\n"
-                   "      Four,\n"
-                   "#endif\n"
-                   "  Five};"));
-  EXPECT_EQ("enum F {\n"
-            "  One,\n"
-            "#if 1\n"
-            "  Two,\n"
-            "#if 0\n"
-            "Three,\n"
-            "      Four,\n"
-            "#endif\n"
-            "  Five\n"
-            "#endif\n"
-            "};",
-            format("enum F {\n"
-                   "One,\n"
-                   "#if 1\n"
-                   "Two,\n"
-                   "#if 0\n"
-                   "Three,\n"
-                   "      Four,\n"
-                   "#endif\n"
-                   "Five\n"
-                   "#endif\n"
-                   "};"));
-  EXPECT_EQ("enum G {\n"
-            "  One,\n"
-            "#if 0\n"
-            "Two,\n"
-            "#else\n"
-            "  Three,\n"
-            "#endif\n"
-            "  Four\n"
-            "};",
-            format("enum G {\n"
-                   "One,\n"
-                   "#if 0\n"
-                   "Two,\n"
-                   "#else\n"
-                   "Three,\n"
-                   "#endif\n"
-                   "Four\n"
-                   "};"));
-  EXPECT_EQ("enum H {\n"
-            "  One,\n"
-            "#if 0\n"
-            "#ifdef Q\n"
-            "Two,\n"
-            "#else\n"
-            "Three,\n"
-            "#endif\n"
-            "#endif\n"
-            "  Four\n"
-            "};",
-            format("enum H {\n"
-                   "One,\n"
-                   "#if 0\n"
-                   "#ifdef Q\n"
-                   "Two,\n"
-                   "#else\n"
-                   "Three,\n"
-                   "#endif\n"
-                   "#endif\n"
-                   "Four\n"
-                   "};"));
-  EXPECT_EQ("enum I {\n"
-            "  One,\n"
-            "#if /* test */ 0 || 1\n"
-            "Two,\n"
-            "Three,\n"
-            "#endif\n"
-            "  Four\n"
-            "};",
-            format("enum I {\n"
-                   "One,\n"
-                   "#if /* test */ 0 || 1\n"
-                   "Two,\n"
-                   "Three,\n"
-                   "#endif\n"
-                   "Four\n"
-                   "};"));
-  EXPECT_EQ("enum J {\n"
-            "  One,\n"
-            "#if 0\n"
-            "#if 0\n"
-            "Two,\n"
-            "#else\n"
-            "Three,\n"
-            "#endif\n"
-            "Four,\n"
-            "#endif\n"
-            "  Five\n"
-            "};",
-            format("enum J {\n"
-                   "One,\n"
-                   "#if 0\n"
-                   "#if 0\n"
-                   "Two,\n"
-                   "#else\n"
-                   "Three,\n"
-                   "#endif\n"
-                   "Four,\n"
-                   "#endif\n"
-                   "Five\n"
-                   "};"));
-
-  // Ignore stuff in SWIG-blocks.
-  EXPECT_EQ("#ifdef SWIG\n"
-            "}{)(&*(^%%#%@! fsadj f;ldjs ,:;| <<<>>>][)(][\n"
-            "#endif\n"
-            "void f() {}",
-            format("#ifdef SWIG\n"
-                   "}{)(&*(^%%#%@! fsadj f;ldjs ,:;| <<<>>>][)(][\n"
-                   "#endif\n"
-                   "void f(  ) {  }"));
-  EXPECT_EQ("#ifndef SWIG\n"
-            "void f() {}\n"
-            "#endif",
-            format("#ifndef SWIG\n"
-                   "void f(      ) {       }\n"
-                   "#endif"));
-}
-
-TEST_F(FormatTestComments, DontCrashOnBlockComments) {
-  EXPECT_EQ(
-      "int xxxxxxxxx; /* "
-      "yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy\n"
-      "zzzzzz\n"
-      "0*/",
-      format("int xxxxxxxxx;                          /* "
-             "yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy zzzzzz\n"
-             "0*/"));
-}
-
-TEST_F(FormatTestComments, BlockCommentsInControlLoops) {
-  verifyFormat("if (0) /* a comment in a strange place */ {\n"
-               "  f();\n"
-               "}");
-  verifyFormat("if (0) /* a comment in a strange place */ {\n"
-               "  f();\n"
-               "} /* another comment */ else /* comment #3 */ {\n"
-               "  g();\n"
-               "}");
-  verifyFormat("while (0) /* a comment in a strange place */ {\n"
-               "  f();\n"
-               "}");
-  verifyFormat("for (;;) /* a comment in a strange place */ {\n"
-               "  f();\n"
-               "}");
-  verifyFormat("do /* a comment in a strange place */ {\n"
-               "  f();\n"
-               "} /* another comment */ while (0);");
-}
-
-TEST_F(FormatTestComments, BlockComments) {
-  EXPECT_EQ("/* */ /* */ /* */\n/* */ /* */ /* */",
-            format("/* *//* */  /* */\n/* *//* */  /* */"));
-  EXPECT_EQ("/* */ a /* */ b;", format("  /* */  a/* */  b;"));
-  EXPECT_EQ("#define A /*123*/ \\\n"
-            "  b\n"
-            "/* */\n"
-            "someCall(\n"
-            "    parameter);",
-            format("#define A /*123*/ b\n"
-                   "/* */\n"
-                   "someCall(parameter);",
-                   getLLVMStyleWithColumns(15)));
-
-  EXPECT_EQ("#define A\n"
-            "/* */ someCall(\n"
-            "    parameter);",
-            format("#define A\n"
-                   "/* */someCall(parameter);",
-                   getLLVMStyleWithColumns(15)));
-  EXPECT_EQ("/*\n**\n*/", format("/*\n**\n*/"));
-  EXPECT_EQ("/*\n"
-            " *\n"
-            " * aaaaaa\n"
-            " * aaaaaa\n"
-            " */",
-            format("/*\n"
-                   "*\n"
-                   " * aaaaaa aaaaaa\n"
-                   "*/",
-                   getLLVMStyleWithColumns(10)));
-  EXPECT_EQ("/*\n"
-            "**\n"
-            "* aaaaaa\n"
-            "*aaaaaa\n"
-            "*/",
-            format("/*\n"
-                   "**\n"
-                   "* aaaaaa aaaaaa\n"
-                   "*/",
-                   getLLVMStyleWithColumns(10)));
-  EXPECT_EQ("int aaaaaaaaaaaaaaaaaaaaaaaaaaaa =\n"
-            "    /* line 1\n"
-            "       bbbbbbbbbbbb */\n"
-            "    bbbbbbbbbbbbbbbbbbbbbbbbbbbb;",
-            format("int aaaaaaaaaaaaaaaaaaaaaaaaaaaa =\n"
-                   "    /* line 1\n"
-                   "       bbbbbbbbbbbb */ bbbbbbbbbbbbbbbbbbbbbbbbbbbb;",
-                   getLLVMStyleWithColumns(50)));
-
-  FormatStyle NoBinPacking = getLLVMStyle();
-  NoBinPacking.BinPackParameters = false;
-  EXPECT_EQ("someFunction(1, /* comment 1 */\n"
-            "             2, /* comment 2 */\n"
-            "             3, /* comment 3 */\n"
-            "             aaaa,\n"
-            "             bbbb);",
-            format("someFunction (1,   /* comment 1 */\n"
-                   "                2, /* comment 2 */  \n"
-                   "               3,   /* comment 3 */\n"
-                   "aaaa, bbbb );",
-                   NoBinPacking));
-  verifyFormat(
-      "bool aaaaaaaaaaaaa = /* comment: */ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa ||\n"
-      "                     aaaaaaaaaaaaaaaaaaaaaaaaaaaa;");
-  EXPECT_EQ(
-      "bool aaaaaaaaaaaaa = /* trailing comment */\n"
-      "    aaaaaaaaaaaaaaaaaaaaaaaaaaa || aaaaaaaaaaaaaaaaaaaaaaaaa ||\n"
-      "    aaaaaaaaaaaaaaaaaaaaaaaaaaaa || aaaaaaaaaaaaaaaaaaaaaaaaaa;",
-      format(
-          "bool       aaaaaaaaaaaaa =       /* trailing comment */\n"
-          "    aaaaaaaaaaaaaaaaaaaaaaaaaaa||aaaaaaaaaaaaaaaaaaaaaaaaa    ||\n"
-          "    aaaaaaaaaaaaaaaaaaaaaaaaaaaa   || aaaaaaaaaaaaaaaaaaaaaaaaaa;"));
-  EXPECT_EQ(
-      "int aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa; /* comment */\n"
-      "int bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb;   /* comment */\n"
-      "int cccccccccccccccccccccccccccccc;       /* comment */\n",
-      format("int aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa; /* comment */\n"
-             "int      bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb; /* comment */\n"
-             "int    cccccccccccccccccccccccccccccc;  /* comment */\n"));
-
-  verifyFormat("void f(int * /* unused */) {}");
-
-  EXPECT_EQ("/*\n"
-            " **\n"
-            " */",
-            format("/*\n"
-                   " **\n"
-                   " */"));
-  EXPECT_EQ("/*\n"
-            " *q\n"
-            " */",
-            format("/*\n"
-                   " *q\n"
-                   " */"));
-  EXPECT_EQ("/*\n"
-            " * q\n"
-            " */",
-            format("/*\n"
-                   " * q\n"
-                   " */"));
-  EXPECT_EQ("/*\n"
-            " **/",
-            format("/*\n"
-                   " **/"));
-  EXPECT_EQ("/*\n"
-            " ***/",
-            format("/*\n"
-                   " ***/"));
-}
-
-TEST_F(FormatTestComments, BlockCommentsInMacros) {
-  EXPECT_EQ("#define A          \\\n"
-            "  {                \\\n"
-            "    /* one line */ \\\n"
-            "    someCall();",
-            format("#define A {        \\\n"
-                   "  /* one line */   \\\n"
-                   "  someCall();",
-                   getLLVMStyleWithColumns(20)));
-  EXPECT_EQ("#define A          \\\n"
-            "  {                \\\n"
-            "    /* previous */ \\\n"
-            "    /* one line */ \\\n"
-            "    someCall();",
-            format("#define A {        \\\n"
-                   "  /* previous */   \\\n"
-                   "  /* one line */   \\\n"
-                   "  someCall();",
-                   getLLVMStyleWithColumns(20)));
-}
-
-TEST_F(FormatTestComments, BlockCommentsAtEndOfLine) {
-  EXPECT_EQ("a = {\n"
-            "    1111 /*    */\n"
-            "};",
-            format("a = {1111 /*    */\n"
-                   "};",
-                   getLLVMStyleWithColumns(15)));
-  EXPECT_EQ("a = {\n"
-            "    1111 /*      */\n"
-            "};",
-            format("a = {1111 /*      */\n"
-                   "};",
-                   getLLVMStyleWithColumns(15)));
-  EXPECT_EQ("a = {\n"
-            "    1111 /*      a\n"
-            "          */\n"
-            "};",
-            format("a = {1111 /*      a */\n"
-                   "};",
-                   getLLVMStyleWithColumns(15)));
-}
-
-TEST_F(FormatTestComments, BreaksAfterMultilineBlockCommentsInParamLists) {
-  EXPECT_EQ("a = f(/* long\n"
-            "         long */\n"
-            "      a);",
-            format("a = f(/* long long */ a);", getLLVMStyleWithColumns(16)));
-  EXPECT_EQ("a = f(\n"
-            "    /* long\n"
-            "       long */\n"
-            "    a);",
-            format("a = f(/* long long */ a);", getLLVMStyleWithColumns(15)));
-
-  EXPECT_EQ("a = f(/* long\n"
-            "         long\n"
-            "       */\n"
-            "      a);",
-            format("a = f(/* long\n"
-                   "         long\n"
-                   "       */a);",
-                   getLLVMStyleWithColumns(16)));
-
-  EXPECT_EQ("a = f(/* long\n"
-            "         long\n"
-            "       */\n"
-            "      a);",
-            format("a = f(/* long\n"
-                   "         long\n"
-                   "       */ a);",
-                   getLLVMStyleWithColumns(16)));
-
-  EXPECT_EQ("a = f(/* long\n"
-            "         long\n"
-            "       */\n"
-            "      (1 + 1));",
-            format("a = f(/* long\n"
-                   "         long\n"
-                   "       */ (1 + 1));",
-                   getLLVMStyleWithColumns(16)));
-
-  EXPECT_EQ(
-      "a = f(a,\n"
-      "      /* long\n"
-      "         long */\n"
-      "      b);",
-      format("a = f(a, /* long long */ b);", getLLVMStyleWithColumns(16)));
-
-  EXPECT_EQ(
-      "a = f(\n"
-      "    a,\n"
-      "    /* long\n"
-      "       long */\n"
-      "    b);",
-      format("a = f(a, /* long long */ b);", getLLVMStyleWithColumns(15)));
-
-  EXPECT_EQ("a = f(a,\n"
-            "      /* long\n"
-            "         long */\n"
-            "      (1 + 1));",
-            format("a = f(a, /* long long */ (1 + 1));",
-                   getLLVMStyleWithColumns(16)));
-  EXPECT_EQ("a = f(\n"
-            "    a,\n"
-            "    /* long\n"
-            "       long */\n"
-            "    (1 + 1));",
-            format("a = f(a, /* long long */ (1 + 1));",
-                   getLLVMStyleWithColumns(15)));
-}
-
-TEST_F(FormatTestComments, IndentLineCommentsInStartOfBlockAtEndOfFile) {
-  verifyFormat("{\n"
-               "  // a\n"
-               "  // b");
-}
-
-TEST_F(FormatTestComments, AlignTrailingComments) {
-  EXPECT_EQ("#define MACRO(V)                       \\\n"
-            "  V(Rt2) /* one more char */           \\\n"
-            "  V(Rs)  /* than here  */              \\\n"
-            "/* comment 3 */\n",
-            format("#define MACRO(V)\\\n"
-                   "V(Rt2)  /* one more char */ \\\n"
-                   "V(Rs) /* than here  */    \\\n"
-                   "/* comment 3 */\n",
-                   getLLVMStyleWithColumns(40)));
-  EXPECT_EQ("int i = f(abc, // line 1\n"
-            "          d,   // line 2\n"
-            "               // line 3\n"
-            "          b);",
-            format("int i = f(abc, // line 1\n"
-                   "          d, // line 2\n"
-                   "             // line 3\n"
-                   "          b);",
-                   getLLVMStyleWithColumns(40)));
-
-  // Align newly broken trailing comments.
-  EXPECT_EQ("int ab; // line\n"
-            "int a;  // long\n"
-            "        // long\n",
-            format("int ab; // line\n"
-                   "int a; // long long\n",
-                   getLLVMStyleWithColumns(15)));
-  EXPECT_EQ("int ab; // line\n"
-            "int a;  // long\n"
-            "        // long\n"
-            "        // long",
-            format("int ab; // line\n"
-                   "int a; // long long\n"
-                   "       // long",
-                   getLLVMStyleWithColumns(15)));
-  EXPECT_EQ("int ab; // line\n"
-            "int a;  // long\n"
-            "        // long\n"
-            "pt c;   // long",
-            format("int ab; // line\n"
-                   "int a; // long long\n"
-                   "pt c; // long",
-                   getLLVMStyleWithColumns(15)));
-  EXPECT_EQ("int ab; // line\n"
-            "int a;  // long\n"
-            "        // long\n"
-            "\n"
-            "// long",
-            format("int ab; // line\n"
-                   "int a; // long long\n"
-                   "\n"
-                   "// long",
-                   getLLVMStyleWithColumns(15)));
-
-  // Don't align newly broken trailing comments if that would put them over the
-  // column limit.
-  EXPECT_EQ("int i, j; // line 1\n"
-            "int k; // line longg\n"
-            "       // long",
-            format("int i, j; // line 1\n"
-                   "int k; // line longg long",
-                   getLLVMStyleWithColumns(20)));
-
-  // Always align if ColumnLimit = 0
-  EXPECT_EQ("int i, j; // line 1\n"
-            "int k;    // line longg long",
-            format("int i, j; // line 1\n"
-                   "int k; // line longg long",
-                   getLLVMStyleWithColumns(0)));
-
-  // Align comment line sections aligned with the next token with the next
-  // token.
-  EXPECT_EQ("class A {\n"
-            "public: // public comment\n"
-            "  // comment about a\n"
-            "  int a;\n"
-            "};",
-            format("class A {\n"
-                   "public: // public comment\n"
-                   "  // comment about a\n"
-                   "  int a;\n"
-                   "};",
-                   getLLVMStyleWithColumns(40)));
-  EXPECT_EQ("class A {\n"
-            "public: // public comment 1\n"
-            "        // public comment 2\n"
-            "  // comment 1 about a\n"
-            "  // comment 2 about a\n"
-            "  int a;\n"
-            "};",
-            format("class A {\n"
-                   "public: // public comment 1\n"
-                   "   // public comment 2\n"
-                   "  // comment 1 about a\n"
-                   "  // comment 2 about a\n"
-                   "  int a;\n"
-                   "};",
-                   getLLVMStyleWithColumns(40)));
-  EXPECT_EQ("int f(int n) { // comment line 1 on f\n"
-            "               // comment line 2 on f\n"
-            "  // comment line 1 before return\n"
-            "  // comment line 2 before return\n"
-            "  return n; // comment line 1 on return\n"
-            "            // comment line 2 on return\n"
-            "  // comment line 1 after return\n"
-            "}",
-            format("int f(int n) { // comment line 1 on f\n"
-                   "   // comment line 2 on f\n"
-                   "  // comment line 1 before return\n"
-                   "  // comment line 2 before return\n"
-                   "  return n; // comment line 1 on return\n"
-                   "   // comment line 2 on return\n"
-                   "  // comment line 1 after return\n"
-                   "}",
-                   getLLVMStyleWithColumns(40)));
-  EXPECT_EQ("int f(int n) {\n"
-            "  switch (n) { // comment line 1 on switch\n"
-            "               // comment line 2 on switch\n"
-            "  // comment line 1 before case 1\n"
-            "  // comment line 2 before case 1\n"
-            "  case 1: // comment line 1 on case 1\n"
-            "          // comment line 2 on case 1\n"
-            "    // comment line 1 before return 1\n"
-            "    // comment line 2 before return 1\n"
-            "    return 1; // comment line 1 on return 1\n"
-            "              // comment line 2 on return 1\n"
-            "  // comment line 1 before default\n"
-            "  // comment line 2 before default\n"
-            "  default: // comment line 1 on default\n"
-            "           // comment line 2 on default\n"
-            "    // comment line 1 before return 2\n"
-            "    return 2 * f(n - 1); // comment line 1 on return 2\n"
-            "                         // comment line 2 on return 2\n"
-            "    // comment line 1 after return\n"
-            "    // comment line 2 after return\n"
-            "  }\n"
-            "}",
-            format("int f(int n) {\n"
-                   "  switch (n) { // comment line 1 on switch\n"
-                   "              // comment line 2 on switch\n"
-                   "    // comment line 1 before case 1\n"
-                   "    // comment line 2 before case 1\n"
-                   "    case 1: // comment line 1 on case 1\n"
-                   "              // comment line 2 on case 1\n"
-                   "    // comment line 1 before return 1\n"
-                   "    // comment line 2 before return 1\n"
-                   "    return 1;  // comment line 1 on return 1\n"
-                   "             // comment line 2 on return 1\n"
-                   "    // comment line 1 before default\n"
-                   "    // comment line 2 before default\n"
-                   "    default:   // comment line 1 on default\n"
-                   "                // comment line 2 on default\n"
-                   "    // comment line 1 before return 2\n"
-                   "    return 2 * f(n - 1); // comment line 1 on return 2\n"
-                   "                        // comment line 2 on return 2\n"
-                   "    // comment line 1 after return\n"
-                   "     // comment line 2 after return\n"
-                   "  }\n"
-                   "}",
-                   getLLVMStyleWithColumns(80)));
-
-  // If all the lines in a sequence of line comments are aligned with the next
-  // token, the first line belongs to the previous token and the other lines
-  // belong to the next token.
-  EXPECT_EQ("int a; // line about a\n"
-            "long b;",
-            format("int a; // line about a\n"
-                   "       long b;",
-                   getLLVMStyleWithColumns(80)));
-  EXPECT_EQ("int a; // line about a\n"
-            "// line about b\n"
-            "long b;",
-            format("int a; // line about a\n"
-                   "       // line about b\n"
-                   "       long b;",
-                   getLLVMStyleWithColumns(80)));
-  EXPECT_EQ("int a; // line about a\n"
-            "// line 1 about b\n"
-            "// line 2 about b\n"
-            "long b;",
-            format("int a; // line about a\n"
-                   "       // line 1 about b\n"
-                   "       // line 2 about b\n"
-                   "       long b;",
-                   getLLVMStyleWithColumns(80)));
-
-  // Checks an edge case in preprocessor handling.
-  // These comments should *not* be aligned
-  EXPECT_NE( // change for EQ when fixed
-      "#if FOO\n"
-      "#else\n"
-      "long a; // Line about a\n"
-      "#endif\n"
-      "#if BAR\n"
-      "#else\n"
-      "long b_long_name; // Line about b\n"
-      "#endif\n",
-      format("#if FOO\n"
-             "#else\n"
-             "long a;           // Line about a\n" // Previous (bad) behavior
-             "#endif\n"
-             "#if BAR\n"
-             "#else\n"
-             "long b_long_name; // Line about b\n"
-             "#endif\n",
-             getLLVMStyleWithColumns(80)));
-
-  // bug 47589
-  EXPECT_EQ(
-      "namespace m {\n\n"
-      "#define FOO_GLOBAL 0      // Global scope.\n"
-      "#define FOO_LINKLOCAL 1   // Link-local scope.\n"
-      "#define FOO_SITELOCAL 2   // Site-local scope (deprecated).\n"
-      "#define FOO_UNIQUELOCAL 3 // Unique local\n"
-      "#define FOO_NODELOCAL 4   // Loopback\n\n"
-      "} // namespace m\n",
-      format("namespace m {\n\n"
-             "#define FOO_GLOBAL 0   // Global scope.\n"
-             "#define FOO_LINKLOCAL 1  // Link-local scope.\n"
-             "#define FOO_SITELOCAL 2  // Site-local scope (deprecated).\n"
-             "#define FOO_UNIQUELOCAL 3 // Unique local\n"
-             "#define FOO_NODELOCAL 4  // Loopback\n\n"
-             "} // namespace m\n",
-             getLLVMStyleWithColumns(80)));
-}
-
-TEST_F(FormatTestComments, AlignsBlockCommentDecorations) {
-  EXPECT_EQ("/*\n"
-            " */",
-            format("/*\n"
-                   "*/",
-                   getLLVMStyle()));
-  EXPECT_EQ("/*\n"
-            " */",
-            format("/*\n"
-                   " */",
-                   getLLVMStyle()));
-  EXPECT_EQ("/*\n"
-            " */",
-            format("/*\n"
-                   "  */",
-                   getLLVMStyle()));
-
-  // Align a single line.
-  EXPECT_EQ("/*\n"
-            " * line */",
-            format("/*\n"
-                   "* line */",
-                   getLLVMStyle()));
-  EXPECT_EQ("/*\n"
-            " * line */",
-            format("/*\n"
-                   " * line */",
-                   getLLVMStyle()));
-  EXPECT_EQ("/*\n"
-            " * line */",
-            format("/*\n"
-                   "  * line */",
-                   getLLVMStyle()));
-  EXPECT_EQ("/*\n"
-            " * line */",
-            format("/*\n"
-                   "   * line */",
-                   getLLVMStyle()));
-  EXPECT_EQ("/**\n"
-            " * line */",
-            format("/**\n"
-                   "* line */",
-                   getLLVMStyle()));
-  EXPECT_EQ("/**\n"
-            " * line */",
-            format("/**\n"
-                   " * line */",
-                   getLLVMStyle()));
-  EXPECT_EQ("/**\n"
-            " * line */",
-            format("/**\n"
-                   "  * line */",
-                   getLLVMStyle()));
-  EXPECT_EQ("/**\n"
-            " * line */",
-            format("/**\n"
-                   "   * line */",
-                   getLLVMStyle()));
-  EXPECT_EQ("/**\n"
-            " * line */",
-            format("/**\n"
-                   "    * line */",
-                   getLLVMStyle()));
-
-  // Align the end '*/' after a line.
-  EXPECT_EQ("/*\n"
-            " * line\n"
-            " */",
-            format("/*\n"
-                   "* line\n"
-                   "*/",
-                   getLLVMStyle()));
-  EXPECT_EQ("/*\n"
-            " * line\n"
-            " */",
-            format("/*\n"
-                   "   * line\n"
-                   "  */",
-                   getLLVMStyle()));
-  EXPECT_EQ("/*\n"
-            " * line\n"
-            " */",
-            format("/*\n"
-                   "  * line\n"
-                   "  */",
-                   getLLVMStyle()));
-
-  // Align two lines.
-  EXPECT_EQ("/* line 1\n"
-            " * line 2 */",
-            format("/* line 1\n"
-                   " * line 2 */",
-                   getLLVMStyle()));
-  EXPECT_EQ("/* line 1\n"
-            " * line 2 */",
-            format("/* line 1\n"
-                   "* line 2 */",
-                   getLLVMStyle()));
-  EXPECT_EQ("/* line 1\n"
-            " * line 2 */",
-            format("/* line 1\n"
-                   "  * line 2 */",
-                   getLLVMStyle()));
-  EXPECT_EQ("/* line 1\n"
-            " * line 2 */",
-            format("/* line 1\n"
-                   "   * line 2 */",
-                   getLLVMStyle()));
-  EXPECT_EQ("/* line 1\n"
-            " * line 2 */",
-            format("/* line 1\n"
-                   "    * line 2 */",
-                   getLLVMStyle()));
-  EXPECT_EQ("int i; /* line 1\n"
-            "        * line 2 */",
-            format("int i; /* line 1\n"
-                   "* line 2 */",
-                   getLLVMStyle()));
-  EXPECT_EQ("int i; /* line 1\n"
-            "        * line 2 */",
-            format("int i; /* line 1\n"
-                   "        * line 2 */",
-                   getLLVMStyle()));
-  EXPECT_EQ("int i; /* line 1\n"
-            "        * line 2 */",
-            format("int i; /* line 1\n"
-                   "             * line 2 */",
-                   getLLVMStyle()));
-
-  // Align several lines.
-  EXPECT_EQ("/* line 1\n"
-            " * line 2\n"
-            " * line 3 */",
-            format("/* line 1\n"
-                   " * line 2\n"
-                   "* line 3 */",
-                   getLLVMStyle()));
-  EXPECT_EQ("/* line 1\n"
-            " * line 2\n"
-            " * line 3 */",
-            format("/* line 1\n"
-                   "  * line 2\n"
-                   "* line 3 */",
-                   getLLVMStyle()));
-  EXPECT_EQ("/*\n"
-            "** line 1\n"
-            "** line 2\n"
-            "*/",
-            format("/*\n"
-                   "** line 1\n"
-                   " ** line 2\n"
-                   "*/",
-                   getLLVMStyle()));
-
-  // Align with different indent after the decorations.
-  EXPECT_EQ("/*\n"
-            " * line 1\n"
-            " *  line 2\n"
-            " * line 3\n"
-            " *   line 4\n"
-            " */",
-            format("/*\n"
-                   "* line 1\n"
-                   "  *  line 2\n"
-                   "   * line 3\n"
-                   "*   line 4\n"
-                   "*/",
-                   getLLVMStyle()));
-
-  // Align empty or blank lines.
-  EXPECT_EQ("/**\n"
-            " *\n"
-            " *\n"
-            " *\n"
-            " */",
-            format("/**\n"
-                   "*  \n"
-                   " * \n"
-                   "  *\n"
-                   "*/",
-                   getLLVMStyle()));
-
-  // Align while breaking and reflowing.
-  EXPECT_EQ("/*\n"
-            " * long long long\n"
-            " * long long\n"
-            " *\n"
-            " * long */",
-            format("/*\n"
-                   " * long long long long\n"
-                   " * long\n"
-                   "  *\n"
-                   "* long */",
-                   getLLVMStyleWithColumns(20)));
-}
-
-TEST_F(FormatTestComments, NoCrash_Bug34236) {
-  // This is a test case from a crasher reported in:
-  // https://bugs.llvm.org/show_bug.cgi?id=34236
-  // Temporarily disable formatting for readability.
-  // clang-format off
-  EXPECT_EQ(
-"/*                                                                */ /*\n"
-"                                                                      *       a\n"
-"                                                                      * b c d*/",
-      format(
-"/*                                                                */ /*\n"
-" *       a b\n"
-" *       c     d*/",
-          getLLVMStyleWithColumns(80)));
-  // clang-format on
-}
-
-TEST_F(FormatTestComments, NonTrailingBlockComments) {
-  verifyFormat("const /** comment comment */ A = B;",
-               getLLVMStyleWithColumns(40));
-
-  verifyFormat("const /** comment comment comment */ A =\n"
-               "    B;",
-               getLLVMStyleWithColumns(40));
-
-  EXPECT_EQ("const /** comment comment comment\n"
-            "         comment */\n"
-            "    A = B;",
-            format("const /** comment comment comment comment */\n"
-                   "    A = B;",
-                   getLLVMStyleWithColumns(40)));
-}
-
-TEST_F(FormatTestComments, PythonStyleComments) {
-  // Keeps a space after '#'.
-  EXPECT_EQ("# comment\n"
-            "key: value",
-            format("#comment\n"
-                   "key:value",
-                   getTextProtoStyleWithColumns(20)));
-  EXPECT_EQ("# comment\n"
-            "key: value",
-            format("# comment\n"
-                   "key:value",
-                   getTextProtoStyleWithColumns(20)));
-  // Breaks long comment.
-  EXPECT_EQ("# comment comment\n"
-            "# comment\n"
-            "key: value",
-            format("# comment comment comment\n"
-                   "key:value",
-                   getTextProtoStyleWithColumns(20)));
-  // Indents comments.
-  EXPECT_EQ("data {\n"
-            "  # comment comment\n"
-            "  # comment\n"
-            "  key: value\n"
-            "}",
-            format("data {\n"
-                   "# comment comment comment\n"
-                   "key: value}",
-                   getTextProtoStyleWithColumns(20)));
-  EXPECT_EQ("data {\n"
-            "  # comment comment\n"
-            "  # comment\n"
-            "  key: value\n"
-            "}",
-            format("data {# comment comment comment\n"
-                   "key: value}",
-                   getTextProtoStyleWithColumns(20)));
-  // Reflows long comments.
-  EXPECT_EQ("# comment comment\n"
-            "# comment comment\n"
-            "key: value",
-            format("# comment comment comment\n"
-                   "# comment\n"
-                   "key:value",
-                   getTextProtoStyleWithColumns(20)));
-  // Breaks trailing comments.
-  EXPECT_EQ("k: val  # comment\n"
-            "        # comment\n"
-            "a: 1",
-            format("k:val#comment comment\n"
-                   "a:1",
-                   getTextProtoStyleWithColumns(20)));
-  EXPECT_EQ("id {\n"
-            "  k: val  # comment\n"
-            "          # comment\n"
-            "  # line line\n"
-            "  a: 1\n"
-            "}",
-            format("id {k:val#comment comment\n"
-                   "# line line\n"
-                   "a:1}",
-                   getTextProtoStyleWithColumns(20)));
-  // Aligns trailing comments.
-  EXPECT_EQ("k: val  # commen1\n"
-            "        # commen2\n"
-            "        # commen3\n"
-            "# commen4\n"
-            "a: 1  # commen5\n"
-            "      # commen6\n"
-            "      # commen7",
-            format("k:val#commen1 commen2\n"
-                   " #commen3\n"
-                   "# commen4\n"
-                   "a:1#commen5 commen6\n"
-                   " #commen7",
-                   getTextProtoStyleWithColumns(20)));
-}
-
-TEST_F(FormatTestComments, BreaksBeforeTrailingUnbreakableSequence) {
-  // The end of /* trail */ is exactly at 80 columns, but the unbreakable
-  // trailing sequence ); after it exceeds the column limit. Make sure we
-  // correctly break the line in that case.
-  verifyFormat("int a =\n"
-               "    foo(/* trail */);",
-               getLLVMStyleWithColumns(23));
-}
-
-TEST_F(FormatTestComments, ReflowBackslashCrash) {
-  // clang-format off
-  EXPECT_EQ(
-"// How to run:\n"
-"// bbbbb run \\\n"
-"// rrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr\n"
-"// \\ <log_file> -- --output_directory=\"<output_directory>\"",
-  format(
-"// How to run:\n"
-"// bbbbb run \\\n"
-"// rrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr \\\n"
-"// <log_file> -- --output_directory=\"<output_directory>\""));
-  // clang-format on
-}
-
-TEST_F(FormatTestComments, IndentsLongJavadocAnnotatedLines) {
-  FormatStyle Style = getGoogleStyle(FormatStyle::LK_Java);
-  Style.ColumnLimit = 60;
-  FormatStyle Style20 = getGoogleStyle(FormatStyle::LK_Java);
-  Style20.ColumnLimit = 20;
-  EXPECT_EQ(
-      "/**\n"
-      " * @param x long long long long long long long long long\n"
-      " *     long\n"
-      " */\n",
-      format("/**\n"
-             " * @param x long long long long long long long long long long\n"
-             " */\n",
-             Style));
-  EXPECT_EQ("/**\n"
-            " * @param x long long long long long long long long long\n"
-            " *     long long long long long long long long long long\n"
-            " */\n",
-            format("/**\n"
-                   " * @param x long long long long long long long long long "
-                   "long long long long long long long long long long\n"
-                   " */\n",
-                   Style));
-  EXPECT_EQ("/**\n"
-            " * @param x long long long long long long long long long\n"
-            " *     long long long long long long long long long long\n"
-            " *     long\n"
-            " */\n",
-            format("/**\n"
-                   " * @param x long long long long long long long long long "
-                   "long long long long long long long long long long long\n"
-                   " */\n",
-                   Style));
-  EXPECT_EQ("/**\n"
-            " * Sentence that\n"
-            " * should be broken.\n"
-            " * @param short\n"
-            " * keep indentation\n"
-            " */\n",
-            format("/**\n"
-                   " * Sentence that should be broken.\n"
-                   " * @param short\n"
-                   " * keep indentation\n"
-                   " */\n",
-                   Style20));
-
-  EXPECT_EQ("/**\n"
-            " * @param l1 long1\n"
-            " *     to break\n"
-            " * @param l2 long2\n"
-            " *     to break\n"
-            " */\n",
-            format("/**\n"
-                   " * @param l1 long1 to break\n"
-                   " * @param l2 long2 to break\n"
-                   " */\n",
-                   Style20));
-
-  EXPECT_EQ("/**\n"
-            " * @param xx to\n"
-            " *     break\n"
-            " * no reflow\n"
-            " */\n",
-            format("/**\n"
-                   " * @param xx to break\n"
-                   " * no reflow\n"
-                   " */\n",
-                   Style20));
-
-  EXPECT_EQ("/**\n"
-            " * @param xx to\n"
-            " *     break yes\n"
-            " *     reflow\n"
-            " */\n",
-            format("/**\n"
-                   " * @param xx to break\n"
-                   " *     yes reflow\n"
-                   " */\n",
-                   Style20));
-
-  FormatStyle JSStyle20 = getGoogleStyle(FormatStyle::LK_JavaScript);
-  JSStyle20.ColumnLimit = 20;
-  EXPECT_EQ("/**\n"
-            " * @param l1 long1\n"
-            " *     to break\n"
-            " */\n",
-            format("/**\n"
-                   " * @param l1 long1 to break\n"
-                   " */\n",
-                   JSStyle20));
-  EXPECT_EQ("/**\n"
-            " * @param {l1 long1\n"
-            " *     to break}\n"
-            " */\n",
-            format("/**\n"
-                   " * @param {l1 long1 to break}\n"
-                   " */\n",
-                   JSStyle20));
-}
-
-TEST_F(FormatTestComments, SpaceAtLineCommentBegin) {
-  FormatStyle Style = getLLVMStyle();
-  StringRef NoTextInComment = " //       \n"
-                              "\n"
-                              "void foo() {// \n"
-                              "// \n"
-                              "}";
-
-  EXPECT_EQ("//\n"
-            "\n"
-            "void foo() { //\n"
-            "  //\n"
-            "}",
-            format(NoTextInComment, Style));
-
-  Style.SpacesInLineCommentPrefix.Minimum = 0;
-  EXPECT_EQ("//\n"
-            "\n"
-            "void foo() { //\n"
-            "  //\n"
-            "}",
-            format(NoTextInComment, Style));
-
-  Style.SpacesInLineCommentPrefix.Minimum = 5;
-  EXPECT_EQ("//\n"
-            "\n"
-            "void foo() { //\n"
-            "  //\n"
-            "}",
-            format(NoTextInComment, Style));
-
-  Style = getLLVMStyle();
-  StringRef Code =
-      "//Free comment without space\n"
-      "\n"
-      "//   Free comment with 3 spaces\n"
-      "\n"
-      "///Free Doxygen without space\n"
-      "\n"
-      "///   Free Doxygen with 3 spaces\n"
-      "\n"
-      "/// A Doxygen Comment with a nested list:\n"
-      "/// - Foo\n"
-      "/// - Bar\n"
-      "///   - Baz\n"
-      "///   - End\n"
-      "///     of the inner list\n"
-      "///   .\n"
-      "/// .\n"
-      "\n"
-      "namespace Foo {\n"
-      "bool bar(bool b) {\n"
-      "  bool ret1 = true; ///<Doxygenstyle without space\n"
-      "  bool ret2 = true; ///<   Doxygenstyle with 3 spaces\n"
-      "  if (b) {\n"
-      "    //Foo\n"
-      "\n"
-      "    //   In function comment\n"
-      "    ret2 = false;\n"
-      "  } // End of if\n"
-      "\n"
-      "//  if (ret1) {\n" // Commented out at the beginning of the line
-      "//    return ret2;\n"
-      "//  }\n"
-      "\n"
-      "  //if (ret1) {\n" // Commtented out at the beginning of the content
-      "  //  return ret2;\n"
-      "  //}\n"
-      "\n"
-      "  return ret1 && ret2;\n"
-      "}\n"
-      "}\n"
-      "\n"
-      "namespace Bar {\n"
-      "int foo();\n"
-      "} //  namespace Bar\n"
-      "//@Nothing added because of the non ascii char\n"
-      "\n"
-      "//@      Nothing removed because of the non ascii char\n"
-      "\n"
-      "//  Comment to move to the left\n"
-      "//But not this?\n"
-      "//  @but this\n"
-      "\n"
-      "//Comment to move to the right\n"
-      "//@ this stays\n"
-      "\n"
-      "//} will not move\n"
-      "\n"
-      "//vv will only move\n"
-      "//} if the line above does\n";
-
-  EXPECT_EQ("// Free comment without space\n"
-            "\n"
-            "//   Free comment with 3 spaces\n"
-            "\n"
-            "/// Free Doxygen without space\n"
-            "\n"
-            "///   Free Doxygen with 3 spaces\n"
-            "\n"
-            "/// A Doxygen Comment with a nested list:\n"
-            "/// - Foo\n"
-            "/// - Bar\n"
-            "///   - Baz\n"
-            "///   - End\n"
-            "///     of the inner list\n"
-            "///   .\n"
-            "/// .\n"
-            "\n"
-            "namespace Foo {\n"
-            "bool bar(bool b) {\n"
-            "  bool ret1 = true; ///< Doxygenstyle without space\n"
-            "  bool ret2 = true; ///<   Doxygenstyle with 3 spaces\n"
-            "  if (b) {\n"
-            "    // Foo\n"
-            "\n"
-            "    //   In function comment\n"
-            "    ret2 = false;\n"
-            "  } // End of if\n"
-            "\n"
-            "  //  if (ret1) {\n"
-            "  //    return ret2;\n"
-            "  //  }\n"
-            "\n"
-            "  // if (ret1) {\n"
-            "  //   return ret2;\n"
-            "  // }\n"
-            "\n"
-            "  return ret1 && ret2;\n"
-            "}\n"
-            "} // namespace Foo\n"
-            "\n"
-            "namespace Bar {\n"
-            "int foo();\n"
-            "} //  namespace Bar\n"
-            "//@Nothing added because of the non ascii char\n"
-            "\n"
-            "//@      Nothing removed because of the non ascii char\n"
-            "\n"
-            "//  Comment to move to the left\n"
-            "// But not this?\n"
-            "//  @but this\n"
-            "\n"
-            "// Comment to move to the right\n"
-            "//@ this stays\n"
-            "\n"
-            "//} will not move\n"
-            "\n"
-            "// vv will only move\n"
-            "// } if the line above does\n",
-            format(Code, Style));
-
-  Style.SpacesInLineCommentPrefix = {0, 0};
-  EXPECT_EQ("//Free comment without space\n"
-            "\n"
-            "//Free comment with 3 spaces\n"
-            "\n"
-            "///Free Doxygen without space\n"
-            "\n"
-            "///Free Doxygen with 3 spaces\n"
-            "\n"
-            "///A Doxygen Comment with a nested list:\n"
-            "///- Foo\n"
-            "///- Bar\n"
-            "///  - Baz\n" // Here we keep the relative indentation
-            "///  - End\n"
-            "///    of the inner list\n"
-            "///  .\n"
-            "///.\n"
-            "\n"
-            "namespace Foo {\n"
-            "bool bar(bool b) {\n"
-            "  bool ret1 = true; ///<Doxygenstyle without space\n"
-            "  bool ret2 = true; ///<Doxygenstyle with 3 spaces\n"
-            "  if (b) {\n"
-            "    //Foo\n"
-            "\n"
-            "    //In function comment\n"
-            "    ret2 = false;\n"
-            "  } //End of if\n"
-            "\n"
-            "  //if (ret1) {\n"
-            "  //  return ret2;\n"
-            "  //}\n"
-            "\n"
-            "  //if (ret1) {\n"
-            "  //  return ret2;\n"
-            "  //}\n"
-            "\n"
-            "  return ret1 && ret2;\n"
-            "}\n"
-            "} //namespace Foo\n"
-            "\n"
-            "namespace Bar {\n"
-            "int foo();\n"
-            "} //namespace Bar\n"
-            "//@Nothing added because of the non ascii char\n"
-            "\n"
-            "//@      Nothing removed because of the non ascii char\n"
-            "\n"
-            "//Comment to move to the left\n"
-            "//But not this?\n"
-            "//@but this\n"
-            "\n"
-            "//Comment to move to the right\n"
-            "//@ this stays\n"
-            "\n"
-            "//} will not move\n"
-            "\n"
-            "//vv will only move\n"
-            "//} if the line above does\n",
-            format(Code, Style));
-
-  Style.SpacesInLineCommentPrefix = {2, -1u};
-  EXPECT_EQ("//  Free comment without space\n"
-            "\n"
-            "//   Free comment with 3 spaces\n"
-            "\n"
-            "///  Free Doxygen without space\n"
-            "\n"
-            "///   Free Doxygen with 3 spaces\n"
-            "\n"
-            "///  A Doxygen Comment with a nested list:\n"
-            "///  - Foo\n"
-            "///  - Bar\n"
-            "///    - Baz\n"
-            "///    - End\n"
-            "///      of the inner list\n"
-            "///    .\n"
-            "///  .\n"
-            "\n"
-            "namespace Foo {\n"
-            "bool bar(bool b) {\n"
-            "  bool ret1 = true; ///<  Doxygenstyle without space\n"
-            "  bool ret2 = true; ///<   Doxygenstyle with 3 spaces\n"
-            "  if (b) {\n"
-            "    //  Foo\n"
-            "\n"
-            "    //   In function comment\n"
-            "    ret2 = false;\n"
-            "  } //  End of if\n"
-            "\n"
-            "  //  if (ret1) {\n"
-            "  //    return ret2;\n"
-            "  //  }\n"
-            "\n"
-            "  //  if (ret1) {\n"
-            "  //    return ret2;\n"
-            "  //  }\n"
-            "\n"
-            "  return ret1 && ret2;\n"
-            "}\n"
-            "} //  namespace Foo\n"
-            "\n"
-            "namespace Bar {\n"
-            "int foo();\n"
-            "} //  namespace Bar\n"
-            "//@Nothing added because of the non ascii char\n"
-            "\n"
-            "//@      Nothing removed because of the non ascii char\n"
-            "\n"
-            "//  Comment to move to the left\n"
-            "//  But not this?\n"
-            "//  @but this\n"
-            "\n"
-            "//  Comment to move to the right\n"
-            "//@ this stays\n"
-            "\n"
-            "//} will not move\n"
-            "\n"
-            "//  vv will only move\n"
-            "//  } if the line above does\n",
-            format(Code, Style));
-
-  Style = getLLVMStyleWithColumns(20);
-  StringRef WrapCode = "//Lorem ipsum dolor sit amet\n"
-                       "\n"
-                       "//  Lorem   ipsum   dolor   sit   amet\n"
-                       "\n"
-                       "void f() {//Hello World\n"
-                       "}";
-
-  EXPECT_EQ("// Lorem ipsum dolor\n"
-            "// sit amet\n"
-            "\n"
-            "//  Lorem   ipsum\n"
-            "//  dolor   sit amet\n"
-            "\n"
-            "void f() { // Hello\n"
-            "           // World\n"
-            "}",
-            format(WrapCode, Style));
-
-  Style.SpacesInLineCommentPrefix = {0, 0};
-  EXPECT_EQ("//Lorem ipsum dolor\n"
-            "//sit amet\n"
-            "\n"
-            "//Lorem   ipsum\n"
-            "//dolor   sit   amet\n"
-            "\n"
-            "void f() { //Hello\n"
-            "           //World\n"
-            "}",
-            format(WrapCode, Style));
-
-  Style.SpacesInLineCommentPrefix = {1, 1};
-  EXPECT_EQ("// Lorem ipsum dolor\n"
-            "// sit amet\n"
-            "\n"
-            "// Lorem   ipsum\n"
-            "// dolor   sit amet\n"
-            "\n"
-            "void f() { // Hello\n"
-            "           // World\n"
-            "}",
-            format(WrapCode, Style));
-
-  Style.SpacesInLineCommentPrefix = {3, 3};
-  EXPECT_EQ("//   Lorem ipsum\n"
-            "//   dolor sit amet\n"
-            "\n"
-            "//   Lorem   ipsum\n"
-            "//   dolor   sit\n"
-            "//   amet\n"
-            "\n"
-            "void f() { //   Hello\n"
-            "           //   World\n"
-            "}",
-            format(WrapCode, Style));
-
-  Style = getLLVMStyleWithColumns(20);
-  StringRef AShitloadOfSpaces = "//                      This are more spaces "
-                                "than the ColumnLimit, what now?\n"
-                                "\n"
-                                "//   Comment\n"
-                                "\n"
-                                "// This is a text to split in multiple "
-                                "lines, please. Thank you very much!\n"
-                                "\n"
-                                "// A comment with\n"
-                                "//   some indentation that has to be split.\n"
-                                "// And now without";
-  EXPECT_EQ("//                      This are more spaces "
-            "than the ColumnLimit, what now?\n"
-            "\n"
-            "//   Comment\n"
-            "\n"
-            "// This is a text to\n"
-            "// split in multiple\n"
-            "// lines, please.\n"
-            "// Thank you very\n"
-            "// much!\n"
-            "\n"
-            "// A comment with\n"
-            "//   some\n"
-            "//   indentation\n"
-            "//   that has to be\n"
-            "//   split.\n"
-            "// And now without",
-            format(AShitloadOfSpaces, Style));
-
-  Style.SpacesInLineCommentPrefix = {0, 0};
-  EXPECT_EQ("//This are more\n"
-            "//spaces than the\n"
-            "//ColumnLimit, what\n"
-            "//now?\n"
-            "\n"
-            "//Comment\n"
-            "\n"
-            "//This is a text to\n"
-            "//split in multiple\n"
-            "//lines, please.\n"
-            "//Thank you very\n"
-            "//much!\n"
-            "\n"
-            "//A comment with\n"
-            "//  some indentation\n"
-            "//  that has to be\n"
-            "//  split.\n"
-            "//And now without",
-            format(AShitloadOfSpaces, Style));
-
-  Style.SpacesInLineCommentPrefix = {3, 3};
-  EXPECT_EQ("//   This are more\n"
-            "//   spaces than the\n"
-            "//   ColumnLimit,\n"
-            "//   what now?\n"
-            "\n"
-            "//   Comment\n"
-            "\n"
-            "//   This is a text\n"
-            "//   to split in\n"
-            "//   multiple lines,\n"
-            "//   please. Thank\n"
-            "//   you very much!\n"
-            "\n"
-            "//   A comment with\n"
-            "//     some\n"
-            "//     indentation\n"
-            "//     that has to\n"
-            "//     be split.\n"
-            "//   And now without",
-            format(AShitloadOfSpaces, Style));
-
-  Style.SpacesInLineCommentPrefix = {30, -1u};
-  EXPECT_EQ("//                              This are more spaces than the "
-            "ColumnLimit, what now?\n"
-            "\n"
-            "//                              Comment\n"
-            "\n"
-            "//                              This is a text to split in "
-            "multiple lines, please. Thank you very much!\n"
-            "\n"
-            "//                              A comment with\n"
-            "//                                some indentation that has to be "
-            "split.\n"
-            "//                              And now without",
-            format(AShitloadOfSpaces, Style));
-
-  Style.SpacesInLineCommentPrefix = {2, 4};
-  EXPECT_EQ("//  A Comment to be\n"
-            "//  moved\n"
-            "//   with indent\n"
-            "\n"
-            "//  A Comment to be\n"
-            "//  moved\n"
-            "//   with indent\n"
-            "\n"
-            "//  A Comment to be\n"
-            "//  moved\n"
-            "//   with indent\n"
-            "\n"
-            "//   A Comment to be\n"
-            "//   moved\n"
-            "//    with indent\n"
-            "\n"
-            "//    A Comment to\n"
-            "//    be moved\n"
-            "//     with indent\n"
-            "\n"
-            "//    A Comment to\n"
-            "//    be moved\n"
-            "//     with indent\n"
-            "\n"
-            "//    A Comment to\n"
-            "//    be moved\n"
-            "//     with indent\n",
-            format("//A Comment to be moved\n"
-                   "// with indent\n"
-                   "\n"
-                   "// A Comment to be moved\n"
-                   "//  with indent\n"
-                   "\n"
-                   "//  A Comment to be moved\n"
-                   "//   with indent\n"
-                   "\n"
-                   "//   A Comment to be moved\n"
-                   "//    with indent\n"
-                   "\n"
-                   "//    A Comment to be moved\n"
-                   "//     with indent\n"
-                   "\n"
-                   "//     A Comment to be moved\n"
-                   "//      with indent\n"
-                   "\n"
-                   "//      A Comment to be moved\n"
-                   "//       with indent\n",
-                   Style));
-
-  Style.ColumnLimit = 30;
-  EXPECT_EQ("int i; //  A Comment to be\n"
-            "       //  moved\n"
-            "       //   with indent\n"
-            "\n"
-            "int i; //  A Comment to be\n"
-            "       //  moved\n"
-            "       //   with indent\n"
-            "\n"
-            "int i; //  A Comment to be\n"
-            "       //  moved\n"
-            "       //   with indent\n"
-            "\n"
-            "int i; //   A Comment to be\n"
-            "       //   moved\n"
-            "       //    with indent\n"
-            "\n"
-            "int i; //    A Comment to be\n"
-            "       //    moved\n"
-            "       //     with indent\n"
-            "\n"
-            "int i; //    A Comment to be\n"
-            "       //    moved\n"
-            "       //     with indent\n"
-            "\n"
-            "int i; //    A Comment to be\n"
-            "       //    moved\n"
-            "       //     with indent\n",
-            format("int i;//A Comment to be moved\n"
-                   "      // with indent\n"
-                   "\n"
-                   "int i;// A Comment to be moved\n"
-                   "      //  with indent\n"
-                   "\n"
-                   "int i;//  A Comment to be moved\n"
-                   "      //   with indent\n"
-                   "\n"
-                   "int i;//   A Comment to be moved\n"
-                   "      //    with indent\n"
-                   "\n"
-                   "int i;//    A Comment to be moved\n"
-                   "      //     with indent\n"
-                   "\n"
-                   "int i;//     A Comment to be moved\n"
-                   "      //      with indent\n"
-                   "\n"
-                   "int i;//      A Comment to be moved\n"
-                   "      //       with indent\n",
-                   Style));
-
-  Style = getLLVMStyleWithColumns(0);
-  EXPECT_EQ("// Free comment without space\n"
-            "\n"
-            "//   Free comment with 3 spaces\n"
-            "\n"
-            "/// Free Doxygen without space\n"
-            "\n"
-            "///   Free Doxygen with 3 spaces\n"
-            "\n"
-            "/// A Doxygen Comment with a nested list:\n"
-            "/// - Foo\n"
-            "/// - Bar\n"
-            "///   - Baz\n"
-            "///   - End\n"
-            "///     of the inner list\n"
-            "///   .\n"
-            "/// .\n"
-            "\n"
-            "namespace Foo {\n"
-            "bool bar(bool b) {\n"
-            "  bool ret1 = true; ///< Doxygenstyle without space\n"
-            "  bool ret2 = true; ///<   Doxygenstyle with 3 spaces\n"
-            "  if (b) {\n"
-            "    // Foo\n"
-            "\n"
-            "    //   In function comment\n"
-            "    ret2 = false;\n"
-            "  } // End of if\n"
-            "\n"
-            "  //  if (ret1) {\n"
-            "  //    return ret2;\n"
-            "  //  }\n"
-            "\n"
-            "  // if (ret1) {\n"
-            "  //   return ret2;\n"
-            "  // }\n"
-            "\n"
-            "  return ret1 && ret2;\n"
-            "}\n"
-            "} // namespace Foo\n"
-            "\n"
-            "namespace Bar {\n"
-            "int foo();\n"
-            "} //  namespace Bar\n"
-            "//@Nothing added because of the non ascii char\n"
-            "\n"
-            "//@      Nothing removed because of the non ascii char\n"
-            "\n"
-            "//  Comment to move to the left\n"
-            "// But not this?\n"
-            "//  @but this\n"
-            "\n"
-            "// Comment to move to the right\n"
-            "//@ this stays\n"
-            "\n"
-            "//} will not move\n"
-            "\n"
-            "// vv will only move\n"
-            "// } if the line above does\n",
-            format(Code, Style));
-
-  Style.SpacesInLineCommentPrefix = {0, 0};
-  EXPECT_EQ("//Free comment without space\n"
-            "\n"
-            "//Free comment with 3 spaces\n"
-            "\n"
-            "///Free Doxygen without space\n"
-            "\n"
-            "///Free Doxygen with 3 spaces\n"
-            "\n"
-            "///A Doxygen Comment with a nested list:\n"
-            "///- Foo\n"
-            "///- Bar\n"
-            "///  - Baz\n" // Here we keep the relative indentation
-            "///  - End\n"
-            "///    of the inner list\n"
-            "///  .\n"
-            "///.\n"
-            "\n"
-            "namespace Foo {\n"
-            "bool bar(bool b) {\n"
-            "  bool ret1 = true; ///<Doxygenstyle without space\n"
-            "  bool ret2 = true; ///<Doxygenstyle with 3 spaces\n"
-            "  if (b) {\n"
-            "    //Foo\n"
-            "\n"
-            "    //In function comment\n"
-            "    ret2 = false;\n"
-            "  } //End of if\n"
-            "\n"
-            "  //if (ret1) {\n"
-            "  //  return ret2;\n"
-            "  //}\n"
-            "\n"
-            "  //if (ret1) {\n"
-            "  //  return ret2;\n"
-            "  //}\n"
-            "\n"
-            "  return ret1 && ret2;\n"
-            "}\n"
-            "} //namespace Foo\n"
-            "\n"
-            "namespace Bar {\n"
-            "int foo();\n"
-            "} //namespace Bar\n"
-            "//@Nothing added because of the non ascii char\n"
-            "\n"
-            "//@      Nothing removed because of the non ascii char\n"
-            "\n"
-            "//Comment to move to the left\n"
-            "//But not this?\n"
-            "//@but this\n"
-            "\n"
-            "//Comment to move to the right\n"
-            "//@ this stays\n"
-            "\n"
-            "//} will not move\n"
-            "\n"
-            "//vv will only move\n"
-            "//} if the line above does\n",
-            format(Code, Style));
-
-  Style.SpacesInLineCommentPrefix = {2, -1u};
-  EXPECT_EQ("//  Free comment without space\n"
-            "\n"
-            "//   Free comment with 3 spaces\n"
-            "\n"
-            "///  Free Doxygen without space\n"
-            "\n"
-            "///   Free Doxygen with 3 spaces\n"
-            "\n"
-            "///  A Doxygen Comment with a nested list:\n"
-            "///  - Foo\n"
-            "///  - Bar\n"
-            "///    - Baz\n"
-            "///    - End\n"
-            "///      of the inner list\n"
-            "///    .\n"
-            "///  .\n"
-            "\n"
-            "namespace Foo {\n"
-            "bool bar(bool b) {\n"
-            "  bool ret1 = true; ///<  Doxygenstyle without space\n"
-            "  bool ret2 = true; ///<   Doxygenstyle with 3 spaces\n"
-            "  if (b) {\n"
-            "    //  Foo\n"
-            "\n"
-            "    //   In function comment\n"
-            "    ret2 = false;\n"
-            "  } //  End of if\n"
-            "\n"
-            "  //  if (ret1) {\n"
-            "  //    return ret2;\n"
-            "  //  }\n"
-            "\n"
-            "  //  if (ret1) {\n"
-            "  //    return ret2;\n"
-            "  //  }\n"
-            "\n"
-            "  return ret1 && ret2;\n"
-            "}\n"
-            "} //  namespace Foo\n"
-            "\n"
-            "namespace Bar {\n"
-            "int foo();\n"
-            "} //  namespace Bar\n"
-            "//@Nothing added because of the non ascii char\n"
-            "\n"
-            "//@      Nothing removed because of the non ascii char\n"
-            "\n"
-            "//  Comment to move to the left\n"
-            "//  But not this?\n"
-            "//  @but this\n"
-            "\n"
-            "//  Comment to move to the right\n"
-            "//@ this stays\n"
-            "\n"
-            "//} will not move\n"
-            "\n"
-            "//  vv will only move\n"
-            "//  } if the line above does\n",
-            format(Code, Style));
-}
-
-} // end namespace
-} // end namespace format
-} // end namespace clang
diff --git a/gnu/llvm/clang/unittests/Format/FormatTestJS.cpp b/gnu/llvm/clang/unittests/Format/FormatTestJS.cpp
deleted file mode 100644
index c92c81f66a8..00000000000
--- a/gnu/llvm/clang/unittests/Format/FormatTestJS.cpp
+++ /dev/null
@@ -1,2608 +0,0 @@
-//===- unittest/Format/FormatTestJS.cpp - Formatting unit tests for JS ----===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "FormatTestUtils.h"
-#include "clang/Format/Format.h"
-#include "llvm/Support/Debug.h"
-#include "gtest/gtest.h"
-
-#define DEBUG_TYPE "format-test"
-
-namespace clang {
-namespace format {
-
-class FormatTestJS : public ::testing::Test {
-protected:
-  static std::string format(llvm::StringRef Code, unsigned Offset,
-                            unsigned Length, const FormatStyle &Style) {
-    LLVM_DEBUG(llvm::errs() << "---\n");
-    LLVM_DEBUG(llvm::errs() << Code << "\n\n");
-    std::vector<tooling::Range> Ranges(1, tooling::Range(Offset, Length));
-    FormattingAttemptStatus Status;
-    tooling::Replacements Replaces =
-        reformat(Style, Code, Ranges, "<stdin>", &Status);
-    EXPECT_TRUE(Status.FormatComplete);
-    auto Result = applyAllReplacements(Code, Replaces);
-    EXPECT_TRUE(static_cast<bool>(Result));
-    LLVM_DEBUG(llvm::errs() << "\n" << *Result << "\n\n");
-    return *Result;
-  }
-
-  static std::string format(
-      llvm::StringRef Code,
-      const FormatStyle &Style = getGoogleStyle(FormatStyle::LK_JavaScript)) {
-    return format(Code, 0, Code.size(), Style);
-  }
-
-  static FormatStyle getGoogleJSStyleWithColumns(unsigned ColumnLimit) {
-    FormatStyle Style = getGoogleStyle(FormatStyle::LK_JavaScript);
-    Style.ColumnLimit = ColumnLimit;
-    return Style;
-  }
-
-  static void verifyFormat(
-      llvm::StringRef Code,
-      const FormatStyle &Style = getGoogleStyle(FormatStyle::LK_JavaScript)) {
-    EXPECT_EQ(Code.str(), format(Code, Style)) << "Expected code is not stable";
-    std::string Result = format(test::messUp(Code), Style);
-    EXPECT_EQ(Code.str(), Result) << "Formatted:\n" << Result;
-  }
-
-  static void verifyFormat(
-      llvm::StringRef Expected, llvm::StringRef Code,
-      const FormatStyle &Style = getGoogleStyle(FormatStyle::LK_JavaScript)) {
-    EXPECT_EQ(Expected.str(), format(Expected, Style))
-        << "Expected code is not stable";
-    std::string Result = format(Code, Style);
-    EXPECT_EQ(Expected.str(), Result) << "Formatted:\n" << Result;
-  }
-};
-
-TEST_F(FormatTestJS, BlockComments) {
-  verifyFormat("/* aaaaaaaaaaaaa */ aaaaaaaaaaaaaaaaaaaaaaaaaaa(\n"
-               "    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa);");
-  // Breaks after a single line block comment.
-  EXPECT_EQ("aaaaa = bbbb.ccccccccccccccc(\n"
-            "    /** @type_{!cccc.rrrrrrr.MMMMMMMMMMMM.LLLLLLLLLLL.lala} */\n"
-            "    mediaMessage);",
-            format("aaaaa = bbbb.ccccccccccccccc(\n"
-                   "    /** "
-                   "@type_{!cccc.rrrrrrr.MMMMMMMMMMMM.LLLLLLLLLLL.lala} */ "
-                   "mediaMessage);",
-                   getGoogleJSStyleWithColumns(70)));
-  // Breaks after a multiline block comment.
-  EXPECT_EQ(
-      "aaaaa = bbbb.ccccccccccccccc(\n"
-      "    /**\n"
-      "     * @type_{!cccc.rrrrrrr.MMMMMMMMMMMM.LLLLLLLLLLL.lala}\n"
-      "     */\n"
-      "    mediaMessage);",
-      format("aaaaa = bbbb.ccccccccccccccc(\n"
-             "    /**\n"
-             "     * @type_{!cccc.rrrrrrr.MMMMMMMMMMMM.LLLLLLLLLLL.lala}\n"
-             "     */ mediaMessage);",
-             getGoogleJSStyleWithColumns(70)));
-}
-
-TEST_F(FormatTestJS, JSDocComments) {
-  // Break the first line of a multiline jsdoc comment.
-  EXPECT_EQ("/**\n"
-            " * jsdoc line 1\n"
-            " * jsdoc line 2\n"
-            " */",
-            format("/** jsdoc line 1\n"
-                   " * jsdoc line 2\n"
-                   " */",
-                   getGoogleJSStyleWithColumns(20)));
-  // Both break after '/**' and break the line itself.
-  EXPECT_EQ("/**\n"
-            " * jsdoc line long\n"
-            " * long jsdoc line 2\n"
-            " */",
-            format("/** jsdoc line long long\n"
-                   " * jsdoc line 2\n"
-                   " */",
-                   getGoogleJSStyleWithColumns(20)));
-  // Break a short first line if the ending '*/' is on a newline.
-  EXPECT_EQ("/**\n"
-            " * jsdoc line 1\n"
-            " */",
-            format("/** jsdoc line 1\n"
-                   " */",
-                   getGoogleJSStyleWithColumns(20)));
-  // Don't break the first line of a short single line jsdoc comment.
-  EXPECT_EQ("/** jsdoc line 1 */",
-            format("/** jsdoc line 1 */", getGoogleJSStyleWithColumns(20)));
-  // Don't break the first line of a single line jsdoc comment if it just fits
-  // the column limit.
-  EXPECT_EQ("/** jsdoc line 12 */",
-            format("/** jsdoc line 12 */", getGoogleJSStyleWithColumns(20)));
-  // Don't break after '/**' and before '*/' if there is no space between
-  // '/**' and the content.
-  EXPECT_EQ(
-      "/*** nonjsdoc long\n"
-      " * line */",
-      format("/*** nonjsdoc long line */", getGoogleJSStyleWithColumns(20)));
-  EXPECT_EQ(
-      "/**strange long long\n"
-      " * line */",
-      format("/**strange long long line */", getGoogleJSStyleWithColumns(20)));
-  // Break the first line of a single line jsdoc comment if it just exceeds the
-  // column limit.
-  EXPECT_EQ("/**\n"
-            " * jsdoc line 123\n"
-            " */",
-            format("/** jsdoc line 123 */", getGoogleJSStyleWithColumns(20)));
-  // Break also if the leading indent of the first line is more than 1 column.
-  EXPECT_EQ("/**\n"
-            " * jsdoc line 123\n"
-            " */",
-            format("/**  jsdoc line 123 */", getGoogleJSStyleWithColumns(20)));
-  // Break also if the leading indent of the first line is more than 1 column.
-  EXPECT_EQ("/**\n"
-            " * jsdoc line 123\n"
-            " */",
-            format("/**   jsdoc line 123 */", getGoogleJSStyleWithColumns(20)));
-  // Break after the content of the last line.
-  EXPECT_EQ("/**\n"
-            " * line 1\n"
-            " * line 2\n"
-            " */",
-            format("/**\n"
-                   " * line 1\n"
-                   " * line 2 */",
-                   getGoogleJSStyleWithColumns(20)));
-  // Break both the content and after the content of the last line.
-  EXPECT_EQ("/**\n"
-            " * line 1\n"
-            " * line long long\n"
-            " * long\n"
-            " */",
-            format("/**\n"
-                   " * line 1\n"
-                   " * line long long long */",
-                   getGoogleJSStyleWithColumns(20)));
-
-  // The comment block gets indented.
-  EXPECT_EQ("function f() {\n"
-            "  /**\n"
-            "   * comment about\n"
-            "   * x\n"
-            "   */\n"
-            "  var x = 1;\n"
-            "}",
-            format("function f() {\n"
-                   "/** comment about x */\n"
-                   "var x = 1;\n"
-                   "}",
-                   getGoogleJSStyleWithColumns(20)));
-
-  // Don't break the first line of a single line short jsdoc comment pragma.
-  EXPECT_EQ("/** @returns j */",
-            format("/** @returns j */", getGoogleJSStyleWithColumns(20)));
-
-  // Break a single line long jsdoc comment pragma.
-  EXPECT_EQ("/**\n"
-            " * @returns {string}\n"
-            " *     jsdoc line 12\n"
-            " */",
-            format("/** @returns {string} jsdoc line 12 */",
-                   getGoogleJSStyleWithColumns(20)));
-
-  // FIXME: this overcounts the */ as a continuation of the 12 when breaking.
-  // Related to the FIXME in BreakableBlockComment::getRangeLength.
-  EXPECT_EQ("/**\n"
-            " * @returns {string}\n"
-            " *     jsdoc line line\n"
-            " *     12\n"
-            " */",
-            format("/** @returns {string} jsdoc line line 12*/",
-                   getGoogleJSStyleWithColumns(25)));
-
-  // Fix a multiline jsdoc comment ending in a comment pragma.
-  EXPECT_EQ("/**\n"
-            " * line 1\n"
-            " * line 2\n"
-            " * @returns {string}\n"
-            " *     jsdoc line 12\n"
-            " */",
-            format("/** line 1\n"
-                   " * line 2\n"
-                   " * @returns {string} jsdoc line 12 */",
-                   getGoogleJSStyleWithColumns(20)));
-
-  EXPECT_EQ("/**\n"
-            " * line 1\n"
-            " * line 2\n"
-            " *\n"
-            " * @returns j\n"
-            " */",
-            format("/** line 1\n"
-                   " * line 2\n"
-                   " *\n"
-                   " * @returns j */",
-                   getGoogleJSStyleWithColumns(20)));
-}
-
-TEST_F(FormatTestJS, UnderstandsJavaScriptOperators) {
-  verifyFormat("a == = b;");
-  verifyFormat("a != = b;");
-
-  verifyFormat("a === b;");
-  verifyFormat("aaaaaaa ===\n    b;", getGoogleJSStyleWithColumns(10));
-  verifyFormat("a !== b;");
-  verifyFormat("aaaaaaa !==\n    b;", getGoogleJSStyleWithColumns(10));
-  verifyFormat("if (a + b + c +\n"
-               "        d !==\n"
-               "    e + f + g)\n"
-               "  q();",
-               getGoogleJSStyleWithColumns(20));
-
-  verifyFormat("a >> >= b;");
-
-  verifyFormat("a >>> b;");
-  verifyFormat("aaaaaaa >>>\n    b;", getGoogleJSStyleWithColumns(10));
-  verifyFormat("a >>>= b;");
-  verifyFormat("aaaaaaa >>>=\n    b;", getGoogleJSStyleWithColumns(10));
-  verifyFormat("if (a + b + c +\n"
-               "        d >>>\n"
-               "    e + f + g)\n"
-               "  q();",
-               getGoogleJSStyleWithColumns(20));
-  verifyFormat("var x = aaaaaaaaaa ?\n"
-               "    bbbbbb :\n"
-               "    ccc;",
-               getGoogleJSStyleWithColumns(20));
-
-  verifyFormat("var b = a.map((x) => x + 1);");
-  verifyFormat("return ('aaa') in bbbb;");
-  verifyFormat("var x = aaaaaaaaaaaaaaaaaaaaaaaaa() in\n"
-               "    aaaa.aaaaaa.aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa;");
-  FormatStyle Style = getGoogleJSStyleWithColumns(80);
-  Style.AlignOperands = FormatStyle::OAS_Align;
-  verifyFormat("var x = aaaaaaaaaaaaaaaaaaaaaaaaa() in\n"
-               "        aaaa.aaaaaa.aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa;",
-               Style);
-  Style.BreakBeforeBinaryOperators = FormatStyle::BOS_All;
-  verifyFormat("var x = aaaaaaaaaaaaaaaaaaaaaaaaa()\n"
-               "            in aaaa.aaaaaa.aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa;",
-               Style);
-
-  // ES6 spread operator.
-  verifyFormat("someFunction(...a);");
-  verifyFormat("var x = [1, ...a, 2];");
-
-  // "- -1" is legal JS syntax, but must not collapse into "--".
-  verifyFormat("- -1;", " - -1;");
-  verifyFormat("-- -1;", " -- -1;");
-  verifyFormat("+ +1;", " + +1;");
-  verifyFormat("++ +1;", " ++ +1;");
-}
-
-TEST_F(FormatTestJS, UnderstandsAmpAmp) {
-  verifyFormat("e && e.SomeFunction();");
-}
-
-TEST_F(FormatTestJS, LiteralOperatorsCanBeKeywords) {
-  verifyFormat("not.and.or.not_eq = 1;");
-}
-
-TEST_F(FormatTestJS, ReservedWords) {
-  // JavaScript reserved words (aka keywords) are only illegal when used as
-  // Identifiers, but are legal as IdentifierNames.
-  verifyFormat("x.class.struct = 1;");
-  verifyFormat("x.case = 1;");
-  verifyFormat("x.interface = 1;");
-  verifyFormat("x.for = 1;");
-  verifyFormat("x.of();");
-  verifyFormat("of(null);");
-  verifyFormat("return of(null);");
-  verifyFormat("import {of} from 'x';");
-  verifyFormat("x.in();");
-  verifyFormat("x.let();");
-  verifyFormat("x.var();");
-  verifyFormat("x.for();");
-  verifyFormat("x.as();");
-  verifyFormat("x.instanceof();");
-  verifyFormat("x.switch();");
-  verifyFormat("x.case();");
-  verifyFormat("x.delete();");
-  verifyFormat("x.throw();");
-  verifyFormat("x.throws();");
-  verifyFormat("x.if();");
-  verifyFormat("x = {\n"
-               "  a: 12,\n"
-               "  interface: 1,\n"
-               "  switch: 1,\n"
-               "};");
-  verifyFormat("var struct = 2;");
-  verifyFormat("var union = 2;");
-  verifyFormat("var interface = 2;");
-  verifyFormat("interface = 2;");
-  verifyFormat("x = interface instanceof y;");
-  verifyFormat("interface Test {\n"
-               "  x: string;\n"
-               "  switch: string;\n"
-               "  case: string;\n"
-               "  default: string;\n"
-               "}\n");
-  verifyFormat("const Axis = {\n"
-               "  for: 'for',\n"
-               "  x: 'x'\n"
-               "};",
-               "const Axis = {for: 'for', x:   'x'};");
-}
-
-TEST_F(FormatTestJS, ReservedWordsMethods) {
-  verifyFormat("class X {\n"
-               "  delete() {\n"
-               "    x();\n"
-               "  }\n"
-               "  interface() {\n"
-               "    x();\n"
-               "  }\n"
-               "  let() {\n"
-               "    x();\n"
-               "  }\n"
-               "}\n");
-  verifyFormat("class KeywordNamedMethods {\n"
-               "  do() {\n"
-               "  }\n"
-               "  for() {\n"
-               "  }\n"
-               "  while() {\n"
-               "  }\n"
-               "  if() {\n"
-               "  }\n"
-               "  else() {\n"
-               "  }\n"
-               "  try() {\n"
-               "  }\n"
-               "  catch() {\n"
-               "  }\n"
-               "}\n");
-}
-
-TEST_F(FormatTestJS, ReservedWordsParenthesized) {
-  // All of these are statements using the keyword, not function calls.
-  verifyFormat("throw (x + y);\n"
-               "await (await x).y;\n"
-               "typeof (x) === 'string';\n"
-               "void (0);\n"
-               "delete (x.y);\n"
-               "return (x);\n");
-}
-
-TEST_F(FormatTestJS, ES6DestructuringAssignment) {
-  verifyFormat("var [a, b, c] = [1, 2, 3];");
-  verifyFormat("const [a, b, c] = [1, 2, 3];");
-  verifyFormat("let [a, b, c] = [1, 2, 3];");
-  verifyFormat("var {a, b} = {a: 1, b: 2};");
-  verifyFormat("let {a, b} = {a: 1, b: 2};");
-}
-
-TEST_F(FormatTestJS, ContainerLiterals) {
-  verifyFormat("var x = {\n"
-               "  y: function(a) {\n"
-               "    return a;\n"
-               "  }\n"
-               "};");
-  verifyFormat("return {\n"
-               "  link: function() {\n"
-               "    f();  //\n"
-               "  }\n"
-               "};");
-  verifyFormat("return {\n"
-               "  a: a,\n"
-               "  link: function() {\n"
-               "    f();  //\n"
-               "  }\n"
-               "};");
-  verifyFormat("return {\n"
-               "  a: a,\n"
-               "  link: function() {\n"
-               "    f();  //\n"
-               "  },\n"
-               "  link: function() {\n"
-               "    f();  //\n"
-               "  }\n"
-               "};");
-  verifyFormat("var stuff = {\n"
-               "  // comment for update\n"
-               "  update: false,\n"
-               "  // comment for modules\n"
-               "  modules: false,\n"
-               "  // comment for tasks\n"
-               "  tasks: false\n"
-               "};");
-  verifyFormat("return {\n"
-               "  'finish':\n"
-               "      //\n"
-               "      a\n"
-               "};");
-  verifyFormat("var obj = {\n"
-               "  fooooooooo: function(x) {\n"
-               "    return x.zIsTooLongForOneLineWithTheDeclarationLine();\n"
-               "  }\n"
-               "};");
-  // Simple object literal, as opposed to enum style below.
-  verifyFormat("var obj = {a: 123};");
-  // Enum style top level assignment.
-  verifyFormat("X = {\n  a: 123\n};");
-  verifyFormat("X.Y = {\n  a: 123\n};");
-  // But only on the top level, otherwise its a plain object literal assignment.
-  verifyFormat("function x() {\n"
-               "  y = {z: 1};\n"
-               "}");
-  verifyFormat("x = foo && {a: 123};");
-
-  // Arrow functions in object literals.
-  verifyFormat("var x = {\n"
-               "  y: (a) => {\n"
-               "    x();\n"
-               "    return a;\n"
-               "  },\n"
-               "};");
-  verifyFormat("var x = {y: (a) => a};");
-
-  // Methods in object literals.
-  verifyFormat("var x = {\n"
-               "  y(a: string): number {\n"
-               "    return a;\n"
-               "  }\n"
-               "};");
-  verifyFormat("var x = {\n"
-               "  y(a: string) {\n"
-               "    return a;\n"
-               "  }\n"
-               "};");
-
-  // Computed keys.
-  verifyFormat("var x = {[a]: 1, b: 2, [c]: 3};");
-  verifyFormat("var x = {\n"
-               "  [a]: 1,\n"
-               "  b: 2,\n"
-               "  [c]: 3,\n"
-               "};");
-
-  // Object literals can leave out labels.
-  verifyFormat("f({a}, () => {\n"
-               "  x;\n"
-               "  g();\n"
-               "});");
-
-  // Keys can be quoted.
-  verifyFormat("var x = {\n"
-               "  a: a,\n"
-               "  b: b,\n"
-               "  'c': c,\n"
-               "};");
-
-  // Dict literals can skip the label names.
-  verifyFormat("var x = {\n"
-               "  aaa,\n"
-               "  aaa,\n"
-               "  aaa,\n"
-               "};");
-  verifyFormat("return {\n"
-               "  a,\n"
-               "  b: 'b',\n"
-               "  c,\n"
-               "};");
-}
-
-TEST_F(FormatTestJS, MethodsInObjectLiterals) {
-  verifyFormat("var o = {\n"
-               "  value: 'test',\n"
-               "  get value() {  // getter\n"
-               "    return this.value;\n"
-               "  }\n"
-               "};");
-  verifyFormat("var o = {\n"
-               "  value: 'test',\n"
-               "  set value(val) {  // setter\n"
-               "    this.value = val;\n"
-               "  }\n"
-               "};");
-  verifyFormat("var o = {\n"
-               "  value: 'test',\n"
-               "  someMethod(val) {  // method\n"
-               "    doSomething(this.value + val);\n"
-               "  }\n"
-               "};");
-  verifyFormat("var o = {\n"
-               "  someMethod(val) {  // method\n"
-               "    doSomething(this.value + val);\n"
-               "  },\n"
-               "  someOtherMethod(val) {  // method\n"
-               "    doSomething(this.value + val);\n"
-               "  }\n"
-               "};");
-}
-
-TEST_F(FormatTestJS, GettersSettersVisibilityKeywords) {
-  // Don't break after "protected"
-  verifyFormat("class X {\n"
-               "  protected get getter():\n"
-               "      number {\n"
-               "    return 1;\n"
-               "  }\n"
-               "}",
-               getGoogleJSStyleWithColumns(12));
-  // Don't break after "get"
-  verifyFormat("class X {\n"
-               "  protected get someReallyLongGetterName():\n"
-               "      number {\n"
-               "    return 1;\n"
-               "  }\n"
-               "}",
-               getGoogleJSStyleWithColumns(40));
-}
-
-TEST_F(FormatTestJS, SpacesInContainerLiterals) {
-  verifyFormat("var arr = [1, 2, 3];");
-  verifyFormat("f({a: 1, b: 2, c: 3});");
-
-  verifyFormat("var object_literal_with_long_name = {\n"
-               "  a: 'aaaaaaaaaaaaaaaaaa',\n"
-               "  b: 'bbbbbbbbbbbbbbbbbb'\n"
-               "};");
-
-  verifyFormat("f({a: 1, b: 2, c: 3});",
-               getChromiumStyle(FormatStyle::LK_JavaScript));
-  verifyFormat("f({'a': [{}]});");
-}
-
-TEST_F(FormatTestJS, SingleQuotedStrings) {
-  verifyFormat("this.function('', true);");
-}
-
-TEST_F(FormatTestJS, GoogScopes) {
-  verifyFormat("goog.scope(function() {\n"
-               "var x = a.b;\n"
-               "var y = c.d;\n"
-               "});  // goog.scope");
-  verifyFormat("goog.scope(function() {\n"
-               "// test\n"
-               "var x = 0;\n"
-               "// test\n"
-               "});");
-}
-
-TEST_F(FormatTestJS, IIFEs) {
-  // Internal calling parens; no semi.
-  verifyFormat("(function() {\n"
-               "var a = 1;\n"
-               "}())");
-  // External calling parens; no semi.
-  verifyFormat("(function() {\n"
-               "var b = 2;\n"
-               "})()");
-  // Internal calling parens; with semi.
-  verifyFormat("(function() {\n"
-               "var c = 3;\n"
-               "}());");
-  // External calling parens; with semi.
-  verifyFormat("(function() {\n"
-               "var d = 4;\n"
-               "})();");
-}
-
-TEST_F(FormatTestJS, GoogModules) {
-  verifyFormat("goog.module('this.is.really.absurdly.long');",
-               getGoogleJSStyleWithColumns(40));
-  verifyFormat("goog.require('this.is.really.absurdly.long');",
-               getGoogleJSStyleWithColumns(40));
-  verifyFormat("goog.provide('this.is.really.absurdly.long');",
-               getGoogleJSStyleWithColumns(40));
-  verifyFormat("var long = goog.require('this.is.really.absurdly.long');",
-               getGoogleJSStyleWithColumns(40));
-  verifyFormat("const X = goog.requireType('this.is.really.absurdly.long');",
-               getGoogleJSStyleWithColumns(40));
-  verifyFormat("goog.forwardDeclare('this.is.really.absurdly.long');",
-               getGoogleJSStyleWithColumns(40));
-
-  // These should be wrapped normally.
-  verifyFormat(
-      "var MyLongClassName =\n"
-      "    goog.module.get('my.long.module.name.followedBy.MyLongClassName');");
-  verifyFormat("function a() {\n"
-               "  goog.setTestOnly();\n"
-               "}\n",
-               "function a() {\n"
-               "goog.setTestOnly();\n"
-               "}\n");
-}
-
-TEST_F(FormatTestJS, FormatsNamespaces) {
-  verifyFormat("namespace Foo {\n"
-               "  export let x = 1;\n"
-               "}\n");
-  verifyFormat("declare namespace Foo {\n"
-               "  export let x: number;\n"
-               "}\n");
-}
-
-TEST_F(FormatTestJS, NamespacesMayNotWrap) {
-  verifyFormat("declare namespace foobarbaz {\n"
-               "}\n",
-               getGoogleJSStyleWithColumns(18));
-  verifyFormat("declare module foobarbaz {\n"
-               "}\n",
-               getGoogleJSStyleWithColumns(15));
-  verifyFormat("namespace foobarbaz {\n"
-               "}\n",
-               getGoogleJSStyleWithColumns(10));
-  verifyFormat("module foobarbaz {\n"
-               "}\n",
-               getGoogleJSStyleWithColumns(7));
-}
-
-TEST_F(FormatTestJS, AmbientDeclarations) {
-  FormatStyle NineCols = getGoogleJSStyleWithColumns(9);
-  verifyFormat("declare class\n"
-               "    X {}",
-               NineCols);
-  verifyFormat("declare function\n"
-               "x();", // TODO(martinprobst): should ideally be indented.
-               NineCols);
-  verifyFormat("declare function foo();\n"
-               "let x = 1;\n");
-  verifyFormat("declare function foo(): string;\n"
-               "let x = 1;\n");
-  verifyFormat("declare function foo(): {x: number};\n"
-               "let x = 1;\n");
-  verifyFormat("declare class X {}\n"
-               "let x = 1;\n");
-  verifyFormat("declare interface Y {}\n"
-               "let x = 1;\n");
-  verifyFormat("declare enum X {\n"
-               "}",
-               NineCols);
-  verifyFormat("declare let\n"
-               "    x: number;",
-               NineCols);
-}
-
-TEST_F(FormatTestJS, FormatsFreestandingFunctions) {
-  verifyFormat("function outer1(a, b) {\n"
-               "  function inner1(a, b) {\n"
-               "    return a;\n"
-               "  }\n"
-               "  inner1(a, b);\n"
-               "}\n"
-               "function outer2(a, b) {\n"
-               "  function inner2(a, b) {\n"
-               "    return a;\n"
-               "  }\n"
-               "  inner2(a, b);\n"
-               "}");
-  verifyFormat("function f() {}");
-  verifyFormat("function aFunction() {}\n"
-               "(function f() {\n"
-               "  var x = 1;\n"
-               "}());\n");
-  verifyFormat("function aFunction() {}\n"
-               "{\n"
-               "  let x = 1;\n"
-               "  console.log(x);\n"
-               "}\n");
-}
-
-TEST_F(FormatTestJS, GeneratorFunctions) {
-  verifyFormat("function* f() {\n"
-               "  let x = 1;\n"
-               "  yield x;\n"
-               "  yield* something();\n"
-               "  yield [1, 2];\n"
-               "  yield {a: 1};\n"
-               "}");
-  verifyFormat("function*\n"
-               "    f() {\n"
-               "}",
-               getGoogleJSStyleWithColumns(8));
-  verifyFormat("export function* f() {\n"
-               "  yield 1;\n"
-               "}\n");
-  verifyFormat("class X {\n"
-               "  * generatorMethod() {\n"
-               "    yield x;\n"
-               "  }\n"
-               "}");
-  verifyFormat("var x = {\n"
-               "  a: function*() {\n"
-               "    //\n"
-               "  }\n"
-               "}\n");
-}
-
-TEST_F(FormatTestJS, AsyncFunctions) {
-  verifyFormat("async function f() {\n"
-               "  let x = 1;\n"
-               "  return fetch(x);\n"
-               "}");
-  verifyFormat("async function f() {\n"
-               "  return 1;\n"
-               "}\n"
-               "\n"
-               "function a() {\n"
-               "  return 1;\n"
-               "}\n",
-               "  async   function f() {\n"
-               "   return 1;\n"
-               "}\n"
-               "\n"
-               "   function a() {\n"
-               "  return   1;\n"
-               "}  \n");
-  // clang-format must not insert breaks between async and function, otherwise
-  // automatic semicolon insertion may trigger (in particular in a class body).
-  verifyFormat("async function\n"
-               "hello(\n"
-               "    myparamnameiswaytooloooong) {\n"
-               "}",
-               "async function hello(myparamnameiswaytooloooong) {}",
-               getGoogleJSStyleWithColumns(10));
-  verifyFormat("class C {\n"
-               "  async hello(\n"
-               "      myparamnameiswaytooloooong) {\n"
-               "  }\n"
-               "}",
-               "class C {\n"
-               "  async hello(myparamnameiswaytooloooong) {} }",
-               getGoogleJSStyleWithColumns(10));
-  verifyFormat("async function* f() {\n"
-               "  yield fetch(x);\n"
-               "}");
-  verifyFormat("export async function f() {\n"
-               "  return fetch(x);\n"
-               "}");
-  verifyFormat("let x = async () => f();");
-  verifyFormat("let x = async function() {\n"
-               "  f();\n"
-               "};");
-  verifyFormat("let x = async();");
-  verifyFormat("class X {\n"
-               "  async asyncMethod() {\n"
-               "    return fetch(1);\n"
-               "  }\n"
-               "}");
-  verifyFormat("function initialize() {\n"
-               "  // Comment.\n"
-               "  return async.then();\n"
-               "}\n");
-  verifyFormat("for await (const x of y) {\n"
-               "  console.log(x);\n"
-               "}\n");
-  verifyFormat("function asyncLoop() {\n"
-               "  for await (const x of y) {\n"
-               "    console.log(x);\n"
-               "  }\n"
-               "}\n");
-}
-
-TEST_F(FormatTestJS, FunctionParametersTrailingComma) {
-  verifyFormat("function trailingComma(\n"
-               "    p1,\n"
-               "    p2,\n"
-               "    p3,\n"
-               ") {\n"
-               "  a;  //\n"
-               "}\n",
-               "function trailingComma(p1, p2, p3,) {\n"
-               "  a;  //\n"
-               "}\n");
-  verifyFormat("trailingComma(\n"
-               "    p1,\n"
-               "    p2,\n"
-               "    p3,\n"
-               ");\n",
-               "trailingComma(p1, p2, p3,);\n");
-  verifyFormat("trailingComma(\n"
-               "    p1  // hello\n"
-               ");\n",
-               "trailingComma(p1 // hello\n"
-               ");\n");
-}
-
-TEST_F(FormatTestJS, ArrayLiterals) {
-  verifyFormat("var aaaaa: List<SomeThing> =\n"
-               "    [new SomeThingAAAAAAAAAAAA(), new SomeThingBBBBBBBBB()];");
-  verifyFormat("return [\n"
-               "  aaaaaaaaaaaaaaaaaaaaaaaaaaa, bbbbbbbbbbbbbbbbbbbbbbbbbbb,\n"
-               "  ccccccccccccccccccccccccccc\n"
-               "];");
-  verifyFormat("return [\n"
-               "  aaaa().bbbbbbbb('A'),\n"
-               "  aaaa().bbbbbbbb('B'),\n"
-               "  aaaa().bbbbbbbb('C'),\n"
-               "];");
-  verifyFormat("var someVariable = SomeFunction([\n"
-               "  aaaaaaaaaaaaaaaaaaaaaaaaaaa, bbbbbbbbbbbbbbbbbbbbbbbbbbb,\n"
-               "  ccccccccccccccccccccccccccc\n"
-               "]);");
-  verifyFormat("var someVariable = SomeFunction([\n"
-               "  [aaaaaaaaaaaaaaaaaaaaaa, bbbbbbbbbbbbbbbbbbbbbb],\n"
-               "]);",
-               getGoogleJSStyleWithColumns(51));
-  verifyFormat("var someVariable = SomeFunction(aaaa, [\n"
-               "  aaaaaaaaaaaaaaaaaaaaaaaaaaa, bbbbbbbbbbbbbbbbbbbbbbbbbbb,\n"
-               "  ccccccccccccccccccccccccccc\n"
-               "]);");
-  verifyFormat("var someVariable = SomeFunction(\n"
-               "    aaaa,\n"
-               "    [\n"
-               "      aaaaaaaaaaaaaaaaaaaaaaaaaa, bbbbbbbbbbbbbbbbbbbbbbbbbb,\n"
-               "      cccccccccccccccccccccccccc\n"
-               "    ],\n"
-               "    aaaa);");
-  verifyFormat("var aaaa = aaaaa ||  // wrap\n"
-               "    [];");
-
-  verifyFormat("someFunction([], {a: a});");
-
-  verifyFormat("var string = [\n"
-               "  'aaaaaa',\n"
-               "  'bbbbbb',\n"
-               "].join('+');");
-}
-
-TEST_F(FormatTestJS, ColumnLayoutForArrayLiterals) {
-  verifyFormat("var array = [\n"
-               "  a, a, a, a, a, a, a, a, a, a, a, a, a, a, a,\n"
-               "  a, a, a, a, a, a, a, a, a, a, a, a, a, a, a,\n"
-               "];");
-  verifyFormat("var array = someFunction([\n"
-               "  a, a, a, a, a, a, a, a, a, a, a, a, a, a, a,\n"
-               "  a, a, a, a, a, a, a, a, a, a, a, a, a, a, a,\n"
-               "]);");
-}
-
-TEST_F(FormatTestJS, TrailingCommaInsertion) {
-  FormatStyle Style = getGoogleStyle(FormatStyle::LK_JavaScript);
-  Style.InsertTrailingCommas = FormatStyle::TCS_Wrapped;
-  // Insert comma in wrapped array.
-  verifyFormat("const x = [\n"
-               "  1,  //\n"
-               "  2,\n"
-               "];",
-               "const x = [\n"
-               "  1,  //\n"
-               "  2];",
-               Style);
-  // Insert comma in newly wrapped array.
-  Style.ColumnLimit = 30;
-  verifyFormat("const x = [\n"
-               "  aaaaaaaaaaaaaaaaaaaaaaaaa,\n"
-               "];",
-               "const x = [aaaaaaaaaaaaaaaaaaaaaaaaa];", Style);
-  // Do not insert trailing commas if they'd exceed the colum limit
-  verifyFormat("const x = [\n"
-               "  aaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-               "];",
-               "const x = [aaaaaaaaaaaaaaaaaaaaaaaaaaaa];", Style);
-  // Object literals.
-  verifyFormat("const x = {\n"
-               "  a: aaaaaaaaaaaaaaaaa,\n"
-               "};",
-               "const x = {a: aaaaaaaaaaaaaaaaa};", Style);
-  verifyFormat("const x = {\n"
-               "  a: aaaaaaaaaaaaaaaaaaaaaaaaa\n"
-               "};",
-               "const x = {a: aaaaaaaaaaaaaaaaaaaaaaaaa};", Style);
-  // Object literal types.
-  verifyFormat("let x: {\n"
-               "  a: aaaaaaaaaaaaaaaaaaaaa,\n"
-               "};",
-               "let x: {a: aaaaaaaaaaaaaaaaaaaaa};", Style);
-}
-
-TEST_F(FormatTestJS, FunctionLiterals) {
-  FormatStyle Style = getGoogleStyle(FormatStyle::LK_JavaScript);
-  Style.AllowShortFunctionsOnASingleLine = FormatStyle::SFS_Inline;
-  verifyFormat("doFoo(function() {});");
-  verifyFormat("doFoo(function() { return 1; });", Style);
-  verifyFormat("var func = function() {\n"
-               "  return 1;\n"
-               "};");
-  verifyFormat("var func =  //\n"
-               "    function() {\n"
-               "  return 1;\n"
-               "};");
-  verifyFormat("return {\n"
-               "  body: {\n"
-               "    setAttribute: function(key, val) { this[key] = val; },\n"
-               "    getAttribute: function(key) { return this[key]; },\n"
-               "    style: {direction: ''}\n"
-               "  }\n"
-               "};",
-               Style);
-  verifyFormat("abc = xyz ? function() {\n"
-               "  return 1;\n"
-               "} : function() {\n"
-               "  return -1;\n"
-               "};");
-
-  verifyFormat("var closure = goog.bind(\n"
-               "    function() {  // comment\n"
-               "      foo();\n"
-               "      bar();\n"
-               "    },\n"
-               "    this, arg1IsReallyLongAndNeedsLineBreaks,\n"
-               "    arg3IsReallyLongAndNeedsLineBreaks);");
-  verifyFormat("var closure = goog.bind(function() {  // comment\n"
-               "  foo();\n"
-               "  bar();\n"
-               "}, this);");
-  verifyFormat("return {\n"
-               "  a: 'E',\n"
-               "  b: function() {\n"
-               "    return function() {\n"
-               "      f();  //\n"
-               "    };\n"
-               "  }\n"
-               "};");
-  verifyFormat("{\n"
-               "  var someVariable = function(x) {\n"
-               "    return x.zIsTooLongForOneLineWithTheDeclarationLine();\n"
-               "  };\n"
-               "}");
-  verifyFormat("someLooooooooongFunction(\n"
-               "    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,\n"
-               "    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,\n"
-               "    function(aaaaaaaaaaaaaaaaaaaaaaaaaaaaa) {\n"
-               "      // code\n"
-               "    });");
-
-  verifyFormat("return {\n"
-               "  a: function SomeFunction() {\n"
-               "    // ...\n"
-               "    return 1;\n"
-               "  }\n"
-               "};");
-  verifyFormat("this.someObject.doSomething(aaaaaaaaaaaaaaaaaaaaaaaaaa)\n"
-               "    .then(goog.bind(function(aaaaaaaaaaa) {\n"
-               "      someFunction();\n"
-               "      someFunction();\n"
-               "    }, this), aaaaaaaaaaaaaaaaa);");
-
-  verifyFormat("someFunction(goog.bind(function() {\n"
-               "  doSomething();\n"
-               "  doSomething();\n"
-               "}, this), goog.bind(function() {\n"
-               "  doSomething();\n"
-               "  doSomething();\n"
-               "}, this));");
-
-  verifyFormat("SomeFunction(function() {\n"
-               "  foo();\n"
-               "  bar();\n"
-               "}.bind(this));");
-
-  verifyFormat("SomeFunction((function() {\n"
-               "               foo();\n"
-               "               bar();\n"
-               "             }).bind(this));");
-
-  // FIXME: This is bad, we should be wrapping before "function() {".
-  verifyFormat("someFunction(function() {\n"
-               "  doSomething();  // break\n"
-               "})\n"
-               "    .doSomethingElse(\n"
-               "        // break\n"
-               "    );");
-
-  Style.ColumnLimit = 33;
-  verifyFormat("f({a: function() { return 1; }});", Style);
-  Style.ColumnLimit = 32;
-  verifyFormat("f({\n"
-               "  a: function() { return 1; }\n"
-               "});",
-               Style);
-}
-
-TEST_F(FormatTestJS, DontWrapEmptyLiterals) {
-  verifyFormat("(aaaaaaaaaaaaaaaaaaaaa.getData as jasmine.Spy)\n"
-               "    .and.returnValue(Observable.of([]));");
-  verifyFormat("(aaaaaaaaaaaaaaaaaaaaa.getData as jasmine.Spy)\n"
-               "    .and.returnValue(Observable.of({}));");
-  verifyFormat("(aaaaaaaaaaaaaaaaaaaaa.getData as jasmine.Spy)\n"
-               "    .and.returnValue(Observable.of(()));");
-}
-
-TEST_F(FormatTestJS, InliningFunctionLiterals) {
-  FormatStyle Style = getGoogleStyle(FormatStyle::LK_JavaScript);
-  Style.AllowShortFunctionsOnASingleLine = FormatStyle::SFS_Inline;
-  verifyFormat("var func = function() {\n"
-               "  return 1;\n"
-               "};",
-               Style);
-  verifyFormat("var func = doSomething(function() { return 1; });", Style);
-  verifyFormat("var outer = function() {\n"
-               "  var inner = function() { return 1; }\n"
-               "};",
-               Style);
-  verifyFormat("function outer1(a, b) {\n"
-               "  function inner1(a, b) { return a; }\n"
-               "}",
-               Style);
-
-  Style.AllowShortFunctionsOnASingleLine = FormatStyle::SFS_All;
-  verifyFormat("var func = function() { return 1; };", Style);
-  verifyFormat("var func = doSomething(function() { return 1; });", Style);
-  verifyFormat(
-      "var outer = function() { var inner = function() { return 1; } };",
-      Style);
-  verifyFormat("function outer1(a, b) {\n"
-               "  function inner1(a, b) { return a; }\n"
-               "}",
-               Style);
-
-  Style.AllowShortFunctionsOnASingleLine = FormatStyle::SFS_None;
-  verifyFormat("var func = function() {\n"
-               "  return 1;\n"
-               "};",
-               Style);
-  verifyFormat("var func = doSomething(function() {\n"
-               "  return 1;\n"
-               "});",
-               Style);
-  verifyFormat("var outer = function() {\n"
-               "  var inner = function() {\n"
-               "    return 1;\n"
-               "  }\n"
-               "};",
-               Style);
-  verifyFormat("function outer1(a, b) {\n"
-               "  function inner1(a, b) {\n"
-               "    return a;\n"
-               "  }\n"
-               "}",
-               Style);
-
-  Style.AllowShortFunctionsOnASingleLine = FormatStyle::SFS_Empty;
-  verifyFormat("var func = function() {\n"
-               "  return 1;\n"
-               "};",
-               Style);
-}
-
-TEST_F(FormatTestJS, MultipleFunctionLiterals) {
-  FormatStyle Style = getGoogleStyle(FormatStyle::LK_JavaScript);
-  Style.AllowShortFunctionsOnASingleLine = FormatStyle::SFS_All;
-  verifyFormat("promise.then(\n"
-               "    function success() {\n"
-               "      doFoo();\n"
-               "      doBar();\n"
-               "    },\n"
-               "    function error() {\n"
-               "      doFoo();\n"
-               "      doBaz();\n"
-               "    },\n"
-               "    []);\n");
-  verifyFormat("promise.then(\n"
-               "    function success() {\n"
-               "      doFoo();\n"
-               "      doBar();\n"
-               "    },\n"
-               "    [],\n"
-               "    function error() {\n"
-               "      doFoo();\n"
-               "      doBaz();\n"
-               "    });\n");
-  verifyFormat("promise.then(\n"
-               "    [],\n"
-               "    function success() {\n"
-               "      doFoo();\n"
-               "      doBar();\n"
-               "    },\n"
-               "    function error() {\n"
-               "      doFoo();\n"
-               "      doBaz();\n"
-               "    });\n");
-
-  verifyFormat("getSomeLongPromise()\n"
-               "    .then(function(value) { body(); })\n"
-               "    .thenCatch(function(error) {\n"
-               "      body();\n"
-               "      body();\n"
-               "    });",
-               Style);
-  verifyFormat("getSomeLongPromise()\n"
-               "    .then(function(value) {\n"
-               "      body();\n"
-               "      body();\n"
-               "    })\n"
-               "    .thenCatch(function(error) {\n"
-               "      body();\n"
-               "      body();\n"
-               "    });");
-
-  verifyFormat("getSomeLongPromise()\n"
-               "    .then(function(value) { body(); })\n"
-               "    .thenCatch(function(error) { body(); });",
-               Style);
-
-  verifyFormat("return [aaaaaaaaaaaaaaaaaaaaaa]\n"
-               "    .aaaaaaa(function() {\n"
-               "      //\n"
-               "    })\n"
-               "    .bbbbbb();");
-}
-
-TEST_F(FormatTestJS, ArrowFunctions) {
-  verifyFormat("var x = (a) => {\n"
-               "  x;\n"
-               "  return a;\n"
-               "};\n");
-  verifyFormat("var x = (a) => {\n"
-               "  function y() {\n"
-               "    return 42;\n"
-               "  }\n"
-               "  return a;\n"
-               "};");
-  verifyFormat("var x = (a: type): {some: type} => {\n"
-               "  y;\n"
-               "  return a;\n"
-               "};");
-  verifyFormat("var x = (a) => a;");
-  verifyFormat("return () => [];");
-  verifyFormat("var aaaaaaaaaaaaaaaaaaaa = {\n"
-               "  aaaaaaaaaaaaaaaaaaaaaaaaaaaa:\n"
-               "      (aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,\n"
-               "       aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa) =>\n"
-               "          aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,\n"
-               "};");
-  verifyFormat("var a = a.aaaaaaa(\n"
-               "    (a: a) => aaaaaaaaaaaaaaaaaaaaaaaaa(bbbbbbbbb) &&\n"
-               "        aaaaaaaaaaaaaaaaaaaaaaaaa(bbbbbbb));");
-  verifyFormat("var a = a.aaaaaaa(\n"
-               "    (a: a) => aaaaaaaaaaaaaaaaaaaaa(bbbbbbbbb) ?\n"
-               "        aaaaaaaaaaaaaaaaaaaaa(bbbbbbb) :\n"
-               "        aaaaaaaaaaaaaaaaaaaaa(bbbbbbb));");
-
-  // FIXME: This is bad, we should be wrapping before "() => {".
-  verifyFormat("someFunction(() => {\n"
-               "  doSomething();  // break\n"
-               "})\n"
-               "    .doSomethingElse(\n"
-               "        // break\n"
-               "    );");
-  verifyFormat("const f = (x: string|null): string|null => {\n"
-               "  y;\n"
-               "  return x;\n"
-               "}\n");
-}
-
-TEST_F(FormatTestJS, ArrowFunctionStyle) {
-  FormatStyle Style = getGoogleStyle(FormatStyle::LK_JavaScript);
-  Style.AllowShortLambdasOnASingleLine = FormatStyle::SLS_All;
-  verifyFormat("const arr = () => { x; };", Style);
-  verifyFormat("const arrInlineAll = () => {};", Style);
-  Style.AllowShortLambdasOnASingleLine = FormatStyle::SLS_None;
-  verifyFormat("const arr = () => {\n"
-               "  x;\n"
-               "};",
-               Style);
-  verifyFormat("const arrInlineNone = () => {\n"
-               "};",
-               Style);
-  Style.AllowShortLambdasOnASingleLine = FormatStyle::SLS_Empty;
-  verifyFormat("const arr = () => {\n"
-               "  x;\n"
-               "};",
-               Style);
-  verifyFormat("const arrInlineEmpty = () => {};", Style);
-  Style.AllowShortLambdasOnASingleLine = FormatStyle::SLS_Inline;
-  verifyFormat("const arr = () => {\n"
-               "  x;\n"
-               "};",
-               Style);
-  verifyFormat("foo(() => {});", Style);
-  verifyFormat("const arrInlineInline = () => {};", Style);
-}
-
-TEST_F(FormatTestJS, ReturnStatements) {
-  verifyFormat("function() {\n"
-               "  return [hello, world];\n"
-               "}");
-}
-
-TEST_F(FormatTestJS, ForLoops) {
-  verifyFormat("for (var i in [2, 3]) {\n"
-               "}");
-  verifyFormat("for (var i of [2, 3]) {\n"
-               "}");
-  verifyFormat("for (let {a, b} of x) {\n"
-               "}");
-  verifyFormat("for (let {a, b} of [x]) {\n"
-               "}");
-  verifyFormat("for (let [a, b] of [x]) {\n"
-               "}");
-  verifyFormat("for (let {a, b} in x) {\n"
-               "}");
-}
-
-TEST_F(FormatTestJS, WrapRespectsAutomaticSemicolonInsertion) {
-  // The following statements must not wrap, as otherwise the program meaning
-  // would change due to automatic semicolon insertion.
-  // See http://www.ecma-international.org/ecma-262/5.1/#sec-7.9.1.
-  verifyFormat("return aaaaa;", getGoogleJSStyleWithColumns(10));
-  verifyFormat("yield aaaaa;", getGoogleJSStyleWithColumns(10));
-  verifyFormat("return /* hello! */ aaaaa;", getGoogleJSStyleWithColumns(10));
-  verifyFormat("continue aaaaa;", getGoogleJSStyleWithColumns(10));
-  verifyFormat("continue /* hello! */ aaaaa;", getGoogleJSStyleWithColumns(10));
-  verifyFormat("break aaaaa;", getGoogleJSStyleWithColumns(10));
-  verifyFormat("throw aaaaa;", getGoogleJSStyleWithColumns(10));
-  verifyFormat("aaaaaaaaa++;", getGoogleJSStyleWithColumns(10));
-  verifyFormat("aaaaaaaaa--;", getGoogleJSStyleWithColumns(10));
-  verifyFormat("return [\n"
-               "  aaa\n"
-               "];",
-               getGoogleJSStyleWithColumns(12));
-  verifyFormat("class X {\n"
-               "  readonly ratherLongField =\n"
-               "      1;\n"
-               "}",
-               "class X {\n"
-               "  readonly ratherLongField = 1;\n"
-               "}",
-               getGoogleJSStyleWithColumns(20));
-  verifyFormat("const x = (5 + 9)\n"
-               "const y = 3\n",
-               "const x = (   5 +    9)\n"
-               "const y = 3\n");
-  // Ideally the foo() bit should be indented relative to the async function().
-  verifyFormat("async function\n"
-               "foo() {}",
-               getGoogleJSStyleWithColumns(10));
-  verifyFormat("await theReckoning;", getGoogleJSStyleWithColumns(10));
-  verifyFormat("some['a']['b']", getGoogleJSStyleWithColumns(10));
-  verifyFormat("x = (a['a']\n"
-               "      ['b']);",
-               getGoogleJSStyleWithColumns(10));
-  verifyFormat("function f() {\n"
-               "  return foo.bar(\n"
-               "      (param): param is {\n"
-               "        a: SomeType\n"
-               "      }&ABC => 1)\n"
-               "}",
-               getGoogleJSStyleWithColumns(25));
-}
-
-TEST_F(FormatTestJS, AddsIsTheDictKeyOnNewline) {
-  // Do not confuse is, the dict key with is, the type matcher. Put is, the dict
-  // key, on a newline.
-  verifyFormat("Polymer({\n"
-               "  is: '',  //\n"
-               "  rest: 1\n"
-               "});",
-               getGoogleJSStyleWithColumns(20));
-}
-
-TEST_F(FormatTestJS, AutomaticSemicolonInsertionHeuristic) {
-  verifyFormat("a\n"
-               "b;",
-               " a \n"
-               " b ;");
-  verifyFormat("a()\n"
-               "b;",
-               " a ()\n"
-               " b ;");
-  verifyFormat("a[b]\n"
-               "c;",
-               "a [b]\n"
-               "c ;");
-  verifyFormat("1\n"
-               "a;",
-               "1 \n"
-               "a ;");
-  verifyFormat("a\n"
-               "1;",
-               "a \n"
-               "1 ;");
-  verifyFormat("a\n"
-               "'x';",
-               "a \n"
-               " 'x';");
-  verifyFormat("a++\n"
-               "b;",
-               "a ++\n"
-               "b ;");
-  verifyFormat("a\n"
-               "!b && c;",
-               "a \n"
-               " ! b && c;");
-  verifyFormat("a\n"
-               "if (1) f();",
-               " a\n"
-               " if (1) f();");
-  verifyFormat("a\n"
-               "class X {}",
-               " a\n"
-               " class X {}");
-  verifyFormat("var a", "var\n"
-                        "a");
-  verifyFormat("x instanceof String", "x\n"
-                                      "instanceof\n"
-                                      "String");
-  verifyFormat("function f(@Foo bar) {}", "function f(@Foo\n"
-                                          "  bar) {}");
-  verifyFormat("function f(@Foo(Param) bar) {}", "function f(@Foo(Param)\n"
-                                                 "  bar) {}");
-  verifyFormat("a = true\n"
-               "return 1",
-               "a = true\n"
-               "  return   1");
-  verifyFormat("a = 's'\n"
-               "return 1",
-               "a = 's'\n"
-               "  return   1");
-  verifyFormat("a = null\n"
-               "return 1",
-               "a = null\n"
-               "  return   1");
-  // Below "class Y {}" should ideally be on its own line.
-  verifyFormat("x = {\n"
-               "  a: 1\n"
-               "} class Y {}",
-               "  x  =  {a  : 1}\n"
-               "   class  Y {  }");
-  verifyFormat("if (x) {\n"
-               "}\n"
-               "return 1",
-               "if (x) {}\n"
-               " return   1");
-  verifyFormat("if (x) {\n"
-               "}\n"
-               "class X {}",
-               "if (x) {}\n"
-               " class X {}");
-}
-
-TEST_F(FormatTestJS, ImportExportASI) {
-  verifyFormat("import {x} from 'y'\n"
-               "export function z() {}",
-               "import   {x} from 'y'\n"
-               "  export function z() {}");
-  // Below "class Y {}" should ideally be on its own line.
-  verifyFormat("export {x} class Y {}", "  export {x}\n"
-                                        "  class  Y {\n}");
-  verifyFormat("if (x) {\n"
-               "}\n"
-               "export class Y {}",
-               "if ( x ) { }\n"
-               " export class Y {}");
-}
-
-TEST_F(FormatTestJS, ClosureStyleCasts) {
-  verifyFormat("var x = /** @type {foo} */ (bar);");
-}
-
-TEST_F(FormatTestJS, TryCatch) {
-  verifyFormat("try {\n"
-               "  f();\n"
-               "} catch (e) {\n"
-               "  g();\n"
-               "} finally {\n"
-               "  h();\n"
-               "}");
-
-  // But, of course, "catch" is a perfectly fine function name in JavaScript.
-  verifyFormat("someObject.catch();");
-  verifyFormat("someObject.new();");
-}
-
-TEST_F(FormatTestJS, StringLiteralConcatenation) {
-  verifyFormat("var literal = 'hello ' +\n"
-               "    'world';");
-}
-
-TEST_F(FormatTestJS, RegexLiteralClassification) {
-  // Regex literals.
-  verifyFormat("var regex = /abc/;");
-  verifyFormat("f(/abc/);");
-  verifyFormat("f(abc, /abc/);");
-  verifyFormat("some_map[/abc/];");
-  verifyFormat("var x = a ? /abc/ : /abc/;");
-  verifyFormat("for (var i = 0; /abc/.test(s[i]); i++) {\n}");
-  verifyFormat("var x = !/abc/.test(y);");
-  verifyFormat("var x = foo()! / 10;");
-  verifyFormat("var x = a && /abc/.test(y);");
-  verifyFormat("var x = a || /abc/.test(y);");
-  verifyFormat("var x = a + /abc/.search(y);");
-  verifyFormat("/abc/.search(y);");
-  verifyFormat("var regexs = {/abc/, /abc/};");
-  verifyFormat("return /abc/;");
-
-  // Not regex literals.
-  verifyFormat("var a = a / 2 + b / 3;");
-  verifyFormat("var a = a++ / 2;");
-  // Prefix unary can operate on regex literals, not that it makes sense.
-  verifyFormat("var a = ++/a/;");
-
-  // This is a known issue, regular expressions are incorrectly detected if
-  // directly following a closing parenthesis.
-  verifyFormat("if (foo) / bar /.exec(baz);");
-}
-
-TEST_F(FormatTestJS, RegexLiteralSpecialCharacters) {
-  verifyFormat("var regex = /=/;");
-  verifyFormat("var regex = /a*/;");
-  verifyFormat("var regex = /a+/;");
-  verifyFormat("var regex = /a?/;");
-  verifyFormat("var regex = /.a./;");
-  verifyFormat("var regex = /a\\*/;");
-  verifyFormat("var regex = /^a$/;");
-  verifyFormat("var regex = /\\/a/;");
-  verifyFormat("var regex = /(?:x)/;");
-  verifyFormat("var regex = /x(?=y)/;");
-  verifyFormat("var regex = /x(?!y)/;");
-  verifyFormat("var regex = /x|y/;");
-  verifyFormat("var regex = /a{2}/;");
-  verifyFormat("var regex = /a{1,3}/;");
-
-  verifyFormat("var regex = /[abc]/;");
-  verifyFormat("var regex = /[^abc]/;");
-  verifyFormat("var regex = /[\\b]/;");
-  verifyFormat("var regex = /[/]/;");
-  verifyFormat("var regex = /[\\/]/;");
-  verifyFormat("var regex = /\\[/;");
-  verifyFormat("var regex = /\\\\[/]/;");
-  verifyFormat("var regex = /}[\"]/;");
-  verifyFormat("var regex = /}[/\"]/;");
-  verifyFormat("var regex = /}[\"/]/;");
-
-  verifyFormat("var regex = /\\b/;");
-  verifyFormat("var regex = /\\B/;");
-  verifyFormat("var regex = /\\d/;");
-  verifyFormat("var regex = /\\D/;");
-  verifyFormat("var regex = /\\f/;");
-  verifyFormat("var regex = /\\n/;");
-  verifyFormat("var regex = /\\r/;");
-  verifyFormat("var regex = /\\s/;");
-  verifyFormat("var regex = /\\S/;");
-  verifyFormat("var regex = /\\t/;");
-  verifyFormat("var regex = /\\v/;");
-  verifyFormat("var regex = /\\w/;");
-  verifyFormat("var regex = /\\W/;");
-  verifyFormat("var regex = /a(a)\\1/;");
-  verifyFormat("var regex = /\\0/;");
-  verifyFormat("var regex = /\\\\/g;");
-  verifyFormat("var regex = /\\a\\\\/g;");
-  verifyFormat("var regex = /\a\\//g;");
-  verifyFormat("var regex = /a\\//;\n"
-               "var x = 0;");
-  verifyFormat("var regex = /'/g;", "var regex = /'/g ;");
-  verifyFormat("var regex = /'/g;  //'", "var regex = /'/g ; //'");
-  verifyFormat("var regex = /\\/*/;\n"
-               "var x = 0;",
-               "var regex = /\\/*/;\n"
-               "var x=0;");
-  verifyFormat("var x = /a\\//;", "var x = /a\\//  \n;");
-  verifyFormat("var regex = /\"/;", getGoogleJSStyleWithColumns(16));
-  verifyFormat("var regex =\n"
-               "    /\"/;",
-               getGoogleJSStyleWithColumns(15));
-  verifyFormat("var regex =  //\n"
-               "    /a/;");
-  verifyFormat("var regexs = [\n"
-               "  /d/,   //\n"
-               "  /aa/,  //\n"
-               "];");
-}
-
-TEST_F(FormatTestJS, RegexLiteralModifiers) {
-  verifyFormat("var regex = /abc/g;");
-  verifyFormat("var regex = /abc/i;");
-  verifyFormat("var regex = /abc/m;");
-  verifyFormat("var regex = /abc/y;");
-}
-
-TEST_F(FormatTestJS, RegexLiteralLength) {
-  verifyFormat("var regex = /aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/;",
-               getGoogleJSStyleWithColumns(60));
-  verifyFormat("var regex =\n"
-               "    /aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/;",
-               getGoogleJSStyleWithColumns(60));
-  verifyFormat("var regex = /\\xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/;",
-               getGoogleJSStyleWithColumns(50));
-}
-
-TEST_F(FormatTestJS, RegexLiteralExamples) {
-  verifyFormat("var regex = search.match(/(?:\?|&)times=([^?&]+)/i);");
-}
-
-TEST_F(FormatTestJS, IgnoresMpegTS) {
-  std::string MpegTS(200, ' ');
-  MpegTS.replace(0, strlen("nearlyLooks  +   like +   ts + code;  "),
-                 "nearlyLooks  +   like +   ts + code;  ");
-  MpegTS[0] = 0x47;
-  MpegTS[188] = 0x47;
-  verifyFormat(MpegTS, MpegTS);
-}
-
-TEST_F(FormatTestJS, TypeAnnotations) {
-  verifyFormat("var x: string;");
-  verifyFormat("var x: {a: string; b: number;} = {};");
-  verifyFormat("function x(): string {\n  return 'x';\n}");
-  verifyFormat("function x(): {x: string} {\n  return {x: 'x'};\n}");
-  verifyFormat("function x(y: string): string {\n  return 'x';\n}");
-  verifyFormat("for (var y: string in x) {\n  x();\n}");
-  verifyFormat("for (var y: string of x) {\n  x();\n}");
-  verifyFormat("function x(y: {a?: number;} = {}): number {\n"
-               "  return 12;\n"
-               "}");
-  verifyFormat("const x: Array<{a: number; b: string;}> = [];");
-  verifyFormat("((a: string, b: number): string => a + b);");
-  verifyFormat("var x: (y: number) => string;");
-  verifyFormat("var x: P<string, (a: number) => string>;");
-  verifyFormat("var x = {\n"
-               "  y: function(): z {\n"
-               "    return 1;\n"
-               "  }\n"
-               "};");
-  verifyFormat("var x = {\n"
-               "  y: function(): {a: number} {\n"
-               "    return 1;\n"
-               "  }\n"
-               "};");
-  verifyFormat("function someFunc(args: string[]):\n"
-               "    {longReturnValue: string[]} {}",
-               getGoogleJSStyleWithColumns(60));
-  verifyFormat(
-      "var someValue = (v as aaaaaaaaaaaaaaaaaaaa<T>[])\n"
-      "                    .someFunction(aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa);");
-  verifyFormat("const xIsALongIdent:\n"
-               "    YJustBarelyFitsLinex[];",
-               getGoogleJSStyleWithColumns(20));
-  verifyFormat("const x = {\n"
-               "  y: 1\n"
-               "} as const;");
-}
-
-TEST_F(FormatTestJS, UnionIntersectionTypes) {
-  verifyFormat("let x: A|B = A | B;");
-  verifyFormat("let x: A&B|C = A & B;");
-  verifyFormat("let x: Foo<A|B> = new Foo<A|B>();");
-  verifyFormat("function(x: A|B): C&D {}");
-  verifyFormat("function(x: A|B = A | B): C&D {}");
-  verifyFormat("function x(path: number|string) {}");
-  verifyFormat("function x(): string|number {}");
-  verifyFormat("type Foo = Bar|Baz;");
-  verifyFormat("type Foo = Bar<X>|Baz;");
-  verifyFormat("type Foo = (Bar<X>|Baz);");
-  verifyFormat("let x: Bar|Baz;");
-  verifyFormat("let x: Bar<X>|Baz;");
-  verifyFormat("let x: (Foo|Bar)[];");
-  verifyFormat("type X = {\n"
-               "  a: Foo|Bar;\n"
-               "};");
-  verifyFormat("export type X = {\n"
-               "  a: Foo|Bar;\n"
-               "};");
-}
-
-TEST_F(FormatTestJS, UnionIntersectionTypesInObjectType) {
-  verifyFormat("let x: {x: number|null} = {x: number | null};");
-  verifyFormat("let nested: {x: {y: number|null}};");
-  verifyFormat("let mixed: {x: [number|null, {w: number}]};");
-  verifyFormat("class X {\n"
-               "  contructor(x: {\n"
-               "    a: a|null,\n"
-               "    b: b|null,\n"
-               "  }) {}\n"
-               "}");
-}
-
-TEST_F(FormatTestJS, ClassDeclarations) {
-  verifyFormat("class C {\n  x: string = 12;\n}");
-  verifyFormat("class C {\n  x(): string => 12;\n}");
-  verifyFormat("class C {\n  ['x' + 2]: string = 12;\n}");
-  verifyFormat("class C {\n"
-               "  foo() {}\n"
-               "  [bar]() {}\n"
-               "}\n");
-  verifyFormat("class C {\n  private x: string = 12;\n}");
-  verifyFormat("class C {\n  private static x: string = 12;\n}");
-  verifyFormat("class C {\n  static x(): string {\n    return 'asd';\n  }\n}");
-  verifyFormat("class C extends P implements I {}");
-  verifyFormat("class C extends p.P implements i.I {}");
-  verifyFormat("x(class {\n"
-               "  a(): A {}\n"
-               "});");
-  verifyFormat("class Test {\n"
-               "  aaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaa: aaaaaaaaaaaaaaaaaaaa):\n"
-               "      aaaaaaaaaaaaaaaaaaaaaa {}\n"
-               "}");
-  verifyFormat("foo = class Name {\n"
-               "  constructor() {}\n"
-               "};");
-  verifyFormat("foo = class {\n"
-               "  constructor() {}\n"
-               "};");
-  verifyFormat("class C {\n"
-               "  x: {y: Z;} = {};\n"
-               "  private y: {y: Z;} = {};\n"
-               "}");
-
-  // ':' is not a type declaration here.
-  verifyFormat("class X {\n"
-               "  subs = {\n"
-               "    'b': {\n"
-               "      'c': 1,\n"
-               "    },\n"
-               "  };\n"
-               "}");
-  verifyFormat("@Component({\n"
-               "  moduleId: module.id,\n"
-               "})\n"
-               "class SessionListComponent implements OnDestroy, OnInit {\n"
-               "}");
-}
-
-TEST_F(FormatTestJS, StrictPropInitWrap) {
-  const FormatStyle &Style = getGoogleJSStyleWithColumns(22);
-  verifyFormat("class X {\n"
-               "  strictPropInitField!:\n"
-               "      string;\n"
-               "}",
-               Style);
-}
-
-TEST_F(FormatTestJS, InterfaceDeclarations) {
-  verifyFormat("interface I {\n"
-               "  x: string;\n"
-               "  enum: string[];\n"
-               "  enum?: string[];\n"
-               "}\n"
-               "var y;");
-  // Ensure that state is reset after parsing the interface.
-  verifyFormat("interface a {}\n"
-               "export function b() {}\n"
-               "var x;");
-
-  // Arrays of object type literals.
-  verifyFormat("interface I {\n"
-               "  o: {}[];\n"
-               "}");
-}
-
-TEST_F(FormatTestJS, ObjectTypesInExtendsImplements) {
-  verifyFormat("class C extends {} {}");
-  verifyFormat("class C implements {bar: number} {}");
-  // Somewhat odd, but probably closest to reasonable formatting?
-  verifyFormat("class C implements {\n"
-               "  bar: number,\n"
-               "  baz: string,\n"
-               "} {}");
-  verifyFormat("class C<P extends {}> {}");
-}
-
-TEST_F(FormatTestJS, EnumDeclarations) {
-  verifyFormat("enum Foo {\n"
-               "  A = 1,\n"
-               "  B\n"
-               "}");
-  verifyFormat("export /* somecomment*/ enum Foo {\n"
-               "  A = 1,\n"
-               "  B\n"
-               "}");
-  verifyFormat("enum Foo {\n"
-               "  A = 1,  // comment\n"
-               "  B\n"
-               "}\n"
-               "var x = 1;");
-  verifyFormat("const enum Foo {\n"
-               "  A = 1,\n"
-               "  B\n"
-               "}");
-  verifyFormat("export const enum Foo {\n"
-               "  A = 1,\n"
-               "  B\n"
-               "}");
-}
-
-TEST_F(FormatTestJS, Decorators) {
-  verifyFormat("@A\nclass C {\n}");
-  verifyFormat("@A({arg: 'value'})\nclass C {\n}");
-  verifyFormat("@A\n@B\nclass C {\n}");
-  verifyFormat("class C {\n  @A x: string;\n}");
-  verifyFormat("class C {\n"
-               "  @A\n"
-               "  private x(): string {\n"
-               "    return 'y';\n"
-               "  }\n"
-               "}");
-  verifyFormat("class C {\n"
-               "  private x(@A x: string) {}\n"
-               "}");
-  verifyFormat("class X {}\n"
-               "class Y {}");
-  verifyFormat("class X {\n"
-               "  @property() private isReply = false;\n"
-               "}\n");
-}
-
-TEST_F(FormatTestJS, TypeAliases) {
-  verifyFormat("type X = number;\n"
-               "class C {}");
-  verifyFormat("type X<Y> = Z<Y>;");
-  verifyFormat("type X = {\n"
-               "  y: number\n"
-               "};\n"
-               "class C {}");
-  verifyFormat("export type X = {\n"
-               "  a: string,\n"
-               "  b?: string,\n"
-               "};\n");
-}
-
-TEST_F(FormatTestJS, TypeInterfaceLineWrapping) {
-  const FormatStyle &Style = getGoogleJSStyleWithColumns(20);
-  verifyFormat("type LongTypeIsReallyUnreasonablyLong =\n"
-               "    string;\n",
-               "type LongTypeIsReallyUnreasonablyLong = string;\n", Style);
-  verifyFormat("interface AbstractStrategyFactoryProvider {\n"
-               "  a: number\n"
-               "}\n",
-               "interface AbstractStrategyFactoryProvider { a: number }\n",
-               Style);
-}
-
-TEST_F(FormatTestJS, RemoveEmptyLinesInArrowFunctions) {
-  verifyFormat("x = () => {\n"
-               "  foo();\n"
-               "  bar();\n"
-               "};\n",
-               "x = () => {\n"
-               "\n"
-               "  foo();\n"
-               "  bar();\n"
-               "\n"
-               "};\n");
-}
-
-TEST_F(FormatTestJS, Modules) {
-  verifyFormat("import SomeThing from 'some/module.js';");
-  verifyFormat("import {X, Y} from 'some/module.js';");
-  verifyFormat("import a, {X, Y} from 'some/module.js';");
-  verifyFormat("import {X, Y,} from 'some/module.js';");
-  verifyFormat("import {X as myLocalX, Y as myLocalY} from 'some/module.js';");
-  // Ensure Automatic Semicolon Insertion does not break on "as\n".
-  verifyFormat("import {X as myX} from 'm';", "import {X as\n"
-                                              " myX} from 'm';");
-  verifyFormat("import * as lib from 'some/module.js';");
-  verifyFormat("var x = {import: 1};\nx.import = 2;");
-
-  verifyFormat("export function fn() {\n"
-               "  return 'fn';\n"
-               "}");
-  verifyFormat("export function A() {}\n"
-               "export default function B() {}\n"
-               "export function C() {}");
-  verifyFormat("export default () => {\n"
-               "  let x = 1;\n"
-               "  return x;\n"
-               "}");
-  verifyFormat("export const x = 12;");
-  verifyFormat("export default class X {}");
-  verifyFormat("export {X, Y} from 'some/module.js';");
-  verifyFormat("export {X, Y,} from 'some/module.js';");
-  verifyFormat("export {SomeVeryLongExport as X, "
-               "SomeOtherVeryLongExport as Y} from 'some/module.js';");
-  // export without 'from' is wrapped.
-  verifyFormat("export let someRatherLongVariableName =\n"
-               "    someSurprisinglyLongVariable + someOtherRatherLongVar;");
-  // ... but not if from is just an identifier.
-  verifyFormat("export {\n"
-               "  from as from,\n"
-               "  someSurprisinglyLongVariable as\n"
-               "      from\n"
-               "};",
-               getGoogleJSStyleWithColumns(20));
-  verifyFormat("export class C {\n"
-               "  x: number;\n"
-               "  y: string;\n"
-               "}");
-  verifyFormat("export class X {\n"
-               "  y: number;\n"
-               "}");
-  verifyFormat("export abstract class X {\n"
-               "  y: number;\n"
-               "}");
-  verifyFormat("export default class X {\n"
-               "  y: number\n"
-               "}");
-  verifyFormat("export default function() {\n  return 1;\n}");
-  verifyFormat("export var x = 12;");
-  verifyFormat("class C {}\n"
-               "export function f() {}\n"
-               "var v;");
-  verifyFormat("export var x: number = 12;");
-  verifyFormat("export const y = {\n"
-               "  a: 1,\n"
-               "  b: 2\n"
-               "};");
-  verifyFormat("export enum Foo {\n"
-               "  BAR,\n"
-               "  // adsdasd\n"
-               "  BAZ\n"
-               "}");
-  verifyFormat("export default [\n"
-               "  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,\n"
-               "  bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb\n"
-               "];");
-  verifyFormat("export default [];");
-  verifyFormat("export default () => {};");
-  verifyFormat("export default () => {\n"
-               "  x;\n"
-               "  x;\n"
-               "};");
-  verifyFormat("export interface Foo {\n"
-               "  foo: number;\n"
-               "}\n"
-               "export class Bar {\n"
-               "  blah(): string {\n"
-               "    return this.blah;\n"
-               "  };\n"
-               "}");
-}
-
-TEST_F(FormatTestJS, ImportWrapping) {
-  verifyFormat("import {VeryLongImportsAreAnnoying, VeryLongImportsAreAnnoying,"
-               " VeryLongImportsAreAnnoying, VeryLongImportsAreAnnoying"
-               "} from 'some/module.js';");
-  FormatStyle Style = getGoogleJSStyleWithColumns(80);
-  Style.JavaScriptWrapImports = true;
-  verifyFormat("import {\n"
-               "  VeryLongImportsAreAnnoying,\n"
-               "  VeryLongImportsAreAnnoying,\n"
-               "  VeryLongImportsAreAnnoying,\n"
-               "} from 'some/module.js';",
-               Style);
-  verifyFormat("import {\n"
-               "  A,\n"
-               "  A,\n"
-               "} from 'some/module.js';",
-               Style);
-  verifyFormat("export {\n"
-               "  A,\n"
-               "  A,\n"
-               "} from 'some/module.js';",
-               Style);
-  Style.ColumnLimit = 40;
-  // Using this version of verifyFormat because test::messUp hides the issue.
-  verifyFormat("import {\n"
-               "  A,\n"
-               "} from\n"
-               "    'some/path/longer/than/column/limit/module.js';",
-               " import  {  \n"
-               "    A,  \n"
-               "  }    from\n"
-               "      'some/path/longer/than/column/limit/module.js'  ; ",
-               Style);
-}
-
-TEST_F(FormatTestJS, TemplateStrings) {
-  // Keeps any whitespace/indentation within the template string.
-  verifyFormat("var x = `hello\n"
-               "     ${name}\n"
-               "  !`;",
-               "var x    =    `hello\n"
-               "     ${  name    }\n"
-               "  !`;");
-
-  verifyFormat("var x =\n"
-               "    `hello ${world}` >= some();",
-               getGoogleJSStyleWithColumns(34)); // Barely doesn't fit.
-  verifyFormat("var x = `hello ${world}` >= some();",
-               getGoogleJSStyleWithColumns(35)); // Barely fits.
-  verifyFormat("var x = `hellö ${wörld}` >= söme();",
-               getGoogleJSStyleWithColumns(35)); // Fits due to UTF-8.
-  verifyFormat("var x = `hello\n"
-               "  ${world}` >=\n"
-               "    some();",
-               "var x =\n"
-               "    `hello\n"
-               "  ${world}` >= some();",
-               getGoogleJSStyleWithColumns(21)); // Barely doesn't fit.
-  verifyFormat("var x = `hello\n"
-               "  ${world}` >= some();",
-               "var x =\n"
-               "    `hello\n"
-               "  ${world}` >= some();",
-               getGoogleJSStyleWithColumns(22)); // Barely fits.
-
-  verifyFormat("var x =\n"
-               "    `h`;",
-               getGoogleJSStyleWithColumns(11));
-  verifyFormat("var x =\n    `multi\n  line`;", "var x = `multi\n  line`;",
-               getGoogleJSStyleWithColumns(13));
-  verifyFormat("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(\n"
-               "    `aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa`);");
-  // Repro for an obscure width-miscounting issue with template strings.
-  verifyFormat(
-      "someLongVariable =\n"
-      "    "
-      "`${logPrefix[11]}/${logPrefix[12]}/${logPrefix[13]}${logPrefix[14]}`;",
-      "someLongVariable = "
-      "`${logPrefix[11]}/${logPrefix[12]}/${logPrefix[13]}${logPrefix[14]}`;");
-
-  // Make sure template strings get a proper ColumnWidth assigned, even if they
-  // are first token in line.
-  verifyFormat("var a = aaaaaaaaaaaaaaaaaaaaaaaaaaaa ||\n"
-               "    `aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa`;");
-
-  // Two template strings.
-  verifyFormat("var x = `hello` == `hello`;");
-
-  // Comments in template strings.
-  verifyFormat("var x = `//a`;\n"
-               "var y;",
-               "var x =\n `//a`;\n"
-               "var y  ;");
-  verifyFormat("var x = `/*a`;\n"
-               "var y;",
-               "var x =\n `/*a`;\n"
-               "var y;");
-  // Unterminated string literals in a template string.
-  verifyFormat("var x = `'`;  // comment with matching quote '\n"
-               "var y;");
-  verifyFormat("var x = `\"`;  // comment with matching quote \"\n"
-               "var y;");
-  verifyFormat("it(`'aaaaaaaaaaaaaaa   `, aaaaaaaaa);",
-               "it(`'aaaaaaaaaaaaaaa   `,   aaaaaaaaa) ;",
-               getGoogleJSStyleWithColumns(40));
-  // Backticks in a comment - not a template string.
-  verifyFormat("var x = 1  // `/*a`;\n"
-               "    ;",
-               "var x =\n 1  // `/*a`;\n"
-               "    ;");
-  verifyFormat("/* ` */ var x = 1; /* ` */", "/* ` */ var x\n= 1; /* ` */");
-  // Comment spans multiple template strings.
-  verifyFormat("var x = `/*a`;\n"
-               "var y = ` */ `;",
-               "var x =\n `/*a`;\n"
-               "var y =\n ` */ `;");
-  // Escaped backtick.
-  verifyFormat("var x = ` \\` a`;\n"
-               "var y;",
-               "var x = ` \\` a`;\n"
-               "var y;");
-  // Escaped dollar.
-  verifyFormat("var x = ` \\${foo}`;\n");
-
-  // The token stream can contain two string_literals in sequence, but that
-  // doesn't mean that they are implicitly concatenated in JavaScript.
-  verifyFormat("var f = `aaaa ${a ? 'a' : 'b'}`;");
-
-  // Ensure that scopes are appropriately set around evaluated expressions in
-  // template strings.
-  verifyFormat("var f = `aaaaaaaaaaaaa:${aaaaaaa.aaaaa} aaaaaaaa\n"
-               "         aaaaaaaaaaaaa:${aaaaaaa.aaaaa} aaaaaaaa`;",
-               "var f = `aaaaaaaaaaaaa:${aaaaaaa.  aaaaa} aaaaaaaa\n"
-               "         aaaaaaaaaaaaa:${  aaaaaaa. aaaaa} aaaaaaaa`;");
-  verifyFormat("var x = someFunction(`${})`)  //\n"
-               "            .oooooooooooooooooon();");
-  verifyFormat("var x = someFunction(`${aaaa}${\n"
-               "    aaaaa(  //\n"
-               "        aaaaa)})`);");
-}
-
-TEST_F(FormatTestJS, TemplateStringMultiLineExpression) {
-  verifyFormat("var f = `aaaaaaaaaaaaaaaaaa: ${\n"
-               "    aaaaa +  //\n"
-               "    bbbb}`;",
-               "var f = `aaaaaaaaaaaaaaaaaa: ${aaaaa +  //\n"
-               "                               bbbb}`;");
-  verifyFormat("var f = `\n"
-               "  aaaaaaaaaaaaaaaaaa: ${\n"
-               "    aaaaa +  //\n"
-               "    bbbb}`;",
-               "var f  =  `\n"
-               "  aaaaaaaaaaaaaaaaaa: ${   aaaaa  +  //\n"
-               "                        bbbb }`;");
-  verifyFormat("var f = `\n"
-               "  aaaaaaaaaaaaaaaaaa: ${\n"
-               "    someFunction(\n"
-               "        aaaaa +  //\n"
-               "        bbbb)}`;",
-               "var f  =  `\n"
-               "  aaaaaaaaaaaaaaaaaa: ${someFunction (\n"
-               "                            aaaaa  +   //\n"
-               "                            bbbb)}`;");
-
-  // It might be preferable to wrap before "someFunction".
-  verifyFormat("var f = `\n"
-               "  aaaaaaaaaaaaaaaaaa: ${someFunction({\n"
-               "  aaaa: aaaaa,\n"
-               "  bbbb: bbbbb,\n"
-               "})}`;",
-               "var f  =  `\n"
-               "  aaaaaaaaaaaaaaaaaa: ${someFunction ({\n"
-               "                          aaaa:  aaaaa,\n"
-               "                          bbbb:  bbbbb,\n"
-               "                        })}`;");
-}
-
-TEST_F(FormatTestJS, TemplateStringASI) {
-  verifyFormat("var x = `hello${world}`;", "var x = `hello${\n"
-                                           "    world\n"
-                                           "}`;");
-}
-
-TEST_F(FormatTestJS, NestedTemplateStrings) {
-  verifyFormat(
-      "var x = `<ul>${xs.map(x => `<li>${x}</li>`).join('\\n')}</ul>`;");
-  verifyFormat("var x = `he${({text: 'll'}.text)}o`;");
-
-  // Crashed at some point.
-  verifyFormat("}");
-}
-
-TEST_F(FormatTestJS, TaggedTemplateStrings) {
-  verifyFormat("var x = html`<ul>`;");
-  verifyFormat("yield `hello`;");
-  verifyFormat("var f = {\n"
-               "  param: longTagName`This is a ${\n"
-               "                    'really'} long line`\n"
-               "};",
-               "var f = {param: longTagName`This is a ${'really'} long line`};",
-               getGoogleJSStyleWithColumns(40));
-}
-
-TEST_F(FormatTestJS, CastSyntax) {
-  verifyFormat("var x = <type>foo;");
-  verifyFormat("var x = foo as type;");
-  verifyFormat("let x = (a + b) as\n"
-               "    LongTypeIsLong;",
-               getGoogleJSStyleWithColumns(20));
-  verifyFormat("foo = <Bar[]>[\n"
-               "  1,  //\n"
-               "  2\n"
-               "];");
-  verifyFormat("var x = [{x: 1} as type];");
-  verifyFormat("x = x as [a, b];");
-  verifyFormat("x = x as {a: string};");
-  verifyFormat("x = x as (string);");
-  verifyFormat("x = x! as (string);");
-  verifyFormat("x = y! in z;");
-  verifyFormat("var x = something.someFunction() as\n"
-               "    something;",
-               getGoogleJSStyleWithColumns(40));
-}
-
-TEST_F(FormatTestJS, TypeArguments) {
-  verifyFormat("class X<Y> {}");
-  verifyFormat("new X<Y>();");
-  verifyFormat("foo<Y>(a);");
-  verifyFormat("var x: X<Y>[];");
-  verifyFormat("class C extends D<E> implements F<G>, H<I> {}");
-  verifyFormat("function f(a: List<any> = null) {}");
-  verifyFormat("function f(): List<any> {}");
-  verifyFormat("function aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa():\n"
-               "    bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb {}");
-  verifyFormat("function aaaaaaaaaa(\n"
-               "    aaaaaaaaaaaaaaaa: aaaaaaaaaaaaaaaaaaa,\n"
-               "    aaaaaaaaaaaaaaaa: aaaaaaaaaaaaaaaaaaa):\n"
-               "    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa {}");
-}
-
-TEST_F(FormatTestJS, UserDefinedTypeGuards) {
-  verifyFormat(
-      "function foo(check: Object):\n"
-      "    check is {foo: string, bar: string, baz: string, foobar: string} {\n"
-      "  return 'bar' in check;\n"
-      "}\n");
-}
-
-TEST_F(FormatTestJS, OptionalTypes) {
-  verifyFormat("function x(a?: b, c?, d?) {}");
-  verifyFormat("class X {\n"
-               "  y?: z;\n"
-               "  z?;\n"
-               "}");
-  verifyFormat("interface X {\n"
-               "  y?(): z;\n"
-               "}");
-  verifyFormat("constructor({aa}: {\n"
-               "  aa?: string,\n"
-               "  aaaaaaaa?: string,\n"
-               "  aaaaaaaaaaaaaaa?: boolean,\n"
-               "  aaaaaa?: List<string>\n"
-               "}) {}");
-}
-
-TEST_F(FormatTestJS, IndexSignature) {
-  verifyFormat("var x: {[k: string]: v};");
-}
-
-TEST_F(FormatTestJS, WrapAfterParen) {
-  verifyFormat("xxxxxxxxxxx(\n"
-               "    aaa, aaa);",
-               getGoogleJSStyleWithColumns(20));
-  verifyFormat("xxxxxxxxxxx(\n"
-               "    aaa, aaa, aaa,\n"
-               "    aaa, aaa, aaa);",
-               getGoogleJSStyleWithColumns(20));
-  verifyFormat("xxxxxxxxxxx(\n"
-               "    aaaaaaaaaaaaaaaaaaaaaaaa,\n"
-               "    function(x) {\n"
-               "      y();  //\n"
-               "    });",
-               getGoogleJSStyleWithColumns(40));
-  verifyFormat("while (aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa &&\n"
-               "       bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb) {\n}");
-}
-
-TEST_F(FormatTestJS, JSDocAnnotations) {
-  verifyFormat("/**\n"
-               " * @exports {this.is.a.long.path.to.a.Type}\n"
-               " */",
-               "/**\n"
-               " * @exports {this.is.a.long.path.to.a.Type}\n"
-               " */",
-               getGoogleJSStyleWithColumns(20));
-  verifyFormat("/**\n"
-               " * @mods {this.is.a.long.path.to.a.Type}\n"
-               " */",
-               "/**\n"
-               " * @mods {this.is.a.long.path.to.a.Type}\n"
-               " */",
-               getGoogleJSStyleWithColumns(20));
-  verifyFormat("/**\n"
-               " * @mods {this.is.a.long.path.to.a.Type}\n"
-               " */",
-               "/**\n"
-               " * @mods {this.is.a.long.path.to.a.Type}\n"
-               " */",
-               getGoogleJSStyleWithColumns(20));
-  verifyFormat("/**\n"
-               " * @param {canWrap\n"
-               " *     onSpace}\n"
-               " */",
-               "/**\n"
-               " * @param {canWrap onSpace}\n"
-               " */",
-               getGoogleJSStyleWithColumns(20));
-  // make sure clang-format doesn't break before *any* '{'
-  verifyFormat("/**\n"
-               " * @lala {lala {lalala\n"
-               " */\n",
-               "/**\n"
-               " * @lala {lala {lalala\n"
-               " */\n",
-               getGoogleJSStyleWithColumns(20));
-  // cases where '{' is around the column limit
-  for (int ColumnLimit = 6; ColumnLimit < 13; ++ColumnLimit) {
-    verifyFormat("/**\n"
-                 " * @param {type}\n"
-                 " */",
-                 "/**\n"
-                 " * @param {type}\n"
-                 " */",
-                 getGoogleJSStyleWithColumns(ColumnLimit));
-  }
-  // don't break before @tags
-  verifyFormat("/**\n"
-               " * This\n"
-               " * tag @param\n"
-               " * stays.\n"
-               " */",
-               "/**\n"
-               " * This tag @param stays.\n"
-               " */",
-               getGoogleJSStyleWithColumns(13));
-  verifyFormat("/**\n"
-               " * @see http://very/very/long/url/is/long\n"
-               " */",
-               "/**\n"
-               " * @see http://very/very/long/url/is/long\n"
-               " */",
-               getGoogleJSStyleWithColumns(20));
-  verifyFormat("/**\n"
-               " * @param This is a\n"
-               " *     long comment\n"
-               " *     but no type\n"
-               " */",
-               "/**\n"
-               " * @param This is a long comment but no type\n"
-               " */",
-               getGoogleJSStyleWithColumns(20));
-  // Break and reindent @param line and reflow unrelated lines.
-  EXPECT_EQ("{\n"
-            "  /**\n"
-            "   * long long long\n"
-            "   * long\n"
-            "   * @param {this.is.a.long.path.to.a.Type}\n"
-            "   *     a\n"
-            "   * long long long\n"
-            "   * long long\n"
-            "   */\n"
-            "  function f(a) {}\n"
-            "}",
-            format("{\n"
-                   "/**\n"
-                   " * long long long long\n"
-                   " * @param {this.is.a.long.path.to.a.Type} a\n"
-                   " * long long long long\n"
-                   " * long\n"
-                   " */\n"
-                   "  function f(a) {}\n"
-                   "}",
-                   getGoogleJSStyleWithColumns(20)));
-}
-
-TEST_F(FormatTestJS, TslintComments) {
-  // tslint uses pragma comments that must be on their own line.
-  verifyFormat("// Comment that needs wrapping. Comment that needs wrapping. "
-               "Comment that needs\n"
-               "// wrapping. Trailing line.\n"
-               "// tslint:disable-next-line:must-be-on-own-line",
-               "// Comment that needs wrapping. Comment that needs wrapping. "
-               "Comment that needs wrapping.\n"
-               "// Trailing line.\n"
-               "// tslint:disable-next-line:must-be-on-own-line");
-}
-
-TEST_F(FormatTestJS, TscComments) {
-  // As above, @ts-ignore and @ts-check comments must be on their own line.
-  verifyFormat("// Comment that needs wrapping. Comment that needs wrapping. "
-               "Comment that needs\n"
-               "// wrapping. Trailing line.\n"
-               "// @ts-ignore",
-               "// Comment that needs wrapping. Comment that needs wrapping. "
-               "Comment that needs wrapping.\n"
-               "// Trailing line.\n"
-               "// @ts-ignore");
-  verifyFormat("// Comment that needs wrapping. Comment that needs wrapping. "
-               "Comment that needs\n"
-               "// wrapping. Trailing line.\n"
-               "// @ts-check",
-               "// Comment that needs wrapping. Comment that needs wrapping. "
-               "Comment that needs wrapping.\n"
-               "// Trailing line.\n"
-               "// @ts-check");
-}
-
-TEST_F(FormatTestJS, RequoteStringsSingle) {
-  verifyFormat("var x = 'foo';", "var x = \"foo\";");
-  verifyFormat("var x = 'fo\\'o\\'';", "var x = \"fo'o'\";");
-  verifyFormat("var x = 'fo\\'o\\'';", "var x = \"fo\\'o'\";");
-  verifyFormat("var x =\n"
-               "    'foo\\'';",
-               // Code below is 15 chars wide, doesn't fit into the line with
-               // the \ escape added.
-               "var x = \"foo'\";", getGoogleJSStyleWithColumns(15));
-  // Removes no-longer needed \ escape from ".
-  verifyFormat("var x = 'fo\"o';", "var x = \"fo\\\"o\";");
-  // Code below fits into 15 chars *after* removing the \ escape.
-  verifyFormat("var x = 'fo\"o';", "var x = \"fo\\\"o\";",
-               getGoogleJSStyleWithColumns(15));
-  verifyFormat("// clang-format off\n"
-               "let x = \"double\";\n"
-               "// clang-format on\n"
-               "let x = 'single';\n",
-               "// clang-format off\n"
-               "let x = \"double\";\n"
-               "// clang-format on\n"
-               "let x = \"single\";\n");
-}
-
-TEST_F(FormatTestJS, RequoteAndIndent) {
-  verifyFormat("let x = someVeryLongFunctionThatGoesOnAndOn(\n"
-               "    'double quoted string that needs wrapping');",
-               "let x = someVeryLongFunctionThatGoesOnAndOn("
-               "\"double quoted string that needs wrapping\");");
-
-  verifyFormat("let x =\n"
-               "    'foo\\'oo';\n"
-               "let x =\n"
-               "    'foo\\'oo';",
-               "let x=\"foo'oo\";\n"
-               "let x=\"foo'oo\";",
-               getGoogleJSStyleWithColumns(15));
-}
-
-TEST_F(FormatTestJS, RequoteStringsDouble) {
-  FormatStyle DoubleQuotes = getGoogleStyle(FormatStyle::LK_JavaScript);
-  DoubleQuotes.JavaScriptQuotes = FormatStyle::JSQS_Double;
-  verifyFormat("var x = \"foo\";", DoubleQuotes);
-  verifyFormat("var x = \"foo\";", "var x = 'foo';", DoubleQuotes);
-  verifyFormat("var x = \"fo'o\";", "var x = 'fo\\'o';", DoubleQuotes);
-}
-
-TEST_F(FormatTestJS, RequoteStringsLeave) {
-  FormatStyle LeaveQuotes = getGoogleStyle(FormatStyle::LK_JavaScript);
-  LeaveQuotes.JavaScriptQuotes = FormatStyle::JSQS_Leave;
-  verifyFormat("var x = \"foo\";", LeaveQuotes);
-  verifyFormat("var x = 'foo';", LeaveQuotes);
-}
-
-TEST_F(FormatTestJS, SupportShebangLines) {
-  verifyFormat("#!/usr/bin/env node\n"
-               "var x = hello();",
-               "#!/usr/bin/env node\n"
-               "var x   =  hello();");
-}
-
-TEST_F(FormatTestJS, NonNullAssertionOperator) {
-  verifyFormat("let x = foo!.bar();\n");
-  verifyFormat("let x = foo ? bar! : baz;\n");
-  verifyFormat("let x = !foo;\n");
-  verifyFormat("if (!+a) {\n}");
-  verifyFormat("let x = foo[0]!;\n");
-  verifyFormat("let x = (foo)!;\n");
-  verifyFormat("let x = x(foo!);\n");
-  verifyFormat("a.aaaaaa(a.a!).then(\n"
-               "    x => x(x));\n",
-               getGoogleJSStyleWithColumns(20));
-  verifyFormat("let x = foo! - 1;\n");
-  verifyFormat("let x = {foo: 1}!;\n");
-  verifyFormat("let x = hello.foo()!\n"
-               "            .foo()!\n"
-               "            .foo()!\n"
-               "            .foo()!;\n",
-               getGoogleJSStyleWithColumns(20));
-  verifyFormat("let x = namespace!;\n");
-  verifyFormat("return !!x;\n");
-}
-
-TEST_F(FormatTestJS, CppKeywords) {
-  // Make sure we don't mess stuff up because of C++ keywords.
-  verifyFormat("return operator && (aa);");
-  // .. or QT ones.
-  verifyFormat("const slots: Slot[];");
-  // use the "!" assertion operator to validate that clang-format understands
-  // these C++ keywords aren't keywords in JS/TS.
-  verifyFormat("auto!;");
-  verifyFormat("char!;");
-  verifyFormat("concept!;");
-  verifyFormat("double!;");
-  verifyFormat("extern!;");
-  verifyFormat("float!;");
-  verifyFormat("inline!;");
-  verifyFormat("int!;");
-  verifyFormat("long!;");
-  verifyFormat("register!;");
-  verifyFormat("restrict!;");
-  verifyFormat("sizeof!;");
-  verifyFormat("struct!;");
-  verifyFormat("typedef!;");
-  verifyFormat("union!;");
-  verifyFormat("unsigned!;");
-  verifyFormat("volatile!;");
-  verifyFormat("_Alignas!;");
-  verifyFormat("_Alignof!;");
-  verifyFormat("_Atomic!;");
-  verifyFormat("_Bool!;");
-  verifyFormat("_Complex!;");
-  verifyFormat("_Generic!;");
-  verifyFormat("_Imaginary!;");
-  verifyFormat("_Noreturn!;");
-  verifyFormat("_Static_assert!;");
-  verifyFormat("_Thread_local!;");
-  verifyFormat("__func__!;");
-  verifyFormat("__objc_yes!;");
-  verifyFormat("__objc_no!;");
-  verifyFormat("asm!;");
-  verifyFormat("bool!;");
-  verifyFormat("const_cast!;");
-  verifyFormat("dynamic_cast!;");
-  verifyFormat("explicit!;");
-  verifyFormat("friend!;");
-  verifyFormat("mutable!;");
-  verifyFormat("operator!;");
-  verifyFormat("reinterpret_cast!;");
-  verifyFormat("static_cast!;");
-  verifyFormat("template!;");
-  verifyFormat("typename!;");
-  verifyFormat("typeid!;");
-  verifyFormat("using!;");
-  verifyFormat("virtual!;");
-  verifyFormat("wchar_t!;");
-
-  // Positive tests:
-  verifyFormat("x.type!;");
-  verifyFormat("x.get!;");
-  verifyFormat("x.set!;");
-}
-
-TEST_F(FormatTestJS, NullPropagatingOperator) {
-  verifyFormat("let x = foo?.bar?.baz();\n");
-  verifyFormat("let x = foo?.(foo);\n");
-  verifyFormat("let x = foo?.['arr'];\n");
-}
-
-TEST_F(FormatTestJS, NullishCoalescingOperator) {
-  verifyFormat("const val = something ?? 'some other default';\n");
-  verifyFormat(
-      "const val = something ?? otherDefault ??\n"
-      "    evenMore ?? evenMore;\n",
-      "const val = something ?? otherDefault ?? evenMore ?? evenMore;\n",
-      getGoogleJSStyleWithColumns(40));
-}
-
-TEST_F(FormatTestJS, AssignmentOperators) {
-  verifyFormat("a &&= b;\n");
-  verifyFormat("a ||= b;\n");
-  // NB: need to split ? ?= to avoid it being interpreted by C++ as a trigraph
-  // for #.
-  verifyFormat("a ?"
-               "?= b;\n");
-}
-
-TEST_F(FormatTestJS, Conditional) {
-  verifyFormat("y = x ? 1 : 2;");
-  verifyFormat("x ? 1 : 2;");
-  verifyFormat("class Foo {\n"
-               "  field = true ? 1 : 2;\n"
-               "  method(a = true ? 1 : 2) {}\n"
-               "}");
-}
-
-TEST_F(FormatTestJS, ImportComments) {
-  verifyFormat("import {x} from 'x';  // from some location",
-               getGoogleJSStyleWithColumns(25));
-  verifyFormat("// taze: x from 'location'", getGoogleJSStyleWithColumns(10));
-  verifyFormat("/// <reference path=\"some/location\" />",
-               getGoogleJSStyleWithColumns(10));
-}
-
-TEST_F(FormatTestJS, Exponentiation) {
-  verifyFormat("squared = x ** 2;");
-  verifyFormat("squared **= 2;");
-}
-
-TEST_F(FormatTestJS, NestedLiterals) {
-  FormatStyle FourSpaces = getGoogleJSStyleWithColumns(15);
-  FourSpaces.IndentWidth = 4;
-  verifyFormat("var l = [\n"
-               "    [\n"
-               "        1,\n"
-               "    ],\n"
-               "];",
-               FourSpaces);
-  verifyFormat("var l = [\n"
-               "    {\n"
-               "        1: 1,\n"
-               "    },\n"
-               "];",
-               FourSpaces);
-  verifyFormat("someFunction(\n"
-               "    p1,\n"
-               "    [\n"
-               "        1,\n"
-               "    ],\n"
-               ");",
-               FourSpaces);
-  verifyFormat("someFunction(\n"
-               "    p1,\n"
-               "    {\n"
-               "        1: 1,\n"
-               "    },\n"
-               ");",
-               FourSpaces);
-  verifyFormat("var o = {\n"
-               "    1: 1,\n"
-               "    2: {\n"
-               "        3: 3,\n"
-               "    },\n"
-               "};",
-               FourSpaces);
-  verifyFormat("var o = {\n"
-               "    1: 1,\n"
-               "    2: [\n"
-               "        3,\n"
-               "    ],\n"
-               "};",
-               FourSpaces);
-}
-
-TEST_F(FormatTestJS, BackslashesInComments) {
-  verifyFormat("// hello \\\n"
-               "if (x) foo();\n",
-               "// hello \\\n"
-               "     if ( x) \n"
-               "   foo();\n");
-  verifyFormat("/* ignore \\\n"
-               " */\n"
-               "if (x) foo();\n",
-               "/* ignore \\\n"
-               " */\n"
-               " if (  x) foo();\n");
-  verifyFormat("// st \\ art\\\n"
-               "// comment"
-               "// continue \\\n"
-               "formatMe();\n",
-               "// st \\ art\\\n"
-               "// comment"
-               "// continue \\\n"
-               "formatMe( );\n");
-}
-
-TEST_F(FormatTestJS, AddsLastLinePenaltyIfEndingIsBroken) {
-  EXPECT_EQ(
-      "a = function() {\n"
-      "  b = function() {\n"
-      "    this.aaaaaaaaaaaaaaaaaaa[aaaaaaaaaaa] = aaaa.aaaaaa ?\n"
-      "        aaaa.aaaaaa : /** @type "
-      "{aaaa.aaaa.aaaaaaaaa.aaaaaaaaaaaaaaaaaaa} */\n"
-      "        (aaaa.aaaa.aaaaaaaaa.aaaaaaaaaaaaa.aaaaaaaaaaaaaaaaa);\n"
-      "  };\n"
-      "};",
-      format("a = function() {\n"
-             "  b = function() {\n"
-             "    this.aaaaaaaaaaaaaaaaaaa[aaaaaaaaaaa] = aaaa.aaaaaa ? "
-             "aaaa.aaaaaa : /** @type "
-             "{aaaa.aaaa.aaaaaaaaa.aaaaaaaaaaaaaaaaaaa} */\n"
-             "        (aaaa.aaaa.aaaaaaaaa.aaaaaaaaaaaaa.aaaaaaaaaaaaaaaaa);\n"
-             "  };\n"
-             "};"));
-}
-
-TEST_F(FormatTestJS, ParameterNamingComment) {
-  verifyFormat("callFoo(/*spaceAfterParameterNamingComment=*/ 1);");
-}
-
-TEST_F(FormatTestJS, ConditionalTypes) {
-  // Formatting below is not necessarily intentional, this just ensures that
-  // clang-format does not break the code.
-  verifyFormat( // wrap
-      "type UnionToIntersection<U> =\n"
-      "    (U extends any ? (k: U) => void :\n"
-      "                     never) extends((k: infer I) => void) ? I : never;");
-}
-
-TEST_F(FormatTestJS, SupportPrivateFieldsAndMethods) {
-  verifyFormat("class Example {\n"
-               "  pub = 1;\n"
-               "  #priv = 2;\n"
-               "  static pub2 = 'foo';\n"
-               "  static #priv2 = 'bar';\n"
-               "  method() {\n"
-               "    this.#priv = 5;\n"
-               "  }\n"
-               "  static staticMethod() {\n"
-               "    switch (this.#priv) {\n"
-               "      case '1':\n"
-               "        #priv = 3;\n"
-               "        break;\n"
-               "    }\n"
-               "  }\n"
-               "  #privateMethod() {\n"
-               "    this.#privateMethod();  // infinite loop\n"
-               "  }\n"
-               "  static #staticPrivateMethod() {}\n");
-}
-
-TEST_F(FormatTestJS, DeclaredFields) {
-  verifyFormat("class Example {\n"
-               "  declare pub: string;\n"
-               "  declare private priv: string;\n"
-               "}\n");
-}
-
-TEST_F(FormatTestJS, NoBreakAfterAsserts) {
-  verifyFormat(
-      "interface Assertable<State extends {}> {\n"
-      "  assert<ExportedState extends {}, DependencyState extends State = "
-      "State>(\n"
-      "      callback: Callback<ExportedState, DependencyState>):\n"
-      "      asserts this is ExtendedState<DependencyState&ExportedState>;\n"
-      "}\n",
-      "interface Assertable<State extends {}> {\n"
-      "  assert<ExportedState extends {}, DependencyState extends State = "
-      "State>(callback: Callback<ExportedState, DependencyState>): asserts "
-      "this is ExtendedState<DependencyState&ExportedState>;\n"
-      "}\n");
-}
-
-} // namespace format
-} // end namespace clang
diff --git a/gnu/llvm/clang/unittests/Format/FormatTestJava.cpp b/gnu/llvm/clang/unittests/Format/FormatTestJava.cpp
deleted file mode 100644
index 9a18c2853ab..00000000000
--- a/gnu/llvm/clang/unittests/Format/FormatTestJava.cpp
+++ /dev/null
@@ -1,588 +0,0 @@
-//===- unittest/Format/FormatTestJava.cpp - Formatting tests for Java -----===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "FormatTestUtils.h"
-#include "clang/Format/Format.h"
-#include "llvm/Support/Debug.h"
-#include "gtest/gtest.h"
-
-#define DEBUG_TYPE "format-test"
-
-namespace clang {
-namespace format {
-
-class FormatTestJava : public ::testing::Test {
-protected:
-  static std::string format(llvm::StringRef Code, unsigned Offset,
-                            unsigned Length, const FormatStyle &Style) {
-    LLVM_DEBUG(llvm::errs() << "---\n");
-    LLVM_DEBUG(llvm::errs() << Code << "\n\n");
-    std::vector<tooling::Range> Ranges(1, tooling::Range(Offset, Length));
-    tooling::Replacements Replaces = reformat(Style, Code, Ranges);
-    auto Result = applyAllReplacements(Code, Replaces);
-    EXPECT_TRUE(static_cast<bool>(Result));
-    LLVM_DEBUG(llvm::errs() << "\n" << *Result << "\n\n");
-    return *Result;
-  }
-
-  static std::string
-  format(llvm::StringRef Code,
-         const FormatStyle &Style = getGoogleStyle(FormatStyle::LK_Java)) {
-    return format(Code, 0, Code.size(), Style);
-  }
-
-  static FormatStyle getStyleWithColumns(unsigned ColumnLimit) {
-    FormatStyle Style = getGoogleStyle(FormatStyle::LK_Java);
-    Style.ColumnLimit = ColumnLimit;
-    return Style;
-  }
-
-  static void verifyFormat(
-      llvm::StringRef Code,
-      const FormatStyle &Style = getGoogleStyle(FormatStyle::LK_Java)) {
-    EXPECT_EQ(Code.str(), format(Code, Style)) << "Expected code is not stable";
-    EXPECT_EQ(Code.str(), format(test::messUp(Code), Style));
-  }
-};
-
-TEST_F(FormatTestJava, NoAlternativeOperatorNames) {
-  verifyFormat("someObject.and();");
-}
-
-TEST_F(FormatTestJava, UnderstandsCasts) {
-  verifyFormat("a[b >> 1] = (byte) (c() << 4);");
-}
-
-TEST_F(FormatTestJava, FormatsInstanceOfLikeOperators) {
-  FormatStyle Style = getStyleWithColumns(50);
-  verifyFormat("return aaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-               "    instanceof bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb;",
-               Style);
-  Style.BreakBeforeBinaryOperators = FormatStyle::BOS_None;
-  verifyFormat("return aaaaaaaaaaaaaaaaaaaaaaaaaaaaa instanceof\n"
-               "    bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb;",
-               Style);
-  verifyFormat("return aaaaaaaaaaaaaaaaaaa instanceof bbbbbbbbbbbbbbbbbbbbbbb\n"
-               "    && ccccccccccccccccccc instanceof dddddddddddddddddddddd;");
-}
-
-TEST_F(FormatTestJava, Chromium) {
-  verifyFormat("class SomeClass {\n"
-               "    void f() {}\n"
-               "    int g() {\n"
-               "        return 0;\n"
-               "    }\n"
-               "    void h() {\n"
-               "        while (true) f();\n"
-               "        for (;;) f();\n"
-               "        if (true) f();\n"
-               "    }\n"
-               "}",
-               getChromiumStyle(FormatStyle::LK_Java));
-}
-
-TEST_F(FormatTestJava, QualifiedNames) {
-  verifyFormat("public some.package.Type someFunction( // comment\n"
-               "    int parameter) {}");
-}
-
-TEST_F(FormatTestJava, ClassKeyword) {
-  verifyFormat("SomeClass.class.getName();");
-  verifyFormat("Class c = SomeClass.class;");
-}
-
-TEST_F(FormatTestJava, ClassDeclarations) {
-  verifyFormat("public class SomeClass {\n"
-               "  private int a;\n"
-               "  private int b;\n"
-               "}");
-  verifyFormat("public class A {\n"
-               "  class B {\n"
-               "    int i;\n"
-               "  }\n"
-               "  class C {\n"
-               "    int j;\n"
-               "  }\n"
-               "}");
-  verifyFormat("public class A extends B.C {}");
-
-  verifyFormat("abstract class SomeClass\n"
-               "    extends SomeOtherClass implements SomeInterface {}",
-               getStyleWithColumns(60));
-  verifyFormat("abstract class SomeClass extends SomeOtherClass\n"
-               "    implements SomeInterfaceeeeeeeeeeeee {}",
-               getStyleWithColumns(60));
-  verifyFormat("abstract class SomeClass\n"
-               "    extends SomeOtherClass\n"
-               "    implements SomeInterface {}",
-               getStyleWithColumns(40));
-  verifyFormat("abstract class SomeClass\n"
-               "    extends SomeOtherClass\n"
-               "    implements SomeInterface,\n"
-               "               AnotherInterface {}",
-               getStyleWithColumns(40));
-  verifyFormat("abstract class SomeClass\n"
-               "    implements SomeInterface, AnotherInterface {}",
-               getStyleWithColumns(60));
-  verifyFormat("@SomeAnnotation()\n"
-               "abstract class aaaaaaaaaaaa\n"
-               "    extends bbbbbbbbbbbbbbb implements cccccccccccc {}",
-               getStyleWithColumns(76));
-  verifyFormat("@SomeAnnotation()\n"
-               "abstract class aaaaaaaaa<a>\n"
-               "    extends bbbbbbbbbbbb<b> implements cccccccccccc {}",
-               getStyleWithColumns(76));
-  verifyFormat("interface SomeInterface<A> extends Foo, Bar {\n"
-               "  void doStuff(int theStuff);\n"
-               "  void doMoreStuff(int moreStuff);\n"
-               "}");
-  verifyFormat("public interface SomeInterface {\n"
-               "  void doStuff(int theStuff);\n"
-               "  void doMoreStuff(int moreStuff);\n"
-               "  default void doStuffWithDefault() {}\n"
-               "}");
-  verifyFormat("@interface SomeInterface {\n"
-               "  void doStuff(int theStuff);\n"
-               "  void doMoreStuff(int moreStuff);\n"
-               "}");
-  verifyFormat("public @interface SomeInterface {\n"
-               "  void doStuff(int theStuff);\n"
-               "  void doMoreStuff(int moreStuff);\n"
-               "}");
-  verifyFormat("class A {\n"
-               "  public @interface SomeInterface {\n"
-               "    int stuff;\n"
-               "    void doMoreStuff(int moreStuff);\n"
-               "  }\n"
-               "}");
-  verifyFormat("class A {\n"
-               "  public @interface SomeInterface {}\n"
-               "}");
-}
-
-TEST_F(FormatTestJava, AnonymousClasses) {
-  verifyFormat("return new A() {\n"
-               "  public String toString() {\n"
-               "    return \"NotReallyA\";\n"
-               "  }\n"
-               "};");
-  verifyFormat("A a = new A() {\n"
-               "  public String toString() {\n"
-               "    return \"NotReallyA\";\n"
-               "  }\n"
-               "};");
-}
-
-TEST_F(FormatTestJava, EnumDeclarations) {
-  verifyFormat("enum SomeThing { ABC, CDE }");
-  verifyFormat("enum SomeThing {\n"
-               "  ABC,\n"
-               "  CDE,\n"
-               "}");
-  verifyFormat("public class SomeClass {\n"
-               "  enum SomeThing { ABC, CDE }\n"
-               "  void f() {}\n"
-               "}");
-  verifyFormat("public class SomeClass implements SomeInterface {\n"
-               "  enum SomeThing { ABC, CDE }\n"
-               "  void f() {}\n"
-               "}");
-  verifyFormat("enum SomeThing {\n"
-               "  ABC,\n"
-               "  CDE;\n"
-               "  void f() {}\n"
-               "}");
-  verifyFormat("enum SomeThing {\n"
-               "  ABC(1, \"ABC\"),\n"
-               "  CDE(2, \"CDE\");\n"
-               "  Something(int i, String s) {}\n"
-               "}");
-  verifyFormat("enum SomeThing {\n"
-               "  ABC(new int[] {1, 2}),\n"
-               "  CDE(new int[] {2, 3});\n"
-               "  Something(int[] i) {}\n"
-               "}");
-  verifyFormat("public enum SomeThing {\n"
-               "  ABC {\n"
-               "    public String toString() {\n"
-               "      return \"ABC\";\n"
-               "    }\n"
-               "  },\n"
-               "  CDE {\n"
-               "    @Override\n"
-               "    public String toString() {\n"
-               "      return \"CDE\";\n"
-               "    }\n"
-               "  };\n"
-               "  public void f() {}\n"
-               "}");
-  verifyFormat("private enum SomeEnum implements Foo<?, B> {\n"
-               "  ABC {\n"
-               "    @Override\n"
-               "    public String toString() {\n"
-               "      return \"ABC\";\n"
-               "    }\n"
-               "  },\n"
-               "  CDE {\n"
-               "    @Override\n"
-               "    public String toString() {\n"
-               "      return \"CDE\";\n"
-               "    }\n"
-               "  };\n"
-               "}");
-  verifyFormat("public enum VeryLongEnum {\n"
-               "  ENUM_WITH_MANY_PARAMETERS(\n"
-               "      \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"bbbbbbbbbbbbbbbb\", "
-               "\"cccccccccccccccccccccccc\"),\n"
-               "  SECOND_ENUM(\"a\", \"b\", \"c\");\n"
-               "  private VeryLongEnum(String a, String b, String c) {}\n"
-               "}\n");
-}
-
-TEST_F(FormatTestJava, ArrayInitializers) {
-  verifyFormat("new int[] {1, 2, 3, 4};");
-  verifyFormat("new int[] {\n"
-               "    1,\n"
-               "    2,\n"
-               "    3,\n"
-               "    4,\n"
-               "};");
-
-  FormatStyle Style = getStyleWithColumns(65);
-  Style.Cpp11BracedListStyle = false;
-  verifyFormat(
-      "expected = new int[] { 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,\n"
-      "  100, 100, 100, 100, 100, 100, 100, 100, 100, 100 };",
-      Style);
-}
-
-TEST_F(FormatTestJava, ThrowsDeclarations) {
-  verifyFormat("public void doSooooooooooooooooooooooooooomething()\n"
-               "    throws LooooooooooooooooooooooooooooongException {}");
-  verifyFormat("public void doSooooooooooooooooooooooooooomething()\n"
-               "    throws LoooooooooongException, LooooooooooongException {}");
-}
-
-TEST_F(FormatTestJava, Annotations) {
-  verifyFormat("@Override\n"
-               "public String toString() {}");
-  verifyFormat("@Override\n"
-               "@Nullable\n"
-               "public String getNameIfPresent() {}");
-  verifyFormat("@Override // comment\n"
-               "@Nullable\n"
-               "public String getNameIfPresent() {}");
-  verifyFormat("@java.lang.Override // comment\n"
-               "@Nullable\n"
-               "public String getNameIfPresent() {}");
-
-  verifyFormat("@SuppressWarnings(value = \"unchecked\")\n"
-               "public void doSomething() {}");
-  verifyFormat("@SuppressWarnings(value = \"unchecked\")\n"
-               "@Author(name = \"abc\")\n"
-               "public void doSomething() {}");
-
-  verifyFormat("DoSomething(new A() {\n"
-               "  @Override\n"
-               "  public String toString() {}\n"
-               "});");
-
-  verifyFormat("void SomeFunction(@Nullable String something) {}");
-  verifyFormat("void SomeFunction(@org.llvm.Nullable String something) {}");
-
-  verifyFormat("@Partial @Mock DataLoader loader;");
-  verifyFormat("@Partial\n"
-               "@Mock\n"
-               "DataLoader loader;",
-               getChromiumStyle(FormatStyle::LK_Java));
-  verifyFormat("@SuppressWarnings(value = \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\")\n"
-               "public static int iiiiiiiiiiiiiiiiiiiiiiii;");
-
-  verifyFormat("@SomeAnnotation(\"With some really looooooooooooooong text\")\n"
-               "private static final long something = 0L;");
-  verifyFormat("@org.llvm.Qualified(\"With some really looooooooooong text\")\n"
-               "private static final long something = 0L;");
-  verifyFormat("@Mock\n"
-               "DataLoader loooooooooooooooooooooooader =\n"
-               "    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa;",
-               getStyleWithColumns(60));
-  verifyFormat("@org.llvm.QualifiedMock\n"
-               "DataLoader loooooooooooooooooooooooader =\n"
-               "    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa;",
-               getStyleWithColumns(60));
-  verifyFormat("@Test(a)\n"
-               "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa =\n"
-               "    aaaaaaaaaaaaaaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaaaaaaaaaa);");
-  verifyFormat("@SomeAnnotation(\n"
-               "    aaaaaaaaaaaaaaaaa, aaaaaaaaaaaaaaaaaaaa)\n"
-               "int i;",
-               getStyleWithColumns(50));
-  verifyFormat("@Test\n"
-               "ReturnType doSomething(\n"
-               "    String aaaaaaaaaaaaa, String bbbbbbbbbbbbbbb) {}",
-               getStyleWithColumns(60));
-  verifyFormat("{\n"
-               "  boolean someFunction(\n"
-               "      @Param(aaaaaaaaaaaaaaaa) String aaaaa,\n"
-               "      String bbbbbbbbbbbbbbb) {}\n"
-               "}",
-               getStyleWithColumns(60));
-  verifyFormat("@Annotation(\"Some\"\n"
-               "    + \" text\")\n"
-               "List<Integer> list;");
-
-  verifyFormat(
-      "@Test\n"
-      "@Feature({\"Android-TabSwitcher\"})\n"
-      "@CommandLineFlags.Add({ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE})\n"
-      "@Features.EnableFeatures({FEATURE})\n"
-      "public void test(@Foo.bar(\"baz\") @Quux.Qoob int theFirstParaaaaam,\n"
-      "    @Foo.bar(\"baz\") @Quux.Qoob int theSecondParaaaaaaaaaaaaaaaam) {}");
-}
-
-TEST_F(FormatTestJava, Generics) {
-  verifyFormat("Iterable<?> a;");
-  verifyFormat("Iterable<?> a;");
-  verifyFormat("Iterable<? extends SomeObject> a;");
-
-  verifyFormat("A.<B>doSomething();");
-  verifyFormat("A.<B<C>>doSomething();");
-  verifyFormat("A.<B<C<D>>>doSomething();");
-  verifyFormat("A.<B<C<D<E>>>>doSomething();");
-
-  verifyFormat("OrderedPair<String, List<Box<Integer>>> p = null;");
-
-  verifyFormat("@Override\n"
-               "public Map<String, ?> getAll() {}");
-
-  verifyFormat("public <R> ArrayList<R> get() {}");
-  verifyFormat("protected <R> ArrayList<R> get() {}");
-  verifyFormat("private <R> ArrayList<R> get() {}");
-  verifyFormat("public static <R> ArrayList<R> get() {}");
-  verifyFormat("public static native <R> ArrayList<R> get();");
-  verifyFormat("public final <X> Foo foo() {}");
-  verifyFormat("public abstract <X> Foo foo();");
-  verifyFormat("<T extends B> T getInstance(Class<T> type);");
-  verifyFormat("Function<F, ? extends T> function;");
-
-  verifyFormat("private Foo<X, Y>[] foos;");
-  verifyFormat("Foo<X, Y>[] foos = this.foos;");
-  verifyFormat("return (a instanceof List<?>)\n"
-               "    ? aaaaaaaaaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaaaaaaaa)\n"
-               "    : aaaaaaaaaaaaaaaaaaaaaaa;",
-               getStyleWithColumns(60));
-
-  verifyFormat(
-      "SomeLoooooooooooooooooooooongType name =\n"
-      "    SomeType.foo(someArgument)\n"
-      "        .<X>method()\n"
-      "        .aaaaaaaaaaaaaaaaaaa()\n"
-      "        .aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa();");
-}
-
-TEST_F(FormatTestJava, StringConcatenation) {
-  verifyFormat("String someString = \"abc\"\n"
-               "    + \"cde\";");
-}
-
-TEST_F(FormatTestJava, TryCatchFinally) {
-  verifyFormat("try {\n"
-               "  Something();\n"
-               "} catch (SomeException e) {\n"
-               "  HandleException(e);\n"
-               "}");
-  verifyFormat("try {\n"
-               "  Something();\n"
-               "} finally {\n"
-               "  AlwaysDoThis();\n"
-               "}");
-  verifyFormat("try {\n"
-               "  Something();\n"
-               "} catch (SomeException e) {\n"
-               "  HandleException(e);\n"
-               "} finally {\n"
-               "  AlwaysDoThis();\n"
-               "}");
-
-  verifyFormat("try {\n"
-               "  Something();\n"
-               "} catch (SomeException | OtherException e) {\n"
-               "  HandleException(e);\n"
-               "}");
-}
-
-TEST_F(FormatTestJava, TryWithResources) {
-  verifyFormat("try (SomeResource rs = someFunction()) {\n"
-               "  Something();\n"
-               "}");
-  verifyFormat("try (SomeResource rs = someFunction()) {\n"
-               "  Something();\n"
-               "} catch (SomeException e) {\n"
-               "  HandleException(e);\n"
-               "}");
-}
-
-TEST_F(FormatTestJava, SynchronizedKeyword) {
-  verifyFormat("synchronized (mData) {\n"
-               "  // ...\n"
-               "}");
-}
-
-TEST_F(FormatTestJava, AssertKeyword) {
-  verifyFormat("assert a && b;");
-  verifyFormat("assert (a && b);");
-}
-
-TEST_F(FormatTestJava, PackageDeclarations) {
-  verifyFormat("package some.really.loooooooooooooooooooooong.package;",
-               getStyleWithColumns(50));
-}
-
-TEST_F(FormatTestJava, ImportDeclarations) {
-  verifyFormat("import some.really.loooooooooooooooooooooong.imported.Class;",
-               getStyleWithColumns(50));
-  verifyFormat("import static some.really.looooooooooooooooong.imported.Class;",
-               getStyleWithColumns(50));
-}
-
-TEST_F(FormatTestJava, MethodDeclarations) {
-  verifyFormat("void methodName(Object arg1,\n"
-               "    Object arg2, Object arg3) {}",
-               getStyleWithColumns(40));
-  verifyFormat("void methodName(\n"
-               "    Object arg1, Object arg2) {}",
-               getStyleWithColumns(40));
-}
-
-TEST_F(FormatTestJava, MethodReference) {
-  EXPECT_EQ("private void foo() {\n"
-            "  f(this::methodReference);\n"
-            "  f(C.super::methodReference);\n"
-            "  Consumer<String> c = System.out::println;\n"
-            "  Iface<Integer> mRef = Ty::<Integer>meth;\n"
-            "}",
-            format("private void foo() {\n"
-                   "  f(this ::methodReference);\n"
-                   "  f(C.super ::methodReference);\n"
-                   "  Consumer<String> c = System.out ::println;\n"
-                   "  Iface<Integer> mRef = Ty :: <Integer> meth;\n"
-                   "}"));
-}
-
-TEST_F(FormatTestJava, CppKeywords) {
-  verifyFormat("public void union(Type a, Type b);");
-  verifyFormat("public void struct(Object o);");
-  verifyFormat("public void delete(Object o);");
-  verifyFormat("return operator && (aa);");
-}
-
-TEST_F(FormatTestJava, NeverAlignAfterReturn) {
-  verifyFormat("return aaaaaaaaaaaaaaaaaaa\n"
-               "    && bbbbbbbbbbbbbbbbbbb\n"
-               "    && ccccccccccccccccccc;",
-               getStyleWithColumns(40));
-  verifyFormat("return (result == null)\n"
-               "    ? aaaaaaaaaaaaaaaaa\n"
-               "    : bbbbbbbbbbbbbbbbb;",
-               getStyleWithColumns(40));
-  verifyFormat("return aaaaaaaaaaaaaaaaaaa()\n"
-               "    .bbbbbbbbbbbbbbbbbbb()\n"
-               "    .ccccccccccccccccccc();",
-               getStyleWithColumns(40));
-  verifyFormat("return aaaaaaaaaaaaaaaaaaa()\n"
-               "    .bbbbbbbbbbbbbbbbbbb(\n"
-               "        ccccccccccccccc)\n"
-               "    .ccccccccccccccccccc();",
-               getStyleWithColumns(40));
-}
-
-TEST_F(FormatTestJava, FormatsInnerBlocks) {
-  verifyFormat("someObject.someFunction(new Runnable() {\n"
-               "  @Override\n"
-               "  public void run() {\n"
-               "    System.out.println(42);\n"
-               "  }\n"
-               "}, someOtherParameter);");
-  verifyFormat("someFunction(new Runnable() {\n"
-               "  public void run() {\n"
-               "    System.out.println(42);\n"
-               "  }\n"
-               "});");
-  verifyFormat("someObject.someFunction(\n"
-               "    new Runnable() {\n"
-               "      @Override\n"
-               "      public void run() {\n"
-               "        System.out.println(42);\n"
-               "      }\n"
-               "    },\n"
-               "    new Runnable() {\n"
-               "      @Override\n"
-               "      public void run() {\n"
-               "        System.out.println(43);\n"
-               "      }\n"
-               "    },\n"
-               "    someOtherParameter);");
-}
-
-TEST_F(FormatTestJava, FormatsLambdas) {
-  verifyFormat("(aaaaaaaaaa, bbbbbbbbbb) -> aaaaaaaaaa + bbbbbbbbbb;");
-  verifyFormat("(aaaaaaaaaa, bbbbbbbbbb)\n"
-               "    -> aaaaaaaaaa + bbbbbbbbbb;",
-               getStyleWithColumns(40));
-  verifyFormat("Runnable someLambda = () -> DoSomething();");
-  verifyFormat("Runnable someLambda = () -> {\n"
-               "  DoSomething();\n"
-               "}");
-
-  verifyFormat("Runnable someLambda =\n"
-               "    (int aaaaa) -> DoSomething(aaaaa);",
-               getStyleWithColumns(40));
-}
-
-TEST_F(FormatTestJava, BreaksStringLiterals) {
-  // FIXME: String literal breaking is currently disabled for Java and JS, as it
-  // requires strings to be merged using "+" which we don't support.
-  EXPECT_EQ("\"some text other\";",
-            format("\"some text other\";", getStyleWithColumns(14)));
-}
-
-TEST_F(FormatTestJava, AlignsBlockComments) {
-  EXPECT_EQ("/*\n"
-            " * Really multi-line\n"
-            " * comment.\n"
-            " */\n"
-            "void f() {}",
-            format("  /*\n"
-                   "   * Really multi-line\n"
-                   "   * comment.\n"
-                   "   */\n"
-                   "  void f() {}"));
-}
-
-TEST_F(FormatTestJava, KeepsDelimitersOnOwnLineInJavaDocComments) {
-  EXPECT_EQ("/**\n"
-            " * javadoc line 1\n"
-            " * javadoc line 2\n"
-            " */",
-            format("/** javadoc line 1\n"
-                   " * javadoc line 2 */"));
-}
-
-TEST_F(FormatTestJava, RetainsLogicalShifts) {
-  verifyFormat("void f() {\n"
-               "  int a = 1;\n"
-               "  a >>>= 1;\n"
-               "}");
-  verifyFormat("void f() {\n"
-               "  int a = 1;\n"
-               "  a = a >>> 1;\n"
-               "}");
-}
-
-} // namespace format
-} // end namespace clang
diff --git a/gnu/llvm/clang/unittests/Format/FormatTestJson.cpp b/gnu/llvm/clang/unittests/Format/FormatTestJson.cpp
deleted file mode 100644
index a1680d80b92..00000000000
--- a/gnu/llvm/clang/unittests/Format/FormatTestJson.cpp
+++ /dev/null
@@ -1,197 +0,0 @@
-//===- unittest/Format/FormatTestJson.cpp - Formatting tests for Json     -===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "FormatTestUtils.h"
-#include "clang/Format/Format.h"
-#include "llvm/Support/Debug.h"
-#include "gtest/gtest.h"
-
-#define DEBUG_TYPE "format-test-json"
-
-namespace clang {
-namespace format {
-
-class FormatTestJson : public ::testing::Test {
-protected:
-  static std::string format(llvm::StringRef Code, unsigned Offset,
-                            unsigned Length, const FormatStyle &Style) {
-    LLVM_DEBUG(llvm::errs() << "---\n");
-    LLVM_DEBUG(llvm::errs() << Code << "\n\n");
-
-    tooling::Replacements Replaces;
-
-    // Mock up what ClangFormat.cpp will do for JSON by adding a variable
-    // to trick JSON into being JavaScript
-    if (Style.isJson()) {
-      auto Err = Replaces.add(
-          tooling::Replacement(tooling::Replacement("", 0, 0, "x = ")));
-      if (Err) {
-        llvm::errs() << "Bad Json variable insertion\n";
-      }
-    }
-    auto ChangedCode = applyAllReplacements(Code, Replaces);
-    if (!ChangedCode) {
-      llvm::errs() << "Bad Json varibale replacement\n";
-    }
-    StringRef NewCode = *ChangedCode;
-
-    std::vector<tooling::Range> Ranges(1, tooling::Range(0, NewCode.size()));
-    Replaces = reformat(Style, NewCode, Ranges);
-    auto Result = applyAllReplacements(NewCode, Replaces);
-    EXPECT_TRUE(static_cast<bool>(Result));
-    LLVM_DEBUG(llvm::errs() << "\n" << *Result << "\n\n");
-    return *Result;
-  }
-
-  static std::string
-  format(llvm::StringRef Code,
-         const FormatStyle &Style = getLLVMStyle(FormatStyle::LK_Json)) {
-    return format(Code, 0, Code.size(), Style);
-  }
-
-  static FormatStyle getStyleWithColumns(unsigned ColumnLimit) {
-    FormatStyle Style = getLLVMStyle(FormatStyle::LK_Json);
-    Style.ColumnLimit = ColumnLimit;
-    return Style;
-  }
-
-  static void
-  verifyFormat(llvm::StringRef Code,
-               const FormatStyle &Style = getLLVMStyle(FormatStyle::LK_Json)) {
-    EXPECT_EQ(Code.str(), format(Code, Style)) << "Expected code is not stable";
-    EXPECT_EQ(Code.str(), format(test::messUp(Code), Style));
-  }
-};
-
-TEST_F(FormatTestJson, JsonRecord) {
-  verifyFormat("{}");
-  verifyFormat("{\n"
-               "  \"name\": 1\n"
-               "}");
-  verifyFormat("{\n"
-               "  \"name\": \"Foo\"\n"
-               "}");
-  verifyFormat("{\n"
-               "  \"name\": {\n"
-               "    \"value\": 1\n"
-               "  }\n"
-               "}");
-  verifyFormat("{\n"
-               "  \"name\": {\n"
-               "    \"value\": 1\n"
-               "  },\n"
-               "  \"name\": {\n"
-               "    \"value\": 2\n"
-               "  }\n"
-               "}");
-  verifyFormat("{\n"
-               "  \"name\": {\n"
-               "    \"value\": [\n"
-               "      1,\n"
-               "      2,\n"
-               "    ]\n"
-               "  }\n"
-               "}");
-  verifyFormat("{\n"
-               "  \"name\": {\n"
-               "    \"value\": [\n"
-               "      \"name\": {\n"
-               "        \"value\": 1\n"
-               "      },\n"
-               "      \"name\": {\n"
-               "        \"value\": 2\n"
-               "      }\n"
-               "    ]\n"
-               "  }\n"
-               "}");
-  verifyFormat(R"({
-  "firstName": "John",
-  "lastName": "Smith",
-  "isAlive": true,
-  "age": 27,
-  "address": {
-    "streetAddress": "21 2nd Street",
-    "city": "New York",
-    "state": "NY",
-    "postalCode": "10021-3100"
-  },
-  "phoneNumbers": [
-    {
-      "type": "home",
-      "number": "212 555-1234"
-    },
-    {
-      "type": "office",
-      "number": "646 555-4567"
-    }
-  ],
-  "children": [],
-  "spouse": null
-})");
-}
-
-TEST_F(FormatTestJson, JsonArray) {
-  verifyFormat("[]");
-  verifyFormat("[\n"
-               "  1\n"
-               "]");
-  verifyFormat("[\n"
-               "  1,\n"
-               "  2\n"
-               "]");
-  verifyFormat("[\n"
-               "  {},\n"
-               "  {}\n"
-               "]");
-  verifyFormat("[\n"
-               "  {\n"
-               "    \"name\": 1\n"
-               "  },\n"
-               "  {}\n"
-               "]");
-}
-
-TEST_F(FormatTestJson, JsonNoStringSplit) {
-  FormatStyle Style = getLLVMStyle(FormatStyle::LK_Json);
-  Style.IndentWidth = 4;
-  verifyFormat(
-      "[\n"
-      "    {\n"
-      "        "
-      "\"naaaaaaaa\": \"foooooooooooooooooooooo oooooooooooooooooooooo\"\n"
-      "    },\n"
-      "    {}\n"
-      "]",
-      Style);
-  verifyFormat("[\n"
-               "    {\n"
-               "        "
-               "\"naaaaaaaa\": "
-               "\"foooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo"
-               "oooooooooooooooooooooooooo\"\n"
-               "    },\n"
-               "    {}\n"
-               "]",
-               Style);
-
-  Style.ColumnLimit = 80;
-  verifyFormat("[\n"
-               "    {\n"
-               "        "
-               "\"naaaaaaaa\":\n"
-               "            "
-               "\"foooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo"
-               "oooooooooooooooooooooooooo\"\n"
-               "    },\n"
-               "    {}\n"
-               "]",
-               Style);
-}
-
-} // namespace format
-} // end namespace clang
diff --git a/gnu/llvm/clang/unittests/Format/FormatTestObjC.cpp b/gnu/llvm/clang/unittests/Format/FormatTestObjC.cpp
deleted file mode 100644
index 78be44e7a3f..00000000000
--- a/gnu/llvm/clang/unittests/Format/FormatTestObjC.cpp
+++ /dev/null
@@ -1,1531 +0,0 @@
-//===- unittest/Format/FormatTestObjC.cpp - Formatting unit tests----------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/Format/Format.h"
-
-#include "../Tooling/ReplacementTest.h"
-#include "FormatTestUtils.h"
-
-#include "llvm/Support/Debug.h"
-#include "llvm/Support/MemoryBuffer.h"
-#include "gtest/gtest.h"
-
-#define DEBUG_TYPE "format-test"
-
-using testing::ScopedTrace;
-
-namespace clang {
-namespace format {
-namespace {
-
-class FormatTestObjC : public ::testing::Test {
-protected:
-  FormatTestObjC() {
-    Style = getLLVMStyle();
-    Style.Language = FormatStyle::LK_ObjC;
-  }
-
-  enum StatusCheck { SC_ExpectComplete, SC_ExpectIncomplete, SC_DoNotCheck };
-
-  std::string format(llvm::StringRef Code,
-                     StatusCheck CheckComplete = SC_ExpectComplete) {
-    LLVM_DEBUG(llvm::errs() << "---\n");
-    LLVM_DEBUG(llvm::errs() << Code << "\n\n");
-    std::vector<tooling::Range> Ranges(1, tooling::Range(0, Code.size()));
-    FormattingAttemptStatus Status;
-    tooling::Replacements Replaces =
-        reformat(Style, Code, Ranges, "<stdin>", &Status);
-    if (CheckComplete != SC_DoNotCheck) {
-      bool ExpectedCompleteFormat = CheckComplete == SC_ExpectComplete;
-      EXPECT_EQ(ExpectedCompleteFormat, Status.FormatComplete)
-          << Code << "\n\n";
-    }
-    auto Result = applyAllReplacements(Code, Replaces);
-    EXPECT_TRUE(static_cast<bool>(Result));
-    LLVM_DEBUG(llvm::errs() << "\n" << *Result << "\n\n");
-    return *Result;
-  }
-
-  void _verifyFormat(const char *File, int Line, StringRef Code) {
-    ScopedTrace t(File, Line, ::testing::Message() << Code.str());
-    EXPECT_EQ(Code.str(), format(Code)) << "Expected code is not stable";
-    EXPECT_EQ(Code.str(), format(test::messUp(Code)));
-  }
-
-  void _verifyIncompleteFormat(const char *File, int Line, StringRef Code) {
-    ScopedTrace t(File, Line, ::testing::Message() << Code.str());
-    EXPECT_EQ(Code.str(), format(test::messUp(Code), SC_ExpectIncomplete));
-  }
-
-  FormatStyle Style;
-};
-
-#define verifyIncompleteFormat(...)                                            \
-  _verifyIncompleteFormat(__FILE__, __LINE__, __VA_ARGS__)
-#define verifyFormat(...) _verifyFormat(__FILE__, __LINE__, __VA_ARGS__)
-
-TEST(FormatTestObjCStyle, DetectsObjCInHeaders) {
-  auto Style = getStyle("LLVM", "a.h", "none",
-                        "@interface\n"
-                        "- (id)init;");
-  ASSERT_TRUE((bool)Style);
-  EXPECT_EQ(FormatStyle::LK_ObjC, Style->Language);
-
-  Style = getStyle("LLVM", "a.h", "none",
-                   "@interface\n"
-                   "+ (id)init;");
-  ASSERT_TRUE((bool)Style);
-  EXPECT_EQ(FormatStyle::LK_ObjC, Style->Language);
-
-  Style = getStyle("LLVM", "a.h", "none",
-                   "@interface\n"
-                   "@end\n"
-                   "//comment");
-  ASSERT_TRUE((bool)Style);
-  EXPECT_EQ(FormatStyle::LK_ObjC, Style->Language);
-
-  Style = getStyle("LLVM", "a.h", "none",
-                   "@interface\n"
-                   "@end //comment");
-  ASSERT_TRUE((bool)Style);
-  EXPECT_EQ(FormatStyle::LK_ObjC, Style->Language);
-
-  // No recognizable ObjC.
-  Style = getStyle("LLVM", "a.h", "none", "void f() {}");
-  ASSERT_TRUE((bool)Style);
-  EXPECT_EQ(FormatStyle::LK_Cpp, Style->Language);
-
-  Style = getStyle("{}", "a.h", "none", "@interface Foo\n@end\n");
-  ASSERT_TRUE((bool)Style);
-  EXPECT_EQ(FormatStyle::LK_ObjC, Style->Language);
-
-  Style = getStyle("{}", "a.h", "none",
-                   "const int interface = 1;\nconst int end = 2;\n");
-  ASSERT_TRUE((bool)Style);
-  EXPECT_EQ(FormatStyle::LK_Cpp, Style->Language);
-
-  Style = getStyle("{}", "a.h", "none", "@protocol Foo\n@end\n");
-  ASSERT_TRUE((bool)Style);
-  EXPECT_EQ(FormatStyle::LK_ObjC, Style->Language);
-
-  Style = getStyle("{}", "a.h", "none",
-                   "const int protocol = 1;\nconst int end = 2;\n");
-  ASSERT_TRUE((bool)Style);
-  EXPECT_EQ(FormatStyle::LK_Cpp, Style->Language);
-
-  Style = getStyle("{}", "a.h", "none", "typedef NS_ENUM(int, Foo) {};\n");
-  ASSERT_TRUE((bool)Style);
-  EXPECT_EQ(FormatStyle::LK_ObjC, Style->Language);
-
-  Style =
-      getStyle("{}", "a.h", "none", "typedef NS_CLOSED_ENUM(int, Foo) {};\n");
-  ASSERT_TRUE((bool)Style);
-  EXPECT_EQ(FormatStyle::LK_ObjC, Style->Language);
-
-  Style = getStyle("{}", "a.h", "none", "enum Foo {};");
-  ASSERT_TRUE((bool)Style);
-  EXPECT_EQ(FormatStyle::LK_Cpp, Style->Language);
-
-  Style =
-      getStyle("{}", "a.h", "none", "inline void Foo() { Log(@\"Foo\"); }\n");
-  ASSERT_TRUE((bool)Style);
-  EXPECT_EQ(FormatStyle::LK_ObjC, Style->Language);
-
-  Style =
-      getStyle("{}", "a.h", "none", "inline void Foo() { Log(\"Foo\"); }\n");
-  ASSERT_TRUE((bool)Style);
-  EXPECT_EQ(FormatStyle::LK_Cpp, Style->Language);
-
-  Style =
-      getStyle("{}", "a.h", "none", "inline void Foo() { id = @[1, 2, 3]; }\n");
-  ASSERT_TRUE((bool)Style);
-  EXPECT_EQ(FormatStyle::LK_ObjC, Style->Language);
-
-  Style = getStyle("{}", "a.h", "none",
-                   "inline void Foo() { id foo = @{1: 2, 3: 4, 5: 6}; }\n");
-  ASSERT_TRUE((bool)Style);
-  EXPECT_EQ(FormatStyle::LK_ObjC, Style->Language);
-
-  Style = getStyle("{}", "a.h", "none",
-                   "inline void Foo() { int foo[] = {1, 2, 3}; }\n");
-  ASSERT_TRUE((bool)Style);
-  EXPECT_EQ(FormatStyle::LK_Cpp, Style->Language);
-
-  // ObjC characteristic types.
-  Style = getStyle("{}", "a.h", "none", "extern NSString *kFoo;\n");
-  ASSERT_TRUE((bool)Style);
-  EXPECT_EQ(FormatStyle::LK_ObjC, Style->Language);
-
-  Style = getStyle("{}", "a.h", "none", "extern NSInteger Foo();\n");
-  ASSERT_TRUE((bool)Style);
-  EXPECT_EQ(FormatStyle::LK_ObjC, Style->Language);
-
-  Style = getStyle("{}", "a.h", "none", "NSObject *Foo();\n");
-  ASSERT_TRUE((bool)Style);
-  EXPECT_EQ(FormatStyle::LK_ObjC, Style->Language);
-
-  Style = getStyle("{}", "a.h", "none", "NSSet *Foo();\n");
-  ASSERT_TRUE((bool)Style);
-  EXPECT_EQ(FormatStyle::LK_ObjC, Style->Language);
-}
-
-TEST(FormatTestObjCStyle, AvoidDetectingDesignatedInitializersAsObjCInHeaders) {
-  auto Style = getStyle("LLVM", "a.h", "none",
-                        "static const char *names[] = {[0] = \"foo\",\n"
-                        "[kBar] = \"bar\"};");
-  ASSERT_TRUE((bool)Style);
-  EXPECT_EQ(FormatStyle::LK_Cpp, Style->Language);
-
-  Style = getStyle("LLVM", "a.h", "none",
-                   "static const char *names[] = {[0] EQ \"foo\",\n"
-                   "[kBar] EQ \"bar\"};");
-  ASSERT_TRUE((bool)Style);
-  EXPECT_EQ(FormatStyle::LK_Cpp, Style->Language);
-}
-
-TEST_F(FormatTestObjC, FormatObjCTryCatch) {
-  verifyFormat("@try {\n"
-               "  f();\n"
-               "} @catch (NSException e) {\n"
-               "  @throw;\n"
-               "} @finally {\n"
-               "  exit(42);\n"
-               "}");
-  verifyFormat("DEBUG({\n"
-               "  @try {\n"
-               "  } @finally {\n"
-               "  }\n"
-               "});\n");
-}
-
-TEST_F(FormatTestObjC, FormatObjCAutoreleasepool) {
-  verifyFormat("@autoreleasepool {\n"
-               "  f();\n"
-               "}\n"
-               "@autoreleasepool {\n"
-               "  f();\n"
-               "}\n");
-  Style.BreakBeforeBraces = FormatStyle::BS_Custom;
-  Style.BraceWrapping.AfterControlStatement = FormatStyle::BWACS_Always;
-  verifyFormat("@autoreleasepool\n"
-               "{\n"
-               "  f();\n"
-               "}\n"
-               "@autoreleasepool\n"
-               "{\n"
-               "  f();\n"
-               "}\n");
-}
-
-TEST_F(FormatTestObjC, FormatObjCGenerics) {
-  Style.ColumnLimit = 40;
-  verifyFormat("int aaaaaaaaaaaaaaaa(\n"
-               "    NSArray<aaaaaaaaaaaaaaaaaa *>\n"
-               "        aaaaaaaaaaaaaaaaa);\n");
-  verifyFormat("int aaaaaaaaaaaaaaaa(\n"
-               "    NSArray<aaaaaaaaaaaaaaaaaaa<\n"
-               "        aaaaaaaaaaaaaaaa *> *>\n"
-               "        aaaaaaaaaaaaaaaaa);\n");
-}
-
-TEST_F(FormatTestObjC, FormatObjCSynchronized) {
-  verifyFormat("@synchronized(self) {\n"
-               "  f();\n"
-               "}\n"
-               "@synchronized(self) {\n"
-               "  f();\n"
-               "}\n");
-  Style.BreakBeforeBraces = FormatStyle::BS_Custom;
-  Style.BraceWrapping.AfterControlStatement = FormatStyle::BWACS_Always;
-  verifyFormat("@synchronized(self)\n"
-               "{\n"
-               "  f();\n"
-               "}\n"
-               "@synchronized(self)\n"
-               "{\n"
-               "  f();\n"
-               "}\n");
-}
-
-TEST_F(FormatTestObjC, FormatObjCInterface) {
-  verifyFormat("@interface Foo : NSObject <NSSomeDelegate> {\n"
-               "@public\n"
-               "  int field1;\n"
-               "@protected\n"
-               "  int field2;\n"
-               "@private\n"
-               "  int field3;\n"
-               "@package\n"
-               "  int field4;\n"
-               "}\n"
-               "+ (id)init;\n"
-               "@end");
-
-  verifyFormat("@interface /* wait for it */ Foo\n"
-               "+ (id)init;\n"
-               "// Look, a comment!\n"
-               "- (int)answerWith:(int)i;\n"
-               "@end");
-
-  verifyFormat("@interface Foo\n"
-               "@end\n"
-               "@interface Bar\n"
-               "@end");
-
-  verifyFormat("@interface Foo : Bar\n"
-               "@property(assign, readwrite) NSInteger bar;\n"
-               "+ (id)init;\n"
-               "@end");
-
-  verifyFormat("FOUNDATION_EXPORT NS_AVAILABLE_IOS(10.0) @interface Foo : Bar\n"
-               "@property(assign, readwrite) NSInteger bar;\n"
-               "+ (id)init;\n"
-               "@end");
-
-  verifyFormat("@interface Foo : /**/ Bar /**/ <Baz, /**/ Quux>\n"
-               "+ (id)init;\n"
-               "@end");
-
-  verifyFormat("@interface Foo (HackStuff)\n"
-               "+ (id)init;\n"
-               "@end");
-
-  verifyFormat("@interface Foo ()\n"
-               "+ (id)init;\n"
-               "@end");
-
-  verifyFormat("@interface Foo (HackStuff) <MyProtocol>\n"
-               "+ (id)init;\n"
-               "@end");
-
-  verifyFormat("@interface Foo {\n"
-               "  int _i;\n"
-               "}\n"
-               "+ (id)init;\n"
-               "@end");
-
-  verifyFormat("@interface Foo : Bar {\n"
-               "  int _i;\n"
-               "}\n"
-               "+ (id)init;\n"
-               "@end");
-
-  verifyFormat("@interface Foo : Bar <Baz, Quux> {\n"
-               "  int _i;\n"
-               "}\n"
-               "+ (id)init;\n"
-               "@end");
-
-  verifyFormat("@interface Foo<Baz : Blech> : Bar <Baz, Quux> {\n"
-               "  int _i;\n"
-               "}\n"
-               "+ (id)init;\n"
-               "@end");
-
-  verifyFormat("@interface Foo<Bar : Baz <Blech>> : Xyzzy <Corge> {\n"
-               "  int _i;\n"
-               "}\n"
-               "+ (id)init;\n"
-               "@end");
-
-  verifyFormat("@interface Foo<Bar : Baz <Blech>> : Xyzzy <Corge> <Quux> {\n"
-               "  int _i;\n"
-               "}\n"
-               "+ (id)init;\n"
-               "@end");
-
-  verifyFormat("@interface Foo : Bar <Baz> <Blech>\n"
-               "@end");
-
-  verifyFormat("@interface Foo : Bar <Baz> <Blech, Xyzzy, Corge>\n"
-               "@end");
-
-  verifyFormat("@interface Foo (HackStuff) {\n"
-               "  int _i;\n"
-               "}\n"
-               "+ (id)init;\n"
-               "@end");
-
-  verifyFormat("@interface Foo () {\n"
-               "  int _i;\n"
-               "}\n"
-               "+ (id)init;\n"
-               "@end");
-
-  verifyFormat("@interface Foo (HackStuff) <MyProtocol> {\n"
-               "  int _i;\n"
-               "}\n"
-               "+ (id)init;\n"
-               "@end");
-  verifyFormat("@interface Foo\n"
-               "- (void)foo {\n"
-               "}\n"
-               "@end\n"
-               "@implementation Bar\n"
-               "- (void)bar {\n"
-               "}\n"
-               "@end");
-  Style.ColumnLimit = 40;
-  verifyFormat("@interface ccccccccccccc () <\n"
-               "    ccccccccccccc, ccccccccccccc,\n"
-               "    ccccccccccccc, ccccccccccccc> {\n"
-               "}");
-  verifyFormat("@interface ccccccccccccc (ccccccccccc) <\n"
-               "    ccccccccccccc> {\n"
-               "}");
-  Style.ObjCBinPackProtocolList = FormatStyle::BPS_Never;
-  verifyFormat("@interface ddddddddddddd () <\n"
-               "    ddddddddddddd,\n"
-               "    ddddddddddddd,\n"
-               "    ddddddddddddd,\n"
-               "    ddddddddddddd> {\n"
-               "}");
-
-  Style.BinPackParameters = false;
-  Style.ObjCBinPackProtocolList = FormatStyle::BPS_Auto;
-  verifyFormat("@interface eeeeeeeeeeeee () <\n"
-               "    eeeeeeeeeeeee,\n"
-               "    eeeeeeeeeeeee,\n"
-               "    eeeeeeeeeeeee,\n"
-               "    eeeeeeeeeeeee> {\n"
-               "}");
-  Style.ObjCBinPackProtocolList = FormatStyle::BPS_Always;
-  verifyFormat("@interface fffffffffffff () <\n"
-               "    fffffffffffff, fffffffffffff,\n"
-               "    fffffffffffff, fffffffffffff> {\n"
-               "}");
-
-  Style = getGoogleStyle(FormatStyle::LK_ObjC);
-  verifyFormat("@interface Foo : NSObject <NSSomeDelegate> {\n"
-               " @public\n"
-               "  int field1;\n"
-               " @protected\n"
-               "  int field2;\n"
-               " @private\n"
-               "  int field3;\n"
-               " @package\n"
-               "  int field4;\n"
-               "}\n"
-               "+ (id)init;\n"
-               "@end");
-  verifyFormat("@interface Foo : Bar <Baz, Quux>\n"
-               "+ (id)init;\n"
-               "@end");
-  verifyFormat("@interface Foo (HackStuff) <MyProtocol>\n"
-               "+ (id)init;\n"
-               "@end");
-  Style.ColumnLimit = 40;
-  // BinPackParameters should be true by default.
-  verifyFormat("void eeeeeeee(int eeeee, int eeeee,\n"
-               "              int eeeee, int eeeee);\n");
-  // ObjCBinPackProtocolList should be BPS_Never by default.
-  verifyFormat("@interface fffffffffffff () <\n"
-               "    fffffffffffff,\n"
-               "    fffffffffffff,\n"
-               "    fffffffffffff,\n"
-               "    fffffffffffff> {\n"
-               "}");
-  verifyFormat("@interface ggggggggggggg\n"
-               "    : ggggggggggggg <ggggggggggggg>\n"
-               "      <ggggggggggggg>\n"
-               "@end");
-}
-
-TEST_F(FormatTestObjC, FormatObjCImplementation) {
-  verifyFormat("@implementation Foo : NSObject {\n"
-               "@public\n"
-               "  int field1;\n"
-               "@protected\n"
-               "  int field2;\n"
-               "@private\n"
-               "  int field3;\n"
-               "@package\n"
-               "  int field4;\n"
-               "}\n"
-               "+ (id)init {\n}\n"
-               "@end");
-
-  verifyFormat("@implementation Foo\n"
-               "+ (id)init {\n"
-               "  if (true)\n"
-               "    return nil;\n"
-               "}\n"
-               "// Look, a comment!\n"
-               "- (int)answerWith:(int)i {\n"
-               "  return i;\n"
-               "}\n"
-               "+ (int)answerWith:(int)i {\n"
-               "  return i;\n"
-               "}\n"
-               "@end");
-
-  verifyFormat("@implementation Foo\n"
-               "@end\n"
-               "@implementation Bar\n"
-               "@end");
-
-  EXPECT_EQ("@implementation Foo : Bar\n"
-            "+ (id)init {\n}\n"
-            "- (void)foo {\n}\n"
-            "@end",
-            format("@implementation Foo : Bar\n"
-                   "+(id)init{}\n"
-                   "-(void)foo{}\n"
-                   "@end"));
-
-  verifyFormat("@implementation Foo {\n"
-               "  int _i;\n"
-               "}\n"
-               "+ (id)init {\n}\n"
-               "@end");
-
-  verifyFormat("@implementation Foo : Bar {\n"
-               "  int _i;\n"
-               "}\n"
-               "+ (id)init {\n}\n"
-               "@end");
-
-  verifyFormat("@implementation Foo (HackStuff)\n"
-               "+ (id)init {\n}\n"
-               "@end");
-  verifyFormat("@implementation ObjcClass\n"
-               "- (void)method;\n"
-               "{}\n"
-               "@end");
-
-  Style = getGoogleStyle(FormatStyle::LK_ObjC);
-  verifyFormat("@implementation Foo : NSObject {\n"
-               " @public\n"
-               "  int field1;\n"
-               " @protected\n"
-               "  int field2;\n"
-               " @private\n"
-               "  int field3;\n"
-               " @package\n"
-               "  int field4;\n"
-               "}\n"
-               "+ (id)init {\n}\n"
-               "@end");
-}
-
-TEST_F(FormatTestObjC, FormatObjCProtocol) {
-  verifyFormat("@protocol Foo\n"
-               "@property(weak) id delegate;\n"
-               "- (NSUInteger)numberOfThings;\n"
-               "@end");
-
-  verifyFormat("@protocol MyProtocol <NSObject>\n"
-               "- (NSUInteger)numberOfThings;\n"
-               "@end");
-
-  verifyFormat("@protocol Foo;\n"
-               "@protocol Bar;\n");
-
-  verifyFormat("@protocol Foo\n"
-               "@end\n"
-               "@protocol Bar\n"
-               "@end");
-
-  verifyFormat("FOUNDATION_EXPORT NS_AVAILABLE_IOS(10.0) @protocol Foo\n"
-               "@property(assign, readwrite) NSInteger bar;\n"
-               "@end");
-
-  verifyFormat("@protocol myProtocol\n"
-               "- (void)mandatoryWithInt:(int)i;\n"
-               "@optional\n"
-               "- (void)optional;\n"
-               "@required\n"
-               "- (void)required;\n"
-               "@optional\n"
-               "@property(assign) int madProp;\n"
-               "@end\n");
-
-  verifyFormat("@property(nonatomic, assign, readonly)\n"
-               "    int *looooooooooooooooooooooooooooongNumber;\n"
-               "@property(nonatomic, assign, readonly)\n"
-               "    NSString *looooooooooooooooooooooooooooongName;");
-
-  verifyFormat("@implementation PR18406\n"
-               "}\n"
-               "@end");
-
-  Style = getGoogleStyle(FormatStyle::LK_ObjC);
-  verifyFormat("@protocol MyProtocol <NSObject>\n"
-               "- (NSUInteger)numberOfThings;\n"
-               "@end");
-}
-
-TEST_F(FormatTestObjC, FormatObjCMethodDeclarations) {
-  verifyFormat("- (void)doSomethingWith:(GTMFoo *)theFoo\n"
-               "                   rect:(NSRect)theRect\n"
-               "               interval:(float)theInterval {\n"
-               "}");
-  verifyFormat("- (void)shortf:(GTMFoo *)theFoo\n"
-               "      longKeyword:(NSRect)theRect\n"
-               "    longerKeyword:(float)theInterval\n"
-               "            error:(NSError **)theError {\n"
-               "}");
-  verifyFormat("- (void)shortf:(GTMFoo *)theFoo\n"
-               "          longKeyword:(NSRect)theRect\n"
-               "    evenLongerKeyword:(float)theInterval\n"
-               "                error:(NSError **)theError {\n"
-               "}");
-  verifyFormat("+ (instancetype)new;\n");
-  Style.ColumnLimit = 60;
-  verifyFormat("- (instancetype)initXxxxxx:(id<x>)x\n"
-               "                         y:(id<yyyyyyyyyyyyyyyyyyyy>)y\n"
-               "    NS_DESIGNATED_INITIALIZER;");
-  verifyFormat("- (void)drawRectOn:(id)surface\n"
-               "            ofSize:(size_t)height\n"
-               "                  :(size_t)width;");
-  Style.ColumnLimit = 40;
-  // Make sure selectors with 0, 1, or more arguments are indented when wrapped.
-  verifyFormat("- (aaaaaaaaaaaaaaaaaaaaaaaaaaaaa)\n"
-               "    aaaaaaaaaaaaaaaaaaaaaaaaaaaa;\n");
-  verifyFormat("- (aaaaaaaaaaaaaaaaaaaaaaaaaaaaa)\n"
-               "    aaaaaaaaaaaaaaaaaaaaaaaaaaaa:(int)a;\n");
-  verifyFormat("- (aaaaaaaaaaaaaaaaaaaaaaaaaaaaa)\n"
-               "    aaaaaaaaaaaaaaaaaaaaaaaaaaaa:(int)a\n"
-               "    aaaaaaaaaaaaaaaaaaaaaaaaaaaa:(int)a;\n");
-  verifyFormat("- (aaaaaaaaaaaaaaaaaaaaaaaaaaaaa)\n"
-               "     aaaaaaaaaaaaaaaaaaaaaaaaaaa:(int)a\n"
-               "    aaaaaaaaaaaaaaaaaaaaaaaaaaaa:(int)a;\n");
-  verifyFormat("- (aaaaaaaaaaaaaaaaaaaaaaaaaaaaa)\n"
-               "    aaaaaaaaaaaaaaaaaaaaaaaaaaaa:(int)a\n"
-               "     aaaaaaaaaaaaaaaaaaaaaaaaaaa:(int)a;\n");
-
-  // Continuation indent width should win over aligning colons if the function
-  // name is long.
-  Style = getGoogleStyle(FormatStyle::LK_ObjC);
-  Style.ColumnLimit = 40;
-  verifyFormat("- (void)shortf:(GTMFoo *)theFoo\n"
-               "    dontAlignNamef:(NSRect)theRect {\n"
-               "}");
-
-  // Make sure we don't break aligning for short parameter names.
-  verifyFormat("- (void)shortf:(GTMFoo *)theFoo\n"
-               "       aShortf:(NSRect)theRect {\n"
-               "}");
-
-  // Format pairs correctly.
-  Style.ColumnLimit = 80;
-  verifyFormat("- (void)drawRectOn:(id)surface\n"
-               "            ofSize:(aaaaaaaa)height\n"
-               "                  :(size_t)width\n"
-               "          atOrigin:(size_t)x\n"
-               "                  :(size_t)y\n"
-               "             aaaaa:(a)yyy\n"
-               "               bbb:(d)cccc;");
-  verifyFormat("- (void)drawRectOn:(id)surface ofSize:(aaa)height:(bbb)width;");
-
-  // BraceWrapping AfterFunction is respected for ObjC methods
-  Style = getGoogleStyle(FormatStyle::LK_ObjC);
-  Style.BreakBeforeBraces = FormatStyle::BS_Custom;
-  Style.BraceWrapping.AfterFunction = true;
-  verifyFormat("@implementation Foo\n"
-               "- (void)foo:(id)bar\n"
-               "{\n"
-               "}\n"
-               "@end\n");
-}
-
-TEST_F(FormatTestObjC, FormatObjCMethodExpr) {
-  verifyFormat("[foo bar:baz];");
-  verifyFormat("[foo bar]->baz;");
-  verifyFormat("return [foo bar:baz];");
-  verifyFormat("return (a)[foo bar:baz];");
-  verifyFormat("f([foo bar:baz]);");
-  verifyFormat("f(2, [foo bar:baz]);");
-  verifyFormat("f(2, a ? b : c);");
-  verifyFormat("[[self initWithInt:4] bar:[baz quux:arrrr]];");
-
-  // Unary operators.
-  verifyFormat("int a = +[foo bar:baz];");
-  verifyFormat("int a = -[foo bar:baz];");
-  verifyFormat("int a = ![foo bar:baz];");
-  verifyFormat("int a = ~[foo bar:baz];");
-  verifyFormat("int a = ++[foo bar:baz];");
-  verifyFormat("int a = --[foo bar:baz];");
-  verifyFormat("int a = sizeof [foo bar:baz];");
-  verifyFormat("int a = alignof [foo bar:baz];");
-  verifyFormat("int a = &[foo bar:baz];");
-  verifyFormat("int a = *[foo bar:baz];");
-  // FIXME: Make casts work, without breaking f()[4].
-  // verifyFormat("int a = (int)[foo bar:baz];");
-  // verifyFormat("return (int)[foo bar:baz];");
-  // verifyFormat("(void)[foo bar:baz];");
-  verifyFormat("return (MyType *)[self.tableView cellForRowAtIndexPath:cell];");
-
-  // Binary operators.
-  verifyFormat("[foo bar:baz], [foo bar:baz];");
-  verifyFormat("[foo bar:baz] = [foo bar:baz];");
-  verifyFormat("[foo bar:baz] *= [foo bar:baz];");
-  verifyFormat("[foo bar:baz] /= [foo bar:baz];");
-  verifyFormat("[foo bar:baz] %= [foo bar:baz];");
-  verifyFormat("[foo bar:baz] += [foo bar:baz];");
-  verifyFormat("[foo bar:baz] -= [foo bar:baz];");
-  verifyFormat("[foo bar:baz] <<= [foo bar:baz];");
-  verifyFormat("[foo bar:baz] >>= [foo bar:baz];");
-  verifyFormat("[foo bar:baz] &= [foo bar:baz];");
-  verifyFormat("[foo bar:baz] ^= [foo bar:baz];");
-  verifyFormat("[foo bar:baz] |= [foo bar:baz];");
-  verifyFormat("[foo bar:baz] ? [foo bar:baz] : [foo bar:baz];");
-  verifyFormat("[foo bar:baz] || [foo bar:baz];");
-  verifyFormat("[foo bar:baz] && [foo bar:baz];");
-  verifyFormat("[foo bar:baz] | [foo bar:baz];");
-  verifyFormat("[foo bar:baz] ^ [foo bar:baz];");
-  verifyFormat("[foo bar:baz] & [foo bar:baz];");
-  verifyFormat("[foo bar:baz] == [foo bar:baz];");
-  verifyFormat("[foo bar:baz] != [foo bar:baz];");
-  verifyFormat("[foo bar:baz] >= [foo bar:baz];");
-  verifyFormat("[foo bar:baz] <= [foo bar:baz];");
-  verifyFormat("[foo bar:baz] > [foo bar:baz];");
-  verifyFormat("[foo bar:baz] < [foo bar:baz];");
-  verifyFormat("[foo bar:baz] >> [foo bar:baz];");
-  verifyFormat("[foo bar:baz] << [foo bar:baz];");
-  verifyFormat("[foo bar:baz] - [foo bar:baz];");
-  verifyFormat("[foo bar:baz] + [foo bar:baz];");
-  verifyFormat("[foo bar:baz] * [foo bar:baz];");
-  verifyFormat("[foo bar:baz] / [foo bar:baz];");
-  verifyFormat("[foo bar:baz] % [foo bar:baz];");
-  // Whew!
-
-  verifyFormat("return in[42];");
-  verifyFormat("for (auto v : in[1]) {\n}");
-  verifyFormat("for (int i = 0; i < in[a]; ++i) {\n}");
-  verifyFormat("for (int i = 0; in[a] < i; ++i) {\n}");
-  verifyFormat("for (int i = 0; i < n; ++i, ++in[a]) {\n}");
-  verifyFormat("for (int i = 0; i < n; ++i, in[a]++) {\n}");
-  verifyFormat("for (int i = 0; i < f(in[a]); ++i, in[a]++) {\n}");
-  verifyFormat("for (id foo in [self getStuffFor:bla]) {\n"
-               "}");
-  verifyFormat("[self aaaaa:MACRO(a, b:, c:)];");
-  verifyFormat("[self aaaaa:MACRO(a, b:c:, d:e:)];");
-  verifyFormat("[self aaaaa:MACRO(a, b:c:d:, e:f:g:)];");
-  verifyFormat("int XYMyFoo(int a, int b) NS_SWIFT_NAME(foo(self:scale:));");
-  verifyFormat("[self aaaaa:(1 + 2) bbbbb:3];");
-  verifyFormat("[self aaaaa:(Type)a bbbbb:3];");
-
-  verifyFormat("[self stuffWithInt:(4 + 2) float:4.5];");
-  verifyFormat("[self stuffWithInt:a ? b : c float:4.5];");
-  verifyFormat("[self stuffWithInt:a ? [self foo:bar] : c];");
-  verifyFormat("[self stuffWithInt:a ? (e ? f : g) : c];");
-  verifyFormat("[cond ? obj1 : obj2 methodWithParam:param]");
-  verifyFormat("[button setAction:@selector(zoomOut:)];");
-  verifyFormat("[color getRed:&r green:&g blue:&b alpha:&a];");
-
-  verifyFormat("arr[[self indexForFoo:a]];");
-  verifyFormat("throw [self errorFor:a];");
-  verifyFormat("@throw [self errorFor:a];");
-
-  verifyFormat("[(id)foo bar:(id)baz quux:(id)snorf];");
-  verifyFormat("[(id)foo bar:(id) ? baz : quux];");
-  verifyFormat("4 > 4 ? (id)a : (id)baz;");
-
-  unsigned PreviousColumnLimit = Style.ColumnLimit;
-  Style.ColumnLimit = 50;
-  // Instead of:
-  // bool a =
-  //     ([object a:42] == 0 || [object a:42
-  //                                    b:42] == 0);
-  verifyFormat("bool a = ([object a:42] == 0 ||\n"
-               "          [object a:42 b:42] == 0);");
-  Style.ColumnLimit = PreviousColumnLimit;
-  verifyFormat("bool a = ([aaaaaaaa aaaaa] == aaaaaaaaaaaaaaaaa ||\n"
-               "          [aaaaaaaa aaaaa] == aaaaaaaaaaaaaaaaaaaa);");
-
-  // This tests that the formatter doesn't break after "backing" but before ":",
-  // which would be at 80 columns.
-  verifyFormat(
-      "void f() {\n"
-      "  if ((self = [super initWithContentRect:contentRect\n"
-      "                               styleMask:styleMask ?: otherMask\n"
-      "                                 backing:NSBackingStoreBuffered\n"
-      "                                   defer:YES]))");
-
-  verifyFormat(
-      "[foo checkThatBreakingAfterColonWorksOk:\n"
-      "         [bar ifItDoes:reduceOverallLineLengthLikeInThisCase]];");
-
-  verifyFormat("[myObj short:arg1 // Force line break\n"
-               "          longKeyword:arg2 != nil ? arg2 : @\"longKeyword\"\n"
-               "    evenLongerKeyword:arg3 ?: @\"evenLongerKeyword\"\n"
-               "                error:arg4];");
-  verifyFormat(
-      "void f() {\n"
-      "  popup_window_.reset([[RenderWidgetPopupWindow alloc]\n"
-      "      initWithContentRect:NSMakeRect(origin_global.x, origin_global.y,\n"
-      "                                     pos.width(), pos.height())\n"
-      "                styleMask:NSBorderlessWindowMask\n"
-      "                  backing:NSBackingStoreBuffered\n"
-      "                    defer:NO]);\n"
-      "}");
-  verifyFormat("[contentsContainer replaceSubview:[subviews objectAtIndex:0]\n"
-               "                             with:contentsNativeView];");
-
-  verifyFormat(
-      "[pboard addTypes:[NSArray arrayWithObject:kBookmarkButtonDragType]\n"
-      "           owner:nillllll];");
-
-  verifyFormat(
-      "[pboard setData:[NSData dataWithBytes:&button length:sizeof(button)]\n"
-      "        forType:kBookmarkButtonDragType];");
-
-  verifyFormat("[defaultCenter addObserver:self\n"
-               "                  selector:@selector(willEnterFullscreen)\n"
-               "                      name:kWillEnterFullscreenNotification\n"
-               "                    object:nil];");
-  verifyFormat("[image_rep drawInRect:drawRect\n"
-               "             fromRect:NSZeroRect\n"
-               "            operation:NSCompositeCopy\n"
-               "             fraction:1.0\n"
-               "       respectFlipped:NO\n"
-               "                hints:nil];");
-  verifyFormat("[aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
-               "    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa];");
-  verifyFormat("[aaaaaaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaaaaaaaa)\n"
-               "    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa];");
-  verifyFormat("[aaaaaaaaaaaaaaaaaaaaaaa.aaaaaaaa[aaaaaaaaaaaaaaaaaaaaa]\n"
-               "    aaaaaaaaaaaaaaaaaaaaaa];");
-
-  verifyFormat(
-      "scoped_nsobject<NSTextField> message(\n"
-      "    // The frame will be fixed up when |-setMessageText:| is called.\n"
-      "    [[NSTextField alloc] initWithFrame:NSMakeRect(0, 0, 0, 0)]);");
-  verifyFormat("[self aaaaaa:bbbbbbbbbbbbb\n"
-               "    aaaaaaaaaa:bbbbbbbbbbbbbbbbb\n"
-               "         aaaaa:bbbbbbbbbbb + bbbbbbbbbbbb\n"
-               "          aaaa:bbb];");
-  verifyFormat("[self param:function( //\n"
-               "                parameter)]");
-  verifyFormat(
-      "[self aaaaaaaaaa:aaaaaaaaaaaaaaa | aaaaaaaaaaaaaaa | aaaaaaaaaaaaaaa |\n"
-      "                 aaaaaaaaaaaaaaa | aaaaaaaaaaaaaaa | aaaaaaaaaaaaaaa |\n"
-      "                 aaaaaaaaaaaaaaa | aaaaaaaaaaaaaaa];");
-
-  // Variadic parameters.
-  verifyFormat(
-      "NSArray *myStrings = [NSArray stringarray:@\"a\", @\"b\", nil];");
-  verifyFormat(
-      "[self aaaaaaaaaaaaa:aaaaaaaaaaaaaaa, aaaaaaaaaaaaaaa, aaaaaaaaaaaaaaa,\n"
-      "                    aaaaaaaaaaaaaaa, aaaaaaaaaaaaaaa, aaaaaaaaaaaaaaa,\n"
-      "                    aaaaaaaaaaaaaaa, aaaaaaaaaaaaaaa];");
-
-  verifyFormat("[self // break\n"
-               "      a:a\n"
-               "    aaa:aaa];");
-
-  // Formats pair-parameters.
-  verifyFormat("[I drawRectOn:surface ofSize:aa:bbb atOrigin:cc:dd];");
-  verifyFormat("[I drawRectOn:surface //\n"
-               "       ofSize:aa:bbb\n"
-               "     atOrigin:cc:dd];");
-
-  // Inline block as a first argument.
-  verifyFormat("[object justBlock:^{\n"
-               "  a = 42;\n"
-               "}];");
-  verifyFormat("[object\n"
-               "    justBlock:^{\n"
-               "      a = 42;\n"
-               "    }\n"
-               "     notBlock:42\n"
-               "            a:42];");
-  verifyFormat("[object\n"
-               "    firstBlock:^{\n"
-               "      a = 42;\n"
-               "    }\n"
-               "    blockWithLongerName:^{\n"
-               "      a = 42;\n"
-               "    }];");
-  verifyFormat("[object\n"
-               "    blockWithLongerName:^{\n"
-               "      a = 42;\n"
-               "    }\n"
-               "    secondBlock:^{\n"
-               "      a = 42;\n"
-               "    }];");
-  verifyFormat("[object\n"
-               "    firstBlock:^{\n"
-               "      a = 42;\n"
-               "    }\n"
-               "    notBlock:42\n"
-               "    secondBlock:^{\n"
-               "      a = 42;\n"
-               "    }];");
-
-  // Space between cast rparen and selector name component.
-  verifyFormat("[((Foo *)foo) bar];");
-  verifyFormat("[((Foo *)foo) bar:1 blech:2];");
-
-  Style.ColumnLimit = 20;
-  verifyFormat("aaaaa = [a aa:aa\n"
-               "           aa:aa];");
-  verifyFormat("aaaaaa = [aa aa:aa\n"
-               "             aa:aa];");
-
-  // Message receiver taking multiple lines.
-  // Non-corner case.
-  verifyFormat("[[object block:^{\n"
-               "  return 42;\n"
-               "}] a:42 b:42];");
-  // Arguments just fit into one line.
-  verifyFormat("[[object block:^{\n"
-               "  return 42;\n"
-               "}] aaaaaaa:42 b:42];");
-  // Arguments just over a column limit.
-  verifyFormat("[[object block:^{\n"
-               "  return 42;\n"
-               "}] aaaaaaa:42\n"
-               "        bb:42];");
-  // Arguments just fit into one line.
-  Style.ColumnLimit = 23;
-  verifyFormat("[[obj a:42\n"
-               "      b:42\n"
-               "      c:42\n"
-               "      d:42] e:42 f:42];");
-
-  // Arguments do not fit into one line with a receiver.
-  Style.ColumnLimit = 20;
-  verifyFormat("[[obj a:42] a:42\n"
-               "            b:42];");
-  verifyFormat("[[obj a:42] a:42\n"
-               "            b:42\n"
-               "            c:42];");
-  verifyFormat("[[obj aaaaaa:42\n"
-               "           b:42]\n"
-               "    cc:42\n"
-               "     d:42];");
-
-  // Avoid breaking receiver expression.
-  Style.ColumnLimit = 30;
-  verifyFormat("fooooooo =\n"
-               "    [[obj fooo] aaa:42\n"
-               "                aaa:42];");
-  verifyFormat("[[[obj foo] bar] aa:42\n"
-               "                 bb:42\n"
-               "                 cc:42];");
-
-  // Avoid breaking between unary operators and ObjC method expressions.
-  Style.ColumnLimit = 45;
-  verifyFormat("if (a012345678901234567890123 &&\n"
-               "    ![foo bar]) {\n"
-               "}");
-  verifyFormat("if (a012345678901234567890123 &&\n"
-               "    +[foo bar]) {\n"
-               "}");
-  verifyFormat("if (a012345678901234567890123 &&\n"
-               "    -[foo bar]) {\n"
-               "}");
-
-  Style.ColumnLimit = 70;
-  verifyFormat(
-      "void f() {\n"
-      "  popup_wdow_.reset([[RenderWidgetPopupWindow alloc]\n"
-      "      iniithContentRect:NSMakRet(origin_global.x, origin_global.y,\n"
-      "                                 pos.width(), pos.height())\n"
-      "                syeMask:NSBorderlessWindowMask\n"
-      "                  bking:NSBackingStoreBuffered\n"
-      "                    der:NO]);\n"
-      "}");
-
-  Style.ColumnLimit = 60;
-  verifyFormat("[call aaaaaaaa.aaaaaa.aaaaaaaa.aaaaaaaa.aaaaaaaa.aaaaaaaa\n"
-               "        .aaaaaaaa];"); // FIXME: Indentation seems off.
-  // FIXME: This violates the column limit.
-  verifyFormat(
-      "[aaaaaaaaaaaaaaaaaaaaaaaaa\n"
-      "    aaaaaaaaaaaaaaaaa:aaaaaaaa\n"
-      "                  aaa:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa];");
-
-  Style = getChromiumStyle(FormatStyle::LK_ObjC);
-  Style.ColumnLimit = 80;
-  verifyFormat(
-      "void f() {\n"
-      "  popup_window_.reset([[RenderWidgetPopupWindow alloc]\n"
-      "      initWithContentRect:NSMakeRect(origin_global.x, origin_global.y,\n"
-      "                                     pos.width(), pos.height())\n"
-      "                styleMask:NSBorderlessWindowMask\n"
-      "                  backing:NSBackingStoreBuffered\n"
-      "                    defer:NO]);\n"
-      "}");
-
-  // Respect continuation indent and colon alignment (e.g. when object name is
-  // short, and first selector is the longest one)
-  Style = getLLVMStyle();
-  Style.Language = FormatStyle::LK_ObjC;
-  Style.ContinuationIndentWidth = 8;
-  verifyFormat("[self performSelectorOnMainThread:@selector(loadAccessories)\n"
-               "                       withObject:nil\n"
-               "                    waitUntilDone:false];");
-  verifyFormat("[self performSelector:@selector(loadAccessories)\n"
-               "        withObjectOnMainThread:nil\n"
-               "                 waitUntilDone:false];");
-  verifyFormat(
-      "[aaaaaaaaaaaaaaaaaaaaaaaaa\n"
-      "        performSelectorOnMainThread:@selector(loadAccessories)\n"
-      "                         withObject:nil\n"
-      "                      waitUntilDone:false];");
-  verifyFormat(
-      "[self // force wrapping\n"
-      "        performSelectorOnMainThread:@selector(loadAccessories)\n"
-      "                         withObject:nil\n"
-      "                      waitUntilDone:false];");
-
-  // The appropriate indentation is used after a block statement.
-  Style.ContinuationIndentWidth = 4;
-  verifyFormat(
-      "void aaaaaaaaaaaaaaaaaaaaa(int c) {\n"
-      "  if (c) {\n"
-      "    f();\n"
-      "  }\n"
-      "  [dddddddddddddddddddddddddddddddddddddddddddddddddddddddd\n"
-      "      eeeeeeeeeeeeeeeeeeeeeeeeeeeee:^(fffffffffffffff gggggggg) {\n"
-      "        f(SSSSS, c);\n"
-      "      }];\n"
-      "}");
-}
-
-TEST_F(FormatTestObjC, ObjCAt) {
-  verifyFormat("@autoreleasepool");
-  verifyFormat("@catch");
-  verifyFormat("@class");
-  verifyFormat("@compatibility_alias");
-  verifyFormat("@defs");
-  verifyFormat("@dynamic");
-  verifyFormat("@encode");
-  verifyFormat("@end");
-  verifyFormat("@finally");
-  verifyFormat("@implementation");
-  verifyFormat("@import");
-  verifyFormat("@interface");
-  verifyFormat("@optional");
-  verifyFormat("@package");
-  verifyFormat("@private");
-  verifyFormat("@property");
-  verifyFormat("@protected");
-  verifyFormat("@protocol");
-  verifyFormat("@public");
-  verifyFormat("@required");
-  verifyFormat("@selector");
-  verifyFormat("@synchronized");
-  verifyFormat("@synthesize");
-  verifyFormat("@throw");
-  verifyFormat("@try");
-
-  EXPECT_EQ("@interface", format("@ interface"));
-
-  // The precise formatting of this doesn't matter, nobody writes code like
-  // this.
-  verifyFormat("@ /*foo*/ interface");
-}
-
-TEST_F(FormatTestObjC, ObjCBlockTypesAndVariables) {
-  verifyFormat("void DoStuffWithBlockType(int (^)(char));");
-  verifyFormat("int (^foo)(char, float);");
-  verifyFormat("int (^foo[10])(char, float);");
-  verifyFormat("int (^foo[kNumEntries])(char, float);");
-  verifyFormat("int (^foo[kNumEntries + 10])(char, float);");
-  verifyFormat("int (^foo[(kNumEntries + 10)])(char, float);");
-}
-
-TEST_F(FormatTestObjC, ObjCSnippets) {
-  verifyFormat("@autoreleasepool {\n"
-               "  foo();\n"
-               "}");
-  verifyFormat("@class Foo, Bar;");
-  verifyFormat("@compatibility_alias AliasName ExistingClass;");
-  verifyFormat("@dynamic textColor;");
-  verifyFormat("char *buf1 = @encode(int *);");
-  verifyFormat("char *buf1 = @encode(typeof(4 * 5));");
-  verifyFormat("char *buf1 = @encode(int **);");
-  verifyFormat("Protocol *proto = @protocol(p1);");
-  verifyFormat("SEL s = @selector(foo:);");
-  verifyFormat("@synchronized(self) {\n"
-               "  f();\n"
-               "}");
-
-  verifyFormat("@import foo.bar;\n"
-               "@import baz;");
-
-  verifyFormat("@synthesize dropArrowPosition = dropArrowPosition_;");
-
-  verifyFormat("@property(assign, nonatomic) CGFloat hoverAlpha;");
-  verifyFormat("@property(assign, getter=isEditable) BOOL editable;");
-
-  verifyFormat("extern UIWindow *MainWindow(void) "
-               "NS_SWIFT_NAME(getter:MyHelper.mainWindow());");
-
-  verifyFormat("extern UIWindow *MainWindow(void) "
-               "CF_SWIFT_NAME(getter:MyHelper.mainWindow());");
-
-  Style.ColumnLimit = 50;
-  verifyFormat("@interface Foo\n"
-               "- (void)doStuffWithFoo:(id)name\n"
-               "                   bar:(id)bar\n"
-               "                   baz:(id)baz\n"
-               "    NS_SWIFT_NAME(doStuff(withFoo:bar:baz:));\n"
-               "@end");
-
-  Style = getMozillaStyle();
-  verifyFormat("@property (assign, getter=isEditable) BOOL editable;");
-  verifyFormat("@property BOOL editable;");
-
-  Style = getWebKitStyle();
-  verifyFormat("@property (assign, getter=isEditable) BOOL editable;");
-  verifyFormat("@property BOOL editable;");
-
-  Style = getGoogleStyle(FormatStyle::LK_ObjC);
-  verifyFormat("@synthesize dropArrowPosition = dropArrowPosition_;");
-  verifyFormat("@property(assign, getter=isEditable) BOOL editable;");
-}
-
-TEST_F(FormatTestObjC, ObjCForIn) {
-  verifyFormat("- (void)test {\n"
-               "  for (NSString *n in arrayOfStrings) {\n"
-               "    foo(n);\n"
-               "  }\n"
-               "}");
-  verifyFormat("- (void)test {\n"
-               "  for (NSString *n in (__bridge NSArray *)arrayOfStrings) {\n"
-               "    foo(n);\n"
-               "  }\n"
-               "}");
-  verifyFormat("for (Foo *x in bar) {\n}");
-  verifyFormat("for (Foo *x in [bar baz]) {\n}");
-  verifyFormat("for (Foo *x in [bar baz:blech]) {\n}");
-  verifyFormat("for (Foo *x in [bar baz:blech, 1, 2, 3, 0]) {\n}");
-  verifyFormat("for (Foo *x in [bar baz:^{\n"
-               "       [uh oh];\n"
-               "     }]) {\n}");
-}
-
-TEST_F(FormatTestObjC, ObjCCxxKeywords) {
-  verifyFormat("+ (instancetype)new {\n"
-               "  return nil;\n"
-               "}\n");
-  verifyFormat("+ (instancetype)myNew {\n"
-               "  return [self new];\n"
-               "}\n");
-  verifyFormat("SEL NewSelector(void) { return @selector(new); }\n");
-  verifyFormat("SEL MacroSelector(void) { return MACRO(new); }\n");
-  verifyFormat("+ (instancetype)delete {\n"
-               "  return nil;\n"
-               "}\n");
-  verifyFormat("+ (instancetype)myDelete {\n"
-               "  return [self delete];\n"
-               "}\n");
-  verifyFormat("SEL DeleteSelector(void) { return @selector(delete); }\n");
-  verifyFormat("SEL MacroSelector(void) { return MACRO(delete); }\n");
-  verifyFormat("MACRO(new:)\n");
-  verifyFormat("MACRO(delete:)\n");
-  verifyFormat("foo = @{MACRO(new:) : MACRO(delete:)}\n");
-  verifyFormat("@implementation Foo\n"
-               "// Testing\n"
-               "- (Class)class {\n"
-               "}\n"
-               "- (void)foo {\n"
-               "}\n"
-               "@end\n");
-  verifyFormat("@implementation Foo\n"
-               "- (Class)class {\n"
-               "}\n"
-               "- (void)foo {\n"
-               "}\n"
-               "@end");
-  verifyFormat("@implementation Foo\n"
-               "+ (Class)class {\n"
-               "}\n"
-               "- (void)foo {\n"
-               "}\n"
-               "@end");
-  verifyFormat("@implementation Foo\n"
-               "- (Class)class:(Class)klass {\n"
-               "}\n"
-               "- (void)foo {\n"
-               "}\n"
-               "@end");
-  verifyFormat("@implementation Foo\n"
-               "+ (Class)class:(Class)klass {\n"
-               "}\n"
-               "- (void)foo {\n"
-               "}\n"
-               "@end");
-
-  verifyFormat("@interface Foo\n"
-               "// Testing\n"
-               "- (Class)class;\n"
-               "- (void)foo;\n"
-               "@end\n");
-  verifyFormat("@interface Foo\n"
-               "- (Class)class;\n"
-               "- (void)foo;\n"
-               "@end");
-  verifyFormat("@interface Foo\n"
-               "+ (Class)class;\n"
-               "- (void)foo;\n"
-               "@end");
-  verifyFormat("@interface Foo\n"
-               "- (Class)class:(Class)klass;\n"
-               "- (void)foo;\n"
-               "@end");
-  verifyFormat("@interface Foo\n"
-               "+ (Class)class:(Class)klass;\n"
-               "- (void)foo;\n"
-               "@end");
-}
-
-TEST_F(FormatTestObjC, ObjCLiterals) {
-  verifyFormat("@\"String\"");
-  verifyFormat("@1");
-  verifyFormat("@+4.8");
-  verifyFormat("@-4");
-  verifyFormat("@1LL");
-  verifyFormat("@.5");
-  verifyFormat("@'c'");
-  verifyFormat("@true");
-
-  verifyFormat("NSNumber *smallestInt = @(-INT_MAX - 1);");
-  verifyFormat("NSNumber *piOverTwo = @(M_PI / 2);");
-  verifyFormat("NSNumber *favoriteColor = @(Green);");
-  verifyFormat("NSString *path = @(getenv(\"PATH\"));");
-
-  verifyFormat("[dictionary setObject:@(1) forKey:@\"number\"];");
-}
-
-TEST_F(FormatTestObjC, ObjCDictLiterals) {
-  verifyFormat("@{");
-  verifyFormat("@{}");
-  verifyFormat("@{@\"one\" : @1}");
-  verifyFormat("return @{@\"one\" : @1;");
-  verifyFormat("@{@\"one\" : @1}");
-
-  verifyFormat("@{@\"one\" : @{@2 : @1}}");
-  verifyFormat("@{\n"
-               "  @\"one\" : @{@2 : @1},\n"
-               "}");
-
-  verifyFormat("@{1 > 2 ? @\"one\" : @\"two\" : 1 > 2 ? @1 : @2}");
-  verifyIncompleteFormat("[self setDict:@{}");
-  verifyIncompleteFormat("[self setDict:@{@1 : @2}");
-  verifyFormat("NSLog(@\"%@\", @{@1 : @2, @2 : @3}[@1]);");
-  verifyFormat(
-      "NSDictionary *masses = @{@\"H\" : @1.0078, @\"He\" : @4.0026};");
-  verifyFormat(
-      "NSDictionary *settings = @{AVEncoderKey : @(AVAudioQualityMax)};");
-
-  verifyFormat("NSDictionary *d = @{\n"
-               "  @\"nam\" : NSUserNam(),\n"
-               "  @\"dte\" : [NSDate date],\n"
-               "  @\"processInfo\" : [NSProcessInfo processInfo]\n"
-               "};");
-  verifyFormat(
-      "@{\n"
-      "  NSFontAttributeNameeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee : "
-      "regularFont,\n"
-      "};");
-  verifyFormat(
-      "@{\n"
-      "  NSFontAttributeNameeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee :\n"
-      "      reeeeeeeeeeeeeeeeeeeeeeeegularFont,\n"
-      "};");
-
-  // We should try to be robust in case someone forgets the "@".
-  verifyFormat("NSDictionary *d = {\n"
-               "  @\"nam\" : NSUserNam(),\n"
-               "  @\"dte\" : [NSDate date],\n"
-               "  @\"processInfo\" : [NSProcessInfo processInfo]\n"
-               "};");
-  verifyFormat("NSMutableDictionary *dictionary =\n"
-               "    [NSMutableDictionary dictionaryWithDictionary:@{\n"
-               "      aaaaaaaaaaaaaaaaaaaaa : aaaaaaaaaaaaa,\n"
-               "      bbbbbbbbbbbbbbbbbb : bbbbb,\n"
-               "      cccccccccccccccc : ccccccccccccccc\n"
-               "    }];");
-
-  // Ensure that casts before the key are kept on the same line as the key.
-  verifyFormat(
-      "NSDictionary *d = @{\n"
-      "  (aaaaaaaa id)aaaaaaaaa : (aaaaaaaa id)aaaaaaaaaaaaaaaaaaaaaaaa,\n"
-      "  (aaaaaaaa id)aaaaaaaaaaaaaa : (aaaaaaaa id)aaaaaaaaaaaaaa,\n"
-      "};");
-  Style.ColumnLimit = 40;
-  verifyFormat("int Foo() {\n"
-               "  a12345 = @{a12345 : a12345};\n"
-               "}");
-  verifyFormat("int Foo() {\n"
-               "  a12345 = @{a12345 : @(a12345)};\n"
-               "}");
-  verifyFormat("int Foo() {\n"
-               "  a12345 = @{(Foo *)a12345 : @(a12345)};\n"
-               "}");
-  verifyFormat("int Foo() {\n"
-               "  a12345 = @{@(a12345) : a12345};\n"
-               "}");
-  verifyFormat("int Foo() {\n"
-               "  a12345 = @{@(a12345) : @YES};\n"
-               "}");
-  Style.SpacesInContainerLiterals = false;
-  verifyFormat("int Foo() {\n"
-               "  b12345 = @{b12345: b12345};\n"
-               "}");
-  verifyFormat("int Foo() {\n"
-               "  b12345 = @{(Foo *)b12345: @(b12345)};\n"
-               "}");
-  Style.SpacesInContainerLiterals = true;
-
-  Style = getGoogleStyle(FormatStyle::LK_ObjC);
-  verifyFormat(
-      "@{\n"
-      "  NSFontAttributeNameeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee : "
-      "regularFont,\n"
-      "};");
-}
-
-TEST_F(FormatTestObjC, ObjCArrayLiterals) {
-  verifyIncompleteFormat("@[");
-  verifyFormat("@[]");
-  verifyFormat(
-      "NSArray *array = @[ @\" Hey \", NSApp, [NSNumber numberWithInt:42] ];");
-  verifyFormat("return @[ @3, @[], @[ @4, @5 ] ];");
-  verifyFormat("NSArray *array = @[ [foo description] ];");
-
-  verifyFormat(
-      "NSArray *some_variable = @[\n"
-      "  aaaa == bbbbbbbbbbb ? @\"aaaaaaaaaaaa\" : @\"aaaaaaaaaaaaaa\",\n"
-      "  @\"aaaaaaaaaaaaaaaaa\",\n"
-      "  @\"aaaaaaaaaaaaaaaaa\",\n"
-      "  @\"aaaaaaaaaaaaaaaaa\",\n"
-      "];");
-  verifyFormat(
-      "NSArray *some_variable = @[\n"
-      "  aaaa == bbbbbbbbbbb ? @\"aaaaaaaaaaaa\" : @\"aaaaaaaaaaaaaa\",\n"
-      "  @\"aaaaaaaaaaaaaaaa\", @\"aaaaaaaaaaaaaaaa\", @\"aaaaaaaaaaaaaaaa\"\n"
-      "];");
-  verifyFormat("NSArray *some_variable = @[\n"
-               "  @\"aaaaaaaaaaaaaaaaa\",\n"
-               "  @\"aaaaaaaaaaaaaaaaa\",\n"
-               "  @\"aaaaaaaaaaaaaaaaa\",\n"
-               "  @\"aaaaaaaaaaaaaaaaa\",\n"
-               "];");
-  verifyFormat("NSArray *array = @[\n"
-               "  @\"a\",\n"
-               "  @\"a\",\n" // Trailing comma -> one per line.
-               "];");
-
-  // We should try to be robust in case someone forgets the "@".
-  verifyFormat("NSArray *some_variable = [\n"
-               "  @\"aaaaaaaaaaaaaaaaa\",\n"
-               "  @\"aaaaaaaaaaaaaaaaa\",\n"
-               "  @\"aaaaaaaaaaaaaaaaa\",\n"
-               "  @\"aaaaaaaaaaaaaaaaa\",\n"
-               "];");
-  verifyFormat(
-      "- (NSAttributedString *)attributedStringForSegment:(NSUInteger)segment\n"
-      "                                             index:(NSUInteger)index\n"
-      "                                nonDigitAttributes:\n"
-      "                                    (NSDictionary *)noDigitAttributes;");
-  verifyFormat("[someFunction someLooooooooooooongParameter:@[\n"
-               "  NSBundle.mainBundle.infoDictionary[@\"a\"]\n"
-               "]];");
-  Style.ColumnLimit = 40;
-  verifyFormat("int Foo() {\n"
-               "  a12345 = @[ a12345, a12345 ];\n"
-               "}");
-  verifyFormat("int Foo() {\n"
-               "  a123 = @[ (Foo *)a12345, @(a12345) ];\n"
-               "}");
-  Style.SpacesInContainerLiterals = false;
-  verifyFormat("int Foo() {\n"
-               "  b12345 = @[b12345, b12345];\n"
-               "}");
-  verifyFormat("int Foo() {\n"
-               "  b12345 = @[(Foo *)b12345, @(b12345)];\n"
-               "}");
-  Style.SpacesInContainerLiterals = true;
-  Style.ColumnLimit = 20;
-  // We can't break string literals inside NSArray literals
-  // (that raises -Wobjc-string-concatenation).
-  verifyFormat("NSArray *foo = @[\n"
-               "  @\"aaaaaaaaaaaaaaaaaaaaaaaaaa\"\n"
-               "];\n");
-}
-
-TEST_F(FormatTestObjC, BreaksCallStatementWhereSemiJustOverTheLimit) {
-  Style.ColumnLimit = 60;
-  // If the statement starting with 'a = ...' is put on a single line, the ';'
-  // is at line 61.
-  verifyFormat("int f(int a) {\n"
-               "  a = [self aaaaaaaaaa:bbbbbbbbb\n"
-               "             ccccccccc:dddddddd\n"
-               "                    ee:fddd];\n"
-               "}");
-}
-
-TEST_F(FormatTestObjC, AlwaysBreakBeforeMultilineStrings) {
-  Style = getGoogleStyle(FormatStyle::LK_ObjC);
-  Style.ColumnLimit = 40;
-  verifyFormat("aaaa = @\"bbbb\"\n"
-               "       @\"cccc\";");
-  verifyFormat("aaaa(@\"bbbb\"\n"
-               "     @\"cccc\");");
-  verifyFormat("aaaa(qqq, @\"bbbb\"\n"
-               "          @\"cccc\");");
-  verifyFormat("[aaaa qqqq:@\"bbbb\"\n"
-               "           @\"cccc\"];");
-  verifyFormat("aaaa = [aaaa qqqq:@\"bbbb\"\n"
-               "                  @\"cccc\"];");
-  verifyFormat("[aaaa qqqq:@\"bbbb\"\n"
-               "           @\"cccc\"\n"
-               "        rr:42\n"
-               "    ssssss:@\"ee\"\n"
-               "           @\"fffff\"];");
-}
-
-TEST_F(FormatTestObjC, DisambiguatesCallsFromCppLambdas) {
-  verifyFormat("x = ([a foo:bar] && b->c == 'd');");
-  verifyFormat("x = ([a foo:bar] + b->c == 'd');");
-  verifyFormat("x = ([a foo:bar] + !b->c == 'd');");
-  verifyFormat("x = ([a foo:bar] + ~b->c == 'd');");
-  verifyFormat("x = ([a foo:bar] - b->c == 'd');");
-  verifyFormat("x = ([a foo:bar] / b->c == 'd');");
-  verifyFormat("x = ([a foo:bar] % b->c == 'd');");
-  verifyFormat("x = ([a foo:bar] | b->c == 'd');");
-  verifyFormat("x = ([a foo:bar] || b->c == 'd');");
-  verifyFormat("x = ([a foo:bar] && b->c == 'd');");
-  verifyFormat("x = ([a foo:bar] == b->c == 'd');");
-  verifyFormat("x = ([a foo:bar] != b->c == 'd');");
-  verifyFormat("x = ([a foo:bar] <= b->c == 'd');");
-  verifyFormat("x = ([a foo:bar] >= b->c == 'd');");
-  verifyFormat("x = ([a foo:bar] << b->c == 'd');");
-  verifyFormat("x = ([a foo:bar] ? b->c == 'd' : 'e');");
-  // FIXME: The following are wrongly classified as C++ lambda expressions.
-  // For example this code:
-  //   x = ([a foo:bar] & b->c == 'd');
-  // is formatted as:
-  //   x = ([a foo:bar] & b -> c == 'd');
-  // verifyFormat("x = ([a foo:bar] & b->c == 'd');");
-  // verifyFormat("x = ([a foo:bar] > b->c == 'd');");
-  // verifyFormat("x = ([a foo:bar] < b->c == 'd');");
-  // verifyFormat("x = ([a foo:bar] >> b->c == 'd');");
-}
-
-TEST_F(FormatTestObjC, DisambiguatesCallsFromStructuredBindings) {
-  verifyFormat("int f() {\n"
-               "  if (a && [f arg])\n"
-               "    return 0;\n"
-               "}");
-  verifyFormat("int f() {\n"
-               "  if (a & [f arg])\n"
-               "    return 0;\n"
-               "}");
-  verifyFormat("int f() {\n"
-               "  for (auto &[elem] : list)\n"
-               "    return 0;\n"
-               "}");
-  verifyFormat("int f() {\n"
-               "  for (auto &&[elem] : list)\n"
-               "    return 0;\n"
-               "}");
-  verifyFormat(
-      "int f() {\n"
-      "  for (auto /**/ const /**/ volatile /**/ && /**/ [elem] : list)\n"
-      "    return 0;\n"
-      "}");
-}
-
-TEST_F(FormatTestObjC, BreakLineBeforeNestedBlockParam) {
-  Style = getGoogleStyle(FormatStyle::LK_ObjC);
-  Style.ObjCBreakBeforeNestedBlockParam = false;
-  Style.ColumnLimit = 0;
-
-  verifyFormat("[self.test1 t:self callback:^(typeof(self) self, NSNumber *u, "
-               "NSNumber *v) {\n"
-               "  u = v;\n"
-               "}]");
-
-  verifyFormat("[self.test1 t:self w:self callback:^(typeof(self) self, "
-               "NSNumber *u, NSNumber *v) {\n"
-               "  u = v;\n"
-               "}]");
-
-  verifyFormat("[self.test1 t:self w:self callback:^(typeof(self) self, "
-               "NSNumber *u, NSNumber *v) {\n"
-               "  u = c;\n"
-               "} w:self callback2:^(typeof(self) self, NSNumber *a, NSNumber "
-               "*b, NSNumber *c) {\n"
-               "  b = c;\n"
-               "}]");
-  verifyFormat("[self.test1 t:self w:self callback:^(typeof(self) self, "
-               "NSNumber *u, NSNumber *v) {\n"
-               "  u = v;\n"
-               "} z:self]");
-
-  Style.ColumnLimit = 80;
-  verifyFormat(
-      "[self.test_method a:self b:self\n"
-      "           callback:^(typeof(self) self, NSNumber *u, NSNumber *v) {\n"
-      "             u = v;\n"
-      "           }]");
-
-  verifyFormat("[self block:^(void) {\n"
-               "  doStuff();\n"
-               "} completionHandler:^(void) {\n"
-               "  doStuff();\n"
-               "  [self block:^(void) {\n"
-               "    doStuff();\n"
-               "  } completionHandler:^(void) {\n"
-               "    doStuff();\n"
-               "  }];\n"
-               "}];");
-
-  Style.ColumnLimit = 0;
-  verifyFormat("[[SessionService sharedService] "
-               "loadWindowWithCompletionBlock:^(SessionWindow *window) {\n"
-               "  if (window) {\n"
-               "    [self windowDidLoad:window];\n"
-               "  } else {\n"
-               "    [self errorLoadingWindow];\n"
-               "  }\n"
-               "}];");
-  verifyFormat("[controller test:^{\n"
-               "  doStuff();\n"
-               "} withTimeout:5 completionHandler:^{\n"
-               "  doStuff();\n"
-               "}];");
-  verifyFormat(
-      "[self setupTextFieldSignals:@[\n"
-      "  self.documentWidthField,\n"
-      "  self.documentHeightField,\n"
-      "] solver:^(NSTextField *textField) {\n"
-      "  return [self.representedObject solveEquationForTextField:textField];\n"
-      "}];");
-}
-
-TEST_F(FormatTestObjC, IfNotUnlikely) {
-  Style = getGoogleStyle(FormatStyle::LK_ObjC);
-
-  verifyFormat("if (argc < 5) [obj func:arg];");
-  verifyFormat("if (argc < 5) [[obj1 method1:arg1] method2:arg2];");
-  verifyFormat("if (argc < 5) [[foo bar] baz:i[0]];");
-  verifyFormat("if (argc < 5) [[foo bar] baz:i[0]][1];");
-
-  verifyFormat("if (argc < 5)\n"
-               "  [obj func:arg];\n"
-               "else\n"
-               "  [obj func:arg2];");
-
-  verifyFormat("if (argc < 5) [[unlikely]]\n"
-               "  [obj func:arg];\n"
-               "else [[likely]]\n"
-               "  [obj func:arg2];");
-}
-
-} // end namespace
-} // end namespace format
-} // end namespace clang
diff --git a/gnu/llvm/clang/unittests/Format/FormatTestProto.cpp b/gnu/llvm/clang/unittests/Format/FormatTestProto.cpp
deleted file mode 100644
index 1ff7c22a6df..00000000000
--- a/gnu/llvm/clang/unittests/Format/FormatTestProto.cpp
+++ /dev/null
@@ -1,671 +0,0 @@
-//===- unittest/Format/FormatTestProto.cpp --------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "FormatTestUtils.h"
-#include "clang/Format/Format.h"
-#include "llvm/Support/Debug.h"
-#include "gtest/gtest.h"
-
-#define DEBUG_TYPE "format-test"
-
-namespace clang {
-namespace format {
-
-class FormatTestProto : public ::testing::Test {
-protected:
-  static std::string format(llvm::StringRef Code, unsigned Offset,
-                            unsigned Length, const FormatStyle &Style) {
-    LLVM_DEBUG(llvm::errs() << "---\n");
-    LLVM_DEBUG(llvm::errs() << Code << "\n\n");
-    std::vector<tooling::Range> Ranges(1, tooling::Range(Offset, Length));
-    tooling::Replacements Replaces = reformat(Style, Code, Ranges);
-    auto Result = applyAllReplacements(Code, Replaces);
-    EXPECT_TRUE(static_cast<bool>(Result));
-    LLVM_DEBUG(llvm::errs() << "\n" << *Result << "\n\n");
-    return *Result;
-  }
-
-  static std::string format(llvm::StringRef Code) {
-    FormatStyle Style = getGoogleStyle(FormatStyle::LK_Proto);
-    Style.ColumnLimit = 60; // To make writing tests easier.
-    return format(Code, 0, Code.size(), Style);
-  }
-
-  static void verifyFormat(llvm::StringRef Code) {
-    EXPECT_EQ(Code.str(), format(Code)) << "Expected code is not stable";
-    EXPECT_EQ(Code.str(), format(test::messUp(Code)));
-  }
-};
-
-TEST_F(FormatTestProto, FormatsMessages) {
-  verifyFormat("message SomeMessage {\n"
-               "  required int32 field1 = 1;\n"
-               "}");
-  verifyFormat("message SomeMessage {\n"
-               "  required .absolute.Reference field1 = 1;\n"
-               "}");
-  verifyFormat("message SomeMessage {\n"
-               "  required int32 field1 = 1;\n"
-               "  optional string field2 = 2 [default = \"2\"]\n"
-               "}");
-
-  verifyFormat("message SomeMessage {\n"
-               "  optional really.really.long.qualified.type.aaa.aaaaaaa\n"
-               "      fiiiiiiiiiiiiiiiiiiiiiiiiield = 1;\n"
-               "  optional\n"
-               "      really.really.long.qualified.type.aaa.aaaaaaa.aaaaaaaa\n"
-               "          another_fiiiiiiiiiiiiiiiiiiiiield = 2;\n"
-               "}");
-  verifyFormat("message SomeMessage {\n"
-               "  map<string, Project> projects = 1;\n"
-               "  optional map<string, int32> size_projects = 2;\n"
-               "  map<int, really.really.really.long.qualified.type.nameeee>\n"
-               "      projects = 3;\n"
-               "  map<int, really.really.really.really.long.qualified.type\n"
-               "               .nameeee> projects = 4;\n"
-               "  map<int,\n"
-               "      reallyreallyreallyreallyreallyreallyreallylongname>\n"
-               "      projects = 5;\n"
-               "  map<int, Project>\n"
-               "      longlonglonglonglonglonglonglonglonglongonglon = 6;\n"
-               "  map<releleallyreallyreallyreallyreallyreallyreallylongname,\n"
-               "      int> projects = 7;\n"
-               "  map<releleallyreallyreallyreallyreallyreallyreallylongname,\n"
-               "      releleallyreallyreallyreallyreallyreallyreallylongname>\n"
-               "      releleallyreallyreallyreallyreallyreallyreallylongnam =\n"
-               "          8;\n"
-               "  map<relele.llyreal.yreallyr.allyreally.eallyreal\n"
-               "          .sauenirylongname,\n"
-               "      really.really.really.really.long.qualified.type\n"
-               "          .nameeee> projects = 9;\n"
-               "}");
-}
-
-TEST_F(FormatTestProto, KeywordsInOtherLanguages) {
-  verifyFormat("optional string operator = 1;");
-}
-
-TEST_F(FormatTestProto, FormatsEnums) {
-  verifyFormat("enum Type {\n"
-               "  UNKNOWN = 0;\n"
-               "  TYPE_A = 1;\n"
-               "  TYPE_B = 2;\n"
-               "};");
-  verifyFormat("enum Type {\n"
-               "  UNKNOWN = 0 [(some_options) = { a: aa, b: bb }];\n"
-               "};");
-  verifyFormat("enum Type {\n"
-               "  UNKNOWN = 0 [(some_options) = {\n"
-               "    a: aa,  // wrap\n"
-               "    b: bb\n"
-               "  }];\n"
-               "};");
-}
-
-TEST_F(FormatTestProto, EnumAsFieldName) {
-  verifyFormat("message SomeMessage {\n"
-               "  required int32 enum = 1;\n"
-               "}");
-}
-
-TEST_F(FormatTestProto, UnderstandsReturns) {
-  verifyFormat("rpc Search(SearchRequest) returns (SearchResponse);");
-}
-
-TEST_F(FormatTestProto, MessageFieldAttributes) {
-  verifyFormat("optional string test = 1 [default = \"test\"];");
-  verifyFormat("optional bool a = 1 [default = true, deprecated = true];");
-  verifyFormat("optional LongMessageType long_proto_field = 1 [\n"
-               "  default = REALLY_REALLY_LONG_CONSTANT_VALUE,\n"
-               "  deprecated = true\n"
-               "];");
-  verifyFormat("optional LongMessageType long_proto_field = 1\n"
-               "    [default = REALLY_REALLY_LONG_CONSTANT_VALUE];");
-  verifyFormat("repeated double value = 1\n"
-               "    [(aaaaaaa.aaaaaaaaa) = { aaaaaaaaaaaaaaaaa: AAAAAAAA }];");
-  verifyFormat("repeated double value = 1 [(aaaaaaa.aaaaaaaaa) = {\n"
-               "  aaaaaaaaaaaaaaaa: AAAAAAAAAA,\n"
-               "  bbbbbbbbbbbbbbbb: BBBBBBBBBB\n"
-               "}];");
-  verifyFormat("repeated double value = 1 [(aaaaaaa.aaaaaaaaa) = {\n"
-               "  aaaaaaaaaaaaaaaa: AAAAAAAAAA\n"
-               "  bbbbbbbbbbbbbbbb: BBBBBBBBBB\n"
-               "}];");
-  verifyFormat("repeated double value = 1 [\n"
-               "  (aaaaaaa.aaaaaaaaa) = {\n"
-               "    aaaaaaaaaaaaaaaa: AAAAAAAAAA\n"
-               "    bbbbbbbbbbbbbbbb: BBBBBBBBBB\n"
-               "  },\n"
-               "  (bbbbbbb.bbbbbbbbb) = {\n"
-               "    aaaaaaaaaaaaaaaa: AAAAAAAAAA\n"
-               "    bbbbbbbbbbbbbbbb: BBBBBBBBBB\n"
-               "  }\n"
-               "];");
-  verifyFormat("repeated double value = 1 [(aaaaaaa.aaaaaaaaa) = {\n"
-               "  type: \"AAAAAAAAAA\"\n"
-               "  is: \"AAAAAAAAAA\"\n"
-               "  or: \"BBBBBBBBBB\"\n"
-               "}];");
-  verifyFormat("repeated double value = 1 [(aaaaaaa.aaaaaaaaa) = {\n"
-               "  aaaaaaaaaaaaaaaa: AAAAAAAAAA,\n"
-               "  bbbbbbb: BBBB,\n"
-               "  bbbb: BBB\n"
-               "}];");
-  verifyFormat("optional AAA aaa = 1 [\n"
-               "  foo = {\n"
-               "    key: 'a'  //\n"
-               "  },\n"
-               "  bar = {\n"
-               "    key: 'a'  //\n"
-               "  }\n"
-               "];");
-  verifyFormat("optional string test = 1 [default = \"test\"\n"
-               "                                    \"test\"];");
-  verifyFormat("optional Aaaaaaaa aaaaaaaa = 12 [\n"
-               "  (aaa) = aaaa,\n"
-               "  (bbbbbbbbbbbbbbbbbbbbbbbbbb) = {\n"
-               "    aaaaaaaaaaaaaaaaa: true,\n"
-               "    aaaaaaaaaaaaaaaa: true\n"
-               "  }\n"
-               "];");
-  verifyFormat("extensions 20 [(proto2.type) = 'Aaaa.bbbb'];");
-  verifyFormat("extensions 20\n"
-               "    [(proto3.type) = 'Aaaa.bbbb', (aaa.Aaa) = 'aaa.bbb'];");
-  verifyFormat("extensions 123 [\n"
-               "  (aaa) = aaaa,\n"
-               "  (bbbbbbbbbbbbbbbbbbbbbbbbbb) = {\n"
-               "    aaaaaaaaaaaaaaaaa: true,\n"
-               "    aaaaaaaaaaaaaaaa: true\n"
-               "  }\n"
-               "];");
-}
-
-TEST_F(FormatTestProto, DoesntWrapFileOptions) {
-  EXPECT_EQ(
-      "option java_package = "
-      "\"some.really.long.package.that.exceeds.the.column.limit\";",
-      format("option    java_package   =    "
-             "\"some.really.long.package.that.exceeds.the.column.limit\";"));
-}
-
-TEST_F(FormatTestProto, TrailingCommentAfterFileOption) {
-  verifyFormat("option java_package = \"foo.pkg\";  // comment\n");
-}
-
-TEST_F(FormatTestProto, FormatsOptions) {
-  verifyFormat("option (MyProto.options) = {\n"
-               "  field_a: OK\n"
-               "  field_b: \"OK\"\n"
-               "  field_c: \"OK\"\n"
-               "  msg_field: { field_d: 123 }\n"
-               "};");
-  verifyFormat("option (MyProto.options) = {\n"
-               "  field_a: OK\n"
-               "  field_b: \"OK\"\n"
-               "  field_c: \"OK\"\n"
-               "  msg_field: { field_d: 123 field_e: OK }\n"
-               "};");
-  verifyFormat("option (MyProto.options) = {\n"
-               "  field_a: OK  // Comment\n"
-               "  field_b: \"OK\"\n"
-               "  field_c: \"OK\"\n"
-               "  msg_field: { field_d: 123 }\n"
-               "};");
-  verifyFormat("option (MyProto.options) = {\n"
-               "  field_c: \"OK\"\n"
-               "  msg_field { field_d: 123 }\n"
-               "};");
-  verifyFormat("option (MyProto.options) = {\n"
-               "  field_a: OK\n"
-               "  field_b { field_c: OK }\n"
-               "  field_d: OKOKOK\n"
-               "  field_e: OK\n"
-               "}");
-
-  // Support syntax with <> instead of {}.
-  verifyFormat("option (MyProto.options) = {\n"
-               "  field_c: \"OK\",\n"
-               "  msg_field: < field_d: 123 >\n"
-               "  empty: <>\n"
-               "  empty <>\n"
-               "};");
-
-  verifyFormat("option (MyProto.options) = {\n"
-               "  field_a: OK\n"
-               "  field_b < field_c: OK >\n"
-               "  field_d: OKOKOK\n"
-               "  field_e: OK\n"
-               "}");
-
-  verifyFormat("option (MyProto.options) = {\n"
-               "  msg_field: <>\n"
-               "  field_c: \"OK\",\n"
-               "  msg_field: < field_d: 123 >\n"
-               "  field_e: OK\n"
-               "  msg_field: < field_d: 12 >\n"
-               "};");
-
-  verifyFormat("option (MyProto.options) = <\n"
-               "  field_a: OK\n"
-               "  field_b: \"OK\"\n"
-               "  field_c: 1\n"
-               "  field_d: 12.5\n"
-               "  field_e: OK\n"
-               ">;");
-
-  verifyFormat("option (MyProto.options) = <\n"
-               "  field_a: OK,\n"
-               "  field_b: \"OK\",\n"
-               "  field_c: 1,\n"
-               "  field_d: 12.5,\n"
-               "  field_e: OK,\n"
-               ">;");
-
-  verifyFormat("option (MyProto.options) = <\n"
-               "  field_a: \"OK\"\n"
-               "  msg_field: { field_b: OK }\n"
-               "  field_g: OK\n"
-               "  field_g: OK\n"
-               "  field_g: OK\n"
-               ">;");
-
-  verifyFormat("option (MyProto.options) = <\n"
-               "  field_a: \"OK\"\n"
-               "  msg_field <\n"
-               "    field_b: OK\n"
-               "    field_c: OK\n"
-               "    field_d: OK\n"
-               "    field_e: OK\n"
-               "    field_f: OK\n"
-               "  >\n"
-               "  field_g: OK\n"
-               ">;");
-
-  verifyFormat("option (MyProto.options) = <\n"
-               "  field_a: \"OK\"\n"
-               "  msg_field <\n"
-               "    field_b: OK,\n"
-               "    field_c: OK,\n"
-               "    field_d: OK,\n"
-               "    field_e: OK,\n"
-               "    field_f: OK\n"
-               "  >\n"
-               "  field_g: OK\n"
-               ">;");
-
-  verifyFormat("option (MyProto.options) = <\n"
-               "  field_a: \"OK\"\n"
-               "  msg_field: <\n"
-               "    field_b: OK\n"
-               "    field_c: OK\n"
-               "    field_d: OK\n"
-               "    field_e: OK\n"
-               "    field_f: OK\n"
-               "  >\n"
-               "  field_g: OK\n"
-               ">;");
-
-  verifyFormat("option (MyProto.options) = <\n"
-               "  field_a: \"OK\"\n"
-               "  msg_field: {\n"
-               "    field_b: OK\n"
-               "    field_c: OK\n"
-               "    field_d: OK\n"
-               "    field_e: OK\n"
-               "    field_f: OK\n"
-               "  }\n"
-               "  field_g: OK\n"
-               ">;");
-
-  verifyFormat("option (MyProto.options) = <\n"
-               "  field_a: \"OK\"\n"
-               "  msg_field {\n"
-               "    field_b: OK\n"
-               "    field_c: OK\n"
-               "    field_d: OK\n"
-               "    field_e: OK\n"
-               "    field_f: OK\n"
-               "  }\n"
-               "  field_g: OK\n"
-               ">;");
-
-  verifyFormat("option (MyProto.options) = {\n"
-               "  field_a: \"OK\"\n"
-               "  msg_field <\n"
-               "    field_b: OK\n"
-               "    field_c: OK\n"
-               "    field_d: OK\n"
-               "    field_e: OK\n"
-               "    field_f: OK\n"
-               "  >\n"
-               "  field_g: OK\n"
-               "};");
-
-  verifyFormat("option (MyProto.options) = {\n"
-               "  field_a: \"OK\"\n"
-               "  msg_field: <\n"
-               "    field_b: OK\n"
-               "    field_c: OK\n"
-               "    field_d: OK\n"
-               "    field_e: OK\n"
-               "    field_f: OK\n"
-               "  >\n"
-               "  field_g: OK\n"
-               "};");
-
-  verifyFormat("option (MyProto.options) = <\n"
-               "  field_a: \"OK\"\n"
-               "  msg_field {\n"
-               "    field_b: OK\n"
-               "    field_c: OK\n"
-               "    field_d: OK\n"
-               "    msg_field <\n"
-               "      field_A: 1\n"
-               "      field_B: 2\n"
-               "      field_C: 3\n"
-               "      field_D: 4\n"
-               "      field_E: 5\n"
-               "    >\n"
-               "    msg_field < field_A: 1 field_B: 2 field_C: 3 f_D: 4 >\n"
-               "    field_e: OK\n"
-               "    field_f: OK\n"
-               "  }\n"
-               "  field_g: OK\n"
-               ">;");
-
-  verifyFormat("option (MyProto.options) = <\n"
-               "  data1 < key1: value1 >\n"
-               "  data2 { key2: value2 }\n"
-               ">;");
-
-  verifyFormat("option (MyProto.options) = <\n"
-               "  app_id: 'com.javax.swing.salsa.latino'\n"
-               "  head_id: 1\n"
-               "  data < key: value >\n"
-               ">;");
-
-  verifyFormat("option (MyProto.options) = {\n"
-               "  app_id: 'com.javax.swing.salsa.latino'\n"
-               "  head_id: 1\n"
-               "  headheadheadheadheadhead_id: 1\n"
-               "  product_data { product { 1 } }\n"
-               "};");
-}
-
-TEST_F(FormatTestProto, DoesntWrapPackageStatements) {
-  verifyFormat(
-      "package"
-      " some.really.long.package.that.exceeds.the.column.limit00000000;");
-}
-
-TEST_F(FormatTestProto, TrailingCommentAfterPackage) {
-  verifyFormat("package foo.pkg;  // comment\n");
-}
-
-TEST_F(FormatTestProto, FormatsService) {
-  verifyFormat("service SearchService {\n"
-               "  rpc Search(SearchRequest) returns (SearchResponse) {\n"
-               "    option foo = true;\n"
-               "  }\n"
-               "};");
-}
-
-TEST_F(FormatTestProto, ExtendingMessage) {
-  verifyFormat("extend .foo.Bar {}");
-}
-
-TEST_F(FormatTestProto, FormatsImports) {
-  verifyFormat("import \"a.proto\";\n"
-               "import \"b.proto\";\n"
-               "// comment\n"
-               "message A {}");
-
-  verifyFormat("import public \"a.proto\";\n"
-               "import \"b.proto\";\n"
-               "// comment\n"
-               "message A {}");
-
-  // Missing semicolons should not confuse clang-format.
-  verifyFormat("import \"a.proto\"\n"
-               "import \"b.proto\"\n"
-               "// comment\n"
-               "message A {}");
-}
-
-TEST_F(FormatTestProto, KeepsLongStringLiteralsOnSameLine) {
-  verifyFormat(
-      "option (MyProto.options) = {\n"
-      "  foo: {\n"
-      "    text: \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaasaaaaaaaa\"\n"
-      "  }\n"
-      "}");
-}
-
-TEST_F(FormatTestProto, FormatsOptionsExtensions) {
-  verifyFormat("option (MyProto.options) = {\n"
-               "  msg_field: { field_d: 123 }\n"
-               "  [ext.t/u] { key: value }\n"
-               "  key: value\n"
-               "  [t.u/v] <\n"
-               "    [ext] { key: value }\n"
-               "  >\n"
-               "};");
-}
-
-TEST_F(FormatTestProto, SpacesAroundPercents) {
-  verifyFormat("option (MyProto.options) = {\n"
-               "  key: %lld\n"
-               "  key: 0x%04x\n"
-               "  key: \"%d %d\"\n"
-               "};");
-}
-
-TEST_F(FormatTestProto, FormatsRepeatedListInitializersInOptions) {
-  verifyFormat("option (MyProto.options) = {\n"
-               "  key: item\n"
-               "  keys: [\n"
-               "    'ala',\n"
-               "    'bala',\n"
-               "    'porto',\n"
-               "    'kala',\n"
-               "    'too',\n"
-               "    'long',\n"
-               "    'long',\n"
-               "    'long'\n"
-               "  ]\n"
-               "  key: [ item ]\n"
-               "  msg {\n"
-               "    key: item\n"
-               "    keys: [\n"
-               "      'ala',\n"
-               "      'bala',\n"
-               "      'porto',\n"
-               "      'kala',\n"
-               "      'too',\n"
-               "      'long',\n"
-               "      'long'\n"
-               "    ]\n"
-               "  }\n"
-               "  key: value\n"
-               "};");
-}
-
-TEST_F(FormatTestProto, AcceptsOperatorAsKeyInOptions) {
-  verifyFormat("option (MyProto.options) = {\n"
-               "  bbbbbbbbb: <\n"
-               "    ccccccccccccccccccccccc: <\n"
-               "      operator: 1\n"
-               "      operator: 2\n"
-               "      operator: 3\n"
-               "      operator { key: value }\n"
-               "    >\n"
-               "  >\n"
-               "};");
-}
-
-TEST_F(FormatTestProto, BreaksEntriesOfSubmessagesContainingSubmessages) {
-  FormatStyle Style = getGoogleStyle(FormatStyle::LK_TextProto);
-  Style.ColumnLimit = 60;
-  // The column limit allows for the keys submessage to be put on 1 line, but we
-  // break it since it contains a submessage an another entry.
-  verifyFormat("option (MyProto.options) = {\n"
-               "  key: valueeeeeeee\n"
-               "  keys: {\n"
-               "    item: 'aaaaaaaaaaaaaaaa'\n"
-               "    sub <>\n"
-               "  }\n"
-               "}");
-  verifyFormat("option (MyProto.options) = {\n"
-               "  key: valueeeeeeee\n"
-               "  keys: {\n"
-               "    item: 'aaaaaaaaaaaaaaaa'\n"
-               "    sub {}\n"
-               "  }\n"
-               "}");
-  verifyFormat("option (MyProto.options) = {\n"
-               "  key: valueeeeeeee\n"
-               "  keys: {\n"
-               "    sub {}\n"
-               "    sub: <>\n"
-               "    sub: []\n"
-               "  }\n"
-               "}");
-  verifyFormat("option (MyProto.options) = {\n"
-               "  key: valueeeeeeee\n"
-               "  keys: {\n"
-               "    item: 'aaaaaaaaaaa'\n"
-               "    sub { msg: 1 }\n"
-               "  }\n"
-               "}");
-  verifyFormat("option (MyProto.options) = {\n"
-               "  key: valueeeeeeee\n"
-               "  keys: {\n"
-               "    item: 'aaaaaaaaaaa'\n"
-               "    sub: { msg: 1 }\n"
-               "  }\n"
-               "}");
-  verifyFormat("option (MyProto.options) = {\n"
-               "  key: valueeeeeeee\n"
-               "  keys: {\n"
-               "    item: 'aaaaaaaaaaa'\n"
-               "    sub < msg: 1 >\n"
-               "  }\n"
-               "}");
-  verifyFormat("option (MyProto.options) = {\n"
-               "  key: valueeeeeeee\n"
-               "  keys: {\n"
-               "    item: 'aaaaaaaaaaa'\n"
-               "    sub: [ msg: 1 ]\n"
-               "  }\n"
-               "}");
-  verifyFormat("option (MyProto.options) = {\n"
-               "  key: valueeeeeeee\n"
-               "  keys: <\n"
-               "    item: 'aaaaaaaaaaa'\n"
-               "    sub: [ 1, 2 ]\n"
-               "  >\n"
-               "}");
-  verifyFormat("option (MyProto.options) = {\n"
-               "  key: valueeeeeeee\n"
-               "  keys: {\n"
-               "    sub {}\n"
-               "    item: 'aaaaaaaaaaaaaaaa'\n"
-               "  }\n"
-               "}");
-  verifyFormat("option (MyProto.options) = {\n"
-               "  key: valueeeeeeee\n"
-               "  keys: {\n"
-               "    sub: []\n"
-               "    item: 'aaaaaaaaaaaaaaaa'\n"
-               "  }\n"
-               "}");
-  verifyFormat("option (MyProto.options) = {\n"
-               "  key: valueeeeeeee\n"
-               "  keys: {\n"
-               "    sub <>\n"
-               "    item: 'aaaaaaaaaaaaaaaa'\n"
-               "  }\n"
-               "}");
-  verifyFormat("option (MyProto.options) = {\n"
-               "  key: valueeeeeeee\n"
-               "  keys: {\n"
-               "    sub { key: value }\n"
-               "    item: 'aaaaaaaaaaaaaaaa'\n"
-               "  }\n"
-               "}");
-  verifyFormat("option (MyProto.options) = {\n"
-               "  key: valueeeeeeee\n"
-               "  keys: {\n"
-               "    sub: [ 1, 2 ]\n"
-               "    item: 'aaaaaaaaaaaaaaaa'\n"
-               "  }\n"
-               "}");
-  verifyFormat("option (MyProto.options) = {\n"
-               "  key: valueeeeeeee\n"
-               "  keys: {\n"
-               "    sub < sub_2: {} >\n"
-               "    item: 'aaaaaaaaaaaaaaaa'\n"
-               "  }\n"
-               "}");
-  verifyFormat("option (MyProto.options) = {\n"
-               "  key: valueeeeeeee\n"
-               "  keys: {\n"
-               "    item: data\n"
-               "    sub: [ 1, 2 ]\n"
-               "    item: 'aaaaaaaaaaaaaaaa'\n"
-               "  }\n"
-               "}");
-  verifyFormat("option (MyProto.options) = {\n"
-               "  key: valueeeeeeee\n"
-               "  keys: {\n"
-               "    item: data\n"
-               "    sub < sub_2: {} >\n"
-               "    item: 'aaaaaaaaaaaaaaaa'\n"
-               "  }\n"
-               "}");
-  verifyFormat("option (MyProto.options) = {\n"
-               "  sub: {\n"
-               "    key: valueeeeeeee\n"
-               "    keys: {\n"
-               "      sub: [ 1, 2 ]\n"
-               "      item: 'aaaaaaaaaaaaaaaa'\n"
-               "    }\n"
-               "  }\n"
-               "}");
-}
-
-TEST_F(FormatTestProto, PreventBreaksBetweenKeyAndSubmessages) {
-  verifyFormat("option (MyProto.options) = {\n"
-               "  submessage: {\n"
-               "    key: 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'\n"
-               "  }\n"
-               "}");
-  verifyFormat("option (MyProto.options) = {\n"
-               "  submessage {\n"
-               "    key: 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'\n"
-               "  }\n"
-               "}");
-  verifyFormat("option (MyProto.options) = {\n"
-               "  submessage: <\n"
-               "    key: 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'\n"
-               "  >\n"
-               "}");
-  verifyFormat("option (MyProto.options) = {\n"
-               "  submessage <\n"
-               "    key: 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'\n"
-               "  >\n"
-               "}");
-  verifyFormat("option (MyProto.options) = {\n"
-               "  repeatedd: [\n"
-               "    'eyaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'\n"
-               "  ]\n"
-               "}");
-}
-
-} // namespace format
-} // end namespace clang
diff --git a/gnu/llvm/clang/unittests/Format/FormatTestRawStrings.cpp b/gnu/llvm/clang/unittests/Format/FormatTestRawStrings.cpp
deleted file mode 100644
index 6f9a0d650ba..00000000000
--- a/gnu/llvm/clang/unittests/Format/FormatTestRawStrings.cpp
+++ /dev/null
@@ -1,997 +0,0 @@
-//===- unittest/Format/FormatTestRawStrings.cpp - Formatting unit tests ---===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/Format/Format.h"
-
-#include "../Tooling/ReplacementTest.h"
-#include "FormatTestUtils.h"
-
-#include "llvm/Support/Debug.h"
-#include "llvm/Support/MemoryBuffer.h"
-#include "gtest/gtest.h"
-
-#define DEBUG_TYPE "format-test"
-
-using clang::tooling::ReplacementTest;
-using clang::tooling::toReplacements;
-
-namespace clang {
-namespace format {
-namespace {
-
-class FormatTestRawStrings : public ::testing::Test {
-protected:
-  enum StatusCheck { SC_ExpectComplete, SC_ExpectIncomplete, SC_DoNotCheck };
-
-  std::string format(llvm::StringRef Code,
-                     const FormatStyle &Style = getLLVMStyle(),
-                     StatusCheck CheckComplete = SC_ExpectComplete) {
-    LLVM_DEBUG(llvm::errs() << "---\n");
-    LLVM_DEBUG(llvm::errs() << Code << "\n\n");
-    std::vector<tooling::Range> Ranges(1, tooling::Range(0, Code.size()));
-    FormattingAttemptStatus Status;
-    tooling::Replacements Replaces =
-        reformat(Style, Code, Ranges, "<stdin>", &Status);
-    if (CheckComplete != SC_DoNotCheck) {
-      bool ExpectedCompleteFormat = CheckComplete == SC_ExpectComplete;
-      EXPECT_EQ(ExpectedCompleteFormat, Status.FormatComplete)
-          << Code << "\n\n";
-    }
-    ReplacementCount = Replaces.size();
-    auto Result = applyAllReplacements(Code, Replaces);
-    EXPECT_TRUE(static_cast<bool>(Result));
-    LLVM_DEBUG(llvm::errs() << "\n" << *Result << "\n\n");
-    return *Result;
-  }
-
-  FormatStyle getStyleWithColumns(FormatStyle Style, unsigned ColumnLimit) {
-    Style.ColumnLimit = ColumnLimit;
-    return Style;
-  }
-
-  FormatStyle getLLVMStyleWithColumns(unsigned ColumnLimit) {
-    return getStyleWithColumns(getLLVMStyle(), ColumnLimit);
-  }
-
-  int ReplacementCount;
-
-  FormatStyle getRawStringPbStyleWithColumns(unsigned ColumnLimit) {
-    FormatStyle Style = getLLVMStyle();
-    Style.ColumnLimit = ColumnLimit;
-    Style.RawStringFormats = {
-        {
-            /*Language=*/FormatStyle::LK_TextProto,
-            /*Delimiters=*/{"pb"},
-            /*EnclosingFunctions=*/{},
-            /*CanonicalDelimiter=*/"",
-            /*BasedOnStyle=*/"google",
-        },
-    };
-    return Style;
-  }
-
-  FormatStyle getRawStringLLVMCppStyleBasedOn(std::string BasedOnStyle) {
-    FormatStyle Style = getLLVMStyle();
-    Style.RawStringFormats = {
-        {
-            /*Language=*/FormatStyle::LK_Cpp,
-            /*Delimiters=*/{"cpp"},
-            /*EnclosingFunctions=*/{},
-            /*CanonicalDelimiter=*/"",
-            BasedOnStyle,
-        },
-    };
-    return Style;
-  }
-
-  FormatStyle getRawStringGoogleCppStyleBasedOn(std::string BasedOnStyle) {
-    FormatStyle Style = getGoogleStyle(FormatStyle::LK_Cpp);
-    Style.RawStringFormats = {
-        {
-            /*Language=*/FormatStyle::LK_Cpp,
-            /*Delimiters=*/{"cpp"},
-            /*EnclosingFunctions=*/{},
-            /*CanonicalDelimiter=*/"",
-            BasedOnStyle,
-        },
-    };
-    return Style;
-  }
-
-  // Gcc 4.8 doesn't support raw string literals in macros, which breaks some
-  // build bots. We use this function instead.
-  void expect_eq(const std::string Expected, const std::string Actual) {
-    EXPECT_EQ(Expected, Actual);
-  }
-};
-
-TEST_F(FormatTestRawStrings, ReformatsAccordingToBaseStyle) {
-  // llvm style puts '*' on the right.
-  // google style puts '*' on the left.
-
-  // Use the llvm style if the raw string style has no BasedOnStyle.
-  expect_eq(R"test(int *i = R"cpp(int *p = nullptr;)cpp")test",
-            format(R"test(int * i = R"cpp(int * p = nullptr;)cpp")test",
-                   getRawStringLLVMCppStyleBasedOn("")));
-
-  // Use the google style if the raw string style has BasedOnStyle=google.
-  expect_eq(R"test(int *i = R"cpp(int* p = nullptr;)cpp")test",
-            format(R"test(int * i = R"cpp(int * p = nullptr;)cpp")test",
-                   getRawStringLLVMCppStyleBasedOn("google")));
-
-  // Use the llvm style if the raw string style has no BasedOnStyle=llvm.
-  expect_eq(R"test(int* i = R"cpp(int *p = nullptr;)cpp")test",
-            format(R"test(int * i = R"cpp(int * p = nullptr;)cpp")test",
-                   getRawStringGoogleCppStyleBasedOn("llvm")));
-}
-
-TEST_F(FormatTestRawStrings, UsesConfigurationOverBaseStyle) {
-  // llvm style puts '*' on the right.
-  // google style puts '*' on the left.
-
-  // Uses the configured google style inside raw strings even if BasedOnStyle in
-  // the raw string format is llvm.
-  FormatStyle Style = getGoogleStyle(FormatStyle::LK_Cpp);
-  EXPECT_EQ(0, parseConfiguration("---\n"
-                                  "Language: Cpp\n"
-                                  "BasedOnStyle: Google",
-                                  &Style)
-                   .value());
-  Style.RawStringFormats = {{
-      FormatStyle::LK_Cpp,
-      {"cpp"},
-      {},
-      /*CanonicalDelimiter=*/"",
-      /*BasedOnStyle=*/"llvm",
-  }};
-  expect_eq(R"test(int* i = R"cpp(int* j = 0;)cpp";)test",
-            format(R"test(int * i = R"cpp(int * j = 0;)cpp";)test", Style));
-}
-
-TEST_F(FormatTestRawStrings, MatchesDelimitersCaseSensitively) {
-  // Don't touch the 'PB' raw string, format the 'pb' raw string.
-  expect_eq(R"test(
-s = R"PB(item:1)PB";
-t = R"pb(item: 1)pb";)test",
-            format(R"test(
-s = R"PB(item:1)PB";
-t = R"pb(item:1)pb";)test",
-                   getRawStringPbStyleWithColumns(40)));
-}
-
-TEST_F(FormatTestRawStrings, RespectsClangFormatOff) {
-  expect_eq(R"test(
-// clang-format off
-s = R"pb(item:      1)pb";
-// clang-format on
-t = R"pb(item: 1)pb";)test",
-            format(R"test(
-// clang-format off
-s = R"pb(item:      1)pb";
-// clang-format on
-t = R"pb(item:      1)pb";)test",
-                   getRawStringPbStyleWithColumns(40)));
-}
-
-TEST_F(FormatTestRawStrings, ReformatsShortRawStringsOnSingleLine) {
-  expect_eq(R"test(P p = TP(R"pb()pb");)test",
-            format(R"test(P p = TP(R"pb( )pb");)test",
-                   getRawStringPbStyleWithColumns(40)));
-  expect_eq(R"test(P p = TP(R"pb(item_1: 1)pb");)test",
-            format(R"test(P p = TP(R"pb(item_1:1)pb");)test",
-                   getRawStringPbStyleWithColumns(40)));
-  expect_eq(R"test(P p = TP(R"pb(item_1: 1)pb");)test",
-            format(R"test(P p = TP(R"pb(  item_1 :  1   )pb");)test",
-                   getRawStringPbStyleWithColumns(40)));
-  expect_eq(R"test(P p = TP(R"pb(item_1: 1 item_2: 2)pb");)test",
-            format(R"test(P p = TP(R"pb(item_1:1 item_2:2)pb");)test",
-                   getRawStringPbStyleWithColumns(40)));
-  // Merge two short lines into one.
-  expect_eq(R"test(
-std::string s = R"pb(
-  item_1: 1 item_2: 2
-)pb";
-)test",
-            format(R"test(
-std::string s = R"pb(
-  item_1:1
-  item_2:2
-)pb";
-)test",
-                   getRawStringPbStyleWithColumns(40)));
-}
-
-TEST_F(FormatTestRawStrings, BreaksShortRawStringsWhenNeeded) {
-  // The raw string contains multiple submessage entries, so break for
-  // readability.
-  expect_eq(R"test(
-P p = TP(R"pb(item_1 < 1 >
-              item_2: { 2 })pb");)test",
-            format(
-                R"test(
-P p = TP(R"pb(item_1<1> item_2:{2})pb");)test",
-                getRawStringPbStyleWithColumns(40)));
-}
-
-TEST_F(FormatTestRawStrings, BreaksRawStringsExceedingColumnLimit) {
-  expect_eq(R"test(
-P p = TPPPPPPPPPPPPPPP(
-    R"pb(item_1: 1, item_2: 2)pb");)test",
-            format(R"test(
-P p = TPPPPPPPPPPPPPPP(R"pb(item_1: 1, item_2: 2)pb");)test",
-                   getRawStringPbStyleWithColumns(40)));
-
-  expect_eq(R"test(
-P p =
-    TPPPPPPPPPPPPPPP(
-        R"pb(item_1: 1,
-             item_2: 2,
-             item_3: 3)pb");)test",
-            format(R"test(
-P p = TPPPPPPPPPPPPPPP(R"pb(item_1: 1, item_2: 2, item_3: 3)pb");)test",
-                   getRawStringPbStyleWithColumns(40)));
-
-  expect_eq(R"test(
-P p = TP(R"pb(item_1 < 1 >
-              item_2: < 2 >
-              item_3 {})pb");)test",
-            format(R"test(
-P p = TP(R"pb(item_1<1> item_2:<2> item_3{ })pb");)test",
-                   getRawStringPbStyleWithColumns(40)));
-
-  expect_eq(
-      R"test(
-P p = TP(R"pb(item_1: 1,
-              item_2: 2,
-              item_3: 3,
-              item_4: 4)pb");)test",
-      format(
-          R"test(
-P p = TP(R"pb(item_1: 1, item_2: 2, item_3: 3, item_4: 4)pb");)test",
-          getRawStringPbStyleWithColumns(40)));
-
-  expect_eq(R"test(
-P p = TPPPPPPPPPPPPPPP(
-    R"pb(item_1 < 1 >,
-         item_2: { 2 },
-         item_3: < 3 >,
-         item_4: { 4 })pb");)test",
-            format(R"test(
-P p = TPPPPPPPPPPPPPPP(R"pb(item_1<1>, item_2: {2}, item_3: <3>, item_4:{4})pb");)test",
-                   getRawStringPbStyleWithColumns(40)));
-
-  // Breaks before a short raw string exceeding the column limit.
-  expect_eq(R"test(
-FFFFFFFFFFFFFFFFFFFFFFFFFFF(
-    R"pb(key: 1)pb");
-P p = TPPPPPPPPPPPPPPPPPPPP(
-    R"pb(key: 2)pb");
-auto TPPPPPPPPPPPPPPPPPPPP =
-    R"pb(key: 3)pb";
-P p = TPPPPPPPPPPPPPPPPPPPP(
-    R"pb(i: 1, j: 2)pb");
-
-int f(string s) {
-  FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF(
-      R"pb(key: 1)pb");
-  P p = TPPPPPPPPPPPPPPPPPPPP(
-      R"pb(key: 2)pb");
-  auto TPPPPPPPPPPPPPPPPPPPP =
-      R"pb(key: 3)pb";
-  if (s.empty())
-    P p = TPPPPPPPPPPPPPPPPPPPP(
-        R"pb(i: 1, j: 2)pb");
-}
-)test",
-            format(R"test(
-FFFFFFFFFFFFFFFFFFFFFFFFFFF(R"pb(key:1)pb");
-P p = TPPPPPPPPPPPPPPPPPPPP(R"pb(key:2)pb");
-auto TPPPPPPPPPPPPPPPPPPPP = R"pb(key:3)pb";
-P p = TPPPPPPPPPPPPPPPPPPPP(R"pb(i: 1, j:2)pb");
-
-int f(string s) {
-  FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF(R"pb(key:1)pb");
-  P p = TPPPPPPPPPPPPPPPPPPPP(R"pb(key:2)pb");
-  auto TPPPPPPPPPPPPPPPPPPPP = R"pb(key:3)pb";
-  if (s.empty())
-    P p = TPPPPPPPPPPPPPPPPPPPP(R"pb(i: 1, j:2)pb");
-}
-)test",
-                   getRawStringPbStyleWithColumns(40)));
-}
-
-TEST_F(FormatTestRawStrings, FormatsRawStringArguments) {
-  expect_eq(R"test(
-P p = TP(R"pb(key { 1 })pb", param_2);)test",
-            format(R"test(
-P p = TP(R"pb(key{1})pb",param_2);)test",
-                   getRawStringPbStyleWithColumns(40)));
-
-  expect_eq(R"test(
-PPPPPPPPPPPPP(R"pb(keykeyk)pb",
-              param_2);)test",
-            format(R"test(
-PPPPPPPPPPPPP(R"pb(keykeyk)pb", param_2);)test",
-                   getRawStringPbStyleWithColumns(40)));
-
-  expect_eq(R"test(
-P p = TP(
-    R"pb(item: { i: 1, s: 's' }
-         item: { i: 2, s: 't' })pb");)test",
-            format(R"test(
-P p = TP(R"pb(item: {i: 1, s: 's'} item: {i: 2, s: 't'})pb");)test",
-                   getRawStringPbStyleWithColumns(40)));
-  expect_eq(R"test(
-FFFFFFFFFFFFFFFFFFF(
-    R"pb(key: "value")pb",
-    R"pb(key2: "value")pb");)test",
-            format(R"test(
-FFFFFFFFFFFFFFFFFFF(R"pb(key: "value")pb", R"pb(key2: "value")pb");)test",
-                   getRawStringPbStyleWithColumns(40)));
-
-  // Formats the first out of two arguments.
-  expect_eq(R"test(
-FFFFFFFF(R"pb(key: 1)pb", argument2);
-struct S {
-  const s =
-      f(R"pb(key: 1)pb", argument2);
-  void f() {
-    if (gol)
-      return g(R"pb(key: 1)pb",
-               132789237);
-    return g(R"pb(key: 1)pb", "172893");
-  }
-};)test",
-            format(R"test(
-FFFFFFFF(R"pb(key:1)pb", argument2);
-struct S {
-const s = f(R"pb(key:1)pb", argument2);
-void f() {
-  if (gol)
-    return g(R"pb(key:1)pb", 132789237);
-  return g(R"pb(key:1)pb", "172893");
-}
-};)test",
-                   getRawStringPbStyleWithColumns(40)));
-
-  // Formats the second out of two arguments.
-  expect_eq(R"test(
-FFFFFFFF(argument1, R"pb(key: 2)pb");
-struct S {
-  const s =
-      f(argument1, R"pb(key: 2)pb");
-  void f() {
-    if (gol)
-      return g(12784137,
-               R"pb(key: 2)pb");
-    return g(17283122, R"pb(key: 2)pb");
-  }
-};)test",
-            format(R"test(
-FFFFFFFF(argument1, R"pb(key:2)pb");
-struct S {
-const s = f(argument1, R"pb(key:2)pb");
-void f() {
-  if (gol)
-    return g(12784137, R"pb(key:2)pb");
-  return g(17283122, R"pb(key:2)pb");
-}
-};)test",
-                   getRawStringPbStyleWithColumns(40)));
-
-  // Formats two short raw string arguments.
-  expect_eq(R"test(
-FFFFF(R"pb(key: 1)pb", R"pb(key: 2)pb");)test",
-            format(R"test(
-FFFFF(R"pb(key:1)pb", R"pb(key:2)pb");)test",
-                   getRawStringPbStyleWithColumns(40)));
-  // TODO(krasimir): The original source code fits on one line, so the
-  // non-optimizing formatter is chosen. But after the formatting in protos is
-  // made, the code doesn't fit on one line anymore and further formatting
-  // splits it.
-  //
-  // Should we disable raw string formatting for the non-optimizing formatter?
-  expect_eq(R"test(
-FFFFFFF(R"pb(key: 1)pb", R"pb(key: 2)pb");)test",
-            format(R"test(
-FFFFFFF(R"pb(key:1)pb", R"pb(key:2)pb");)test",
-                   getRawStringPbStyleWithColumns(40)));
-
-  // Formats two short raw string arguments, puts second on newline.
-  expect_eq(R"test(
-FFFFFFFF(R"pb(key: 1)pb",
-         R"pb(key: 2)pb");)test",
-            format(R"test(
-FFFFFFFF(R"pb(key:1)pb", R"pb(key:2)pb");)test",
-                   getRawStringPbStyleWithColumns(40)));
-
-  // Formats both arguments.
-  expect_eq(R"test(
-FFFFFFFF(R"pb(key: 1)pb",
-         R"pb(key: 2)pb");
-struct S {
-  const s = f(R"pb(key: 1)pb",
-              R"pb(key: 2)pb");
-  void f() {
-    if (gol)
-      return g(R"pb(key: 1)pb",
-               R"pb(key: 2)pb");
-    return g(R"pb(k1)pb", R"pb(k2)pb");
-  }
-};)test",
-            format(R"test(
-FFFFFFFF(R"pb(key:1)pb", R"pb(key:2)pb");
-struct S {
-const s = f(R"pb(key:1)pb", R"pb(key:2)pb");
-void f() {
-  if (gol)
-    return g(R"pb(key:1)pb", R"pb(key:2)pb");
-  return g(R"pb( k1 )pb", R"pb( k2 )pb");
-}
-};)test",
-                   getRawStringPbStyleWithColumns(40)));
-}
-
-TEST_F(FormatTestRawStrings, RawStringStartingWithNewlines) {
-  expect_eq(R"test(
-std::string s = R"pb(
-  item_1: 1
-)pb";
-)test",
-            format(R"test(
-std::string s = R"pb(
-    item_1:1
-)pb";
-)test",
-                   getRawStringPbStyleWithColumns(40)));
-
-  expect_eq(R"test(
-std::string s = R"pb(
-
-  item_1: 1
-)pb";
-)test",
-            format(R"test(
-std::string s = R"pb(
-
-    item_1:1
-)pb";
-)test",
-                   getRawStringPbStyleWithColumns(40)));
-
-  expect_eq(R"test(
-std::string s = R"pb(
-  item_1: 1
-)pb";
-)test",
-            format(R"test(
-std::string s = R"pb(
-    item_1:1
-
-)pb";
-)test",
-                   getRawStringPbStyleWithColumns(40)));
-
-  expect_eq(R"test(
-std::string s = R"pb(
-  item_1: 1,
-  item_2: 2
-)pb";
-)test",
-            format(R"test(
-std::string s = R"pb(
-  item_1:1, item_2:2
-)pb";
-)test",
-                   getRawStringPbStyleWithColumns(40)));
-
-  expect_eq(R"test(
-std::string s = R"pb(
-  book {
-    title: "Alice's Adventures"
-    author: "Lewis Caroll"
-  }
-  book {
-    title: "Peter Pan"
-    author: "J. M. Barrie"
-  }
-)pb";
-)test",
-            format(R"test(
-std::string s = R"pb(
-    book { title: "Alice's Adventures" author: "Lewis Caroll" }
-    book { title: "Peter Pan" author: "J. M. Barrie" }
-)pb";
-)test",
-                   getRawStringPbStyleWithColumns(40)));
-}
-
-TEST_F(FormatTestRawStrings, BreaksBeforeRawStrings) {
-  expect_eq(R"test(
-ASSERT_TRUE(
-    ParseFromString(R"pb(item_1: 1)pb"),
-    ptr);)test",
-            format(R"test(
-ASSERT_TRUE(ParseFromString(R"pb(item_1: 1)pb"), ptr);)test",
-                   getRawStringPbStyleWithColumns(40)));
-
-  expect_eq(R"test(
-ASSERT_TRUE(toolong::ParseFromString(
-                R"pb(item_1: 1)pb"),
-            ptr);)test",
-            format(R"test(
-ASSERT_TRUE(toolong::ParseFromString(R"pb(item_1: 1)pb"), ptr);)test",
-                   getRawStringPbStyleWithColumns(40)));
-
-  expect_eq(R"test(
-ASSERT_TRUE(ParseFromString(
-                R"pb(item_1: 1,
-                     item_2: 2)pb"),
-            ptr);)test",
-            format(R"test(
-ASSERT_TRUE(ParseFromString(R"pb(item_1: 1, item_2: 2)pb"), ptr);)test",
-                   getRawStringPbStyleWithColumns(40)));
-
-  expect_eq(R"test(
-ASSERT_TRUE(
-    ParseFromString(
-        R"pb(item_1: 1 item_2: 2)pb"),
-    ptr);)test",
-            format(R"test(
-ASSERT_TRUE(ParseFromString(R"pb(item_1: 1 item_2: 2)pb"), ptr);)test",
-                   getRawStringPbStyleWithColumns(40)));
-}
-
-TEST_F(FormatTestRawStrings, RawStringsInOperands) {
-  // Formats the raw string first operand of a binary operator expression.
-  expect_eq(R"test(auto S = R"pb(item_1: 1)pb" + rest;)test",
-            format(R"test(auto S = R"pb(item_1:1)pb" + rest;)test",
-                   getRawStringPbStyleWithColumns(40)));
-
-  expect_eq(R"test(
-auto S = R"pb(item_1: 1, item_2: 2)pb" +
-         rest;)test",
-            format(R"test(
-auto S = R"pb(item_1:1,item_2:2)pb"+rest;)test",
-                   getRawStringPbStyleWithColumns(40)));
-
-  expect_eq(R"test(
-auto S =
-    R"pb(item_1: 1 item_2: 2)pb" + rest;)test",
-            format(R"test(
-auto S = R"pb(item_1:1 item_2:2)pb"+rest;)test",
-                   getRawStringPbStyleWithColumns(40)));
-
-  // `rest` fits on the line after )pb", but forced on newline since the raw
-  // string literal is multiline.
-  expect_eq(R"test(
-auto S = R"pb(item_1: 1,
-              item_2: 2,
-              item_3: 3)pb" +
-         rest;)test",
-            format(R"test(
-auto S = R"pb(item_1:1,item_2:2,item_3:3)pb"+rest;)test",
-                   getRawStringPbStyleWithColumns(40)));
-
-  expect_eq(R"test(
-auto S = R"pb(item_1: 1,
-              item_2: 2,
-              item_3: 3)pb" +
-         longlongrest;)test",
-            format(R"test(
-auto S = R"pb(item_1:1,item_2:2,item_3:3)pb"+longlongrest;)test",
-                   getRawStringPbStyleWithColumns(40)));
-
-  // Formats the raw string second operand of a binary operator expression.
-  expect_eq(R"test(auto S = first + R"pb(item_1: 1)pb";)test",
-            format(R"test(auto S = first + R"pb(item_1:1)pb";)test",
-                   getRawStringPbStyleWithColumns(40)));
-
-  expect_eq(R"test(
-auto S = first + R"pb(item_1: 1,
-                      item_2: 2)pb";)test",
-            format(R"test(
-auto S = first+R"pb(item_1:1,item_2:2)pb";)test",
-                   getRawStringPbStyleWithColumns(40)));
-
-  expect_eq(R"test(
-auto S = first + R"pb(item_1: 1
-                      item_2: 2)pb";)test",
-            format(R"test(
-auto S = first+R"pb(item_1:1 item_2:2)pb";)test",
-                   getRawStringPbStyleWithColumns(40)));
-
-  expect_eq(R"test(
-auto S = R"pb(item_1: 1,
-              item_2: 2,
-              item_3: 3)pb" +
-         rest;)test",
-            format(R"test(
-auto S = R"pb(item_1:1,item_2:2,item_3:3)pb"+rest;)test",
-                   getRawStringPbStyleWithColumns(40)));
-
-  expect_eq(R"test(
-auto S = R"pb(item_1: 1,
-              item_2: 2,
-              item_3: 3)pb" +
-         longlongrest;)test",
-            format(R"test(
-auto S = R"pb(item_1:1,item_2:2,item_3:3)pb"+longlongrest;)test",
-                   getRawStringPbStyleWithColumns(40)));
-
-  // Formats the raw string operands in expressions.
-  expect_eq(R"test(
-auto S = R"pb(item_1: 1)pb" +
-         R"pb(item_2: 2)pb";
-)test",
-            format(R"test(
-auto S=R"pb(item_1:1)pb"+R"pb(item_2:2)pb";
-)test",
-                   getRawStringPbStyleWithColumns(40)));
-
-  expect_eq(R"test(
-auto S = R"pb(item_1: 1)pb" +
-         R"pb(item_2: 2)pb" +
-         R"pb(item_3: 3)pb";
-)test",
-            format(R"test(
-auto S=R"pb(item_1:1)pb"+R"pb(item_2:2)pb"+R"pb(item_3:3)pb";
-)test",
-                   getRawStringPbStyleWithColumns(40)));
-
-  expect_eq(R"test(
-auto S = (count < 3)
-             ? R"pb(item_1: 1)pb"
-             : R"pb(item_2: 2)pb";
-)test",
-            format(R"test(
-auto S=(count<3)?R"pb(item_1:1)pb":R"pb(item_2:2)pb";
-)test",
-                   getRawStringPbStyleWithColumns(40)));
-
-  expect_eq(R"test(
-auto S =
-    (count < 3)
-        ? R"pb(item_1: 1, item_2: 2)pb"
-        : R"pb(item_3: 3)pb";
-)test",
-            format(R"test(
-auto S=(count<3)?R"pb(item_1:1,item_2:2)pb":R"pb(item_3:3)pb";
-)test",
-                   getRawStringPbStyleWithColumns(40)));
-
-  expect_eq(R"test(
-auto S =
-    (count < 3)
-        ? R"pb(item_1: 1)pb"
-        : R"pb(item_2: 2, item_3: 3)pb";
-)test",
-            format(R"test(
-auto S=(count<3)?R"pb(item_1:1)pb":R"pb(item_2:2,item_3:3)pb";
-)test",
-                   getRawStringPbStyleWithColumns(40)));
-}
-
-TEST_F(FormatTestRawStrings, PrefixAndSuffixAlignment) {
-  // Keep the suffix at the end of line if not on newline.
-  expect_eq(R"test(
-int s() {
-  auto S = PTP(
-      R"pb(
-        item_1: 1,
-        item_2: 2)pb");
-})test",
-            format(R"test(
-int s() {
-  auto S = PTP(
-      R"pb(
-      item_1: 1,
-      item_2: 2)pb");
-})test",
-                   getRawStringPbStyleWithColumns(20)));
-
-  // Align the suffix with the surrounding indent if the prefix is not on
-  // a line of its own.
-  expect_eq(R"test(
-int s() {
-  auto S = PTP(R"pb(
-    item_1: 1,
-    item_2: 2
-  )pb");
-})test",
-            format(R"test(
-int s() {
-  auto S = PTP(R"pb(
-      item_1: 1,
-      item_2: 2
-      )pb");
-})test",
-                   getRawStringPbStyleWithColumns(20)));
-
-  // Align the prefix with the suffix if both the prefix and suffix are on a
-  // line of their own.
-  expect_eq(R"test(
-int s() {
-  auto S = PTP(
-      R"pb(
-        item_1: 1,
-        item_2: 2,
-      )pb");
-})test",
-            format(R"test(
-int s() {
-  auto S = PTP(
-      R"pb(
-      item_1: 1,
-      item_2: 2,
-      )pb");
-})test",
-                   getRawStringPbStyleWithColumns(20)));
-}
-
-TEST_F(FormatTestRawStrings, EstimatesPenalty) {
-  // The penalty for characters exceeding the column limit in the raw string
-  // forces 'hh' to be put on a newline.
-  expect_eq(R"test(
-ff(gggggg,
-   hh(R"pb(key {
-             i1: k1
-             i2: k2
-           })pb"));
-)test",
-            format(R"test(
-ff(gggggg, hh(R"pb(key {
-    i1: k1
-    i2: k2
-    })pb"));
-)test",
-                   getRawStringPbStyleWithColumns(20)));
-}
-
-TEST_F(FormatTestRawStrings, DontFormatNonRawStrings) {
-  expect_eq(R"test(a = R"pb(key:value)";)test",
-            format(R"test(a = R"pb(key:value)";)test",
-                   getRawStringPbStyleWithColumns(20)));
-}
-
-TEST_F(FormatTestRawStrings, FormatsRawStringsWithEnclosingFunctionName) {
-  FormatStyle Style = getRawStringPbStyleWithColumns(40);
-  Style.RawStringFormats[0].EnclosingFunctions.push_back("PARSE_TEXT_PROTO");
-  Style.RawStringFormats[0].EnclosingFunctions.push_back("ParseTextProto");
-  expect_eq(R"test(a = PARSE_TEXT_PROTO(R"(key: value)");)test",
-            format(R"test(a = PARSE_TEXT_PROTO(R"(key:value)");)test", Style));
-
-  expect_eq(R"test(
-a = PARSE_TEXT_PROTO /**/ (
-    /**/ R"(key: value)");)test",
-            format(R"test(
-a = PARSE_TEXT_PROTO/**/(/**/R"(key:value)");)test",
-                   Style));
-
-  expect_eq(R"test(
-a = ParseTextProto<ProtoType>(
-    R"(key: value)");)test",
-            format(R"test(
-a = ParseTextProto<ProtoType>(R"(key:value)");)test",
-                   Style));
-}
-
-TEST_F(FormatTestRawStrings, UpdatesToCanonicalDelimiters) {
-  FormatStyle Style = getRawStringPbStyleWithColumns(35);
-  Style.RawStringFormats[0].CanonicalDelimiter = "proto";
-  Style.RawStringFormats[0].EnclosingFunctions.push_back("PARSE_TEXT_PROTO");
-
-  expect_eq(R"test(a = R"proto(key: value)proto";)test",
-            format(R"test(a = R"pb(key:value)pb";)test", Style));
-
-  expect_eq(R"test(PARSE_TEXT_PROTO(R"proto(key: value)proto");)test",
-            format(R"test(PARSE_TEXT_PROTO(R"(key:value)");)test", Style));
-
-  // Don't update to canonical delimiter if it occurs as a raw string suffix in
-  // the raw string content.
-  expect_eq(R"test(a = R"pb(key: ")proto")pb";)test",
-            format(R"test(a = R"pb(key:")proto")pb";)test", Style));
-}
-
-TEST_F(FormatTestRawStrings, PenalizesPrefixExcessChars) {
-  FormatStyle Style = getRawStringPbStyleWithColumns(60);
-
-  // The '(' in R"pb is at column 60, no break.
-  expect_eq(R"test(
-xxxxxxxaaaaax wwwwwww = _Verxrrrrrrrr(PARSE_TEXT_PROTO(R"pb(
-  Category: aaaaaaaaaaaaaaaaaaaaaaaaaa
-)pb"));
-)test",
-            format(R"test(
-xxxxxxxaaaaax wwwwwww = _Verxrrrrrrrr(PARSE_TEXT_PROTO(R"pb(
-  Category: aaaaaaaaaaaaaaaaaaaaaaaaaa
-)pb"));
-)test",
-                   Style));
-  // The '(' in R"pb is at column 61, break.
-  expect_eq(R"test(
-xxxxxxxaaaaax wwwwwww =
-    _Verxrrrrrrrrr(PARSE_TEXT_PROTO(R"pb(
-      Category: aaaaaaaaaaaaaaaaaaaaaaaaaa
-    )pb"));
-)test",
-            format(R"test(
-xxxxxxxaaaaax wwwwwww = _Verxrrrrrrrrr(PARSE_TEXT_PROTO(R"pb(
-      Category: aaaaaaaaaaaaaaaaaaaaaaaaaa
-)pb"));
-)test",
-                   Style));
-}
-
-TEST_F(FormatTestRawStrings, KeepsRBraceFolloedByMoreLBracesOnSameLine) {
-  FormatStyle Style = getRawStringPbStyleWithColumns(80);
-
-  expect_eq(
-      R"test(
-int f() {
-  if (1) {
-    TTTTTTTTTTTTTTTTTTTTT s = PARSE_TEXT_PROTO(R"pb(
-      ttttttttt {
-        ppppppppppppp {
-          [cccccccccc.pppppppppppppp.TTTTTTTTTTTTTTTTTTTT] { field_1: "123_1" }
-          [cccccccccc.pppppppppppppp.TTTTTTTTTTTTTTTTTTTT] { field_2: "123_2" }
-        }
-      }
-    )pb");
-  }
-}
-)test",
-      format(
-          R"test(
-int f() {
-  if (1) {
-   TTTTTTTTTTTTTTTTTTTTT s = PARSE_TEXT_PROTO(R"pb(
-   ttttttttt {
-   ppppppppppppp {
-   [cccccccccc.pppppppppppppp.TTTTTTTTTTTTTTTTTTTT] { field_1: "123_1" }
-   [cccccccccc.pppppppppppppp.TTTTTTTTTTTTTTTTTTTT] { field_2: "123_2" }}}
-   )pb");
-  }
-}
-)test",
-          Style));
-}
-
-TEST_F(FormatTestRawStrings,
-       DoNotFormatUnrecognizedDelimitersInRecognizedFunctions) {
-  FormatStyle Style = getRawStringPbStyleWithColumns(60);
-  Style.RawStringFormats[0].EnclosingFunctions.push_back("EqualsProto");
-  // EqualsProto is a recognized function, but the Raw delimiter is
-  // unrecognized. Do not touch the string in this case, since it might be
-  // special.
-  expect_eq(R"test(
-void f() {
-  aaaaaaaaa(bbbbbbbbb, EqualsProto(R"Raw(
-item {
-  key: value
-}
-)Raw"));
-})test",
-            format(R"test(
-void f() {
-  aaaaaaaaa(bbbbbbbbb, EqualsProto(R"Raw(
-item {
-  key: value
-}
-)Raw"));
-})test",
-                   Style));
-}
-
-TEST_F(FormatTestRawStrings,
-       BreaksBeforeNextParamAfterMultilineRawStringParam) {
-  FormatStyle Style = getRawStringPbStyleWithColumns(60);
-  expect_eq(R"test(
-int f() {
-  int a = g(x, R"pb(
-              key: 1  #
-              key: 2
-            )pb",
-            3, 4);
-}
-)test",
-            format(R"test(
-int f() {
-  int a = g(x, R"pb(
-              key: 1 #
-              key: 2
-            )pb", 3, 4);
-}
-)test",
-                   Style));
-
-  // Breaks after a parent of a multiline param.
-  expect_eq(R"test(
-int f() {
-  int a = g(x, h(R"pb(
-              key: 1  #
-              key: 2
-            )pb"),
-            3, 4);
-}
-)test",
-            format(R"test(
-int f() {
-  int a = g(x, h(R"pb(
-              key: 1 #
-              key: 2
-            )pb"), 3, 4);
-}
-)test",
-                   Style));
-
-  expect_eq(R"test(
-int f() {
-  int a = g(x,
-            h(R"pb(
-                key: 1  #
-                key: 2
-              )pb",
-              2),
-            3, 4);
-}
-)test",
-            format(R"test(
-int f() {
-  int a = g(x, h(R"pb(
-              key: 1 #
-              key: 2
-            )pb", 2), 3, 4);
-}
-)test",
-                   Style));
-  // Breaks if formatting introduces a multiline raw string.
-  expect_eq(R"test(
-int f() {
-  int a = g(x, R"pb(key1: value111111111
-                    key2: value2222222222)pb",
-            3, 4);
-}
-)test",
-            format(R"test(
-int f() {
-  int a = g(x, R"pb(key1: value111111111 key2: value2222222222)pb", 3, 4);
-}
-)test",
-                   Style));
-  // Does not force a break after an original multiline param that is
-  // reformatterd as on single line.
-  expect_eq(R"test(
-int f() {
-  int a = g(R"pb(key: 1)pb", 2);
-})test",
-            format(R"test(
-int f() {
-  int a = g(R"pb(key:
-                 1)pb", 2);
-})test",
-                   Style));
-}
-
-TEST_F(FormatTestRawStrings, IndentsLastParamAfterNewline) {
-  FormatStyle Style = getRawStringPbStyleWithColumns(60);
-  expect_eq(R"test(
-fffffffffffffffffffff("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
-                      R"pb(
-                        b: c
-                      )pb");)test",
-            format(R"test(
-fffffffffffffffffffff("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
-                      R"pb(
-                      b: c
-                      )pb");)test",
-                   Style));
-}
-} // end namespace
-} // end namespace format
-} // end namespace clang
diff --git a/gnu/llvm/clang/unittests/Format/FormatTestSelective.cpp b/gnu/llvm/clang/unittests/Format/FormatTestSelective.cpp
deleted file mode 100644
index c88d1b8bd8b..00000000000
--- a/gnu/llvm/clang/unittests/Format/FormatTestSelective.cpp
+++ /dev/null
@@ -1,608 +0,0 @@
-//===- unittest/Format/FormatTestSelective.cpp - Formatting unit tests ----===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "FormatTestUtils.h"
-#include "clang/Format/Format.h"
-#include "llvm/Support/Debug.h"
-#include "gtest/gtest.h"
-
-#define DEBUG_TYPE "format-test"
-
-namespace clang {
-namespace format {
-namespace {
-
-class FormatTestSelective : public ::testing::Test {
-protected:
-  std::string format(llvm::StringRef Code, unsigned Offset, unsigned Length) {
-    LLVM_DEBUG(llvm::errs() << "---\n");
-    LLVM_DEBUG(llvm::errs() << Code << "\n\n");
-    std::vector<tooling::Range> Ranges(1, tooling::Range(Offset, Length));
-    FormattingAttemptStatus Status;
-    tooling::Replacements Replaces =
-        reformat(Style, Code, Ranges, "<stdin>", &Status);
-    EXPECT_TRUE(Status.FormatComplete) << Code << "\n\n";
-    auto Result = applyAllReplacements(Code, Replaces);
-    EXPECT_TRUE(static_cast<bool>(Result));
-    LLVM_DEBUG(llvm::errs() << "\n" << *Result << "\n\n");
-    return *Result;
-  }
-
-  FormatStyle Style = getLLVMStyle();
-};
-
-TEST_F(FormatTestSelective, RemovesTrailingWhitespaceOfFormattedLine) {
-  EXPECT_EQ("int a;\nint b;", format("int a; \nint b;", 0, 0));
-  EXPECT_EQ("int a;", format("int a;         ", 0, 0));
-  EXPECT_EQ("int a;\n", format("int a;  \n   \n   \n ", 0, 0));
-  EXPECT_EQ("int a;\nint b;    ", format("int a;  \nint b;    ", 0, 0));
-}
-
-TEST_F(FormatTestSelective, FormatsCorrectRegionForLeadingWhitespace) {
-  EXPECT_EQ("{int b;\n"
-            "  int a;\n"
-            "}",
-            format("{int b;\n  int  a;}", 8, 0));
-  EXPECT_EQ("{\n"
-            "  int b;\n"
-            "  int  a;}",
-            format("{int b;\n  int  a;}", 7, 0));
-
-  Style.ColumnLimit = 12;
-  EXPECT_EQ("#define A  \\\n"
-            "  int a;   \\\n"
-            "  int b;",
-            format("#define A  \\\n"
-                   "  int a;   \\\n"
-                   "    int b;",
-                   26, 0));
-  EXPECT_EQ("#define A  \\\n"
-            "  int a;   \\\n"
-            "  int b;",
-            format("#define A  \\\n"
-                   "  int a;   \\\n"
-                   "  int b;",
-                   25, 0));
-}
-
-TEST_F(FormatTestSelective, FormatLineWhenInvokedOnTrailingNewline) {
-  EXPECT_EQ("int  b;\n\nint a;", format("int  b;\n\nint a;", 8, 0));
-  EXPECT_EQ("int b;\n\nint a;", format("int  b;\n\nint a;", 7, 0));
-
-  // This might not strictly be correct, but is likely good in all practical
-  // cases.
-  EXPECT_EQ("int b;\nint a;", format("int  b;int a;", 7, 0));
-}
-
-TEST_F(FormatTestSelective, RemovesWhitespaceWhenTriggeredOnEmptyLine) {
-  EXPECT_EQ("int  a;\n\n int b;", format("int  a;\n  \n\n int b;", 8, 0));
-  EXPECT_EQ("int  a;\n\n int b;", format("int  a;\n  \n\n int b;", 9, 0));
-}
-
-TEST_F(FormatTestSelective, ReformatsMovedLines) {
-  EXPECT_EQ(
-      "template <typename T> T *getFETokenInfo() const {\n"
-      "  return static_cast<T *>(FETokenInfo);\n"
-      "}\n"
-      "int  a; // <- Should not be formatted",
-      format(
-          "template<typename T>\n"
-          "T *getFETokenInfo() const { return static_cast<T*>(FETokenInfo); }\n"
-          "int  a; // <- Should not be formatted",
-          9, 5));
-}
-
-TEST_F(FormatTestSelective, FormatsIfWithoutCompoundStatement) {
-  Style.AllowShortIfStatementsOnASingleLine = FormatStyle::SIS_WithoutElse;
-  EXPECT_EQ("if (a) return;", format("if(a)\nreturn;", 7, 1));
-  EXPECT_EQ("if (a) return; // comment",
-            format("if(a)\nreturn; // comment", 20, 1));
-}
-
-TEST_F(FormatTestSelective, FormatsCommentsLocally) {
-  EXPECT_EQ("int a;    // comment\n"
-            "int    b; // comment",
-            format("int   a; // comment\n"
-                   "int    b; // comment",
-                   0, 0));
-  EXPECT_EQ("int a; // comment\n"
-            "       // line 2\n"
-            "int b;",
-            format("int   a; // comment\n"
-                   "            // line 2\n"
-                   "int b;",
-                   28, 0));
-  EXPECT_EQ("int   a; // comment\n"
-            "// comment 2\n"
-            "int b;",
-            format("int   a; // comment\n"
-                   "// comment 2\n"
-                   "int b;",
-                   28, 0));
-  EXPECT_EQ("int aaaaaa; // comment\n"
-            "int b;\n"
-            "int c; // unrelated comment",
-            format("int aaaaaa; // comment\n"
-                   "int b;\n"
-                   "int   c; // unrelated comment",
-                   31, 0));
-
-  EXPECT_EQ("int a; // This\n"
-            "       // is\n"
-            "       // a",
-            format("int a;      // This\n"
-                   "            // is\n"
-                   "            // a",
-                   0, 0));
-  EXPECT_EQ("int a; // This\n"
-            "       // is\n"
-            "       // a\n"
-            "// This is b\n"
-            "int b;",
-            format("int a; // This\n"
-                   "     // is\n"
-                   "     // a\n"
-                   "// This is b\n"
-                   "int b;",
-                   0, 0));
-  EXPECT_EQ("int a; // This\n"
-            "       // is\n"
-            "       // a\n"
-            "\n"
-            "//This is unrelated",
-            format("int a; // This\n"
-                   "     // is\n"
-                   "     // a\n"
-                   "\n"
-                   "//This is unrelated",
-                   0, 0));
-  EXPECT_EQ("int a;\n"
-            "// This is\n"
-            "// not formatted.   ",
-            format("int a;\n"
-                   "// This is\n"
-                   "// not formatted.   ",
-                   0, 0));
-  EXPECT_EQ("int x;  // Format this line.\n"
-            "int xx; //\n"
-            "int xxxxx; //",
-            format("int x; // Format this line.\n"
-                   "int xx; //\n"
-                   "int xxxxx; //",
-                   0, 0));
-}
-
-TEST_F(FormatTestSelective, ContinueReindenting) {
-  // When we change an indent, we continue formatting as long as following
-  // lines are not indented correctly.
-  EXPECT_EQ("int   i;\n"
-            "int b;\n"
-            "int c;\n"
-            "int d;\n"
-            "int e;\n"
-            "  int f;\n",
-            format("int   i;\n"
-                   "  int b;\n"
-                   " int   c;\n"
-                   "  int d;\n"
-                   "int e;\n"
-                   "  int f;\n",
-                   11, 0));
-}
-
-TEST_F(FormatTestSelective, ReindentClosingBrace) {
-  EXPECT_EQ("int   i;\n"
-            "int f() {\n"
-            "  int a;\n"
-            "  int b;\n"
-            "}\n"
-            " int c;\n",
-            format("int   i;\n"
-                   "  int f(){\n"
-                   "int a;\n"
-                   "int b;\n"
-                   "  }\n"
-                   " int c;\n",
-                   11, 0));
-  EXPECT_EQ("void f() {\n"
-            "  if (foo) {\n"
-            "    b();\n"
-            "  } else {\n"
-            "    c();\n"
-            "  }\n"
-            "int d;\n"
-            "}\n",
-            format("void f() {\n"
-                   "  if (foo) {\n"
-                   "b();\n"
-                   "}else{\n"
-                   "c();\n"
-                   "}\n"
-                   "int d;\n"
-                   "}\n",
-                   13, 0));
-  EXPECT_EQ("int i = []() {\n"
-            "  class C {\n"
-            "    int a;\n"
-            "    int b;\n"
-            "  };\n"
-            "  int c;\n"
-            "};\n",
-            format("int i = []() {\n"
-                   "  class C{\n"
-                   "int a;\n"
-                   "int b;\n"
-                   "};\n"
-                   "int c;\n"
-                   "  };\n",
-                   17, 0));
-}
-
-TEST_F(FormatTestSelective, IndividualStatementsOfNestedBlocks) {
-  EXPECT_EQ("DEBUG({\n"
-            "  int i;\n"
-            "  int        j;\n"
-            "});",
-            format("DEBUG(   {\n"
-                   "  int        i;\n"
-                   "  int        j;\n"
-                   "}   )  ;",
-                   20, 1));
-  EXPECT_EQ("DEBUG(   {\n"
-            "  int        i;\n"
-            "  int j;\n"
-            "}   )  ;",
-            format("DEBUG(   {\n"
-                   "  int        i;\n"
-                   "  int        j;\n"
-                   "}   )  ;",
-                   41, 1));
-  EXPECT_EQ("DEBUG(   {\n"
-            "    int        i;\n"
-            "    int j;\n"
-            "}   )  ;",
-            format("DEBUG(   {\n"
-                   "    int        i;\n"
-                   "    int        j;\n"
-                   "}   )  ;",
-                   41, 1));
-  EXPECT_EQ("DEBUG({\n"
-            "  int i;\n"
-            "  int j;\n"
-            "});",
-            format("DEBUG(   {\n"
-                   "    int        i;\n"
-                   "    int        j;\n"
-                   "}   )  ;",
-                   20, 1));
-
-  EXPECT_EQ("Debug({\n"
-            "        if (aaaaaaaaaaaaaaaaaaaaaaaa)\n"
-            "          return;\n"
-            "      },\n"
-            "      a);",
-            format("Debug({\n"
-                   "        if (aaaaaaaaaaaaaaaaaaaaaaaa)\n"
-                   "             return;\n"
-                   "      },\n"
-                   "      a);",
-                   50, 1));
-  EXPECT_EQ("DEBUG({\n"
-            "  DEBUG({\n"
-            "    int a;\n"
-            "    int b;\n"
-            "  }) ;\n"
-            "});",
-            format("DEBUG({\n"
-                   "  DEBUG({\n"
-                   "    int a;\n"
-                   "    int    b;\n" // Format this line only.
-                   "  }) ;\n"        // Don't touch this line.
-                   "});",
-                   35, 0));
-  EXPECT_EQ("DEBUG({\n"
-            "  int a; //\n"
-            "});",
-            format("DEBUG({\n"
-                   "    int a; //\n"
-                   "});",
-                   0, 0));
-  EXPECT_EQ("someFunction(\n"
-            "    [] {\n"
-            "      // Only with this comment.\n"
-            "      int i; // invoke formatting here.\n"
-            "    }, // force line break\n"
-            "    aaa);",
-            format("someFunction(\n"
-                   "    [] {\n"
-                   "      // Only with this comment.\n"
-                   "      int   i; // invoke formatting here.\n"
-                   "    }, // force line break\n"
-                   "    aaa);",
-                   63, 1));
-
-  EXPECT_EQ("int longlongname; // comment\n"
-            "int x = f({\n"
-            "  int x; // comment\n"
-            "  int y; // comment\n"
-            "});",
-            format("int longlongname; // comment\n"
-                   "int x = f({\n"
-                   "  int x; // comment\n"
-                   "  int y; // comment\n"
-                   "});",
-                   65, 0));
-  EXPECT_EQ("int s = f({\n"
-            "  class X {\n"
-            "  public:\n"
-            "    void f();\n"
-            "  };\n"
-            "});",
-            format("int s = f({\n"
-                   "  class X {\n"
-                   "    public:\n"
-                   "    void f();\n"
-                   "  };\n"
-                   "});",
-                   0, 0));
-  EXPECT_EQ("SomeFunction(\n"
-            "    [] {\n"
-            "      int i;\n"
-            "      return i;\n" // Format this line.
-            "    },\n"
-            "    [] {\n"
-            "       return 2;\n" // Don't fix this.
-            "    });",
-            format("SomeFunction(\n"
-                   "    [] {\n"
-                   "      int i;\n"
-                   "       return i;\n" // Format this line.
-                   "    },\n"
-                   "    [] {\n"
-                   "       return 2;\n" // Don't fix this.
-                   "    });",
-                   40, 0));
-}
-
-TEST_F(FormatTestSelective, WrongIndent) {
-  EXPECT_EQ("namespace {\n"
-            "int i;\n"
-            "int j;\n"
-            "}",
-            format("namespace {\n"
-                   "  int i;\n" // Format here.
-                   "  int j;\n"
-                   "}",
-                   15, 0));
-  EXPECT_EQ("namespace {\n"
-            "  int i;\n"
-            "  int j;\n"
-            "}",
-            format("namespace {\n"
-                   "  int i;\n"
-                   "  int j;\n" // Format here.
-                   "}",
-                   24, 0));
-}
-
-TEST_F(FormatTestSelective, AlwaysFormatsEntireMacroDefinitions) {
-  Style.AlignEscapedNewlines = FormatStyle::ENAS_Left;
-  EXPECT_EQ("int  i;\n"
-            "#define A \\\n"
-            "  int i;  \\\n"
-            "  int j\n"
-            "int  k;",
-            format("int  i;\n"
-                   "#define A  \\\n"
-                   " int   i    ;  \\\n"
-                   " int   j\n"
-                   "int  k;",
-                   8, 0)); // 8: position of "#define".
-  EXPECT_EQ("int  i;\n"
-            "#define A \\\n"
-            "  int i;  \\\n"
-            "  int j\n"
-            "int  k;",
-            format("int  i;\n"
-                   "#define A  \\\n"
-                   " int   i    ;  \\\n"
-                   " int   j\n"
-                   "int  k;",
-                   45, 0)); // 45: position of "j".
-}
-
-TEST_F(FormatTestSelective, ReformatRegionAdjustsIndent) {
-  EXPECT_EQ("{\n"
-            "{\n"
-            "a;\n"
-            "b;\n"
-            "}\n"
-            "}",
-            format("{\n"
-                   "{\n"
-                   "a;\n"
-                   "     b;\n"
-                   "}\n"
-                   "}",
-                   13, 2));
-  EXPECT_EQ("{\n"
-            "{\n"
-            "  a;\n"
-            "  b;\n"
-            "  c;\n"
-            " d;\n"
-            "}\n"
-            "}",
-            format("{\n"
-                   "{\n"
-                   "     a;\n"
-                   "   b;\n"
-                   "  c;\n"
-                   " d;\n"
-                   "}\n"
-                   "}",
-                   9, 2));
-  EXPECT_EQ("{\n"
-            "{\n"
-            "public:\n"
-            "  b;\n"
-            "}\n"
-            "}",
-            format("{\n"
-                   "{\n"
-                   "public:\n"
-                   "     b;\n"
-                   "}\n"
-                   "}",
-                   17, 2));
-  EXPECT_EQ("{\n"
-            "{\n"
-            "a;\n"
-            "}\n"
-            "{\n"
-            "  b; //\n"
-            "}\n"
-            "}",
-            format("{\n"
-                   "{\n"
-                   "a;\n"
-                   "}\n"
-                   "{\n"
-                   "           b; //\n"
-                   "}\n"
-                   "}",
-                   22, 2));
-  EXPECT_EQ("  {\n"
-            "    a; //\n"
-            "  }",
-            format("  {\n"
-                   "a; //\n"
-                   "  }",
-                   4, 2));
-  EXPECT_EQ("void f() {}\n"
-            "void g() {}",
-            format("void f() {}\n"
-                   "void g() {}",
-                   13, 0));
-  EXPECT_EQ("int a; // comment\n"
-            "       // line 2\n"
-            "int b;",
-            format("int a; // comment\n"
-                   "       // line 2\n"
-                   "  int b;",
-                   35, 0));
-
-  EXPECT_EQ(" void f() {\n"
-            "#define A 1\n"
-            " }",
-            format(" void f() {\n"
-                   "     #define A 1\n" // Format this line.
-                   " }",
-                   20, 0));
-  EXPECT_EQ(" void f() {\n"
-            "    int i;\n"
-            "#define A \\\n"
-            "    int i;  \\\n"
-            "   int j;\n"
-            "    int k;\n"
-            " }",
-            format(" void f() {\n"
-                   "    int i;\n"
-                   "#define A \\\n"
-                   "    int i;  \\\n"
-                   "   int j;\n"
-                   "      int k;\n" // Format this line.
-                   " }",
-                   67, 0));
-
-  Style.ColumnLimit = 11;
-  EXPECT_EQ("  int a;\n"
-            "  void\n"
-            "  ffffff() {\n"
-            "  }",
-            format("  int a;\n"
-                   "void ffffff() {}",
-                   11, 0));
-}
-
-TEST_F(FormatTestSelective, UnderstandsTabs) {
-  Style.IndentWidth = 8;
-  Style.UseTab = FormatStyle::UT_Always;
-  Style.AlignEscapedNewlines = FormatStyle::ENAS_Left;
-  EXPECT_EQ("void f() {\n"
-            "\tf();\n"
-            "\tg();\n"
-            "}",
-            format("void f() {\n"
-                   "\tf();\n"
-                   "\tg();\n"
-                   "}",
-                   0, 0));
-  EXPECT_EQ("void f() {\n"
-            "\tf();\n"
-            "\tg();\n"
-            "}",
-            format("void f() {\n"
-                   "\tf();\n"
-                   "\tg();\n"
-                   "}",
-                   16, 0));
-  EXPECT_EQ("void f() {\n"
-            "  \tf();\n"
-            "\tg();\n"
-            "}",
-            format("void f() {\n"
-                   "  \tf();\n"
-                   "  \tg();\n"
-                   "}",
-                   21, 0));
-}
-
-TEST_F(FormatTestSelective, StopFormattingWhenLeavingScope) {
-  EXPECT_EQ(
-      "void f() {\n"
-      "  if (a) {\n"
-      "    g();\n"
-      "    h();\n"
-      "  }\n"
-      "\n"
-      "void g() {\n"
-      "}",
-      format("void f() {\n"
-             "  if (a) {\n" // Assume this was added without the closing brace.
-             "  g();\n"
-             "  h();\n"
-             "}\n"
-             "\n"
-             "void g() {\n" // Make sure not to format this.
-             "}",
-             15, 0));
-}
-
-TEST_F(FormatTestSelective, SelectivelyRequoteJavaScript) {
-  Style = getGoogleStyle(FormatStyle::LK_JavaScript);
-  EXPECT_EQ("var x = \"a\";\n"
-            "var x = 'a';\n"
-            "var x = \"a\";",
-            format("var x = \"a\";\n"
-                   "var x = \"a\";\n"
-                   "var x = \"a\";",
-                   20, 0));
-}
-
-TEST_F(FormatTestSelective, KeepsIndentAfterCommentSectionImport) {
-  std::string Code = "#include <a> // line 1\n" // 23 chars long
-                     "             // line 2\n" // 23 chars long
-                     "\n"                       // this newline is char 47
-                     "int i;";                  // this line is not indented
-  EXPECT_EQ(Code, format(Code, 47, 1));
-}
-
-} // end namespace
-} // end namespace format
-} // end namespace clang
diff --git a/gnu/llvm/clang/unittests/Format/FormatTestTableGen.cpp b/gnu/llvm/clang/unittests/Format/FormatTestTableGen.cpp
deleted file mode 100644
index 06029bd8c72..00000000000
--- a/gnu/llvm/clang/unittests/Format/FormatTestTableGen.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-//===- unittest/Format/FormatTestTableGen.cpp -----------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "FormatTestUtils.h"
-#include "clang/Format/Format.h"
-#include "llvm/Support/Debug.h"
-#include "gtest/gtest.h"
-
-#define DEBUG_TYPE "format-test"
-
-namespace clang {
-namespace format {
-
-class FormatTestTableGen : public ::testing::Test {
-protected:
-  static std::string format(llvm::StringRef Code, unsigned Offset,
-                            unsigned Length, const FormatStyle &Style) {
-    LLVM_DEBUG(llvm::errs() << "---\n");
-    LLVM_DEBUG(llvm::errs() << Code << "\n\n");
-    std::vector<tooling::Range> Ranges(1, tooling::Range(Offset, Length));
-    tooling::Replacements Replaces = reformat(Style, Code, Ranges);
-    auto Result = applyAllReplacements(Code, Replaces);
-    EXPECT_TRUE(static_cast<bool>(Result));
-    LLVM_DEBUG(llvm::errs() << "\n" << *Result << "\n\n");
-    return *Result;
-  }
-
-  static std::string format(llvm::StringRef Code) {
-    FormatStyle Style = getGoogleStyle(FormatStyle::LK_TableGen);
-    Style.ColumnLimit = 60; // To make writing tests easier.
-    return format(Code, 0, Code.size(), Style);
-  }
-
-  static void verifyFormat(llvm::StringRef Code) {
-    EXPECT_EQ(Code.str(), format(Code)) << "Expected code is not stable";
-    EXPECT_EQ(Code.str(), format(test::messUp(Code)));
-  }
-};
-
-TEST_F(FormatTestTableGen, FormatStringBreak) {
-  verifyFormat("include \"OptParser.td\"\n"
-               "def flag : Flag<\"--foo\">,\n"
-               "           HelpText<\n"
-               "               \"This is a very, very, very, very, \"\n"
-               "               \"very, very, very, very, very, very, \"\n"
-               "               \"very long help string\">;\n");
-}
-
-TEST_F(FormatTestTableGen, NoSpacesInSquareBracketLists) {
-  verifyFormat("def flag : Flag<[\"-\", \"--\"], \"foo\">;\n");
-}
-
-} // namespace format
-} // end namespace clang
diff --git a/gnu/llvm/clang/unittests/Format/FormatTestTextProto.cpp b/gnu/llvm/clang/unittests/Format/FormatTestTextProto.cpp
deleted file mode 100644
index 1e259489384..00000000000
--- a/gnu/llvm/clang/unittests/Format/FormatTestTextProto.cpp
+++ /dev/null
@@ -1,744 +0,0 @@
-//===- unittest/Format/FormatTestTextProto.cpp ----------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "FormatTestUtils.h"
-#include "clang/Format/Format.h"
-#include "llvm/Support/Debug.h"
-#include "gtest/gtest.h"
-
-#define DEBUG_TYPE "format-test"
-
-namespace clang {
-namespace format {
-
-class FormatTestTextProto : public ::testing::Test {
-protected:
-  static std::string format(llvm::StringRef Code, unsigned Offset,
-                            unsigned Length, const FormatStyle &Style) {
-    LLVM_DEBUG(llvm::errs() << "---\n");
-    LLVM_DEBUG(llvm::errs() << Code << "\n\n");
-    std::vector<tooling::Range> Ranges(1, tooling::Range(Offset, Length));
-    tooling::Replacements Replaces = reformat(Style, Code, Ranges);
-    auto Result = applyAllReplacements(Code, Replaces);
-    EXPECT_TRUE(static_cast<bool>(Result));
-    LLVM_DEBUG(llvm::errs() << "\n" << *Result << "\n\n");
-    return *Result;
-  }
-
-  static std::string format(llvm::StringRef Code, const FormatStyle &Style) {
-    return format(Code, 0, Code.size(), Style);
-  }
-
-  static void verifyFormat(llvm::StringRef Code, const FormatStyle &Style) {
-    EXPECT_EQ(Code.str(), format(Code, Style)) << "Expected code is not stable";
-    EXPECT_EQ(Code.str(), format(test::messUp(Code), Style));
-  }
-
-  static void verifyFormat(llvm::StringRef Code) {
-    FormatStyle Style = getGoogleStyle(FormatStyle::LK_TextProto);
-    Style.ColumnLimit = 60; // To make writing tests easier.
-    verifyFormat(Code, Style);
-  }
-};
-
-TEST_F(FormatTestTextProto, KeepsTopLevelEntriesFittingALine) {
-  verifyFormat("field_a: OK field_b: OK field_c: OK field_d: OK field_e: OK");
-}
-
-TEST_F(FormatTestTextProto, SupportsMessageFields) {
-  verifyFormat("msg_field: {}");
-
-  verifyFormat("msg_field: { field_a: A }");
-
-  verifyFormat("msg_field: { field_a: \"OK\" field_b: 123 }");
-
-  verifyFormat("msg_field: {\n"
-               "  field_a: 1\n"
-               "  field_b: OK\n"
-               "  field_c: \"OK\"\n"
-               "  field_d: 123\n"
-               "  field_e: 23\n"
-               "}");
-
-  verifyFormat("msg_field {}");
-
-  verifyFormat("msg_field { field_a: A }");
-
-  verifyFormat("msg_field { field_a: \"OK\" field_b: 123 }");
-
-  verifyFormat("msg_field {\n"
-               "  field_a: 1\n"
-               "  field_b: OK\n"
-               "  field_c: \"OK\"\n"
-               "  field_d: 123\n"
-               "  field_e: 23.0\n"
-               "  field_f: false\n"
-               "  field_g: 'lala'\n"
-               "  field_h: 1234.567e-89\n"
-               "}");
-
-  verifyFormat("msg_field: { msg_field { field_a: 1 } }");
-
-  verifyFormat("id: \"ala.bala\"\n"
-               "item { type: ITEM_A rank: 1 score: 90.0 }\n"
-               "item { type: ITEM_B rank: 2 score: 70.5 }\n"
-               "item {\n"
-               "  type: ITEM_A\n"
-               "  rank: 3\n"
-               "  score: 20.0\n"
-               "  description: \"the third item has a description\"\n"
-               "}");
-}
-
-TEST_F(FormatTestTextProto, AvoidsTopLevelBinPacking) {
-  verifyFormat("field_a: OK\n"
-               "field_b: OK\n"
-               "field_c: OK\n"
-               "field_d: OK\n"
-               "field_e: OK\n"
-               "field_f: OK");
-
-  verifyFormat("field_a: OK\n"
-               "field_b: \"OK\"\n"
-               "field_c: \"OK\"\n"
-               "msg_field: { field_d: 123 }\n"
-               "field_e: OK\n"
-               "field_f: OK");
-
-  verifyFormat("field_a: OK\n"
-               "field_b: \"OK\"\n"
-               "field_c: \"OK\"\n"
-               "msg_field: { field_d: 123 field_e: OK }");
-
-  verifyFormat("a: {\n"
-               "  field_a: OK\n"
-               "  field_b { field_c: OK }\n"
-               "  field_d: OKOKOK\n"
-               "  field_e: OK\n"
-               "}");
-
-  verifyFormat("field_a: OK,\n"
-               "field_b { field_c: OK },\n"
-               "field_d: OKOKOK,\n"
-               "field_e: OK");
-}
-
-TEST_F(FormatTestTextProto, AddsNewlinesAfterTrailingComments) {
-  verifyFormat("field_a: OK  // Comment\n"
-               "field_b: 1");
-
-  verifyFormat("field_a: OK\n"
-               "msg_field: {\n"
-               "  field_b: OK  // Comment\n"
-               "}");
-
-  verifyFormat("field_a: OK\n"
-               "msg_field {\n"
-               "  field_b: OK  // Comment\n"
-               "}");
-}
-
-TEST_F(FormatTestTextProto, ImplicitStringLiteralConcatenation) {
-  verifyFormat("field_a: 'aaaaa'\n"
-               "         'bbbbb'");
-  verifyFormat("field_a: \"aaaaa\"\n"
-               "         \"bbbbb\"");
-  FormatStyle Style = getGoogleStyle(FormatStyle::LK_TextProto);
-  Style.AlwaysBreakBeforeMultilineStrings = true;
-  verifyFormat("field_a:\n"
-               "    'aaaaa'\n"
-               "    'bbbbb'",
-               Style);
-  verifyFormat("field_a:\n"
-               "    \"aaaaa\"\n"
-               "    \"bbbbb\"",
-               Style);
-}
-
-TEST_F(FormatTestTextProto, SupportsAngleBracketMessageFields) {
-  // Single-line tests
-  verifyFormat("msg_field <>");
-  verifyFormat("msg_field: <>");
-  verifyFormat("msg_field < field_a: OK >");
-  verifyFormat("msg_field: < field_a: 123 >");
-  verifyFormat("msg_field < field_a <> >");
-  verifyFormat("msg_field < field_a < field_b <> > >");
-  verifyFormat("msg_field: < field_a < field_b: <> > >");
-  verifyFormat("msg_field < field_a: OK, field_b: \"OK\" >");
-  verifyFormat("msg_field: < field_a: OK, field_b: \"OK\" >");
-  // Multiple lines tests
-  verifyFormat("msg_field <\n"
-               "  field_a: OK\n"
-               "  field_b: <>,\n"
-               "  field_c: OK\n"
-               ">");
-
-  verifyFormat("msg_field <\n"
-               "  field_a { field_b: 1 },\n"
-               "  field_c: < f_d: 2 >\n"
-               ">");
-
-  verifyFormat("msg_field: <\n"
-               "  field_a: OK\n"
-               "  field_b: <>,\n"
-               "  field_c: OK\n"
-               ">");
-
-  verifyFormat("msg_field: <\n"
-               "  field_a { field_b: 1 },\n"
-               "  field_c: < fd_d: 2 >\n"
-               ">");
-
-  verifyFormat("field_a: \"OK\",\n"
-               "msg_field: < field_b: 123 >,\n"
-               "field_c: {}");
-
-  verifyFormat("field_a < field_b: 1 >,\n"
-               "msg_fid: < fiel_b: 123 >,\n"
-               "field_c <>");
-
-  verifyFormat("field_a < field_b: 1 >\n"
-               "msg_fied: < field_b: 123 >\n"
-               "field_c <>");
-
-  verifyFormat("field <\n"
-               "  field < field: <> >,\n"
-               "  field <>\n"
-               ">\n"
-               "field: < field: 1 >");
-
-  verifyFormat("msg_field <\n"
-               "  field_a: OK\n"
-               "  field_b: \"OK\"\n"
-               "  field_c: 1\n"
-               "  field_d: 12.5\n"
-               "  field_e: OK\n"
-               ">");
-
-  verifyFormat("msg_field: <>\n"
-               "field_c: \"OK\",\n"
-               "msg_field: < field_d: 123 >\n"
-               "field_e: OK\n"
-               "msg_field: < field_d: 12 >");
-
-  verifyFormat("field_a: OK,\n"
-               "field_b < field_c: OK >,\n"
-               "field_d: < 12.5 >,\n"
-               "field_e: OK");
-
-  verifyFormat("field_a: OK\n"
-               "field_b < field_c: OK >\n"
-               "field_d: < 12.5 >\n"
-               "field_e: OKOKOK");
-
-  verifyFormat("msg_field <\n"
-               "  field_a: OK,\n"
-               "  field_b < field_c: OK >,\n"
-               "  field_d: < 12.5 >,\n"
-               "  field_e: OK\n"
-               ">");
-
-  verifyFormat("msg_field <\n"
-               "  field_a: < field: OK >,\n"
-               "  field_b < field_c: OK >,\n"
-               "  field_d: < 12.5 >,\n"
-               "  field_e: OK,\n"
-               ">");
-
-  verifyFormat("msg_field: <\n"
-               "  field_a: \"OK\"\n"
-               "  msg_field: { field_b: OK }\n"
-               "  field_g: OK\n"
-               "  field_g: OK\n"
-               "  field_g: OK\n"
-               ">");
-
-  verifyFormat("field_a {\n"
-               "  field_d: ok\n"
-               "  field_b: < field_c: 1 >\n"
-               "  field_d: ok\n"
-               "  field_d: ok\n"
-               "}");
-
-  verifyFormat("field_a: {\n"
-               "  field_d: ok\n"
-               "  field_b: < field_c: 1 >\n"
-               "  field_d: ok\n"
-               "  field_d: ok\n"
-               "}");
-
-  verifyFormat("field_a: <\n"
-               "  f1: 1,\n"
-               "  f2: <>\n"
-               ">\n"
-               "field_b <\n"
-               "  field_b1: <>\n"
-               "  field_b2: ok,\n"
-               "  field_b3: <\n"
-               "    field_x {}  // Comment\n"
-               "    field_y: { field_z: 1 }\n"
-               "    field_w: ok\n"
-               "  >\n"
-               "  field {\n"
-               "    field_x <>  // Comment\n"
-               "    field_y: < field_z: 1 >\n"
-               "    field_w: ok\n"
-               "    msg_field: <\n"
-               "      field: <>\n"
-               "      field: < field: 1 >\n"
-               "      field: < field: 2 >\n"
-               "      field: < field: 3 >\n"
-               "      field: < field: 4 >\n"
-               "      field: ok\n"
-               "    >\n"
-               "  }\n"
-               ">\n"
-               "field: OK,\n"
-               "field_c < field < field <> > >");
-
-  verifyFormat("app_id: 'com.javax.swing.salsa.latino'\n"
-               "head_id: 1\n"
-               "data < key: value >");
-
-  verifyFormat("app_id: 'com.javax.swing.salsa.latino'\n"
-               "head_id: 1\n"
-               "data < key: value >\n"
-               "tail_id: 2");
-
-  verifyFormat("app_id: 'com.javax.swing.salsa.latino'\n"
-               "head_id: 1\n"
-               "data < key: value >\n"
-               "data { key: value }");
-
-  verifyFormat("app {\n"
-               "  app_id: 'com.javax.swing.salsa.latino'\n"
-               "  head_id: 1\n"
-               "  data < key: value >\n"
-               "}");
-
-  verifyFormat("app: {\n"
-               "  app_id: 'com.javax.swing.salsa.latino'\n"
-               "  head_id: 1\n"
-               "  data < key: value >\n"
-               "}");
-
-  verifyFormat("app_id: 'com.javax.swing.salsa.latino'\n"
-               "headheadheadheadheadhead_id: 1\n"
-               "product_data { product { 1 } }");
-
-  verifyFormat("app_id: 'com.javax.swing.salsa.latino'\n"
-               "headheadheadheadheadhead_id: 1\n"
-               "product_data < product { 1 } >");
-
-  verifyFormat("app_id: 'com.javax.swing.salsa.latino'\n"
-               "headheadheadheadheadhead_id: 1\n"
-               "product_data < product < 1 > >");
-
-  verifyFormat("app <\n"
-               "  app_id: 'com.javax.swing.salsa.latino'\n"
-               "  headheadheadheadheadhead_id: 1\n"
-               "  product_data < product { 1 } >\n"
-               ">");
-
-  verifyFormat("dcccwrnfioeruvginerurneitinfo {\n"
-               "  exte3nsionrnfvui { key: value }\n"
-               "}");
-}
-
-TEST_F(FormatTestTextProto, DiscardsUnbreakableTailIfCanBreakAfter) {
-  // The two closing braces count towards the string UnbreakableTailLength, but
-  // since we have broken after the corresponding opening braces, we don't
-  // consider that length for string breaking.
-  verifyFormat(
-      "foo: {\n"
-      "  bar: {\n"
-      "    text: \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\"\n"
-      "  }\n"
-      "}");
-}
-
-TEST_F(FormatTestTextProto, KeepsLongStringLiteralsOnSameLine) {
-  verifyFormat(
-      "foo: {\n"
-      "  text: \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaasaaaaaaaaaa\"\n"
-      "}");
-}
-
-TEST_F(FormatTestTextProto, KeepsCommentsIndentedInList) {
-  verifyFormat("aaaaaaaaaa: 100\n"
-               "bbbbbbbbbbbbbbbbbbbbbbbbbbb: 200\n"
-               "# Single line comment for stuff here.\n"
-               "cccccccccccccccccccccccc: 3849\n"
-               "# Multiline comment for stuff here.\n"
-               "# Multiline comment for stuff here.\n"
-               "# Multiline comment for stuff here.\n"
-               "cccccccccccccccccccccccc: 3849");
-}
-
-TEST_F(FormatTestTextProto, UnderstandsHashComments) {
-  FormatStyle Style = getGoogleStyle(FormatStyle::LK_TextProto);
-  Style.ColumnLimit = 60; // To make writing tests easier.
-  EXPECT_EQ("aaa: 100\n"
-            "## this is a double-hash comment.\n"
-            "bb: 100\n"
-            "## another double-hash comment.\n"
-            "### a triple-hash comment\n"
-            "cc: 200\n"
-            "### another triple-hash comment\n"
-            "#### a quadriple-hash comment\n"
-            "dd: 100\n"
-            "#### another quadriple-hash comment\n",
-            format("aaa: 100\n"
-                   "##this is a double-hash comment.\n"
-                   "bb: 100\n"
-                   "## another double-hash comment.\n"
-                   "###a triple-hash comment\n"
-                   "cc: 200\n"
-                   "### another triple-hash comment\n"
-                   "####a quadriple-hash comment\n"
-                   "dd: 100\n"
-                   "#### another quadriple-hash comment\n",
-                   Style));
-}
-
-TEST_F(FormatTestTextProto, FormatsExtensions) {
-  verifyFormat("[type] { key: value }");
-  verifyFormat("[type] {\n"
-               "  keyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy: value\n"
-               "}");
-  verifyFormat("[type.type] { key: value }");
-  verifyFormat("[type.type] < key: value >");
-  verifyFormat("[type.type/type.type] { key: value }");
-  verifyFormat("msg {\n"
-               "  [type.type] { key: value }\n"
-               "}");
-  verifyFormat("msg {\n"
-               "  [type.type] {\n"
-               "    keyyyyyyyyyyyyyy: valuuuuuuuuuuuuuuuuuuuuuuuuue\n"
-               "  }\n"
-               "}");
-  verifyFormat("key: value\n"
-               "[a.b] { key: value }");
-  verifyFormat("msg: <\n"
-               "  key: value\n"
-               "  [a.b.c/d.e]: < key: value >\n"
-               "  [f.g]: <\n"
-               "    key: valueeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee\n"
-               "    key: {}\n"
-               "  >\n"
-               "  key {}\n"
-               "  [h.i.j] < key: value >\n"
-               "  [a]: {\n"
-               "    [b.c]: {}\n"
-               "    [d] <>\n"
-               "    [e/f]: 1\n"
-               "  }\n"
-               ">");
-  verifyFormat("[longg.long.long.long.long.long.long.long.long.long.long\n"
-               "     .longg.longlong] { key: value }");
-  verifyFormat("[longg.long.long.long.long.long.long.long.long.long.long\n"
-               "     .longg.longlong] {\n"
-               "  key: value\n"
-               "  key: value\n"
-               "  key: value\n"
-               "  key: value\n"
-               "}");
-  verifyFormat("[longg.long.long.long.long.long.long.long.long.long\n"
-               "     .long/longg.longlong] { key: value }");
-  verifyFormat("[aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/\n"
-               " bbbbbbbbbbbbbb] { key: value }");
-  // These go over the column limit intentionally, since the alternative
-  // [aa..a\n] is worse.
-  verifyFormat(
-      "[aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa] {\n"
-      "  key: value\n"
-      "}");
-  verifyFormat(
-      "[aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa] {\n"
-      "  [type.type] {\n"
-      "    keyyyyyyyyyyyyyy: valuuuuuuuuuuuuuuuuuuuuuuuuue\n"
-      "  }\n"
-      "}");
-  verifyFormat("[aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/\n"
-               " bbbbbbb] {\n"
-               "  [type.type] {\n"
-               "    keyyyyyyyyyyyyyy: valuuuuuuuuuuuuuuuuuuuuuuuuue\n"
-               "  }\n"
-               "}");
-  verifyFormat(
-      "aaaaaaaaaaaaaaa {\n"
-      "  bbbbbb {\n"
-      "    [a.b/cy] {\n"
-      "      eeeeeeeeeeeee: \"The lazy coo cat jumps over the lazy hot dog\"\n"
-      "    }\n"
-      "  }\n"
-      "}");
-}
-
-TEST_F(FormatTestTextProto, SpacesAroundPercents) {
-  verifyFormat("key: %d");
-  verifyFormat("key: 0x%04x");
-  verifyFormat("key: \"%d %d\"");
-}
-
-TEST_F(FormatTestTextProto, FormatsRepeatedListInitializers) {
-  verifyFormat("keys: []");
-  verifyFormat("keys: [ 1 ]");
-  verifyFormat("keys: [ 'ala', 'bala' ]");
-  verifyFormat("keys: [\n"
-               "  'ala',\n"
-               "  'bala',\n"
-               "  'porto',\n"
-               "  'kala',\n"
-               "  'too',\n"
-               "  'long',\n"
-               "  'ng'\n"
-               "]");
-  verifyFormat("key: item\n"
-               "keys: [\n"
-               "  'ala',\n"
-               "  'bala',\n"
-               "  'porto',\n"
-               "  'kala',\n"
-               "  'too',\n"
-               "  'long',\n"
-               "  'long',\n"
-               "  'long'\n"
-               "]\n"
-               "key: item\n"
-               "msg {\n"
-               "  key: item\n"
-               "  keys: [\n"
-               "    'ala',\n"
-               "    'bala',\n"
-               "    'porto',\n"
-               "    'kala',\n"
-               "    'too',\n"
-               "    'long',\n"
-               "    'long'\n"
-               "  ]\n"
-               "}\n"
-               "key: value");
-  FormatStyle Style = getGoogleStyle(FormatStyle::LK_TextProto);
-  Style.ColumnLimit = 60; // To make writing tests easier.
-  Style.Cpp11BracedListStyle = true;
-  verifyFormat("keys: [1]", Style);
-}
-
-TEST_F(FormatTestTextProto, AcceptsOperatorAsKey) {
-  verifyFormat("aaaaaaaaaaa: <\n"
-               "  bbbbbbbbb: <\n"
-               "    ccccccccccccccccccccccc: <\n"
-               "      operator: 1\n"
-               "      operator: 2\n"
-               "      operator: 3\n"
-               "      operator { key: value }\n"
-               "    >\n"
-               "  >\n"
-               ">");
-}
-
-TEST_F(FormatTestTextProto, BreaksConsecutiveStringLiterals) {
-  verifyFormat("ala: \"str1\"\n"
-               "     \"str2\"\n");
-}
-
-TEST_F(FormatTestTextProto, PutsMultipleEntriesInExtensionsOnNewlines) {
-  FormatStyle Style = getGoogleStyle(FormatStyle::LK_TextProto);
-  verifyFormat("pppppppppp: {\n"
-               "  ssssss: \"http://example.com/blahblahblah\"\n"
-               "  ppppppp: \"sssss/MMMMMMMMMMMM\"\n"
-               "  [ns.sssss.eeeeeeeee.eeeeeeeeeeeeeee] { begin: 24 end: 252 }\n"
-               "  [ns.sssss.eeeeeeeee.eeeeeeeeeeeeeee] {\n"
-               "    begin: 24\n"
-               "    end: 252\n"
-               "    key: value\n"
-               "    key: value\n"
-               "  }\n"
-               "}",
-               Style);
-}
-
-TEST_F(FormatTestTextProto, BreaksAfterBraceFollowedByClosingBraceOnNextLine) {
-  FormatStyle Style = getGoogleStyle(FormatStyle::LK_TextProto);
-  Style.ColumnLimit = 60;
-  verifyFormat("keys: [\n"
-               "  data: { item: 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' }\n"
-               "]");
-  verifyFormat("keys: <\n"
-               "  data: { item: 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' }\n"
-               ">");
-}
-
-TEST_F(FormatTestTextProto, BreaksEntriesOfSubmessagesContainingSubmessages) {
-  FormatStyle Style = getGoogleStyle(FormatStyle::LK_TextProto);
-  Style.ColumnLimit = 60;
-  // The column limit allows for the keys submessage to be put on 1 line, but we
-  // break it since it contains a submessage an another entry.
-  verifyFormat("key: valueeeeeeee\n"
-               "keys: {\n"
-               "  item: 'aaaaaaaaaaaaaaaa'\n"
-               "  sub <>\n"
-               "}");
-  verifyFormat("key: valueeeeeeee\n"
-               "keys: {\n"
-               "  item: 'aaaaaaaaaaaaaaaa'\n"
-               "  sub {}\n"
-               "}");
-  verifyFormat("key: valueeeeeeee\n"
-               "keys: {\n"
-               "  sub {}\n"
-               "  sub: <>\n"
-               "  sub: []\n"
-               "}");
-  verifyFormat("key: valueeeeeeee\n"
-               "keys: {\n"
-               "  item: 'aaaaaaaaaaa'\n"
-               "  sub { msg: 1 }\n"
-               "}");
-  verifyFormat("key: valueeeeeeee\n"
-               "keys: {\n"
-               "  item: 'aaaaaaaaaaa'\n"
-               "  sub: { msg: 1 }\n"
-               "}");
-  verifyFormat("key: valueeeeeeee\n"
-               "keys: {\n"
-               "  item: 'aaaaaaaaaaa'\n"
-               "  sub < msg: 1 >\n"
-               "}");
-  verifyFormat("key: valueeeeeeee\n"
-               "keys: {\n"
-               "  item: 'aaaaaaaaaaa'\n"
-               "  sub: [ msg: 1 ]\n"
-               "}");
-  verifyFormat("key: valueeeeeeee\n"
-               "keys: <\n"
-               "  item: 'aaaaaaaaaaa'\n"
-               "  sub: [ 1, 2 ]\n"
-               ">");
-  verifyFormat("key: valueeeeeeee\n"
-               "keys: {\n"
-               "  sub {}\n"
-               "  item: 'aaaaaaaaaaaaaaaa'\n"
-               "}");
-  verifyFormat("key: valueeeeeeee\n"
-               "keys: {\n"
-               "  sub: []\n"
-               "  item: 'aaaaaaaaaaaaaaaa'\n"
-               "}");
-  verifyFormat("key: valueeeeeeee\n"
-               "keys: {\n"
-               "  sub <>\n"
-               "  item: 'aaaaaaaaaaaaaaaa'\n"
-               "}");
-  verifyFormat("key: valueeeeeeee\n"
-               "keys: {\n"
-               "  sub { key: value }\n"
-               "  item: 'aaaaaaaaaaaaaaaa'\n"
-               "}");
-  verifyFormat("key: valueeeeeeee\n"
-               "keys: {\n"
-               "  sub: [ 1, 2 ]\n"
-               "  item: 'aaaaaaaaaaaaaaaa'\n"
-               "}");
-  verifyFormat("key: valueeeeeeee\n"
-               "keys: {\n"
-               "  sub < sub_2: {} >\n"
-               "  item: 'aaaaaaaaaaaaaaaa'\n"
-               "}");
-  verifyFormat("key: valueeeeeeee\n"
-               "keys: {\n"
-               "  item: data\n"
-               "  sub: [ 1, 2 ]\n"
-               "  item: 'aaaaaaaaaaaaaaaa'\n"
-               "}");
-  verifyFormat("key: valueeeeeeee\n"
-               "keys: {\n"
-               "  item: data\n"
-               "  sub < sub_2: {} >\n"
-               "  item: 'aaaaaaaaaaaaaaaa'\n"
-               "}");
-  verifyFormat("sub: {\n"
-               "  key: valueeeeeeee\n"
-               "  keys: {\n"
-               "    sub: [ 1, 2 ]\n"
-               "    item: 'aaaaaaaaaaaaaaaa'\n"
-               "  }\n"
-               "}");
-  verifyFormat("sub: {\n"
-               "  key: 1\n"
-               "  sub: {}\n"
-               "}\n"
-               "# comment\n");
-  verifyFormat("sub: {\n"
-               "  key: 1\n"
-               "  # comment\n"
-               "  sub: {}\n"
-               "}");
-}
-
-TEST_F(FormatTestTextProto, PreventBreaksBetweenKeyAndSubmessages) {
-  verifyFormat("submessage: {\n"
-               "  key: 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'\n"
-               "}");
-  verifyFormat("submessage {\n"
-               "  key: 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'\n"
-               "}");
-  verifyFormat("submessage: <\n"
-               "  key: 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'\n"
-               ">");
-  verifyFormat("submessage <\n"
-               "  key: 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'\n"
-               ">");
-  verifyFormat("repeatedd: [\n"
-               "  'eyaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'\n"
-               "]");
-  // "{" is going over the column limit.
-  verifyFormat(
-      "submessageeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee: {\n"
-      "  key: 'aaaaa'\n"
-      "}");
-}
-
-TEST_F(FormatTestTextProto, FormatsCommentsAtEndOfFile) {
-  verifyFormat("key: value\n"
-               "# endfile comment");
-  verifyFormat("key: value\n"
-               "// endfile comment");
-  verifyFormat("key: value\n"
-               "// endfile comment 1\n"
-               "// endfile comment 2");
-  verifyFormat("submessage { key: value }\n"
-               "# endfile comment");
-  verifyFormat("submessage <\n"
-               "  key: value\n"
-               "  item {}\n"
-               ">\n"
-               "# endfile comment");
-}
-
-TEST_F(FormatTestTextProto, KeepsAmpersandsNextToKeys) {
-  verifyFormat("@tmpl { field: 1 }");
-  verifyFormat("@placeholder: 1");
-  verifyFormat("@name <>");
-  verifyFormat("submessage: @base { key: value }");
-  verifyFormat("submessage: @base {\n"
-               "  key: value\n"
-               "  item: {}\n"
-               "}");
-  verifyFormat("submessage: {\n"
-               "  msg: @base {\n"
-               "    yolo: {}\n"
-               "    key: value\n"
-               "  }\n"
-               "  key: value\n"
-               "}");
-}
-
-} // namespace format
-} // end namespace clang
diff --git a/gnu/llvm/clang/unittests/Format/FormatTestUtils.h b/gnu/llvm/clang/unittests/Format/FormatTestUtils.h
deleted file mode 100644
index fb75070db1c..00000000000
--- a/gnu/llvm/clang/unittests/Format/FormatTestUtils.h
+++ /dev/null
@@ -1,67 +0,0 @@
-//===- unittest/Format/FormatTestUtils.h - Formatting unit tests ----------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-//  This file defines utility functions for Clang-Format related tests.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_CLANG_UNITTESTS_FORMAT_FORMATTESTUTILS_H
-#define LLVM_CLANG_UNITTESTS_FORMAT_FORMATTESTUTILS_H
-
-#include "llvm/ADT/StringRef.h"
-
-namespace clang {
-namespace format {
-namespace test {
-
-inline std::string messUp(llvm::StringRef Code) {
-  std::string MessedUp(Code.str());
-  bool InComment = false;
-  bool InPreprocessorDirective = false;
-  bool JustReplacedNewline = false;
-  for (unsigned i = 0, e = MessedUp.size() - 1; i != e; ++i) {
-    if (MessedUp[i] == '/' && MessedUp[i + 1] == '/') {
-      if (JustReplacedNewline)
-        MessedUp[i - 1] = '\n';
-      InComment = true;
-    } else if (MessedUp[i] == '#' &&
-               (JustReplacedNewline || i == 0 || MessedUp[i - 1] == '\n')) {
-      if (i != 0)
-        MessedUp[i - 1] = '\n';
-      InPreprocessorDirective = true;
-    } else if (MessedUp[i] == '\\' && MessedUp[i + 1] == '\n') {
-      MessedUp[i] = ' ';
-      MessedUp[i + 1] = ' ';
-    } else if (MessedUp[i] == '\n') {
-      if (InComment) {
-        InComment = false;
-      } else if (InPreprocessorDirective) {
-        InPreprocessorDirective = false;
-      } else {
-        JustReplacedNewline = true;
-        MessedUp[i] = ' ';
-      }
-    } else if (MessedUp[i] != ' ') {
-      JustReplacedNewline = false;
-    }
-  }
-  std::string WithoutWhitespace;
-  if (MessedUp[0] != ' ')
-    WithoutWhitespace.push_back(MessedUp[0]);
-  for (unsigned i = 1, e = MessedUp.size(); i != e; ++i) {
-    if (MessedUp[i] != ' ' || MessedUp[i - 1] != ' ')
-      WithoutWhitespace.push_back(MessedUp[i]);
-  }
-  return WithoutWhitespace;
-}
-
-} // end namespace test
-} // end namespace format
-} // end namespace clang
-
-#endif
diff --git a/gnu/llvm/clang/unittests/Format/MacroExpanderTest.cpp b/gnu/llvm/clang/unittests/Format/MacroExpanderTest.cpp
deleted file mode 100644
index 7ec98a5e82b..00000000000
--- a/gnu/llvm/clang/unittests/Format/MacroExpanderTest.cpp
+++ /dev/null
@@ -1,207 +0,0 @@
-#include "../../lib/Format/Macros.h"
-#include "TestLexer.h"
-#include "clang/Basic/FileManager.h"
-
-#include "gtest/gtest.h"
-
-namespace clang {
-namespace format {
-
-namespace {
-
-class MacroExpanderTest : public ::testing::Test {
-public:
-  MacroExpanderTest() : Lex(Allocator, Buffers) {}
-  std::unique_ptr<MacroExpander>
-  create(const std::vector<std::string> &MacroDefinitions) {
-    return std::make_unique<MacroExpander>(MacroDefinitions,
-                                           Lex.SourceMgr.get(), Lex.Style,
-                                           Lex.Allocator, Lex.IdentTable);
-  }
-
-  std::string expand(MacroExpander &Macros, llvm::StringRef Name,
-                     const std::vector<std::string> &Args = {}) {
-    EXPECT_TRUE(Macros.defined(Name));
-    return text(Macros.expand(Lex.id(Name), lexArgs(Args)));
-  }
-
-  llvm::SmallVector<TokenList, 1>
-  lexArgs(const std::vector<std::string> &Args) {
-    llvm::SmallVector<TokenList, 1> Result;
-    for (const auto &Arg : Args) {
-      Result.push_back(uneof(Lex.lex(Arg)));
-    }
-    return Result;
-  }
-
-  struct MacroAttributes {
-    clang::tok::TokenKind Kind;
-    MacroRole Role;
-    unsigned Start;
-    unsigned End;
-    llvm::SmallVector<FormatToken *, 1> ExpandedFrom;
-  };
-
-  void expectAttributes(const TokenList &Tokens,
-                        const std::vector<MacroAttributes> &Attributes,
-                        const std::string &File, unsigned Line) {
-    EXPECT_EQ(Tokens.size(), Attributes.size()) << text(Tokens);
-    for (size_t I = 0, E = Tokens.size(); I != E; ++I) {
-      if (I >= Attributes.size())
-        continue;
-      std::string Context =
-          ("for token " + llvm::Twine(I) + ": " + Tokens[I]->Tok.getName() +
-           " / " + Tokens[I]->TokenText)
-              .str();
-      EXPECT_TRUE(Tokens[I]->is(Attributes[I].Kind))
-          << Context << " in " << text(Tokens) << " at " << File << ":" << Line;
-      EXPECT_EQ(Tokens[I]->MacroCtx->Role, Attributes[I].Role)
-          << Context << " in " << text(Tokens) << " at " << File << ":" << Line;
-      EXPECT_EQ(Tokens[I]->MacroCtx->StartOfExpansion, Attributes[I].Start)
-          << Context << " in " << text(Tokens) << " at " << File << ":" << Line;
-      EXPECT_EQ(Tokens[I]->MacroCtx->EndOfExpansion, Attributes[I].End)
-          << Context << " in " << text(Tokens) << " at " << File << ":" << Line;
-      EXPECT_EQ(Tokens[I]->MacroCtx->ExpandedFrom, Attributes[I].ExpandedFrom)
-          << Context << " in " << text(Tokens) << " at " << File << ":" << Line;
-    }
-  }
-
-protected:
-  llvm::SpecificBumpPtrAllocator<FormatToken> Allocator;
-  std::vector<std::unique_ptr<llvm::MemoryBuffer>> Buffers;
-  TestLexer Lex;
-};
-
-#define EXPECT_ATTRIBUTES(Tokens, Attributes)                                  \
-  expectAttributes(Tokens, Attributes, __FILE__, __LINE__)
-
-TEST_F(MacroExpanderTest, SkipsDefinitionOnError) {
-  auto Macros =
-      create({"A(", "B(,", "C(a,", "D(a a", "E(a, a", "F(,)", "G(a;"});
-  for (const auto *Name : {"A", "B", "C", "D", "E", "F", "G"}) {
-    EXPECT_FALSE(Macros->defined(Name)) << "for Name " << Name;
-  }
-}
-
-TEST_F(MacroExpanderTest, ExpandsWithoutArguments) {
-  auto Macros = create({
-      "A",
-      "B=b",
-      "C=c + c",
-      "D()",
-  });
-  EXPECT_TRUE(Macros->objectLike("A"));
-  EXPECT_TRUE(Macros->objectLike("B"));
-  EXPECT_TRUE(Macros->objectLike("C"));
-  EXPECT_TRUE(!Macros->objectLike("D"));
-  EXPECT_EQ("", expand(*Macros, "A"));
-  EXPECT_EQ("b", expand(*Macros, "B"));
-  EXPECT_EQ("c+c", expand(*Macros, "C"));
-  EXPECT_EQ("", expand(*Macros, "D"));
-}
-
-TEST_F(MacroExpanderTest, ExpandsWithArguments) {
-  auto Macros = create({
-      "A(x)",
-      "B(x, y)=x + y",
-  });
-  EXPECT_EQ("", expand(*Macros, "A", {"a"}));
-  EXPECT_EQ("b1+b2+b3", expand(*Macros, "B", {"b1", "b2 + b3"}));
-  EXPECT_EQ("x+", expand(*Macros, "B", {"x"}));
-}
-
-TEST_F(MacroExpanderTest, AttributizesTokens) {
-  auto Macros = create({
-      "A(x, y)={ x + y; }",
-      "B(x, y)=x + 3 + y",
-  });
-  auto *A = Lex.id("A");
-  auto AArgs = lexArgs({"a1 * a2", "a3 * a4"});
-  auto Result = Macros->expand(A, AArgs);
-  EXPECT_EQ(11U, Result.size()) << text(Result) << " / " << Result;
-  EXPECT_EQ("{a1*a2+a3*a4;}", text(Result));
-  std::vector<MacroAttributes> Attributes = {
-      {tok::l_brace, MR_Hidden, 1, 0, {A}},
-      {tok::identifier, MR_ExpandedArg, 0, 0, {A}},
-      {tok::star, MR_ExpandedArg, 0, 0, {A}},
-      {tok::identifier, MR_ExpandedArg, 0, 0, {A}},
-      {tok::plus, MR_Hidden, 0, 0, {A}},
-      {tok::identifier, MR_ExpandedArg, 0, 0, {A}},
-      {tok::star, MR_ExpandedArg, 0, 0, {A}},
-      {tok::identifier, MR_ExpandedArg, 0, 0, {A}},
-      {tok::semi, MR_Hidden, 0, 0, {A}},
-      {tok::r_brace, MR_Hidden, 0, 1, {A}},
-      {tok::eof, MR_Hidden, 0, 0, {A}},
-  };
-  EXPECT_ATTRIBUTES(Result, Attributes);
-
-  auto *B = Lex.id("B");
-  auto BArgs = lexArgs({"b1", "b2"});
-  Result = Macros->expand(B, BArgs);
-  EXPECT_EQ(6U, Result.size()) << text(Result) << " / " << Result;
-  EXPECT_EQ("b1+3+b2", text(Result));
-  Attributes = {
-      {tok::identifier, MR_ExpandedArg, 1, 0, {B}},
-      {tok::plus, MR_Hidden, 0, 0, {B}},
-      {tok::numeric_constant, MR_Hidden, 0, 0, {B}},
-      {tok::plus, MR_Hidden, 0, 0, {B}},
-      {tok::identifier, MR_ExpandedArg, 0, 1, {B}},
-      {tok::eof, MR_Hidden, 0, 0, {B}},
-  };
-  EXPECT_ATTRIBUTES(Result, Attributes);
-}
-
-TEST_F(MacroExpanderTest, RecursiveExpansion) {
-  auto Macros = create({
-      "A(x)=x",
-      "B(x)=x",
-      "C(x)=x",
-  });
-
-  auto *A = Lex.id("A");
-  auto *B = Lex.id("B");
-  auto *C = Lex.id("C");
-
-  auto Args = lexArgs({"id"});
-  auto CResult = uneof(Macros->expand(C, Args));
-  auto BResult = uneof(Macros->expand(B, CResult));
-  auto AResult = uneof(Macros->expand(A, BResult));
-
-  std::vector<MacroAttributes> Attributes = {
-      {tok::identifier, MR_ExpandedArg, 3, 3, {C, B, A}},
-  };
-  EXPECT_ATTRIBUTES(AResult, Attributes);
-}
-
-TEST_F(MacroExpanderTest, SingleExpansion) {
-  auto Macros = create({"A(x)=x+x"});
-  auto *A = Lex.id("A");
-  auto Args = lexArgs({"id"});
-  auto Result = uneof(Macros->expand(A, Args));
-  std::vector<MacroAttributes> Attributes = {
-      {tok::identifier, MR_ExpandedArg, 1, 0, {A}},
-      {tok::plus, MR_Hidden, 0, 0, {A}},
-      {tok::identifier, MR_Hidden, 0, 1, {A}},
-  };
-  EXPECT_ATTRIBUTES(Result, Attributes);
-}
-
-TEST_F(MacroExpanderTest, UnderstandsCppTokens) {
-  auto Macros = create({"A(T,name)=T name = 0;"});
-  auto *A = Lex.id("A");
-  auto Args = lexArgs({"const int", "x"});
-  auto Result = uneof(Macros->expand(A, Args));
-  std::vector<MacroAttributes> Attributes = {
-      {tok::kw_const, MR_ExpandedArg, 1, 0, {A}},
-      {tok::kw_int, MR_ExpandedArg, 0, 0, {A}},
-      {tok::identifier, MR_ExpandedArg, 0, 0, {A}},
-      {tok::equal, MR_Hidden, 0, 0, {A}},
-      {tok::numeric_constant, MR_Hidden, 0, 0, {A}},
-      {tok::semi, MR_Hidden, 0, 1, {A}},
-  };
-  EXPECT_ATTRIBUTES(Result, Attributes);
-}
-
-} // namespace
-} // namespace format
-} // namespace clang
diff --git a/gnu/llvm/clang/unittests/Format/NamespaceEndCommentsFixerTest.cpp b/gnu/llvm/clang/unittests/Format/NamespaceEndCommentsFixerTest.cpp
deleted file mode 100644
index 9b0301930d2..00000000000
--- a/gnu/llvm/clang/unittests/Format/NamespaceEndCommentsFixerTest.cpp
+++ /dev/null
@@ -1,1190 +0,0 @@
-//===- NamespaceEndCommentsFixerTest.cpp - Formatting unit tests ----------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/Format/Format.h"
-
-#include "llvm/Support/Debug.h"
-#include "gtest/gtest.h"
-
-#define DEBUG_TYPE "namespace-end-comments-fixer-test"
-
-namespace clang {
-namespace format {
-namespace {
-
-class NamespaceEndCommentsFixerTest : public ::testing::Test {
-protected:
-  std::string
-  fixNamespaceEndComments(llvm::StringRef Code,
-                          const std::vector<tooling::Range> &Ranges,
-                          const FormatStyle &Style = getLLVMStyle()) {
-    LLVM_DEBUG(llvm::errs() << "---\n");
-    LLVM_DEBUG(llvm::errs() << Code << "\n\n");
-    tooling::Replacements Replaces =
-        clang::format::fixNamespaceEndComments(Style, Code, Ranges, "<stdin>");
-    auto Result = applyAllReplacements(Code, Replaces);
-    EXPECT_TRUE(static_cast<bool>(Result));
-    LLVM_DEBUG(llvm::errs() << "\n" << *Result << "\n\n");
-    return *Result;
-  }
-
-  std::string
-  fixNamespaceEndComments(llvm::StringRef Code,
-                          const FormatStyle &Style = getLLVMStyle()) {
-    return fixNamespaceEndComments(
-        Code,
-        /*Ranges=*/{1, tooling::Range(0, Code.size())}, Style);
-  }
-};
-
-TEST_F(NamespaceEndCommentsFixerTest, AddsEndComment) {
-  EXPECT_EQ("namespace {\n"
-            "int i;\n"
-            "int j;\n"
-            "}// namespace",
-            fixNamespaceEndComments("namespace {\n"
-                                    "int i;\n"
-                                    "int j;\n"
-                                    "}"));
-
-  EXPECT_EQ("namespace {\n"
-            "int i;\n"
-            "int j;\n"
-            "}// namespace\n",
-            fixNamespaceEndComments("namespace {\n"
-                                    "int i;\n"
-                                    "int j;\n"
-                                    "}\n"));
-  EXPECT_EQ("namespace A {\n"
-            "int i;\n"
-            "int j;\n"
-            "}// namespace A",
-            fixNamespaceEndComments("namespace A {\n"
-                                    "int i;\n"
-                                    "int j;\n"
-                                    "}"));
-  EXPECT_EQ("inline namespace A {\n"
-            "int i;\n"
-            "int j;\n"
-            "}// namespace A",
-            fixNamespaceEndComments("inline namespace A {\n"
-                                    "int i;\n"
-                                    "int j;\n"
-                                    "}"));
-
-  EXPECT_EQ("namespace [[deprecated(\"foo\")]] A::B {\n"
-            "int i;\n"
-            "int j;\n"
-            "}// namespace A::B",
-            fixNamespaceEndComments("namespace [[deprecated(\"foo\")]] A::B {\n"
-                                    "int i;\n"
-                                    "int j;\n"
-                                    "}"));
-
-  EXPECT_EQ("namespace [[deprecated(\"foo\")]] A::inline B::inline C {\n"
-            "int i;\n"
-            "int j;\n"
-            "}// namespace A::inline B::inline C",
-            fixNamespaceEndComments(
-                "namespace [[deprecated(\"foo\")]] A::inline B::inline C {\n"
-                "int i;\n"
-                "int j;\n"
-                "}"));
-
-  EXPECT_EQ("namespace DEPRECATED A::B {\n"
-            "int i;\n"
-            "int j;\n"
-            "}// namespace A::B",
-            fixNamespaceEndComments("namespace DEPRECATED A::B {\n"
-                                    "int i;\n"
-                                    "int j;\n"
-                                    "}"));
-
-  EXPECT_EQ("inline namespace [[deprecated]] A {\n"
-            "int i;\n"
-            "int j;\n"
-            "}// namespace A",
-            fixNamespaceEndComments("inline namespace [[deprecated]] A {\n"
-                                    "int i;\n"
-                                    "int j;\n"
-                                    "}"));
-
-  EXPECT_EQ("namespace ::A {\n"
-            "int i;\n"
-            "int j;\n"
-            "}// namespace ::A",
-            fixNamespaceEndComments("namespace ::A {\n"
-                                    "int i;\n"
-                                    "int j;\n"
-                                    "}"));
-  EXPECT_EQ("namespace ::A::B {\n"
-            "int i;\n"
-            "int j;\n"
-            "}// namespace ::A::B",
-            fixNamespaceEndComments("namespace ::A::B {\n"
-                                    "int i;\n"
-                                    "int j;\n"
-                                    "}"));
-  EXPECT_EQ("namespace /**/::/**/A/**/::/**/B/**/ {\n"
-            "int i;\n"
-            "int j;\n"
-            "}// namespace ::A::B",
-            fixNamespaceEndComments("namespace /**/::/**/A/**/::/**/B/**/ {\n"
-                                    "int i;\n"
-                                    "int j;\n"
-                                    "}"));
-  EXPECT_EQ("namespace A {\n"
-            "namespace B {\n"
-            "int i;\n"
-            "}\n"
-            "}// namespace A",
-            fixNamespaceEndComments("namespace A {\n"
-                                    "namespace B {\n"
-                                    "int i;\n"
-                                    "}\n"
-                                    "}"));
-  EXPECT_EQ("namespace A {\n"
-            "namespace B {\n"
-            "int i;\n"
-            "int j;\n"
-            "}// namespace B\n"
-            "}// namespace A",
-            fixNamespaceEndComments("namespace A {\n"
-                                    "namespace B {\n"
-                                    "int i;\n"
-                                    "int j;\n"
-                                    "}\n"
-                                    "}"));
-  EXPECT_EQ("namespace A {\n"
-            "int a;\n"
-            "int b;\n"
-            "}// namespace A\n"
-            "namespace B {\n"
-            "int b;\n"
-            "int a;\n"
-            "}// namespace B",
-            fixNamespaceEndComments("namespace A {\n"
-                                    "int a;\n"
-                                    "int b;\n"
-                                    "}\n"
-                                    "namespace B {\n"
-                                    "int b;\n"
-                                    "int a;\n"
-                                    "}"));
-  EXPECT_EQ("namespace A {\n"
-            "int a1;\n"
-            "int a2;\n"
-            "}// namespace A\n"
-            "namespace A {\n"
-            "int a2;\n"
-            "int a1;\n"
-            "}// namespace A",
-            fixNamespaceEndComments("namespace A {\n"
-                                    "int a1;\n"
-                                    "int a2;\n"
-                                    "}\n"
-                                    "namespace A {\n"
-                                    "int a2;\n"
-                                    "int a1;\n"
-                                    "}"));
-  EXPECT_EQ("namespace A {\n"
-            "int a;\n"
-            "int b;\n"
-            "}// namespace A\n"
-            "// comment about b\n"
-            "int b;",
-            fixNamespaceEndComments("namespace A {\n"
-                                    "int a;\n"
-                                    "int b;\n"
-                                    "}\n"
-                                    "// comment about b\n"
-                                    "int b;"));
-
-  EXPECT_EQ("namespace A {\n"
-            "namespace B {\n"
-            "namespace C {\n"
-            "namespace D {\n"
-            "}\n"
-            "}// namespace C\n"
-            "}// namespace B\n"
-            "}// namespace A",
-            fixNamespaceEndComments("namespace A {\n"
-                                    "namespace B {\n"
-                                    "namespace C {\n"
-                                    "namespace D {\n"
-                                    "}\n"
-                                    "}\n"
-                                    "}\n"
-                                    "}"));
-
-  // Add comment for namespaces which will be 'compacted'
-  FormatStyle CompactNamespacesStyle = getLLVMStyle();
-  CompactNamespacesStyle.CompactNamespaces = true;
-  EXPECT_EQ("namespace out { namespace in {\n"
-            "int i;\n"
-            "int j;\n"
-            "}}// namespace out::in",
-            fixNamespaceEndComments("namespace out { namespace in {\n"
-                                    "int i;\n"
-                                    "int j;\n"
-                                    "}}",
-                                    CompactNamespacesStyle));
-  EXPECT_EQ("namespace out {\n"
-            "namespace in {\n"
-            "int i;\n"
-            "int j;\n"
-            "}\n"
-            "}// namespace out::in",
-            fixNamespaceEndComments("namespace out {\n"
-                                    "namespace in {\n"
-                                    "int i;\n"
-                                    "int j;\n"
-                                    "}\n"
-                                    "}",
-                                    CompactNamespacesStyle));
-  EXPECT_EQ("namespace out { namespace in {\n"
-            "int i;\n"
-            "int j;\n"
-            "};}// namespace out::in",
-            fixNamespaceEndComments("namespace out { namespace in {\n"
-                                    "int i;\n"
-                                    "int j;\n"
-                                    "};}",
-                                    CompactNamespacesStyle));
-
-  // Adds an end comment after a semicolon.
-  EXPECT_EQ("namespace {\n"
-            "int i;\n"
-            "int j;\n"
-            "};// namespace",
-            fixNamespaceEndComments("namespace {\n"
-                                    "int i;\n"
-                                    "int j;\n"
-                                    "};"));
-  EXPECT_EQ("namespace A {\n"
-            "int i;\n"
-            "int j;\n"
-            "};// namespace A",
-            fixNamespaceEndComments("namespace A {\n"
-                                    "int i;\n"
-                                    "int j;\n"
-                                    "};"));
-  EXPECT_EQ("namespace A {\n"
-            "int i;\n"
-            "int j;\n"
-            "};// namespace A\n"
-            "// unrelated",
-            fixNamespaceEndComments("namespace A {\n"
-                                    "int i;\n"
-                                    "int j;\n"
-                                    "};\n"
-                                    "// unrelated"));
-}
-
-TEST_F(NamespaceEndCommentsFixerTest, AddsMacroEndComment) {
-  FormatStyle Style = getLLVMStyle();
-  Style.NamespaceMacros.push_back("TESTSUITE");
-
-  EXPECT_EQ("TESTSUITE() {\n"
-            "int i;\n"
-            "int j;\n"
-            "}// TESTSUITE()",
-            fixNamespaceEndComments("TESTSUITE() {\n"
-                                    "int i;\n"
-                                    "int j;\n"
-                                    "}",
-                                    Style));
-
-  EXPECT_EQ("TESTSUITE(A) {\n"
-            "int i;\n"
-            "int j;\n"
-            "}// TESTSUITE(A)",
-            fixNamespaceEndComments("TESTSUITE(A) {\n"
-                                    "int i;\n"
-                                    "int j;\n"
-                                    "}",
-                                    Style));
-  EXPECT_EQ("inline TESTSUITE(A) {\n"
-            "int i;\n"
-            "int j;\n"
-            "}// TESTSUITE(A)",
-            fixNamespaceEndComments("inline TESTSUITE(A) {\n"
-                                    "int i;\n"
-                                    "int j;\n"
-                                    "}",
-                                    Style));
-  EXPECT_EQ("TESTSUITE(::A) {\n"
-            "int i;\n"
-            "int j;\n"
-            "}// TESTSUITE(::A)",
-            fixNamespaceEndComments("TESTSUITE(::A) {\n"
-                                    "int i;\n"
-                                    "int j;\n"
-                                    "}",
-                                    Style));
-  EXPECT_EQ("TESTSUITE(::A::B) {\n"
-            "int i;\n"
-            "int j;\n"
-            "}// TESTSUITE(::A::B)",
-            fixNamespaceEndComments("TESTSUITE(::A::B) {\n"
-                                    "int i;\n"
-                                    "int j;\n"
-                                    "}",
-                                    Style));
-  EXPECT_EQ("TESTSUITE(/**/::/**/A/**/::/**/B/**/) {\n"
-            "int i;\n"
-            "int j;\n"
-            "}// TESTSUITE(::A::B)",
-            fixNamespaceEndComments("TESTSUITE(/**/::/**/A/**/::/**/B/**/) {\n"
-                                    "int i;\n"
-                                    "int j;\n"
-                                    "}",
-                                    Style));
-  EXPECT_EQ("TESTSUITE(A, B) {\n"
-            "int i;\n"
-            "int j;\n"
-            "}// TESTSUITE(A)",
-            fixNamespaceEndComments("TESTSUITE(A, B) {\n"
-                                    "int i;\n"
-                                    "int j;\n"
-                                    "}",
-                                    Style));
-  EXPECT_EQ("TESTSUITE(\"Test1\") {\n"
-            "int i;\n"
-            "int j;\n"
-            "}// TESTSUITE(\"Test1\")",
-            fixNamespaceEndComments("TESTSUITE(\"Test1\") {\n"
-                                    "int i;\n"
-                                    "int j;\n"
-                                    "}",
-                                    Style));
-}
-
-TEST_F(NamespaceEndCommentsFixerTest, AddsNewlineIfNeeded) {
-  EXPECT_EQ("namespace A {\n"
-            "int i;\n"
-            "int j;\n"
-            "}// namespace A\n"
-            " int k;",
-            fixNamespaceEndComments("namespace A {\n"
-                                    "int i;\n"
-                                    "int j;\n"
-                                    "} int k;"));
-  EXPECT_EQ("namespace {\n"
-            "int i;\n"
-            "int j;\n"
-            "}// namespace\n"
-            " int k;",
-            fixNamespaceEndComments("namespace {\n"
-                                    "int i;\n"
-                                    "int j;\n"
-                                    "} int k;"));
-  EXPECT_EQ("namespace A {\n"
-            "int i;\n"
-            "int j;\n"
-            "}// namespace A\n"
-            " namespace B {\n"
-            "int j;\n"
-            "int k;\n"
-            "}// namespace B",
-            fixNamespaceEndComments("namespace A {\n"
-                                    "int i;\n"
-                                    "int j;\n"
-                                    "} namespace B {\n"
-                                    "int j;\n"
-                                    "int k;\n"
-                                    "}"));
-  EXPECT_EQ("namespace {\n"
-            "int i;\n"
-            "int j;\n"
-            "};// namespace\n"
-            "int k;",
-            fixNamespaceEndComments("namespace {\n"
-                                    "int i;\n"
-                                    "int j;\n"
-                                    "};int k;"));
-  EXPECT_EQ("namespace {\n"
-            "int i;\n"
-            "int j;\n"
-            "};// namespace\n"
-            ";",
-            fixNamespaceEndComments("namespace {\n"
-                                    "int i;\n"
-                                    "int j;\n"
-                                    "};;"));
-}
-
-TEST_F(NamespaceEndCommentsFixerTest, DoesNotAddEndCommentForShortNamespace) {
-  EXPECT_EQ("namespace {}", fixNamespaceEndComments("namespace {}"));
-  EXPECT_EQ("namespace A {}", fixNamespaceEndComments("namespace A {}"));
-  EXPECT_EQ("namespace A { a }", fixNamespaceEndComments("namespace A { a }"));
-  EXPECT_EQ("namespace A { a };",
-            fixNamespaceEndComments("namespace A { a };"));
-}
-
-TEST_F(NamespaceEndCommentsFixerTest, DoesNotAddCommentAfterUnaffectedRBrace) {
-  EXPECT_EQ("namespace A {\n"
-            "int i;\n"
-            "}",
-            fixNamespaceEndComments("namespace A {\n"
-                                    "int i;\n"
-                                    "}",
-                                    // The range (16, 3) spans the 'int' above.
-                                    /*Ranges=*/{1, tooling::Range(16, 3)}));
-  EXPECT_EQ("namespace A {\n"
-            "int i;\n"
-            "};",
-            fixNamespaceEndComments("namespace A {\n"
-                                    "int i;\n"
-                                    "};",
-                                    // The range (16, 3) spans the 'int' above.
-                                    /*Ranges=*/{1, tooling::Range(16, 3)}));
-}
-
-TEST_F(NamespaceEndCommentsFixerTest,
-       DoesNotAddCommentAfterRBraceInPPDirective) {
-  EXPECT_EQ("#define SAD \\\n"
-            "namespace A { \\\n"
-            "int i; \\\n"
-            "}",
-            fixNamespaceEndComments("#define SAD \\\n"
-                                    "namespace A { \\\n"
-                                    "int i; \\\n"
-                                    "}"));
-}
-
-TEST_F(NamespaceEndCommentsFixerTest, KeepsValidEndComment) {
-  EXPECT_EQ("namespace {\n"
-            "int i;\n"
-            "} // end anonymous namespace",
-            fixNamespaceEndComments("namespace {\n"
-                                    "int i;\n"
-                                    "} // end anonymous namespace"));
-  EXPECT_EQ("namespace A {\n"
-            "int i;\n"
-            "} /* end of namespace A */",
-            fixNamespaceEndComments("namespace A {\n"
-                                    "int i;\n"
-                                    "} /* end of namespace A */"));
-  EXPECT_EQ("namespace A {\n"
-            "int i;\n"
-            "}   //   namespace A",
-            fixNamespaceEndComments("namespace A {\n"
-                                    "int i;\n"
-                                    "}   //   namespace A"));
-  EXPECT_EQ("namespace A::B {\n"
-            "int i;\n"
-            "} // end namespace A::B",
-            fixNamespaceEndComments("namespace A::B {\n"
-                                    "int i;\n"
-                                    "} // end namespace A::B"));
-  EXPECT_EQ("namespace A {\n"
-            "int i;\n"
-            "}; // end namespace A",
-            fixNamespaceEndComments("namespace A {\n"
-                                    "int i;\n"
-                                    "}; // end namespace A"));
-  EXPECT_EQ("namespace {\n"
-            "int i;\n"
-            "}; /* unnamed namespace */",
-            fixNamespaceEndComments("namespace {\n"
-                                    "int i;\n"
-                                    "}; /* unnamed namespace */"));
-}
-
-TEST_F(NamespaceEndCommentsFixerTest, KeepsValidMacroEndComment) {
-  FormatStyle Style = getLLVMStyle();
-  Style.NamespaceMacros.push_back("TESTSUITE");
-
-  EXPECT_EQ("TESTSUITE() {\n"
-            "int i;\n"
-            "} // end anonymous TESTSUITE()",
-            fixNamespaceEndComments("TESTSUITE() {\n"
-                                    "int i;\n"
-                                    "} // end anonymous TESTSUITE()",
-                                    Style));
-  EXPECT_EQ("TESTSUITE(A) {\n"
-            "int i;\n"
-            "} /* end of TESTSUITE(A) */",
-            fixNamespaceEndComments("TESTSUITE(A) {\n"
-                                    "int i;\n"
-                                    "} /* end of TESTSUITE(A) */",
-                                    Style));
-  EXPECT_EQ("TESTSUITE(A) {\n"
-            "int i;\n"
-            "}   //   TESTSUITE(A)",
-            fixNamespaceEndComments("TESTSUITE(A) {\n"
-                                    "int i;\n"
-                                    "}   //   TESTSUITE(A)",
-                                    Style));
-  EXPECT_EQ("TESTSUITE(A::B) {\n"
-            "int i;\n"
-            "} // end TESTSUITE(A::B)",
-            fixNamespaceEndComments("TESTSUITE(A::B) {\n"
-                                    "int i;\n"
-                                    "} // end TESTSUITE(A::B)",
-                                    Style));
-  EXPECT_EQ("TESTSUITE(A) {\n"
-            "int i;\n"
-            "}; // end TESTSUITE(A)",
-            fixNamespaceEndComments("TESTSUITE(A) {\n"
-                                    "int i;\n"
-                                    "}; // end TESTSUITE(A)",
-                                    Style));
-  EXPECT_EQ("TESTSUITE() {\n"
-            "int i;\n"
-            "}; /* unnamed TESTSUITE() */",
-            fixNamespaceEndComments("TESTSUITE() {\n"
-                                    "int i;\n"
-                                    "}; /* unnamed TESTSUITE() */",
-                                    Style));
-}
-
-TEST_F(NamespaceEndCommentsFixerTest, UpdatesInvalidEndLineComment) {
-  EXPECT_EQ("namespace {\n"
-            "int i;\n"
-            "} // namespace",
-            fixNamespaceEndComments("namespace {\n"
-                                    "int i;\n"
-                                    "} // namespace A"));
-  EXPECT_EQ("namespace A {\n"
-            "int i;\n"
-            "} // namespace A",
-            fixNamespaceEndComments("namespace A {\n"
-                                    "int i;\n"
-                                    "} // namespace"));
-  EXPECT_EQ("namespace A {\n"
-            "int i;\n"
-            "} // namespace A",
-            fixNamespaceEndComments("namespace A {\n"
-                                    "int i;\n"
-                                    "} //"));
-  EXPECT_EQ("namespace A {\n"
-            "int i;\n"
-            "}; // namespace A",
-            fixNamespaceEndComments("namespace A {\n"
-                                    "int i;\n"
-                                    "}; //"));
-
-  EXPECT_EQ("namespace A {\n"
-            "int i;\n"
-            "} // namespace A",
-            fixNamespaceEndComments("namespace A {\n"
-                                    "int i;\n"
-                                    "} // banamespace A"));
-  EXPECT_EQ("namespace A {\n"
-            "int i;\n"
-            "}; // namespace A",
-            fixNamespaceEndComments("namespace A {\n"
-                                    "int i;\n"
-                                    "}; // banamespace A"));
-  // Updates invalid line comments even for short namespaces.
-  EXPECT_EQ("namespace A {} // namespace A",
-            fixNamespaceEndComments("namespace A {} // namespace"));
-  EXPECT_EQ("namespace A {}; // namespace A",
-            fixNamespaceEndComments("namespace A {}; // namespace"));
-
-  // Update invalid comments for compacted namespaces.
-  FormatStyle CompactNamespacesStyle = getLLVMStyle();
-  CompactNamespacesStyle.CompactNamespaces = true;
-  EXPECT_EQ("namespace out { namespace in {\n"
-            "}} // namespace out::in",
-            fixNamespaceEndComments("namespace out { namespace in {\n"
-                                    "}} // namespace out",
-                                    CompactNamespacesStyle));
-  EXPECT_EQ("namespace out { namespace in {\n"
-            "}} // namespace out::in",
-            fixNamespaceEndComments("namespace out { namespace in {\n"
-                                    "}} // namespace in",
-                                    CompactNamespacesStyle));
-  EXPECT_EQ("namespace out { namespace in {\n"
-            "}\n"
-            "} // namespace out::in",
-            fixNamespaceEndComments("namespace out { namespace in {\n"
-                                    "}// banamespace in\n"
-                                    "} // namespace out",
-                                    CompactNamespacesStyle));
-}
-
-TEST_F(NamespaceEndCommentsFixerTest, UpdatesInvalidMacroEndLineComment) {
-  FormatStyle Style = getLLVMStyle();
-  Style.NamespaceMacros.push_back("TESTSUITE");
-
-  EXPECT_EQ("TESTSUITE() {\n"
-            "int i;\n"
-            "} // TESTSUITE()",
-            fixNamespaceEndComments("TESTSUITE() {\n"
-                                    "int i;\n"
-                                    "} // TESTSUITE(A)",
-                                    Style));
-  EXPECT_EQ("TESTSUITE(A) {\n"
-            "int i;\n"
-            "} // TESTSUITE(A)",
-            fixNamespaceEndComments("TESTSUITE(A) {\n"
-                                    "int i;\n"
-                                    "} // TESTSUITE()",
-                                    Style));
-  EXPECT_EQ("TESTSUITE(A) {\n"
-            "int i;\n"
-            "} // TESTSUITE(A)",
-            fixNamespaceEndComments("TESTSUITE(A) {\n"
-                                    "int i;\n"
-                                    "} //",
-                                    Style));
-  EXPECT_EQ("TESTSUITE(A) {\n"
-            "int i;\n"
-            "}; // TESTSUITE(A)",
-            fixNamespaceEndComments("TESTSUITE(A) {\n"
-                                    "int i;\n"
-                                    "}; //",
-                                    Style));
-  EXPECT_EQ("TESTSUITE(A) {\n"
-            "int i;\n"
-            "} // TESTSUITE(A)",
-            fixNamespaceEndComments("TESTSUITE(A) {\n"
-                                    "int i;\n"
-                                    "} // TESTSUITE A",
-                                    Style));
-  EXPECT_EQ("TESTSUITE() {\n"
-            "int i;\n"
-            "} // TESTSUITE()",
-            fixNamespaceEndComments("TESTSUITE() {\n"
-                                    "int i;\n"
-                                    "} // TESTSUITE",
-                                    Style));
-  EXPECT_EQ("TESTSUITE(A) {\n"
-            "int i;\n"
-            "} // TESTSUITE(A)",
-            fixNamespaceEndComments("TESTSUITE(A) {\n"
-                                    "int i;\n"
-                                    "} // TOASTSUITE(A)",
-                                    Style));
-  EXPECT_EQ("TESTSUITE(A) {\n"
-            "int i;\n"
-            "}; // TESTSUITE(A)",
-            fixNamespaceEndComments("TESTSUITE(A) {\n"
-                                    "int i;\n"
-                                    "}; // TOASTSUITE(A)",
-                                    Style));
-  // Updates invalid line comments even for short namespaces.
-  EXPECT_EQ("TESTSUITE(A) {} // TESTSUITE(A)",
-            fixNamespaceEndComments("TESTSUITE(A) {} // TESTSUITE()", Style));
-  EXPECT_EQ("TESTSUITE(A) {}; // TESTSUITE(A)",
-            fixNamespaceEndComments("TESTSUITE(A) {}; // TESTSUITE()", Style));
-
-  // Update invalid comments for compacted namespaces.
-  FormatStyle CompactNamespacesStyle = getLLVMStyle();
-  CompactNamespacesStyle.CompactNamespaces = true;
-  CompactNamespacesStyle.NamespaceMacros.push_back("TESTSUITE");
-
-  EXPECT_EQ("TESTSUITE(out) { TESTSUITE(in) {\n"
-            "}} // TESTSUITE(out::in)",
-            fixNamespaceEndComments("TESTSUITE(out) { TESTSUITE(in) {\n"
-                                    "}} // TESTSUITE(out)",
-                                    CompactNamespacesStyle));
-  EXPECT_EQ("TESTSUITE(out) { TESTSUITE(in) {\n"
-            "}} // TESTSUITE(out::in)",
-            fixNamespaceEndComments("TESTSUITE(out) { TESTSUITE(in) {\n"
-                                    "}} // TESTSUITE(in)",
-                                    CompactNamespacesStyle));
-  EXPECT_EQ("TESTSUITE(out) { TESTSUITE(in) {\n"
-            "}\n"
-            "} // TESTSUITE(out::in)",
-            fixNamespaceEndComments("TESTSUITE(out) { TESTSUITE(in) {\n"
-                                    "}// TAOSTSUITE(in)\n"
-                                    "} // TESTSUITE(out)",
-                                    CompactNamespacesStyle));
-}
-
-TEST_F(NamespaceEndCommentsFixerTest, UpdatesInvalidEndBlockComment) {
-  EXPECT_EQ("namespace {\n"
-            "int i;\n"
-            "} // namespace",
-            fixNamespaceEndComments("namespace {\n"
-                                    "int i;\n"
-                                    "} /* namespace A */"));
-  EXPECT_EQ("namespace A {\n"
-            "int i;\n"
-            "}  // namespace A",
-            fixNamespaceEndComments("namespace A {\n"
-                                    "int i;\n"
-                                    "}  /* end namespace */"));
-  EXPECT_EQ("namespace A {\n"
-            "int i;\n"
-            "} // namespace A",
-            fixNamespaceEndComments("namespace A {\n"
-                                    "int i;\n"
-                                    "} /**/"));
-  EXPECT_EQ("namespace A {\n"
-            "int i;\n"
-            "} // namespace A",
-            fixNamespaceEndComments("namespace A {\n"
-                                    "int i;\n"
-                                    "} /* end unnamed namespace */"));
-  EXPECT_EQ("namespace A {\n"
-            "int i;\n"
-            "} // namespace A",
-            fixNamespaceEndComments("namespace A {\n"
-                                    "int i;\n"
-                                    "} /* banamespace A */"));
-  EXPECT_EQ("namespace A {\n"
-            "int i;\n"
-            "}; // namespace A",
-            fixNamespaceEndComments("namespace A {\n"
-                                    "int i;\n"
-                                    "}; /* banamespace A */"));
-  EXPECT_EQ("namespace A {} // namespace A",
-            fixNamespaceEndComments("namespace A {} /**/"));
-  EXPECT_EQ("namespace A {}; // namespace A",
-            fixNamespaceEndComments("namespace A {}; /**/"));
-}
-
-TEST_F(NamespaceEndCommentsFixerTest, UpdatesInvalidMacroEndBlockComment) {
-  FormatStyle Style = getLLVMStyle();
-  Style.NamespaceMacros.push_back("TESTSUITE");
-
-  EXPECT_EQ("TESTSUITE() {\n"
-            "int i;\n"
-            "} // TESTSUITE()",
-            fixNamespaceEndComments("TESTSUITE() {\n"
-                                    "int i;\n"
-                                    "} /* TESTSUITE(A) */",
-                                    Style));
-  EXPECT_EQ("TESTSUITE(A) {\n"
-            "int i;\n"
-            "}  // TESTSUITE(A)",
-            fixNamespaceEndComments("TESTSUITE(A) {\n"
-                                    "int i;\n"
-                                    "}  /* end TESTSUITE() */",
-                                    Style));
-  EXPECT_EQ("TESTSUITE(A) {\n"
-            "int i;\n"
-            "} // TESTSUITE(A)",
-            fixNamespaceEndComments("TESTSUITE(A) {\n"
-                                    "int i;\n"
-                                    "} /**/",
-                                    Style));
-  EXPECT_EQ("TESTSUITE(A) {\n"
-            "int i;\n"
-            "} // TESTSUITE(A)",
-            fixNamespaceEndComments("TESTSUITE(A) {\n"
-                                    "int i;\n"
-                                    "} /* end unnamed TESTSUITE() */",
-                                    Style));
-  EXPECT_EQ("TESTSUITE(A) {\n"
-            "int i;\n"
-            "} // TESTSUITE(A)",
-            fixNamespaceEndComments("TESTSUITE(A) {\n"
-                                    "int i;\n"
-                                    "} /* TOASTSUITE(A) */",
-                                    Style));
-  EXPECT_EQ("TESTSUITE(A) {\n"
-            "int i;\n"
-            "}; // TESTSUITE(A)",
-            fixNamespaceEndComments("TESTSUITE(A) {\n"
-                                    "int i;\n"
-                                    "}; /* TAOSTSUITE(A) */",
-                                    Style));
-  EXPECT_EQ("TESTSUITE(A) {} // TESTSUITE(A)",
-            fixNamespaceEndComments("TESTSUITE(A) {} /**/", Style));
-  EXPECT_EQ("TESTSUITE(A) {}; // TESTSUITE(A)",
-            fixNamespaceEndComments("TESTSUITE(A) {}; /**/", Style));
-}
-
-TEST_F(NamespaceEndCommentsFixerTest,
-       DoesNotAddEndCommentForNamespacesControlledByMacros) {
-  EXPECT_EQ("#ifdef 1\n"
-            "namespace A {\n"
-            "#elseif\n"
-            "namespace B {\n"
-            "#endif\n"
-            "int i;\n"
-            "}\n"
-            "}\n",
-            fixNamespaceEndComments("#ifdef 1\n"
-                                    "namespace A {\n"
-                                    "#elseif\n"
-                                    "namespace B {\n"
-                                    "#endif\n"
-                                    "int i;\n"
-                                    "}\n"
-                                    "}\n"));
-}
-
-TEST_F(NamespaceEndCommentsFixerTest, AddsEndCommentForNamespacesAroundMacros) {
-  // Conditional blocks around are fine
-  EXPECT_EQ("namespace A {\n"
-            "#if 1\n"
-            "int i;\n"
-            "#endif\n"
-            "}// namespace A",
-            fixNamespaceEndComments("namespace A {\n"
-                                    "#if 1\n"
-                                    "int i;\n"
-                                    "#endif\n"
-                                    "}"));
-  EXPECT_EQ("#if 1\n"
-            "#endif\n"
-            "namespace A {\n"
-            "int i;\n"
-            "int j;\n"
-            "}// namespace A",
-            fixNamespaceEndComments("#if 1\n"
-                                    "#endif\n"
-                                    "namespace A {\n"
-                                    "int i;\n"
-                                    "int j;\n"
-                                    "}"));
-  EXPECT_EQ("namespace A {\n"
-            "int i;\n"
-            "int j;\n"
-            "}// namespace A\n"
-            "#if 1\n"
-            "#endif",
-            fixNamespaceEndComments("namespace A {\n"
-                                    "int i;\n"
-                                    "int j;\n"
-                                    "}\n"
-                                    "#if 1\n"
-                                    "#endif"));
-  EXPECT_EQ("#if 1\n"
-            "namespace A {\n"
-            "int i;\n"
-            "int j;\n"
-            "}// namespace A\n"
-            "#endif",
-            fixNamespaceEndComments("#if 1\n"
-                                    "namespace A {\n"
-                                    "int i;\n"
-                                    "int j;\n"
-                                    "}\n"
-                                    "#endif"));
-
-  // Macro definition has no impact
-  EXPECT_EQ("namespace A {\n"
-            "#define FOO\n"
-            "int i;\n"
-            "}// namespace A",
-            fixNamespaceEndComments("namespace A {\n"
-                                    "#define FOO\n"
-                                    "int i;\n"
-                                    "}"));
-  EXPECT_EQ("#define FOO\n"
-            "namespace A {\n"
-            "int i;\n"
-            "int j;\n"
-            "}// namespace A",
-            fixNamespaceEndComments("#define FOO\n"
-                                    "namespace A {\n"
-                                    "int i;\n"
-                                    "int j;\n"
-                                    "}"));
-  EXPECT_EQ("namespace A {\n"
-            "int i;\n"
-            "int j;\n"
-            "}// namespace A\n"
-            "#define FOO\n",
-            fixNamespaceEndComments("namespace A {\n"
-                                    "int i;\n"
-                                    "int j;\n"
-                                    "}\n"
-                                    "#define FOO\n"));
-
-  // No replacement if open & close in different conditional blocks
-  EXPECT_EQ("#if 1\n"
-            "namespace A {\n"
-            "#endif\n"
-            "int i;\n"
-            "int j;\n"
-            "#if 1\n"
-            "}\n"
-            "#endif",
-            fixNamespaceEndComments("#if 1\n"
-                                    "namespace A {\n"
-                                    "#endif\n"
-                                    "int i;\n"
-                                    "int j;\n"
-                                    "#if 1\n"
-                                    "}\n"
-                                    "#endif"));
-  EXPECT_EQ("#ifdef A\n"
-            "namespace A {\n"
-            "#endif\n"
-            "int i;\n"
-            "int j;\n"
-            "#ifdef B\n"
-            "}\n"
-            "#endif",
-            fixNamespaceEndComments("#ifdef A\n"
-                                    "namespace A {\n"
-                                    "#endif\n"
-                                    "int i;\n"
-                                    "int j;\n"
-                                    "#ifdef B\n"
-                                    "}\n"
-                                    "#endif"));
-
-  // No replacement inside unreachable conditional block
-  EXPECT_EQ("#if 0\n"
-            "namespace A {\n"
-            "int i;\n"
-            "int j;\n"
-            "}\n"
-            "#endif",
-            fixNamespaceEndComments("#if 0\n"
-                                    "namespace A {\n"
-                                    "int i;\n"
-                                    "int j;\n"
-                                    "}\n"
-                                    "#endif"));
-}
-
-TEST_F(NamespaceEndCommentsFixerTest,
-       DoesNotAddEndCommentForNamespacesInMacroDeclarations) {
-  EXPECT_EQ("#ifdef 1\n"
-            "namespace A {\n"
-            "#elseif\n"
-            "namespace B {\n"
-            "#endif\n"
-            "int i;\n"
-            "}\n"
-            "}\n",
-            fixNamespaceEndComments("#ifdef 1\n"
-                                    "namespace A {\n"
-                                    "#elseif\n"
-                                    "namespace B {\n"
-                                    "#endif\n"
-                                    "int i;\n"
-                                    "}\n"
-                                    "}\n"));
-  EXPECT_EQ("namespace {\n"
-            "int i;\n"
-            "int j;\n"
-            "}// namespace\n"
-            "#if A\n"
-            "int i;\n"
-            "#else\n"
-            "int j;\n"
-            "#endif",
-            fixNamespaceEndComments("namespace {\n"
-                                    "int i;\n"
-                                    "int j;\n"
-                                    "}\n"
-                                    "#if A\n"
-                                    "int i;\n"
-                                    "#else\n"
-                                    "int j;\n"
-                                    "#endif"));
-  EXPECT_EQ("#if A\n"
-            "namespace A {\n"
-            "#else\n"
-            "namespace B {\n"
-            "#endif\n"
-            "int i;\n"
-            "int j;\n"
-            "}",
-            fixNamespaceEndComments("#if A\n"
-                                    "namespace A {\n"
-                                    "#else\n"
-                                    "namespace B {\n"
-                                    "#endif\n"
-                                    "int i;\n"
-                                    "int j;\n"
-                                    "}"));
-  EXPECT_EQ("#if A\n"
-            "namespace A {\n"
-            "#else\n"
-            "namespace B {\n"
-            "#endif\n"
-            "int i;\n"
-            "int j;\n"
-            "} // namespace A",
-            fixNamespaceEndComments("#if A\n"
-                                    "namespace A {\n"
-                                    "#else\n"
-                                    "namespace B {\n"
-                                    "#endif\n"
-                                    "int i;\n"
-                                    "int j;\n"
-                                    "} // namespace A"));
-  EXPECT_EQ("#if A\n"
-            "namespace A {\n"
-            "#else\n"
-            "namespace B {\n"
-            "#endif\n"
-            "int i;\n"
-            "int j;\n"
-            "} // namespace B",
-            fixNamespaceEndComments("#if A\n"
-                                    "namespace A {\n"
-                                    "#else\n"
-                                    "namespace B {\n"
-                                    "#endif\n"
-                                    "int i;\n"
-                                    "int j;\n"
-                                    "} // namespace B"));
-  EXPECT_EQ("namespace A\n"
-            "int i;\n"
-            "int j;\n"
-            "#if A\n"
-            "}\n"
-            "#else\n"
-            "}\n"
-            "#endif",
-            fixNamespaceEndComments("namespace A\n"
-                                    "int i;\n"
-                                    "int j;\n"
-                                    "#if A\n"
-                                    "}\n"
-                                    "#else\n"
-                                    "}\n"
-                                    "#endif"));
-  EXPECT_EQ("namespace A\n"
-            "int i;\n"
-            "int j;\n"
-            "#if A\n"
-            "} // namespace A\n"
-            "#else\n"
-            "} // namespace A\n"
-            "#endif",
-            fixNamespaceEndComments("namespace A\n"
-                                    "int i;\n"
-                                    "int j;\n"
-                                    "#if A\n"
-                                    "} // namespace A\n"
-                                    "#else\n"
-                                    "} // namespace A\n"
-                                    "#endif"));
-}
-
-TEST_F(NamespaceEndCommentsFixerTest,
-       DoesNotAddEndCommentForUnbalancedRBracesAfterNamespaceEnd) {
-  EXPECT_EQ("namespace {\n"
-            "int i;\n"
-            "} // namespace\n"
-            "}",
-            fixNamespaceEndComments("namespace {\n"
-                                    "int i;\n"
-                                    "} // namespace\n"
-                                    "}"));
-}
-
-TEST_F(NamespaceEndCommentsFixerTest, HandlesInlineAtEndOfLine_PR32438) {
-  EXPECT_EQ("template <int> struct a {};\n"
-            "struct a<bool{}> b() {\n"
-            "}\n"
-            "#define c inline\n"
-            "void d() {\n"
-            "}\n",
-            fixNamespaceEndComments("template <int> struct a {};\n"
-                                    "struct a<bool{}> b() {\n"
-                                    "}\n"
-                                    "#define c inline\n"
-                                    "void d() {\n"
-                                    "}\n"));
-}
-
-TEST_F(NamespaceEndCommentsFixerTest, IgnoreUnbalanced) {
-  EXPECT_EQ("namespace A {\n"
-            "class Foo {\n"
-            "}\n"
-            "}// namespace A\n",
-            fixNamespaceEndComments("namespace A {\n"
-                                    "class Foo {\n"
-                                    "}\n"
-                                    "}\n"));
-  EXPECT_EQ("namespace A {\n"
-            "class Foo {\n"
-            "}\n",
-            fixNamespaceEndComments("namespace A {\n"
-                                    "class Foo {\n"
-                                    "}\n"));
-
-  EXPECT_EQ("namespace A {\n"
-            "class Foo {\n"
-            "}\n"
-            "}\n"
-            "}\n",
-            fixNamespaceEndComments("namespace A {\n"
-                                    "class Foo {\n"
-                                    "}\n"
-                                    "}\n"
-                                    "}\n"));
-}
-
-using ShortNamespaceLinesTest = NamespaceEndCommentsFixerTest;
-
-TEST_F(ShortNamespaceLinesTest, ZeroUnwrappedLines) {
-  auto Style = getLLVMStyle();
-  Style.ShortNamespaceLines = 0u;
-
-  EXPECT_EQ("namespace OneLinerNamespace {}\n",
-            fixNamespaceEndComments("namespace OneLinerNamespace {}\n", Style));
-  EXPECT_EQ("namespace ShortNamespace {\n"
-            "}\n",
-            fixNamespaceEndComments("namespace ShortNamespace {\n"
-                                    "}\n",
-                                    Style));
-  EXPECT_EQ("namespace LongNamespace {\n"
-            "int i;\n"
-            "}// namespace LongNamespace\n",
-            fixNamespaceEndComments("namespace LongNamespace {\n"
-                                    "int i;\n"
-                                    "}\n",
-                                    Style));
-}
-
-TEST_F(ShortNamespaceLinesTest, OneUnwrappedLine) {
-  constexpr auto DefaultUnwrappedLines = 1u;
-  auto const Style = getLLVMStyle();
-
-  EXPECT_EQ(DefaultUnwrappedLines, Style.ShortNamespaceLines);
-  EXPECT_EQ("namespace ShortNamespace {\n"
-            "int i;\n"
-            "}\n",
-            fixNamespaceEndComments("namespace ShortNamespace {\n"
-                                    "int i;\n"
-                                    "}\n"));
-  EXPECT_EQ("namespace LongNamespace {\n"
-            "int i;\n"
-            "int j;\n"
-            "}// namespace LongNamespace\n",
-            fixNamespaceEndComments("namespace LongNamespace {\n"
-                                    "int i;\n"
-                                    "int j;\n"
-                                    "}\n"));
-}
-
-TEST_F(ShortNamespaceLinesTest, MultipleUnwrappedLine) {
-  auto Style = getLLVMStyle();
-  Style.ShortNamespaceLines = 2u;
-
-  EXPECT_EQ("namespace ShortNamespace {\n"
-            "int i;\n"
-            "int j;\n"
-            "}\n",
-            fixNamespaceEndComments("namespace ShortNamespace {\n"
-                                    "int i;\n"
-                                    "int j;\n"
-                                    "}\n",
-                                    Style));
-  EXPECT_EQ("namespace LongNamespace {\n"
-            "int i;\n"
-            "int j;\n"
-            "int k;\n"
-            "}// namespace LongNamespace\n",
-            fixNamespaceEndComments("namespace LongNamespace {\n"
-                                    "int i;\n"
-                                    "int j;\n"
-                                    "int k;\n"
-                                    "}\n",
-                                    Style));
-}
-} // end namespace
-} // end namespace format
-} // end namespace clang
diff --git a/gnu/llvm/clang/unittests/Format/SortImportsTestJS.cpp b/gnu/llvm/clang/unittests/Format/SortImportsTestJS.cpp
deleted file mode 100644
index 4b426375cfe..00000000000
--- a/gnu/llvm/clang/unittests/Format/SortImportsTestJS.cpp
+++ /dev/null
@@ -1,447 +0,0 @@
-//===- unittest/Format/SortImportsTestJS.cpp - JS import sort unit tests --===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "FormatTestUtils.h"
-#include "clang/Format/Format.h"
-#include "llvm/Support/Debug.h"
-#include "gtest/gtest.h"
-
-#define DEBUG_TYPE "format-test"
-
-namespace clang {
-namespace format {
-namespace {
-
-class SortImportsTestJS : public ::testing::Test {
-protected:
-  std::string sort(StringRef Code, unsigned Offset = 0, unsigned Length = 0) {
-    StringRef FileName = "input.js";
-    if (Length == 0U)
-      Length = Code.size() - Offset;
-    std::vector<tooling::Range> Ranges(1, tooling::Range(Offset, Length));
-    auto Sorted =
-        applyAllReplacements(Code, sortIncludes(Style, Code, Ranges, FileName));
-    EXPECT_TRUE(static_cast<bool>(Sorted));
-    auto Formatted = applyAllReplacements(
-        *Sorted, reformat(Style, *Sorted, Ranges, FileName));
-    EXPECT_TRUE(static_cast<bool>(Formatted));
-    return *Formatted;
-  }
-
-  void verifySort(llvm::StringRef Expected, llvm::StringRef Code,
-                  unsigned Offset = 0, unsigned Length = 0) {
-    std::string Result = sort(Code, Offset, Length);
-    EXPECT_EQ(Expected.str(), Result) << "Expected:\n"
-                                      << Expected << "\nActual:\n"
-                                      << Result;
-  }
-
-  FormatStyle Style = getGoogleStyle(FormatStyle::LK_JavaScript);
-};
-
-TEST_F(SortImportsTestJS, AlreadySorted) {
-  verifySort("import {sym} from 'a';\n"
-             "import {sym} from 'b';\n"
-             "import {sym} from 'c';\n"
-             "\n"
-             "let x = 1;",
-             "import {sym} from 'a';\n"
-             "import {sym} from 'b';\n"
-             "import {sym} from 'c';\n"
-             "\n"
-             "let x = 1;");
-}
-
-TEST_F(SortImportsTestJS, BasicSorting) {
-  verifySort("import {sym} from 'a';\n"
-             "import {sym} from 'b';\n"
-             "import {sym} from 'c';\n"
-             "\n"
-             "let x = 1;",
-             "import {sym} from 'a';\n"
-             "import {sym} from 'c';\n"
-             "import {sym} from 'b';\n"
-             "let x = 1;");
-}
-
-TEST_F(SortImportsTestJS, DefaultBinding) {
-  verifySort("import A from 'a';\n"
-             "import B from 'b';\n"
-             "\n"
-             "let x = 1;",
-             "import B from 'b';\n"
-             "import A from 'a';\n"
-             "let x = 1;");
-}
-
-TEST_F(SortImportsTestJS, DefaultAndNamedBinding) {
-  verifySort("import A, {a} from 'a';\n"
-             "import B, {b} from 'b';\n"
-             "\n"
-             "let x = 1;",
-             "import B, {b} from 'b';\n"
-             "import A, {a} from 'a';\n"
-             "let x = 1;");
-}
-
-TEST_F(SortImportsTestJS, WrappedImportStatements) {
-  verifySort("import {sym1, sym2} from 'a';\n"
-             "import {sym} from 'b';\n"
-             "\n"
-             "1;",
-             "import\n"
-             "  {sym}\n"
-             "  from 'b';\n"
-             "import {\n"
-             "  sym1,\n"
-             "  sym2\n"
-             "} from 'a';\n"
-             "1;");
-}
-
-TEST_F(SortImportsTestJS, SeparateMainCodeBody) {
-  verifySort("import {sym} from 'a';"
-             "\n"
-             "let x = 1;\n",
-             "import {sym} from 'a'; let x = 1;\n");
-}
-
-TEST_F(SortImportsTestJS, Comments) {
-  verifySort("/** @fileoverview This is a great file. */\n"
-             "// A very important import follows.\n"
-             "import {sym} from 'a';  /* more comments */\n"
-             "import {sym} from 'b';  // from //foo:bar\n",
-             "/** @fileoverview This is a great file. */\n"
-             "import {sym} from 'b';  // from //foo:bar\n"
-             "// A very important import follows.\n"
-             "import {sym} from 'a';  /* more comments */\n");
-  verifySort("import {sym} from 'a';\n"
-             "import {sym} from 'b';\n"
-             "\n"
-             "/** Comment on variable. */\n"
-             "const x = 1;\n",
-             "import {sym} from 'b';\n"
-             "import {sym} from 'a';\n"
-             "\n"
-             "/** Comment on variable. */\n"
-             "const x = 1;\n");
-}
-
-TEST_F(SortImportsTestJS, SortStar) {
-  verifySort("import * as foo from 'a';\n"
-             "import {sym} from 'a';\n"
-             "import * as bar from 'b';\n",
-             "import {sym} from 'a';\n"
-             "import * as foo from 'a';\n"
-             "import * as bar from 'b';\n");
-}
-
-TEST_F(SortImportsTestJS, AliasesSymbols) {
-  verifySort("import {sym1 as alias1} from 'b';\n"
-             "import {sym2 as alias2, sym3 as alias3} from 'c';\n",
-             "import {sym2 as alias2, sym3 as alias3} from 'c';\n"
-             "import {sym1 as alias1} from 'b';\n");
-}
-
-TEST_F(SortImportsTestJS, SortSymbols) {
-  verifySort("import {sym1, sym2 as a, sym3} from 'b';\n",
-             "import {sym2 as a, sym1, sym3} from 'b';\n");
-  verifySort("import {sym1 /* important! */, /*!*/ sym2 as a} from 'b';\n",
-             "import {/*!*/ sym2 as a, sym1 /* important! */} from 'b';\n");
-  verifySort("import {sym1, sym2} from 'b';\n", "import {\n"
-                                                "  sym2 \n"
-                                                ",\n"
-                                                " sym1 \n"
-                                                "} from 'b';\n");
-}
-
-TEST_F(SortImportsTestJS, GroupImports) {
-  verifySort("import {a} from 'absolute';\n"
-             "\n"
-             "import {b} from '../parent';\n"
-             "import {b} from '../parent/nested';\n"
-             "\n"
-             "import {b} from './relative/path';\n"
-             "import {b} from './relative/path/nested';\n"
-             "\n"
-             "let x = 1;\n",
-             "import {b} from './relative/path/nested';\n"
-             "import {b} from './relative/path';\n"
-             "import {b} from '../parent/nested';\n"
-             "import {b} from '../parent';\n"
-             "import {a} from 'absolute';\n"
-             "let x = 1;\n");
-}
-
-TEST_F(SortImportsTestJS, Exports) {
-  verifySort("import {S} from 'bpath';\n"
-             "\n"
-             "import {T} from './cpath';\n"
-             "\n"
-             "export {A, B} from 'apath';\n"
-             "export {P} from '../parent';\n"
-             "export {R} from './relative';\n"
-             "export {S};\n"
-             "\n"
-             "let x = 1;\n"
-             "export y = 1;\n",
-             "export {R} from './relative';\n"
-             "import {T} from './cpath';\n"
-             "export {S};\n"
-             "export {A, B} from 'apath';\n"
-             "import {S} from 'bpath';\n"
-             "export {P} from '../parent';\n"
-             "let x = 1;\n"
-             "export y = 1;\n");
-  verifySort("import {S} from 'bpath';\n"
-             "\n"
-             "export {T} from 'epath';\n",
-             "export {T} from 'epath';\n"
-             "import {S} from 'bpath';\n");
-}
-
-TEST_F(SortImportsTestJS, SideEffectImports) {
-  verifySort("import 'ZZside-effect';\n"
-             "import 'AAside-effect';\n"
-             "\n"
-             "import {A} from 'absolute';\n"
-             "\n"
-             "import {R} from './relative';\n",
-             "import {R} from './relative';\n"
-             "import 'ZZside-effect';\n"
-             "import {A} from 'absolute';\n"
-             "import 'AAside-effect';\n");
-}
-
-TEST_F(SortImportsTestJS, AffectedRange) {
-  // Affected range inside of import statements.
-  verifySort("import {sym} from 'a';\n"
-             "import {sym} from 'b';\n"
-             "import {sym} from 'c';\n"
-             "\n"
-             "let x = 1;",
-             "import {sym} from 'c';\n"
-             "import {sym} from 'b';\n"
-             "import {sym} from 'a';\n"
-             "let x = 1;",
-             0, 30);
-  // Affected range outside of import statements.
-  verifySort("import {sym} from 'c';\n"
-             "import {sym} from 'b';\n"
-             "import {sym} from 'a';\n"
-             "\n"
-             "let x = 1;",
-             "import {sym} from 'c';\n"
-             "import {sym} from 'b';\n"
-             "import {sym} from 'a';\n"
-             "\n"
-             "let x = 1;",
-             70, 1);
-}
-
-TEST_F(SortImportsTestJS, SortingCanShrink) {
-  // Sort excluding a suffix.
-  verifySort("import {B} from 'a';\n"
-             "import {A} from 'b';\n"
-             "\n"
-             "1;",
-             "import {A} from 'b';\n"
-             "\n"
-             "import {B} from 'a';\n"
-             "\n"
-             "1;");
-}
-
-TEST_F(SortImportsTestJS, TrailingComma) {
-  verifySort("import {A, B,} from 'aa';\n", "import {B, A,} from 'aa';\n");
-}
-
-TEST_F(SortImportsTestJS, SortCaseInsensitive) {
-  verifySort("import {A} from 'aa';\n"
-             "import {A} from 'Ab';\n"
-             "import {A} from 'b';\n"
-             "import {A} from 'Bc';\n"
-             "\n"
-             "1;",
-             "import {A} from 'b';\n"
-             "import {A} from 'Bc';\n"
-             "import {A} from 'Ab';\n"
-             "import {A} from 'aa';\n"
-             "\n"
-             "1;");
-  verifySort("import {aa, Ab, b, Bc} from 'x';\n"
-             "\n"
-             "1;",
-             "import {b, Bc, Ab, aa} from 'x';\n"
-             "\n"
-             "1;");
-}
-
-TEST_F(SortImportsTestJS, SortMultiLine) {
-  // Reproduces issue where multi-line import was not parsed correctly.
-  verifySort("import {A} from 'a';\n"
-             "import {A} from 'b';\n"
-             "\n"
-             "1;",
-             "import\n"
-             "{\n"
-             "A\n"
-             "}\n"
-             "from\n"
-             "'b';\n"
-             "import {A} from 'a';\n"
-             "\n"
-             "1;");
-}
-
-TEST_F(SortImportsTestJS, SortDefaultImports) {
-  // Reproduces issue where multi-line import was not parsed correctly.
-  verifySort("import {A} from 'a';\n"
-             "import {default as B} from 'b';\n",
-             "import {default as B} from 'b';\n"
-             "import {A} from 'a';\n");
-}
-
-TEST_F(SortImportsTestJS, MergeImports) {
-  // basic operation
-  verifySort("import {X, Y} from 'a';\n"
-             "import {Z} from 'z';\n"
-             "\n"
-             "X + Y + Z;\n",
-             "import {X} from 'a';\n"
-             "import {Z} from 'z';\n"
-             "import {Y} from 'a';\n"
-             "\n"
-             "X + Y + Z;\n");
-
-  // merge only, no resorting.
-  verifySort("import {A, B} from 'foo';\n", "import {A} from 'foo';\n"
-                                            "import {B} from 'foo';");
-
-  // empty imports
-  verifySort("import {A} from 'foo';\n", "import {} from 'foo';\n"
-                                         "import {A} from 'foo';");
-
-  // ignores import *
-  verifySort("import * as foo from 'foo';\n"
-             "import {A} from 'foo';\n",
-             "import   * as foo from 'foo';\n"
-             "import {A} from 'foo';\n");
-
-  // ignores default import
-  verifySort("import X from 'foo';\n"
-             "import {A} from 'foo';\n",
-             "import    X from 'foo';\n"
-             "import {A} from 'foo';\n");
-
-  // keeps comments
-  // known issue: loses the 'also a' comment.
-  verifySort("// a\n"
-             "import {/* x */ X, /* y */ Y} from 'a';\n"
-             "// z\n"
-             "import {Z} from 'z';\n"
-             "\n"
-             "X + Y + Z;\n",
-             "// a\n"
-             "import {/* y */ Y} from 'a';\n"
-             "// z\n"
-             "import {Z} from 'z';\n"
-             "// also a\n"
-             "import {/* x */ X} from 'a';\n"
-             "\n"
-             "X + Y + Z;\n");
-
-  // do not merge imports and exports
-  verifySort("import {A} from 'foo';\n"
-             "\n"
-             "export {B} from 'foo';\n",
-             "import {A} from 'foo';\n"
-             "export   {B} from 'foo';");
-  // do merge exports
-  verifySort("export {A, B} from 'foo';\n", "export {A} from 'foo';\n"
-                                            "export   {B} from 'foo';");
-
-  // do not merge side effect imports with named ones
-  verifySort("import './a';\n"
-             "\n"
-             "import {bar} from './a';\n",
-             "import {bar} from './a';\n"
-             "import './a';\n");
-}
-
-TEST_F(SortImportsTestJS, RespectsClangFormatOff) {
-  verifySort("// clang-format off\n"
-             "import {B} from './b';\n"
-             "import {A} from './a';\n"
-             "// clang-format on\n",
-             "// clang-format off\n"
-             "import {B} from './b';\n"
-             "import {A} from './a';\n"
-             "// clang-format on\n");
-
-  verifySort("import {A} from './sorted1_a';\n"
-             "import {B} from './sorted1_b';\n"
-             "// clang-format off\n"
-             "import {B} from './unsorted_b';\n"
-             "import {A} from './unsorted_a';\n"
-             "// clang-format on\n"
-             "import {A} from './sorted2_a';\n"
-             "import {B} from './sorted2_b';\n",
-             "import {B} from './sorted1_b';\n"
-             "import {A} from './sorted1_a';\n"
-             "// clang-format off\n"
-             "import {B} from './unsorted_b';\n"
-             "import {A} from './unsorted_a';\n"
-             "// clang-format on\n"
-             "import {B} from './sorted2_b';\n"
-             "import {A} from './sorted2_a';\n");
-
-  // Boundary cases
-  verifySort("// clang-format on\n", "// clang-format on\n");
-  verifySort("// clang-format off\n", "// clang-format off\n");
-  verifySort("// clang-format on\n"
-             "// clang-format off\n",
-             "// clang-format on\n"
-             "// clang-format off\n");
-  verifySort("// clang-format off\n"
-             "// clang-format on\n"
-             "import {A} from './a';\n"
-             "import {B} from './b';\n",
-             "// clang-format off\n"
-             "// clang-format on\n"
-             "import {B} from './b';\n"
-             "import {A} from './a';\n");
-  // section ends with comment
-  verifySort("// clang-format on\n"
-             "import {A} from './a';\n"
-             "import {B} from './b';\n"
-             "import {C} from './c';\n"
-             "\n" // inserted empty line is working as intended: splits imports
-                  // section from main code body
-             "// clang-format off\n",
-             "// clang-format on\n"
-             "import {C} from './c';\n"
-             "import {B} from './b';\n"
-             "import {A} from './a';\n"
-             "// clang-format off\n");
-}
-
-TEST_F(SortImportsTestJS, RespectsClangFormatOffInNamedImports) {
-  verifySort("// clang-format off\n"
-             "import {B, A} from './b';\n"
-             "// clang-format on\n"
-             "const x = 1;",
-             "// clang-format off\n"
-             "import {B, A} from './b';\n"
-             "// clang-format on\n"
-             "const x =   1;");
-}
-
-} // end namespace
-} // end namespace format
-} // end namespace clang
diff --git a/gnu/llvm/clang/unittests/Format/SortImportsTestJava.cpp b/gnu/llvm/clang/unittests/Format/SortImportsTestJava.cpp
deleted file mode 100644
index 5a1d0de8b42..00000000000
--- a/gnu/llvm/clang/unittests/Format/SortImportsTestJava.cpp
+++ /dev/null
@@ -1,353 +0,0 @@
-#include "clang/Format/Format.h"
-#include "gtest/gtest.h"
-
-#define DEBUG_TYPE "format-test"
-
-namespace clang {
-namespace format {
-namespace {
-
-class SortImportsTestJava : public ::testing::Test {
-protected:
-  std::vector<tooling::Range> GetCodeRange(StringRef Code) {
-    return std::vector<tooling::Range>(1, tooling::Range(0, Code.size()));
-  }
-
-  std::string sort(StringRef Code, std::vector<tooling::Range> Ranges) {
-    auto Replaces = sortIncludes(FmtStyle, Code, Ranges, "input.java");
-    Ranges = tooling::calculateRangesAfterReplacements(Replaces, Ranges);
-    auto Sorted = applyAllReplacements(Code, Replaces);
-    EXPECT_TRUE(static_cast<bool>(Sorted));
-    auto Result = applyAllReplacements(
-        *Sorted, reformat(FmtStyle, *Sorted, Ranges, "input.java"));
-    EXPECT_TRUE(static_cast<bool>(Result));
-    return *Result;
-  }
-
-  std::string sort(StringRef Code) { return sort(Code, GetCodeRange(Code)); }
-
-  FormatStyle FmtStyle;
-
-public:
-  SortImportsTestJava() {
-    FmtStyle = getGoogleStyle(FormatStyle::LK_Java);
-    FmtStyle.JavaImportGroups = {"com.test", "org", "com"};
-    FmtStyle.SortIncludes = FormatStyle::SI_CaseInsensitive;
-  }
-};
-
-TEST_F(SortImportsTestJava, StaticSplitFromNormal) {
-  EXPECT_EQ("import static org.b;\n"
-            "\n"
-            "import org.a;\n",
-            sort("import org.a;\n"
-                 "import static org.b;\n"));
-}
-
-TEST_F(SortImportsTestJava, CapitalBeforeLowercase) {
-  EXPECT_EQ("import org.Test;\n"
-            "import org.a.Test;\n"
-            "import org.b;\n",
-            sort("import org.a.Test;\n"
-                 "import org.Test;\n"
-                 "import org.b;\n"));
-}
-
-TEST_F(SortImportsTestJava, KeepSplitGroupsWithOneNewImport) {
-  EXPECT_EQ("import static com.test.a;\n"
-            "\n"
-            "import static org.a;\n"
-            "\n"
-            "import static com.a;\n"
-            "\n"
-            "import com.test.b;\n"
-            "import com.test.c;\n"
-            "\n"
-            "import org.b;\n"
-            "\n"
-            "import com.b;\n",
-            sort("import static com.test.a;\n"
-                 "\n"
-                 "import static org.a;\n"
-                 "\n"
-                 "import static com.a;\n"
-                 "\n"
-                 "import com.test.b;\n"
-                 "\n"
-                 "import org.b;\n"
-                 "\n"
-                 "import com.b;\n"
-                 "import com.test.c;\n"));
-}
-
-TEST_F(SortImportsTestJava, SplitGroupsWithNewline) {
-  EXPECT_EQ("import static com.test.a;\n"
-            "\n"
-            "import static org.a;\n"
-            "\n"
-            "import static com.a;\n"
-            "\n"
-            "import com.test.b;\n"
-            "\n"
-            "import org.b;\n"
-            "\n"
-            "import com.b;\n",
-            sort("import static com.test.a;\n"
-                 "import static org.a;\n"
-                 "import static com.a;\n"
-                 "import com.test.b;\n"
-                 "import org.b;\n"
-                 "import com.b;\n"));
-}
-
-TEST_F(SortImportsTestJava, UnspecifiedGroupAfterAllGroups) {
-  EXPECT_EQ("import com.test.a;\n"
-            "\n"
-            "import org.a;\n"
-            "\n"
-            "import com.a;\n"
-            "\n"
-            "import abc.a;\n"
-            "import xyz.b;\n",
-            sort("import com.test.a;\n"
-                 "import com.a;\n"
-                 "import xyz.b;\n"
-                 "import abc.a;\n"
-                 "import org.a;\n"));
-}
-
-TEST_F(SortImportsTestJava, NoSortOutsideRange) {
-  std::vector<tooling::Range> Ranges = {tooling::Range(27, 15)};
-  EXPECT_EQ("import org.b;\n"
-            "import org.a;\n"
-            "// comments\n"
-            "// that do\n"
-            "// nothing\n",
-            sort("import org.b;\n"
-                 "import org.a;\n"
-                 "// comments\n"
-                 "// that do\n"
-                 "// nothing\n",
-                 Ranges));
-}
-
-TEST_F(SortImportsTestJava, SortWhenRangeContainsOneLine) {
-  std::vector<tooling::Range> Ranges = {tooling::Range(27, 20)};
-  EXPECT_EQ("import org.a;\n"
-            "import org.b;\n"
-            "\n"
-            "import com.a;\n"
-            "// comments\n"
-            "// that do\n"
-            "// nothing\n",
-            sort("import org.b;\n"
-                 "import org.a;\n"
-                 "import com.a;\n"
-                 "// comments\n"
-                 "// that do\n"
-                 "// nothing\n",
-                 Ranges));
-}
-
-TEST_F(SortImportsTestJava, SortLexicographically) {
-  EXPECT_EQ("import org.a.*;\n"
-            "import org.a.a;\n"
-            "import org.aA;\n"
-            "import org.aa;\n",
-            sort("import org.aa;\n"
-                 "import org.a.a;\n"
-                 "import org.a.*;\n"
-                 "import org.aA;\n"));
-}
-
-TEST_F(SortImportsTestJava, StaticInCommentHasNoEffect) {
-  EXPECT_EQ("import org.a; // static\n"
-            "import org.b;\n"
-            "import org.c; // static\n",
-            sort("import org.a; // static\n"
-                 "import org.c; // static\n"
-                 "import org.b;\n"));
-}
-
-TEST_F(SortImportsTestJava, CommentsWithAffectedImports) {
-  EXPECT_EQ("import org.a;\n"
-            "// commentB\n"
-            "/* commentB\n"
-            " commentB*/\n"
-            "import org.b;\n"
-            "// commentC\n"
-            "import org.c;\n",
-            sort("import org.a;\n"
-                 "// commentC\n"
-                 "import org.c;\n"
-                 "// commentB\n"
-                 "/* commentB\n"
-                 " commentB*/\n"
-                 "import org.b;\n"));
-}
-
-TEST_F(SortImportsTestJava, CommentWithUnaffectedImports) {
-  EXPECT_EQ("import org.a;\n"
-            "// comment\n"
-            "import org.b;\n",
-            sort("import org.a;\n"
-                 "// comment\n"
-                 "import org.b;\n"));
-}
-
-TEST_F(SortImportsTestJava, CommentAfterAffectedImports) {
-  EXPECT_EQ("import org.a;\n"
-            "import org.b;\n"
-            "// comment\n",
-            sort("import org.b;\n"
-                 "import org.a;\n"
-                 "// comment\n"));
-}
-
-TEST_F(SortImportsTestJava, CommentBeforeAffectedImports) {
-  EXPECT_EQ("// comment\n"
-            "import org.a;\n"
-            "import org.b;\n",
-            sort("// comment\n"
-                 "import org.b;\n"
-                 "import org.a;\n"));
-}
-
-TEST_F(SortImportsTestJava, FormatTotallyOff) {
-  EXPECT_EQ("// clang-format off\n"
-            "import org.b;\n"
-            "import org.a;\n"
-            "// clang-format on\n",
-            sort("// clang-format off\n"
-                 "import org.b;\n"
-                 "import org.a;\n"
-                 "// clang-format on\n"));
-}
-
-TEST_F(SortImportsTestJava, FormatTotallyOn) {
-  EXPECT_EQ("// clang-format off\n"
-            "// clang-format on\n"
-            "import org.a;\n"
-            "import org.b;\n",
-            sort("// clang-format off\n"
-                 "// clang-format on\n"
-                 "import org.b;\n"
-                 "import org.a;\n"));
-}
-
-TEST_F(SortImportsTestJava, FormatPariallyOnShouldNotReorder) {
-  EXPECT_EQ("// clang-format off\n"
-            "import org.b;\n"
-            "import org.a;\n"
-            "// clang-format on\n"
-            "import org.d;\n"
-            "import org.c;\n",
-            sort("// clang-format off\n"
-                 "import org.b;\n"
-                 "import org.a;\n"
-                 "// clang-format on\n"
-                 "import org.d;\n"
-                 "import org.c;\n"));
-}
-
-TEST_F(SortImportsTestJava, SortJavaStaticImport) {
-  FmtStyle.SortJavaStaticImport = FormatStyle::SJSIO_Before;
-  EXPECT_EQ("import static com.test.a;\n"
-            "\n"
-            "import static org.a;\n"
-            "\n"
-            "import static com.a;\n"
-            "\n"
-            "import com.test.b;\n"
-            "\n"
-            "import org.b;\n"
-            "\n"
-            "import com.b;\n",
-            sort("import static com.test.a;\n"
-                 "import static org.a;\n"
-                 "import static com.a;\n"
-                 "import com.test.b;\n"
-                 "import org.b;\n"
-                 "import com.b;\n"));
-
-  FmtStyle.SortJavaStaticImport = FormatStyle::SJSIO_After;
-  EXPECT_EQ("import com.test.b;\n"
-            "import com.test.c;\n"
-            "\n"
-            "import org.b;\n"
-            "\n"
-            "import com.b;\n"
-            "\n"
-            "import static com.test.a;\n"
-            "\n"
-            "import static org.a;\n"
-            "\n"
-            "import static com.a;\n",
-            sort("import static com.test.a;\n"
-                 "import static org.a;\n"
-                 "import static com.a;\n"
-                 "import com.test.b;\n"
-                 "import org.b;\n"
-                 "import com.b;\n"
-                 "import com.test.c;\n"));
-}
-
-TEST_F(SortImportsTestJava, SortJavaStaticImportAsGroup) {
-  FmtStyle.SortJavaStaticImport = FormatStyle::SJSIO_After;
-
-  EXPECT_EQ("import com.test.a;\n"
-            "import com.test.b;\n"
-            "\n"
-            "import static org.a;\n"
-            "import static org.b;\n",
-            sort("import com.test.a;\n"
-                 "import static org.a;\n"
-                 "import com.test.b;\n"
-                 "import static org.b;\n"));
-}
-
-TEST_F(SortImportsTestJava, DeduplicateImports) {
-  EXPECT_EQ("import org.a;\n", sort("import org.a;\n"
-                                    "import org.a;\n"));
-}
-
-TEST_F(SortImportsTestJava, NoNewlineAtEnd) {
-  EXPECT_EQ("import org.a;\n"
-            "import org.b;",
-            sort("import org.b;\n"
-                 "import org.a;"));
-}
-
-TEST_F(SortImportsTestJava, ImportNamedFunction) {
-  EXPECT_EQ("import X;\n"
-            "class C {\n"
-            "  void m() {\n"
-            "    importFile();\n"
-            "  }\n"
-            "}\n",
-            sort("import X;\n"
-                 "class C {\n"
-                 "  void m() {\n"
-                 "    importFile();\n"
-                 "  }\n"
-                 "}\n"));
-}
-
-TEST_F(SortImportsTestJava, NoReplacementsForValidImports) {
-  // Identical #includes have led to a failure with an unstable sort.
-  std::string Code = "import org.a;\n"
-                     "import org.b;\n";
-  EXPECT_TRUE(
-      sortIncludes(FmtStyle, Code, GetCodeRange(Code), "input.java").empty());
-}
-
-TEST_F(SortImportsTestJava, NoReplacementsForValidImportsWindows) {
-  std::string Code = "import org.a;\r\n"
-                     "import org.b;\r\n";
-  EXPECT_TRUE(
-      sortIncludes(FmtStyle, Code, GetCodeRange(Code), "input.java").empty());
-}
-
-} // end namespace
-} // end namespace format
-} // end namespace clang
diff --git a/gnu/llvm/clang/unittests/Format/SortIncludesTest.cpp b/gnu/llvm/clang/unittests/Format/SortIncludesTest.cpp
deleted file mode 100644
index 4efeb96124b..00000000000
--- a/gnu/llvm/clang/unittests/Format/SortIncludesTest.cpp
+++ /dev/null
@@ -1,1050 +0,0 @@
-//===- unittest/Format/SortIncludesTest.cpp - Include sort unit tests -----===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "FormatTestUtils.h"
-#include "clang/Format/Format.h"
-#include "llvm/ADT/None.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/Support/Debug.h"
-#include "gtest/gtest.h"
-
-#define DEBUG_TYPE "format-test"
-
-namespace clang {
-namespace format {
-namespace {
-
-class SortIncludesTest : public ::testing::Test {
-protected:
-  std::vector<tooling::Range> GetCodeRange(StringRef Code) {
-    return std::vector<tooling::Range>(1, tooling::Range(0, Code.size()));
-  }
-
-  std::string sort(StringRef Code, std::vector<tooling::Range> Ranges,
-                   StringRef FileName = "input.cc",
-                   unsigned ExpectedNumRanges = 1) {
-    auto Replaces = sortIncludes(FmtStyle, Code, Ranges, FileName);
-    Ranges = tooling::calculateRangesAfterReplacements(Replaces, Ranges);
-    EXPECT_EQ(ExpectedNumRanges, Replaces.size());
-    auto Sorted = applyAllReplacements(Code, Replaces);
-    EXPECT_TRUE(static_cast<bool>(Sorted));
-    auto Result = applyAllReplacements(
-        *Sorted, reformat(FmtStyle, *Sorted, Ranges, FileName));
-    EXPECT_TRUE(static_cast<bool>(Result));
-    return *Result;
-  }
-
-  std::string sort(StringRef Code, StringRef FileName = "input.cpp",
-                   unsigned ExpectedNumRanges = 1) {
-    return sort(Code, GetCodeRange(Code), FileName, ExpectedNumRanges);
-  }
-
-  unsigned newCursor(llvm::StringRef Code, unsigned Cursor) {
-    sortIncludes(FmtStyle, Code, GetCodeRange(Code), "input.cpp", &Cursor);
-    return Cursor;
-  }
-
-  FormatStyle FmtStyle = getLLVMStyle();
-  tooling::IncludeStyle &Style = FmtStyle.IncludeStyle;
-};
-
-TEST_F(SortIncludesTest, BasicSorting) {
-  EXPECT_EQ("#include \"a.h\"\n"
-            "#include \"b.h\"\n"
-            "#include \"c.h\"\n",
-            sort("#include \"a.h\"\n"
-                 "#include \"c.h\"\n"
-                 "#include \"b.h\"\n"));
-
-  EXPECT_EQ("// comment\n"
-            "#include <a>\n"
-            "#include <b>\n",
-            sort("// comment\n"
-                 "#include <b>\n"
-                 "#include <a>\n",
-                 {tooling::Range(25, 1)}));
-}
-
-TEST_F(SortIncludesTest, SortedIncludesUsingSortPriorityAttribute) {
-  FmtStyle.IncludeStyle.IncludeBlocks = tooling::IncludeStyle::IBS_Regroup;
-  FmtStyle.IncludeStyle.IncludeCategories = {
-      {"^<sys/param\\.h>", 1, 0, false},
-      {"^<sys/types\\.h>", 1, 1, false},
-      {"^<sys.*/", 1, 2, false},
-      {"^<uvm/", 2, 3, false},
-      {"^<machine/", 3, 4, false},
-      {"^<dev/", 4, 5, false},
-      {"^<net.*/", 5, 6, false},
-      {"^<protocols/", 5, 7, false},
-      {"^<(fs|miscfs|msdosfs|nfs|ntfs|ufs)/", 6, 8, false},
-      {"^<(x86|amd64|i386|xen)/", 7, 8, false},
-      {"<path", 9, 11, false},
-      {"^<[^/].*\\.h>", 8, 10, false},
-      {"^\".*\\.h\"", 10, 12, false}};
-  EXPECT_EQ("#include <sys/param.h>\n"
-            "#include <sys/types.h>\n"
-            "#include <sys/ioctl.h>\n"
-            "#include <sys/socket.h>\n"
-            "#include <sys/stat.h>\n"
-            "#include <sys/wait.h>\n"
-            "\n"
-            "#include <net/if.h>\n"
-            "#include <net/if_dl.h>\n"
-            "#include <net/route.h>\n"
-            "#include <netinet/in.h>\n"
-            "#include <protocols/rwhod.h>\n"
-            "\n"
-            "#include <assert.h>\n"
-            "#include <errno.h>\n"
-            "#include <inttypes.h>\n"
-            "#include <stdio.h>\n"
-            "#include <stdlib.h>\n"
-            "\n"
-            "#include <paths.h>\n"
-            "\n"
-            "#include \"pathnames.h\"\n",
-            sort("#include <sys/param.h>\n"
-                 "#include <sys/types.h>\n"
-                 "#include <sys/ioctl.h>\n"
-                 "#include <net/if_dl.h>\n"
-                 "#include <net/route.h>\n"
-                 "#include <netinet/in.h>\n"
-                 "#include <sys/socket.h>\n"
-                 "#include <sys/stat.h>\n"
-                 "#include <sys/wait.h>\n"
-                 "#include <net/if.h>\n"
-                 "#include <protocols/rwhod.h>\n"
-                 "#include <assert.h>\n"
-                 "#include <paths.h>\n"
-                 "#include \"pathnames.h\"\n"
-                 "#include <errno.h>\n"
-                 "#include <inttypes.h>\n"
-                 "#include <stdio.h>\n"
-                 "#include <stdlib.h>\n"));
-}
-TEST_F(SortIncludesTest, SortPriorityNotDefined) {
-  FmtStyle = getLLVMStyle();
-  EXPECT_EQ("#include \"FormatTestUtils.h\"\n"
-            "#include \"clang/Format/Format.h\"\n"
-            "#include \"llvm/ADT/None.h\"\n"
-            "#include \"llvm/Support/Debug.h\"\n"
-            "#include \"gtest/gtest.h\"\n",
-            sort("#include \"clang/Format/Format.h\"\n"
-                 "#include \"llvm/ADT/None.h\"\n"
-                 "#include \"FormatTestUtils.h\"\n"
-                 "#include \"gtest/gtest.h\"\n"
-                 "#include \"llvm/Support/Debug.h\"\n"));
-}
-
-TEST_F(SortIncludesTest, NoReplacementsForValidIncludes) {
-  // Identical #includes have led to a failure with an unstable sort.
-  std::string Code = "#include <a>\n"
-                     "#include <b>\n"
-                     "#include <c>\n"
-                     "#include <d>\n"
-                     "#include <e>\n"
-                     "#include <f>\n";
-  EXPECT_TRUE(sortIncludes(FmtStyle, Code, GetCodeRange(Code), "a.cc").empty());
-}
-
-TEST_F(SortIncludesTest, MainFileHeader) {
-  std::string Code = "#include <string>\n"
-                     "\n"
-                     "#include \"a/extra_action.proto.h\"\n";
-  FmtStyle = getGoogleStyle(FormatStyle::LK_Cpp);
-  EXPECT_TRUE(
-      sortIncludes(FmtStyle, Code, GetCodeRange(Code), "a/extra_action.cc")
-          .empty());
-
-  EXPECT_EQ("#include \"foo.bar.h\"\n"
-            "\n"
-            "#include \"a.h\"\n",
-            sort("#include \"a.h\"\n"
-                 "#include \"foo.bar.h\"\n",
-                 "foo.bar.cc"));
-}
-
-TEST_F(SortIncludesTest, SortedIncludesInMultipleBlocksAreMerged) {
-  Style.IncludeBlocks = tooling::IncludeStyle::IBS_Merge;
-  EXPECT_EQ("#include \"a.h\"\n"
-            "#include \"b.h\"\n"
-            "#include \"c.h\"\n",
-            sort("#include \"a.h\"\n"
-                 "#include \"c.h\"\n"
-                 "\n"
-                 "\n"
-                 "#include \"b.h\"\n"));
-
-  Style.IncludeBlocks = tooling::IncludeStyle::IBS_Regroup;
-  EXPECT_EQ("#include \"a.h\"\n"
-            "#include \"b.h\"\n"
-            "#include \"c.h\"\n",
-            sort("#include \"a.h\"\n"
-                 "#include \"c.h\"\n"
-                 "\n"
-                 "\n"
-                 "#include \"b.h\"\n"));
-}
-
-TEST_F(SortIncludesTest, SupportClangFormatOff) {
-  EXPECT_EQ("#include <a>\n"
-            "#include <b>\n"
-            "#include <c>\n"
-            "// clang-format off\n"
-            "#include <b>\n"
-            "#include <a>\n"
-            "#include <c>\n"
-            "// clang-format on\n",
-            sort("#include <b>\n"
-                 "#include <a>\n"
-                 "#include <c>\n"
-                 "// clang-format off\n"
-                 "#include <b>\n"
-                 "#include <a>\n"
-                 "#include <c>\n"
-                 "// clang-format on\n"));
-
-  Style.IncludeBlocks = Style.IBS_Merge;
-  std::string Code = "// clang-format off\r\n"
-                     "#include \"d.h\"\r\n"
-                     "#include \"b.h\"\r\n"
-                     "// clang-format on\r\n"
-                     "\r\n"
-                     "#include \"c.h\"\r\n"
-                     "#include \"a.h\"\r\n"
-                     "#include \"e.h\"\r\n";
-
-  std::string Expected = "// clang-format off\r\n"
-                         "#include \"d.h\"\r\n"
-                         "#include \"b.h\"\r\n"
-                         "// clang-format on\r\n"
-                         "\r\n"
-                         "#include \"e.h\"\r\n"
-                         "#include \"a.h\"\r\n"
-                         "#include \"c.h\"\r\n";
-
-  EXPECT_EQ(Expected, sort(Code, "e.cpp", 1));
-}
-
-TEST_F(SortIncludesTest, SupportClangFormatOffCStyle) {
-  EXPECT_EQ("#include <a>\n"
-            "#include <b>\n"
-            "#include <c>\n"
-            "/* clang-format off */\n"
-            "#include <b>\n"
-            "#include <a>\n"
-            "#include <c>\n"
-            "/* clang-format on */\n",
-            sort("#include <b>\n"
-                 "#include <a>\n"
-                 "#include <c>\n"
-                 "/* clang-format off */\n"
-                 "#include <b>\n"
-                 "#include <a>\n"
-                 "#include <c>\n"
-                 "/* clang-format on */\n"));
-
-  // Not really turning it off
-  EXPECT_EQ("#include <a>\n"
-            "#include <b>\n"
-            "#include <c>\n"
-            "/* clang-format offically */\n"
-            "#include <a>\n"
-            "#include <b>\n"
-            "#include <c>\n"
-            "/* clang-format onwards */\n",
-            sort("#include <b>\n"
-                 "#include <a>\n"
-                 "#include <c>\n"
-                 "/* clang-format offically */\n"
-                 "#include <b>\n"
-                 "#include <a>\n"
-                 "#include <c>\n"
-                 "/* clang-format onwards */\n",
-                 "input.h", 2));
-}
-
-TEST_F(SortIncludesTest, IncludeSortingCanBeDisabled) {
-  FmtStyle.SortIncludes = FormatStyle::SI_Never;
-  EXPECT_EQ("#include \"a.h\"\n"
-            "#include \"c.h\"\n"
-            "#include \"b.h\"\n",
-            sort("#include \"a.h\"\n"
-                 "#include \"c.h\"\n"
-                 "#include \"b.h\"\n",
-                 "input.h", 0));
-}
-
-TEST_F(SortIncludesTest, MixIncludeAndImport) {
-  EXPECT_EQ("#include \"a.h\"\n"
-            "#import \"b.h\"\n"
-            "#include \"c.h\"\n",
-            sort("#include \"a.h\"\n"
-                 "#include \"c.h\"\n"
-                 "#import \"b.h\"\n"));
-}
-
-TEST_F(SortIncludesTest, FixTrailingComments) {
-  EXPECT_EQ("#include \"a.h\"  // comment\n"
-            "#include \"bb.h\" // comment\n"
-            "#include \"ccc.h\"\n",
-            sort("#include \"a.h\" // comment\n"
-                 "#include \"ccc.h\"\n"
-                 "#include \"bb.h\" // comment\n"));
-}
-
-TEST_F(SortIncludesTest, LeadingWhitespace) {
-  EXPECT_EQ("#include \"a.h\"\n"
-            "#include \"b.h\"\n"
-            "#include \"c.h\"\n",
-            sort(" #include \"a.h\"\n"
-                 "  #include \"c.h\"\n"
-                 "   #include \"b.h\"\n"));
-  EXPECT_EQ("#include \"a.h\"\n"
-            "#include \"b.h\"\n"
-            "#include \"c.h\"\n",
-            sort("# include \"a.h\"\n"
-                 "#  include \"c.h\"\n"
-                 "#   include \"b.h\"\n"));
-  EXPECT_EQ("#include \"a.h\"\n", sort("#include \"a.h\"\n"
-                                       " #include \"a.h\"\n"));
-}
-
-TEST_F(SortIncludesTest, TrailingWhitespace) {
-  EXPECT_EQ("#include \"a.h\"\n"
-            "#include \"b.h\"\n"
-            "#include \"c.h\"\n",
-            sort("#include \"a.h\" \n"
-                 "#include \"c.h\"  \n"
-                 "#include \"b.h\"   \n"));
-  EXPECT_EQ("#include \"a.h\"\n", sort("#include \"a.h\"\n"
-                                       "#include \"a.h\" \n"));
-}
-
-TEST_F(SortIncludesTest, GreaterInComment) {
-  EXPECT_EQ("#include \"a.h\"\n"
-            "#include \"b.h\" // >\n"
-            "#include \"c.h\"\n",
-            sort("#include \"a.h\"\n"
-                 "#include \"c.h\"\n"
-                 "#include \"b.h\" // >\n"));
-}
-
-TEST_F(SortIncludesTest, SortsLocallyInEachBlock) {
-  EXPECT_EQ("#include \"a.h\"\n"
-            "#include \"c.h\"\n"
-            "\n"
-            "#include \"b.h\"\n",
-            sort("#include \"a.h\"\n"
-                 "#include \"c.h\"\n"
-                 "\n"
-                 "#include \"b.h\"\n",
-                 "input.h", 0));
-}
-
-TEST_F(SortIncludesTest, SortsAllBlocksWhenMerging) {
-  Style.IncludeBlocks = tooling::IncludeStyle::IBS_Merge;
-  EXPECT_EQ("#include \"a.h\"\n"
-            "#include \"b.h\"\n"
-            "#include \"c.h\"\n",
-            sort("#include \"a.h\"\n"
-                 "#include \"c.h\"\n"
-                 "\n"
-                 "#include \"b.h\"\n"));
-}
-
-TEST_F(SortIncludesTest, CommentsAlwaysSeparateGroups) {
-  EXPECT_EQ("#include \"a.h\"\n"
-            "#include \"c.h\"\n"
-            "// comment\n"
-            "#include \"b.h\"\n",
-            sort("#include \"c.h\"\n"
-                 "#include \"a.h\"\n"
-                 "// comment\n"
-                 "#include \"b.h\"\n"));
-
-  Style.IncludeBlocks = tooling::IncludeStyle::IBS_Merge;
-  EXPECT_EQ("#include \"a.h\"\n"
-            "#include \"c.h\"\n"
-            "// comment\n"
-            "#include \"b.h\"\n",
-            sort("#include \"c.h\"\n"
-                 "#include \"a.h\"\n"
-                 "// comment\n"
-                 "#include \"b.h\"\n"));
-
-  Style.IncludeBlocks = tooling::IncludeStyle::IBS_Regroup;
-  EXPECT_EQ("#include \"a.h\"\n"
-            "#include \"c.h\"\n"
-            "// comment\n"
-            "#include \"b.h\"\n",
-            sort("#include \"c.h\"\n"
-                 "#include \"a.h\"\n"
-                 "// comment\n"
-                 "#include \"b.h\"\n"));
-}
-
-TEST_F(SortIncludesTest, HandlesAngledIncludesAsSeparateBlocks) {
-  EXPECT_EQ("#include \"a.h\"\n"
-            "#include \"c.h\"\n"
-            "#include <array>\n"
-            "#include <b.h>\n"
-            "#include <d.h>\n"
-            "#include <vector>\n",
-            sort("#include <vector>\n"
-                 "#include <d.h>\n"
-                 "#include <array>\n"
-                 "#include <b.h>\n"
-                 "#include \"c.h\"\n"
-                 "#include \"a.h\"\n"));
-
-  FmtStyle = getGoogleStyle(FormatStyle::LK_Cpp);
-  EXPECT_EQ("#include <b.h>\n"
-            "#include <d.h>\n"
-            "\n"
-            "#include <array>\n"
-            "#include <vector>\n"
-            "\n"
-            "#include \"a.h\"\n"
-            "#include \"c.h\"\n",
-            sort("#include <vector>\n"
-                 "#include <d.h>\n"
-                 "#include <array>\n"
-                 "#include <b.h>\n"
-                 "#include \"c.h\"\n"
-                 "#include \"a.h\"\n"));
-}
-
-TEST_F(SortIncludesTest, RegroupsAngledIncludesInSeparateBlocks) {
-  Style.IncludeBlocks = tooling::IncludeStyle::IBS_Regroup;
-  EXPECT_EQ("#include \"a.h\"\n"
-            "#include \"c.h\"\n"
-            "\n"
-            "#include <b.h>\n"
-            "#include <d.h>\n",
-            sort("#include <d.h>\n"
-                 "#include <b.h>\n"
-                 "#include \"c.h\"\n"
-                 "#include \"a.h\"\n"));
-}
-
-TEST_F(SortIncludesTest, HandlesMultilineIncludes) {
-  EXPECT_EQ("#include \"a.h\"\n"
-            "#include \"b.h\"\n"
-            "#include \"c.h\"\n",
-            sort("#include \"a.h\"\n"
-                 "#include \\\n"
-                 "\"c.h\"\n"
-                 "#include \"b.h\"\n"));
-}
-
-TEST_F(SortIncludesTest, LeavesMainHeaderFirst) {
-  Style.IncludeIsMainRegex = "([-_](test|unittest))?$";
-  EXPECT_EQ("#include \"llvm/a.h\"\n"
-            "#include \"b.h\"\n"
-            "#include \"c.h\"\n",
-            sort("#include \"llvm/a.h\"\n"
-                 "#include \"c.h\"\n"
-                 "#include \"b.h\"\n",
-                 "a.cc"));
-  EXPECT_EQ("#include \"llvm/a.h\"\n"
-            "#include \"b.h\"\n"
-            "#include \"c.h\"\n",
-            sort("#include \"llvm/a.h\"\n"
-                 "#include \"c.h\"\n"
-                 "#include \"b.h\"\n",
-                 "a_test.cc"));
-  EXPECT_EQ("#include \"llvm/input.h\"\n"
-            "#include \"b.h\"\n"
-            "#include \"c.h\"\n",
-            sort("#include \"llvm/input.h\"\n"
-                 "#include \"c.h\"\n"
-                 "#include \"b.h\"\n",
-                 "input.mm"));
-
-  // Don't allow prefixes.
-  EXPECT_EQ("#include \"b.h\"\n"
-            "#include \"c.h\"\n"
-            "#include \"llvm/not_a.h\"\n",
-            sort("#include \"llvm/not_a.h\"\n"
-                 "#include \"c.h\"\n"
-                 "#include \"b.h\"\n",
-                 "a.cc"));
-
-  // Don't do this for _main and other suffixes.
-  EXPECT_EQ("#include \"b.h\"\n"
-            "#include \"c.h\"\n"
-            "#include \"llvm/a.h\"\n",
-            sort("#include \"llvm/a.h\"\n"
-                 "#include \"c.h\"\n"
-                 "#include \"b.h\"\n",
-                 "a_main.cc"));
-
-  // Don't do this in headers.
-  EXPECT_EQ("#include \"b.h\"\n"
-            "#include \"c.h\"\n"
-            "#include \"llvm/a.h\"\n",
-            sort("#include \"llvm/a.h\"\n"
-                 "#include \"c.h\"\n"
-                 "#include \"b.h\"\n",
-                 "a.h"));
-
-  // Only do this in the first #include block.
-  EXPECT_EQ("#include <a>\n"
-            "\n"
-            "#include \"b.h\"\n"
-            "#include \"c.h\"\n"
-            "#include \"llvm/a.h\"\n",
-            sort("#include <a>\n"
-                 "\n"
-                 "#include \"llvm/a.h\"\n"
-                 "#include \"c.h\"\n"
-                 "#include \"b.h\"\n",
-                 "a.cc"));
-
-  // Only recognize the first #include with a matching basename as main include.
-  EXPECT_EQ("#include \"a.h\"\n"
-            "#include \"b.h\"\n"
-            "#include \"c.h\"\n"
-            "#include \"llvm/a.h\"\n",
-            sort("#include \"b.h\"\n"
-                 "#include \"a.h\"\n"
-                 "#include \"c.h\"\n"
-                 "#include \"llvm/a.h\"\n",
-                 "a.cc"));
-}
-
-TEST_F(SortIncludesTest, LeavesMainHeaderFirstInAdditionalExtensions) {
-  Style.IncludeIsMainRegex = "([-_](test|unittest))?|(Impl)?$";
-  EXPECT_EQ("#include \"b.h\"\n"
-            "#include \"c.h\"\n"
-            "#include \"llvm/a.h\"\n",
-            sort("#include \"llvm/a.h\"\n"
-                 "#include \"c.h\"\n"
-                 "#include \"b.h\"\n",
-                 "a_test.xxx"));
-  EXPECT_EQ("#include \"b.h\"\n"
-            "#include \"c.h\"\n"
-            "#include \"llvm/a.h\"\n",
-            sort("#include \"llvm/a.h\"\n"
-                 "#include \"c.h\"\n"
-                 "#include \"b.h\"\n",
-                 "aImpl.hpp"));
-
-  // .cpp extension is considered "main" by default
-  EXPECT_EQ("#include \"llvm/a.h\"\n"
-            "#include \"b.h\"\n"
-            "#include \"c.h\"\n",
-            sort("#include \"llvm/a.h\"\n"
-                 "#include \"c.h\"\n"
-                 "#include \"b.h\"\n",
-                 "aImpl.cpp"));
-  EXPECT_EQ("#include \"llvm/a.h\"\n"
-            "#include \"b.h\"\n"
-            "#include \"c.h\"\n",
-            sort("#include \"llvm/a.h\"\n"
-                 "#include \"c.h\"\n"
-                 "#include \"b.h\"\n",
-                 "a_test.cpp"));
-
-  // Allow additional filenames / extensions
-  Style.IncludeIsMainSourceRegex = "(Impl\\.hpp)|(\\.xxx)$";
-  EXPECT_EQ("#include \"llvm/a.h\"\n"
-            "#include \"b.h\"\n"
-            "#include \"c.h\"\n",
-            sort("#include \"llvm/a.h\"\n"
-                 "#include \"c.h\"\n"
-                 "#include \"b.h\"\n",
-                 "a_test.xxx"));
-  EXPECT_EQ("#include \"llvm/a.h\"\n"
-            "#include \"b.h\"\n"
-            "#include \"c.h\"\n",
-            sort("#include \"llvm/a.h\"\n"
-                 "#include \"c.h\"\n"
-                 "#include \"b.h\"\n",
-                 "aImpl.hpp"));
-}
-
-TEST_F(SortIncludesTest, RecognizeMainHeaderInAllGroups) {
-  Style.IncludeIsMainRegex = "([-_](test|unittest))?$";
-  Style.IncludeBlocks = tooling::IncludeStyle::IBS_Merge;
-
-  EXPECT_EQ("#include \"c.h\"\n"
-            "#include \"a.h\"\n"
-            "#include \"b.h\"\n",
-            sort("#include \"b.h\"\n"
-                 "\n"
-                 "#include \"a.h\"\n"
-                 "#include \"c.h\"\n",
-                 "c.cc"));
-}
-
-TEST_F(SortIncludesTest, MainHeaderIsSeparatedWhenRegroupping) {
-  Style.IncludeIsMainRegex = "([-_](test|unittest))?$";
-  Style.IncludeBlocks = tooling::IncludeStyle::IBS_Regroup;
-
-  EXPECT_EQ("#include \"a.h\"\n"
-            "\n"
-            "#include \"b.h\"\n"
-            "#include \"c.h\"\n",
-            sort("#include \"b.h\"\n"
-                 "\n"
-                 "#include \"a.h\"\n"
-                 "#include \"c.h\"\n",
-                 "a.cc"));
-}
-
-TEST_F(SortIncludesTest, SupportOptionalCaseSensitiveSorting) {
-  EXPECT_FALSE(FmtStyle.SortIncludes == FormatStyle::SI_CaseInsensitive);
-
-  FmtStyle.SortIncludes = FormatStyle::SI_CaseInsensitive;
-
-  EXPECT_EQ("#include \"A/B.h\"\n"
-            "#include \"A/b.h\"\n"
-            "#include \"a/b.h\"\n"
-            "#include \"B/A.h\"\n"
-            "#include \"B/a.h\"\n",
-            sort("#include \"B/a.h\"\n"
-                 "#include \"B/A.h\"\n"
-                 "#include \"A/B.h\"\n"
-                 "#include \"a/b.h\"\n"
-                 "#include \"A/b.h\"\n",
-                 "a.h"));
-
-  Style.IncludeBlocks = clang::tooling::IncludeStyle::IBS_Regroup;
-  Style.IncludeCategories = {
-      {"^\"", 1, 0, false}, {"^<.*\\.h>$", 2, 0, false}, {"^<", 3, 0, false}};
-
-  StringRef UnsortedCode = "#include \"qt.h\"\n"
-                           "#include <algorithm>\n"
-                           "#include <qtwhatever.h>\n"
-                           "#include <Qtwhatever.h>\n"
-                           "#include <Algorithm>\n"
-                           "#include \"vlib.h\"\n"
-                           "#include \"Vlib.h\"\n"
-                           "#include \"AST.h\"\n";
-
-  EXPECT_EQ("#include \"AST.h\"\n"
-            "#include \"qt.h\"\n"
-            "#include \"Vlib.h\"\n"
-            "#include \"vlib.h\"\n"
-            "\n"
-            "#include <Qtwhatever.h>\n"
-            "#include <qtwhatever.h>\n"
-            "\n"
-            "#include <Algorithm>\n"
-            "#include <algorithm>\n",
-            sort(UnsortedCode));
-}
-
-TEST_F(SortIncludesTest, SupportCaseInsensitiveMatching) {
-  // Setup an regex for main includes so we can cover those as well.
-  Style.IncludeIsMainRegex = "([-_](test|unittest))?$";
-
-  // Ensure both main header detection and grouping work in a case insensitive
-  // manner.
-  EXPECT_EQ("#include \"llvm/A.h\"\n"
-            "#include \"b.h\"\n"
-            "#include \"c.h\"\n"
-            "#include \"LLVM/z.h\"\n"
-            "#include \"llvm/X.h\"\n"
-            "#include \"GTest/GTest.h\"\n"
-            "#include \"gmock/gmock.h\"\n",
-            sort("#include \"c.h\"\n"
-                 "#include \"b.h\"\n"
-                 "#include \"GTest/GTest.h\"\n"
-                 "#include \"llvm/A.h\"\n"
-                 "#include \"gmock/gmock.h\"\n"
-                 "#include \"llvm/X.h\"\n"
-                 "#include \"LLVM/z.h\"\n",
-                 "a_TEST.cc"));
-}
-
-TEST_F(SortIncludesTest, SupportOptionalCaseSensitiveMachting) {
-  Style.IncludeBlocks = clang::tooling::IncludeStyle::IBS_Regroup;
-  Style.IncludeCategories = {{"^\"", 1, 0, false},
-                             {"^<.*\\.h>$", 2, 0, false},
-                             {"^<Q[A-Z][^\\.]*>", 3, 0, false},
-                             {"^<Qt[^\\.]*>", 4, 0, false},
-                             {"^<", 5, 0, false}};
-
-  StringRef UnsortedCode = "#include <QWidget>\n"
-                           "#include \"qt.h\"\n"
-                           "#include <algorithm>\n"
-                           "#include <windows.h>\n"
-                           "#include <QLabel>\n"
-                           "#include \"qa.h\"\n"
-                           "#include <queue>\n"
-                           "#include <qtwhatever.h>\n"
-                           "#include <QtGlobal>\n";
-
-  EXPECT_EQ("#include \"qa.h\"\n"
-            "#include \"qt.h\"\n"
-            "\n"
-            "#include <qtwhatever.h>\n"
-            "#include <windows.h>\n"
-            "\n"
-            "#include <QLabel>\n"
-            "#include <QWidget>\n"
-            "#include <QtGlobal>\n"
-            "#include <queue>\n"
-            "\n"
-            "#include <algorithm>\n",
-            sort(UnsortedCode));
-
-  Style.IncludeCategories[2].RegexIsCaseSensitive = true;
-  Style.IncludeCategories[3].RegexIsCaseSensitive = true;
-  EXPECT_EQ("#include \"qa.h\"\n"
-            "#include \"qt.h\"\n"
-            "\n"
-            "#include <qtwhatever.h>\n"
-            "#include <windows.h>\n"
-            "\n"
-            "#include <QLabel>\n"
-            "#include <QWidget>\n"
-            "\n"
-            "#include <QtGlobal>\n"
-            "\n"
-            "#include <algorithm>\n"
-            "#include <queue>\n",
-            sort(UnsortedCode));
-}
-
-TEST_F(SortIncludesTest, NegativePriorities) {
-  Style.IncludeCategories = {{".*important_os_header.*", -1, 0, false},
-                             {".*", 1, 0, false}};
-  EXPECT_EQ("#include \"important_os_header.h\"\n"
-            "#include \"c_main.h\"\n"
-            "#include \"a_other.h\"\n",
-            sort("#include \"c_main.h\"\n"
-                 "#include \"a_other.h\"\n"
-                 "#include \"important_os_header.h\"\n",
-                 "c_main.cc"));
-
-  // check stable when re-run
-  EXPECT_EQ("#include \"important_os_header.h\"\n"
-            "#include \"c_main.h\"\n"
-            "#include \"a_other.h\"\n",
-            sort("#include \"important_os_header.h\"\n"
-                 "#include \"c_main.h\"\n"
-                 "#include \"a_other.h\"\n",
-                 "c_main.cc", 0));
-}
-
-TEST_F(SortIncludesTest, PriorityGroupsAreSeparatedWhenRegroupping) {
-  Style.IncludeCategories = {{".*important_os_header.*", -1, 0, false},
-                             {".*", 1, 0, false}};
-  Style.IncludeBlocks = tooling::IncludeStyle::IBS_Regroup;
-
-  EXPECT_EQ("#include \"important_os_header.h\"\n"
-            "\n"
-            "#include \"c_main.h\"\n"
-            "\n"
-            "#include \"a_other.h\"\n",
-            sort("#include \"c_main.h\"\n"
-                 "#include \"a_other.h\"\n"
-                 "#include \"important_os_header.h\"\n",
-                 "c_main.cc"));
-
-  // check stable when re-run
-  EXPECT_EQ("#include \"important_os_header.h\"\n"
-            "\n"
-            "#include \"c_main.h\"\n"
-            "\n"
-            "#include \"a_other.h\"\n",
-            sort("#include \"important_os_header.h\"\n"
-                 "\n"
-                 "#include \"c_main.h\"\n"
-                 "\n"
-                 "#include \"a_other.h\"\n",
-                 "c_main.cc", 0));
-}
-
-TEST_F(SortIncludesTest, CalculatesCorrectCursorPosition) {
-  std::string Code = "#include <ccc>\n"    // Start of line: 0
-                     "#include <bbbbbb>\n" // Start of line: 15
-                     "#include <a>\n";     // Start of line: 33
-  EXPECT_EQ(31u, newCursor(Code, 0));
-  EXPECT_EQ(13u, newCursor(Code, 15));
-  EXPECT_EQ(0u, newCursor(Code, 33));
-
-  EXPECT_EQ(41u, newCursor(Code, 10));
-  EXPECT_EQ(23u, newCursor(Code, 25));
-  EXPECT_EQ(10u, newCursor(Code, 43));
-}
-
-TEST_F(SortIncludesTest, DeduplicateIncludes) {
-  EXPECT_EQ("#include <a>\n"
-            "#include <b>\n"
-            "#include <c>\n",
-            sort("#include <a>\n"
-                 "#include <b>\n"
-                 "#include <b>\n"
-                 "#include <b>\n"
-                 "#include <b>\n"
-                 "#include <c>\n"));
-
-  Style.IncludeBlocks = tooling::IncludeStyle::IBS_Merge;
-  EXPECT_EQ("#include <a>\n"
-            "#include <b>\n"
-            "#include <c>\n",
-            sort("#include <a>\n"
-                 "#include <b>\n"
-                 "\n"
-                 "#include <b>\n"
-                 "\n"
-                 "#include <b>\n"
-                 "#include <c>\n"));
-
-  Style.IncludeBlocks = tooling::IncludeStyle::IBS_Regroup;
-  EXPECT_EQ("#include <a>\n"
-            "#include <b>\n"
-            "#include <c>\n",
-            sort("#include <a>\n"
-                 "#include <b>\n"
-                 "\n"
-                 "#include <b>\n"
-                 "\n"
-                 "#include <b>\n"
-                 "#include <c>\n"));
-}
-
-TEST_F(SortIncludesTest, SortAndDeduplicateIncludes) {
-  EXPECT_EQ("#include <a>\n"
-            "#include <b>\n"
-            "#include <c>\n",
-            sort("#include <b>\n"
-                 "#include <a>\n"
-                 "#include <b>\n"
-                 "#include <b>\n"
-                 "#include <c>\n"
-                 "#include <b>\n"));
-
-  Style.IncludeBlocks = tooling::IncludeStyle::IBS_Merge;
-  EXPECT_EQ("#include <a>\n"
-            "#include <b>\n"
-            "#include <c>\n",
-            sort("#include <b>\n"
-                 "#include <a>\n"
-                 "\n"
-                 "#include <b>\n"
-                 "\n"
-                 "#include <c>\n"
-                 "#include <b>\n"));
-
-  Style.IncludeBlocks = tooling::IncludeStyle::IBS_Regroup;
-  EXPECT_EQ("#include <a>\n"
-            "#include <b>\n"
-            "#include <c>\n",
-            sort("#include <b>\n"
-                 "#include <a>\n"
-                 "\n"
-                 "#include <b>\n"
-                 "\n"
-                 "#include <c>\n"
-                 "#include <b>\n"));
-}
-
-TEST_F(SortIncludesTest, CalculatesCorrectCursorPositionAfterDeduplicate) {
-  std::string Code = "#include <b>\n"      // Start of line: 0
-                     "#include <a>\n"      // Start of line: 13
-                     "#include <b>\n"      // Start of line: 26
-                     "#include <b>\n"      // Start of line: 39
-                     "#include <c>\n"      // Start of line: 52
-                     "#include <b>\n";     // Start of line: 65
-  std::string Expected = "#include <a>\n"  // Start of line: 0
-                         "#include <b>\n"  // Start of line: 13
-                         "#include <c>\n"; // Start of line: 26
-  EXPECT_EQ(Expected, sort(Code));
-  // Cursor on 'i' in "#include <a>".
-  EXPECT_EQ(1u, newCursor(Code, 14));
-  // Cursor on 'b' in "#include <b>".
-  EXPECT_EQ(23u, newCursor(Code, 10));
-  EXPECT_EQ(23u, newCursor(Code, 36));
-  EXPECT_EQ(23u, newCursor(Code, 49));
-  EXPECT_EQ(23u, newCursor(Code, 36));
-  EXPECT_EQ(23u, newCursor(Code, 75));
-  // Cursor on '#' in "#include <c>".
-  EXPECT_EQ(26u, newCursor(Code, 52));
-}
-
-TEST_F(SortIncludesTest, DeduplicateLocallyInEachBlock) {
-  EXPECT_EQ("#include <a>\n"
-            "#include <b>\n"
-            "\n"
-            "#include <b>\n"
-            "#include <c>\n",
-            sort("#include <a>\n"
-                 "#include <b>\n"
-                 "\n"
-                 "#include <c>\n"
-                 "#include <b>\n"
-                 "#include <b>\n"));
-}
-
-TEST_F(SortIncludesTest, ValidAffactedRangesAfterDeduplicatingIncludes) {
-  std::string Code = "#include <a>\n"
-                     "#include <b>\n"
-                     "#include <a>\n"
-                     "#include <a>\n"
-                     "\n"
-                     "   int     x ;";
-  std::vector<tooling::Range> Ranges = {tooling::Range(0, 52)};
-  auto Replaces = sortIncludes(FmtStyle, Code, Ranges, "input.cpp");
-  Ranges = tooling::calculateRangesAfterReplacements(Replaces, Ranges);
-  EXPECT_EQ(1u, Ranges.size());
-  EXPECT_EQ(0u, Ranges[0].getOffset());
-  EXPECT_EQ(26u, Ranges[0].getLength());
-}
-
-TEST_F(SortIncludesTest, DoNotSortLikelyXml) {
-  EXPECT_EQ("<!--;\n"
-            "#include <b>\n"
-            "#include <a>\n"
-            "-->",
-            sort("<!--;\n"
-                 "#include <b>\n"
-                 "#include <a>\n"
-                 "-->",
-                 "input.h", 0));
-}
-
-TEST_F(SortIncludesTest, DoNotOutputReplacementsForSortedBlocksWithRegrouping) {
-  Style.IncludeBlocks = Style.IBS_Regroup;
-  std::string Code = R"(
-#include "b.h"
-
-#include <a.h>
-)";
-  EXPECT_EQ(Code, sort(Code, "input.h", 0));
-}
-
-TEST_F(SortIncludesTest,
-       DoNotOutputReplacementsForSortedBlocksWithRegroupingWindows) {
-  Style.IncludeBlocks = Style.IBS_Regroup;
-  std::string Code = "#include \"b.h\"\r\n"
-                     "\r\n"
-                     "#include <a.h>\r\n";
-  EXPECT_EQ(Code, sort(Code, "input.h", 0));
-}
-
-TEST_F(SortIncludesTest, DoNotRegroupGroupsInGoogleObjCStyle) {
-  FmtStyle = getGoogleStyle(FormatStyle::LK_ObjC);
-
-  EXPECT_EQ("#include <a.h>\n"
-            "#include <b.h>\n"
-            "#include \"a.h\"",
-            sort("#include <b.h>\n"
-                 "#include <a.h>\n"
-                 "#include \"a.h\""));
-}
-
-TEST_F(SortIncludesTest, DoNotTreatPrecompiledHeadersAsFirstBlock) {
-  Style.IncludeBlocks = Style.IBS_Merge;
-  std::string Code = "#include \"d.h\"\r\n"
-                     "#include \"b.h\"\r\n"
-                     "#pragma hdrstop\r\n"
-                     "\r\n"
-                     "#include \"c.h\"\r\n"
-                     "#include \"a.h\"\r\n"
-                     "#include \"e.h\"\r\n";
-
-  std::string Expected = "#include \"b.h\"\r\n"
-                         "#include \"d.h\"\r\n"
-                         "#pragma hdrstop\r\n"
-                         "\r\n"
-                         "#include \"e.h\"\r\n"
-                         "#include \"a.h\"\r\n"
-                         "#include \"c.h\"\r\n";
-
-  EXPECT_EQ(Expected, sort(Code, "e.cpp", 2));
-
-  Code = "#include \"d.h\"\n"
-         "#include \"b.h\"\n"
-         "#pragma hdrstop( \"c:\\projects\\include\\myinc.pch\" )\n"
-         "\n"
-         "#include \"c.h\"\n"
-         "#include \"a.h\"\n"
-         "#include \"e.h\"\n";
-
-  Expected = "#include \"b.h\"\n"
-             "#include \"d.h\"\n"
-             "#pragma hdrstop(\"c:\\projects\\include\\myinc.pch\")\n"
-             "\n"
-             "#include \"e.h\"\n"
-             "#include \"a.h\"\n"
-             "#include \"c.h\"\n";
-
-  EXPECT_EQ(Expected, sort(Code, "e.cpp", 2));
-}
-
-TEST_F(SortIncludesTest, skipUTF8ByteOrderMarkMerge) {
-  Style.IncludeBlocks = Style.IBS_Merge;
-  std::string Code = "\xEF\xBB\xBF#include \"d.h\"\r\n"
-                     "#include \"b.h\"\r\n"
-                     "\r\n"
-                     "#include \"c.h\"\r\n"
-                     "#include \"a.h\"\r\n"
-                     "#include \"e.h\"\r\n";
-
-  std::string Expected = "\xEF\xBB\xBF#include \"e.h\"\r\n"
-                         "#include \"a.h\"\r\n"
-                         "#include \"b.h\"\r\n"
-                         "#include \"c.h\"\r\n"
-                         "#include \"d.h\"\r\n";
-
-  EXPECT_EQ(Expected, sort(Code, "e.cpp", 1));
-}
-
-TEST_F(SortIncludesTest, skipUTF8ByteOrderMarkPreserve) {
-  Style.IncludeBlocks = Style.IBS_Preserve;
-  std::string Code = "\xEF\xBB\xBF#include \"d.h\"\r\n"
-                     "#include \"b.h\"\r\n"
-                     "\r\n"
-                     "#include \"c.h\"\r\n"
-                     "#include \"a.h\"\r\n"
-                     "#include \"e.h\"\r\n";
-
-  std::string Expected = "\xEF\xBB\xBF#include \"b.h\"\r\n"
-                         "#include \"d.h\"\r\n"
-                         "\r\n"
-                         "#include \"a.h\"\r\n"
-                         "#include \"c.h\"\r\n"
-                         "#include \"e.h\"\r\n";
-
-  EXPECT_EQ(Expected, sort(Code, "e.cpp", 2));
-}
-
-TEST_F(SortIncludesTest, MergeLines) {
-  Style.IncludeBlocks = Style.IBS_Merge;
-  std::string Code = "#include \"c.h\"\r\n"
-                     "#include \"b\\\r\n"
-                     ".h\"\r\n"
-                     "#include \"a.h\"\r\n";
-
-  std::string Expected = "#include \"a.h\"\r\n"
-                         "#include \"b\\\r\n"
-                         ".h\"\r\n"
-                         "#include \"c.h\"\r\n";
-
-  EXPECT_EQ(Expected, sort(Code, "a.cpp", 1));
-}
-
-TEST_F(SortIncludesTest, DisableFormatDisablesIncludeSorting) {
-  StringRef Sorted = "#include <a.h>\n"
-                     "#include <b.h>\n";
-  StringRef Unsorted = "#include <b.h>\n"
-                       "#include <a.h>\n";
-  EXPECT_EQ(Sorted, sort(Unsorted));
-  FmtStyle.DisableFormat = true;
-  EXPECT_EQ(Unsorted, sort(Unsorted, "input.cpp", 0));
-}
-
-} // end namespace
-} // end namespace format
-} // end namespace clang
diff --git a/gnu/llvm/clang/unittests/Format/TestLexer.h b/gnu/llvm/clang/unittests/Format/TestLexer.h
deleted file mode 100644
index 0945e9e66c6..00000000000
--- a/gnu/llvm/clang/unittests/Format/TestLexer.h
+++ /dev/null
@@ -1,123 +0,0 @@
-//===--- TestLexer.h - Format C++ code --------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-///
-/// \file
-/// This file contains a TestLexer to create FormatTokens from strings.
-///
-//===----------------------------------------------------------------------===//
-
-#ifndef CLANG_UNITTESTS_FORMAT_TESTLEXER_H
-#define CLANG_UNITTESTS_FORMAT_TESTLEXER_H
-
-#include "../../lib/Format/FormatTokenLexer.h"
-#include "../../lib/Format/TokenAnalyzer.h"
-#include "../../lib/Format/TokenAnnotator.h"
-#include "../../lib/Format/UnwrappedLineParser.h"
-
-#include "clang/Basic/FileManager.h"
-#include "clang/Basic/SourceManager.h"
-
-#include <numeric>
-#include <ostream>
-
-namespace clang {
-namespace format {
-
-typedef llvm::SmallVector<FormatToken *, 8> TokenList;
-
-inline std::ostream &operator<<(std::ostream &Stream, const FormatToken &Tok) {
-  Stream << "(" << Tok.Tok.getName() << ", \"" << Tok.TokenText.str() << "\" , "
-         << getTokenTypeName(Tok.getType()) << ")";
-  return Stream;
-}
-inline std::ostream &operator<<(std::ostream &Stream, const TokenList &Tokens) {
-  Stream << "{";
-  for (size_t I = 0, E = Tokens.size(); I != E; ++I) {
-    Stream << (I > 0 ? ", " : "") << *Tokens[I];
-  }
-  Stream << "} (" << Tokens.size() << " tokens)";
-  return Stream;
-}
-
-inline TokenList uneof(const TokenList &Tokens) {
-  assert(!Tokens.empty() && Tokens.back()->is(tok::eof));
-  return TokenList(Tokens.begin(), std::prev(Tokens.end()));
-}
-
-inline std::string text(llvm::ArrayRef<FormatToken *> Tokens) {
-  return std::accumulate(Tokens.begin(), Tokens.end(), std::string(),
-                         [](const std::string &R, FormatToken *Tok) {
-                           return (R + Tok->TokenText).str();
-                         });
-}
-
-class TestLexer : public UnwrappedLineConsumer {
-public:
-  TestLexer(llvm::SpecificBumpPtrAllocator<FormatToken> &Allocator,
-            std::vector<std::unique_ptr<llvm::MemoryBuffer>> &Buffers,
-            FormatStyle Style = getLLVMStyle())
-      : Allocator(Allocator), Buffers(Buffers), Style(Style),
-        SourceMgr("test.cpp", ""), IdentTable(getFormattingLangOpts(Style)) {}
-
-  TokenList lex(llvm::StringRef Code) {
-    FormatTokenLexer Lex = getNewLexer(Code);
-    ArrayRef<FormatToken *> Result = Lex.lex();
-    return TokenList(Result.begin(), Result.end());
-  }
-
-  TokenList annotate(llvm::StringRef Code) {
-    FormatTokenLexer Lex = getNewLexer(Code);
-    auto Tokens = Lex.lex();
-    UnwrappedLineParser Parser(Style, Lex.getKeywords(), 0, Tokens, *this);
-    Parser.parse();
-    TokenAnnotator Annotator(Style, Lex.getKeywords());
-    for (auto &Line : UnwrappedLines) {
-      AnnotatedLine Annotated(Line);
-      Annotator.annotate(Annotated);
-      Annotator.calculateFormattingInformation(Annotated);
-    }
-    UnwrappedLines.clear();
-    return TokenList(Tokens.begin(), Tokens.end());
-  }
-
-  FormatToken *id(llvm::StringRef Code) {
-    auto Result = uneof(lex(Code));
-    assert(Result.size() == 1U && "Code must expand to 1 token.");
-    return Result[0];
-  }
-
-protected:
-  void consumeUnwrappedLine(const UnwrappedLine &TheLine) override {
-    UnwrappedLines.push_back(TheLine);
-  }
-  void finishRun() override {}
-
-  FormatTokenLexer getNewLexer(StringRef Code) {
-    Buffers.push_back(
-        llvm::MemoryBuffer::getMemBufferCopy(Code, "<scratch space>"));
-    clang::FileID FID =
-        SourceMgr.get().createFileID(Buffers.back()->getMemBufferRef());
-    return FormatTokenLexer(SourceMgr.get(), FID, 0, Style, Encoding, Allocator,
-                            IdentTable);
-  }
-
-public:
-  llvm::SpecificBumpPtrAllocator<FormatToken>& Allocator;
-  std::vector<std::unique_ptr<llvm::MemoryBuffer>>& Buffers;
-  FormatStyle Style;
-  encoding::Encoding Encoding = encoding::Encoding_UTF8;
-  clang::SourceManagerForFile SourceMgr;
-  IdentifierTable IdentTable;
-  SmallVector<UnwrappedLine, 16> UnwrappedLines;
-};
-
-} // namespace format
-} // namespace clang
-
-#endif // LLVM_CLANG_UNITTESTS_FORMAT_TEST_LEXER_H
diff --git a/gnu/llvm/clang/unittests/Format/TokenAnnotatorTest.cpp b/gnu/llvm/clang/unittests/Format/TokenAnnotatorTest.cpp
deleted file mode 100644
index e87270d6386..00000000000
--- a/gnu/llvm/clang/unittests/Format/TokenAnnotatorTest.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
-//===- unittest/Format/TokenAnnotatorTest.cpp - Formatting unit tests -----===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/Format/Format.h"
-
-#include "FormatTestUtils.h"
-#include "TestLexer.h"
-#include "gtest/gtest.h"
-
-namespace clang {
-namespace format {
-namespace {
-
-class TokenAnnotatorTest : public ::testing::Test {
-protected:
-  TokenList annotate(llvm::StringRef Code,
-                     const FormatStyle &Style = getLLVMStyle()) {
-    return TestLexer(Allocator, Buffers, Style).annotate(Code);
-  }
-  llvm::SpecificBumpPtrAllocator<FormatToken> Allocator;
-  std::vector<std::unique_ptr<llvm::MemoryBuffer>> Buffers;
-};
-
-#define EXPECT_TOKEN_KIND(FormatTok, Kind)                                     \
-  EXPECT_EQ((FormatTok)->Tok.getKind(), Kind) << *(FormatTok)
-#define EXPECT_TOKEN_TYPE(FormatTok, Type)                                     \
-  EXPECT_EQ((FormatTok)->getType(), Type) << *(FormatTok)
-#define EXPECT_TOKEN(FormatTok, Kind, Type)                                    \
-  do {                                                                         \
-    EXPECT_TOKEN_KIND(FormatTok, Kind);                                        \
-    EXPECT_TOKEN_TYPE(FormatTok, Type);                                        \
-  } while (false);
-
-TEST_F(TokenAnnotatorTest, UnderstandsUsesOfStarAndAmpInMacroDefinition) {
-  // This is a regression test for mis-parsing the & after decltype as a binary
-  // operator instead of a reference (when inside a macro definition).
-  auto Tokens = annotate("auto x = [](const decltype(x) &ptr) {};");
-  EXPECT_EQ(Tokens.size(), 18u) << Tokens;
-  EXPECT_TOKEN(Tokens[7], tok::kw_decltype, TT_Unknown);
-  EXPECT_TOKEN(Tokens[8], tok::l_paren, TT_TypeDeclarationParen);
-  EXPECT_TOKEN(Tokens[9], tok::identifier, TT_Unknown);
-  EXPECT_TOKEN(Tokens[10], tok::r_paren, TT_TypeDeclarationParen);
-  EXPECT_TOKEN(Tokens[11], tok::amp, TT_PointerOrReference);
-  // Same again with * instead of &:
-  Tokens = annotate("auto x = [](const decltype(x) *ptr) {};");
-  EXPECT_EQ(Tokens.size(), 18u) << Tokens;
-  EXPECT_TOKEN(Tokens[10], tok::r_paren, TT_TypeDeclarationParen);
-  EXPECT_TOKEN(Tokens[11], tok::star, TT_PointerOrReference);
-
-  // Also check that we parse correctly within a macro definition:
-  Tokens = annotate("#define lambda [](const decltype(x) &ptr) {}");
-  EXPECT_EQ(Tokens.size(), 17u) << Tokens;
-  EXPECT_TOKEN(Tokens[7], tok::kw_decltype, TT_Unknown);
-  EXPECT_TOKEN(Tokens[8], tok::l_paren, TT_TypeDeclarationParen);
-  EXPECT_TOKEN(Tokens[9], tok::identifier, TT_Unknown);
-  EXPECT_TOKEN(Tokens[10], tok::r_paren, TT_TypeDeclarationParen);
-  EXPECT_TOKEN(Tokens[11], tok::amp, TT_PointerOrReference);
-  // Same again with * instead of &:
-  Tokens = annotate("#define lambda [](const decltype(x) *ptr) {}");
-  EXPECT_EQ(Tokens.size(), 17u) << Tokens;
-  EXPECT_TOKEN(Tokens[10], tok::r_paren, TT_TypeDeclarationParen);
-  EXPECT_TOKEN(Tokens[11], tok::star, TT_PointerOrReference);
-}
-
-} // namespace
-} // namespace format
-} // namespace clang
diff --git a/gnu/llvm/clang/unittests/Format/UsingDeclarationsSorterTest.cpp b/gnu/llvm/clang/unittests/Format/UsingDeclarationsSorterTest.cpp
deleted file mode 100644
index cd5d456b1d7..00000000000
--- a/gnu/llvm/clang/unittests/Format/UsingDeclarationsSorterTest.cpp
+++ /dev/null
@@ -1,374 +0,0 @@
-//===- UsingDeclarationsSorterTest.cpp - Formatting unit tests ------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/Format/Format.h"
-
-#include "llvm/Support/Debug.h"
-#include "gtest/gtest.h"
-
-#define DEBUG_TYPE "using-declarations-sorter-test"
-
-namespace clang {
-namespace format {
-namespace {
-
-class UsingDeclarationsSorterTest : public ::testing::Test {
-protected:
-  std::string sortUsingDeclarations(llvm::StringRef Code,
-                                    const std::vector<tooling::Range> &Ranges,
-                                    const FormatStyle &Style = getLLVMStyle()) {
-    LLVM_DEBUG(llvm::errs() << "---\n");
-    LLVM_DEBUG(llvm::errs() << Code << "\n\n");
-    tooling::Replacements Replaces =
-        clang::format::sortUsingDeclarations(Style, Code, Ranges, "<stdin>");
-    auto Result = applyAllReplacements(Code, Replaces);
-    EXPECT_TRUE(static_cast<bool>(Result));
-    LLVM_DEBUG(llvm::errs() << "\n" << *Result << "\n\n");
-    return *Result;
-  }
-
-  std::string sortUsingDeclarations(llvm::StringRef Code,
-                                    const FormatStyle &Style = getLLVMStyle()) {
-    return sortUsingDeclarations(Code,
-                                 /*Ranges=*/{1, tooling::Range(0, Code.size())},
-                                 Style);
-  }
-};
-
-TEST_F(UsingDeclarationsSorterTest, SwapsTwoConsecutiveUsingDeclarations) {
-  EXPECT_EQ("using a;\n"
-            "using b;",
-            sortUsingDeclarations("using a;\n"
-                                  "using b;"));
-  EXPECT_EQ("using a;\n"
-            "using aa;",
-            sortUsingDeclarations("using aa;\n"
-                                  "using a;"));
-  EXPECT_EQ("using a;\n"
-            "using ::a;",
-            sortUsingDeclarations("using a;\n"
-                                  "using ::a;"));
-
-  EXPECT_EQ("using a::bcd;\n"
-            "using a::cd;",
-            sortUsingDeclarations("using a::cd;\n"
-                                  "using a::bcd;"));
-
-  EXPECT_EQ("using a;\n"
-            "using a::a;",
-            sortUsingDeclarations("using a::a;\n"
-                                  "using a;"));
-
-  EXPECT_EQ("using a::ba::aa;\n"
-            "using a::bb::ccc;",
-            sortUsingDeclarations("using a::bb::ccc;\n"
-                                  "using a::ba::aa;"));
-
-  EXPECT_EQ("using a;\n"
-            "using typename a;",
-            sortUsingDeclarations("using typename a;\n"
-                                  "using a;"));
-
-  EXPECT_EQ("using typename z;\n"
-            "using typenamea;",
-            sortUsingDeclarations("using typenamea;\n"
-                                  "using typename z;"));
-
-  EXPECT_EQ("using a, b;\n"
-            "using aa;",
-            sortUsingDeclarations("using aa;\n"
-                                  "using a, b;"));
-}
-
-TEST_F(UsingDeclarationsSorterTest, UsingDeclarationOrder) {
-  EXPECT_EQ("using A;\n"
-            "using a;",
-            sortUsingDeclarations("using A;\n"
-                                  "using a;"));
-  EXPECT_EQ("using a;\n"
-            "using A;",
-            sortUsingDeclarations("using a;\n"
-                                  "using A;"));
-  EXPECT_EQ("using a;\n"
-            "using B;",
-            sortUsingDeclarations("using B;\n"
-                                  "using a;"));
-
-  // Ignores leading '::'.
-  EXPECT_EQ("using ::a;\n"
-            "using A;",
-            sortUsingDeclarations("using ::a;\n"
-                                  "using A;"));
-
-  EXPECT_EQ("using ::A;\n"
-            "using a;",
-            sortUsingDeclarations("using ::A;\n"
-                                  "using a;"));
-
-  // Sorts '_' before 'a' and 'A'.
-  EXPECT_EQ("using _;\n"
-            "using A;",
-            sortUsingDeclarations("using A;\n"
-                                  "using _;"));
-  EXPECT_EQ("using _;\n"
-            "using a;",
-            sortUsingDeclarations("using a;\n"
-                                  "using _;"));
-  EXPECT_EQ("using a::_;\n"
-            "using a::a;",
-            sortUsingDeclarations("using a::a;\n"
-                                  "using a::_;"));
-
-  // Sorts non-namespace names before namespace names at the same level.
-  EXPECT_EQ("using ::testing::_;\n"
-            "using ::testing::Aardvark;\n"
-            "using ::testing::kMax;\n"
-            "using ::testing::Xylophone;\n"
-            "using ::testing::apple::Honeycrisp;\n"
-            "using ::testing::zebra::Stripes;",
-            sortUsingDeclarations("using ::testing::Aardvark;\n"
-                                  "using ::testing::Xylophone;\n"
-                                  "using ::testing::kMax;\n"
-                                  "using ::testing::_;\n"
-                                  "using ::testing::apple::Honeycrisp;\n"
-                                  "using ::testing::zebra::Stripes;"));
-}
-
-TEST_F(UsingDeclarationsSorterTest, SortsStably) {
-  EXPECT_EQ("using a;\n"
-            "using A;\n"
-            "using a;\n"
-            "using A;\n"
-            "using a;\n"
-            "using A;\n"
-            "using a;\n"
-            "using B;\n"
-            "using b;\n"
-            "using B;\n"
-            "using b;\n"
-            "using B;\n"
-            "using b;",
-            sortUsingDeclarations("using a;\n"
-                                  "using B;\n"
-                                  "using a;\n"
-                                  "using b;\n"
-                                  "using A;\n"
-                                  "using a;\n"
-                                  "using b;\n"
-                                  "using B;\n"
-                                  "using b;\n"
-                                  "using A;\n"
-                                  "using a;\n"
-                                  "using b;\n"
-                                  "using b;\n"
-                                  "using B;\n"
-                                  "using b;\n"
-                                  "using A;\n"
-                                  "using a;"));
-}
-
-TEST_F(UsingDeclarationsSorterTest, SortsMultipleTopLevelDeclarations) {
-  EXPECT_EQ("using a;\n"
-            "using b;\n"
-            "using c;\n"
-            "using d;\n"
-            "using e;",
-            sortUsingDeclarations("using d;\n"
-                                  "using b;\n"
-                                  "using e;\n"
-                                  "using a;\n"
-                                  "using c;"));
-
-  EXPECT_EQ("#include <iostream>\n"
-            "using std::cin;\n"
-            "using std::cout;\n"
-            "using ::std::endl;\n"
-            "int main();",
-            sortUsingDeclarations("#include <iostream>\n"
-                                  "using std::cout;\n"
-                                  "using ::std::endl;\n"
-                                  "using std::cin;\n"
-                                  "int main();"));
-}
-
-TEST_F(UsingDeclarationsSorterTest, BreaksOnEmptyLines) {
-  EXPECT_EQ("using b;\n"
-            "using c;\n"
-            "\n"
-            "using a;\n"
-            "using d;",
-            sortUsingDeclarations("using c;\n"
-                                  "using b;\n"
-                                  "\n"
-                                  "using d;\n"
-                                  "using a;"));
-}
-
-TEST_F(UsingDeclarationsSorterTest, BreaksOnUsingNamespace) {
-  EXPECT_EQ("using b;\n"
-            "using namespace std;\n"
-            "using a;",
-            sortUsingDeclarations("using b;\n"
-                                  "using namespace std;\n"
-                                  "using a;"));
-}
-
-TEST_F(UsingDeclarationsSorterTest, KeepsUsingDeclarationsInPPDirectives) {
-  EXPECT_EQ("#define A \\\n"
-            "using b;\\\n"
-            "using a;",
-            sortUsingDeclarations("#define A \\\n"
-                                  "using b;\\\n"
-                                  "using a;"));
-}
-
-TEST_F(UsingDeclarationsSorterTest, KeepsTypeAliases) {
-  auto Code = "struct C { struct B { struct A; }; };\n"
-              "using B = C::B;\n"
-              "using A = B::A;";
-  EXPECT_EQ(Code, sortUsingDeclarations(Code));
-}
-
-TEST_F(UsingDeclarationsSorterTest, MovesTrailingCommentsWithDeclarations) {
-  EXPECT_EQ("using a; // line a1\n"
-            "using b; /* line b1\n"
-            "          * line b2\n"
-            "          * line b3 */\n"
-            "using c; // line c1\n"
-            "         // line c2",
-            sortUsingDeclarations("using c; // line c1\n"
-                                  "         // line c2\n"
-                                  "using b; /* line b1\n"
-                                  "          * line b2\n"
-                                  "          * line b3 */\n"
-                                  "using a; // line a1"));
-}
-
-TEST_F(UsingDeclarationsSorterTest, SortsInStructScope) {
-  EXPECT_EQ("struct pt3 : pt2 {\n"
-            "  using pt2::x;\n"
-            "  using pt2::y;\n"
-            "  float z;\n"
-            "};",
-            sortUsingDeclarations("struct pt3 : pt2 {\n"
-                                  "  using pt2::y;\n"
-                                  "  using pt2::x;\n"
-                                  "  float z;\n"
-                                  "};"));
-}
-
-TEST_F(UsingDeclarationsSorterTest, KeepsOperators) {
-  EXPECT_EQ("using a::operator();\n"
-            "using a::operator-;\n"
-            "using a::operator+;",
-            sortUsingDeclarations("using a::operator();\n"
-                                  "using a::operator-;\n"
-                                  "using a::operator+;"));
-}
-
-TEST_F(UsingDeclarationsSorterTest, SortsUsingDeclarationsInsideNamespaces) {
-  EXPECT_EQ("namespace A {\n"
-            "struct B;\n"
-            "struct C;\n"
-            "}\n"
-            "namespace X {\n"
-            "using A::B;\n"
-            "using A::C;\n"
-            "}",
-            sortUsingDeclarations("namespace A {\n"
-                                  "struct B;\n"
-                                  "struct C;\n"
-                                  "}\n"
-                                  "namespace X {\n"
-                                  "using A::C;\n"
-                                  "using A::B;\n"
-                                  "}"));
-}
-
-TEST_F(UsingDeclarationsSorterTest, SupportsClangFormatOff) {
-  EXPECT_EQ("// clang-format off\n"
-            "using b;\n"
-            "using a;\n"
-            "// clang-format on\n"
-            "using c;\n"
-            "using d;",
-            sortUsingDeclarations("// clang-format off\n"
-                                  "using b;\n"
-                                  "using a;\n"
-                                  "// clang-format on\n"
-                                  "using d;\n"
-                                  "using c;"));
-}
-
-TEST_F(UsingDeclarationsSorterTest, SortsPartialRangeOfUsingDeclarations) {
-  // Sorts the whole block of using declarations surrounding the range.
-  EXPECT_EQ("using a;\n"
-            "using b;\n"
-            "using c;",
-            sortUsingDeclarations("using b;\n"
-                                  "using c;\n" // starts at offset 10
-                                  "using a;",
-                                  {tooling::Range(10, 15)}));
-  EXPECT_EQ("using a;\n"
-            "using b;\n"
-            "using c;\n"
-            "using A = b;",
-            sortUsingDeclarations("using b;\n"
-                                  "using c;\n" // starts at offset 10
-                                  "using a;\n"
-                                  "using A = b;",
-                                  {tooling::Range(10, 15)}));
-
-  EXPECT_EQ("using d;\n"
-            "using c;\n"
-            "\n"
-            "using a;\n"
-            "using b;\n"
-            "\n"
-            "using f;\n"
-            "using e;",
-            sortUsingDeclarations("using d;\n"
-                                  "using c;\n"
-                                  "\n"
-                                  "using b;\n" // starts at offset 19
-                                  "using a;\n"
-                                  "\n"
-                                  "using f;\n"
-                                  "using e;",
-                                  {tooling::Range(19, 1)}));
-}
-
-TEST_F(UsingDeclarationsSorterTest,
-       SortsUsingDeclarationsWithLeadingkComments) {
-  EXPECT_EQ("/* comment */ using a;\n"
-            "/* comment */ using b;",
-            sortUsingDeclarations("/* comment */ using b;\n"
-                                  "/* comment */ using a;"));
-}
-
-TEST_F(UsingDeclarationsSorterTest, DeduplicatesUsingDeclarations) {
-  EXPECT_EQ("using a;\n"
-            "using b;\n"
-            "using c;\n"
-            "\n"
-            "using a;\n"
-            "using e;",
-            sortUsingDeclarations("using c;\n"
-                                  "using a;\n"
-                                  "using b;\n"
-                                  "using a;\n"
-                                  "using b;\n"
-                                  "\n"
-                                  "using e;\n"
-                                  "using a;\n"
-                                  "using e;"));
-}
-
-} // end namespace
-} // end namespace format
-} // end namespace clang
diff --git a/gnu/llvm/clang/unittests/Frontend/ASTUnitTest.cpp b/gnu/llvm/clang/unittests/Frontend/ASTUnitTest.cpp
deleted file mode 100644
index eb3fdb48a2d..00000000000
--- a/gnu/llvm/clang/unittests/Frontend/ASTUnitTest.cpp
+++ /dev/null
@@ -1,177 +0,0 @@
-//===- unittests/Frontend/ASTUnitTest.cpp - ASTUnit tests -----------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include <fstream>
-
-#include "clang/Basic/FileManager.h"
-#include "clang/Frontend/ASTUnit.h"
-#include "clang/Frontend/CompilerInstance.h"
-#include "clang/Frontend/CompilerInvocation.h"
-#include "clang/Frontend/PCHContainerOperations.h"
-#include "clang/Lex/HeaderSearch.h"
-#include "llvm/Support/FileSystem.h"
-#include "llvm/Support/Path.h"
-#include "llvm/Support/ToolOutputFile.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-using namespace clang;
-
-namespace {
-
-class ASTUnitTest : public ::testing::Test {
-protected:
-  int FD;
-  llvm::SmallString<256> InputFileName;
-  std::unique_ptr<ToolOutputFile> input_file;
-  IntrusiveRefCntPtr<DiagnosticsEngine> Diags;
-  std::shared_ptr<CompilerInvocation> CInvok;
-  std::shared_ptr<PCHContainerOperations> PCHContainerOps;
-
-  std::unique_ptr<ASTUnit> createASTUnit(bool isVolatile) {
-    EXPECT_FALSE(llvm::sys::fs::createTemporaryFile("ast-unit", "cpp", FD,
-                                                    InputFileName));
-    input_file = std::make_unique<ToolOutputFile>(InputFileName, FD);
-    input_file->os() << "";
-
-    const char *Args[] = {"clang", "-xc++", InputFileName.c_str()};
-
-    Diags = CompilerInstance::createDiagnostics(new DiagnosticOptions());
-
-    CInvok = createInvocationFromCommandLine(Args, Diags);
-
-    if (!CInvok)
-      return nullptr;
-
-    FileManager *FileMgr =
-        new FileManager(FileSystemOptions(), vfs::getRealFileSystem());
-    PCHContainerOps = std::make_shared<PCHContainerOperations>();
-
-    return ASTUnit::LoadFromCompilerInvocation(
-        CInvok, PCHContainerOps, Diags, FileMgr, false, CaptureDiagsKind::None,
-        0, TU_Complete, false, false, isVolatile);
-  }
-};
-
-TEST_F(ASTUnitTest, SaveLoadPreservesLangOptionsInPrintingPolicy) {
-  // Check that the printing policy is restored with the correct language
-  // options when loading an ASTUnit from a file.  To this end, an ASTUnit
-  // for a C++ translation unit is set up and written to a temporary file.
-
-  // By default `UseVoidForZeroParams` is true for non-C++ language options,
-  // thus we can check this field after loading the ASTUnit to deduce whether
-  // the correct (C++) language options were used when setting up the printing
-  // policy.
-
-  {
-    PrintingPolicy PolicyWithDefaultLangOpt(LangOptions{});
-    EXPECT_TRUE(PolicyWithDefaultLangOpt.UseVoidForZeroParams);
-  }
-
-  std::unique_ptr<ASTUnit> AST = createASTUnit(false);
-
-  if (!AST)
-    FAIL() << "failed to create ASTUnit";
-
-  EXPECT_FALSE(AST->getASTContext().getPrintingPolicy().UseVoidForZeroParams);
-
-  llvm::SmallString<256> ASTFileName;
-  ASSERT_FALSE(
-      llvm::sys::fs::createTemporaryFile("ast-unit", "ast", FD, ASTFileName));
-  ToolOutputFile ast_file(ASTFileName, FD);
-  AST->Save(ASTFileName.str());
-
-  EXPECT_TRUE(llvm::sys::fs::exists(ASTFileName));
-
-  std::unique_ptr<ASTUnit> AU = ASTUnit::LoadFromASTFile(
-      std::string(ASTFileName.str()), PCHContainerOps->getRawReader(),
-      ASTUnit::LoadEverything, Diags, FileSystemOptions(),
-      /*UseDebugInfo=*/false);
-
-  if (!AU)
-    FAIL() << "failed to load ASTUnit";
-
-  EXPECT_FALSE(AU->getASTContext().getPrintingPolicy().UseVoidForZeroParams);
-}
-
-TEST_F(ASTUnitTest, GetBufferForFileMemoryMapping) {
-  std::unique_ptr<ASTUnit> AST = createASTUnit(true);
-
-  if (!AST)
-    FAIL() << "failed to create ASTUnit";
-
-  std::unique_ptr<llvm::MemoryBuffer> memoryBuffer =
-      AST->getBufferForFile(InputFileName);
-
-  EXPECT_NE(memoryBuffer->getBufferKind(),
-            llvm::MemoryBuffer::MemoryBuffer_MMap);
-}
-
-TEST_F(ASTUnitTest, ModuleTextualHeader) {
-  llvm::IntrusiveRefCntPtr<llvm::vfs::InMemoryFileSystem> InMemoryFs =
-      new llvm::vfs::InMemoryFileSystem();
-  InMemoryFs->addFile("test.cpp", 0, llvm::MemoryBuffer::getMemBuffer(R"cpp(
-      #include "Textual.h"
-      void foo() {}
-    )cpp"));
-  InMemoryFs->addFile("m.modulemap", 0, llvm::MemoryBuffer::getMemBuffer(R"cpp(
-      module M {
-        module Textual {
-          textual header "Textual.h"
-        }
-      }
-    )cpp"));
-  InMemoryFs->addFile("Textual.h", 0, llvm::MemoryBuffer::getMemBuffer(R"cpp(
-      void foo();
-    )cpp"));
-
-  const char *Args[] = {"clang", "test.cpp", "-fmodule-map-file=m.modulemap",
-                        "-fmodule-name=M"};
-  Diags = CompilerInstance::createDiagnostics(new DiagnosticOptions());
-  CInvok = createInvocationFromCommandLine(Args, Diags);
-  ASSERT_TRUE(CInvok);
-
-  FileManager *FileMgr = new FileManager(FileSystemOptions(), InMemoryFs);
-  PCHContainerOps = std::make_shared<PCHContainerOperations>();
-
-  auto AU = ASTUnit::LoadFromCompilerInvocation(
-      CInvok, PCHContainerOps, Diags, FileMgr, false, CaptureDiagsKind::None, 1,
-      TU_Complete, false, false, false);
-  ASSERT_TRUE(AU);
-  auto File = AU->getFileManager().getFileRef("Textual.h", false, false);
-  ASSERT_TRUE(bool(File));
-  // Verify that we do not crash here.
-  EXPECT_TRUE(AU->getPreprocessor().getHeaderSearchInfo().getExistingFileInfo(
-      &File->getFileEntry()));
-}
-
-TEST_F(ASTUnitTest, LoadFromCommandLineEarlyError) {
-  EXPECT_FALSE(
-      llvm::sys::fs::createTemporaryFile("ast-unit", "c", FD, InputFileName));
-  input_file = std::make_unique<ToolOutputFile>(InputFileName, FD);
-  input_file->os() << "";
-
-  const char *Args[] = {"clang", "-target", "foobar", InputFileName.c_str()};
-
-  auto Diags = CompilerInstance::createDiagnostics(new DiagnosticOptions());
-  auto PCHContainerOps = std::make_shared<PCHContainerOperations>();
-  std::unique_ptr<clang::ASTUnit> ErrUnit;
-
-  ASTUnit *AST = ASTUnit::LoadFromCommandLine(
-      &Args[0], &Args[4], PCHContainerOps, Diags, "", false,
-      CaptureDiagsKind::All, None, true, 0, TU_Complete, false, false, false,
-      SkipFunctionBodiesScope::None, false, true, false, false, None, &ErrUnit,
-      nullptr);
-
-  ASSERT_EQ(AST, nullptr);
-  ASSERT_NE(ErrUnit, nullptr);
-  ASSERT_TRUE(Diags->hasErrorOccurred());
-  ASSERT_NE(ErrUnit->stored_diag_size(), 0U);
-}
-
-} // anonymous namespace
diff --git a/gnu/llvm/clang/unittests/Frontend/CMakeLists.txt b/gnu/llvm/clang/unittests/Frontend/CMakeLists.txt
deleted file mode 100644
index 3c25b43e953..00000000000
--- a/gnu/llvm/clang/unittests/Frontend/CMakeLists.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  Support
-  )
-
-add_clang_unittest(FrontendTests
-  ASTUnitTest.cpp
-  CompilerInvocationTest.cpp
-  CompilerInstanceTest.cpp
-  FixedPointString.cpp
-  FrontendActionTest.cpp
-  CodeGenActionTest.cpp
-  ParsedSourceLocationTest.cpp
-  PCHPreambleTest.cpp
-  OutputStreamTest.cpp
-  TextDiagnosticTest.cpp
-  )
-clang_target_link_libraries(FrontendTests
-  PRIVATE
-  clangAST
-  clangBasic
-  clangFrontend
-  clangLex
-  clangSema
-  clangCodeGen
-  clangFrontendTool
-  clangSerialization
-  )
diff --git a/gnu/llvm/clang/unittests/Frontend/CodeGenActionTest.cpp b/gnu/llvm/clang/unittests/Frontend/CodeGenActionTest.cpp
deleted file mode 100644
index 455ec705f88..00000000000
--- a/gnu/llvm/clang/unittests/Frontend/CodeGenActionTest.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-//===- unittests/Frontend/CodeGenActionTest.cpp --- FrontendAction tests --===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// Unit tests for CodeGenAction.
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/CodeGen/CodeGenAction.h"
-#include "clang/Basic/LangStandard.h"
-#include "clang/CodeGen/BackendUtil.h"
-#include "clang/Frontend/CompilerInstance.h"
-#include "clang/Lex/PreprocessorOptions.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-using namespace clang;
-using namespace clang::frontend;
-
-namespace {
-
-
-class NullCodeGenAction : public CodeGenAction {
-public:
-  NullCodeGenAction(llvm::LLVMContext *_VMContext = nullptr)
-    : CodeGenAction(Backend_EmitMCNull, _VMContext) {}
-
-  // The action does not call methods of ATContext.
-  void ExecuteAction() override {
-    CompilerInstance &CI = getCompilerInstance();
-    if (!CI.hasPreprocessor())
-      return;
-    if (!CI.hasSema())
-      CI.createSema(getTranslationUnitKind(), nullptr);
-  }
-};
-
-
-TEST(CodeGenTest, TestNullCodeGen) {
-  auto Invocation = std::make_shared<CompilerInvocation>();
-  Invocation->getPreprocessorOpts().addRemappedFile(
-      "test.cc",
-      MemoryBuffer::getMemBuffer("").release());
-  Invocation->getFrontendOpts().Inputs.push_back(
-      FrontendInputFile("test.cc", Language::CXX));
-  Invocation->getFrontendOpts().ProgramAction = EmitLLVM;
-  Invocation->getTargetOpts().Triple = "i386-unknown-linux-gnu";
-  CompilerInstance Compiler;
-  Compiler.setInvocation(std::move(Invocation));
-  Compiler.createDiagnostics();
-  EXPECT_TRUE(Compiler.hasDiagnostics());
-
-  std::unique_ptr<FrontendAction> Act(new NullCodeGenAction);
-  bool Success = Compiler.ExecuteAction(*Act);
-  EXPECT_TRUE(Success);
-}
-
-}
diff --git a/gnu/llvm/clang/unittests/Frontend/CompilerInstanceTest.cpp b/gnu/llvm/clang/unittests/Frontend/CompilerInstanceTest.cpp
deleted file mode 100644
index 8e74d170d4f..00000000000
--- a/gnu/llvm/clang/unittests/Frontend/CompilerInstanceTest.cpp
+++ /dev/null
@@ -1,95 +0,0 @@
-//===- unittests/Frontend/CompilerInstanceTest.cpp - CI tests -------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/Frontend/CompilerInstance.h"
-#include "clang/Basic/FileManager.h"
-#include "clang/Frontend/CompilerInvocation.h"
-#include "clang/Frontend/TextDiagnosticPrinter.h"
-#include "llvm/Support/FileSystem.h"
-#include "llvm/Support/Format.h"
-#include "llvm/Support/ToolOutputFile.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-using namespace clang;
-
-namespace {
-
-TEST(CompilerInstance, DefaultVFSOverlayFromInvocation) {
-  // Create a temporary VFS overlay yaml file.
-  int FD;
-  SmallString<256> FileName;
-  ASSERT_FALSE(sys::fs::createTemporaryFile("vfs", "yaml", FD, FileName));
-  ToolOutputFile File(FileName, FD);
-
-  SmallString<256> CurrentPath;
-  sys::fs::current_path(CurrentPath);
-  sys::fs::make_absolute(CurrentPath, FileName);
-
-  // Mount the VFS file itself on the path 'virtual.file'. Makes this test
-  // a bit shorter than creating a new dummy file just for this purpose.
-  const std::string CurrentPathStr = std::string(CurrentPath.str());
-  const std::string FileNameStr = std::string(FileName.str());
-  const char *VFSYaml = "{ 'version': 0, 'roots': [\n"
-                        "  { 'name': '%s',\n"
-                        "    'type': 'directory',\n"
-                        "    'contents': [\n"
-                        "      { 'name': 'vfs-virtual.file', 'type': 'file',\n"
-                        "        'external-contents': '%s'\n"
-                        "      }\n"
-                        "    ]\n"
-                        "  }\n"
-                        "]}\n";
-  File.os() << format(VFSYaml, CurrentPathStr.c_str(), FileName.c_str());
-  File.os().flush();
-
-  // Create a CompilerInvocation that uses this overlay file.
-  const std::string VFSArg = "-ivfsoverlay" + FileNameStr;
-  const char *Args[] = {"clang", VFSArg.c_str(), "-xc++", "-"};
-
-  IntrusiveRefCntPtr<DiagnosticsEngine> Diags =
-      CompilerInstance::createDiagnostics(new DiagnosticOptions());
-
-  std::shared_ptr<CompilerInvocation> CInvok =
-      createInvocationFromCommandLine(Args, Diags);
-
-  if (!CInvok)
-    FAIL() << "could not create compiler invocation";
-  // Create a minimal CompilerInstance which should use the VFS we specified
-  // in the CompilerInvocation (as we don't explicitly set our own).
-  CompilerInstance Instance;
-  Instance.setDiagnostics(Diags.get());
-  Instance.setInvocation(CInvok);
-  Instance.createFileManager();
-
-  // Check if the virtual file exists which means that our VFS is used by the
-  // CompilerInstance.
-  ASSERT_TRUE(Instance.getFileManager().getFile("vfs-virtual.file"));
-}
-
-TEST(CompilerInstance, AllowDiagnosticLogWithUnownedDiagnosticConsumer) {
-  auto DiagOpts = new DiagnosticOptions();
-  // Tell the diagnostics engine to emit the diagnostic log to STDERR. This
-  // ensures that a chained diagnostic consumer is created so that the test can
-  // exercise the unowned diagnostic consumer in a chained consumer.
-  DiagOpts->DiagnosticLogFile = "-";
-
-  // Create the diagnostic engine with unowned consumer.
-  std::string DiagnosticOutput;
-  llvm::raw_string_ostream DiagnosticsOS(DiagnosticOutput);
-  auto DiagPrinter = std::make_unique<TextDiagnosticPrinter>(
-      DiagnosticsOS, new DiagnosticOptions());
-  CompilerInstance Instance;
-  IntrusiveRefCntPtr<DiagnosticsEngine> Diags = Instance.createDiagnostics(
-      DiagOpts, DiagPrinter.get(), /*ShouldOwnClient=*/false);
-
-  Diags->Report(diag::err_expected) << "no crash";
-  ASSERT_EQ(DiagnosticsOS.str(), "error: expected no crash\n");
-}
-
-} // anonymous namespace
diff --git a/gnu/llvm/clang/unittests/Frontend/CompilerInvocationTest.cpp b/gnu/llvm/clang/unittests/Frontend/CompilerInvocationTest.cpp
deleted file mode 100644
index 9bcbf1fe600..00000000000
--- a/gnu/llvm/clang/unittests/Frontend/CompilerInvocationTest.cpp
+++ /dev/null
@@ -1,998 +0,0 @@
-//===- unittests/Frontend/CompilerInvocationTest.cpp - CI tests //---------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/Frontend/CompilerInvocation.h"
-#include "clang/Basic/TargetOptions.h"
-#include "clang/Frontend/CompilerInstance.h"
-#include "clang/Frontend/TextDiagnosticBuffer.h"
-#include "clang/Lex/PreprocessorOptions.h"
-#include "clang/Serialization/ModuleFileExtension.h"
-#include "llvm/Support/Host.h"
-
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-using namespace clang;
-
-using ::testing::Contains;
-using ::testing::HasSubstr;
-using ::testing::StrEq;
-
-namespace {
-class CommandLineTest : public ::testing::Test {
-public:
-  IntrusiveRefCntPtr<DiagnosticsEngine> Diags;
-  SmallVector<const char *, 32> GeneratedArgs;
-  SmallVector<std::string, 32> GeneratedArgsStorage;
-  CompilerInvocation Invocation;
-
-  const char *operator()(const Twine &Arg) {
-    return GeneratedArgsStorage.emplace_back(Arg.str()).c_str();
-  }
-
-  CommandLineTest()
-      : Diags(CompilerInstance::createDiagnostics(new DiagnosticOptions(),
-                                                  new TextDiagnosticBuffer())) {
-  }
-};
-
-template <typename M>
-std::string describeContainsN(M InnerMatcher, unsigned N, bool Negation) {
-  StringRef Contains = Negation ? "doesn't contain" : "contains";
-  StringRef Instance = N == 1 ? " instance " : " instances ";
-  StringRef Element = "of element that ";
-
-  std::ostringstream Inner;
-  InnerMatcher.impl().DescribeTo(&Inner);
-
-  return (Contains + " exactly " + Twine(N) + Instance + Element + Inner.str())
-      .str();
-}
-
-MATCHER_P2(ContainsN, InnerMatcher, N,
-           describeContainsN(InnerMatcher, N, negation)) {
-  auto InnerMatches = [this](const auto &Element) {
-    ::testing::internal::DummyMatchResultListener InnerListener;
-    return InnerMatcher.impl().MatchAndExplain(Element, &InnerListener);
-  };
-
-  return count_if(arg, InnerMatches) == N;
-}
-
-TEST(ContainsN, Empty) {
-  const char *Array[] = {""};
-
-  ASSERT_THAT(Array, ContainsN(StrEq("x"), 0));
-  ASSERT_THAT(Array, Not(ContainsN(StrEq("x"), 1)));
-  ASSERT_THAT(Array, Not(ContainsN(StrEq("x"), 2)));
-}
-
-TEST(ContainsN, Zero) {
-  const char *Array[] = {"y"};
-
-  ASSERT_THAT(Array, ContainsN(StrEq("x"), 0));
-  ASSERT_THAT(Array, Not(ContainsN(StrEq("x"), 1)));
-  ASSERT_THAT(Array, Not(ContainsN(StrEq("x"), 2)));
-}
-
-TEST(ContainsN, One) {
-  const char *Array[] = {"a", "b", "x", "z"};
-
-  ASSERT_THAT(Array, Not(ContainsN(StrEq("x"), 0)));
-  ASSERT_THAT(Array, ContainsN(StrEq("x"), 1));
-  ASSERT_THAT(Array, Not(ContainsN(StrEq("x"), 2)));
-}
-
-TEST(ContainsN, Two) {
-  const char *Array[] = {"x", "a", "b", "x"};
-
-  ASSERT_THAT(Array, Not(ContainsN(StrEq("x"), 0)));
-  ASSERT_THAT(Array, Not(ContainsN(StrEq("x"), 1)));
-  ASSERT_THAT(Array, ContainsN(StrEq("x"), 2));
-}
-
-// Copy constructor/assignment perform deep copy of reference-counted pointers.
-
-TEST(CompilerInvocationTest, DeepCopyConstructor) {
-  CompilerInvocation A;
-  A.getAnalyzerOpts()->Config["Key"] = "Old";
-
-  CompilerInvocation B(A);
-  B.getAnalyzerOpts()->Config["Key"] = "New";
-
-  ASSERT_EQ(A.getAnalyzerOpts()->Config["Key"], "Old");
-}
-
-TEST(CompilerInvocationTest, DeepCopyAssignment) {
-  CompilerInvocation A;
-  A.getAnalyzerOpts()->Config["Key"] = "Old";
-
-  CompilerInvocation B;
-  B = A;
-  B.getAnalyzerOpts()->Config["Key"] = "New";
-
-  ASSERT_EQ(A.getAnalyzerOpts()->Config["Key"], "Old");
-}
-
-// Boolean option with a keypath that defaults to true.
-// The only flag with a negative spelling can set the keypath to false.
-
-TEST_F(CommandLineTest, BoolOptionDefaultTrueSingleFlagNotPresent) {
-  const char *Args[] = {""};
-
-  ASSERT_TRUE(CompilerInvocation::CreateFromArgs(Invocation, Args, *Diags));
-  ASSERT_TRUE(Invocation.getFrontendOpts().UseTemporary);
-
-  Invocation.generateCC1CommandLine(GeneratedArgs, *this);
-
-  ASSERT_THAT(GeneratedArgs, Not(Contains(StrEq("-fno-temp-file"))));
-}
-
-TEST_F(CommandLineTest, BoolOptionDefaultTrueSingleFlagPresent) {
-  const char *Args[] = {"-fno-temp-file"};
-
-  ASSERT_TRUE(CompilerInvocation::CreateFromArgs(Invocation, Args, *Diags));
-  ASSERT_FALSE(Invocation.getFrontendOpts().UseTemporary);
-
-  Invocation.generateCC1CommandLine(GeneratedArgs, *this);
-
-  ASSERT_THAT(GeneratedArgs, Contains(StrEq("-fno-temp-file")));
-}
-
-TEST_F(CommandLineTest, BoolOptionDefaultTrueSingleFlagUnknownPresent) {
-  const char *Args[] = {"-ftemp-file"};
-
-  // Driver-only flag.
-  ASSERT_FALSE(CompilerInvocation::CreateFromArgs(Invocation, Args, *Diags));
-  ASSERT_TRUE(Invocation.getFrontendOpts().UseTemporary);
-}
-
-// Boolean option with a keypath that defaults to true.
-// The flag with negative spelling can set the keypath to false.
-// The flag with positive spelling can reset the keypath to true.
-
-TEST_F(CommandLineTest, BoolOptionDefaultTruePresentNone) {
-  const char *Args[] = {""};
-
-  ASSERT_TRUE(CompilerInvocation::CreateFromArgs(Invocation, Args, *Diags));
-  ASSERT_TRUE(Invocation.getCodeGenOpts().Autolink);
-
-  Invocation.generateCC1CommandLine(GeneratedArgs, *this);
-  ASSERT_THAT(GeneratedArgs, Not(Contains(StrEq("-fautolink"))));
-  ASSERT_THAT(GeneratedArgs, Not(Contains(StrEq("-fno-autolink"))));
-}
-
-TEST_F(CommandLineTest, BoolOptionDefaultTruePresentNegChange) {
-  const char *Args[] = {"-fno-autolink"};
-
-  ASSERT_TRUE(CompilerInvocation::CreateFromArgs(Invocation, Args, *Diags));
-  ASSERT_FALSE(Invocation.getCodeGenOpts().Autolink);
-
-  Invocation.generateCC1CommandLine(GeneratedArgs, *this);
-  ASSERT_THAT(GeneratedArgs, Contains(StrEq("-fno-autolink")));
-  ASSERT_THAT(GeneratedArgs, Not(Contains(StrEq("-fautolink"))));
-}
-
-TEST_F(CommandLineTest, BoolOptionDefaultTruePresentPosReset) {
-  const char *Args[] = {"-fautolink"};
-
-  // Driver-only flag.
-  ASSERT_FALSE(CompilerInvocation::CreateFromArgs(Invocation, Args, *Diags));
-  ASSERT_TRUE(Invocation.getCodeGenOpts().Autolink);
-}
-
-// Boolean option with a keypath that defaults to false.
-// The flag with negative spelling can set the keypath to true.
-// The flag with positive spelling can reset the keypath to false.
-
-TEST_F(CommandLineTest, BoolOptionDefaultFalsePresentNone) {
-  const char *Args[] = {""};
-
-  ASSERT_TRUE(CompilerInvocation::CreateFromArgs(Invocation, Args, *Diags));
-  ASSERT_FALSE(Invocation.getCodeGenOpts().NoInlineLineTables);
-
-  Invocation.generateCC1CommandLine(GeneratedArgs, *this);
-  ASSERT_THAT(GeneratedArgs, Not(Contains(StrEq("-ginline-line-tables"))));
-  ASSERT_THAT(GeneratedArgs, Not(Contains(StrEq("-gno-inline-line-tables"))));
-}
-
-TEST_F(CommandLineTest, BoolOptionDefaultFalsePresentNegChange) {
-  const char *Args[] = {"-gno-inline-line-tables"};
-
-  ASSERT_TRUE(CompilerInvocation::CreateFromArgs(Invocation, Args, *Diags));
-  ASSERT_TRUE(Invocation.getCodeGenOpts().NoInlineLineTables);
-
-  Invocation.generateCC1CommandLine(GeneratedArgs, *this);
-  ASSERT_THAT(GeneratedArgs, Contains(StrEq("-gno-inline-line-tables")));
-  ASSERT_THAT(GeneratedArgs, Not(Contains(StrEq("-ginline-line-tables"))));
-}
-
-TEST_F(CommandLineTest, BoolOptionDefaultFalsePresentPosReset) {
-  const char *Args[] = {"-ginline-line-tables"};
-
-  // Driver-only flag.
-  ASSERT_FALSE(CompilerInvocation::CreateFromArgs(Invocation, Args, *Diags));
-  ASSERT_FALSE(Invocation.getCodeGenOpts().NoInlineLineTables);
-}
-
-// Boolean option with a keypath that defaults to false.
-// The flag with positive spelling can set the keypath to true.
-// The flag with negative spelling can reset the keypath to false.
-
-TEST_F(CommandLineTest, BoolOptionDefaultFalsePresentNoneX) {
-  const char *Args[] = {""};
-
-  ASSERT_TRUE(CompilerInvocation::CreateFromArgs(Invocation, Args, *Diags));
-  ASSERT_FALSE(Invocation.getCodeGenOpts().CodeViewGHash);
-
-  Invocation.generateCC1CommandLine(GeneratedArgs, *this);
-  ASSERT_THAT(GeneratedArgs, Not(Contains(StrEq("-gcodeview-ghash"))));
-  ASSERT_THAT(GeneratedArgs, Not(Contains(StrEq("-gno-codeview-ghash"))));
-}
-
-TEST_F(CommandLineTest, BoolOptionDefaultFalsePresentPosChange) {
-  const char *Args[] = {"-gcodeview-ghash"};
-
-  ASSERT_TRUE(CompilerInvocation::CreateFromArgs(Invocation, Args, *Diags));
-  ASSERT_TRUE(Invocation.getCodeGenOpts().CodeViewGHash);
-
-  Invocation.generateCC1CommandLine(GeneratedArgs, *this);
-  ASSERT_THAT(GeneratedArgs, Contains(StrEq("-gcodeview-ghash")));
-  ASSERT_THAT(GeneratedArgs, Not(Contains(StrEq("-gno-codeview-ghash"))));
-}
-
-TEST_F(CommandLineTest, BoolOptionDefaultFalsePresentNegReset) {
-  const char *Args[] = {"-gno-codeview-ghash"};
-
-  // Driver-only flag.
-  ASSERT_FALSE(CompilerInvocation::CreateFromArgs(Invocation, Args, *Diags));
-  ASSERT_FALSE(Invocation.getCodeGenOpts().CodeViewGHash);
-}
-
-// Boolean option with a keypath that defaults to an arbitrary expression.
-// The flag with positive spelling can set the keypath to true.
-// The flag with negative spelling can set the keypath to false.
-
-static constexpr unsigned PassManagerDefault =
-    !static_cast<unsigned>(LLVM_ENABLE_NEW_PASS_MANAGER);
-
-static constexpr const char *PassManagerResetByFlag =
-    LLVM_ENABLE_NEW_PASS_MANAGER ? "-fno-legacy-pass-manager"
-                                 : "-flegacy-pass-manager";
-
-static constexpr const char *PassManagerChangedByFlag =
-    LLVM_ENABLE_NEW_PASS_MANAGER ? "-flegacy-pass-manager"
-                                 : "-fno-legacy-pass-manager";
-
-TEST_F(CommandLineTest, BoolOptionDefaultArbitraryTwoFlagsPresentNone) {
-  const char *Args = {""};
-
-  ASSERT_TRUE(CompilerInvocation::CreateFromArgs(Invocation, Args, *Diags));
-  ASSERT_EQ(Invocation.getCodeGenOpts().LegacyPassManager, PassManagerDefault);
-
-  Invocation.generateCC1CommandLine(GeneratedArgs, *this);
-
-  ASSERT_THAT(GeneratedArgs, Not(Contains(StrEq(PassManagerResetByFlag))));
-  ASSERT_THAT(GeneratedArgs, Not(Contains(StrEq(PassManagerChangedByFlag))));
-}
-
-TEST_F(CommandLineTest, BoolOptionDefaultArbitraryTwoFlagsPresentChange) {
-  const char *Args[] = {PassManagerChangedByFlag};
-
-  ASSERT_TRUE(CompilerInvocation::CreateFromArgs(Invocation, Args, *Diags));
-  ASSERT_EQ(Invocation.getCodeGenOpts().LegacyPassManager, !PassManagerDefault);
-
-  Invocation.generateCC1CommandLine(GeneratedArgs, *this);
-  ASSERT_THAT(GeneratedArgs, Contains(StrEq(PassManagerChangedByFlag)));
-  ASSERT_THAT(GeneratedArgs, Not(Contains(StrEq(PassManagerResetByFlag))));
-}
-
-TEST_F(CommandLineTest, BoolOptionDefaultArbitraryTwoFlagsPresentReset) {
-  const char *Args[] = {PassManagerResetByFlag};
-
-  ASSERT_TRUE(CompilerInvocation::CreateFromArgs(Invocation, Args, *Diags));
-  ASSERT_EQ(Invocation.getCodeGenOpts().LegacyPassManager, PassManagerDefault);
-
-  Invocation.generateCC1CommandLine(GeneratedArgs, *this);
-  ASSERT_THAT(GeneratedArgs, Not(Contains(StrEq(PassManagerResetByFlag))));
-  ASSERT_THAT(GeneratedArgs, Not(Contains(StrEq(PassManagerChangedByFlag))));
-}
-
-// Boolean option that gets the CC1Option flag from a let statement (which
-// is applied **after** the record is defined):
-//
-//   let Flags = [CC1Option] in {
-//     defm option : BoolOption<...>;
-//   }
-
-TEST_F(CommandLineTest, BoolOptionCC1ViaLetPresentNone) {
-  const char *Args[] = {""};
-
-  ASSERT_TRUE(CompilerInvocation::CreateFromArgs(Invocation, Args, *Diags));
-  ASSERT_FALSE(Invocation.getCodeGenOpts().DebugPassManager);
-
-  Invocation.generateCC1CommandLine(GeneratedArgs, *this);
-
-  ASSERT_THAT(GeneratedArgs, Not(Contains(StrEq("-fdebug-pass-manager"))));
-  ASSERT_THAT(GeneratedArgs, Not(Contains(StrEq("-fno-debug-pass-manager"))));
-}
-
-TEST_F(CommandLineTest, BoolOptionCC1ViaLetPresentPos) {
-  const char *Args[] = {"-fdebug-pass-manager"};
-
-  ASSERT_TRUE(CompilerInvocation::CreateFromArgs(Invocation, Args, *Diags));
-  ASSERT_TRUE(Invocation.getCodeGenOpts().DebugPassManager);
-
-  Invocation.generateCC1CommandLine(GeneratedArgs, *this);
-
-  ASSERT_THAT(GeneratedArgs, ContainsN(StrEq("-fdebug-pass-manager"), 1));
-  ASSERT_THAT(GeneratedArgs, Not(Contains(StrEq("-fno-debug-pass-manager"))));
-}
-
-TEST_F(CommandLineTest, BoolOptionCC1ViaLetPresentNeg) {
-  const char *Args[] = {"-fno-debug-pass-manager"};
-
-  ASSERT_TRUE(CompilerInvocation::CreateFromArgs(Invocation, Args, *Diags));
-  ASSERT_FALSE(Invocation.getCodeGenOpts().DebugPassManager);
-
-  Invocation.generateCC1CommandLine(GeneratedArgs, *this);
-
-  ASSERT_THAT(GeneratedArgs, Not(Contains(StrEq("-fno-debug-pass-manager"))));
-  ASSERT_THAT(GeneratedArgs, Not(Contains(StrEq("-fdebug-pass-manager"))));
-}
-
-TEST_F(CommandLineTest, CanGenerateCC1CommandLineFlag) {
-  const char *Args[] = {"-fmodules-strict-context-hash"};
-
-  ASSERT_TRUE(CompilerInvocation::CreateFromArgs(Invocation, Args, *Diags));
-
-  Invocation.generateCC1CommandLine(GeneratedArgs, *this);
-
-  ASSERT_THAT(GeneratedArgs, Contains(StrEq("-fmodules-strict-context-hash")));
-}
-
-TEST_F(CommandLineTest, CanGenerateCC1CommandLineSeparate) {
-  const char *TripleCStr = "i686-apple-darwin9";
-  const char *Args[] = {"-triple", TripleCStr};
-
-  ASSERT_TRUE(CompilerInvocation::CreateFromArgs(Invocation, Args, *Diags));
-
-  Invocation.generateCC1CommandLine(GeneratedArgs, *this);
-
-  ASSERT_THAT(GeneratedArgs, Contains(StrEq(TripleCStr)));
-}
-
-TEST_F(CommandLineTest,  CanGenerateCC1CommandLineSeparateRequiredPresent) {
-  const std::string DefaultTriple =
-      llvm::Triple::normalize(llvm::sys::getDefaultTargetTriple());
-  const char *Args[] = {"-triple", DefaultTriple.c_str()};
-
-  ASSERT_TRUE(CompilerInvocation::CreateFromArgs(Invocation, Args, *Diags));
-
-  Invocation.generateCC1CommandLine(GeneratedArgs, *this);
-
-  // Triple should always be emitted even if it is the default
-  ASSERT_THAT(GeneratedArgs, Contains(StrEq(DefaultTriple.c_str())));
-}
-
-TEST_F(CommandLineTest, CanGenerateCC1CommandLineSeparateRequiredAbsent) {
-  const std::string DefaultTriple =
-      llvm::Triple::normalize(llvm::sys::getDefaultTargetTriple());
-  const char *Args[] = {""};
-
-  ASSERT_TRUE(CompilerInvocation::CreateFromArgs(Invocation, Args, *Diags));
-
-  Invocation.generateCC1CommandLine(GeneratedArgs, *this);
-
-  // Triple should always be emitted even if it is the default
-  ASSERT_THAT(GeneratedArgs, Contains(StrEq(DefaultTriple.c_str())));
-}
-
-TEST_F(CommandLineTest, SeparateEnumNonDefault) {
-  const char *Args[] = {"-mrelocation-model", "static"};
-
-  ASSERT_TRUE(CompilerInvocation::CreateFromArgs(Invocation, Args, *Diags));
-  ASSERT_EQ(Invocation.getCodeGenOpts().RelocationModel, Reloc::Model::Static);
-
-  Invocation.generateCC1CommandLine(GeneratedArgs, *this);
-
-  // Non default relocation model.
-  ASSERT_THAT(GeneratedArgs, Contains(StrEq("-mrelocation-model")));
-  ASSERT_THAT(GeneratedArgs, Contains(StrEq("static")));
-  ASSERT_THAT(GeneratedArgs, Not(Contains(StrEq("-mrelocation-model=static"))));
-}
-
-TEST_F(CommandLineTest, SeparateEnumDefault) {
-  const char *Args[] = {"-mrelocation-model", "pic"};
-
-  ASSERT_TRUE(CompilerInvocation::CreateFromArgs(Invocation, Args, *Diags));
-  ASSERT_EQ(Invocation.getCodeGenOpts().RelocationModel, Reloc::Model::PIC_);
-
-  Invocation.generateCC1CommandLine(GeneratedArgs, *this);
-
-  // Default relocation model.
-  ASSERT_THAT(GeneratedArgs, Not(Contains(StrEq("-mrelocation-model"))));
-  ASSERT_THAT(GeneratedArgs, Not(Contains(StrEq("pic"))));
-  ASSERT_THAT(GeneratedArgs, Not(Contains(StrEq("-mrelocation-model=pic"))));
-}
-
-TEST_F(CommandLineTest, JoinedEnumNonDefault) {
-  const char *Args[] = {"-fobjc-dispatch-method=non-legacy"};
-
-  ASSERT_TRUE(CompilerInvocation::CreateFromArgs(Invocation, Args, *Diags));
-  ASSERT_EQ(Invocation.getCodeGenOpts().getObjCDispatchMethod(),
-            CodeGenOptions::NonLegacy);
-
-  Invocation.generateCC1CommandLine(GeneratedArgs, *this);
-
-  ASSERT_THAT(GeneratedArgs,
-              Contains(StrEq("-fobjc-dispatch-method=non-legacy")));
-  ASSERT_THAT(GeneratedArgs, Not(Contains(StrEq("-fobjc-dispatch-method="))));
-  ASSERT_THAT(GeneratedArgs, Not(Contains(StrEq("non-legacy"))));
-}
-
-TEST_F(CommandLineTest, JoinedEnumDefault) {
-  const char *Args[] = {"-fobjc-dispatch-method=legacy"};
-
-  ASSERT_TRUE(CompilerInvocation::CreateFromArgs(Invocation, Args, *Diags));
-  ASSERT_EQ(Invocation.getCodeGenOpts().getObjCDispatchMethod(),
-            CodeGenOptions::Legacy);
-
-  Invocation.generateCC1CommandLine(GeneratedArgs, *this);
-
-  ASSERT_THAT(GeneratedArgs,
-              Not(Contains(StrEq("-fobjc-dispatch-method=legacy"))));
-  ASSERT_THAT(GeneratedArgs, Not(Contains(StrEq("-fobjc-dispatch-method="))));
-  ASSERT_THAT(GeneratedArgs, Not(Contains(StrEq("legacy"))));
-}
-
-TEST_F(CommandLineTest, StringVectorEmpty) {
-  const char *Args[] = {""};
-
-  ASSERT_TRUE(CompilerInvocation::CreateFromArgs(Invocation, Args, *Diags));
-  ASSERT_TRUE(Invocation.getFrontendOpts().ModuleMapFiles.empty());
-
-  Invocation.generateCC1CommandLine(GeneratedArgs, *this);
-
-  ASSERT_THAT(GeneratedArgs, Not(Contains(HasSubstr("-fmodule-map-file"))));
-}
-
-TEST_F(CommandLineTest, StringVectorSingle) {
-  const char *Args[] = {"-fmodule-map-file=a"};
-
-  ASSERT_TRUE(CompilerInvocation::CreateFromArgs(Invocation, Args, *Diags));
-  ASSERT_EQ(Invocation.getFrontendOpts().ModuleMapFiles,
-            std::vector<std::string>({"a"}));
-
-  Invocation.generateCC1CommandLine(GeneratedArgs, *this);
-
-  ASSERT_THAT(GeneratedArgs, ContainsN(StrEq("-fmodule-map-file=a"), 1));
-  ASSERT_THAT(GeneratedArgs, ContainsN(HasSubstr("-fmodule-map-file"), 1));
-}
-
-TEST_F(CommandLineTest, StringVectorMultiple) {
-  const char *Args[] = {"-fmodule-map-file=a", "-fmodule-map-file=b"};
-
-  ASSERT_TRUE(CompilerInvocation::CreateFromArgs(Invocation, Args, *Diags));
-  ASSERT_TRUE(Invocation.getFrontendOpts().ModuleMapFiles ==
-              std::vector<std::string>({"a", "b"}));
-
-  Invocation.generateCC1CommandLine(GeneratedArgs, *this);
-
-  ASSERT_THAT(GeneratedArgs, ContainsN(StrEq("-fmodule-map-file=a"), 1));
-  ASSERT_THAT(GeneratedArgs, ContainsN(StrEq("-fmodule-map-file=b"), 1));
-  ASSERT_THAT(GeneratedArgs, ContainsN(HasSubstr("-fmodule-map-file"), 2));
-}
-
-// CommaJoined option with MarshallingInfoStringVector.
-
-TEST_F(CommandLineTest, StringVectorCommaJoinedNone) {
-  const char *Args[] = {""};
-
-  ASSERT_TRUE(CompilerInvocation::CreateFromArgs(Invocation, Args, *Diags));
-  ASSERT_TRUE(Invocation.getLangOpts()->CommentOpts.BlockCommandNames.empty());
-
-  Invocation.generateCC1CommandLine(GeneratedArgs, *this);
-
-  ASSERT_THAT(GeneratedArgs,
-              Not(Contains(HasSubstr("-fcomment-block-commands"))));
-}
-
-TEST_F(CommandLineTest, StringVectorCommaJoinedSingle) {
-  const char *Args[] = {"-fcomment-block-commands=x,y"};
-
-  ASSERT_TRUE(CompilerInvocation::CreateFromArgs(Invocation, Args, *Diags));
-  ASSERT_EQ(Invocation.getLangOpts()->CommentOpts.BlockCommandNames,
-            std::vector<std::string>({"x", "y"}));
-
-  Invocation.generateCC1CommandLine(GeneratedArgs, *this);
-
-  ASSERT_THAT(GeneratedArgs,
-              ContainsN(StrEq("-fcomment-block-commands=x,y"), 1));
-}
-
-TEST_F(CommandLineTest, StringVectorCommaJoinedMultiple) {
-  const char *Args[] = {"-fcomment-block-commands=x,y",
-                        "-fcomment-block-commands=a,b"};
-
-  ASSERT_TRUE(CompilerInvocation::CreateFromArgs(Invocation, Args, *Diags));
-  ASSERT_EQ(Invocation.getLangOpts()->CommentOpts.BlockCommandNames,
-            std::vector<std::string>({"x", "y", "a", "b"}));
-
-  Invocation.generateCC1CommandLine(GeneratedArgs, *this);
-
-  ASSERT_THAT(GeneratedArgs,
-              ContainsN(StrEq("-fcomment-block-commands=x,y,a,b"), 1));
-}
-
-// A flag that should be parsed only if a condition is met.
-
-TEST_F(CommandLineTest, ConditionalParsingIfFalseFlagNotPresent) {
-  const char *Args[] = {""};
-
-  CompilerInvocation::CreateFromArgs(Invocation, Args, *Diags);
-
-  ASSERT_FALSE(Diags->hasErrorOccurred());
-  ASSERT_FALSE(Invocation.getLangOpts()->SYCLIsDevice);
-  ASSERT_FALSE(Invocation.getLangOpts()->SYCLIsHost);
-  ASSERT_EQ(Invocation.getLangOpts()->getSYCLVersion(), LangOptions::SYCL_None);
-
-  Invocation.generateCC1CommandLine(GeneratedArgs, *this);
-
-  ASSERT_THAT(GeneratedArgs, Not(Contains(StrEq("-fsycl"))));
-  ASSERT_THAT(GeneratedArgs, Not(Contains(HasSubstr("-sycl-std="))));
-}
-
-TEST_F(CommandLineTest, ConditionalParsingIfFalseFlagPresent) {
-  const char *Args[] = {"-sycl-std=2017"};
-
-  CompilerInvocation::CreateFromArgs(Invocation, Args, *Diags);
-
-  ASSERT_FALSE(Diags->hasErrorOccurred());
-  ASSERT_FALSE(Invocation.getLangOpts()->SYCLIsDevice);
-  ASSERT_FALSE(Invocation.getLangOpts()->SYCLIsHost);
-  ASSERT_EQ(Invocation.getLangOpts()->getSYCLVersion(), LangOptions::SYCL_None);
-
-  Invocation.generateCC1CommandLine(GeneratedArgs, *this);
-
-  ASSERT_THAT(GeneratedArgs, Not(Contains(StrEq("-fsycl-is-device"))));
-  ASSERT_THAT(GeneratedArgs, Not(Contains(StrEq("-fsycl-is-host"))));
-  ASSERT_THAT(GeneratedArgs, Not(Contains(HasSubstr("-sycl-std="))));
-}
-
-TEST_F(CommandLineTest, ConditionalParsingIfNonsenseSyclStdArg) {
-  const char *Args[] = {"-fsycl-is-device", "-sycl-std=garbage"};
-
-  CompilerInvocation::CreateFromArgs(Invocation, Args, *Diags);
-
-  ASSERT_TRUE(Diags->hasErrorOccurred());
-  ASSERT_TRUE(Invocation.getLangOpts()->SYCLIsDevice);
-  ASSERT_FALSE(Invocation.getLangOpts()->SYCLIsHost);
-  ASSERT_EQ(Invocation.getLangOpts()->getSYCLVersion(), LangOptions::SYCL_None);
-
-  Invocation.generateCC1CommandLine(GeneratedArgs, *this);
-
-  ASSERT_THAT(GeneratedArgs, Contains(StrEq("-fsycl-is-device")));
-  ASSERT_THAT(GeneratedArgs, Not(Contains(StrEq("-fsycl-is-host"))));
-  ASSERT_THAT(GeneratedArgs, Not(Contains(HasSubstr("-sycl-std="))));
-}
-
-TEST_F(CommandLineTest, ConditionalParsingIfOddSyclStdArg1) {
-  const char *Args[] = {"-fsycl-is-device", "-sycl-std=121"};
-
-  CompilerInvocation::CreateFromArgs(Invocation, Args, *Diags);
-
-  ASSERT_FALSE(Diags->hasErrorOccurred());
-  ASSERT_TRUE(Invocation.getLangOpts()->SYCLIsDevice);
-  ASSERT_FALSE(Invocation.getLangOpts()->SYCLIsHost);
-  ASSERT_EQ(Invocation.getLangOpts()->getSYCLVersion(), LangOptions::SYCL_2017);
-
-  Invocation.generateCC1CommandLine(GeneratedArgs, *this);
-
-  ASSERT_THAT(GeneratedArgs, Contains(StrEq("-fsycl-is-device")));
-  ASSERT_THAT(GeneratedArgs, Not(Contains(StrEq("-fsycl-is-host"))));
-  ASSERT_THAT(GeneratedArgs, Contains(HasSubstr("-sycl-std=2017")));
-}
-
-TEST_F(CommandLineTest, ConditionalParsingIfOddSyclStdArg2) {
-  const char *Args[] = {"-fsycl-is-device", "-sycl-std=1.2.1"};
-
-  CompilerInvocation::CreateFromArgs(Invocation, Args, *Diags);
-
-  ASSERT_FALSE(Diags->hasErrorOccurred());
-  ASSERT_TRUE(Invocation.getLangOpts()->SYCLIsDevice);
-  ASSERT_FALSE(Invocation.getLangOpts()->SYCLIsHost);
-  ASSERT_EQ(Invocation.getLangOpts()->getSYCLVersion(), LangOptions::SYCL_2017);
-
-  Invocation.generateCC1CommandLine(GeneratedArgs, *this);
-
-  ASSERT_THAT(GeneratedArgs, Contains(StrEq("-fsycl-is-device")));
-  ASSERT_THAT(GeneratedArgs, Not(Contains(StrEq("-fsycl-is-host"))));
-  ASSERT_THAT(GeneratedArgs, Contains(HasSubstr("-sycl-std=2017")));
-}
-
-TEST_F(CommandLineTest, ConditionalParsingIfOddSyclStdArg3) {
-  const char *Args[] = {"-fsycl-is-device", "-sycl-std=sycl-1.2.1"};
-
-  CompilerInvocation::CreateFromArgs(Invocation, Args, *Diags);
-
-  ASSERT_FALSE(Diags->hasErrorOccurred());
-  ASSERT_TRUE(Invocation.getLangOpts()->SYCLIsDevice);
-  ASSERT_FALSE(Invocation.getLangOpts()->SYCLIsHost);
-  ASSERT_EQ(Invocation.getLangOpts()->getSYCLVersion(), LangOptions::SYCL_2017);
-
-  Invocation.generateCC1CommandLine(GeneratedArgs, *this);
-
-  ASSERT_THAT(GeneratedArgs, Contains(StrEq("-fsycl-is-device")));
-  ASSERT_THAT(GeneratedArgs, Not(Contains(StrEq("-fsycl-is-host"))));
-  ASSERT_THAT(GeneratedArgs, Contains(HasSubstr("-sycl-std=2017")));
-}
-
-TEST_F(CommandLineTest, ConditionalParsingIfTrueFlagNotPresentHost) {
-  const char *Args[] = {"-fsycl-is-host"};
-
-  CompilerInvocation::CreateFromArgs(Invocation, Args, *Diags);
-
-  ASSERT_FALSE(Diags->hasErrorOccurred());
-  ASSERT_EQ(Invocation.getLangOpts()->getSYCLVersion(),
-            LangOptions::SYCL_Default);
-
-  Invocation.generateCC1CommandLine(GeneratedArgs, *this);
-
-  ASSERT_THAT(GeneratedArgs, Contains(StrEq("-fsycl-is-host")));
-  ASSERT_THAT(GeneratedArgs, Contains(HasSubstr("-sycl-std=")));
-}
-
-TEST_F(CommandLineTest, ConditionalParsingIfTrueFlagNotPresentDevice) {
-  const char *Args[] = {"-fsycl-is-device"};
-
-  CompilerInvocation::CreateFromArgs(Invocation, Args, *Diags);
-
-  ASSERT_FALSE(Diags->hasErrorOccurred());
-  ASSERT_EQ(Invocation.getLangOpts()->getSYCLVersion(),
-            LangOptions::SYCL_Default);
-
-  Invocation.generateCC1CommandLine(GeneratedArgs, *this);
-
-  ASSERT_THAT(GeneratedArgs, Contains(StrEq("-fsycl-is-device")));
-  ASSERT_THAT(GeneratedArgs, Contains(HasSubstr("-sycl-std=")));
-}
-
-TEST_F(CommandLineTest, ConditionalParsingIfTrueFlagPresent) {
-  const char *Args[] = {"-fsycl-is-device", "-sycl-std=2017"};
-
-  CompilerInvocation::CreateFromArgs(Invocation, Args, *Diags);
-
-  ASSERT_FALSE(Diags->hasErrorOccurred());
-  ASSERT_EQ(Invocation.getLangOpts()->getSYCLVersion(), LangOptions::SYCL_2017);
-
-  Invocation.generateCC1CommandLine(GeneratedArgs, *this);
-
-  ASSERT_THAT(GeneratedArgs, Contains(StrEq("-fsycl-is-device")));
-  ASSERT_THAT(GeneratedArgs, Contains(StrEq("-sycl-std=2017")));
-}
-
-// Wide integer option.
-
-TEST_F(CommandLineTest, WideIntegerHighValue) {
-  const char *Args[] = {"-fbuild-session-timestamp=1609827494445723662"};
-
-  CompilerInvocation::CreateFromArgs(Invocation, Args, *Diags);
-
-  ASSERT_FALSE(Diags->hasErrorOccurred());
-  ASSERT_EQ(Invocation.getHeaderSearchOpts().BuildSessionTimestamp,
-            1609827494445723662ull);
-}
-
-// Tree of boolean options that can be (directly or transitively) implied by
-// their parent:
-//
-//   * -cl-unsafe-math-optimizations
-//     * -cl-mad-enable
-//     * -menable-unsafe-fp-math
-//       * -freciprocal-math
-
-TEST_F(CommandLineTest, ImpliedBoolOptionsNoFlagPresent) {
-  const char *Args[] = {""};
-
-  ASSERT_TRUE(CompilerInvocation::CreateFromArgs(Invocation, Args, *Diags));
-  ASSERT_FALSE(Invocation.getLangOpts()->CLUnsafeMath);
-  ASSERT_FALSE(Invocation.getCodeGenOpts().LessPreciseFPMAD);
-  ASSERT_FALSE(Invocation.getLangOpts()->UnsafeFPMath);
-  ASSERT_FALSE(Invocation.getLangOpts()->AllowRecip);
-
-  Invocation.generateCC1CommandLine(GeneratedArgs, *this);
-
-  // Not generated - missing.
-  ASSERT_THAT(GeneratedArgs,
-              Not(Contains(StrEq("-cl-unsafe-math-optimizations"))));
-  ASSERT_THAT(GeneratedArgs, Not(Contains(StrEq("-cl-mad-enable"))));
-  ASSERT_THAT(GeneratedArgs, Not(Contains(StrEq("-menable-unsafe-fp-math"))));
-  ASSERT_THAT(GeneratedArgs, Not(Contains(StrEq("-freciprocal-math"))));
-}
-
-TEST_F(CommandLineTest, ImpliedBoolOptionsRootFlagPresent) {
-  const char *Args[] = {"-cl-unsafe-math-optimizations"};
-
-  ASSERT_TRUE(CompilerInvocation::CreateFromArgs(Invocation, Args, *Diags));
-  // Explicitly provided root flag.
-  ASSERT_TRUE(Invocation.getLangOpts()->CLUnsafeMath);
-  // Directly implied by explicitly provided root flag.
-  ASSERT_TRUE(Invocation.getCodeGenOpts().LessPreciseFPMAD);
-  ASSERT_TRUE(Invocation.getLangOpts()->UnsafeFPMath);
-  // Transitively implied by explicitly provided root flag.
-  ASSERT_TRUE(Invocation.getLangOpts()->AllowRecip);
-
-  Invocation.generateCC1CommandLine(GeneratedArgs, *this);
-
-  // Generated - explicitly provided.
-  ASSERT_THAT(GeneratedArgs, Contains(StrEq("-cl-unsafe-math-optimizations")));
-  // Not generated - implied by the generated root flag.
-  ASSERT_THAT(GeneratedArgs, Not(Contains(StrEq("-cl-mad-enable"))));
-  ASSERT_THAT(GeneratedArgs, Not(Contains(StrEq("-menable-unsafe-fp-math"))));
-  ASSERT_THAT(GeneratedArgs, Not(Contains(StrEq("-freciprocal-math"))));
-}
-
-TEST_F(CommandLineTest, ImpliedBoolOptionsAllFlagsPresent) {
-  const char *Args[] = {"-cl-unsafe-math-optimizations", "-cl-mad-enable",
-                        "-menable-unsafe-fp-math", "-freciprocal-math"};
-
-  ASSERT_TRUE(CompilerInvocation::CreateFromArgs(Invocation, Args, *Diags));
-  ASSERT_TRUE(Invocation.getLangOpts()->CLUnsafeMath);
-  ASSERT_TRUE(Invocation.getCodeGenOpts().LessPreciseFPMAD);
-  ASSERT_TRUE(Invocation.getLangOpts()->UnsafeFPMath);
-  ASSERT_TRUE(Invocation.getLangOpts()->AllowRecip);
-
-  Invocation.generateCC1CommandLine(GeneratedArgs, *this);
-
-  // Generated - explicitly provided.
-  ASSERT_THAT(GeneratedArgs, Contains(StrEq("-cl-unsafe-math-optimizations")));
-  // Not generated - implied by their generated parent.
-  ASSERT_THAT(GeneratedArgs, Not(Contains(StrEq("-cl-mad-enable"))));
-  ASSERT_THAT(GeneratedArgs, Not(Contains(StrEq("-menable-unsafe-fp-math"))));
-  ASSERT_THAT(GeneratedArgs, Not(Contains(StrEq("-freciprocal-math"))));
-}
-
-TEST_F(CommandLineTest, ImpliedBoolOptionsImpliedFlagsPresent) {
-  const char *Args[] = {"-cl-mad-enable", "-menable-unsafe-fp-math",
-                        "-freciprocal-math"};
-
-  ASSERT_TRUE(CompilerInvocation::CreateFromArgs(Invocation, Args, *Diags));
-  ASSERT_FALSE(Invocation.getLangOpts()->CLUnsafeMath);
-  ASSERT_TRUE(Invocation.getCodeGenOpts().LessPreciseFPMAD);
-  ASSERT_TRUE(Invocation.getLangOpts()->UnsafeFPMath);
-  ASSERT_TRUE(Invocation.getLangOpts()->AllowRecip);
-
-  Invocation.generateCC1CommandLine(GeneratedArgs, *this);
-  // Not generated - missing.
-  ASSERT_THAT(GeneratedArgs,
-              Not(Contains(StrEq("-cl-unsafe-math-optimizations"))));
-  // Generated - explicitly provided.
-  ASSERT_THAT(GeneratedArgs, Contains(StrEq("-cl-mad-enable")));
-  ASSERT_THAT(GeneratedArgs, Contains(StrEq("-menable-unsafe-fp-math")));
-  // Not generated - implied by its generated parent.
-  ASSERT_THAT(GeneratedArgs, Not(Contains(StrEq("-freciprocal-math"))));
-}
-
-TEST_F(CommandLineTest, PresentAndNotImpliedGenerated) {
-  const char *Args[] = {"-cl-mad-enable", "-menable-unsafe-fp-math"};
-
-  ASSERT_TRUE(CompilerInvocation::CreateFromArgs(Invocation, Args, *Diags));
-
-  Invocation.generateCC1CommandLine(GeneratedArgs, *this);
-
-  // Present options that were not implied are generated.
-  ASSERT_THAT(GeneratedArgs, Contains(StrEq("-cl-mad-enable")));
-  ASSERT_THAT(GeneratedArgs, Contains(StrEq("-menable-unsafe-fp-math")));
-}
-
-// Diagnostic option.
-
-TEST_F(CommandLineTest, DiagnosticOptionPresent) {
-  const char *Args[] = {"-verify=xyz"};
-
-  ASSERT_TRUE(CompilerInvocation::CreateFromArgs(Invocation, Args, *Diags));
-
-  ASSERT_EQ(Invocation.getDiagnosticOpts().VerifyPrefixes,
-            std::vector<std::string>({"xyz"}));
-
-  Invocation.generateCC1CommandLine(GeneratedArgs, *this);
-
-  ASSERT_THAT(GeneratedArgs, ContainsN(StrEq("-verify=xyz"), 1));
-}
-
-// Option default depends on language standard.
-
-TEST_F(CommandLineTest, DigraphsImplied) {
-  const char *Args[] = {""};
-
-  ASSERT_TRUE(CompilerInvocation::CreateFromArgs(Invocation, Args, *Diags));
-  ASSERT_TRUE(Invocation.getLangOpts()->Digraphs);
-
-  Invocation.generateCC1CommandLine(GeneratedArgs, *this);
-  ASSERT_THAT(GeneratedArgs, Not(Contains(StrEq("-fno-digraphs"))));
-  ASSERT_THAT(GeneratedArgs, Not(Contains(StrEq("-fdigraphs"))));
-}
-
-TEST_F(CommandLineTest, DigraphsDisabled) {
-  const char *Args[] = {"-fno-digraphs"};
-
-  ASSERT_TRUE(CompilerInvocation::CreateFromArgs(Invocation, Args, *Diags));
-  ASSERT_FALSE(Invocation.getLangOpts()->Digraphs);
-
-  Invocation.generateCC1CommandLine(GeneratedArgs, *this);
-  ASSERT_THAT(GeneratedArgs, Contains(StrEq("-fno-digraphs")));
-  ASSERT_THAT(GeneratedArgs, Not(Contains(StrEq("-fdigraphs"))));
-}
-
-TEST_F(CommandLineTest, DigraphsNotImplied) {
-  const char *Args[] = {"-std=c89"};
-
-  ASSERT_TRUE(CompilerInvocation::CreateFromArgs(Invocation, Args, *Diags));
-  ASSERT_FALSE(Invocation.getLangOpts()->Digraphs);
-
-  Invocation.generateCC1CommandLine(GeneratedArgs, *this);
-  ASSERT_THAT(GeneratedArgs, Not(Contains(StrEq("-fno-digraphs"))));
-  ASSERT_THAT(GeneratedArgs, Not(Contains(StrEq("-fdigraphs"))));
-}
-
-TEST_F(CommandLineTest, DigraphsEnabled) {
-  const char *Args[] = {"-std=c89", "-fdigraphs"};
-
-  ASSERT_TRUE(CompilerInvocation::CreateFromArgs(Invocation, Args, *Diags));
-  ASSERT_TRUE(Invocation.getLangOpts()->Digraphs);
-
-  Invocation.generateCC1CommandLine(GeneratedArgs, *this);
-  ASSERT_THAT(GeneratedArgs, Contains(StrEq("-fdigraphs")));
-}
-
-struct DummyModuleFileExtension
-    : public llvm::RTTIExtends<DummyModuleFileExtension, ModuleFileExtension> {
-  static char ID;
-
-  ModuleFileExtensionMetadata getExtensionMetadata() const override {
-    return {};
-  };
-
-  llvm::hash_code hashExtension(llvm::hash_code Code) const override {
-    return {};
-  }
-
-  std::unique_ptr<ModuleFileExtensionWriter>
-  createExtensionWriter(ASTWriter &Writer) override {
-    return {};
-  }
-
-  std::unique_ptr<ModuleFileExtensionReader>
-  createExtensionReader(const ModuleFileExtensionMetadata &Metadata,
-                        ASTReader &Reader, serialization::ModuleFile &Mod,
-                        const llvm::BitstreamCursor &Stream) override {
-    return {};
-  }
-};
-
-char DummyModuleFileExtension::ID = 0;
-
-TEST_F(CommandLineTest, TestModuleFileExtension) {
-  const char *Args[] = {"-ftest-module-file-extension=first:2:1:0:first",
-                        "-ftest-module-file-extension=second:3:2:1:second"};
-
-  ASSERT_TRUE(CompilerInvocation::CreateFromArgs(Invocation, Args, *Diags));
-  ASSERT_THAT(Invocation.getFrontendOpts().ModuleFileExtensions.size(), 2);
-
-  // Exercise the check that only serializes instances of
-  // TestModuleFileExtension by providing an instance of another
-  // ModuleFileExtension subclass.
-  Invocation.getFrontendOpts().ModuleFileExtensions.push_back(
-      std::make_shared<DummyModuleFileExtension>());
-
-  Invocation.generateCC1CommandLine(GeneratedArgs, *this);
-
-  ASSERT_THAT(GeneratedArgs,
-              ContainsN(HasSubstr("-ftest-module-file-extension="), 2));
-  ASSERT_THAT(
-      GeneratedArgs,
-      Contains(StrEq("-ftest-module-file-extension=first:2:1:0:first")));
-  ASSERT_THAT(
-      GeneratedArgs,
-      Contains(StrEq("-ftest-module-file-extension=second:3:2:1:second")));
-}
-
-TEST_F(CommandLineTest, RoundTrip) {
-  // Testing one marshalled and one manually generated option from each
-  // CompilerInvocation member.
-  const char *Args[] = {
-      "-round-trip-args",
-      // LanguageOptions
-      "-std=c17",
-      "-fmax-tokens=10",
-      // TargetOptions
-      "-target-sdk-version=1.2.3",
-      "-meabi",
-      "4",
-      // DiagnosticOptions
-      "-Wundef-prefix=XY",
-      "-fdiagnostics-format",
-      "clang",
-      // HeaderSearchOptions
-      "-stdlib=libc++",
-      "-fimplicit-module-maps",
-      // PreprocessorOptions
-      "-DXY=AB",
-      "-include-pch",
-      "a.pch",
-      // AnalyzerOptions
-      "-analyzer-config",
-      "ctu-import-threshold=42",
-      "-unoptimized-cfg",
-      // MigratorOptions (no manually handled arguments)
-      "-no-ns-alloc-error",
-      // CodeGenOptions
-      "-debug-info-kind=limited",
-      "-debug-info-macro",
-      // DependencyOutputOptions
-      "--show-includes",
-      "-H",
-      // FileSystemOptions (no manually handled arguments)
-      "-working-directory",
-      "folder",
-      // FrontendOptions
-      "-load",
-      "plugin",
-      "-ast-merge",
-      // PreprocessorOutputOptions
-      "-dD",
-      "-CC",
-  };
-
-  ASSERT_TRUE(CompilerInvocation::CreateFromArgs(Invocation, Args, *Diags));
-
-  ASSERT_TRUE(Invocation.getLangOpts()->C17);
-  ASSERT_EQ(Invocation.getLangOpts()->MaxTokens, 10u);
-
-  ASSERT_EQ(Invocation.getTargetOpts().SDKVersion, llvm::VersionTuple(1, 2, 3));
-  ASSERT_EQ(Invocation.getTargetOpts().EABIVersion, EABI::EABI4);
-
-  ASSERT_THAT(Invocation.getDiagnosticOpts().UndefPrefixes,
-              Contains(StrEq("XY")));
-  ASSERT_EQ(Invocation.getDiagnosticOpts().getFormat(),
-            TextDiagnosticFormat::Clang);
-
-  ASSERT_TRUE(Invocation.getHeaderSearchOpts().UseLibcxx);
-  ASSERT_TRUE(Invocation.getHeaderSearchOpts().ImplicitModuleMaps);
-
-  ASSERT_THAT(Invocation.getPreprocessorOpts().Macros,
-              Contains(std::make_pair(std::string("XY=AB"), false)));
-  ASSERT_EQ(Invocation.getPreprocessorOpts().ImplicitPCHInclude, "a.pch");
-
-  ASSERT_EQ(Invocation.getAnalyzerOpts()->Config["ctu-import-threshold"], "42");
-  ASSERT_TRUE(Invocation.getAnalyzerOpts()->UnoptimizedCFG);
-
-  ASSERT_TRUE(Invocation.getMigratorOpts().NoNSAllocReallocError);
-
-  ASSERT_EQ(Invocation.getCodeGenOpts().getDebugInfo(),
-            codegenoptions::DebugInfoKind::LimitedDebugInfo);
-  ASSERT_TRUE(Invocation.getCodeGenOpts().MacroDebugInfo);
-
-  ASSERT_EQ(Invocation.getDependencyOutputOpts().ShowIncludesDest,
-            ShowIncludesDestination::Stdout);
-  ASSERT_TRUE(Invocation.getDependencyOutputOpts().ShowHeaderIncludes);
-}
-
-TEST_F(CommandLineTest, PluginArgsRoundTripDeterminism) {
-  const char *Args[] = {
-      "-plugin-arg-blink-gc-plugin", "no-members-in-stack-allocated",
-      "-plugin-arg-find-bad-constructs", "checked-ptr-as-trivial-member",
-      "-plugin-arg-find-bad-constructs", "check-ipc",
-      // Enable round-trip to ensure '-plugin-arg' generation is deterministic.
-      "-round-trip-args"};
-
-  ASSERT_TRUE(CompilerInvocation::CreateFromArgs(Invocation, Args, *Diags));
-}
-} // anonymous namespace
diff --git a/gnu/llvm/clang/unittests/Frontend/FixedPointString.cpp b/gnu/llvm/clang/unittests/Frontend/FixedPointString.cpp
deleted file mode 100644
index 755efd7fcaa..00000000000
--- a/gnu/llvm/clang/unittests/Frontend/FixedPointString.cpp
+++ /dev/null
@@ -1,107 +0,0 @@
-#include "clang/AST/Type.h"
-#include "llvm/ADT/APSInt.h"
-#include "llvm/ADT/SmallString.h"
-#include "gtest/gtest.h"
-
-using clang::FixedPointValueToString;
-using llvm::APSInt;
-using llvm::SmallString;
-
-namespace {
-
-TEST(FixedPointString, DifferentTypes) {
-  SmallString<64> S;
-  FixedPointValueToString(S, APSInt::get(320), 7);
-  ASSERT_STREQ(S.c_str(), "2.5");
-
-  S.clear();
-  FixedPointValueToString(S, APSInt::get(0), 7);
-  ASSERT_STREQ(S.c_str(), "0.0");
-
-  // signed short _Accum
-  S.clear();
-  FixedPointValueToString(S, APSInt::getMaxValue(16, /*Unsigned=*/false), 7);
-  ASSERT_STREQ(S.c_str(), "255.9921875");
-
-  // signed _Accum
-  S.clear();
-  FixedPointValueToString(S, APSInt::getMaxValue(32, /*Unsigned=*/false), 15);
-  ASSERT_STREQ(S.c_str(), "65535.999969482421875");
-
-  // signed long _Accum
-  S.clear();
-  FixedPointValueToString(S, APSInt::getMaxValue(64, /*Unsigned=*/false), 31);
-  ASSERT_STREQ(S.c_str(), "4294967295.9999999995343387126922607421875");
-
-  // unsigned short _Accum
-  S.clear();
-  FixedPointValueToString(S, APSInt::getMaxValue(16, /*Unsigned=*/true), 8);
-  ASSERT_STREQ(S.c_str(), "255.99609375");
-
-  // unsigned _Accum
-  S.clear();
-  FixedPointValueToString(S, APSInt::getMaxValue(32, /*Unsigned=*/true), 16);
-  ASSERT_STREQ(S.c_str(), "65535.9999847412109375");
-
-  // unsigned long _Accum
-  S.clear();
-  FixedPointValueToString(S, APSInt::getMaxValue(64, /*Unsigned=*/true), 32);
-  ASSERT_STREQ(S.c_str(), "4294967295.99999999976716935634613037109375");
-
-  // signed short _Fract
-  S.clear();
-  FixedPointValueToString(S, APSInt::getMaxValue(8, /*Unsigned=*/false), 7);
-  ASSERT_STREQ(S.c_str(), "0.9921875");
-
-  // signed _Fract
-  S.clear();
-  FixedPointValueToString(S, APSInt::getMaxValue(16, /*Unsigned=*/false), 15);
-  ASSERT_STREQ(S.c_str(), "0.999969482421875");
-
-  // signed long _Fract
-  S.clear();
-  FixedPointValueToString(S, APSInt::getMaxValue(32, /*Unsigned=*/false), 31);
-  ASSERT_STREQ(S.c_str(), "0.9999999995343387126922607421875");
-
-  // unsigned short _Fract
-  S.clear();
-  FixedPointValueToString(S, APSInt::getMaxValue(8, /*Unsigned=*/true), 8);
-  ASSERT_STREQ(S.c_str(), "0.99609375");
-
-  // unsigned _Fract
-  S.clear();
-  FixedPointValueToString(S, APSInt::getMaxValue(16, /*Unsigned=*/true), 16);
-  ASSERT_STREQ(S.c_str(), "0.9999847412109375");
-
-  // unsigned long _Fract
-  S.clear();
-  FixedPointValueToString(S, APSInt::getMaxValue(32, /*Unsigned=*/true), 32);
-  ASSERT_STREQ(S.c_str(), "0.99999999976716935634613037109375");
-}
-
-TEST(FixedPointString, Negative) {
-  SmallString<64> S;
-  FixedPointValueToString(S, APSInt::get(-320), 7);
-  ASSERT_STREQ(S.c_str(), "-2.5");
-
-  S.clear();
-  FixedPointValueToString(S, APSInt::get(-64), 7);
-  ASSERT_STREQ(S.c_str(), "-0.5");
-
-  // signed short _Accum
-  S.clear();
-  FixedPointValueToString(S, APSInt::getMinValue(16, /*Unsigned=*/false), 7);
-  ASSERT_STREQ(S.c_str(), "-256.0");
-
-  // signed _Accum
-  S.clear();
-  FixedPointValueToString(S, APSInt::getMinValue(32, /*Unsigned=*/false), 15);
-  ASSERT_STREQ(S.c_str(), "-65536.0");
-
-  // signed long _Accum
-  S.clear();
-  FixedPointValueToString(S, APSInt::getMinValue(64, /*Unsigned=*/false), 31);
-  ASSERT_STREQ(S.c_str(), "-4294967296.0");
-}
-
-} // namespace
diff --git a/gnu/llvm/clang/unittests/Frontend/FrontendActionTest.cpp b/gnu/llvm/clang/unittests/Frontend/FrontendActionTest.cpp
deleted file mode 100644
index 8de687d28e7..00000000000
--- a/gnu/llvm/clang/unittests/Frontend/FrontendActionTest.cpp
+++ /dev/null
@@ -1,295 +0,0 @@
-//===- unittests/Frontend/FrontendActionTest.cpp - FrontendAction tests ---===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/Frontend/FrontendAction.h"
-#include "clang/AST/ASTConsumer.h"
-#include "clang/AST/ASTContext.h"
-#include "clang/AST/RecursiveASTVisitor.h"
-#include "clang/Basic/LangStandard.h"
-#include "clang/Frontend/CompilerInstance.h"
-#include "clang/Frontend/CompilerInvocation.h"
-#include "clang/Frontend/FrontendActions.h"
-#include "clang/Lex/Preprocessor.h"
-#include "clang/Lex/PreprocessorOptions.h"
-#include "clang/Sema/Sema.h"
-#include "clang/Serialization/InMemoryModuleCache.h"
-#include "llvm/ADT/Triple.h"
-#include "llvm/Support/MemoryBuffer.h"
-#include "llvm/Support/ToolOutputFile.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-using namespace clang;
-
-namespace {
-
-class TestASTFrontendAction : public ASTFrontendAction {
-public:
-  TestASTFrontendAction(bool enableIncrementalProcessing = false,
-                        bool actOnEndOfTranslationUnit = false)
-    : EnableIncrementalProcessing(enableIncrementalProcessing),
-      ActOnEndOfTranslationUnit(actOnEndOfTranslationUnit) { }
-
-  bool EnableIncrementalProcessing;
-  bool ActOnEndOfTranslationUnit;
-  std::vector<std::string> decl_names;
-
-  bool BeginSourceFileAction(CompilerInstance &ci) override {
-    if (EnableIncrementalProcessing)
-      ci.getPreprocessor().enableIncrementalProcessing();
-
-    return ASTFrontendAction::BeginSourceFileAction(ci);
-  }
-
-  std::unique_ptr<ASTConsumer> CreateASTConsumer(CompilerInstance &CI,
-                                                 StringRef InFile) override {
-    return std::make_unique<Visitor>(CI, ActOnEndOfTranslationUnit,
-                                      decl_names);
-  }
-
-private:
-  class Visitor : public ASTConsumer, public RecursiveASTVisitor<Visitor> {
-  public:
-    Visitor(CompilerInstance &CI, bool ActOnEndOfTranslationUnit,
-            std::vector<std::string> &decl_names) :
-      CI(CI), ActOnEndOfTranslationUnit(ActOnEndOfTranslationUnit),
-      decl_names_(decl_names) {}
-
-    void HandleTranslationUnit(ASTContext &context) override {
-      if (ActOnEndOfTranslationUnit) {
-        CI.getSema().ActOnEndOfTranslationUnit();
-      }
-      TraverseDecl(context.getTranslationUnitDecl());
-    }
-
-    virtual bool VisitNamedDecl(NamedDecl *Decl) {
-      decl_names_.push_back(Decl->getQualifiedNameAsString());
-      return true;
-    }
-
-  private:
-    CompilerInstance &CI;
-    bool ActOnEndOfTranslationUnit;
-    std::vector<std::string> &decl_names_;
-  };
-};
-
-TEST(ASTFrontendAction, Sanity) {
-  auto invocation = std::make_shared<CompilerInvocation>();
-  invocation->getPreprocessorOpts().addRemappedFile(
-      "test.cc",
-      MemoryBuffer::getMemBuffer("int main() { float x; }").release());
-  invocation->getFrontendOpts().Inputs.push_back(
-      FrontendInputFile("test.cc", Language::CXX));
-  invocation->getFrontendOpts().ProgramAction = frontend::ParseSyntaxOnly;
-  invocation->getTargetOpts().Triple = "i386-unknown-linux-gnu";
-  CompilerInstance compiler;
-  compiler.setInvocation(std::move(invocation));
-  compiler.createDiagnostics();
-
-  TestASTFrontendAction test_action;
-  ASSERT_TRUE(compiler.ExecuteAction(test_action));
-  ASSERT_EQ(2U, test_action.decl_names.size());
-  EXPECT_EQ("main", test_action.decl_names[0]);
-  EXPECT_EQ("x", test_action.decl_names[1]);
-}
-
-TEST(ASTFrontendAction, IncrementalParsing) {
-  auto invocation = std::make_shared<CompilerInvocation>();
-  invocation->getPreprocessorOpts().addRemappedFile(
-      "test.cc",
-      MemoryBuffer::getMemBuffer("int main() { float x; }").release());
-  invocation->getFrontendOpts().Inputs.push_back(
-      FrontendInputFile("test.cc", Language::CXX));
-  invocation->getFrontendOpts().ProgramAction = frontend::ParseSyntaxOnly;
-  invocation->getTargetOpts().Triple = "i386-unknown-linux-gnu";
-  CompilerInstance compiler;
-  compiler.setInvocation(std::move(invocation));
-  compiler.createDiagnostics();
-
-  TestASTFrontendAction test_action(/*enableIncrementalProcessing=*/true);
-  ASSERT_TRUE(compiler.ExecuteAction(test_action));
-  ASSERT_EQ(2U, test_action.decl_names.size());
-  EXPECT_EQ("main", test_action.decl_names[0]);
-  EXPECT_EQ("x", test_action.decl_names[1]);
-}
-
-TEST(ASTFrontendAction, LateTemplateIncrementalParsing) {
-  auto invocation = std::make_shared<CompilerInvocation>();
-  invocation->getLangOpts()->CPlusPlus = true;
-  invocation->getLangOpts()->DelayedTemplateParsing = true;
-  invocation->getPreprocessorOpts().addRemappedFile(
-    "test.cc", MemoryBuffer::getMemBuffer(
-      "template<typename T> struct A { A(T); T data; };\n"
-      "template<typename T> struct B: public A<T> {\n"
-      "  B();\n"
-      "  B(B const& b): A<T>(b.data) {}\n"
-      "};\n"
-      "B<char> c() { return B<char>(); }\n").release());
-  invocation->getFrontendOpts().Inputs.push_back(
-      FrontendInputFile("test.cc", Language::CXX));
-  invocation->getFrontendOpts().ProgramAction = frontend::ParseSyntaxOnly;
-  invocation->getTargetOpts().Triple = "i386-unknown-linux-gnu";
-  CompilerInstance compiler;
-  compiler.setInvocation(std::move(invocation));
-  compiler.createDiagnostics();
-
-  TestASTFrontendAction test_action(/*enableIncrementalProcessing=*/true,
-                                    /*actOnEndOfTranslationUnit=*/true);
-  ASSERT_TRUE(compiler.ExecuteAction(test_action));
-  ASSERT_EQ(13U, test_action.decl_names.size());
-  EXPECT_EQ("A", test_action.decl_names[0]);
-  EXPECT_EQ("c", test_action.decl_names[12]);
-}
-
-struct TestPPCallbacks : public PPCallbacks {
-  TestPPCallbacks() : SeenEnd(false) {}
-
-  void EndOfMainFile() override { SeenEnd = true; }
-
-  bool SeenEnd;
-};
-
-class TestPPCallbacksFrontendAction : public PreprocessorFrontendAction {
-  TestPPCallbacks *Callbacks;
-
-public:
-  TestPPCallbacksFrontendAction(TestPPCallbacks *C)
-      : Callbacks(C), SeenEnd(false) {}
-
-  void ExecuteAction() override {
-    Preprocessor &PP = getCompilerInstance().getPreprocessor();
-    PP.addPPCallbacks(std::unique_ptr<TestPPCallbacks>(Callbacks));
-    PP.EnterMainSourceFile();
-  }
-  void EndSourceFileAction() override { SeenEnd = Callbacks->SeenEnd; }
-
-  bool SeenEnd;
-};
-
-TEST(PreprocessorFrontendAction, EndSourceFile) {
-  auto Invocation = std::make_shared<CompilerInvocation>();
-  Invocation->getPreprocessorOpts().addRemappedFile(
-      "test.cc",
-      MemoryBuffer::getMemBuffer("int main() { float x; }").release());
-  Invocation->getFrontendOpts().Inputs.push_back(
-      FrontendInputFile("test.cc", Language::CXX));
-  Invocation->getFrontendOpts().ProgramAction = frontend::ParseSyntaxOnly;
-  Invocation->getTargetOpts().Triple = "i386-unknown-linux-gnu";
-  CompilerInstance Compiler;
-  Compiler.setInvocation(std::move(Invocation));
-  Compiler.createDiagnostics();
-
-  TestPPCallbacks *Callbacks = new TestPPCallbacks;
-  TestPPCallbacksFrontendAction TestAction(Callbacks);
-  ASSERT_FALSE(Callbacks->SeenEnd);
-  ASSERT_FALSE(TestAction.SeenEnd);
-  ASSERT_TRUE(Compiler.ExecuteAction(TestAction));
-  // Check that EndOfMainFile was called before EndSourceFileAction.
-  ASSERT_TRUE(TestAction.SeenEnd);
-}
-
-class TypoExternalSemaSource : public ExternalSemaSource {
-  CompilerInstance &CI;
-
-public:
-  TypoExternalSemaSource(CompilerInstance &CI) : CI(CI) {}
-
-  TypoCorrection CorrectTypo(const DeclarationNameInfo &Typo, int LookupKind,
-                             Scope *S, CXXScopeSpec *SS,
-                             CorrectionCandidateCallback &CCC,
-                             DeclContext *MemberContext, bool EnteringContext,
-                             const ObjCObjectPointerType *OPT) override {
-    // Generate a fake typo correction with one attached note.
-    ASTContext &Ctx = CI.getASTContext();
-    TypoCorrection TC(DeclarationName(&Ctx.Idents.get("moo")));
-    unsigned DiagID = Ctx.getDiagnostics().getCustomDiagID(
-        DiagnosticsEngine::Note, "This is a note");
-    TC.addExtraDiagnostic(PartialDiagnostic(DiagID, Ctx.getDiagAllocator()));
-    return TC;
-  }
-};
-
-struct TypoDiagnosticConsumer : public DiagnosticConsumer {
-  void HandleDiagnostic(DiagnosticsEngine::Level DiagLevel,
-                        const Diagnostic &Info) override {
-    // Capture errors and notes. There should be one of each.
-    if (DiagLevel == DiagnosticsEngine::Error) {
-      assert(Error.empty());
-      Info.FormatDiagnostic(Error);
-    } else {
-      assert(Note.empty());
-      Info.FormatDiagnostic(Note);
-    }
-  }
-  SmallString<32> Error;
-  SmallString<32> Note;
-};
-
-TEST(ASTFrontendAction, ExternalSemaSource) {
-  auto Invocation = std::make_shared<CompilerInvocation>();
-  Invocation->getLangOpts()->CPlusPlus = true;
-  Invocation->getPreprocessorOpts().addRemappedFile(
-      "test.cc", MemoryBuffer::getMemBuffer("void fooo();\n"
-                                            "int main() { foo(); }")
-                     .release());
-  Invocation->getFrontendOpts().Inputs.push_back(
-      FrontendInputFile("test.cc", Language::CXX));
-  Invocation->getFrontendOpts().ProgramAction = frontend::ParseSyntaxOnly;
-  Invocation->getTargetOpts().Triple = "i386-unknown-linux-gnu";
-  CompilerInstance Compiler;
-  Compiler.setInvocation(std::move(Invocation));
-  auto *TDC = new TypoDiagnosticConsumer;
-  Compiler.createDiagnostics(TDC, /*ShouldOwnClient=*/true);
-  Compiler.setExternalSemaSource(new TypoExternalSemaSource(Compiler));
-
-  SyntaxOnlyAction TestAction;
-  ASSERT_TRUE(Compiler.ExecuteAction(TestAction));
-  // There should be one error correcting to 'moo' and a note attached to it.
-  EXPECT_EQ("use of undeclared identifier 'foo'; did you mean 'moo'?",
-            std::string(TDC->Error));
-  EXPECT_EQ("This is a note", std::string(TDC->Note));
-}
-
-TEST(GeneratePCHFrontendAction, CacheGeneratedPCH) {
-  // Create a temporary file for writing out the PCH that will be cleaned up.
-  int PCHFD;
-  llvm::SmallString<128> PCHFilename;
-  ASSERT_FALSE(
-      llvm::sys::fs::createTemporaryFile("test.h", "pch", PCHFD, PCHFilename));
-  llvm::ToolOutputFile PCHFile(PCHFilename, PCHFD);
-
-  for (bool ShouldCache : {false, true}) {
-    auto Invocation = std::make_shared<CompilerInvocation>();
-    Invocation->getLangOpts()->CacheGeneratedPCH = ShouldCache;
-    Invocation->getPreprocessorOpts().addRemappedFile(
-        "test.h",
-        MemoryBuffer::getMemBuffer("int foo(void) { return 1; }\n").release());
-    Invocation->getFrontendOpts().Inputs.push_back(
-        FrontendInputFile("test.h", Language::C));
-    Invocation->getFrontendOpts().OutputFile = PCHFilename.str().str();
-    Invocation->getFrontendOpts().ProgramAction = frontend::GeneratePCH;
-    Invocation->getTargetOpts().Triple = "x86_64-apple-darwin19.0.0";
-    CompilerInstance Compiler;
-    Compiler.setInvocation(std::move(Invocation));
-    Compiler.createDiagnostics();
-
-    GeneratePCHAction TestAction;
-    ASSERT_TRUE(Compiler.ExecuteAction(TestAction));
-
-    // Check whether the PCH was cached.
-    if (ShouldCache)
-      EXPECT_EQ(InMemoryModuleCache::Final,
-                Compiler.getModuleCache().getPCMState(PCHFilename));
-    else
-      EXPECT_EQ(InMemoryModuleCache::Unknown,
-                Compiler.getModuleCache().getPCMState(PCHFilename));
-  }
-}
-
-} // anonymous namespace
diff --git a/gnu/llvm/clang/unittests/Frontend/OutputStreamTest.cpp b/gnu/llvm/clang/unittests/Frontend/OutputStreamTest.cpp
deleted file mode 100644
index 9cb101ecff8..00000000000
--- a/gnu/llvm/clang/unittests/Frontend/OutputStreamTest.cpp
+++ /dev/null
@@ -1,112 +0,0 @@
-//===- unittests/Frontend/OutputStreamTest.cpp --- FrontendAction tests --===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/Basic/LangStandard.h"
-#include "clang/CodeGen/BackendUtil.h"
-#include "clang/CodeGen/CodeGenAction.h"
-#include "clang/Frontend/CompilerInstance.h"
-#include "clang/Frontend/TextDiagnosticPrinter.h"
-#include "clang/FrontendTool/Utils.h"
-#include "clang/Lex/PreprocessorOptions.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-using namespace clang;
-using namespace clang::frontend;
-
-namespace {
-
-TEST(FrontendOutputTests, TestOutputStream) {
-  auto Invocation = std::make_shared<CompilerInvocation>();
-  Invocation->getPreprocessorOpts().addRemappedFile(
-      "test.cc", MemoryBuffer::getMemBuffer("").release());
-  Invocation->getFrontendOpts().Inputs.push_back(
-      FrontendInputFile("test.cc", Language::CXX));
-  Invocation->getFrontendOpts().ProgramAction = EmitBC;
-  Invocation->getTargetOpts().Triple = "i386-unknown-linux-gnu";
-  CompilerInstance Compiler;
-
-  SmallVector<char, 256> IRBuffer;
-  std::unique_ptr<raw_pwrite_stream> IRStream(
-      new raw_svector_ostream(IRBuffer));
-
-  Compiler.setOutputStream(std::move(IRStream));
-  Compiler.setInvocation(std::move(Invocation));
-  Compiler.createDiagnostics();
-
-  bool Success = ExecuteCompilerInvocation(&Compiler);
-  EXPECT_TRUE(Success);
-  EXPECT_TRUE(!IRBuffer.empty());
-  EXPECT_TRUE(StringRef(IRBuffer.data()).startswith("BC"));
-}
-
-TEST(FrontendOutputTests, TestVerboseOutputStreamShared) {
-  auto Invocation = std::make_shared<CompilerInvocation>();
-  Invocation->getPreprocessorOpts().addRemappedFile(
-      "test.cc", MemoryBuffer::getMemBuffer("invalid").release());
-  Invocation->getFrontendOpts().Inputs.push_back(
-      FrontendInputFile("test.cc", Language::CXX));
-  Invocation->getFrontendOpts().ProgramAction = EmitBC;
-  Invocation->getTargetOpts().Triple = "i386-unknown-linux-gnu";
-  CompilerInstance Compiler;
-
-  std::string VerboseBuffer;
-  raw_string_ostream VerboseStream(VerboseBuffer);
-
-  Compiler.setOutputStream(std::make_unique<raw_null_ostream>());
-  Compiler.setInvocation(std::move(Invocation));
-  IntrusiveRefCntPtr<DiagnosticOptions> DiagOpts = new DiagnosticOptions();
-  Compiler.createDiagnostics(
-      new TextDiagnosticPrinter(llvm::nulls(), &*DiagOpts), true);
-  Compiler.setVerboseOutputStream(VerboseStream);
-
-  bool Success = ExecuteCompilerInvocation(&Compiler);
-  EXPECT_FALSE(Success);
-  EXPECT_TRUE(!VerboseStream.str().empty());
-  EXPECT_TRUE(StringRef(VerboseBuffer.data()).contains("errors generated"));
-}
-
-TEST(FrontendOutputTests, TestVerboseOutputStreamOwned) {
-  std::string VerboseBuffer;
-  bool Success;
-  {
-    auto Invocation = std::make_shared<CompilerInvocation>();
-    Invocation->getPreprocessorOpts().addRemappedFile(
-        "test.cc", MemoryBuffer::getMemBuffer("invalid").release());
-    Invocation->getFrontendOpts().Inputs.push_back(
-        FrontendInputFile("test.cc", Language::CXX));
-    Invocation->getFrontendOpts().ProgramAction = EmitBC;
-    Invocation->getTargetOpts().Triple = "i386-unknown-linux-gnu";
-    CompilerInstance Compiler;
-
-    std::unique_ptr<raw_ostream> VerboseStream =
-        std::make_unique<raw_string_ostream>(VerboseBuffer);
-
-    Compiler.setOutputStream(std::make_unique<raw_null_ostream>());
-    Compiler.setInvocation(std::move(Invocation));
-    IntrusiveRefCntPtr<DiagnosticOptions> DiagOpts = new DiagnosticOptions();
-    Compiler.createDiagnostics(
-        new TextDiagnosticPrinter(llvm::nulls(), &*DiagOpts), true);
-    Compiler.setVerboseOutputStream(std::move(VerboseStream));
-
-    Success = ExecuteCompilerInvocation(&Compiler);
-  }
-  EXPECT_FALSE(Success);
-  EXPECT_TRUE(!VerboseBuffer.empty());
-  EXPECT_TRUE(StringRef(VerboseBuffer.data()).contains("errors generated"));
-}
-
-TEST(FrontendOutputTests, TestVerboseOutputStreamOwnedNotLeaked) {
-  CompilerInstance Compiler;
-  Compiler.setVerboseOutputStream(std::make_unique<raw_null_ostream>());
-
-  // Trust leak sanitizer bots to catch a leak here.
-  Compiler.setVerboseOutputStream(llvm::nulls());
-}
-
-} // anonymous namespace
diff --git a/gnu/llvm/clang/unittests/Frontend/PCHPreambleTest.cpp b/gnu/llvm/clang/unittests/Frontend/PCHPreambleTest.cpp
deleted file mode 100644
index d253d937ace..00000000000
--- a/gnu/llvm/clang/unittests/Frontend/PCHPreambleTest.cpp
+++ /dev/null
@@ -1,265 +0,0 @@
-//====-- unittests/Frontend/PCHPreambleTest.cpp - FrontendAction tests ---====//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/Frontend/ASTUnit.h"
-#include "clang/Frontend/CompilerInvocation.h"
-#include "clang/Frontend/CompilerInstance.h"
-#include "clang/Frontend/FrontendActions.h"
-#include "clang/Frontend/FrontendOptions.h"
-#include "clang/Lex/PreprocessorOptions.h"
-#include "clang/Basic/Diagnostic.h"
-#include "clang/Basic/FileManager.h"
-#include "llvm/Support/FileSystem.h"
-#include "llvm/Support/MemoryBuffer.h"
-#include "llvm/Support/Path.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-using namespace clang;
-
-namespace {
-
-class ReadCountingInMemoryFileSystem : public vfs::InMemoryFileSystem
-{
-  std::map<std::string, unsigned> ReadCounts;
-
-public:
-  ErrorOr<std::unique_ptr<vfs::File>> openFileForRead(const Twine &Path) override
-  {
-    SmallVector<char, 128> PathVec;
-    Path.toVector(PathVec);
-    llvm::sys::path::remove_dots(PathVec, true);
-    ++ReadCounts[std::string(PathVec.begin(), PathVec.end())];
-    return InMemoryFileSystem::openFileForRead(Path);
-  }
-
-  unsigned GetReadCount(const Twine &Path) const
-  {
-    auto it = ReadCounts.find(Path.str());
-    return it == ReadCounts.end() ? 0 : it->second;
-  }
-};
-
-class PCHPreambleTest : public ::testing::Test {
-  IntrusiveRefCntPtr<ReadCountingInMemoryFileSystem> VFS;
-  StringMap<std::string> RemappedFiles;
-  std::shared_ptr<PCHContainerOperations> PCHContainerOpts;
-  FileSystemOptions FSOpts;
-
-public:
-  void SetUp() override { ResetVFS(); }
-  void TearDown() override {}
-
-  void ResetVFS() {
-    VFS = new ReadCountingInMemoryFileSystem();
-    // We need the working directory to be set to something absolute,
-    // otherwise it ends up being inadvertently set to the current
-    // working directory in the real file system due to a series of
-    // unfortunate conditions interacting badly.
-    // What's more, this path *must* be absolute on all (real)
-    // filesystems, so just '/' won't work (e.g. on Win32).
-    VFS->setCurrentWorkingDirectory("//./");
-  }
-
-  void AddFile(const std::string &Filename, const std::string &Contents) {
-    ::time_t now;
-    ::time(&now);
-    VFS->addFile(Filename, now, MemoryBuffer::getMemBufferCopy(Contents, Filename));
-  }
-
-  void RemapFile(const std::string &Filename, const std::string &Contents) {
-    RemappedFiles[Filename] = Contents;
-  }
-
-  std::unique_ptr<ASTUnit> ParseAST(const std::string &EntryFile) {
-    PCHContainerOpts = std::make_shared<PCHContainerOperations>();
-    std::shared_ptr<CompilerInvocation> CI(new CompilerInvocation);
-    CI->getFrontendOpts().Inputs.push_back(
-      FrontendInputFile(EntryFile, FrontendOptions::getInputKindForExtension(
-        llvm::sys::path::extension(EntryFile).substr(1))));
-
-    CI->getTargetOpts().Triple = "i386-unknown-linux-gnu";
-
-    CI->getPreprocessorOpts().RemappedFileBuffers = GetRemappedFiles();
-
-    PreprocessorOptions &PPOpts = CI->getPreprocessorOpts();
-    PPOpts.RemappedFilesKeepOriginalName = true;
-
-    IntrusiveRefCntPtr<DiagnosticsEngine>
-      Diags(CompilerInstance::createDiagnostics(new DiagnosticOptions, new DiagnosticConsumer));
-
-    FileManager *FileMgr = new FileManager(FSOpts, VFS);
-
-    std::unique_ptr<ASTUnit> AST = ASTUnit::LoadFromCompilerInvocation(
-        CI, PCHContainerOpts, Diags, FileMgr, false, CaptureDiagsKind::None,
-        /*PrecompilePreambleAfterNParses=*/1);
-    return AST;
-  }
-
-  bool ReparseAST(const std::unique_ptr<ASTUnit> &AST) {
-    bool reparseFailed = AST->Reparse(PCHContainerOpts, GetRemappedFiles(), VFS);
-    return !reparseFailed;
-  }
-
-  unsigned GetFileReadCount(const std::string &Filename) const {
-    return VFS->GetReadCount(Filename);
-  }
-
-private:
-  std::vector<std::pair<std::string, llvm::MemoryBuffer *>>
-  GetRemappedFiles() const {
-    std::vector<std::pair<std::string, llvm::MemoryBuffer *>> Remapped;
-    for (const auto &RemappedFile : RemappedFiles) {
-      std::unique_ptr<MemoryBuffer> buf = MemoryBuffer::getMemBufferCopy(
-        RemappedFile.second, RemappedFile.first());
-      Remapped.emplace_back(std::string(RemappedFile.first()), buf.release());
-    }
-    return Remapped;
-  }
-};
-
-TEST_F(PCHPreambleTest, ReparseReusesPreambleWithUnsavedFileNotExistingOnDisk) {
-  std::string Header1 = "//./header1.h";
-  std::string MainName = "//./main.cpp";
-  AddFile(MainName, R"cpp(
-#include "//./header1.h"
-int main() { return ZERO; }
-)cpp");
-  RemapFile(Header1, "#define ZERO 0\n");
-
-  // Parse with header file provided as unsaved file, which does not exist on
-  // disk.
-  std::unique_ptr<ASTUnit> AST(ParseAST(MainName));
-  ASSERT_TRUE(AST.get());
-  ASSERT_FALSE(AST->getDiagnostics().hasErrorOccurred());
-
-  // Reparse and check that the preamble was reused.
-  ASSERT_TRUE(ReparseAST(AST));
-  ASSERT_EQ(AST->getPreambleCounterForTests(), 1U);
-}
-
-TEST_F(PCHPreambleTest, ReparseReusesPreambleAfterUnsavedFileWasCreatedOnDisk) {
-  std::string Header1 = "//./header1.h";
-  std::string MainName = "//./main.cpp";
-  AddFile(MainName, R"cpp(
-#include "//./header1.h"
-int main() { return ZERO; }
-)cpp");
-  RemapFile(Header1, "#define ZERO 0\n");
-
-  // Parse with header file provided as unsaved file, which does not exist on
-  // disk.
-  std::unique_ptr<ASTUnit> AST(ParseAST(MainName));
-  ASSERT_TRUE(AST.get());
-  ASSERT_FALSE(AST->getDiagnostics().hasErrorOccurred());
-
-  // Create the unsaved file also on disk and check that preamble was reused.
-  AddFile(Header1, "#define ZERO 0\n");
-  ASSERT_TRUE(ReparseAST(AST));
-  ASSERT_EQ(AST->getPreambleCounterForTests(), 1U);
-}
-
-TEST_F(PCHPreambleTest,
-       ReparseReusesPreambleAfterUnsavedFileWasRemovedFromDisk) {
-  std::string Header1 = "//./foo/header1.h";
-  std::string MainName = "//./main.cpp";
-  std::string MainFileContent = R"cpp(
-#include "//./foo/header1.h"
-int main() { return ZERO; }
-)cpp";
-  AddFile(MainName, MainFileContent);
-  AddFile(Header1, "#define ZERO 0\n");
-  RemapFile(Header1, "#define ZERO 0\n");
-
-  // Parse with header file provided as unsaved file, which exists on disk.
-  std::unique_ptr<ASTUnit> AST(ParseAST(MainName));
-  ASSERT_TRUE(AST.get());
-  ASSERT_FALSE(AST->getDiagnostics().hasErrorOccurred());
-  ASSERT_EQ(AST->getPreambleCounterForTests(), 1U);
-
-  // Remove the unsaved file from disk and check that the preamble was reused.
-  ResetVFS();
-  AddFile(MainName, MainFileContent);
-  ASSERT_TRUE(ReparseAST(AST));
-  ASSERT_EQ(AST->getPreambleCounterForTests(), 1U);
-}
-
-TEST_F(PCHPreambleTest, ReparseWithOverriddenFileDoesNotInvalidatePreamble) {
-  std::string Header1 = "//./header1.h";
-  std::string Header2 = "//./header2.h";
-  std::string MainName = "//./main.cpp";
-  AddFile(Header1, "");
-  AddFile(Header2, "#pragma once");
-  AddFile(MainName,
-    "#include \"//./foo/../header1.h\"\n"
-    "#include \"//./foo/../header2.h\"\n"
-    "int main() { return ZERO; }");
-  RemapFile(Header1, "static const int ZERO = 0;\n");
-
-  std::unique_ptr<ASTUnit> AST(ParseAST(MainName));
-  ASSERT_TRUE(AST.get());
-  ASSERT_FALSE(AST->getDiagnostics().hasErrorOccurred());
-
-  unsigned initialCounts[] = {
-    GetFileReadCount(MainName),
-    GetFileReadCount(Header1),
-    GetFileReadCount(Header2)
-  };
-
-  ASSERT_TRUE(ReparseAST(AST));
-
-  ASSERT_NE(initialCounts[0], GetFileReadCount(MainName));
-  ASSERT_EQ(initialCounts[1], GetFileReadCount(Header1));
-  ASSERT_EQ(initialCounts[2], GetFileReadCount(Header2));
-}
-
-TEST_F(PCHPreambleTest, ParseWithBom) {
-  std::string Header = "//./header.h";
-  std::string Main = "//./main.cpp";
-  AddFile(Header, "int random() { return 4; }");
-  AddFile(Main,
-    "\xef\xbb\xbf"
-    "#include \"//./header.h\"\n"
-    "int main() { return random() -2; }");
-
-  std::unique_ptr<ASTUnit> AST(ParseAST(Main));
-  ASSERT_TRUE(AST.get());
-  ASSERT_FALSE(AST->getDiagnostics().hasErrorOccurred());
-
-  unsigned HeaderReadCount = GetFileReadCount(Header);
-
-  ASSERT_TRUE(ReparseAST(AST));
-  ASSERT_FALSE(AST->getDiagnostics().hasErrorOccurred());
-  
-  // Check preamble PCH was really reused
-  ASSERT_EQ(HeaderReadCount, GetFileReadCount(Header));
-
-  // Remove BOM
-  RemapFile(Main,
-    "#include \"//./header.h\"\n"
-    "int main() { return random() -2; }");
-
-  ASSERT_TRUE(ReparseAST(AST));
-  ASSERT_FALSE(AST->getDiagnostics().hasErrorOccurred());
-
-  ASSERT_LE(HeaderReadCount, GetFileReadCount(Header));
-  HeaderReadCount = GetFileReadCount(Header);
-
-  // Add BOM back
-  RemapFile(Main,
-    "\xef\xbb\xbf"
-    "#include \"//./header.h\"\n"
-    "int main() { return random() -2; }");
-
-  ASSERT_TRUE(ReparseAST(AST));
-  ASSERT_FALSE(AST->getDiagnostics().hasErrorOccurred());
-
-  ASSERT_LE(HeaderReadCount, GetFileReadCount(Header));
-}
-
-} // anonymous namespace
diff --git a/gnu/llvm/clang/unittests/Frontend/ParsedSourceLocationTest.cpp b/gnu/llvm/clang/unittests/Frontend/ParsedSourceLocationTest.cpp
deleted file mode 100644
index 1539005acd8..00000000000
--- a/gnu/llvm/clang/unittests/Frontend/ParsedSourceLocationTest.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-//===- unittests/Frontend/ParsedSourceLocationTest.cpp - ------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/Frontend/CommandLineSourceLoc.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-using namespace clang;
-
-namespace {
-
-TEST(ParsedSourceRange, ParseTest) {
-  auto Check = [](StringRef Value, StringRef Filename, unsigned BeginLine,
-                  unsigned BeginColumn, unsigned EndLine, unsigned EndColumn) {
-    Optional<ParsedSourceRange> PSR = ParsedSourceRange::fromString(Value);
-    ASSERT_TRUE(PSR);
-    EXPECT_EQ(PSR->FileName, Filename);
-    EXPECT_EQ(PSR->Begin.first, BeginLine);
-    EXPECT_EQ(PSR->Begin.second, BeginColumn);
-    EXPECT_EQ(PSR->End.first, EndLine);
-    EXPECT_EQ(PSR->End.second, EndColumn);
-  };
-
-  Check("/Users/test/a-b.cpp:1:2", "/Users/test/a-b.cpp", 1, 2, 1, 2);
-  Check("/Users/test/a-b.cpp:1:2-3:4", "/Users/test/a-b.cpp", 1, 2, 3, 4);
-
-  Check("C:/Users/bob/a-b.cpp:1:2", "C:/Users/bob/a-b.cpp", 1, 2, 1, 2);
-  Check("C:/Users/bob/a-b.cpp:1:2-3:4", "C:/Users/bob/a-b.cpp", 1, 2, 3, 4);
-}
-
-} // anonymous namespace
diff --git a/gnu/llvm/clang/unittests/Frontend/TextDiagnosticTest.cpp b/gnu/llvm/clang/unittests/Frontend/TextDiagnosticTest.cpp
deleted file mode 100644
index 220cff6643d..00000000000
--- a/gnu/llvm/clang/unittests/Frontend/TextDiagnosticTest.cpp
+++ /dev/null
@@ -1,100 +0,0 @@
-//===- unittests/Frontend/TextDiagnosticTest.cpp - ------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/Frontend/TextDiagnostic.h"
-#include "clang/Basic/FileManager.h"
-#include "clang/Basic/LangOptions.h"
-#include "clang/Basic/SourceManager.h"
-#include "llvm/Support/SmallVectorMemoryBuffer.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-using namespace clang;
-
-namespace {
-
-/// Prints a diagnostic with the given DiagnosticOptions and the given
-/// SourceLocation and returns the printed diagnostic text.
-static std::string PrintDiag(const DiagnosticOptions &Opts, FullSourceLoc Loc) {
-  std::string Out;
-  llvm::raw_string_ostream OS(Out);
-  clang::LangOptions LangOpts;
-  // Owned by TextDiagnostic.
-  DiagnosticOptions *DiagOpts = new DiagnosticOptions(Opts);
-  TextDiagnostic Diag(OS, LangOpts, DiagOpts);
-  // Emit a dummy diagnostic that is just 'message'.
-  Diag.emitDiagnostic(Loc, DiagnosticsEngine::Level::Warning, "message",
-                      /*Ranges=*/{}, /*FixItHints=*/{});
-  OS.flush();
-  return Out;
-}
-
-TEST(TextDiagnostic, ShowLine) {
-  // Create dummy FileManager and SourceManager.
-  FileSystemOptions FSOpts;
-  FileManager FileMgr(FSOpts);
-  IntrusiveRefCntPtr<DiagnosticIDs> DiagID(new DiagnosticIDs);
-  DiagnosticsEngine DiagEngine(DiagID, new DiagnosticOptions,
-                               new IgnoringDiagConsumer());
-  SourceManager SrcMgr(DiagEngine, FileMgr);
-
-  // Create a dummy file with some contents to produce a test SourceLocation.
-  const llvm::StringRef file_path = "main.cpp";
-  const llvm::StringRef main_file_contents = "some\nsource\ncode\n";
-  const clang::FileEntryRef fe = FileMgr.getVirtualFileRef(
-      file_path,
-      /*Size=*/static_cast<off_t>(main_file_contents.size()),
-      /*ModificationTime=*/0);
-
-  llvm::SmallVector<char, 64> buffer;
-  buffer.append(main_file_contents.begin(), main_file_contents.end());
-  auto file_contents = std::make_unique<llvm::SmallVectorMemoryBuffer>(
-      std::move(buffer), file_path);
-  SrcMgr.overrideFileContents(fe, std::move(file_contents));
-
-  // Create the actual file id and use it as the main file.
-  clang::FileID fid =
-      SrcMgr.createFileID(fe, SourceLocation(), clang::SrcMgr::C_User);
-  SrcMgr.setMainFileID(fid);
-
-  // Create the source location for the test diagnostic.
-  FullSourceLoc Loc(SrcMgr.translateLineCol(fid, /*Line=*/1, /*Col=*/2),
-                    SrcMgr);
-
-  DiagnosticOptions DiagOpts;
-  DiagOpts.ShowLine = true;
-  DiagOpts.ShowColumn = true;
-  // Hide printing the source line/caret to make the diagnostic shorter and it's
-  // not relevant for this test.
-  DiagOpts.ShowCarets = false;
-  EXPECT_EQ("main.cpp:1:2: warning: message\n", PrintDiag(DiagOpts, Loc));
-
-  // Check that ShowLine doesn't influence the Vi/MSVC diagnostic formats as its
-  // a Clang-specific diagnostic option.
-  DiagOpts.setFormat(TextDiagnosticFormat::Vi);
-  DiagOpts.ShowLine = false;
-  EXPECT_EQ("main.cpp +1:2: warning: message\n", PrintDiag(DiagOpts, Loc));
-
-  DiagOpts.setFormat(TextDiagnosticFormat::MSVC);
-  DiagOpts.ShowLine = false;
-  EXPECT_EQ("main.cpp(1,2): warning: message\n", PrintDiag(DiagOpts, Loc));
-
-  // Reset back to the Clang format.
-  DiagOpts.setFormat(TextDiagnosticFormat::Clang);
-
-  // Hide line number but show column.
-  DiagOpts.ShowLine = false;
-  EXPECT_EQ("main.cpp:2: warning: message\n", PrintDiag(DiagOpts, Loc));
-
-  // Show line number but hide column.
-  DiagOpts.ShowLine = true;
-  DiagOpts.ShowColumn = false;
-  EXPECT_EQ("main.cpp:1: warning: message\n", PrintDiag(DiagOpts, Loc));
-}
-
-} // anonymous namespace
diff --git a/gnu/llvm/clang/unittests/Index/CMakeLists.txt b/gnu/llvm/clang/unittests/Index/CMakeLists.txt
deleted file mode 100644
index ea940e9d7a9..00000000000
--- a/gnu/llvm/clang/unittests/Index/CMakeLists.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  ${LLVM_TARGETS_TO_BUILD}
-  Support
-  )
-
-add_clang_unittest(IndexTests
-  IndexTests.cpp
-  )
-
-clang_target_link_libraries(IndexTests
-  PRIVATE
-  clangAST
-  clangBasic
-  clangFrontend
-  clangIndex
-  clangLex
-  clangSerialization
-  clangTooling
-  )
diff --git a/gnu/llvm/clang/unittests/Index/IndexTests.cpp b/gnu/llvm/clang/unittests/Index/IndexTests.cpp
deleted file mode 100644
index 24230c68fa2..00000000000
--- a/gnu/llvm/clang/unittests/Index/IndexTests.cpp
+++ /dev/null
@@ -1,382 +0,0 @@
-//===--- IndexTests.cpp - Test indexing actions -----------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/AST/ASTConsumer.h"
-#include "clang/AST/ASTContext.h"
-#include "clang/AST/Decl.h"
-#include "clang/Basic/SourceLocation.h"
-#include "clang/Basic/SourceManager.h"
-#include "clang/Frontend/CompilerInstance.h"
-#include "clang/Frontend/FrontendAction.h"
-#include "clang/Index/IndexDataConsumer.h"
-#include "clang/Index/IndexSymbol.h"
-#include "clang/Index/IndexingAction.h"
-#include "clang/Lex/Preprocessor.h"
-#include "clang/Tooling/Tooling.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/Support/VirtualFileSystem.h"
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-#include <memory>
-
-namespace clang {
-namespace index {
-namespace {
-struct Position {
-  size_t Line = 0;
-  size_t Column = 0;
-
-  Position(size_t Line = 0, size_t Column = 0) : Line(Line), Column(Column) {}
-
-  static Position fromSourceLocation(SourceLocation Loc,
-                                     const SourceManager &SM) {
-    FileID FID;
-    unsigned Offset;
-    std::tie(FID, Offset) = SM.getDecomposedSpellingLoc(Loc);
-    Position P;
-    P.Line = SM.getLineNumber(FID, Offset);
-    P.Column = SM.getColumnNumber(FID, Offset);
-    return P;
-  }
-};
-
-bool operator==(const Position &LHS, const Position &RHS) {
-  return std::tie(LHS.Line, LHS.Column) == std::tie(RHS.Line, RHS.Column);
-}
-
-llvm::raw_ostream &operator<<(llvm::raw_ostream &OS, const Position &Pos) {
-  return OS << Pos.Line << ':' << Pos.Column;
-}
-
-struct TestSymbol {
-  std::string QName;
-  Position WrittenPos;
-  Position DeclPos;
-  SymbolInfo SymInfo;
-  SymbolRoleSet Roles;
-  // FIXME: add more information.
-};
-
-llvm::raw_ostream &operator<<(llvm::raw_ostream &OS, const TestSymbol &S) {
-  return OS << S.QName << '[' << S.WrittenPos << ']' << '@' << S.DeclPos << '('
-            << static_cast<unsigned>(S.SymInfo.Kind) << ')';
-}
-
-class Indexer : public IndexDataConsumer {
-public:
-  void initialize(ASTContext &Ctx) override {
-    AST = &Ctx;
-    IndexDataConsumer::initialize(Ctx);
-  }
-
-  bool handleDeclOccurrence(const Decl *D, SymbolRoleSet Roles,
-                            ArrayRef<SymbolRelation>, SourceLocation Loc,
-                            ASTNodeInfo) override {
-    const auto *ND = llvm::dyn_cast<NamedDecl>(D);
-    if (!ND)
-      return true;
-    TestSymbol S;
-    S.SymInfo = getSymbolInfo(D);
-    S.QName = ND->getQualifiedNameAsString();
-    S.WrittenPos = Position::fromSourceLocation(Loc, AST->getSourceManager());
-    S.DeclPos =
-        Position::fromSourceLocation(D->getLocation(), AST->getSourceManager());
-    S.Roles = Roles;
-    Symbols.push_back(std::move(S));
-    return true;
-  }
-
-  bool handleMacroOccurrence(const IdentifierInfo *Name, const MacroInfo *MI,
-                             SymbolRoleSet Roles, SourceLocation Loc) override {
-    TestSymbol S;
-    S.SymInfo = getSymbolInfoForMacro(*MI);
-    S.QName = std::string(Name->getName());
-    S.WrittenPos = Position::fromSourceLocation(Loc, AST->getSourceManager());
-    S.DeclPos = Position::fromSourceLocation(MI->getDefinitionLoc(),
-                                             AST->getSourceManager());
-    S.Roles = Roles;
-    Symbols.push_back(std::move(S));
-    return true;
-  }
-
-  std::vector<TestSymbol> Symbols;
-  const ASTContext *AST = nullptr;
-};
-
-class IndexAction : public ASTFrontendAction {
-public:
-  IndexAction(std::shared_ptr<Indexer> Index,
-              IndexingOptions Opts = IndexingOptions())
-      : Index(std::move(Index)), Opts(Opts) {}
-
-protected:
-  std::unique_ptr<ASTConsumer> CreateASTConsumer(CompilerInstance &CI,
-                                                 StringRef InFile) override {
-    class Consumer : public ASTConsumer {
-      std::shared_ptr<Indexer> Index;
-      std::shared_ptr<Preprocessor> PP;
-      IndexingOptions Opts;
-
-    public:
-      Consumer(std::shared_ptr<Indexer> Index, std::shared_ptr<Preprocessor> PP,
-               IndexingOptions Opts)
-          : Index(std::move(Index)), PP(std::move(PP)), Opts(Opts) {}
-
-      void HandleTranslationUnit(ASTContext &Ctx) override {
-        std::vector<Decl *> DeclsToIndex(
-            Ctx.getTranslationUnitDecl()->decls().begin(),
-            Ctx.getTranslationUnitDecl()->decls().end());
-        indexTopLevelDecls(Ctx, *PP, DeclsToIndex, *Index, Opts);
-      }
-    };
-    return std::make_unique<Consumer>(Index, CI.getPreprocessorPtr(), Opts);
-  }
-
-private:
-  std::shared_ptr<Indexer> Index;
-  IndexingOptions Opts;
-};
-
-using testing::AllOf;
-using testing::Contains;
-using testing::Not;
-using testing::UnorderedElementsAre;
-
-MATCHER_P(QName, Name, "") { return arg.QName == Name; }
-MATCHER_P(WrittenAt, Pos, "") { return arg.WrittenPos == Pos; }
-MATCHER_P(DeclAt, Pos, "") { return arg.DeclPos == Pos; }
-MATCHER_P(Kind, SymKind, "") { return arg.SymInfo.Kind == SymKind; }
-MATCHER_P(HasRole, Role, "") { return arg.Roles & static_cast<unsigned>(Role); }
-
-TEST(IndexTest, Simple) {
-  auto Index = std::make_shared<Indexer>();
-  tooling::runToolOnCode(std::make_unique<IndexAction>(Index),
-                         "class X {}; void f() {}");
-  EXPECT_THAT(Index->Symbols, UnorderedElementsAre(QName("X"), QName("f")));
-}
-
-TEST(IndexTest, IndexPreprocessorMacros) {
-  std::string Code = R"cpp(
-    #define INDEX_MAC 1
-    #define INDEX_MAC_UNDEF 1
-    #undef INDEX_MAC_UNDEF
-    #define INDEX_MAC_REDEF 1
-    #undef INDEX_MAC_REDEF
-    #define INDEX_MAC_REDEF 2
-  )cpp";
-  auto Index = std::make_shared<Indexer>();
-  IndexingOptions Opts;
-  Opts.IndexMacrosInPreprocessor = true;
-  tooling::runToolOnCode(std::make_unique<IndexAction>(Index, Opts), Code);
-  EXPECT_THAT(Index->Symbols,
-              Contains(AllOf(QName("INDEX_MAC"), WrittenAt(Position(2, 13)),
-                             DeclAt(Position(2, 13)),
-                             HasRole(SymbolRole::Definition))));
-  EXPECT_THAT(
-      Index->Symbols,
-      AllOf(Contains(AllOf(QName("INDEX_MAC_UNDEF"), WrittenAt(Position(3, 13)),
-                           DeclAt(Position(3, 13)),
-                           HasRole(SymbolRole::Definition))),
-            Contains(AllOf(QName("INDEX_MAC_UNDEF"), WrittenAt(Position(4, 12)),
-                           DeclAt(Position(3, 13)),
-                           HasRole(SymbolRole::Undefinition)))));
-  EXPECT_THAT(
-      Index->Symbols,
-      AllOf(Contains(AllOf(QName("INDEX_MAC_REDEF"), WrittenAt(Position(5, 13)),
-                           DeclAt(Position(5, 13)),
-                           HasRole(SymbolRole::Definition))),
-            Contains(AllOf(QName("INDEX_MAC_REDEF"), WrittenAt(Position(6, 12)),
-                           DeclAt(Position(5, 13)),
-                           HasRole(SymbolRole::Undefinition))),
-            Contains(AllOf(QName("INDEX_MAC_REDEF"), WrittenAt(Position(7, 13)),
-                           DeclAt(Position(7, 13)),
-                           HasRole(SymbolRole::Definition)))));
-
-  Opts.IndexMacrosInPreprocessor = false;
-  Index->Symbols.clear();
-  tooling::runToolOnCode(std::make_unique<IndexAction>(Index, Opts), Code);
-  EXPECT_THAT(Index->Symbols, UnorderedElementsAre());
-}
-
-TEST(IndexTest, IndexParametersInDecls) {
-  std::string Code = "void foo(int bar);";
-  auto Index = std::make_shared<Indexer>();
-  IndexingOptions Opts;
-  Opts.IndexFunctionLocals = true;
-  Opts.IndexParametersInDeclarations = true;
-  tooling::runToolOnCode(std::make_unique<IndexAction>(Index, Opts), Code);
-  EXPECT_THAT(Index->Symbols, Contains(QName("bar")));
-
-  Opts.IndexParametersInDeclarations = false;
-  Index->Symbols.clear();
-  tooling::runToolOnCode(std::make_unique<IndexAction>(Index, Opts), Code);
-  EXPECT_THAT(Index->Symbols, Not(Contains(QName("bar"))));
-}
-
-TEST(IndexTest, IndexExplicitTemplateInstantiation) {
-  std::string Code = R"cpp(
-    template <typename T>
-    struct Foo { void bar() {} };
-    template <>
-    struct Foo<int> { void bar() {} };
-    void foo() {
-      Foo<char> abc;
-      Foo<int> b;
-    }
-  )cpp";
-  auto Index = std::make_shared<Indexer>();
-  IndexingOptions Opts;
-  tooling::runToolOnCode(std::make_unique<IndexAction>(Index, Opts), Code);
-  EXPECT_THAT(Index->Symbols,
-              AllOf(Contains(AllOf(QName("Foo"), WrittenAt(Position(8, 7)),
-                                   DeclAt(Position(5, 12)))),
-                    Contains(AllOf(QName("Foo"), WrittenAt(Position(7, 7)),
-                                   DeclAt(Position(3, 12))))));
-}
-
-TEST(IndexTest, IndexTemplateInstantiationPartial) {
-  std::string Code = R"cpp(
-    template <typename T1, typename T2>
-    struct Foo { void bar() {} };
-    template <typename T>
-    struct Foo<T, int> { void bar() {} };
-    void foo() {
-      Foo<char, char> abc;
-      Foo<int, int> b;
-    }
-  )cpp";
-  auto Index = std::make_shared<Indexer>();
-  IndexingOptions Opts;
-  tooling::runToolOnCode(std::make_unique<IndexAction>(Index, Opts), Code);
-  EXPECT_THAT(Index->Symbols,
-              Contains(AllOf(QName("Foo"), WrittenAt(Position(8, 7)),
-                             DeclAt(Position(5, 12)))));
-}
-
-TEST(IndexTest, IndexTypeParmDecls) {
-  std::string Code = R"cpp(
-    template <typename T, int I, template<typename> class C, typename NoRef>
-    struct Foo {
-      T t = I;
-      C<int> x;
-    };
-  )cpp";
-  auto Index = std::make_shared<Indexer>();
-  IndexingOptions Opts;
-  tooling::runToolOnCode(std::make_unique<IndexAction>(Index, Opts), Code);
-  EXPECT_THAT(Index->Symbols, AllOf(Not(Contains(QName("Foo::T"))),
-                                    Not(Contains(QName("Foo::I"))),
-                                    Not(Contains(QName("Foo::C"))),
-                                    Not(Contains(QName("Foo::NoRef")))));
-
-  Opts.IndexTemplateParameters = true;
-  Index->Symbols.clear();
-  tooling::runToolOnCode(std::make_unique<IndexAction>(Index, Opts), Code);
-  EXPECT_THAT(Index->Symbols,
-              AllOf(Contains(AllOf(QName("Foo::T"),
-                                   Kind(SymbolKind::TemplateTypeParm))),
-                    Contains(AllOf(QName("Foo::I"),
-                                   Kind(SymbolKind::NonTypeTemplateParm))),
-                    Contains(AllOf(QName("Foo::C"),
-                                   Kind(SymbolKind::TemplateTemplateParm))),
-                    Contains(QName("Foo::NoRef"))));
-}
-
-TEST(IndexTest, UsingDecls) {
-  std::string Code = R"cpp(
-    void foo(int bar);
-    namespace std {
-      using ::foo;
-    }
-  )cpp";
-  auto Index = std::make_shared<Indexer>();
-  IndexingOptions Opts;
-  tooling::runToolOnCode(std::make_unique<IndexAction>(Index, Opts), Code);
-  EXPECT_THAT(Index->Symbols,
-              Contains(AllOf(QName("std::foo"), Kind(SymbolKind::Using))));
-}
-
-TEST(IndexTest, Constructors) {
-  std::string Code = R"cpp(
-    struct Foo {
-      Foo(int);
-      ~Foo();
-    };
-  )cpp";
-  auto Index = std::make_shared<Indexer>();
-  IndexingOptions Opts;
-  tooling::runToolOnCode(std::make_unique<IndexAction>(Index, Opts), Code);
-  EXPECT_THAT(
-      Index->Symbols,
-      UnorderedElementsAre(
-          AllOf(QName("Foo"), Kind(SymbolKind::Struct),
-                WrittenAt(Position(2, 12))),
-          AllOf(QName("Foo::Foo"), Kind(SymbolKind::Constructor),
-                WrittenAt(Position(3, 7))),
-          AllOf(QName("Foo"), Kind(SymbolKind::Struct),
-                HasRole(SymbolRole::NameReference), WrittenAt(Position(3, 7))),
-          AllOf(QName("Foo::~Foo"), Kind(SymbolKind::Destructor),
-                WrittenAt(Position(4, 7))),
-          AllOf(QName("Foo"), Kind(SymbolKind::Struct),
-                HasRole(SymbolRole::NameReference),
-                WrittenAt(Position(4, 8)))));
-}
-
-TEST(IndexTest, InjecatedNameClass) {
-  std::string Code = R"cpp(
-    template <typename T>
-    class Foo {
-      void f(Foo x);
-    };
-  )cpp";
-  auto Index = std::make_shared<Indexer>();
-  IndexingOptions Opts;
-  tooling::runToolOnCode(std::make_unique<IndexAction>(Index, Opts), Code);
-  EXPECT_THAT(Index->Symbols,
-              UnorderedElementsAre(AllOf(QName("Foo"), Kind(SymbolKind::Class),
-                                         WrittenAt(Position(3, 11))),
-                                   AllOf(QName("Foo::f"),
-                                         Kind(SymbolKind::InstanceMethod),
-                                         WrittenAt(Position(4, 12))),
-                                   AllOf(QName("Foo"), Kind(SymbolKind::Class),
-                                         HasRole(SymbolRole::Reference),
-                                         WrittenAt(Position(4, 14)))));
-}
-
-TEST(IndexTest, VisitDefaultArgs) {
-  std::string Code = R"cpp(
-    int var = 0;
-    void f(int s = var) {}
-  )cpp";
-  auto Index = std::make_shared<Indexer>();
-  IndexingOptions Opts;
-  Opts.IndexFunctionLocals = true;
-  Opts.IndexParametersInDeclarations = true;
-  tooling::runToolOnCode(std::make_unique<IndexAction>(Index, Opts), Code);
-  EXPECT_THAT(Index->Symbols,
-              Contains(AllOf(QName("var"), HasRole(SymbolRole::Reference),
-                             WrittenAt(Position(3, 20)))));
-}
-
-TEST(IndexTest, RelationBaseOf) {
-  std::string Code = R"cpp(
-    class A {};
-    template <typename> class B {};
-    class C : B<A> {};
-  )cpp";
-  auto Index = std::make_shared<Indexer>();
-  tooling::runToolOnCode(std::make_unique<IndexAction>(Index), Code);
-  // A should not be the base of anything.
-  EXPECT_THAT(Index->Symbols,
-              Contains(AllOf(QName("A"), HasRole(SymbolRole::Reference),
-                             Not(HasRole(SymbolRole::RelationBaseOf)))));
-}
-
-} // namespace
-} // namespace index
-} // namespace clang
diff --git a/gnu/llvm/clang/unittests/Interpreter/CMakeLists.txt b/gnu/llvm/clang/unittests/Interpreter/CMakeLists.txt
deleted file mode 100644
index ec5e62b989c..00000000000
--- a/gnu/llvm/clang/unittests/Interpreter/CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  Core
-  )
-
-add_clang_unittest(ClangReplInterpreterTests
-  IncrementalProcessingTest.cpp
-  InterpreterTest.cpp
-  )
-target_link_libraries(ClangReplInterpreterTests PUBLIC
-  clangAST
-  clangBasic
-  clangInterpreter
-  clangFrontend
-  )
diff --git a/gnu/llvm/clang/unittests/Interpreter/IncrementalProcessingTest.cpp b/gnu/llvm/clang/unittests/Interpreter/IncrementalProcessingTest.cpp
deleted file mode 100644
index b7ad468e14c..00000000000
--- a/gnu/llvm/clang/unittests/Interpreter/IncrementalProcessingTest.cpp
+++ /dev/null
@@ -1,80 +0,0 @@
-//=== unittests/CodeGen/IncrementalProcessingTest.cpp - IncrementalCodeGen ===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/AST/ASTConsumer.h"
-#include "clang/AST/ASTContext.h"
-#include "clang/AST/RecursiveASTVisitor.h"
-#include "clang/Basic/TargetInfo.h"
-#include "clang/CodeGen/ModuleBuilder.h"
-#include "clang/Frontend/CompilerInstance.h"
-#include "clang/Interpreter/Interpreter.h"
-#include "clang/Lex/Preprocessor.h"
-#include "clang/Parse/Parser.h"
-#include "clang/Sema/Sema.h"
-#include "llvm/ADT/Triple.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/IR/Module.h"
-#include "llvm/Support/Host.h"
-#include "llvm/Support/MemoryBuffer.h"
-#include "gtest/gtest.h"
-
-#include <memory>
-
-using namespace llvm;
-using namespace clang;
-
-namespace {
-
-// Incremental processing produces several modules, all using the same "main
-// file". Make sure CodeGen can cope with that, e.g. for static initializers.
-const char TestProgram1[] = "extern \"C\" int funcForProg1() { return 17; }\n"
-                            "struct EmitCXXGlobalInitFunc1 {\n"
-                            "   EmitCXXGlobalInitFunc1() {}\n"
-                            "} test1;";
-
-const char TestProgram2[] = "extern \"C\" int funcForProg2() { return 42; }\n"
-                            "struct EmitCXXGlobalInitFunc2 {\n"
-                            "   EmitCXXGlobalInitFunc2() {}\n"
-                            "} test2;";
-
-const Function *getGlobalInit(llvm::Module *M) {
-  for (const auto &Func : *M)
-    if (Func.hasName() && Func.getName().startswith("_GLOBAL__sub_I_"))
-      return &Func;
-
-  return nullptr;
-}
-
-TEST(IncrementalProcessing, EmitCXXGlobalInitFunc) {
-  std::vector<const char *> ClangArgv = {"-Xclang", "-emit-llvm-only"};
-  auto CI = llvm::cantFail(IncrementalCompilerBuilder::create(ClangArgv));
-  auto Interp = llvm::cantFail(Interpreter::create(std::move(CI)));
-
-  std::array<clang::PartialTranslationUnit *, 2> PTUs;
-
-  PTUs[0] = &llvm::cantFail(Interp->Parse(TestProgram1));
-  ASSERT_TRUE(PTUs[0]->TheModule);
-  ASSERT_TRUE(PTUs[0]->TheModule->getFunction("funcForProg1"));
-
-  PTUs[1] = &llvm::cantFail(Interp->Parse(TestProgram2));
-  ASSERT_TRUE(PTUs[1]->TheModule);
-  ASSERT_TRUE(PTUs[1]->TheModule->getFunction("funcForProg2"));
-  // First code should not end up in second module:
-  ASSERT_FALSE(PTUs[1]->TheModule->getFunction("funcForProg1"));
-
-  // Make sure global inits exist and are unique:
-  const Function *GlobalInit1 = getGlobalInit(PTUs[0]->TheModule.get());
-  ASSERT_TRUE(GlobalInit1);
-
-  const Function *GlobalInit2 = getGlobalInit(PTUs[1]->TheModule.get());
-  ASSERT_TRUE(GlobalInit2);
-
-  ASSERT_FALSE(GlobalInit1->getName() == GlobalInit2->getName());
-}
-
-} // end anonymous namespace
diff --git a/gnu/llvm/clang/unittests/Interpreter/InterpreterTest.cpp b/gnu/llvm/clang/unittests/Interpreter/InterpreterTest.cpp
deleted file mode 100644
index 6ce43748ae0..00000000000
--- a/gnu/llvm/clang/unittests/Interpreter/InterpreterTest.cpp
+++ /dev/null
@@ -1,128 +0,0 @@
-//===- unittests/Interpreter/InterpreterTest.cpp --- Interpreter tests ----===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// Unit tests for Clang's Interpreter library.
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/Interpreter/Interpreter.h"
-
-#include "clang/AST/Decl.h"
-#include "clang/AST/DeclGroup.h"
-#include "clang/Frontend/CompilerInstance.h"
-#include "clang/Frontend/TextDiagnosticPrinter.h"
-
-#include "llvm/ADT/ArrayRef.h"
-
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-
-using namespace clang;
-
-namespace {
-using Args = std::vector<const char *>;
-static std::unique_ptr<Interpreter>
-createInterpreter(const Args &ExtraArgs = {},
-                  DiagnosticConsumer *Client = nullptr) {
-  Args ClangArgs = {"-Xclang", "-emit-llvm-only"};
-  ClangArgs.insert(ClangArgs.end(), ExtraArgs.begin(), ExtraArgs.end());
-  auto CI = cantFail(clang::IncrementalCompilerBuilder::create(ClangArgs));
-  if (Client)
-    CI->getDiagnostics().setClient(Client, /*ShouldOwnClient=*/false);
-  return cantFail(clang::Interpreter::create(std::move(CI)));
-}
-
-static size_t DeclsSize(TranslationUnitDecl *PTUDecl) {
-  return std::distance(PTUDecl->decls().begin(), PTUDecl->decls().end());
-}
-
-TEST(InterpreterTest, Sanity) {
-  std::unique_ptr<Interpreter> Interp = createInterpreter();
-
-  using PTU = PartialTranslationUnit;
-
-  PTU &R1(cantFail(Interp->Parse("void g(); void g() {}")));
-  EXPECT_EQ(2U, DeclsSize(R1.TUPart));
-
-  PTU &R2(cantFail(Interp->Parse("int i;")));
-  EXPECT_EQ(1U, DeclsSize(R2.TUPart));
-}
-
-static std::string DeclToString(Decl *D) {
-  return llvm::cast<NamedDecl>(D)->getQualifiedNameAsString();
-}
-
-TEST(InterpreterTest, IncrementalInputTopLevelDecls) {
-  std::unique_ptr<Interpreter> Interp = createInterpreter();
-  auto R1 = Interp->Parse("int var1 = 42; int f() { return var1; }");
-  // gtest doesn't expand into explicit bool conversions.
-  EXPECT_TRUE(!!R1);
-  auto R1DeclRange = R1->TUPart->decls();
-  EXPECT_EQ(2U, DeclsSize(R1->TUPart));
-  EXPECT_EQ("var1", DeclToString(*R1DeclRange.begin()));
-  EXPECT_EQ("f", DeclToString(*(++R1DeclRange.begin())));
-
-  auto R2 = Interp->Parse("int var2 = f();");
-  EXPECT_TRUE(!!R2);
-  auto R2DeclRange = R2->TUPart->decls();
-  EXPECT_EQ(1U, DeclsSize(R2->TUPart));
-  EXPECT_EQ("var2", DeclToString(*R2DeclRange.begin()));
-}
-
-TEST(InterpreterTest, Errors) {
-  Args ExtraArgs = {"-Xclang", "-diagnostic-log-file", "-Xclang", "-"};
-
-  // Create the diagnostic engine with unowned consumer.
-  std::string DiagnosticOutput;
-  llvm::raw_string_ostream DiagnosticsOS(DiagnosticOutput);
-  auto DiagPrinter = std::make_unique<TextDiagnosticPrinter>(
-      DiagnosticsOS, new DiagnosticOptions());
-
-  auto Interp = createInterpreter(ExtraArgs, DiagPrinter.get());
-  auto Err = Interp->Parse("intentional_error v1 = 42; ").takeError();
-  using ::testing::HasSubstr;
-  EXPECT_THAT(DiagnosticsOS.str(),
-              HasSubstr("error: unknown type name 'intentional_error'"));
-  EXPECT_EQ("Parsing failed.", llvm::toString(std::move(Err)));
-
-  auto RecoverErr = Interp->Parse("int var1 = 42;");
-  EXPECT_TRUE(!!RecoverErr);
-}
-
-// Here we test whether the user can mix declarations and statements. The
-// interpreter should be smart enough to recognize the declarations from the
-// statements and wrap the latter into a declaration, producing valid code.
-TEST(InterpreterTest, DeclsAndStatements) {
-  Args ExtraArgs = {"-Xclang", "-diagnostic-log-file", "-Xclang", "-"};
-
-  // Create the diagnostic engine with unowned consumer.
-  std::string DiagnosticOutput;
-  llvm::raw_string_ostream DiagnosticsOS(DiagnosticOutput);
-  auto DiagPrinter = std::make_unique<TextDiagnosticPrinter>(
-      DiagnosticsOS, new DiagnosticOptions());
-
-  auto Interp = createInterpreter(ExtraArgs, DiagPrinter.get());
-  auto R1 = Interp->Parse(
-      "int var1 = 42; extern \"C\" int printf(const char*, ...);");
-  // gtest doesn't expand into explicit bool conversions.
-  EXPECT_TRUE(!!R1);
-
-  auto *PTU1 = R1->TUPart;
-  EXPECT_EQ(2U, DeclsSize(PTU1));
-
-  // FIXME: Add support for wrapping and running statements.
-  auto R2 = Interp->Parse("var1++; printf(\"var1 value %d\\n\", var1);");
-  EXPECT_FALSE(!!R2);
-  using ::testing::HasSubstr;
-  EXPECT_THAT(DiagnosticsOS.str(),
-              HasSubstr("error: unknown type name 'var1'"));
-  auto Err = R2.takeError();
-  EXPECT_EQ("Parsing failed.", llvm::toString(std::move(Err)));
-}
-
-} // end anonymous namespace
diff --git a/gnu/llvm/clang/unittests/Introspection/CMakeLists.txt b/gnu/llvm/clang/unittests/Introspection/CMakeLists.txt
deleted file mode 100644
index f9c55c5edfc..00000000000
--- a/gnu/llvm/clang/unittests/Introspection/CMakeLists.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  FrontendOpenMP
-  Support
-  )
-
-add_clang_unittest(IntrospectionTests
-  IntrospectionTest.cpp
-  )
-
-clang_target_link_libraries(IntrospectionTests
-  PRIVATE
-  clangAST
-  clangASTMatchers
-  clangTooling
-  clangBasic
-  clangSerialization
-  clangFrontend
-  )
-target_link_libraries(IntrospectionTests
-  PRIVATE
-  LLVMTestingSupport
-)
diff --git a/gnu/llvm/clang/unittests/Introspection/IntrospectionTest.cpp b/gnu/llvm/clang/unittests/Introspection/IntrospectionTest.cpp
deleted file mode 100644
index d4f626bfeb7..00000000000
--- a/gnu/llvm/clang/unittests/Introspection/IntrospectionTest.cpp
+++ /dev/null
@@ -1,1606 +0,0 @@
-//===- unittest/Introspection/IntrospectionTest.cpp ----------*- C++ -*---===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// Tests for AST location API introspection.
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/AST/ASTContext.h"
-#include "clang/ASTMatchers/ASTMatchFinder.h"
-#include "clang/ASTMatchers/ASTMatchers.h"
-#include "clang/Tooling/NodeIntrospection.h"
-#include "clang/Tooling/Tooling.h"
-#include "gmock/gmock-matchers.h"
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-
-using namespace clang;
-using namespace clang::ast_matchers;
-using namespace clang::tooling;
-
-using ::testing::Pair;
-using ::testing::UnorderedElementsAre;
-
-template <typename T, typename MapType>
-std::vector<std::pair<std::string, T>>
-FormatExpected(const MapType &Accessors) {
-  std::vector<std::pair<std::string, T>> Result;
-  llvm::transform(llvm::make_filter_range(Accessors,
-                                          [](const auto &Accessor) {
-                                            return Accessor.first.isValid();
-                                          }),
-                  std::back_inserter(Result), [](const auto &Accessor) {
-                    return std::make_pair(
-                        LocationCallFormatterCpp::format(*Accessor.second),
-                        Accessor.first);
-                  });
-  return Result;
-}
-
-#define STRING_LOCATION_PAIR(INSTANCE, LOC) Pair(#LOC, INSTANCE->LOC)
-
-#define STRING_LOCATION_STDPAIR(INSTANCE, LOC)                                 \
-  std::make_pair(std::string(#LOC), INSTANCE->LOC)
-
-/**
-  A test formatter for a hypothetical language which needs
-  neither casts nor '->'.
-*/
-class LocationCallFormatterSimple {
-public:
-  static void print(const LocationCall &Call, llvm::raw_ostream &OS) {
-    if (Call.isCast()) {
-      if (const LocationCall *On = Call.on())
-        print(*On, OS);
-      return;
-    }
-    if (const LocationCall *On = Call.on()) {
-      print(*On, OS);
-      OS << '.';
-    }
-    OS << Call.name() << "()";
-  }
-
-  static std::string format(const LocationCall &Call) {
-    std::string Result;
-    llvm::raw_string_ostream OS(Result);
-    print(Call, OS);
-    OS.flush();
-    return Result;
-  }
-};
-
-TEST(Introspection, SourceLocations_CallContainer) {
-  SourceLocationMap slm;
-  SharedLocationCall Prefix;
-  slm.insert(std::make_pair(
-      SourceLocation(),
-      llvm::makeIntrusiveRefCnt<LocationCall>(Prefix, "getSourceRange")));
-  EXPECT_EQ(slm.size(), 1u);
-
-  auto callTypeLoc =
-      llvm::makeIntrusiveRefCnt<LocationCall>(Prefix, "getTypeLoc");
-  slm.insert(std::make_pair(
-      SourceLocation(),
-      llvm::makeIntrusiveRefCnt<LocationCall>(callTypeLoc, "getSourceRange")));
-  EXPECT_EQ(slm.size(), 2u);
-}
-
-TEST(Introspection, SourceLocations_CallContainer2) {
-  SourceRangeMap slm;
-  SharedLocationCall Prefix;
-  slm.insert(
-      std::make_pair(SourceRange(), llvm::makeIntrusiveRefCnt<LocationCall>(
-                                        Prefix, "getCXXOperatorNameRange")));
-  EXPECT_EQ(slm.size(), 1u);
-
-  slm.insert(std::make_pair(
-      SourceRange(),
-      llvm::makeIntrusiveRefCnt<LocationCall>(Prefix, "getSourceRange")));
-  EXPECT_EQ(slm.size(), 2u);
-}
-
-TEST(Introspection, SourceLocations_CallChainFormatting) {
-  SharedLocationCall Prefix;
-  auto chainedCall = llvm::makeIntrusiveRefCnt<LocationCall>(
-      llvm::makeIntrusiveRefCnt<LocationCall>(Prefix, "getTypeLoc"),
-      "getSourceRange");
-  EXPECT_EQ(LocationCallFormatterCpp::format(*chainedCall),
-            "getTypeLoc().getSourceRange()");
-}
-
-TEST(Introspection, SourceLocations_Formatter) {
-  SharedLocationCall Prefix;
-  auto chainedCall = llvm::makeIntrusiveRefCnt<LocationCall>(
-      llvm::makeIntrusiveRefCnt<LocationCall>(
-          llvm::makeIntrusiveRefCnt<LocationCall>(
-              llvm::makeIntrusiveRefCnt<LocationCall>(
-                  Prefix, "getTypeSourceInfo", LocationCall::ReturnsPointer),
-              "getTypeLoc"),
-          "getAs<clang::TypeSpecTypeLoc>", LocationCall::IsCast),
-      "getNameLoc");
-
-  EXPECT_EQ("getTypeSourceInfo()->getTypeLoc().getAs<clang::TypeSpecTypeLoc>()."
-            "getNameLoc()",
-            LocationCallFormatterCpp::format(*chainedCall));
-  EXPECT_EQ("getTypeSourceInfo().getTypeLoc().getNameLoc()",
-            LocationCallFormatterSimple::format(*chainedCall));
-}
-
-TEST(Introspection, SourceLocations_Stmt) {
-  if (!NodeIntrospection::hasIntrospectionSupport())
-    return;
-  auto AST = buildASTFromCode("void foo() {} void bar() { foo(); }", "foo.cpp",
-                              std::make_shared<PCHContainerOperations>());
-  auto &Ctx = AST->getASTContext();
-  auto &TU = *Ctx.getTranslationUnitDecl();
-
-  auto BoundNodes = ast_matchers::match(
-      decl(hasDescendant(
-          callExpr(callee(functionDecl(hasName("foo")))).bind("fooCall"))),
-      TU, Ctx);
-
-  EXPECT_EQ(BoundNodes.size(), 1u);
-
-  auto *FooCall = BoundNodes[0].getNodeAs<CallExpr>("fooCall");
-
-  auto Result = NodeIntrospection::GetLocations(FooCall);
-
-  auto ExpectedLocations =
-    FormatExpected<SourceLocation>(Result.LocationAccessors);
-
-  EXPECT_THAT(
-      ExpectedLocations,
-      UnorderedElementsAre(STRING_LOCATION_PAIR(FooCall, getBeginLoc()),
-                           STRING_LOCATION_PAIR(FooCall, getEndLoc()),
-                           STRING_LOCATION_PAIR(FooCall, getExprLoc()),
-                           STRING_LOCATION_PAIR(FooCall, getRParenLoc())));
-
-  auto ExpectedRanges = FormatExpected<SourceRange>(Result.RangeAccessors);
-
-  EXPECT_THAT(ExpectedRanges, UnorderedElementsAre(STRING_LOCATION_PAIR(
-                                  FooCall, getSourceRange())));
-}
-
-TEST(Introspection, SourceLocations_Decl) {
-  if (!NodeIntrospection::hasIntrospectionSupport())
-    return;
-  auto AST =
-      buildASTFromCode(R"cpp(
-namespace ns1 {
-namespace ns2 {
-template <typename T, typename U> struct Foo {};
-template <typename T, typename U> struct Bar {
-  struct Nested {
-    template <typename A, typename B>
-    Foo<A, B> method(int i, bool b) const noexcept(true);
-  };
-};
-} // namespace ns2
-} // namespace ns1
-
-template <typename T, typename U>
-template <typename A, typename B>
-ns1::ns2::Foo<A, B> ns1::ns2::Bar<T, U>::Nested::method(int i, bool b) const
-    noexcept(true) {}
-)cpp",
-                       "foo.cpp", std::make_shared<PCHContainerOperations>());
-  auto &Ctx = AST->getASTContext();
-  auto &TU = *Ctx.getTranslationUnitDecl();
-
-  auto BoundNodes = ast_matchers::match(
-      decl(hasDescendant(
-          cxxMethodDecl(hasName("method"), isDefinition()).bind("method"))),
-      TU, Ctx);
-
-  EXPECT_EQ(BoundNodes.size(), 1u);
-
-  const auto *MethodDecl = BoundNodes[0].getNodeAs<CXXMethodDecl>("method");
-
-  auto Result = NodeIntrospection::GetLocations(MethodDecl);
-
-  auto ExpectedLocations =
-      FormatExpected<SourceLocation>(Result.LocationAccessors);
-
-  llvm::sort(ExpectedLocations);
-
-  // clang-format off
-  std::vector<std::pair<std::string, SourceLocation>> ActualLocations{
-STRING_LOCATION_STDPAIR(MethodDecl, getBeginLoc()),
-STRING_LOCATION_STDPAIR(MethodDecl, getBodyRBrace()),
-STRING_LOCATION_STDPAIR(MethodDecl, getEndLoc()),
-STRING_LOCATION_STDPAIR(MethodDecl, getInnerLocStart()),
-STRING_LOCATION_STDPAIR(MethodDecl, getLocation()),
-STRING_LOCATION_STDPAIR(MethodDecl, getNameInfo().getBeginLoc()),
-STRING_LOCATION_STDPAIR(MethodDecl, getNameInfo().getEndLoc()),
-STRING_LOCATION_STDPAIR(MethodDecl, getNameInfo().getLoc()),
-STRING_LOCATION_STDPAIR(MethodDecl, getOuterLocStart()),
-STRING_LOCATION_STDPAIR(MethodDecl, getQualifierLoc().getBeginLoc()),
-STRING_LOCATION_STDPAIR(MethodDecl, getQualifierLoc().getEndLoc()),
-STRING_LOCATION_STDPAIR(MethodDecl, getQualifierLoc().getLocalBeginLoc()),
-STRING_LOCATION_STDPAIR(MethodDecl, getQualifierLoc().getLocalEndLoc()),
-STRING_LOCATION_STDPAIR(MethodDecl, getQualifierLoc().getPrefix().getBeginLoc()),
-STRING_LOCATION_STDPAIR(MethodDecl, getQualifierLoc().getPrefix().getEndLoc()),
-STRING_LOCATION_STDPAIR(MethodDecl, getQualifierLoc().getPrefix().getLocalBeginLoc()),
-STRING_LOCATION_STDPAIR(MethodDecl, getQualifierLoc().getPrefix().getLocalEndLoc()),
-STRING_LOCATION_STDPAIR(MethodDecl, getQualifierLoc().getPrefix().getPrefix().getBeginLoc()),
-STRING_LOCATION_STDPAIR(MethodDecl, getQualifierLoc().getPrefix().getPrefix().getEndLoc()),
-STRING_LOCATION_STDPAIR(MethodDecl, getQualifierLoc().getPrefix().getPrefix().getLocalBeginLoc()),
-STRING_LOCATION_STDPAIR(MethodDecl, getQualifierLoc().getPrefix().getPrefix().getLocalEndLoc()),
-STRING_LOCATION_STDPAIR(MethodDecl, getQualifierLoc().getPrefix().getPrefix().getPrefix().getBeginLoc()),
-STRING_LOCATION_STDPAIR(MethodDecl, getQualifierLoc().getPrefix().getPrefix().getPrefix().getEndLoc()),
-STRING_LOCATION_STDPAIR(MethodDecl, getQualifierLoc().getPrefix().getPrefix().getPrefix().getLocalBeginLoc()),
-STRING_LOCATION_STDPAIR(MethodDecl, getQualifierLoc().getPrefix().getPrefix().getPrefix().getLocalEndLoc()),
-STRING_LOCATION_STDPAIR(MethodDecl, getQualifierLoc().getPrefix().getTypeLoc().getAs<clang::TemplateSpecializationTypeLoc>().getLAngleLoc()),
-STRING_LOCATION_STDPAIR(MethodDecl, getQualifierLoc().getPrefix().getTypeLoc().getAs<clang::TemplateSpecializationTypeLoc>().getRAngleLoc()),
-STRING_LOCATION_STDPAIR(MethodDecl, getQualifierLoc().getPrefix().getTypeLoc().getAs<clang::TemplateSpecializationTypeLoc>().getTemplateNameLoc()),
-STRING_LOCATION_STDPAIR(MethodDecl, getQualifierLoc().getPrefix().getTypeLoc().getBeginLoc()),
-STRING_LOCATION_STDPAIR(MethodDecl, getQualifierLoc().getPrefix().getTypeLoc().getEndLoc()),
-STRING_LOCATION_STDPAIR(MethodDecl, getQualifierLoc().getTypeLoc().getAs<clang::TypeSpecTypeLoc>().getNameLoc()),
-STRING_LOCATION_STDPAIR(MethodDecl, getQualifierLoc().getTypeLoc().getBeginLoc()),
-STRING_LOCATION_STDPAIR(MethodDecl, getQualifierLoc().getTypeLoc().getEndLoc()),
-STRING_LOCATION_STDPAIR(MethodDecl, getTypeSourceInfo()->getTypeLoc().getAs<clang::FunctionTypeLoc>().getLParenLoc()),
-STRING_LOCATION_STDPAIR(MethodDecl, getTypeSourceInfo()->getTypeLoc().getAs<clang::FunctionTypeLoc>().getLocalRangeBegin()),
-STRING_LOCATION_STDPAIR(MethodDecl, getTypeSourceInfo()->getTypeLoc().getAs<clang::FunctionTypeLoc>().getLocalRangeEnd()),
-STRING_LOCATION_STDPAIR(MethodDecl, getTypeSourceInfo()->getTypeLoc().getAs<clang::FunctionTypeLoc>().getRParenLoc()),
-STRING_LOCATION_STDPAIR(MethodDecl, getTypeSourceInfo()->getTypeLoc().getAs<clang::FunctionTypeLoc>().getReturnLoc().getAs<clang::ElaboratedTypeLoc>().getNamedTypeLoc().getAs<clang::TemplateSpecializationTypeLoc>().getLAngleLoc()),
-STRING_LOCATION_STDPAIR(MethodDecl, getTypeSourceInfo()->getTypeLoc().getAs<clang::FunctionTypeLoc>().getReturnLoc().getAs<clang::ElaboratedTypeLoc>().getNamedTypeLoc().getAs<clang::TemplateSpecializationTypeLoc>().getRAngleLoc()),
-STRING_LOCATION_STDPAIR(MethodDecl, getTypeSourceInfo()->getTypeLoc().getAs<clang::FunctionTypeLoc>().getReturnLoc().getAs<clang::ElaboratedTypeLoc>().getNamedTypeLoc().getAs<clang::TemplateSpecializationTypeLoc>().getTemplateNameLoc()),
-STRING_LOCATION_STDPAIR(MethodDecl, getTypeSourceInfo()->getTypeLoc().getAs<clang::FunctionTypeLoc>().getReturnLoc().getAs<clang::ElaboratedTypeLoc>().getNamedTypeLoc().getBeginLoc()),
-STRING_LOCATION_STDPAIR(MethodDecl, getTypeSourceInfo()->getTypeLoc().getAs<clang::FunctionTypeLoc>().getReturnLoc().getAs<clang::ElaboratedTypeLoc>().getNamedTypeLoc().getEndLoc()),
-STRING_LOCATION_STDPAIR(MethodDecl, getTypeSourceInfo()->getTypeLoc().getAs<clang::FunctionTypeLoc>().getReturnLoc().getAs<clang::ElaboratedTypeLoc>().getQualifierLoc().getBeginLoc()),
-STRING_LOCATION_STDPAIR(MethodDecl, getTypeSourceInfo()->getTypeLoc().getAs<clang::FunctionTypeLoc>().getReturnLoc().getAs<clang::ElaboratedTypeLoc>().getQualifierLoc().getEndLoc()),
-STRING_LOCATION_STDPAIR(MethodDecl, getTypeSourceInfo()->getTypeLoc().getAs<clang::FunctionTypeLoc>().getReturnLoc().getAs<clang::ElaboratedTypeLoc>().getQualifierLoc().getLocalBeginLoc()),
-STRING_LOCATION_STDPAIR(MethodDecl, getTypeSourceInfo()->getTypeLoc().getAs<clang::FunctionTypeLoc>().getReturnLoc().getAs<clang::ElaboratedTypeLoc>().getQualifierLoc().getLocalEndLoc()),
-STRING_LOCATION_STDPAIR(MethodDecl, getTypeSourceInfo()->getTypeLoc().getAs<clang::FunctionTypeLoc>().getReturnLoc().getAs<clang::ElaboratedTypeLoc>().getQualifierLoc().getPrefix().getBeginLoc()),
-STRING_LOCATION_STDPAIR(MethodDecl, getTypeSourceInfo()->getTypeLoc().getAs<clang::FunctionTypeLoc>().getReturnLoc().getAs<clang::ElaboratedTypeLoc>().getQualifierLoc().getPrefix().getEndLoc()),
-STRING_LOCATION_STDPAIR(MethodDecl, getTypeSourceInfo()->getTypeLoc().getAs<clang::FunctionTypeLoc>().getReturnLoc().getAs<clang::ElaboratedTypeLoc>().getQualifierLoc().getPrefix().getLocalBeginLoc()),
-STRING_LOCATION_STDPAIR(MethodDecl, getTypeSourceInfo()->getTypeLoc().getAs<clang::FunctionTypeLoc>().getReturnLoc().getAs<clang::ElaboratedTypeLoc>().getQualifierLoc().getPrefix().getLocalEndLoc()),
-STRING_LOCATION_STDPAIR(MethodDecl, getTypeSourceInfo()->getTypeLoc().getAs<clang::FunctionTypeLoc>().getReturnLoc().getBeginLoc()),
-STRING_LOCATION_STDPAIR(MethodDecl, getTypeSourceInfo()->getTypeLoc().getAs<clang::FunctionTypeLoc>().getReturnLoc().getEndLoc()),
-STRING_LOCATION_STDPAIR(MethodDecl, getTypeSourceInfo()->getTypeLoc().getAs<clang::FunctionTypeLoc>().getReturnLoc().getNextTypeLoc().getAs<clang::TemplateSpecializationTypeLoc>().getLAngleLoc()),
-STRING_LOCATION_STDPAIR(MethodDecl, getTypeSourceInfo()->getTypeLoc().getAs<clang::FunctionTypeLoc>().getReturnLoc().getNextTypeLoc().getAs<clang::TemplateSpecializationTypeLoc>().getRAngleLoc()),
-STRING_LOCATION_STDPAIR(MethodDecl, getTypeSourceInfo()->getTypeLoc().getAs<clang::FunctionTypeLoc>().getReturnLoc().getNextTypeLoc().getAs<clang::TemplateSpecializationTypeLoc>().getTemplateNameLoc()),
-STRING_LOCATION_STDPAIR(MethodDecl, getTypeSourceInfo()->getTypeLoc().getAs<clang::FunctionTypeLoc>().getReturnLoc().getNextTypeLoc().getBeginLoc()),
-STRING_LOCATION_STDPAIR(MethodDecl, getTypeSourceInfo()->getTypeLoc().getAs<clang::FunctionTypeLoc>().getReturnLoc().getNextTypeLoc().getEndLoc()),
-STRING_LOCATION_STDPAIR(MethodDecl, getTypeSourceInfo()->getTypeLoc().getBeginLoc()),
-STRING_LOCATION_STDPAIR(MethodDecl, getTypeSourceInfo()->getTypeLoc().getEndLoc()),
-STRING_LOCATION_STDPAIR(MethodDecl, getTypeSourceInfo()->getTypeLoc().getNextTypeLoc().getAs<clang::ElaboratedTypeLoc>().getNamedTypeLoc().getAs<clang::TemplateSpecializationTypeLoc>().getLAngleLoc()),
-STRING_LOCATION_STDPAIR(MethodDecl, getTypeSourceInfo()->getTypeLoc().getNextTypeLoc().getAs<clang::ElaboratedTypeLoc>().getNamedTypeLoc().getAs<clang::TemplateSpecializationTypeLoc>().getRAngleLoc()),
-STRING_LOCATION_STDPAIR(MethodDecl, getTypeSourceInfo()->getTypeLoc().getNextTypeLoc().getAs<clang::ElaboratedTypeLoc>().getNamedTypeLoc().getAs<clang::TemplateSpecializationTypeLoc>().getTemplateNameLoc()),
-STRING_LOCATION_STDPAIR(MethodDecl, getTypeSourceInfo()->getTypeLoc().getNextTypeLoc().getAs<clang::ElaboratedTypeLoc>().getNamedTypeLoc().getBeginLoc()),
-STRING_LOCATION_STDPAIR(MethodDecl, getTypeSourceInfo()->getTypeLoc().getNextTypeLoc().getAs<clang::ElaboratedTypeLoc>().getNamedTypeLoc().getEndLoc()),
-STRING_LOCATION_STDPAIR(MethodDecl, getTypeSourceInfo()->getTypeLoc().getNextTypeLoc().getAs<clang::ElaboratedTypeLoc>().getQualifierLoc().getBeginLoc()),
-STRING_LOCATION_STDPAIR(MethodDecl, getTypeSourceInfo()->getTypeLoc().getNextTypeLoc().getAs<clang::ElaboratedTypeLoc>().getQualifierLoc().getEndLoc()),
-STRING_LOCATION_STDPAIR(MethodDecl, getTypeSourceInfo()->getTypeLoc().getNextTypeLoc().getAs<clang::ElaboratedTypeLoc>().getQualifierLoc().getLocalBeginLoc()),
-STRING_LOCATION_STDPAIR(MethodDecl, getTypeSourceInfo()->getTypeLoc().getNextTypeLoc().getAs<clang::ElaboratedTypeLoc>().getQualifierLoc().getLocalEndLoc()),
-STRING_LOCATION_STDPAIR(MethodDecl, getTypeSourceInfo()->getTypeLoc().getNextTypeLoc().getAs<clang::ElaboratedTypeLoc>().getQualifierLoc().getPrefix().getBeginLoc()),
-STRING_LOCATION_STDPAIR(MethodDecl, getTypeSourceInfo()->getTypeLoc().getNextTypeLoc().getAs<clang::ElaboratedTypeLoc>().getQualifierLoc().getPrefix().getEndLoc()),
-STRING_LOCATION_STDPAIR(MethodDecl, getTypeSourceInfo()->getTypeLoc().getNextTypeLoc().getAs<clang::ElaboratedTypeLoc>().getQualifierLoc().getPrefix().getLocalBeginLoc()),
-STRING_LOCATION_STDPAIR(MethodDecl, getTypeSourceInfo()->getTypeLoc().getNextTypeLoc().getAs<clang::ElaboratedTypeLoc>().getQualifierLoc().getPrefix().getLocalEndLoc()),
-STRING_LOCATION_STDPAIR(MethodDecl, getTypeSourceInfo()->getTypeLoc().getNextTypeLoc().getBeginLoc()),
-STRING_LOCATION_STDPAIR(MethodDecl, getTypeSourceInfo()->getTypeLoc().getNextTypeLoc().getEndLoc()),
-STRING_LOCATION_STDPAIR(MethodDecl, getTypeSourceInfo()->getTypeLoc().getNextTypeLoc().getNextTypeLoc().getAs<clang::TemplateSpecializationTypeLoc>().getLAngleLoc()),
-STRING_LOCATION_STDPAIR(MethodDecl, getTypeSourceInfo()->getTypeLoc().getNextTypeLoc().getNextTypeLoc().getAs<clang::TemplateSpecializationTypeLoc>().getRAngleLoc()),
-STRING_LOCATION_STDPAIR(MethodDecl, getTypeSourceInfo()->getTypeLoc().getNextTypeLoc().getNextTypeLoc().getAs<clang::TemplateSpecializationTypeLoc>().getTemplateNameLoc()),
-STRING_LOCATION_STDPAIR(MethodDecl, getTypeSourceInfo()->getTypeLoc().getNextTypeLoc().getNextTypeLoc().getBeginLoc()),
-STRING_LOCATION_STDPAIR(MethodDecl, getTypeSourceInfo()->getTypeLoc().getNextTypeLoc().getNextTypeLoc().getEndLoc()),
-STRING_LOCATION_STDPAIR(MethodDecl, getTypeSpecEndLoc()),
-STRING_LOCATION_STDPAIR(MethodDecl, getTypeSpecStartLoc())
-  };
-  // clang-format on
-
-  EXPECT_EQ(ExpectedLocations, ActualLocations);
-
-  auto ExpectedRanges = FormatExpected<SourceRange>(Result.RangeAccessors);
-
-  llvm::sort(ExpectedRanges, [](const auto &LHS, const auto &RHS) {
-    return LHS.first < RHS.first;
-  });
-
-  // clang-format off
-  EXPECT_EQ(
-            llvm::makeArrayRef(ExpectedRanges),
-      (ArrayRef<std::pair<std::string, SourceRange>>{
-STRING_LOCATION_STDPAIR(MethodDecl, getExceptionSpecSourceRange()),
-STRING_LOCATION_STDPAIR(MethodDecl, getNameInfo().getSourceRange()),
-STRING_LOCATION_STDPAIR(MethodDecl, getParametersSourceRange()),
-STRING_LOCATION_STDPAIR(MethodDecl, getQualifierLoc().getLocalSourceRange()),
-STRING_LOCATION_STDPAIR(MethodDecl, getQualifierLoc().getPrefix().getLocalSourceRange()),
-STRING_LOCATION_STDPAIR(MethodDecl, getQualifierLoc().getPrefix().getPrefix().getLocalSourceRange()),
-STRING_LOCATION_STDPAIR(MethodDecl, getQualifierLoc().getPrefix().getPrefix().getPrefix().getLocalSourceRange()),
-STRING_LOCATION_STDPAIR(MethodDecl, getQualifierLoc().getPrefix().getPrefix().getPrefix().getSourceRange()),
-STRING_LOCATION_STDPAIR(MethodDecl, getQualifierLoc().getPrefix().getPrefix().getSourceRange()),
-STRING_LOCATION_STDPAIR(MethodDecl, getQualifierLoc().getPrefix().getSourceRange()),
-STRING_LOCATION_STDPAIR(MethodDecl, getQualifierLoc().getPrefix().getTypeLoc().getLocalSourceRange()),
-STRING_LOCATION_STDPAIR(MethodDecl, getQualifierLoc().getPrefix().getTypeLoc().getSourceRange()),
-STRING_LOCATION_STDPAIR(MethodDecl, getQualifierLoc().getSourceRange()),
-STRING_LOCATION_STDPAIR(MethodDecl, getQualifierLoc().getTypeLoc().getLocalSourceRange()),
-STRING_LOCATION_STDPAIR(MethodDecl, getQualifierLoc().getTypeLoc().getSourceRange()),
-STRING_LOCATION_STDPAIR(MethodDecl, getReturnTypeSourceRange()),
-STRING_LOCATION_STDPAIR(MethodDecl, getSourceRange()),
-STRING_LOCATION_STDPAIR(MethodDecl, getTypeSourceInfo()->getTypeLoc().getAs<clang::FunctionTypeLoc>().getExceptionSpecRange()),
-STRING_LOCATION_STDPAIR(MethodDecl, getTypeSourceInfo()->getTypeLoc().getAs<clang::FunctionTypeLoc>().getParensRange()),
-STRING_LOCATION_STDPAIR(MethodDecl, getTypeSourceInfo()->getTypeLoc().getAs<clang::FunctionTypeLoc>().getReturnLoc().getAs<clang::ElaboratedTypeLoc>().getNamedTypeLoc().getLocalSourceRange()),
-STRING_LOCATION_STDPAIR(MethodDecl, getTypeSourceInfo()->getTypeLoc().getAs<clang::FunctionTypeLoc>().getReturnLoc().getAs<clang::ElaboratedTypeLoc>().getNamedTypeLoc().getSourceRange()),
-STRING_LOCATION_STDPAIR(MethodDecl, getTypeSourceInfo()->getTypeLoc().getAs<clang::FunctionTypeLoc>().getReturnLoc().getAs<clang::ElaboratedTypeLoc>().getQualifierLoc().getLocalSourceRange()),
-STRING_LOCATION_STDPAIR(MethodDecl, getTypeSourceInfo()->getTypeLoc().getAs<clang::FunctionTypeLoc>().getReturnLoc().getAs<clang::ElaboratedTypeLoc>().getQualifierLoc().getPrefix().getLocalSourceRange()),
-STRING_LOCATION_STDPAIR(MethodDecl, getTypeSourceInfo()->getTypeLoc().getAs<clang::FunctionTypeLoc>().getReturnLoc().getAs<clang::ElaboratedTypeLoc>().getQualifierLoc().getPrefix().getSourceRange()),
-STRING_LOCATION_STDPAIR(MethodDecl, getTypeSourceInfo()->getTypeLoc().getAs<clang::FunctionTypeLoc>().getReturnLoc().getAs<clang::ElaboratedTypeLoc>().getQualifierLoc().getSourceRange()),
-STRING_LOCATION_STDPAIR(MethodDecl, getTypeSourceInfo()->getTypeLoc().getAs<clang::FunctionTypeLoc>().getReturnLoc().getLocalSourceRange()),
-STRING_LOCATION_STDPAIR(MethodDecl, getTypeSourceInfo()->getTypeLoc().getAs<clang::FunctionTypeLoc>().getReturnLoc().getNextTypeLoc().getLocalSourceRange()),
-STRING_LOCATION_STDPAIR(MethodDecl, getTypeSourceInfo()->getTypeLoc().getAs<clang::FunctionTypeLoc>().getReturnLoc().getNextTypeLoc().getSourceRange()),
-STRING_LOCATION_STDPAIR(MethodDecl, getTypeSourceInfo()->getTypeLoc().getAs<clang::FunctionTypeLoc>().getReturnLoc().getSourceRange()),
-STRING_LOCATION_STDPAIR(MethodDecl, getTypeSourceInfo()->getTypeLoc().getLocalSourceRange()),
-STRING_LOCATION_STDPAIR(MethodDecl, getTypeSourceInfo()->getTypeLoc().getNextTypeLoc().getAs<clang::ElaboratedTypeLoc>().getNamedTypeLoc().getLocalSourceRange()),
-STRING_LOCATION_STDPAIR(MethodDecl, getTypeSourceInfo()->getTypeLoc().getNextTypeLoc().getAs<clang::ElaboratedTypeLoc>().getNamedTypeLoc().getSourceRange()),
-STRING_LOCATION_STDPAIR(MethodDecl, getTypeSourceInfo()->getTypeLoc().getNextTypeLoc().getAs<clang::ElaboratedTypeLoc>().getQualifierLoc().getLocalSourceRange()),
-STRING_LOCATION_STDPAIR(MethodDecl, getTypeSourceInfo()->getTypeLoc().getNextTypeLoc().getAs<clang::ElaboratedTypeLoc>().getQualifierLoc().getPrefix().getLocalSourceRange()),
-STRING_LOCATION_STDPAIR(MethodDecl, getTypeSourceInfo()->getTypeLoc().getNextTypeLoc().getAs<clang::ElaboratedTypeLoc>().getQualifierLoc().getPrefix().getSourceRange()),
-STRING_LOCATION_STDPAIR(MethodDecl, getTypeSourceInfo()->getTypeLoc().getNextTypeLoc().getAs<clang::ElaboratedTypeLoc>().getQualifierLoc().getSourceRange()),
-STRING_LOCATION_STDPAIR(MethodDecl, getTypeSourceInfo()->getTypeLoc().getNextTypeLoc().getLocalSourceRange()),
-STRING_LOCATION_STDPAIR(MethodDecl, getTypeSourceInfo()->getTypeLoc().getNextTypeLoc().getNextTypeLoc().getLocalSourceRange()),
-STRING_LOCATION_STDPAIR(MethodDecl, getTypeSourceInfo()->getTypeLoc().getNextTypeLoc().getNextTypeLoc().getSourceRange()),
-STRING_LOCATION_STDPAIR(MethodDecl, getTypeSourceInfo()->getTypeLoc().getNextTypeLoc().getSourceRange()),
-STRING_LOCATION_STDPAIR(MethodDecl, getTypeSourceInfo()->getTypeLoc().getSourceRange())
-  }));
-  // clang-format on
-}
-
-TEST(Introspection, SourceLocations_NNS) {
-  if (!NodeIntrospection::hasIntrospectionSupport())
-    return;
-  auto AST =
-      buildASTFromCode(R"cpp(
-namespace ns
-{
-  struct A {
-  void foo();
-};
-}
-void ns::A::foo() {}
-)cpp",
-                       "foo.cpp", std::make_shared<PCHContainerOperations>());
-  auto &Ctx = AST->getASTContext();
-  auto &TU = *Ctx.getTranslationUnitDecl();
-
-  auto BoundNodes = ast_matchers::match(
-      decl(hasDescendant(nestedNameSpecifierLoc().bind("nns"))), TU, Ctx);
-
-  EXPECT_EQ(BoundNodes.size(), 1u);
-
-  const auto *NNS = BoundNodes[0].getNodeAs<NestedNameSpecifierLoc>("nns");
-
-  auto Result = NodeIntrospection::GetLocations(*NNS);
-
-  auto ExpectedLocations =
-      FormatExpected<SourceLocation>(Result.LocationAccessors);
-
-  llvm::sort(ExpectedLocations);
-
-  EXPECT_EQ(
-      llvm::makeArrayRef(ExpectedLocations),
-      (ArrayRef<std::pair<std::string, SourceLocation>>{
-          STRING_LOCATION_STDPAIR(NNS, getBeginLoc()),
-          STRING_LOCATION_STDPAIR(NNS, getEndLoc()),
-          STRING_LOCATION_STDPAIR(NNS, getLocalBeginLoc()),
-          STRING_LOCATION_STDPAIR(NNS, getLocalEndLoc()),
-          STRING_LOCATION_STDPAIR(NNS, getPrefix().getBeginLoc()),
-          STRING_LOCATION_STDPAIR(NNS, getPrefix().getEndLoc()),
-          STRING_LOCATION_STDPAIR(NNS, getPrefix().getLocalBeginLoc()),
-          STRING_LOCATION_STDPAIR(NNS, getPrefix().getLocalEndLoc()),
-          STRING_LOCATION_STDPAIR(
-              NNS, getTypeLoc().getAs<clang::TypeSpecTypeLoc>().getNameLoc()),
-          STRING_LOCATION_STDPAIR(NNS, getTypeLoc().getBeginLoc()),
-          STRING_LOCATION_STDPAIR(NNS, getTypeLoc().getEndLoc())}));
-
-  auto ExpectedRanges = FormatExpected<SourceRange>(Result.RangeAccessors);
-
-  EXPECT_THAT(
-      ExpectedRanges,
-      UnorderedElementsAre(
-          STRING_LOCATION_PAIR(NNS, getPrefix().getLocalSourceRange()),
-          STRING_LOCATION_PAIR(NNS, getPrefix().getSourceRange()),
-          STRING_LOCATION_PAIR(NNS, getLocalSourceRange()),
-          STRING_LOCATION_PAIR(NNS, getSourceRange()),
-          STRING_LOCATION_PAIR(NNS, getTypeLoc().getSourceRange()),
-          STRING_LOCATION_PAIR(NNS, getTypeLoc().getLocalSourceRange())));
-}
-
-TEST(Introspection, SourceLocations_TA_Type) {
-  if (!NodeIntrospection::hasIntrospectionSupport())
-    return;
-  auto AST =
-      buildASTFromCode(R"cpp(
-template<typename T>
-  struct A {
-  void foo();
-};
-
-void foo()
-{
-  A<int> a;
-}
-)cpp",
-                       "foo.cpp", std::make_shared<PCHContainerOperations>());
-  auto &Ctx = AST->getASTContext();
-  auto &TU = *Ctx.getTranslationUnitDecl();
-
-  auto BoundNodes = ast_matchers::match(
-      decl(hasDescendant(templateArgumentLoc().bind("ta"))), TU, Ctx);
-
-  EXPECT_EQ(BoundNodes.size(), 1u);
-
-  const auto *TA = BoundNodes[0].getNodeAs<TemplateArgumentLoc>("ta");
-
-  auto Result = NodeIntrospection::GetLocations(*TA);
-
-  auto ExpectedLocations =
-      FormatExpected<SourceLocation>(Result.LocationAccessors);
-
-  // clang-format off
-  EXPECT_THAT(ExpectedLocations,
-              UnorderedElementsAre(
-STRING_LOCATION_PAIR(TA, getLocation()),
-STRING_LOCATION_PAIR(TA,
-  getTypeSourceInfo()->getTypeLoc().getAs<clang::BuiltinTypeLoc>().getBuiltinLoc()),
-STRING_LOCATION_PAIR(TA,
-  getTypeSourceInfo()->getTypeLoc().getAs<clang::BuiltinTypeLoc>().getNameLoc()),
-STRING_LOCATION_PAIR(
-    TA, getTypeSourceInfo()->getTypeLoc().getBeginLoc()),
-STRING_LOCATION_PAIR(
-    TA, getTypeSourceInfo()->getTypeLoc().getEndLoc())
-  ));
-  // clang-format on
-
-  auto ExpectedRanges = FormatExpected<SourceRange>(Result.RangeAccessors);
-
-  EXPECT_THAT(
-      ExpectedRanges,
-      UnorderedElementsAre(
-          STRING_LOCATION_PAIR(TA, getSourceRange()),
-          STRING_LOCATION_PAIR(
-              TA, getTypeSourceInfo()->getTypeLoc().getSourceRange()),
-          STRING_LOCATION_PAIR(
-              TA, getTypeSourceInfo()->getTypeLoc().getLocalSourceRange())));
-}
-
-TEST(Introspection, SourceLocations_TA_Decl) {
-  if (!NodeIntrospection::hasIntrospectionSupport())
-    return;
-  auto AST =
-      buildASTFromCode(R"cpp(
-template<void(*Ty)()>
-void test2() {}
-void doNothing() {}
-void test() {
-    test2<doNothing>();
-}
-)cpp",
-                       "foo.cpp", std::make_shared<PCHContainerOperations>());
-  auto &Ctx = AST->getASTContext();
-  auto &TU = *Ctx.getTranslationUnitDecl();
-
-  auto BoundNodes = ast_matchers::match(
-      decl(hasDescendant(templateArgumentLoc().bind("ta"))), TU, Ctx);
-
-  EXPECT_EQ(BoundNodes.size(), 1u);
-
-  const auto *TA = BoundNodes[0].getNodeAs<TemplateArgumentLoc>("ta");
-
-  auto Result = NodeIntrospection::GetLocations(*TA);
-
-  auto ExpectedLocations =
-      FormatExpected<SourceLocation>(Result.LocationAccessors);
-
-  EXPECT_THAT(ExpectedLocations,
-              UnorderedElementsAre(STRING_LOCATION_PAIR(TA, getLocation())));
-
-  auto ExpectedRanges = FormatExpected<SourceRange>(Result.RangeAccessors);
-
-  EXPECT_THAT(ExpectedRanges,
-              UnorderedElementsAre(STRING_LOCATION_PAIR(TA, getSourceRange())));
-}
-
-TEST(Introspection, SourceLocations_TA_Nullptr) {
-  if (!NodeIntrospection::hasIntrospectionSupport())
-    return;
-  auto AST =
-      buildASTFromCode(R"cpp(
-template<void(*Ty)()>
-void test2() {}
-void doNothing() {}
-void test() {
-    test2<nullptr>();
-}
-)cpp",
-                       "foo.cpp", std::make_shared<PCHContainerOperations>());
-  auto &Ctx = AST->getASTContext();
-  auto &TU = *Ctx.getTranslationUnitDecl();
-
-  auto BoundNodes = ast_matchers::match(
-      decl(hasDescendant(templateArgumentLoc().bind("ta"))), TU, Ctx);
-
-  EXPECT_EQ(BoundNodes.size(), 1u);
-
-  const auto *TA = BoundNodes[0].getNodeAs<TemplateArgumentLoc>("ta");
-
-  auto Result = NodeIntrospection::GetLocations(*TA);
-
-  auto ExpectedLocations =
-      FormatExpected<SourceLocation>(Result.LocationAccessors);
-
-  EXPECT_THAT(ExpectedLocations,
-              UnorderedElementsAre(STRING_LOCATION_PAIR(TA, getLocation())));
-
-  auto ExpectedRanges = FormatExpected<SourceRange>(Result.RangeAccessors);
-
-  EXPECT_THAT(ExpectedRanges,
-              UnorderedElementsAre(STRING_LOCATION_PAIR(TA, getSourceRange())));
-}
-
-TEST(Introspection, SourceLocations_TA_Integral) {
-  if (!NodeIntrospection::hasIntrospectionSupport())
-    return;
-  auto AST =
-      buildASTFromCode(R"cpp(
-template<int>
-void test2() {}
-void test() {
-    test2<42>();
-}
-)cpp",
-                       "foo.cpp", std::make_shared<PCHContainerOperations>());
-  auto &Ctx = AST->getASTContext();
-  auto &TU = *Ctx.getTranslationUnitDecl();
-
-  auto BoundNodes = ast_matchers::match(
-      decl(hasDescendant(templateArgumentLoc().bind("ta"))), TU, Ctx);
-
-  EXPECT_EQ(BoundNodes.size(), 1u);
-
-  const auto *TA = BoundNodes[0].getNodeAs<TemplateArgumentLoc>("ta");
-
-  auto Result = NodeIntrospection::GetLocations(*TA);
-
-  auto ExpectedLocations =
-      FormatExpected<SourceLocation>(Result.LocationAccessors);
-
-  EXPECT_THAT(ExpectedLocations,
-              UnorderedElementsAre(STRING_LOCATION_PAIR(TA, getLocation())));
-
-  auto ExpectedRanges = FormatExpected<SourceRange>(Result.RangeAccessors);
-
-  EXPECT_THAT(ExpectedRanges,
-              UnorderedElementsAre(STRING_LOCATION_PAIR(TA, getSourceRange())));
-}
-
-TEST(Introspection, SourceLocations_TA_Template) {
-  if (!NodeIntrospection::hasIntrospectionSupport())
-    return;
-  auto AST =
-      buildASTFromCode(R"cpp(
-template<typename T> class A;
-template <template <typename> class T> void foo();
-void bar()
-{
-  foo<A>();
-}
-)cpp",
-                       "foo.cpp", std::make_shared<PCHContainerOperations>());
-  auto &Ctx = AST->getASTContext();
-  auto &TU = *Ctx.getTranslationUnitDecl();
-
-  auto BoundNodes = ast_matchers::match(
-      decl(hasDescendant(templateArgumentLoc().bind("ta"))), TU, Ctx);
-
-  EXPECT_EQ(BoundNodes.size(), 1u);
-
-  const auto *TA = BoundNodes[0].getNodeAs<TemplateArgumentLoc>("ta");
-
-  auto Result = NodeIntrospection::GetLocations(*TA);
-
-  auto ExpectedLocations =
-      FormatExpected<SourceLocation>(Result.LocationAccessors);
-
-  EXPECT_THAT(
-      ExpectedLocations,
-      UnorderedElementsAre(STRING_LOCATION_PAIR(TA, getLocation()),
-                           STRING_LOCATION_PAIR(TA, getTemplateNameLoc())));
-
-  auto ExpectedRanges = FormatExpected<SourceRange>(Result.RangeAccessors);
-
-  EXPECT_THAT(ExpectedRanges,
-              UnorderedElementsAre(STRING_LOCATION_PAIR(TA, getSourceRange())));
-}
-
-TEST(Introspection, SourceLocations_TA_TemplateExpansion) {
-  if (!NodeIntrospection::hasIntrospectionSupport())
-    return;
-  auto AST = buildASTFromCodeWithArgs(
-      R"cpp(
-template<template<typename> class ...> class B { };
-  template<template<typename> class ...T> class C {
-  B<T...> testTemplateExpansion;
-};
-)cpp",
-      {"-fno-delayed-template-parsing"}, "foo.cpp", "clang-tool",
-      std::make_shared<PCHContainerOperations>());
-  auto &Ctx = AST->getASTContext();
-  auto &TU = *Ctx.getTranslationUnitDecl();
-
-  auto BoundNodes = ast_matchers::match(
-      decl(hasDescendant(templateArgumentLoc().bind("ta"))), TU, Ctx);
-
-  EXPECT_EQ(BoundNodes.size(), 1u);
-
-  const auto *TA = BoundNodes[0].getNodeAs<TemplateArgumentLoc>("ta");
-
-  auto Result = NodeIntrospection::GetLocations(*TA);
-
-  auto ExpectedLocations =
-      FormatExpected<SourceLocation>(Result.LocationAccessors);
-
-  EXPECT_THAT(
-      ExpectedLocations,
-      UnorderedElementsAre(STRING_LOCATION_PAIR(TA, getLocation()),
-                           STRING_LOCATION_PAIR(TA, getTemplateNameLoc()),
-                           STRING_LOCATION_PAIR(TA, getTemplateEllipsisLoc())));
-
-  auto ExpectedRanges = FormatExpected<SourceRange>(Result.RangeAccessors);
-
-  EXPECT_THAT(ExpectedRanges,
-              UnorderedElementsAre(STRING_LOCATION_PAIR(TA, getSourceRange())));
-}
-
-TEST(Introspection, SourceLocations_TA_Expression) {
-  if (!NodeIntrospection::hasIntrospectionSupport())
-    return;
-  auto AST =
-      buildASTFromCode(R"cpp(
-template<int, int = 0> class testExpr;
-template<int I> class testExpr<I> { };
-)cpp",
-                       "foo.cpp", std::make_shared<PCHContainerOperations>());
-  auto &Ctx = AST->getASTContext();
-  auto &TU = *Ctx.getTranslationUnitDecl();
-
-  auto BoundNodes = ast_matchers::match(
-      decl(hasDescendant(templateArgumentLoc().bind("ta"))), TU, Ctx);
-
-  EXPECT_EQ(BoundNodes.size(), 1u);
-
-  const auto *TA = BoundNodes[0].getNodeAs<TemplateArgumentLoc>("ta");
-
-  auto Result = NodeIntrospection::GetLocations(*TA);
-
-  auto ExpectedLocations =
-      FormatExpected<SourceLocation>(Result.LocationAccessors);
-
-  EXPECT_THAT(ExpectedLocations,
-              UnorderedElementsAre(STRING_LOCATION_PAIR(TA, getLocation())));
-
-  auto ExpectedRanges = FormatExpected<SourceRange>(Result.RangeAccessors);
-
-  EXPECT_THAT(ExpectedRanges,
-              UnorderedElementsAre(STRING_LOCATION_PAIR(TA, getSourceRange())));
-}
-
-TEST(Introspection, SourceLocations_TA_Pack) {
-  if (!NodeIntrospection::hasIntrospectionSupport())
-    return;
-  auto AST = buildASTFromCodeWithArgs(
-      R"cpp(
-template<typename... T> class A {};
-void foo()
-{
-    A<int> ai;
-}
-)cpp",
-      {"-fno-delayed-template-parsing"}, "foo.cpp", "clang-tool",
-      std::make_shared<PCHContainerOperations>());
-  auto &Ctx = AST->getASTContext();
-  auto &TU = *Ctx.getTranslationUnitDecl();
-
-  auto BoundNodes = ast_matchers::match(
-      decl(hasDescendant(templateArgumentLoc().bind("ta"))), TU, Ctx);
-
-  EXPECT_EQ(BoundNodes.size(), 1u);
-
-  const auto *TA = BoundNodes[0].getNodeAs<TemplateArgumentLoc>("ta");
-
-  auto Result = NodeIntrospection::GetLocations(*TA);
-
-  auto ExpectedLocations =
-      FormatExpected<SourceLocation>(Result.LocationAccessors);
-
-  // clang-format off
-  EXPECT_THAT(ExpectedLocations,
-              UnorderedElementsAre(
-STRING_LOCATION_PAIR(TA, getLocation()),
-STRING_LOCATION_PAIR(TA,
-  getTypeSourceInfo()->getTypeLoc().getAs<clang::BuiltinTypeLoc>().getBuiltinLoc()),
-STRING_LOCATION_PAIR(TA,
-  getTypeSourceInfo()->getTypeLoc().getAs<clang::BuiltinTypeLoc>().getNameLoc()),
-STRING_LOCATION_PAIR(
-    TA, getTypeSourceInfo()->getTypeLoc().getBeginLoc()),
-STRING_LOCATION_PAIR(
-    TA, getTypeSourceInfo()->getTypeLoc().getEndLoc())
-  ));
-  // clang-format on
-
-  auto ExpectedRanges = FormatExpected<SourceRange>(Result.RangeAccessors);
-
-  EXPECT_THAT(
-      ExpectedRanges,
-      UnorderedElementsAre(
-          STRING_LOCATION_PAIR(TA, getSourceRange()),
-          STRING_LOCATION_PAIR(
-              TA, getTypeSourceInfo()->getTypeLoc().getSourceRange()),
-          STRING_LOCATION_PAIR(
-              TA, getTypeSourceInfo()->getTypeLoc().getLocalSourceRange())));
-}
-
-TEST(Introspection, SourceLocations_CXXCtorInitializer_base) {
-  if (!NodeIntrospection::hasIntrospectionSupport())
-    return;
-  auto AST =
-      buildASTFromCode(R"cpp(
-struct A {
-};
-
-struct B : A {
-  B() : A() {}
-};
-)cpp",
-                       "foo.cpp", std::make_shared<PCHContainerOperations>());
-  auto &Ctx = AST->getASTContext();
-  auto &TU = *Ctx.getTranslationUnitDecl();
-
-  auto BoundNodes = ast_matchers::match(
-      decl(hasDescendant(cxxConstructorDecl(
-          hasAnyConstructorInitializer(cxxCtorInitializer().bind("init"))))),
-      TU, Ctx);
-
-  EXPECT_EQ(BoundNodes.size(), 1u);
-
-  const auto *CtorInit = BoundNodes[0].getNodeAs<CXXCtorInitializer>("init");
-
-  auto Result = NodeIntrospection::GetLocations(CtorInit);
-
-  auto ExpectedLocations =
-      FormatExpected<SourceLocation>(Result.LocationAccessors);
-
-  // clang-format off
-  EXPECT_THAT(
-      ExpectedLocations,
-      UnorderedElementsAre(
-STRING_LOCATION_PAIR(CtorInit, getBaseClassLoc().getAs<clang::TypeSpecTypeLoc>().getNameLoc()),
-STRING_LOCATION_PAIR(CtorInit, getBaseClassLoc().getBeginLoc()),
-STRING_LOCATION_PAIR(CtorInit, getBaseClassLoc().getEndLoc()),
-STRING_LOCATION_PAIR(CtorInit, getLParenLoc()),
-STRING_LOCATION_PAIR(CtorInit, getRParenLoc()),
-STRING_LOCATION_PAIR(CtorInit, getSourceLocation()),
-STRING_LOCATION_PAIR(CtorInit, getTypeSourceInfo()->getTypeLoc().getAs<clang::TypeSpecTypeLoc>().getNameLoc()),
-STRING_LOCATION_PAIR(CtorInit, getTypeSourceInfo()->getTypeLoc().getBeginLoc()),
-STRING_LOCATION_PAIR(CtorInit, getTypeSourceInfo()->getTypeLoc().getEndLoc())
- ));
-  // clang-format on
-
-  auto ExpectedRanges = FormatExpected<SourceRange>(Result.RangeAccessors);
-
-  // clang-format off
-  EXPECT_THAT(
-      ExpectedRanges,
-      UnorderedElementsAre(
-  STRING_LOCATION_PAIR(CtorInit, getBaseClassLoc().getLocalSourceRange()),
-  STRING_LOCATION_PAIR(CtorInit, getBaseClassLoc().getSourceRange()),
-  STRING_LOCATION_PAIR(CtorInit, getTypeSourceInfo()->getTypeLoc().getLocalSourceRange()),
-  STRING_LOCATION_PAIR(CtorInit, getTypeSourceInfo()->getTypeLoc().getSourceRange()),
-  STRING_LOCATION_PAIR(CtorInit, getSourceRange())));
-  // clang-format on
-}
-
-TEST(Introspection, SourceLocations_CXXCtorInitializer_member) {
-  if (!NodeIntrospection::hasIntrospectionSupport())
-    return;
-  auto AST =
-      buildASTFromCode(R"cpp(
-struct A {
-  int m_i;
-  A() : m_i(42) {}
-};
-)cpp",
-                       "foo.cpp", std::make_shared<PCHContainerOperations>());
-  auto &Ctx = AST->getASTContext();
-  auto &TU = *Ctx.getTranslationUnitDecl();
-
-  auto BoundNodes = ast_matchers::match(
-      decl(hasDescendant(cxxConstructorDecl(
-          hasAnyConstructorInitializer(cxxCtorInitializer().bind("init"))))),
-      TU, Ctx);
-
-  EXPECT_EQ(BoundNodes.size(), 1u);
-
-  const auto *CtorInit = BoundNodes[0].getNodeAs<CXXCtorInitializer>("init");
-
-  auto Result = NodeIntrospection::GetLocations(CtorInit);
-
-  auto ExpectedLocations =
-      FormatExpected<SourceLocation>(Result.LocationAccessors);
-
-  EXPECT_THAT(ExpectedLocations,
-              UnorderedElementsAre(
-                  STRING_LOCATION_PAIR(CtorInit, getLParenLoc()),
-                  STRING_LOCATION_PAIR(CtorInit, getMemberLocation()),
-                  STRING_LOCATION_PAIR(CtorInit, getRParenLoc()),
-                  STRING_LOCATION_PAIR(CtorInit, getSourceLocation())));
-
-  auto ExpectedRanges = FormatExpected<SourceRange>(Result.RangeAccessors);
-
-  EXPECT_THAT(ExpectedRanges, UnorderedElementsAre(STRING_LOCATION_PAIR(
-                                  CtorInit, getSourceRange())));
-}
-
-TEST(Introspection, SourceLocations_CXXCtorInitializer_ctor) {
-  if (!NodeIntrospection::hasIntrospectionSupport())
-    return;
-  auto AST =
-      buildASTFromCode(R"cpp(
-struct C {
-  C() : C(42) {}
-  C(int) {}
-};
-)cpp",
-                       "foo.cpp", std::make_shared<PCHContainerOperations>());
-  auto &Ctx = AST->getASTContext();
-  auto &TU = *Ctx.getTranslationUnitDecl();
-
-  auto BoundNodes = ast_matchers::match(
-      decl(hasDescendant(cxxConstructorDecl(
-          hasAnyConstructorInitializer(cxxCtorInitializer().bind("init"))))),
-      TU, Ctx);
-
-  EXPECT_EQ(BoundNodes.size(), 1u);
-
-  const auto *CtorInit = BoundNodes[0].getNodeAs<CXXCtorInitializer>("init");
-
-  auto Result = NodeIntrospection::GetLocations(CtorInit);
-
-  auto ExpectedLocations =
-      FormatExpected<SourceLocation>(Result.LocationAccessors);
-
-  // clang-format off
-  EXPECT_THAT(
-      ExpectedLocations,
-      UnorderedElementsAre(
-STRING_LOCATION_PAIR(CtorInit, getLParenLoc()),
-STRING_LOCATION_PAIR(CtorInit, getRParenLoc()),
-STRING_LOCATION_PAIR(CtorInit, getSourceLocation()),
-STRING_LOCATION_PAIR(CtorInit,
-                     getTypeSourceInfo()->getTypeLoc().getBeginLoc()),
-STRING_LOCATION_PAIR(CtorInit,
-                     getTypeSourceInfo()->getTypeLoc().getEndLoc()),
-STRING_LOCATION_PAIR(CtorInit,
-  getTypeSourceInfo()->getTypeLoc().getAs<clang::TypeSpecTypeLoc>().getNameLoc())
-  ));
-  // clang-format on
-
-  auto ExpectedRanges = FormatExpected<SourceRange>(Result.RangeAccessors);
-
-  EXPECT_THAT(
-      ExpectedRanges,
-      UnorderedElementsAre(
-          STRING_LOCATION_PAIR(CtorInit, getSourceRange()),
-          STRING_LOCATION_PAIR(
-              CtorInit,
-              getTypeSourceInfo()->getTypeLoc().getLocalSourceRange()),
-          STRING_LOCATION_PAIR(
-              CtorInit, getTypeSourceInfo()->getTypeLoc().getSourceRange())));
-}
-
-TEST(Introspection, SourceLocations_CXXCtorInitializer_pack) {
-  if (!NodeIntrospection::hasIntrospectionSupport())
-    return;
-  auto AST = buildASTFromCodeWithArgs(
-      R"cpp(
-template<typename... T>
-struct Templ {
-};
-
-template<typename... T>
-struct D : Templ<T...> {
-  D(T... t) : Templ<T>(t)... {}
-};
-)cpp",
-      {"-fno-delayed-template-parsing"}, "foo.cpp", "clang-tool",
-      std::make_shared<PCHContainerOperations>());
-  auto &Ctx = AST->getASTContext();
-  auto &TU = *Ctx.getTranslationUnitDecl();
-
-  auto BoundNodes = ast_matchers::match(
-      decl(hasDescendant(cxxConstructorDecl(
-          hasAnyConstructorInitializer(cxxCtorInitializer().bind("init"))))),
-      TU, Ctx);
-
-  EXPECT_EQ(BoundNodes.size(), 1u);
-
-  const auto *CtorInit = BoundNodes[0].getNodeAs<CXXCtorInitializer>("init");
-
-  auto Result = NodeIntrospection::GetLocations(CtorInit);
-
-  auto ExpectedLocations =
-      FormatExpected<SourceLocation>(Result.LocationAccessors);
-
-  llvm::sort(ExpectedLocations);
-
-  // clang-format off
-  EXPECT_EQ(
-     llvm::makeArrayRef(ExpectedLocations),
-      (ArrayRef<std::pair<std::string, SourceLocation>>{
-STRING_LOCATION_STDPAIR(CtorInit, getBaseClassLoc().getAs<clang::TemplateSpecializationTypeLoc>().getLAngleLoc()),
-STRING_LOCATION_STDPAIR(CtorInit, getBaseClassLoc().getAs<clang::TemplateSpecializationTypeLoc>().getRAngleLoc()),
-STRING_LOCATION_STDPAIR(CtorInit, getBaseClassLoc().getAs<clang::TemplateSpecializationTypeLoc>().getTemplateNameLoc()),
-STRING_LOCATION_STDPAIR(CtorInit, getBaseClassLoc().getBeginLoc()),
-STRING_LOCATION_STDPAIR(CtorInit, getBaseClassLoc().getEndLoc()),
-STRING_LOCATION_STDPAIR(CtorInit, getEllipsisLoc()),
-STRING_LOCATION_STDPAIR(CtorInit, getLParenLoc()),
-STRING_LOCATION_STDPAIR(CtorInit, getMemberLocation()),
-STRING_LOCATION_STDPAIR(CtorInit, getRParenLoc()),
-STRING_LOCATION_STDPAIR(CtorInit, getSourceLocation()),
-STRING_LOCATION_STDPAIR(CtorInit, getTypeSourceInfo()->getTypeLoc().getAs<clang::TemplateSpecializationTypeLoc>().getLAngleLoc()),
-STRING_LOCATION_STDPAIR(CtorInit, getTypeSourceInfo()->getTypeLoc().getAs<clang::TemplateSpecializationTypeLoc>().getRAngleLoc()),
-STRING_LOCATION_STDPAIR(CtorInit, getTypeSourceInfo()->getTypeLoc().getAs<clang::TemplateSpecializationTypeLoc>().getTemplateNameLoc()),
-STRING_LOCATION_STDPAIR(CtorInit, getTypeSourceInfo()->getTypeLoc().getBeginLoc()),
-STRING_LOCATION_STDPAIR(CtorInit, getTypeSourceInfo()->getTypeLoc().getEndLoc())
-  }));
-  // clang-format on
-
-  auto ExpectedRanges = FormatExpected<SourceRange>(Result.RangeAccessors);
-
-  EXPECT_THAT(
-      ExpectedRanges,
-      UnorderedElementsAre(
-          STRING_LOCATION_PAIR(CtorInit,
-                               getBaseClassLoc().getLocalSourceRange()),
-          STRING_LOCATION_PAIR(CtorInit, getBaseClassLoc().getSourceRange()),
-          STRING_LOCATION_PAIR(CtorInit, getSourceRange()),
-          STRING_LOCATION_PAIR(
-              CtorInit,
-              getTypeSourceInfo()->getTypeLoc().getLocalSourceRange()),
-          STRING_LOCATION_PAIR(
-              CtorInit, getTypeSourceInfo()->getTypeLoc().getSourceRange())));
-}
-
-TEST(Introspection, SourceLocations_CXXBaseSpecifier_plain) {
-  if (!NodeIntrospection::hasIntrospectionSupport())
-    return;
-  auto AST =
-      buildASTFromCode(R"cpp(
-class A {};
-class B : A {};
-)cpp",
-                       "foo.cpp", std::make_shared<PCHContainerOperations>());
-  auto &Ctx = AST->getASTContext();
-  auto &TU = *Ctx.getTranslationUnitDecl();
-
-  auto BoundNodes = ast_matchers::match(
-      decl(hasDescendant(cxxRecordDecl(hasDirectBase(
-          cxxBaseSpecifier(hasType(asString("class A"))).bind("base"))))),
-      TU, Ctx);
-
-  EXPECT_EQ(BoundNodes.size(), 1u);
-
-  const auto *Base = BoundNodes[0].getNodeAs<CXXBaseSpecifier>("base");
-
-  auto Result = NodeIntrospection::GetLocations(Base);
-
-  auto ExpectedLocations =
-      FormatExpected<SourceLocation>(Result.LocationAccessors);
-
-  // clang-format off
-  EXPECT_THAT(ExpectedLocations,
-              UnorderedElementsAre(
-STRING_LOCATION_PAIR(Base, getBaseTypeLoc()),
-STRING_LOCATION_PAIR(Base, getBeginLoc()),
-STRING_LOCATION_PAIR(Base, getEndLoc()),
-STRING_LOCATION_PAIR(Base, getTypeSourceInfo()->getTypeLoc().getAs<clang::TypeSpecTypeLoc>().getNameLoc()),
-STRING_LOCATION_PAIR(Base, getTypeSourceInfo()->getTypeLoc().getEndLoc()),
-STRING_LOCATION_PAIR(Base, getTypeSourceInfo()->getTypeLoc().getBeginLoc())
-  ));
-  // clang-format on
-
-  auto ExpectedRanges = FormatExpected<SourceRange>(Result.RangeAccessors);
-
-  // clang-format off
-  EXPECT_THAT(ExpectedRanges, UnorderedElementsAre(
-STRING_LOCATION_PAIR(Base, getSourceRange()),
-STRING_LOCATION_PAIR(Base, getTypeSourceInfo()->getTypeLoc().getSourceRange()),
-STRING_LOCATION_PAIR(Base, getTypeSourceInfo()->getTypeLoc().getLocalSourceRange())
-    ));
-  // clang-format on
-}
-
-TEST(Introspection, SourceLocations_CXXBaseSpecifier_accessspec) {
-  if (!NodeIntrospection::hasIntrospectionSupport())
-    return;
-  auto AST =
-      buildASTFromCode(R"cpp(
-class A {};
-class B : public A {};
-)cpp",
-                       "foo.cpp", std::make_shared<PCHContainerOperations>());
-  auto &Ctx = AST->getASTContext();
-  auto &TU = *Ctx.getTranslationUnitDecl();
-
-  auto BoundNodes = ast_matchers::match(
-      decl(hasDescendant(cxxRecordDecl(hasDirectBase(
-          cxxBaseSpecifier(hasType(asString("class A"))).bind("base"))))),
-      TU, Ctx);
-
-  EXPECT_EQ(BoundNodes.size(), 1u);
-
-  const auto *Base = BoundNodes[0].getNodeAs<CXXBaseSpecifier>("base");
-
-  auto Result = NodeIntrospection::GetLocations(Base);
-
-  auto ExpectedLocations =
-      FormatExpected<SourceLocation>(Result.LocationAccessors);
-
-  // clang-format off
-  EXPECT_THAT(ExpectedLocations,
-              UnorderedElementsAre(
-STRING_LOCATION_PAIR(Base, getBaseTypeLoc()),
-STRING_LOCATION_PAIR(Base, getBeginLoc()),
-STRING_LOCATION_PAIR(Base, getEndLoc()),
-STRING_LOCATION_PAIR(Base, getTypeSourceInfo()->getTypeLoc().getAs<clang::TypeSpecTypeLoc>().getNameLoc()),
-STRING_LOCATION_PAIR(Base, getTypeSourceInfo()->getTypeLoc().getEndLoc()),
-STRING_LOCATION_PAIR(Base, getTypeSourceInfo()->getTypeLoc().getBeginLoc())
-  ));
-  // clang-format on
-
-  auto ExpectedRanges = FormatExpected<SourceRange>(Result.RangeAccessors);
-
-  // clang-format off
-  EXPECT_THAT(ExpectedRanges, UnorderedElementsAre(
-STRING_LOCATION_PAIR(Base, getSourceRange()),
-STRING_LOCATION_PAIR(Base, getTypeSourceInfo()->getTypeLoc().getLocalSourceRange()),
-STRING_LOCATION_PAIR(Base, getTypeSourceInfo()->getTypeLoc().getSourceRange())
-  ));
-  // clang-format on
-}
-
-TEST(Introspection, SourceLocations_CXXBaseSpecifier_virtual) {
-  if (!NodeIntrospection::hasIntrospectionSupport())
-    return;
-  auto AST =
-      buildASTFromCode(R"cpp(
-class A {};
-class B {};
-class C : virtual B, A {};
-)cpp",
-                       "foo.cpp", std::make_shared<PCHContainerOperations>());
-  auto &Ctx = AST->getASTContext();
-  auto &TU = *Ctx.getTranslationUnitDecl();
-
-  auto BoundNodes = ast_matchers::match(
-      decl(hasDescendant(cxxRecordDecl(hasDirectBase(
-          cxxBaseSpecifier(hasType(asString("class A"))).bind("base"))))),
-      TU, Ctx);
-
-  EXPECT_EQ(BoundNodes.size(), 1u);
-
-  const auto *Base = BoundNodes[0].getNodeAs<CXXBaseSpecifier>("base");
-
-  auto Result = NodeIntrospection::GetLocations(Base);
-
-  auto ExpectedLocations =
-      FormatExpected<SourceLocation>(Result.LocationAccessors);
-
-  // clang-format off
-  EXPECT_THAT(ExpectedLocations,
-              UnorderedElementsAre(
-STRING_LOCATION_PAIR(Base, getBaseTypeLoc()),
-STRING_LOCATION_PAIR(Base, getBeginLoc()),
-STRING_LOCATION_PAIR(Base, getEndLoc()),
-STRING_LOCATION_PAIR(Base, getTypeSourceInfo()->getTypeLoc().getBeginLoc()),
-STRING_LOCATION_PAIR(Base, getTypeSourceInfo()->getTypeLoc().getAs<clang::TypeSpecTypeLoc>().getNameLoc()),
-STRING_LOCATION_PAIR(Base, getTypeSourceInfo()->getTypeLoc().getEndLoc())
-  ));
-  // clang-format on
-
-  auto ExpectedRanges = FormatExpected<SourceRange>(Result.RangeAccessors);
-
-  // clang-format off
-  EXPECT_THAT(ExpectedRanges, UnorderedElementsAre(
-STRING_LOCATION_PAIR(Base, getSourceRange()),
-STRING_LOCATION_PAIR(Base, getTypeSourceInfo()->getTypeLoc().getSourceRange()),
-STRING_LOCATION_PAIR(Base, getTypeSourceInfo()->getTypeLoc().getLocalSourceRange())
-  ));
-  // clang-format on
-}
-
-TEST(Introspection, SourceLocations_CXXBaseSpecifier_template_base) {
-  if (!NodeIntrospection::hasIntrospectionSupport())
-    return;
-  auto AST =
-      buildASTFromCode(R"cpp(
-template<typename T, typename U>
-class A {};
-class B : A<int, bool> {};
-)cpp",
-                       "foo.cpp", std::make_shared<PCHContainerOperations>());
-  auto &Ctx = AST->getASTContext();
-  auto &TU = *Ctx.getTranslationUnitDecl();
-
-  auto BoundNodes =
-      ast_matchers::match(decl(hasDescendant(cxxRecordDecl(
-                              hasDirectBase(cxxBaseSpecifier().bind("base"))))),
-                          TU, Ctx);
-
-  EXPECT_EQ(BoundNodes.size(), 1u);
-
-  const auto *Base = BoundNodes[0].getNodeAs<CXXBaseSpecifier>("base");
-
-  auto Result = NodeIntrospection::GetLocations(Base);
-
-  auto ExpectedLocations =
-      FormatExpected<SourceLocation>(Result.LocationAccessors);
-
-  // clang-format off
-  EXPECT_THAT(ExpectedLocations,
-              UnorderedElementsAre(
-STRING_LOCATION_PAIR(Base, getBaseTypeLoc()),
-STRING_LOCATION_PAIR(Base, getBeginLoc()),
-STRING_LOCATION_PAIR(Base, getEndLoc()),
-STRING_LOCATION_PAIR(Base, getTypeSourceInfo()->getTypeLoc().getBeginLoc()),
-STRING_LOCATION_PAIR(Base, getTypeSourceInfo()->getTypeLoc().getAs<clang::TemplateSpecializationTypeLoc>().getTemplateNameLoc()),
-STRING_LOCATION_PAIR(Base, getTypeSourceInfo()->getTypeLoc().getAs<clang::TemplateSpecializationTypeLoc>().getLAngleLoc()),
-STRING_LOCATION_PAIR(Base, getTypeSourceInfo()->getTypeLoc().getEndLoc()),
-STRING_LOCATION_PAIR(Base, getTypeSourceInfo()->getTypeLoc().getAs<clang::TemplateSpecializationTypeLoc>().getRAngleLoc())
-  ));
-  // clang-format on
-
-  auto ExpectedRanges = FormatExpected<SourceRange>(Result.RangeAccessors);
-
-  // clang-format off
-  EXPECT_THAT(ExpectedRanges, UnorderedElementsAre(
-STRING_LOCATION_PAIR(Base, getSourceRange()),
-STRING_LOCATION_PAIR(Base, getTypeSourceInfo()->getTypeLoc().getSourceRange()),
-STRING_LOCATION_PAIR(Base, getTypeSourceInfo()->getTypeLoc().getLocalSourceRange())
-  ));
-  // clang-format on
-}
-
-TEST(Introspection, SourceLocations_CXXBaseSpecifier_pack) {
-  if (!NodeIntrospection::hasIntrospectionSupport())
-    return;
-  auto AST = buildASTFromCodeWithArgs(
-      R"cpp(
-template<typename... T>
-struct Templ : T... {
-};
-)cpp",
-      {"-fno-delayed-template-parsing"}, "foo.cpp", "clang-tool",
-      std::make_shared<PCHContainerOperations>());
-  auto &Ctx = AST->getASTContext();
-  auto &TU = *Ctx.getTranslationUnitDecl();
-
-  auto BoundNodes =
-      ast_matchers::match(decl(hasDescendant(cxxRecordDecl(
-                              hasDirectBase(cxxBaseSpecifier().bind("base"))))),
-                          TU, Ctx);
-
-  EXPECT_EQ(BoundNodes.size(), 1u);
-
-  const auto *Base = BoundNodes[0].getNodeAs<CXXBaseSpecifier>("base");
-
-  auto Result = NodeIntrospection::GetLocations(Base);
-
-  auto ExpectedLocations =
-      FormatExpected<SourceLocation>(Result.LocationAccessors);
-
-  // clang-format off
-  EXPECT_THAT(ExpectedLocations,
-              UnorderedElementsAre(
-STRING_LOCATION_PAIR(Base, getBaseTypeLoc()),
-STRING_LOCATION_PAIR(Base, getEllipsisLoc()),
-STRING_LOCATION_PAIR(Base, getBeginLoc()),
-STRING_LOCATION_PAIR(Base, getEndLoc()),
-STRING_LOCATION_PAIR(Base, getTypeSourceInfo()->getTypeLoc().getEndLoc()),
-STRING_LOCATION_PAIR(Base, getTypeSourceInfo()->getTypeLoc().getAs<clang::TypeSpecTypeLoc>().getNameLoc()),
-STRING_LOCATION_PAIR(Base, getTypeSourceInfo()->getTypeLoc().getBeginLoc())
-  ));
-  // clang-format on
-
-  auto ExpectedRanges = FormatExpected<SourceRange>(Result.RangeAccessors);
-
-  // clang-format off
-  EXPECT_THAT(ExpectedRanges, UnorderedElementsAre(
-STRING_LOCATION_PAIR(Base, getSourceRange()),
-STRING_LOCATION_PAIR(Base, getTypeSourceInfo()->getTypeLoc().getSourceRange()),
-STRING_LOCATION_PAIR(Base, getTypeSourceInfo()->getTypeLoc().getLocalSourceRange())
-  ));
-  // clang-format on
-}
-
-TEST(Introspection, SourceLocations_FunctionProtoTypeLoc) {
-  if (!NodeIntrospection::hasIntrospectionSupport())
-    return;
-  auto AST =
-      buildASTFromCode(R"cpp(
-int foo();
-)cpp",
-                       "foo.cpp", std::make_shared<PCHContainerOperations>());
-  auto &Ctx = AST->getASTContext();
-  auto &TU = *Ctx.getTranslationUnitDecl();
-
-  auto BoundNodes = ast_matchers::match(
-      decl(hasDescendant(loc(functionProtoType()).bind("tl"))), TU, Ctx);
-
-  EXPECT_EQ(BoundNodes.size(), 1u);
-
-  const auto *TL = BoundNodes[0].getNodeAs<TypeLoc>("tl");
-  auto Result = NodeIntrospection::GetLocations(*TL);
-
-  auto ExpectedLocations =
-      FormatExpected<SourceLocation>(Result.LocationAccessors);
-
-  llvm::sort(ExpectedLocations);
-
-  // clang-format off
-  EXPECT_EQ(
-      llvm::makeArrayRef(ExpectedLocations),
-          (ArrayRef<std::pair<std::string, SourceLocation>>{
-STRING_LOCATION_STDPAIR(TL, getAs<clang::FunctionTypeLoc>().getLParenLoc()),
-STRING_LOCATION_STDPAIR(TL, getAs<clang::FunctionTypeLoc>().getLocalRangeBegin()),
-STRING_LOCATION_STDPAIR(TL, getAs<clang::FunctionTypeLoc>().getLocalRangeEnd()),
-STRING_LOCATION_STDPAIR(TL, getAs<clang::FunctionTypeLoc>().getRParenLoc()),
-STRING_LOCATION_STDPAIR(TL, getAs<clang::FunctionTypeLoc>().getReturnLoc().getAs<clang::BuiltinTypeLoc>().getBuiltinLoc()),
-STRING_LOCATION_STDPAIR(TL, getAs<clang::FunctionTypeLoc>().getReturnLoc().getAs<clang::BuiltinTypeLoc>().getNameLoc()),
-STRING_LOCATION_STDPAIR(TL, getAs<clang::FunctionTypeLoc>().getReturnLoc().getBeginLoc()),
-STRING_LOCATION_STDPAIR(TL, getAs<clang::FunctionTypeLoc>().getReturnLoc().getEndLoc()),
-STRING_LOCATION_STDPAIR(TL, getBeginLoc()),
-STRING_LOCATION_STDPAIR(TL, getEndLoc()),
-STRING_LOCATION_STDPAIR(TL, getNextTypeLoc().getAs<clang::BuiltinTypeLoc>().getBuiltinLoc()),
-STRING_LOCATION_STDPAIR(TL, getNextTypeLoc().getAs<clang::BuiltinTypeLoc>().getNameLoc()),
-STRING_LOCATION_STDPAIR(TL, getNextTypeLoc().getBeginLoc()),
-STRING_LOCATION_STDPAIR(TL, getNextTypeLoc().getEndLoc())
-        }));
-  // clang-format on
-
-  auto ExpectedRanges = FormatExpected<SourceRange>(Result.RangeAccessors);
-
-  // clang-format off
-  EXPECT_THAT(
-      ExpectedRanges,
-      UnorderedElementsAre(
-STRING_LOCATION_PAIR(TL, getAs<clang::FunctionTypeLoc>().getParensRange()),
-STRING_LOCATION_PAIR(TL, getAs<clang::FunctionTypeLoc>().getReturnLoc().getLocalSourceRange()),
-STRING_LOCATION_PAIR(TL, getAs<clang::FunctionTypeLoc>().getReturnLoc().getSourceRange()),
-STRING_LOCATION_PAIR(TL, getLocalSourceRange()),
-STRING_LOCATION_PAIR(TL, getNextTypeLoc().getLocalSourceRange()),
-STRING_LOCATION_PAIR(TL, getNextTypeLoc().getSourceRange()),
-STRING_LOCATION_PAIR(TL, getSourceRange())
-          ));
-  // clang-format on
-}
-
-TEST(Introspection, SourceLocations_PointerTypeLoc) {
-  if (!NodeIntrospection::hasIntrospectionSupport())
-    return;
-  auto AST =
-      buildASTFromCode(R"cpp(
-int* i;
-)cpp",
-                       "foo.cpp", std::make_shared<PCHContainerOperations>());
-  auto &Ctx = AST->getASTContext();
-  auto &TU = *Ctx.getTranslationUnitDecl();
-
-  auto BoundNodes = ast_matchers::match(
-      decl(hasDescendant(
-          varDecl(hasName("i"), hasDescendant(loc(pointerType()).bind("tl"))))),
-      TU, Ctx);
-
-  EXPECT_EQ(BoundNodes.size(), 1u);
-
-  const auto *TL = BoundNodes[0].getNodeAs<TypeLoc>("tl");
-  auto Result = NodeIntrospection::GetLocations(*TL);
-
-  auto ExpectedLocations =
-      FormatExpected<SourceLocation>(Result.LocationAccessors);
-
-  llvm::sort(ExpectedLocations);
-
-  // clang-format off
-  EXPECT_EQ(
-      llvm::makeArrayRef(ExpectedLocations),
-      (ArrayRef<std::pair<std::string, SourceLocation>>{
-STRING_LOCATION_STDPAIR(TL, getAs<clang::PointerTypeLoc>().getPointeeLoc().getAs<clang::BuiltinTypeLoc>().getBuiltinLoc()),
-STRING_LOCATION_STDPAIR(TL, getAs<clang::PointerTypeLoc>().getPointeeLoc().getAs<clang::BuiltinTypeLoc>().getNameLoc()),
-STRING_LOCATION_STDPAIR(TL, getAs<clang::PointerTypeLoc>().getPointeeLoc().getBeginLoc()),
-STRING_LOCATION_STDPAIR(TL, getAs<clang::PointerTypeLoc>().getPointeeLoc().getEndLoc()),
-STRING_LOCATION_STDPAIR(TL, getAs<clang::PointerTypeLoc>().getSigilLoc()),
-STRING_LOCATION_STDPAIR(TL, getAs<clang::PointerTypeLoc>().getStarLoc()),
-STRING_LOCATION_STDPAIR(TL, getBeginLoc()),
-STRING_LOCATION_STDPAIR(TL, getEndLoc()),
-STRING_LOCATION_STDPAIR(TL, getNextTypeLoc().getAs<clang::BuiltinTypeLoc>().getBuiltinLoc()),
-STRING_LOCATION_STDPAIR(TL, getNextTypeLoc().getAs<clang::BuiltinTypeLoc>().getNameLoc()),
-STRING_LOCATION_STDPAIR(TL, getNextTypeLoc().getBeginLoc()),
-STRING_LOCATION_STDPAIR(TL, getNextTypeLoc().getEndLoc())
-}));
-  // clang-format on
-
-  auto ExpectedRanges = FormatExpected<SourceRange>(Result.RangeAccessors);
-
-  // clang-format off
-  EXPECT_THAT(
-      ExpectedRanges,
-      UnorderedElementsAre(
-STRING_LOCATION_PAIR(TL, getAs<clang::PointerTypeLoc>().getPointeeLoc().getLocalSourceRange()),
-STRING_LOCATION_PAIR(TL, getAs<clang::PointerTypeLoc>().getPointeeLoc().getSourceRange()),
-STRING_LOCATION_PAIR(TL, getLocalSourceRange()),
-STRING_LOCATION_PAIR(TL, getNextTypeLoc().getLocalSourceRange()),
-STRING_LOCATION_PAIR(TL, getNextTypeLoc().getSourceRange()),
-STRING_LOCATION_PAIR(TL, getSourceRange())
-          ));
-  // clang-format on
-}
-
-#ifndef _WIN32
-// This test doesn't work on windows due to use of the typeof extension.
-TEST(Introspection, SourceLocations_TypeOfTypeLoc) {
-  if (!NodeIntrospection::hasIntrospectionSupport())
-    return;
-  auto AST =
-      buildASTFromCode(R"cpp(
-typeof (static_cast<void *>(0)) i;
-)cpp",
-                       "foo.cpp", std::make_shared<PCHContainerOperations>());
-  auto &Ctx = AST->getASTContext();
-  auto &TU = *Ctx.getTranslationUnitDecl();
-
-  auto BoundNodes = ast_matchers::match(
-      decl(hasDescendant(
-          varDecl(hasName("i"), hasDescendant(loc(type()).bind("tl"))))),
-      TU, Ctx);
-
-  EXPECT_EQ(BoundNodes.size(), 1u);
-
-  const auto *TL = BoundNodes[0].getNodeAs<TypeLoc>("tl");
-  auto Result = NodeIntrospection::GetLocations(*TL);
-
-  auto ExpectedLocations =
-      FormatExpected<SourceLocation>(Result.LocationAccessors);
-
-  EXPECT_THAT(ExpectedLocations,
-              UnorderedElementsAre(
-                  STRING_LOCATION_PAIR(TL, getBeginLoc()),
-                  STRING_LOCATION_PAIR(TL, getEndLoc()),
-                  STRING_LOCATION_PAIR(
-                      TL, getAs<clang::TypeOfExprTypeLoc>().getTypeofLoc()),
-                  STRING_LOCATION_PAIR(
-                      TL, getAs<clang::TypeOfExprTypeLoc>().getLParenLoc()),
-                  STRING_LOCATION_PAIR(
-                      TL, getAs<clang::TypeOfExprTypeLoc>().getRParenLoc())));
-
-  auto ExpectedRanges = FormatExpected<SourceRange>(Result.RangeAccessors);
-
-  EXPECT_THAT(ExpectedRanges,
-              UnorderedElementsAre(
-                  STRING_LOCATION_PAIR(TL, getLocalSourceRange()),
-                  STRING_LOCATION_PAIR(TL, getSourceRange()),
-                  STRING_LOCATION_PAIR(
-                      TL, getAs<clang::TypeOfExprTypeLoc>().getParensRange())));
-}
-#endif
-
-TEST(Introspection, SourceLocations_DeclarationNameInfo_Dtor) {
-  if (!NodeIntrospection::hasIntrospectionSupport())
-    return;
-  auto AST =
-      buildASTFromCode(R"cpp(
-class Foo
-{
-  ~Foo() {}
-};
-)cpp",
-                       "foo.cpp", std::make_shared<PCHContainerOperations>());
-  auto &Ctx = AST->getASTContext();
-  auto &TU = *Ctx.getTranslationUnitDecl();
-
-  auto BoundNodes = ast_matchers::match(
-      decl(hasDescendant(cxxDestructorDecl(hasName("~Foo")).bind("dtor"))), TU,
-      Ctx);
-
-  EXPECT_EQ(BoundNodes.size(), 1u);
-
-  const auto *Dtor = BoundNodes[0].getNodeAs<CXXDestructorDecl>("dtor");
-  auto NI = Dtor->getNameInfo();
-  auto Result = NodeIntrospection::GetLocations(NI);
-
-  auto ExpectedLocations =
-      FormatExpected<SourceLocation>(Result.LocationAccessors);
-
-  llvm::sort(ExpectedLocations);
-
-  // clang-format off
-  EXPECT_EQ(
-      llvm::makeArrayRef(ExpectedLocations),
-      (ArrayRef<std::pair<std::string, SourceLocation>>{
-          STRING_LOCATION_STDPAIR((&NI), getBeginLoc()),
-          STRING_LOCATION_STDPAIR((&NI), getEndLoc()),
-          STRING_LOCATION_STDPAIR((&NI), getLoc()),
-          STRING_LOCATION_STDPAIR((&NI),
-getNamedTypeInfo()->getTypeLoc().getAs<clang::TypeSpecTypeLoc>().getNameLoc()),
-          STRING_LOCATION_STDPAIR(
-              (&NI), getNamedTypeInfo()->getTypeLoc().getBeginLoc()),
-          STRING_LOCATION_STDPAIR(
-              (&NI), getNamedTypeInfo()->getTypeLoc().getEndLoc())}));
-  // clang-format on
-
-  auto ExpectedRanges = FormatExpected<SourceRange>(Result.RangeAccessors);
-
-  EXPECT_THAT(
-      ExpectedRanges,
-      UnorderedElementsAre(
-          STRING_LOCATION_PAIR(
-              (&NI), getNamedTypeInfo()->getTypeLoc().getLocalSourceRange()),
-          STRING_LOCATION_PAIR(
-              (&NI), getNamedTypeInfo()->getTypeLoc().getSourceRange()),
-          STRING_LOCATION_PAIR((&NI), getSourceRange())));
-}
-
-TEST(Introspection, SourceLocations_DeclarationNameInfo_CRef) {
-  if (!NodeIntrospection::hasIntrospectionSupport())
-    return;
-
-  auto AST = buildASTFromCodeWithArgs(
-      R"cpp(
-template<typename T>
-struct MyContainer
-{
-    template <typename U>
-    void pushBack();
-};
-
-template<typename T>
-void foo()
-{
-    MyContainer<T> mc;
-    mc.template pushBack<int>();
-}
-)cpp",
-      {"-fno-delayed-template-parsing"}, "foo.cpp", "clang-tool",
-      std::make_shared<PCHContainerOperations>());
-
-  auto &Ctx = AST->getASTContext();
-  auto &TU = *Ctx.getTranslationUnitDecl();
-
-  auto BoundNodes = ast_matchers::match(
-      decl(hasDescendant(cxxDependentScopeMemberExpr(hasMemberName("pushBack")).bind("member"))), TU,
-      Ctx);
-
-  EXPECT_EQ(BoundNodes.size(), 1u);
-
-  const auto *Member = BoundNodes[0].getNodeAs<CXXDependentScopeMemberExpr>("member");
-  auto Result = NodeIntrospection::GetLocations(Member);
-
-  auto ExpectedLocations =
-      FormatExpected<SourceLocation>(Result.LocationAccessors);
-
-  llvm::sort(ExpectedLocations);
-
-  EXPECT_EQ(
-      llvm::makeArrayRef(ExpectedLocations),
-      (ArrayRef<std::pair<std::string, SourceLocation>>{
-    STRING_LOCATION_STDPAIR(Member, getBeginLoc()),
-    STRING_LOCATION_STDPAIR(Member, getEndLoc()),
-    STRING_LOCATION_STDPAIR(Member, getExprLoc()),
-    STRING_LOCATION_STDPAIR(Member, getLAngleLoc()),
-    STRING_LOCATION_STDPAIR(Member, getMemberLoc()),
-    STRING_LOCATION_STDPAIR(Member, getMemberNameInfo().getBeginLoc()),
-    STRING_LOCATION_STDPAIR(Member, getMemberNameInfo().getEndLoc()),
-    STRING_LOCATION_STDPAIR(Member, getMemberNameInfo().getLoc()),
-    STRING_LOCATION_STDPAIR(Member, getOperatorLoc()),
-    STRING_LOCATION_STDPAIR(Member, getRAngleLoc()),
-    STRING_LOCATION_STDPAIR(Member, getTemplateKeywordLoc())
-        }));
-
-  auto ExpectedRanges = FormatExpected<SourceRange>(Result.RangeAccessors);
-
-  EXPECT_THAT(
-      ExpectedRanges,
-      UnorderedElementsAre(
-          STRING_LOCATION_PAIR(Member, getMemberNameInfo().getSourceRange()),
-          STRING_LOCATION_PAIR(Member, getSourceRange())
-          ));
-}
-
-TEST(Introspection, SourceLocations_DeclarationNameInfo_ConvOp) {
-  if (!NodeIntrospection::hasIntrospectionSupport())
-    return;
-  auto AST =
-      buildASTFromCode(R"cpp(
-class Foo
-{
-  bool operator==(const Foo&) const { return false; }
-};
-)cpp",
-                       "foo.cpp", std::make_shared<PCHContainerOperations>());
-  auto &Ctx = AST->getASTContext();
-  auto &TU = *Ctx.getTranslationUnitDecl();
-
-  auto BoundNodes = ast_matchers::match(
-      decl(hasDescendant(cxxMethodDecl().bind("opeq"))), TU, Ctx);
-
-  EXPECT_EQ(BoundNodes.size(), 1u);
-
-  const auto *Opeq = BoundNodes[0].getNodeAs<CXXMethodDecl>("opeq");
-  auto NI = Opeq->getNameInfo();
-  auto Result = NodeIntrospection::GetLocations(NI);
-
-  auto ExpectedLocations =
-      FormatExpected<SourceLocation>(Result.LocationAccessors);
-
-  llvm::sort(ExpectedLocations);
-
-  EXPECT_EQ(llvm::makeArrayRef(ExpectedLocations),
-            (ArrayRef<std::pair<std::string, SourceLocation>>{
-                STRING_LOCATION_STDPAIR((&NI), getBeginLoc()),
-                STRING_LOCATION_STDPAIR((&NI), getEndLoc()),
-                STRING_LOCATION_STDPAIR((&NI), getLoc())}));
-
-  auto ExpectedRanges = FormatExpected<SourceRange>(Result.RangeAccessors);
-
-  EXPECT_THAT(ExpectedRanges,
-              UnorderedElementsAre(
-                  STRING_LOCATION_PAIR((&NI), getSourceRange()),
-                  STRING_LOCATION_PAIR((&NI), getCXXOperatorNameRange())));
-}
-
-TEST(Introspection, SourceLocations_DeclarationNameInfo_LitOp) {
-  if (!NodeIntrospection::hasIntrospectionSupport())
-    return;
-  auto AST =
-      buildASTFromCode(R"cpp(
-long double operator"" _identity ( long double val )
-{
-    return val;
-}
-)cpp",
-                       "foo.cpp", std::make_shared<PCHContainerOperations>());
-  auto &Ctx = AST->getASTContext();
-  auto &TU = *Ctx.getTranslationUnitDecl();
-
-  auto BoundNodes = ast_matchers::match(
-      decl(hasDescendant(functionDecl().bind("litop"))), TU, Ctx);
-
-  EXPECT_EQ(BoundNodes.size(), 1u);
-
-  const auto *LitOp = BoundNodes[0].getNodeAs<FunctionDecl>("litop");
-  auto NI = LitOp->getNameInfo();
-  auto Result = NodeIntrospection::GetLocations(NI);
-
-  auto ExpectedLocations =
-      FormatExpected<SourceLocation>(Result.LocationAccessors);
-
-  llvm::sort(ExpectedLocations);
-
-  EXPECT_EQ(llvm::makeArrayRef(ExpectedLocations),
-            (ArrayRef<std::pair<std::string, SourceLocation>>{
-                STRING_LOCATION_STDPAIR((&NI), getBeginLoc()),
-                STRING_LOCATION_STDPAIR((&NI), getCXXLiteralOperatorNameLoc()),
-                STRING_LOCATION_STDPAIR((&NI), getEndLoc()),
-                STRING_LOCATION_STDPAIR((&NI), getLoc())}));
-
-  auto ExpectedRanges = FormatExpected<SourceRange>(Result.RangeAccessors);
-
-  EXPECT_THAT(ExpectedRanges, UnorderedElementsAre(STRING_LOCATION_PAIR(
-                                  (&NI), getSourceRange())));
-}
diff --git a/gnu/llvm/clang/unittests/Lex/CMakeLists.txt b/gnu/llvm/clang/unittests/Lex/CMakeLists.txt
deleted file mode 100644
index 97a4e5e4460..00000000000
--- a/gnu/llvm/clang/unittests/Lex/CMakeLists.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  Support
-  )
-
-add_clang_unittest(LexTests
-  DependencyDirectivesSourceMinimizerTest.cpp
-  HeaderMapTest.cpp
-  HeaderSearchTest.cpp
-  LexerTest.cpp
-  PPCallbacksTest.cpp
-  PPConditionalDirectiveRecordTest.cpp
-  )
-
-clang_target_link_libraries(LexTests
-  PRIVATE
-  clangAST
-  clangBasic
-  clangLex
-  clangParse
-  clangSema
-  )
diff --git a/gnu/llvm/clang/unittests/Lex/DependencyDirectivesSourceMinimizerTest.cpp b/gnu/llvm/clang/unittests/Lex/DependencyDirectivesSourceMinimizerTest.cpp
deleted file mode 100644
index 81945cf4618..00000000000
--- a/gnu/llvm/clang/unittests/Lex/DependencyDirectivesSourceMinimizerTest.cpp
+++ /dev/null
@@ -1,820 +0,0 @@
-//===- unittests/Lex/DependencyDirectivesSourceMinimizer.cpp -  -----------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/Lex/DependencyDirectivesSourceMinimizer.h"
-#include "llvm/ADT/SmallString.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-using namespace clang;
-using namespace clang::minimize_source_to_dependency_directives;
-
-namespace clang {
-
-bool minimizeSourceToDependencyDirectives(StringRef Input,
-                                          SmallVectorImpl<char> &Out) {
-  SmallVector<minimize_source_to_dependency_directives::Token, 32> Tokens;
-  return minimizeSourceToDependencyDirectives(Input, Out, Tokens);
-}
-
-} // end namespace clang
-
-namespace {
-
-TEST(MinimizeSourceToDependencyDirectivesTest, Empty) {
-  SmallVector<char, 128> Out;
-  SmallVector<Token, 4> Tokens;
-
-  ASSERT_FALSE(minimizeSourceToDependencyDirectives("", Out, Tokens));
-  EXPECT_TRUE(Out.empty());
-  ASSERT_EQ(1u, Tokens.size());
-  ASSERT_EQ(pp_eof, Tokens.back().K);
-
-  ASSERT_FALSE(
-      minimizeSourceToDependencyDirectives("abc def\nxyz", Out, Tokens));
-  EXPECT_TRUE(Out.empty());
-  ASSERT_EQ(1u, Tokens.size());
-  ASSERT_EQ(pp_eof, Tokens.back().K);
-}
-
-TEST(MinimizeSourceToDependencyDirectivesTest, AllTokens) {
-  SmallVector<char, 128> Out;
-  SmallVector<Token, 4> Tokens;
-
-  ASSERT_FALSE(
-      minimizeSourceToDependencyDirectives("#define A\n"
-                                           "#undef A\n"
-                                           "#endif\n"
-                                           "#if A\n"
-                                           "#ifdef A\n"
-                                           "#ifndef A\n"
-                                           "#elifdef A\n"
-                                           "#elifndef A\n"
-                                           "#elif A\n"
-                                           "#else\n"
-                                           "#include <A>\n"
-                                           "#include_next <A>\n"
-                                           "#__include_macros <A>\n"
-                                           "#import <A>\n"
-                                           "@import A;\n"
-                                           "#pragma clang module import A\n"
-                                           "export module m;\n"
-                                           "import m;\n",
-                                           Out, Tokens));
-  EXPECT_EQ(pp_define, Tokens[0].K);
-  EXPECT_EQ(pp_undef, Tokens[1].K);
-  EXPECT_EQ(pp_endif, Tokens[2].K);
-  EXPECT_EQ(pp_if, Tokens[3].K);
-  EXPECT_EQ(pp_ifdef, Tokens[4].K);
-  EXPECT_EQ(pp_ifndef, Tokens[5].K);
-  EXPECT_EQ(pp_elifdef, Tokens[6].K);
-  EXPECT_EQ(pp_elifndef, Tokens[7].K);
-  EXPECT_EQ(pp_elif, Tokens[8].K);
-  EXPECT_EQ(pp_else, Tokens[9].K);
-  EXPECT_EQ(pp_include, Tokens[10].K);
-  EXPECT_EQ(pp_include_next, Tokens[11].K);
-  EXPECT_EQ(pp___include_macros, Tokens[12].K);
-  EXPECT_EQ(pp_import, Tokens[13].K);
-  EXPECT_EQ(decl_at_import, Tokens[14].K);
-  EXPECT_EQ(pp_pragma_import, Tokens[15].K);
-  EXPECT_EQ(cxx_export_decl, Tokens[16].K);
-  EXPECT_EQ(cxx_module_decl, Tokens[17].K);
-  EXPECT_EQ(cxx_import_decl, Tokens[18].K);
-  EXPECT_EQ(pp_eof, Tokens[19].K);
-}
-
-TEST(MinimizeSourceToDependencyDirectivesTest, Define) {
-  SmallVector<char, 128> Out;
-  SmallVector<Token, 4> Tokens;
-
-  ASSERT_FALSE(
-      minimizeSourceToDependencyDirectives("#define MACRO", Out, Tokens));
-  EXPECT_STREQ("#define MACRO\n", Out.data());
-  ASSERT_EQ(2u, Tokens.size());
-  ASSERT_EQ(pp_define, Tokens.front().K);
-}
-
-TEST(MinimizeSourceToDependencyDirectivesTest, DefineSpacing) {
-  SmallVector<char, 128> Out;
-
-  ASSERT_FALSE(
-      minimizeSourceToDependencyDirectives("#define MACRO\n\n\n", Out));
-  EXPECT_STREQ("#define MACRO\n", Out.data());
-
-  ASSERT_FALSE(
-      minimizeSourceToDependencyDirectives("#define MACRO \n\n\n", Out));
-  EXPECT_STREQ("#define MACRO\n", Out.data());
-
-  ASSERT_FALSE(
-      minimizeSourceToDependencyDirectives("#define MACRO a \n\n\n", Out));
-  EXPECT_STREQ("#define MACRO a\n", Out.data());
-
-  ASSERT_FALSE(
-      minimizeSourceToDependencyDirectives("#define   MACRO\n\n\n", Out));
-  EXPECT_STREQ("#define MACRO\n", Out.data());
-}
-
-TEST(MinimizeSourceToDependencyDirectivesTest, DefineMacroArguments) {
-  SmallVector<char, 128> Out;
-
-  ASSERT_FALSE(minimizeSourceToDependencyDirectives("#define MACRO()", Out));
-  EXPECT_STREQ("#define MACRO()\n", Out.data());
-
-  ASSERT_FALSE(
-      minimizeSourceToDependencyDirectives("#define MACRO(a, b...)", Out));
-  EXPECT_STREQ("#define MACRO(a,b...)\n", Out.data());
-
-  ASSERT_FALSE(
-      minimizeSourceToDependencyDirectives("#define MACRO content", Out));
-  EXPECT_STREQ("#define MACRO content\n", Out.data());
-
-  ASSERT_FALSE(minimizeSourceToDependencyDirectives(
-      "#define MACRO   con  tent   ", Out));
-  EXPECT_STREQ("#define MACRO con  tent\n", Out.data());
-
-  ASSERT_FALSE(minimizeSourceToDependencyDirectives(
-      "#define MACRO()   con  tent   ", Out));
-  EXPECT_STREQ("#define MACRO() con  tent\n", Out.data());
-}
-
-TEST(MinimizeSourceToDependencyDirectivesTest, DefineInvalidMacroArguments) {
-  SmallVector<char, 128> Out;
-
-  ASSERT_FALSE(minimizeSourceToDependencyDirectives("#define MACRO((a))", Out));
-  EXPECT_STREQ("#define MACRO(/* invalid */\n", Out.data());
-
-  ASSERT_FALSE(minimizeSourceToDependencyDirectives("#define MACRO(", Out));
-  EXPECT_STREQ("#define MACRO(/* invalid */\n", Out.data());
-
-  ASSERT_FALSE(
-      minimizeSourceToDependencyDirectives("#define MACRO(a * b)", Out));
-  EXPECT_STREQ("#define MACRO(/* invalid */\n", Out.data());
-}
-
-TEST(MinimizeSourceToDependencyDirectivesTest, DefineHorizontalWhitespace) {
-  SmallVector<char, 128> Out;
-
-  ASSERT_FALSE(minimizeSourceToDependencyDirectives(
-      "#define MACRO(\t)\tcon \t tent\t", Out));
-  EXPECT_STREQ("#define MACRO() con \t tent\n", Out.data());
-
-  ASSERT_FALSE(minimizeSourceToDependencyDirectives(
-      "#define MACRO(\f)\fcon \f tent\f", Out));
-  EXPECT_STREQ("#define MACRO() con \f tent\n", Out.data());
-
-  ASSERT_FALSE(minimizeSourceToDependencyDirectives(
-      "#define MACRO(\v)\vcon \v tent\v", Out));
-  EXPECT_STREQ("#define MACRO() con \v tent\n", Out.data());
-
-  ASSERT_FALSE(minimizeSourceToDependencyDirectives(
-      "#define MACRO \t\v\f\v\t con\f\t\vtent\v\f \v", Out));
-  EXPECT_STREQ("#define MACRO con\f\t\vtent\n", Out.data());
-}
-
-TEST(MinimizeSourceToDependencyDirectivesTest, DefineMultilineArgs) {
-  SmallVector<char, 128> Out;
-
-  ASSERT_FALSE(
-      minimizeSourceToDependencyDirectives("#define MACRO(a        \\\n"
-                                           "              )",
-                                           Out));
-  EXPECT_STREQ("#define MACRO(a)\n", Out.data());
-
-  ASSERT_FALSE(
-      minimizeSourceToDependencyDirectives("#define MACRO(a,       \\\n"
-                                           "              b)       \\\n"
-                                           "        call((a),      \\\n"
-                                           "             (b))",
-                                           Out));
-  EXPECT_STREQ("#define MACRO(a,b) call((a), (b))\n", Out.data());
-}
-
-TEST(MinimizeSourceToDependencyDirectivesTest,
-     DefineMultilineArgsCarriageReturn) {
-  SmallVector<char, 128> Out;
-
-  ASSERT_FALSE(
-      minimizeSourceToDependencyDirectives("#define MACRO(a,       \\\r"
-                                           "              b)       \\\r"
-                                           "        call((a),      \\\r"
-                                           "             (b))",
-                                           Out));
-  EXPECT_STREQ("#define MACRO(a,b) call((a), (b))\n", Out.data());
-}
-
-TEST(MinimizeSourceToDependencyDirectivesTest, DefineMultilineArgsStringize) {
-  SmallVector<char, 128> Out;
-
-  ASSERT_FALSE(minimizeSourceToDependencyDirectives("#define MACRO(a,b) \\\n"
-                                                    "                #a \\\n"
-                                                    "                #b",
-                                                    Out));
-  EXPECT_STREQ("#define MACRO(a,b) #a #b\n", Out.data());
-}
-
-TEST(MinimizeSourceToDependencyDirectivesTest,
-     DefineMultilineArgsCarriageReturnNewline) {
-  SmallVector<char, 128> Out;
-
-  ASSERT_FALSE(
-      minimizeSourceToDependencyDirectives("#define MACRO(a,       \\\r\n"
-                                           "              b)       \\\r\n"
-                                           "        call((a),      \\\r\n"
-                                           "             (b))",
-                                           Out));
-  EXPECT_STREQ("#define MACRO(a,b) call((a), (b))\n", Out.data());
-}
-
-TEST(MinimizeSourceToDependencyDirectivesTest,
-     DefineMultilineArgsNewlineCarriageReturn) {
-  SmallVector<char, 128> Out;
-
-  ASSERT_FALSE(
-      minimizeSourceToDependencyDirectives("#define MACRO(a,       \\\n\r"
-                                           "              b)       \\\n\r"
-                                           "        call((a),      \\\n\r"
-                                           "             (b))",
-                                           Out));
-  EXPECT_STREQ("#define MACRO(a,b) call((a), (b))\n", Out.data());
-}
-
-TEST(MinimizeSourceToDependencyDirectivesTest, DefineNumber) {
-  SmallVector<char, 128> Out;
-
-  ASSERT_TRUE(minimizeSourceToDependencyDirectives("#define 0\n", Out));
-}
-
-TEST(MinimizeSourceToDependencyDirectivesTest, DefineNoName) {
-  SmallVector<char, 128> Out;
-
-  ASSERT_TRUE(minimizeSourceToDependencyDirectives("#define &\n", Out));
-}
-
-TEST(MinimizeSourceToDependencyDirectivesTest, DefineNoWhitespace) {
-  SmallVector<char, 128> Out;
-
-  ASSERT_FALSE(minimizeSourceToDependencyDirectives("#define AND&\n", Out));
-  EXPECT_STREQ("#define AND &\n", Out.data());
-
-  ASSERT_FALSE(minimizeSourceToDependencyDirectives("#define AND\\\n"
-                                                    "&\n",
-                                                    Out));
-  EXPECT_STREQ("#define AND &\n", Out.data());
-}
-
-TEST(MinimizeSourceToDependencyDirectivesTest, MultilineComment) {
-  SmallVector<char, 128> Out;
-
-  ASSERT_FALSE(
-      minimizeSourceToDependencyDirectives("#define MACRO a/*\n"
-                                           "  /*\n"
-                                           "#define MISSING abc\n"
-                                           "  /*\n"
-                                           "  /* something */ \n"
-                                           "#include  /* \"def\" */ <abc> \n",
-                                           Out));
-  EXPECT_STREQ("#define MACRO a\n"
-               "#include <abc>\n",
-               Out.data());
-}
-
-TEST(MinimizeSourceToDependencyDirectivesTest, MultilineCommentInStrings) {
-  SmallVector<char, 128> Out;
-
-  ASSERT_FALSE(minimizeSourceToDependencyDirectives("#define MACRO1 \"/*\"\n"
-                                                    "#define MACRO2 \"*/\"\n",
-                                                    Out));
-  EXPECT_STREQ("#define MACRO1 \"/*\"\n"
-               "#define MACRO2 \"*/\"\n",
-               Out.data());
-}
-
-TEST(MinimizeSourceToDependencyDirectivesTest, Ifdef) {
-  SmallVector<char, 128> Out;
-
-  ASSERT_FALSE(minimizeSourceToDependencyDirectives("#ifdef A\n"
-                                                    "#define B\n"
-                                                    "#endif\n",
-                                                    Out));
-  EXPECT_STREQ("#ifdef A\n"
-               "#define B\n"
-               "#endif\n",
-               Out.data());
-
-  ASSERT_FALSE(minimizeSourceToDependencyDirectives("#ifdef A\n"
-                                                    "#define B\n"
-                                                    "#elif B\n"
-                                                    "#define C\n"
-                                                    "#elif C\n"
-                                                    "#define D\n"
-                                                    "#else\n"
-                                                    "#define E\n"
-                                                    "#endif\n",
-                                                    Out));
-  EXPECT_STREQ("#ifdef A\n"
-               "#define B\n"
-               "#elif B\n"
-               "#define C\n"
-               "#elif C\n"
-               "#define D\n"
-               "#else\n"
-               "#define E\n"
-               "#endif\n",
-               Out.data());
-}
-
-TEST(MinimizeSourceToDependencyDirectivesTest, Elifdef) {
-  SmallVector<char, 128> Out;
-
-  ASSERT_FALSE(minimizeSourceToDependencyDirectives("#ifdef A\n"
-                                                    "#define B\n"
-                                                    "#elifdef C\n"
-                                                    "#define D\n"
-                                                    "#endif\n",
-                                                    Out));
-  EXPECT_STREQ("#ifdef A\n"
-               "#define B\n"
-               "#elifdef C\n"
-               "#define D\n"
-               "#endif\n",
-               Out.data());
-
-  ASSERT_FALSE(minimizeSourceToDependencyDirectives("#ifdef A\n"
-                                                    "#define B\n"
-                                                    "#elifdef B\n"
-                                                    "#define C\n"
-                                                    "#elifndef C\n"
-                                                    "#define D\n"
-                                                    "#else\n"
-                                                    "#define E\n"
-                                                    "#endif\n",
-                                                    Out));
-  EXPECT_STREQ("#ifdef A\n"
-               "#define B\n"
-               "#elifdef B\n"
-               "#define C\n"
-               "#elifndef C\n"
-               "#define D\n"
-               "#else\n"
-               "#define E\n"
-               "#endif\n",
-               Out.data());
-}
-
-TEST(MinimizeSourceToDependencyDirectivesTest, EmptyIfdef) {
-  SmallVector<char, 128> Out;
-
-  ASSERT_FALSE(minimizeSourceToDependencyDirectives("#ifdef A\n"
-                                                    "void skip();\n"
-                                                    "#elif B\n"
-                                                    "#elif C\n"
-                                                    "#else D\n"
-                                                    "#endif\n",
-                                                    Out));
-  EXPECT_STREQ("#ifdef A\n"
-               "#elif B\n"
-               "#elif C\n"
-               "#endif\n",
-               Out.data());
-}
-
-TEST(MinimizeSourceToDependencyDirectivesTest, EmptyElifdef) {
-  SmallVector<char, 128> Out;
-
-  ASSERT_FALSE(minimizeSourceToDependencyDirectives("#ifdef A\n"
-                                                    "void skip();\n"
-                                                    "#elifdef B\n"
-                                                    "#elifndef C\n"
-                                                    "#else D\n"
-                                                    "#endif\n",
-                                                    Out));
-  EXPECT_STREQ("#ifdef A\n"
-               "#elifdef B\n"
-               "#elifndef C\n"
-               "#endif\n",
-               Out.data());
-}
-
-TEST(MinimizeSourceToDependencyDirectivesTest, Pragma) {
-  SmallVector<char, 128> Out;
-
-  ASSERT_FALSE(minimizeSourceToDependencyDirectives("#pragma A\n", Out));
-  EXPECT_STREQ("", Out.data());
-
-  ASSERT_FALSE(minimizeSourceToDependencyDirectives("#pragma clang\n", Out));
-  EXPECT_STREQ("", Out.data());
-
-  ASSERT_FALSE(
-      minimizeSourceToDependencyDirectives("#pragma clang module\n", Out));
-  EXPECT_STREQ("", Out.data());
-
-  ASSERT_FALSE(minimizeSourceToDependencyDirectives(
-      "#pragma clang module impor\n", Out));
-  EXPECT_STREQ("", Out.data());
-
-  ASSERT_FALSE(minimizeSourceToDependencyDirectives(
-      "#pragma clang module import\n", Out));
-  EXPECT_STREQ("#pragma clang module import\n", Out.data());
-}
-
-TEST(MinimizeSourceToDependencyDirectivesTest, Include) {
-  SmallVector<char, 128> Out;
-
-  ASSERT_FALSE(minimizeSourceToDependencyDirectives("#include \"A\"\n", Out));
-  EXPECT_STREQ("#include \"A\"\n", Out.data());
-
-  ASSERT_FALSE(minimizeSourceToDependencyDirectives("#include <A>\n", Out));
-  EXPECT_STREQ("#include <A>\n", Out.data());
-
-  ASSERT_FALSE(
-      minimizeSourceToDependencyDirectives("#include_next <A>\n", Out));
-  EXPECT_STREQ("#include_next <A>\n", Out.data());
-
-  ASSERT_FALSE(minimizeSourceToDependencyDirectives("#import <A>\n", Out));
-  EXPECT_STREQ("#import <A>\n", Out.data());
-
-  ASSERT_FALSE(
-      minimizeSourceToDependencyDirectives("#__include_macros <A>\n", Out));
-  EXPECT_STREQ("#__include_macros <A>\n", Out.data());
-}
-
-TEST(MinimizeSourceToDependencyDirectivesTest, AtImport) {
-  SmallVector<char, 128> Out;
-
-  ASSERT_FALSE(minimizeSourceToDependencyDirectives("@import A;\n", Out));
-  EXPECT_STREQ("@import A;\n", Out.data());
-
-  ASSERT_FALSE(minimizeSourceToDependencyDirectives(" @ import  A;\n", Out));
-  EXPECT_STREQ("@import A;\n", Out.data());
-
-  ASSERT_FALSE(minimizeSourceToDependencyDirectives("@import A\n;", Out));
-  EXPECT_STREQ("@import A;\n", Out.data());
-
-  ASSERT_FALSE(minimizeSourceToDependencyDirectives("@import A.B;\n", Out));
-  EXPECT_STREQ("@import A.B;\n", Out.data());
-
-  ASSERT_FALSE(minimizeSourceToDependencyDirectives(
-      "@import /*x*/ A /*x*/ . /*x*/ B /*x*/ \n /*x*/ ; /*x*/", Out));
-  EXPECT_STREQ("@import A.B;\n", Out.data());
-}
-
-TEST(MinimizeSourceToDependencyDirectivesTest, AtImportFailures) {
-  SmallVector<char, 128> Out;
-
-  ASSERT_TRUE(minimizeSourceToDependencyDirectives("@import A\n", Out));
-  ASSERT_TRUE(minimizeSourceToDependencyDirectives("@import MACRO(A);\n", Out));
-  ASSERT_TRUE(minimizeSourceToDependencyDirectives("@import \" \";\n", Out));
-}
-
-TEST(MinimizeSourceToDependencyDirectivesTest, RawStringLiteral) {
-  SmallVector<char, 128> Out;
-
-  ASSERT_FALSE(minimizeSourceToDependencyDirectives("#ifndef GUARD\n"
-                                                    "#define GUARD\n"
-                                                    "R\"()\"\n"
-                                                    "#endif\n",
-                                                    Out));
-  EXPECT_STREQ("#ifndef GUARD\n"
-               "#define GUARD\n"
-               "#endif\n",
-               Out.data());
-
-  bool RawStringLiteralResult = minimizeSourceToDependencyDirectives(
-      "#ifndef GUARD\n"
-      "#define GUARD\n"
-      R"raw(static constexpr char bytes[] = R"(-?:\,[]{}#&*!|>'"%@`)";)raw"
-      "\n"
-      "#endif\n",
-      Out);
-  ASSERT_FALSE(RawStringLiteralResult);
-  EXPECT_STREQ("#ifndef GUARD\n"
-               "#define GUARD\n"
-               "#endif\n",
-               Out.data());
-
-  bool RawStringLiteralResult2 = minimizeSourceToDependencyDirectives(
-      "#ifndef GUARD\n"
-      "#define GUARD\n"
-      R"raw(static constexpr char bytes[] = R"abc(-?:\,[]{}#&*!|>'"%@`)abc";)raw"
-      "\n"
-      "#endif\n",
-      Out);
-  ASSERT_FALSE(RawStringLiteralResult2);
-  EXPECT_STREQ("#ifndef GUARD\n"
-               "#define GUARD\n"
-               "#endif\n",
-               Out.data());
-}
-
-TEST(MinimizeSourceToDependencyDirectivesTest, SplitIdentifier) {
-  SmallVector<char, 128> Out;
-
-  ASSERT_FALSE(minimizeSourceToDependencyDirectives("#if\\\n"
-                                                    "ndef GUARD\n"
-                                                    "#define GUARD\n"
-                                                    "#endif\n",
-                                                    Out));
-  EXPECT_STREQ("#ifndef GUARD\n"
-               "#define GUARD\n"
-               "#endif\n",
-               Out.data());
-
-  ASSERT_FALSE(minimizeSourceToDependencyDirectives("#define GUA\\\n"
-                                                    "RD\n",
-                                                    Out));
-  EXPECT_STREQ("#define GUARD\n", Out.data());
-
-  ASSERT_FALSE(minimizeSourceToDependencyDirectives("#define GUA\\\r"
-                                                    "RD\n",
-                                                    Out));
-  EXPECT_STREQ("#define GUARD\n", Out.data());
-
-  ASSERT_FALSE(minimizeSourceToDependencyDirectives("#define GUA\\\n"
-                                                    "           RD\n",
-                                                    Out));
-  EXPECT_STREQ("#define GUA RD\n", Out.data());
-}
-
-TEST(MinimizeSourceToDependencyDirectivesTest,
-     WhitespaceAfterLineContinuationSlash) {
-  SmallVector<char, 128> Out;
-
-  ASSERT_FALSE(minimizeSourceToDependencyDirectives("#define A 1 + \\  \n"
-                                                    "2 + \\\t\n"
-                                                    "3\n",
-                                                    Out));
-  EXPECT_STREQ("#define A 1 + 2 + 3\n", Out.data());
-}
-
-TEST(MinimizeSourceToDependencyDirectivesTest, PoundWarningAndError) {
-  SmallVector<char, 128> Out;
-
-  for (auto Source : {
-           "#warning '\n#include <t.h>\n",
-           "#warning \"\n#include <t.h>\n",
-           "#warning /*\n#include <t.h>\n",
-           "#warning \\\n#include <t.h>\n#include <t.h>\n",
-           "#error '\n#include <t.h>\n",
-           "#error \"\n#include <t.h>\n",
-           "#error /*\n#include <t.h>\n",
-           "#error \\\n#include <t.h>\n#include <t.h>\n",
-       }) {
-    ASSERT_FALSE(minimizeSourceToDependencyDirectives(Source, Out));
-    EXPECT_STREQ("#include <t.h>\n", Out.data());
-  }
-
-  for (auto Source : {
-           "#warning \\\n#include <t.h>\n",
-           "#error \\\n#include <t.h>\n",
-       }) {
-    ASSERT_FALSE(minimizeSourceToDependencyDirectives(Source, Out));
-    EXPECT_STREQ("", Out.data());
-  }
-
-  for (auto Source : {
-           "#if MACRO\n#warning '\n#endif\n",
-           "#if MACRO\n#warning \"\n#endif\n",
-           "#if MACRO\n#warning /*\n#endif\n",
-           "#if MACRO\n#error '\n#endif\n",
-           "#if MACRO\n#error \"\n#endif\n",
-           "#if MACRO\n#error /*\n#endif\n",
-       }) {
-    ASSERT_FALSE(minimizeSourceToDependencyDirectives(Source, Out));
-    EXPECT_STREQ("#if MACRO\n#endif\n", Out.data());
-  }
-}
-
-TEST(MinimizeSourceToDependencyDirectivesTest, CharacterLiteral) {
-  SmallVector<char, 128> Out;
-
-  StringRef Source = R"(
-#include <bob>
-int a = 0'1;
-int b = 0xfa'af'fa;
-int c = 12 ' ';
-#include <foo>
-)";
-  ASSERT_FALSE(minimizeSourceToDependencyDirectives(Source, Out));
-  EXPECT_STREQ("#include <bob>\n#include <foo>\n", Out.data());
-}
-
-TEST(MinimizeSourceToDependencyDirectivesTest, CharacterLiteralPrefixL) {
-  SmallVector<char, 128> Out;
-
-  StringRef Source = R"(L'P'
-#if DEBUG
-// '
-#endif
-#include <test.h>
-)";
-  ASSERT_FALSE(minimizeSourceToDependencyDirectives(Source, Out));
-  EXPECT_STREQ("#if DEBUG\n#endif\n#include <test.h>\n", Out.data());
-}
-
-TEST(MinimizeSourceToDependencyDirectivesTest, CharacterLiteralPrefixU) {
-  SmallVector<char, 128> Out;
-
-  StringRef Source = R"(int x = U'P';
-#include <test.h>
-// '
-)";
-  ASSERT_FALSE(minimizeSourceToDependencyDirectives(Source, Out));
-  EXPECT_STREQ("#include <test.h>\n", Out.data());
-}
-
-TEST(MinimizeSourceToDependencyDirectivesTest, CharacterLiteralPrefixu) {
-  SmallVector<char, 128> Out;
-
-  StringRef Source = R"(int x = u'b';
-int y = u8'a';
-int z = 128'78;
-#include <test.h>
-// '
-)";
-  ASSERT_FALSE(minimizeSourceToDependencyDirectives(Source, Out));
-  EXPECT_STREQ("#include <test.h>\n", Out.data());
-}
-
-TEST(MinimizeSourceToDependencyDirectivesTest, PragmaOnce) {
-  SmallVector<char, 128> Out;
-  SmallVector<Token, 4> Tokens;
-
-  StringRef Source = R"(// comment
-#pragma once
-// another comment
-#include <test.h>
-)";
-  ASSERT_FALSE(minimizeSourceToDependencyDirectives(Source, Out, Tokens));
-  EXPECT_STREQ("#pragma once\n#include <test.h>\n", Out.data());
-  ASSERT_EQ(Tokens.size(), 3u);
-  EXPECT_EQ(Tokens[0].K,
-            minimize_source_to_dependency_directives::pp_pragma_once);
-
-  Source = R"(// comment
-    #pragma once extra tokens
-    // another comment
-    #include <test.h>
-    )";
-  ASSERT_FALSE(minimizeSourceToDependencyDirectives(Source, Out));
-  EXPECT_STREQ("#pragma once\n#include <test.h>\n", Out.data());
-}
-
-TEST(MinimizeSourceToDependencyDirectivesTest,
-     SkipLineStringCharLiteralsUntilNewline) {
-  SmallVector<char, 128> Out;
-
-  StringRef Source = R"(#if NEVER_ENABLED
-    #define why(fmt, ...) #error don't try me
-    #endif
-
-    void foo();
-)";
-  ASSERT_FALSE(minimizeSourceToDependencyDirectives(Source, Out));
-  EXPECT_STREQ(
-      "#if NEVER_ENABLED\n#define why(fmt,...) #error don't try me\n#endif\n",
-      Out.data());
-
-  Source = R"(#if NEVER_ENABLED
-      #define why(fmt, ...) "quote dropped
-      #endif
-
-      void foo();
-  )";
-  ASSERT_FALSE(minimizeSourceToDependencyDirectives(Source, Out));
-  EXPECT_STREQ(
-      "#if NEVER_ENABLED\n#define why(fmt,...) \"quote dropped\n#endif\n",
-      Out.data());
-}
-
-TEST(MinimizeSourceToDependencyDirectivesTest,
-     SupportWhitespaceBeforeLineContinuationInStringSkipping) {
-  SmallVector<char, 128> Out;
-
-  StringRef Source = "#define X '\\ \t\nx'\nvoid foo() {}";
-  ASSERT_FALSE(minimizeSourceToDependencyDirectives(Source, Out));
-  EXPECT_STREQ("#define X '\\ \t\nx'\n", Out.data());
-
-  Source = "#define X \"\\ \r\nx\"\nvoid foo() {}";
-  ASSERT_FALSE(minimizeSourceToDependencyDirectives(Source, Out));
-  EXPECT_STREQ("#define X \"\\ \r\nx\"\n", Out.data());
-
-  Source = "#define X \"\\ \r\nx\n#include <x>\n";
-  ASSERT_FALSE(minimizeSourceToDependencyDirectives(Source, Out));
-  EXPECT_STREQ("#define X \"\\ \r\nx\n#include <x>\n", Out.data());
-}
-
-TEST(MinimizeSourceToDependencyDirectivesTest, CxxModules) {
-  SmallVector<char, 128> Out;
-  SmallVector<Token, 4> Tokens;
-
-  StringRef Source = R"(
-    module;
-    #include "textual-header.h"
-
-    export module m;
-    exp\
-ort \
-      import \
-      :l [[rename]];
-
-    export void f();
-
-    void h() {
-      import.a = 3;
-      import = 3;
-      import <<= 3;
-      import->a = 3;
-      import();
-      import . a();
-
-      import a b d e d e f e;
-      import foo [[no_unique_address]];
-      import foo();
-      import f(:sefse);
-      import f(->a = 3);
-    }
-    )";
-  ASSERT_FALSE(minimizeSourceToDependencyDirectives(Source, Out, Tokens));
-  EXPECT_STREQ("#include \"textual-header.h\"\nexport module m;\n"
-               "export import :l [[rename]];\n"
-               "import <<= 3;\nimport a b d e d e f e;\n"
-               "import foo [[no_unique_address]];\nimport foo();\n"
-               "import f(:sefse);\nimport f(->a = 3);\n", Out.data());
-  ASSERT_EQ(Tokens.size(), 12u);
-  EXPECT_EQ(Tokens[0].K,
-            minimize_source_to_dependency_directives::pp_include);
-  EXPECT_EQ(Tokens[2].K,
-            minimize_source_to_dependency_directives::cxx_module_decl);
-}
-
-TEST(MinimizeSourceToDependencyDirectivesTest, SkippedPPRangesBasic) {
-  SmallString<128> Out;
-  SmallVector<Token, 32> Toks;
-  StringRef Source = "#ifndef GUARD\n"
-                     "#define GUARD\n"
-                     "void foo();\n"
-                     "#endif\n";
-  ASSERT_FALSE(minimizeSourceToDependencyDirectives(Source, Out, Toks));
-  SmallVector<SkippedRange, 4> Ranges;
-  ASSERT_FALSE(computeSkippedRanges(Toks, Ranges));
-  EXPECT_EQ(Ranges.size(), 1u);
-  EXPECT_EQ(Ranges[0].Offset, 0);
-  EXPECT_EQ(Ranges[0].Length, (int)Out.find("#endif"));
-}
-
-TEST(MinimizeSourceToDependencyDirectivesTest, SkippedPPRangesBasicElifdef) {
-  SmallString<128> Out;
-  SmallVector<Token, 32> Toks;
-  StringRef Source = "#ifdef BLAH\n"
-                     "void skip();\n"
-                     "#elifdef BLAM\n"
-                     "void skip();\n"
-                     "#elifndef GUARD\n"
-                     "#define GUARD\n"
-                     "void foo();\n"
-                     "#endif\n";
-  ASSERT_FALSE(minimizeSourceToDependencyDirectives(Source, Out, Toks));
-  SmallVector<SkippedRange, 4> Ranges;
-  ASSERT_FALSE(computeSkippedRanges(Toks, Ranges));
-  EXPECT_EQ(Ranges.size(), 3u);
-  EXPECT_EQ(Ranges[0].Offset, 0);
-  EXPECT_EQ(Ranges[0].Length, (int)Out.find("#elifdef"));
-  EXPECT_EQ(Ranges[1].Offset, (int)Out.find("#elifdef"));
-  EXPECT_EQ(Ranges[1].Offset + Ranges[1].Length, (int)Out.find("#elifndef"));
-  EXPECT_EQ(Ranges[2].Offset, (int)Out.find("#elifndef"));
-  EXPECT_EQ(Ranges[2].Offset + Ranges[2].Length, (int)Out.rfind("#endif"));
-}
-
-TEST(MinimizeSourceToDependencyDirectivesTest, SkippedPPRangesNested) {
-  SmallString<128> Out;
-  SmallVector<Token, 32> Toks;
-  StringRef Source = "#ifndef GUARD\n"
-                     "#define GUARD\n"
-                     "#if FOO\n"
-                     "#include hello\n"
-                     "#elif BAR\n"
-                     "#include bye\n"
-                     "#endif\n"
-                     "#else\n"
-                     "#include nothing\n"
-                     "#endif\n";
-  ASSERT_FALSE(minimizeSourceToDependencyDirectives(Source, Out, Toks));
-  SmallVector<SkippedRange, 4> Ranges;
-  ASSERT_FALSE(computeSkippedRanges(Toks, Ranges));
-  EXPECT_EQ(Ranges.size(), 4u);
-  EXPECT_EQ(Ranges[0].Offset, (int)Out.find("#if FOO"));
-  EXPECT_EQ(Ranges[0].Offset + Ranges[0].Length, (int)Out.find("#elif"));
-  EXPECT_EQ(Ranges[1].Offset, (int)Out.find("#elif BAR"));
-  EXPECT_EQ(Ranges[1].Offset + Ranges[1].Length, (int)Out.find("#endif"));
-  EXPECT_EQ(Ranges[2].Offset, 0);
-  EXPECT_EQ(Ranges[2].Length, (int)Out.find("#else"));
-  EXPECT_EQ(Ranges[3].Offset, (int)Out.find("#else"));
-  EXPECT_EQ(Ranges[3].Offset + Ranges[3].Length, (int)Out.rfind("#endif"));
-}
-
-} // end anonymous namespace
diff --git a/gnu/llvm/clang/unittests/Lex/HeaderMapTest.cpp b/gnu/llvm/clang/unittests/Lex/HeaderMapTest.cpp
deleted file mode 100644
index 4220edb2908..00000000000
--- a/gnu/llvm/clang/unittests/Lex/HeaderMapTest.cpp
+++ /dev/null
@@ -1,187 +0,0 @@
-//===- unittests/Lex/HeaderMapTest.cpp - HeaderMap tests ----------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===--------------------------------------------------------------===//
-
-#include "HeaderMapTestUtils.h"
-#include "llvm/ADT/SmallString.h"
-#include "gtest/gtest.h"
-#include <type_traits>
-
-using namespace clang;
-using namespace llvm;
-using namespace clang::test;
-
-namespace {
-
-TEST(HeaderMapTest, checkHeaderEmpty) {
-  bool NeedsSwap;
-  ASSERT_FALSE(HeaderMapImpl::checkHeader(
-      *MemoryBuffer::getMemBufferCopy("", "empty"), NeedsSwap));
-  ASSERT_FALSE(HeaderMapImpl::checkHeader(
-      *MemoryBuffer::getMemBufferCopy("", "empty"), NeedsSwap));
-}
-
-TEST(HeaderMapTest, checkHeaderMagic) {
-  HMapFileMock<1, 1> File;
-  File.init();
-  File.Header.Magic = 0;
-  bool NeedsSwap;
-  ASSERT_FALSE(HeaderMapImpl::checkHeader(*File.getBuffer(), NeedsSwap));
-}
-
-TEST(HeaderMapTest, checkHeaderReserved) {
-  HMapFileMock<1, 1> File;
-  File.init();
-  File.Header.Reserved = 1;
-  bool NeedsSwap;
-  ASSERT_FALSE(HeaderMapImpl::checkHeader(*File.getBuffer(), NeedsSwap));
-}
-
-TEST(HeaderMapTest, checkHeaderVersion) {
-  HMapFileMock<1, 1> File;
-  File.init();
-  ++File.Header.Version;
-  bool NeedsSwap;
-  ASSERT_FALSE(HeaderMapImpl::checkHeader(*File.getBuffer(), NeedsSwap));
-}
-
-TEST(HeaderMapTest, checkHeaderValidButEmpty) {
-  HMapFileMock<1, 1> File;
-  File.init();
-  bool NeedsSwap;
-  ASSERT_TRUE(HeaderMapImpl::checkHeader(*File.getBuffer(), NeedsSwap));
-  ASSERT_FALSE(NeedsSwap);
-
-  File.swapBytes();
-  ASSERT_TRUE(HeaderMapImpl::checkHeader(*File.getBuffer(), NeedsSwap));
-  ASSERT_TRUE(NeedsSwap);
-}
-
-TEST(HeaderMapTest, checkHeader3Buckets) {
-  HMapFileMock<3, 1> File;
-  ASSERT_EQ(3 * sizeof(HMapBucket), sizeof(File.Buckets));
-
-  File.init();
-  bool NeedsSwap;
-  ASSERT_FALSE(HeaderMapImpl::checkHeader(*File.getBuffer(), NeedsSwap));
-}
-
-TEST(HeaderMapTest, checkHeader0Buckets) {
-  // Create with 1 bucket to avoid 0-sized arrays.
-  HMapFileMock<1, 1> File;
-  File.init();
-  File.Header.NumBuckets = 0;
-  bool NeedsSwap;
-  ASSERT_FALSE(HeaderMapImpl::checkHeader(*File.getBuffer(), NeedsSwap));
-}
-
-TEST(HeaderMapTest, checkHeaderNotEnoughBuckets) {
-  HMapFileMock<1, 1> File;
-  File.init();
-  File.Header.NumBuckets = 8;
-  bool NeedsSwap;
-  ASSERT_FALSE(HeaderMapImpl::checkHeader(*File.getBuffer(), NeedsSwap));
-}
-
-TEST(HeaderMapTest, lookupFilename) {
-  typedef HMapFileMock<2, 7> FileTy;
-  FileTy File;
-  File.init();
-
-  HMapFileMockMaker<FileTy> Maker(File);
-  auto a = Maker.addString("a");
-  auto b = Maker.addString("b");
-  auto c = Maker.addString("c");
-  Maker.addBucket("a", a, b, c);
-
-  bool NeedsSwap;
-  ASSERT_TRUE(HeaderMapImpl::checkHeader(*File.getBuffer(), NeedsSwap));
-  ASSERT_FALSE(NeedsSwap);
-  HeaderMapImpl Map(File.getBuffer(), NeedsSwap);
-
-  SmallString<8> DestPath;
-  ASSERT_EQ("bc", Map.lookupFilename("a", DestPath));
-}
-
-template <class FileTy, class PaddingTy> struct PaddedFile {
-  FileTy File;
-  PaddingTy Padding;
-};
-
-TEST(HeaderMapTest, lookupFilenameTruncatedSuffix) {
-  typedef HMapFileMock<2, 64 - sizeof(HMapHeader) - 2 * sizeof(HMapBucket)>
-      FileTy;
-  static_assert(std::is_standard_layout<FileTy>::value,
-                "Expected standard layout");
-  static_assert(sizeof(FileTy) == 64, "check the math");
-  PaddedFile<FileTy, uint64_t> P;
-  auto &File = P.File;
-  auto &Padding = P.Padding;
-  File.init();
-
-  HMapFileMockMaker<FileTy> Maker(File);
-  auto a = Maker.addString("a");
-  auto b = Maker.addString("b");
-  auto c = Maker.addString("c");
-  Maker.addBucket("a", a, b, c);
-
-  // Add 'x' characters to cause an overflow into Padding.
-  ASSERT_EQ('c', File.Bytes[5]);
-  for (unsigned I = 6; I < sizeof(File.Bytes); ++I) {
-    ASSERT_EQ(0, File.Bytes[I]);
-    File.Bytes[I] = 'x';
-  }
-  Padding = 0xffffffff; // Padding won't stop it either.
-
-  bool NeedsSwap;
-  ASSERT_TRUE(HeaderMapImpl::checkHeader(*File.getBuffer(), NeedsSwap));
-  ASSERT_FALSE(NeedsSwap);
-  HeaderMapImpl Map(File.getBuffer(), NeedsSwap);
-
-  // The string for "c" runs to the end of File.  Check that the suffix
-  // ("cxxxx...") is detected as truncated, and an empty string is returned.
-  SmallString<24> DestPath;
-  ASSERT_EQ("", Map.lookupFilename("a", DestPath));
-}
-
-TEST(HeaderMapTest, lookupFilenameTruncatedPrefix) {
-  typedef HMapFileMock<2, 64 - sizeof(HMapHeader) - 2 * sizeof(HMapBucket)>
-      FileTy;
-  static_assert(std::is_standard_layout<FileTy>::value,
-                "Expected standard layout");
-  static_assert(sizeof(FileTy) == 64, "check the math");
-  PaddedFile<FileTy, uint64_t> P;
-  auto &File = P.File;
-  auto &Padding = P.Padding;
-  File.init();
-
-  HMapFileMockMaker<FileTy> Maker(File);
-  auto a = Maker.addString("a");
-  auto c = Maker.addString("c");
-  auto b = Maker.addString("b"); // Store the prefix last.
-  Maker.addBucket("a", a, b, c);
-
-  // Add 'x' characters to cause an overflow into Padding.
-  ASSERT_EQ('b', File.Bytes[5]);
-  for (unsigned I = 6; I < sizeof(File.Bytes); ++I) {
-    ASSERT_EQ(0, File.Bytes[I]);
-    File.Bytes[I] = 'x';
-  }
-  Padding = 0xffffffff; // Padding won't stop it either.
-
-  bool NeedsSwap;
-  ASSERT_TRUE(HeaderMapImpl::checkHeader(*File.getBuffer(), NeedsSwap));
-  ASSERT_FALSE(NeedsSwap);
-  HeaderMapImpl Map(File.getBuffer(), NeedsSwap);
-
-  // The string for "b" runs to the end of File.  Check that the prefix
-  // ("bxxxx...") is detected as truncated, and an empty string is returned.
-  SmallString<24> DestPath;
-  ASSERT_EQ("", Map.lookupFilename("a", DestPath));
-}
-
-} // end namespace
diff --git a/gnu/llvm/clang/unittests/Lex/HeaderMapTestUtils.h b/gnu/llvm/clang/unittests/Lex/HeaderMapTestUtils.h
deleted file mode 100644
index 271d0588fc8..00000000000
--- a/gnu/llvm/clang/unittests/Lex/HeaderMapTestUtils.h
+++ /dev/null
@@ -1,100 +0,0 @@
-//===- unittests/Lex/HeaderMapTestUtils.h - HeaderMap utils -------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===--------------------------------------------------------------===//
-
-#ifndef LLVM_CLANG_UNITTESTS_LEX_HEADERMAPTESTUTILS_H
-#define LLVM_CLANG_UNITTESTS_LEX_HEADERMAPTESTUTILS_H
-
-#include "clang/Basic/CharInfo.h"
-#include "clang/Lex/HeaderMap.h"
-#include "clang/Lex/HeaderMapTypes.h"
-#include "llvm/Support/SwapByteOrder.h"
-#include <cassert>
-
-namespace clang {
-namespace test {
-
-// Lay out a header file for testing.
-template <unsigned NumBuckets, unsigned NumBytes> struct HMapFileMock {
-  HMapHeader Header;
-  HMapBucket Buckets[NumBuckets];
-  unsigned char Bytes[NumBytes];
-
-  void init() {
-    memset(this, 0, sizeof(HMapFileMock));
-    Header.Magic = HMAP_HeaderMagicNumber;
-    Header.Version = HMAP_HeaderVersion;
-    Header.NumBuckets = NumBuckets;
-    Header.StringsOffset = sizeof(Header) + sizeof(Buckets);
-  }
-
-  void swapBytes() {
-    using llvm::sys::getSwappedBytes;
-    Header.Magic = getSwappedBytes(Header.Magic);
-    Header.Version = getSwappedBytes(Header.Version);
-    Header.NumBuckets = getSwappedBytes(Header.NumBuckets);
-    Header.StringsOffset = getSwappedBytes(Header.StringsOffset);
-  }
-
-  std::unique_ptr<llvm::MemoryBuffer> getBuffer() {
-    return llvm::MemoryBuffer::getMemBuffer(
-        StringRef(reinterpret_cast<char *>(this), sizeof(HMapFileMock)),
-        "header",
-        /* RequresNullTerminator */ false);
-  }
-};
-
-template <class FileTy> struct HMapFileMockMaker {
-  FileTy &File;
-  unsigned SI = 1;
-  unsigned BI = 0;
-  HMapFileMockMaker(FileTy &File) : File(File) {}
-
-  unsigned addString(StringRef S) {
-    assert(SI + S.size() + 1 <= sizeof(File.Bytes));
-    std::copy(S.begin(), S.end(), File.Bytes + SI);
-    auto OldSI = SI;
-    SI += S.size() + 1;
-    return OldSI;
-  }
-
-  void addBucket(StringRef Str, unsigned Key, unsigned Prefix,
-                 unsigned Suffix) {
-    addBucket(getHash(Str), Key, Prefix, Suffix);
-  }
-
-  void addBucket(unsigned Hash, unsigned Key, unsigned Prefix,
-                 unsigned Suffix) {
-    assert(!(File.Header.NumBuckets & (File.Header.NumBuckets - 1)));
-    unsigned I = Hash & (File.Header.NumBuckets - 1);
-    do {
-      if (!File.Buckets[I].Key) {
-        File.Buckets[I].Key = Key;
-        File.Buckets[I].Prefix = Prefix;
-        File.Buckets[I].Suffix = Suffix;
-        ++File.Header.NumEntries;
-        return;
-      }
-      ++I;
-      I &= File.Header.NumBuckets - 1;
-    } while (I != (Hash & (File.Header.NumBuckets - 1)));
-    llvm_unreachable("no empty buckets");
-  }
-
-  // The header map hash function.
-  static unsigned getHash(StringRef Str) {
-    unsigned Result = 0;
-    for (char C : Str)
-      Result += toLowercase(C) * 13;
-    return Result;
-  }
-};
-
-} // namespace test
-} // namespace clang
-
-#endif
diff --git a/gnu/llvm/clang/unittests/Lex/HeaderSearchTest.cpp b/gnu/llvm/clang/unittests/Lex/HeaderSearchTest.cpp
deleted file mode 100644
index 4121a73a52c..00000000000
--- a/gnu/llvm/clang/unittests/Lex/HeaderSearchTest.cpp
+++ /dev/null
@@ -1,183 +0,0 @@
-//===- unittests/Lex/HeaderSearchTest.cpp ------ HeaderSearch tests -------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/Lex/HeaderSearch.h"
-#include "HeaderMapTestUtils.h"
-#include "clang/Basic/Diagnostic.h"
-#include "clang/Basic/DiagnosticOptions.h"
-#include "clang/Basic/FileManager.h"
-#include "clang/Basic/LangOptions.h"
-#include "clang/Basic/SourceManager.h"
-#include "clang/Basic/TargetInfo.h"
-#include "clang/Basic/TargetOptions.h"
-#include "clang/Lex/HeaderSearch.h"
-#include "clang/Lex/HeaderSearchOptions.h"
-#include "clang/Serialization/InMemoryModuleCache.h"
-#include "gtest/gtest.h"
-
-namespace clang {
-namespace {
-
-// The test fixture.
-class HeaderSearchTest : public ::testing::Test {
-protected:
-  HeaderSearchTest()
-      : VFS(new llvm::vfs::InMemoryFileSystem), FileMgr(FileMgrOpts, VFS),
-        DiagID(new DiagnosticIDs()),
-        Diags(DiagID, new DiagnosticOptions, new IgnoringDiagConsumer()),
-        SourceMgr(Diags, FileMgr), TargetOpts(new TargetOptions),
-        Search(std::make_shared<HeaderSearchOptions>(), SourceMgr, Diags,
-               LangOpts, Target.get()) {
-    TargetOpts->Triple = "x86_64-apple-darwin11.1.0";
-    Target = TargetInfo::CreateTargetInfo(Diags, TargetOpts);
-  }
-
-  void addSearchDir(llvm::StringRef Dir) {
-    VFS->addFile(Dir, 0, llvm::MemoryBuffer::getMemBuffer(""), /*User=*/None,
-                 /*Group=*/None, llvm::sys::fs::file_type::directory_file);
-    auto DE = FileMgr.getOptionalDirectoryRef(Dir);
-    assert(DE);
-    auto DL = DirectoryLookup(*DE, SrcMgr::C_User, /*isFramework=*/false);
-    Search.AddSearchPath(DL, /*isAngled=*/false);
-  }
-
-  void addHeaderMap(llvm::StringRef Filename,
-                    std::unique_ptr<llvm::MemoryBuffer> Buf) {
-    VFS->addFile(Filename, 0, std::move(Buf), /*User=*/None, /*Group=*/None,
-                 llvm::sys::fs::file_type::regular_file);
-    auto FE = FileMgr.getFile(Filename, true);
-    assert(FE);
-
-    // Test class supports only one HMap at a time.
-    assert(!HMap);
-    HMap = HeaderMap::Create(*FE, FileMgr);
-    auto DL =
-        DirectoryLookup(HMap.get(), SrcMgr::C_User, /*isFramework=*/false);
-    Search.AddSearchPath(DL, /*isAngled=*/false);
-  }
-
-  IntrusiveRefCntPtr<llvm::vfs::InMemoryFileSystem> VFS;
-  FileSystemOptions FileMgrOpts;
-  FileManager FileMgr;
-  IntrusiveRefCntPtr<DiagnosticIDs> DiagID;
-  DiagnosticsEngine Diags;
-  SourceManager SourceMgr;
-  LangOptions LangOpts;
-  std::shared_ptr<TargetOptions> TargetOpts;
-  IntrusiveRefCntPtr<TargetInfo> Target;
-  HeaderSearch Search;
-  std::unique_ptr<HeaderMap> HMap;
-};
-
-TEST_F(HeaderSearchTest, NoSearchDir) {
-  EXPECT_EQ(Search.search_dir_size(), 0u);
-  EXPECT_EQ(Search.suggestPathToFileForDiagnostics("/x/y/z", /*WorkingDir=*/"",
-                                                   /*MainFile=*/""),
-            "/x/y/z");
-}
-
-TEST_F(HeaderSearchTest, SimpleShorten) {
-  addSearchDir("/x");
-  addSearchDir("/x/y");
-  EXPECT_EQ(Search.suggestPathToFileForDiagnostics("/x/y/z", /*WorkingDir=*/"",
-                                                   /*MainFile=*/""),
-            "z");
-  addSearchDir("/a/b/");
-  EXPECT_EQ(Search.suggestPathToFileForDiagnostics("/a/b/c", /*WorkingDir=*/"",
-                                                   /*MainFile=*/""),
-            "c");
-}
-
-TEST_F(HeaderSearchTest, ShortenWithWorkingDir) {
-  addSearchDir("x/y");
-  EXPECT_EQ(Search.suggestPathToFileForDiagnostics("/a/b/c/x/y/z",
-                                                   /*WorkingDir=*/"/a/b/c",
-                                                   /*MainFile=*/""),
-            "z");
-}
-
-TEST_F(HeaderSearchTest, Dots) {
-  addSearchDir("/x/./y/");
-  EXPECT_EQ(Search.suggestPathToFileForDiagnostics("/x/y/./z",
-                                                   /*WorkingDir=*/"",
-                                                   /*MainFile=*/""),
-            "z");
-  addSearchDir("a/.././c/");
-  EXPECT_EQ(Search.suggestPathToFileForDiagnostics("/m/n/./c/z",
-                                                   /*WorkingDir=*/"/m/n/",
-                                                   /*MainFile=*/""),
-            "z");
-}
-
-#ifdef _WIN32
-TEST_F(HeaderSearchTest, BackSlash) {
-  addSearchDir("C:\\x\\y\\");
-  EXPECT_EQ(Search.suggestPathToFileForDiagnostics("C:\\x\\y\\z\\t",
-                                                   /*WorkingDir=*/"",
-                                                   /*MainFile=*/""),
-            "z/t");
-}
-
-TEST_F(HeaderSearchTest, BackSlashWithDotDot) {
-  addSearchDir("..\\y");
-  EXPECT_EQ(Search.suggestPathToFileForDiagnostics("C:\\x\\y\\z\\t",
-                                                   /*WorkingDir=*/"C:/x/y/",
-                                                   /*MainFile=*/""),
-            "z/t");
-}
-#endif
-
-TEST_F(HeaderSearchTest, DotDotsWithAbsPath) {
-  addSearchDir("/x/../y/");
-  EXPECT_EQ(Search.suggestPathToFileForDiagnostics("/y/z",
-                                                   /*WorkingDir=*/"",
-                                                   /*MainFile=*/""),
-            "z");
-}
-
-TEST_F(HeaderSearchTest, IncludeFromSameDirectory) {
-  EXPECT_EQ(Search.suggestPathToFileForDiagnostics("/y/z/t.h",
-                                                   /*WorkingDir=*/"",
-                                                   /*MainFile=*/"/y/a.cc"),
-            "z/t.h");
-
-  addSearchDir("/");
-  EXPECT_EQ(Search.suggestPathToFileForDiagnostics("/y/z/t.h",
-                                                   /*WorkingDir=*/"",
-                                                   /*MainFile=*/"/y/a.cc"),
-            "y/z/t.h");
-}
-
-// Helper struct with null terminator character to make MemoryBuffer happy.
-template <class FileTy, class PaddingTy>
-struct NullTerminatedFile : public FileTy {
-  PaddingTy Padding = 0;
-};
-
-TEST_F(HeaderSearchTest, HeaderMapReverseLookup) {
-  typedef NullTerminatedFile<test::HMapFileMock<2, 32>, char> FileTy;
-  FileTy File;
-  File.init();
-
-  test::HMapFileMockMaker<FileTy> Maker(File);
-  auto a = Maker.addString("d.h");
-  auto b = Maker.addString("b/");
-  auto c = Maker.addString("c.h");
-  Maker.addBucket("d.h", a, b, c);
-
-  addHeaderMap("/x/y/z.hmap", File.getBuffer());
-  addSearchDir("/a");
-
-  EXPECT_EQ(Search.suggestPathToFileForDiagnostics("/a/b/c.h",
-                                                   /*WorkingDir=*/"",
-                                                   /*MainFile=*/""),
-            "d.h");
-}
-
-} // namespace
-} // namespace clang
diff --git a/gnu/llvm/clang/unittests/Lex/LexerTest.cpp b/gnu/llvm/clang/unittests/Lex/LexerTest.cpp
deleted file mode 100644
index 319c63f6a50..00000000000
--- a/gnu/llvm/clang/unittests/Lex/LexerTest.cpp
+++ /dev/null
@@ -1,635 +0,0 @@
-//===- unittests/Lex/LexerTest.cpp ------ Lexer tests ---------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/Lex/Lexer.h"
-#include "clang/Basic/Diagnostic.h"
-#include "clang/Basic/DiagnosticOptions.h"
-#include "clang/Basic/FileManager.h"
-#include "clang/Basic/LangOptions.h"
-#include "clang/Basic/SourceLocation.h"
-#include "clang/Basic/SourceManager.h"
-#include "clang/Basic/TargetInfo.h"
-#include "clang/Basic/TargetOptions.h"
-#include "clang/Basic/TokenKinds.h"
-#include "clang/Lex/HeaderSearch.h"
-#include "clang/Lex/HeaderSearchOptions.h"
-#include "clang/Lex/MacroArgs.h"
-#include "clang/Lex/MacroInfo.h"
-#include "clang/Lex/ModuleLoader.h"
-#include "clang/Lex/Preprocessor.h"
-#include "clang/Lex/PreprocessorOptions.h"
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-#include <memory>
-#include <vector>
-
-namespace {
-using namespace clang;
-using testing::ElementsAre;
-
-// The test fixture.
-class LexerTest : public ::testing::Test {
-protected:
-  LexerTest()
-    : FileMgr(FileMgrOpts),
-      DiagID(new DiagnosticIDs()),
-      Diags(DiagID, new DiagnosticOptions, new IgnoringDiagConsumer()),
-      SourceMgr(Diags, FileMgr),
-      TargetOpts(new TargetOptions)
-  {
-    TargetOpts->Triple = "x86_64-apple-darwin11.1.0";
-    Target = TargetInfo::CreateTargetInfo(Diags, TargetOpts);
-  }
-
-  std::unique_ptr<Preprocessor> CreatePP(StringRef Source,
-                                         TrivialModuleLoader &ModLoader) {
-    std::unique_ptr<llvm::MemoryBuffer> Buf =
-        llvm::MemoryBuffer::getMemBuffer(Source);
-    SourceMgr.setMainFileID(SourceMgr.createFileID(std::move(Buf)));
-
-    HeaderSearch HeaderInfo(std::make_shared<HeaderSearchOptions>(), SourceMgr,
-                            Diags, LangOpts, Target.get());
-    std::unique_ptr<Preprocessor> PP = std::make_unique<Preprocessor>(
-        std::make_shared<PreprocessorOptions>(), Diags, LangOpts, SourceMgr,
-        HeaderInfo, ModLoader,
-        /*IILookup =*/nullptr,
-        /*OwnsHeaderSearch =*/false);
-    PP->Initialize(*Target);
-    PP->EnterMainSourceFile();
-    return PP;
-  }
-
-  std::vector<Token> Lex(StringRef Source) {
-    TrivialModuleLoader ModLoader;
-    PP = CreatePP(Source, ModLoader);
-
-    std::vector<Token> toks;
-    while (1) {
-      Token tok;
-      PP->Lex(tok);
-      if (tok.is(tok::eof))
-        break;
-      toks.push_back(tok);
-    }
-
-    return toks;
-  }
-
-  std::vector<Token> CheckLex(StringRef Source,
-                              ArrayRef<tok::TokenKind> ExpectedTokens) {
-    auto toks = Lex(Source);
-    EXPECT_EQ(ExpectedTokens.size(), toks.size());
-    for (unsigned i = 0, e = ExpectedTokens.size(); i != e; ++i) {
-      EXPECT_EQ(ExpectedTokens[i], toks[i].getKind());
-    }
-
-    return toks;
-  }
-
-  std::string getSourceText(Token Begin, Token End) {
-    bool Invalid;
-    StringRef Str =
-        Lexer::getSourceText(CharSourceRange::getTokenRange(SourceRange(
-                                    Begin.getLocation(), End.getLocation())),
-                             SourceMgr, LangOpts, &Invalid);
-    if (Invalid)
-      return "<INVALID>";
-    return std::string(Str);
-  }
-
-  FileSystemOptions FileMgrOpts;
-  FileManager FileMgr;
-  IntrusiveRefCntPtr<DiagnosticIDs> DiagID;
-  DiagnosticsEngine Diags;
-  SourceManager SourceMgr;
-  LangOptions LangOpts;
-  std::shared_ptr<TargetOptions> TargetOpts;
-  IntrusiveRefCntPtr<TargetInfo> Target;
-  std::unique_ptr<Preprocessor> PP;
-};
-
-TEST_F(LexerTest, GetSourceTextExpandsToMaximumInMacroArgument) {
-  std::vector<tok::TokenKind> ExpectedTokens;
-  ExpectedTokens.push_back(tok::identifier);
-  ExpectedTokens.push_back(tok::l_paren);
-  ExpectedTokens.push_back(tok::identifier);
-  ExpectedTokens.push_back(tok::r_paren);
-
-  std::vector<Token> toks = CheckLex("#define M(x) x\n"
-                                     "M(f(M(i)))",
-                                     ExpectedTokens);
-
-  EXPECT_EQ("M(i)", getSourceText(toks[2], toks[2]));
-}
-
-TEST_F(LexerTest, GetSourceTextExpandsToMaximumInMacroArgumentForEndOfMacro) {
-  std::vector<tok::TokenKind> ExpectedTokens;
-  ExpectedTokens.push_back(tok::identifier);
-  ExpectedTokens.push_back(tok::identifier);
-
-  std::vector<Token> toks = CheckLex("#define M(x) x\n"
-                                     "M(M(i) c)",
-                                     ExpectedTokens);
-
-  EXPECT_EQ("M(i)", getSourceText(toks[0], toks[0]));
-}
-
-TEST_F(LexerTest, GetSourceTextExpandsInMacroArgumentForBeginOfMacro) {
-  std::vector<tok::TokenKind> ExpectedTokens;
-  ExpectedTokens.push_back(tok::identifier);
-  ExpectedTokens.push_back(tok::identifier);
-  ExpectedTokens.push_back(tok::identifier);
-
-  std::vector<Token> toks = CheckLex("#define M(x) x\n"
-                                     "M(c c M(i))",
-                                     ExpectedTokens);
-
-  EXPECT_EQ("c M(i)", getSourceText(toks[1], toks[2]));
-}
-
-TEST_F(LexerTest, GetSourceTextExpandsInMacroArgumentForEndOfMacro) {
-  std::vector<tok::TokenKind> ExpectedTokens;
-  ExpectedTokens.push_back(tok::identifier);
-  ExpectedTokens.push_back(tok::identifier);
-  ExpectedTokens.push_back(tok::identifier);
-
-  std::vector<Token> toks = CheckLex("#define M(x) x\n"
-                                     "M(M(i) c c)",
-                                     ExpectedTokens);
-
-  EXPECT_EQ("M(i) c", getSourceText(toks[0], toks[1]));
-}
-
-TEST_F(LexerTest, GetSourceTextInSeparateFnMacros) {
-  std::vector<tok::TokenKind> ExpectedTokens;
-  ExpectedTokens.push_back(tok::identifier);
-  ExpectedTokens.push_back(tok::identifier);
-  ExpectedTokens.push_back(tok::identifier);
-  ExpectedTokens.push_back(tok::identifier);
-
-  std::vector<Token> toks = CheckLex("#define M(x) x\n"
-                                     "M(c M(i)) M(M(i) c)",
-                                     ExpectedTokens);
-
-  EXPECT_EQ("<INVALID>", getSourceText(toks[1], toks[2]));
-}
-
-TEST_F(LexerTest, GetSourceTextWorksAcrossTokenPastes) {
-  std::vector<tok::TokenKind> ExpectedTokens;
-  ExpectedTokens.push_back(tok::identifier);
-  ExpectedTokens.push_back(tok::l_paren);
-  ExpectedTokens.push_back(tok::identifier);
-  ExpectedTokens.push_back(tok::r_paren);
-
-  std::vector<Token> toks = CheckLex("#define M(x) x\n"
-                                     "#define C(x) M(x##c)\n"
-                                     "M(f(C(i)))",
-                                     ExpectedTokens);
-
-  EXPECT_EQ("C(i)", getSourceText(toks[2], toks[2]));
-}
-
-TEST_F(LexerTest, GetSourceTextExpandsAcrossMultipleMacroCalls) {
-  std::vector<tok::TokenKind> ExpectedTokens;
-  ExpectedTokens.push_back(tok::identifier);
-  ExpectedTokens.push_back(tok::l_paren);
-  ExpectedTokens.push_back(tok::identifier);
-  ExpectedTokens.push_back(tok::r_paren);
-
-  std::vector<Token> toks = CheckLex("#define M(x) x\n"
-                                     "f(M(M(i)))",
-                                     ExpectedTokens);
-  EXPECT_EQ("M(M(i))", getSourceText(toks[2], toks[2]));
-}
-
-TEST_F(LexerTest, GetSourceTextInMiddleOfMacroArgument) {
-  std::vector<tok::TokenKind> ExpectedTokens;
-  ExpectedTokens.push_back(tok::identifier);
-  ExpectedTokens.push_back(tok::l_paren);
-  ExpectedTokens.push_back(tok::identifier);
-  ExpectedTokens.push_back(tok::r_paren);
-
-  std::vector<Token> toks = CheckLex("#define M(x) x\n"
-                                     "M(f(i))",
-                                     ExpectedTokens);
-  EXPECT_EQ("i", getSourceText(toks[2], toks[2]));
-}
-
-TEST_F(LexerTest, GetSourceTextExpandsAroundDifferentMacroCalls) {
-  std::vector<tok::TokenKind> ExpectedTokens;
-  ExpectedTokens.push_back(tok::identifier);
-  ExpectedTokens.push_back(tok::l_paren);
-  ExpectedTokens.push_back(tok::identifier);
-  ExpectedTokens.push_back(tok::r_paren);
-
-  std::vector<Token> toks = CheckLex("#define M(x) x\n"
-                                     "#define C(x) x\n"
-                                     "f(C(M(i)))",
-                                     ExpectedTokens);
-  EXPECT_EQ("C(M(i))", getSourceText(toks[2], toks[2]));
-}
-
-TEST_F(LexerTest, GetSourceTextOnlyExpandsIfFirstTokenInMacro) {
-  std::vector<tok::TokenKind> ExpectedTokens;
-  ExpectedTokens.push_back(tok::identifier);
-  ExpectedTokens.push_back(tok::l_paren);
-  ExpectedTokens.push_back(tok::identifier);
-  ExpectedTokens.push_back(tok::identifier);
-  ExpectedTokens.push_back(tok::r_paren);
-
-  std::vector<Token> toks = CheckLex("#define M(x) x\n"
-                                     "#define C(x) c x\n"
-                                     "f(C(M(i)))",
-                                     ExpectedTokens);
-  EXPECT_EQ("M(i)", getSourceText(toks[3], toks[3]));
-}
-
-TEST_F(LexerTest, GetSourceTextExpandsRecursively) {
-  std::vector<tok::TokenKind> ExpectedTokens;
-  ExpectedTokens.push_back(tok::identifier);
-  ExpectedTokens.push_back(tok::identifier);
-  ExpectedTokens.push_back(tok::l_paren);
-  ExpectedTokens.push_back(tok::identifier);
-  ExpectedTokens.push_back(tok::r_paren);
-
-  std::vector<Token> toks = CheckLex("#define M(x) x\n"
-                                     "#define C(x) c M(x)\n"
-                                     "C(f(M(i)))",
-                                     ExpectedTokens);
-  EXPECT_EQ("M(i)", getSourceText(toks[3], toks[3]));
-}
-
-TEST_F(LexerTest, LexAPI) {
-  std::vector<tok::TokenKind> ExpectedTokens;
-  // Line 1 (after the #defines)
-  ExpectedTokens.push_back(tok::l_square);
-  ExpectedTokens.push_back(tok::identifier);
-  ExpectedTokens.push_back(tok::r_square);
-  ExpectedTokens.push_back(tok::l_square);
-  ExpectedTokens.push_back(tok::identifier);
-  ExpectedTokens.push_back(tok::r_square);
-  // Line 2
-  ExpectedTokens.push_back(tok::identifier);
-  ExpectedTokens.push_back(tok::identifier);
-  ExpectedTokens.push_back(tok::identifier);
-  ExpectedTokens.push_back(tok::identifier);
-
-  std::vector<Token> toks = CheckLex("#define M(x) [x]\n"
-                                     "#define N(x) x\n"
-                                     "#define INN(x) x\n"
-                                     "#define NOF1 INN(val)\n"
-                                     "#define NOF2 val\n"
-                                     "M(foo) N([bar])\n"
-                                     "N(INN(val)) N(NOF1) N(NOF2) N(val)",
-                                     ExpectedTokens);
-
-  SourceLocation lsqrLoc = toks[0].getLocation();
-  SourceLocation idLoc = toks[1].getLocation();
-  SourceLocation rsqrLoc = toks[2].getLocation();
-  CharSourceRange macroRange = SourceMgr.getExpansionRange(lsqrLoc);
-
-  SourceLocation Loc;
-  EXPECT_TRUE(Lexer::isAtStartOfMacroExpansion(lsqrLoc, SourceMgr, LangOpts, &Loc));
-  EXPECT_EQ(Loc, macroRange.getBegin());
-  EXPECT_FALSE(Lexer::isAtStartOfMacroExpansion(idLoc, SourceMgr, LangOpts));
-  EXPECT_FALSE(Lexer::isAtEndOfMacroExpansion(idLoc, SourceMgr, LangOpts));
-  EXPECT_TRUE(Lexer::isAtEndOfMacroExpansion(rsqrLoc, SourceMgr, LangOpts, &Loc));
-  EXPECT_EQ(Loc, macroRange.getEnd());
-  EXPECT_TRUE(macroRange.isTokenRange());
-
-  CharSourceRange range = Lexer::makeFileCharRange(
-           CharSourceRange::getTokenRange(lsqrLoc, idLoc), SourceMgr, LangOpts);
-  EXPECT_TRUE(range.isInvalid());
-  range = Lexer::makeFileCharRange(CharSourceRange::getTokenRange(idLoc, rsqrLoc),
-                                   SourceMgr, LangOpts);
-  EXPECT_TRUE(range.isInvalid());
-  range = Lexer::makeFileCharRange(CharSourceRange::getTokenRange(lsqrLoc, rsqrLoc),
-                                   SourceMgr, LangOpts);
-  EXPECT_TRUE(!range.isTokenRange());
-  EXPECT_EQ(range.getAsRange(),
-            SourceRange(macroRange.getBegin(),
-                        macroRange.getEnd().getLocWithOffset(1)));
-
-  StringRef text = Lexer::getSourceText(
-                               CharSourceRange::getTokenRange(lsqrLoc, rsqrLoc),
-                               SourceMgr, LangOpts);
-  EXPECT_EQ(text, "M(foo)");
-
-  SourceLocation macroLsqrLoc = toks[3].getLocation();
-  SourceLocation macroIdLoc = toks[4].getLocation();
-  SourceLocation macroRsqrLoc = toks[5].getLocation();
-  SourceLocation fileLsqrLoc = SourceMgr.getSpellingLoc(macroLsqrLoc);
-  SourceLocation fileIdLoc = SourceMgr.getSpellingLoc(macroIdLoc);
-  SourceLocation fileRsqrLoc = SourceMgr.getSpellingLoc(macroRsqrLoc);
-
-  range = Lexer::makeFileCharRange(
-      CharSourceRange::getTokenRange(macroLsqrLoc, macroIdLoc),
-      SourceMgr, LangOpts);
-  EXPECT_EQ(SourceRange(fileLsqrLoc, fileIdLoc.getLocWithOffset(3)),
-            range.getAsRange());
-
-  range = Lexer::makeFileCharRange(CharSourceRange::getTokenRange(macroIdLoc, macroRsqrLoc),
-                                   SourceMgr, LangOpts);
-  EXPECT_EQ(SourceRange(fileIdLoc, fileRsqrLoc.getLocWithOffset(1)),
-            range.getAsRange());
-
-  macroRange = SourceMgr.getExpansionRange(macroLsqrLoc);
-  range = Lexer::makeFileCharRange(
-                     CharSourceRange::getTokenRange(macroLsqrLoc, macroRsqrLoc),
-                     SourceMgr, LangOpts);
-  EXPECT_EQ(SourceRange(macroRange.getBegin(), macroRange.getEnd().getLocWithOffset(1)),
-            range.getAsRange());
-
-  text = Lexer::getSourceText(
-          CharSourceRange::getTokenRange(SourceRange(macroLsqrLoc, macroIdLoc)),
-          SourceMgr, LangOpts);
-  EXPECT_EQ(text, "[bar");
-
-
-  SourceLocation idLoc1 = toks[6].getLocation();
-  SourceLocation idLoc2 = toks[7].getLocation();
-  SourceLocation idLoc3 = toks[8].getLocation();
-  SourceLocation idLoc4 = toks[9].getLocation();
-  EXPECT_EQ("INN", Lexer::getImmediateMacroName(idLoc1, SourceMgr, LangOpts));
-  EXPECT_EQ("INN", Lexer::getImmediateMacroName(idLoc2, SourceMgr, LangOpts));
-  EXPECT_EQ("NOF2", Lexer::getImmediateMacroName(idLoc3, SourceMgr, LangOpts));
-  EXPECT_EQ("N", Lexer::getImmediateMacroName(idLoc4, SourceMgr, LangOpts));
-}
-
-TEST_F(LexerTest, HandlesSplitTokens) {
-  std::vector<tok::TokenKind> ExpectedTokens;
-  // Line 1 (after the #defines)
-  ExpectedTokens.push_back(tok::identifier);
-  ExpectedTokens.push_back(tok::less);
-  ExpectedTokens.push_back(tok::identifier);
-  ExpectedTokens.push_back(tok::less);
-  ExpectedTokens.push_back(tok::greatergreater);
-  // Line 2
-  ExpectedTokens.push_back(tok::identifier);
-  ExpectedTokens.push_back(tok::less);
-  ExpectedTokens.push_back(tok::identifier);
-  ExpectedTokens.push_back(tok::less);
-  ExpectedTokens.push_back(tok::greatergreater);
-
-  std::vector<Token> toks = CheckLex("#define TY ty\n"
-                                     "#define RANGLE ty<ty<>>\n"
-                                     "TY<ty<>>\n"
-                                     "RANGLE",
-                                     ExpectedTokens);
-
-  SourceLocation outerTyLoc = toks[0].getLocation();
-  SourceLocation innerTyLoc = toks[2].getLocation();
-  SourceLocation gtgtLoc = toks[4].getLocation();
-  // Split the token to simulate the action of the parser and force creation of
-  // an `ExpansionTokenRange`.
-  SourceLocation rangleLoc = PP->SplitToken(gtgtLoc, 1);
-
-  // Verify that it only captures the first greater-then and not the second one.
-  CharSourceRange range = Lexer::makeFileCharRange(
-      CharSourceRange::getTokenRange(innerTyLoc, rangleLoc), SourceMgr,
-      LangOpts);
-  EXPECT_TRUE(range.isCharRange());
-  EXPECT_EQ(range.getAsRange(),
-            SourceRange(innerTyLoc, gtgtLoc.getLocWithOffset(1)));
-
-  // Verify case where range begins in a macro expansion.
-  range = Lexer::makeFileCharRange(
-      CharSourceRange::getTokenRange(outerTyLoc, rangleLoc), SourceMgr,
-      LangOpts);
-  EXPECT_TRUE(range.isCharRange());
-  EXPECT_EQ(range.getAsRange(),
-            SourceRange(SourceMgr.getExpansionLoc(outerTyLoc),
-                        gtgtLoc.getLocWithOffset(1)));
-
-  SourceLocation macroInnerTyLoc = toks[7].getLocation();
-  SourceLocation macroGtgtLoc = toks[9].getLocation();
-  // Split the token to simulate the action of the parser and force creation of
-  // an `ExpansionTokenRange`.
-  SourceLocation macroRAngleLoc = PP->SplitToken(macroGtgtLoc, 1);
-
-  // Verify that it fails (because it only captures the first greater-then and
-  // not the second one, so it doesn't span the entire macro expansion).
-  range = Lexer::makeFileCharRange(
-      CharSourceRange::getTokenRange(macroInnerTyLoc, macroRAngleLoc),
-      SourceMgr, LangOpts);
-  EXPECT_TRUE(range.isInvalid());
-}
-
-TEST_F(LexerTest, DontMergeMacroArgsFromDifferentMacroFiles) {
-  std::vector<Token> toks =
-      Lex("#define helper1 0\n"
-          "void helper2(const char *, ...);\n"
-          "#define M1(a, ...) helper2(a, ##__VA_ARGS__)\n"
-          "#define M2(a, ...) M1(a, helper1, ##__VA_ARGS__)\n"
-          "void f1() { M2(\"a\", \"b\"); }");
-
-  // Check the file corresponding to the "helper1" macro arg in M2.
-  //
-  // The lexer used to report its size as 31, meaning that the end of the
-  // expansion would be on the *next line* (just past `M2("a", "b")`). Make
-  // sure that we get the correct end location (the comma after "helper1").
-  SourceLocation helper1ArgLoc = toks[20].getLocation();
-  EXPECT_EQ(SourceMgr.getFileIDSize(SourceMgr.getFileID(helper1ArgLoc)), 8U);
-}
-
-TEST_F(LexerTest, DontOverallocateStringifyArgs) {
-  TrivialModuleLoader ModLoader;
-  auto PP = CreatePP("\"StrArg\", 5, 'C'", ModLoader);
-
-  llvm::BumpPtrAllocator Allocator;
-  std::array<IdentifierInfo *, 3> ParamList;
-  MacroInfo *MI = PP->AllocateMacroInfo({});
-  MI->setIsFunctionLike();
-  MI->setParameterList(ParamList, Allocator);
-  EXPECT_EQ(3u, MI->getNumParams());
-  EXPECT_TRUE(MI->isFunctionLike());
-
-  Token Eof;
-  Eof.setKind(tok::eof);
-  std::vector<Token> ArgTokens;
-  while (1) {
-    Token tok;
-    PP->Lex(tok);
-    if (tok.is(tok::eof)) {
-      ArgTokens.push_back(Eof);
-      break;
-    }
-    if (tok.is(tok::comma))
-      ArgTokens.push_back(Eof);
-    else
-      ArgTokens.push_back(tok);
-  }
-
-  auto MacroArgsDeleter = [&PP](MacroArgs *M) { M->destroy(*PP); };
-  std::unique_ptr<MacroArgs, decltype(MacroArgsDeleter)> MA(
-      MacroArgs::create(MI, ArgTokens, false, *PP), MacroArgsDeleter);
-  auto StringifyArg = [&](int ArgNo) {
-    return MA->StringifyArgument(MA->getUnexpArgument(ArgNo), *PP,
-                                 /*Charify=*/false, {}, {});
-  };
-  Token Result = StringifyArg(0);
-  EXPECT_EQ(tok::string_literal, Result.getKind());
-  EXPECT_STREQ("\"\\\"StrArg\\\"\"", Result.getLiteralData());
-  Result = StringifyArg(1);
-  EXPECT_EQ(tok::string_literal, Result.getKind());
-  EXPECT_STREQ("\"5\"", Result.getLiteralData());
-  Result = StringifyArg(2);
-  EXPECT_EQ(tok::string_literal, Result.getKind());
-  EXPECT_STREQ("\"'C'\"", Result.getLiteralData());
-#if !defined(NDEBUG) && GTEST_HAS_DEATH_TEST
-  EXPECT_DEATH(StringifyArg(3), "Invalid arg #");
-#endif
-}
-
-TEST_F(LexerTest, IsNewLineEscapedValid) {
-  auto hasNewLineEscaped = [](const char *S) {
-    return Lexer::isNewLineEscaped(S, S + strlen(S) - 1);
-  };
-
-  EXPECT_TRUE(hasNewLineEscaped("\\\r"));
-  EXPECT_TRUE(hasNewLineEscaped("\\\n"));
-  EXPECT_TRUE(hasNewLineEscaped("\\\r\n"));
-  EXPECT_TRUE(hasNewLineEscaped("\\\n\r"));
-  EXPECT_TRUE(hasNewLineEscaped("\\ \t\v\f\r"));
-  EXPECT_TRUE(hasNewLineEscaped("\\ \t\v\f\r\n"));
-
-  EXPECT_FALSE(hasNewLineEscaped("\\\r\r"));
-  EXPECT_FALSE(hasNewLineEscaped("\\\r\r\n"));
-  EXPECT_FALSE(hasNewLineEscaped("\\\n\n"));
-  EXPECT_FALSE(hasNewLineEscaped("\r"));
-  EXPECT_FALSE(hasNewLineEscaped("\n"));
-  EXPECT_FALSE(hasNewLineEscaped("\r\n"));
-  EXPECT_FALSE(hasNewLineEscaped("\n\r"));
-  EXPECT_FALSE(hasNewLineEscaped("\r\r"));
-  EXPECT_FALSE(hasNewLineEscaped("\n\n"));
-}
-
-TEST_F(LexerTest, GetBeginningOfTokenWithEscapedNewLine) {
-  // Each line should have the same length for
-  // further offset calculation to be more straightforward.
-  const unsigned IdentifierLength = 8;
-  std::string TextToLex = "rabarbar\n"
-                          "foo\\\nbar\n"
-                          "foo\\\rbar\n"
-                          "fo\\\r\nbar\n"
-                          "foo\\\n\rba\n";
-  std::vector<tok::TokenKind> ExpectedTokens{5, tok::identifier};
-  std::vector<Token> LexedTokens = CheckLex(TextToLex, ExpectedTokens);
-
-  for (const Token &Tok : LexedTokens) {
-    std::pair<FileID, unsigned> OriginalLocation =
-        SourceMgr.getDecomposedLoc(Tok.getLocation());
-    for (unsigned Offset = 0; Offset < IdentifierLength; ++Offset) {
-      SourceLocation LookupLocation =
-          Tok.getLocation().getLocWithOffset(Offset);
-
-      std::pair<FileID, unsigned> FoundLocation =
-          SourceMgr.getDecomposedExpansionLoc(
-              Lexer::GetBeginningOfToken(LookupLocation, SourceMgr, LangOpts));
-
-      // Check that location returned by the GetBeginningOfToken
-      // is the same as original token location reported by Lexer.
-      EXPECT_EQ(FoundLocation.second, OriginalLocation.second);
-    }
-  }
-}
-
-TEST_F(LexerTest, AvoidPastEndOfStringDereference) {
-  EXPECT_TRUE(Lex("  //  \\\n").empty());
-  EXPECT_TRUE(Lex("#include <\\\\").empty());
-  EXPECT_TRUE(Lex("#include <\\\\\n").empty());
-}
-
-TEST_F(LexerTest, StringizingRasString) {
-  // For "std::string Lexer::Stringify(StringRef Str, bool Charify)".
-  std::string String1 = R"(foo
-    {"bar":[]}
-    baz)";
-  // For "void Lexer::Stringify(SmallVectorImpl<char> &Str)".
-  SmallString<128> String2;
-  String2 += String1.c_str();
-
-  // Corner cases.
-  std::string String3 = R"(\
-    \n
-    \\n
-    \\)";
-  SmallString<128> String4;
-  String4 += String3.c_str();
-  std::string String5 = R"(a\
-
-
-    \\b)";
-  SmallString<128> String6;
-  String6 += String5.c_str();
-
-  String1 = Lexer::Stringify(StringRef(String1));
-  Lexer::Stringify(String2);
-  String3 = Lexer::Stringify(StringRef(String3));
-  Lexer::Stringify(String4);
-  String5 = Lexer::Stringify(StringRef(String5));
-  Lexer::Stringify(String6);
-
-  EXPECT_EQ(String1, R"(foo\n    {\"bar\":[]}\n    baz)");
-  EXPECT_EQ(String2, R"(foo\n    {\"bar\":[]}\n    baz)");
-  EXPECT_EQ(String3, R"(\\\n    \\n\n    \\\\n\n    \\\\)");
-  EXPECT_EQ(String4, R"(\\\n    \\n\n    \\\\n\n    \\\\)");
-  EXPECT_EQ(String5, R"(a\\\n\n\n    \\\\b)");
-  EXPECT_EQ(String6, R"(a\\\n\n\n    \\\\b)");
-}
-
-TEST_F(LexerTest, CharRangeOffByOne) {
-  std::vector<Token> toks = Lex(R"(#define MOO 1
-    void foo() { MOO; })");
-  const Token &moo = toks[5];
-
-  EXPECT_EQ(getSourceText(moo, moo), "MOO");
-
-  SourceRange R{moo.getLocation(), moo.getLocation()};
-
-  EXPECT_TRUE(
-      Lexer::isAtStartOfMacroExpansion(R.getBegin(), SourceMgr, LangOpts));
-  EXPECT_TRUE(
-      Lexer::isAtEndOfMacroExpansion(R.getEnd(), SourceMgr, LangOpts));
-
-  CharSourceRange CR = Lexer::getAsCharRange(R, SourceMgr, LangOpts);
-
-  EXPECT_EQ(Lexer::getSourceText(CR, SourceMgr, LangOpts), "MOO"); // Was "MO".
-}
-
-TEST_F(LexerTest, FindNextToken) {
-  Lex("int abcd = 0;\n"
-      "int xyz = abcd;\n");
-  std::vector<std::string> GeneratedByNextToken;
-  SourceLocation Loc =
-      SourceMgr.getLocForStartOfFile(SourceMgr.getMainFileID());
-  while (true) {
-    auto T = Lexer::findNextToken(Loc, SourceMgr, LangOpts);
-    ASSERT_TRUE(T.hasValue());
-    if (T->is(tok::eof))
-      break;
-    GeneratedByNextToken.push_back(getSourceText(*T, *T));
-    Loc = T->getLocation();
-  }
-  EXPECT_THAT(GeneratedByNextToken, ElementsAre("abcd", "=", "0", ";", "int",
-                                                "xyz", "=", "abcd", ";"));
-}
-
-TEST_F(LexerTest, CreatedFIDCountForPredefinedBuffer) {
-  TrivialModuleLoader ModLoader;
-  auto PP = CreatePP("", ModLoader);
-  while (1) {
-    Token tok;
-    PP->Lex(tok);
-    if (tok.is(tok::eof))
-      break;
-  }
-  EXPECT_EQ(SourceMgr.getNumCreatedFIDsForFileID(PP->getPredefinesFileID()),
-            1U);
-}
-} // anonymous namespace
diff --git a/gnu/llvm/clang/unittests/Lex/PPCallbacksTest.cpp b/gnu/llvm/clang/unittests/Lex/PPCallbacksTest.cpp
deleted file mode 100644
index bb4098a1f98..00000000000
--- a/gnu/llvm/clang/unittests/Lex/PPCallbacksTest.cpp
+++ /dev/null
@@ -1,555 +0,0 @@
-//===- unittests/Lex/PPCallbacksTest.cpp - PPCallbacks tests ------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===--------------------------------------------------------------===//
-
-#include "clang/Lex/Preprocessor.h"
-#include "clang/AST/ASTConsumer.h"
-#include "clang/AST/ASTContext.h"
-#include "clang/Basic/Diagnostic.h"
-#include "clang/Basic/DiagnosticOptions.h"
-#include "clang/Basic/FileManager.h"
-#include "clang/Basic/LangOptions.h"
-#include "clang/Basic/SourceManager.h"
-#include "clang/Basic/TargetInfo.h"
-#include "clang/Basic/TargetOptions.h"
-#include "clang/Lex/HeaderSearch.h"
-#include "clang/Lex/HeaderSearchOptions.h"
-#include "clang/Lex/ModuleLoader.h"
-#include "clang/Lex/PreprocessorOptions.h"
-#include "clang/Parse/Parser.h"
-#include "clang/Sema/Sema.h"
-#include "llvm/ADT/SmallString.h"
-#include "llvm/Support/Path.h"
-#include "gtest/gtest.h"
-
-using namespace clang;
-
-namespace {
-
-// Stub to collect data from InclusionDirective callbacks.
-class InclusionDirectiveCallbacks : public PPCallbacks {
-public:
-  void InclusionDirective(SourceLocation HashLoc, const Token &IncludeTok,
-                          StringRef FileName, bool IsAngled,
-                          CharSourceRange FilenameRange, const FileEntry *File,
-                          StringRef SearchPath, StringRef RelativePath,
-                          const Module *Imported,
-                          SrcMgr::CharacteristicKind FileType) override {
-    this->HashLoc = HashLoc;
-    this->IncludeTok = IncludeTok;
-    this->FileName = FileName.str();
-    this->IsAngled = IsAngled;
-    this->FilenameRange = FilenameRange;
-    this->File = File;
-    this->SearchPath = SearchPath.str();
-    this->RelativePath = RelativePath.str();
-    this->Imported = Imported;
-    this->FileType = FileType;
-  }
-
-  SourceLocation HashLoc;
-  Token IncludeTok;
-  SmallString<16> FileName;
-  bool IsAngled;
-  CharSourceRange FilenameRange;
-  const FileEntry* File;
-  SmallString<16> SearchPath;
-  SmallString<16> RelativePath;
-  const Module* Imported;
-  SrcMgr::CharacteristicKind FileType;
-};
-
-class CondDirectiveCallbacks : public PPCallbacks {
-public:
-  struct Result {
-    SourceRange ConditionRange;
-    ConditionValueKind ConditionValue;
-
-    Result(SourceRange R, ConditionValueKind K)
-        : ConditionRange(R), ConditionValue(K) {}
-  };
-
-  std::vector<Result> Results;
-
-  void If(SourceLocation Loc, SourceRange ConditionRange,
-          ConditionValueKind ConditionValue) override {
-    Results.emplace_back(ConditionRange, ConditionValue);
-  }
-
-  void Elif(SourceLocation Loc, SourceRange ConditionRange,
-            ConditionValueKind ConditionValue, SourceLocation IfLoc) override {
-    Results.emplace_back(ConditionRange, ConditionValue);
-  }
-};
-
-// Stub to collect data from PragmaOpenCLExtension callbacks.
-class PragmaOpenCLExtensionCallbacks : public PPCallbacks {
-public:
-  typedef struct {
-    SmallString<16> Name;
-    unsigned State;
-  } CallbackParameters;
-
-  PragmaOpenCLExtensionCallbacks() : Name("Not called."), State(99) {}
-
-  void PragmaOpenCLExtension(clang::SourceLocation NameLoc,
-                             const clang::IdentifierInfo *Name,
-                             clang::SourceLocation StateLoc,
-                             unsigned State) override {
-      this->NameLoc = NameLoc;
-      this->Name = Name->getName();
-      this->StateLoc = StateLoc;
-      this->State = State;
-  }
-
-  SourceLocation NameLoc;
-  SmallString<16> Name;
-  SourceLocation StateLoc;
-  unsigned State;
-};
-
-class PragmaMarkCallbacks : public PPCallbacks {
-public:
-  struct Mark {
-    SourceLocation Location;
-    std::string Trivia;
-  };
-
-  std::vector<Mark> Marks;
-
-  void PragmaMark(SourceLocation Loc, StringRef Trivia) override {
-    Marks.emplace_back(Mark{Loc, Trivia.str()});
-  }
-};
-
-// PPCallbacks test fixture.
-class PPCallbacksTest : public ::testing::Test {
-protected:
-  PPCallbacksTest()
-      : InMemoryFileSystem(new llvm::vfs::InMemoryFileSystem),
-        FileMgr(FileSystemOptions(), InMemoryFileSystem),
-        DiagID(new DiagnosticIDs()), DiagOpts(new DiagnosticOptions()),
-        Diags(DiagID, DiagOpts.get(), new IgnoringDiagConsumer()),
-        SourceMgr(Diags, FileMgr), TargetOpts(new TargetOptions()) {
-    TargetOpts->Triple = "x86_64-apple-darwin11.1.0";
-    Target = TargetInfo::CreateTargetInfo(Diags, TargetOpts);
-  }
-
-  IntrusiveRefCntPtr<llvm::vfs::InMemoryFileSystem> InMemoryFileSystem;
-  FileManager FileMgr;
-  IntrusiveRefCntPtr<DiagnosticIDs> DiagID;
-  IntrusiveRefCntPtr<DiagnosticOptions> DiagOpts;
-  DiagnosticsEngine Diags;
-  SourceManager SourceMgr;
-  LangOptions LangOpts;
-  std::shared_ptr<TargetOptions> TargetOpts;
-  IntrusiveRefCntPtr<TargetInfo> Target;
-
-  // Register a header path as a known file and add its location
-  // to search path.
-  void AddFakeHeader(HeaderSearch &HeaderInfo, const char *HeaderPath,
-                     bool IsSystemHeader) {
-    // Tell FileMgr about header.
-    InMemoryFileSystem->addFile(HeaderPath, 0,
-                                llvm::MemoryBuffer::getMemBuffer("\n"));
-
-    // Add header's parent path to search path.
-    StringRef SearchPath = llvm::sys::path::parent_path(HeaderPath);
-    auto DE = FileMgr.getOptionalDirectoryRef(SearchPath);
-    DirectoryLookup DL(*DE, SrcMgr::C_User, false);
-    HeaderInfo.AddSearchPath(DL, IsSystemHeader);
-  }
-
-  // Get the raw source string of the range.
-  StringRef GetSourceString(CharSourceRange Range) {
-    const char* B = SourceMgr.getCharacterData(Range.getBegin());
-    const char* E = SourceMgr.getCharacterData(Range.getEnd());
-
-    return StringRef(B, E - B);
-  }
-
-  StringRef GetSourceStringToEnd(CharSourceRange Range) {
-    const char *B = SourceMgr.getCharacterData(Range.getBegin());
-    const char *E = SourceMgr.getCharacterData(Range.getEnd());
-
-    return StringRef(
-        B,
-        E - B + Lexer::MeasureTokenLength(Range.getEnd(), SourceMgr, LangOpts));
-  }
-
-  // Run lexer over SourceText and collect FilenameRange from
-  // the InclusionDirective callback.
-  CharSourceRange InclusionDirectiveFilenameRange(const char *SourceText,
-                                                  const char *HeaderPath,
-                                                  bool SystemHeader) {
-    std::unique_ptr<llvm::MemoryBuffer> Buf =
-        llvm::MemoryBuffer::getMemBuffer(SourceText);
-    SourceMgr.setMainFileID(SourceMgr.createFileID(std::move(Buf)));
-
-    TrivialModuleLoader ModLoader;
-
-    HeaderSearch HeaderInfo(std::make_shared<HeaderSearchOptions>(), SourceMgr,
-                            Diags, LangOpts, Target.get());
-    AddFakeHeader(HeaderInfo, HeaderPath, SystemHeader);
-
-    Preprocessor PP(std::make_shared<PreprocessorOptions>(), Diags, LangOpts,
-                    SourceMgr, HeaderInfo, ModLoader,
-                    /*IILookup =*/nullptr,
-                    /*OwnsHeaderSearch =*/false);
-    return InclusionDirectiveCallback(PP)->FilenameRange;
-  }
-
-  SrcMgr::CharacteristicKind InclusionDirectiveCharacteristicKind(
-      const char *SourceText, const char *HeaderPath, bool SystemHeader) {
-    std::unique_ptr<llvm::MemoryBuffer> Buf =
-        llvm::MemoryBuffer::getMemBuffer(SourceText);
-    SourceMgr.setMainFileID(SourceMgr.createFileID(std::move(Buf)));
-
-    TrivialModuleLoader ModLoader;
-
-    HeaderSearch HeaderInfo(std::make_shared<HeaderSearchOptions>(), SourceMgr,
-                            Diags, LangOpts, Target.get());
-    AddFakeHeader(HeaderInfo, HeaderPath, SystemHeader);
-
-    Preprocessor PP(std::make_shared<PreprocessorOptions>(), Diags, LangOpts,
-                    SourceMgr, HeaderInfo, ModLoader,
-                    /*IILookup =*/nullptr,
-                    /*OwnsHeaderSearch =*/false);
-    return InclusionDirectiveCallback(PP)->FileType;
-  }
-
-  InclusionDirectiveCallbacks *InclusionDirectiveCallback(Preprocessor &PP) {
-    PP.Initialize(*Target);
-    InclusionDirectiveCallbacks* Callbacks = new InclusionDirectiveCallbacks;
-    PP.addPPCallbacks(std::unique_ptr<PPCallbacks>(Callbacks));
-
-    // Lex source text.
-    PP.EnterMainSourceFile();
-
-    while (true) {
-      Token Tok;
-      PP.Lex(Tok);
-      if (Tok.is(tok::eof))
-        break;
-    }
-
-    // Callbacks have been executed at this point -- return filename range.
-    return Callbacks;
-  }
-
-  std::vector<CondDirectiveCallbacks::Result>
-  DirectiveExprRange(StringRef SourceText) {
-    TrivialModuleLoader ModLoader;
-    std::unique_ptr<llvm::MemoryBuffer> Buf =
-        llvm::MemoryBuffer::getMemBuffer(SourceText);
-    SourceMgr.setMainFileID(SourceMgr.createFileID(std::move(Buf)));
-    HeaderSearch HeaderInfo(std::make_shared<HeaderSearchOptions>(), SourceMgr,
-                            Diags, LangOpts, Target.get());
-    Preprocessor PP(std::make_shared<PreprocessorOptions>(), Diags, LangOpts,
-                    SourceMgr, HeaderInfo, ModLoader,
-                    /*IILookup =*/nullptr,
-                    /*OwnsHeaderSearch =*/false);
-    PP.Initialize(*Target);
-    auto *Callbacks = new CondDirectiveCallbacks;
-    PP.addPPCallbacks(std::unique_ptr<PPCallbacks>(Callbacks));
-
-    // Lex source text.
-    PP.EnterMainSourceFile();
-
-    while (true) {
-      Token Tok;
-      PP.Lex(Tok);
-      if (Tok.is(tok::eof))
-        break;
-    }
-
-    return Callbacks->Results;
-  }
-
-  std::vector<PragmaMarkCallbacks::Mark>
-  PragmaMarkCall(const char *SourceText) {
-    std::unique_ptr<llvm::MemoryBuffer> SourceBuf =
-        llvm::MemoryBuffer::getMemBuffer(SourceText, "test.c");
-    SourceMgr.setMainFileID(SourceMgr.createFileID(std::move(SourceBuf)));
-
-    HeaderSearch HeaderInfo(std::make_shared<HeaderSearchOptions>(), SourceMgr,
-                            Diags, LangOpts, Target.get());
-    TrivialModuleLoader ModLoader;
-
-    Preprocessor PP(std::make_shared<PreprocessorOptions>(), Diags, LangOpts,
-                    SourceMgr, HeaderInfo, ModLoader, /*IILookup=*/nullptr,
-                    /*OwnsHeaderSearch=*/false);
-    PP.Initialize(*Target);
-
-    auto *Callbacks = new PragmaMarkCallbacks;
-    PP.addPPCallbacks(std::unique_ptr<PPCallbacks>(Callbacks));
-
-    // Lex source text.
-    PP.EnterMainSourceFile();
-    while (true) {
-      Token Tok;
-      PP.Lex(Tok);
-      if (Tok.is(tok::eof))
-        break;
-    }
-
-    return Callbacks->Marks;
-  }
-
-  PragmaOpenCLExtensionCallbacks::CallbackParameters
-  PragmaOpenCLExtensionCall(const char *SourceText) {
-    LangOptions OpenCLLangOpts;
-    OpenCLLangOpts.OpenCL = 1;
-
-    std::unique_ptr<llvm::MemoryBuffer> SourceBuf =
-        llvm::MemoryBuffer::getMemBuffer(SourceText, "test.cl");
-    SourceMgr.setMainFileID(SourceMgr.createFileID(std::move(SourceBuf)));
-
-    TrivialModuleLoader ModLoader;
-    HeaderSearch HeaderInfo(std::make_shared<HeaderSearchOptions>(), SourceMgr,
-                            Diags, OpenCLLangOpts, Target.get());
-
-    Preprocessor PP(std::make_shared<PreprocessorOptions>(), Diags,
-                    OpenCLLangOpts, SourceMgr, HeaderInfo, ModLoader,
-                    /*IILookup =*/nullptr,
-                    /*OwnsHeaderSearch =*/false);
-    PP.Initialize(*Target);
-
-    // parser actually sets correct pragma handlers for preprocessor
-    // according to LangOptions, so we init Parser to register opencl
-    // pragma handlers
-    ASTContext Context(OpenCLLangOpts, SourceMgr, PP.getIdentifierTable(),
-                       PP.getSelectorTable(), PP.getBuiltinInfo(), PP.TUKind);
-    Context.InitBuiltinTypes(*Target);
-
-    ASTConsumer Consumer;
-    Sema S(PP, Context, Consumer);
-    Parser P(PP, S, false);
-    PragmaOpenCLExtensionCallbacks* Callbacks = new PragmaOpenCLExtensionCallbacks;
-    PP.addPPCallbacks(std::unique_ptr<PPCallbacks>(Callbacks));
-
-    // Lex source text.
-    PP.EnterMainSourceFile();
-    while (true) {
-      Token Tok;
-      PP.Lex(Tok);
-      if (Tok.is(tok::eof))
-        break;
-    }
-
-    PragmaOpenCLExtensionCallbacks::CallbackParameters RetVal = {
-      Callbacks->Name,
-      Callbacks->State
-    };
-    return RetVal;
-  }
-};
-
-TEST_F(PPCallbacksTest, UserFileCharacteristics) {
-  const char *Source = "#include \"quoted.h\"\n";
-
-  SrcMgr::CharacteristicKind Kind =
-      InclusionDirectiveCharacteristicKind(Source, "/quoted.h", false);
-
-  ASSERT_EQ(SrcMgr::CharacteristicKind::C_User, Kind);
-}
-
-TEST_F(PPCallbacksTest, QuotedFilename) {
-  const char* Source =
-    "#include \"quoted.h\"\n";
-
-  CharSourceRange Range =
-    InclusionDirectiveFilenameRange(Source, "/quoted.h", false);
-
-  ASSERT_EQ("\"quoted.h\"", GetSourceString(Range));
-}
-
-TEST_F(PPCallbacksTest, AngledFilename) {
-  const char* Source =
-    "#include <angled.h>\n";
-
-  CharSourceRange Range =
-    InclusionDirectiveFilenameRange(Source, "/angled.h", true);
-
-  ASSERT_EQ("<angled.h>", GetSourceString(Range));
-}
-
-TEST_F(PPCallbacksTest, QuotedInMacro) {
-  const char* Source =
-    "#define MACRO_QUOTED \"quoted.h\"\n"
-    "#include MACRO_QUOTED\n";
-
-  CharSourceRange Range =
-    InclusionDirectiveFilenameRange(Source, "/quoted.h", false);
-
-  ASSERT_EQ("\"quoted.h\"", GetSourceString(Range));
-}
-
-TEST_F(PPCallbacksTest, AngledInMacro) {
-  const char* Source =
-    "#define MACRO_ANGLED <angled.h>\n"
-    "#include MACRO_ANGLED\n";
-
-  CharSourceRange Range =
-    InclusionDirectiveFilenameRange(Source, "/angled.h", true);
-
-  ASSERT_EQ("<angled.h>", GetSourceString(Range));
-}
-
-TEST_F(PPCallbacksTest, StringizedMacroArgument) {
-  const char* Source =
-    "#define MACRO_STRINGIZED(x) #x\n"
-    "#include MACRO_STRINGIZED(quoted.h)\n";
-
-  CharSourceRange Range =
-    InclusionDirectiveFilenameRange(Source, "/quoted.h", false);
-
-  ASSERT_EQ("\"quoted.h\"", GetSourceString(Range));
-}
-
-TEST_F(PPCallbacksTest, ConcatenatedMacroArgument) {
-  const char* Source =
-    "#define MACRO_ANGLED <angled.h>\n"
-    "#define MACRO_CONCAT(x, y) x ## _ ## y\n"
-    "#include MACRO_CONCAT(MACRO, ANGLED)\n";
-
-  CharSourceRange Range =
-    InclusionDirectiveFilenameRange(Source, "/angled.h", false);
-
-  ASSERT_EQ("<angled.h>", GetSourceString(Range));
-}
-
-TEST_F(PPCallbacksTest, TrigraphFilename) {
-  const char* Source =
-    "#include \"tri\?\?-graph.h\"\n";
-
-  CharSourceRange Range =
-    InclusionDirectiveFilenameRange(Source, "/tri~graph.h", false);
-
-  ASSERT_EQ("\"tri\?\?-graph.h\"", GetSourceString(Range));
-}
-
-TEST_F(PPCallbacksTest, TrigraphInMacro) {
-  const char* Source =
-    "#define MACRO_TRIGRAPH \"tri\?\?-graph.h\"\n"
-    "#include MACRO_TRIGRAPH\n";
-
-  CharSourceRange Range =
-    InclusionDirectiveFilenameRange(Source, "/tri~graph.h", false);
-
-  ASSERT_EQ("\"tri\?\?-graph.h\"", GetSourceString(Range));
-}
-
-TEST_F(PPCallbacksTest, OpenCLExtensionPragmaEnabled) {
-  const char* Source =
-    "#pragma OPENCL EXTENSION cl_khr_fp64 : enable\n";
-
-  PragmaOpenCLExtensionCallbacks::CallbackParameters Parameters =
-    PragmaOpenCLExtensionCall(Source);
-
-  ASSERT_EQ("cl_khr_fp64", Parameters.Name);
-  unsigned ExpectedState = 1;
-  ASSERT_EQ(ExpectedState, Parameters.State);
-}
-
-TEST_F(PPCallbacksTest, OpenCLExtensionPragmaDisabled) {
-  const char* Source =
-    "#pragma OPENCL EXTENSION cl_khr_fp16 : disable\n";
-
-  PragmaOpenCLExtensionCallbacks::CallbackParameters Parameters =
-    PragmaOpenCLExtensionCall(Source);
-
-  ASSERT_EQ("cl_khr_fp16", Parameters.Name);
-  unsigned ExpectedState = 0;
-  ASSERT_EQ(ExpectedState, Parameters.State);
-}
-
-TEST_F(PPCallbacksTest, CollectMarks) {
-  const char *Source =
-    "#pragma mark\n"
-    "#pragma mark\r\n"
-    "#pragma mark - trivia\n"
-    "#pragma mark - trivia\r\n";
-
-  auto Marks = PragmaMarkCall(Source);
-
-  ASSERT_EQ(4u, Marks.size());
-  ASSERT_TRUE(Marks[0].Trivia.empty());
-  ASSERT_TRUE(Marks[1].Trivia.empty());
-  ASSERT_FALSE(Marks[2].Trivia.empty());
-  ASSERT_FALSE(Marks[3].Trivia.empty());
-  ASSERT_EQ(" - trivia", Marks[2].Trivia);
-  ASSERT_EQ(" - trivia", Marks[3].Trivia);
-}
-
-TEST_F(PPCallbacksTest, DirectiveExprRanges) {
-  const auto &Results1 = DirectiveExprRange("#if FLUZZY_FLOOF\n#endif\n");
-  EXPECT_EQ(Results1.size(), 1U);
-  EXPECT_EQ(
-      GetSourceStringToEnd(CharSourceRange(Results1[0].ConditionRange, false)),
-      "FLUZZY_FLOOF");
-
-  const auto &Results2 = DirectiveExprRange("#if 1 + 4 < 7\n#endif\n");
-  EXPECT_EQ(Results2.size(), 1U);
-  EXPECT_EQ(
-      GetSourceStringToEnd(CharSourceRange(Results2[0].ConditionRange, false)),
-      "1 + 4 < 7");
-
-  const auto &Results3 = DirectiveExprRange("#if 1 + \\\n  2\n#endif\n");
-  EXPECT_EQ(Results3.size(), 1U);
-  EXPECT_EQ(
-      GetSourceStringToEnd(CharSourceRange(Results3[0].ConditionRange, false)),
-      "1 + \\\n  2");
-
-  const auto &Results4 = DirectiveExprRange("#if 0\n#elif FLOOFY\n#endif\n");
-  EXPECT_EQ(Results4.size(), 2U);
-  EXPECT_EQ(
-      GetSourceStringToEnd(CharSourceRange(Results4[0].ConditionRange, false)),
-      "0");
-  EXPECT_EQ(
-      GetSourceStringToEnd(CharSourceRange(Results4[1].ConditionRange, false)),
-      "FLOOFY");
-
-  const auto &Results5 = DirectiveExprRange("#if 1\n#elif FLOOFY\n#endif\n");
-  EXPECT_EQ(Results5.size(), 2U);
-  EXPECT_EQ(
-      GetSourceStringToEnd(CharSourceRange(Results5[0].ConditionRange, false)),
-      "1");
-  EXPECT_EQ(
-      GetSourceStringToEnd(CharSourceRange(Results5[1].ConditionRange, false)),
-      "FLOOFY");
-
-  const auto &Results6 =
-      DirectiveExprRange("#if defined(FLUZZY_FLOOF)\n#endif\n");
-  EXPECT_EQ(Results6.size(), 1U);
-  EXPECT_EQ(
-      GetSourceStringToEnd(CharSourceRange(Results6[0].ConditionRange, false)),
-      "defined(FLUZZY_FLOOF)");
-
-  const auto &Results7 =
-      DirectiveExprRange("#if 1\n#elif defined(FLOOFY)\n#endif\n");
-  EXPECT_EQ(Results7.size(), 2U);
-  EXPECT_EQ(
-      GetSourceStringToEnd(CharSourceRange(Results7[0].ConditionRange, false)),
-      "1");
-  EXPECT_EQ(
-      GetSourceStringToEnd(CharSourceRange(Results7[1].ConditionRange, false)),
-      "defined(FLOOFY)");
-
-  const auto &Results8 =
-      DirectiveExprRange("#define FLOOFY 0\n#if __FILE__ > FLOOFY\n#endif\n");
-  EXPECT_EQ(Results8.size(), 1U);
-  EXPECT_EQ(
-      GetSourceStringToEnd(CharSourceRange(Results8[0].ConditionRange, false)),
-      "__FILE__ > FLOOFY");
-  EXPECT_EQ(
-      Lexer::getSourceText(CharSourceRange(Results8[0].ConditionRange, false),
-                           SourceMgr, LangOpts),
-      "__FILE__ > FLOOFY");
-}
-
-} // namespace
diff --git a/gnu/llvm/clang/unittests/Lex/PPConditionalDirectiveRecordTest.cpp b/gnu/llvm/clang/unittests/Lex/PPConditionalDirectiveRecordTest.cpp
deleted file mode 100644
index ba756395786..00000000000
--- a/gnu/llvm/clang/unittests/Lex/PPConditionalDirectiveRecordTest.cpp
+++ /dev/null
@@ -1,134 +0,0 @@
-//===- unittests/Lex/PPConditionalDirectiveRecordTest.cpp-PP directive tests =//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/Lex/PPConditionalDirectiveRecord.h"
-#include "clang/Basic/Diagnostic.h"
-#include "clang/Basic/DiagnosticOptions.h"
-#include "clang/Basic/FileManager.h"
-#include "clang/Basic/LangOptions.h"
-#include "clang/Basic/SourceManager.h"
-#include "clang/Basic/TargetInfo.h"
-#include "clang/Basic/TargetOptions.h"
-#include "clang/Lex/HeaderSearch.h"
-#include "clang/Lex/HeaderSearchOptions.h"
-#include "clang/Lex/ModuleLoader.h"
-#include "clang/Lex/Preprocessor.h"
-#include "clang/Lex/PreprocessorOptions.h"
-#include "gtest/gtest.h"
-
-using namespace clang;
-
-namespace {
-
-// The test fixture.
-class PPConditionalDirectiveRecordTest : public ::testing::Test {
-protected:
-  PPConditionalDirectiveRecordTest()
-    : FileMgr(FileMgrOpts),
-      DiagID(new DiagnosticIDs()),
-      Diags(DiagID, new DiagnosticOptions, new IgnoringDiagConsumer()),
-      SourceMgr(Diags, FileMgr),
-      TargetOpts(new TargetOptions)
-  {
-    TargetOpts->Triple = "x86_64-apple-darwin11.1.0";
-    Target = TargetInfo::CreateTargetInfo(Diags, TargetOpts);
-  }
-
-  FileSystemOptions FileMgrOpts;
-  FileManager FileMgr;
-  IntrusiveRefCntPtr<DiagnosticIDs> DiagID;
-  DiagnosticsEngine Diags;
-  SourceManager SourceMgr;
-  LangOptions LangOpts;
-  std::shared_ptr<TargetOptions> TargetOpts;
-  IntrusiveRefCntPtr<TargetInfo> Target;
-};
-
-TEST_F(PPConditionalDirectiveRecordTest, PPRecAPI) {
-  const char *source =
-      "0 1\n"
-      "#if 1\n"
-      "2\n"
-      "#ifndef BB\n"
-      "3 4\n"
-      "#else\n"
-      "#endif\n"
-      "5\n"
-      "#endif\n"
-      "6\n"
-      "#if 1\n"
-      "7\n"
-      "#if 1\n"
-      "#endif\n"
-      "8\n"
-      "#endif\n"
-      "9\n";
-
-  std::unique_ptr<llvm::MemoryBuffer> Buf =
-      llvm::MemoryBuffer::getMemBuffer(source);
-  SourceMgr.setMainFileID(SourceMgr.createFileID(std::move(Buf)));
-
-  TrivialModuleLoader ModLoader;
-  HeaderSearch HeaderInfo(std::make_shared<HeaderSearchOptions>(), SourceMgr,
-                          Diags, LangOpts, Target.get());
-  Preprocessor PP(std::make_shared<PreprocessorOptions>(), Diags, LangOpts,
-                  SourceMgr, HeaderInfo, ModLoader,
-                  /*IILookup =*/nullptr,
-                  /*OwnsHeaderSearch =*/false);
-  PP.Initialize(*Target);
-  PPConditionalDirectiveRecord *
-    PPRec = new PPConditionalDirectiveRecord(SourceMgr);
-  PP.addPPCallbacks(std::unique_ptr<PPCallbacks>(PPRec));
-  PP.EnterMainSourceFile();
-
-  std::vector<Token> toks;
-  while (1) {
-    Token tok;
-    PP.Lex(tok);
-    if (tok.is(tok::eof))
-      break;
-    toks.push_back(tok);
-  }
-
-  // Make sure we got the tokens that we expected.
-  ASSERT_EQ(10U, toks.size());
-  
-  EXPECT_FALSE(PPRec->rangeIntersectsConditionalDirective(
-                    SourceRange(toks[0].getLocation(), toks[1].getLocation())));
-  EXPECT_TRUE(PPRec->rangeIntersectsConditionalDirective(
-                    SourceRange(toks[0].getLocation(), toks[2].getLocation())));
-  EXPECT_FALSE(PPRec->rangeIntersectsConditionalDirective(
-                    SourceRange(toks[3].getLocation(), toks[4].getLocation())));
-  EXPECT_TRUE(PPRec->rangeIntersectsConditionalDirective(
-                    SourceRange(toks[1].getLocation(), toks[5].getLocation())));
-  EXPECT_TRUE(PPRec->rangeIntersectsConditionalDirective(
-                    SourceRange(toks[2].getLocation(), toks[6].getLocation())));
-  EXPECT_FALSE(PPRec->rangeIntersectsConditionalDirective(
-                    SourceRange(toks[2].getLocation(), toks[5].getLocation())));
-  EXPECT_FALSE(PPRec->rangeIntersectsConditionalDirective(
-                    SourceRange(toks[0].getLocation(), toks[6].getLocation())));
-  EXPECT_TRUE(PPRec->rangeIntersectsConditionalDirective(
-                    SourceRange(toks[2].getLocation(), toks[8].getLocation())));
-  EXPECT_FALSE(PPRec->rangeIntersectsConditionalDirective(
-                    SourceRange(toks[0].getLocation(), toks[9].getLocation())));
-
-  EXPECT_TRUE(PPRec->areInDifferentConditionalDirectiveRegion(
-                    toks[0].getLocation(), toks[2].getLocation()));
-  EXPECT_FALSE(PPRec->areInDifferentConditionalDirectiveRegion(
-                    toks[3].getLocation(), toks[4].getLocation()));
-  EXPECT_TRUE(PPRec->areInDifferentConditionalDirectiveRegion(
-                    toks[1].getLocation(), toks[5].getLocation()));
-  EXPECT_TRUE(PPRec->areInDifferentConditionalDirectiveRegion(
-                    toks[2].getLocation(), toks[0].getLocation()));
-  EXPECT_FALSE(PPRec->areInDifferentConditionalDirectiveRegion(
-                    toks[4].getLocation(), toks[3].getLocation()));
-  EXPECT_TRUE(PPRec->areInDifferentConditionalDirectiveRegion(
-                    toks[5].getLocation(), toks[1].getLocation()));
-}
-
-} // anonymous namespace
diff --git a/gnu/llvm/clang/unittests/Rename/CMakeLists.txt b/gnu/llvm/clang/unittests/Rename/CMakeLists.txt
deleted file mode 100644
index 6ec0c521551..00000000000
--- a/gnu/llvm/clang/unittests/Rename/CMakeLists.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  FrontendOpenMP
-  support
-  )
-
-# We'd like clang/unittests/Tooling/RewriterTestContext.h in the test.
-include_directories(${CLANG_SOURCE_DIR})
-
-add_clang_unittest(ClangRenameTests
-  RenameClassTest.cpp
-  RenameEnumTest.cpp
-  RenameAliasTest.cpp
-  RenameMemberTest.cpp
-  RenameFunctionTest.cpp
-  )
-
-clang_target_link_libraries(ClangRenameTests
-  PRIVATE
-  clangAST
-  clangASTMatchers
-  clangBasic
-  clangFormat
-  clangFrontend
-  clangRewrite
-  clangSerialization
-  clangTooling
-  clangToolingCore
-  clangToolingRefactoring
-  )
diff --git a/gnu/llvm/clang/unittests/Rename/ClangRenameTest.h b/gnu/llvm/clang/unittests/Rename/ClangRenameTest.h
deleted file mode 100644
index 64033657b57..00000000000
--- a/gnu/llvm/clang/unittests/Rename/ClangRenameTest.h
+++ /dev/null
@@ -1,116 +0,0 @@
-//===-- ClangRenameTests.cpp - clang-rename unit tests --------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_CLANG_UNITTESTS_RENAME_CLANGRENAMETEST_H
-#define LLVM_CLANG_UNITTESTS_RENAME_CLANGRENAMETEST_H
-
-#include "unittests/Tooling/RewriterTestContext.h"
-#include "clang/ASTMatchers/ASTMatchFinder.h"
-#include "clang/Basic/FileManager.h"
-#include "clang/Basic/FileSystemOptions.h"
-#include "clang/Format/Format.h"
-#include "clang/Frontend/CompilerInstance.h"
-#include "clang/Frontend/PCHContainerOperations.h"
-#include "clang/Tooling/Refactoring.h"
-#include "clang/Tooling/Refactoring/Rename/RenamingAction.h"
-#include "clang/Tooling/Refactoring/Rename/USRFindingAction.h"
-#include "clang/Tooling/Tooling.h"
-#include "llvm/ADT/IntrusiveRefCntPtr.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/Support/Format.h"
-#include "llvm/Support/MemoryBuffer.h"
-#include "llvm/Support/VirtualFileSystem.h"
-#include "gtest/gtest.h"
-#include <memory>
-#include <string>
-#include <vector>
-
-namespace clang {
-namespace clang_rename {
-namespace test {
-
-struct Case {
-  std::string Before;
-  std::string After;
-  std::string OldName;
-  std::string NewName;
-};
-
-class ClangRenameTest : public testing::Test,
-                        public testing::WithParamInterface<Case> {
-protected:
-  void AppendToHeader(StringRef Code) { HeaderContent += Code.str(); }
-
-  std::string runClangRenameOnCode(llvm::StringRef Code,
-                                   llvm::StringRef OldName,
-                                   llvm::StringRef NewName) {
-    std::string NewCode;
-    llvm::raw_string_ostream(NewCode) << llvm::format(
-        "#include \"%s\"\n%s", HeaderName.c_str(), Code.str().c_str());
-    tooling::FileContentMappings FileContents = {{HeaderName, HeaderContent},
-                                                 {CCName, NewCode}};
-    clang::RewriterTestContext Context;
-    Context.createInMemoryFile(HeaderName, HeaderContent);
-    clang::FileID InputFileID = Context.createInMemoryFile(CCName, NewCode);
-
-    tooling::USRFindingAction FindingAction({}, {std::string(OldName)}, false);
-    std::unique_ptr<tooling::FrontendActionFactory> USRFindingActionFactory =
-        tooling::newFrontendActionFactory(&FindingAction);
-
-    if (!tooling::runToolOnCodeWithArgs(
-            USRFindingActionFactory->create(), NewCode, {"-std=c++11"}, CCName,
-            "clang-rename", std::make_shared<PCHContainerOperations>(),
-            FileContents))
-      return "";
-
-    const std::vector<std::vector<std::string>> &USRList =
-        FindingAction.getUSRList();
-    std::vector<std::string> NewNames = {std::string(NewName)};
-    std::map<std::string, tooling::Replacements> FileToReplacements;
-    tooling::QualifiedRenamingAction RenameAction(NewNames, USRList,
-                                                  FileToReplacements);
-    auto RenameActionFactory = tooling::newFrontendActionFactory(&RenameAction);
-    if (!tooling::runToolOnCodeWithArgs(
-            RenameActionFactory->create(), NewCode, {"-std=c++11"}, CCName,
-            "clang-rename", std::make_shared<PCHContainerOperations>(),
-            FileContents))
-      return "";
-
-    formatAndApplyAllReplacements(FileToReplacements, Context.Rewrite, "llvm");
-    return Context.getRewrittenText(InputFileID);
-  }
-
-  void CompareSnippets(StringRef Expected, StringRef Actual) {
-    std::string ExpectedCode;
-    llvm::raw_string_ostream(ExpectedCode) << llvm::format(
-        "#include \"%s\"\n%s", HeaderName.c_str(), Expected.str().c_str());
-    EXPECT_EQ(format(ExpectedCode), format(Actual));
-  }
-
-  std::string format(llvm::StringRef Code) {
-    tooling::Replacements Replaces = format::reformat(
-        format::getLLVMStyle(), Code, {tooling::Range(0, Code.size())});
-    auto ChangedCode = tooling::applyAllReplacements(Code, Replaces);
-    EXPECT_TRUE(static_cast<bool>(ChangedCode));
-    if (!ChangedCode) {
-      llvm::errs() << llvm::toString(ChangedCode.takeError());
-      return "";
-    }
-    return *ChangedCode;
-  }
-
-  std::string HeaderContent;
-  std::string HeaderName = "header.h";
-  std::string CCName = "input.cc";
-};
-
-} // namespace test
-} // namespace clang_rename
-} // namesdpace clang
-
-#endif
diff --git a/gnu/llvm/clang/unittests/Rename/RenameAliasTest.cpp b/gnu/llvm/clang/unittests/Rename/RenameAliasTest.cpp
deleted file mode 100644
index 50fa2c10426..00000000000
--- a/gnu/llvm/clang/unittests/Rename/RenameAliasTest.cpp
+++ /dev/null
@@ -1,303 +0,0 @@
-//===-- RenameAliasTest.cpp - unit tests for renaming alias ---------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "ClangRenameTest.h"
-
-namespace clang {
-namespace clang_rename {
-namespace test {
-namespace {
-
-class RenameAliasTest : public ClangRenameTest {
-public:
-  RenameAliasTest() {
-    AppendToHeader(R"(
-        #define MACRO(x) x
-        namespace some_ns {
-        class A {
-         public:
-          void foo() {}
-          struct Nested {
-           enum NestedEnum {
-             E1, E2,
-           };
-          };
-        };
-        } // namespace some_ns
-        namespace a {
-        typedef some_ns::A TA;
-        using UA = some_ns::A;
-        } // namespace a
-        namespace b {
-        typedef some_ns::A TA;
-        using UA = some_ns::A;
-        }
-        template <typename T> class ptr {};
-        template <typename T>
-
-        using TPtr = ptr<int>;
-    )");
-  }
-};
-
-INSTANTIATE_TEST_SUITE_P(
-    RenameAliasTests, RenameAliasTest,
-    testing::ValuesIn(std::vector<Case>({
-        // basic functions
-        {"void f(a::TA a1) {}", "void f(b::TB a1) {}", "a::TA", "b::TB"},
-        {"void f(a::UA a1) {}", "void f(b::UB a1) {}", "a::UA", "b::UB"},
-        {"void f(a::TA* a1) {}", "void f(b::TB* a1) {}", "a::TA", "b::TB"},
-        {"void f(a::TA** a1) {}", "void f(b::TB** a1) {}", "a::TA", "b::TB"},
-        {"a::TA f() { return a::TA(); }", "b::TB f() { return b::TB(); }",
-         "a::TA", "b::TB"},
-        {"a::TA f() { return a::UA(); }", "b::TB f() { return a::UA(); }",
-         "a::TA", "b::TB"},
-        {"a::TA f() { return a::UA(); }", "a::TA f() { return b::UB(); }",
-         "a::UA", "b::UB"},
-        {"void f() { a::TA a; }", "void f() { b::TB a; }", "a::TA", "b::TB"},
-        {"void f(const a::TA& a1) {}", "void f(const b::TB& a1) {}", "a::TA",
-         "b::TB"},
-        {"void f(const a::UA& a1) {}", "void f(const b::UB& a1) {}", "a::UA",
-         "b::UB"},
-        {"void f(const a::TA* a1) {}", "void f(const b::TB* a1) {}", "a::TA",
-         "b::TB"},
-        {"namespace a { void f(TA a1) {} }",
-         "namespace a { void f(b::TB a1) {} }", "a::TA", "b::TB"},
-        {"void f(MACRO(a::TA) a1) {}", "void f(MACRO(b::TB) a1) {}", "a::TA",
-         "b::TB"},
-        {"void f(MACRO(a::TA a1)) {}", "void f(MACRO(b::TB a1)) {}", "a::TA",
-         "b::TB"},
-
-        // shorten/add namespace.
-        {"namespace b { void f(a::UA a1) {} }",
-         "namespace b {void f(UB a1) {} }", "a::UA", "b::UB"},
-        {"namespace a { void f(UA a1) {} }",
-         "namespace a {void f(b::UB a1) {} }", "a::UA", "b::UB"},
-
-        // use namespace and typedefs
-        {"struct S { using T = a::TA; T a_; };",
-         "struct S { using T = b::TB; T a_; };", "a::TA", "b::TB"},
-        {"using T = a::TA; T gA;", "using T = b::TB; T gA;", "a::TA", "b::TB"},
-        {"using T = a::UA; T gA;", "using T = b::UB; T gA;", "a::UA", "b::UB"},
-        {"typedef a::TA T; T gA;", "typedef b::TB T; T gA;", "a::TA", "b::TB"},
-        {"typedef a::UA T; T gA;", "typedef b::UB T; T gA;", "a::UA", "b::UB"},
-        {"typedef MACRO(a::TA) T; T gA;", "typedef MACRO(b::TB) T; T gA;",
-         "a::TA", "b::TB"},
-
-        // types in using shadows.
-        {"using a::TA; TA gA;", "using b::TB; b::TB gA;", "a::TA", "b::TB"},
-        {"using a::UA; UA gA;", "using b::UB; b::UB gA;", "a::UA", "b::UB"},
-
-        // struct members and other oddities
-        {"struct S : public a::TA {};", "struct S : public b::TB {};", "a::TA",
-         "b::TB"},
-        {"struct S : public a::UA {};", "struct S : public b::UB {};", "a::UA",
-         "b::UB"},
-        {"struct F { void f(a::TA a1) {} };",
-         "struct F { void f(b::TB a1) {} };", "a::TA", "b::TB"},
-        {"struct F { a::TA a_; };", "struct F { b::TB a_; };", "a::TA",
-         "b::TB"},
-        {"struct F { ptr<a::TA> a_; };", "struct F { ptr<b::TB> a_; };",
-         "a::TA", "b::TB"},
-        {"struct F { ptr<a::UA> a_; };", "struct F { ptr<b::UB> a_; };",
-         "a::UA", "b::UB"},
-
-        // types in nested name specifiers
-        {"void f() { a::TA::Nested ne; }", "void f() { b::TB::Nested ne; }",
-         "a::TA", "b::TB"},
-        {"void f() { a::UA::Nested ne; }", "void f() { b::UB::Nested ne; }",
-         "a::UA", "b::UB"},
-        {"void f() { a::TA::Nested::NestedEnum e; }",
-         "void f() { b::TB::Nested::NestedEnum e; }", "a::TA", "b::TB"},
-        {"void f() { auto e = a::TA::Nested::NestedEnum::E1; }",
-         "void f() { auto e = b::TB::Nested::NestedEnum::E1; }", "a::TA",
-         "b::TB"},
-        {"void f() { auto e = a::TA::Nested::E1; }",
-         "void f() { auto e = b::TB::Nested::E1; }", "a::TA", "b::TB"},
-
-        // templates
-        {"template <typename T> struct Foo { T t; }; void f() { Foo<a::TA> "
-         "foo; }",
-         "template <typename T> struct Foo { T t; }; void f() { Foo<b::TB> "
-         "foo; }",
-         "a::TA", "b::TB"},
-        {"template <typename T> struct Foo { a::TA a; };",
-         "template <typename T> struct Foo { b::TB a; };", "a::TA", "b::TB"},
-        {"template <typename T> void f(T t) {} void g() { f<a::TA>(a::TA()); }",
-         "template <typename T> void f(T t) {} void g() { f<b::TB>(b::TB()); }",
-         "a::TA", "b::TB"},
-        {"template <typename T> void f(T t) {} void g() { f<a::UA>(a::UA()); }",
-         "template <typename T> void f(T t) {} void g() { f<b::UB>(b::UB()); }",
-         "a::UA", "b::UB"},
-        {"template <typename T> int f() { return 1; } template <> int "
-         "f<a::TA>() { return 2; } int g() { return f<a::TA>(); }",
-         "template <typename T> int f() { return 1; } template <> int "
-         "f<b::TB>() { return 2; } int g() { return f<b::TB>(); }",
-         "a::TA", "b::TB"},
-        {"struct Foo { template <typename T> T foo(); }; void g() { Foo f;  "
-         "auto a = f.template foo<a::TA>(); }",
-         "struct Foo { template <typename T> T foo(); }; void g() { Foo f;  "
-         "auto a = f.template foo<b::TB>(); }",
-         "a::TA", "b::TB"},
-        {"struct Foo { template <typename T> T foo(); }; void g() { Foo f;  "
-         "auto a = f.template foo<a::UA>(); }",
-         "struct Foo { template <typename T> T foo(); }; void g() { Foo f;  "
-         "auto a = f.template foo<b::UB>(); }",
-         "a::UA", "b::UB"},
-
-        // The following two templates are distilled from regressions found in
-        // unique_ptr<> and type_traits.h
-        {"template <typename T> struct outer { typedef T type; type Baz(); }; "
-         "outer<a::TA> g_A;",
-         "template <typename T> struct outer { typedef T type; type Baz(); }; "
-         "outer<b::TB> g_A;",
-         "a::TA", "b::TB"},
-        {"template <typename T> struct nested { typedef T type; }; template "
-         "<typename T> struct outer { typename nested<T>::type Foo(); }; "
-         "outer<a::TA> g_A;",
-         "template <typename T> struct nested { typedef T type; }; template "
-         "<typename T> struct outer { typename nested<T>::type Foo(); }; "
-         "outer<b::TB> g_A;",
-         "a::TA", "b::TB"},
-
-        // macros
-        {"#define FOO(T, t) T t\nvoid f() { FOO(a::TA, a1); FOO(a::TA, a2); }",
-         "#define FOO(T, t) T t\nvoid f() { FOO(b::TB, a1); FOO(b::TB, a2); }",
-         "a::TA", "b::TB"},
-        {"#define FOO(n) a::TA n\nvoid f() { FOO(a1); FOO(a2); }",
-         "#define FOO(n) b::TB n\nvoid f() { FOO(a1); FOO(a2); }", "a::TA",
-         "b::TB"},
-        {"#define FOO(n) a::UA n\nvoid f() { FOO(a1); FOO(a2); }",
-         "#define FOO(n) b::UB n\nvoid f() { FOO(a1); FOO(a2); }", "a::UA",
-         "b::UB"},
-
-        // Pointer to member functions
-        {"auto gA = &a::TA::foo;", "auto gA = &b::TB::foo;", "a::TA", "b::TB"},
-        {"using a::TA; auto gA = &TA::foo;",
-         "using b::TB; auto gA = &b::TB::foo;", "a::TA", "b::TB"},
-        {"typedef a::TA T; auto gA = &T::foo;",
-         "typedef b::TB T; auto gA = &T::foo;", "a::TA", "b::TB"},
-        {"auto gA = &MACRO(a::TA)::foo;", "auto gA = &MACRO(b::TB)::foo;",
-         "a::TA", "b::TB"},
-
-        // templated using alias.
-        {"void f(TPtr<int> p) {}", "void f(NewTPtr<int> p) {}", "TPtr",
-         "NewTPtr"},
-        {"void f(::TPtr<int> p) {}", "void f(::NewTPtr<int> p) {}", "TPtr",
-         "NewTPtr"},
-    })));
-
-TEST_P(RenameAliasTest, RenameAlias) {
-  auto Param = GetParam();
-  assert(!Param.OldName.empty());
-  assert(!Param.NewName.empty());
-  std::string Actual =
-      runClangRenameOnCode(Param.Before, Param.OldName, Param.NewName);
-  CompareSnippets(Param.After, Actual);
-}
-
-TEST_F(RenameAliasTest, RenameTypedefDefinitions) {
-  std::string Before = R"(
-    class X {};
-    typedef X TOld;
-    )";
-  std::string Expected = R"(
-    class X {};
-    typedef X TNew;
-    )";
-  std::string After = runClangRenameOnCode(Before, "TOld", "TNew");
-  CompareSnippets(Expected, After);
-}
-
-TEST_F(RenameAliasTest, RenameUsingAliasDefinitions) {
-  std::string Before = R"(
-    class X {};
-    using UOld = X;
-    )";
-  std::string Expected = R"(
-    class X {};
-    using UNew = X;
-    )";
-  std::string After = runClangRenameOnCode(Before, "UOld", "UNew");
-  CompareSnippets(Expected, After);
-}
-
-TEST_F(RenameAliasTest, RenameTemplatedAliasDefinitions) {
-  std::string Before = R"(
-    template <typename T>
-    class X { T t; };
-
-    template <typename T>
-    using Old = X<T>;
-    )";
-  std::string Expected = R"(
-    template <typename T>
-    class X { T t; };
-
-    template <typename T>
-    using New = X<T>;
-    )";
-  std::string After = runClangRenameOnCode(Before, "Old", "New");
-  CompareSnippets(Expected, After);
-}
-
-TEST_F(RenameAliasTest, RenameAliasesInNamespaces) {
-  std::string Before = R"(
-    namespace x { class X {}; }
-    namespace ns {
-    using UOld = x::X;
-    }
-    )";
-  std::string Expected = R"(
-    namespace x { class X {}; }
-    namespace ns {
-    using UNew = x::X;
-    }
-    )";
-  std::string After = runClangRenameOnCode(Before, "ns::UOld", "ns::UNew");
-  CompareSnippets(Expected, After);
-}
-
-TEST_F(RenameAliasTest, AliasesInMacros) {
-  std::string Before = R"(
-    namespace x { class Old {}; }
-    namespace ns {
-    #define REF(alias) alias alias_var;
-
-    #define ALIAS(old) \
-      using old##Alias = x::old; \
-      REF(old##Alias);
-
-    ALIAS(Old);
-
-    OldAlias old_alias;
-    }
-    )";
-  std::string Expected = R"(
-    namespace x { class Old {}; }
-    namespace ns {
-    #define REF(alias) alias alias_var;
-
-    #define ALIAS(old) \
-      using old##Alias = x::old; \
-      REF(old##Alias);
-
-    ALIAS(Old);
-
-    NewAlias old_alias;
-    }
-    )";
-  std::string After =
-      runClangRenameOnCode(Before, "ns::OldAlias", "ns::NewAlias");
-  CompareSnippets(Expected, After);
-}
-
-} // anonymous namespace
-} // namespace test
-} // namespace clang_rename
-} // namesdpace clang
diff --git a/gnu/llvm/clang/unittests/Rename/RenameClassTest.cpp b/gnu/llvm/clang/unittests/Rename/RenameClassTest.cpp
deleted file mode 100644
index 24370b5795e..00000000000
--- a/gnu/llvm/clang/unittests/Rename/RenameClassTest.cpp
+++ /dev/null
@@ -1,820 +0,0 @@
-//===-- RenameClassTest.cpp - unit tests for renaming classes -------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "ClangRenameTest.h"
-
-namespace clang {
-namespace clang_rename {
-namespace test {
-namespace {
-
-class RenameClassTest : public ClangRenameTest {
-public:
-  RenameClassTest() {
-    AppendToHeader(R"(
-      namespace a {
-        class Foo {
-          public:
-            struct Nested {
-              enum NestedEnum {E1, E2};
-            };
-            void func() {}
-          static int Constant;
-        };
-        class Goo {
-          public:
-            struct Nested {
-              enum NestedEnum {E1, E2};
-            };
-        };
-        int Foo::Constant = 1;
-      } // namespace a
-      namespace b {
-      class Foo {};
-      } // namespace b
-
-      #define MACRO(x) x
-
-      template<typename T> class ptr {};
-    )");
-  }
-};
-
-INSTANTIATE_TEST_SUITE_P(
-    RenameClassTests, RenameClassTest,
-    testing::ValuesIn(std::vector<Case>({
-        // basic classes
-        {"a::Foo f;", "b::Bar f;", "", ""},
-        {"::a::Foo f;", "::b::Bar f;", "", ""},
-        {"void f(a::Foo f) {}", "void f(b::Bar f) {}", "", ""},
-        {"void f(a::Foo *f) {}", "void f(b::Bar *f) {}", "", ""},
-        {"a::Foo f() { return a::Foo(); }", "b::Bar f() { return b::Bar(); }",
-         "", ""},
-        {"namespace a {a::Foo f() { return Foo(); }}",
-         "namespace a {b::Bar f() { return b::Bar(); }}", "", ""},
-        {"void f(const a::Foo& a1) {}", "void f(const b::Bar& a1) {}", "", ""},
-        {"void f(const a::Foo* a1) {}", "void f(const b::Bar* a1) {}", "", ""},
-        {"namespace a { void f(Foo a1) {} }",
-         "namespace a { void f(b::Bar a1) {} }", "", ""},
-        {"void f(MACRO(a::Foo) a1) {}", "void f(MACRO(b::Bar) a1) {}", "", ""},
-        {"void f(MACRO(a::Foo a1)) {}", "void f(MACRO(b::Bar a1)) {}", "", ""},
-        {"a::Foo::Nested ns;", "b::Bar::Nested ns;", "", ""},
-        {"auto t = a::Foo::Constant;", "auto t = b::Bar::Constant;", "", ""},
-        {"a::Foo::Nested ns;", "a::Foo::Nested2 ns;", "a::Foo::Nested",
-         "a::Foo::Nested2"},
-
-        // use namespace and typedefs
-        {"using a::Foo; Foo gA;", "using b::Bar; b::Bar gA;", "", ""},
-        {"using a::Foo; void f(Foo gA) {}", "using b::Bar; void f(Bar gA) {}",
-         "", ""},
-        {"using a::Foo; namespace x { Foo gA; }",
-         "using b::Bar; namespace x { Bar gA; }", "", ""},
-        {"struct S { using T = a::Foo; T a_; };",
-         "struct S { using T = b::Bar; T a_; };", "", ""},
-        {"using T = a::Foo; T gA;", "using T = b::Bar; T gA;", "", ""},
-        {"typedef a::Foo T; T gA;", "typedef b::Bar T; T gA;", "", ""},
-        {"typedef MACRO(a::Foo) T; T gA;", "typedef MACRO(b::Bar) T; T gA;", "",
-         ""},
-
-        // struct members and other oddities
-        {"struct S : public a::Foo {};", "struct S : public b::Bar {};", "",
-         ""},
-        {"struct F { void f(a::Foo a1) {} };",
-         "struct F { void f(b::Bar a1) {} };", "", ""},
-        {"struct F { a::Foo a_; };", "struct F { b::Bar a_; };", "", ""},
-        {"struct F { ptr<a::Foo> a_; };", "struct F { ptr<b::Bar> a_; };", "",
-         ""},
-
-        {"void f() { a::Foo::Nested ne; }", "void f() { b::Bar::Nested ne; }",
-         "", ""},
-        {"void f() { a::Goo::Nested ne; }", "void f() { a::Goo::Nested ne; }",
-         "", ""},
-        {"void f() { a::Foo::Nested::NestedEnum e; }",
-         "void f() { b::Bar::Nested::NestedEnum e; }", "", ""},
-        {"void f() { auto e = a::Foo::Nested::NestedEnum::E1; }",
-         "void f() { auto e = b::Bar::Nested::NestedEnum::E1; }", "", ""},
-        {"void f() { auto e = a::Foo::Nested::E1; }",
-         "void f() { auto e = b::Bar::Nested::E1; }", "", ""},
-
-        // templates
-        {"template <typename T> struct Foo { T t; };\n"
-         "void f() { Foo<a::Foo> foo; }",
-         "template <typename T> struct Foo { T t; };\n"
-         "void f() { Foo<b::Bar> foo; }",
-         "", ""},
-        {"template <typename T> struct Foo { a::Foo a; };",
-         "template <typename T> struct Foo { b::Bar a; };", "", ""},
-        {"template <typename T> void f(T t) {}\n"
-         "void g() { f<a::Foo>(a::Foo()); }",
-         "template <typename T> void f(T t) {}\n"
-         "void g() { f<b::Bar>(b::Bar()); }",
-         "", ""},
-        {"template <typename T> int f() { return 1; }\n"
-         "template <> int f<a::Foo>() { return 2; }\n"
-         "int g() { return f<a::Foo>(); }",
-         "template <typename T> int f() { return 1; }\n"
-         "template <> int f<b::Bar>() { return 2; }\n"
-         "int g() { return f<b::Bar>(); }",
-         "", ""},
-        {"struct Foo { template <typename T> T foo(); };\n"
-         "void g() { Foo f;  auto a = f.template foo<a::Foo>(); }",
-         "struct Foo { template <typename T> T foo(); };\n"
-         "void g() { Foo f;  auto a = f.template foo<b::Bar>(); }",
-         "", ""},
-
-        // The following two templates are distilled from regressions found in
-        // unique_ptr<> and type_traits.h
-        {"template <typename T> struct outer {\n"
-         "     typedef T type;\n"
-         "     type Baz();\n"
-         "    };\n"
-         "    outer<a::Foo> g_A;",
-         "template <typename T> struct outer {\n"
-         "      typedef T type;\n"
-         "      type Baz();\n"
-         "    };\n"
-         "    outer<b::Bar> g_A;",
-         "", ""},
-        {"template <typename T> struct nested { typedef T type; };\n"
-         "template <typename T> struct outer { typename nested<T>::type Foo(); "
-         "};\n"
-         "outer<a::Foo> g_A;",
-         "template <typename T> struct nested { typedef T type; };\n"
-         "template <typename T> struct outer { typename nested<T>::type Foo(); "
-         "};\n"
-         "outer<b::Bar> g_A;",
-         "", ""},
-
-        // macros
-        {"#define FOO(T, t) T t\n"
-         "void f() { FOO(a::Foo, a1); FOO(a::Foo, a2); }",
-         "#define FOO(T, t) T t\n"
-         "void f() { FOO(b::Bar, a1); FOO(b::Bar, a2); }",
-         "", ""},
-        {"#define FOO(n) a::Foo n\n"
-         " void f() { FOO(a1); FOO(a2); }",
-         "#define FOO(n) b::Bar n\n"
-         " void f() { FOO(a1); FOO(a2); }",
-         "", ""},
-
-        // Pointer to member functions
-        {"auto gA = &a::Foo::func;", "auto gA = &b::Bar::func;", "", ""},
-        {"using a::Foo; auto gA = &Foo::func;",
-         "using b::Bar; auto gA = &b::Bar::func;", "", ""},
-        {"using a::Foo; namespace x { auto gA = &Foo::func; }",
-         "using b::Bar; namespace x { auto gA = &Bar::func; }", "", ""},
-        {"typedef a::Foo T; auto gA = &T::func;",
-         "typedef b::Bar T; auto gA = &T::func;", "", ""},
-        {"auto gA = &MACRO(a::Foo)::func;", "auto gA = &MACRO(b::Bar)::func;",
-         "", ""},
-
-        // Short match inside a namespace
-        {"namespace a { void f(Foo a1) {} }",
-         "namespace a { void f(b::Bar a1) {} }", "", ""},
-
-        // Correct match.
-        {"using a::Foo; struct F { ptr<Foo> a_; };",
-         "using b::Bar; struct F { ptr<Bar> a_; };", "", ""},
-
-        // avoid false positives
-        {"void f(b::Foo a) {}", "void f(b::Foo a) {}", "", ""},
-        {"namespace b { void f(Foo a) {} }", "namespace b { void f(Foo a) {} }",
-         "", ""},
-
-        // friends, everyone needs friends.
-        {"class Foo { int i; friend class a::Foo; };",
-         "class Foo { int i; friend class b::Bar; };", "", ""},
-    })) );
-
-TEST_P(RenameClassTest, RenameClasses) {
-  auto Param = GetParam();
-  std::string OldName = Param.OldName.empty() ? "a::Foo" : Param.OldName;
-  std::string NewName = Param.NewName.empty() ? "b::Bar" : Param.NewName;
-  std::string Actual = runClangRenameOnCode(Param.Before, OldName, NewName);
-  CompareSnippets(Param.After, Actual);
-}
-
-class NamespaceDetectionTest : public ClangRenameTest {
-protected:
-  NamespaceDetectionTest() {
-    AppendToHeader(R"(
-         class Old {};
-         namespace o1 {
-         class Old {};
-         namespace o2 {
-         class Old {};
-         namespace o3 {
-         class Old {};
-         }  // namespace o3
-         }  // namespace o2
-         }  // namespace o1
-     )");
-  }
-};
-
-INSTANTIATE_TEST_SUITE_P(
-    RenameClassTest, NamespaceDetectionTest,
-    ::testing::ValuesIn(std::vector<Case>({
-        // Test old and new namespace overlap.
-        {"namespace o1 { namespace o2 { namespace o3 { Old moo; } } }",
-         "namespace o1 { namespace o2 { namespace o3 { New moo; } } }",
-         "o1::o2::o3::Old", "o1::o2::o3::New"},
-        {"namespace o1 { namespace o2 { namespace o3 { Old moo; } } }",
-         "namespace o1 { namespace o2 { namespace o3 { n3::New moo; } } }",
-         "o1::o2::o3::Old", "o1::o2::n3::New"},
-        {"namespace o1 { namespace o2 { namespace o3 { Old moo; } } }",
-         "namespace o1 { namespace o2 { namespace o3 { n2::n3::New moo; } } }",
-         "o1::o2::o3::Old", "o1::n2::n3::New"},
-        {"namespace o1 { namespace o2 { Old moo; } }",
-         "namespace o1 { namespace o2 { New moo; } }", "::o1::o2::Old",
-         "::o1::o2::New"},
-        {"namespace o1 { namespace o2 { Old moo; } }",
-         "namespace o1 { namespace o2 { n2::New moo; } }", "::o1::o2::Old",
-         "::o1::n2::New"},
-        {"namespace o1 { namespace o2 { Old moo; } }",
-         "namespace o1 { namespace o2 { ::n1::n2::New moo; } }",
-         "::o1::o2::Old", "::n1::n2::New"},
-        {"namespace o1 { namespace o2 { Old moo; } }",
-         "namespace o1 { namespace o2 { n1::n2::New moo; } }", "::o1::o2::Old",
-         "n1::n2::New"},
-
-        // Test old and new namespace with differing depths.
-        {"namespace o1 { namespace o2 { namespace o3 { Old moo; } } }",
-         "namespace o1 { namespace o2 { namespace o3 { New moo; } } }",
-         "o1::o2::o3::Old", "::o1::New"},
-        {"namespace o1 { namespace o2 { namespace o3 { Old moo; } } }",
-         "namespace o1 { namespace o2 { namespace o3 { New moo; } } }",
-         "o1::o2::o3::Old", "::o1::o2::New"},
-        {"namespace o1 { namespace o2 { namespace o3 { Old moo; } } }",
-         "namespace o1 { namespace o2 { namespace o3 { New moo; } } }",
-         "o1::o2::o3::Old", "o1::New"},
-        {"namespace o1 { namespace o2 { namespace o3 { Old moo; } } }",
-         "namespace o1 { namespace o2 { namespace o3 { New moo; } } }",
-         "o1::o2::o3::Old", "o1::o2::New"},
-        {"Old moo;", "o1::New moo;", "::Old", "o1::New"},
-        {"Old moo;", "o1::New moo;", "Old", "o1::New"},
-        {"namespace o1 { ::Old moo; }", "namespace o1 { New moo; }", "Old",
-         "o1::New"},
-        {"namespace o1 { namespace o2 {  Old moo; } }",
-         "namespace o1 { namespace o2 {  ::New moo; } }", "::o1::o2::Old",
-         "::New"},
-        {"namespace o1 { namespace o2 {  Old moo; } }",
-         "namespace o1 { namespace o2 {  New moo; } }", "::o1::o2::Old", "New"},
-
-        // Test moving into the new namespace at different levels.
-        {"namespace n1 { namespace n2 { o1::o2::Old moo; } }",
-         "namespace n1 { namespace n2 { New moo; } }", "::o1::o2::Old",
-         "::n1::n2::New"},
-        {"namespace n1 { namespace n2 { o1::o2::Old moo; } }",
-         "namespace n1 { namespace n2 { New moo; } }", "::o1::o2::Old",
-         "n1::n2::New"},
-        {"namespace n1 { namespace n2 { o1::o2::Old moo; } }",
-         "namespace n1 { namespace n2 { o2::New moo; } }", "::o1::o2::Old",
-         "::n1::o2::New"},
-        {"namespace n1 { namespace n2 { o1::o2::Old moo; } }",
-         "namespace n1 { namespace n2 { o2::New moo; } }", "::o1::o2::Old",
-         "n1::o2::New"},
-        {"namespace n1 { namespace n2 { o1::o2::Old moo; } }",
-         "namespace n1 { namespace n2 { ::o1::o2::New moo; } }",
-         "::o1::o2::Old", "::o1::o2::New"},
-        {"namespace n1 { namespace n2 { o1::o2::Old moo; } }",
-         "namespace n1 { namespace n2 { o1::o2::New moo; } }", "::o1::o2::Old",
-         "o1::o2::New"},
-
-        // Test friends declarations.
-        {"class Foo { friend class o1::Old; };",
-         "class Foo { friend class o1::New; };", "o1::Old", "o1::New"},
-        {"class Foo { int i; friend class o1::Old; };",
-         "class Foo { int i; friend class ::o1::New; };", "::o1::Old",
-         "::o1::New"},
-        {"namespace o1 { class Foo { int i; friend class Old; }; }",
-         "namespace o1 { class Foo { int i; friend class New; }; }", "o1::Old",
-         "o1::New"},
-        {"namespace o1 { class Foo { int i; friend class Old; }; }",
-         "namespace o1 { class Foo { int i; friend class New; }; }",
-         "::o1::Old", "::o1::New"},
-    })) );
-
-TEST_P(NamespaceDetectionTest, RenameClasses) {
-  auto Param = GetParam();
-  std::string Actual =
-      runClangRenameOnCode(Param.Before, Param.OldName, Param.NewName);
-  CompareSnippets(Param.After, Actual);
-}
-
-class TemplatedClassRenameTest : public ClangRenameTest {
-protected:
-  TemplatedClassRenameTest() {
-    AppendToHeader(R"(
-           template <typename T> struct Old {
-             T t_;
-             T f() { return T(); };
-             static T s(T t) { return t; }
-           };
-           namespace ns {
-           template <typename T> struct Old {
-             T t_;
-             T f() { return T(); };
-             static T s(T t) { return t; }
-           };
-           }  // namespace ns
-
-           namespace o1 {
-           namespace o2 {
-           namespace o3 {
-           template <typename T> struct Old {
-             T t_;
-             T f() { return T(); };
-             static T s(T t) { return t; }
-           };
-           }  // namespace o3
-           }  // namespace o2
-           }  // namespace o1
-       )");
-  }
-};
-
-INSTANTIATE_TEST_SUITE_P(
-    RenameClassTests, TemplatedClassRenameTest,
-    ::testing::ValuesIn(std::vector<Case>({
-        {"Old<int> gI; Old<bool> gB;", "New<int> gI; New<bool> gB;", "Old",
-         "New"},
-        {"ns::Old<int> gI; ns::Old<bool> gB;",
-         "ns::New<int> gI; ns::New<bool> gB;", "ns::Old", "ns::New"},
-        {"auto gI = &Old<int>::f; auto gB = &Old<bool>::f;",
-         "auto gI = &New<int>::f; auto gB = &New<bool>::f;", "Old", "New"},
-        {"auto gI = &ns::Old<int>::f;", "auto gI = &ns::New<int>::f;",
-         "ns::Old", "ns::New"},
-
-        {"int gI = Old<int>::s(0); bool gB = Old<bool>::s(false);",
-         "int gI = New<int>::s(0); bool gB = New<bool>::s(false);", "Old",
-         "New"},
-        {"int gI = ns::Old<int>::s(0); bool gB = ns::Old<bool>::s(false);",
-         "int gI = ns::New<int>::s(0); bool gB = ns::New<bool>::s(false);",
-         "ns::Old", "ns::New"},
-
-        {"struct S { Old<int*> o_; };", "struct S { New<int*> o_; };", "Old",
-         "New"},
-        {"struct S { ns::Old<int*> o_; };", "struct S { ns::New<int*> o_; };",
-         "ns::Old", "ns::New"},
-
-        {"auto a = reinterpret_cast<Old<int>*>(new Old<int>);",
-         "auto a = reinterpret_cast<New<int>*>(new New<int>);", "Old", "New"},
-        {"auto a = reinterpret_cast<ns::Old<int>*>(new ns::Old<int>);",
-         "auto a = reinterpret_cast<ns::New<int>*>(new ns::New<int>);",
-         "ns::Old", "ns::New"},
-        {"auto a = reinterpret_cast<const Old<int>*>(new Old<int>);",
-         "auto a = reinterpret_cast<const New<int>*>(new New<int>);", "Old",
-         "New"},
-        {"auto a = reinterpret_cast<const ns::Old<int>*>(new ns::Old<int>);",
-         "auto a = reinterpret_cast<const ns::New<int>*>(new ns::New<int>);",
-         "ns::Old", "ns::New"},
-
-        {"Old<bool>& foo();", "New<bool>& foo();", "Old", "New"},
-        {"ns::Old<bool>& foo();", "ns::New<bool>& foo();", "ns::Old",
-         "ns::New"},
-        {"o1::o2::o3::Old<bool>& foo();", "o1::o2::o3::New<bool>& foo();",
-         "o1::o2::o3::Old", "o1::o2::o3::New"},
-        {"namespace ns { Old<bool>& foo(); }",
-         "namespace ns { New<bool>& foo(); }", "ns::Old", "ns::New"},
-        {"const Old<bool>& foo();", "const New<bool>& foo();", "Old", "New"},
-        {"const ns::Old<bool>& foo();", "const ns::New<bool>& foo();",
-         "ns::Old", "ns::New"},
-
-        // FIXME: figure out why this only works when Moo gets
-        // specialized at some point.
-        {"template <typename T> struct Moo { Old<T> o_; }; Moo<int> m;",
-         "template <typename T> struct Moo { New<T> o_; }; Moo<int> m;", "Old",
-         "New"},
-        {"template <typename T> struct Moo { ns::Old<T> o_; }; Moo<int> m;",
-         "template <typename T> struct Moo { ns::New<T> o_; }; Moo<int> m;",
-         "ns::Old", "ns::New"},
-    })) );
-
-TEST_P(TemplatedClassRenameTest, RenameTemplateClasses) {
-  auto Param = GetParam();
-  std::string Actual =
-      runClangRenameOnCode(Param.Before, Param.OldName, Param.NewName);
-  CompareSnippets(Param.After, Actual);
-}
-
-TEST_F(ClangRenameTest, RenameClassWithOutOfLineMembers) {
-  std::string Before = R"(
-      class Old {
-       public:
-        Old();
-        ~Old();
-
-        Old* next();
-
-       private:
-        Old* next_;
-      };
-
-      Old::Old() {}
-      Old::~Old() {}
-      Old* Old::next() { return next_; }
-    )";
-  std::string Expected = R"(
-      class New {
-       public:
-        New();
-        ~New();
-
-        New* next();
-
-       private:
-        New* next_;
-      };
-
-      New::New() {}
-      New::~New() {}
-      New* New::next() { return next_; }
-    )";
-  std::string After = runClangRenameOnCode(Before, "Old", "New");
-  CompareSnippets(Expected, After);
-}
-
-TEST_F(ClangRenameTest, RenameClassWithInlineMembers) {
-  std::string Before = R"(
-      class Old {
-       public:
-        Old() {}
-        ~Old() {}
-
-        Old* next() { return next_; }
-
-       private:
-        Old* next_;
-      };
-    )";
-  std::string Expected = R"(
-      class New {
-       public:
-        New() {}
-        ~New() {}
-
-        New* next() { return next_; }
-
-       private:
-        New* next_;
-      };
-    )";
-  std::string After = runClangRenameOnCode(Before, "Old", "New");
-  CompareSnippets(Expected, After);
-}
-
-TEST_F(ClangRenameTest, RenameClassWithNamespaceWithInlineMembers) {
-  std::string Before = R"(
-      namespace ns {
-      class Old {
-       public:
-        Old() {}
-        ~Old() {}
-
-        Old* next() { return next_; }
-
-       private:
-        Old* next_;
-      };
-      }  // namespace ns
-    )";
-  std::string Expected = R"(
-      namespace ns {
-      class New {
-       public:
-        New() {}
-        ~New() {}
-
-        New* next() { return next_; }
-
-       private:
-        New* next_;
-      };
-      }  // namespace ns
-    )";
-  std::string After = runClangRenameOnCode(Before, "ns::Old", "ns::New");
-  CompareSnippets(Expected, After);
-}
-
-TEST_F(ClangRenameTest, RenameClassWithNamespaceWithOutOfInlineMembers) {
-  std::string Before = R"(
-      namespace ns {
-      class Old {
-       public:
-        Old();
-        ~Old();
-
-        Old* next();
-
-       private:
-        Old* next_;
-      };
-
-      Old::Old() {}
-      Old::~Old() {}
-      Old* Old::next() { return next_; }
-      }  // namespace ns
-    )";
-  std::string Expected = R"(
-      namespace ns {
-      class New {
-       public:
-        New();
-        ~New();
-
-        New* next();
-
-       private:
-        New* next_;
-      };
-
-      New::New() {}
-      New::~New() {}
-      New* New::next() { return next_; }
-      }  // namespace ns
-    )";
-  std::string After = runClangRenameOnCode(Before, "ns::Old", "ns::New");
-  CompareSnippets(Expected, After);
-}
-
-TEST_F(ClangRenameTest, RenameClassInInheritedConstructor) {
-  // `using Base::Base;` will generate an implicit constructor containing usage
-  // of `::ns::Old` which should not be matched.
-  std::string Before = R"(
-      namespace ns {
-      class Old;
-      class Old {
-        int x;
-      };
-      class Base {
-       protected:
-        Old *moo_;
-       public:
-        Base(Old *moo) : moo_(moo) {}
-      };
-      class Derived : public Base {
-       public:
-         using Base::Base;
-      };
-      }  // namespace ns
-      int main() {
-        ::ns::Old foo;
-        ::ns::Derived d(&foo);
-        return 0;
-      })";
-  std::string Expected = R"(
-      namespace ns {
-      class New;
-      class New {
-        int x;
-      };
-      class Base {
-       protected:
-        New *moo_;
-       public:
-        Base(New *moo) : moo_(moo) {}
-      };
-      class Derived : public Base {
-       public:
-         using Base::Base;
-      };
-      }  // namespace ns
-      int main() {
-        ::ns::New foo;
-        ::ns::Derived d(&foo);
-        return 0;
-      })";
-  std::string After = runClangRenameOnCode(Before, "ns::Old", "ns::New");
-  CompareSnippets(Expected, After);
-}
-
-TEST_F(ClangRenameTest, DontRenameReferencesInImplicitFunction) {
-  std::string Before = R"(
-      namespace ns {
-      class Old {
-      };
-      } // namespace ns
-      struct S {
-        int y;
-        ns::Old old;
-      };
-      void f() {
-        S s1, s2, s3;
-        // This causes an implicit assignment operator to be created.
-        s1 = s2 = s3;
-      }
-      )";
-  std::string Expected = R"(
-      namespace ns {
-      class New {
-      };
-      } // namespace ns
-      struct S {
-        int y;
-        ::new_ns::New old;
-      };
-      void f() {
-        S s1, s2, s3;
-        // This causes an implicit assignment operator to be created.
-        s1 = s2 = s3;
-      }
-      )";
-  std::string After = runClangRenameOnCode(Before, "ns::Old", "::new_ns::New");
-  CompareSnippets(Expected, After);
-}
-
-TEST_F(ClangRenameTest, ReferencesInLambdaFunctionParameters) {
-  std::string Before = R"(
-      template <class T>
-      class function;
-      template <class R, class... ArgTypes>
-      class function<R(ArgTypes...)> {
-      public:
-        template <typename Functor>
-        function(Functor f) {}
-
-        function() {}
-
-        R operator()(ArgTypes...) const {}
-      };
-
-      namespace ns {
-      class Old {};
-      void f() {
-        function<void(Old)> func;
-      }
-      }  // namespace ns)";
-  std::string Expected = R"(
-      template <class T>
-      class function;
-      template <class R, class... ArgTypes>
-      class function<R(ArgTypes...)> {
-      public:
-        template <typename Functor>
-        function(Functor f) {}
-
-        function() {}
-
-        R operator()(ArgTypes...) const {}
-      };
-
-      namespace ns {
-      class New {};
-      void f() {
-        function<void(::new_ns::New)> func;
-      }
-      }  // namespace ns)";
-  std::string After = runClangRenameOnCode(Before, "ns::Old", "::new_ns::New");
-  CompareSnippets(Expected, After);
-}
-
-TEST_F(ClangRenameTest, DontChangeIfSameName) {
-  std::string Before = R"(
-      namespace foo {
-      class Old {
-       public:
-         static void foo() {}
-      };
-      }
-
-      void f(foo::Old * x) {
-        foo::Old::foo() ;
-      }
-      using foo::Old;)";
-  std::string Expected = R"(
-      namespace foo {
-      class Old {
-       public:
-         static void foo() {}
-      };
-      }
-
-      void f(foo::Old * x) {
-        foo::Old::foo() ;
-      }
-      using foo::Old;)";
-  std::string After = runClangRenameOnCode(Before, "foo::Old", "foo::Old");
-  CompareSnippets(Expected, After);
-}
-
-TEST_F(ClangRenameTest, ChangeIfNewNameWithLeadingDotDot) {
-  std::string Before = R"(
-      namespace foo {
-      class Old {
-       public:
-         static void foo() {}
-      };
-      }
-
-      void f(foo::Old * x) {
-        foo::Old::foo() ;
-      }
-      using foo::Old;)";
-  std::string Expected = R"(
-      namespace foo {
-      class Old {
-       public:
-         static void foo() {}
-      };
-      }
-
-      void f(::foo::Old * x) {
-        ::foo::Old::foo() ;
-      }
-      using ::foo::Old;)";
-  std::string After = runClangRenameOnCode(Before, "foo::Old", "::foo::Old");
-  CompareSnippets(Expected, After);
-}
-
-TEST_F(ClangRenameTest, ChangeIfSameNameWithLeadingDotDot) {
-  std::string Before = R"(
-      namespace foo {
-      class Old {
-       public:
-         static void foo() {}
-      };
-      }
-
-      void f(foo::Old * x) {
-        foo::Old::foo() ;
-      }
-      using foo::Old;)";
-  std::string Expected = R"(
-      namespace foo {
-      class Old {
-       public:
-         static void foo() {}
-      };
-      }
-
-      void f(::foo::Old * x) {
-        ::foo::Old::foo() ;
-      }
-      using ::foo::Old;)";
-  std::string After = runClangRenameOnCode(Before, "::foo::Old", "::foo::Old");
-  CompareSnippets(Expected, After);
-}
-
-TEST_F(RenameClassTest, UsingAlias) {
-  std::string Before = R"(
-      namespace a { struct A {}; }
-
-      namespace foo {
-      using Alias = a::A;
-      Alias a;
-      })";
-  std::string Expected = R"(
-      namespace a { struct B {}; }
-
-      namespace foo {
-      using Alias = b::B;
-      Alias a;
-      })";
-  std::string After = runClangRenameOnCode(Before, "a::A", "b::B");
-  CompareSnippets(Expected, After);
-}
-
-TEST_F(ClangRenameTest, FieldDesignatedInitializers) {
-  std::string Before = R"(
-      struct S {
-        int a;
-      };
-      void foo() {
-        S s = { .a = 10 };
-        s.a = 20;
-      })";
-  std::string Expected = R"(
-      struct S {
-        int b;
-      };
-      void foo() {
-        S s = { .b = 10 };
-        s.b = 20;
-      })";
-  std::string After = runClangRenameOnCode(Before, "S::a", "S::b");
-  CompareSnippets(Expected, After);
-}
-
-// FIXME: investigate why the test fails when adding a new USR to the USRSet.
-TEST_F(ClangRenameTest, DISABLED_NestedTemplates) {
-  std::string Before = R"(
-      namespace a { template <typename T> struct A {}; }
-      a::A<a::A<int>> foo;)";
-  std::string Expected = R"(
-      namespace a { template <typename T> struct B {}; }
-      b::B<b::B<int>> foo;)";
-  std::string After = runClangRenameOnCode(Before, "a::A", "b::B");
-  CompareSnippets(Expected, After);
-}
-
-
-} // anonymous namespace
-} // namespace test
-} // namespace clang_rename
-} // namesdpace clang
diff --git a/gnu/llvm/clang/unittests/Rename/RenameEnumTest.cpp b/gnu/llvm/clang/unittests/Rename/RenameEnumTest.cpp
deleted file mode 100644
index dc3440047c4..00000000000
--- a/gnu/llvm/clang/unittests/Rename/RenameEnumTest.cpp
+++ /dev/null
@@ -1,189 +0,0 @@
-#include "ClangRenameTest.h"
-
-namespace clang {
-namespace clang_rename {
-namespace test {
-namespace {
-
-class RenameEnumTest : public ClangRenameTest {
-public:
-  RenameEnumTest() {
-    AppendToHeader(R"(
-        #define MACRO(x) x
-        namespace a {
-        enum A1 { Red };
-        enum class A2 { Blue };
-        struct C {
-         enum NestedEnum { White };
-         enum class NestedScopedEnum { Black };
-        };
-        namespace d {
-        enum A3 { Orange };
-        } // namespace d
-        enum A4 { Pink };
-        } // namespace a
-        enum A5 { Green };)");
-  }
-};
-
-INSTANTIATE_TEST_SUITE_P(
-    RenameEnumTests, RenameEnumTest,
-    testing::ValuesIn(std::vector<Case>({
-        {"void f(a::A2 arg) { a::A2 t = a::A2::Blue; }",
-         "void f(b::B2 arg) { b::B2 t = b::B2::Blue; }", "a::A2", "b::B2"},
-        {"void f() { a::A1* t1; }", "void f() { b::B1* t1; }", "a::A1",
-         "b::B1"},
-        {"void f() { a::A2* t1; }", "void f() { b::B2* t1; }", "a::A2",
-         "b::B2"},
-        {"void f() { enum a::A2 t = a::A2::Blue; }",
-         "void f() { enum b::B2 t = b::B2::Blue; }", "a::A2", "b::B2"},
-        {"void f() { enum a::A2 t = a::A2::Blue; }",
-         "void f() { enum b::B2 t = b::B2::Blue; }", "a::A2", "b::B2"},
-
-        {"void f() { a::A1 t = a::Red; }", "void f() { b::B1 t = b::B1::Red; }",
-         "a::A1", "b::B1"},
-        {"void f() { a::A1 t = a::A1::Red; }",
-         "void f() { b::B1 t = b::B1::Red; }", "a::A1", "b::B1"},
-        {"void f() { auto t = a::Red; }", "void f() { auto t = b::B1::Red; }",
-         "a::A1", "b::B1"},
-        {"namespace b { void f() { a::A1 t = a::Red; } }",
-         "namespace b { void f() { B1 t = B1::Red; } }", "a::A1", "b::B1"},
-        {"void f() { a::d::A3 t = a::d::Orange; }",
-         "void f() { a::b::B3 t = a::b::B3::Orange; }", "a::d::A3", "a::b::B3"},
-        {"namespace a { void f() { a::d::A3 t = a::d::Orange; } }",
-         "namespace a { void f() { b::B3 t = b::B3::Orange; } }", "a::d::A3",
-         "a::b::B3"},
-        {"void f() { A5 t = Green; }", "void f() { B5 t = Green; }", "A5",
-         "B5"},
-        // FIXME: the new namespace qualifier should be added to the unscoped
-        // enum constant.
-        {"namespace a { void f() { auto t = Green; } }",
-         "namespace a { void f() { auto t = Green; } }", "a::A1", "b::B1"},
-
-        // namespace qualifiers
-        {"namespace a { void f(A1 a1) {} }",
-         "namespace a { void f(b::B1 a1) {} }", "a::A1", "b::B1"},
-        {"namespace a { void f(A2 a2) {} }",
-         "namespace a { void f(b::B2 a2) {} }", "a::A2", "b::B2"},
-        {"namespace b { void f(a::A1 a1) {} }",
-         "namespace b { void f(B1 a1) {} }", "a::A1", "b::B1"},
-        {"namespace b { void f(a::A2 a2) {} }",
-         "namespace b { void f(B2 a2) {} }", "a::A2", "b::B2"},
-
-        // nested enums
-        {"void f() { a::C::NestedEnum t = a::C::White; }",
-         "void f() { a::C::NewNestedEnum t = a::C::NewNestedEnum::White; }",
-         "a::C::NestedEnum", "a::C::NewNestedEnum"},
-        {"void f() { a::C::NestedScopedEnum t = a::C::NestedScopedEnum::Black; "
-         "}",
-         "void f() { a::C::NewNestedScopedEnum t = "
-         "a::C::NewNestedScopedEnum::Black; }",
-         "a::C::NestedScopedEnum", "a::C::NewNestedScopedEnum"},
-
-        // macros
-        {"void f(MACRO(a::A1) a1) {}", "void f(MACRO(b::B1) a1) {}", "a::A1",
-         "b::B1"},
-        {"void f(MACRO(a::A2) a2) {}", "void f(MACRO(b::B2) a2) {}", "a::A2",
-         "b::B2"},
-        {"#define FOO(T, t) T t\nvoid f() { FOO(a::A1, a1); }",
-         "#define FOO(T, t) T t\nvoid f() { FOO(b::B1, a1); }", "a::A1",
-         "b::B1"},
-        {"#define FOO(T, t) T t\nvoid f() { FOO(a::A2, a2); }",
-         "#define FOO(T, t) T t\nvoid f() { FOO(b::B2, a2); }", "a::A2",
-         "b::B2"},
-        {"#define FOO(n) a::A1 n\nvoid f() { FOO(a1); FOO(a2); }",
-         "#define FOO(n) b::B1 n\nvoid f() { FOO(a1); FOO(a2); }", "a::A1",
-         "b::B1"},
-
-        // using and type alias
-        {"using a::A1; A1 gA;", "using b::B1; b::B1 gA;", "a::A1", "b::B1"},
-        {"using a::A2; A2 gA;", "using b::B2; b::B2 gA;", "a::A2", "b::B2"},
-        {"struct S { using T = a::A1; T a_; };",
-         "struct S { using T = b::B1; T a_; };", "a::A1", "b::B1"},
-        {"using T = a::A1; T gA;", "using T = b::B1; T gA;", "a::A1", "b::B1"},
-        {"using T = a::A2; T gA;", "using T = b::B2; T gA;", "a::A2", "b::B2"},
-        {"typedef a::A1 T; T gA;", "typedef b::B1 T; T gA;", "a::A1", "b::B1"},
-        {"typedef a::A2 T; T gA;", "typedef b::B2 T; T gA;", "a::A2", "b::B2"},
-        {"typedef MACRO(a::A1) T; T gA;", "typedef MACRO(b::B1) T; T gA;",
-         "a::A1", "b::B1"},
-
-        // templates
-        {"template<typename T> struct Foo { T t; }; void f() { Foo<a::A1> "
-         "foo1; }",
-         "template<typename T> struct Foo { T t; }; void f() { Foo<b::B1> "
-         "foo1; }",
-         "a::A1", "b::B1"},
-        {"template<typename T> struct Foo { T t; }; void f() { Foo<a::A2> "
-         "foo2; }",
-         "template<typename T> struct Foo { T t; }; void f() { Foo<b::B2> "
-         "foo2; }",
-         "a::A2", "b::B2"},
-        {"template<typename T> struct Foo { a::A1 a1; };",
-         "template<typename T> struct Foo { b::B1 a1; };", "a::A1", "b::B1"},
-        {"template<typename T> struct Foo { a::A2 a2; };",
-         "template<typename T> struct Foo { b::B2 a2; };", "a::A2", "b::B2"},
-        {"template<typename T> int f() { return 1; } template<> int f<a::A1>() "
-         "{ return 2; } int g() { return f<a::A1>(); }",
-         "template<typename T> int f() { return 1; } template<> int f<b::B1>() "
-         "{ return 2; } int g() { return f<b::B1>(); }",
-         "a::A1", "b::B1"},
-        {"template<typename T> int f() { return 1; } template<> int f<a::A2>() "
-         "{ return 2; } int g() { return f<a::A2>(); }",
-         "template<typename T> int f() { return 1; } template<> int f<b::B2>() "
-         "{ return 2; } int g() { return f<b::B2>(); }",
-         "a::A2", "b::B2"},
-        {"struct Foo { template <typename T> T foo(); }; void g() { Foo f;  "
-         "f.foo<a::A1>(); }",
-         "struct Foo { template <typename T> T foo(); }; void g() { Foo f;  "
-         "f.foo<b::B1>(); }",
-         "a::A1", "b::B1"},
-        {"struct Foo { template <typename T> T foo(); }; void g() { Foo f;  "
-         "f.foo<a::A2>(); }",
-         "struct Foo { template <typename T> T foo(); }; void g() { Foo f;  "
-         "f.foo<b::B2>(); }",
-         "a::A2", "b::B2"},
-    })) );
-
-TEST_P(RenameEnumTest, RenameEnums) {
-  auto Param = GetParam();
-  assert(!Param.OldName.empty());
-  assert(!Param.NewName.empty());
-  std::string Actual =
-      runClangRenameOnCode(Param.Before, Param.OldName, Param.NewName);
-  CompareSnippets(Param.After, Actual);
-}
-
-TEST_F(RenameEnumTest, RenameEnumDecl) {
-  std::string Before = R"(
-      namespace ns {
-      enum Old1 { Blue };
-      }
-  )";
-  std::string Expected = R"(
-      namespace ns {
-      enum New1 { Blue };
-      }
-  )";
-  std::string After = runClangRenameOnCode(Before, "ns::Old1", "ns::New1");
-  CompareSnippets(Expected, After);
-}
-
-TEST_F(RenameEnumTest, RenameScopedEnumDecl) {
-  std::string Before = R"(
-      namespace ns {
-      enum class Old1 { Blue };
-      }
-  )";
-  std::string Expected = R"(
-      namespace ns {
-      enum class New1 { Blue };
-      }
-  )";
-  std::string After = runClangRenameOnCode(Before, "ns::Old1", "ns::New1");
-  CompareSnippets(Expected, After);
-}
-
-} // anonymous namespace
-} // namespace test
-} // namespace clang_rename
-} // namesdpace clang
diff --git a/gnu/llvm/clang/unittests/Rename/RenameFunctionTest.cpp b/gnu/llvm/clang/unittests/Rename/RenameFunctionTest.cpp
deleted file mode 100644
index 1c9b112232e..00000000000
--- a/gnu/llvm/clang/unittests/Rename/RenameFunctionTest.cpp
+++ /dev/null
@@ -1,573 +0,0 @@
-//===-- RenameFunctionTest.cpp - unit tests for renaming functions --------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "ClangRenameTest.h"
-
-namespace clang {
-namespace clang_rename {
-namespace test {
-namespace {
-
-class RenameFunctionTest : public ClangRenameTest {
-public:
-  RenameFunctionTest() {
-    AppendToHeader(R"(
-      struct A {
-        static bool Foo();
-        static bool Spam();
-      };
-      struct B {
-        static void Same();
-        static bool Foo();
-        static int Eric(int x);
-      };
-      void Same(int x);
-      int Eric(int x);
-      namespace base {
-        void Same();
-        void ToNanoSeconds();
-        void ToInt64NanoSeconds();
-      })");
-  }
-};
-
-TEST_F(RenameFunctionTest, RefactorsAFoo) {
-  std::string Before = R"(
-      void f() {
-        A::Foo();
-        ::A::Foo();
-      })";
-  std::string Expected = R"(
-      void f() {
-        A::Bar();
-        ::A::Bar();
-      })";
-
-  std::string After = runClangRenameOnCode(Before, "A::Foo", "A::Bar");
-  CompareSnippets(Expected, After);
-}
-
-TEST_F(RenameFunctionTest, RefactorsNonCallingAFoo) {
-  std::string Before = R"(
-      bool g(bool (*func)()) {
-        return func();
-      }
-      void f() {
-        auto *ref1 = A::Foo;
-        auto *ref2 = ::A::Foo;
-        g(A::Foo);
-      })";
-  std::string Expected = R"(
-      bool g(bool (*func)()) {
-        return func();
-      }
-      void f() {
-        auto *ref1 = A::Bar;
-        auto *ref2 = ::A::Bar;
-        g(A::Bar);
-      })";
-  std::string After = runClangRenameOnCode(Before, "A::Foo", "A::Bar");
-  CompareSnippets(Expected, After);
-}
-
-TEST_F(RenameFunctionTest, RefactorsEric) {
-  std::string Before = R"(
-      void f() {
-        if (Eric(3)==4) ::Eric(2);
-      })";
-  std::string Expected = R"(
-      void f() {
-        if (Larry(3)==4) ::Larry(2);
-      })";
-  std::string After = runClangRenameOnCode(Before, "Eric", "Larry");
-  CompareSnippets(Expected, After);
-}
-
-TEST_F(RenameFunctionTest, RefactorsNonCallingEric) {
-  std::string Before = R"(
-        int g(int (*func)(int)) {
-          return func(1);
-        }
-        void f() {
-          auto *ref = ::Eric;
-          g(Eric);
-        })";
-  std::string Expected = R"(
-        int g(int (*func)(int)) {
-          return func(1);
-        }
-        void f() {
-          auto *ref = ::Larry;
-          g(Larry);
-        })";
-  std::string After = runClangRenameOnCode(Before, "Eric", "Larry");
-  CompareSnippets(Expected, After);
-}
-
-TEST_F(RenameFunctionTest, DoesNotRefactorBFoo) {
-  std::string Before = R"(
-      void f() {
-        B::Foo();
-      })";
-  std::string After = runClangRenameOnCode(Before, "A::Foo", "A::Bar");
-  CompareSnippets(Before, After);
-}
-
-TEST_F(RenameFunctionTest, DoesNotRefactorBEric) {
-  std::string Before = R"(
-      void f() {
-        B::Eric(2);
-      })";
-  std::string After = runClangRenameOnCode(Before, "Eric", "Larry");
-  CompareSnippets(Before, After);
-}
-
-TEST_F(RenameFunctionTest, DoesNotRefactorCEric) {
-  std::string Before = R"(
-      namespace C { int Eric(int x); }
-      void f() {
-        if (C::Eric(3)==4) ::C::Eric(2);
-      })";
-  std::string Expected = R"(
-      namespace C { int Eric(int x); }
-      void f() {
-        if (C::Eric(3)==4) ::C::Eric(2);
-      })";
-  std::string After = runClangRenameOnCode(Before, "Eric", "Larry");
-  CompareSnippets(Expected, After);
-}
-
-TEST_F(RenameFunctionTest, DoesNotRefactorEricInNamespaceC) {
-  std::string Before = R"(
-       namespace C {
-       int Eric(int x);
-       void f() {
-         if (Eric(3)==4) Eric(2);
-       }
-       }  // namespace C)";
-  std::string After = runClangRenameOnCode(Before, "Eric", "Larry");
-  CompareSnippets(Before, After);
-}
-
-TEST_F(RenameFunctionTest, NamespaceQualified) {
-  std::string Before = R"(
-      void f() {
-        base::ToNanoSeconds();
-        ::base::ToNanoSeconds();
-      }
-      void g() {
-        using base::ToNanoSeconds;
-        base::ToNanoSeconds();
-        ::base::ToNanoSeconds();
-        ToNanoSeconds();
-      }
-      namespace foo {
-        namespace base {
-          void ToNanoSeconds();
-          void f() {
-            base::ToNanoSeconds();
-          }
-        }
-        void f() {
-          ::base::ToNanoSeconds();
-        }
-      })";
-  std::string Expected = R"(
-      void f() {
-        base::ToInt64NanoSeconds();
-        ::base::ToInt64NanoSeconds();
-      }
-      void g() {
-        using base::ToInt64NanoSeconds;
-        base::ToInt64NanoSeconds();
-        ::base::ToInt64NanoSeconds();
-        base::ToInt64NanoSeconds();
-      }
-      namespace foo {
-        namespace base {
-          void ToNanoSeconds();
-          void f() {
-            base::ToNanoSeconds();
-          }
-        }
-        void f() {
-          ::base::ToInt64NanoSeconds();
-        }
-      })";
-  std::string After = runClangRenameOnCode(Before, "base::ToNanoSeconds",
-                                           "base::ToInt64NanoSeconds");
-  CompareSnippets(Expected, After);
-}
-
-TEST_F(RenameFunctionTest, RenameFunctionDecls) {
-  std::string Before = R"(
-      namespace na {
-        void X();
-        void X() {}
-      })";
-  std::string Expected = R"(
-      namespace na {
-        void Y();
-        void Y() {}
-      })";
-  std::string After = runClangRenameOnCode(Before, "na::X", "na::Y");
-  CompareSnippets(Expected, After);
-}
-
-TEST_F(RenameFunctionTest, RenameTemplateFunctions) {
-  std::string Before = R"(
-      namespace na {
-      template<typename T> T X();
-      }
-      namespace na { void f() { X<int>(); } }
-      namespace nb { void g() { na::X          <int>(); } }
-      )";
-  std::string Expected = R"(
-      namespace na {
-      template<typename T> T Y();
-      }
-      namespace na { void f() { nb::Y<int>(); } }
-      namespace nb { void g() { Y<int>(); } }
-      )";
-  std::string After = runClangRenameOnCode(Before, "na::X", "nb::Y");
-  CompareSnippets(Expected, After);
-}
-
-TEST_F(RenameFunctionTest, RenameOutOfLineFunctionDecls) {
-  std::string Before = R"(
-      namespace na {
-        void X();
-      }
-      void na::X() {}
-      )";
-  std::string Expected = R"(
-      namespace na {
-        void Y();
-      }
-      void na::Y() {}
-      )";
-  std::string After = runClangRenameOnCode(Before, "na::X", "na::Y");
-  CompareSnippets(Expected, After);
-}
-
-TEST_F(RenameFunctionTest, NewNamespaceWithoutLeadingDotDot) {
-  std::string Before = R"(
-      namespace old_ns {
-        void X();
-        void X() {}
-      }
-      // Assume that the reference is in another file.
-      void f() { old_ns::X(); }
-      namespace old_ns { void g() { X(); } }
-      namespace new_ns { void h() { ::old_ns::X(); } }
-      )";
-  std::string Expected = R"(
-      namespace old_ns {
-        void Y();
-        void Y() {}
-      }
-      // Assume that the reference is in another file.
-      void f() { new_ns::Y(); }
-      namespace old_ns { void g() { new_ns::Y(); } }
-      namespace new_ns { void h() { Y(); } }
-      )";
-  std::string After = runClangRenameOnCode(Before, "::old_ns::X", "new_ns::Y");
-  CompareSnippets(Expected, After);
-}
-
-TEST_F(RenameFunctionTest, NewNamespaceWithLeadingDotDot) {
-  std::string Before = R"(
-      namespace old_ns {
-        void X();
-        void X() {}
-      }
-      // Assume that the reference is in another file.
-      void f() { old_ns::X(); }
-      namespace old_ns { void g() { X(); } }
-      namespace new_ns { void h() { ::old_ns::X(); } }
-      )";
-  std::string Expected = R"(
-      namespace old_ns {
-        void Y();
-        void Y() {}
-      }
-      // Assume that the reference is in another file.
-      void f() { ::new_ns::Y(); }
-      namespace old_ns { void g() { ::new_ns::Y(); } }
-      namespace new_ns { void h() { Y(); } }
-      )";
-  std::string After =
-      runClangRenameOnCode(Before, "::old_ns::X", "::new_ns::Y");
-  CompareSnippets(Expected, After);
-}
-
-TEST_F(RenameFunctionTest, DontRenameSymbolsDefinedInAnonymousNamespace) {
-  std::string Before = R"(
-      namespace old_ns {
-      class X {};
-      namespace {
-        void X();
-        void X() {}
-        void f() { X(); }
-      }
-      }
-      )";
-  std::string Expected = R"(
-      namespace old_ns {
-      class Y {};
-      namespace {
-        void X();
-        void X() {}
-        void f() { X(); }
-      }
-      }
-      )";
-  std::string After =
-      runClangRenameOnCode(Before, "::old_ns::X", "::old_ns::Y");
-  CompareSnippets(Expected, After);
-}
-
-TEST_F(RenameFunctionTest, NewNestedNamespace) {
-  std::string Before = R"(
-      namespace old_ns {
-        void X();
-        void X() {}
-      }
-      // Assume that the reference is in another file.
-      namespace old_ns {
-      void f() { X(); }
-      }
-      )";
-  std::string Expected = R"(
-      namespace old_ns {
-        void X();
-        void X() {}
-      }
-      // Assume that the reference is in another file.
-      namespace old_ns {
-      void f() { older_ns::X(); }
-      }
-      )";
-  std::string After =
-      runClangRenameOnCode(Before, "::old_ns::X", "::old_ns::older_ns::X");
-  CompareSnippets(Expected, After);
-}
-
-TEST_F(RenameFunctionTest, MoveFromGlobalToNamespaceWithoutLeadingDotDot) {
-  std::string Before = R"(
-      void X();
-      void X() {}
-
-      // Assume that the reference is in another file.
-      namespace some_ns {
-      void f() { X(); }
-      }
-      )";
-  std::string Expected = R"(
-      void X();
-      void X() {}
-
-      // Assume that the reference is in another file.
-      namespace some_ns {
-      void f() { ns::X(); }
-      }
-      )";
-  std::string After =
-      runClangRenameOnCode(Before, "::X", "ns::X");
-  CompareSnippets(Expected, After);
-}
-
-TEST_F(RenameFunctionTest, MoveFromGlobalToNamespaceWithLeadingDotDot) {
-  std::string Before = R"(
-      void Y() {}
-
-      // Assume that the reference is in another file.
-      namespace some_ns {
-      void f() { Y(); }
-      }
-      )";
-  std::string Expected = R"(
-      void Y() {}
-
-      // Assume that the reference is in another file.
-      namespace some_ns {
-      void f() { ::ns::Y(); }
-      }
-      )";
-  std::string After =
-      runClangRenameOnCode(Before, "::Y", "::ns::Y");
-  CompareSnippets(Expected, After);
-}
-
-// FIXME: the rename of overloaded operator is not fully supported yet.
-TEST_F(RenameFunctionTest, DISABLED_DoNotRenameOverloadedOperatorCalls) {
-  std::string Before = R"(
-      namespace old_ns {
-      class T { public: int x; };
-      bool operator==(const T& lhs, const T& rhs) {
-        return lhs.x == rhs.x;
-      }
-      }  // namespace old_ns
-
-      // Assume that the reference is in another file.
-      bool f() {
-        auto eq = old_ns::operator==;
-        old_ns::T t1, t2;
-        old_ns::operator==(t1, t2);
-        return t1 == t2;
-      }
-      )";
-  std::string Expected = R"(
-      namespace old_ns {
-      class T { public: int x; };
-      bool operator==(const T& lhs, const T& rhs) {
-        return lhs.x == rhs.x;
-      }
-      }  // namespace old_ns
-
-      // Assume that the reference is in another file.
-      bool f() {
-        auto eq = new_ns::operator==;
-        old_ns::T t1, t2;
-        new_ns::operator==(t1, t2);
-        return t1 == t2;
-      }
-      )";
-  std::string After =
-      runClangRenameOnCode(Before, "old_ns::operator==", "new_ns::operator==");
-  CompareSnippets(Expected, After);
-}
-
-TEST_F(RenameFunctionTest, FunctionRefAsTemplate) {
-  std::string Before = R"(
-      void X();
-
-      // Assume that the reference is in another file.
-      namespace some_ns {
-      template <void (*Func)(void)>
-      class TIterator {};
-
-      template <void (*Func)(void)>
-      class T {
-      public:
-        typedef TIterator<Func> IterType;
-        using TI = TIterator<Func>;
-        void g() {
-          Func();
-          auto func = Func;
-          TIterator<Func> iter;
-        }
-      };
-
-
-      void f() { T<X> tx; tx.g(); }
-      }  // namespace some_ns
-      )";
-  std::string Expected = R"(
-      void X();
-
-      // Assume that the reference is in another file.
-      namespace some_ns {
-      template <void (*Func)(void)>
-      class TIterator {};
-
-      template <void (*Func)(void)>
-      class T {
-      public:
-        typedef TIterator<Func> IterType;
-        using TI = TIterator<Func>;
-        void g() {
-          Func();
-          auto func = Func;
-          TIterator<Func> iter;
-        }
-      };
-
-
-      void f() { T<ns::X> tx; tx.g(); }
-      }  // namespace some_ns
-      )";
-  std::string After = runClangRenameOnCode(Before, "::X", "ns::X");
-  CompareSnippets(Expected, After);
-}
-
-TEST_F(RenameFunctionTest, RenameFunctionInUsingDecl) {
-  std::string Before = R"(
-      using base::ToNanoSeconds;
-      namespace old_ns {
-      using base::ToNanoSeconds;
-      void f() {
-        using base::ToNanoSeconds;
-      }
-      }
-      )";
-  std::string Expected = R"(
-      using base::ToInt64NanoSeconds;
-      namespace old_ns {
-      using base::ToInt64NanoSeconds;
-      void f() {
-        using base::ToInt64NanoSeconds;
-      }
-      }
-      )";
-  std::string After = runClangRenameOnCode(Before, "base::ToNanoSeconds",
-                                           "base::ToInt64NanoSeconds");
-  CompareSnippets(Expected, After);
-}
-
-// FIXME: Fix the complex the case where the symbol being renamed is located in
-// `std::function<decltype<renamed_symbol>>`.
-TEST_F(ClangRenameTest, DISABLED_ReferencesInLambdaFunctionParameters) {
-  std::string Before = R"(
-      template <class T>
-      class function;
-      template <class R, class... ArgTypes>
-      class function<R(ArgTypes...)> {
-      public:
-        template <typename Functor>
-        function(Functor f) {}
-
-        function() {}
-
-        R operator()(ArgTypes...) const {}
-      };
-
-      namespace ns {
-      void Old() {}
-      void f() {
-        function<decltype(Old)> func;
-      }
-      }  // namespace ns)";
-  std::string Expected = R"(
-      template <class T>
-      class function;
-      template <class R, class... ArgTypes>
-      class function<R(ArgTypes...)> {
-      public:
-        template <typename Functor>
-        function(Functor f) {}
-
-        function() {}
-
-        R operator()(ArgTypes...) const {}
-      };
-
-      namespace ns {
-      void New() {}
-      void f() {
-        function<decltype(::new_ns::New)> func;
-      }
-      }  // namespace ns)";
-  std::string After = runClangRenameOnCode(Before, "ns::Old", "::new_ns::New");
-  CompareSnippets(Expected, After);
-}
-
-} // anonymous namespace
-} // namespace test
-} // namespace clang_rename
-} // namesdpace clang
diff --git a/gnu/llvm/clang/unittests/Rename/RenameMemberTest.cpp b/gnu/llvm/clang/unittests/Rename/RenameMemberTest.cpp
deleted file mode 100644
index c16d16aa25f..00000000000
--- a/gnu/llvm/clang/unittests/Rename/RenameMemberTest.cpp
+++ /dev/null
@@ -1,228 +0,0 @@
-//===-- ClangMemberTests.cpp - unit tests for renaming class members ------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "ClangRenameTest.h"
-
-namespace clang {
-namespace clang_rename {
-namespace test {
-namespace {
-
-class RenameMemberTest : public ClangRenameTest {
-public:
-  RenameMemberTest() {
-    AppendToHeader(R"(
-        struct NA {
-          void Foo();
-          void NotFoo();
-          static void SFoo();
-          static void SNotFoo();
-          int Moo;
-        };
-        struct A {
-          virtual void Foo();
-          void NotFoo();
-          static void SFoo();
-          static void SNotFoo();
-          int Moo;
-          int NotMoo;
-          static int SMoo;
-        };
-        struct B : public A {
-          void Foo() override;
-        };
-        template <typename T> struct TA {
-          T* Foo();
-          T* NotFoo();
-          static T* SFoo();
-          static T* NotSFoo();
-        };
-        template <typename T> struct TB : public TA<T> {};
-        namespace ns {
-          template <typename T> struct TA {
-            T* Foo();
-            T* NotFoo();
-            static T* SFoo();
-            static T* NotSFoo();
-            static int SMoo;
-          };
-          template <typename T> struct TB : public TA<T> {};
-          struct A {
-            void Foo();
-            void NotFoo();
-            static void SFoo();
-            static void SNotFoo();
-          };
-          struct B : public A {};
-          struct C {
-            template <class T>
-            void SFoo(const T& t) {}
-            template <class T>
-            void Foo() {}
-          };
-        })");
-  }
-};
-
-INSTANTIATE_TEST_SUITE_P(
-    DISABLED_RenameTemplatedClassStaticVariableTest, RenameMemberTest,
-    testing::ValuesIn(std::vector<Case>({
-        // FIXME: support renaming static variables for template classes.
-        {"void f() { ns::TA<int>::SMoo; }",
-         "void f() { ns::TA<int>::SMeh; }", "ns::TA::SMoo", "ns::TA::SMeh"},
-    })) );
-
-INSTANTIATE_TEST_SUITE_P(
-    RenameMemberTest, RenameMemberTest,
-    testing::ValuesIn(std::vector<Case>({
-        // Normal methods and fields.
-        {"void f() { A a; a.Foo(); }", "void f() { A a; a.Bar(); }", "A::Foo",
-         "A::Bar"},
-        {"void f() { ns::A a; a.Foo(); }", "void f() { ns::A a; a.Bar(); }",
-         "ns::A::Foo", "ns::A::Bar"},
-        {"void f() { A a; int x = a.Moo; }", "void f() { A a; int x = a.Meh; }",
-         "A::Moo", "A::Meh"},
-        {"void f() { B b; b.Foo(); }", "void f() { B b; b.Bar(); }", "B::Foo",
-         "B::Bar"},
-        {"void f() { ns::B b; b.Foo(); }", "void f() { ns::B b; b.Bar(); }",
-         "ns::A::Foo", "ns::A::Bar"},
-        {"void f() { B b; int x = b.Moo; }", "void f() { B b; int x = b.Meh; }",
-         "A::Moo", "A::Meh"},
-
-        // Static methods.
-        {"void f() { A::SFoo(); }", "void f() { A::SBar(); }", "A::SFoo",
-         "A::SBar"},
-        {"void f() { ns::A::SFoo(); }", "void f() { ns::A::SBar(); }",
-         "ns::A::SFoo", "ns::A::SBar"},
-        {"void f() { TA<int>::SFoo(); }", "void f() { TA<int>::SBar(); }",
-         "TA::SFoo", "TA::SBar"},
-        {"void f() { ns::TA<int>::SFoo(); }",
-         "void f() { ns::TA<int>::SBar(); }", "ns::TA::SFoo", "ns::TA::SBar"},
-
-        // Static variables.
-        {"void f() { A::SMoo; }",
-         "void f() { A::SMeh; }", "A::SMoo", "A::SMeh"},
-
-        // Templated methods.
-        {"void f() { TA<int> a; a.Foo(); }", "void f() { TA<int> a; a.Bar(); }",
-         "TA::Foo", "TA::Bar"},
-        {"void f() { ns::TA<int> a; a.Foo(); }",
-         "void f() { ns::TA<int> a; a.Bar(); }", "ns::TA::Foo", "ns::TA::Bar"},
-        {"void f() { TB<int> b; b.Foo(); }", "void f() { TB<int> b; b.Bar(); }",
-         "TA::Foo", "TA::Bar"},
-        {"void f() { ns::TB<int> b; b.Foo(); }",
-         "void f() { ns::TB<int> b; b.Bar(); }", "ns::TA::Foo", "ns::TA::Bar"},
-        {"void f() { ns::C c; int x; c.SFoo(x); }",
-         "void f() { ns::C c; int x; c.SBar(x); }", "ns::C::SFoo",
-         "ns::C::SBar"},
-        {"void f() { ns::C c; c.Foo<int>(); }",
-         "void f() { ns::C c; c.Bar<int>(); }", "ns::C::Foo", "ns::C::Bar"},
-
-        // Pointers to methods.
-        {"void f() { auto p = &A::Foo; }", "void f() { auto p = &A::Bar; }",
-         "A::Foo", "A::Bar"},
-        {"void f() { auto p = &A::SFoo; }", "void f() { auto p = &A::SBar; }",
-         "A::SFoo", "A::SBar"},
-        {"void f() { auto p = &B::Foo; }", "void f() { auto p = &B::Bar; }",
-         "B::Foo", "B::Bar"},
-        {"void f() { auto p = &ns::A::Foo; }",
-         "void f() { auto p = &ns::A::Bar; }", "ns::A::Foo", "ns::A::Bar"},
-        {"void f() { auto p = &ns::A::SFoo; }",
-         "void f() { auto p = &ns::A::SBar; }", "ns::A::SFoo", "ns::A::SBar"},
-        {"void f() { auto p = &ns::C::SFoo<int>; }",
-         "void f() { auto p = &ns::C::SBar<int>; }", "ns::C::SFoo",
-         "ns::C::SBar"},
-
-        // These methods are not declared or overridden in the subclass B, we
-        // have to use the qualified name with parent class A to identify them.
-        {"void f() { auto p = &ns::B::Foo; }",
-         "void f() { auto p = &ns::B::Bar; }", "ns::A::Foo", "ns::B::Bar"},
-        {"void f() { B::SFoo(); }", "void f() { B::SBar(); }", "A::SFoo",
-         "B::SBar"},
-        {"void f() { ns::B::SFoo(); }", "void f() { ns::B::SBar(); }",
-         "ns::A::SFoo", "ns::B::SBar"},
-        {"void f() { auto p = &B::SFoo; }", "void f() { auto p = &B::SBar; }",
-         "A::SFoo", "B::SBar"},
-        {"void f() { auto p = &ns::B::SFoo; }",
-         "void f() { auto p = &ns::B::SBar; }", "ns::A::SFoo", "ns::B::SBar"},
-        {"void f() { TB<int>::SFoo(); }", "void f() { TB<int>::SBar(); }",
-         "TA::SFoo", "TB::SBar"},
-        {"void f() { ns::TB<int>::SFoo(); }",
-         "void f() { ns::TB<int>::SBar(); }", "ns::TA::SFoo", "ns::TB::SBar"},
-    })) );
-
-TEST_P(RenameMemberTest, RenameMembers) {
-  auto Param = GetParam();
-  assert(!Param.OldName.empty());
-  assert(!Param.NewName.empty());
-  std::string Actual =
-      runClangRenameOnCode(Param.Before, Param.OldName, Param.NewName);
-  CompareSnippets(Param.After, Actual);
-}
-
-TEST_F(RenameMemberTest, RenameMemberInsideClassMethods) {
-  std::string Before = R"(
-      struct X {
-        int Moo;
-        void Baz() { Moo = 1; }
-      };)";
-  std::string Expected = R"(
-      struct X {
-        int Meh;
-        void Baz() { Meh = 1; }
-      };)";
-  std::string After = runClangRenameOnCode(Before, "X::Moo", "Y::Meh");
-  CompareSnippets(Expected, After);
-}
-
-TEST_F(RenameMemberTest, RenameMethodInsideClassMethods) {
-  std::string Before = R"(
-      struct X {
-        void Foo() {}
-        void Baz() { Foo(); }
-      };)";
-  std::string Expected = R"(
-      struct X {
-        void Bar() {}
-        void Baz() { Bar(); }
-      };)";
-  std::string After = runClangRenameOnCode(Before, "X::Foo", "X::Bar");
-  CompareSnippets(Expected, After);
-}
-
-TEST_F(RenameMemberTest, RenameCtorInitializer) {
-  std::string Before = R"(
-      class X {
-      public:
-       X();
-       A a;
-       A a2;
-       B b;
-      };
-
-      X::X():a(), b() {}
-      )";
-  std::string Expected = R"(
-      class X {
-      public:
-       X();
-       A bar;
-       A a2;
-       B b;
-      };
-
-      X::X():bar(), b() {}
-      )";
-  std::string After = runClangRenameOnCode(Before, "X::a", "X::bar");
-  CompareSnippets(Expected, After);
-}
-
-} // anonymous namespace
-} // namespace test
-} // namespace clang_rename
-} // namesdpace clang
diff --git a/gnu/llvm/clang/unittests/Rewrite/CMakeLists.txt b/gnu/llvm/clang/unittests/Rewrite/CMakeLists.txt
deleted file mode 100644
index 6594d8cc589..00000000000
--- a/gnu/llvm/clang/unittests/Rewrite/CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  Support
-  )
-
-add_clang_unittest(RewriteTests
-  RewriteBufferTest.cpp
-  RewriterTest.cpp
-  )
-clang_target_link_libraries(RewriteTests
-  PRIVATE
-  clangFrontend
-  clangRewrite
-  clangSerialization
-  clangTooling
-  )
diff --git a/gnu/llvm/clang/unittests/Rewrite/RewriteBufferTest.cpp b/gnu/llvm/clang/unittests/Rewrite/RewriteBufferTest.cpp
deleted file mode 100644
index bf29c0ff928..00000000000
--- a/gnu/llvm/clang/unittests/Rewrite/RewriteBufferTest.cpp
+++ /dev/null
@@ -1,113 +0,0 @@
-//===- unittests/Rewrite/RewriteBufferTest.cpp - RewriteBuffer tests ------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/Rewrite/Core/RewriteBuffer.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-using namespace clang;
-
-namespace {
-
-#define EXPECT_OUTPUT(Buf, Output) EXPECT_EQ(Output, writeOutput(Buf))
-
-static std::string writeOutput(const RewriteBuffer &Buf) {
-  std::string Result;
-  raw_string_ostream OS(Result);
-  Buf.write(OS);
-  OS.flush();
-  return Result;
-}
-
-static void tagRange(unsigned Offset, unsigned Len, StringRef tagName,
-                     RewriteBuffer &Buf) {
-  std::string BeginTag;
-  raw_string_ostream(BeginTag) << '<' << tagName << '>';
-  std::string EndTag;
-  raw_string_ostream(EndTag) << "</" << tagName << '>';
-
-  Buf.InsertTextAfter(Offset, BeginTag);
-  Buf.InsertTextBefore(Offset+Len, EndTag);
-}
-
-TEST(RewriteBuffer, TagRanges) {
-  StringRef Input = "hello world";
-  const char *Output = "<outer><inner>hello</inner></outer> ";
-
-  RewriteBuffer Buf;
-  Buf.Initialize(Input);
-  StringRef RemoveStr = "world";
-  size_t Pos = Input.find(RemoveStr);
-  Buf.RemoveText(Pos, RemoveStr.size());
-
-  StringRef TagStr = "hello";
-  Pos = Input.find(TagStr);
-  tagRange(Pos, TagStr.size(), "outer", Buf);
-  tagRange(Pos, TagStr.size(), "inner", Buf);
-
-  EXPECT_OUTPUT(Buf, Output);
-}
-
-TEST(RewriteBuffer, DISABLED_RemoveLineIfEmpty_XFAIL) {
-  StringRef Input = "def\n"
-                    "ghi\n"
-                    "jkl\n";
-  RewriteBuffer Buf;
-  Buf.Initialize(Input);
-
-  // Insert "abc\n" at the start.
-  Buf.InsertText(0, "abc\n");
-  EXPECT_OUTPUT(Buf, "abc\n"
-                     "def\n"
-                     "ghi\n"
-                     "jkl\n");
-
-  // Remove "def\n".
-  //
-  // After the removal of "def", we have:
-  //
-  //   "abc\n"
-  //   "\n"
-  //   "ghi\n"
-  //   "jkl\n"
-  //
-  // Because removeLineIfEmpty=true, RemoveText has to remove the "\n" left on
-  // the line.  This happens correctly for the rewrite buffer itself, so the
-  // next check below passes.
-  //
-  // However, RemoveText's implementation incorrectly records the delta for
-  // removing the "\n" using the rewrite buffer offset, 4, where it was
-  // supposed to use the original input offset, 3.  Interpreted as an original
-  // input offset, 4 points to "g" not to "\n".  Thus, any future modifications
-  // at the original input's "g" will incorrectly see "g" as having become an
-  // empty string and so will map to the next character, "h", in the rewrite
-  // buffer.
-  StringRef RemoveStr0 = "def";
-  Buf.RemoveText(Input.find(RemoveStr0), RemoveStr0.size(),
-                 /*removeLineIfEmpty*/ true);
-  EXPECT_OUTPUT(Buf, "abc\n"
-                     "ghi\n"
-                     "jkl\n");
-
-  // Try to remove "ghi\n".
-  //
-  // As discussed above, the original input offset for "ghi\n" incorrectly
-  // maps to the rewrite buffer offset for "hi\nj", so we end up with:
-  //
-  //   "abc\n"
-  //   "gkl\n"
-  //
-  // To show that removeLineIfEmpty=true is the culprit, change true to false
-  // and append a newline to RemoveStr0 above.  The test then passes.
-  StringRef RemoveStr1 = "ghi\n";
-  Buf.RemoveText(Input.find(RemoveStr1), RemoveStr1.size());
-  EXPECT_OUTPUT(Buf, "abc\n"
-                     "jkl\n");
-}
-
-} // anonymous namespace
diff --git a/gnu/llvm/clang/unittests/Rewrite/RewriterTest.cpp b/gnu/llvm/clang/unittests/Rewrite/RewriterTest.cpp
deleted file mode 100644
index ca72dde46fd..00000000000
--- a/gnu/llvm/clang/unittests/Rewrite/RewriterTest.cpp
+++ /dev/null
@@ -1,80 +0,0 @@
-//===- unittests/Rewrite/RewriterTest.cpp - Rewriter tests ----------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/Rewrite/Core/Rewriter.h"
-#include "clang/Tooling/Tooling.h"
-#include "gtest/gtest.h"
-
-using namespace clang;
-
-namespace {
-
-struct RangeTypeTest {
-  std::unique_ptr<ASTUnit> AST;
-  Rewriter Rewrite;
-  SourceLocation FileStart;
-  CharSourceRange CRange; // covers exact char range
-  CharSourceRange TRange; // extends CRange to whole tokens
-  SourceRange SRange;     // different type but behaves like TRange
-  SourceLocation makeLoc(int Off) { return FileStart.getLocWithOffset(Off); }
-  CharSourceRange makeCharRange(int StartOff, int EndOff) {
-    return CharSourceRange::getCharRange(makeLoc(StartOff), makeLoc(EndOff));
-  }
-  RangeTypeTest(StringRef Code, int StartOff, int EndOff) {
-    AST = tooling::buildASTFromCode(Code);
-    ASTContext &C = AST->getASTContext();
-    Rewrite = Rewriter(C.getSourceManager(), C.getLangOpts());
-    FileStart = AST->getStartOfMainFileID();
-    CRange = makeCharRange(StartOff, EndOff);
-    SRange = CRange.getAsRange();
-    TRange = CharSourceRange::getTokenRange(SRange);
-  }
-};
-
-TEST(Rewriter, GetRewrittenTextRangeTypes) {
-  // Check that correct text is retrieved for each range type.  Check again
-  // after a modification.  Ranges remain in terms of the original text but
-  // include the new text.
-  StringRef Code = "int main() { return 0; }";
-  //              get char range ^~~    = "ret"
-  //             get token range ^~~+++ = "return"
-  //            get source range ^~~+++ = "return"
-  //                  insert "x" ^
-  //              get char range ^~~    = "xret"
-  //             get token range ^~~+++ = "xreturn"
-  //            get source range ^~~+++ = "xreturn"
-  RangeTypeTest T(Code, 13, 16);
-  EXPECT_EQ(T.Rewrite.getRewrittenText(T.CRange), "ret");
-  EXPECT_EQ(T.Rewrite.getRewrittenText(T.TRange), "return");
-  EXPECT_EQ(T.Rewrite.getRewrittenText(T.SRange), "return");
-  T.Rewrite.InsertText(T.makeLoc(13), "x");
-  EXPECT_EQ(T.Rewrite.getRewrittenText(T.CRange), "xret");
-  EXPECT_EQ(T.Rewrite.getRewrittenText(T.TRange), "xreturn");
-  EXPECT_EQ(T.Rewrite.getRewrittenText(T.SRange), "xreturn");
-}
-
-TEST(Rewriter, ReplaceTextRangeTypes) {
-  // Check that correct text is replaced for each range type.  Ranges remain in
-  // terms of the original text but include the new text.
-  StringRef Code = "int main(int argc, char *argv[]) { return argc; }";
-  //                            replace char range with "foo" ^~
-  //                                                      get ^~~~~ = "foogc;"
-  //                           replace token range with "bar" ^~++
-  //                                                      get ^~~~~ = "bar;"
-  //                            replace source range with "0" ^~++
-  //                                                      get ^~~~~ = "0;"
-  RangeTypeTest T(Code, 42, 44);
-  T.Rewrite.ReplaceText(T.CRange, "foo");
-  EXPECT_EQ(T.Rewrite.getRewrittenText(T.makeCharRange(42, 47)), "foogc;");
-  T.Rewrite.ReplaceText(T.TRange, "bar");
-  EXPECT_EQ(T.Rewrite.getRewrittenText(T.makeCharRange(42, 47)), "bar;");
-  T.Rewrite.ReplaceText(T.SRange, "0");
-  EXPECT_EQ(T.Rewrite.getRewrittenText(T.makeCharRange(42, 47)), "0;");
-}
-
-} // anonymous namespace
diff --git a/gnu/llvm/clang/unittests/Sema/CMakeLists.txt b/gnu/llvm/clang/unittests/Sema/CMakeLists.txt
deleted file mode 100644
index 194b7640b3c..00000000000
--- a/gnu/llvm/clang/unittests/Sema/CMakeLists.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  FrontendOpenMP
-  Support
-  )
-
-add_clang_unittest(SemaTests
-  ExternalSemaSourceTest.cpp
-  CodeCompleteTest.cpp
-  GslOwnerPointerInference.cpp
-  )
-
-clang_target_link_libraries(SemaTests
-  PRIVATE
-  clangAST
-  clangASTMatchers
-  clangBasic
-  clangFrontend
-  clangParse
-  clangSema
-  clangSerialization
-  clangTesting
-  clangTooling
-  )
-
-target_link_libraries(SemaTests
-  PRIVATE
-  LLVMTestingSupport
-)
diff --git a/gnu/llvm/clang/unittests/Sema/CodeCompleteTest.cpp b/gnu/llvm/clang/unittests/Sema/CodeCompleteTest.cpp
deleted file mode 100644
index dae0793658c..00000000000
--- a/gnu/llvm/clang/unittests/Sema/CodeCompleteTest.cpp
+++ /dev/null
@@ -1,496 +0,0 @@
-//=== unittests/Sema/CodeCompleteTest.cpp - Code Complete tests ==============//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/Frontend/CompilerInstance.h"
-#include "clang/Frontend/FrontendActions.h"
-#include "clang/Lex/Preprocessor.h"
-#include "clang/Parse/ParseAST.h"
-#include "clang/Sema/Sema.h"
-#include "clang/Sema/SemaDiagnostic.h"
-#include "clang/Tooling/Tooling.h"
-#include "llvm/Testing/Support/Annotations.h"
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-#include <cstddef>
-#include <string>
-
-namespace {
-
-using namespace clang;
-using namespace clang::tooling;
-using ::testing::Each;
-using ::testing::UnorderedElementsAre;
-
-const char TestCCName[] = "test.cc";
-
-struct CompletionContext {
-  std::vector<std::string> VisitedNamespaces;
-  std::string PreferredType;
-  // String representation of std::ptrdiff_t on a given platform. This is a hack
-  // to properly account for different configurations of clang.
-  std::string PtrDiffType;
-};
-
-class VisitedContextFinder : public CodeCompleteConsumer {
-public:
-  VisitedContextFinder(CompletionContext &ResultCtx)
-      : CodeCompleteConsumer(/*CodeCompleteOpts=*/{}), ResultCtx(ResultCtx),
-        CCTUInfo(std::make_shared<GlobalCodeCompletionAllocator>()) {}
-
-  void ProcessCodeCompleteResults(Sema &S, CodeCompletionContext Context,
-                                  CodeCompletionResult *Results,
-                                  unsigned NumResults) override {
-    ResultCtx.VisitedNamespaces =
-        getVisitedNamespace(Context.getVisitedContexts());
-    ResultCtx.PreferredType = Context.getPreferredType().getAsString();
-    ResultCtx.PtrDiffType =
-        S.getASTContext().getPointerDiffType().getAsString();
-  }
-
-  CodeCompletionAllocator &getAllocator() override {
-    return CCTUInfo.getAllocator();
-  }
-
-  CodeCompletionTUInfo &getCodeCompletionTUInfo() override { return CCTUInfo; }
-
-private:
-  std::vector<std::string> getVisitedNamespace(
-      CodeCompletionContext::VisitedContextSet VisitedContexts) const {
-    std::vector<std::string> NSNames;
-    for (const auto *Context : VisitedContexts)
-      if (const auto *NS = llvm::dyn_cast<NamespaceDecl>(Context))
-        NSNames.push_back(NS->getQualifiedNameAsString());
-    return NSNames;
-  }
-
-  CompletionContext &ResultCtx;
-  CodeCompletionTUInfo CCTUInfo;
-};
-
-class CodeCompleteAction : public SyntaxOnlyAction {
-public:
-  CodeCompleteAction(ParsedSourceLocation P, CompletionContext &ResultCtx)
-      : CompletePosition(std::move(P)), ResultCtx(ResultCtx) {}
-
-  bool BeginInvocation(CompilerInstance &CI) override {
-    CI.getFrontendOpts().CodeCompletionAt = CompletePosition;
-    CI.setCodeCompletionConsumer(new VisitedContextFinder(ResultCtx));
-    return true;
-  }
-
-private:
-  // 1-based code complete position <Line, Col>;
-  ParsedSourceLocation CompletePosition;
-  CompletionContext &ResultCtx;
-};
-
-ParsedSourceLocation offsetToPosition(llvm::StringRef Code, size_t Offset) {
-  Offset = std::min(Code.size(), Offset);
-  StringRef Before = Code.substr(0, Offset);
-  int Lines = Before.count('\n');
-  size_t PrevNL = Before.rfind('\n');
-  size_t StartOfLine = (PrevNL == StringRef::npos) ? 0 : (PrevNL + 1);
-  return {TestCCName, static_cast<unsigned>(Lines + 1),
-          static_cast<unsigned>(Offset - StartOfLine + 1)};
-}
-
-CompletionContext runCompletion(StringRef Code, size_t Offset) {
-  CompletionContext ResultCtx;
-  clang::tooling::runToolOnCodeWithArgs(
-      std::make_unique<CodeCompleteAction>(offsetToPosition(Code, Offset),
-                                           ResultCtx),
-      Code, {"-std=c++11"}, TestCCName);
-  return ResultCtx;
-}
-
-CompletionContext runCodeCompleteOnCode(StringRef AnnotatedCode) {
-  llvm::Annotations A(AnnotatedCode);
-  return runCompletion(A.code(), A.point());
-}
-
-std::vector<std::string>
-collectPreferredTypes(StringRef AnnotatedCode,
-                      std::string *PtrDiffType = nullptr) {
-  llvm::Annotations A(AnnotatedCode);
-  std::vector<std::string> Types;
-  for (size_t Point : A.points()) {
-    auto Results = runCompletion(A.code(), Point);
-    if (PtrDiffType) {
-      assert(PtrDiffType->empty() || *PtrDiffType == Results.PtrDiffType);
-      *PtrDiffType = Results.PtrDiffType;
-    }
-    Types.push_back(Results.PreferredType);
-  }
-  return Types;
-}
-
-TEST(SemaCodeCompleteTest, VisitedNSForValidQualifiedId) {
-  auto VisitedNS = runCodeCompleteOnCode(R"cpp(
-     namespace ns1 {}
-     namespace ns2 {}
-     namespace ns3 {}
-     namespace ns3 { namespace nns3 {} }
-
-     namespace foo {
-     using namespace ns1;
-     namespace ns4 {} // not visited
-     namespace { using namespace ns2; }
-     inline namespace bar { using namespace ns3::nns3; }
-     } // foo
-     namespace ns { foo::^ }
-  )cpp")
-                       .VisitedNamespaces;
-  EXPECT_THAT(VisitedNS, UnorderedElementsAre("foo", "ns1", "ns2", "ns3::nns3",
-                                              "foo::(anonymous)"));
-}
-
-TEST(SemaCodeCompleteTest, VisitedNSForInvalidQualifiedId) {
-  auto VisitedNS = runCodeCompleteOnCode(R"cpp(
-     namespace na {}
-     namespace ns1 {
-     using namespace na;
-     foo::^
-     }
-  )cpp")
-                       .VisitedNamespaces;
-  EXPECT_THAT(VisitedNS, UnorderedElementsAre("ns1", "na"));
-}
-
-TEST(SemaCodeCompleteTest, VisitedNSWithoutQualifier) {
-  auto VisitedNS = runCodeCompleteOnCode(R"cpp(
-    namespace n1 {
-    namespace n2 {
-      void f(^) {}
-    }
-    }
-  )cpp")
-                       .VisitedNamespaces;
-  EXPECT_THAT(VisitedNS, UnorderedElementsAre("n1", "n1::n2"));
-}
-
-TEST(PreferredTypeTest, BinaryExpr) {
-  // Check various operations for arithmetic types.
-  StringRef Code = R"cpp(
-    void test(int x) {
-      x = ^10;
-      x += ^10; x -= ^10; x *= ^10; x /= ^10; x %= ^10;
-      x + ^10; x - ^10; x * ^10; x / ^10; x % ^10;
-    })cpp";
-  EXPECT_THAT(collectPreferredTypes(Code), Each("int"));
-
-  Code = R"cpp(
-    void test(float x) {
-      x = ^10;
-      x += ^10; x -= ^10; x *= ^10; x /= ^10; x %= ^10;
-      x + ^10; x - ^10; x * ^10; x / ^10; x % ^10;
-    })cpp";
-  EXPECT_THAT(collectPreferredTypes(Code), Each("float"));
-
-  // Pointer types.
-  Code = R"cpp(
-    void test(int *ptr) {
-      ptr - ^ptr;
-      ptr = ^ptr;
-    })cpp";
-  EXPECT_THAT(collectPreferredTypes(Code), Each("int *"));
-
-  Code = R"cpp(
-    void test(int *ptr) {
-      ptr + ^10;
-      ptr += ^10;
-      ptr -= ^10;
-    })cpp";
-  {
-    std::string PtrDiff;
-    auto Types = collectPreferredTypes(Code, &PtrDiff);
-    EXPECT_THAT(Types, Each(PtrDiff));
-  }
-
-  // Comparison operators.
-  Code = R"cpp(
-    void test(int i) {
-      i <= ^1; i < ^1; i >= ^1; i > ^1; i == ^1; i != ^1;
-    }
-  )cpp";
-  EXPECT_THAT(collectPreferredTypes(Code), Each("int"));
-
-  Code = R"cpp(
-    void test(int *ptr) {
-      ptr <= ^ptr; ptr < ^ptr; ptr >= ^ptr; ptr > ^ptr;
-      ptr == ^ptr; ptr != ^ptr;
-    }
-  )cpp";
-  EXPECT_THAT(collectPreferredTypes(Code), Each("int *"));
-
-  // Relational operations.
-  Code = R"cpp(
-    void test(int i, int *ptr) {
-      i && ^1; i || ^1;
-      ptr && ^1; ptr || ^1;
-    }
-  )cpp";
-  EXPECT_THAT(collectPreferredTypes(Code), Each("_Bool"));
-
-  // Bitwise operations.
-  Code = R"cpp(
-    void test(long long ll) {
-      ll | ^1; ll & ^1;
-    }
-  )cpp";
-  EXPECT_THAT(collectPreferredTypes(Code), Each("long long"));
-
-  Code = R"cpp(
-    enum A {};
-    void test(A a) {
-      a | ^1; a & ^1;
-    }
-  )cpp";
-  EXPECT_THAT(collectPreferredTypes(Code), Each("enum A"));
-
-  Code = R"cpp(
-    enum class A {};
-    void test(A a) {
-      // This is technically illegal with the 'enum class' without overloaded
-      // operators, but we pretend it's fine.
-      a | ^a; a & ^a;
-    }
-  )cpp";
-  EXPECT_THAT(collectPreferredTypes(Code), Each("enum A"));
-
-  // Binary shifts.
-  Code = R"cpp(
-    void test(int i, long long ll) {
-      i << ^1; ll << ^1;
-      i <<= ^1; i <<= ^1;
-      i >> ^1; ll >> ^1;
-      i >>= ^1; i >>= ^1;
-    }
-  )cpp";
-  EXPECT_THAT(collectPreferredTypes(Code), Each("int"));
-
-  // Comma does not provide any useful information.
-  Code = R"cpp(
-    class Cls {};
-    void test(int i, int* ptr, Cls x) {
-      (i, ^i);
-      (ptr, ^ptr);
-      (x, ^x);
-    }
-  )cpp";
-  EXPECT_THAT(collectPreferredTypes(Code), Each("NULL TYPE"));
-
-  // User-defined types do not take operator overloading into account.
-  // However, they provide heuristics for some common cases.
-  Code = R"cpp(
-    class Cls {};
-    void test(Cls c) {
-      // we assume arithmetic and comparions ops take the same type.
-      c + ^c; c - ^c; c * ^c; c / ^c; c % ^c;
-      c == ^c; c != ^c; c < ^c; c <= ^c; c > ^c; c >= ^c;
-      // same for the assignments.
-      c = ^c; c += ^c; c -= ^c; c *= ^c; c /= ^c; c %= ^c;
-    }
-  )cpp";
-  EXPECT_THAT(collectPreferredTypes(Code), Each("class Cls"));
-
-  Code = R"cpp(
-    class Cls {};
-    void test(Cls c) {
-      // we assume relational ops operate on bools.
-      c && ^c; c || ^c;
-    }
-  )cpp";
-  EXPECT_THAT(collectPreferredTypes(Code), Each("_Bool"));
-
-  Code = R"cpp(
-    class Cls {};
-    void test(Cls c) {
-      // we make no assumptions about the following operators, since they are
-      // often overloaded with a non-standard meaning.
-      c << ^c; c >> ^c; c | ^c; c & ^c;
-      c <<= ^c; c >>= ^c; c |= ^c; c &= ^c;
-    }
-  )cpp";
-  EXPECT_THAT(collectPreferredTypes(Code), Each("NULL TYPE"));
-}
-
-TEST(PreferredTypeTest, Members) {
-  StringRef Code = R"cpp(
-    struct vector {
-      int *begin();
-      vector clone();
-    };
-
-    void test(int *a) {
-      a = ^vector().^clone().^begin();
-    }
-  )cpp";
-  EXPECT_THAT(collectPreferredTypes(Code), Each("int *"));
-}
-
-TEST(PreferredTypeTest, Conditions) {
-  StringRef Code = R"cpp(
-    struct vector {
-      bool empty();
-    };
-
-    void test() {
-      if (^vector().^empty()) {}
-      while (^vector().^empty()) {}
-      for (; ^vector().^empty();) {}
-    }
-  )cpp";
-  EXPECT_THAT(collectPreferredTypes(Code), Each("_Bool"));
-}
-
-TEST(PreferredTypeTest, InitAndAssignment) {
-  StringRef Code = R"cpp(
-    struct vector {
-      int* begin();
-    };
-
-    void test() {
-      const int* x = ^vector().^begin();
-      x = ^vector().^begin();
-
-      if (const int* y = ^vector().^begin()) {}
-    }
-  )cpp";
-  EXPECT_THAT(collectPreferredTypes(Code), Each("const int *"));
-}
-
-TEST(PreferredTypeTest, UnaryExprs) {
-  StringRef Code = R"cpp(
-    void test(long long a) {
-      a = +^a;
-      a = -^a
-      a = ++^a;
-      a = --^a;
-    }
-  )cpp";
-  EXPECT_THAT(collectPreferredTypes(Code), Each("long long"));
-
-  Code = R"cpp(
-    void test(int a, int *ptr) {
-      !^a;
-      !^ptr;
-      !!!^a;
-
-      a = !^a;
-      a = !^ptr;
-      a = !!!^a;
-    }
-  )cpp";
-  EXPECT_THAT(collectPreferredTypes(Code), Each("_Bool"));
-
-  Code = R"cpp(
-    void test(int a) {
-      const int* x = &^a;
-    }
-  )cpp";
-  EXPECT_THAT(collectPreferredTypes(Code), Each("const int"));
-
-  Code = R"cpp(
-    void test(int *a) {
-      int x = *^a;
-      int &r = *^a;
-    }
-  )cpp";
-  EXPECT_THAT(collectPreferredTypes(Code), Each("int *"));
-
-  Code = R"cpp(
-    void test(int a) {
-      *^a;
-      &^a;
-    }
-
-  )cpp";
-}
-
-TEST(PreferredTypeTest, ParenExpr) {
-  StringRef Code = R"cpp(
-    const int *i = ^(^(^(^10)));
-  )cpp";
-  EXPECT_THAT(collectPreferredTypes(Code), Each("const int *"));
-}
-
-TEST(PreferredTypeTest, FunctionArguments) {
-  StringRef Code = R"cpp(
-    void foo(const int*);
-
-    void bar(const int*);
-    void bar(const int*, int b);
-
-    struct vector {
-      const int *data();
-    };
-    void test() {
-      foo(^(^(^(^vec^tor^().^da^ta^()))));
-      bar(^(^(^(^vec^tor^().^da^ta^()))));
-    }
-  )cpp";
-  EXPECT_THAT(collectPreferredTypes(Code), Each("const int *"));
-
-  Code = R"cpp(
-    void bar(int, volatile double *);
-    void bar(int, volatile double *, int, int);
-
-    struct vector {
-      double *data();
-    };
-
-    struct class_members {
-      void bar(int, volatile double *);
-      void bar(int, volatile double *, int, int);
-    };
-    void test() {
-      bar(10, ^(^(^(^vec^tor^().^da^ta^()))));
-      class_members().bar(10, ^(^(^(^vec^tor^().^da^ta^()))));
-    }
-  )cpp";
-  EXPECT_THAT(collectPreferredTypes(Code), Each("volatile double *"));
-
-  Code = R"cpp(
-    namespace ns {
-      struct vector {
-      };
-    }
-    void accepts_vector(ns::vector);
-
-    void test() {
-      accepts_vector(^::^ns::^vector());
-    }
-  )cpp";
-  EXPECT_THAT(collectPreferredTypes(Code), Each("ns::vector"));
-
-  Code = R"cpp(
-    template <class T>
-    struct vector { using self = vector; };
-
-    void accepts_vector(vector<int>);
-    int foo(int);
-
-    void test() {
-      accepts_vector(^::^vector<decltype(foo(1))>::^self);
-    }
-  )cpp";
-  EXPECT_THAT(collectPreferredTypes(Code), Each("vector<int>"));
-}
-
-TEST(PreferredTypeTest, NoCrashOnInvalidTypes) {
-  StringRef Code = R"cpp(
-    auto x = decltype(&1)(^);
-    auto y = new decltype(&1)(^);
-    // GNU decimal type extension is not supported in clang.
-    auto z = new _Decimal128(^);
-    void foo() { (void)(foo)(^); }
-  )cpp";
-  EXPECT_THAT(collectPreferredTypes(Code), Each("NULL TYPE"));
-}
-
-} // namespace
diff --git a/gnu/llvm/clang/unittests/Sema/ExternalSemaSourceTest.cpp b/gnu/llvm/clang/unittests/Sema/ExternalSemaSourceTest.cpp
deleted file mode 100644
index 842eb83eb3d..00000000000
--- a/gnu/llvm/clang/unittests/Sema/ExternalSemaSourceTest.cpp
+++ /dev/null
@@ -1,317 +0,0 @@
-//=== unittests/Sema/ExternalSemaSourceTest.cpp - ExternalSemaSource tests ===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/AST/ASTConsumer.h"
-#include "clang/AST/ASTContext.h"
-#include "clang/Frontend/CompilerInstance.h"
-#include "clang/Lex/Preprocessor.h"
-#include "clang/Parse/ParseAST.h"
-#include "clang/Sema/ExternalSemaSource.h"
-#include "clang/Sema/Sema.h"
-#include "clang/Sema/SemaDiagnostic.h"
-#include "clang/Sema/TypoCorrection.h"
-#include "clang/Tooling/Tooling.h"
-#include "gtest/gtest.h"
-
-using namespace clang;
-using namespace clang::tooling;
-
-namespace {
-
-// \brief Counts the number of times MaybeDiagnoseMissingCompleteType
-// is called. Returns the result it was provided on creation.
-class CompleteTypeDiagnoser : public clang::ExternalSemaSource {
-public:
-  CompleteTypeDiagnoser(bool MockResult) : CallCount(0), Result(MockResult) {}
-
-  bool MaybeDiagnoseMissingCompleteType(SourceLocation L, QualType T) override {
-    ++CallCount;
-    return Result;
-  }
-
-  int CallCount;
-  bool Result;
-};
-
-/// Counts the number of typo-correcting diagnostics correcting from one name to
-/// another while still passing all diagnostics along a chain of consumers.
-class DiagnosticWatcher : public clang::DiagnosticConsumer {
-  DiagnosticConsumer *Chained;
-  std::string FromName;
-  std::string ToName;
-
-public:
-  DiagnosticWatcher(StringRef From, StringRef To)
-      : Chained(nullptr), FromName(From), ToName("'"), SeenCount(0) {
-    ToName.append(std::string(To));
-    ToName.append("'");
-  }
-
-  void HandleDiagnostic(DiagnosticsEngine::Level DiagLevel,
-                        const Diagnostic &Info) override {
-    if (Chained)
-      Chained->HandleDiagnostic(DiagLevel, Info);
-    if (Info.getID() - 1 == diag::err_using_directive_member_suggest) {
-      const IdentifierInfo *Ident = Info.getArgIdentifier(0);
-      const std::string &CorrectedQuotedStr = Info.getArgStdStr(1);
-      if (Ident->getName() == FromName && CorrectedQuotedStr == ToName)
-        ++SeenCount;
-    } else if (Info.getID() == diag::err_no_member_suggest) {
-      auto Ident = DeclarationName::getFromOpaqueInteger(Info.getRawArg(0));
-      const std::string &CorrectedQuotedStr = Info.getArgStdStr(3);
-      if (Ident.getAsString() == FromName && CorrectedQuotedStr == ToName)
-        ++SeenCount;
-    }
-  }
-
-  void clear() override {
-    DiagnosticConsumer::clear();
-    if (Chained)
-      Chained->clear();
-  }
-
-  bool IncludeInDiagnosticCounts() const override {
-    if (Chained)
-      return Chained->IncludeInDiagnosticCounts();
-    return false;
-  }
-
-  DiagnosticWatcher *Chain(DiagnosticConsumer *ToChain) {
-    Chained = ToChain;
-    return this;
-  }
-
-  int SeenCount;
-};
-
-// \brief Always corrects a typo matching CorrectFrom with a new namespace
-// with the name CorrectTo.
-class NamespaceTypoProvider : public clang::ExternalSemaSource {
-  std::string CorrectFrom;
-  std::string CorrectTo;
-  Sema *CurrentSema;
-
-public:
-  NamespaceTypoProvider(StringRef From, StringRef To)
-      : CorrectFrom(From), CorrectTo(To), CurrentSema(nullptr), CallCount(0) {}
-
-  void InitializeSema(Sema &S) override { CurrentSema = &S; }
-
-  void ForgetSema() override { CurrentSema = nullptr; }
-
-  TypoCorrection CorrectTypo(const DeclarationNameInfo &Typo, int LookupKind,
-                             Scope *S, CXXScopeSpec *SS,
-                             CorrectionCandidateCallback &CCC,
-                             DeclContext *MemberContext, bool EnteringContext,
-                             const ObjCObjectPointerType *OPT) override {
-    ++CallCount;
-    if (CurrentSema && Typo.getName().getAsString() == CorrectFrom) {
-      DeclContext *DestContext = nullptr;
-      ASTContext &Context = CurrentSema->getASTContext();
-      if (SS)
-        DestContext = CurrentSema->computeDeclContext(*SS, EnteringContext);
-      if (!DestContext)
-        DestContext = Context.getTranslationUnitDecl();
-      IdentifierInfo *ToIdent =
-          CurrentSema->getPreprocessor().getIdentifierInfo(CorrectTo);
-      NamespaceDecl *NewNamespace =
-          NamespaceDecl::Create(Context, DestContext, false, Typo.getBeginLoc(),
-                                Typo.getLoc(), ToIdent, nullptr);
-      DestContext->addDecl(NewNamespace);
-      TypoCorrection Correction(ToIdent);
-      Correction.addCorrectionDecl(NewNamespace);
-      return Correction;
-    }
-    return TypoCorrection();
-  }
-
-  int CallCount;
-};
-
-class FunctionTypoProvider : public clang::ExternalSemaSource {
-  std::string CorrectFrom;
-  std::string CorrectTo;
-  Sema *CurrentSema;
-
-public:
-  FunctionTypoProvider(StringRef From, StringRef To)
-      : CorrectFrom(From), CorrectTo(To), CurrentSema(nullptr), CallCount(0) {}
-
-  void InitializeSema(Sema &S) override { CurrentSema = &S; }
-
-  void ForgetSema() override { CurrentSema = nullptr; }
-
-  TypoCorrection CorrectTypo(const DeclarationNameInfo &Typo, int LookupKind,
-                             Scope *S, CXXScopeSpec *SS,
-                             CorrectionCandidateCallback &CCC,
-                             DeclContext *MemberContext, bool EnteringContext,
-                             const ObjCObjectPointerType *OPT) override {
-    ++CallCount;
-    if (CurrentSema && Typo.getName().getAsString() == CorrectFrom) {
-      DeclContext *DestContext = nullptr;
-      ASTContext &Context = CurrentSema->getASTContext();
-      if (SS)
-        DestContext = CurrentSema->computeDeclContext(*SS, EnteringContext);
-      if (!DestContext)
-        DestContext = Context.getTranslationUnitDecl();
-      IdentifierInfo *ToIdent =
-          CurrentSema->getPreprocessor().getIdentifierInfo(CorrectTo);
-      auto *NewFunction = FunctionDecl::Create(
-          Context, DestContext, SourceLocation(), SourceLocation(), ToIdent,
-          Context.getFunctionType(Context.VoidTy, {}, {}), nullptr, SC_Static);
-      DestContext->addDecl(NewFunction);
-      TypoCorrection Correction(ToIdent);
-      Correction.addCorrectionDecl(NewFunction);
-      return Correction;
-    }
-    return TypoCorrection();
-  }
-
-  int CallCount;
-};
-
-// \brief Chains together a vector of DiagnosticWatchers and
-// adds a vector of ExternalSemaSources to the CompilerInstance before
-// performing semantic analysis.
-class ExternalSemaSourceInstaller : public clang::ASTFrontendAction {
-  std::vector<DiagnosticWatcher *> Watchers;
-  std::vector<clang::ExternalSemaSource *> Sources;
-  std::unique_ptr<DiagnosticConsumer> OwnedClient;
-
-protected:
-  std::unique_ptr<clang::ASTConsumer>
-  CreateASTConsumer(clang::CompilerInstance &Compiler,
-                    llvm::StringRef /* dummy */) override {
-    return std::make_unique<clang::ASTConsumer>();
-  }
-
-  void ExecuteAction() override {
-    CompilerInstance &CI = getCompilerInstance();
-    ASSERT_FALSE(CI.hasSema());
-    CI.createSema(getTranslationUnitKind(), nullptr);
-    ASSERT_TRUE(CI.hasDiagnostics());
-    DiagnosticsEngine &Diagnostics = CI.getDiagnostics();
-    DiagnosticConsumer *Client = Diagnostics.getClient();
-    if (Diagnostics.ownsClient())
-      OwnedClient = Diagnostics.takeClient();
-    for (size_t I = 0, E = Watchers.size(); I < E; ++I)
-      Client = Watchers[I]->Chain(Client);
-    Diagnostics.setClient(Client, false);
-    for (size_t I = 0, E = Sources.size(); I < E; ++I) {
-      Sources[I]->InitializeSema(CI.getSema());
-      CI.getSema().addExternalSource(Sources[I]);
-    }
-    ParseAST(CI.getSema(), CI.getFrontendOpts().ShowStats,
-             CI.getFrontendOpts().SkipFunctionBodies);
-  }
-
-public:
-  void PushSource(clang::ExternalSemaSource *Source) {
-    Sources.push_back(Source);
-  }
-
-  void PushWatcher(DiagnosticWatcher *Watcher) { Watchers.push_back(Watcher); }
-};
-
-// Make sure that the DiagnosticWatcher is not miscounting.
-TEST(ExternalSemaSource, SanityCheck) {
-  auto Installer = std::make_unique<ExternalSemaSourceInstaller>();
-  DiagnosticWatcher Watcher("AAB", "BBB");
-  Installer->PushWatcher(&Watcher);
-  std::vector<std::string> Args(1, "-std=c++11");
-  ASSERT_TRUE(clang::tooling::runToolOnCodeWithArgs(
-      std::move(Installer), "namespace AAA { } using namespace AAB;", Args));
-  ASSERT_EQ(0, Watcher.SeenCount);
-}
-
-// Check that when we add a NamespaceTypeProvider, we use that suggestion
-// instead of the usual suggestion we would use above.
-TEST(ExternalSemaSource, ExternalTypoCorrectionPrioritized) {
-  auto Installer = std::make_unique<ExternalSemaSourceInstaller>();
-  NamespaceTypoProvider Provider("AAB", "BBB");
-  DiagnosticWatcher Watcher("AAB", "BBB");
-  Installer->PushSource(&Provider);
-  Installer->PushWatcher(&Watcher);
-  std::vector<std::string> Args(1, "-std=c++11");
-  ASSERT_TRUE(clang::tooling::runToolOnCodeWithArgs(
-      std::move(Installer), "namespace AAA { } using namespace AAB;", Args));
-  ASSERT_LE(0, Provider.CallCount);
-  ASSERT_EQ(1, Watcher.SeenCount);
-}
-
-// Check that we use the first successful TypoCorrection returned from an
-// ExternalSemaSource.
-TEST(ExternalSemaSource, ExternalTypoCorrectionOrdering) {
-  auto Installer = std::make_unique<ExternalSemaSourceInstaller>();
-  NamespaceTypoProvider First("XXX", "BBB");
-  NamespaceTypoProvider Second("AAB", "CCC");
-  NamespaceTypoProvider Third("AAB", "DDD");
-  DiagnosticWatcher Watcher("AAB", "CCC");
-  Installer->PushSource(&First);
-  Installer->PushSource(&Second);
-  Installer->PushSource(&Third);
-  Installer->PushWatcher(&Watcher);
-  std::vector<std::string> Args(1, "-std=c++11");
-  ASSERT_TRUE(clang::tooling::runToolOnCodeWithArgs(
-      std::move(Installer), "namespace AAA { } using namespace AAB;", Args));
-  ASSERT_LE(1, First.CallCount);
-  ASSERT_LE(1, Second.CallCount);
-  ASSERT_EQ(0, Third.CallCount);
-  ASSERT_EQ(1, Watcher.SeenCount);
-}
-
-TEST(ExternalSemaSource, ExternalDelayedTypoCorrection) {
-  auto Installer = std::make_unique<ExternalSemaSourceInstaller>();
-  FunctionTypoProvider Provider("aaa", "bbb");
-  DiagnosticWatcher Watcher("aaa", "bbb");
-  Installer->PushSource(&Provider);
-  Installer->PushWatcher(&Watcher);
-  std::vector<std::string> Args(1, "-std=c++11");
-  ASSERT_TRUE(clang::tooling::runToolOnCodeWithArgs(
-      std::move(Installer), "namespace AAA { } void foo() { AAA::aaa(); }",
-      Args));
-  ASSERT_LE(0, Provider.CallCount);
-  ASSERT_EQ(1, Watcher.SeenCount);
-}
-
-// We should only try MaybeDiagnoseMissingCompleteType if we can't otherwise
-// solve the problem.
-TEST(ExternalSemaSource, TryOtherTacticsBeforeDiagnosing) {
-  auto Installer = std::make_unique<ExternalSemaSourceInstaller>();
-  CompleteTypeDiagnoser Diagnoser(false);
-  Installer->PushSource(&Diagnoser);
-  std::vector<std::string> Args(1, "-std=c++11");
-  // This code hits the class template specialization/class member of a class
-  // template specialization checks in Sema::RequireCompleteTypeImpl.
-  ASSERT_TRUE(clang::tooling::runToolOnCodeWithArgs(
-      std::move(Installer),
-      "template <typename T> struct S { class C { }; }; S<char>::C SCInst;",
-      Args));
-  ASSERT_EQ(0, Diagnoser.CallCount);
-}
-
-// The first ExternalSemaSource where MaybeDiagnoseMissingCompleteType returns
-// true should be the last one called.
-TEST(ExternalSemaSource, FirstDiagnoserTaken) {
-  auto Installer = std::make_unique<ExternalSemaSourceInstaller>();
-  CompleteTypeDiagnoser First(false);
-  CompleteTypeDiagnoser Second(true);
-  CompleteTypeDiagnoser Third(true);
-  Installer->PushSource(&First);
-  Installer->PushSource(&Second);
-  Installer->PushSource(&Third);
-  std::vector<std::string> Args(1, "-std=c++11");
-  ASSERT_FALSE(clang::tooling::runToolOnCodeWithArgs(
-      std::move(Installer), "class Incomplete; Incomplete IncompleteInstance;",
-      Args));
-  ASSERT_EQ(1, First.CallCount);
-  ASSERT_EQ(1, Second.CallCount);
-  ASSERT_EQ(0, Third.CallCount);
-}
-
-} // anonymous namespace
diff --git a/gnu/llvm/clang/unittests/Sema/GslOwnerPointerInference.cpp b/gnu/llvm/clang/unittests/Sema/GslOwnerPointerInference.cpp
deleted file mode 100644
index 5d86a8806cb..00000000000
--- a/gnu/llvm/clang/unittests/Sema/GslOwnerPointerInference.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-//== unittests/Sema/GslOwnerPointerInference.cpp - gsl::Owner/Pointer ========//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "../ASTMatchers/ASTMatchersTest.h"
-#include "clang/ASTMatchers/ASTMatchers.h"
-#include "gtest/gtest.h"
-
-namespace clang {
-using namespace ast_matchers;
-
-TEST(OwnerPointer, BothHaveAttributes) {
-  EXPECT_TRUE(matches("template<class T>"
-                      "class [[gsl::Owner]] C;"
-
-                      "template<class T>"
-                      "class [[gsl::Owner]] C {};"
-
-                      "C<int> c;",
-                      classTemplateSpecializationDecl(
-                          hasName("C"), hasAttr(clang::attr::Owner))));
-}
-
-TEST(OwnerPointer, ForwardDeclOnly) {
-  EXPECT_TRUE(matches("template<class T>"
-                      "class [[gsl::Owner]] C;"
-
-                      "template<class T>"
-                      "class C {};"
-
-                      "C<int> c;",
-                      classTemplateSpecializationDecl(
-                          hasName("C"), hasAttr(clang::attr::Owner))));
-}
-
-TEST(OwnerPointer, LateForwardDeclOnly) {
-  EXPECT_TRUE(matches("template<class T>"
-                      "class C;"
-
-                      "template<class T>"
-                      "class C {};"
-
-                      "template<class T>"
-                      "class [[gsl::Owner]] C;"
-
-                      "C<int> c;",
-                      classTemplateSpecializationDecl(
-                          hasName("C"), hasAttr(clang::attr::Owner))));
-}
-
-} // namespace clang
diff --git a/gnu/llvm/clang/unittests/Serialization/CMakeLists.txt b/gnu/llvm/clang/unittests/Serialization/CMakeLists.txt
deleted file mode 100644
index c0a79842525..00000000000
--- a/gnu/llvm/clang/unittests/Serialization/CMakeLists.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  BitReader
-  BitstreamReader
-  Support
-  )
-
-add_clang_unittest(SerializationTests
-  InMemoryModuleCacheTest.cpp
-  ModuleCacheTest.cpp
-  )
-
-clang_target_link_libraries(SerializationTests
-  PRIVATE
-  clangAST
-  clangBasic
-  clangFrontend
-  clangLex
-  clangSema
-  clangSerialization
-  )
diff --git a/gnu/llvm/clang/unittests/Serialization/InMemoryModuleCacheTest.cpp b/gnu/llvm/clang/unittests/Serialization/InMemoryModuleCacheTest.cpp
deleted file mode 100644
index ed5e1538eba..00000000000
--- a/gnu/llvm/clang/unittests/Serialization/InMemoryModuleCacheTest.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-//===- InMemoryModuleCacheTest.cpp - InMemoryModuleCache tests ------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/Serialization/InMemoryModuleCache.h"
-#include "llvm/Support/MemoryBuffer.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-using namespace clang;
-
-namespace {
-
-std::unique_ptr<MemoryBuffer> getBuffer(int I) {
-  SmallVector<char, 8> Bytes;
-  raw_svector_ostream(Bytes) << "data:" << I;
-  return MemoryBuffer::getMemBuffer(StringRef(Bytes.data(), Bytes.size()), "",
-                                    /* RequiresNullTerminator = */ false);
-}
-
-TEST(InMemoryModuleCacheTest, initialState) {
-  InMemoryModuleCache Cache;
-  EXPECT_EQ(InMemoryModuleCache::Unknown, Cache.getPCMState("B"));
-  EXPECT_FALSE(Cache.isPCMFinal("B"));
-  EXPECT_FALSE(Cache.shouldBuildPCM("B"));
-
-#if !defined(NDEBUG) && GTEST_HAS_DEATH_TEST
-  EXPECT_DEATH(Cache.tryToDropPCM("B"), "PCM to remove is unknown");
-  EXPECT_DEATH(Cache.finalizePCM("B"), "PCM to finalize is unknown");
-#endif
-}
-
-TEST(InMemoryModuleCacheTest, addPCM) {
-  auto B = getBuffer(1);
-  auto *RawB = B.get();
-
-  InMemoryModuleCache Cache;
-  EXPECT_EQ(RawB, &Cache.addPCM("B", std::move(B)));
-  EXPECT_EQ(InMemoryModuleCache::Tentative, Cache.getPCMState("B"));
-  EXPECT_EQ(RawB, Cache.lookupPCM("B"));
-  EXPECT_FALSE(Cache.isPCMFinal("B"));
-  EXPECT_FALSE(Cache.shouldBuildPCM("B"));
-
-#if !defined(NDEBUG) && GTEST_HAS_DEATH_TEST
-  EXPECT_DEATH(Cache.addPCM("B", getBuffer(2)), "Already has a PCM");
-  EXPECT_DEATH(Cache.addBuiltPCM("B", getBuffer(2)),
-               "Trying to override tentative PCM");
-#endif
-}
-
-TEST(InMemoryModuleCacheTest, addBuiltPCM) {
-  auto B = getBuffer(1);
-  auto *RawB = B.get();
-
-  InMemoryModuleCache Cache;
-  EXPECT_EQ(RawB, &Cache.addBuiltPCM("B", std::move(B)));
-  EXPECT_EQ(InMemoryModuleCache::Final, Cache.getPCMState("B"));
-  EXPECT_EQ(RawB, Cache.lookupPCM("B"));
-  EXPECT_TRUE(Cache.isPCMFinal("B"));
-  EXPECT_FALSE(Cache.shouldBuildPCM("B"));
-
-#if !defined(NDEBUG) && GTEST_HAS_DEATH_TEST
-  EXPECT_DEATH(Cache.addPCM("B", getBuffer(2)), "Already has a PCM");
-  EXPECT_DEATH(Cache.addBuiltPCM("B", getBuffer(2)),
-               "Trying to override finalized PCM");
-#endif
-}
-
-TEST(InMemoryModuleCacheTest, tryToDropPCM) {
-  auto B1 = getBuffer(1);
-  auto B2 = getBuffer(2);
-  auto *RawB1 = B1.get();
-  auto *RawB2 = B2.get();
-  ASSERT_NE(RawB1, RawB2);
-
-  InMemoryModuleCache Cache;
-  EXPECT_EQ(InMemoryModuleCache::Unknown, Cache.getPCMState("B"));
-  EXPECT_EQ(RawB1, &Cache.addPCM("B", std::move(B1)));
-  EXPECT_FALSE(Cache.tryToDropPCM("B"));
-  EXPECT_EQ(nullptr, Cache.lookupPCM("B"));
-  EXPECT_EQ(InMemoryModuleCache::ToBuild, Cache.getPCMState("B"));
-  EXPECT_FALSE(Cache.isPCMFinal("B"));
-  EXPECT_TRUE(Cache.shouldBuildPCM("B"));
-
-#if !defined(NDEBUG) && GTEST_HAS_DEATH_TEST
-  EXPECT_DEATH(Cache.addPCM("B", getBuffer(2)), "Already has a PCM");
-  EXPECT_DEATH(Cache.tryToDropPCM("B"),
-               "PCM to remove is scheduled to be built");
-  EXPECT_DEATH(Cache.finalizePCM("B"), "Trying to finalize a dropped PCM");
-#endif
-
-  // Add a new one.
-  EXPECT_EQ(RawB2, &Cache.addBuiltPCM("B", std::move(B2)));
-  EXPECT_TRUE(Cache.isPCMFinal("B"));
-
-  // Can try to drop again, but this should error and do nothing.
-  EXPECT_TRUE(Cache.tryToDropPCM("B"));
-  EXPECT_EQ(RawB2, Cache.lookupPCM("B"));
-}
-
-TEST(InMemoryModuleCacheTest, finalizePCM) {
-  auto B = getBuffer(1);
-  auto *RawB = B.get();
-
-  InMemoryModuleCache Cache;
-  EXPECT_EQ(InMemoryModuleCache::Unknown, Cache.getPCMState("B"));
-  EXPECT_EQ(RawB, &Cache.addPCM("B", std::move(B)));
-
-  // Call finalize.
-  Cache.finalizePCM("B");
-  EXPECT_EQ(InMemoryModuleCache::Final, Cache.getPCMState("B"));
-  EXPECT_TRUE(Cache.isPCMFinal("B"));
-}
-
-} // namespace
diff --git a/gnu/llvm/clang/unittests/Serialization/ModuleCacheTest.cpp b/gnu/llvm/clang/unittests/Serialization/ModuleCacheTest.cpp
deleted file mode 100644
index 6cffbc2c122..00000000000
--- a/gnu/llvm/clang/unittests/Serialization/ModuleCacheTest.cpp
+++ /dev/null
@@ -1,179 +0,0 @@
-//===- unittests/Serialization/ModuleCacheTest.cpp - CI tests -------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/Basic/FileManager.h"
-#include "clang/Frontend/CompilerInstance.h"
-#include "clang/Frontend/CompilerInvocation.h"
-#include "clang/Frontend/FrontendActions.h"
-#include "clang/Lex/HeaderSearch.h"
-#include "llvm/ADT/SmallString.h"
-#include "llvm/Support/FileSystem.h"
-#include "llvm/Support/raw_ostream.h"
-
-#include "gtest/gtest.h"
-
-using namespace llvm;
-using namespace clang;
-
-namespace {
-
-class ModuleCacheTest : public ::testing::Test {
-  void SetUp() override {
-    ASSERT_FALSE(sys::fs::createUniqueDirectory("modulecache-test", TestDir));
-
-    ModuleCachePath = SmallString<256>(TestDir);
-    sys::path::append(ModuleCachePath, "mcp");
-    ASSERT_FALSE(sys::fs::create_directories(ModuleCachePath));
-  }
-
-  void TearDown() override { sys::fs::remove_directories(TestDir); }
-
-public:
-  SmallString<256> TestDir;
-  SmallString<256> ModuleCachePath;
-
-  void addFile(StringRef Path, StringRef Contents) {
-    ASSERT_FALSE(sys::path::is_absolute(Path));
-
-    SmallString<256> AbsPath(TestDir);
-    sys::path::append(AbsPath, Path);
-
-    std::error_code EC;
-    ASSERT_FALSE(
-        sys::fs::create_directories(llvm::sys::path::parent_path(AbsPath)));
-    llvm::raw_fd_ostream OS(AbsPath, EC);
-    ASSERT_FALSE(EC);
-    OS << Contents;
-  }
-
-  void addDuplicateFrameworks() {
-    addFile("test.m", R"cpp(
-        @import Top;
-    )cpp");
-
-    addFile("frameworks/Top.framework/Headers/top.h", R"cpp(
-        @import M;
-    )cpp");
-    addFile("frameworks/Top.framework/Modules/module.modulemap", R"cpp(
-        framework module Top [system] {
-          header "top.h"
-          export *
-        }
-    )cpp");
-
-    addFile("frameworks/M.framework/Headers/m.h", R"cpp(
-        void foo();
-    )cpp");
-    addFile("frameworks/M.framework/Modules/module.modulemap", R"cpp(
-        framework module M [system] {
-          header "m.h"
-          export *
-        }
-    )cpp");
-
-    addFile("frameworks2/M.framework/Headers/m.h", R"cpp(
-        void foo();
-    )cpp");
-    addFile("frameworks2/M.framework/Modules/module.modulemap", R"cpp(
-        framework module M [system] {
-          header "m.h"
-          export *
-        }
-    )cpp");
-  }
-};
-
-TEST_F(ModuleCacheTest, CachedModuleNewPath) {
-  addDuplicateFrameworks();
-
-  SmallString<256> MCPArg("-fmodules-cache-path=");
-  MCPArg.append(ModuleCachePath);
-  IntrusiveRefCntPtr<DiagnosticsEngine> Diags =
-      CompilerInstance::createDiagnostics(new DiagnosticOptions());
-
-  // First run should pass with no errors
-  const char *Args[] = {"clang",        "-fmodules",          "-Fframeworks",
-                        MCPArg.c_str(), "-working-directory", TestDir.c_str(),
-                        "test.m"};
-  std::shared_ptr<CompilerInvocation> Invocation =
-      createInvocationFromCommandLine(Args, Diags);
-  ASSERT_TRUE(Invocation);
-  CompilerInstance Instance;
-  Instance.setDiagnostics(Diags.get());
-  Instance.setInvocation(Invocation);
-  SyntaxOnlyAction Action;
-  ASSERT_TRUE(Instance.ExecuteAction(Action));
-  ASSERT_FALSE(Diags->hasErrorOccurred());
-
-  // Now add `frameworks2` to the search path. `Top.pcm` will have a reference
-  // to the `M` from `frameworks`, but a search will find the `M` from
-  // `frameworks2` - causing a mismatch and it to be considered out of date.
-  //
-  // Normally this would be fine - `M` and the modules it depends on would be
-  // rebuilt. However, since we have a shared module cache and thus an already
-  // finalized `Top`, recompiling `Top` will cause the existing module to be
-  // removed from the cache, causing possible crashed if it is ever used.
-  //
-  // Make sure that an error occurs instead.
-  const char *Args2[] = {"clang",         "-fmodules",    "-Fframeworks2",
-                         "-Fframeworks",  MCPArg.c_str(), "-working-directory",
-                         TestDir.c_str(), "test.m"};
-  std::shared_ptr<CompilerInvocation> Invocation2 =
-      createInvocationFromCommandLine(Args2, Diags);
-  ASSERT_TRUE(Invocation2);
-  CompilerInstance Instance2(Instance.getPCHContainerOperations(),
-                             &Instance.getModuleCache());
-  Instance2.setDiagnostics(Diags.get());
-  Instance2.setInvocation(Invocation2);
-  SyntaxOnlyAction Action2;
-  ASSERT_FALSE(Instance2.ExecuteAction(Action2));
-  ASSERT_TRUE(Diags->hasErrorOccurred());
-}
-
-TEST_F(ModuleCacheTest, CachedModuleNewPathAllowErrors) {
-  addDuplicateFrameworks();
-
-  SmallString<256> MCPArg("-fmodules-cache-path=");
-  MCPArg.append(ModuleCachePath);
-  IntrusiveRefCntPtr<DiagnosticsEngine> Diags =
-      CompilerInstance::createDiagnostics(new DiagnosticOptions());
-
-  // First run should pass with no errors
-  const char *Args[] = {"clang",        "-fmodules",          "-Fframeworks",
-                        MCPArg.c_str(), "-working-directory", TestDir.c_str(),
-                        "test.m"};
-  std::shared_ptr<CompilerInvocation> Invocation =
-      createInvocationFromCommandLine(Args, Diags);
-  ASSERT_TRUE(Invocation);
-  CompilerInstance Instance;
-  Instance.setDiagnostics(Diags.get());
-  Instance.setInvocation(Invocation);
-  SyntaxOnlyAction Action;
-  ASSERT_TRUE(Instance.ExecuteAction(Action));
-  ASSERT_FALSE(Diags->hasErrorOccurred());
-
-  // Same as `CachedModuleNewPath` but while allowing errors. This is a hard
-  // failure where the module wasn't created, so it should still fail.
-  const char *Args2[] = {
-      "clang",         "-fmodules",    "-Fframeworks2",
-      "-Fframeworks",  MCPArg.c_str(), "-working-directory",
-      TestDir.c_str(), "-Xclang",      "-fallow-pcm-with-compiler-errors",
-      "test.m"};
-  std::shared_ptr<CompilerInvocation> Invocation2 =
-      createInvocationFromCommandLine(Args2, Diags);
-  ASSERT_TRUE(Invocation2);
-  CompilerInstance Instance2(Instance.getPCHContainerOperations(),
-                             &Instance.getModuleCache());
-  Instance2.setDiagnostics(Diags.get());
-  Instance2.setInvocation(Invocation2);
-  SyntaxOnlyAction Action2;
-  ASSERT_FALSE(Instance2.ExecuteAction(Action2));
-  ASSERT_TRUE(Diags->hasErrorOccurred());
-}
-
-} // anonymous namespace
diff --git a/gnu/llvm/clang/unittests/StaticAnalyzer/AnalyzerOptionsTest.cpp b/gnu/llvm/clang/unittests/StaticAnalyzer/AnalyzerOptionsTest.cpp
deleted file mode 100644
index cd78014eae9..00000000000
--- a/gnu/llvm/clang/unittests/StaticAnalyzer/AnalyzerOptionsTest.cpp
+++ /dev/null
@@ -1,97 +0,0 @@
-//===- unittest/StaticAnalyzer/AnalyzerOptionsTest.cpp - SA Options test --===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/StaticAnalyzer/Core/AnalyzerOptions.h"
-#include "clang/StaticAnalyzer/Core/Checker.h"
-#include "gtest/gtest.h"
-
-namespace clang {
-namespace ento {
-
-TEST(StaticAnalyzerOptions, getRegisteredCheckers) {
-  auto IsDebugChecker = [](StringRef CheckerName) {
-    return CheckerName.startswith("debug");
-  };
-  auto IsAlphaChecker = [](StringRef CheckerName) {
-    return CheckerName.startswith("alpha");
-  };
-  const auto &AllCheckers =
-      AnalyzerOptions::getRegisteredCheckers(/*IncludeExperimental=*/true);
-  EXPECT_FALSE(llvm::any_of(AllCheckers, IsDebugChecker));
-  EXPECT_TRUE(llvm::any_of(AllCheckers, IsAlphaChecker));
-
-  const auto &StableCheckers = AnalyzerOptions::getRegisteredCheckers();
-  EXPECT_FALSE(llvm::any_of(StableCheckers, IsDebugChecker));
-  EXPECT_FALSE(llvm::any_of(StableCheckers, IsAlphaChecker));
-}
-
-TEST(StaticAnalyzerOptions, SearchInParentPackageTests) {
-  AnalyzerOptions Opts;
-  Opts.Config["Outer.Inner.CheckerOne:Option"] = "true";
-  Opts.Config["Outer.Inner:Option"] = "false";
-  Opts.Config["Outer.Inner:Option2"] = "true";
-  Opts.Config["Outer:Option2"] = "false";
-
-  struct CheckerOneMock : CheckerBase {
-    StringRef getTagDescription() const override {
-      return "Outer.Inner.CheckerOne";
-    }
-  };
-  struct CheckerTwoMock : CheckerBase {
-    StringRef getTagDescription() const override {
-      return "Outer.Inner.CheckerTwo";
-    }
-  };
-
-  // CheckerTwo one has Option specified as true. It should read true regardless
-  // of search mode.
-  CheckerOneMock CheckerOne;
-  EXPECT_TRUE(Opts.getCheckerBooleanOption(&CheckerOne, "Option"));
-  // The package option is overridden with a checker option.
-  EXPECT_TRUE(Opts.getCheckerBooleanOption(&CheckerOne, "Option", true));
-  // The Outer package option is overridden by the Inner package option. No
-  // package option is specified.
-  EXPECT_TRUE(Opts.getCheckerBooleanOption(&CheckerOne, "Option2", true));
-  // No package option is specified and search in packages is turned off. We
-  // should assert here, but we can't test that.
-  //Opts.getCheckerBooleanOption(&CheckerOne, "Option2");
-  //Opts.getCheckerBooleanOption(&CheckerOne, "Option2");
-
-  // Checker true has no option specified. It should get false when search in
-  // parents turned on.
-  CheckerTwoMock CheckerTwo;
-  EXPECT_FALSE(Opts.getCheckerBooleanOption(&CheckerTwo, "Option", true));
-  // In any other case, we should assert, that we cannot test unfortunately.
-  //Opts.getCheckerBooleanOption(&CheckerTwo, "Option");
-  //Opts.getCheckerBooleanOption(&CheckerTwo, "Option");
-}
-
-TEST(StaticAnalyzerOptions, StringOptions) {
-  AnalyzerOptions Opts;
-  Opts.Config["Outer.Inner.CheckerOne:Option"] = "StringValue";
-
-  struct CheckerOneMock : CheckerBase {
-    StringRef getTagDescription() const override {
-      return "Outer.Inner.CheckerOne";
-    }
-  };
-
-  CheckerOneMock CheckerOne;
-  EXPECT_TRUE("StringValue" ==
-            Opts.getCheckerStringOption(&CheckerOne, "Option"));
-}
-
-TEST(StaticAnalyzerOptions, SubCheckerOptions) {
-  AnalyzerOptions Opts;
-  Opts.Config["Outer.Inner.CheckerOne:Option"] = "StringValue";
-  EXPECT_TRUE("StringValue" == Opts.getCheckerStringOption(
-        "Outer.Inner.CheckerOne", "Option"));
-}
-
-} // end namespace ento
-} // end namespace clang
diff --git a/gnu/llvm/clang/unittests/StaticAnalyzer/BugReportInterestingnessTest.cpp b/gnu/llvm/clang/unittests/StaticAnalyzer/BugReportInterestingnessTest.cpp
deleted file mode 100644
index bc1b8edf053..00000000000
--- a/gnu/llvm/clang/unittests/StaticAnalyzer/BugReportInterestingnessTest.cpp
+++ /dev/null
@@ -1,162 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "Reusables.h"
-#include "clang/Frontend/CompilerInstance.h"
-#include "clang/StaticAnalyzer/Core/BugReporter/BugReporter.h"
-#include "clang/StaticAnalyzer/Core/BugReporter/BugType.h"
-#include "clang/StaticAnalyzer/Core/Checker.h"
-#include "clang/StaticAnalyzer/Core/PathSensitive/AnalysisManager.h"
-#include "clang/StaticAnalyzer/Core/PathSensitive/CallEvent.h"
-#include "clang/StaticAnalyzer/Core/PathSensitive/CheckerContext.h"
-#include "clang/StaticAnalyzer/Frontend/AnalysisConsumer.h"
-#include "clang/StaticAnalyzer/Frontend/CheckerRegistry.h"
-#include "clang/Tooling/Tooling.h"
-#include "gtest/gtest.h"
-
-using namespace clang;
-using namespace ento;
-using namespace llvm;
-
-namespace {
-
-class InterestingnessTestChecker : public Checker<check::PreCall> {
-  BugType BT_TestBug;
-
-  using HandlerFn = std::function<void(const InterestingnessTestChecker *,
-                                       const CallEvent &, CheckerContext &)>;
-
-  CallDescriptionMap<HandlerFn> Handlers = {
-      {{"setInteresting", 1}, &InterestingnessTestChecker::handleInteresting},
-      {{"setNotInteresting", 1},
-       &InterestingnessTestChecker::handleNotInteresting},
-      {{"check", 1}, &InterestingnessTestChecker::handleCheck},
-      {{"bug", 1}, &InterestingnessTestChecker::handleBug},
-  };
-
-  void handleInteresting(const CallEvent &Call, CheckerContext &C) const;
-  void handleNotInteresting(const CallEvent &Call, CheckerContext &C) const;
-  void handleCheck(const CallEvent &Call, CheckerContext &C) const;
-  void handleBug(const CallEvent &Call, CheckerContext &C) const;
-
-public:
-  InterestingnessTestChecker()
-      : BT_TestBug(this, "InterestingnessTestBug", "Test") {}
-
-  void checkPreCall(const CallEvent &Call, CheckerContext &C) const {
-    const HandlerFn *Handler = Handlers.lookup(Call);
-    if (!Handler)
-      return;
-
-    (*Handler)(this, Call, C);
-  }
-};
-
-} // namespace
-
-void InterestingnessTestChecker::handleInteresting(const CallEvent &Call,
-                                                   CheckerContext &C) const {
-  SymbolRef Sym = Call.getArgSVal(0).getAsSymbol();
-  assert(Sym);
-  C.addTransition(nullptr, C.getNoteTag([Sym](PathSensitiveBugReport &BR) {
-    BR.markInteresting(Sym);
-    return "";
-  }));
-}
-
-void InterestingnessTestChecker::handleNotInteresting(const CallEvent &Call,
-                                                      CheckerContext &C) const {
-  SymbolRef Sym = Call.getArgSVal(0).getAsSymbol();
-  assert(Sym);
-  C.addTransition(nullptr, C.getNoteTag([Sym](PathSensitiveBugReport &BR) {
-    BR.markNotInteresting(Sym);
-    return "";
-  }));
-}
-
-void InterestingnessTestChecker::handleCheck(const CallEvent &Call,
-                                             CheckerContext &C) const {
-  SymbolRef Sym = Call.getArgSVal(0).getAsSymbol();
-  assert(Sym);
-  C.addTransition(nullptr, C.getNoteTag([Sym](PathSensitiveBugReport &BR) {
-    if (BR.isInteresting(Sym))
-      return "Interesting";
-    else
-      return "NotInteresting";
-  }));
-}
-
-void InterestingnessTestChecker::handleBug(const CallEvent &Call,
-                                           CheckerContext &C) const {
-  ExplodedNode *N = C.generateErrorNode();
-  C.emitReport(
-      std::make_unique<PathSensitiveBugReport>(BT_TestBug, "test bug", N));
-}
-
-namespace {
-
-class TestAction : public ASTFrontendAction {
-  ExpectedDiagsTy ExpectedDiags;
-
-public:
-  TestAction(ExpectedDiagsTy &&ExpectedDiags)
-      : ExpectedDiags(std::move(ExpectedDiags)) {}
-
-  std::unique_ptr<ASTConsumer> CreateASTConsumer(CompilerInstance &Compiler,
-                                                 StringRef File) override {
-    std::unique_ptr<AnalysisASTConsumer> AnalysisConsumer =
-        CreateAnalysisConsumer(Compiler);
-    AnalysisConsumer->AddDiagnosticConsumer(new VerifyPathDiagnosticConsumer(
-        std::move(ExpectedDiags), Compiler.getSourceManager()));
-    AnalysisConsumer->AddCheckerRegistrationFn([](CheckerRegistry &Registry) {
-      Registry.addChecker<InterestingnessTestChecker>("test.Interestingness",
-                                                      "Description", "");
-    });
-    Compiler.getAnalyzerOpts()->CheckersAndPackages = {
-        {"test.Interestingness", true}};
-    return std::move(AnalysisConsumer);
-  }
-};
-
-} // namespace
-
-TEST(BugReportInterestingness, Symbols) {
-  EXPECT_TRUE(tooling::runToolOnCode(
-      std::make_unique<TestAction>(ExpectedDiagsTy{
-          {{15, 7},
-           "test bug",
-           "test bug",
-           "test.Interestingness",
-           "InterestingnessTestBug",
-           "Test",
-           {
-               {{8, 7}, "Interesting", {{{8, 7}, {8, 14}}}},
-               {{10, 7}, "NotInteresting", {{{10, 7}, {10, 14}}}},
-               {{12, 7}, "Interesting", {{{12, 7}, {12, 14}}}},
-               {{14, 7}, "NotInteresting", {{{14, 7}, {14, 14}}}},
-               {{15, 7}, "test bug", {{{15, 7}, {15, 12}}}},
-           }}}),
-      R"(
-    void setInteresting(int);
-    void setNotInteresting(int);
-    void check(int);
-    void bug(int);
-
-    void f(int A) {
-      check(A);
-      setInteresting(A);
-      check(A);
-      setNotInteresting(A);
-      check(A);
-      setInteresting(A);
-      check(A);
-      bug(A);
-    }
-  )",
-      "input.cpp"));
-}
diff --git a/gnu/llvm/clang/unittests/StaticAnalyzer/CMakeLists.txt b/gnu/llvm/clang/unittests/StaticAnalyzer/CMakeLists.txt
deleted file mode 100644
index d131e03057b..00000000000
--- a/gnu/llvm/clang/unittests/StaticAnalyzer/CMakeLists.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  FrontendOpenMP
-  Support
-  )
-
-add_clang_unittest(StaticAnalysisTests
-  AnalyzerOptionsTest.cpp
-  BugReportInterestingnessTest.cpp
-  CallDescriptionTest.cpp
-  CallEventTest.cpp
-  FalsePositiveRefutationBRVisitorTest.cpp
-  ParamRegionTest.cpp
-  RangeSetTest.cpp
-  RegisterCustomCheckersTest.cpp
-  StoreTest.cpp
-  SymbolReaperTest.cpp
-  SValTest.cpp
-  TestReturnValueUnderConstruction.cpp
-  )
-
-clang_target_link_libraries(StaticAnalysisTests
-  PRIVATE
-  clangBasic
-  clangAnalysis
-  clangAST
-  clangASTMatchers
-  clangCrossTU
-  clangFrontend
-  clangSerialization
-  clangStaticAnalyzerCore
-  clangStaticAnalyzerFrontend
-  clangTooling
-  )
diff --git a/gnu/llvm/clang/unittests/StaticAnalyzer/CallDescriptionTest.cpp b/gnu/llvm/clang/unittests/StaticAnalyzer/CallDescriptionTest.cpp
deleted file mode 100644
index 2ebaa46b0f7..00000000000
--- a/gnu/llvm/clang/unittests/StaticAnalyzer/CallDescriptionTest.cpp
+++ /dev/null
@@ -1,162 +0,0 @@
-//===- unittests/StaticAnalyzer/CallDescriptionTest.cpp -------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "Reusables.h"
-
-#include "clang/StaticAnalyzer/Core/PathSensitive/CallEvent.h"
-#include "clang/Tooling/Tooling.h"
-#include "gtest/gtest.h"
-
-namespace clang {
-namespace ento {
-namespace {
-
-// A wrapper around CallDescriptionMap<bool> that allows verifying that
-// all functions have been found. This is needed because CallDescriptionMap
-// isn't supposed to support iteration.
-class ResultMap {
-  size_t Found, Total;
-  CallDescriptionMap<bool> Impl;
-
-public:
-  ResultMap(std::initializer_list<std::pair<CallDescription, bool>> Data)
-      : Found(0),
-        Total(std::count_if(Data.begin(), Data.end(),
-                            [](const std::pair<CallDescription, bool> &Pair) {
-                              return Pair.second == true;
-                            })),
-        Impl(std::move(Data)) {}
-
-  const bool *lookup(const CallEvent &Call) {
-    const bool *Result = Impl.lookup(Call);
-    // If it's a function we expected to find, remember that we've found it.
-    if (Result && *Result)
-      ++Found;
-    return Result;
-  }
-
-  // Fail the test if we haven't found all the true-calls we were looking for.
-  ~ResultMap() { EXPECT_EQ(Found, Total); }
-};
-
-// Scan the code body for call expressions and see if we find all calls that
-// we were supposed to find ("true" in the provided ResultMap) and that we
-// don't find the ones that we weren't supposed to find
-// ("false" in the ResultMap).
-class CallDescriptionConsumer : public ExprEngineConsumer {
-  ResultMap &RM;
-  void performTest(const Decl *D) {
-    using namespace ast_matchers;
-
-    if (!D->hasBody())
-      return;
-
-    const CallExpr *CE = findNode<CallExpr>(D, callExpr());
-    const StackFrameContext *SFC =
-        Eng.getAnalysisDeclContextManager().getStackFrame(D);
-    ProgramStateRef State = Eng.getInitialState(SFC);
-    CallEventRef<> Call =
-        Eng.getStateManager().getCallEventManager().getCall(CE, State, SFC);
-
-    const bool *LookupResult = RM.lookup(*Call);
-    // Check that we've found the function in the map
-    // with the correct description.
-    EXPECT_TRUE(LookupResult && *LookupResult);
-
-    // ResultMap is responsible for making sure that we've found *all* calls.
-  }
-
-public:
-  CallDescriptionConsumer(CompilerInstance &C,
-                          ResultMap &RM)
-      : ExprEngineConsumer(C), RM(RM) {}
-
-  bool HandleTopLevelDecl(DeclGroupRef DG) override {
-    for (const auto *D : DG)
-      performTest(D);
-    return true;
-  }
-};
-
-class CallDescriptionAction : public ASTFrontendAction {
-  ResultMap RM;
-
-public:
-  CallDescriptionAction(
-      std::initializer_list<std::pair<CallDescription, bool>> Data)
-      : RM(Data) {}
-
-  std::unique_ptr<ASTConsumer> CreateASTConsumer(CompilerInstance &Compiler,
-                                                 StringRef File) override {
-    return std::make_unique<CallDescriptionConsumer>(Compiler, RM);
-  }
-};
-
-TEST(CallEvent, CallDescription) {
-  // Test simple name matching.
-  EXPECT_TRUE(tooling::runToolOnCode(
-      std::unique_ptr<CallDescriptionAction>(new CallDescriptionAction({
-          {{"bar"}, false}, // false: there's no call to 'bar' in this code.
-          {{"foo"}, true},  // true: there's a call to 'foo' in this code.
-      })), "void foo(); void bar() { foo(); }"));
-
-  // Test arguments check.
-  EXPECT_TRUE(tooling::runToolOnCode(
-      std::unique_ptr<CallDescriptionAction>(new CallDescriptionAction({
-          {{"foo", 1}, true},
-          {{"foo", 2}, false},
-      })), "void foo(int); void foo(int, int); void bar() { foo(1); }"));
-
-  // Test lack of arguments check.
-  EXPECT_TRUE(tooling::runToolOnCode(
-      std::unique_ptr<CallDescriptionAction>(new CallDescriptionAction({
-          {{"foo", None}, true},
-          {{"foo", 2}, false},
-      })), "void foo(int); void foo(int, int); void bar() { foo(1); }"));
-
-  // Test qualified names.
-  EXPECT_TRUE(tooling::runToolOnCode(
-      std::unique_ptr<CallDescriptionAction>(new CallDescriptionAction({
-          {{{"std", "basic_string", "c_str"}}, true},
-      })),
-      "namespace std { inline namespace __1 {"
-      "  template<typename T> class basic_string {"
-      "  public:"
-      "    T *c_str();"
-      "  };"
-      "}}"
-      "void foo() {"
-      "  using namespace std;"
-      "  basic_string<char> s;"
-      "  s.c_str();"
-      "}"));
-
-  // A negative test for qualified names.
-  EXPECT_TRUE(tooling::runToolOnCode(
-      std::unique_ptr<CallDescriptionAction>(new CallDescriptionAction({
-          {{{"foo", "bar"}}, false},
-          {{{"bar", "foo"}}, false},
-          {{"foo"}, true},
-      })), "void foo(); struct bar { void foo(); }; void test() { foo(); }"));
-
-  // Test CDF_MaybeBuiltin - a flag that allows matching weird builtins.
-  EXPECT_TRUE(tooling::runToolOnCode(
-      std::unique_ptr<CallDescriptionAction>(new CallDescriptionAction({
-          {{"memset", 3}, false},
-          {{CDF_MaybeBuiltin, "memset", 3}, true}
-      })),
-      "void foo() {"
-      "  int x;"
-      "  __builtin___memset_chk(&x, 0, sizeof(x),"
-      "                         __builtin_object_size(&x, 0));"
-      "}"));
-}
-
-} // namespace
-} // namespace ento
-} // namespace clang
diff --git a/gnu/llvm/clang/unittests/StaticAnalyzer/CallEventTest.cpp b/gnu/llvm/clang/unittests/StaticAnalyzer/CallEventTest.cpp
deleted file mode 100644
index 43ee7320721..00000000000
--- a/gnu/llvm/clang/unittests/StaticAnalyzer/CallEventTest.cpp
+++ /dev/null
@@ -1,89 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/StaticAnalyzer/Core/PathSensitive/CallEvent.h"
-#include "CheckerRegistration.h"
-#include "clang/Basic/LLVM.h"
-#include "clang/Frontend/CompilerInstance.h"
-#include "clang/StaticAnalyzer/Core/BugReporter/BugReporter.h"
-#include "clang/StaticAnalyzer/Core/BugReporter/BugType.h"
-#include "clang/StaticAnalyzer/Core/BugReporter/CommonBugCategories.h"
-#include "clang/StaticAnalyzer/Core/Checker.h"
-#include "clang/StaticAnalyzer/Core/PathSensitive/AnalysisManager.h"
-#include "clang/StaticAnalyzer/Core/PathSensitive/CheckerContext.h"
-#include "clang/StaticAnalyzer/Core/PathSensitive/ExplodedGraph.h"
-#include "clang/StaticAnalyzer/Frontend/AnalysisConsumer.h"
-#include "clang/StaticAnalyzer/Frontend/CheckerRegistry.h"
-#include "clang/Tooling/Tooling.h"
-#include "gtest/gtest.h"
-
-namespace clang {
-namespace ento {
-namespace {
-
-void reportBug(const CheckerBase *Checker, const CallEvent &Call,
-               CheckerContext &C, StringRef WarningMsg) {
-  C.getBugReporter().EmitBasicReport(
-      nullptr, Checker, "", categories::LogicError, WarningMsg,
-      PathDiagnosticLocation(Call.getOriginExpr(), C.getSourceManager(),
-                             C.getLocationContext()),
-      {});
-}
-
-class CXXDeallocatorChecker : public Checker<check::PreCall> {
-  std::unique_ptr<BuiltinBug> BT_uninitField;
-
-public:
-  CXXDeallocatorChecker()
-      : BT_uninitField(new BuiltinBug(this, "CXXDeallocator")) {}
-
-  void checkPreCall(const CallEvent &Call, CheckerContext &C) const {
-    const auto *DC = dyn_cast<CXXDeallocatorCall>(&Call);
-    if (!DC) {
-      return;
-    }
-
-    SmallString<100> WarningBuf;
-    llvm::raw_svector_ostream WarningOS(WarningBuf);
-    WarningOS << "NumArgs: " << DC->getNumArgs();
-
-    reportBug(this, *DC, C, WarningBuf);
-  }
-};
-
-void addCXXDeallocatorChecker(AnalysisASTConsumer &AnalysisConsumer,
-                              AnalyzerOptions &AnOpts) {
-  AnOpts.CheckersAndPackages = {{"test.CXXDeallocator", true}};
-  AnalysisConsumer.AddCheckerRegistrationFn([](CheckerRegistry &Registry) {
-    Registry.addChecker<CXXDeallocatorChecker>("test.CXXDeallocator",
-                                               "Description", "");
-  });
-}
-
-// TODO: What we should really be testing here is all the different varieties
-// of delete operators, and wether the retrieval of their arguments works as
-// intended. At the time of writing this file, CXXDeallocatorCall doesn't pick
-// up on much of those due to the AST not containing CXXDeleteExpr for most of
-// the standard/custom deletes.
-TEST(CXXDeallocatorCall, SimpleDestructor) {
-  std::string Diags;
-  EXPECT_TRUE(runCheckerOnCode<addCXXDeallocatorChecker>(R"(
-    struct A {};
-
-    void f() {
-      A *a = new A;
-      delete a;
-    }
-  )",
-                                                         Diags));
-  EXPECT_EQ(Diags, "test.CXXDeallocator:NumArgs: 1\n");
-}
-
-} // namespace
-} // namespace ento
-} // namespace clang
diff --git a/gnu/llvm/clang/unittests/StaticAnalyzer/CheckerRegistration.h b/gnu/llvm/clang/unittests/StaticAnalyzer/CheckerRegistration.h
deleted file mode 100644
index e02b856e0e9..00000000000
--- a/gnu/llvm/clang/unittests/StaticAnalyzer/CheckerRegistration.h
+++ /dev/null
@@ -1,110 +0,0 @@
-//===- unittests/StaticAnalyzer/RegisterCustomCheckersTest.cpp ------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/Frontend/CompilerInstance.h"
-#include "clang/StaticAnalyzer/Core/BugReporter/BugReporter.h"
-#include "clang/StaticAnalyzer/Core/BugReporter/BugType.h"
-#include "clang/StaticAnalyzer/Core/Checker.h"
-#include "clang/StaticAnalyzer/Core/PathSensitive/AnalysisManager.h"
-#include "clang/StaticAnalyzer/Frontend/AnalysisConsumer.h"
-#include "clang/StaticAnalyzer/Frontend/CheckerRegistry.h"
-#include "clang/Tooling/Tooling.h"
-#include "gtest/gtest.h"
-
-namespace clang {
-namespace ento {
-
-class DiagConsumer : public PathDiagnosticConsumer {
-  llvm::raw_ostream &Output;
-
-public:
-  DiagConsumer(llvm::raw_ostream &Output) : Output(Output) {}
-  void FlushDiagnosticsImpl(std::vector<const PathDiagnostic *> &Diags,
-                            FilesMade *filesMade) override {
-    for (const auto *PD : Diags)
-      Output << PD->getCheckerName() << ":" << PD->getShortDescription() << '\n';
-  }
-
-  StringRef getName() const override { return "Test"; }
-};
-
-using AddCheckerFn = void(AnalysisASTConsumer &AnalysisConsumer,
-                          AnalyzerOptions &AnOpts);
-
-template <AddCheckerFn Fn1, AddCheckerFn Fn2, AddCheckerFn... Fns>
-void addChecker(AnalysisASTConsumer &AnalysisConsumer,
-                AnalyzerOptions &AnOpts) {
-  Fn1(AnalysisConsumer, AnOpts);
-  addChecker<Fn2, Fns...>(AnalysisConsumer, AnOpts);
-}
-
-template <AddCheckerFn Fn1>
-void addChecker(AnalysisASTConsumer &AnalysisConsumer,
-                AnalyzerOptions &AnOpts) {
-  Fn1(AnalysisConsumer, AnOpts);
-}
-
-template <AddCheckerFn... Fns>
-class TestAction : public ASTFrontendAction {
-  llvm::raw_ostream &DiagsOutput;
-
-public:
-  TestAction(llvm::raw_ostream &DiagsOutput) : DiagsOutput(DiagsOutput) {}
-
-  std::unique_ptr<ASTConsumer> CreateASTConsumer(CompilerInstance &Compiler,
-                                                 StringRef File) override {
-    std::unique_ptr<AnalysisASTConsumer> AnalysisConsumer =
-        CreateAnalysisConsumer(Compiler);
-    AnalysisConsumer->AddDiagnosticConsumer(new DiagConsumer(DiagsOutput));
-    addChecker<Fns...>(*AnalysisConsumer, *Compiler.getAnalyzerOpts());
-    return std::move(AnalysisConsumer);
-  }
-};
-
-inline SmallString<80> getCurrentTestNameAsFileName() {
-  const ::testing::TestInfo *Info =
-      ::testing::UnitTest::GetInstance()->current_test_info();
-
-  SmallString<80> FileName;
-  (Twine{Info->name()} + ".cc").toVector(FileName);
-  return FileName;
-}
-
-template <AddCheckerFn... Fns>
-bool runCheckerOnCode(const std::string &Code, std::string &Diags) {
-  const SmallVectorImpl<char> &FileName = getCurrentTestNameAsFileName();
-  llvm::raw_string_ostream OS(Diags);
-  return tooling::runToolOnCode(std::make_unique<TestAction<Fns...>>(OS), Code,
-                                FileName);
-}
-
-template <AddCheckerFn... Fns>
-bool runCheckerOnCode(const std::string &Code) {
-  std::string Diags;
-  return runCheckerOnCode<Fns...>(Code, Diags);
-}
-
-template <AddCheckerFn... Fns>
-bool runCheckerOnCodeWithArgs(const std::string &Code,
-                              const std::vector<std::string> &Args,
-                              std::string &Diags) {
-  const SmallVectorImpl<char> &FileName = getCurrentTestNameAsFileName();
-  llvm::raw_string_ostream OS(Diags);
-  return tooling::runToolOnCodeWithArgs(
-      std::make_unique<TestAction<Fns...>>(OS), Code, Args, FileName);
-}
-
-template <AddCheckerFn... Fns>
-bool runCheckerOnCodeWithArgs(const std::string &Code,
-                              const std::vector<std::string> &Args) {
-  std::string Diags;
-  return runCheckerOnCodeWithArgs<Fns...>(Code, Args, Diags);
-}
-
-} // namespace ento
-} // namespace clang
diff --git a/gnu/llvm/clang/unittests/StaticAnalyzer/FalsePositiveRefutationBRVisitorTest.cpp b/gnu/llvm/clang/unittests/StaticAnalyzer/FalsePositiveRefutationBRVisitorTest.cpp
deleted file mode 100644
index 32bd3950d52..00000000000
--- a/gnu/llvm/clang/unittests/StaticAnalyzer/FalsePositiveRefutationBRVisitorTest.cpp
+++ /dev/null
@@ -1,223 +0,0 @@
-//===- unittests/StaticAnalyzer/FalsePositiveRefutationBRVisitorTest.cpp --===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "CheckerRegistration.h"
-#include "Reusables.h"
-#include "clang/Frontend/CompilerInstance.h"
-#include "clang/StaticAnalyzer/Core/BugReporter/BugReporter.h"
-#include "clang/StaticAnalyzer/Core/BugReporter/BugType.h"
-#include "clang/StaticAnalyzer/Core/Checker.h"
-#include "clang/StaticAnalyzer/Core/PathSensitive/CallEvent.h"
-#include "clang/StaticAnalyzer/Core/PathSensitive/CheckerContext.h"
-#include "clang/StaticAnalyzer/Frontend/AnalysisConsumer.h"
-#include "clang/StaticAnalyzer/Frontend/CheckerRegistry.h"
-#include "llvm/Config/llvm-config.h"
-#include "gtest/gtest.h"
-
-namespace clang {
-namespace ento {
-namespace {
-
-class FalsePositiveGenerator : public Checker<eval::Call> {
-  using Self = FalsePositiveGenerator;
-  const BuiltinBug FalsePositiveGeneratorBug{this, "FalsePositiveGenerator"};
-  using HandlerFn = bool (Self::*)(const CallEvent &Call,
-                                   CheckerContext &) const;
-  CallDescriptionMap<HandlerFn> Callbacks = {
-      {{"reachedWithContradiction", 0}, &Self::reachedWithContradiction},
-      {{"reachedWithNoContradiction", 0}, &Self::reachedWithNoContradiction},
-      {{"reportIfCanBeTrue", 1}, &Self::reportIfCanBeTrue},
-  };
-
-  bool report(CheckerContext &C, ProgramStateRef State,
-              StringRef Description) const {
-    ExplodedNode *Node = C.generateNonFatalErrorNode(State);
-    if (!Node)
-      return false;
-
-    auto Report = std::make_unique<PathSensitiveBugReport>(
-        FalsePositiveGeneratorBug, Description, Node);
-    C.emitReport(std::move(Report));
-    return true;
-  }
-
-  bool reachedWithNoContradiction(const CallEvent &, CheckerContext &C) const {
-    return report(C, C.getState(), "REACHED_WITH_NO_CONTRADICTION");
-  }
-
-  bool reachedWithContradiction(const CallEvent &, CheckerContext &C) const {
-    return report(C, C.getState(), "REACHED_WITH_CONTRADICTION");
-  }
-
-  // Similar to ExprInspectionChecker::analyzerEval except it emits warning only
-  // if the argument can be true. The report emits the report in the state where
-  // the assertion true.
-  bool reportIfCanBeTrue(const CallEvent &Call, CheckerContext &C) const {
-    // A specific instantiation of an inlined function may have more constrained
-    // values than can generally be assumed. Skip the check.
-    if (C.getPredecessor()->getLocationContext()->getStackFrame()->getParent())
-      return false;
-
-    SVal AssertionVal = Call.getArgSVal(0);
-    if (AssertionVal.isUndef())
-      return false;
-
-    ProgramStateRef State = C.getPredecessor()->getState();
-    ProgramStateRef StTrue;
-    std::tie(StTrue, std::ignore) =
-        State->assume(AssertionVal.castAs<DefinedOrUnknownSVal>());
-    if (StTrue)
-      return report(C, StTrue, "CAN_BE_TRUE");
-    return false;
-  }
-
-public:
-  bool evalCall(const CallEvent &Call, CheckerContext &C) const {
-    if (const HandlerFn *Callback = Callbacks.lookup(Call))
-      return (this->*(*Callback))(Call, C);
-    return false;
-  }
-};
-
-void addFalsePositiveGenerator(AnalysisASTConsumer &AnalysisConsumer,
-                               AnalyzerOptions &AnOpts) {
-  AnOpts.CheckersAndPackages = {{"test.FalsePositiveGenerator", true},
-                                {"debug.ViewExplodedGraph", false}};
-  AnalysisConsumer.AddCheckerRegistrationFn([](CheckerRegistry &Registry) {
-    Registry.addChecker<FalsePositiveGenerator>(
-        "test.FalsePositiveGenerator", "EmptyDescription", "EmptyDocsUri");
-  });
-}
-
-class FalsePositiveRefutationBRVisitorTestBase : public testing::Test {
-public:
-  void SetUp() override {
-#ifndef LLVM_WITH_Z3
-    GTEST_SKIP() << "Requires the LLVM_ENABLE_Z3_SOLVER cmake option.";
-#endif
-  }
-};
-
-// C++20 use constexpr below.
-const std::vector<std::string> LazyAssumeArgs{
-    "-Xclang", "-analyzer-config", "-Xclang", "eagerly-assume=false"};
-const std::vector<std::string> LazyAssumeAndCrossCheckArgs{
-    "-Xclang", "-analyzer-config", "-Xclang", "eagerly-assume=false",
-    "-Xclang", "-analyzer-config", "-Xclang", "crosscheck-with-z3=true"};
-
-TEST_F(FalsePositiveRefutationBRVisitorTestBase, UnSatInTheMiddleNoReport) {
-  constexpr auto Code = R"(
-     void reachedWithContradiction();
-     void reachedWithNoContradiction();
-     void test(int x, int y) {
-       if (x * y == 0)
-         return;
-       reachedWithNoContradiction();
-       if (x == 0) {
-         reachedWithContradiction();
-         // x * y != 0  =>  x != 0 && y != 0  => contradict with x == 0
-       }
-     })";
-
-  std::string Diags;
-  EXPECT_TRUE(runCheckerOnCodeWithArgs<addFalsePositiveGenerator>(
-      Code, LazyAssumeAndCrossCheckArgs, Diags));
-  EXPECT_EQ(Diags,
-            "test.FalsePositiveGenerator:REACHED_WITH_NO_CONTRADICTION\n");
-  // Single warning. The second report was invalidated by the visitor.
-
-  // Without enabling the crosscheck-with-z3 both reports are displayed.
-  std::string Diags2;
-  EXPECT_TRUE(runCheckerOnCodeWithArgs<addFalsePositiveGenerator>(
-      Code, LazyAssumeArgs, Diags2));
-  EXPECT_EQ(Diags2,
-            "test.FalsePositiveGenerator:REACHED_WITH_NO_CONTRADICTION\n"
-            "test.FalsePositiveGenerator:REACHED_WITH_CONTRADICTION\n");
-}
-
-TEST_F(FalsePositiveRefutationBRVisitorTestBase,
-       UnSatAtErrorNodeWithNewSymbolNoReport) {
-  constexpr auto Code = R"(
-    void reportIfCanBeTrue(bool);
-    void reachedWithNoContradiction();
-    void test(int x, int y) {
-      if (x * y == 0)
-       return;
-      // We know that 'x * y': {[MIN,-1], [1,MAX]}
-      reachedWithNoContradiction();
-      reportIfCanBeTrue(x == 0); // contradiction
-      // The function introduces the 'x == 0' constraint in the ErrorNode which
-      // leads to contradiction with the constraint of 'x * y'.
-      // Note that the new constraint was bound to a new symbol 'x'.
-    })";
-  std::string Diags;
-  EXPECT_TRUE(runCheckerOnCodeWithArgs<addFalsePositiveGenerator>(
-      Code, LazyAssumeAndCrossCheckArgs, Diags));
-  EXPECT_EQ(Diags,
-            "test.FalsePositiveGenerator:REACHED_WITH_NO_CONTRADICTION\n");
-  // Single warning. The second report was invalidated by the visitor.
-
-  // Without enabling the crosscheck-with-z3 both reports are displayed.
-  std::string Diags2;
-  EXPECT_TRUE(runCheckerOnCodeWithArgs<addFalsePositiveGenerator>(
-      Code, LazyAssumeArgs, Diags2));
-  EXPECT_EQ(Diags2,
-            "test.FalsePositiveGenerator:REACHED_WITH_NO_CONTRADICTION\n"
-            "test.FalsePositiveGenerator:CAN_BE_TRUE\n");
-}
-
-TEST_F(FalsePositiveRefutationBRVisitorTestBase,
-       UnSatAtErrorNodeDueToRefinedConstraintNoReport) {
-  constexpr auto Code = R"(
-    void reportIfCanBeTrue(bool);
-    void reachedWithNoContradiction();
-    void test(unsigned x, unsigned n) {
-      if (n >= 1 && n <= 2) {
-        if (x >= 3)
-          return;
-        // x: [0,2] and n: [1,2]
-        int y = x + n; // y: '(x+n)' Which is in approximately between 1 and 4.
-
-        // Registers the symbol 'y' with the constraint [1, MAX] in the true
-        // branch.
-        if (y > 0) {
-          // Since the x: [0,2] and n: [1,2], the 'y' is indeed greater than
-          // zero. If we emit a warning here, the constraints on the BugPath is
-          // SAT. Therefore that report is NOT invalidated.
-          reachedWithNoContradiction(); // 'y' can be greater than zero. OK
-
-          // If we ask the analyzer whether the 'y' can be 5. It won't know,
-          // therefore, the state will be created where the 'y' expression is 5.
-          // Although, this assumption is false!
-          // 'y' can not be 5 if the maximal value of both x and n is 2.
-          // The BugPath which become UnSAT in the ErrorNode with a refined
-          // constraint, should be invalidated.
-          reportIfCanBeTrue(y == 5);
-        }
-      }
-    })";
-
-  std::string Diags;
-  EXPECT_TRUE(runCheckerOnCodeWithArgs<addFalsePositiveGenerator>(
-      Code, LazyAssumeAndCrossCheckArgs, Diags));
-  EXPECT_EQ(Diags,
-            "test.FalsePositiveGenerator:REACHED_WITH_NO_CONTRADICTION\n");
-  // Single warning. The second report was invalidated by the visitor.
-
-  // Without enabling the crosscheck-with-z3 both reports are displayed.
-  std::string Diags2;
-  EXPECT_TRUE(runCheckerOnCodeWithArgs<addFalsePositiveGenerator>(
-      Code, LazyAssumeArgs, Diags2));
-  EXPECT_EQ(Diags2,
-            "test.FalsePositiveGenerator:REACHED_WITH_NO_CONTRADICTION\n"
-            "test.FalsePositiveGenerator:CAN_BE_TRUE\n");
-}
-
-} // namespace
-} // namespace ento
-} // namespace clang
diff --git a/gnu/llvm/clang/unittests/StaticAnalyzer/ParamRegionTest.cpp b/gnu/llvm/clang/unittests/StaticAnalyzer/ParamRegionTest.cpp
deleted file mode 100644
index 3dbbc7ba157..00000000000
--- a/gnu/llvm/clang/unittests/StaticAnalyzer/ParamRegionTest.cpp
+++ /dev/null
@@ -1,124 +0,0 @@
-//===- unittests/StaticAnalyzer/ParamRegionTest.cpp -----------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "Reusables.h"
-
-#include "clang/Tooling/Tooling.h"
-#include "gtest/gtest.h"
-
-namespace clang {
-namespace ento {
-namespace {
-
-class ParamRegionTestConsumer : public ExprEngineConsumer {
-  void checkForSameParamRegions(MemRegionManager &MRMgr,
-                                const StackFrameContext *SFC,
-                                const ParmVarDecl *PVD) {
-    ASSERT_TRUE(llvm::all_of(PVD->redecls(), [&](const clang::VarDecl *D2) {
-      return MRMgr.getVarRegion(PVD, SFC) ==
-             MRMgr.getVarRegion(cast<ParmVarDecl>(D2), SFC);
-    }));
-  }
-
-  void performTest(const Decl *D) {
-    StoreManager &StMgr = Eng.getStoreManager();
-    MemRegionManager &MRMgr = StMgr.getRegionManager();
-    const StackFrameContext *SFC =
-        Eng.getAnalysisDeclContextManager().getStackFrame(D);
-
-    if (const auto *FD = dyn_cast<FunctionDecl>(D)) {
-      for (const auto *P : FD->parameters()) {
-        if (SFC->inTopFrame())
-          assert(isa<NonParamVarRegion>(MRMgr.getVarRegion(P, SFC)));
-        else
-          assert(isa<ParamVarRegion>(MRMgr.getVarRegion(P, SFC)));
-        checkForSameParamRegions(MRMgr, SFC, P);
-      }
-    } else if (const auto *CD = dyn_cast<CXXConstructorDecl>(D)) {
-      for (const auto *P : CD->parameters()) {
-        if (SFC->inTopFrame())
-          assert(isa<NonParamVarRegion>(MRMgr.getVarRegion(P, SFC)));
-        else
-          assert(isa<ParamVarRegion>(MRMgr.getVarRegion(P, SFC)));
-        checkForSameParamRegions(MRMgr, SFC, P);
-      }
-    } else if (const auto *MD = dyn_cast<ObjCMethodDecl>(D)) {
-      for (const auto *P : MD->parameters()) {
-        if (SFC->inTopFrame())
-          assert(isa<NonParamVarRegion>(MRMgr.getVarRegion(P, SFC)));
-        else
-          assert(isa<ParamVarRegion>(MRMgr.getVarRegion(P, SFC)));
-        checkForSameParamRegions(MRMgr, SFC, P);
-      }
-    }
-  }
-
-public:
-  ParamRegionTestConsumer(CompilerInstance &C) : ExprEngineConsumer(C) {}
-
-  bool HandleTopLevelDecl(DeclGroupRef DG) override {
-    for (const auto *D : DG) {
-      performTest(D);
-    }
-    return true;
-  }
-};
-
-class ParamRegionTestAction : public ASTFrontendAction {
-public:
-  std::unique_ptr<ASTConsumer> CreateASTConsumer(CompilerInstance &Compiler,
-                                                 StringRef File) override {
-    return std::make_unique<ParamRegionTestConsumer>(Compiler);
-  }
-};
-
-TEST(ParamRegion, ParamRegionTest) {
-  EXPECT_TRUE(
-      tooling::runToolOnCode(std::make_unique<ParamRegionTestAction>(),
-                             R"(void foo(int n);
-                                void baz(int p);
-
-                                void foo(int n) {
-                                  auto lambda = [n](int m) {
-                                    return n + m;
-                                  };
-
-                                  int k = lambda(2);
-                                }
-
-                                void bar(int l) {
-                                  foo(l);
-                                }
-
-                                struct S {
-                                  int n;
-                                  S(int nn): n(nn) {}
-                                };
-
-                                void baz(int p) {
-                                  S s(p);
-                                }
-
-                                void bar(int l);
-                                void baz(int p);)"));
-  EXPECT_TRUE(
-      tooling::runToolOnCode(std::make_unique<ParamRegionTestAction>(),
-                             R"(@interface O
-                                + alloc;
-                                - initWithInt:(int)q;
-                                @end
-
-                                void qix(int r) {
-                                  O *o = [[O alloc] initWithInt:r];
-                                })",
-                             "input.m"));
-}
-
-} // namespace
-} // namespace ento
-} // namespace clang
diff --git a/gnu/llvm/clang/unittests/StaticAnalyzer/RangeSetTest.cpp b/gnu/llvm/clang/unittests/StaticAnalyzer/RangeSetTest.cpp
deleted file mode 100644
index dc222e0b080..00000000000
--- a/gnu/llvm/clang/unittests/StaticAnalyzer/RangeSetTest.cpp
+++ /dev/null
@@ -1,349 +0,0 @@
-//===- unittests/StaticAnalyzer/RangeSetTest.cpp ----------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/Basic/Builtins.h"
-#include "clang/Basic/FileManager.h"
-#include "clang/Basic/SourceManager.h"
-#include "clang/StaticAnalyzer/Core/PathSensitive/RangedConstraintManager.h"
-#include "clang/Tooling/Tooling.h"
-#include "llvm/ADT/APSInt.h"
-#include "llvm/Support/raw_ostream.h"
-#include "gtest/gtest.h"
-
-using namespace clang;
-using namespace ento;
-
-namespace clang {
-namespace ento {
-
-template <class RangeOrSet> static std::string toString(const RangeOrSet &Obj) {
-  std::string ObjRepresentation;
-  llvm::raw_string_ostream SS(ObjRepresentation);
-  Obj.dump(SS);
-  return SS.str();
-}
-LLVM_ATTRIBUTE_UNUSED static std::string toString(const llvm::APSInt &Point) {
-  return toString(Point, 10);
-}
-// We need it here for better fail diagnostics from gtest.
-LLVM_ATTRIBUTE_UNUSED static std::ostream &operator<<(std::ostream &OS,
-                                                      const RangeSet &Set) {
-  return OS << toString(Set);
-}
-
-} // namespace ento
-} // namespace clang
-
-namespace {
-
-template <typename BaseType> class RangeSetTest : public testing::Test {
-public:
-  // Init block
-  std::unique_ptr<ASTUnit> AST = tooling::buildASTFromCode("struct foo;");
-  ASTContext &Context = AST->getASTContext();
-  llvm::BumpPtrAllocator Arena;
-  BasicValueFactory BVF{Context, Arena};
-  RangeSet::Factory F{BVF};
-  // End init block
-
-  using Self = RangeSetTest<BaseType>;
-  using RawRange = std::pair<BaseType, BaseType>;
-  using RawRangeSet = std::initializer_list<RawRange>;
-
-  static constexpr BaseType getMin() {
-    return std::numeric_limits<BaseType>::min();
-  }
-  static constexpr BaseType getMax() {
-    return std::numeric_limits<BaseType>::max();
-  }
-  static constexpr BaseType getMid() {
-    return isSigned() ? 0 : ~(fromInt(-1) / fromInt(2));
-  }
-
-  static constexpr bool isSigned() { return std::is_signed<BaseType>::value; }
-  static constexpr BaseType fromInt(int X) { return static_cast<BaseType>(X); }
-
-  static llvm::APSInt Base;
-  const llvm::APSInt &from(BaseType X) {
-    llvm::APSInt Dummy = Base;
-    Dummy = X;
-    return BVF.getValue(Dummy);
-  }
-
-  Range from(const RawRange &Init) {
-    return Range(from(Init.first), from(Init.second));
-  }
-
-  RangeSet from(const RawRangeSet &Init) {
-    RangeSet RangeSet = F.getEmptySet();
-    for (const auto &Raw : Init) {
-      RangeSet = F.add(RangeSet, from(Raw));
-    }
-    return RangeSet;
-  }
-
-  template <class F, class... RawArgTypes>
-  void wrap(F ActualFunction, RawArgTypes &&... Args) {
-    (this->*ActualFunction)(from(std::forward<RawArgTypes>(Args))...);
-  }
-
-  void checkNegateImpl(RangeSet Original, RangeSet Expected) {
-    RangeSet NegatedFromOriginal = F.negate(Original);
-    EXPECT_EQ(NegatedFromOriginal, Expected);
-    // Negate negated back and check with original.
-    RangeSet NegatedBackward = F.negate(NegatedFromOriginal);
-    EXPECT_EQ(NegatedBackward, Original);
-  }
-
-  void checkNegate(RawRangeSet RawOriginal, RawRangeSet RawExpected) {
-    wrap(&Self::checkNegateImpl, RawOriginal, RawExpected);
-  }
-
-  template <class PointOrSet>
-  void checkIntersectImpl(RangeSet LHS, PointOrSet RHS, RangeSet Expected) {
-    RangeSet Result = F.intersect(LHS, RHS);
-    EXPECT_EQ(Result, Expected)
-        << "while intersecting " << toString(LHS) << " and " << toString(RHS);
-  }
-
-  void checkIntersectRangeImpl(RangeSet LHS, const llvm::APSInt &Lower,
-                               const llvm::APSInt &Upper, RangeSet Expected) {
-    RangeSet Result = F.intersect(LHS, Lower, Upper);
-    EXPECT_EQ(Result, Expected)
-        << "while intersecting " << toString(LHS) << " and [" << toString(Lower)
-        << ", " << toString(Upper) << "]";
-  }
-
-  void checkIntersect(RawRangeSet RawLHS, RawRangeSet RawRHS,
-                      RawRangeSet RawExpected) {
-    wrap(&Self::checkIntersectImpl<RangeSet>, RawLHS, RawRHS, RawExpected);
-  }
-
-  void checkIntersect(RawRangeSet RawLHS, BaseType RawRHS,
-                      RawRangeSet RawExpected) {
-    wrap(&Self::checkIntersectImpl<const llvm::APSInt &>, RawLHS, RawRHS,
-         RawExpected);
-  }
-
-  void checkIntersect(RawRangeSet RawLHS, BaseType RawLower, BaseType RawUpper,
-                      RawRangeSet RawExpected) {
-    wrap(&Self::checkIntersectRangeImpl, RawLHS, RawLower, RawUpper,
-         RawExpected);
-  }
-
-  void checkContainsImpl(RangeSet LHS, const llvm::APSInt &RHS, bool Expected) {
-    bool Result = LHS.contains(RHS);
-    EXPECT_EQ(Result, Expected)
-        << toString(LHS) << (Result ? " contains " : " doesn't contain ")
-        << toString(RHS);
-  }
-
-  void checkContains(RawRangeSet RawLHS, BaseType RawRHS, bool Expected) {
-    checkContainsImpl(from(RawLHS), from(RawRHS), Expected);
-  }
-
-  template <class RHSType>
-  void checkAddImpl(RangeSet LHS, RHSType RHS, RangeSet Expected) {
-    RangeSet Result = F.add(LHS, RHS);
-    EXPECT_EQ(Result, Expected)
-        << "while adding " << toString(LHS) << " and " << toString(RHS);
-  }
-
-  void checkAdd(RawRangeSet RawLHS, RawRange RawRHS, RawRangeSet RawExpected) {
-    wrap(&Self::checkAddImpl<Range>, RawLHS, RawRHS, RawExpected);
-  }
-
-  void checkAdd(RawRangeSet RawLHS, RawRangeSet RawRHS,
-                RawRangeSet RawExpected) {
-    wrap(&Self::checkAddImpl<RangeSet>, RawRHS, RawLHS, RawExpected);
-  }
-
-  void checkAdd(RawRangeSet RawLHS, BaseType RawRHS, RawRangeSet RawExpected) {
-    wrap(&Self::checkAddImpl<const llvm::APSInt &>, RawLHS, RawRHS,
-         RawExpected);
-  }
-
-  void checkDeleteImpl(const llvm::APSInt &Point, RangeSet From,
-                       RangeSet Expected) {
-    RangeSet Result = F.deletePoint(From, Point);
-    EXPECT_EQ(Result, Expected)
-        << "while deleting " << toString(Point) << " from " << toString(From);
-  }
-
-  void checkDelete(BaseType Point, RawRangeSet RawFrom,
-                   RawRangeSet RawExpected) {
-    wrap(&Self::checkDeleteImpl, Point, RawFrom, RawExpected);
-  }
-};
-
-} // namespace
-
-template <typename BaseType>
-llvm::APSInt RangeSetTest<BaseType>::Base{sizeof(BaseType) * 8, !isSigned()};
-
-using IntTypes = ::testing::Types<int8_t, uint8_t, int16_t, uint16_t, int32_t,
-                                  uint32_t, int64_t, uint64_t>;
-TYPED_TEST_SUITE(RangeSetTest, IntTypes, );
-
-TYPED_TEST(RangeSetTest, RangeSetNegateTest) {
-  // Use next values of the range {MIN, A, B, MID, C, D, MAX}.
-
-  constexpr TypeParam MIN = TestFixture::getMin();
-  constexpr TypeParam MAX = TestFixture::getMax();
-  // MID is a value in the middle of the range
-  // which unary minus does not affect on,
-  // e.g. int8/int32(0), uint8(128), uint32(2147483648).
-  constexpr TypeParam MID = TestFixture::getMid();
-  constexpr TypeParam A = MID - TestFixture::fromInt(42 + 42);
-  constexpr TypeParam B = MID - TestFixture::fromInt(42);
-  constexpr TypeParam C = -B;
-  constexpr TypeParam D = -A;
-
-  static_assert(MIN < A && A < B && B < MID && MID < C && C < D && D < MAX,
-                "Values shall be in an ascending order");
-
-  this->checkNegate({{MIN, A}}, {{MIN, MIN}, {D, MAX}});
-  this->checkNegate({{MIN, C}}, {{MIN, MIN}, {B, MAX}});
-  this->checkNegate({{MIN, MID}}, {{MIN, MIN}, {MID, MAX}});
-  this->checkNegate({{MIN, MAX}}, {{MIN, MAX}});
-  this->checkNegate({{A, D}}, {{A, D}});
-  this->checkNegate({{A, B}}, {{C, D}});
-  this->checkNegate({{MIN, A}, {D, MAX}}, {{MIN, A}, {D, MAX}});
-  this->checkNegate({{MIN, B}, {MID, D}}, {{MIN, MIN}, {A, MID}, {C, MAX}});
-  this->checkNegate({{MIN, MID}, {C, D}}, {{MIN, MIN}, {A, B}, {MID, MAX}});
-  this->checkNegate({{MIN, MID}, {C, MAX}}, {{MIN, B}, {MID, MAX}});
-  this->checkNegate({{A, MID}, {D, MAX}}, {{MIN + 1, A}, {MID, D}});
-  this->checkNegate({{A, A}}, {{D, D}});
-  this->checkNegate({{MID, MID}}, {{MID, MID}});
-  this->checkNegate({{MAX, MAX}}, {{MIN + 1, MIN + 1}});
-}
-
-TYPED_TEST(RangeSetTest, RangeSetPointIntersectTest) {
-  // Check that we can correctly intersect empty sets.
-  this->checkIntersect({}, 42, {});
-  // Check that intersection with itself produces the same set.
-  this->checkIntersect({{42, 42}}, 42, {{42, 42}});
-  // Check more general cases.
-  this->checkIntersect({{0, 10}, {20, 30}, {30, 40}, {50, 60}}, 42, {});
-  this->checkIntersect({{0, 10}, {20, 30}, {30, 60}}, 42, {{42, 42}});
-}
-
-TYPED_TEST(RangeSetTest, RangeSetRangeIntersectTest) {
-  constexpr TypeParam MIN = TestFixture::getMin();
-  constexpr TypeParam MAX = TestFixture::getMax();
-
-  // Check that we can correctly intersect empty sets.
-  this->checkIntersect({}, 10, 20, {});
-  this->checkIntersect({}, 20, 10, {});
-  // Check that intersection with itself produces the same set.
-  this->checkIntersect({{10, 20}}, 10, 20, {{10, 20}});
-  this->checkIntersect({{MIN, 10}, {20, MAX}}, 20, 10, {{MIN, 10}, {20, MAX}});
-  // Check non-overlapping range intersections.
-  this->checkIntersect({{10, 20}}, 21, 9, {});
-  this->checkIntersect({{MIN, 9}, {21, MAX}}, 10, 20, {});
-  // Check more general cases.
-  this->checkIntersect({{0, 10}, {20, 30}, {30, 40}, {50, 60}}, 10, 35,
-                       {{10, 10}, {20, 30}, {30, 35}});
-  this->checkIntersect({{0, 10}, {20, 30}, {30, 40}, {50, 60}}, 35, 10,
-                       {{0, 10}, {35, 40}, {50, 60}});
-}
-
-TYPED_TEST(RangeSetTest, RangeSetGenericIntersectTest) {
-  // Check that we can correctly intersect empty sets.
-  this->checkIntersect({}, {}, {});
-  this->checkIntersect({}, {{0, 10}}, {});
-  this->checkIntersect({{0, 10}}, {}, {});
-
-  this->checkIntersect({{0, 10}}, {{4, 6}}, {{4, 6}});
-  this->checkIntersect({{0, 10}}, {{4, 20}}, {{4, 10}});
-  // Check that intersection with points works as expected.
-  this->checkIntersect({{0, 10}}, {{4, 4}}, {{4, 4}});
-  // All ranges are closed, check that intersection with edge points works as
-  // expected.
-  this->checkIntersect({{0, 10}}, {{10, 10}}, {{10, 10}});
-
-  // Let's check that we can skip some intervals and partially intersect
-  // other intervals.
-  this->checkIntersect({{0, 2}, {4, 5}, {6, 9}, {10, 11}, {12, 12}, {13, 15}},
-                       {{8, 14}, {20, 30}},
-                       {{8, 9}, {10, 11}, {12, 12}, {13, 14}});
-  // Check more generic case.
-  this->checkIntersect(
-      {{0, 1}, {2, 3}, {5, 6}, {7, 15}, {25, 30}},
-      {{4, 10}, {11, 11}, {12, 16}, {17, 17}, {19, 20}, {21, 23}, {24, 27}},
-      {{5, 6}, {7, 10}, {11, 11}, {12, 15}, {25, 27}});
-}
-
-TYPED_TEST(RangeSetTest, RangeSetContainsTest) {
-  // Check with an empty set.
-  this->checkContains({}, 10, false);
-  // Check contains with sets of size one:
-  //   * when the whole range is less
-  this->checkContains({{0, 5}}, 10, false);
-  //   * when the whole range is greater
-  this->checkContains({{20, 25}}, 10, false);
-  //   * when the range is just the point we are looking for
-  this->checkContains({{10, 10}}, 10, true);
-  //   * when the range starts with the point
-  this->checkContains({{10, 15}}, 10, true);
-  //   * when the range ends with the point
-  this->checkContains({{5, 10}}, 10, true);
-  //   * when the range has the point somewhere in the middle
-  this->checkContains({{0, 25}}, 10, true);
-  // Check similar cases, but with larger sets.
-  this->checkContains({{0, 5}, {10, 10}, {15, 20}}, 10, true);
-  this->checkContains({{0, 5}, {10, 12}, {15, 20}}, 10, true);
-  this->checkContains({{0, 5}, {5, 7}, {8, 10}, {12, 41}}, 10, true);
-
-  constexpr TypeParam MIN = TestFixture::getMin();
-  constexpr TypeParam MAX = TestFixture::getMax();
-  constexpr TypeParam MID = TestFixture::getMid();
-  this->checkContains({{MIN, MAX}}, 0, true);
-  this->checkContains({{MIN, MAX}}, MID, true);
-  this->checkContains({{MIN, MAX}}, -10, true);
-  this->checkContains({{MIN, MAX}}, 10, true);
-}
-
-TYPED_TEST(RangeSetTest, RangeSetAddTest) {
-  // Check adding single points
-  this->checkAdd({}, 10, {{10, 10}});
-  this->checkAdd({{0, 5}}, 10, {{0, 5}, {10, 10}});
-  this->checkAdd({{0, 5}, {30, 40}}, 10, {{0, 5}, {10, 10}, {30, 40}});
-
-  // Check adding single ranges.
-  this->checkAdd({}, {10, 20}, {{10, 20}});
-  this->checkAdd({{0, 5}}, {10, 20}, {{0, 5}, {10, 20}});
-  this->checkAdd({{0, 5}, {30, 40}}, {10, 20}, {{0, 5}, {10, 20}, {30, 40}});
-
-  // Check adding whole sets of ranges.
-  this->checkAdd({{0, 5}}, {{10, 20}}, {{0, 5}, {10, 20}});
-  // Check that ordering of ranges is as expected.
-  this->checkAdd({{0, 5}, {30, 40}}, {{10, 20}}, {{0, 5}, {10, 20}, {30, 40}});
-  this->checkAdd({{0, 5}, {30, 40}}, {{10, 20}, {50, 60}},
-                 {{0, 5}, {10, 20}, {30, 40}, {50, 60}});
-  this->checkAdd({{10, 20}, {50, 60}}, {{0, 5}, {30, 40}, {70, 80}},
-                 {{0, 5}, {10, 20}, {30, 40}, {50, 60}, {70, 80}});
-}
-
-TYPED_TEST(RangeSetTest, RangeSetDeletePointTest) {
-  constexpr TypeParam MIN = TestFixture::getMin();
-  constexpr TypeParam MAX = TestFixture::getMax();
-  constexpr TypeParam MID = TestFixture::getMid();
-
-  this->checkDelete(MID, {{MIN, MAX}}, {{MIN, MID - 1}, {MID + 1, MAX}});
-  // Check that delete works with an empty set.
-  this->checkDelete(10, {}, {});
-  // Check that delete can remove entire ranges.
-  this->checkDelete(10, {{10, 10}}, {});
-  this->checkDelete(10, {{0, 5}, {10, 10}, {20, 30}}, {{0, 5}, {20, 30}});
-  // Check that delete can split existing ranges into two.
-  this->checkDelete(10, {{0, 5}, {7, 15}, {20, 30}},
-                    {{0, 5}, {7, 9}, {11, 15}, {20, 30}});
-  // Check that delete of the point not from the range set works as expected.
-  this->checkDelete(10, {{0, 5}, {20, 30}}, {{0, 5}, {20, 30}});
-}
diff --git a/gnu/llvm/clang/unittests/StaticAnalyzer/RegisterCustomCheckersTest.cpp b/gnu/llvm/clang/unittests/StaticAnalyzer/RegisterCustomCheckersTest.cpp
deleted file mode 100644
index 60b8aafa0d8..00000000000
--- a/gnu/llvm/clang/unittests/StaticAnalyzer/RegisterCustomCheckersTest.cpp
+++ /dev/null
@@ -1,461 +0,0 @@
-//===- unittests/StaticAnalyzer/RegisterCustomCheckersTest.cpp ------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "CheckerRegistration.h"
-#include "clang/Frontend/CompilerInstance.h"
-#include "clang/StaticAnalyzer/Core/BugReporter/BugReporter.h"
-#include "clang/StaticAnalyzer/Core/BugReporter/BugType.h"
-#include "clang/StaticAnalyzer/Core/Checker.h"
-#include "clang/StaticAnalyzer/Core/CheckerRegistryData.h"
-#include "clang/StaticAnalyzer/Core/PathSensitive/AnalysisManager.h"
-#include "clang/StaticAnalyzer/Core/PathSensitive/CheckerContext.h"
-#include "clang/StaticAnalyzer/Frontend/AnalysisConsumer.h"
-#include "clang/StaticAnalyzer/Frontend/CheckerRegistry.h"
-#include "clang/Tooling/Tooling.h"
-#include "llvm/Support/raw_ostream.h"
-#include "gtest/gtest.h"
-#include <memory>
-
-namespace clang {
-namespace ento {
-namespace {
-
-//===----------------------------------------------------------------------===//
-// Just a minimal test for how checker registration works with statically
-// linked, non TableGen generated checkers.
-//===----------------------------------------------------------------------===//
-
-class CustomChecker : public Checker<check::ASTCodeBody> {
-public:
-  void checkASTCodeBody(const Decl *D, AnalysisManager &Mgr,
-                        BugReporter &BR) const {
-    BR.EmitBasicReport(D, this, "Custom diagnostic", categories::LogicError,
-                       "Custom diagnostic description",
-                       PathDiagnosticLocation(D, Mgr.getSourceManager()), {});
-  }
-};
-
-void addCustomChecker(AnalysisASTConsumer &AnalysisConsumer,
-                      AnalyzerOptions &AnOpts) {
-  AnOpts.CheckersAndPackages = {{"test.CustomChecker", true}};
-  AnalysisConsumer.AddCheckerRegistrationFn([](CheckerRegistry &Registry) {
-    Registry.addChecker<CustomChecker>("test.CustomChecker", "Description", "");
-  });
-}
-
-TEST(RegisterCustomCheckers, RegisterChecker) {
-  std::string Diags;
-  EXPECT_TRUE(runCheckerOnCode<addCustomChecker>("void f() {;}", Diags));
-  EXPECT_EQ(Diags, "test.CustomChecker:Custom diagnostic description\n");
-}
-
-//===----------------------------------------------------------------------===//
-// Pretty much the same.
-//===----------------------------------------------------------------------===//
-
-class LocIncDecChecker : public Checker<check::Location> {
-public:
-  void checkLocation(SVal Loc, bool IsLoad, const Stmt *S,
-                     CheckerContext &C) const {
-    const auto *UnaryOp = dyn_cast<UnaryOperator>(S);
-    if (UnaryOp && !IsLoad) {
-      EXPECT_FALSE(UnaryOp->isIncrementOp());
-    }
-  }
-};
-
-void addLocIncDecChecker(AnalysisASTConsumer &AnalysisConsumer,
-                         AnalyzerOptions &AnOpts) {
-  AnOpts.CheckersAndPackages = {{"test.LocIncDecChecker", true}};
-  AnalysisConsumer.AddCheckerRegistrationFn([](CheckerRegistry &Registry) {
-    Registry.addChecker<CustomChecker>("test.LocIncDecChecker", "Description",
-                                       "");
-  });
-}
-
-TEST(RegisterCustomCheckers, CheckLocationIncDec) {
-  EXPECT_TRUE(
-      runCheckerOnCode<addLocIncDecChecker>("void f() { int *p; (*p)++; }"));
-}
-
-//===----------------------------------------------------------------------===//
-// Unsatisfied checker dependency
-//===----------------------------------------------------------------------===//
-
-class CheckerRegistrationOrderPrinter
-    : public Checker<check::PreStmt<DeclStmt>> {
-  std::unique_ptr<BuiltinBug> BT =
-      std::make_unique<BuiltinBug>(this, "Registration order");
-
-public:
-  void checkPreStmt(const DeclStmt *DS, CheckerContext &C) const {
-    ExplodedNode *N = nullptr;
-    N = C.generateErrorNode();
-    llvm::SmallString<200> Buf;
-    llvm::raw_svector_ostream OS(Buf);
-    C.getAnalysisManager()
-        .getCheckerManager()
-        ->getCheckerRegistryData()
-        .printEnabledCheckerList(OS);
-    // Strip a newline off.
-    auto R =
-        std::make_unique<PathSensitiveBugReport>(*BT, OS.str().drop_back(1), N);
-    C.emitReport(std::move(R));
-  }
-};
-
-void registerCheckerRegistrationOrderPrinter(CheckerManager &mgr) {
-  mgr.registerChecker<CheckerRegistrationOrderPrinter>();
-}
-
-bool shouldRegisterCheckerRegistrationOrderPrinter(const CheckerManager &mgr) {
-  return true;
-}
-
-void addCheckerRegistrationOrderPrinter(CheckerRegistry &Registry) {
-  Registry.addChecker(registerCheckerRegistrationOrderPrinter,
-                      shouldRegisterCheckerRegistrationOrderPrinter,
-                      "test.RegistrationOrder", "Description", "", false);
-}
-
-#define UNITTEST_CHECKER(CHECKER_NAME, DIAG_MSG)                               \
-  class CHECKER_NAME : public Checker<check::PreStmt<DeclStmt>> {              \
-    std::unique_ptr<BuiltinBug> BT =                                           \
-        std::make_unique<BuiltinBug>(this, DIAG_MSG);                          \
-                                                                               \
-  public:                                                                      \
-    void checkPreStmt(const DeclStmt *DS, CheckerContext &C) const {}          \
-  };                                                                           \
-                                                                               \
-  void register##CHECKER_NAME(CheckerManager &mgr) {                           \
-    mgr.registerChecker<CHECKER_NAME>();                                       \
-  }                                                                            \
-                                                                               \
-  bool shouldRegister##CHECKER_NAME(const CheckerManager &mgr) {               \
-    return true;                                                               \
-  }                                                                            \
-  void add##CHECKER_NAME(CheckerRegistry &Registry) {                          \
-    Registry.addChecker(register##CHECKER_NAME, shouldRegister##CHECKER_NAME,  \
-                        "test." #CHECKER_NAME, "Description", "", false);      \
-  }
-
-UNITTEST_CHECKER(StrongDep, "Strong")
-UNITTEST_CHECKER(Dep, "Dep")
-
-bool shouldRegisterStrongFALSE(const CheckerManager &mgr) {
-  return false;
-}
-
-
-void addDep(AnalysisASTConsumer &AnalysisConsumer,
-                  AnalyzerOptions &AnOpts) {
-  AnOpts.CheckersAndPackages = {{"test.Dep", true},
-                                {"test.RegistrationOrder", true}};
-  AnalysisConsumer.AddCheckerRegistrationFn([](CheckerRegistry &Registry) {
-    Registry.addChecker(registerStrongDep, shouldRegisterStrongFALSE,
-                        "test.Strong", "Description", "", false);
-    addStrongDep(Registry);
-    addDep(Registry);
-    addCheckerRegistrationOrderPrinter(Registry);
-    Registry.addDependency("test.Dep", "test.Strong");
-  });
-}
-
-TEST(RegisterDeps, UnsatisfiedDependency) {
-  std::string Diags;
-  EXPECT_TRUE(runCheckerOnCode<addDep>("void f() {int i;}", Diags));
-  EXPECT_EQ(Diags, "test.RegistrationOrder:test.RegistrationOrder\n");
-}
-
-//===----------------------------------------------------------------------===//
-// Weak checker dependencies.
-//===----------------------------------------------------------------------===//
-
-UNITTEST_CHECKER(WeakDep, "Weak")
-
-void addWeakDepCheckerBothEnabled(AnalysisASTConsumer &AnalysisConsumer,
-                                  AnalyzerOptions &AnOpts) {
-  AnOpts.CheckersAndPackages = {{"test.Dep", true},
-                                {"test.WeakDep", true},
-                                {"test.RegistrationOrder", true}};
-  AnalysisConsumer.AddCheckerRegistrationFn([=](CheckerRegistry &Registry) {
-    addWeakDep(Registry);
-    addDep(Registry);
-    addCheckerRegistrationOrderPrinter(Registry);
-    Registry.addWeakDependency("test.Dep", "test.WeakDep");
-  });
-}
-
-void addWeakDepCheckerBothEnabledSwitched(AnalysisASTConsumer &AnalysisConsumer,
-                                          AnalyzerOptions &AnOpts) {
-  AnOpts.CheckersAndPackages = {{"test.Dep", true},
-                                {"test.WeakDep", true},
-                                {"test.RegistrationOrder", true}};
-  AnalysisConsumer.AddCheckerRegistrationFn([=](CheckerRegistry &Registry) {
-    addWeakDep(Registry);
-    addDep(Registry);
-    addCheckerRegistrationOrderPrinter(Registry);
-    Registry.addWeakDependency("test.WeakDep", "test.Dep");
-  });
-}
-
-void addWeakDepCheckerDepDisabled(AnalysisASTConsumer &AnalysisConsumer,
-                                  AnalyzerOptions &AnOpts) {
-  AnOpts.CheckersAndPackages = {{"test.Dep", true},
-                                {"test.WeakDep", false},
-                                {"test.RegistrationOrder", true}};
-  AnalysisConsumer.AddCheckerRegistrationFn([=](CheckerRegistry &Registry) {
-    addWeakDep(Registry);
-    addDep(Registry);
-    addCheckerRegistrationOrderPrinter(Registry);
-    Registry.addWeakDependency("test.Dep", "test.WeakDep");
-  });
-}
-
-void addWeakDepCheckerDepUnspecified(AnalysisASTConsumer &AnalysisConsumer,
-                                     AnalyzerOptions &AnOpts) {
-  AnOpts.CheckersAndPackages = {{"test.Dep", true},
-                                {"test.RegistrationOrder", true}};
-  AnalysisConsumer.AddCheckerRegistrationFn([=](CheckerRegistry &Registry) {
-    addWeakDep(Registry);
-    addDep(Registry);
-    addCheckerRegistrationOrderPrinter(Registry);
-    Registry.addWeakDependency("test.Dep", "test.WeakDep");
-  });
-}
-
-UNITTEST_CHECKER(WeakDep2, "Weak2")
-UNITTEST_CHECKER(Dep2, "Dep2")
-
-void addWeakDepHasWeakDep(AnalysisASTConsumer &AnalysisConsumer,
-                          AnalyzerOptions &AnOpts) {
-  AnOpts.CheckersAndPackages = {{"test.Dep", true},
-                                {"test.WeakDep", true},
-                                {"test.WeakDep2", true},
-                                {"test.RegistrationOrder", true}};
-  AnalysisConsumer.AddCheckerRegistrationFn([=](CheckerRegistry &Registry) {
-    addStrongDep(Registry);
-    addWeakDep(Registry);
-    addWeakDep2(Registry);
-    addDep(Registry);
-    addDep2(Registry);
-    addCheckerRegistrationOrderPrinter(Registry);
-    Registry.addWeakDependency("test.Dep", "test.WeakDep");
-    Registry.addWeakDependency("test.WeakDep", "test.WeakDep2");
-  });
-}
-
-void addWeakDepTransitivity(AnalysisASTConsumer &AnalysisConsumer,
-                            AnalyzerOptions &AnOpts) {
-  AnOpts.CheckersAndPackages = {{"test.Dep", true},
-                                {"test.WeakDep", false},
-                                {"test.WeakDep2", true},
-                                {"test.RegistrationOrder", true}};
-  AnalysisConsumer.AddCheckerRegistrationFn([=](CheckerRegistry &Registry) {
-    addStrongDep(Registry);
-    addWeakDep(Registry);
-    addWeakDep2(Registry);
-    addDep(Registry);
-    addDep2(Registry);
-    addCheckerRegistrationOrderPrinter(Registry);
-    Registry.addWeakDependency("test.Dep", "test.WeakDep");
-    Registry.addWeakDependency("test.WeakDep", "test.WeakDep2");
-  });
-}
-
-TEST(RegisterDeps, SimpleWeakDependency) {
-  std::string Diags;
-  EXPECT_TRUE(runCheckerOnCode<addWeakDepCheckerBothEnabled>(
-      "void f() {int i;}", Diags));
-  EXPECT_EQ(Diags, "test.RegistrationOrder:test.WeakDep\ntest."
-                   "Dep\ntest.RegistrationOrder\n");
-  Diags.clear();
-
-  // Mind that AnalyzerOption listed the enabled checker list in the same order,
-  // but the dependencies are switched.
-  EXPECT_TRUE(runCheckerOnCode<addWeakDepCheckerBothEnabledSwitched>(
-      "void f() {int i;}", Diags));
-  EXPECT_EQ(Diags, "test.RegistrationOrder:test.Dep\ntest."
-                   "RegistrationOrder\ntest.WeakDep\n");
-  Diags.clear();
-
-  // Weak dependencies dont prevent dependent checkers from being enabled.
-  EXPECT_TRUE(runCheckerOnCode<addWeakDepCheckerDepDisabled>(
-      "void f() {int i;}", Diags));
-  EXPECT_EQ(Diags, "test.RegistrationOrder:test.Dep\ntest.RegistrationOrder\n");
-  Diags.clear();
-
-  // Nor will they be enabled just because a dependent checker is.
-  EXPECT_TRUE(runCheckerOnCode<addWeakDepCheckerDepUnspecified>(
-      "void f() {int i;}", Diags));
-  EXPECT_EQ(Diags, "test.RegistrationOrder:test.Dep\ntest.RegistrationOrder\n");
-  Diags.clear();
-
-  EXPECT_TRUE(
-      runCheckerOnCode<addWeakDepTransitivity>("void f() {int i;}", Diags));
-  EXPECT_EQ(Diags, "test.RegistrationOrder:test.WeakDep2\ntest."
-                   "Dep\ntest.RegistrationOrder\n");
-  Diags.clear();
-
-  EXPECT_TRUE(
-      runCheckerOnCode<addWeakDepHasWeakDep>("void f() {int i;}", Diags));
-  EXPECT_EQ(Diags, "test.RegistrationOrder:test.WeakDep2\ntest."
-                   "WeakDep\ntest.Dep\ntest.RegistrationOrder\n");
-  Diags.clear();
-}
-
-//===----------------------------------------------------------------------===//
-// Interaction of weak and regular checker dependencies.
-//===----------------------------------------------------------------------===//
-
-void addWeakDepHasStrongDep(AnalysisASTConsumer &AnalysisConsumer,
-                            AnalyzerOptions &AnOpts) {
-  AnOpts.CheckersAndPackages = {{"test.Dep", true},
-                                {"test.StrongDep", true},
-                                {"test.WeakDep", true},
-                                {"test.RegistrationOrder", true}};
-  AnalysisConsumer.AddCheckerRegistrationFn([=](CheckerRegistry &Registry) {
-    addStrongDep(Registry);
-    addWeakDep(Registry);
-    addDep(Registry);
-    addCheckerRegistrationOrderPrinter(Registry);
-    Registry.addDependency("test.WeakDep", "test.StrongDep");
-    Registry.addWeakDependency("test.Dep", "test.WeakDep");
-  });
-}
-
-void addWeakDepAndStrongDep(AnalysisASTConsumer &AnalysisConsumer,
-                            AnalyzerOptions &AnOpts) {
-  AnOpts.CheckersAndPackages = {{"test.Dep", true},
-                                {"test.StrongDep", true},
-                                {"test.WeakDep", true},
-                                {"test.RegistrationOrder", true}};
-  AnalysisConsumer.AddCheckerRegistrationFn([=](CheckerRegistry &Registry) {
-    addStrongDep(Registry);
-    addWeakDep(Registry);
-    addDep(Registry);
-    addCheckerRegistrationOrderPrinter(Registry);
-    Registry.addDependency("test.Dep", "test.StrongDep");
-    Registry.addWeakDependency("test.Dep", "test.WeakDep");
-  });
-}
-
-void addDisabledWeakDepHasStrongDep(AnalysisASTConsumer &AnalysisConsumer,
-                                    AnalyzerOptions &AnOpts) {
-  AnOpts.CheckersAndPackages = {{"test.Dep", true},
-                                {"test.StrongDep", true},
-                                {"test.WeakDep", false},
-                                {"test.RegistrationOrder", true}};
-  AnalysisConsumer.AddCheckerRegistrationFn([=](CheckerRegistry &Registry) {
-    addStrongDep(Registry);
-    addWeakDep(Registry);
-    addDep(Registry);
-    addCheckerRegistrationOrderPrinter(Registry);
-    Registry.addDependency("test.WeakDep", "test.StrongDep");
-    Registry.addWeakDependency("test.Dep", "test.WeakDep");
-  });
-}
-
-void addDisabledWeakDepHasUnspecifiedStrongDep(
-    AnalysisASTConsumer &AnalysisConsumer, AnalyzerOptions &AnOpts) {
-  AnOpts.CheckersAndPackages = {{"test.Dep", true},
-                                {"test.WeakDep", false},
-                                {"test.RegistrationOrder", true}};
-  AnalysisConsumer.AddCheckerRegistrationFn([=](CheckerRegistry &Registry) {
-    addStrongDep(Registry);
-    addWeakDep(Registry);
-    addDep(Registry);
-    addCheckerRegistrationOrderPrinter(Registry);
-    Registry.addDependency("test.WeakDep", "test.StrongDep");
-    Registry.addWeakDependency("test.Dep", "test.WeakDep");
-  });
-}
-
-void addWeakDepHasDisabledStrongDep(AnalysisASTConsumer &AnalysisConsumer,
-                                    AnalyzerOptions &AnOpts) {
-  AnOpts.CheckersAndPackages = {{"test.Dep", true},
-                                {"test.StrongDep", false},
-                                {"test.WeakDep", true},
-                                {"test.RegistrationOrder", true}};
-  AnalysisConsumer.AddCheckerRegistrationFn([=](CheckerRegistry &Registry) {
-    addStrongDep(Registry);
-    addWeakDep(Registry);
-    addDep(Registry);
-    addCheckerRegistrationOrderPrinter(Registry);
-    Registry.addDependency("test.WeakDep", "test.StrongDep");
-    Registry.addWeakDependency("test.Dep", "test.WeakDep");
-  });
-}
-
-void addWeakDepHasUnspecifiedButLaterEnabledStrongDep(
-    AnalysisASTConsumer &AnalysisConsumer, AnalyzerOptions &AnOpts) {
-  AnOpts.CheckersAndPackages = {{"test.Dep", true},
-                                {"test.Dep2", true},
-                                {"test.WeakDep", true},
-                                {"test.RegistrationOrder", true}};
-  AnalysisConsumer.AddCheckerRegistrationFn([=](CheckerRegistry &Registry) {
-    addStrongDep(Registry);
-    addWeakDep(Registry);
-    addDep(Registry);
-    addDep2(Registry);
-    addCheckerRegistrationOrderPrinter(Registry);
-    Registry.addDependency("test.WeakDep", "test.StrongDep");
-    Registry.addDependency("test.Dep2", "test.StrongDep");
-    Registry.addWeakDependency("test.Dep", "test.WeakDep");
-  });
-}
-
-TEST(RegisterDeps, DependencyInteraction) {
-  std::string Diags;
-  EXPECT_TRUE(
-      runCheckerOnCode<addWeakDepHasStrongDep>("void f() {int i;}", Diags));
-  EXPECT_EQ(Diags, "test.RegistrationOrder:test.StrongDep\ntest."
-                   "WeakDep\ntest.Dep\ntest.RegistrationOrder\n");
-  Diags.clear();
-
-  // Weak dependencies are registered before strong dependencies. This is most
-  // important for purely diagnostic checkers that are implemented as a part of
-  // purely modeling checkers, becuse the checker callback order will have to be
-  // established in between the modeling portion and the weak dependency.
-  EXPECT_TRUE(
-      runCheckerOnCode<addWeakDepAndStrongDep>("void f() {int i;}", Diags));
-  EXPECT_EQ(Diags, "test.RegistrationOrder:test.WeakDep\ntest."
-                   "StrongDep\ntest.Dep\ntest.RegistrationOrder\n");
-  Diags.clear();
-
-  // If a weak dependency is disabled, the checker itself can still be enabled.
-  EXPECT_TRUE(runCheckerOnCode<addDisabledWeakDepHasStrongDep>(
-      "void f() {int i;}", Diags));
-  EXPECT_EQ(Diags, "test.RegistrationOrder:test.Dep\ntest."
-                   "RegistrationOrder\ntest.StrongDep\n");
-  Diags.clear();
-
-  // If a weak dependency is disabled, the checker itself can still be enabled,
-  // but it shouldn't enable a strong unspecified dependency.
-  EXPECT_TRUE(runCheckerOnCode<addDisabledWeakDepHasUnspecifiedStrongDep>(
-      "void f() {int i;}", Diags));
-  EXPECT_EQ(Diags, "test.RegistrationOrder:test.Dep\ntest.RegistrationOrder\n");
-  Diags.clear();
-
-  // A strong dependency of a weak dependency is disabled, so neither of them
-  // should be enabled.
-  EXPECT_TRUE(runCheckerOnCode<addWeakDepHasDisabledStrongDep>(
-      "void f() {int i;}", Diags));
-  EXPECT_EQ(Diags, "test.RegistrationOrder:test.Dep\ntest.RegistrationOrder\n");
-  Diags.clear();
-
-  EXPECT_TRUE(
-      runCheckerOnCode<addWeakDepHasUnspecifiedButLaterEnabledStrongDep>(
-          "void f() {int i;}", Diags));
-  EXPECT_EQ(Diags, "test.RegistrationOrder:test.StrongDep\ntest.WeakDep\ntest."
-                   "Dep\ntest.Dep2\ntest.RegistrationOrder\n");
-  Diags.clear();
-}
-} // namespace
-} // namespace ento
-} // namespace clang
diff --git a/gnu/llvm/clang/unittests/StaticAnalyzer/Reusables.h b/gnu/llvm/clang/unittests/StaticAnalyzer/Reusables.h
deleted file mode 100644
index 609983e783f..00000000000
--- a/gnu/llvm/clang/unittests/StaticAnalyzer/Reusables.h
+++ /dev/null
@@ -1,155 +0,0 @@
-//===- unittests/StaticAnalyzer/Reusables.h -------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_CLANG_UNITTESTS_STATICANALYZER_REUSABLES_H
-#define LLVM_CLANG_UNITTESTS_STATICANALYZER_REUSABLES_H
-
-#include "clang/ASTMatchers/ASTMatchFinder.h"
-#include "clang/CrossTU/CrossTranslationUnit.h"
-#include "clang/Frontend/CompilerInstance.h"
-#include "clang/StaticAnalyzer/Core/PathSensitive/ExprEngine.h"
-#include "gtest/gtest.h"
-
-namespace clang {
-namespace ento {
-
-// Find a node in the current AST that matches a matcher.
-template <typename T, typename MatcherT>
-const T *findNode(const Decl *Where, MatcherT What) {
-  using namespace ast_matchers;
-  auto Matches = match(decl(hasDescendant(What.bind("root"))),
-                       *Where, Where->getASTContext());
-  assert(Matches.size() <= 1 && "Ambiguous match!");
-  assert(Matches.size() >= 1 && "Match not found!");
-  const T *Node = selectFirst<T>("root", Matches);
-  assert(Node && "Type mismatch!");
-  return Node;
-}
-
-// Find a declaration in the current AST by name.
-template <typename T>
-const T *findDeclByName(const Decl *Where, StringRef Name) {
-  using namespace ast_matchers;
-  return findNode<T>(Where, namedDecl(hasName(Name)));
-}
-
-// A re-usable consumer that constructs ExprEngine out of CompilerInvocation.
-class ExprEngineConsumer : public ASTConsumer {
-protected:
-  CompilerInstance &C;
-
-private:
-  // We need to construct all of these in order to construct ExprEngine.
-  CheckerManager ChkMgr;
-  cross_tu::CrossTranslationUnitContext CTU;
-  PathDiagnosticConsumers Consumers;
-  AnalysisManager AMgr;
-  SetOfConstDecls VisitedCallees;
-  FunctionSummariesTy FS;
-
-protected:
-  ExprEngine Eng;
-
-public:
-  ExprEngineConsumer(CompilerInstance &C)
-      : C(C),
-        ChkMgr(C.getASTContext(), *C.getAnalyzerOpts(), C.getPreprocessor()),
-        CTU(C), Consumers(),
-        AMgr(C.getASTContext(), C.getPreprocessor(), Consumers,
-             CreateRegionStoreManager, CreateRangeConstraintManager, &ChkMgr,
-             *C.getAnalyzerOpts()),
-        VisitedCallees(), FS(),
-        Eng(CTU, AMgr, &VisitedCallees, &FS, ExprEngine::Inline_Regular) {}
-};
-
-struct ExpectedLocationTy {
-  unsigned Line;
-  unsigned Column;
-
-  void testEquality(SourceLocation L, SourceManager &SM) const {
-    EXPECT_EQ(SM.getSpellingLineNumber(L), Line);
-    EXPECT_EQ(SM.getSpellingColumnNumber(L), Column);
-  }
-};
-
-struct ExpectedRangeTy {
-  ExpectedLocationTy Begin;
-  ExpectedLocationTy End;
-
-  void testEquality(SourceRange R, SourceManager &SM) const {
-    Begin.testEquality(R.getBegin(), SM);
-    End.testEquality(R.getEnd(), SM);
-  }
-};
-
-struct ExpectedPieceTy {
-  ExpectedLocationTy Loc;
-  std::string Text;
-  std::vector<ExpectedRangeTy> Ranges;
-
-  void testEquality(const PathDiagnosticPiece &Piece, SourceManager &SM) {
-    Loc.testEquality(Piece.getLocation().asLocation(), SM);
-    EXPECT_EQ(Piece.getString(), Text);
-    EXPECT_EQ(Ranges.size(), Piece.getRanges().size());
-    for (const auto &RangeItem : llvm::enumerate(Piece.getRanges()))
-      Ranges[RangeItem.index()].testEquality(RangeItem.value(), SM);
-  }
-};
-
-struct ExpectedDiagTy {
-  ExpectedLocationTy Loc;
-  std::string VerboseDescription;
-  std::string ShortDescription;
-  std::string CheckerName;
-  std::string BugType;
-  std::string Category;
-  std::vector<ExpectedPieceTy> Path;
-
-  void testEquality(const PathDiagnostic &Diag, SourceManager &SM) {
-    Loc.testEquality(Diag.getLocation().asLocation(), SM);
-    EXPECT_EQ(Diag.getVerboseDescription(), VerboseDescription);
-    EXPECT_EQ(Diag.getShortDescription(), ShortDescription);
-    EXPECT_EQ(Diag.getCheckerName(), CheckerName);
-    EXPECT_EQ(Diag.getBugType(), BugType);
-    EXPECT_EQ(Diag.getCategory(), Category);
-
-    EXPECT_EQ(Path.size(), Diag.path.size());
-    for (const auto &PieceItem : llvm::enumerate(Diag.path)) {
-      if (PieceItem.index() < Path.size())
-        Path[PieceItem.index()].testEquality(*PieceItem.value(), SM);
-    }
-  }
-};
-
-using ExpectedDiagsTy = std::vector<ExpectedDiagTy>;
-
-// A consumer to verify the generated diagnostics.
-class VerifyPathDiagnosticConsumer : public PathDiagnosticConsumer {
-  ExpectedDiagsTy ExpectedDiags;
-  SourceManager &SM;
-
-public:
-  VerifyPathDiagnosticConsumer(ExpectedDiagsTy &&ExpectedDiags,
-                               SourceManager &SM)
-      : ExpectedDiags(ExpectedDiags), SM(SM) {}
-
-  StringRef getName() const override { return "verify test diagnostics"; }
-
-  void FlushDiagnosticsImpl(std::vector<const PathDiagnostic *> &Diags,
-                            FilesMade *filesMade) override {
-    EXPECT_EQ(Diags.size(), ExpectedDiags.size());
-    for (const auto &Item : llvm::enumerate(Diags))
-      if (Item.index() < ExpectedDiags.size())
-        ExpectedDiags[Item.index()].testEquality(*Item.value(), SM);
-  }
-};
-
-} // namespace ento
-} // namespace clang
-
-#endif
diff --git a/gnu/llvm/clang/unittests/StaticAnalyzer/SValTest.cpp b/gnu/llvm/clang/unittests/StaticAnalyzer/SValTest.cpp
deleted file mode 100644
index ea10d69d280..00000000000
--- a/gnu/llvm/clang/unittests/StaticAnalyzer/SValTest.cpp
+++ /dev/null
@@ -1,366 +0,0 @@
-//===- unittests/StaticAnalyzer/SvalTest.cpp ------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "CheckerRegistration.h"
-
-#include "clang/AST/ASTContext.h"
-#include "clang/AST/Decl.h"
-#include "clang/AST/DeclGroup.h"
-#include "clang/AST/RecursiveASTVisitor.h"
-#include "clang/AST/Stmt.h"
-#include "clang/AST/Type.h"
-#include "clang/StaticAnalyzer/Core/Checker.h"
-#include "clang/StaticAnalyzer/Core/CheckerManager.h"
-#include "clang/StaticAnalyzer/Core/PathSensitive/ExprEngine.h"
-#include "clang/StaticAnalyzer/Core/PathSensitive/MemRegion.h"
-#include "clang/StaticAnalyzer/Core/PathSensitive/SVals.h"
-#include "clang/StaticAnalyzer/Frontend/AnalysisConsumer.h"
-#include "clang/StaticAnalyzer/Frontend/CheckerRegistry.h"
-#include "clang/Tooling/Tooling.h"
-#include "llvm/ADT/STLExtras.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/Support/Casting.h"
-#include "llvm/Support/raw_ostream.h"
-#include "gtest/gtest.h"
-
-namespace clang {
-
-// getType() tests include whole bunch of type comparisons,
-// so when something is wrong, it's good to have gtest telling us
-// what are those types.
-LLVM_ATTRIBUTE_UNUSED std::ostream &operator<<(std::ostream &OS,
-                                               const QualType &T) {
-  return OS << T.getAsString();
-}
-
-LLVM_ATTRIBUTE_UNUSED std::ostream &operator<<(std::ostream &OS,
-                                               const CanQualType &T) {
-  return OS << QualType{T};
-}
-
-namespace ento {
-namespace {
-
-//===----------------------------------------------------------------------===//
-//                       Testing framework implementation
-//===----------------------------------------------------------------------===//
-
-/// A simple map from variable names to symbolic values used to init them.
-using SVals = llvm::StringMap<SVal>;
-
-/// SValCollector is the barebone of all tests.
-///
-/// It is implemented as a checker and reacts to binds, so we find
-/// symbolic values of interest, and to end analysis, where we actually
-/// can test whatever we gathered.
-class SValCollector : public Checker<check::Bind, check::EndAnalysis> {
-public:
-  void checkBind(SVal Loc, SVal Val, const Stmt *S, CheckerContext &C) const {
-    // Skip instantly if we finished testing.
-    // Also, we care only for binds happening in variable initializations.
-    if (Tested || !isa<DeclStmt>(S))
-      return;
-
-    if (const auto *VR = llvm::dyn_cast_or_null<VarRegion>(Loc.getAsRegion())) {
-      CollectedSVals[VR->getDescriptiveName(false)] = Val;
-    }
-  }
-
-  void checkEndAnalysis(ExplodedGraph &G, BugReporter &B,
-                        ExprEngine &Engine) const {
-    if (!Tested) {
-      test(Engine, Engine.getContext());
-      Tested = true;
-      CollectedSVals.clear();
-    }
-  }
-
-  /// Helper function for tests to access bound symbolic values.
-  SVal getByName(StringRef Name) const { return CollectedSVals[Name]; }
-
-private:
-  /// Entry point for tests.
-  virtual void test(ExprEngine &Engine, const ASTContext &Context) const = 0;
-
-  mutable bool Tested = false;
-  mutable SVals CollectedSVals;
-};
-
-// SVAL_TEST is a combined way of providing a short code snippet and
-// to test some programmatic predicates on symbolic values produced by the
-// engine for the actual code.
-//
-// Each test has a NAME.  One can think of it as a name for normal gtests.
-//
-// Each test should provide a CODE snippet.  Code snippets might contain any
-// valid C/C++, but have ONLY ONE defined function.  There are no requirements
-// about function's name or parameters.  It can even be a class method.  The
-// body of the function must contain a set of variable declarations.  Each
-// variable declaration gets bound to a symbolic value, so for the following
-// example:
-//
-//     int x = <expr>;
-//
-// `x` will be bound to whatever symbolic value the engine produced for <expr>.
-// LIVENESS and REASSIGNMENTS don't affect this binding.
-//
-// During the test the actual values can be accessed via `getByName` function,
-// and, for the `x`-bound value, one must use "x" as its name.
-//
-// Example:
-// SVAL_TEST(SimpleSValTest, R"(
-// void foo() {
-//   int x = 42;
-// })") {
-//   SVal X = getByName("x");
-//   EXPECT_TRUE(X.isConstant(42));
-// }
-#define SVAL_TEST(NAME, CODE)                                                  \
-  class NAME##SValCollector final : public SValCollector {                     \
-  public:                                                                      \
-    void test(ExprEngine &Engine, const ASTContext &Context) const override;   \
-  };                                                                           \
-                                                                               \
-  void add##NAME##SValCollector(AnalysisASTConsumer &AnalysisConsumer,         \
-                                AnalyzerOptions &AnOpts) {                     \
-    AnOpts.CheckersAndPackages = {{"test.##NAME##SValCollector", true}};       \
-    AnalysisConsumer.AddCheckerRegistrationFn([](CheckerRegistry &Registry) {  \
-      Registry.addChecker<NAME##SValCollector>("test.##NAME##SValCollector",   \
-                                               "Description", "");             \
-    });                                                                        \
-  }                                                                            \
-                                                                               \
-  TEST(SValTest, NAME) { runCheckerOnCode<add##NAME##SValCollector>(CODE); }   \
-  void NAME##SValCollector::test(ExprEngine &Engine,                           \
-                                 const ASTContext &Context) const
-
-//===----------------------------------------------------------------------===//
-//                                 Actual tests
-//===----------------------------------------------------------------------===//
-
-SVAL_TEST(GetConstType, R"(
-void foo() {
-  int x = 42;
-  int *y = nullptr;
-})") {
-  SVal X = getByName("x");
-  ASSERT_FALSE(X.getType(Context).isNull());
-  EXPECT_EQ(Context.IntTy, X.getType(Context));
-
-  SVal Y = getByName("y");
-  ASSERT_FALSE(Y.getType(Context).isNull());
-  EXPECT_EQ(Context.getUIntPtrType(), Y.getType(Context));
-}
-
-SVAL_TEST(GetLocAsIntType, R"(
-void foo(int *x) {
-  long int a = (long int)x;
-  unsigned b = (long unsigned)&a;
-  int c = (long int)nullptr;
-})") {
-  SVal A = getByName("a");
-  ASSERT_FALSE(A.getType(Context).isNull());
-  // TODO: Turn it into signed long
-  EXPECT_EQ(Context.getUIntPtrType(), A.getType(Context));
-
-  SVal B = getByName("b");
-  ASSERT_FALSE(B.getType(Context).isNull());
-  EXPECT_EQ(Context.UnsignedIntTy, B.getType(Context));
-
-  SVal C = getByName("c");
-  ASSERT_FALSE(C.getType(Context).isNull());
-  EXPECT_EQ(Context.IntTy, C.getType(Context));
-}
-
-SVAL_TEST(GetSymExprType, R"(
-void foo(int a, int b) {
-  int x = a;
-  int y = a + b;
-  long z = a;
-})") {
-  QualType Int = Context.IntTy;
-
-  SVal X = getByName("x");
-  ASSERT_FALSE(X.getType(Context).isNull());
-  EXPECT_EQ(Int, X.getType(Context));
-
-  SVal Y = getByName("y");
-  ASSERT_FALSE(Y.getType(Context).isNull());
-  EXPECT_EQ(Int, Y.getType(Context));
-
-  // TODO: Change to Long when we support symbolic casts
-  SVal Z = getByName("z");
-  ASSERT_FALSE(Z.getType(Context).isNull());
-  EXPECT_EQ(Int, Z.getType(Context));
-}
-
-SVAL_TEST(GetPointerType, R"(
-int *bar();
-int &foobar();
-struct Z {
-  int a;
-  int *b;
-};
-void foo(int x, int *y, Z z) {
-  int &a = x;
-  int &b = *y;
-  int &c = *bar();
-  int &d = foobar();
-  int &e = z.a;
-  int &f = *z.b;
-})") {
-  QualType Int = Context.IntTy;
-
-  SVal A = getByName("a");
-  ASSERT_FALSE(A.getType(Context).isNull());
-  const auto *APtrTy = dyn_cast<PointerType>(A.getType(Context));
-  ASSERT_NE(APtrTy, nullptr);
-  EXPECT_EQ(Int, APtrTy->getPointeeType());
-
-  SVal B = getByName("b");
-  ASSERT_FALSE(B.getType(Context).isNull());
-  const auto *BPtrTy = dyn_cast<PointerType>(B.getType(Context));
-  ASSERT_NE(BPtrTy, nullptr);
-  EXPECT_EQ(Int, BPtrTy->getPointeeType());
-
-  SVal C = getByName("c");
-  ASSERT_FALSE(C.getType(Context).isNull());
-  const auto *CPtrTy = dyn_cast<PointerType>(C.getType(Context));
-  ASSERT_NE(CPtrTy, nullptr);
-  EXPECT_EQ(Int, CPtrTy->getPointeeType());
-
-  SVal D = getByName("d");
-  ASSERT_FALSE(D.getType(Context).isNull());
-  const auto *DRefTy = dyn_cast<LValueReferenceType>(D.getType(Context));
-  ASSERT_NE(DRefTy, nullptr);
-  EXPECT_EQ(Int, DRefTy->getPointeeType());
-
-  SVal E = getByName("e");
-  ASSERT_FALSE(E.getType(Context).isNull());
-  const auto *EPtrTy = dyn_cast<PointerType>(E.getType(Context));
-  ASSERT_NE(EPtrTy, nullptr);
-  EXPECT_EQ(Int, EPtrTy->getPointeeType());
-
-  SVal F = getByName("f");
-  ASSERT_FALSE(F.getType(Context).isNull());
-  const auto *FPtrTy = dyn_cast<PointerType>(F.getType(Context));
-  ASSERT_NE(FPtrTy, nullptr);
-  EXPECT_EQ(Int, FPtrTy->getPointeeType());
-}
-
-SVAL_TEST(GetCompoundType, R"(
-struct TestStruct {
-  int a, b;
-};
-union TestUnion {
-  int a;
-  float b;
-  TestStruct c;
-};
-void foo(int x) {
-  int a[] = {1, x, 2};
-  TestStruct b = {x, 42};
-  TestUnion c = {42};
-  TestUnion d = {.c=b};
-}
-)") {
-  SVal A = getByName("a");
-  ASSERT_FALSE(A.getType(Context).isNull());
-  const auto *AArrayType = dyn_cast<ArrayType>(A.getType(Context));
-  ASSERT_NE(AArrayType, nullptr);
-  EXPECT_EQ(Context.IntTy, AArrayType->getElementType());
-
-  SVal B = getByName("b");
-  ASSERT_FALSE(B.getType(Context).isNull());
-  const auto *BRecordType = dyn_cast<RecordType>(B.getType(Context));
-  ASSERT_NE(BRecordType, nullptr);
-  EXPECT_EQ("TestStruct", BRecordType->getDecl()->getName());
-
-  SVal C = getByName("c");
-  ASSERT_FALSE(C.getType(Context).isNull());
-  const auto *CRecordType = dyn_cast<RecordType>(C.getType(Context));
-  ASSERT_NE(CRecordType, nullptr);
-  EXPECT_EQ("TestUnion", CRecordType->getDecl()->getName());
-
-  auto D = getByName("d").getAs<nonloc::CompoundVal>();
-  ASSERT_TRUE(D.hasValue());
-  auto Begin = D->begin();
-  ASSERT_NE(D->end(), Begin);
-  ++Begin;
-  ASSERT_EQ(D->end(), Begin);
-  auto LD = D->begin()->getAs<nonloc::LazyCompoundVal>();
-  ASSERT_TRUE(LD.hasValue());
-  auto LDT = LD->getType(Context);
-  ASSERT_FALSE(LDT.isNull());
-  const auto *DRecordType = dyn_cast<RecordType>(LDT);
-  ASSERT_NE(DRecordType, nullptr);
-  EXPECT_EQ("TestStruct", DRecordType->getDecl()->getName());
-}
-
-SVAL_TEST(GetStringType, R"(
-void foo() {
-  const char *a = "Hello, world!";
-}
-)") {
-  SVal A = getByName("a");
-  ASSERT_FALSE(A.getType(Context).isNull());
-  const auto *APtrTy = dyn_cast<PointerType>(A.getType(Context));
-  ASSERT_NE(APtrTy, nullptr);
-  EXPECT_EQ(Context.CharTy, APtrTy->getPointeeType());
-}
-
-SVAL_TEST(GetThisType, R"(
-class TestClass {
-  void foo();
-};
-void TestClass::foo() {
-  const auto *a = this;
-}
-)") {
-  SVal A = getByName("a");
-  ASSERT_FALSE(A.getType(Context).isNull());
-  const auto *APtrTy = dyn_cast<PointerType>(A.getType(Context));
-  ASSERT_NE(APtrTy, nullptr);
-  const auto *ARecordType = dyn_cast<RecordType>(APtrTy->getPointeeType());
-  ASSERT_NE(ARecordType, nullptr);
-  EXPECT_EQ("TestClass", ARecordType->getDecl()->getName());
-}
-
-SVAL_TEST(GetFunctionPtrType, R"(
-void bar();
-void foo() {
-  auto *a = &bar;
-}
-)") {
-  SVal A = getByName("a");
-  ASSERT_FALSE(A.getType(Context).isNull());
-  const auto *APtrTy = dyn_cast<PointerType>(A.getType(Context));
-  ASSERT_NE(APtrTy, nullptr);
-  ASSERT_TRUE(isa<FunctionProtoType>(APtrTy->getPointeeType()));
-}
-
-SVAL_TEST(GetLabelType, R"(
-void foo() {
-  entry:
-  void *a = &&entry;
-  char *b = (char *)&&entry;
-}
-)") {
-  SVal A = getByName("a");
-  ASSERT_FALSE(A.getType(Context).isNull());
-  EXPECT_EQ(Context.VoidPtrTy, A.getType(Context));
-
-  SVal B = getByName("a");
-  ASSERT_FALSE(B.getType(Context).isNull());
-  // TODO: Change to CharTy when we support symbolic casts
-  EXPECT_EQ(Context.VoidPtrTy, B.getType(Context));
-}
-
-} // namespace
-} // namespace ento
-} // namespace clang
diff --git a/gnu/llvm/clang/unittests/StaticAnalyzer/StoreTest.cpp b/gnu/llvm/clang/unittests/StaticAnalyzer/StoreTest.cpp
deleted file mode 100644
index 17b64ce622f..00000000000
--- a/gnu/llvm/clang/unittests/StaticAnalyzer/StoreTest.cpp
+++ /dev/null
@@ -1,155 +0,0 @@
-//===- unittests/StaticAnalyzer/StoreTest.cpp -----------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "Reusables.h"
-
-#include "clang/Tooling/Tooling.h"
-#include "gtest/gtest.h"
-
-namespace clang {
-namespace ento {
-namespace {
-
-class StoreTestConsumer : public ExprEngineConsumer {
-public:
-  StoreTestConsumer(CompilerInstance &C) : ExprEngineConsumer(C) {}
-
-  bool HandleTopLevelDecl(DeclGroupRef DG) override {
-    for (const auto *D : DG)
-      performTest(D);
-    return true;
-  }
-
-private:
-  virtual void performTest(const Decl *D) = 0;
-};
-
-template <class ConsumerTy> class TestAction : public ASTFrontendAction {
-public:
-  std::unique_ptr<ASTConsumer> CreateASTConsumer(CompilerInstance &Compiler,
-                                                 StringRef File) override {
-    return std::make_unique<ConsumerTy>(Compiler);
-  }
-};
-
-// Test that we can put a value into an int-type variable and load it
-// back from that variable. Test what happens if default bindings are used.
-class VariableBindConsumer : public StoreTestConsumer {
-  void performTest(const Decl *D) override {
-    StoreManager &SManager = Eng.getStoreManager();
-    SValBuilder &Builder = Eng.getSValBuilder();
-    MemRegionManager &MRManager = SManager.getRegionManager();
-    const ASTContext &ASTCtxt = Eng.getContext();
-
-    const auto *VDX0 = findDeclByName<VarDecl>(D, "x0");
-    const auto *VDY0 = findDeclByName<VarDecl>(D, "y0");
-    const auto *VDZ0 = findDeclByName<VarDecl>(D, "z0");
-    const auto *VDX1 = findDeclByName<VarDecl>(D, "x1");
-    const auto *VDY1 = findDeclByName<VarDecl>(D, "y1");
-
-    ASSERT_TRUE(VDX0 && VDY0 && VDZ0 && VDX1 && VDY1);
-
-    const StackFrameContext *SFC =
-        Eng.getAnalysisDeclContextManager().getStackFrame(D);
-
-    Loc LX0 = loc::MemRegionVal(MRManager.getVarRegion(VDX0, SFC));
-    Loc LY0 = loc::MemRegionVal(MRManager.getVarRegion(VDY0, SFC));
-    Loc LZ0 = loc::MemRegionVal(MRManager.getVarRegion(VDZ0, SFC));
-    Loc LX1 = loc::MemRegionVal(MRManager.getVarRegion(VDX1, SFC));
-    Loc LY1 = loc::MemRegionVal(MRManager.getVarRegion(VDY1, SFC));
-
-    Store StInit = SManager.getInitialStore(SFC).getStore();
-    SVal Zero = Builder.makeZeroVal(ASTCtxt.IntTy);
-    SVal One = Builder.makeIntVal(1, ASTCtxt.IntTy);
-    SVal NarrowZero = Builder.makeZeroVal(ASTCtxt.CharTy);
-
-    // Bind(Zero)
-    Store StX0 = SManager.Bind(StInit, LX0, Zero).getStore();
-    EXPECT_EQ(Zero, SManager.getBinding(StX0, LX0, ASTCtxt.IntTy));
-
-    // BindDefaultInitial(Zero)
-    Store StY0 =
-        SManager.BindDefaultInitial(StInit, LY0.getAsRegion(), Zero).getStore();
-    EXPECT_EQ(Zero, SManager.getBinding(StY0, LY0, ASTCtxt.IntTy));
-    EXPECT_EQ(Zero, *SManager.getDefaultBinding(StY0, LY0.getAsRegion()));
-
-    // BindDefaultZero()
-    Store StZ0 = SManager.BindDefaultZero(StInit, LZ0.getAsRegion()).getStore();
-    // BindDefaultZero wipes the region with '0 S8b', not with out Zero.
-    // Direct load, however, does give us back the object of the type
-    // that we specify for loading.
-    EXPECT_EQ(Zero, SManager.getBinding(StZ0, LZ0, ASTCtxt.IntTy));
-    EXPECT_EQ(NarrowZero, *SManager.getDefaultBinding(StZ0, LZ0.getAsRegion()));
-
-    // Bind(One)
-    Store StX1 = SManager.Bind(StInit, LX1, One).getStore();
-    EXPECT_EQ(One, SManager.getBinding(StX1, LX1, ASTCtxt.IntTy));
-
-    // BindDefaultInitial(One)
-    Store StY1 =
-        SManager.BindDefaultInitial(StInit, LY1.getAsRegion(), One).getStore();
-    EXPECT_EQ(One, SManager.getBinding(StY1, LY1, ASTCtxt.IntTy));
-    EXPECT_EQ(One, *SManager.getDefaultBinding(StY1, LY1.getAsRegion()));
-  }
-
-public:
-  using StoreTestConsumer::StoreTestConsumer;
-};
-
-TEST(Store, VariableBind) {
-  EXPECT_TRUE(tooling::runToolOnCode(
-      std::make_unique<TestAction<VariableBindConsumer>>(),
-      "void foo() { int x0, y0, z0, x1, y1; }"));
-}
-
-class LiteralCompoundConsumer : public StoreTestConsumer {
-  void performTest(const Decl *D) override {
-    StoreManager &SManager = Eng.getStoreManager();
-    SValBuilder &Builder = Eng.getSValBuilder();
-    MemRegionManager &MRManager = SManager.getRegionManager();
-    ASTContext &ASTCtxt = Eng.getContext();
-
-    using namespace ast_matchers;
-
-    const auto *CL = findNode<CompoundLiteralExpr>(D, compoundLiteralExpr());
-
-    const StackFrameContext *SFC =
-        Eng.getAnalysisDeclContextManager().getStackFrame(D);
-
-    QualType Int = ASTCtxt.IntTy;
-
-    // Get region for 'test'
-    const SubRegion *CLRegion = MRManager.getCompoundLiteralRegion(CL, SFC);
-
-    // Get value for 'test[0]'
-    NonLoc Zero = Builder.makeIntVal(0, false);
-    loc::MemRegionVal ZeroElement(
-        MRManager.getElementRegion(ASTCtxt.IntTy, Zero, CLRegion, ASTCtxt));
-
-    Store StInit = SManager.getInitialStore(SFC).getStore();
-    // Let's bind constant 1 to 'test[0]'
-    SVal One = Builder.makeIntVal(1, Int);
-    Store StX = SManager.Bind(StInit, ZeroElement, One).getStore();
-
-    // And make sure that we can read this binding back as it was
-    EXPECT_EQ(One, SManager.getBinding(StX, ZeroElement, Int));
-  }
-
-public:
-  using StoreTestConsumer::StoreTestConsumer;
-};
-
-TEST(Store, LiteralCompound) {
-  EXPECT_TRUE(tooling::runToolOnCode(
-      std::make_unique<TestAction<LiteralCompoundConsumer>>(),
-      "void foo() { int *test = (int[]){ 1, 2, 3 }; }", "input.c"));
-}
-
-} // namespace
-} // namespace ento
-} // namespace clang
diff --git a/gnu/llvm/clang/unittests/StaticAnalyzer/SymbolReaperTest.cpp b/gnu/llvm/clang/unittests/StaticAnalyzer/SymbolReaperTest.cpp
deleted file mode 100644
index bbbf68851a5..00000000000
--- a/gnu/llvm/clang/unittests/StaticAnalyzer/SymbolReaperTest.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-//===- unittests/StaticAnalyzer/SymbolReaperTest.cpp ----------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "Reusables.h"
-
-#include "clang/Tooling/Tooling.h"
-#include "gtest/gtest.h"
-
-namespace clang {
-namespace ento {
-namespace {
-
-class SuperRegionLivenessConsumer : public ExprEngineConsumer {
-  void performTest(const Decl *D) {
-    const auto *FD = findDeclByName<FieldDecl>(D, "x");
-    const auto *VD = findDeclByName<VarDecl>(D, "s");
-    assert(FD && VD);
-
-    // The variable must belong to a stack frame,
-    // otherwise SymbolReaper would think it's a global.
-    const StackFrameContext *SFC =
-        Eng.getAnalysisDeclContextManager().getStackFrame(D);
-
-    // Create regions for 's' and 's.x'.
-    const VarRegion *VR = Eng.getRegionManager().getVarRegion(VD, SFC);
-    const FieldRegion *FR = Eng.getRegionManager().getFieldRegion(FD, VR);
-
-    // Pass a null location context to the SymbolReaper so that
-    // it was thinking that the variable is dead.
-    SymbolReaper SymReaper((StackFrameContext *)nullptr, (Stmt *)nullptr,
-                           Eng.getSymbolManager(), Eng.getStoreManager());
-
-    SymReaper.markLive(FR);
-    EXPECT_TRUE(SymReaper.isLiveRegion(VR));
-  }
-
-public:
-  SuperRegionLivenessConsumer(CompilerInstance &C) : ExprEngineConsumer(C) {}
-  ~SuperRegionLivenessConsumer() override {}
-
-  bool HandleTopLevelDecl(DeclGroupRef DG) override {
-    for (const auto *D : DG)
-      performTest(D);
-    return true;
-  }
-};
-
-class SuperRegionLivenessAction : public ASTFrontendAction {
-public:
-  SuperRegionLivenessAction() {}
-  std::unique_ptr<ASTConsumer> CreateASTConsumer(CompilerInstance &Compiler,
-                                                 StringRef File) override {
-    return std::make_unique<SuperRegionLivenessConsumer>(Compiler);
-  }
-};
-
-// Test that marking s.x as live would also make s live.
-TEST(SymbolReaper, SuperRegionLiveness) {
-  EXPECT_TRUE(
-      tooling::runToolOnCode(std::make_unique<SuperRegionLivenessAction>(),
-                             "void foo() { struct S { int x; } s; }"));
-}
-
-} // namespace
-} // namespace ento
-} // namespace clang
diff --git a/gnu/llvm/clang/unittests/StaticAnalyzer/TestReturnValueUnderConstruction.cpp b/gnu/llvm/clang/unittests/StaticAnalyzer/TestReturnValueUnderConstruction.cpp
deleted file mode 100644
index eb0ee6c1fd8..00000000000
--- a/gnu/llvm/clang/unittests/StaticAnalyzer/TestReturnValueUnderConstruction.cpp
+++ /dev/null
@@ -1,121 +0,0 @@
-//===- unittests/StaticAnalyzer/TestReturnValueUnderConstruction.cpp ------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "CheckerRegistration.h"
-#include "clang/StaticAnalyzer/Core/Checker.h"
-#include "clang/StaticAnalyzer/Core/PathSensitive/CallEvent.h"
-#include "clang/StaticAnalyzer/Core/PathSensitive/CheckerContext.h"
-#include "clang/StaticAnalyzer/Frontend/AnalysisConsumer.h"
-#include "clang/StaticAnalyzer/Frontend/CheckerRegistry.h"
-#include "clang/Tooling/Tooling.h"
-#include "gtest/gtest.h"
-
-namespace clang {
-namespace ento {
-namespace {
-
-class TestReturnValueUnderConstructionChecker
-  : public Checker<check::PostCall> {
-public:
-  void checkPostCall(const CallEvent &Call, CheckerContext &C) const {
-    // Only calls with origin expression are checked. These are `returnC()`,
-    // `returnD()`, C::C() and D::D().
-    if (!Call.getOriginExpr())
-      return;
-
-    // Since `returnC` returns an object by value, the invocation results
-    // in an object of type `C` constructed into variable `c`. Thus the
-    // return value of `CallEvent::getReturnValueUnderConstruction()` must
-    // be non-empty and has to be a `MemRegion`.
-    Optional<SVal> RetVal = Call.getReturnValueUnderConstruction();
-    ASSERT_TRUE(RetVal);
-    ASSERT_TRUE(RetVal->getAsRegion());
-
-    const auto *RetReg = cast<TypedValueRegion>(RetVal->getAsRegion());
-    const Expr *OrigExpr = Call.getOriginExpr();
-    ASSERT_EQ(OrigExpr->getType(), RetReg->getValueType());
-  }
-};
-
-void addTestReturnValueUnderConstructionChecker(
-    AnalysisASTConsumer &AnalysisConsumer, AnalyzerOptions &AnOpts) {
-  AnOpts.CheckersAndPackages =
-    {{"test.TestReturnValueUnderConstruction", true}};
-  AnalysisConsumer.AddCheckerRegistrationFn([](CheckerRegistry &Registry) {
-      Registry.addChecker<TestReturnValueUnderConstructionChecker>(
-          "test.TestReturnValueUnderConstruction", "", "");
-    });
-}
-
-TEST(TestReturnValueUnderConstructionChecker,
-     ReturnValueUnderConstructionChecker) {
-  EXPECT_TRUE(runCheckerOnCode<addTestReturnValueUnderConstructionChecker>(
-      R"(class C {
-         public:
-           C(int nn): n(nn) {}
-           virtual ~C() {}
-         private:
-           int n;
-         };
-
-         C returnC(int m) {
-           C c(m);
-           return c;
-         }
-
-         void foo() {
-           C c = returnC(1);
-         })"));
-
-  EXPECT_TRUE(runCheckerOnCode<addTestReturnValueUnderConstructionChecker>(
-      R"(class C {
-         public:
-           C(int nn): n(nn) {}
-           explicit C(): C(0) {}
-           virtual ~C() {}
-         private:
-           int n;
-         };
-
-         C returnC() {
-           C c;
-           return c;
-         }
-
-         void foo() {
-           C c = returnC();
-         })"));
-
-  EXPECT_TRUE(runCheckerOnCode<addTestReturnValueUnderConstructionChecker>(
-      R"(class C {
-         public:
-           C(int nn): n(nn) {}
-           virtual ~C() {}
-         private:
-           int n;
-         };
-
-         class D: public C {
-         public:
-           D(int nn): C(nn) {}
-           virtual ~D() {}
-         };
-
-         D returnD(int m) {
-           D d(m);
-           return d;
-         }
-
-         void foo() {
-           D d = returnD(1); 
-         })"));
-}
-
-} // namespace
-} // namespace ento
-} // namespace clang
diff --git a/gnu/llvm/clang/unittests/Tooling/ASTSelectionTest.cpp b/gnu/llvm/clang/unittests/Tooling/ASTSelectionTest.cpp
deleted file mode 100644
index 88988ef4478..00000000000
--- a/gnu/llvm/clang/unittests/Tooling/ASTSelectionTest.cpp
+++ /dev/null
@@ -1,1084 +0,0 @@
-//===- unittest/Tooling/ASTSelectionTest.cpp ------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "TestVisitor.h"
-#include "clang/Basic/SourceManager.h"
-#include "clang/Tooling/Refactoring/ASTSelection.h"
-
-using namespace clang;
-using namespace tooling;
-
-namespace {
-
-struct FileLocation {
-  unsigned Line, Column;
-
-  SourceLocation translate(const SourceManager &SM) {
-    return SM.translateLineCol(SM.getMainFileID(), Line, Column);
-  }
-};
-
-using FileRange = std::pair<FileLocation, FileLocation>;
-
-class SelectionFinderVisitor : public TestVisitor<SelectionFinderVisitor> {
-  FileLocation Location;
-  Optional<FileRange> SelectionRange;
-  llvm::function_ref<void(SourceRange SelectionRange,
-                          Optional<SelectedASTNode>)>
-      Consumer;
-
-public:
-  SelectionFinderVisitor(FileLocation Location,
-                         Optional<FileRange> SelectionRange,
-                         llvm::function_ref<void(SourceRange SelectionRange,
-                                                 Optional<SelectedASTNode>)>
-                             Consumer)
-      : Location(Location), SelectionRange(SelectionRange), Consumer(Consumer) {
-  }
-
-  bool VisitTranslationUnitDecl(const TranslationUnitDecl *TU) {
-    const ASTContext &Context = TU->getASTContext();
-    const SourceManager &SM = Context.getSourceManager();
-
-    SourceRange SelRange;
-    if (SelectionRange) {
-      SelRange = SourceRange(SelectionRange->first.translate(SM),
-                             SelectionRange->second.translate(SM));
-    } else {
-      SourceLocation Loc = Location.translate(SM);
-      SelRange = SourceRange(Loc, Loc);
-    }
-    Consumer(SelRange, findSelectedASTNodes(Context, SelRange));
-    return false;
-  }
-};
-
-/// This is a test utility function that computes the AST selection at the
-/// given location with an optional selection range.
-///
-/// A location roughly corresponds to a cursor location in an editor, while
-/// the optional range corresponds to the selection range in an editor.
-void findSelectedASTNodesWithRange(
-    StringRef Source, FileLocation Location, Optional<FileRange> SelectionRange,
-    llvm::function_ref<void(SourceRange SelectionRange,
-                            Optional<SelectedASTNode>)>
-        Consumer,
-    SelectionFinderVisitor::Language Language =
-        SelectionFinderVisitor::Lang_CXX11) {
-  SelectionFinderVisitor Visitor(Location, SelectionRange, Consumer);
-  EXPECT_TRUE(Visitor.runOver(Source, Language));
-}
-
-void findSelectedASTNodes(
-    StringRef Source, FileLocation Location, Optional<FileRange> SelectionRange,
-    llvm::function_ref<void(Optional<SelectedASTNode>)> Consumer,
-    SelectionFinderVisitor::Language Language =
-        SelectionFinderVisitor::Lang_CXX11) {
-  findSelectedASTNodesWithRange(
-      Source, Location, SelectionRange,
-      [&](SourceRange, Optional<SelectedASTNode> Selection) {
-        Consumer(std::move(Selection));
-      },
-      Language);
-}
-
-void checkNodeImpl(bool IsTypeMatched, const SelectedASTNode &Node,
-                   SourceSelectionKind SelectionKind, unsigned NumChildren) {
-  ASSERT_TRUE(IsTypeMatched);
-  EXPECT_EQ(Node.Children.size(), NumChildren);
-  ASSERT_EQ(Node.SelectionKind, SelectionKind);
-}
-
-void checkDeclName(const SelectedASTNode &Node, StringRef Name) {
-  const auto *ND = Node.Node.get<NamedDecl>();
-  EXPECT_TRUE(!!ND);
-  ASSERT_EQ(ND->getName(), Name);
-}
-
-template <typename T>
-const SelectedASTNode &checkNode(
-    const SelectedASTNode &StmtNode, SourceSelectionKind SelectionKind,
-    unsigned NumChildren = 0,
-    std::enable_if_t<std::is_base_of<Stmt, T>::value, T> *StmtOverloadChecker =
-        nullptr) {
-  checkNodeImpl(isa<T>(StmtNode.Node.get<Stmt>()), StmtNode, SelectionKind,
-                NumChildren);
-  return StmtNode;
-}
-
-template <typename T>
-const SelectedASTNode &checkNode(
-    const SelectedASTNode &DeclNode, SourceSelectionKind SelectionKind,
-    unsigned NumChildren = 0, StringRef Name = "",
-    std::enable_if_t<std::is_base_of<Decl, T>::value, T> *DeclOverloadChecker =
-        nullptr) {
-  checkNodeImpl(isa<T>(DeclNode.Node.get<Decl>()), DeclNode, SelectionKind,
-                NumChildren);
-  if (!Name.empty())
-    checkDeclName(DeclNode, Name);
-  return DeclNode;
-}
-
-struct ForAllChildrenOf {
-  const SelectedASTNode &Node;
-
-  static void childKindVerifier(const SelectedASTNode &Node,
-                                SourceSelectionKind SelectionKind) {
-    for (const SelectedASTNode &Child : Node.Children) {
-      ASSERT_EQ(Node.SelectionKind, SelectionKind);
-      childKindVerifier(Child, SelectionKind);
-    }
-  }
-
-public:
-  ForAllChildrenOf(const SelectedASTNode &Node) : Node(Node) {}
-
-  void shouldHaveSelectionKind(SourceSelectionKind Kind) {
-    childKindVerifier(Node, Kind);
-  }
-};
-
-ForAllChildrenOf allChildrenOf(const SelectedASTNode &Node) {
-  return ForAllChildrenOf(Node);
-}
-
-TEST(ASTSelectionFinder, CursorNoSelection) {
-  findSelectedASTNodes(
-      " void f() { }", {1, 1}, None,
-      [](Optional<SelectedASTNode> Node) { EXPECT_FALSE(Node); });
-}
-
-TEST(ASTSelectionFinder, CursorAtStartOfFunction) {
-  findSelectedASTNodes(
-      "void f() { }", {1, 1}, None, [](Optional<SelectedASTNode> Node) {
-        EXPECT_TRUE(Node);
-        checkNode<TranslationUnitDecl>(*Node, SourceSelectionKind::None,
-                                       /*NumChildren=*/1);
-        checkNode<FunctionDecl>(Node->Children[0],
-                                SourceSelectionKind::ContainsSelection,
-                                /*NumChildren=*/0, /*Name=*/"f");
-
-        // Check that the dumping works.
-        std::string DumpValue;
-        llvm::raw_string_ostream OS(DumpValue);
-        Node->Children[0].dump(OS);
-        ASSERT_EQ(OS.str(), "FunctionDecl \"f\" contains-selection\n");
-      });
-}
-
-TEST(ASTSelectionFinder, RangeNoSelection) {
-  findSelectedASTNodes(
-      " void f() { }", {1, 1}, FileRange{{1, 1}, {1, 1}},
-      [](Optional<SelectedASTNode> Node) { EXPECT_FALSE(Node); });
-  findSelectedASTNodes(
-      "  void f() { }", {1, 1}, FileRange{{1, 1}, {1, 2}},
-      [](Optional<SelectedASTNode> Node) { EXPECT_FALSE(Node); });
-}
-
-TEST(ASTSelectionFinder, EmptyRangeFallbackToCursor) {
-  findSelectedASTNodes("void f() { }", {1, 1}, FileRange{{1, 1}, {1, 1}},
-                       [](Optional<SelectedASTNode> Node) {
-                         EXPECT_TRUE(Node);
-                         checkNode<FunctionDecl>(
-                             Node->Children[0],
-                             SourceSelectionKind::ContainsSelection,
-                             /*NumChildren=*/0, /*Name=*/"f");
-                       });
-}
-
-TEST(ASTSelectionFinder, WholeFunctionSelection) {
-  StringRef Source = "int f(int x) { return x;\n}\nvoid f2() { }";
-  // From 'int' until just after '}':
-
-  findSelectedASTNodes(
-      Source, {1, 1}, FileRange{{1, 1}, {2, 2}},
-      [](Optional<SelectedASTNode> Node) {
-        EXPECT_TRUE(Node);
-        EXPECT_EQ(Node->Children.size(), 1u);
-        const auto &Fn = checkNode<FunctionDecl>(
-            Node->Children[0], SourceSelectionKind::ContainsSelection,
-            /*NumChildren=*/2, /*Name=*/"f");
-        checkNode<ParmVarDecl>(Fn.Children[0],
-                               SourceSelectionKind::InsideSelection);
-        const auto &Body = checkNode<CompoundStmt>(
-            Fn.Children[1], SourceSelectionKind::InsideSelection,
-            /*NumChildren=*/1);
-        const auto &Return = checkNode<ReturnStmt>(
-            Body.Children[0], SourceSelectionKind::InsideSelection,
-            /*NumChildren=*/1);
-        checkNode<ImplicitCastExpr>(Return.Children[0],
-                                    SourceSelectionKind::InsideSelection,
-                                    /*NumChildren=*/1);
-        checkNode<DeclRefExpr>(Return.Children[0].Children[0],
-                               SourceSelectionKind::InsideSelection);
-      });
-
-  // From 'int' until just before '}':
-  findSelectedASTNodes(
-      Source, {2, 1}, FileRange{{1, 1}, {2, 1}},
-      [](Optional<SelectedASTNode> Node) {
-        EXPECT_TRUE(Node);
-        EXPECT_EQ(Node->Children.size(), 1u);
-        const auto &Fn = checkNode<FunctionDecl>(
-            Node->Children[0], SourceSelectionKind::ContainsSelection,
-            /*NumChildren=*/2, /*Name=*/"f");
-        const auto &Body = checkNode<CompoundStmt>(
-            Fn.Children[1], SourceSelectionKind::ContainsSelectionEnd,
-            /*NumChildren=*/1);
-        checkNode<ReturnStmt>(Body.Children[0],
-                              SourceSelectionKind::InsideSelection,
-                              /*NumChildren=*/1);
-      });
-  // From '{' until just after '}':
-  findSelectedASTNodes(
-      Source, {1, 14}, FileRange{{1, 14}, {2, 2}},
-      [](Optional<SelectedASTNode> Node) {
-        EXPECT_TRUE(Node);
-        EXPECT_EQ(Node->Children.size(), 1u);
-        const auto &Fn = checkNode<FunctionDecl>(
-            Node->Children[0], SourceSelectionKind::ContainsSelection,
-            /*NumChildren=*/1, /*Name=*/"f");
-        const auto &Body = checkNode<CompoundStmt>(
-            Fn.Children[0], SourceSelectionKind::ContainsSelection,
-            /*NumChildren=*/1);
-        checkNode<ReturnStmt>(Body.Children[0],
-                              SourceSelectionKind::InsideSelection,
-                              /*NumChildren=*/1);
-      });
-  // From 'x' until just after '}':
-  findSelectedASTNodes(
-      Source, {2, 2}, FileRange{{1, 11}, {2, 2}},
-      [](Optional<SelectedASTNode> Node) {
-        EXPECT_TRUE(Node);
-        EXPECT_EQ(Node->Children.size(), 1u);
-        const auto &Fn = checkNode<FunctionDecl>(
-            Node->Children[0], SourceSelectionKind::ContainsSelection,
-            /*NumChildren=*/2, /*Name=*/"f");
-        checkNode<ParmVarDecl>(Fn.Children[0],
-                               SourceSelectionKind::ContainsSelectionStart);
-        const auto &Body = checkNode<CompoundStmt>(
-            Fn.Children[1], SourceSelectionKind::InsideSelection,
-            /*NumChildren=*/1);
-        checkNode<ReturnStmt>(Body.Children[0],
-                              SourceSelectionKind::InsideSelection,
-                              /*NumChildren=*/1);
-      });
-}
-
-TEST(ASTSelectionFinder, MultipleFunctionSelection) {
-  StringRef Source = R"(void f0() {
-}
-void f1() { }
-void f2() { }
-void f3() { }
-)";
-  auto SelectedF1F2 = [](Optional<SelectedASTNode> Node) {
-    EXPECT_TRUE(Node);
-    EXPECT_EQ(Node->Children.size(), 2u);
-    checkNode<FunctionDecl>(Node->Children[0],
-                            SourceSelectionKind::InsideSelection,
-                            /*NumChildren=*/1, /*Name=*/"f1");
-    checkNode<FunctionDecl>(Node->Children[1],
-                            SourceSelectionKind::InsideSelection,
-                            /*NumChildren=*/1, /*Name=*/"f2");
-  };
-  // Just after '}' of f0 and just before 'void' of f3:
-  findSelectedASTNodes(Source, {2, 2}, FileRange{{2, 2}, {5, 1}}, SelectedF1F2);
-  // Just before 'void' of f1 and just after '}' of f2:
-  findSelectedASTNodes(Source, {3, 1}, FileRange{{3, 1}, {4, 14}},
-                       SelectedF1F2);
-}
-
-TEST(ASTSelectionFinder, MultipleStatementSelection) {
-  StringRef Source = R"(void f(int x, int y) {
-  int z = x;
-  f(2, 3);
-  if (x == 0) {
-    return;
-  }
-  x = 1;
-  return;
-})";
-  // From 'f(2,3)' until just before 'x = 1;':
-  findSelectedASTNodes(
-      Source, {3, 2}, FileRange{{3, 2}, {7, 1}},
-      [](Optional<SelectedASTNode> Node) {
-        EXPECT_TRUE(Node);
-        EXPECT_EQ(Node->Children.size(), 1u);
-        const auto &Fn = checkNode<FunctionDecl>(
-            Node->Children[0], SourceSelectionKind::ContainsSelection,
-            /*NumChildren=*/1, /*Name=*/"f");
-        const auto &Body = checkNode<CompoundStmt>(
-            Fn.Children[0], SourceSelectionKind::ContainsSelection,
-            /*NumChildren=*/2);
-        allChildrenOf(checkNode<CallExpr>(Body.Children[0],
-                                          SourceSelectionKind::InsideSelection,
-                                          /*NumChildren=*/3))
-            .shouldHaveSelectionKind(SourceSelectionKind::InsideSelection);
-        allChildrenOf(checkNode<IfStmt>(Body.Children[1],
-                                        SourceSelectionKind::InsideSelection,
-                                        /*NumChildren=*/2))
-            .shouldHaveSelectionKind(SourceSelectionKind::InsideSelection);
-      });
-  // From 'f(2,3)' until just before ';' in 'x = 1;':
-  findSelectedASTNodes(
-      Source, {3, 2}, FileRange{{3, 2}, {7, 8}},
-      [](Optional<SelectedASTNode> Node) {
-        EXPECT_TRUE(Node);
-        EXPECT_EQ(Node->Children.size(), 1u);
-        const auto &Fn = checkNode<FunctionDecl>(
-            Node->Children[0], SourceSelectionKind::ContainsSelection,
-            /*NumChildren=*/1, /*Name=*/"f");
-        const auto &Body = checkNode<CompoundStmt>(
-            Fn.Children[0], SourceSelectionKind::ContainsSelection,
-            /*NumChildren=*/3);
-        checkNode<CallExpr>(Body.Children[0],
-                            SourceSelectionKind::InsideSelection,
-                            /*NumChildren=*/3);
-        checkNode<IfStmt>(Body.Children[1],
-                          SourceSelectionKind::InsideSelection,
-                          /*NumChildren=*/2);
-        checkNode<BinaryOperator>(Body.Children[2],
-                                  SourceSelectionKind::InsideSelection,
-                                  /*NumChildren=*/2);
-      });
-  // From the middle of 'int z = 3' until the middle of 'x = 1;':
-  findSelectedASTNodes(
-      Source, {2, 10}, FileRange{{2, 10}, {7, 5}},
-      [](Optional<SelectedASTNode> Node) {
-        EXPECT_TRUE(Node);
-        EXPECT_EQ(Node->Children.size(), 1u);
-        const auto &Fn = checkNode<FunctionDecl>(
-            Node->Children[0], SourceSelectionKind::ContainsSelection,
-            /*NumChildren=*/1, /*Name=*/"f");
-        const auto &Body = checkNode<CompoundStmt>(
-            Fn.Children[0], SourceSelectionKind::ContainsSelection,
-            /*NumChildren=*/4);
-        checkNode<DeclStmt>(Body.Children[0],
-                            SourceSelectionKind::ContainsSelectionStart,
-                            /*NumChildren=*/1);
-        checkNode<CallExpr>(Body.Children[1],
-                            SourceSelectionKind::InsideSelection,
-                            /*NumChildren=*/3);
-        checkNode<IfStmt>(Body.Children[2],
-                          SourceSelectionKind::InsideSelection,
-                          /*NumChildren=*/2);
-        checkNode<BinaryOperator>(Body.Children[3],
-                                  SourceSelectionKind::ContainsSelectionEnd,
-                                  /*NumChildren=*/1);
-      });
-}
-
-TEST(ASTSelectionFinder, SelectionInFunctionInObjCImplementation) {
-  StringRef Source = R"(
-@interface I
-@end
-@implementation I
-
-int notSelected() { }
-
-int selected(int x) {
-  return x;
-}
-
-@end
-@implementation I(Cat)
-
-void catF() { }
-
-@end
-
-void outerFunction() { }
-)";
-  // Just the 'x' expression in 'selected':
-  findSelectedASTNodes(
-      Source, {9, 10}, FileRange{{9, 10}, {9, 11}},
-      [](Optional<SelectedASTNode> Node) {
-        EXPECT_TRUE(Node);
-        EXPECT_EQ(Node->Children.size(), 1u);
-        const auto &Impl = checkNode<ObjCImplementationDecl>(
-            Node->Children[0], SourceSelectionKind::ContainsSelection,
-            /*NumChildren=*/1, /*Name=*/"I");
-        const auto &Fn = checkNode<FunctionDecl>(
-            Impl.Children[0], SourceSelectionKind::ContainsSelection,
-            /*NumChildren=*/1, /*Name=*/"selected");
-        allChildrenOf(Fn).shouldHaveSelectionKind(
-            SourceSelectionKind::ContainsSelection);
-      },
-      SelectionFinderVisitor::Lang_OBJC);
-  // The entire 'catF':
-  findSelectedASTNodes(
-      Source, {15, 1}, FileRange{{15, 1}, {15, 16}},
-      [](Optional<SelectedASTNode> Node) {
-        EXPECT_TRUE(Node);
-        EXPECT_EQ(Node->Children.size(), 1u);
-        const auto &Impl = checkNode<ObjCCategoryImplDecl>(
-            Node->Children[0], SourceSelectionKind::ContainsSelection,
-            /*NumChildren=*/1, /*Name=*/"Cat");
-        const auto &Fn = checkNode<FunctionDecl>(
-            Impl.Children[0], SourceSelectionKind::ContainsSelection,
-            /*NumChildren=*/1, /*Name=*/"catF");
-        allChildrenOf(Fn).shouldHaveSelectionKind(
-            SourceSelectionKind::ContainsSelection);
-      },
-      SelectionFinderVisitor::Lang_OBJC);
-  // From the line before 'selected' to the line after 'catF':
-  findSelectedASTNodes(
-      Source, {16, 1}, FileRange{{7, 1}, {16, 1}},
-      [](Optional<SelectedASTNode> Node) {
-        EXPECT_TRUE(Node);
-        EXPECT_EQ(Node->Children.size(), 2u);
-        const auto &Impl = checkNode<ObjCImplementationDecl>(
-            Node->Children[0], SourceSelectionKind::ContainsSelectionStart,
-            /*NumChildren=*/1, /*Name=*/"I");
-        const auto &Selected = checkNode<FunctionDecl>(
-            Impl.Children[0], SourceSelectionKind::InsideSelection,
-            /*NumChildren=*/2, /*Name=*/"selected");
-        allChildrenOf(Selected).shouldHaveSelectionKind(
-            SourceSelectionKind::InsideSelection);
-        const auto &Cat = checkNode<ObjCCategoryImplDecl>(
-            Node->Children[1], SourceSelectionKind::ContainsSelectionEnd,
-            /*NumChildren=*/1, /*Name=*/"Cat");
-        const auto &CatF = checkNode<FunctionDecl>(
-            Cat.Children[0], SourceSelectionKind::InsideSelection,
-            /*NumChildren=*/1, /*Name=*/"catF");
-        allChildrenOf(CatF).shouldHaveSelectionKind(
-            SourceSelectionKind::InsideSelection);
-      },
-      SelectionFinderVisitor::Lang_OBJC);
-  // Just the 'outer' function:
-  findSelectedASTNodes(Source, {19, 1}, FileRange{{19, 1}, {19, 25}},
-                       [](Optional<SelectedASTNode> Node) {
-                         EXPECT_TRUE(Node);
-                         EXPECT_EQ(Node->Children.size(), 1u);
-                         checkNode<FunctionDecl>(
-                             Node->Children[0],
-                             SourceSelectionKind::ContainsSelection,
-                             /*NumChildren=*/1, /*Name=*/"outerFunction");
-                       },
-                       SelectionFinderVisitor::Lang_OBJC);
-}
-
-TEST(ASTSelectionFinder, FunctionInObjCImplementationCarefulWithEarlyExit) {
-  StringRef Source = R"(
-@interface I
-@end
-@implementation I
-
-void selected() {
-}
-
-- (void) method { }
-
-@end
-)";
-  // Just 'selected'
-  findSelectedASTNodes(
-      Source, {6, 1}, FileRange{{6, 1}, {7, 2}},
-      [](Optional<SelectedASTNode> Node) {
-        EXPECT_TRUE(Node);
-        EXPECT_EQ(Node->Children.size(), 1u);
-        const auto &Impl = checkNode<ObjCImplementationDecl>(
-            Node->Children[0], SourceSelectionKind::ContainsSelection,
-            /*NumChildren=*/1, /*Name=*/"I");
-        checkNode<FunctionDecl>(Impl.Children[0],
-                                SourceSelectionKind::ContainsSelection,
-                                /*NumChildren=*/1, /*Name=*/"selected");
-      },
-      SelectionFinderVisitor::Lang_OBJC);
-}
-
-TEST(ASTSelectionFinder, AvoidImplicitDeclarations) {
-  StringRef Source = R"(
-struct Copy {
-  int x;
-};
-void foo() {
-  Copy x;
-  Copy y = x;
-}
-)";
-  // The entire struct 'Copy':
-  findSelectedASTNodes(
-      Source, {2, 1}, FileRange{{2, 1}, {4, 3}},
-      [](Optional<SelectedASTNode> Node) {
-        EXPECT_TRUE(Node);
-        EXPECT_EQ(Node->Children.size(), 1u);
-        const auto &Record = checkNode<CXXRecordDecl>(
-            Node->Children[0], SourceSelectionKind::InsideSelection,
-            /*NumChildren=*/1, /*Name=*/"Copy");
-        checkNode<FieldDecl>(Record.Children[0],
-                             SourceSelectionKind::InsideSelection);
-      });
-}
-
-TEST(ASTSelectionFinder, CorrectEndForObjectiveCImplementation) {
-  StringRef Source = R"(
-@interface I
-@end
-@implementation I
-@ end
-)";
-  // Just after '@ end'
-  findSelectedASTNodes(Source, {5, 6}, None,
-                       [](Optional<SelectedASTNode> Node) {
-                         EXPECT_TRUE(Node);
-                         EXPECT_EQ(Node->Children.size(), 1u);
-                         checkNode<ObjCImplementationDecl>(
-                             Node->Children[0],
-                             SourceSelectionKind::ContainsSelection);
-                       },
-                       SelectionFinderVisitor::Lang_OBJC);
-}
-
-const SelectedASTNode &checkFnBody(const Optional<SelectedASTNode> &Node,
-                                   StringRef Name) {
-  EXPECT_TRUE(Node);
-  EXPECT_EQ(Node->Children.size(), 1u);
-  const auto &Fn = checkNode<FunctionDecl>(
-      Node->Children[0], SourceSelectionKind::ContainsSelection,
-      /*NumChildren=*/1, Name);
-  return checkNode<CompoundStmt>(Fn.Children[0],
-                                 SourceSelectionKind::ContainsSelection,
-                                 /*NumChildren=*/1);
-}
-
-TEST(ASTSelectionFinder, SelectObjectiveCPseudoObjectExprs) {
-  StringRef Source = R"(
-@interface I
-@property(readwrite) int prop;
-@end
-void selectProp(I *i) {
-(void)i.prop;
-i.prop = 21;
-}
-
-
-@interface NSMutableArray
-- (id)objectAtIndexedSubscript:(unsigned int)index;
-- (void)setObject:(id)object atIndexedSubscript:(unsigned int)index;
-@end
-
-void selectSubscript(NSMutableArray *array, I *i) {
-  (void)array[10];
-  array[i.prop] = i;
-}
-)";
-  // Just 'i.prop'.
-  findSelectedASTNodes(
-      Source, {6, 7}, FileRange{{6, 7}, {6, 13}},
-      [](Optional<SelectedASTNode> Node) {
-        const auto &CS = checkFnBody(Node, /*Name=*/"selectProp");
-        const auto &CCast = checkNode<CStyleCastExpr>(
-            CS.Children[0], SourceSelectionKind::ContainsSelection,
-            /*NumChildren=*/1);
-        const auto &POE = checkNode<PseudoObjectExpr>(
-            CCast.Children[0], SourceSelectionKind::ContainsSelection,
-            /*NumChildren=*/1);
-        const auto &PRE = checkNode<ObjCPropertyRefExpr>(
-            POE.Children[0], SourceSelectionKind::ContainsSelection,
-            /*NumChildren=*/1);
-        const auto &Cast = checkNode<ImplicitCastExpr>(
-            PRE.Children[0], SourceSelectionKind::InsideSelection,
-            /*NumChildren=*/1);
-        checkNode<DeclRefExpr>(Cast.Children[0],
-                               SourceSelectionKind::InsideSelection);
-      },
-      SelectionFinderVisitor::Lang_OBJC);
-  // Just 'i.prop = 21'
-  findSelectedASTNodes(
-      Source, {7, 1}, FileRange{{7, 1}, {7, 12}},
-      [](Optional<SelectedASTNode> Node) {
-        const auto &CS = checkFnBody(Node, /*Name=*/"selectProp");
-        const auto &POE = checkNode<PseudoObjectExpr>(
-            CS.Children[0], SourceSelectionKind::ContainsSelection,
-            /*NumChildren=*/1);
-        const auto &BinOp = checkNode<BinaryOperator>(
-            POE.Children[0], SourceSelectionKind::ContainsSelection,
-            /*NumChildren=*/2);
-        const auto &PRE = checkNode<ObjCPropertyRefExpr>(
-            BinOp.Children[0], SourceSelectionKind::InsideSelection,
-            /*NumChildren=*/1);
-        const auto &Cast = checkNode<ImplicitCastExpr>(
-            PRE.Children[0], SourceSelectionKind::InsideSelection,
-            /*NumChildren=*/1);
-        checkNode<DeclRefExpr>(Cast.Children[0],
-                               SourceSelectionKind::InsideSelection);
-        checkNode<IntegerLiteral>(BinOp.Children[1],
-                                  SourceSelectionKind::InsideSelection);
-      },
-      SelectionFinderVisitor::Lang_OBJC);
-  // Just 'array[10]'
-  findSelectedASTNodes(
-      Source, {17, 9}, FileRange{{17, 9}, {17, 18}},
-      [](Optional<SelectedASTNode> Node) {
-        const auto &CS = checkFnBody(Node, /*Name=*/"selectSubscript");
-        const auto &CCast = checkNode<CStyleCastExpr>(
-            CS.Children[0], SourceSelectionKind::ContainsSelection,
-            /*NumChildren=*/1);
-        const auto &POE = checkNode<PseudoObjectExpr>(
-            CCast.Children[0], SourceSelectionKind::ContainsSelection,
-            /*NumChildren=*/1);
-        const auto &SRE = checkNode<ObjCSubscriptRefExpr>(
-            POE.Children[0], SourceSelectionKind::ContainsSelection,
-            /*NumChildren=*/2);
-        const auto &Cast = checkNode<ImplicitCastExpr>(
-            SRE.Children[0], SourceSelectionKind::InsideSelection,
-            /*NumChildren=*/1);
-        checkNode<DeclRefExpr>(Cast.Children[0],
-                               SourceSelectionKind::InsideSelection);
-        checkNode<IntegerLiteral>(SRE.Children[1],
-                                  SourceSelectionKind::InsideSelection);
-      },
-      SelectionFinderVisitor::Lang_OBJC);
-  // Just 'array[i.prop] = array'
-  findSelectedASTNodes(
-      Source, {18, 3}, FileRange{{18, 3}, {18, 20}},
-      [](Optional<SelectedASTNode> Node) {
-        const auto &CS = checkFnBody(Node, /*Name=*/"selectSubscript");
-        const auto &POE = checkNode<PseudoObjectExpr>(
-            CS.Children[0], SourceSelectionKind::ContainsSelection,
-            /*NumChildren=*/1);
-        const auto &BinOp = checkNode<BinaryOperator>(
-            POE.Children[0], SourceSelectionKind::ContainsSelection,
-            /*NumChildren=*/2);
-        const auto &SRE = checkNode<ObjCSubscriptRefExpr>(
-            BinOp.Children[0], SourceSelectionKind::InsideSelection,
-            /*NumChildren=*/2);
-        const auto &Cast = checkNode<ImplicitCastExpr>(
-            SRE.Children[0], SourceSelectionKind::InsideSelection,
-            /*NumChildren=*/1);
-        checkNode<DeclRefExpr>(Cast.Children[0],
-                               SourceSelectionKind::InsideSelection);
-        const auto &POE2 = checkNode<PseudoObjectExpr>(
-            SRE.Children[1], SourceSelectionKind::InsideSelection,
-            /*NumChildren=*/1);
-        const auto &PRE = checkNode<ObjCPropertyRefExpr>(
-            POE2.Children[0], SourceSelectionKind::InsideSelection,
-            /*NumChildren=*/1);
-        const auto &Cast2 = checkNode<ImplicitCastExpr>(
-            PRE.Children[0], SourceSelectionKind::InsideSelection,
-            /*NumChildren=*/1);
-        checkNode<DeclRefExpr>(Cast2.Children[0],
-                               SourceSelectionKind::InsideSelection);
-        checkNode<DeclRefExpr>(BinOp.Children[1],
-                               SourceSelectionKind::InsideSelection);
-      },
-      SelectionFinderVisitor::Lang_OBJC);
-}
-
-TEST(ASTSelectionFinder, SimpleCodeRangeASTSelection) {
-  StringRef Source = R"(void f(int x, int y) {
-  int z = x;
-  f(2, 3);
-  if (x == 0) {
-    return;
-  }
-  x = 1;
-  return;
-}
-void f2() {
-  int m = 0;
-}
-)";
-  // No selection range.
-  findSelectedASTNodesWithRange(
-      Source, {2, 2}, None,
-      [](SourceRange SelectionRange, Optional<SelectedASTNode> Node) {
-        EXPECT_TRUE(Node);
-        Optional<CodeRangeASTSelection> SelectedCode =
-            CodeRangeASTSelection::create(SelectionRange, std::move(*Node));
-        EXPECT_FALSE(SelectedCode);
-      });
-  findSelectedASTNodesWithRange(
-      Source, {2, 2}, FileRange{{2, 2}, {2, 2}},
-      [](SourceRange SelectionRange, Optional<SelectedASTNode> Node) {
-        EXPECT_TRUE(Node);
-        Optional<CodeRangeASTSelection> SelectedCode =
-            CodeRangeASTSelection::create(SelectionRange, std::move(*Node));
-        EXPECT_FALSE(SelectedCode);
-      });
-  // Range that spans multiple functions is an invalid code range.
-  findSelectedASTNodesWithRange(
-      Source, {2, 2}, FileRange{{7, 2}, {12, 1}},
-      [](SourceRange SelectionRange, Optional<SelectedASTNode> Node) {
-        EXPECT_TRUE(Node);
-        Optional<CodeRangeASTSelection> SelectedCode =
-            CodeRangeASTSelection::create(SelectionRange, std::move(*Node));
-        EXPECT_FALSE(SelectedCode);
-      });
-  // Just 'z = x;':
-  findSelectedASTNodesWithRange(
-      Source, {2, 2}, FileRange{{2, 2}, {2, 13}},
-      [](SourceRange SelectionRange, Optional<SelectedASTNode> Node) {
-        EXPECT_TRUE(Node);
-        Optional<CodeRangeASTSelection> SelectedCode =
-            CodeRangeASTSelection::create(SelectionRange, std::move(*Node));
-        EXPECT_TRUE(SelectedCode);
-        EXPECT_EQ(SelectedCode->size(), 1u);
-        EXPECT_TRUE(isa<DeclStmt>((*SelectedCode)[0]));
-        ArrayRef<SelectedASTNode::ReferenceType> Parents =
-            SelectedCode->getParents();
-        EXPECT_EQ(Parents.size(), 3u);
-        EXPECT_TRUE(
-            isa<TranslationUnitDecl>(Parents[0].get().Node.get<Decl>()));
-        // Function 'f' definition.
-        EXPECT_TRUE(isa<FunctionDecl>(Parents[1].get().Node.get<Decl>()));
-        // Function body of function 'F'.
-        EXPECT_TRUE(isa<CompoundStmt>(Parents[2].get().Node.get<Stmt>()));
-      });
-  // From 'f(2,3)' until just before 'x = 1;':
-  findSelectedASTNodesWithRange(
-      Source, {3, 2}, FileRange{{3, 2}, {7, 1}},
-      [](SourceRange SelectionRange, Optional<SelectedASTNode> Node) {
-        EXPECT_TRUE(Node);
-        Optional<CodeRangeASTSelection> SelectedCode =
-            CodeRangeASTSelection::create(SelectionRange, std::move(*Node));
-        EXPECT_TRUE(SelectedCode);
-        EXPECT_EQ(SelectedCode->size(), 2u);
-        EXPECT_TRUE(isa<CallExpr>((*SelectedCode)[0]));
-        EXPECT_TRUE(isa<IfStmt>((*SelectedCode)[1]));
-        ArrayRef<SelectedASTNode::ReferenceType> Parents =
-            SelectedCode->getParents();
-        EXPECT_EQ(Parents.size(), 3u);
-        EXPECT_TRUE(
-            isa<TranslationUnitDecl>(Parents[0].get().Node.get<Decl>()));
-        // Function 'f' definition.
-        EXPECT_TRUE(isa<FunctionDecl>(Parents[1].get().Node.get<Decl>()));
-        // Function body of function 'F'.
-        EXPECT_TRUE(isa<CompoundStmt>(Parents[2].get().Node.get<Stmt>()));
-      });
-  // From 'f(2,3)' until just before ';' in 'x = 1;':
-  findSelectedASTNodesWithRange(
-      Source, {3, 2}, FileRange{{3, 2}, {7, 8}},
-      [](SourceRange SelectionRange, Optional<SelectedASTNode> Node) {
-        EXPECT_TRUE(Node);
-        Optional<CodeRangeASTSelection> SelectedCode =
-            CodeRangeASTSelection::create(SelectionRange, std::move(*Node));
-        EXPECT_TRUE(SelectedCode);
-        EXPECT_EQ(SelectedCode->size(), 3u);
-        EXPECT_TRUE(isa<CallExpr>((*SelectedCode)[0]));
-        EXPECT_TRUE(isa<IfStmt>((*SelectedCode)[1]));
-        EXPECT_TRUE(isa<BinaryOperator>((*SelectedCode)[2]));
-      });
-  // From the middle of 'int z = 3' until the middle of 'x = 1;':
-  findSelectedASTNodesWithRange(
-      Source, {2, 10}, FileRange{{2, 10}, {7, 5}},
-      [](SourceRange SelectionRange, Optional<SelectedASTNode> Node) {
-        EXPECT_TRUE(Node);
-        EXPECT_TRUE(Node);
-        Optional<CodeRangeASTSelection> SelectedCode =
-            CodeRangeASTSelection::create(SelectionRange, std::move(*Node));
-        EXPECT_TRUE(SelectedCode);
-        EXPECT_EQ(SelectedCode->size(), 4u);
-        EXPECT_TRUE(isa<DeclStmt>((*SelectedCode)[0]));
-        EXPECT_TRUE(isa<CallExpr>((*SelectedCode)[1]));
-        EXPECT_TRUE(isa<IfStmt>((*SelectedCode)[2]));
-        EXPECT_TRUE(isa<BinaryOperator>((*SelectedCode)[3]));
-      });
-}
-
-TEST(ASTSelectionFinder, OutOfBodyCodeRange) {
-  StringRef Source = R"(
-int codeRange = 2 + 3;
-)";
-  // '2+3' expression.
-  findSelectedASTNodesWithRange(
-      Source, {2, 17}, FileRange{{2, 17}, {2, 22}},
-      [](SourceRange SelectionRange, Optional<SelectedASTNode> Node) {
-        EXPECT_TRUE(Node);
-        Optional<CodeRangeASTSelection> SelectedCode =
-            CodeRangeASTSelection::create(SelectionRange, std::move(*Node));
-        EXPECT_TRUE(SelectedCode);
-        EXPECT_EQ(SelectedCode->size(), 1u);
-        EXPECT_TRUE(isa<BinaryOperator>((*SelectedCode)[0]));
-        ArrayRef<SelectedASTNode::ReferenceType> Parents =
-            SelectedCode->getParents();
-        EXPECT_EQ(Parents.size(), 2u);
-        EXPECT_TRUE(
-            isa<TranslationUnitDecl>(Parents[0].get().Node.get<Decl>()));
-        // Variable 'codeRange'.
-        EXPECT_TRUE(isa<VarDecl>(Parents[1].get().Node.get<Decl>()));
-      });
-}
-
-TEST(ASTSelectionFinder, SelectVarDeclStmt) {
-  StringRef Source = R"(
-void f() {
-   {
-       int a;
-   }
-}
-)";
-  // 'int a'
-  findSelectedASTNodesWithRange(
-      Source, {4, 8}, FileRange{{4, 8}, {4, 14}},
-      [](SourceRange SelectionRange, Optional<SelectedASTNode> Node) {
-        EXPECT_TRUE(Node);
-        Optional<CodeRangeASTSelection> SelectedCode =
-            CodeRangeASTSelection::create(SelectionRange, std::move(*Node));
-        EXPECT_TRUE(SelectedCode);
-        EXPECT_EQ(SelectedCode->size(), 1u);
-        EXPECT_TRUE(isa<DeclStmt>((*SelectedCode)[0]));
-        ArrayRef<SelectedASTNode::ReferenceType> Parents =
-            SelectedCode->getParents();
-        EXPECT_EQ(Parents.size(), 4u);
-        EXPECT_TRUE(
-            isa<TranslationUnitDecl>(Parents[0].get().Node.get<Decl>()));
-        // Function 'f' definition.
-        EXPECT_TRUE(isa<FunctionDecl>(Parents[1].get().Node.get<Decl>()));
-        // Function body of function 'F'.
-        EXPECT_TRUE(isa<CompoundStmt>(Parents[2].get().Node.get<Stmt>()));
-        // Compound statement in body of 'F'.
-        EXPECT_TRUE(isa<CompoundStmt>(Parents[3].get().Node.get<Stmt>()));
-      });
-}
-
-TEST(ASTSelectionFinder, SelectEntireDeclStmtRange) {
-  StringRef Source = R"(
-void f(int x, int y) {
-   int a = x * y;
-}
-)";
-  // 'int a = x * y'
-  findSelectedASTNodesWithRange(
-      Source, {3, 4}, FileRange{{3, 4}, {3, 17}},
-      [](SourceRange SelectionRange, Optional<SelectedASTNode> Node) {
-        EXPECT_TRUE(Node);
-        Optional<CodeRangeASTSelection> SelectedCode =
-            CodeRangeASTSelection::create(SelectionRange, std::move(*Node));
-        EXPECT_TRUE(SelectedCode);
-        EXPECT_EQ(SelectedCode->size(), 1u);
-        EXPECT_TRUE(isa<DeclStmt>((*SelectedCode)[0]));
-        ArrayRef<SelectedASTNode::ReferenceType> Parents =
-            SelectedCode->getParents();
-        EXPECT_EQ(Parents.size(), 3u);
-        EXPECT_TRUE(
-            isa<TranslationUnitDecl>(Parents[0].get().Node.get<Decl>()));
-        // Function 'f' definition.
-        EXPECT_TRUE(isa<FunctionDecl>(Parents[1].get().Node.get<Decl>()));
-        // Function body of function 'F'.
-        EXPECT_TRUE(isa<CompoundStmt>(Parents[2].get().Node.get<Stmt>()));
-      });
-}
-
-TEST(ASTSelectionFinder, SelectEntireDeclStmtRangeWithMultipleDecls) {
-  StringRef Source = R"(
-void f(int x, int y) {
-   int a = x * y, b = x - y;
-}
-)";
-  // 'b = x - y'
-  findSelectedASTNodesWithRange(
-      Source, {3, 19}, FileRange{{3, 19}, {3, 28}},
-      [](SourceRange SelectionRange, Optional<SelectedASTNode> Node) {
-        EXPECT_TRUE(Node);
-        Optional<CodeRangeASTSelection> SelectedCode =
-            CodeRangeASTSelection::create(SelectionRange, std::move(*Node));
-        EXPECT_TRUE(SelectedCode);
-        EXPECT_EQ(SelectedCode->size(), 1u);
-        EXPECT_TRUE(isa<DeclStmt>((*SelectedCode)[0]));
-        ArrayRef<SelectedASTNode::ReferenceType> Parents =
-            SelectedCode->getParents();
-        EXPECT_EQ(Parents.size(), 3u);
-        EXPECT_TRUE(
-            isa<TranslationUnitDecl>(Parents[0].get().Node.get<Decl>()));
-        // Function 'f' definition.
-        EXPECT_TRUE(isa<FunctionDecl>(Parents[1].get().Node.get<Decl>()));
-        // Function body of function 'F'.
-        EXPECT_TRUE(isa<CompoundStmt>(Parents[2].get().Node.get<Stmt>()));
-      });
-}
-
-TEST(ASTSelectionFinder, SimpleCodeRangeASTSelectionInObjCMethod) {
-  StringRef Source = R"(@interface I @end
-@implementation I
-- (void) f:(int)x with:(int) y {
-  int z = x;
-  [self f: 2 with: 3];
-  if (x == 0) {
-    return;
-  }
-  x = 1;
-  return;
-}
-- (void)f2 {
-  int m = 0;
-}
-@end
-)";
-  // Range that spans multiple methods is an invalid code range.
-  findSelectedASTNodesWithRange(
-      Source, {9, 2}, FileRange{{9, 2}, {13, 1}},
-      [](SourceRange SelectionRange, Optional<SelectedASTNode> Node) {
-        EXPECT_TRUE(Node);
-        Optional<CodeRangeASTSelection> SelectedCode =
-            CodeRangeASTSelection::create(SelectionRange, std::move(*Node));
-        EXPECT_FALSE(SelectedCode);
-      },
-      SelectionFinderVisitor::Lang_OBJC);
-  // Just 'z = x;':
-  findSelectedASTNodesWithRange(
-      Source, {4, 2}, FileRange{{4, 2}, {4, 13}},
-      [](SourceRange SelectionRange, Optional<SelectedASTNode> Node) {
-        EXPECT_TRUE(Node);
-        Optional<CodeRangeASTSelection> SelectedCode =
-            CodeRangeASTSelection::create(SelectionRange, std::move(*Node));
-        EXPECT_TRUE(SelectedCode);
-        EXPECT_EQ(SelectedCode->size(), 1u);
-        EXPECT_TRUE(isa<DeclStmt>((*SelectedCode)[0]));
-        ArrayRef<SelectedASTNode::ReferenceType> Parents =
-            SelectedCode->getParents();
-        EXPECT_EQ(Parents.size(), 4u);
-        EXPECT_TRUE(
-            isa<TranslationUnitDecl>(Parents[0].get().Node.get<Decl>()));
-        // 'I' @implementation.
-        EXPECT_TRUE(isa<ObjCImplDecl>(Parents[1].get().Node.get<Decl>()));
-        // Function 'f' definition.
-        EXPECT_TRUE(isa<ObjCMethodDecl>(Parents[2].get().Node.get<Decl>()));
-        // Function body of function 'F'.
-        EXPECT_TRUE(isa<CompoundStmt>(Parents[3].get().Node.get<Stmt>()));
-      },
-      SelectionFinderVisitor::Lang_OBJC);
-  // From '[self f: 2 with: 3]' until just before 'x = 1;':
-  findSelectedASTNodesWithRange(
-      Source, {5, 2}, FileRange{{5, 2}, {9, 1}},
-      [](SourceRange SelectionRange, Optional<SelectedASTNode> Node) {
-        EXPECT_TRUE(Node);
-        Optional<CodeRangeASTSelection> SelectedCode =
-            CodeRangeASTSelection::create(SelectionRange, std::move(*Node));
-        EXPECT_TRUE(SelectedCode);
-        EXPECT_EQ(SelectedCode->size(), 2u);
-        EXPECT_TRUE(isa<ObjCMessageExpr>((*SelectedCode)[0]));
-        EXPECT_TRUE(isa<IfStmt>((*SelectedCode)[1]));
-        ArrayRef<SelectedASTNode::ReferenceType> Parents =
-            SelectedCode->getParents();
-        EXPECT_EQ(Parents.size(), 4u);
-        EXPECT_TRUE(
-            isa<TranslationUnitDecl>(Parents[0].get().Node.get<Decl>()));
-        // 'I' @implementation.
-        EXPECT_TRUE(isa<ObjCImplDecl>(Parents[1].get().Node.get<Decl>()));
-        // Function 'f' definition.
-        EXPECT_TRUE(isa<ObjCMethodDecl>(Parents[2].get().Node.get<Decl>()));
-        // Function body of function 'F'.
-        EXPECT_TRUE(isa<CompoundStmt>(Parents[3].get().Node.get<Stmt>()));
-      },
-      SelectionFinderVisitor::Lang_OBJC);
-}
-
-TEST(ASTSelectionFinder, CanonicalizeObjCStringLiteral) {
-  StringRef Source = R"(
-void foo() {
-  (void)@"test";
-}
-      )";
-  // Just '"test"':
-  findSelectedASTNodesWithRange(
-      Source, {3, 10}, FileRange{{3, 10}, {3, 16}},
-      [](SourceRange SelectionRange, Optional<SelectedASTNode> Node) {
-        EXPECT_TRUE(Node);
-        Optional<CodeRangeASTSelection> SelectedCode =
-            CodeRangeASTSelection::create(SelectionRange, std::move(*Node));
-        EXPECT_TRUE(SelectedCode);
-        EXPECT_EQ(SelectedCode->size(), 1u);
-        EXPECT_TRUE(isa<ObjCStringLiteral>((*SelectedCode)[0]));
-      },
-      SelectionFinderVisitor::Lang_OBJC);
-  // Just 'test':
-  findSelectedASTNodesWithRange(
-      Source, {3, 11}, FileRange{{3, 11}, {3, 15}},
-      [](SourceRange SelectionRange, Optional<SelectedASTNode> Node) {
-        EXPECT_TRUE(Node);
-        Optional<CodeRangeASTSelection> SelectedCode =
-            CodeRangeASTSelection::create(SelectionRange, std::move(*Node));
-        EXPECT_TRUE(SelectedCode);
-        EXPECT_EQ(SelectedCode->size(), 1u);
-        EXPECT_TRUE(isa<ObjCStringLiteral>((*SelectedCode)[0]));
-      },
-      SelectionFinderVisitor::Lang_OBJC);
-}
-
-TEST(ASTSelectionFinder, CanonicalizeMemberCalleeToCall) {
-  StringRef Source = R"(
-class AClass { public:
-  void method();
-  int afield;
-  void selectWholeCallWhenJustMethodSelected(int &i) {
-    method();
-  }
-};
-void selectWholeCallWhenJustMethodSelected() {
-  AClass a;
-  a.method();
-}
-void dontSelectArgument(AClass &a) {
-  a.selectWholeCallWhenJustMethodSelected(a.afield);
-}
-     )";
-  // Just 'method' with implicit 'this':
-  findSelectedASTNodesWithRange(
-      Source, {6, 5}, FileRange{{6, 5}, {6, 11}},
-      [](SourceRange SelectionRange, Optional<SelectedASTNode> Node) {
-        EXPECT_TRUE(Node);
-        Optional<CodeRangeASTSelection> SelectedCode =
-            CodeRangeASTSelection::create(SelectionRange, std::move(*Node));
-        EXPECT_TRUE(SelectedCode);
-        EXPECT_EQ(SelectedCode->size(), 1u);
-        EXPECT_TRUE(isa<CXXMemberCallExpr>((*SelectedCode)[0]));
-      });
-  // Just 'method':
-  findSelectedASTNodesWithRange(
-      Source, {11, 5}, FileRange{{11, 5}, {11, 11}},
-      [](SourceRange SelectionRange, Optional<SelectedASTNode> Node) {
-        EXPECT_TRUE(Node);
-        Optional<CodeRangeASTSelection> SelectedCode =
-            CodeRangeASTSelection::create(SelectionRange, std::move(*Node));
-        EXPECT_TRUE(SelectedCode);
-        EXPECT_EQ(SelectedCode->size(), 1u);
-        EXPECT_TRUE(isa<CXXMemberCallExpr>((*SelectedCode)[0]));
-      });
-  // Just 'afield', which should not select the call.
-  findSelectedASTNodesWithRange(
-      Source, {14, 5}, FileRange{{14, 45}, {14, 51}},
-      [](SourceRange SelectionRange, Optional<SelectedASTNode> Node) {
-        EXPECT_TRUE(Node);
-        Optional<CodeRangeASTSelection> SelectedCode =
-            CodeRangeASTSelection::create(SelectionRange, std::move(*Node));
-        EXPECT_TRUE(SelectedCode);
-        EXPECT_EQ(SelectedCode->size(), 1u);
-        EXPECT_FALSE(isa<CXXMemberCallExpr>((*SelectedCode)[0]));
-      });
-}
-
-TEST(ASTSelectionFinder, CanonicalizeFuncCalleeToCall) {
-  StringRef Source = R"(
-void function();
-
-void test() {
-  function();
-}
-     )";
-  // Just 'function':
-  findSelectedASTNodesWithRange(
-      Source, {5, 3}, FileRange{{5, 3}, {5, 11}},
-      [](SourceRange SelectionRange, Optional<SelectedASTNode> Node) {
-        EXPECT_TRUE(Node);
-        Node->dump();
-        Optional<CodeRangeASTSelection> SelectedCode =
-            CodeRangeASTSelection::create(SelectionRange, std::move(*Node));
-        EXPECT_TRUE(SelectedCode);
-        EXPECT_EQ(SelectedCode->size(), 1u);
-        EXPECT_TRUE(isa<CallExpr>((*SelectedCode)[0]));
-        EXPECT_TRUE(isa<CompoundStmt>(
-            SelectedCode->getParents()[SelectedCode->getParents().size() - 1]
-                .get()
-                .Node.get<Stmt>()));
-      });
-}
-
-} // end anonymous namespace
diff --git a/gnu/llvm/clang/unittests/Tooling/CMakeLists.txt b/gnu/llvm/clang/unittests/Tooling/CMakeLists.txt
deleted file mode 100644
index 27b5e30f76b..00000000000
--- a/gnu/llvm/clang/unittests/Tooling/CMakeLists.txt
+++ /dev/null
@@ -1,91 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  ${LLVM_TARGETS_TO_BUILD}
-  Option
-  FrontendOpenMP
-  Support
-  )
-
-
-add_clang_unittest(ToolingTests
-  ASTSelectionTest.cpp
-  CastExprTest.cpp
-  CommentHandlerTest.cpp
-  CompilationDatabaseTest.cpp
-  DependencyScannerTest.cpp
-  DiagnosticsYamlTest.cpp
-  ExecutionTest.cpp
-  FixItTest.cpp
-  HeaderIncludesTest.cpp
-  LexicallyOrderedRecursiveASTVisitorTest.cpp
-  LookupTest.cpp
-  QualTypeNamesTest.cpp
-  RangeSelectorTest.cpp
-  RecursiveASTVisitorTests/Attr.cpp
-  RecursiveASTVisitorTests/CallbacksLeaf.cpp
-  RecursiveASTVisitorTests/CallbacksUnaryOperator.cpp
-  RecursiveASTVisitorTests/CallbacksBinaryOperator.cpp
-  RecursiveASTVisitorTests/CallbacksCompoundAssignOperator.cpp
-  RecursiveASTVisitorTests/CallbacksCallExpr.cpp
-  RecursiveASTVisitorTests/Class.cpp
-  RecursiveASTVisitorTests/Concept.cpp
-  RecursiveASTVisitorTests/ConstructExpr.cpp
-  RecursiveASTVisitorTests/CXXBoolLiteralExpr.cpp
-  RecursiveASTVisitorTests/CXXMemberCall.cpp
-  RecursiveASTVisitorTests/CXXMethodDecl.cpp
-  RecursiveASTVisitorTests/CXXOperatorCallExprTraverser.cpp
-  RecursiveASTVisitorTests/DeclRefExpr.cpp
-  RecursiveASTVisitorTests/ImplicitCtor.cpp
-  RecursiveASTVisitorTests/ImplicitCtorInitializer.cpp
-  RecursiveASTVisitorTests/InitListExprPostOrder.cpp
-  RecursiveASTVisitorTests/InitListExprPostOrderNoQueue.cpp
-  RecursiveASTVisitorTests/InitListExprPreOrder.cpp
-  RecursiveASTVisitorTests/InitListExprPreOrderNoQueue.cpp
-  RecursiveASTVisitorTests/IntegerLiteral.cpp
-  RecursiveASTVisitorTests/LambdaDefaultCapture.cpp
-  RecursiveASTVisitorTests/LambdaExpr.cpp
-  RecursiveASTVisitorTests/LambdaTemplateParams.cpp
-  RecursiveASTVisitorTests/MemberPointerTypeLoc.cpp
-  RecursiveASTVisitorTests/NestedNameSpecifiers.cpp
-  RecursiveASTVisitorTests/ParenExpr.cpp
-  RecursiveASTVisitorTests/TemplateArgumentLocTraverser.cpp
-  RecursiveASTVisitorTests/TraversalScope.cpp
-  RecursiveASTVisitorTestDeclVisitor.cpp
-  RecursiveASTVisitorTestPostOrderVisitor.cpp
-  RecursiveASTVisitorTestTypeLocVisitor.cpp
-  RefactoringActionRulesTest.cpp
-  RefactoringCallbacksTest.cpp
-  RefactoringTest.cpp
-  ReplacementsYamlTest.cpp
-  RewriterTest.cpp
-  SourceCodeBuildersTest.cpp
-  SourceCodeTest.cpp
-  StencilTest.cpp
-  ToolingTest.cpp
-  TransformerTest.cpp
-  )
-
-clang_target_link_libraries(ToolingTests
-  PRIVATE
-  clangAST
-  clangASTMatchers
-  clangBasic
-  clangDependencyScanning
-  clangDriver
-  clangFormat
-  clangFrontend
-  clangLex
-  clangRewrite
-  clangSerialization
-  clangTooling
-  clangToolingCore
-  clangToolingInclusions
-  clangToolingRefactoring
-  clangTransformer
-  )
-
-target_link_libraries(ToolingTests
-  PRIVATE
-  LLVMTestingSupport
-)
-
-add_subdirectory(Syntax)
diff --git a/gnu/llvm/clang/unittests/Tooling/CastExprTest.cpp b/gnu/llvm/clang/unittests/Tooling/CastExprTest.cpp
deleted file mode 100644
index cda963a6a89..00000000000
--- a/gnu/llvm/clang/unittests/Tooling/CastExprTest.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-//===- unittest/Tooling/CastExprTest.cpp ----------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "TestVisitor.h"
-
-using namespace clang;
-
-namespace {
-
-struct CastExprVisitor : TestVisitor<CastExprVisitor> {
-  std::function<void(ExplicitCastExpr *)> OnExplicitCast;
-
-  bool VisitExplicitCastExpr(ExplicitCastExpr *Expr) {
-    if (OnExplicitCast)
-      OnExplicitCast(Expr);
-    return true;
-  }
-};
-
-TEST(CastExprTest, GetSubExprAsWrittenThroughMaterializedTemporary) {
-    CastExprVisitor Visitor;
-    Visitor.OnExplicitCast = [](ExplicitCastExpr *Expr) {
-      auto Sub = Expr->getSubExprAsWritten();
-      EXPECT_TRUE(isa<DeclRefExpr>(Sub))
-        << "Expected DeclRefExpr, but saw " << Sub->getStmtClassName();
-    };
-    Visitor.runOver("struct S1 {};\n"
-                    "struct S2 { operator S1(); };\n"
-                    "S1 f(S2 s) { return static_cast<S1>(s); }\n");
-}
-
-// Verify that getSubExprAsWritten looks through a ConstantExpr in a scenario
-// like
-//
-//   CXXFunctionalCastExpr functional cast to struct S <ConstructorConversion>
-//   `-ConstantExpr 'S'
-//     |-value: Struct
-//     `-CXXConstructExpr 'S' 'void (int)'
-//       `-IntegerLiteral 'int' 0
-TEST(CastExprTest, GetSubExprAsWrittenThroughConstantExpr) {
-    CastExprVisitor Visitor;
-    Visitor.OnExplicitCast = [](ExplicitCastExpr *Expr) {
-      auto *Sub = Expr->getSubExprAsWritten();
-      EXPECT_TRUE(isa<IntegerLiteral>(Sub))
-        << "Expected IntegerLiteral, but saw " << Sub->getStmtClassName();
-    };
-    Visitor.runOver("struct S { consteval S(int) {} };\n"
-                    "S f() { return S(0); }\n",
-                    CastExprVisitor::Lang_CXX2a);
-}
-
-}
diff --git a/gnu/llvm/clang/unittests/Tooling/CommentHandlerTest.cpp b/gnu/llvm/clang/unittests/Tooling/CommentHandlerTest.cpp
deleted file mode 100644
index 7eb11ccd6ee..00000000000
--- a/gnu/llvm/clang/unittests/Tooling/CommentHandlerTest.cpp
+++ /dev/null
@@ -1,223 +0,0 @@
-//===- unittest/Tooling/CommentHandlerTest.cpp -----------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "TestVisitor.h"
-#include "clang/Lex/Preprocessor.h"
-
-namespace clang {
-
-struct Comment {
-  Comment(const std::string &Message, unsigned Line, unsigned Col)
-    : Message(Message), Line(Line), Col(Col) { }
-
-  std::string Message;
-  unsigned Line, Col;
-};
-
-class CommentVerifier;
-typedef std::vector<Comment> CommentList;
-
-class CommentHandlerVisitor : public TestVisitor<CommentHandlerVisitor>,
-                              public CommentHandler {
-  typedef TestVisitor<CommentHandlerVisitor> base;
-
-public:
-  CommentHandlerVisitor() : base(), PP(nullptr), Verified(false) {}
-
-  ~CommentHandlerVisitor() override {
-    EXPECT_TRUE(Verified) << "CommentVerifier not accessed";
-  }
-
-  bool HandleComment(Preprocessor &PP, SourceRange Loc) override {
-    assert(&PP == this->PP && "Preprocessor changed!");
-
-    SourceLocation Start = Loc.getBegin();
-    SourceManager &SM = PP.getSourceManager();
-    std::string C(SM.getCharacterData(Start),
-                  SM.getCharacterData(Loc.getEnd()));
-
-    bool Invalid;
-    unsigned CLine = SM.getSpellingLineNumber(Start, &Invalid);
-    EXPECT_TRUE(!Invalid) << "Invalid line number on comment " << C;
-
-    unsigned CCol = SM.getSpellingColumnNumber(Start, &Invalid);
-    EXPECT_TRUE(!Invalid) << "Invalid column number on comment " << C;
-
-    Comments.push_back(Comment(C, CLine, CCol));
-    return false;
-  }
-
-  CommentVerifier GetVerifier();
-
-protected:
-  std::unique_ptr<ASTFrontendAction> CreateTestAction() override {
-    return std::make_unique<CommentHandlerAction>(this);
-  }
-
-private:
-  Preprocessor *PP;
-  CommentList Comments;
-  bool Verified;
-
-  class CommentHandlerAction : public base::TestAction {
-  public:
-    CommentHandlerAction(CommentHandlerVisitor *Visitor)
-        : TestAction(Visitor) { }
-
-    bool BeginSourceFileAction(CompilerInstance &CI) override {
-      CommentHandlerVisitor *V =
-          static_cast<CommentHandlerVisitor*>(this->Visitor);
-      V->PP = &CI.getPreprocessor();
-      V->PP->addCommentHandler(V);
-      return true;
-    }
-
-    void EndSourceFileAction() override {
-      CommentHandlerVisitor *V =
-          static_cast<CommentHandlerVisitor*>(this->Visitor);
-      V->PP->removeCommentHandler(V);
-    }
-  };
-};
-
-class CommentVerifier {
-  CommentList::const_iterator Current;
-  CommentList::const_iterator End;
-  Preprocessor *PP;
-
-public:
-  CommentVerifier(const CommentList &Comments, Preprocessor *PP)
-      : Current(Comments.begin()), End(Comments.end()), PP(PP)
-    { }
-
-  CommentVerifier(CommentVerifier &&C) : Current(C.Current), End(C.End), PP(C.PP) {
-    C.Current = C.End;
-  }
-
-  ~CommentVerifier() {
-    if (Current != End) {
-      EXPECT_TRUE(Current == End) << "Unexpected comment \""
-        << Current->Message << "\" at line " << Current->Line << ", column "
-        << Current->Col;
-    }
-  }
-
-  void Match(const char *Message, unsigned Line, unsigned Col) {
-    EXPECT_TRUE(Current != End) << "Comment " << Message << " not found";
-    if (Current == End) return;
-
-    const Comment &C = *Current;
-    EXPECT_TRUE(C.Message == Message && C.Line == Line && C.Col == Col)
-      <<   "Expected comment \"" << Message
-      << "\" at line " << Line   << ", column " << Col
-      << "\nActual comment   \"" << C.Message
-      << "\" at line " << C.Line << ", column " << C.Col;
-
-    ++Current;
-  }
-};
-
-CommentVerifier CommentHandlerVisitor::GetVerifier() {
-  Verified = true;
-  return CommentVerifier(Comments, PP);
-}
-
-
-TEST(CommentHandlerTest, BasicTest1) {
-  CommentHandlerVisitor Visitor;
-  EXPECT_TRUE(Visitor.runOver("class X {}; int main() { return 0; }"));
-  CommentVerifier Verifier = Visitor.GetVerifier();
-}
-
-TEST(CommentHandlerTest, BasicTest2) {
-  CommentHandlerVisitor Visitor;
-  EXPECT_TRUE(Visitor.runOver(
-        "class X {}; int main() { /* comment */ return 0; }"));
-  CommentVerifier Verifier = Visitor.GetVerifier();
-  Verifier.Match("/* comment */", 1, 26);
-}
-
-TEST(CommentHandlerTest, BasicTest3) {
-  CommentHandlerVisitor Visitor;
-  EXPECT_TRUE(Visitor.runOver(
-        "class X {}; // comment 1\n"
-        "int main() {\n"
-        "  // comment 2\n"
-        "  return 0;\n"
-        "}"));
-  CommentVerifier Verifier = Visitor.GetVerifier();
-  Verifier.Match("// comment 1", 1, 13);
-  Verifier.Match("// comment 2", 3, 3);
-}
-
-TEST(CommentHandlerTest, IfBlock1) {
-  CommentHandlerVisitor Visitor;
-  EXPECT_TRUE(Visitor.runOver(
-        "#if 0\n"
-        "// ignored comment\n"
-        "#endif\n"
-        "// visible comment\n"));
-  CommentVerifier Verifier = Visitor.GetVerifier();
-  Verifier.Match("// visible comment", 4, 1);
-}
-
-TEST(CommentHandlerTest, IfBlock2) {
-  CommentHandlerVisitor Visitor;
-  EXPECT_TRUE(Visitor.runOver(
-        "#define TEST        // visible_1\n"
-        "#ifndef TEST        // visible_2\n"
-        "                    // ignored_3\n"
-        "# ifdef UNDEFINED   // ignored_4\n"
-        "# endif             // ignored_5\n"
-        "#elif defined(TEST) // visible_6\n"
-        "# if 1              // visible_7\n"
-        "                    // visible_8\n"
-        "# else              // visible_9\n"
-        "                    // ignored_10\n"
-        "#  ifndef TEST      // ignored_11\n"
-        "#  endif            // ignored_12\n"
-        "# endif             // visible_13\n"
-        "#endif              // visible_14\n"));
-
-  CommentVerifier Verifier = Visitor.GetVerifier();
-  Verifier.Match("// visible_1", 1, 21);
-  Verifier.Match("// visible_2", 2, 21);
-  Verifier.Match("// visible_6", 6, 21);
-  Verifier.Match("// visible_7", 7, 21);
-  Verifier.Match("// visible_8", 8, 21);
-  Verifier.Match("// visible_9", 9, 21);
-  Verifier.Match("// visible_13", 13, 21);
-  Verifier.Match("// visible_14", 14, 21);
-}
-
-TEST(CommentHandlerTest, IfBlock3) {
-  const char *Source =
-        "/* commented out ...\n"
-        "#if 0\n"
-        "// enclosed\n"
-        "#endif */";
-
-  CommentHandlerVisitor Visitor;
-  EXPECT_TRUE(Visitor.runOver(Source));
-  CommentVerifier Verifier = Visitor.GetVerifier();
-  Verifier.Match(Source, 1, 1);
-}
-
-TEST(CommentHandlerTest, PPDirectives) {
-  CommentHandlerVisitor Visitor;
-  EXPECT_TRUE(Visitor.runOver(
-        "#warning Y   // ignored_1\n" // #warning takes whole line as message
-        "#undef MACRO // visible_2\n"
-        "#line 1      // visible_3\n"));
-
-  CommentVerifier Verifier = Visitor.GetVerifier();
-  Verifier.Match("// visible_2", 2, 14);
-  Verifier.Match("// visible_3", 3, 14);
-}
-
-} // end namespace clang
diff --git a/gnu/llvm/clang/unittests/Tooling/CompilationDatabaseTest.cpp b/gnu/llvm/clang/unittests/Tooling/CompilationDatabaseTest.cpp
deleted file mode 100644
index 218a352f86f..00000000000
--- a/gnu/llvm/clang/unittests/Tooling/CompilationDatabaseTest.cpp
+++ /dev/null
@@ -1,977 +0,0 @@
-//===- unittest/Tooling/CompilationDatabaseTest.cpp -----------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/AST/DeclCXX.h"
-#include "clang/AST/DeclGroup.h"
-#include "clang/Frontend/FrontendAction.h"
-#include "clang/Tooling/CompilationDatabase.h"
-#include "clang/Tooling/FileMatchTrie.h"
-#include "clang/Tooling/JSONCompilationDatabase.h"
-#include "clang/Tooling/Tooling.h"
-#include "llvm/Support/Path.h"
-#include "llvm/Support/TargetSelect.h"
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-
-namespace clang {
-namespace tooling {
-
-using testing::ElementsAre;
-using testing::EndsWith;
-
-static void expectFailure(StringRef JSONDatabase, StringRef Explanation) {
-  std::string ErrorMessage;
-  EXPECT_EQ(nullptr,
-            JSONCompilationDatabase::loadFromBuffer(JSONDatabase, ErrorMessage,
-                                                    JSONCommandLineSyntax::Gnu))
-      << "Expected an error because of: " << Explanation.str();
-}
-
-TEST(JSONCompilationDatabase, ErrsOnInvalidFormat) {
-  expectFailure("", "Empty database");
-  expectFailure("{", "Invalid JSON");
-  expectFailure("[[]]", "Array instead of object");
-  expectFailure("[{\"a\":[]}]", "Array instead of value");
-  expectFailure("[{\"a\":\"b\"}]", "Unknown key");
-  expectFailure("[{[]:\"\"}]", "Incorrectly typed entry");
-  expectFailure("[{}]", "Empty entry");
-  expectFailure("[{\"directory\":\"\",\"command\":\"\"}]", "Missing file");
-  expectFailure("[{\"directory\":\"\",\"file\":\"\"}]", "Missing command or arguments");
-  expectFailure("[{\"command\":\"\",\"file\":\"\"}]", "Missing directory");
-  expectFailure("[{\"directory\":\"\",\"arguments\":[]}]", "Missing file");
-  expectFailure("[{\"arguments\":\"\",\"file\":\"\"}]", "Missing directory");
-  expectFailure("[{\"directory\":\"\",\"arguments\":\"\",\"file\":\"\"}]", "Arguments not array");
-  expectFailure("[{\"directory\":\"\",\"command\":[],\"file\":\"\"}]", "Command not string");
-  expectFailure("[{\"directory\":\"\",\"arguments\":[[]],\"file\":\"\"}]",
-                "Arguments contain non-string");
-  expectFailure("[{\"output\":[]}]", "Expected strings as value.");
-}
-
-static std::vector<std::string> getAllFiles(StringRef JSONDatabase,
-                                            std::string &ErrorMessage,
-                                            JSONCommandLineSyntax Syntax) {
-  std::unique_ptr<CompilationDatabase> Database(
-      JSONCompilationDatabase::loadFromBuffer(JSONDatabase, ErrorMessage,
-                                              Syntax));
-  if (!Database) {
-    ADD_FAILURE() << ErrorMessage;
-    return std::vector<std::string>();
-  }
-  return Database->getAllFiles();
-}
-
-static std::vector<CompileCommand>
-getAllCompileCommands(JSONCommandLineSyntax Syntax, StringRef JSONDatabase,
-                      std::string &ErrorMessage) {
-  std::unique_ptr<CompilationDatabase> Database(
-      JSONCompilationDatabase::loadFromBuffer(JSONDatabase, ErrorMessage,
-                                              Syntax));
-  if (!Database) {
-    ADD_FAILURE() << ErrorMessage;
-    return std::vector<CompileCommand>();
-  }
-  return Database->getAllCompileCommands();
-}
-
-TEST(JSONCompilationDatabase, GetAllFiles) {
-  std::string ErrorMessage;
-  EXPECT_EQ(std::vector<std::string>(),
-            getAllFiles("[]", ErrorMessage, JSONCommandLineSyntax::Gnu))
-      << ErrorMessage;
-
-  std::vector<std::string> expected_files;
-  SmallString<16> PathStorage;
-  llvm::sys::path::native("//net/dir/file1", PathStorage);
-  expected_files.push_back(std::string(PathStorage.str()));
-  llvm::sys::path::native("//net/dir/file2", PathStorage);
-  expected_files.push_back(std::string(PathStorage.str()));
-  llvm::sys::path::native("//net/file1", PathStorage);
-  expected_files.push_back(std::string(PathStorage.str()));
-  EXPECT_EQ(expected_files,
-            getAllFiles("[{\"directory\":\"//net/dir\","
-                        "\"command\":\"command\","
-                        "\"file\":\"file1\"},"
-                        " {\"directory\":\"//net/dir\","
-                        "\"command\":\"command\","
-                        "\"file\":\"../file1\"},"
-                        " {\"directory\":\"//net/dir\","
-                        "\"command\":\"command\","
-                        "\"file\":\"file2\"}]",
-                        ErrorMessage, JSONCommandLineSyntax::Gnu))
-      << ErrorMessage;
-}
-
-TEST(JSONCompilationDatabase, GetAllCompileCommands) {
-  std::string ErrorMessage;
-  EXPECT_EQ(
-      0u, getAllCompileCommands(JSONCommandLineSyntax::Gnu, "[]", ErrorMessage)
-              .size())
-      << ErrorMessage;
-
-  StringRef Directory1("//net/dir1");
-  StringRef FileName1("file1");
-  StringRef Command1("command1");
-  StringRef Output1("file1.o");
-  StringRef Directory2("//net/dir2");
-  StringRef FileName2("file2");
-  StringRef Command2("command2");
-  StringRef Output2("");
-
-  std::vector<CompileCommand> Commands = getAllCompileCommands(
-      JSONCommandLineSyntax::Gnu,
-      ("[{\"directory\":\"" + Directory1 + "\"," + "\"command\":\"" + Command1 +
-       "\","
-       "\"file\":\"" +
-       FileName1 + "\", \"output\":\"" +
-       Output1 + "\"},"
-                   " {\"directory\":\"" +
-       Directory2 + "\"," + "\"command\":\"" + Command2 + "\","
-                                                          "\"file\":\"" +
-       FileName2 + "\"}]")
-          .str(),
-      ErrorMessage);
-  EXPECT_EQ(2U, Commands.size()) << ErrorMessage;
-  EXPECT_EQ(Directory1, Commands[0].Directory) << ErrorMessage;
-  EXPECT_EQ(FileName1, Commands[0].Filename) << ErrorMessage;
-  EXPECT_EQ(Output1, Commands[0].Output) << ErrorMessage;
-  ASSERT_EQ(1u, Commands[0].CommandLine.size());
-  EXPECT_EQ(Command1, Commands[0].CommandLine[0]) << ErrorMessage;
-  EXPECT_EQ(Directory2, Commands[1].Directory) << ErrorMessage;
-  EXPECT_EQ(FileName2, Commands[1].Filename) << ErrorMessage;
-  EXPECT_EQ(Output2, Commands[1].Output) << ErrorMessage;
-  ASSERT_EQ(1u, Commands[1].CommandLine.size());
-  EXPECT_EQ(Command2, Commands[1].CommandLine[0]) << ErrorMessage;
-
-  // Check that order is preserved.
-  Commands = getAllCompileCommands(
-      JSONCommandLineSyntax::Gnu,
-      ("[{\"directory\":\"" + Directory2 + "\"," + "\"command\":\"" + Command2 +
-       "\","
-       "\"file\":\"" +
-       FileName2 + "\"},"
-                   " {\"directory\":\"" +
-       Directory1 + "\"," + "\"command\":\"" + Command1 + "\","
-                                                          "\"file\":\"" +
-       FileName1 + "\"}]")
-          .str(),
-      ErrorMessage);
-  EXPECT_EQ(2U, Commands.size()) << ErrorMessage;
-  EXPECT_EQ(Directory2, Commands[0].Directory) << ErrorMessage;
-  EXPECT_EQ(FileName2, Commands[0].Filename) << ErrorMessage;
-  ASSERT_EQ(1u, Commands[0].CommandLine.size());
-  EXPECT_EQ(Command2, Commands[0].CommandLine[0]) << ErrorMessage;
-  EXPECT_EQ(Directory1, Commands[1].Directory) << ErrorMessage;
-  EXPECT_EQ(FileName1, Commands[1].Filename) << ErrorMessage;
-  ASSERT_EQ(1u, Commands[1].CommandLine.size());
-  EXPECT_EQ(Command1, Commands[1].CommandLine[0]) << ErrorMessage;
-}
-
-static CompileCommand findCompileArgsInJsonDatabase(StringRef FileName,
-                                                    std::string JSONDatabase,
-                                                    std::string &ErrorMessage) {
-  std::unique_ptr<CompilationDatabase> Database(
-      JSONCompilationDatabase::loadFromBuffer(JSONDatabase, ErrorMessage,
-                                              JSONCommandLineSyntax::Gnu));
-  if (!Database)
-    return CompileCommand();
-  // Overwrite the string to verify we're not reading from it later.
-  JSONDatabase.assign(JSONDatabase.size(), '*');
-  std::vector<CompileCommand> Commands = Database->getCompileCommands(FileName);
-  EXPECT_LE(Commands.size(), 1u);
-  if (Commands.empty())
-    return CompileCommand();
-  return Commands[0];
-}
-
-TEST(JSONCompilationDatabase, ArgumentsPreferredOverCommand) {
-   StringRef Directory("//net/dir");
-   StringRef FileName("//net/dir/filename");
-   StringRef Command("command");
-   StringRef Arguments = "arguments";
-   Twine ArgumentsAccumulate;
-   std::string ErrorMessage;
-   CompileCommand FoundCommand = findCompileArgsInJsonDatabase(
-      FileName,
-      ("[{\"directory\":\"" + Directory + "\","
-         "\"arguments\":[\"" + Arguments + "\"],"
-         "\"command\":\"" + Command + "\","
-         "\"file\":\"" + FileName + "\"}]").str(),
-      ErrorMessage);
-   EXPECT_EQ(Directory, FoundCommand.Directory) << ErrorMessage;
-   EXPECT_EQ(1u, FoundCommand.CommandLine.size()) << ErrorMessage;
-   EXPECT_EQ(Arguments, FoundCommand.CommandLine[0]) << ErrorMessage;
-}
-
-struct FakeComparator : public PathComparator {
-  ~FakeComparator() override {}
-  bool equivalent(StringRef FileA, StringRef FileB) const override {
-    return FileA.equals_insensitive(FileB);
-  }
-};
-
-class FileMatchTrieTest : public ::testing::Test {
-protected:
-  FileMatchTrieTest() : Trie(new FakeComparator()) {}
-
-  StringRef find(StringRef Path) {
-    llvm::raw_string_ostream ES(Error);
-    return Trie.findEquivalent(Path, ES);
-  }
-
-  FileMatchTrie Trie;
-  std::string Error;
-};
-
-TEST_F(FileMatchTrieTest, InsertingRelativePath) {
-  Trie.insert("//net/path/file.cc");
-  Trie.insert("file.cc");
-  EXPECT_EQ("//net/path/file.cc", find("//net/path/file.cc"));
-}
-
-TEST_F(FileMatchTrieTest, MatchingRelativePath) {
-  EXPECT_EQ("", find("file.cc"));
-}
-
-TEST_F(FileMatchTrieTest, ReturnsBestResults) {
-  Trie.insert("//net/d/c/b.cc");
-  Trie.insert("//net/d/b/b.cc");
-  EXPECT_EQ("//net/d/b/b.cc", find("//net/d/b/b.cc"));
-}
-
-TEST_F(FileMatchTrieTest, HandlesSymlinks) {
-  Trie.insert("//net/AA/file.cc");
-  EXPECT_EQ("//net/AA/file.cc", find("//net/aa/file.cc"));
-}
-
-TEST_F(FileMatchTrieTest, ReportsSymlinkAmbiguity) {
-  Trie.insert("//net/Aa/file.cc");
-  Trie.insert("//net/aA/file.cc");
-  EXPECT_TRUE(find("//net/aa/file.cc").empty());
-  EXPECT_EQ("Path is ambiguous", Error);
-}
-
-TEST_F(FileMatchTrieTest, LongerMatchingSuffixPreferred) {
-  Trie.insert("//net/src/Aa/file.cc");
-  Trie.insert("//net/src/aA/file.cc");
-  Trie.insert("//net/SRC/aa/file.cc");
-  EXPECT_EQ("//net/SRC/aa/file.cc", find("//net/src/aa/file.cc"));
-}
-
-TEST_F(FileMatchTrieTest, EmptyTrie) {
-  EXPECT_TRUE(find("//net/some/path").empty());
-}
-
-TEST_F(FileMatchTrieTest, NoResult) {
-  Trie.insert("//net/somepath/otherfile.cc");
-  Trie.insert("//net/otherpath/somefile.cc");
-  EXPECT_EQ("", find("//net/somepath/somefile.cc"));
-}
-
-TEST_F(FileMatchTrieTest, RootElementDifferent) {
-  Trie.insert("//net/path/file.cc");
-  Trie.insert("//net/otherpath/file.cc");
-  EXPECT_EQ("//net/path/file.cc", find("//net/path/file.cc"));
-}
-
-TEST_F(FileMatchTrieTest, CannotResolveRelativePath) {
-  EXPECT_EQ("", find("relative-path.cc"));
-  EXPECT_EQ("Cannot resolve relative paths", Error);
-}
-
-TEST_F(FileMatchTrieTest, SingleFile) {
-  Trie.insert("/root/RootFile.cc");
-  EXPECT_EQ("", find("/root/rootfile.cc"));
-  // Add subpath to avoid `if (Children.empty())` special case
-  // which we hit at previous `find()`.
-  Trie.insert("/root/otherpath/OtherFile.cc");
-  EXPECT_EQ("", find("/root/rootfile.cc"));
-}
-
-TEST(findCompileArgsInJsonDatabase, FindsNothingIfEmpty) {
-  std::string ErrorMessage;
-  CompileCommand NotFound = findCompileArgsInJsonDatabase(
-    "a-file.cpp", "", ErrorMessage);
-  EXPECT_TRUE(NotFound.CommandLine.empty()) << ErrorMessage;
-  EXPECT_TRUE(NotFound.Directory.empty()) << ErrorMessage;
-}
-
-TEST(findCompileArgsInJsonDatabase, ReadsSingleEntry) {
-  StringRef Directory("//net/some/directory");
-  StringRef FileName("//net/path/to/a-file.cpp");
-  StringRef Command("//net/path/to/compiler and some arguments");
-  std::string ErrorMessage;
-  CompileCommand FoundCommand = findCompileArgsInJsonDatabase(
-    FileName,
-    ("[{\"directory\":\"" + Directory + "\"," +
-       "\"command\":\"" + Command + "\","
-       "\"file\":\"" + FileName + "\"}]").str(),
-    ErrorMessage);
-  EXPECT_EQ(Directory, FoundCommand.Directory) << ErrorMessage;
-  ASSERT_EQ(4u, FoundCommand.CommandLine.size()) << ErrorMessage;
-  EXPECT_EQ("//net/path/to/compiler",
-            FoundCommand.CommandLine[0]) << ErrorMessage;
-  EXPECT_EQ("and", FoundCommand.CommandLine[1]) << ErrorMessage;
-  EXPECT_EQ("some", FoundCommand.CommandLine[2]) << ErrorMessage;
-  EXPECT_EQ("arguments", FoundCommand.CommandLine[3]) << ErrorMessage;
-
-  CompileCommand NotFound = findCompileArgsInJsonDatabase(
-    "a-file.cpp",
-    ("[{\"directory\":\"" + Directory + "\"," +
-       "\"command\":\"" + Command + "\","
-       "\"file\":\"" + FileName + "\"}]").str(),
-    ErrorMessage);
-  EXPECT_TRUE(NotFound.Directory.empty()) << ErrorMessage;
-  EXPECT_TRUE(NotFound.CommandLine.empty()) << ErrorMessage;
-}
-
-TEST(findCompileArgsInJsonDatabase, ReadsCompileCommandLinesWithSpaces) {
-  StringRef Directory("//net/some/directory");
-  StringRef FileName("//net/path/to/a-file.cpp");
-  StringRef Command("\\\"//net/path to compiler\\\" \\\"and an argument\\\"");
-  std::string ErrorMessage;
-  CompileCommand FoundCommand = findCompileArgsInJsonDatabase(
-    FileName,
-    ("[{\"directory\":\"" + Directory + "\"," +
-       "\"command\":\"" + Command + "\","
-       "\"file\":\"" + FileName + "\"}]").str(),
-    ErrorMessage);
-  ASSERT_EQ(2u, FoundCommand.CommandLine.size());
-  EXPECT_EQ("//net/path to compiler",
-            FoundCommand.CommandLine[0]) << ErrorMessage;
-  EXPECT_EQ("and an argument", FoundCommand.CommandLine[1]) << ErrorMessage;
-}
-
-TEST(findCompileArgsInJsonDatabase, ReadsDirectoryWithSpaces) {
-  StringRef Directory("//net/some directory / with spaces");
-  StringRef FileName("//net/path/to/a-file.cpp");
-  StringRef Command("a command");
-  std::string ErrorMessage;
-  CompileCommand FoundCommand = findCompileArgsInJsonDatabase(
-    FileName,
-    ("[{\"directory\":\"" + Directory + "\"," +
-       "\"command\":\"" + Command + "\","
-       "\"file\":\"" + FileName + "\"}]").str(),
-    ErrorMessage);
-  EXPECT_EQ(Directory, FoundCommand.Directory) << ErrorMessage;
-}
-
-TEST(findCompileArgsInJsonDatabase, FindsEntry) {
-  StringRef Directory("//net/directory");
-  StringRef FileName("file");
-  StringRef Command("command");
-  std::string JsonDatabase = "[";
-  for (int I = 0; I < 10; ++I) {
-    if (I > 0) JsonDatabase += ",";
-    JsonDatabase +=
-      ("{\"directory\":\"" + Directory + Twine(I) + "\"," +
-        "\"command\":\"" + Command + Twine(I) + "\","
-        "\"file\":\"" + FileName + Twine(I) + "\"}").str();
-  }
-  JsonDatabase += "]";
-  std::string ErrorMessage;
-  CompileCommand FoundCommand = findCompileArgsInJsonDatabase(
-    "//net/directory4/file4", JsonDatabase, ErrorMessage);
-  EXPECT_EQ("//net/directory4", FoundCommand.Directory) << ErrorMessage;
-  ASSERT_EQ(1u, FoundCommand.CommandLine.size()) << ErrorMessage;
-  EXPECT_EQ("command4", FoundCommand.CommandLine[0]) << ErrorMessage;
-}
-
-TEST(findCompileArgsInJsonDatabase, ParsesCompilerWrappers) {
-  std::vector<std::pair<std::string, std::string>> Cases = {
-      {"distcc gcc foo.c", "gcc foo.c"},
-      {"gomacc clang++ foo.c", "clang++ foo.c"},
-      {"sccache clang++ foo.c", "clang++ foo.c"},
-      {"ccache gcc foo.c", "gcc foo.c"},
-      {"ccache.exe gcc foo.c", "gcc foo.c"},
-      {"ccache g++.exe foo.c", "g++.exe foo.c"},
-      {"ccache distcc gcc foo.c", "gcc foo.c"},
-
-      {"distcc foo.c", "distcc foo.c"},
-      {"distcc -I/foo/bar foo.c", "distcc -I/foo/bar foo.c"},
-  };
-  std::string ErrorMessage;
-
-  for (const auto &Case : Cases) {
-    std::string DB =
-        R"([{"directory":"//net/dir", "file":"//net/dir/foo.c", "command":")" +
-        Case.first + "\"}]";
-    CompileCommand FoundCommand =
-        findCompileArgsInJsonDatabase("//net/dir/foo.c", DB, ErrorMessage);
-    EXPECT_EQ(Case.second, llvm::join(FoundCommand.CommandLine, " "))
-        << Case.first;
-  }
-}
-
-static std::vector<std::string> unescapeJsonCommandLine(StringRef Command) {
-  std::string JsonDatabase =
-    ("[{\"directory\":\"//net/root\", \"file\":\"test\", \"command\": \"" +
-     Command + "\"}]").str();
-  std::string ErrorMessage;
-  CompileCommand FoundCommand = findCompileArgsInJsonDatabase(
-    "//net/root/test", JsonDatabase, ErrorMessage);
-  EXPECT_TRUE(ErrorMessage.empty()) << ErrorMessage;
-  return FoundCommand.CommandLine;
-}
-
-TEST(unescapeJsonCommandLine, ReturnsEmptyArrayOnEmptyString) {
-  std::vector<std::string> Result = unescapeJsonCommandLine("");
-  EXPECT_TRUE(Result.empty());
-}
-
-TEST(unescapeJsonCommandLine, SplitsOnSpaces) {
-  std::vector<std::string> Result = unescapeJsonCommandLine("a b c");
-  ASSERT_EQ(3ul, Result.size());
-  EXPECT_EQ("a", Result[0]);
-  EXPECT_EQ("b", Result[1]);
-  EXPECT_EQ("c", Result[2]);
-}
-
-TEST(unescapeJsonCommandLine, MungesMultipleSpaces) {
-  std::vector<std::string> Result = unescapeJsonCommandLine("   a   b   ");
-  ASSERT_EQ(2ul, Result.size());
-  EXPECT_EQ("a", Result[0]);
-  EXPECT_EQ("b", Result[1]);
-}
-
-TEST(unescapeJsonCommandLine, UnescapesBackslashCharacters) {
-  std::vector<std::string> Backslash = unescapeJsonCommandLine("a\\\\\\\\");
-  ASSERT_EQ(1ul, Backslash.size());
-  EXPECT_EQ("a\\", Backslash[0]);
-  std::vector<std::string> Quote = unescapeJsonCommandLine("a\\\\\\\"");
-  ASSERT_EQ(1ul, Quote.size());
-  EXPECT_EQ("a\"", Quote[0]);
-}
-
-TEST(unescapeJsonCommandLine, DoesNotMungeSpacesBetweenQuotes) {
-  std::vector<std::string> Result = unescapeJsonCommandLine("\\\"  a  b  \\\"");
-  ASSERT_EQ(1ul, Result.size());
-  EXPECT_EQ("  a  b  ", Result[0]);
-}
-
-TEST(unescapeJsonCommandLine, AllowsMultipleQuotedArguments) {
-  std::vector<std::string> Result = unescapeJsonCommandLine(
-      "  \\\" a \\\"  \\\" b \\\"  ");
-  ASSERT_EQ(2ul, Result.size());
-  EXPECT_EQ(" a ", Result[0]);
-  EXPECT_EQ(" b ", Result[1]);
-}
-
-TEST(unescapeJsonCommandLine, AllowsEmptyArgumentsInQuotes) {
-  std::vector<std::string> Result = unescapeJsonCommandLine(
-      "\\\"\\\"\\\"\\\"");
-  ASSERT_EQ(1ul, Result.size());
-  EXPECT_TRUE(Result[0].empty()) << Result[0];
-}
-
-TEST(unescapeJsonCommandLine, ParsesEscapedQuotesInQuotedStrings) {
-  std::vector<std::string> Result = unescapeJsonCommandLine(
-      "\\\"\\\\\\\"\\\"");
-  ASSERT_EQ(1ul, Result.size());
-  EXPECT_EQ("\"", Result[0]);
-}
-
-TEST(unescapeJsonCommandLine, ParsesMultipleArgumentsWithEscapedCharacters) {
-  std::vector<std::string> Result = unescapeJsonCommandLine(
-      "  \\\\\\\"  \\\"a \\\\\\\" b \\\"     \\\"and\\\\\\\\c\\\"   \\\\\\\"");
-  ASSERT_EQ(4ul, Result.size());
-  EXPECT_EQ("\"", Result[0]);
-  EXPECT_EQ("a \" b ", Result[1]);
-  EXPECT_EQ("and\\c", Result[2]);
-  EXPECT_EQ("\"", Result[3]);
-}
-
-TEST(unescapeJsonCommandLine, ParsesStringsWithoutSpacesIntoSingleArgument) {
-  std::vector<std::string> QuotedNoSpaces = unescapeJsonCommandLine(
-      "\\\"a\\\"\\\"b\\\"");
-  ASSERT_EQ(1ul, QuotedNoSpaces.size());
-  EXPECT_EQ("ab", QuotedNoSpaces[0]);
-
-  std::vector<std::string> MixedNoSpaces = unescapeJsonCommandLine(
-      "\\\"a\\\"bcd\\\"ef\\\"\\\"\\\"\\\"g\\\"");
-  ASSERT_EQ(1ul, MixedNoSpaces.size());
-  EXPECT_EQ("abcdefg", MixedNoSpaces[0]);
-}
-
-TEST(unescapeJsonCommandLine, ParsesQuotedStringWithoutClosingQuote) {
-  std::vector<std::string> Unclosed = unescapeJsonCommandLine("\\\"abc");
-  ASSERT_EQ(1ul, Unclosed.size());
-  EXPECT_EQ("abc", Unclosed[0]);
-
-  std::vector<std::string> Empty = unescapeJsonCommandLine("\\\"");
-  ASSERT_EQ(1ul, Empty.size());
-  EXPECT_EQ("", Empty[0]);
-}
-
-TEST(unescapeJsonCommandLine, ParsesSingleQuotedString) {
-  std::vector<std::string> Args = unescapeJsonCommandLine("a'\\\\b \\\"c\\\"'");
-  ASSERT_EQ(1ul, Args.size());
-  EXPECT_EQ("a\\b \"c\"", Args[0]);
-}
-
-TEST(FixedCompilationDatabase, ReturnsFixedCommandLine) {
-  FixedCompilationDatabase Database(".", /*CommandLine*/ {"one", "two"});
-  StringRef FileName("source");
-  std::vector<CompileCommand> Result =
-    Database.getCompileCommands(FileName);
-  ASSERT_EQ(1ul, Result.size());
-  EXPECT_EQ(".", Result[0].Directory);
-  EXPECT_EQ(FileName, Result[0].Filename);
-  EXPECT_THAT(Result[0].CommandLine,
-              ElementsAre(EndsWith("clang-tool"), "one", "two", "source"));
-}
-
-TEST(FixedCompilationDatabase, GetAllFiles) {
-  std::vector<std::string> CommandLine;
-  CommandLine.push_back("one");
-  CommandLine.push_back("two");
-  FixedCompilationDatabase Database(".", CommandLine);
-
-  EXPECT_EQ(0ul, Database.getAllFiles().size());
-}
-
-TEST(FixedCompilationDatabase, GetAllCompileCommands) {
-  std::vector<std::string> CommandLine;
-  CommandLine.push_back("one");
-  CommandLine.push_back("two");
-  FixedCompilationDatabase Database(".", CommandLine);
-
-  EXPECT_EQ(0ul, Database.getAllCompileCommands().size());
-}
-
-TEST(FixedCompilationDatabase, FromBuffer) {
-  const char *Data = R"(
-
- -DFOO=BAR
-
---baz
-
-  )";
-  std::string ErrorMsg;
-  auto CDB =
-      FixedCompilationDatabase::loadFromBuffer("/cdb/dir", Data, ErrorMsg);
-
-  std::vector<CompileCommand> Result = CDB->getCompileCommands("/foo/bar.cc");
-  ASSERT_EQ(1ul, Result.size());
-  EXPECT_EQ("/cdb/dir", Result.front().Directory);
-  EXPECT_EQ("/foo/bar.cc", Result.front().Filename);
-  EXPECT_THAT(
-      Result.front().CommandLine,
-      ElementsAre(EndsWith("clang-tool"), "-DFOO=BAR", "--baz", "/foo/bar.cc"));
-}
-
-TEST(ParseFixedCompilationDatabase, ReturnsNullOnEmptyArgumentList) {
-  int Argc = 0;
-  std::string ErrorMsg;
-  std::unique_ptr<FixedCompilationDatabase> Database =
-      FixedCompilationDatabase::loadFromCommandLine(Argc, nullptr, ErrorMsg);
-  EXPECT_FALSE(Database);
-  EXPECT_TRUE(ErrorMsg.empty());
-  EXPECT_EQ(0, Argc);
-}
-
-TEST(ParseFixedCompilationDatabase, ReturnsNullWithoutDoubleDash) {
-  int Argc = 2;
-  const char *Argv[] = { "1", "2" };
-  std::string ErrorMsg;
-  std::unique_ptr<FixedCompilationDatabase> Database(
-      FixedCompilationDatabase::loadFromCommandLine(Argc, Argv, ErrorMsg));
-  EXPECT_FALSE(Database);
-  EXPECT_TRUE(ErrorMsg.empty());
-  EXPECT_EQ(2, Argc);
-}
-
-TEST(ParseFixedCompilationDatabase, ReturnsArgumentsAfterDoubleDash) {
-  int Argc = 5;
-  const char *Argv[] = {
-    "1", "2", "--\0no-constant-folding", "-DDEF3", "-DDEF4"
-  };
-  std::string ErrorMsg;
-  std::unique_ptr<FixedCompilationDatabase> Database(
-      FixedCompilationDatabase::loadFromCommandLine(Argc, Argv, ErrorMsg));
-  ASSERT_TRUE((bool)Database);
-  ASSERT_TRUE(ErrorMsg.empty());
-  std::vector<CompileCommand> Result =
-    Database->getCompileCommands("source");
-  ASSERT_EQ(1ul, Result.size());
-  ASSERT_EQ(".", Result[0].Directory);
-  ASSERT_THAT(Result[0].CommandLine, ElementsAre(EndsWith("clang-tool"),
-                                                 "-DDEF3", "-DDEF4", "source"));
-  EXPECT_EQ(2, Argc);
-}
-
-TEST(ParseFixedCompilationDatabase, ReturnsEmptyCommandLine) {
-  int Argc = 3;
-  const char *Argv[] = { "1", "2", "--\0no-constant-folding" };
-  std::string ErrorMsg;
-  std::unique_ptr<FixedCompilationDatabase> Database =
-      FixedCompilationDatabase::loadFromCommandLine(Argc, Argv, ErrorMsg);
-  ASSERT_TRUE((bool)Database);
-  ASSERT_TRUE(ErrorMsg.empty());
-  std::vector<CompileCommand> Result =
-    Database->getCompileCommands("source");
-  ASSERT_EQ(1ul, Result.size());
-  ASSERT_EQ(".", Result[0].Directory);
-  ASSERT_THAT(Result[0].CommandLine,
-              ElementsAre(EndsWith("clang-tool"), "source"));
-  EXPECT_EQ(2, Argc);
-}
-
-TEST(ParseFixedCompilationDatabase, HandlesPositionalArgs) {
-  const char *Argv[] = {"1", "2", "--", "-c", "somefile.cpp", "-DDEF3"};
-  int Argc = sizeof(Argv) / sizeof(char*);
-  std::string ErrorMsg;
-  std::unique_ptr<FixedCompilationDatabase> Database =
-      FixedCompilationDatabase::loadFromCommandLine(Argc, Argv, ErrorMsg);
-  ASSERT_TRUE((bool)Database);
-  ASSERT_TRUE(ErrorMsg.empty());
-  std::vector<CompileCommand> Result =
-    Database->getCompileCommands("source");
-  ASSERT_EQ(1ul, Result.size());
-  ASSERT_EQ(".", Result[0].Directory);
-  ASSERT_THAT(Result[0].CommandLine,
-              ElementsAre(EndsWith("clang-tool"), "-c", "-DDEF3", "source"));
-  EXPECT_EQ(2, Argc);
-}
-
-TEST(ParseFixedCompilationDatabase, HandlesPositionalArgsSyntaxOnly) {
-  // Adjust the given command line arguments to ensure that any positional
-  // arguments in them are stripped.
-  const char *Argv[] = {"--", "somefile.cpp", "-fsyntax-only", "-DDEF3"};
-  int Argc = llvm::array_lengthof(Argv);
-  std::string ErrorMessage;
-  std::unique_ptr<CompilationDatabase> Database =
-      FixedCompilationDatabase::loadFromCommandLine(Argc, Argv, ErrorMessage);
-  ASSERT_TRUE((bool)Database);
-  ASSERT_TRUE(ErrorMessage.empty());
-  std::vector<CompileCommand> Result = Database->getCompileCommands("source");
-  ASSERT_EQ(1ul, Result.size());
-  ASSERT_EQ(".", Result[0].Directory);
-  ASSERT_THAT(
-      Result[0].CommandLine,
-      ElementsAre(EndsWith("clang-tool"), "-fsyntax-only", "-DDEF3", "source"));
-}
-
-TEST(ParseFixedCompilationDatabase, HandlesArgv0) {
-  const char *Argv[] = {"1", "2", "--", "mytool", "somefile.cpp"};
-  int Argc = sizeof(Argv) / sizeof(char*);
-  std::string ErrorMsg;
-  std::unique_ptr<FixedCompilationDatabase> Database =
-      FixedCompilationDatabase::loadFromCommandLine(Argc, Argv, ErrorMsg);
-  ASSERT_TRUE((bool)Database);
-  ASSERT_TRUE(ErrorMsg.empty());
-  std::vector<CompileCommand> Result =
-    Database->getCompileCommands("source");
-  ASSERT_EQ(1ul, Result.size());
-  ASSERT_EQ(".", Result[0].Directory);
-  std::vector<std::string> Expected;
-  ASSERT_THAT(Result[0].CommandLine,
-              ElementsAre(EndsWith("clang-tool"), "source"));
-  EXPECT_EQ(2, Argc);
-}
-
-struct MemCDB : public CompilationDatabase {
-  using EntryMap = llvm::StringMap<SmallVector<CompileCommand, 1>>;
-  EntryMap Entries;
-  MemCDB(const EntryMap &E) : Entries(E) {}
-
-  std::vector<CompileCommand> getCompileCommands(StringRef F) const override {
-    auto Ret = Entries.lookup(F);
-    return {Ret.begin(), Ret.end()};
-  }
-
-  std::vector<std::string> getAllFiles() const override {
-    std::vector<std::string> Result;
-    for (const auto &Entry : Entries)
-      Result.push_back(std::string(Entry.first()));
-    return Result;
-  }
-};
-
-class MemDBTest : public ::testing::Test {
-protected:
-  // Adds an entry to the underlying compilation database.
-  // A flag is injected: -D <File>, so the command used can be identified.
-  void add(StringRef File, StringRef Clang, StringRef Flags) {
-    SmallVector<StringRef, 8> Argv = {Clang, File, "-D", File};
-    llvm::SplitString(Flags, Argv);
-
-    // Trim double quotation from the argumnets if any.
-    for (auto *It = Argv.begin(); It != Argv.end(); ++It)
-      *It = It->trim("\"");
-
-    SmallString<32> Dir;
-    llvm::sys::path::system_temp_directory(false, Dir);
-
-    Entries[path(File)].push_back(
-        {Dir, path(File), {Argv.begin(), Argv.end()}, "foo.o"});
-  }
-  void add(StringRef File, StringRef Flags = "") { add(File, "clang", Flags); }
-
-  // Turn a unix path fragment (foo/bar.h) into a native path (C:\tmp\foo\bar.h)
-  std::string path(llvm::SmallString<32> File) {
-    llvm::SmallString<32> Dir;
-    llvm::sys::path::system_temp_directory(false, Dir);
-    llvm::sys::path::native(File);
-    llvm::SmallString<64> Result;
-    llvm::sys::path::append(Result, Dir, File);
-    return std::string(Result.str());
-  }
-
-  MemCDB::EntryMap Entries;
-};
-
-class InterpolateTest : public MemDBTest {
-protected:
-  // Look up the command from a relative path, and return it in string form.
-  // The input file is not included in the returned command.
-  std::string getCommand(llvm::StringRef F, bool MakeNative = true) {
-    auto Results =
-        inferMissingCompileCommands(std::make_unique<MemCDB>(Entries))
-            ->getCompileCommands(MakeNative ? path(F) : F);
-    if (Results.empty())
-      return "none";
-    // drop the input file argument, so tests don't have to deal with path().
-    EXPECT_EQ(Results[0].CommandLine.back(), MakeNative ? path(F) : F)
-        << "Last arg should be the file";
-    Results[0].CommandLine.pop_back();
-    return llvm::join(Results[0].CommandLine, " ");
-  }
-
-  // Parse the file whose command was used out of the Heuristic string.
-  std::string getProxy(llvm::StringRef F) {
-    auto Results =
-        inferMissingCompileCommands(std::make_unique<MemCDB>(Entries))
-            ->getCompileCommands(path(F));
-    if (Results.empty())
-      return "none";
-    StringRef Proxy = Results.front().Heuristic;
-    if (!Proxy.consume_front("inferred from "))
-      return "";
-    // We have a proxy file, convert back to a unix relative path.
-    // This is a bit messy, but we do need to test these strings somehow...
-    llvm::SmallString<32> TempDir;
-    llvm::sys::path::system_temp_directory(false, TempDir);
-    Proxy.consume_front(TempDir);
-    Proxy.consume_front(llvm::sys::path::get_separator());
-    llvm::SmallString<32> Result = Proxy;
-    llvm::sys::path::native(Result, llvm::sys::path::Style::posix);
-    return std::string(Result.str());
-  }
-};
-
-TEST_F(InterpolateTest, Nearby) {
-  add("dir/foo.cpp");
-  add("dir/bar.cpp");
-  add("an/other/foo.cpp");
-
-  // great: dir and name both match (prefix or full, case insensitive)
-  EXPECT_EQ(getProxy("dir/f.cpp"), "dir/foo.cpp");
-  EXPECT_EQ(getProxy("dir/FOO.cpp"), "dir/foo.cpp");
-  // no name match. prefer matching dir, break ties by alpha
-  EXPECT_EQ(getProxy("dir/a.cpp"), "dir/bar.cpp");
-  // an exact name match beats one segment of directory match
-  EXPECT_EQ(getProxy("some/other/bar.h"), "dir/bar.cpp");
-  // two segments of directory match beat a prefix name match
-  EXPECT_EQ(getProxy("an/other/b.cpp"), "an/other/foo.cpp");
-  // if nothing matches at all, we still get the closest alpha match
-  EXPECT_EQ(getProxy("below/some/obscure/path.cpp"), "an/other/foo.cpp");
-}
-
-TEST_F(InterpolateTest, Language) {
-  add("dir/foo.cpp", "-std=c++17");
-  add("dir/bar.c", "");
-  add("dir/baz.cee", "-x c");
-  add("dir/aux.cpp", "-std=c++17 -x objective-c++");
-
-  // .h is ambiguous, so we add explicit language flags
-  EXPECT_EQ(getCommand("foo.h"),
-            "clang -D dir/foo.cpp -x c++-header -std=c++17");
-  // Same thing if we have no extension. (again, we treat as header).
-  EXPECT_EQ(getCommand("foo"), "clang -D dir/foo.cpp -x c++-header -std=c++17");
-  // and invalid extensions.
-  EXPECT_EQ(getCommand("foo.cce"),
-            "clang -D dir/foo.cpp -x c++-header -std=c++17");
-  // and don't add -x if the inferred language is correct.
-  EXPECT_EQ(getCommand("foo.hpp"), "clang -D dir/foo.cpp -std=c++17");
-  // respect -x if it's already there.
-  EXPECT_EQ(getCommand("baz.h"), "clang -D dir/baz.cee -x c-header");
-  // prefer a worse match with the right extension.
-  EXPECT_EQ(getCommand("foo.c"), "clang -D dir/bar.c");
-  Entries.erase(path(StringRef("dir/bar.c")));
-  // Now we transfer across languages, so drop -std too.
-  EXPECT_EQ(getCommand("foo.c"), "clang -D dir/foo.cpp");
-  // Prefer -x over -std when overriding language.
-  EXPECT_EQ(getCommand("aux.h"),
-            "clang -D dir/aux.cpp -x objective-c++-header -std=c++17");
-}
-
-TEST_F(InterpolateTest, Strip) {
-  add("dir/foo.cpp", "-o foo.o -Wall");
-  // the -o option and the input file are removed, but -Wall is preserved.
-  EXPECT_EQ(getCommand("dir/bar.cpp"), "clang -D dir/foo.cpp -Wall");
-}
-
-TEST_F(InterpolateTest, StripDoubleDash) {
-  add("dir/foo.cpp", "-o foo.o -std=c++14 -Wall -- dir/foo.cpp");
-  // input file and output option are removed
-  // -Wall flag isn't
-  // -std option gets re-added as the last argument before the input file
-  // -- is removed as it's not necessary - the new input file doesn't start with
-  // a dash
-  EXPECT_EQ(getCommand("dir/bar.cpp"), "clang -D dir/foo.cpp -Wall -std=c++14");
-}
-
-TEST_F(InterpolateTest, InsertDoubleDash) {
-  add("dir/foo.cpp", "-o foo.o -std=c++14 -Wall");
-  EXPECT_EQ(getCommand("-dir/bar.cpp", false),
-            "clang -D dir/foo.cpp -Wall -std=c++14 --");
-}
-
-TEST_F(InterpolateTest, InsertDoubleDashForClangCL) {
-  add("dir/foo.cpp", "clang-cl", "/std:c++14 /W4");
-  EXPECT_EQ(getCommand("/dir/bar.cpp", false),
-            "clang-cl -D dir/foo.cpp /W4 /std:c++14 --");
-}
-
-TEST_F(InterpolateTest, Case) {
-  add("FOO/BAR/BAZ/SHOUT.cc");
-  add("foo/bar/baz/quiet.cc");
-  // Case mismatches are completely ignored, so we choose the name match.
-  EXPECT_EQ(getProxy("foo/bar/baz/shout.C"), "FOO/BAR/BAZ/SHOUT.cc");
-}
-
-TEST_F(InterpolateTest, Aliasing) {
-  add("foo.cpp", "-faligned-new");
-
-  // The interpolated command should keep the given flag as written, even though
-  // the flag is internally represented as an alias.
-  EXPECT_EQ(getCommand("foo.hpp"), "clang -D foo.cpp -faligned-new");
-}
-
-TEST_F(InterpolateTest, ClangCL) {
-  add("foo.cpp", "clang-cl", "/W4");
-
-  // Language flags should be added with CL syntax.
-  EXPECT_EQ(getCommand("foo.h", false), "clang-cl -D foo.cpp /W4 /TP");
-}
-
-TEST_F(InterpolateTest, DriverModes) {
-  add("foo.cpp", "clang-cl", "--driver-mode=gcc");
-  add("bar.cpp", "clang", "--driver-mode=cl");
-
-  // --driver-mode overrides should be respected.
-  EXPECT_EQ(getCommand("foo.h"),
-            "clang-cl -D foo.cpp --driver-mode=gcc -x c++-header");
-  EXPECT_EQ(getCommand("bar.h", false),
-            "clang -D bar.cpp --driver-mode=cl /TP");
-}
-
-TEST(TransferCompileCommandTest, Smoke) {
-  CompileCommand Cmd;
-  Cmd.Filename = "foo.cc";
-  Cmd.CommandLine = {"clang", "-Wall", "foo.cc"};
-  Cmd.Directory = "dir";
-  CompileCommand Transferred = transferCompileCommand(std::move(Cmd), "foo.h");
-  EXPECT_EQ(Transferred.Filename, "foo.h");
-  EXPECT_THAT(Transferred.CommandLine,
-              ElementsAre("clang", "-Wall", "-x", "c++-header", "foo.h"));
-  EXPECT_EQ(Transferred.Directory, "dir");
-}
-
-TEST(CompileCommandTest, EqualityOperator) {
-  CompileCommand CCRef("/foo/bar", "hello.c", {"a", "b"}, "hello.o");
-  CompileCommand CCTest = CCRef;
-
-  EXPECT_TRUE(CCRef == CCTest);
-  EXPECT_FALSE(CCRef != CCTest);
-
-  CCTest = CCRef;
-  CCTest.Directory = "/foo/baz";
-  EXPECT_FALSE(CCRef == CCTest);
-  EXPECT_TRUE(CCRef != CCTest);
-
-  CCTest = CCRef;
-  CCTest.Filename = "bonjour.c";
-  EXPECT_FALSE(CCRef == CCTest);
-  EXPECT_TRUE(CCRef != CCTest);
-
-  CCTest = CCRef;
-  CCTest.CommandLine.push_back("c");
-  EXPECT_FALSE(CCRef == CCTest);
-  EXPECT_TRUE(CCRef != CCTest);
-
-  CCTest = CCRef;
-  CCTest.Output = "bonjour.o";
-  EXPECT_FALSE(CCRef == CCTest);
-  EXPECT_TRUE(CCRef != CCTest);
-}
-
-class TargetAndModeTest : public MemDBTest {
-public:
-  TargetAndModeTest() { llvm::InitializeAllTargetInfos(); }
-
-protected:
-  // Look up the command from a relative path, and return it in string form.
-  std::string getCommand(llvm::StringRef F) {
-    auto Results = inferTargetAndDriverMode(std::make_unique<MemCDB>(Entries))
-                       ->getCompileCommands(path(F));
-    if (Results.empty())
-      return "none";
-    return llvm::join(Results[0].CommandLine, " ");
-  }
-};
-
-TEST_F(TargetAndModeTest, TargetAndMode) {
-  add("foo.cpp", "clang-cl", "");
-  add("bar.cpp", "clang++", "");
-
-  EXPECT_EQ(getCommand("foo.cpp"),
-            "clang-cl --driver-mode=cl foo.cpp -D foo.cpp");
-  EXPECT_EQ(getCommand("bar.cpp"),
-            "clang++ --driver-mode=g++ bar.cpp -D bar.cpp");
-}
-
-class ExpandResponseFilesTest : public MemDBTest {
-public:
-  ExpandResponseFilesTest() : FS(new llvm::vfs::InMemoryFileSystem) {}
-
-protected:
-  void addFile(StringRef File, StringRef Content) {
-    ASSERT_TRUE(
-        FS->addFile(File, 0, llvm::MemoryBuffer::getMemBufferCopy(Content)));
-  }
-
-  std::string getCommand(llvm::StringRef F) {
-    auto Results = expandResponseFiles(std::make_unique<MemCDB>(Entries), FS)
-                       ->getCompileCommands(path(F));
-    if (Results.empty())
-      return "none";
-    return llvm::join(Results[0].CommandLine, " ");
-  }
-
-  llvm::IntrusiveRefCntPtr<llvm::vfs::InMemoryFileSystem> FS;
-};
-
-TEST_F(ExpandResponseFilesTest, ExpandResponseFiles) {
-  addFile(path(StringRef("rsp1.rsp")), "-Dflag");
-
-  add("foo.cpp", "clang", "@rsp1.rsp");
-  add("bar.cpp", "clang", "-Dflag");
-  EXPECT_EQ(getCommand("foo.cpp"), "clang foo.cpp -D foo.cpp -Dflag");
-  EXPECT_EQ(getCommand("bar.cpp"), "clang bar.cpp -D bar.cpp -Dflag");
-}
-
-TEST_F(ExpandResponseFilesTest, ExpandResponseFilesEmptyArgument) {
-  addFile(path(StringRef("rsp1.rsp")), "-Dflag");
-
-  add("foo.cpp", "clang", "@rsp1.rsp \"\"");
-  EXPECT_EQ(getCommand("foo.cpp"), "clang foo.cpp -D foo.cpp -Dflag ");
-}
-
-} // end namespace tooling
-} // end namespace clang
diff --git a/gnu/llvm/clang/unittests/Tooling/DependencyScannerTest.cpp b/gnu/llvm/clang/unittests/Tooling/DependencyScannerTest.cpp
deleted file mode 100644
index 538b36b4b2e..00000000000
--- a/gnu/llvm/clang/unittests/Tooling/DependencyScannerTest.cpp
+++ /dev/null
@@ -1,238 +0,0 @@
-//===- unittest/Tooling/ToolingTest.cpp - Tooling unit tests --------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/AST/ASTConsumer.h"
-#include "clang/AST/DeclCXX.h"
-#include "clang/AST/DeclGroup.h"
-#include "clang/Frontend/ASTUnit.h"
-#include "clang/Frontend/CompilerInstance.h"
-#include "clang/Frontend/FrontendAction.h"
-#include "clang/Frontend/FrontendActions.h"
-#include "clang/Tooling/CompilationDatabase.h"
-#include "clang/Tooling/Tooling.h"
-#include "clang/Tooling/DependencyScanning/DependencyScanningFilesystem.h"
-#include "llvm/ADT/STLExtras.h"
-#include "llvm/Support/FormatVariadic.h"
-#include "llvm/Support/Path.h"
-#include "llvm/Support/TargetRegistry.h"
-#include "llvm/Support/TargetSelect.h"
-#include "gtest/gtest.h"
-#include <algorithm>
-#include <string>
-
-namespace clang {
-namespace tooling {
-
-namespace {
-
-/// Prints out all of the gathered dependencies into a string.
-class TestFileCollector : public DependencyFileGenerator {
-public:
-  TestFileCollector(DependencyOutputOptions &Opts,
-                    std::vector<std::string> &Deps)
-      : DependencyFileGenerator(Opts), Deps(Deps) {}
-
-  void finishedMainFile(DiagnosticsEngine &Diags) override {
-    auto NewDeps = getDependencies();
-    Deps.insert(Deps.end(), NewDeps.begin(), NewDeps.end());
-  }
-
-private:
-  std::vector<std::string> &Deps;
-};
-
-class TestDependencyScanningAction : public tooling::ToolAction {
-public:
-  TestDependencyScanningAction(std::vector<std::string> &Deps) : Deps(Deps) {}
-
-  bool runInvocation(std::shared_ptr<CompilerInvocation> Invocation,
-                     FileManager *FileMgr,
-                     std::shared_ptr<PCHContainerOperations> PCHContainerOps,
-                     DiagnosticConsumer *DiagConsumer) override {
-    CompilerInstance Compiler(std::move(PCHContainerOps));
-    Compiler.setInvocation(std::move(Invocation));
-    Compiler.setFileManager(FileMgr);
-
-    Compiler.createDiagnostics(DiagConsumer, /*ShouldOwnClient=*/false);
-    if (!Compiler.hasDiagnostics())
-      return false;
-
-    Compiler.createSourceManager(*FileMgr);
-    Compiler.addDependencyCollector(std::make_shared<TestFileCollector>(
-        Compiler.getInvocation().getDependencyOutputOpts(), Deps));
-
-    auto Action = std::make_unique<PreprocessOnlyAction>();
-    return Compiler.ExecuteAction(*Action);
-  }
-
-private:
-  std::vector<std::string> &Deps;
-};
-
-} // namespace
-
-TEST(DependencyScanner, ScanDepsReuseFilemanager) {
-  std::vector<std::string> Compilation = {"-c", "-E", "-MT", "test.cpp.o"};
-  StringRef CWD = "/root";
-  FixedCompilationDatabase CDB(CWD, Compilation);
-
-  auto VFS = new llvm::vfs::InMemoryFileSystem();
-  VFS->setCurrentWorkingDirectory(CWD);
-  auto Sept = llvm::sys::path::get_separator();
-  std::string HeaderPath =
-      std::string(llvm::formatv("{0}root{0}header.h", Sept));
-  std::string SymlinkPath =
-      std::string(llvm::formatv("{0}root{0}symlink.h", Sept));
-  std::string TestPath = std::string(llvm::formatv("{0}root{0}test.cpp", Sept));
-
-  VFS->addFile(HeaderPath, 0, llvm::MemoryBuffer::getMemBuffer("\n"));
-  VFS->addHardLink(SymlinkPath, HeaderPath);
-  VFS->addFile(TestPath, 0,
-               llvm::MemoryBuffer::getMemBuffer(
-                   "#include \"symlink.h\"\n#include \"header.h\"\n"));
-
-  ClangTool Tool(CDB, {"test.cpp"}, std::make_shared<PCHContainerOperations>(),
-                 VFS);
-  Tool.clearArgumentsAdjusters();
-  std::vector<std::string> Deps;
-  TestDependencyScanningAction Action(Deps);
-  Tool.run(&Action);
-  using llvm::sys::path::convert_to_slash;
-  // The first invocation should return dependencies in order of access.
-  ASSERT_EQ(Deps.size(), 3u);
-  EXPECT_EQ(convert_to_slash(Deps[0]), "/root/test.cpp");
-  EXPECT_EQ(convert_to_slash(Deps[1]), "/root/symlink.h");
-  EXPECT_EQ(convert_to_slash(Deps[2]), "/root/header.h");
-
-  // The file manager should still have two FileEntries, as one file is a
-  // hardlink.
-  FileManager &Files = Tool.getFiles();
-  EXPECT_EQ(Files.getNumUniqueRealFiles(), 2u);
-
-  Deps.clear();
-  Tool.run(&Action);
-  // The second invocation should have the same order of dependencies.
-  ASSERT_EQ(Deps.size(), 3u);
-  EXPECT_EQ(convert_to_slash(Deps[0]), "/root/test.cpp");
-  EXPECT_EQ(convert_to_slash(Deps[1]), "/root/symlink.h");
-  EXPECT_EQ(convert_to_slash(Deps[2]), "/root/header.h");
-
-  EXPECT_EQ(Files.getNumUniqueRealFiles(), 2u);
-}
-
-TEST(DependencyScanner, ScanDepsReuseFilemanagerSkippedFile) {
-  std::vector<std::string> Compilation = {"-c", "-E", "-MT", "test.cpp.o"};
-  StringRef CWD = "/root";
-  FixedCompilationDatabase CDB(CWD, Compilation);
-
-  auto VFS = new llvm::vfs::InMemoryFileSystem();
-  VFS->setCurrentWorkingDirectory(CWD);
-  auto Sept = llvm::sys::path::get_separator();
-  std::string HeaderPath =
-      std::string(llvm::formatv("{0}root{0}header.h", Sept));
-  std::string SymlinkPath =
-      std::string(llvm::formatv("{0}root{0}symlink.h", Sept));
-  std::string TestPath = std::string(llvm::formatv("{0}root{0}test.cpp", Sept));
-  std::string Test2Path =
-      std::string(llvm::formatv("{0}root{0}test2.cpp", Sept));
-
-  VFS->addFile(HeaderPath, 0,
-               llvm::MemoryBuffer::getMemBuffer("#pragma once\n"));
-  VFS->addHardLink(SymlinkPath, HeaderPath);
-  VFS->addFile(TestPath, 0,
-               llvm::MemoryBuffer::getMemBuffer(
-                   "#include \"header.h\"\n#include \"symlink.h\"\n"));
-  VFS->addFile(Test2Path, 0,
-               llvm::MemoryBuffer::getMemBuffer(
-                   "#include \"symlink.h\"\n#include \"header.h\"\n"));
-
-  ClangTool Tool(CDB, {"test.cpp", "test2.cpp"},
-                 std::make_shared<PCHContainerOperations>(), VFS);
-  Tool.clearArgumentsAdjusters();
-  std::vector<std::string> Deps;
-  TestDependencyScanningAction Action(Deps);
-  Tool.run(&Action);
-  using llvm::sys::path::convert_to_slash;
-  ASSERT_EQ(Deps.size(), 6u);
-  EXPECT_EQ(convert_to_slash(Deps[0]), "/root/test.cpp");
-  EXPECT_EQ(convert_to_slash(Deps[1]), "/root/header.h");
-  EXPECT_EQ(convert_to_slash(Deps[2]), "/root/symlink.h");
-  EXPECT_EQ(convert_to_slash(Deps[3]), "/root/test2.cpp");
-  EXPECT_EQ(convert_to_slash(Deps[4]), "/root/symlink.h");
-  EXPECT_EQ(convert_to_slash(Deps[5]), "/root/header.h");
-}
-
-TEST(DependencyScanner, ScanDepsReuseFilemanagerHasInclude) {
-  std::vector<std::string> Compilation = {"-c", "-E", "-MT", "test.cpp.o"};
-  StringRef CWD = "/root";
-  FixedCompilationDatabase CDB(CWD, Compilation);
-
-  auto VFS = new llvm::vfs::InMemoryFileSystem();
-  VFS->setCurrentWorkingDirectory(CWD);
-  auto Sept = llvm::sys::path::get_separator();
-  std::string HeaderPath =
-      std::string(llvm::formatv("{0}root{0}header.h", Sept));
-  std::string SymlinkPath =
-      std::string(llvm::formatv("{0}root{0}symlink.h", Sept));
-  std::string TestPath = std::string(llvm::formatv("{0}root{0}test.cpp", Sept));
-
-  VFS->addFile(HeaderPath, 0, llvm::MemoryBuffer::getMemBuffer("\n"));
-  VFS->addHardLink(SymlinkPath, HeaderPath);
-  VFS->addFile(
-      TestPath, 0,
-      llvm::MemoryBuffer::getMemBuffer("#if __has_include(\"header.h\") && "
-                                       "__has_include(\"symlink.h\")\n#endif"));
-
-  ClangTool Tool(CDB, {"test.cpp", "test.cpp"},
-                 std::make_shared<PCHContainerOperations>(), VFS);
-  Tool.clearArgumentsAdjusters();
-  std::vector<std::string> Deps;
-  TestDependencyScanningAction Action(Deps);
-  Tool.run(&Action);
-  using llvm::sys::path::convert_to_slash;
-  ASSERT_EQ(Deps.size(), 6u);
-  EXPECT_EQ(convert_to_slash(Deps[0]), "/root/test.cpp");
-  EXPECT_EQ(convert_to_slash(Deps[1]), "/root/header.h");
-  EXPECT_EQ(convert_to_slash(Deps[2]), "/root/symlink.h");
-  EXPECT_EQ(convert_to_slash(Deps[3]), "/root/test.cpp");
-  EXPECT_EQ(convert_to_slash(Deps[4]), "/root/header.h");
-  EXPECT_EQ(convert_to_slash(Deps[5]), "/root/symlink.h");
-}
-
-namespace dependencies {
-TEST(DependencyScanningFilesystem, IgnoredFilesHaveSeparateCache) {
-  auto VFS = llvm::makeIntrusiveRefCnt<llvm::vfs::InMemoryFileSystem>();
-  VFS->addFile("/mod.h", 0, llvm::MemoryBuffer::getMemBuffer("// hi there!\n"));
-
-  DependencyScanningFilesystemSharedCache SharedCache;
-  auto Mappings = std::make_unique<ExcludedPreprocessorDirectiveSkipMapping>();
-  DependencyScanningWorkerFilesystem DepFS(SharedCache, VFS, Mappings.get());
-
-  auto StatusMinimized0 = DepFS.status("/mod.h");
-  DepFS.ignoreFile("/mod.h");
-  auto StatusFull1 = DepFS.status("/mod.h");
-  DepFS.clearIgnoredFiles();
-
-  auto StatusMinimized2 = DepFS.status("/mod.h");
-  DepFS.ignoreFile("/mod.h");
-  auto StatusFull3 = DepFS.status("/mod.h");
-
-  EXPECT_TRUE(StatusMinimized0);
-  EXPECT_EQ(StatusMinimized0->getSize(), 0u);
-  EXPECT_TRUE(StatusFull1);
-  EXPECT_EQ(StatusFull1->getSize(), 13u);
-
-  EXPECT_TRUE(StatusMinimized2);
-  EXPECT_EQ(StatusMinimized2->getSize(), 0u);
-  EXPECT_TRUE(StatusFull3);
-  EXPECT_EQ(StatusFull3->getSize(), 13u);
-}
-
-} // end namespace dependencies
-} // end namespace tooling
-} // end namespace clang
diff --git a/gnu/llvm/clang/unittests/Tooling/DiagnosticsYamlTest.cpp b/gnu/llvm/clang/unittests/Tooling/DiagnosticsYamlTest.cpp
deleted file mode 100644
index 6d3b4b9939f..00000000000
--- a/gnu/llvm/clang/unittests/Tooling/DiagnosticsYamlTest.cpp
+++ /dev/null
@@ -1,220 +0,0 @@
-//===- unittests/Tooling/DiagnosticsYamlTest.cpp - Serialization tests ---===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// Tests for serialization of Diagnostics.
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/Tooling/DiagnosticsYaml.h"
-#include "clang/Tooling/Core/Diagnostic.h"
-#include "clang/Tooling/ReplacementsYaml.h"
-#include "llvm/ADT/SmallVector.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-using namespace clang::tooling;
-using clang::tooling::Diagnostic;
-
-static DiagnosticMessage
-makeMessage(const std::string &Message, int FileOffset,
-            const std::string &FilePath, const StringMap<Replacements> &Fix,
-            const SmallVector<FileByteRange, 1> &Ranges) {
-  DiagnosticMessage DiagMessage;
-  DiagMessage.Message = Message;
-  DiagMessage.FileOffset = FileOffset;
-  DiagMessage.FilePath = FilePath;
-  DiagMessage.Fix = Fix;
-  DiagMessage.Ranges = Ranges;
-  return DiagMessage;
-}
-
-static FileByteRange makeByteRange(int FileOffset,
-                                   int Length,
-                                   const std::string &FilePath) {
-  FileByteRange Range;
-  Range.FileOffset = FileOffset;
-  Range.Length = Length;
-  Range.FilePath = FilePath;
-  return Range;
-}
-
-static Diagnostic makeDiagnostic(StringRef DiagnosticName,
-                                 const std::string &Message, int FileOffset,
-                                 const std::string &FilePath,
-                                 const StringMap<Replacements> &Fix,
-                                 const SmallVector<FileByteRange, 1> &Ranges,
-                                 Diagnostic::Level DiagnosticLevel) {
-  return Diagnostic(DiagnosticName,
-                    makeMessage(Message, FileOffset, FilePath, Fix, Ranges), {},
-                    DiagnosticLevel, "path/to/build/directory");
-}
-
-static const char *YAMLContent =
-    "---\n"
-    "MainSourceFile:  'path/to/source.cpp'\n"
-    "Diagnostics:\n"
-    "  - DiagnosticName:  'diagnostic#1\'\n"
-    "    DiagnosticMessage:\n"
-    "      Message:         'message #1'\n"
-    "      FilePath:        'path/to/source.cpp'\n"
-    "      FileOffset:      55\n"
-    "      Replacements:\n"
-    "        - FilePath:        'path/to/source.cpp'\n"
-    "          Offset:          100\n"
-    "          Length:          12\n"
-    "          ReplacementText: 'replacement #1'\n"
-    "    Level:           Warning\n"
-    "    BuildDirectory:  'path/to/build/directory'\n"
-    "  - DiagnosticName:  'diagnostic#2'\n"
-    "    DiagnosticMessage:\n"
-    "      Message:         'message #2'\n"
-    "      FilePath:        'path/to/header.h'\n"
-    "      FileOffset:      60\n"
-    "      Replacements:\n"
-    "        - FilePath:        'path/to/header.h'\n"
-    "          Offset:          62\n"
-    "          Length:          2\n"
-    "          ReplacementText: 'replacement #2'\n"
-    "      Ranges:\n"
-    "        - FilePath:        'path/to/source.cpp'\n"
-    "          FileOffset:      10\n"
-    "          Length:          10\n"
-    "    Level:           Warning\n"
-    "    BuildDirectory:  'path/to/build/directory'\n"
-    "  - DiagnosticName:  'diagnostic#3'\n"
-    "    DiagnosticMessage:\n"
-    "      Message:         'message #3'\n"
-    "      FilePath:        'path/to/source2.cpp'\n"
-    "      FileOffset:      72\n"
-    "      Replacements:    []\n"
-    "    Notes:\n"
-    "      - Message:         Note1\n"
-    "        FilePath:        'path/to/note1.cpp'\n"
-    "        FileOffset:      88\n"
-    "        Replacements:    []\n"
-    "      - Message:         Note2\n"
-    "        FilePath:        'path/to/note2.cpp'\n"
-    "        FileOffset:      99\n"
-    "        Replacements:    []\n"
-    "    Level:           Warning\n"
-    "    BuildDirectory:  'path/to/build/directory'\n"
-    "  - DiagnosticName:  'diagnostic#4'\n"
-    "    DiagnosticMessage:\n"
-    "      Message:         'message #4'\n"
-    "      FilePath:        'path/to/source3.cpp'\n"
-    "      FileOffset:      72\n"
-    "      Replacements:    []\n"
-    "    Level:           Remark\n"
-    "    BuildDirectory:  'path/to/build/directory'\n"
-    "...\n";
-
-TEST(DiagnosticsYamlTest, serializesDiagnostics) {
-  TranslationUnitDiagnostics TUD;
-  TUD.MainSourceFile = "path/to/source.cpp";
-
-  StringMap<Replacements> Fix1 = {
-      {"path/to/source.cpp",
-       Replacements({"path/to/source.cpp", 100, 12, "replacement #1"})}};
-  TUD.Diagnostics.push_back(makeDiagnostic("diagnostic#1", "message #1", 55,
-                                           "path/to/source.cpp", Fix1, {},
-                                           Diagnostic::Warning));
-
-  StringMap<Replacements> Fix2 = {
-      {"path/to/header.h",
-       Replacements({"path/to/header.h", 62, 2, "replacement #2"})}};
-  SmallVector<FileByteRange, 1> Ranges2 =
-      {makeByteRange(10, 10, "path/to/source.cpp")};
-  TUD.Diagnostics.push_back(makeDiagnostic("diagnostic#2", "message #2", 60,
-                                           "path/to/header.h", Fix2, Ranges2,
-                                           Diagnostic::Warning));
-
-  TUD.Diagnostics.push_back(makeDiagnostic("diagnostic#3", "message #3", 72,
-                                           "path/to/source2.cpp", {}, {},
-                                           Diagnostic::Warning));
-  TUD.Diagnostics.back().Notes.push_back(
-      makeMessage("Note1", 88, "path/to/note1.cpp", {}, {}));
-  TUD.Diagnostics.back().Notes.push_back(
-      makeMessage("Note2", 99, "path/to/note2.cpp", {}, {}));
-
-  TUD.Diagnostics.push_back(makeDiagnostic("diagnostic#4", "message #4", 72,
-                                           "path/to/source3.cpp", {}, {},
-                                           Diagnostic::Remark));
-
-  std::string YamlContent;
-  raw_string_ostream YamlContentStream(YamlContent);
-
-  yaml::Output YAML(YamlContentStream);
-  YAML << TUD;
-
-  EXPECT_EQ(YAMLContent, YamlContentStream.str());
-}
-
-TEST(DiagnosticsYamlTest, deserializesDiagnostics) {
-  TranslationUnitDiagnostics TUDActual;
-  yaml::Input YAML(YAMLContent);
-  YAML >> TUDActual;
-
-  ASSERT_FALSE(YAML.error());
-  ASSERT_EQ(4u, TUDActual.Diagnostics.size());
-  EXPECT_EQ("path/to/source.cpp", TUDActual.MainSourceFile);
-
-  auto getFixes = [](const StringMap<Replacements> &Fix) {
-    std::vector<Replacement> Fixes;
-    for (auto &Replacements : Fix) {
-      for (auto &Replacement : Replacements.second) {
-        Fixes.push_back(Replacement);
-      }
-    }
-    return Fixes;
-  };
-
-  Diagnostic D1 = TUDActual.Diagnostics[0];
-  EXPECT_EQ("diagnostic#1", D1.DiagnosticName);
-  EXPECT_EQ("message #1", D1.Message.Message);
-  EXPECT_EQ(55u, D1.Message.FileOffset);
-  EXPECT_EQ("path/to/source.cpp", D1.Message.FilePath);
-  std::vector<Replacement> Fixes1 = getFixes(D1.Message.Fix);
-  ASSERT_EQ(1u, Fixes1.size());
-  EXPECT_EQ("path/to/source.cpp", Fixes1[0].getFilePath());
-  EXPECT_EQ(100u, Fixes1[0].getOffset());
-  EXPECT_EQ(12u, Fixes1[0].getLength());
-  EXPECT_EQ("replacement #1", Fixes1[0].getReplacementText());
-  EXPECT_TRUE(D1.Message.Ranges.empty());
-
-  Diagnostic D2 = TUDActual.Diagnostics[1];
-  EXPECT_EQ("diagnostic#2", D2.DiagnosticName);
-  EXPECT_EQ("message #2", D2.Message.Message);
-  EXPECT_EQ(60u, D2.Message.FileOffset);
-  EXPECT_EQ("path/to/header.h", D2.Message.FilePath);
-  std::vector<Replacement> Fixes2 = getFixes(D2.Message.Fix);
-  ASSERT_EQ(1u, Fixes2.size());
-  EXPECT_EQ("path/to/header.h", Fixes2[0].getFilePath());
-  EXPECT_EQ(62u, Fixes2[0].getOffset());
-  EXPECT_EQ(2u, Fixes2[0].getLength());
-  EXPECT_EQ("replacement #2", Fixes2[0].getReplacementText());
-  EXPECT_EQ(1u, D2.Message.Ranges.size());
-  EXPECT_EQ("path/to/source.cpp", D2.Message.Ranges[0].FilePath);
-  EXPECT_EQ(10u, D2.Message.Ranges[0].FileOffset);
-  EXPECT_EQ(10u, D2.Message.Ranges[0].Length);
-
-  Diagnostic D3 = TUDActual.Diagnostics[2];
-  EXPECT_EQ("diagnostic#3", D3.DiagnosticName);
-  EXPECT_EQ("message #3", D3.Message.Message);
-  EXPECT_EQ(72u, D3.Message.FileOffset);
-  EXPECT_EQ("path/to/source2.cpp", D3.Message.FilePath);
-  EXPECT_EQ(2u, D3.Notes.size());
-  EXPECT_EQ("Note1", D3.Notes[0].Message);
-  EXPECT_EQ(88u, D3.Notes[0].FileOffset);
-  EXPECT_EQ("path/to/note1.cpp", D3.Notes[0].FilePath);
-  EXPECT_EQ("Note2", D3.Notes[1].Message);
-  EXPECT_EQ(99u, D3.Notes[1].FileOffset);
-  EXPECT_EQ("path/to/note2.cpp", D3.Notes[1].FilePath);
-  std::vector<Replacement> Fixes3 = getFixes(D3.Message.Fix);
-  EXPECT_TRUE(Fixes3.empty());
-  EXPECT_TRUE(D3.Message.Ranges.empty());
-}
diff --git a/gnu/llvm/clang/unittests/Tooling/ExecutionTest.cpp b/gnu/llvm/clang/unittests/Tooling/ExecutionTest.cpp
deleted file mode 100644
index 91ab8594f68..00000000000
--- a/gnu/llvm/clang/unittests/Tooling/ExecutionTest.cpp
+++ /dev/null
@@ -1,297 +0,0 @@
-//===- unittest/Tooling/ExecutionTest.cpp - Tool execution tests. --------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/Tooling/Execution.h"
-#include "clang/AST/ASTConsumer.h"
-#include "clang/AST/DeclCXX.h"
-#include "clang/AST/RecursiveASTVisitor.h"
-#include "clang/Frontend/ASTUnit.h"
-#include "clang/Frontend/FrontendAction.h"
-#include "clang/Frontend/FrontendActions.h"
-#include "clang/Tooling/AllTUsExecution.h"
-#include "clang/Tooling/CompilationDatabase.h"
-#include "clang/Tooling/StandaloneExecution.h"
-#include "clang/Tooling/ToolExecutorPluginRegistry.h"
-#include "clang/Tooling/Tooling.h"
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-#include <algorithm>
-#include <string>
-
-namespace clang {
-namespace tooling {
-
-namespace {
-
-// This traverses the AST and outputs function name as key and "1" as value for
-// each function declaration.
-class ASTConsumerWithResult
-    : public ASTConsumer,
-      public RecursiveASTVisitor<ASTConsumerWithResult> {
-public:
-  using ASTVisitor = RecursiveASTVisitor<ASTConsumerWithResult>;
-
-  explicit ASTConsumerWithResult(ExecutionContext *Context) : Context(Context) {
-    assert(Context != nullptr);
-  }
-
-  void HandleTranslationUnit(clang::ASTContext &Context) override {
-    TraverseDecl(Context.getTranslationUnitDecl());
-  }
-
-  bool TraverseFunctionDecl(clang::FunctionDecl *Decl) {
-    Context->reportResult(Decl->getNameAsString(),
-                          Context->getRevision() + ":" + Context->getCorpus() +
-                              ":" + Context->getCurrentCompilationUnit() +
-                              "/1");
-    return ASTVisitor::TraverseFunctionDecl(Decl);
-  }
-
-private:
-  ExecutionContext *const Context;
-};
-
-class ReportResultAction : public ASTFrontendAction {
-public:
-  explicit ReportResultAction(ExecutionContext *Context) : Context(Context) {
-    assert(Context != nullptr);
-  }
-
-protected:
-  std::unique_ptr<clang::ASTConsumer>
-  CreateASTConsumer(clang::CompilerInstance &compiler,
-                    StringRef /* dummy */) override {
-    std::unique_ptr<clang::ASTConsumer> ast_consumer{
-        new ASTConsumerWithResult(Context)};
-    return ast_consumer;
-  }
-
-private:
-  ExecutionContext *const Context;
-};
-
-class ReportResultActionFactory : public FrontendActionFactory {
-public:
-  ReportResultActionFactory(ExecutionContext *Context) : Context(Context) {}
-  std::unique_ptr<FrontendAction> create() override {
-    return std::make_unique<ReportResultAction>(Context);
-  }
-
-private:
-  ExecutionContext *const Context;
-};
-
-} // namespace
-
-class TestToolExecutor : public ToolExecutor {
-public:
-  static const char *ExecutorName;
-
-  TestToolExecutor(CommonOptionsParser Options)
-      : OptionsParser(std::move(Options)) {}
-
-  StringRef getExecutorName() const override { return ExecutorName; }
-
-  llvm::Error
-  execute(llvm::ArrayRef<std::pair<std::unique_ptr<FrontendActionFactory>,
-                                   ArgumentsAdjuster>>) override {
-    return llvm::Error::success();
-  }
-
-  ExecutionContext *getExecutionContext() override { return nullptr; };
-
-  ToolResults *getToolResults() override { return nullptr; }
-
-  llvm::ArrayRef<std::string> getSourcePaths() const {
-    return OptionsParser.getSourcePathList();
-  }
-
-  void mapVirtualFile(StringRef FilePath, StringRef Content) override {
-    VFS[std::string(FilePath)] = std::string(Content);
-  }
-
-private:
-  CommonOptionsParser OptionsParser;
-  std::string SourcePaths;
-  std::map<std::string, std::string> VFS;
-};
-
-const char *TestToolExecutor::ExecutorName = "test-executor";
-
-class TestToolExecutorPlugin : public ToolExecutorPlugin {
-public:
-  llvm::Expected<std::unique_ptr<ToolExecutor>>
-  create(CommonOptionsParser &OptionsParser) override {
-    return std::make_unique<TestToolExecutor>(std::move(OptionsParser));
-  }
-};
-
-static ToolExecutorPluginRegistry::Add<TestToolExecutorPlugin>
-    X("test-executor", "Plugin for TestToolExecutor.");
-
-llvm::cl::OptionCategory TestCategory("execution-test options");
-
-TEST(CreateToolExecutorTest, FailedCreateExecutorUndefinedFlag) {
-  std::vector<const char *> argv = {"prog", "--fake_flag_no_no_no", "f"};
-  int argc = argv.size();
-  auto Executor = internal::createExecutorFromCommandLineArgsImpl(
-      argc, &argv[0], TestCategory);
-  ASSERT_FALSE((bool)Executor);
-  llvm::consumeError(Executor.takeError());
-}
-
-TEST(CreateToolExecutorTest, RegisterFlagsBeforeReset) {
-  llvm::cl::opt<std::string> BeforeReset(
-      "before_reset", llvm::cl::desc("Defined before reset."),
-      llvm::cl::init(""));
-
-  llvm::cl::ResetAllOptionOccurrences();
-
-  std::vector<const char *> argv = {"prog", "--before_reset=set", "f"};
-  int argc = argv.size();
-  auto Executor = internal::createExecutorFromCommandLineArgsImpl(
-      argc, &argv[0], TestCategory);
-  ASSERT_TRUE((bool)Executor);
-  EXPECT_EQ(BeforeReset, "set");
-  BeforeReset.removeArgument();
-}
-
-TEST(CreateToolExecutorTest, CreateStandaloneToolExecutor) {
-  std::vector<const char *> argv = {"prog", "standalone.cpp"};
-  int argc = argv.size();
-  auto Executor = internal::createExecutorFromCommandLineArgsImpl(
-      argc, &argv[0], TestCategory);
-  ASSERT_TRUE((bool)Executor);
-  EXPECT_EQ(Executor->get()->getExecutorName(),
-            StandaloneToolExecutor::ExecutorName);
-}
-
-TEST(CreateToolExecutorTest, CreateTestToolExecutor) {
-  std::vector<const char *> argv = {"prog", "test.cpp",
-                                    "--executor=test-executor"};
-  int argc = argv.size();
-  auto Executor = internal::createExecutorFromCommandLineArgsImpl(
-      argc, &argv[0], TestCategory);
-  ASSERT_TRUE((bool)Executor);
-  EXPECT_EQ(Executor->get()->getExecutorName(), TestToolExecutor::ExecutorName);
-}
-
-TEST(StandaloneToolTest, SynctaxOnlyActionOnSimpleCode) {
-  FixedCompilationDatabase Compilations(".", std::vector<std::string>());
-  StandaloneToolExecutor Executor(Compilations,
-                                  std::vector<std::string>(1, "a.cc"));
-  Executor.mapVirtualFile("a.cc", "int x = 0;");
-
-  auto Err = Executor.execute(newFrontendActionFactory<SyntaxOnlyAction>(),
-                              getClangSyntaxOnlyAdjuster());
-  ASSERT_TRUE(!Err);
-}
-
-TEST(StandaloneToolTest, SimpleAction) {
-  FixedCompilationDatabase Compilations(".", std::vector<std::string>());
-  StandaloneToolExecutor Executor(Compilations,
-                                  std::vector<std::string>(1, "a.cc"));
-  Executor.mapVirtualFile("a.cc", "int x = 0;");
-
-  auto Err = Executor.execute(std::unique_ptr<FrontendActionFactory>(
-      new ReportResultActionFactory(Executor.getExecutionContext())));
-  ASSERT_TRUE(!Err);
-  auto KVs = Executor.getToolResults()->AllKVResults();
-  ASSERT_EQ(KVs.size(), 0u);
-}
-
-TEST(StandaloneToolTest, SimpleActionWithResult) {
-  FixedCompilationDatabase Compilations(".", std::vector<std::string>());
-  StandaloneToolExecutor Executor(Compilations,
-                                  std::vector<std::string>(1, "a.cc"));
-  Executor.mapVirtualFile("a.cc", "int x = 0; void f() {}");
-
-  auto Err = Executor.execute(std::unique_ptr<FrontendActionFactory>(
-      new ReportResultActionFactory(Executor.getExecutionContext())));
-  ASSERT_TRUE(!Err);
-  auto KVs = Executor.getToolResults()->AllKVResults();
-  ASSERT_EQ(KVs.size(), 1u);
-  EXPECT_EQ("f", KVs[0].first);
-  // Currently the standlone executor returns empty corpus, revision, and
-  // compilation unit.
-  EXPECT_EQ("::/1", KVs[0].second);
-
-  Executor.getToolResults()->forEachResult(
-      [](StringRef, StringRef Value) { EXPECT_EQ("::/1", Value); });
-}
-
-class FixedCompilationDatabaseWithFiles : public CompilationDatabase {
-public:
-  FixedCompilationDatabaseWithFiles(Twine Directory,
-                                    ArrayRef<std::string> Files,
-                                    ArrayRef<std::string> CommandLine)
-      : FixedCompilations(Directory, CommandLine), Files(Files) {}
-
-  std::vector<CompileCommand>
-  getCompileCommands(StringRef FilePath) const override {
-    return FixedCompilations.getCompileCommands(FilePath);
-  }
-
-  std::vector<std::string> getAllFiles() const override { return Files; }
-
-private:
-  FixedCompilationDatabase FixedCompilations;
-  std::vector<std::string> Files;
-};
-
-MATCHER_P(Named, Name, "") { return arg.first == Name; }
-
-TEST(AllTUsToolTest, AFewFiles) {
-  FixedCompilationDatabaseWithFiles Compilations(
-      ".", {"a.cc", "b.cc", "c.cc", "ignore.cc"}, std::vector<std::string>());
-  AllTUsToolExecutor Executor(Compilations, /*ThreadCount=*/0);
-  Filter.setValue("[a-c].cc");
-  Executor.mapVirtualFile("a.cc", "void x() {}");
-  Executor.mapVirtualFile("b.cc", "void y() {}");
-  Executor.mapVirtualFile("c.cc", "void z() {}");
-  Executor.mapVirtualFile("ignore.cc", "void d() {}");
-
-  auto Err = Executor.execute(std::unique_ptr<FrontendActionFactory>(
-      new ReportResultActionFactory(Executor.getExecutionContext())));
-  ASSERT_TRUE(!Err);
-  EXPECT_THAT(
-      Executor.getToolResults()->AllKVResults(),
-      ::testing::UnorderedElementsAre(Named("x"), Named("y"), Named("z")));
-  Filter.setValue(".*"); // reset to default value.
-}
-
-TEST(AllTUsToolTest, ManyFiles) {
-  unsigned NumFiles = 100;
-  std::vector<std::string> Files;
-  std::map<std::string, std::string> FileToContent;
-  std::vector<std::string> ExpectedSymbols;
-  for (unsigned i = 1; i <= NumFiles; ++i) {
-    std::string File = "f" + std::to_string(i) + ".cc";
-    std::string Symbol = "looong_function_name_" + std::to_string(i);
-    Files.push_back(File);
-    FileToContent[File] = "void " + Symbol + "() {}";
-    ExpectedSymbols.push_back(Symbol);
-  }
-  FixedCompilationDatabaseWithFiles Compilations(".", Files,
-                                                 std::vector<std::string>());
-  AllTUsToolExecutor Executor(Compilations, /*ThreadCount=*/0);
-  for (const auto &FileAndContent : FileToContent) {
-    Executor.mapVirtualFile(FileAndContent.first, FileAndContent.second);
-  }
-
-  auto Err = Executor.execute(std::unique_ptr<FrontendActionFactory>(
-      new ReportResultActionFactory(Executor.getExecutionContext())));
-  ASSERT_TRUE(!Err);
-  std::vector<std::string> Results;
-  Executor.getToolResults()->forEachResult(
-      [&](StringRef Name, StringRef) { Results.push_back(std::string(Name)); });
-  EXPECT_THAT(ExpectedSymbols, ::testing::UnorderedElementsAreArray(Results));
-}
-
-} // end namespace tooling
-} // end namespace clang
diff --git a/gnu/llvm/clang/unittests/Tooling/FixItTest.cpp b/gnu/llvm/clang/unittests/Tooling/FixItTest.cpp
deleted file mode 100644
index ec9801d3455..00000000000
--- a/gnu/llvm/clang/unittests/Tooling/FixItTest.cpp
+++ /dev/null
@@ -1,231 +0,0 @@
-//===- unittest/Tooling/FixitTest.cpp ------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "TestVisitor.h"
-#include "clang/Basic/Diagnostic.h"
-#include "clang/Tooling/FixIt.h"
-
-using namespace clang;
-
-using tooling::fixit::getText;
-using tooling::fixit::createRemoval;
-using tooling::fixit::createReplacement;
-
-namespace {
-
-struct CallsVisitor : TestVisitor<CallsVisitor> {
-  bool VisitCallExpr(CallExpr *Expr) {
-    OnCall(Expr, Context);
-    return true;
-  }
-
-  std::function<void(CallExpr *, ASTContext *Context)> OnCall;
-};
-
-std::string LocationToString(SourceLocation Loc, ASTContext *Context) {
-  return Loc.printToString(Context->getSourceManager());
-}
-
-TEST(FixItTest, getText) {
-  CallsVisitor Visitor;
-
-  Visitor.OnCall = [](CallExpr *CE, ASTContext *Context) {
-    EXPECT_EQ("foo(x, y)", getText(*CE, *Context));
-    EXPECT_EQ("foo(x, y)", getText(CE->getSourceRange(), *Context));
-
-    Expr *P0 = CE->getArg(0);
-    Expr *P1 = CE->getArg(1);
-    EXPECT_EQ("x", getText(*P0, *Context));
-    EXPECT_EQ("y", getText(*P1, *Context));
-  };
-  Visitor.runOver("void foo(int x, int y) { foo(x, y); }");
-
-  Visitor.OnCall = [](CallExpr *CE, ASTContext *Context) {
-    EXPECT_EQ("APPLY(foo, x, y)", getText(*CE, *Context));
-  };
-  Visitor.runOver("#define APPLY(f, x, y) f(x, y)\n"
-                  "void foo(int x, int y) { APPLY(foo, x, y); }");
-}
-
-TEST(FixItTest, getTextWithMacro) {
-  CallsVisitor Visitor;
-
-  Visitor.OnCall = [](CallExpr *CE, ASTContext *Context) {
-    EXPECT_EQ("F OO", getText(*CE, *Context));
-    Expr *P0 = CE->getArg(0);
-    Expr *P1 = CE->getArg(1);
-    EXPECT_EQ("", getText(*P0, *Context));
-    EXPECT_EQ("", getText(*P1, *Context));
-  };
-  Visitor.runOver("#define F foo(\n"
-                  "#define OO x, y)\n"
-                  "void foo(int x, int y) { F OO ; }");
-
-  Visitor.OnCall = [](CallExpr *CE, ASTContext *Context) {
-    EXPECT_EQ("", getText(*CE, *Context));
-    Expr *P0 = CE->getArg(0);
-    Expr *P1 = CE->getArg(1);
-    EXPECT_EQ("x", getText(*P0, *Context));
-    EXPECT_EQ("y", getText(*P1, *Context));
-  };
-  Visitor.runOver("#define FOO(x, y) (void)x; (void)y; foo(x, y);\n"
-                  "void foo(int x, int y) { FOO(x,y) }");
-}
-
-TEST(FixItTest, createRemoval) {
-  CallsVisitor Visitor;
-
-  Visitor.OnCall = [](CallExpr *CE, ASTContext *Context) {
-    FixItHint Hint = createRemoval(*CE);
-    EXPECT_EQ("foo(x, y)", getText(Hint.RemoveRange.getAsRange(), *Context));
-    EXPECT_TRUE(Hint.InsertFromRange.isInvalid());
-    EXPECT_TRUE(Hint.CodeToInsert.empty());
-
-    Expr *P0 = CE->getArg(0);
-    FixItHint Hint0 = createRemoval(*P0);
-    EXPECT_EQ("x", getText(Hint0.RemoveRange.getAsRange(), *Context));
-    EXPECT_TRUE(Hint0.InsertFromRange.isInvalid());
-    EXPECT_TRUE(Hint0.CodeToInsert.empty());
-
-    Expr *P1 = CE->getArg(1);
-    FixItHint Hint1 = createRemoval(*P1);
-    EXPECT_EQ("y", getText(Hint1.RemoveRange.getAsRange(), *Context));
-    EXPECT_TRUE(Hint1.InsertFromRange.isInvalid());
-    EXPECT_TRUE(Hint1.CodeToInsert.empty());
-  };
-  Visitor.runOver("void foo(int x, int y) { foo(x, y); }");
-
-  Visitor.OnCall = [](CallExpr *CE, ASTContext *Context) {
-    Expr *P0 = CE->getArg(0);
-    FixItHint Hint0 = createRemoval(*P0);
-    EXPECT_EQ("x + y", getText(Hint0.RemoveRange.getAsRange(), *Context));
-
-    Expr *P1 = CE->getArg(1);
-    FixItHint Hint1 = createRemoval(*P1);
-    EXPECT_EQ("y + x", getText(Hint1.RemoveRange.getAsRange(), *Context));
-  };
-  Visitor.runOver("void foo(int x, int y) { foo(x + y, y + x); }");
-}
-
-TEST(FixItTest, createRemovalWithMacro) {
-  CallsVisitor Visitor;
-
-  Visitor.OnCall = [](CallExpr *CE, ASTContext *Context) {
-    FixItHint Hint = createRemoval(*CE);
-    EXPECT_EQ("FOO", getText(Hint.RemoveRange.getAsRange(), *Context));
-    EXPECT_TRUE(Hint.InsertFromRange.isInvalid());
-    EXPECT_TRUE(Hint.CodeToInsert.empty());
-
-    Expr *P0 = CE->getArg(0);
-    FixItHint Hint0 = createRemoval(*P0);
-    EXPECT_EQ("input.cc:2:26 <Spelling=input.cc:1:17>",
-              LocationToString(Hint0.RemoveRange.getBegin(), Context));
-    EXPECT_EQ("input.cc:2:26 <Spelling=input.cc:1:17>",
-              LocationToString(Hint0.RemoveRange.getEnd(), Context));
-    EXPECT_TRUE(Hint0.InsertFromRange.isInvalid());
-    EXPECT_TRUE(Hint0.CodeToInsert.empty());
-
-    Expr *P1 = CE->getArg(1);
-    FixItHint Hint1 = createRemoval(*P1);
-    EXPECT_EQ("input.cc:2:26 <Spelling=input.cc:1:20>",
-              LocationToString(Hint1.RemoveRange.getBegin(), Context));
-    EXPECT_EQ("input.cc:2:26 <Spelling=input.cc:1:20>",
-              LocationToString(Hint1.RemoveRange.getEnd(), Context));
-    EXPECT_TRUE(Hint1.InsertFromRange.isInvalid());
-    EXPECT_TRUE(Hint1.CodeToInsert.empty());
-  };
-  Visitor.runOver("#define FOO foo(1, 1)\n"
-                  "void foo(int x, int y) { FOO; }");
-
-  Visitor.OnCall = [](CallExpr *CE, ASTContext *Context) {
-    FixItHint Hint = createRemoval(*CE);
-    EXPECT_EQ("input.cc:2:26 <Spelling=input.cc:1:37>",
-              LocationToString(Hint.RemoveRange.getBegin(), Context));
-    EXPECT_EQ("input.cc:2:26 <Spelling=input.cc:1:45>",
-              LocationToString(Hint.RemoveRange.getEnd(), Context));
-    EXPECT_TRUE(Hint.InsertFromRange.isInvalid());
-    EXPECT_TRUE(Hint.CodeToInsert.empty());
-  };
-  Visitor.runOver("#define FOO(x, y) (void)x; (void)y; foo(x, y);\n"
-                  "void foo(int x, int y) { FOO(x,y) }");
-}
-
-TEST(FixItTest, createReplacement) {
-  CallsVisitor Visitor;
-
-  Visitor.OnCall = [](CallExpr *CE, ASTContext *Context) {
-    Expr *P0 = CE->getArg(0);
-    Expr *P1 = CE->getArg(1);
-    FixItHint Hint0 = createReplacement(*P0, *P1, *Context);
-    FixItHint Hint1 = createReplacement(*P1, *P0, *Context);
-
-    // Validate Hint0 fields.
-    EXPECT_EQ("x", getText(Hint0.RemoveRange.getAsRange(), *Context));
-    EXPECT_TRUE(Hint0.InsertFromRange.isInvalid());
-    EXPECT_EQ(Hint0.CodeToInsert, "y");
-
-    // Validate Hint1 fields.
-    EXPECT_EQ("y", getText(Hint1.RemoveRange.getAsRange(), *Context));
-    EXPECT_TRUE(Hint1.InsertFromRange.isInvalid());
-    EXPECT_EQ(Hint1.CodeToInsert, "x");
-  };
-
-  Visitor.runOver("void foo(int x, int y) { foo(x, y); }");
-
-  Visitor.runOver("#define APPLY(f, x, y) f(x, y)\n"
-                  "void foo(int x, int y) { APPLY(foo, x, y); }");
-
-  Visitor.runOver("#define APPLY(f, P) f(P)\n"
-                  "#define PAIR(x, y) x, y\n"
-                  "void foo(int x, int y) { APPLY(foo, PAIR(x, y)); }\n");
-}
-
-TEST(FixItTest, createReplacementWithMacro) {
-  CallsVisitor Visitor;
-
-  Visitor.OnCall = [](CallExpr *CE, ASTContext *Context) {
-    Expr *P0 = CE->getArg(0);
-    Expr *P1 = CE->getArg(1);
-    FixItHint Hint = createReplacement(*P0, *P1, *Context);
-    EXPECT_EQ("input.cc:2:26 <Spelling=input.cc:1:17>",
-              LocationToString(Hint.RemoveRange.getBegin(), Context));
-    EXPECT_EQ("input.cc:2:26 <Spelling=input.cc:1:17>",
-              LocationToString(Hint.RemoveRange.getEnd(), Context));
-    EXPECT_TRUE(Hint.InsertFromRange.isInvalid());
-    EXPECT_TRUE(Hint.CodeToInsert.empty());
-  };
-
-  Visitor.runOver("#define FOO foo(1, 1)\n"
-                  "void foo(int x, int y) { FOO; }");
-
-  Visitor.OnCall = [](CallExpr *CE, ASTContext *Context) {
-    Expr *P0 = CE->getArg(0);
-    Expr *P1 = CE->getArg(1);
-    FixItHint Hint = createReplacement(*P0, *P1, *Context);
-    EXPECT_EQ("input.cc:2:26 <Spelling=input.cc:2:30>",
-              LocationToString(Hint.RemoveRange.getBegin(), Context));
-    EXPECT_EQ("input.cc:2:26 <Spelling=input.cc:2:30>",
-              LocationToString(Hint.RemoveRange.getEnd(), Context));
-    EXPECT_TRUE(Hint.InsertFromRange.isInvalid());
-    EXPECT_EQ("y", Hint.CodeToInsert);
-  };
-  Visitor.runOver("#define FOO(x, y) (void)x; (void)y; foo(x, y);\n"
-                  "void foo(int x, int y) { FOO(x,y) }");
-
-  Visitor.OnCall = [](CallExpr *CE, ASTContext *Context) {
-    Expr *P0 = CE->getArg(0);
-    Expr *P1 = CE->getArg(1);
-    FixItHint Hint = createReplacement(*P0, *P1, *Context);
-    EXPECT_EQ("x + y", getText(Hint.RemoveRange.getAsRange(), *Context));
-    EXPECT_TRUE(Hint.InsertFromRange.isInvalid());
-    EXPECT_EQ("y + x", Hint.CodeToInsert);
-  };
-  Visitor.runOver("void foo(int x, int y) { foo(x + y, y + x); }");
-}
-
-} // end anonymous namespace
diff --git a/gnu/llvm/clang/unittests/Tooling/HeaderIncludesTest.cpp b/gnu/llvm/clang/unittests/Tooling/HeaderIncludesTest.cpp
deleted file mode 100644
index 37007fbfb65..00000000000
--- a/gnu/llvm/clang/unittests/Tooling/HeaderIncludesTest.cpp
+++ /dev/null
@@ -1,555 +0,0 @@
-//===- unittest/Tooling/CleanupTest.cpp - Include insertion/deletion tests ===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/Tooling/Inclusions/HeaderIncludes.h"
-#include "../Tooling/ReplacementTest.h"
-#include "../Tooling/RewriterTestContext.h"
-#include "clang/Format/Format.h"
-#include "clang/Tooling/Core/Replacement.h"
-
-#include "gtest/gtest.h"
-
-namespace clang {
-namespace tooling {
-namespace {
-
-class HeaderIncludesTest : public ::testing::Test {
-protected:
-  std::string insert(llvm::StringRef Code, llvm::StringRef Header) {
-    HeaderIncludes Includes(FileName, Code, Style);
-    assert(Header.startswith("\"") || Header.startswith("<"));
-    auto R = Includes.insert(Header.trim("\"<>"), Header.startswith("<"));
-    if (!R)
-      return std::string(Code);
-    auto Result = applyAllReplacements(Code, Replacements(*R));
-    EXPECT_TRUE(static_cast<bool>(Result));
-    return *Result;
-  }
-
-  std::string remove(llvm::StringRef Code, llvm::StringRef Header) {
-    HeaderIncludes Includes(FileName, Code, Style);
-    assert(Header.startswith("\"") || Header.startswith("<"));
-    auto Replaces = Includes.remove(Header.trim("\"<>"), Header.startswith("<"));
-    auto Result = applyAllReplacements(Code, Replaces);
-    EXPECT_TRUE(static_cast<bool>(Result));
-    return *Result;
-  }
-
-  std::string FileName = "fix.cpp";
-  IncludeStyle Style = format::getLLVMStyle().IncludeStyle;
-};
-
-TEST_F(HeaderIncludesTest, NoExistingIncludeWithoutDefine) {
-  std::string Code = "int main() {}";
-  std::string Expected = "#include \"a.h\"\n"
-                         "int main() {}";
-  EXPECT_EQ(Expected, insert(Code, "\"a.h\""));
-}
-
-TEST_F(HeaderIncludesTest, NoExistingIncludeWithDefine) {
-  std::string Code = "#ifndef A_H\n"
-                     "#define A_H\n"
-                     "class A {};\n"
-                     "#define MMM 123\n"
-                     "#endif";
-  std::string Expected = "#ifndef A_H\n"
-                         "#define A_H\n"
-                         "#include \"b.h\"\n"
-                         "class A {};\n"
-                         "#define MMM 123\n"
-                         "#endif";
-
-  EXPECT_EQ(Expected, insert(Code, "\"b.h\""));
-}
-
-TEST_F(HeaderIncludesTest, InsertBeforeCategoryWithLowerPriority) {
-  std::string Code = "#ifndef A_H\n"
-                     "#define A_H\n"
-                     "\n"
-                     "\n"
-                     "\n"
-                     "#include <vector>\n"
-                     "class A {};\n"
-                     "#define MMM 123\n"
-                     "#endif";
-  std::string Expected = "#ifndef A_H\n"
-                         "#define A_H\n"
-                         "\n"
-                         "\n"
-                         "\n"
-                         "#include \"a.h\"\n"
-                         "#include <vector>\n"
-                         "class A {};\n"
-                         "#define MMM 123\n"
-                         "#endif";
-
-  EXPECT_EQ(Expected, insert(Code, "\"a.h\""));
-}
-
-TEST_F(HeaderIncludesTest, InsertAfterMainHeader) {
-  std::string Code = "#include \"fix.h\"\n"
-                     "\n"
-                     "int main() {}";
-  std::string Expected = "#include \"fix.h\"\n"
-                         "#include <a>\n"
-                         "\n"
-                         "int main() {}";
-  Style = format::getGoogleStyle(format::FormatStyle::LanguageKind::LK_Cpp)
-              .IncludeStyle;
-  EXPECT_EQ(Expected, insert(Code, "<a>"));
-
-  FileName = "fix.cu.cpp";
-  EXPECT_EQ(Expected, insert(Code, "<a>"));
-
-  FileName = "fix_test.cu.cpp";
-  EXPECT_EQ(Expected, insert(Code, "<a>"));
-
-  FileName = "bar.cpp";
-  EXPECT_NE(Expected, insert(Code, "<a>")) << "Not main header";
-}
-
-TEST_F(HeaderIncludesTest, InsertBeforeSystemHeaderLLVM) {
-  std::string Code = "#include <memory>\n"
-                     "\n"
-                     "int main() {}";
-  std::string Expected = "#include \"z.h\"\n"
-                         "#include <memory>\n"
-                         "\n"
-                         "int main() {}";
-  EXPECT_EQ(Expected, insert(Code, "\"z.h\""));
-}
-
-TEST_F(HeaderIncludesTest, InsertAfterSystemHeaderGoogle) {
-  std::string Code = "#include <memory>\n"
-                     "\n"
-                     "int main() {}";
-  std::string Expected = "#include <memory>\n"
-                         "#include \"z.h\"\n"
-                         "\n"
-                         "int main() {}";
-  Style = format::getGoogleStyle(format::FormatStyle::LanguageKind::LK_Cpp)
-              .IncludeStyle;
-  EXPECT_EQ(Expected, insert(Code, "\"z.h\""));
-}
-
-TEST_F(HeaderIncludesTest, InsertOneIncludeLLVMStyle) {
-  std::string Code = "#include \"x/fix.h\"\n"
-                     "#include \"a.h\"\n"
-                     "#include \"b.h\"\n"
-                     "#include \"clang/Format/Format.h\"\n"
-                     "#include <memory>\n";
-  std::string Expected = "#include \"x/fix.h\"\n"
-                         "#include \"a.h\"\n"
-                         "#include \"b.h\"\n"
-                         "#include \"clang/Format/Format.h\"\n"
-                         "#include \"llvm/x/y.h\"\n"
-                         "#include <memory>\n";
-  EXPECT_EQ(Expected, insert(Code, "\"llvm/x/y.h\""));
-}
-
-TEST_F(HeaderIncludesTest, InsertIntoBlockSorted) {
-  std::string Code = "#include \"x/fix.h\"\n"
-                     "#include \"a.h\"\n"
-                     "#include \"c.h\"\n"
-                     "#include <memory>\n";
-  std::string Expected = "#include \"x/fix.h\"\n"
-                         "#include \"a.h\"\n"
-                         "#include \"b.h\"\n"
-                         "#include \"c.h\"\n"
-                         "#include <memory>\n";
-  EXPECT_EQ(Expected, insert(Code, "\"b.h\""));
-}
-
-TEST_F(HeaderIncludesTest, InsertIntoFirstBlockOfSameKind) {
-  std::string Code = "#include \"x/fix.h\"\n"
-                     "#include \"c.h\"\n"
-                     "#include \"e.h\"\n"
-                     "#include \"f.h\"\n"
-                     "#include <memory>\n"
-                     "#include <vector>\n"
-                     "#include \"m.h\"\n"
-                     "#include \"n.h\"\n";
-  std::string Expected = "#include \"x/fix.h\"\n"
-                         "#include \"c.h\"\n"
-                         "#include \"d.h\"\n"
-                         "#include \"e.h\"\n"
-                         "#include \"f.h\"\n"
-                         "#include <memory>\n"
-                         "#include <vector>\n"
-                         "#include \"m.h\"\n"
-                         "#include \"n.h\"\n";
-  EXPECT_EQ(Expected, insert(Code, "\"d.h\""));
-}
-
-TEST_F(HeaderIncludesTest, InsertIntoSystemBlockSorted) {
-  std::string Code = "#include \"x/fix.h\"\n"
-                     "#include \"a.h\"\n"
-                     "#include \"c.h\"\n"
-                     "#include <a>\n"
-                     "#include <z>\n";
-  std::string Expected = "#include \"x/fix.h\"\n"
-                         "#include \"a.h\"\n"
-                         "#include \"c.h\"\n"
-                         "#include <a>\n"
-                         "#include <vector>\n"
-                         "#include <z>\n";
-  EXPECT_EQ(Expected, insert(Code, "<vector>"));
-}
-
-TEST_F(HeaderIncludesTest, InsertNewSystemIncludeGoogleStyle) {
-  std::string Code = "#include \"x/fix.h\"\n"
-                     "\n"
-                     "#include \"y/a.h\"\n"
-                     "#include \"z/b.h\"\n";
-  // FIXME: inserting after the empty line following the main header might be
-  // preferred.
-  std::string Expected = "#include \"x/fix.h\"\n"
-                         "#include <vector>\n"
-                         "\n"
-                         "#include \"y/a.h\"\n"
-                         "#include \"z/b.h\"\n";
-  Style = format::getGoogleStyle(format::FormatStyle::LanguageKind::LK_Cpp)
-              .IncludeStyle;
-  EXPECT_EQ(Expected, insert(Code, "<vector>"));
-}
-
-TEST_F(HeaderIncludesTest, NotConfusedByDefine) {
-  std::string Code = "void f() {}\n"
-                     "#define A \\\n"
-                     "  int i;";
-  std::string Expected = "#include <vector>\n"
-                         "void f() {}\n"
-                         "#define A \\\n"
-                         "  int i;";
-  EXPECT_EQ(Expected, insert(Code, "<vector>"));
-}
-
-TEST_F(HeaderIncludesTest, SkippedTopComment) {
-  std::string Code = "// comment\n"
-                     "\n"
-                     "   // comment\n";
-  std::string Expected = "// comment\n"
-                         "\n"
-                         "   // comment\n"
-                         "#include <vector>\n";
-  EXPECT_EQ(Expected, insert(Code, "<vector>"));
-}
-
-TEST_F(HeaderIncludesTest, SkippedMixedComments) {
-  std::string Code = "// comment\n"
-                     "// comment \\\n"
-                     " comment continued\n"
-                     "/*\n"
-                     "* comment\n"
-                     "*/\n";
-  std::string Expected = "// comment\n"
-                         "// comment \\\n"
-                         " comment continued\n"
-                         "/*\n"
-                         "* comment\n"
-                         "*/\n"
-                         "#include <vector>\n";
-  EXPECT_EQ(Expected, insert(Code, "<vector>"));
-}
-
-TEST_F(HeaderIncludesTest, MultipleBlockCommentsInOneLine) {
-  std::string Code = "/*\n"
-                     "* comment\n"
-                     "*/ /* comment\n"
-                     "*/\n"
-                     "\n\n"
-                     "/* c1 */ /*c2 */\n";
-  std::string Expected = "/*\n"
-                         "* comment\n"
-                         "*/ /* comment\n"
-                         "*/\n"
-                         "\n\n"
-                         "/* c1 */ /*c2 */\n"
-                         "#include <vector>\n";
-  EXPECT_EQ(Expected, insert(Code, "<vector>"));
-}
-
-TEST_F(HeaderIncludesTest, CodeAfterComments) {
-  std::string Code = "/*\n"
-                     "* comment\n"
-                     "*/ /* comment\n"
-                     "*/\n"
-                     "\n\n"
-                     "/* c1 */ /*c2 */\n"
-                     "\n"
-                     "int x;\n";
-  std::string Expected = "/*\n"
-                         "* comment\n"
-                         "*/ /* comment\n"
-                         "*/\n"
-                         "\n\n"
-                         "/* c1 */ /*c2 */\n"
-                         "\n"
-                         "#include <vector>\n"
-                         "int x;\n";
-  EXPECT_EQ(Expected, insert(Code, "<vector>"));
-}
-
-TEST_F(HeaderIncludesTest, FakeHeaderGuardIfDef) {
-  std::string Code = "// comment \n"
-                     "#ifdef X\n"
-                     "#define X\n";
-  std::string Expected = "// comment \n"
-                         "#include <vector>\n"
-                         "#ifdef X\n"
-                         "#define X\n";
-  EXPECT_EQ(Expected, insert(Code, "<vector>"));
-}
-
-TEST_F(HeaderIncludesTest, RealHeaderGuardAfterComments) {
-  std::string Code = "// comment \n"
-                     "#ifndef X\n"
-                     "#define X\n"
-                     "int x;\n"
-                     "#define Y 1\n";
-  std::string Expected = "// comment \n"
-                         "#ifndef X\n"
-                         "#define X\n"
-                         "#include <vector>\n"
-                         "int x;\n"
-                         "#define Y 1\n";
-  EXPECT_EQ(Expected, insert(Code, "<vector>"));
-}
-
-TEST_F(HeaderIncludesTest, PragmaOnce) {
-  std::string Code = "// comment \n"
-                     "#pragma once\n"
-                     "int x;\n";
-  std::string Expected = "// comment \n"
-                         "#pragma once\n"
-                         "#include <vector>\n"
-                         "int x;\n";
-  EXPECT_EQ(Expected, insert(Code, "<vector>"));
-}
-
-TEST_F(HeaderIncludesTest, IfNDefWithNoDefine) {
-  std::string Code = "// comment \n"
-                     "#ifndef X\n"
-                     "int x;\n"
-                     "#define Y 1\n";
-  std::string Expected = "// comment \n"
-                         "#include <vector>\n"
-                         "#ifndef X\n"
-                         "int x;\n"
-                         "#define Y 1\n";
-  EXPECT_EQ(Expected, insert(Code, "<vector>"));
-}
-
-TEST_F(HeaderIncludesTest, FakeHeaderGuard) {
-  std::string Code = "// comment \n"
-                     "#ifndef X\n"
-                     "#define 1\n";
-  std::string Expected = "// comment \n"
-                         "#include <vector>\n"
-                         "#ifndef X\n"
-                         "#define 1\n";
-  EXPECT_EQ(Expected, insert(Code, "<vector>"));
-}
-
-TEST_F(HeaderIncludesTest, FakeHeaderGuardIfnDef) {
-  std::string Code = "#ifndef A_H\n"
-                     "#define A_H 1\n"
-                     "#endif";
-  std::string Expected = "#include \"b.h\"\n"
-                         "#ifndef A_H\n"
-                         "#define A_H 1\n"
-                         "#endif";
-
-  EXPECT_EQ(Expected, insert(Code, "\"b.h\""));
-}
-
-TEST_F(HeaderIncludesTest, HeaderGuardWithComment) {
-  std::string Code = "// comment \n"
-                     "#ifndef X // comment\n"
-                     "// comment\n"
-                     "/* comment\n"
-                     "*/\n"
-                     "/* comment */ #define X\n"
-                     "int x;\n"
-                     "#define Y 1\n";
-  std::string Expected = "// comment \n"
-                         "#ifndef X // comment\n"
-                         "// comment\n"
-                         "/* comment\n"
-                         "*/\n"
-                         "/* comment */ #define X\n"
-                         "#include <vector>\n"
-                         "int x;\n"
-                         "#define Y 1\n";
-  EXPECT_EQ(Expected, insert(Code, "<vector>"));
-}
-
-TEST_F(HeaderIncludesTest, EmptyCode) {
-  std::string Code = "";
-  std::string Expected = "#include <vector>\n";
-  EXPECT_EQ(Expected, insert(Code, "<vector>"));
-}
-
-TEST_F(HeaderIncludesTest, NoNewLineAtTheEndOfCode) {
-  std::string Code = "#include <map>";
-  std::string Expected = "#include <map>\n#include <vector>\n";
-  EXPECT_EQ(Expected, insert(Code, "<vector>"));
-}
-
-TEST_F(HeaderIncludesTest, SkipExistingHeaders) {
-  std::string Code = "#include \"a.h\"\n"
-                     "#include <vector>\n";
-  std::string Expected = "#include \"a.h\"\n"
-                         "#include <vector>\n";
-  EXPECT_EQ(Expected, insert(Code, "<vector>"));
-  EXPECT_EQ(Expected, insert(Code, "\"a.h\""));
-}
-
-TEST_F(HeaderIncludesTest, AddIncludesWithDifferentForms) {
-  std::string Code = "#include <vector>\n";
-  // FIXME: this might not be the best behavior.
-  std::string Expected = "#include \"vector\"\n"
-                         "#include <vector>\n";
-  EXPECT_EQ(Expected, insert(Code, "\"vector\""));
-}
-
-TEST_F(HeaderIncludesTest, NoInsertionAfterCode) {
-  std::string Code = "#include \"a.h\"\n"
-                     "void f() {}\n"
-                     "#include \"b.h\"\n";
-  std::string Expected = "#include \"a.h\"\n"
-                         "#include \"c.h\"\n"
-                         "void f() {}\n"
-                         "#include \"b.h\"\n";
-  EXPECT_EQ(Expected, insert(Code, "\"c.h\""));
-}
-
-TEST_F(HeaderIncludesTest, NoInsertionInStringLiteral) {
-  std::string Code = "#include \"a.h\"\n"
-                     "const char[] = R\"(\n"
-                     "#include \"b.h\"\n"
-                     ")\";\n";
-  std::string Expected = "#include \"a.h\"\n"
-                         "#include \"c.h\"\n"
-                         "const char[] = R\"(\n"
-                         "#include \"b.h\"\n"
-                         ")\";\n";
-  EXPECT_EQ(Expected, insert(Code, "\"c.h\""));
-}
-
-TEST_F(HeaderIncludesTest, NoInsertionAfterOtherDirective) {
-  std::string Code = "#include \"a.h\"\n"
-                     "#ifdef X\n"
-                     "#include \"b.h\"\n"
-                     "#endif\n";
-  std::string Expected = "#include \"a.h\"\n"
-                         "#include \"c.h\"\n"
-                         "#ifdef X\n"
-                         "#include \"b.h\"\n"
-                         "#endif\n";
-  EXPECT_EQ(Expected, insert(Code, "\"c.h\""));
-}
-
-TEST_F(HeaderIncludesTest, CanInsertAfterLongSystemInclude) {
-  std::string Code = "#include \"a.h\"\n"
-                     "// comment\n\n"
-                     "#include <a/b/c/d/e.h>\n";
-  std::string Expected = "#include \"a.h\"\n"
-                         "// comment\n\n"
-                         "#include <a/b/c/d/e.h>\n"
-                         "#include <x.h>\n";
-  EXPECT_EQ(Expected, insert(Code, "<x.h>"));
-}
-
-TEST_F(HeaderIncludesTest, CanInsertAfterComment) {
-  std::string Code = "#include \"a.h\"\n"
-                     "// Comment\n"
-                     "\n"
-                     "/* Comment */\n"
-                     "// Comment\n"
-                     "\n"
-                     "#include \"b.h\"\n";
-  std::string Expected = "#include \"a.h\"\n"
-                         "// Comment\n"
-                         "\n"
-                         "/* Comment */\n"
-                         "// Comment\n"
-                         "\n"
-                         "#include \"b.h\"\n"
-                         "#include \"c.h\"\n";
-  EXPECT_EQ(Expected, insert(Code, "\"c.h\""));
-}
-
-TEST_F(HeaderIncludesTest, LongCommentsInTheBeginningOfFile) {
-  std::string Code = "// Loooooooooooooooooooooooooong comment\n"
-                     "// Loooooooooooooooooooooooooong comment\n"
-                     "// Loooooooooooooooooooooooooong comment\n"
-                     "#include <string>\n"
-                     "#include <vector>\n"
-                     "\n"
-                     "#include \"a.h\"\n"
-                     "#include \"b.h\"\n";
-  std::string Expected = "// Loooooooooooooooooooooooooong comment\n"
-                         "// Loooooooooooooooooooooooooong comment\n"
-                         "// Loooooooooooooooooooooooooong comment\n"
-                         "#include <string>\n"
-                         "#include <vector>\n"
-                         "\n"
-                         "#include \"a.h\"\n"
-                         "#include \"b.h\"\n"
-                         "#include \"third.h\"\n";
-  Style = format::getGoogleStyle(format::FormatStyle::LanguageKind::LK_Cpp)
-              .IncludeStyle;
-  EXPECT_EQ(Expected, insert(Code, "\"third.h\""));
-}
-
-TEST_F(HeaderIncludesTest, SimpleDeleteInclude) {
-  std::string Code = "#include \"abc.h\"\n"
-                     "#include \"xyz.h\" // comment\n"
-                     "int x;\n";
-  std::string Expected = "#include \"abc.h\"\n"
-                         "int x;\n";
-  EXPECT_EQ(Expected, remove(Code, "\"xyz.h\""));
-}
-
-TEST_F(HeaderIncludesTest, DeleteQuotedOnly) {
-  std::string Code = "#include \"abc.h\"\n"
-                     "#include <abc.h>\n"
-                     "int x;\n";
-  std::string Expected = "#include <abc.h>\n"
-                         "int x;\n";
-  EXPECT_EQ(Expected, remove(Code, "\"abc.h\""));
-}
-
-TEST_F(HeaderIncludesTest, DeleteAllCode) {
-  std::string Code = "#include \"xyz.h\"\n";
-  std::string Expected = "";
-  EXPECT_EQ(Expected, remove(Code, "\"xyz.h\""));
-}
-
-TEST_F(HeaderIncludesTest, DeleteOnlyIncludesWithSameQuote) {
-  std::string Code = "#include \"xyz.h\"\n"
-                     "#include \"xyz\"\n"
-                     "#include <xyz.h>\n";
-  std::string Expected = "#include \"xyz.h\"\n"
-                         "#include \"xyz\"\n";
-  EXPECT_EQ(Expected, remove(Code, "<xyz.h>"));
-}
-
-TEST_F(HeaderIncludesTest, CanDeleteAfterCode) {
-  std::string Code = "#include \"a.h\"\n"
-                     "void f() {}\n"
-                     "#include \"b.h\"\n";
-  std::string Expected = "#include \"a.h\"\n"
-                         "void f() {}\n";
-  EXPECT_EQ(Expected, remove(Code, "\"b.h\""));
-}
-
-} // namespace
-} // namespace tooling
-} // namespace clang
diff --git a/gnu/llvm/clang/unittests/Tooling/LexicallyOrderedRecursiveASTVisitorTest.cpp b/gnu/llvm/clang/unittests/Tooling/LexicallyOrderedRecursiveASTVisitorTest.cpp
deleted file mode 100644
index 38079f706f3..00000000000
--- a/gnu/llvm/clang/unittests/Tooling/LexicallyOrderedRecursiveASTVisitorTest.cpp
+++ /dev/null
@@ -1,226 +0,0 @@
-//===- unittest/Tooling/LexicallyOrderedRecursiveASTVisitorTest.cpp -------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "TestVisitor.h"
-#include "clang/AST/LexicallyOrderedRecursiveASTVisitor.h"
-#include <stack>
-
-using namespace clang;
-
-namespace {
-
-class DummyMatchVisitor;
-
-class LexicallyOrderedDeclVisitor
-    : public LexicallyOrderedRecursiveASTVisitor<LexicallyOrderedDeclVisitor> {
-public:
-  LexicallyOrderedDeclVisitor(DummyMatchVisitor &Matcher,
-                              const SourceManager &SM, bool EmitDeclIndices,
-                              bool EmitStmtIndices)
-      : LexicallyOrderedRecursiveASTVisitor(SM), Matcher(Matcher),
-        EmitDeclIndices(EmitDeclIndices), EmitStmtIndices(EmitStmtIndices) {}
-
-  bool TraverseDecl(Decl *D) {
-    TraversalStack.push_back(D);
-    LexicallyOrderedRecursiveASTVisitor::TraverseDecl(D);
-    TraversalStack.pop_back();
-    return true;
-  }
-
-  bool TraverseStmt(Stmt *S);
-
-  bool VisitNamedDecl(const NamedDecl *D);
-  bool VisitDeclRefExpr(const DeclRefExpr *D);
-
-private:
-  DummyMatchVisitor &Matcher;
-  bool EmitDeclIndices, EmitStmtIndices;
-  unsigned Index = 0;
-  llvm::SmallVector<Decl *, 8> TraversalStack;
-};
-
-class DummyMatchVisitor : public ExpectedLocationVisitor<DummyMatchVisitor> {
-  bool EmitDeclIndices, EmitStmtIndices;
-
-public:
-  DummyMatchVisitor(bool EmitDeclIndices = false, bool EmitStmtIndices = false)
-      : EmitDeclIndices(EmitDeclIndices), EmitStmtIndices(EmitStmtIndices) {}
-  bool VisitTranslationUnitDecl(TranslationUnitDecl *TU) {
-    const ASTContext &Context = TU->getASTContext();
-    const SourceManager &SM = Context.getSourceManager();
-    LexicallyOrderedDeclVisitor SubVisitor(*this, SM, EmitDeclIndices,
-                                           EmitStmtIndices);
-    SubVisitor.TraverseDecl(TU);
-    return false;
-  }
-
-  template <class T> void match(StringRef Path, const T *D) {
-    Match(Path, D->getBeginLoc());
-  }
-};
-
-bool LexicallyOrderedDeclVisitor::TraverseStmt(Stmt *S) {
-  Matcher.match("overridden TraverseStmt", S);
-  return LexicallyOrderedRecursiveASTVisitor::TraverseStmt(S);
-}
-
-bool LexicallyOrderedDeclVisitor::VisitNamedDecl(const NamedDecl *D) {
-  std::string Path;
-  llvm::raw_string_ostream OS(Path);
-  assert(TraversalStack.back() == D);
-  for (const Decl *D : TraversalStack) {
-    if (isa<TranslationUnitDecl>(D)) {
-      OS << "/";
-      continue;
-    }
-    if (const auto *ND = dyn_cast<NamedDecl>(D))
-      OS << ND->getNameAsString();
-    else
-      OS << "???";
-    if (isa<DeclContext>(D) || isa<TemplateDecl>(D))
-      OS << "/";
-  }
-  if (EmitDeclIndices)
-    OS << "@" << Index++;
-  Matcher.match(OS.str(), D);
-  return true;
-}
-
-bool LexicallyOrderedDeclVisitor::VisitDeclRefExpr(const DeclRefExpr *D) {
-  std::string Name = D->getFoundDecl()->getNameAsString();
-  llvm::raw_string_ostream OS(Name);
-  if (EmitStmtIndices)
-    OS << "@" << Index++;
-  Matcher.match(OS.str(), D);
-  return true;
-}
-
-TEST(LexicallyOrderedRecursiveASTVisitor, VisitDeclsInImplementation) {
-  StringRef Source = R"(
-@interface I
-@end
-@implementation I
-
-int nestedFunction() { }
-
-- (void) method{ }
-
-int anotherNestedFunction(int x) {
-  return x;
-}
-
-int innerVariable = 0;
-
-@end
-
-int outerVariable = 0;
-
-@implementation I(Cat)
-
-void catF() { }
-
-@end
-
-void outerFunction() { }
-)";
-  DummyMatchVisitor Visitor;
-  Visitor.DisallowMatch("/nestedFunction/", 6, 1);
-  Visitor.ExpectMatch("/I/nestedFunction/", 6, 1);
-  Visitor.ExpectMatch("/I/method/", 8, 1);
-  Visitor.DisallowMatch("/anotherNestedFunction/", 10, 1);
-  Visitor.ExpectMatch("/I/anotherNestedFunction/", 10, 1);
-  Visitor.DisallowMatch("/innerVariable", 14, 1);
-  Visitor.ExpectMatch("/I/innerVariable", 14, 1);
-  Visitor.ExpectMatch("/outerVariable", 18, 1);
-  Visitor.DisallowMatch("/catF/", 22, 1);
-  Visitor.ExpectMatch("/Cat/catF/", 22, 1);
-  Visitor.ExpectMatch("/outerFunction/", 26, 1);
-  EXPECT_TRUE(Visitor.runOver(Source, DummyMatchVisitor::Lang_OBJC));
-}
-
-TEST(LexicallyOrderedRecursiveASTVisitor, VisitMacroDeclsInImplementation) {
-  StringRef Source = R"(
-@interface I
-@end
-
-void outerFunction() { }
-
-#define MACRO_F(x) void nestedFunction##x() { }
-
-@implementation I
-
-MACRO_F(1)
-
-@end
-
-MACRO_F(2)
-)";
-  DummyMatchVisitor Visitor;
-  Visitor.ExpectMatch("/outerFunction/", 5, 1);
-  Visitor.ExpectMatch("/I/nestedFunction1/", 7, 20);
-  Visitor.ExpectMatch("/nestedFunction2/", 7, 20);
-  EXPECT_TRUE(Visitor.runOver(Source, DummyMatchVisitor::Lang_OBJC));
-}
-
-TEST(LexicallyOrderedRecursiveASTVisitor, VisitTemplateDecl) {
-  StringRef Source = R"(
-template <class T> T f();
-template <class U, class = void> class Class {};
-)";
-  DummyMatchVisitor Visitor(/*EmitIndices=*/true);
-  Visitor.ExpectMatch("/f/T@1", 2, 11);
-  Visitor.ExpectMatch("/f/f/@2", 2, 20);
-  Visitor.ExpectMatch("/Class/U@4", 3, 11);
-  Visitor.ExpectMatch("/Class/@5", 3, 20);
-  Visitor.ExpectMatch("/Class/Class/@6", 3, 34);
-  EXPECT_TRUE(Visitor.runOver(Source));
-}
-
-TEST(LexicallyOrderedRecursiveASTVisitor, VisitCXXOperatorCallExpr) {
-  StringRef Source = R"(
-struct S {
-  S &operator+(S&);
-  S *operator->();
-  S &operator++();
-  S operator++(int);
-  void operator()(int, int);
-  void operator[](int);
-  void f();
-};
-S a, b, c;
-
-void test() {
-  a = b + c;
-  a->f();
-  a(1, 2);
-  b[0];
-  ++a;
-  b++;
-}
-)";
-  DummyMatchVisitor Visitor(/*EmitDeclIndices=*/false,
-                            /*EmitStmtIndices=*/true);
-  // There are two overloaded operators that start at this point
-  // This makes sure they are both traversed using the overridden
-  // TraverseStmt, as the traversal is implemented by us for
-  // CXXOperatorCallExpr.
-  Visitor.ExpectMatch("overridden TraverseStmt", 14, 3, 2);
-  Visitor.ExpectMatch("a@0", 14, 3);
-  Visitor.ExpectMatch("operator=@1", 14, 5);
-  Visitor.ExpectMatch("b@2", 14, 7);
-  Visitor.ExpectMatch("operator+@3", 14, 9);
-  Visitor.ExpectMatch("c@4", 14, 11);
-  Visitor.ExpectMatch("operator->@6", 15, 4);
-  Visitor.ExpectMatch("operator()@8", 16, 4);
-  Visitor.ExpectMatch("operator[]@10", 17, 4);
-  Visitor.ExpectMatch("operator++@11", 18, 3);
-  Visitor.ExpectMatch("operator++@14", 19, 4);
-  EXPECT_TRUE(Visitor.runOver(Source));
-}
-
-} // end anonymous namespace
diff --git a/gnu/llvm/clang/unittests/Tooling/LookupTest.cpp b/gnu/llvm/clang/unittests/Tooling/LookupTest.cpp
deleted file mode 100644
index 05494cb42d9..00000000000
--- a/gnu/llvm/clang/unittests/Tooling/LookupTest.cpp
+++ /dev/null
@@ -1,251 +0,0 @@
-//===- unittest/Tooling/LookupTest.cpp ------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/Tooling/Refactoring/Lookup.h"
-#include "TestVisitor.h"
-using namespace clang;
-
-namespace {
-struct GetDeclsVisitor : TestVisitor<GetDeclsVisitor> {
-  std::function<void(CallExpr *)> OnCall;
-  std::function<void(RecordTypeLoc)> OnRecordTypeLoc;
-  SmallVector<Decl *, 4> DeclStack;
-
-  bool VisitCallExpr(CallExpr *Expr) {
-    if (OnCall)
-      OnCall(Expr);
-    return true;
-  }
-
-  bool VisitRecordTypeLoc(RecordTypeLoc Loc) {
-    if (OnRecordTypeLoc)
-      OnRecordTypeLoc(Loc);
-    return true;
-  }
-
-  bool TraverseDecl(Decl *D) {
-    DeclStack.push_back(D);
-    bool Ret = TestVisitor::TraverseDecl(D);
-    DeclStack.pop_back();
-    return Ret;
-  }
-};
-
-TEST(LookupTest, replaceNestedFunctionName) {
-  GetDeclsVisitor Visitor;
-
-  auto replaceCallExpr = [&](const CallExpr *Expr,
-                             StringRef ReplacementString) {
-    const auto *Callee = cast<DeclRefExpr>(Expr->getCallee()->IgnoreImplicit());
-    const ValueDecl *FD = Callee->getDecl();
-    return tooling::replaceNestedName(
-        Callee->getQualifier(), Callee->getLocation(),
-        Visitor.DeclStack.back()->getDeclContext(), FD, ReplacementString);
-  };
-
-  Visitor.OnCall = [&](CallExpr *Expr) {
-    EXPECT_EQ("bar", replaceCallExpr(Expr, "::bar"));
-  };
-  Visitor.runOver("namespace a { void foo(); }\n"
-                  "namespace a { void f() { foo(); } }\n");
-
-  Visitor.OnCall = [&](CallExpr *Expr) {
-    EXPECT_EQ("bar", replaceCallExpr(Expr, "::a::bar"));
-  };
-  Visitor.runOver("namespace a { void foo(); }\n"
-                  "namespace a { void f() { foo(); } }\n");
-
-  Visitor.OnCall = [&](CallExpr *Expr) {
-    EXPECT_EQ("a::bar", replaceCallExpr(Expr, "::a::bar"));
-  };
-  Visitor.runOver("namespace a { void foo(); }\n"
-                  "namespace b { void f() { a::foo(); } }\n");
-
-  Visitor.OnCall = [&](CallExpr *Expr) {
-    EXPECT_EQ("::a::bar", replaceCallExpr(Expr, "::a::bar"));
-  };
-  Visitor.runOver("namespace a { void foo(); }\n"
-                  "namespace b { namespace a { void foo(); }\n"
-                  "void f() { a::foo(); } }\n");
-
-  Visitor.OnCall = [&](CallExpr *Expr) {
-    EXPECT_EQ("c::bar", replaceCallExpr(Expr, "::a::c::bar"));
-  };
-  Visitor.runOver("namespace a { namespace b { void foo(); }\n"
-                  "void f() { b::foo(); } }\n");
-
-  Visitor.OnCall = [&](CallExpr *Expr) {
-    EXPECT_EQ("bar", replaceCallExpr(Expr, "::a::bar"));
-  };
-  Visitor.runOver("namespace a { namespace b { void foo(); }\n"
-                  "void f() { b::foo(); } }\n");
-
-  Visitor.OnCall = [&](CallExpr *Expr) {
-    EXPECT_EQ("bar", replaceCallExpr(Expr, "::bar"));
-  };
-  Visitor.runOver("void foo(); void f() { foo(); }\n");
-
-  Visitor.OnCall = [&](CallExpr *Expr) {
-    EXPECT_EQ("::bar", replaceCallExpr(Expr, "::bar"));
-  };
-  Visitor.runOver("void foo(); void f() { ::foo(); }\n");
-
-  Visitor.OnCall = [&](CallExpr *Expr) {
-    EXPECT_EQ("a::bar", replaceCallExpr(Expr, "::a::bar"));
-  };
-  Visitor.runOver("namespace a { void foo(); }\nvoid f() { a::foo(); }\n");
-
-  Visitor.OnCall = [&](CallExpr *Expr) {
-    EXPECT_EQ("a::bar", replaceCallExpr(Expr, "::a::bar"));
-  };
-  Visitor.runOver("namespace a { int foo(); }\nauto f = a::foo();\n");
-
-  Visitor.OnCall = [&](CallExpr *Expr) {
-    EXPECT_EQ("bar", replaceCallExpr(Expr, "::a::bar"));
-  };
-  Visitor.runOver(
-      "namespace a { int foo(); }\nusing a::foo;\nauto f = foo();\n");
-
-  Visitor.OnCall = [&](CallExpr *Expr) {
-    EXPECT_EQ("c::bar", replaceCallExpr(Expr, "::a::c::bar"));
-  };
-  Visitor.runOver("namespace a { namespace b { void foo(); } }\n"
-                  "namespace a { namespace b { namespace {"
-                  "void f() { foo(); }"
-                  "} } }\n");
-
-  Visitor.OnCall = [&](CallExpr *Expr) {
-    EXPECT_EQ("x::bar", replaceCallExpr(Expr, "::a::x::bar"));
-  };
-  Visitor.runOver("namespace a { namespace b { void foo(); } }\n"
-                  "namespace a { namespace b { namespace c {"
-                  "void f() { foo(); }"
-                  "} } }\n");
-
-  // If the shortest name is ambiguous, we need to add more qualifiers.
-  Visitor.OnCall = [&](CallExpr *Expr) {
-    EXPECT_EQ("a::y::bar", replaceCallExpr(Expr, "::a::y::bar"));
-  };
-  Visitor.runOver(R"(
-    namespace a {
-     namespace b {
-      namespace x { void foo() {} }
-      namespace y { void foo() {} }
-     }
-    }
-
-    namespace a {
-     namespace b {
-      void f() { x::foo(); }
-     }
-    })");
-
-  Visitor.OnCall = [&](CallExpr *Expr) {
-    // y::bar would be ambiguous due to "a::b::y".
-    EXPECT_EQ("::y::bar", replaceCallExpr(Expr, "::y::bar"));
-  };
-  Visitor.runOver(R"(
-    namespace a {
-     namespace b {
-      void foo() {}
-      namespace y { }
-     }
-    }
-
-    namespace a {
-     namespace b {
-      void f() { foo(); }
-     }
-    })");
-
-  Visitor.OnCall = [&](CallExpr *Expr) {
-    EXPECT_EQ("y::bar", replaceCallExpr(Expr, "::y::bar"));
-  };
-  Visitor.runOver(R"(
-    namespace a {
-    namespace b {
-    namespace x { void foo() {} }
-    namespace y { void foo() {} }
-    }
-    }
-
-    void f() { a::b::x::foo(); }
-    )");
-}
-
-TEST(LookupTest, replaceNestedClassName) {
-  GetDeclsVisitor Visitor;
-
-  auto replaceRecordTypeLoc = [&](RecordTypeLoc TLoc,
-                                  StringRef ReplacementString) {
-    const auto *FD = cast<CXXRecordDecl>(TLoc.getDecl());
-    return tooling::replaceNestedName(
-        nullptr, TLoc.getBeginLoc(), Visitor.DeclStack.back()->getDeclContext(),
-        FD, ReplacementString);
-  };
-
-  Visitor.OnRecordTypeLoc = [&](RecordTypeLoc Type) {
-    // Filter Types by name since there are other `RecordTypeLoc` in the test
-    // file.
-    if (Type.getDecl()->getQualifiedNameAsString() == "a::b::Foo") {
-      EXPECT_EQ("x::Bar", replaceRecordTypeLoc(Type, "::a::x::Bar"));
-    }
-  };
-  Visitor.runOver("namespace a { namespace b {\n"
-                  "class Foo;\n"
-                  "namespace c { Foo f();; }\n"
-                  "} }\n");
-
-  Visitor.OnRecordTypeLoc = [&](RecordTypeLoc Type) {
-    // Filter Types by name since there are other `RecordTypeLoc` in the test
-    // file.
-    // `a::b::Foo` in using shadow decl is not `TypeLoc`.
-    if (Type.getDecl()->getQualifiedNameAsString() == "a::b::Foo") {
-      EXPECT_EQ("Bar", replaceRecordTypeLoc(Type, "::a::x::Bar"));
-    }
-  };
-  Visitor.runOver("namespace a { namespace b { class Foo {}; } }\n"
-                  "namespace c { using a::b::Foo; Foo f();; }\n");
-
-  // Rename TypeLoc `x::y::Old` to new name `x::Foo` at [0] and check that the
-  // type is replaced with "Foo" instead of "x::Foo". Although there is a symbol
-  // `x::y::Foo` in c.cc [1], it should not make "Foo" at [0] ambiguous because
-  // it's not visible at [0].
-  Visitor.OnRecordTypeLoc = [&](RecordTypeLoc Type) {
-    if (Type.getDecl()->getQualifiedNameAsString() == "x::y::Old") {
-      EXPECT_EQ("Foo", replaceRecordTypeLoc(Type, "::x::Foo"));
-    }
-  };
-  Visitor.runOver(R"(
-    // a.h
-    namespace x {
-     namespace y {
-      class Old {};
-      class Other {};
-     }
-    }
-
-    // b.h
-    namespace x {
-     namespace y {
-      // This is to be renamed to x::Foo
-      // The expected replacement is "Foo".
-      Old f;  // [0].
-     }
-    }
-
-    // c.cc
-    namespace x {
-    namespace y {
-     using Foo = ::x::y::Other; // [1]
-    }
-    }
-    )");
-}
-
-} // end anonymous namespace
diff --git a/gnu/llvm/clang/unittests/Tooling/QualTypeNamesTest.cpp b/gnu/llvm/clang/unittests/Tooling/QualTypeNamesTest.cpp
deleted file mode 100644
index 8272edb28c2..00000000000
--- a/gnu/llvm/clang/unittests/Tooling/QualTypeNamesTest.cpp
+++ /dev/null
@@ -1,260 +0,0 @@
-//===- unittest/Tooling/QualTypeNameTest.cpp ------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/AST/QualTypeNames.h"
-#include "TestVisitor.h"
-using namespace clang;
-
-namespace {
-struct TypeNameVisitor : TestVisitor<TypeNameVisitor> {
-  llvm::StringMap<std::string> ExpectedQualTypeNames;
-  bool WithGlobalNsPrefix = false;
-
-  // ValueDecls are the least-derived decl with both a qualtype and a
-  // name.
-  bool TraverseDecl(Decl *D) {
-    return true;  // Always continue
-  }
-
-  bool VisitValueDecl(const ValueDecl *VD) {
-    std::string ExpectedName =
-        ExpectedQualTypeNames.lookup(VD->getNameAsString());
-    if (ExpectedName != "") {
-      PrintingPolicy Policy(Context->getPrintingPolicy());
-      Policy.SuppressScope = false;
-      Policy.AnonymousTagLocations = true;
-      Policy.PolishForDeclaration = true;
-      Policy.SuppressUnwrittenScope = true;
-      std::string ActualName = TypeName::getFullyQualifiedName(
-          VD->getType(), *Context, Policy, WithGlobalNsPrefix);
-      if (ExpectedName != ActualName) {
-        // A custom message makes it much easier to see what declaration
-        // failed compared to EXPECT_EQ.
-        EXPECT_TRUE(false) << "Typename::getFullyQualifiedName failed for "
-                           << VD->getQualifiedNameAsString() << std::endl
-                           << "   Actual: " << ActualName << std::endl
-                           << " Exepcted: " << ExpectedName;
-      }
-    }
-    return true;
-  }
-};
-
-// named namespaces inside anonymous namespaces
-
-TEST(QualTypeNameTest, getFullyQualifiedName) {
-  TypeNameVisitor Visitor;
-  // Simple case to test the test framework itself.
-  Visitor.ExpectedQualTypeNames["CheckInt"] = "int";
-
-  // Keeping the names of the variables whose types we check unique
-  // within the entire test--regardless of their own scope--makes it
-  // easier to diagnose test failures.
-
-  // Simple namespace qualifier
-  Visitor.ExpectedQualTypeNames["CheckA"] = "A::B::Class0";
-  // Lookup up the enclosing scopes, then down another one. (These
-  // appear as elaborated type in the AST. In that case--even if
-  // policy.SuppressScope = 0--qual_type.getAsString(policy) only
-  // gives the name as it appears in the source, not the full name.
-  Visitor.ExpectedQualTypeNames["CheckB"] = "A::B::C::Class1";
-  // Template parameter expansion.
-  Visitor.ExpectedQualTypeNames["CheckC"] =
-      "A::B::Template0<A::B::C::MyInt, A::B::AnotherClass>";
-  // Recursive template parameter expansion.
-  Visitor.ExpectedQualTypeNames["CheckD"] =
-      "A::B::Template0<A::B::Template1<A::B::C::MyInt, A::B::AnotherClass>, "
-      "A::B::Template0<int, long> >";
-  // Variadic Template expansion.
-  Visitor.ExpectedQualTypeNames["CheckE"] =
-      "A::Variadic<int, A::B::Template0<int, char>, "
-      "A::B::Template1<int, long>, A::B::C::MyInt>";
-  // Using declarations should be fully expanded.
-  Visitor.ExpectedQualTypeNames["CheckF"] = "A::B::Class0";
-  // Elements found within "using namespace foo;" should be fully
-  // expanded.
-  Visitor.ExpectedQualTypeNames["CheckG"] = "A::B::C::MyInt";
-  // Type inside function
-  Visitor.ExpectedQualTypeNames["CheckH"] = "struct X";
-  // Anonymous Namespaces
-  Visitor.ExpectedQualTypeNames["CheckI"] = "aClass";
-  // Keyword inclusion with namespaces
-  Visitor.ExpectedQualTypeNames["CheckJ"] = "struct A::aStruct";
-  // Anonymous Namespaces nested in named namespaces and vice-versa.
-  Visitor.ExpectedQualTypeNames["CheckK"] = "D::aStruct";
-  // Namespace alias
-  Visitor.ExpectedQualTypeNames["CheckL"] = "A::B::C::MyInt";
-  Visitor.ExpectedQualTypeNames["non_dependent_type_var"] =
-      "Foo<X>::non_dependent_type";
-  Visitor.ExpectedQualTypeNames["AnEnumVar"] = "EnumScopeClass::AnEnum";
-  Visitor.ExpectedQualTypeNames["AliasTypeVal"] = "A::B::C::InnerAlias<int>";
-  Visitor.ExpectedQualTypeNames["AliasInnerTypeVal"] =
-      "OuterTemplateClass<A::B::Class0>::Inner";
-  Visitor.ExpectedQualTypeNames["CheckM"] = "const A::B::Class0 *";
-  Visitor.ExpectedQualTypeNames["CheckN"] = "const X *";
-  Visitor.runOver(
-      "int CheckInt;\n"
-      "template <typename T>\n"
-      "class OuterTemplateClass { public: struct Inner {}; };\n"
-      "namespace A {\n"
-      " namespace B {\n"
-      "   class Class0 { };\n"
-      "   namespace C {\n"
-      "     typedef int MyInt;"
-      "     template <typename T>\n"
-      "     using InnerAlias = OuterTemplateClass<T>;\n"
-      "     InnerAlias<int> AliasTypeVal;\n"
-      "     InnerAlias<Class0>::Inner AliasInnerTypeVal;\n"
-      "   }\n"
-      "   template<class X, class Y> class Template0;"
-      "   template<class X, class Y> class Template1;"
-      "   typedef B::Class0 AnotherClass;\n"
-      "   void Function1(Template0<C::MyInt,\n"
-      "                  AnotherClass> CheckC);\n"
-      "   void Function2(Template0<Template1<C::MyInt, AnotherClass>,\n"
-      "                            Template0<int, long> > CheckD);\n"
-      "   void Function3(const B::Class0* CheckM);\n"
-      "  }\n"
-      "template<typename... Values> class Variadic {};\n"
-      "Variadic<int, B::Template0<int, char>, "
-      "         B::Template1<int, long>, "
-      "         B::C::MyInt > CheckE;\n"
-      " namespace BC = B::C;\n"
-      " BC::MyInt CheckL;\n"
-      "}\n"
-      "using A::B::Class0;\n"
-      "void Function(Class0 CheckF);\n"
-      "using namespace A::B::C;\n"
-      "void Function(MyInt CheckG);\n"
-      "void f() {\n"
-      "  struct X {} CheckH;\n"
-      "}\n"
-      "struct X;\n"
-      "void f(const ::X* CheckN) {}\n"
-      "namespace {\n"
-      "  class aClass {};\n"
-      "   aClass CheckI;\n"
-      "}\n"
-      "namespace A {\n"
-      "  struct aStruct {} CheckJ;\n"
-      "}\n"
-      "namespace {\n"
-      "  namespace D {\n"
-      "    namespace {\n"
-      "      class aStruct {};\n"
-      "      aStruct CheckK;\n"
-      "    }\n"
-      "  }\n"
-      "}\n"
-      "template<class T> struct Foo {\n"
-      "  typedef typename T::A dependent_type;\n"
-      "  typedef int non_dependent_type;\n"
-      "  dependent_type dependent_type_var;\n"
-      "  non_dependent_type non_dependent_type_var;\n"
-      "};\n"
-      "struct X { typedef int A; };"
-      "Foo<X> var;"
-      "void F() {\n"
-      "  var.dependent_type_var = 0;\n"
-      "var.non_dependent_type_var = 0;\n"
-      "}\n"
-      "class EnumScopeClass {\n"
-      "public:\n"
-      "  enum AnEnum { ZERO, ONE };\n"
-      "};\n"
-      "EnumScopeClass::AnEnum AnEnumVar;\n",
-      TypeNameVisitor::Lang_CXX11);
-
-  TypeNameVisitor Complex;
-  Complex.ExpectedQualTypeNames["CheckTX"] = "B::TX";
-  Complex.runOver(
-      "namespace A {"
-      "  struct X {};"
-      "}"
-      "using A::X;"
-      "namespace fake_std {"
-      "  template<class... Types > class tuple {};"
-      "}"
-      "namespace B {"
-      "  using fake_std::tuple;"
-      "  typedef tuple<X> TX;"
-      "  TX CheckTX;"
-      "  struct A { typedef int X; };"
-      "}");
-
-  TypeNameVisitor GlobalNsPrefix;
-  GlobalNsPrefix.WithGlobalNsPrefix = true;
-  GlobalNsPrefix.ExpectedQualTypeNames["IntVal"] = "int";
-  GlobalNsPrefix.ExpectedQualTypeNames["BoolVal"] = "bool";
-  GlobalNsPrefix.ExpectedQualTypeNames["XVal"] = "::A::B::X";
-  GlobalNsPrefix.ExpectedQualTypeNames["IntAliasVal"] = "::A::B::Alias<int>";
-  GlobalNsPrefix.ExpectedQualTypeNames["ZVal"] = "::A::B::Y::Z";
-  GlobalNsPrefix.ExpectedQualTypeNames["GlobalZVal"] = "::Z";
-  GlobalNsPrefix.ExpectedQualTypeNames["CheckK"] = "D::aStruct";
-  GlobalNsPrefix.ExpectedQualTypeNames["YZMPtr"] = "::A::B::X ::A::B::Y::Z::*";
-  GlobalNsPrefix.runOver(
-      "namespace A {\n"
-      "  namespace B {\n"
-      "    int IntVal;\n"
-      "    bool BoolVal;\n"
-      "    struct X {};\n"
-      "    X XVal;\n"
-      "    template <typename T> class CCC { };\n"
-      "    template <typename T>\n"
-      "    using Alias = CCC<T>;\n"
-      "    Alias<int> IntAliasVal;\n"
-      "    struct Y { struct Z { X YZIPtr; }; };\n"
-      "    Y::Z ZVal;\n"
-      "    X Y::Z::*YZMPtr;\n"
-      "  }\n"
-      "}\n"
-      "struct Z {};\n"
-      "Z GlobalZVal;\n"
-      "namespace {\n"
-      "  namespace D {\n"
-      "    namespace {\n"
-      "      class aStruct {};\n"
-      "      aStruct CheckK;\n"
-      "    }\n"
-      "  }\n"
-      "}\n"
-  );
-
-  TypeNameVisitor InlineNamespace;
-  InlineNamespace.ExpectedQualTypeNames["c"] = "B::C";
-  InlineNamespace.runOver("inline namespace A {\n"
-                          "  namespace B {\n"
-                          "    class C {};\n"
-                          "  }\n"
-                          "}\n"
-                          "using namespace A::B;\n"
-                          "C c;\n",
-                          TypeNameVisitor::Lang_CXX11);
-
-  TypeNameVisitor AnonStrucs;
-  AnonStrucs.ExpectedQualTypeNames["a"] = "short";
-  AnonStrucs.ExpectedQualTypeNames["un_in_st_1"] =
-      "union (anonymous struct at input.cc:1:1)::(anonymous union at "
-      "input.cc:2:27)";
-  AnonStrucs.ExpectedQualTypeNames["b"] = "short";
-  AnonStrucs.ExpectedQualTypeNames["un_in_st_2"] =
-      "union (anonymous struct at input.cc:1:1)::(anonymous union at "
-      "input.cc:5:27)";
-  AnonStrucs.ExpectedQualTypeNames["anon_st"] =
-      "struct (anonymous struct at input.cc:1:1)";
-  AnonStrucs.runOver(R"(struct {
-                          union {
-                            short a;
-                          } un_in_st_1;
-                          union {
-                            short b;
-                          } un_in_st_2;
-                        } anon_st;)");
-}
-
-}  // end anonymous namespace
diff --git a/gnu/llvm/clang/unittests/Tooling/RangeSelectorTest.cpp b/gnu/llvm/clang/unittests/Tooling/RangeSelectorTest.cpp
deleted file mode 100644
index a7fea004c3d..00000000000
--- a/gnu/llvm/clang/unittests/Tooling/RangeSelectorTest.cpp
+++ /dev/null
@@ -1,778 +0,0 @@
-//===- unittest/Tooling/RangeSelectorTest.cpp -----------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/Tooling/Transformer/RangeSelector.h"
-#include "clang/ASTMatchers/ASTMatchers.h"
-#include "clang/Frontend/ASTUnit.h"
-#include "clang/Tooling/Tooling.h"
-#include "clang/Tooling/Transformer/Parsing.h"
-#include "clang/Tooling/Transformer/SourceCode.h"
-#include "llvm/Support/Error.h"
-#include "llvm/Testing/Support/Error.h"
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-
-using namespace clang;
-using namespace transformer;
-using namespace ast_matchers;
-
-namespace {
-using ::llvm::Expected;
-using ::llvm::Failed;
-using ::llvm::HasValue;
-using ::llvm::StringError;
-using ::testing::AllOf;
-using ::testing::HasSubstr;
-using ::testing::Property;
-
-using MatchResult = MatchFinder::MatchResult;
-
-struct TestMatch {
-  // The AST unit from which `result` is built. We bundle it because it backs
-  // the result. Users are not expected to access it.
-  std::unique_ptr<clang::ASTUnit> ASTUnit;
-  // The result to use in the test. References `ast_unit`.
-  MatchResult Result;
-};
-
-template <typename M> TestMatch matchCode(StringRef Code, M Matcher) {
-  auto ASTUnit = tooling::buildASTFromCode(Code);
-  assert(ASTUnit != nullptr && "AST construction failed");
-
-  ASTContext &Context = ASTUnit->getASTContext();
-  assert(!Context.getDiagnostics().hasErrorOccurred() && "Compilation error");
-
-  TraversalKindScope RAII(Context, TK_AsIs);
-  auto Matches = ast_matchers::match(Matcher, Context);
-  // We expect a single, exact match.
-  assert(Matches.size() != 0 && "no matches found");
-  assert(Matches.size() == 1 && "too many matches");
-
-  return TestMatch{std::move(ASTUnit), MatchResult(Matches[0], &Context)};
-}
-
-// Applies \p Selector to \p Match and, on success, returns the selected source.
-Expected<StringRef> select(RangeSelector Selector, const TestMatch &Match) {
-  Expected<CharSourceRange> Range = Selector(Match.Result);
-  if (!Range)
-    return Range.takeError();
-  return tooling::getText(*Range, *Match.Result.Context);
-}
-
-// Applies \p Selector to a trivial match with only a single bound node with id
-// "bound_node_id".  For use in testing unbound-node errors.
-Expected<CharSourceRange> selectFromTrivial(const RangeSelector &Selector) {
-  // We need to bind the result to something, or the match will fail. Use a
-  // binding that is not used in the unbound node tests.
-  TestMatch Match =
-      matchCode("static int x = 0;", varDecl().bind("bound_node_id"));
-  return Selector(Match.Result);
-}
-
-// Matches the message expected for unbound-node failures.
-testing::Matcher<StringError> withUnboundNodeMessage() {
-  return testing::Property(
-      &StringError::getMessage,
-      AllOf(HasSubstr("unbound_id"), HasSubstr("not bound")));
-}
-
-// Applies \p Selector to code containing assorted node types, where the match
-// binds each one: a statement ("stmt"), a (non-member) ctor-initializer
-// ("init"), an expression ("expr") and a (nameless) declaration ("decl").  Used
-// to test failures caused by applying selectors to nodes of the wrong type.
-Expected<CharSourceRange> selectFromAssorted(RangeSelector Selector) {
-  StringRef Code = R"cc(
-      struct A {};
-      class F : public A {
-       public:
-        F(int) {}
-      };
-      void g() { F f(1); }
-    )cc";
-
-  auto Matcher =
-      compoundStmt(
-          hasDescendant(
-              cxxConstructExpr(
-                  hasDeclaration(
-                      decl(hasDescendant(cxxCtorInitializer(isBaseInitializer())
-                                             .bind("init")))
-                          .bind("decl")))
-                  .bind("expr")))
-          .bind("stmt");
-
-  return Selector(matchCode(Code, Matcher).Result);
-}
-
-// Matches the message expected for type-error failures.
-testing::Matcher<StringError> withTypeErrorMessage(const std::string &NodeID) {
-  return testing::Property(
-      &StringError::getMessage,
-      AllOf(HasSubstr(NodeID), HasSubstr("mismatched type")));
-}
-
-TEST(RangeSelectorTest, UnboundNode) {
-  EXPECT_THAT_EXPECTED(selectFromTrivial(node("unbound_id")),
-                       Failed<StringError>(withUnboundNodeMessage()));
-}
-
-MATCHER_P(EqualsCharSourceRange, Range, "") {
-  return Range.getAsRange() == arg.getAsRange() &&
-         Range.isTokenRange() == arg.isTokenRange();
-}
-
-// FIXME: here and elsewhere: use llvm::Annotations library to explicitly mark
-// points and ranges of interest, enabling more readable tests.
-TEST(RangeSelectorTest, BeforeOp) {
-  StringRef Code = R"cc(
-    int f(int x, int y, int z) { return 3; }
-    int g() { return f(/* comment */ 3, 7 /* comment */, 9); }
-  )cc";
-  StringRef CallID = "call";
-  ast_matchers::internal::Matcher<Stmt> M = callExpr().bind(CallID);
-  RangeSelector R = before(node(CallID.str()));
-
-  TestMatch Match = matchCode(Code, M);
-  const auto *E = Match.Result.Nodes.getNodeAs<Expr>(CallID);
-  assert(E != nullptr);
-  auto ExprBegin = E->getSourceRange().getBegin();
-  EXPECT_THAT_EXPECTED(
-      R(Match.Result),
-      HasValue(EqualsCharSourceRange(
-          CharSourceRange::getCharRange(ExprBegin, ExprBegin))));
-}
-
-TEST(RangeSelectorTest, BeforeOpParsed) {
-  StringRef Code = R"cc(
-    int f(int x, int y, int z) { return 3; }
-    int g() { return f(/* comment */ 3, 7 /* comment */, 9); }
-  )cc";
-  StringRef CallID = "call";
-  ast_matchers::internal::Matcher<Stmt> M = callExpr().bind(CallID);
-  auto R = parseRangeSelector(R"rs(before(node("call")))rs");
-  ASSERT_THAT_EXPECTED(R, llvm::Succeeded());
-
-  TestMatch Match = matchCode(Code, M);
-  const auto *E = Match.Result.Nodes.getNodeAs<Expr>(CallID);
-  assert(E != nullptr);
-  auto ExprBegin = E->getSourceRange().getBegin();
-  EXPECT_THAT_EXPECTED(
-      (*R)(Match.Result),
-      HasValue(EqualsCharSourceRange(
-          CharSourceRange::getCharRange(ExprBegin, ExprBegin))));
-}
-
-TEST(RangeSelectorTest, AfterOp) {
-  StringRef Code = R"cc(
-    int f(int x, int y, int z) { return 3; }
-    int g() { return f(/* comment */ 3, 7 /* comment */, 9); }
-  )cc";
-  StringRef Call = "call";
-  TestMatch Match = matchCode(Code, callExpr().bind(Call));
-  const auto* E = Match.Result.Nodes.getNodeAs<Expr>(Call);
-  assert(E != nullptr);
-  const SourceRange Range = E->getSourceRange();
-  // The end token, a right paren, is one character wide, so advance by one,
-  // bringing us to the semicolon.
-  const SourceLocation SemiLoc = Range.getEnd().getLocWithOffset(1);
-  const auto ExpectedAfter = CharSourceRange::getCharRange(SemiLoc, SemiLoc);
-
-  // Test with a char range.
-  auto CharRange = CharSourceRange::getCharRange(Range.getBegin(), SemiLoc);
-  EXPECT_THAT_EXPECTED(after(charRange(CharRange))(Match.Result),
-                       HasValue(EqualsCharSourceRange(ExpectedAfter)));
-
-  // Test with a token range.
-  auto TokenRange = CharSourceRange::getTokenRange(Range);
-  EXPECT_THAT_EXPECTED(after(charRange(TokenRange))(Match.Result),
-                       HasValue(EqualsCharSourceRange(ExpectedAfter)));
-}
-
-// Gets the spelling location `Length` characters after the start of AST node
-// `Id`.
-static SourceLocation getSpellingLocAfter(const MatchResult &Result,
-                                          StringRef Id, int Length) {
-  const auto *E = Result.Nodes.getNodeAs<Expr>(Id);
-  assert(E != nullptr);
-  return Result.SourceManager->getSpellingLoc(E->getBeginLoc())
-      .getLocWithOffset(Length);
-}
-
-// Test with a range that is the entire macro arg, but does not end the
-// expansion itself.
-TEST(RangeSelectorTest, AfterOpInMacroArg) {
-  StringRef Code = R"cc(
-#define ISNULL(x) x == nullptr
-    bool g() { int* y; return ISNULL(y); }
-  )cc";
-
-  TestMatch Match =
-      matchCode(Code, declRefExpr(to(namedDecl(hasName("y")))).bind("yvar"));
-  int YVarLen = 1;
-  SourceLocation After = getSpellingLocAfter(Match.Result, "yvar", YVarLen);
-  CharSourceRange Expected = CharSourceRange::getCharRange(After, After);
-  EXPECT_THAT_EXPECTED(after(node("yvar"))(Match.Result),
-                       HasValue(EqualsCharSourceRange(Expected)));
-}
-
-// Test with a range that is the entire macro arg and ends the expansion itself.
-TEST(RangeSelectorTest, AfterOpInMacroArgEndsExpansion) {
-  StringRef Code = R"cc(
-#define ISNULL(x) nullptr == x
-    bool g() { int* y; return ISNULL(y); }
-  )cc";
-
-  TestMatch Match =
-      matchCode(Code, declRefExpr(to(namedDecl(hasName("y")))).bind("yvar"));
-  int YVarLen = 1;
-  SourceLocation After = getSpellingLocAfter(Match.Result, "yvar", YVarLen);
-  CharSourceRange Expected = CharSourceRange::getCharRange(After, After);
-  EXPECT_THAT_EXPECTED(after(node("yvar"))(Match.Result),
-                       HasValue(EqualsCharSourceRange(Expected)));
-}
-
-TEST(RangeSelectorTest, AfterOpInPartOfMacroArg) {
-  StringRef Code = R"cc(
-#define ISNULL(x) x == nullptr
-    int* f(int*);
-    bool g() { int* y; return ISNULL(f(y)); }
-  )cc";
-
-  TestMatch Match =
-      matchCode(Code, declRefExpr(to(namedDecl(hasName("y")))).bind("yvar"));
-  int YVarLen = 1;
-  SourceLocation After = getSpellingLocAfter(Match.Result, "yvar", YVarLen);
-  CharSourceRange Expected = CharSourceRange::getCharRange(After, After);
-  EXPECT_THAT_EXPECTED(after(node("yvar"))(Match.Result),
-                       HasValue(EqualsCharSourceRange(Expected)));
-}
-
-TEST(RangeSelectorTest, BetweenOp) {
-  StringRef Code = R"cc(
-    int f(int x, int y, int z) { return 3; }
-    int g() { return f(3, /* comment */ 7 /* comment */, 9); }
-  )cc";
-  auto Matcher = callExpr(hasArgument(0, expr().bind("a0")),
-                          hasArgument(1, expr().bind("a1")));
-  RangeSelector R = between(node("a0"), node("a1"));
-  TestMatch Match = matchCode(Code, Matcher);
-  EXPECT_THAT_EXPECTED(select(R, Match), HasValue(", /* comment */ "));
-}
-
-TEST(RangeSelectorTest, BetweenOpParsed) {
-  StringRef Code = R"cc(
-    int f(int x, int y, int z) { return 3; }
-    int g() { return f(3, /* comment */ 7 /* comment */, 9); }
-  )cc";
-  auto Matcher = callExpr(hasArgument(0, expr().bind("a0")),
-                          hasArgument(1, expr().bind("a1")));
-  auto R = parseRangeSelector(R"rs(between(node("a0"), node("a1")))rs");
-  ASSERT_THAT_EXPECTED(R, llvm::Succeeded());
-  TestMatch Match = matchCode(Code, Matcher);
-  EXPECT_THAT_EXPECTED(select(*R, Match), HasValue(", /* comment */ "));
-}
-
-// Node-id specific version.
-TEST(RangeSelectorTest, EncloseOpNodes) {
-  StringRef Code = R"cc(
-    int f(int x, int y, int z) { return 3; }
-    int g() { return f(/* comment */ 3, 7 /* comment */, 9); }
-  )cc";
-  auto Matcher = callExpr(hasArgument(0, expr().bind("a0")),
-                          hasArgument(1, expr().bind("a1")));
-  RangeSelector R = encloseNodes("a0", "a1");
-  TestMatch Match = matchCode(Code, Matcher);
-  EXPECT_THAT_EXPECTED(select(R, Match), HasValue("3, 7"));
-}
-
-TEST(RangeSelectorTest, EncloseOpGeneral) {
-  StringRef Code = R"cc(
-    int f(int x, int y, int z) { return 3; }
-    int g() { return f(/* comment */ 3, 7 /* comment */, 9); }
-  )cc";
-  auto Matcher = callExpr(hasArgument(0, expr().bind("a0")),
-                          hasArgument(1, expr().bind("a1")));
-  RangeSelector R = enclose(node("a0"), node("a1"));
-  TestMatch Match = matchCode(Code, Matcher);
-  EXPECT_THAT_EXPECTED(select(R, Match), HasValue("3, 7"));
-}
-
-TEST(RangeSelectorTest, EncloseOpNodesParsed) {
-  StringRef Code = R"cc(
-    int f(int x, int y, int z) { return 3; }
-    int g() { return f(/* comment */ 3, 7 /* comment */, 9); }
-  )cc";
-  auto Matcher = callExpr(hasArgument(0, expr().bind("a0")),
-                          hasArgument(1, expr().bind("a1")));
-  auto R = parseRangeSelector(R"rs(encloseNodes("a0", "a1"))rs");
-  ASSERT_THAT_EXPECTED(R, llvm::Succeeded());
-  TestMatch Match = matchCode(Code, Matcher);
-  EXPECT_THAT_EXPECTED(select(*R, Match), HasValue("3, 7"));
-}
-
-TEST(RangeSelectorTest, EncloseOpGeneralParsed) {
-  StringRef Code = R"cc(
-    int f(int x, int y, int z) { return 3; }
-    int g() { return f(/* comment */ 3, 7 /* comment */, 9); }
-  )cc";
-  auto Matcher = callExpr(hasArgument(0, expr().bind("a0")),
-                          hasArgument(1, expr().bind("a1")));
-  auto R = parseRangeSelector(R"rs(encloseNodes("a0", "a1"))rs");
-  ASSERT_THAT_EXPECTED(R, llvm::Succeeded());
-  TestMatch Match = matchCode(Code, Matcher);
-  EXPECT_THAT_EXPECTED(select(*R, Match), HasValue("3, 7"));
-}
-
-TEST(RangeSelectorTest, NodeOpStatement) {
-  StringRef Code = "int f() { return 3; }";
-  TestMatch Match = matchCode(Code, returnStmt().bind("id"));
-  EXPECT_THAT_EXPECTED(select(node("id"), Match), HasValue("return 3;"));
-}
-
-TEST(RangeSelectorTest, NodeOpExpression) {
-  StringRef Code = "int f() { return 3; }";
-  TestMatch Match = matchCode(Code, expr().bind("id"));
-  EXPECT_THAT_EXPECTED(select(node("id"), Match), HasValue("3"));
-}
-
-TEST(RangeSelectorTest, StatementOp) {
-  StringRef Code = "int f() { return 3; }";
-  TestMatch Match = matchCode(Code, expr().bind("id"));
-  RangeSelector R = statement("id");
-  EXPECT_THAT_EXPECTED(select(R, Match), HasValue("3;"));
-}
-
-TEST(RangeSelectorTest, StatementOpParsed) {
-  StringRef Code = "int f() { return 3; }";
-  TestMatch Match = matchCode(Code, expr().bind("id"));
-  auto R = parseRangeSelector(R"rs(statement("id"))rs");
-  ASSERT_THAT_EXPECTED(R, llvm::Succeeded());
-  EXPECT_THAT_EXPECTED(select(*R, Match), HasValue("3;"));
-}
-
-TEST(RangeSelectorTest, MemberOp) {
-  StringRef Code = R"cc(
-    struct S {
-      int member;
-    };
-    int g() {
-      S s;
-      return s.member;
-    }
-  )cc";
-  const char *ID = "id";
-  TestMatch Match = matchCode(Code, memberExpr().bind(ID));
-  EXPECT_THAT_EXPECTED(select(member(ID), Match), HasValue("member"));
-}
-
-// Tests that member does not select any qualifiers on the member name.
-TEST(RangeSelectorTest, MemberOpQualified) {
-  StringRef Code = R"cc(
-    struct S {
-      int member;
-    };
-    struct T : public S {
-      int field;
-    };
-    int g() {
-      T t;
-      return t.S::member;
-    }
-  )cc";
-  const char *ID = "id";
-  TestMatch Match = matchCode(Code, memberExpr().bind(ID));
-  EXPECT_THAT_EXPECTED(select(member(ID), Match), HasValue("member"));
-}
-
-TEST(RangeSelectorTest, MemberOpTemplate) {
-  StringRef Code = R"cc(
-    struct S {
-      template <typename T> T foo(T t);
-    };
-    int f(int x) {
-      S s;
-      return s.template foo<int>(3);
-    }
-  )cc";
-
-  const char *ID = "id";
-  TestMatch Match = matchCode(Code, memberExpr().bind(ID));
-  EXPECT_THAT_EXPECTED(select(member(ID), Match), HasValue("foo"));
-}
-
-TEST(RangeSelectorTest, MemberOpOperator) {
-  StringRef Code = R"cc(
-    struct S {
-      int operator*();
-    };
-    int f(int x) {
-      S s;
-      return s.operator *();
-    }
-  )cc";
-
-  const char *ID = "id";
-  TestMatch Match = matchCode(Code, memberExpr().bind(ID));
-  EXPECT_THAT_EXPECTED(select(member(ID), Match), HasValue("operator *"));
-}
-
-TEST(RangeSelectorTest, NameOpNamedDecl) {
-  StringRef Code = R"cc(
-    int myfun() {
-      return 3;
-    }
-  )cc";
-  const char *ID = "id";
-  TestMatch Match = matchCode(Code, functionDecl().bind(ID));
-  EXPECT_THAT_EXPECTED(select(name(ID), Match), HasValue("myfun"));
-}
-
-TEST(RangeSelectorTest, NameOpDeclRef) {
-  StringRef Code = R"cc(
-    int foo(int x) {
-      return x;
-    }
-    int g(int x) { return foo(x) * x; }
-  )cc";
-  const char *Ref = "ref";
-  TestMatch Match = matchCode(Code, declRefExpr(to(functionDecl())).bind(Ref));
-  EXPECT_THAT_EXPECTED(select(name(Ref), Match), HasValue("foo"));
-}
-
-TEST(RangeSelectorTest, NameOpCtorInitializer) {
-  StringRef Code = R"cc(
-    class C {
-     public:
-      C() : field(3) {}
-      int field;
-    };
-  )cc";
-  const char *Init = "init";
-  TestMatch Match = matchCode(Code, cxxCtorInitializer().bind(Init));
-  EXPECT_THAT_EXPECTED(select(name(Init), Match), HasValue("field"));
-}
-
-TEST(RangeSelectorTest, NameOpTypeLoc) {
-  StringRef Code = R"cc(
-    namespace ns {
-    struct Foo {
-      Foo();
-      Foo(int);
-      Foo(int, int);
-    };
-    }  // namespace ns
-
-    ns::Foo a;
-    auto b = ns::Foo(3);
-    auto c = ns::Foo(1, 2);
-  )cc";
-  const char *CtorTy = "ctor_ty";
-  // Matches declaration of `a`
-  TestMatch MatchA = matchCode(
-      Code, varDecl(hasName("a"), hasTypeLoc(typeLoc().bind(CtorTy))));
-  EXPECT_THAT_EXPECTED(select(name(CtorTy), MatchA), HasValue("Foo"));
-  // Matches call of Foo(int)
-  TestMatch MatchB = matchCode(
-      Code, cxxFunctionalCastExpr(hasTypeLoc(typeLoc().bind(CtorTy))));
-  EXPECT_THAT_EXPECTED(select(name(CtorTy), MatchB), HasValue("Foo"));
-  // Matches call of Foo(int, int)
-  TestMatch MatchC = matchCode(
-      Code, cxxTemporaryObjectExpr(hasTypeLoc(typeLoc().bind(CtorTy))));
-  EXPECT_THAT_EXPECTED(select(name(CtorTy), MatchC), HasValue("Foo"));
-}
-
-TEST(RangeSelectorTest, NameOpErrors) {
-  EXPECT_THAT_EXPECTED(selectFromTrivial(name("unbound_id")),
-                       Failed<StringError>(withUnboundNodeMessage()));
-  EXPECT_THAT_EXPECTED(selectFromAssorted(name("stmt")),
-                       Failed<StringError>(withTypeErrorMessage("stmt")));
-}
-
-TEST(RangeSelectorTest, NameOpDeclRefError) {
-  StringRef Code = R"cc(
-    struct S {
-      int operator*();
-    };
-    int f(int x) {
-      S s;
-      return *s + x;
-    }
-  )cc";
-  const char *Ref = "ref";
-  TestMatch Match = matchCode(Code, declRefExpr(to(functionDecl())).bind(Ref));
-  EXPECT_THAT_EXPECTED(
-      name(Ref)(Match.Result),
-      Failed<StringError>(testing::Property(
-          &StringError::getMessage,
-          AllOf(HasSubstr(Ref), HasSubstr("requires property 'identifier'")))));
-}
-
-TEST(RangeSelectorTest, CallArgsOp) {
-  const StringRef Code = R"cc(
-    struct C {
-      int bar(int, int);
-    };
-    int f() {
-      C x;
-      return x.bar(3, 4);
-    }
-  )cc";
-  const char *ID = "id";
-  TestMatch Match = matchCode(Code, callExpr().bind(ID));
-  EXPECT_THAT_EXPECTED(select(callArgs(ID), Match), HasValue("3, 4"));
-}
-
-TEST(RangeSelectorTest, CallArgsOpNoArgs) {
-  const StringRef Code = R"cc(
-    struct C {
-      int bar();
-    };
-    int f() {
-      C x;
-      return x.bar();
-    }
-  )cc";
-  const char *ID = "id";
-  TestMatch Match = matchCode(Code, callExpr().bind(ID));
-  EXPECT_THAT_EXPECTED(select(callArgs(ID), Match), HasValue(""));
-}
-
-TEST(RangeSelectorTest, CallArgsOpNoArgsWithComments) {
-  const StringRef Code = R"cc(
-    struct C {
-      int bar();
-    };
-    int f() {
-      C x;
-      return x.bar(/*empty*/);
-    }
-  )cc";
-  const char *ID = "id";
-  TestMatch Match = matchCode(Code, callExpr().bind(ID));
-  EXPECT_THAT_EXPECTED(select(callArgs(ID), Match), HasValue("/*empty*/"));
-}
-
-// Tests that arguments are extracted correctly when a temporary (with parens)
-// is used.
-TEST(RangeSelectorTest, CallArgsOpWithParens) {
-  const StringRef Code = R"cc(
-    struct C {
-      int bar(int, int) { return 3; }
-    };
-    int f() {
-      C x;
-      return C().bar(3, 4);
-    }
-  )cc";
-  const char *ID = "id";
-  TestMatch Match =
-      matchCode(Code, callExpr(callee(functionDecl(hasName("bar")))).bind(ID));
-  EXPECT_THAT_EXPECTED(select(callArgs(ID), Match), HasValue("3, 4"));
-}
-
-TEST(RangeSelectorTest, CallArgsOpLeadingComments) {
-  const StringRef Code = R"cc(
-    struct C {
-      int bar(int, int) { return 3; }
-    };
-    int f() {
-      C x;
-      return x.bar(/*leading*/ 3, 4);
-    }
-  )cc";
-  const char *ID = "id";
-  TestMatch Match = matchCode(Code, callExpr().bind(ID));
-  EXPECT_THAT_EXPECTED(select(callArgs(ID), Match),
-                       HasValue("/*leading*/ 3, 4"));
-}
-
-TEST(RangeSelectorTest, CallArgsOpTrailingComments) {
-  const StringRef Code = R"cc(
-    struct C {
-      int bar(int, int) { return 3; }
-    };
-    int f() {
-      C x;
-      return x.bar(3 /*trailing*/, 4);
-    }
-  )cc";
-  const char *ID = "id";
-  TestMatch Match = matchCode(Code, callExpr().bind(ID));
-  EXPECT_THAT_EXPECTED(select(callArgs(ID), Match),
-                       HasValue("3 /*trailing*/, 4"));
-}
-
-TEST(RangeSelectorTest, CallArgsOpEolComments) {
-  const StringRef Code = R"cc(
-    struct C {
-      int bar(int, int) { return 3; }
-    };
-    int f() {
-      C x;
-      return x.bar(  // Header
-          1,           // foo
-          2            // bar
-      );
-    }
-  )cc";
-  const char *ID = "id";
-  TestMatch Match = matchCode(Code, callExpr().bind(ID));
-  std::string ExpectedString = R"(  // Header
-          1,           // foo
-          2            // bar
-      )";
-  EXPECT_THAT_EXPECTED(select(callArgs(ID), Match), HasValue(ExpectedString));
-}
-
-TEST(RangeSelectorTest, CallArgsErrors) {
-  EXPECT_THAT_EXPECTED(selectFromTrivial(callArgs("unbound_id")),
-                       Failed<StringError>(withUnboundNodeMessage()));
-  EXPECT_THAT_EXPECTED(selectFromAssorted(callArgs("stmt")),
-                       Failed<StringError>(withTypeErrorMessage("stmt")));
-}
-
-TEST(RangeSelectorTest, StatementsOp) {
-  StringRef Code = R"cc(
-    void g();
-    void f() { /* comment */ g(); /* comment */ g(); /* comment */ }
-  )cc";
-  const char *ID = "id";
-  TestMatch Match = matchCode(Code, compoundStmt().bind(ID));
-  EXPECT_THAT_EXPECTED(
-      select(statements(ID), Match),
-      HasValue(" /* comment */ g(); /* comment */ g(); /* comment */ "));
-}
-
-TEST(RangeSelectorTest, StatementsOpEmptyList) {
-  StringRef Code = "void f() {}";
-  const char *ID = "id";
-  TestMatch Match = matchCode(Code, compoundStmt().bind(ID));
-  EXPECT_THAT_EXPECTED(select(statements(ID), Match), HasValue(""));
-}
-
-TEST(RangeSelectorTest, StatementsOpErrors) {
-  EXPECT_THAT_EXPECTED(selectFromTrivial(statements("unbound_id")),
-                       Failed<StringError>(withUnboundNodeMessage()));
-  EXPECT_THAT_EXPECTED(selectFromAssorted(statements("decl")),
-                       Failed<StringError>(withTypeErrorMessage("decl")));
-}
-
-TEST(RangeSelectorTest, ElementsOp) {
-  StringRef Code = R"cc(
-    void f() {
-      int v[] = {/* comment */ 3, /* comment*/ 4 /* comment */};
-      (void)v;
-    }
-  )cc";
-  const char *ID = "id";
-  TestMatch Match = matchCode(Code, initListExpr().bind(ID));
-  EXPECT_THAT_EXPECTED(
-      select(initListElements(ID), Match),
-      HasValue("/* comment */ 3, /* comment*/ 4 /* comment */"));
-}
-
-TEST(RangeSelectorTest, ElementsOpEmptyList) {
-  StringRef Code = R"cc(
-    void f() {
-      int v[] = {};
-      (void)v;
-    }
-  )cc";
-  const char *ID = "id";
-  TestMatch Match = matchCode(Code, initListExpr().bind(ID));
-  EXPECT_THAT_EXPECTED(select(initListElements(ID), Match), HasValue(""));
-}
-
-TEST(RangeSelectorTest, ElementsOpErrors) {
-  EXPECT_THAT_EXPECTED(selectFromTrivial(initListElements("unbound_id")),
-                       Failed<StringError>(withUnboundNodeMessage()));
-  EXPECT_THAT_EXPECTED(selectFromAssorted(initListElements("stmt")),
-                       Failed<StringError>(withTypeErrorMessage("stmt")));
-}
-
-TEST(RangeSelectorTest, ElseBranchOpSingleStatement) {
-  StringRef Code = R"cc(
-    int f() {
-      int x = 0;
-      if (true) x = 3;
-      else x = 4;
-      return x + 5;
-    }
-  )cc";
-  const char *ID = "id";
-  TestMatch Match = matchCode(Code, ifStmt().bind(ID));
-  EXPECT_THAT_EXPECTED(select(elseBranch(ID), Match), HasValue("else x = 4;"));
-}
-
-TEST(RangeSelectorTest, ElseBranchOpCompoundStatement) {
-  StringRef Code = R"cc(
-    int f() {
-      int x = 0;
-      if (true) x = 3;
-      else { x = 4; }
-      return x + 5;
-    }
-  )cc";
-  const char *ID = "id";
-  TestMatch Match = matchCode(Code, ifStmt().bind(ID));
-  EXPECT_THAT_EXPECTED(select(elseBranch(ID), Match),
-                       HasValue("else { x = 4; }"));
-}
-
-// Tests case where the matched node is the complete expanded text.
-TEST(RangeSelectorTest, ExpansionOp) {
-  StringRef Code = R"cc(
-#define BADDECL(E) int bad(int x) { return E; }
-    BADDECL(x * x)
-  )cc";
-
-  const char *Fun = "Fun";
-  TestMatch Match = matchCode(Code, functionDecl(hasName("bad")).bind(Fun));
-  EXPECT_THAT_EXPECTED(select(expansion(node(Fun)), Match),
-                       HasValue("BADDECL(x * x)"));
-}
-
-// Tests case where the matched node is (only) part of the expanded text.
-TEST(RangeSelectorTest, ExpansionOpPartial) {
-  StringRef Code = R"cc(
-#define BADDECL(E) int bad(int x) { return E; }
-    BADDECL(x * x)
-  )cc";
-
-  const char *Ret = "Ret";
-  TestMatch Match = matchCode(Code, returnStmt().bind(Ret));
-  EXPECT_THAT_EXPECTED(select(expansion(node(Ret)), Match),
-                       HasValue("BADDECL(x * x)"));
-}
-
-TEST(RangeSelectorTest, IfBoundOpBound) {
-  StringRef Code = R"cc(
-    int f() {
-      return 3 + 5;
-    }
-  )cc";
-  const char *ID = "id", *Op = "op";
-  TestMatch Match =
-      matchCode(Code, binaryOperator(hasLHS(expr().bind(ID))).bind(Op));
-  EXPECT_THAT_EXPECTED(select(ifBound(ID, node(ID), node(Op)), Match),
-                       HasValue("3"));
-}
-
-TEST(RangeSelectorTest, IfBoundOpUnbound) {
-  StringRef Code = R"cc(
-    int f() {
-      return 3 + 5;
-    }
-  )cc";
-  const char *ID = "id", *Op = "op";
-  TestMatch Match = matchCode(Code, binaryOperator().bind(Op));
-  EXPECT_THAT_EXPECTED(select(ifBound(ID, node(ID), node(Op)), Match),
-                       HasValue("3 + 5"));
-}
-
-} // namespace
diff --git a/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTestDeclVisitor.cpp b/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTestDeclVisitor.cpp
deleted file mode 100644
index e207f03971a..00000000000
--- a/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTestDeclVisitor.cpp
+++ /dev/null
@@ -1,139 +0,0 @@
-//===- unittest/Tooling/RecursiveASTVisitorTestDeclVisitor.cpp ------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "TestVisitor.h"
-
-using namespace clang;
-
-namespace {
-
-class VarDeclVisitor : public ExpectedLocationVisitor<VarDeclVisitor> {
-public:
- bool VisitVarDecl(VarDecl *Variable) {
-   Match(Variable->getNameAsString(), Variable->getBeginLoc());
-   return true;
- }
-};
-
-TEST(RecursiveASTVisitor, VisitsCXXForRangeStmtLoopVariable) {
-  VarDeclVisitor Visitor;
-  Visitor.ExpectMatch("i", 2, 17);
-  EXPECT_TRUE(Visitor.runOver(
-    "int x[5];\n"
-    "void f() { for (int i : x) {} }",
-    VarDeclVisitor::Lang_CXX11));
-}
-
-class ParmVarDeclVisitorForImplicitCode :
-  public ExpectedLocationVisitor<ParmVarDeclVisitorForImplicitCode> {
-public:
-  bool shouldVisitImplicitCode() const { return true; }
-
-  bool VisitParmVarDecl(ParmVarDecl *ParamVar) {
-    Match(ParamVar->getNameAsString(), ParamVar->getBeginLoc());
-    return true;
-  }
-};
-
-// Test RAV visits parameter variable declaration of the implicit
-// copy assignment operator and implicit copy constructor.
-TEST(RecursiveASTVisitor, VisitsParmVarDeclForImplicitCode) {
-  ParmVarDeclVisitorForImplicitCode Visitor;
-  // Match parameter variable name of implicit copy assignment operator and
-  // implicit copy constructor.
-  // This parameter name does not have a valid IdentifierInfo, and shares
-  // same SourceLocation with its class declaration, so we match an empty name
-  // with the class' source location.
-  Visitor.ExpectMatch("", 1, 7);
-  Visitor.ExpectMatch("", 3, 7);
-  EXPECT_TRUE(Visitor.runOver(
-    "class X {};\n"
-    "void foo(X a, X b) {a = b;}\n"
-    "class Y {};\n"
-    "void bar(Y a) {Y b = a;}"));
-}
-
-class NamedDeclVisitor
-  : public ExpectedLocationVisitor<NamedDeclVisitor> {
-public:
-  bool VisitNamedDecl(NamedDecl *Decl) {
-    std::string NameWithTemplateArgs;
-    llvm::raw_string_ostream OS(NameWithTemplateArgs);
-    Decl->getNameForDiagnostic(OS,
-                               Decl->getASTContext().getPrintingPolicy(),
-                               true);
-    Match(OS.str(), Decl->getLocation());
-    return true;
-  }
-};
-
-TEST(RecursiveASTVisitor, VisitsPartialTemplateSpecialization) {
-  // From cfe-commits/Week-of-Mon-20100830/033998.html
-  // Contrary to the approach suggested in that email, we visit all
-  // specializations when we visit the primary template.  Visiting them when we
-  // visit the associated specialization is problematic for specializations of
-  // template members of class templates.
-  NamedDeclVisitor Visitor;
-  Visitor.ExpectMatch("A<bool>", 1, 26);
-  Visitor.ExpectMatch("A<char *>", 2, 26);
-  EXPECT_TRUE(Visitor.runOver(
-    "template <class T> class A {};\n"
-    "template <class T> class A<T*> {};\n"
-    "A<bool> ab;\n"
-    "A<char*> acp;\n"));
-}
-
-TEST(RecursiveASTVisitor, VisitsUndefinedClassTemplateSpecialization) {
-  NamedDeclVisitor Visitor;
-  Visitor.ExpectMatch("A<int>", 1, 29);
-  EXPECT_TRUE(Visitor.runOver(
-    "template<typename T> struct A;\n"
-    "A<int> *p;\n"));
-}
-
-TEST(RecursiveASTVisitor, VisitsNestedUndefinedClassTemplateSpecialization) {
-  NamedDeclVisitor Visitor;
-  Visitor.ExpectMatch("A<int>::B<char>", 2, 31);
-  EXPECT_TRUE(Visitor.runOver(
-    "template<typename T> struct A {\n"
-    "  template<typename U> struct B;\n"
-    "};\n"
-    "A<int>::B<char> *p;\n"));
-}
-
-TEST(RecursiveASTVisitor, VisitsUndefinedFunctionTemplateSpecialization) {
-  NamedDeclVisitor Visitor;
-  Visitor.ExpectMatch("A<int>", 1, 26);
-  EXPECT_TRUE(Visitor.runOver(
-    "template<typename T> int A();\n"
-    "int k = A<int>();\n"));
-}
-
-TEST(RecursiveASTVisitor, VisitsNestedUndefinedFunctionTemplateSpecialization) {
-  NamedDeclVisitor Visitor;
-  Visitor.ExpectMatch("A<int>::B<char>", 2, 35);
-  EXPECT_TRUE(Visitor.runOver(
-    "template<typename T> struct A {\n"
-    "  template<typename U> static int B();\n"
-    "};\n"
-    "int k = A<int>::B<char>();\n"));
-}
-
-TEST(RecursiveASTVisitor, NoRecursionInSelfFriend) {
-  // From cfe-commits/Week-of-Mon-20100830/033977.html
-  NamedDeclVisitor Visitor;
-  Visitor.ExpectMatch("vector_iterator<int>", 2, 7);
-  EXPECT_TRUE(Visitor.runOver(
-    "template<typename Container>\n"
-    "class vector_iterator {\n"
-    "    template <typename C> friend class vector_iterator;\n"
-    "};\n"
-    "vector_iterator<int> it_int;\n"));
-}
-
-} // end anonymous namespace
diff --git a/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTestPostOrderVisitor.cpp b/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTestPostOrderVisitor.cpp
deleted file mode 100644
index 8ac0604c091..00000000000
--- a/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTestPostOrderVisitor.cpp
+++ /dev/null
@@ -1,115 +0,0 @@
-//===- unittests/Tooling/RecursiveASTVisitorPostOrderASTVisitor.cpp -------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file contains tests for the post-order traversing functionality
-// of RecursiveASTVisitor.
-//
-//===----------------------------------------------------------------------===//
-
-#include "TestVisitor.h"
-
-using namespace clang;
-
-namespace {
-
-class RecordingVisitor : public TestVisitor<RecordingVisitor> {
-
-  bool VisitPostOrder;
-
-public:
-  explicit RecordingVisitor(bool VisitPostOrder)
-      : VisitPostOrder(VisitPostOrder) {}
-
-  // List of visited nodes during traversal.
-  std::vector<std::string> VisitedNodes;
-
-  bool shouldTraversePostOrder() const { return VisitPostOrder; }
-
-  bool VisitUnaryOperator(UnaryOperator *Op) {
-    VisitedNodes.push_back(std::string(Op->getOpcodeStr(Op->getOpcode())));
-    return true;
-  }
-
-  bool VisitBinaryOperator(BinaryOperator *Op) {
-    VisitedNodes.push_back(std::string(Op->getOpcodeStr()));
-    return true;
-  }
-
-  bool VisitIntegerLiteral(IntegerLiteral *Lit) {
-    VisitedNodes.push_back(toString(Lit->getValue(), 10, false));
-    return true;
-  }
-
-  bool VisitVarDecl(VarDecl *D) {
-    VisitedNodes.push_back(D->getNameAsString());
-    return true;
-  }
-
-  bool VisitCXXMethodDecl(CXXMethodDecl *D) {
-    VisitedNodes.push_back(D->getQualifiedNameAsString());
-    return true;
-  }
-
-  bool VisitReturnStmt(ReturnStmt *S) {
-    VisitedNodes.push_back("return");
-    return true;
-  }
-
-  bool VisitCXXRecordDecl(CXXRecordDecl *D) {
-    if (!D->isImplicit())
-      VisitedNodes.push_back(D->getQualifiedNameAsString());
-    return true;
-  }
-
-  bool VisitTemplateTypeParmType(TemplateTypeParmType *T) {
-    VisitedNodes.push_back(T->getDecl()->getQualifiedNameAsString());
-    return true;
-  }
-};
-} // namespace
-
-TEST(RecursiveASTVisitor, PostOrderTraversal) {
-  // We traverse the translation unit and store all visited nodes.
-  RecordingVisitor Visitor(true);
-  Visitor.runOver("class A {\n"
-                  "  class B {\n"
-                  "    int foo() {\n"
-                  "      while(4) { int i = 9; int j = -5; }\n"
-                  "      return (1 + 3) + 2; }\n"
-                  "  };\n"
-                  "};\n");
-
-  std::vector<std::string> expected = {"4", "9",      "i",         "5",    "-",
-                                       "j", "1",      "3",         "+",    "2",
-                                       "+", "return", "A::B::foo", "A::B", "A"};
-  // Compare the list of actually visited nodes with the expected list of
-  // visited nodes.
-  ASSERT_EQ(expected.size(), Visitor.VisitedNodes.size());
-  for (std::size_t I = 0; I < expected.size(); I++) {
-    ASSERT_EQ(expected[I], Visitor.VisitedNodes[I]);
-  }
-}
-
-TEST(RecursiveASTVisitor, NoPostOrderTraversal) {
-  // We traverse the translation unit and store all visited nodes.
-  RecordingVisitor Visitor(false);
-  Visitor.runOver("class A {\n"
-                  "  class B {\n"
-                  "    int foo() { return 1 + 2; }\n"
-                  "  };\n"
-                  "};\n");
-
-  std::vector<std::string> expected = {"A", "A::B", "A::B::foo", "return",
-                                       "+", "1",    "2"};
-  // Compare the list of actually visited nodes with the expected list of
-  // visited nodes.
-  ASSERT_EQ(expected.size(), Visitor.VisitedNodes.size());
-  for (std::size_t I = 0; I < expected.size(); I++) {
-    ASSERT_EQ(expected[I], Visitor.VisitedNodes[I]);
-  }
-}
diff --git a/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTestTypeLocVisitor.cpp b/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTestTypeLocVisitor.cpp
deleted file mode 100644
index 299e1b022a1..00000000000
--- a/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTestTypeLocVisitor.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-//===- unittest/Tooling/RecursiveASTVisitorTestTypeLocVisitor.cpp ---------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "TestVisitor.h"
-
-using namespace clang;
-
-namespace {
-
-class TypeLocVisitor : public ExpectedLocationVisitor<TypeLocVisitor> {
-public:
-  bool VisitTypeLoc(TypeLoc TypeLocation) {
-    Match(TypeLocation.getType().getAsString(), TypeLocation.getBeginLoc());
-    return true;
-  }
-};
-
-TEST(RecursiveASTVisitor, VisitsBaseClassDeclarations) {
-  TypeLocVisitor Visitor;
-  Visitor.ExpectMatch("class X", 1, 30);
-  EXPECT_TRUE(Visitor.runOver("class X {}; class Y : public X {};"));
-}
-
-TEST(RecursiveASTVisitor, VisitsCXXBaseSpecifiersOfForwardDeclaredClass) {
-  TypeLocVisitor Visitor;
-  Visitor.ExpectMatch("class X", 3, 18);
-  EXPECT_TRUE(Visitor.runOver(
-    "class Y;\n"
-    "class X {};\n"
-    "class Y : public X {};"));
-}
-
-TEST(RecursiveASTVisitor, VisitsCXXBaseSpecifiersWithIncompleteInnerClass) {
-  TypeLocVisitor Visitor;
-  Visitor.ExpectMatch("class X", 2, 18);
-  EXPECT_TRUE(Visitor.runOver(
-    "class X {};\n"
-    "class Y : public X { class Z; };"));
-}
-
-TEST(RecursiveASTVisitor, VisitsCXXBaseSpecifiersOfSelfReferentialType) {
-  TypeLocVisitor Visitor;
-  Visitor.ExpectMatch("X<class Y>", 2, 18);
-  EXPECT_TRUE(Visitor.runOver(
-    "template<typename T> class X {};\n"
-    "class Y : public X<Y> {};"));
-}
-
-TEST(RecursiveASTVisitor, VisitsClassTemplateTypeParmDefaultArgument) {
-  TypeLocVisitor Visitor;
-  Visitor.ExpectMatch("class X", 2, 23);
-  EXPECT_TRUE(Visitor.runOver(
-    "class X;\n"
-    "template<typename T = X> class Y;\n"
-    "template<typename T> class Y {};\n"));
-}
-
-TEST(RecursiveASTVisitor, VisitsCompoundLiteralType) {
-  TypeLocVisitor Visitor;
-  Visitor.ExpectMatch("struct S", 1, 26);
-  EXPECT_TRUE(Visitor.runOver(
-      "int f() { return (struct S { int a; }){.a = 0}.a; }",
-      TypeLocVisitor::Lang_C));
-}
-
-TEST(RecursiveASTVisitor, VisitsObjCPropertyType) {
-  TypeLocVisitor Visitor;
-  Visitor.ExpectMatch("NSNumber", 2, 33);
-  EXPECT_TRUE(Visitor.runOver(
-      "@class NSNumber; \n"
-      "@interface A @property (retain) NSNumber *x; @end\n",
-      TypeLocVisitor::Lang_OBJC));
-}
-
-TEST(RecursiveASTVisitor, VisitInvalidType) {
-  TypeLocVisitor Visitor;
-  // FIXME: It would be nice to have information about subtypes of invalid type
-  //Visitor.ExpectMatch("typeof(struct F *) []", 1, 1);
-  // Even if the full type is invalid, it should still find sub types
-  //Visitor.ExpectMatch("struct F", 1, 19);
-  EXPECT_FALSE(Visitor.runOver(
-      "__typeof__(struct F*) var[invalid];\n",
-      TypeLocVisitor::Lang_C));
-}
-
-} // end anonymous namespace
diff --git a/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/Attr.cpp b/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/Attr.cpp
deleted file mode 100644
index 022ef8b8322..00000000000
--- a/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/Attr.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-//===- unittest/Tooling/RecursiveASTVisitorTests/Attr.cpp -----------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "TestVisitor.h"
-
-using namespace clang;
-
-namespace {
-
-// Check to ensure that attributes and expressions within them are being
-// visited.
-class AttrVisitor : public ExpectedLocationVisitor<AttrVisitor> {
-public:
-  bool VisitMemberExpr(MemberExpr *ME) {
-    Match(ME->getMemberDecl()->getNameAsString(), ME->getBeginLoc());
-    return true;
-  }
-  bool VisitAttr(Attr *A) {
-    Match("Attr", A->getLocation());
-    return true;
-  }
-  bool VisitGuardedByAttr(GuardedByAttr *A) {
-    Match("guarded_by", A->getLocation());
-    return true;
-  }
-};
-
-
-TEST(RecursiveASTVisitor, AttributesAreVisited) {
-  AttrVisitor Visitor;
-  Visitor.ExpectMatch("Attr", 4, 24);
-  Visitor.ExpectMatch("guarded_by", 4, 24);
-  Visitor.ExpectMatch("mu1",  4, 35);
-  Visitor.ExpectMatch("Attr", 5, 29);
-  Visitor.ExpectMatch("mu1",  5, 54);
-  Visitor.ExpectMatch("mu2",  5, 59);
-  EXPECT_TRUE(Visitor.runOver(
-    "class Foo {\n"
-    "  int mu1;\n"
-    "  int mu2;\n"
-    "  int a __attribute__((guarded_by(mu1)));\n"
-    "  void bar() __attribute__((exclusive_locks_required(mu1, mu2)));\n"
-    "};\n"));
-}
-
-} // end anonymous namespace
diff --git a/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/CXXBoolLiteralExpr.cpp b/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/CXXBoolLiteralExpr.cpp
deleted file mode 100644
index 1fb192dcda0..00000000000
--- a/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/CXXBoolLiteralExpr.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-//===- unittest/Tooling/RecursiveASTVisitorTests/CXXBoolLiteralExpr.cpp ---===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "TestVisitor.h"
-
-using namespace clang;
-
-namespace {
-
-class CXXBoolLiteralExprVisitor 
-  : public ExpectedLocationVisitor<CXXBoolLiteralExprVisitor> {
-public:
-  bool VisitCXXBoolLiteralExpr(CXXBoolLiteralExpr *BE) {
-    if (BE->getValue())
-      Match("true", BE->getLocation());
-    else
-      Match("false", BE->getLocation());
-    return true;
-  }
-};
-
-TEST(RecursiveASTVisitor, VisitsClassTemplateNonTypeParmDefaultArgument) {
-  CXXBoolLiteralExprVisitor Visitor;
-  Visitor.ExpectMatch("true", 2, 19);
-  EXPECT_TRUE(Visitor.runOver(
-    "template<bool B> class X;\n"
-    "template<bool B = true> class Y;\n"
-    "template<bool B> class Y {};\n"));
-}
-
-} // end anonymous namespace
diff --git a/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/CXXMemberCall.cpp b/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/CXXMemberCall.cpp
deleted file mode 100644
index c7b31e06e0e..00000000000
--- a/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/CXXMemberCall.cpp
+++ /dev/null
@@ -1,97 +0,0 @@
-//===- unittest/Tooling/RecursiveASTVisitorTests/CXXMemberCall.cpp --------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "TestVisitor.h"
-
-using namespace clang;
-
-namespace {
-
-class CXXMemberCallVisitor
-  : public ExpectedLocationVisitor<CXXMemberCallVisitor> {
-public:
-  bool VisitCXXMemberCallExpr(CXXMemberCallExpr *Call) {
-    Match(Call->getMethodDecl()->getQualifiedNameAsString(),
-          Call->getBeginLoc());
-    return true;
-  }
-};
-
-TEST(RecursiveASTVisitor, VisitsCallInTemplateInstantiation) {
-  CXXMemberCallVisitor Visitor;
-  Visitor.ExpectMatch("Y::x", 3, 3);
-  EXPECT_TRUE(Visitor.runOver(
-    "struct Y { void x(); };\n"
-    "template<typename T> void y(T t) {\n"
-    "  t.x();\n"
-    "}\n"
-    "void foo() { y<Y>(Y()); }"));
-}
-
-TEST(RecursiveASTVisitor, VisitsCallInNestedFunctionTemplateInstantiation) {
-  CXXMemberCallVisitor Visitor;
-  Visitor.ExpectMatch("Y::x", 4, 5);
-  EXPECT_TRUE(Visitor.runOver(
-    "struct Y { void x(); };\n"
-    "template<typename T> struct Z {\n"
-    "  template<typename U> static void f() {\n"
-    "    T().x();\n"
-    "  }\n"
-    "};\n"
-    "void foo() { Z<Y>::f<int>(); }"));
-}
-
-TEST(RecursiveASTVisitor, VisitsCallInNestedClassTemplateInstantiation) {
-  CXXMemberCallVisitor Visitor;
-  Visitor.ExpectMatch("A::x", 5, 7);
-  EXPECT_TRUE(Visitor.runOver(
-    "template <typename T1> struct X {\n"
-    "  template <typename T2> struct Y {\n"
-    "    void f() {\n"
-    "      T2 y;\n"
-    "      y.x();\n"
-    "    }\n"
-    "  };\n"
-    "};\n"
-    "struct A { void x(); };\n"
-    "int main() {\n"
-    "  (new X<A>::Y<A>())->f();\n"
-    "}"));
-}
-
-TEST(RecursiveASTVisitor, VisitsCallInPartialTemplateSpecialization) {
-  CXXMemberCallVisitor Visitor;
-  Visitor.ExpectMatch("A::x", 6, 20);
-  EXPECT_TRUE(Visitor.runOver(
-    "template <typename T1> struct X {\n"
-    "  template <typename T2, bool B> struct Y { void g(); };\n"
-    "};\n"
-    "template <typename T1> template <typename T2>\n"
-    "struct X<T1>::Y<T2, true> {\n"
-    "  void f() { T2 y; y.x(); }\n"
-    "};\n"
-    "struct A { void x(); };\n"
-    "int main() {\n"
-    "  (new X<A>::Y<A, true>())->f();\n"
-    "}\n"));
-}
-
-TEST(RecursiveASTVisitor, VisitsExplicitTemplateSpecialization) {
-  CXXMemberCallVisitor Visitor;
-  Visitor.ExpectMatch("A::f", 4, 5);
-  EXPECT_TRUE(Visitor.runOver(
-    "struct A {\n"
-    "  void f() const {}\n"
-    "  template<class T> void g(const T& t) const {\n"
-    "    t.f();\n"
-    "  }\n"
-    "};\n"
-    "template void A::g(const A& a) const;\n"));
-}
-
-} // end anonymous namespace
diff --git a/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/CXXMethodDecl.cpp b/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/CXXMethodDecl.cpp
deleted file mode 100644
index 90fa84bd448..00000000000
--- a/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/CXXMethodDecl.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-//=------ unittest/Tooling/RecursiveASTVisitorTests/CXXMethodDecl.cpp ------=//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "TestVisitor.h"
-#include "clang/AST/Expr.h"
-
-using namespace clang;
-
-namespace {
-
-class CXXMethodDeclVisitor
-    : public ExpectedLocationVisitor<CXXMethodDeclVisitor> {
-public:
-  CXXMethodDeclVisitor(bool VisitImplicitCode)
-      : VisitImplicitCode(VisitImplicitCode) {}
-
-  bool shouldVisitImplicitCode() const { return VisitImplicitCode; }
-
-  bool VisitDeclRefExpr(DeclRefExpr *D) {
-    Match("declref", D->getLocation());
-    return true;
-  }
-  bool VisitParmVarDecl(ParmVarDecl *P) {
-    Match("parm", P->getLocation());
-    return true;
-  }
-
-private:
-  bool VisitImplicitCode;
-};
-
-TEST(RecursiveASTVisitor, CXXMethodDeclNoDefaultBodyVisited) {
-  for (bool VisitImplCode : {false, true}) {
-    CXXMethodDeclVisitor Visitor(VisitImplCode);
-    if (VisitImplCode)
-      Visitor.ExpectMatch("declref", 8, 28);
-    else
-      Visitor.DisallowMatch("declref", 8, 28);
-
-    Visitor.ExpectMatch("parm", 8, 27);
-    llvm::StringRef Code = R"cpp(
-      struct B {};
-      struct A {
-        B BB;
-        A &operator=(A &&O);
-      };
-
-      A &A::operator=(A &&O) = default;
-    )cpp";
-    EXPECT_TRUE(Visitor.runOver(Code, CXXMethodDeclVisitor::Lang_CXX11));
-  }
-}
-
-TEST(RecursiveASTVisitor, FunctionDeclNoDefaultBodyVisited) {
-  for (bool VisitImplCode : {false, true}) {
-    CXXMethodDeclVisitor Visitor(VisitImplCode);
-    if (VisitImplCode)
-      Visitor.ExpectMatch("declref", 4, 58, /*Times=*/2);
-    else
-      Visitor.DisallowMatch("declref", 4, 58);
-    llvm::StringRef Code = R"cpp(
-      struct s {
-        int x;
-        friend auto operator==(s a, s b) -> bool = default;
-      };
-      bool k = s() == s(); // make sure clang generates the "==" definition.
-    )cpp";
-    EXPECT_TRUE(Visitor.runOver(Code, CXXMethodDeclVisitor::Lang_CXX2a));
-  }
-}
-} // end anonymous namespace
diff --git a/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/CXXOperatorCallExprTraverser.cpp b/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/CXXOperatorCallExprTraverser.cpp
deleted file mode 100644
index 91de8d17c9d..00000000000
--- a/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/CXXOperatorCallExprTraverser.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-//===- unittest/Tooling/RecursiveASTVisitorTests/CXXOperatorCallExprTraverser.cpp -===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "TestVisitor.h"
-
-using namespace clang;
-
-namespace {
-
-class CXXOperatorCallExprTraverser
-  : public ExpectedLocationVisitor<CXXOperatorCallExprTraverser> {
-public:
-  // Use Traverse, not Visit, to check that data recursion optimization isn't
-  // bypassing the call of this function.
-  bool TraverseCXXOperatorCallExpr(CXXOperatorCallExpr *CE) {
-    Match(getOperatorSpelling(CE->getOperator()), CE->getExprLoc());
-    return ExpectedLocationVisitor<CXXOperatorCallExprTraverser>::
-        TraverseCXXOperatorCallExpr(CE);
-  }
-};
-
-TEST(RecursiveASTVisitor, TraversesOverloadedOperator) {
-  CXXOperatorCallExprTraverser Visitor;
-  Visitor.ExpectMatch("()", 4, 9);
-  EXPECT_TRUE(Visitor.runOver(
-    "struct A {\n"
-    "  int operator()();\n"
-    "} a;\n"
-    "int k = a();\n"));
-}
-
-} // end anonymous namespace
diff --git a/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/CallbacksBinaryOperator.cpp b/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/CallbacksBinaryOperator.cpp
deleted file mode 100644
index 4c5b2b66c06..00000000000
--- a/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/CallbacksBinaryOperator.cpp
+++ /dev/null
@@ -1,210 +0,0 @@
-//===- unittests/Tooling/RecursiveASTVisitorTests/CallbacksBinaryOperator.cpp -===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "CallbacksCommon.h"
-
-TEST(RecursiveASTVisitor, StmtCallbacks_TraverseBinaryOperator) {
-  class RecordingVisitor : public RecordingVisitorBase<RecordingVisitor> {
-  public:
-    RecordingVisitor(ShouldTraversePostOrder ShouldTraversePostOrderValue)
-        : RecordingVisitorBase(ShouldTraversePostOrderValue) {}
-
-    bool TraverseBinaryOperator(BinaryOperator *BO) {
-      recordCallback(__func__, BO, [&]() {
-        RecordingVisitorBase::TraverseBinaryOperator(BO);
-      });
-      return true;
-    }
-
-    bool WalkUpFromStmt(Stmt *S) {
-      recordCallback(__func__, S,
-                     [&]() { RecordingVisitorBase::WalkUpFromStmt(S); });
-      return true;
-    }
-  };
-
-  StringRef Code = R"cpp(
-void test() {
-  1;
-  2 + 3;
-  4;
-}
-)cpp";
-
-  EXPECT_TRUE(visitorCallbackLogEqual(
-      RecordingVisitor(ShouldTraversePostOrder::No), Code,
-      R"txt(
-WalkUpFromStmt CompoundStmt
-WalkUpFromStmt IntegerLiteral(1)
-TraverseBinaryOperator BinaryOperator(+)
-  WalkUpFromStmt BinaryOperator(+)
-  WalkUpFromStmt IntegerLiteral(2)
-  WalkUpFromStmt IntegerLiteral(3)
-WalkUpFromStmt IntegerLiteral(4)
-)txt"));
-
-  EXPECT_TRUE(visitorCallbackLogEqual(
-      RecordingVisitor(ShouldTraversePostOrder::Yes), Code,
-      R"txt(
-WalkUpFromStmt IntegerLiteral(1)
-TraverseBinaryOperator BinaryOperator(+)
-  WalkUpFromStmt IntegerLiteral(2)
-  WalkUpFromStmt IntegerLiteral(3)
-  WalkUpFromStmt BinaryOperator(+)
-WalkUpFromStmt IntegerLiteral(4)
-WalkUpFromStmt CompoundStmt
-)txt"));
-}
-
-TEST(RecursiveASTVisitor,
-     StmtCallbacks_TraverseBinaryOperator_WalkUpFromBinaryOperator) {
-  class RecordingVisitor : public RecordingVisitorBase<RecordingVisitor> {
-  public:
-    RecordingVisitor(ShouldTraversePostOrder ShouldTraversePostOrderValue)
-        : RecordingVisitorBase(ShouldTraversePostOrderValue) {}
-
-    bool TraverseBinaryOperator(BinaryOperator *BO) {
-      recordCallback(__func__, BO, [&]() {
-        RecordingVisitorBase::TraverseBinaryOperator(BO);
-      });
-      return true;
-    }
-
-    bool WalkUpFromStmt(Stmt *S) {
-      recordCallback(__func__, S,
-                     [&]() { RecordingVisitorBase::WalkUpFromStmt(S); });
-      return true;
-    }
-
-    bool WalkUpFromExpr(Expr *E) {
-      recordCallback(__func__, E,
-                     [&]() { RecordingVisitorBase::WalkUpFromExpr(E); });
-      return true;
-    }
-
-    bool WalkUpFromBinaryOperator(BinaryOperator *BO) {
-      recordCallback(__func__, BO, [&]() {
-        RecordingVisitorBase::WalkUpFromBinaryOperator(BO);
-      });
-      return true;
-    }
-  };
-
-  StringRef Code = R"cpp(
-void test() {
-  1;
-  2 + 3;
-  4;
-}
-)cpp";
-
-  EXPECT_TRUE(visitorCallbackLogEqual(
-      RecordingVisitor(ShouldTraversePostOrder::No), Code,
-      R"txt(
-WalkUpFromStmt CompoundStmt
-WalkUpFromExpr IntegerLiteral(1)
-  WalkUpFromStmt IntegerLiteral(1)
-TraverseBinaryOperator BinaryOperator(+)
-  WalkUpFromBinaryOperator BinaryOperator(+)
-    WalkUpFromExpr BinaryOperator(+)
-      WalkUpFromStmt BinaryOperator(+)
-  WalkUpFromExpr IntegerLiteral(2)
-    WalkUpFromStmt IntegerLiteral(2)
-  WalkUpFromExpr IntegerLiteral(3)
-    WalkUpFromStmt IntegerLiteral(3)
-WalkUpFromExpr IntegerLiteral(4)
-  WalkUpFromStmt IntegerLiteral(4)
-)txt"));
-
-  EXPECT_TRUE(visitorCallbackLogEqual(
-      RecordingVisitor(ShouldTraversePostOrder::Yes), Code,
-      R"txt(
-WalkUpFromExpr IntegerLiteral(1)
-  WalkUpFromStmt IntegerLiteral(1)
-TraverseBinaryOperator BinaryOperator(+)
-  WalkUpFromExpr IntegerLiteral(2)
-    WalkUpFromStmt IntegerLiteral(2)
-  WalkUpFromExpr IntegerLiteral(3)
-    WalkUpFromStmt IntegerLiteral(3)
-  WalkUpFromBinaryOperator BinaryOperator(+)
-    WalkUpFromExpr BinaryOperator(+)
-      WalkUpFromStmt BinaryOperator(+)
-WalkUpFromExpr IntegerLiteral(4)
-  WalkUpFromStmt IntegerLiteral(4)
-WalkUpFromStmt CompoundStmt
-)txt"));
-}
-
-TEST(RecursiveASTVisitor, StmtCallbacks_WalkUpFromBinaryOperator) {
-  class RecordingVisitor : public RecordingVisitorBase<RecordingVisitor> {
-  public:
-    RecordingVisitor(ShouldTraversePostOrder ShouldTraversePostOrderValue)
-        : RecordingVisitorBase(ShouldTraversePostOrderValue) {}
-
-    bool WalkUpFromStmt(Stmt *S) {
-      recordCallback(__func__, S,
-                     [&]() { RecordingVisitorBase::WalkUpFromStmt(S); });
-      return true;
-    }
-
-    bool WalkUpFromExpr(Expr *E) {
-      recordCallback(__func__, E,
-                     [&]() { RecordingVisitorBase::WalkUpFromExpr(E); });
-      return true;
-    }
-
-    bool WalkUpFromBinaryOperator(BinaryOperator *BO) {
-      recordCallback(__func__, BO, [&]() {
-        RecordingVisitorBase::WalkUpFromBinaryOperator(BO);
-      });
-      return true;
-    }
-  };
-
-  StringRef Code = R"cpp(
-void test() {
-  1;
-  2 + 3;
-  4;
-}
-)cpp";
-
-  EXPECT_TRUE(visitorCallbackLogEqual(
-      RecordingVisitor(ShouldTraversePostOrder::No), Code,
-      R"txt(
-WalkUpFromStmt CompoundStmt
-WalkUpFromExpr IntegerLiteral(1)
-  WalkUpFromStmt IntegerLiteral(1)
-WalkUpFromBinaryOperator BinaryOperator(+)
-  WalkUpFromExpr BinaryOperator(+)
-    WalkUpFromStmt BinaryOperator(+)
-WalkUpFromExpr IntegerLiteral(2)
-  WalkUpFromStmt IntegerLiteral(2)
-WalkUpFromExpr IntegerLiteral(3)
-  WalkUpFromStmt IntegerLiteral(3)
-WalkUpFromExpr IntegerLiteral(4)
-  WalkUpFromStmt IntegerLiteral(4)
-)txt"));
-
-  EXPECT_TRUE(visitorCallbackLogEqual(
-      RecordingVisitor(ShouldTraversePostOrder::Yes), Code,
-      R"txt(
-WalkUpFromExpr IntegerLiteral(1)
-  WalkUpFromStmt IntegerLiteral(1)
-WalkUpFromExpr IntegerLiteral(2)
-  WalkUpFromStmt IntegerLiteral(2)
-WalkUpFromExpr IntegerLiteral(3)
-  WalkUpFromStmt IntegerLiteral(3)
-WalkUpFromBinaryOperator BinaryOperator(+)
-  WalkUpFromExpr BinaryOperator(+)
-    WalkUpFromStmt BinaryOperator(+)
-WalkUpFromExpr IntegerLiteral(4)
-  WalkUpFromStmt IntegerLiteral(4)
-WalkUpFromStmt CompoundStmt
-)txt"));
-}
diff --git a/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/CallbacksCallExpr.cpp b/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/CallbacksCallExpr.cpp
deleted file mode 100644
index 2121592a430..00000000000
--- a/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/CallbacksCallExpr.cpp
+++ /dev/null
@@ -1,248 +0,0 @@
-//===-- unittests/Tooling/RecursiveASTVisitorTests/CallbacksCallExpr.cpp --===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "CallbacksCommon.h"
-
-TEST(RecursiveASTVisitor, StmtCallbacks_TraverseCallExpr) {
-  class RecordingVisitor : public RecordingVisitorBase<RecordingVisitor> {
-  public:
-    RecordingVisitor(ShouldTraversePostOrder ShouldTraversePostOrderValue)
-        : RecordingVisitorBase(ShouldTraversePostOrderValue) {}
-
-    bool TraverseCallExpr(CallExpr *CE) {
-      recordCallback(__func__, CE,
-                     [&]() { RecordingVisitorBase::TraverseCallExpr(CE); });
-      return true;
-    }
-
-    bool WalkUpFromStmt(Stmt *S) {
-      recordCallback(__func__, S,
-                     [&]() { RecordingVisitorBase::WalkUpFromStmt(S); });
-      return true;
-    }
-  };
-
-  StringRef Code = R"cpp(
-void add(int, int);
-void test() {
-  1;
-  2 + 3;
-  add(4, 5);
-}
-)cpp";
-
-  EXPECT_TRUE(visitorCallbackLogEqual(
-      RecordingVisitor(ShouldTraversePostOrder::No), Code,
-      R"txt(
-WalkUpFromStmt CompoundStmt
-WalkUpFromStmt IntegerLiteral(1)
-WalkUpFromStmt BinaryOperator(+)
-WalkUpFromStmt IntegerLiteral(2)
-WalkUpFromStmt IntegerLiteral(3)
-TraverseCallExpr CallExpr(add)
-  WalkUpFromStmt CallExpr(add)
-  WalkUpFromStmt ImplicitCastExpr
-  WalkUpFromStmt DeclRefExpr(add)
-  WalkUpFromStmt IntegerLiteral(4)
-  WalkUpFromStmt IntegerLiteral(5)
-)txt"));
-
-  EXPECT_TRUE(visitorCallbackLogEqual(
-      RecordingVisitor(ShouldTraversePostOrder::Yes), Code,
-      R"txt(
-WalkUpFromStmt IntegerLiteral(1)
-WalkUpFromStmt IntegerLiteral(2)
-WalkUpFromStmt IntegerLiteral(3)
-WalkUpFromStmt BinaryOperator(+)
-TraverseCallExpr CallExpr(add)
-  WalkUpFromStmt DeclRefExpr(add)
-  WalkUpFromStmt ImplicitCastExpr
-  WalkUpFromStmt IntegerLiteral(4)
-  WalkUpFromStmt IntegerLiteral(5)
-  WalkUpFromStmt CallExpr(add)
-WalkUpFromStmt CompoundStmt
-)txt"));
-}
-
-TEST(RecursiveASTVisitor, StmtCallbacks_TraverseCallExpr_WalkUpFromCallExpr) {
-  class RecordingVisitor : public RecordingVisitorBase<RecordingVisitor> {
-  public:
-    RecordingVisitor(ShouldTraversePostOrder ShouldTraversePostOrderValue)
-        : RecordingVisitorBase(ShouldTraversePostOrderValue) {}
-
-    bool TraverseCallExpr(CallExpr *CE) {
-      recordCallback(__func__, CE,
-                     [&]() { RecordingVisitorBase::TraverseCallExpr(CE); });
-      return true;
-    }
-
-    bool WalkUpFromStmt(Stmt *S) {
-      recordCallback(__func__, S,
-                     [&]() { RecordingVisitorBase::WalkUpFromStmt(S); });
-      return true;
-    }
-
-    bool WalkUpFromExpr(Expr *E) {
-      recordCallback(__func__, E,
-                     [&]() { RecordingVisitorBase::WalkUpFromExpr(E); });
-      return true;
-    }
-
-    bool WalkUpFromCallExpr(CallExpr *CE) {
-      recordCallback(__func__, CE,
-                     [&]() { RecordingVisitorBase::WalkUpFromCallExpr(CE); });
-      return true;
-    }
-  };
-
-  StringRef Code = R"cpp(
-void add(int, int);
-void test() {
-  1;
-  2 + 3;
-  add(4, 5);
-}
-)cpp";
-
-  EXPECT_TRUE(visitorCallbackLogEqual(
-      RecordingVisitor(ShouldTraversePostOrder::No), Code,
-      R"txt(
-WalkUpFromStmt CompoundStmt
-WalkUpFromExpr IntegerLiteral(1)
-  WalkUpFromStmt IntegerLiteral(1)
-WalkUpFromExpr BinaryOperator(+)
-  WalkUpFromStmt BinaryOperator(+)
-WalkUpFromExpr IntegerLiteral(2)
-  WalkUpFromStmt IntegerLiteral(2)
-WalkUpFromExpr IntegerLiteral(3)
-  WalkUpFromStmt IntegerLiteral(3)
-TraverseCallExpr CallExpr(add)
-  WalkUpFromCallExpr CallExpr(add)
-    WalkUpFromExpr CallExpr(add)
-      WalkUpFromStmt CallExpr(add)
-  WalkUpFromExpr ImplicitCastExpr
-    WalkUpFromStmt ImplicitCastExpr
-  WalkUpFromExpr DeclRefExpr(add)
-    WalkUpFromStmt DeclRefExpr(add)
-  WalkUpFromExpr IntegerLiteral(4)
-    WalkUpFromStmt IntegerLiteral(4)
-  WalkUpFromExpr IntegerLiteral(5)
-    WalkUpFromStmt IntegerLiteral(5)
-)txt"));
-
-  EXPECT_TRUE(visitorCallbackLogEqual(
-      RecordingVisitor(ShouldTraversePostOrder::Yes), Code,
-      R"txt(
-WalkUpFromExpr IntegerLiteral(1)
-  WalkUpFromStmt IntegerLiteral(1)
-WalkUpFromExpr IntegerLiteral(2)
-  WalkUpFromStmt IntegerLiteral(2)
-WalkUpFromExpr IntegerLiteral(3)
-  WalkUpFromStmt IntegerLiteral(3)
-WalkUpFromExpr BinaryOperator(+)
-  WalkUpFromStmt BinaryOperator(+)
-TraverseCallExpr CallExpr(add)
-  WalkUpFromExpr DeclRefExpr(add)
-    WalkUpFromStmt DeclRefExpr(add)
-  WalkUpFromExpr ImplicitCastExpr
-    WalkUpFromStmt ImplicitCastExpr
-  WalkUpFromExpr IntegerLiteral(4)
-    WalkUpFromStmt IntegerLiteral(4)
-  WalkUpFromExpr IntegerLiteral(5)
-    WalkUpFromStmt IntegerLiteral(5)
-  WalkUpFromCallExpr CallExpr(add)
-    WalkUpFromExpr CallExpr(add)
-      WalkUpFromStmt CallExpr(add)
-WalkUpFromStmt CompoundStmt
-)txt"));
-}
-
-TEST(RecursiveASTVisitor, StmtCallbacks_WalkUpFromCallExpr) {
-  class RecordingVisitor : public RecordingVisitorBase<RecordingVisitor> {
-  public:
-    RecordingVisitor(ShouldTraversePostOrder ShouldTraversePostOrderValue)
-        : RecordingVisitorBase(ShouldTraversePostOrderValue) {}
-
-    bool WalkUpFromStmt(Stmt *S) {
-      recordCallback(__func__, S,
-                     [&]() { RecordingVisitorBase::WalkUpFromStmt(S); });
-      return true;
-    }
-
-    bool WalkUpFromExpr(Expr *E) {
-      recordCallback(__func__, E,
-                     [&]() { RecordingVisitorBase::WalkUpFromExpr(E); });
-      return true;
-    }
-
-    bool WalkUpFromCallExpr(CallExpr *CE) {
-      recordCallback(__func__, CE,
-                     [&]() { RecordingVisitorBase::WalkUpFromCallExpr(CE); });
-      return true;
-    }
-  };
-
-  StringRef Code = R"cpp(
-void add(int, int);
-void test() {
-  1;
-  2 + 3;
-  add(4, 5);
-}
-)cpp";
-
-  EXPECT_TRUE(visitorCallbackLogEqual(
-      RecordingVisitor(ShouldTraversePostOrder::No), Code,
-      R"txt(
-WalkUpFromStmt CompoundStmt
-WalkUpFromExpr IntegerLiteral(1)
-  WalkUpFromStmt IntegerLiteral(1)
-WalkUpFromExpr BinaryOperator(+)
-  WalkUpFromStmt BinaryOperator(+)
-WalkUpFromExpr IntegerLiteral(2)
-  WalkUpFromStmt IntegerLiteral(2)
-WalkUpFromExpr IntegerLiteral(3)
-  WalkUpFromStmt IntegerLiteral(3)
-WalkUpFromCallExpr CallExpr(add)
-  WalkUpFromExpr CallExpr(add)
-    WalkUpFromStmt CallExpr(add)
-WalkUpFromExpr ImplicitCastExpr
-  WalkUpFromStmt ImplicitCastExpr
-WalkUpFromExpr DeclRefExpr(add)
-  WalkUpFromStmt DeclRefExpr(add)
-WalkUpFromExpr IntegerLiteral(4)
-  WalkUpFromStmt IntegerLiteral(4)
-WalkUpFromExpr IntegerLiteral(5)
-  WalkUpFromStmt IntegerLiteral(5)
-)txt"));
-
-  EXPECT_TRUE(visitorCallbackLogEqual(
-      RecordingVisitor(ShouldTraversePostOrder::Yes), Code,
-      R"txt(
-WalkUpFromExpr IntegerLiteral(1)
-  WalkUpFromStmt IntegerLiteral(1)
-WalkUpFromExpr IntegerLiteral(2)
-  WalkUpFromStmt IntegerLiteral(2)
-WalkUpFromExpr IntegerLiteral(3)
-  WalkUpFromStmt IntegerLiteral(3)
-WalkUpFromExpr BinaryOperator(+)
-  WalkUpFromStmt BinaryOperator(+)
-WalkUpFromExpr DeclRefExpr(add)
-  WalkUpFromStmt DeclRefExpr(add)
-WalkUpFromExpr ImplicitCastExpr
-  WalkUpFromStmt ImplicitCastExpr
-WalkUpFromExpr IntegerLiteral(4)
-  WalkUpFromStmt IntegerLiteral(4)
-WalkUpFromExpr IntegerLiteral(5)
-  WalkUpFromStmt IntegerLiteral(5)
-WalkUpFromCallExpr CallExpr(add)
-  WalkUpFromExpr CallExpr(add)
-    WalkUpFromStmt CallExpr(add)
-WalkUpFromStmt CompoundStmt
-)txt"));
-}
diff --git a/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/CallbacksCommon.h b/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/CallbacksCommon.h
deleted file mode 100644
index 92e30c2d46e..00000000000
--- a/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/CallbacksCommon.h
+++ /dev/null
@@ -1,101 +0,0 @@
-//===--- unittests/Tooling/RecursiveASTVisitorTests/CallbacksCommon.h -----===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "TestVisitor.h"
-
-using namespace clang;
-
-namespace {
-
-enum class ShouldTraversePostOrder : bool {
-  No = false,
-  Yes = true,
-};
-
-/// Base class for tests for RecursiveASTVisitor tests that validate the
-/// sequence of calls to user-defined callbacks like Traverse*(), WalkUp*(),
-/// Visit*().
-template <typename Derived>
-class RecordingVisitorBase : public TestVisitor<Derived> {
-  ShouldTraversePostOrder ShouldTraversePostOrderValue;
-
-public:
-  RecordingVisitorBase(ShouldTraversePostOrder ShouldTraversePostOrderValue)
-      : ShouldTraversePostOrderValue(ShouldTraversePostOrderValue) {}
-
-  bool shouldTraversePostOrder() const {
-    return static_cast<bool>(ShouldTraversePostOrderValue);
-  }
-
-  // Callbacks received during traversal.
-  std::string CallbackLog;
-  unsigned CallbackLogIndent = 0;
-
-  std::string stmtToString(Stmt *S) {
-    StringRef ClassName = S->getStmtClassName();
-    if (IntegerLiteral *IL = dyn_cast<IntegerLiteral>(S)) {
-      return (ClassName + "(" + toString(IL->getValue(), 10, false) + ")").str();
-    }
-    if (UnaryOperator *UO = dyn_cast<UnaryOperator>(S)) {
-      return (ClassName + "(" + UnaryOperator::getOpcodeStr(UO->getOpcode()) +
-              ")")
-          .str();
-    }
-    if (BinaryOperator *BO = dyn_cast<BinaryOperator>(S)) {
-      return (ClassName + "(" + BinaryOperator::getOpcodeStr(BO->getOpcode()) +
-              ")")
-          .str();
-    }
-    if (CallExpr *CE = dyn_cast<CallExpr>(S)) {
-      if (FunctionDecl *Callee = CE->getDirectCallee()) {
-        if (Callee->getIdentifier()) {
-          return (ClassName + "(" + Callee->getName() + ")").str();
-        }
-      }
-    }
-    if (DeclRefExpr *DRE = dyn_cast<DeclRefExpr>(S)) {
-      if (NamedDecl *ND = DRE->getFoundDecl()) {
-        if (ND->getIdentifier()) {
-          return (ClassName + "(" + ND->getName() + ")").str();
-        }
-      }
-    }
-    return ClassName.str();
-  }
-
-  /// Record the fact that the user-defined callback member function
-  /// \p CallbackName was called with the argument \p S. Then, record the
-  /// effects of calling the default implementation \p CallDefaultFn.
-  template <typename CallDefault>
-  void recordCallback(StringRef CallbackName, Stmt *S,
-                      CallDefault CallDefaultFn) {
-    for (unsigned i = 0; i != CallbackLogIndent; ++i) {
-      CallbackLog += "  ";
-    }
-    CallbackLog += (CallbackName + " " + stmtToString(S) + "\n").str();
-    ++CallbackLogIndent;
-    CallDefaultFn();
-    --CallbackLogIndent;
-  }
-};
-
-template <typename VisitorTy>
-::testing::AssertionResult visitorCallbackLogEqual(VisitorTy Visitor,
-                                                   StringRef Code,
-                                                   StringRef ExpectedLog) {
-  Visitor.runOver(Code);
-  // EXPECT_EQ shows the diff between the two strings if they are different.
-  EXPECT_EQ(ExpectedLog.trim().str(),
-            StringRef(Visitor.CallbackLog).trim().str());
-  if (ExpectedLog.trim() != StringRef(Visitor.CallbackLog).trim()) {
-    return ::testing::AssertionFailure();
-  }
-  return ::testing::AssertionSuccess();
-}
-
-} // namespace
diff --git a/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/CallbacksCompoundAssignOperator.cpp b/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/CallbacksCompoundAssignOperator.cpp
deleted file mode 100644
index f381d5e88a5..00000000000
--- a/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/CallbacksCompoundAssignOperator.cpp
+++ /dev/null
@@ -1,211 +0,0 @@
-//===- unittests/Tooling/RecursiveASTVisitorTests/CallbacksCompoundAssignOperator.cpp -===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "CallbacksCommon.h"
-
-TEST(RecursiveASTVisitor, StmtCallbacks_TraverseCompoundAssignOperator) {
-  class RecordingVisitor : public RecordingVisitorBase<RecordingVisitor> {
-  public:
-    RecordingVisitor(ShouldTraversePostOrder ShouldTraversePostOrderValue)
-        : RecordingVisitorBase(ShouldTraversePostOrderValue) {}
-
-    bool TraverseCompoundAssignOperator(CompoundAssignOperator *CAO) {
-      recordCallback(__func__, CAO, [&]() {
-        RecordingVisitorBase::TraverseCompoundAssignOperator(CAO);
-      });
-      return true;
-    }
-
-    bool WalkUpFromStmt(Stmt *S) {
-      recordCallback(__func__, S,
-                     [&]() { RecordingVisitorBase::WalkUpFromStmt(S); });
-      return true;
-    }
-  };
-
-  StringRef Code = R"cpp(
-void test(int a) {
-  1;
-  a += 2;
-  3;
-}
-)cpp";
-
-  EXPECT_TRUE(visitorCallbackLogEqual(
-      RecordingVisitor(ShouldTraversePostOrder::No), Code,
-      R"txt(
-WalkUpFromStmt CompoundStmt
-WalkUpFromStmt IntegerLiteral(1)
-TraverseCompoundAssignOperator CompoundAssignOperator(+=)
-  WalkUpFromStmt CompoundAssignOperator(+=)
-  WalkUpFromStmt DeclRefExpr(a)
-  WalkUpFromStmt IntegerLiteral(2)
-WalkUpFromStmt IntegerLiteral(3)
-)txt"));
-
-  EXPECT_TRUE(visitorCallbackLogEqual(
-      RecordingVisitor(ShouldTraversePostOrder::Yes), Code,
-      R"txt(
-WalkUpFromStmt IntegerLiteral(1)
-TraverseCompoundAssignOperator CompoundAssignOperator(+=)
-  WalkUpFromStmt DeclRefExpr(a)
-  WalkUpFromStmt IntegerLiteral(2)
-  WalkUpFromStmt CompoundAssignOperator(+=)
-WalkUpFromStmt IntegerLiteral(3)
-WalkUpFromStmt CompoundStmt
-)txt"));
-}
-
-TEST(
-    RecursiveASTVisitor,
-    StmtCallbacks_TraverseCompoundAssignOperator_WalkUpFromCompoundAssignOperator) {
-  class RecordingVisitor : public RecordingVisitorBase<RecordingVisitor> {
-  public:
-    RecordingVisitor(ShouldTraversePostOrder ShouldTraversePostOrderValue)
-        : RecordingVisitorBase(ShouldTraversePostOrderValue) {}
-
-    bool TraverseCompoundAssignOperator(CompoundAssignOperator *CAO) {
-      recordCallback(__func__, CAO, [&]() {
-        RecordingVisitorBase::TraverseCompoundAssignOperator(CAO);
-      });
-      return true;
-    }
-
-    bool WalkUpFromStmt(Stmt *S) {
-      recordCallback(__func__, S,
-                     [&]() { RecordingVisitorBase::WalkUpFromStmt(S); });
-      return true;
-    }
-
-    bool WalkUpFromExpr(Expr *E) {
-      recordCallback(__func__, E,
-                     [&]() { RecordingVisitorBase::WalkUpFromExpr(E); });
-      return true;
-    }
-
-    bool WalkUpFromCompoundAssignOperator(CompoundAssignOperator *CAO) {
-      recordCallback(__func__, CAO, [&]() {
-        RecordingVisitorBase::WalkUpFromCompoundAssignOperator(CAO);
-      });
-      return true;
-    }
-  };
-
-  StringRef Code = R"cpp(
-void test(int a) {
-  1;
-  a += 2;
-  3;
-}
-)cpp";
-
-  EXPECT_TRUE(visitorCallbackLogEqual(
-      RecordingVisitor(ShouldTraversePostOrder::No), Code,
-      R"txt(
-WalkUpFromStmt CompoundStmt
-WalkUpFromExpr IntegerLiteral(1)
-  WalkUpFromStmt IntegerLiteral(1)
-TraverseCompoundAssignOperator CompoundAssignOperator(+=)
-  WalkUpFromCompoundAssignOperator CompoundAssignOperator(+=)
-    WalkUpFromExpr CompoundAssignOperator(+=)
-      WalkUpFromStmt CompoundAssignOperator(+=)
-  WalkUpFromExpr DeclRefExpr(a)
-    WalkUpFromStmt DeclRefExpr(a)
-  WalkUpFromExpr IntegerLiteral(2)
-    WalkUpFromStmt IntegerLiteral(2)
-WalkUpFromExpr IntegerLiteral(3)
-  WalkUpFromStmt IntegerLiteral(3)
-)txt"));
-
-  EXPECT_TRUE(visitorCallbackLogEqual(
-      RecordingVisitor(ShouldTraversePostOrder::Yes), Code,
-      R"txt(
-WalkUpFromExpr IntegerLiteral(1)
-  WalkUpFromStmt IntegerLiteral(1)
-TraverseCompoundAssignOperator CompoundAssignOperator(+=)
-  WalkUpFromExpr DeclRefExpr(a)
-    WalkUpFromStmt DeclRefExpr(a)
-  WalkUpFromExpr IntegerLiteral(2)
-    WalkUpFromStmt IntegerLiteral(2)
-  WalkUpFromCompoundAssignOperator CompoundAssignOperator(+=)
-    WalkUpFromExpr CompoundAssignOperator(+=)
-      WalkUpFromStmt CompoundAssignOperator(+=)
-WalkUpFromExpr IntegerLiteral(3)
-  WalkUpFromStmt IntegerLiteral(3)
-WalkUpFromStmt CompoundStmt
-)txt"));
-}
-
-TEST(RecursiveASTVisitor, StmtCallbacks_WalkUpFromCompoundAssignOperator) {
-  class RecordingVisitor : public RecordingVisitorBase<RecordingVisitor> {
-  public:
-    RecordingVisitor(ShouldTraversePostOrder ShouldTraversePostOrderValue)
-        : RecordingVisitorBase(ShouldTraversePostOrderValue) {}
-
-    bool WalkUpFromStmt(Stmt *S) {
-      recordCallback(__func__, S,
-                     [&]() { RecordingVisitorBase::WalkUpFromStmt(S); });
-      return true;
-    }
-
-    bool WalkUpFromExpr(Expr *E) {
-      recordCallback(__func__, E,
-                     [&]() { RecordingVisitorBase::WalkUpFromExpr(E); });
-      return true;
-    }
-
-    bool WalkUpFromCompoundAssignOperator(CompoundAssignOperator *CAO) {
-      recordCallback(__func__, CAO, [&]() {
-        RecordingVisitorBase::WalkUpFromCompoundAssignOperator(CAO);
-      });
-      return true;
-    }
-  };
-
-  StringRef Code = R"cpp(
-void test(int a) {
-  1;
-  a += 2;
-  3;
-}
-)cpp";
-
-  EXPECT_TRUE(visitorCallbackLogEqual(
-      RecordingVisitor(ShouldTraversePostOrder::No), Code,
-      R"txt(
-WalkUpFromStmt CompoundStmt
-WalkUpFromExpr IntegerLiteral(1)
-  WalkUpFromStmt IntegerLiteral(1)
-WalkUpFromCompoundAssignOperator CompoundAssignOperator(+=)
-  WalkUpFromExpr CompoundAssignOperator(+=)
-    WalkUpFromStmt CompoundAssignOperator(+=)
-WalkUpFromExpr DeclRefExpr(a)
-  WalkUpFromStmt DeclRefExpr(a)
-WalkUpFromExpr IntegerLiteral(2)
-  WalkUpFromStmt IntegerLiteral(2)
-WalkUpFromExpr IntegerLiteral(3)
-  WalkUpFromStmt IntegerLiteral(3)
-)txt"));
-
-  EXPECT_TRUE(visitorCallbackLogEqual(
-      RecordingVisitor(ShouldTraversePostOrder::Yes), Code,
-      R"txt(
-WalkUpFromExpr IntegerLiteral(1)
-  WalkUpFromStmt IntegerLiteral(1)
-WalkUpFromExpr DeclRefExpr(a)
-  WalkUpFromStmt DeclRefExpr(a)
-WalkUpFromExpr IntegerLiteral(2)
-  WalkUpFromStmt IntegerLiteral(2)
-WalkUpFromCompoundAssignOperator CompoundAssignOperator(+=)
-  WalkUpFromExpr CompoundAssignOperator(+=)
-    WalkUpFromStmt CompoundAssignOperator(+=)
-WalkUpFromExpr IntegerLiteral(3)
-  WalkUpFromStmt IntegerLiteral(3)
-WalkUpFromStmt CompoundStmt
-)txt"));
-}
diff --git a/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/CallbacksLeaf.cpp b/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/CallbacksLeaf.cpp
deleted file mode 100644
index 9b6f01dc57e..00000000000
--- a/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/CallbacksLeaf.cpp
+++ /dev/null
@@ -1,284 +0,0 @@
-//===--- unittests/Tooling/RecursiveASTVisitorTests/CallbacksLeaf.cpp -----===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "CallbacksCommon.h"
-
-TEST(RecursiveASTVisitor, StmtCallbacks_TraverseLeaf) {
-  class RecordingVisitor : public RecordingVisitorBase<RecordingVisitor> {
-  public:
-    RecordingVisitor(ShouldTraversePostOrder ShouldTraversePostOrderValue)
-        : RecordingVisitorBase(ShouldTraversePostOrderValue) {}
-
-    bool TraverseIntegerLiteral(IntegerLiteral *IL) {
-      recordCallback(__func__, IL, [&]() {
-        RecordingVisitorBase::TraverseIntegerLiteral(IL);
-      });
-      return true;
-    }
-
-    bool WalkUpFromStmt(Stmt *S) {
-      recordCallback(__func__, S,
-                     [&]() { RecordingVisitorBase::WalkUpFromStmt(S); });
-      return true;
-    }
-  };
-
-  StringRef Code = R"cpp(
-void add(int, int);
-void test() {
-  1;
-  2 + 3;
-  add(4, 5);
-}
-)cpp";
-
-  EXPECT_TRUE(visitorCallbackLogEqual(
-      RecordingVisitor(ShouldTraversePostOrder::No), Code,
-      R"txt(
-WalkUpFromStmt CompoundStmt
-TraverseIntegerLiteral IntegerLiteral(1)
-  WalkUpFromStmt IntegerLiteral(1)
-WalkUpFromStmt BinaryOperator(+)
-TraverseIntegerLiteral IntegerLiteral(2)
-  WalkUpFromStmt IntegerLiteral(2)
-TraverseIntegerLiteral IntegerLiteral(3)
-  WalkUpFromStmt IntegerLiteral(3)
-WalkUpFromStmt CallExpr(add)
-WalkUpFromStmt ImplicitCastExpr
-WalkUpFromStmt DeclRefExpr(add)
-TraverseIntegerLiteral IntegerLiteral(4)
-  WalkUpFromStmt IntegerLiteral(4)
-TraverseIntegerLiteral IntegerLiteral(5)
-  WalkUpFromStmt IntegerLiteral(5)
-)txt"));
-
-  EXPECT_TRUE(visitorCallbackLogEqual(
-      RecordingVisitor(ShouldTraversePostOrder::Yes), Code,
-      R"txt(
-TraverseIntegerLiteral IntegerLiteral(1)
-  WalkUpFromStmt IntegerLiteral(1)
-TraverseIntegerLiteral IntegerLiteral(2)
-  WalkUpFromStmt IntegerLiteral(2)
-TraverseIntegerLiteral IntegerLiteral(3)
-  WalkUpFromStmt IntegerLiteral(3)
-WalkUpFromStmt BinaryOperator(+)
-WalkUpFromStmt DeclRefExpr(add)
-WalkUpFromStmt ImplicitCastExpr
-TraverseIntegerLiteral IntegerLiteral(4)
-  WalkUpFromStmt IntegerLiteral(4)
-TraverseIntegerLiteral IntegerLiteral(5)
-  WalkUpFromStmt IntegerLiteral(5)
-WalkUpFromStmt CallExpr(add)
-WalkUpFromStmt CompoundStmt
-)txt"));
-}
-
-TEST(RecursiveASTVisitor, StmtCallbacks_TraverseLeaf_WalkUpFromLeaf) {
-  class RecordingVisitor : public RecordingVisitorBase<RecordingVisitor> {
-  public:
-    RecordingVisitor(ShouldTraversePostOrder ShouldTraversePostOrderValue)
-        : RecordingVisitorBase(ShouldTraversePostOrderValue) {}
-
-    bool TraverseIntegerLiteral(IntegerLiteral *IL) {
-      recordCallback(__func__, IL, [&]() {
-        RecordingVisitorBase::TraverseIntegerLiteral(IL);
-      });
-      return true;
-    }
-
-    bool WalkUpFromStmt(Stmt *S) {
-      recordCallback(__func__, S,
-                     [&]() { RecordingVisitorBase::WalkUpFromStmt(S); });
-      return true;
-    }
-
-    bool WalkUpFromExpr(Expr *E) {
-      recordCallback(__func__, E,
-                     [&]() { RecordingVisitorBase::WalkUpFromExpr(E); });
-      return true;
-    }
-
-    bool WalkUpFromIntegerLiteral(IntegerLiteral *IL) {
-      recordCallback(__func__, IL, [&]() {
-        RecordingVisitorBase::WalkUpFromIntegerLiteral(IL);
-      });
-      return true;
-    }
-  };
-
-  StringRef Code = R"cpp(
-void add(int, int);
-void test() {
-  1;
-  2 + 3;
-  add(4, 5);
-}
-)cpp";
-
-  EXPECT_TRUE(visitorCallbackLogEqual(
-      RecordingVisitor(ShouldTraversePostOrder::No), Code,
-      R"txt(
-WalkUpFromStmt CompoundStmt
-TraverseIntegerLiteral IntegerLiteral(1)
-  WalkUpFromIntegerLiteral IntegerLiteral(1)
-    WalkUpFromExpr IntegerLiteral(1)
-      WalkUpFromStmt IntegerLiteral(1)
-WalkUpFromExpr BinaryOperator(+)
-  WalkUpFromStmt BinaryOperator(+)
-TraverseIntegerLiteral IntegerLiteral(2)
-  WalkUpFromIntegerLiteral IntegerLiteral(2)
-    WalkUpFromExpr IntegerLiteral(2)
-      WalkUpFromStmt IntegerLiteral(2)
-TraverseIntegerLiteral IntegerLiteral(3)
-  WalkUpFromIntegerLiteral IntegerLiteral(3)
-    WalkUpFromExpr IntegerLiteral(3)
-      WalkUpFromStmt IntegerLiteral(3)
-WalkUpFromExpr CallExpr(add)
-  WalkUpFromStmt CallExpr(add)
-WalkUpFromExpr ImplicitCastExpr
-  WalkUpFromStmt ImplicitCastExpr
-WalkUpFromExpr DeclRefExpr(add)
-  WalkUpFromStmt DeclRefExpr(add)
-TraverseIntegerLiteral IntegerLiteral(4)
-  WalkUpFromIntegerLiteral IntegerLiteral(4)
-    WalkUpFromExpr IntegerLiteral(4)
-      WalkUpFromStmt IntegerLiteral(4)
-TraverseIntegerLiteral IntegerLiteral(5)
-  WalkUpFromIntegerLiteral IntegerLiteral(5)
-    WalkUpFromExpr IntegerLiteral(5)
-      WalkUpFromStmt IntegerLiteral(5)
-)txt"));
-
-  EXPECT_TRUE(visitorCallbackLogEqual(
-      RecordingVisitor(ShouldTraversePostOrder::Yes), Code,
-      R"txt(
-TraverseIntegerLiteral IntegerLiteral(1)
-  WalkUpFromIntegerLiteral IntegerLiteral(1)
-    WalkUpFromExpr IntegerLiteral(1)
-      WalkUpFromStmt IntegerLiteral(1)
-TraverseIntegerLiteral IntegerLiteral(2)
-  WalkUpFromIntegerLiteral IntegerLiteral(2)
-    WalkUpFromExpr IntegerLiteral(2)
-      WalkUpFromStmt IntegerLiteral(2)
-TraverseIntegerLiteral IntegerLiteral(3)
-  WalkUpFromIntegerLiteral IntegerLiteral(3)
-    WalkUpFromExpr IntegerLiteral(3)
-      WalkUpFromStmt IntegerLiteral(3)
-WalkUpFromExpr BinaryOperator(+)
-  WalkUpFromStmt BinaryOperator(+)
-WalkUpFromExpr DeclRefExpr(add)
-  WalkUpFromStmt DeclRefExpr(add)
-WalkUpFromExpr ImplicitCastExpr
-  WalkUpFromStmt ImplicitCastExpr
-TraverseIntegerLiteral IntegerLiteral(4)
-  WalkUpFromIntegerLiteral IntegerLiteral(4)
-    WalkUpFromExpr IntegerLiteral(4)
-      WalkUpFromStmt IntegerLiteral(4)
-TraverseIntegerLiteral IntegerLiteral(5)
-  WalkUpFromIntegerLiteral IntegerLiteral(5)
-    WalkUpFromExpr IntegerLiteral(5)
-      WalkUpFromStmt IntegerLiteral(5)
-WalkUpFromExpr CallExpr(add)
-  WalkUpFromStmt CallExpr(add)
-WalkUpFromStmt CompoundStmt
-)txt"));
-}
-
-TEST(RecursiveASTVisitor, StmtCallbacks_WalkUpFromLeaf) {
-  class RecordingVisitor : public RecordingVisitorBase<RecordingVisitor> {
-  public:
-    RecordingVisitor(ShouldTraversePostOrder ShouldTraversePostOrderValue)
-        : RecordingVisitorBase(ShouldTraversePostOrderValue) {}
-
-    bool WalkUpFromStmt(Stmt *S) {
-      recordCallback(__func__, S,
-                     [&]() { RecordingVisitorBase::WalkUpFromStmt(S); });
-      return true;
-    }
-
-    bool WalkUpFromExpr(Expr *E) {
-      recordCallback(__func__, E,
-                     [&]() { RecordingVisitorBase::WalkUpFromExpr(E); });
-      return true;
-    }
-
-    bool WalkUpFromIntegerLiteral(IntegerLiteral *IL) {
-      recordCallback(__func__, IL, [&]() {
-        RecordingVisitorBase::WalkUpFromIntegerLiteral(IL);
-      });
-      return true;
-    }
-  };
-
-  StringRef Code = R"cpp(
-void add(int, int);
-void test() {
-  1;
-  2 + 3;
-  add(4, 5);
-}
-)cpp";
-
-  EXPECT_TRUE(visitorCallbackLogEqual(
-      RecordingVisitor(ShouldTraversePostOrder::No), Code,
-      R"txt(
-WalkUpFromStmt CompoundStmt
-WalkUpFromIntegerLiteral IntegerLiteral(1)
-  WalkUpFromExpr IntegerLiteral(1)
-    WalkUpFromStmt IntegerLiteral(1)
-WalkUpFromExpr BinaryOperator(+)
-  WalkUpFromStmt BinaryOperator(+)
-WalkUpFromIntegerLiteral IntegerLiteral(2)
-  WalkUpFromExpr IntegerLiteral(2)
-    WalkUpFromStmt IntegerLiteral(2)
-WalkUpFromIntegerLiteral IntegerLiteral(3)
-  WalkUpFromExpr IntegerLiteral(3)
-    WalkUpFromStmt IntegerLiteral(3)
-WalkUpFromExpr CallExpr(add)
-  WalkUpFromStmt CallExpr(add)
-WalkUpFromExpr ImplicitCastExpr
-  WalkUpFromStmt ImplicitCastExpr
-WalkUpFromExpr DeclRefExpr(add)
-  WalkUpFromStmt DeclRefExpr(add)
-WalkUpFromIntegerLiteral IntegerLiteral(4)
-  WalkUpFromExpr IntegerLiteral(4)
-    WalkUpFromStmt IntegerLiteral(4)
-WalkUpFromIntegerLiteral IntegerLiteral(5)
-  WalkUpFromExpr IntegerLiteral(5)
-    WalkUpFromStmt IntegerLiteral(5)
-)txt"));
-
-  EXPECT_TRUE(visitorCallbackLogEqual(
-      RecordingVisitor(ShouldTraversePostOrder::Yes), Code,
-      R"txt(
-WalkUpFromIntegerLiteral IntegerLiteral(1)
-  WalkUpFromExpr IntegerLiteral(1)
-    WalkUpFromStmt IntegerLiteral(1)
-WalkUpFromIntegerLiteral IntegerLiteral(2)
-  WalkUpFromExpr IntegerLiteral(2)
-    WalkUpFromStmt IntegerLiteral(2)
-WalkUpFromIntegerLiteral IntegerLiteral(3)
-  WalkUpFromExpr IntegerLiteral(3)
-    WalkUpFromStmt IntegerLiteral(3)
-WalkUpFromExpr BinaryOperator(+)
-  WalkUpFromStmt BinaryOperator(+)
-WalkUpFromExpr DeclRefExpr(add)
-  WalkUpFromStmt DeclRefExpr(add)
-WalkUpFromExpr ImplicitCastExpr
-  WalkUpFromStmt ImplicitCastExpr
-WalkUpFromIntegerLiteral IntegerLiteral(4)
-  WalkUpFromExpr IntegerLiteral(4)
-    WalkUpFromStmt IntegerLiteral(4)
-WalkUpFromIntegerLiteral IntegerLiteral(5)
-  WalkUpFromExpr IntegerLiteral(5)
-    WalkUpFromStmt IntegerLiteral(5)
-WalkUpFromExpr CallExpr(add)
-  WalkUpFromStmt CallExpr(add)
-WalkUpFromStmt CompoundStmt
-)txt"));
-}
diff --git a/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/CallbacksUnaryOperator.cpp b/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/CallbacksUnaryOperator.cpp
deleted file mode 100644
index 26c755599be..00000000000
--- a/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/CallbacksUnaryOperator.cpp
+++ /dev/null
@@ -1,200 +0,0 @@
-//===- unittests/Tooling/RecursiveASTVisitorTests/CallbacksUnaryOperator.cpp -===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "CallbacksCommon.h"
-
-TEST(RecursiveASTVisitor, StmtCallbacks_TraverseUnaryOperator) {
-  class RecordingVisitor : public RecordingVisitorBase<RecordingVisitor> {
-  public:
-    RecordingVisitor(ShouldTraversePostOrder ShouldTraversePostOrderValue)
-        : RecordingVisitorBase(ShouldTraversePostOrderValue) {}
-
-    bool TraverseUnaryOperator(UnaryOperator *UO) {
-      recordCallback(__func__, UO, [&]() {
-        RecordingVisitorBase::TraverseUnaryOperator(UO);
-      });
-      return true;
-    }
-
-    bool WalkUpFromStmt(Stmt *S) {
-      recordCallback(__func__, S,
-                     [&]() { RecordingVisitorBase::WalkUpFromStmt(S); });
-      return true;
-    }
-  };
-
-  StringRef Code = R"cpp(
-void test() {
-  1;
-  -2;
-  3;
-}
-)cpp";
-
-  EXPECT_TRUE(visitorCallbackLogEqual(
-      RecordingVisitor(ShouldTraversePostOrder::No), Code,
-      R"txt(
-WalkUpFromStmt CompoundStmt
-WalkUpFromStmt IntegerLiteral(1)
-TraverseUnaryOperator UnaryOperator(-)
-  WalkUpFromStmt UnaryOperator(-)
-  WalkUpFromStmt IntegerLiteral(2)
-WalkUpFromStmt IntegerLiteral(3)
-)txt"));
-
-  EXPECT_TRUE(visitorCallbackLogEqual(
-      RecordingVisitor(ShouldTraversePostOrder::Yes), Code,
-      R"txt(
-WalkUpFromStmt IntegerLiteral(1)
-TraverseUnaryOperator UnaryOperator(-)
-  WalkUpFromStmt IntegerLiteral(2)
-  WalkUpFromStmt UnaryOperator(-)
-WalkUpFromStmt IntegerLiteral(3)
-WalkUpFromStmt CompoundStmt
-)txt"));
-}
-
-TEST(RecursiveASTVisitor,
-     StmtCallbacks_TraverseUnaryOperator_WalkUpFromUnaryOperator) {
-  class RecordingVisitor : public RecordingVisitorBase<RecordingVisitor> {
-  public:
-    RecordingVisitor(ShouldTraversePostOrder ShouldTraversePostOrderValue)
-        : RecordingVisitorBase(ShouldTraversePostOrderValue) {}
-
-    bool TraverseUnaryOperator(UnaryOperator *UO) {
-      recordCallback(__func__, UO, [&]() {
-        RecordingVisitorBase::TraverseUnaryOperator(UO);
-      });
-      return true;
-    }
-
-    bool WalkUpFromStmt(Stmt *S) {
-      recordCallback(__func__, S,
-                     [&]() { RecordingVisitorBase::WalkUpFromStmt(S); });
-      return true;
-    }
-
-    bool WalkUpFromExpr(Expr *E) {
-      recordCallback(__func__, E,
-                     [&]() { RecordingVisitorBase::WalkUpFromExpr(E); });
-      return true;
-    }
-
-    bool WalkUpFromUnaryOperator(UnaryOperator *UO) {
-      recordCallback(__func__, UO, [&]() {
-        RecordingVisitorBase::WalkUpFromUnaryOperator(UO);
-      });
-      return true;
-    }
-  };
-
-  StringRef Code = R"cpp(
-void test() {
-  1;
-  -2;
-  3;
-}
-)cpp";
-
-  EXPECT_TRUE(visitorCallbackLogEqual(
-      RecordingVisitor(ShouldTraversePostOrder::No), Code,
-      R"txt(
-WalkUpFromStmt CompoundStmt
-WalkUpFromExpr IntegerLiteral(1)
-  WalkUpFromStmt IntegerLiteral(1)
-TraverseUnaryOperator UnaryOperator(-)
-  WalkUpFromUnaryOperator UnaryOperator(-)
-    WalkUpFromExpr UnaryOperator(-)
-      WalkUpFromStmt UnaryOperator(-)
-  WalkUpFromExpr IntegerLiteral(2)
-    WalkUpFromStmt IntegerLiteral(2)
-WalkUpFromExpr IntegerLiteral(3)
-  WalkUpFromStmt IntegerLiteral(3)
-)txt"));
-
-  EXPECT_TRUE(visitorCallbackLogEqual(
-      RecordingVisitor(ShouldTraversePostOrder::Yes), Code,
-      R"txt(
-WalkUpFromExpr IntegerLiteral(1)
-  WalkUpFromStmt IntegerLiteral(1)
-TraverseUnaryOperator UnaryOperator(-)
-  WalkUpFromExpr IntegerLiteral(2)
-    WalkUpFromStmt IntegerLiteral(2)
-  WalkUpFromUnaryOperator UnaryOperator(-)
-    WalkUpFromExpr UnaryOperator(-)
-      WalkUpFromStmt UnaryOperator(-)
-WalkUpFromExpr IntegerLiteral(3)
-  WalkUpFromStmt IntegerLiteral(3)
-WalkUpFromStmt CompoundStmt
-)txt"));
-}
-
-TEST(RecursiveASTVisitor, StmtCallbacks_WalkUpFromUnaryOperator) {
-  class RecordingVisitor : public RecordingVisitorBase<RecordingVisitor> {
-  public:
-    RecordingVisitor(ShouldTraversePostOrder ShouldTraversePostOrderValue)
-        : RecordingVisitorBase(ShouldTraversePostOrderValue) {}
-
-    bool WalkUpFromStmt(Stmt *S) {
-      recordCallback(__func__, S,
-                     [&]() { RecordingVisitorBase::WalkUpFromStmt(S); });
-      return true;
-    }
-
-    bool WalkUpFromExpr(Expr *E) {
-      recordCallback(__func__, E,
-                     [&]() { RecordingVisitorBase::WalkUpFromExpr(E); });
-      return true;
-    }
-
-    bool WalkUpFromUnaryOperator(UnaryOperator *UO) {
-      recordCallback(__func__, UO, [&]() {
-        RecordingVisitorBase::WalkUpFromUnaryOperator(UO);
-      });
-      return true;
-    }
-  };
-
-  StringRef Code = R"cpp(
-void test() {
-  1;
-  -2;
-  3;
-}
-)cpp";
-
-  EXPECT_TRUE(visitorCallbackLogEqual(
-      RecordingVisitor(ShouldTraversePostOrder::No), Code,
-      R"txt(
-WalkUpFromStmt CompoundStmt
-WalkUpFromExpr IntegerLiteral(1)
-  WalkUpFromStmt IntegerLiteral(1)
-WalkUpFromUnaryOperator UnaryOperator(-)
-  WalkUpFromExpr UnaryOperator(-)
-    WalkUpFromStmt UnaryOperator(-)
-WalkUpFromExpr IntegerLiteral(2)
-  WalkUpFromStmt IntegerLiteral(2)
-WalkUpFromExpr IntegerLiteral(3)
-  WalkUpFromStmt IntegerLiteral(3)
-)txt"));
-
-  EXPECT_TRUE(visitorCallbackLogEqual(
-      RecordingVisitor(ShouldTraversePostOrder::Yes), Code,
-      R"txt(
-WalkUpFromExpr IntegerLiteral(1)
-  WalkUpFromStmt IntegerLiteral(1)
-WalkUpFromExpr IntegerLiteral(2)
-  WalkUpFromStmt IntegerLiteral(2)
-WalkUpFromUnaryOperator UnaryOperator(-)
-  WalkUpFromExpr UnaryOperator(-)
-    WalkUpFromStmt UnaryOperator(-)
-WalkUpFromExpr IntegerLiteral(3)
-  WalkUpFromStmt IntegerLiteral(3)
-WalkUpFromStmt CompoundStmt
-)txt"));
-}
diff --git a/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/Class.cpp b/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/Class.cpp
deleted file mode 100644
index 3ea5abd46a1..00000000000
--- a/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/Class.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-//===- unittest/Tooling/RecursiveASTVisitorTests/Class.cpp ----------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "TestVisitor.h"
-
-using namespace clang;
-
-namespace {
-
-// Checks for lambda classes that are not marked as implicitly-generated.
-// (There should be none.)
-class ClassVisitor : public ExpectedLocationVisitor<ClassVisitor> {
-public:
-  ClassVisitor() : SawNonImplicitLambdaClass(false) {}
-  bool VisitCXXRecordDecl(CXXRecordDecl* record) {
-    if (record->isLambda() && !record->isImplicit())
-      SawNonImplicitLambdaClass = true;
-    return true;
-  }
-
-  bool sawOnlyImplicitLambdaClasses() const {
-    return !SawNonImplicitLambdaClass;
-  }
-
-private:
-  bool SawNonImplicitLambdaClass;
-};
-
-TEST(RecursiveASTVisitor, LambdaClosureTypesAreImplicit) {
-  ClassVisitor Visitor;
-  EXPECT_TRUE(Visitor.runOver("auto lambda = []{};", ClassVisitor::Lang_CXX11));
-  EXPECT_TRUE(Visitor.sawOnlyImplicitLambdaClasses());
-}
-
-} // end anonymous namespace
diff --git a/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/Concept.cpp b/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/Concept.cpp
deleted file mode 100644
index f0f700204dd..00000000000
--- a/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/Concept.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-//===- unittest/Tooling/RecursiveASTVisitorTests/Concept.cpp----------------==//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "TestVisitor.h"
-#include "clang/AST/ExprConcepts.h"
-
-using namespace clang;
-
-namespace {
-
-struct ConceptVisitor : ExpectedLocationVisitor<ConceptVisitor> {
-  bool VisitConceptSpecializationExpr(ConceptSpecializationExpr *E) {
-    ++ConceptSpecializationExprsVisited;
-    return true;
-  }
-  bool TraverseConceptReference(const ConceptReference &R) {
-    ++ConceptReferencesTraversed;
-    return true;
-  }
-
-  int ConceptSpecializationExprsVisited = 0;
-  int ConceptReferencesTraversed = 0;
-};
-
-TEST(RecursiveASTVisitor, ConstrainedParameter) {
-  ConceptVisitor Visitor;
-  EXPECT_TRUE(Visitor.runOver("template <typename T> concept Fooable = true;\n"
-                              "template <Fooable T> void bar(T);",
-                              ConceptVisitor::Lang_CXX2a));
-  // Check that we visit the "Fooable T" template parameter's TypeConstraint's
-  // ImmediatelyDeclaredConstraint, which is a ConceptSpecializationExpr.
-  EXPECT_EQ(1, Visitor.ConceptSpecializationExprsVisited);
-  // There are two ConceptReference objects in the AST: the base subobject
-  // of the ConceptSpecializationExpr, and the base subobject of the
-  // TypeConstraint itself. To avoid traversing the concept and arguments
-  // multiple times, we only traverse one.
-  EXPECT_EQ(1, Visitor.ConceptReferencesTraversed);
-}
-
-} // end anonymous namespace
diff --git a/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/ConstructExpr.cpp b/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/ConstructExpr.cpp
deleted file mode 100644
index b4f4f54dc7e..00000000000
--- a/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/ConstructExpr.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-//===- unittest/Tooling/RecursiveASTVisitorTests/ConstructExpr.cpp --------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "TestVisitor.h"
-
-using namespace clang;
-
-namespace {
-
-/// \brief A visitor that optionally includes implicit code and matches
-/// CXXConstructExpr.
-///
-/// The name recorded for the match is the name of the class whose constructor
-/// is invoked by the CXXConstructExpr, not the name of the class whose
-/// constructor the CXXConstructExpr is contained in.
-class ConstructExprVisitor
-    : public ExpectedLocationVisitor<ConstructExprVisitor> {
-public:
-  ConstructExprVisitor() : ShouldVisitImplicitCode(false) {}
-
-  bool shouldVisitImplicitCode() const { return ShouldVisitImplicitCode; }
-
-  void setShouldVisitImplicitCode(bool NewValue) {
-    ShouldVisitImplicitCode = NewValue;
-  }
-
-  bool VisitCXXConstructExpr(CXXConstructExpr* Expr) {
-    if (const CXXConstructorDecl* Ctor = Expr->getConstructor()) {
-      if (const CXXRecordDecl* Class = Ctor->getParent()) {
-        Match(Class->getName(), Expr->getLocation());
-      }
-    }
-    return true;
-  }
-
- private:
-  bool ShouldVisitImplicitCode;
-};
-
-TEST(RecursiveASTVisitor, CanVisitImplicitMemberInitializations) {
-  ConstructExprVisitor Visitor;
-  Visitor.setShouldVisitImplicitCode(true);
-  Visitor.ExpectMatch("WithCtor", 2, 8);
-  // Simple has a constructor that implicitly initializes 'w'.  Test
-  // that a visitor that visits implicit code visits that initialization.
-  // Note: Clang lazily instantiates implicit declarations, so we need
-  // to use them in order to force them to appear in the AST.
-  EXPECT_TRUE(Visitor.runOver(
-      "struct WithCtor { WithCtor(); }; \n"
-      "struct Simple { WithCtor w; }; \n"
-      "int main() { Simple s; }\n"));
-}
-
-// The same as CanVisitImplicitMemberInitializations, but checking that the
-// visits are omitted when the visitor does not include implicit code.
-TEST(RecursiveASTVisitor, CanSkipImplicitMemberInitializations) {
-  ConstructExprVisitor Visitor;
-  Visitor.setShouldVisitImplicitCode(false);
-  Visitor.DisallowMatch("WithCtor", 2, 8);
-  // Simple has a constructor that implicitly initializes 'w'.  Test
-  // that a visitor that skips implicit code skips that initialization.
-  // Note: Clang lazily instantiates implicit declarations, so we need
-  // to use them in order to force them to appear in the AST.
-  EXPECT_TRUE(Visitor.runOver(
-      "struct WithCtor { WithCtor(); }; \n"
-      "struct Simple { WithCtor w; }; \n"
-      "int main() { Simple s; }\n"));
-}
-
-} // end anonymous namespace
diff --git a/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/DeclRefExpr.cpp b/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/DeclRefExpr.cpp
deleted file mode 100644
index adc972e1c3d..00000000000
--- a/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/DeclRefExpr.cpp
+++ /dev/null
@@ -1,124 +0,0 @@
-//===- unittest/Tooling/RecursiveASTVisitorTests/DeclRefExpr.cpp ----------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "TestVisitor.h"
-
-using namespace clang;
-
-namespace {
-
-class DeclRefExprVisitor : public ExpectedLocationVisitor<DeclRefExprVisitor> {
-public:
-  DeclRefExprVisitor() : ShouldVisitImplicitCode(false) {}
-
-  bool shouldVisitImplicitCode() const { return ShouldVisitImplicitCode; }
-
-  void setShouldVisitImplicitCode(bool NewValue) {
-    ShouldVisitImplicitCode = NewValue;
-  }
-
-  bool VisitDeclRefExpr(DeclRefExpr *Reference) {
-    Match(Reference->getNameInfo().getAsString(), Reference->getLocation());
-    return true;
-  }
-
-private:
-  bool ShouldVisitImplicitCode;
-};
-
-TEST(RecursiveASTVisitor, VisitsBaseClassTemplateArguments) {
-  DeclRefExprVisitor Visitor;
-  Visitor.ExpectMatch("x", 2, 3);
-  EXPECT_TRUE(Visitor.runOver(
-    "void x(); template <void (*T)()> class X {};\nX<x> y;"));
-}
-
-TEST(RecursiveASTVisitor, VisitsCXXForRangeStmtRange) {
-  DeclRefExprVisitor Visitor;
-  Visitor.ExpectMatch("x", 2, 25);
-  Visitor.ExpectMatch("x", 2, 30);
-  EXPECT_TRUE(Visitor.runOver(
-    "int x[5];\n"
-    "void f() { for (int i : x) { x[0] = 1; } }",
-    DeclRefExprVisitor::Lang_CXX11));
-}
-
-TEST(RecursiveASTVisitor, VisitsCallExpr) {
-  DeclRefExprVisitor Visitor;
-  Visitor.ExpectMatch("x", 1, 22);
-  EXPECT_TRUE(Visitor.runOver(
-    "void x(); void y() { x(); }"));
-}
-
-TEST(RecursiveASTVisitor, VisitsExplicitLambdaCaptureInit) {
-  DeclRefExprVisitor Visitor;
-  Visitor.ExpectMatch("i", 1, 20);
-  EXPECT_TRUE(Visitor.runOver(
-    "void f() { int i; [i]{}; }",
-    DeclRefExprVisitor::Lang_CXX11));
-}
-
-TEST(RecursiveASTVisitor, VisitsUseOfImplicitLambdaCapture) {
-  DeclRefExprVisitor Visitor;
-  Visitor.ExpectMatch("i", 1, 24);
-  EXPECT_TRUE(Visitor.runOver(
-    "void f() { int i; [=]{ i; }; }",
-    DeclRefExprVisitor::Lang_CXX11));
-}
-
-TEST(RecursiveASTVisitor, VisitsImplicitLambdaCaptureInit) {
-  DeclRefExprVisitor Visitor;
-  Visitor.setShouldVisitImplicitCode(true);
-  // We're expecting "i" to be visited twice: once for the initialization expr
-  // for the captured variable "i" outside of the lambda body, and again for
-  // the use of "i" inside the lambda.
-  Visitor.ExpectMatch("i", 1, 20, /*Times=*/1);
-  Visitor.ExpectMatch("i", 1, 24, /*Times=*/1);
-  EXPECT_TRUE(Visitor.runOver(
-    "void f() { int i; [=]{ i; }; }",
-    DeclRefExprVisitor::Lang_CXX11));
-}
-
-TEST(RecursiveASTVisitor, VisitsLambdaInitCaptureInit) {
-  DeclRefExprVisitor Visitor;
-  Visitor.ExpectMatch("i", 1, 24);
-  EXPECT_TRUE(Visitor.runOver(
-    "void f() { int i; [a = i + 1]{}; }",
-    DeclRefExprVisitor::Lang_CXX14));
-}
-
-/* FIXME: According to Richard Smith this is a bug in the AST.
-TEST(RecursiveASTVisitor, VisitsBaseClassTemplateArgumentsInInstantiation) {
-  DeclRefExprVisitor Visitor;
-  Visitor.ExpectMatch("x", 3, 43);
-  EXPECT_TRUE(Visitor.runOver(
-    "template <typename T> void x();\n"
-    "template <void (*T)()> class X {};\n"
-    "template <typename T> class Y : public X< x<T> > {};\n"
-    "Y<int> y;"));
-}
-*/
-
-TEST(RecursiveASTVisitor, VisitsExtension) {
-  DeclRefExprVisitor Visitor;
-  Visitor.ExpectMatch("s", 1, 24);
-  EXPECT_TRUE(Visitor.runOver(
-    "int s = __extension__ (s);\n"));
-}
-
-TEST(RecursiveASTVisitor, VisitsCopyExprOfBlockDeclCapture) {
-  DeclRefExprVisitor Visitor;
-  Visitor.ExpectMatch("x", 3, 24);
-  EXPECT_TRUE(Visitor.runOver("void f(int(^)(int)); \n"
-                              "void g() { \n"
-                              "  f([&](int x){ return x; }); \n"
-                              "}",
-                              DeclRefExprVisitor::Lang_OBJCXX11));
-}
-
-} // end anonymous namespace
diff --git a/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/ImplicitCtor.cpp b/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/ImplicitCtor.cpp
deleted file mode 100644
index 27999e5ef8e..00000000000
--- a/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/ImplicitCtor.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-//===- unittest/Tooling/RecursiveASTVisitorTests/ImplicitCtor.cpp ---------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "TestVisitor.h"
-
-using namespace clang;
-
-namespace {
-
-// A visitor that visits implicit declarations and matches constructors.
-class ImplicitCtorVisitor
-    : public ExpectedLocationVisitor<ImplicitCtorVisitor> {
-public:
-  bool shouldVisitImplicitCode() const { return true; }
-
-  bool VisitCXXConstructorDecl(CXXConstructorDecl* Ctor) {
-    if (Ctor->isImplicit()) {  // Was not written in source code
-      if (const CXXRecordDecl* Class = Ctor->getParent()) {
-        Match(Class->getName(), Ctor->getLocation());
-      }
-    }
-    return true;
-  }
-};
-
-TEST(RecursiveASTVisitor, VisitsImplicitCopyConstructors) {
-  ImplicitCtorVisitor Visitor;
-  Visitor.ExpectMatch("Simple", 2, 8);
-  // Note: Clang lazily instantiates implicit declarations, so we need
-  // to use them in order to force them to appear in the AST.
-  EXPECT_TRUE(Visitor.runOver(
-      "struct WithCtor { WithCtor(); }; \n"
-      "struct Simple { Simple(); WithCtor w; }; \n"
-      "int main() { Simple s; Simple t(s); }\n"));
-}
-
-} // end anonymous namespace
diff --git a/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/ImplicitCtorInitializer.cpp b/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/ImplicitCtorInitializer.cpp
deleted file mode 100644
index c762e1cffc3..00000000000
--- a/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/ImplicitCtorInitializer.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-//=- unittest/Tooling/RecursiveASTVisitorTests/ImplicitCtorInitializer.cpp -=//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "TestVisitor.h"
-
-using namespace clang;
-
-namespace {
-
-class CXXCtorInitializerVisitor
-    : public ExpectedLocationVisitor<CXXCtorInitializerVisitor> {
-public:
-  CXXCtorInitializerVisitor(bool VisitImplicitCode)
-      : VisitImplicitCode(VisitImplicitCode) {}
-
-  bool shouldVisitImplicitCode() const { return VisitImplicitCode; }
-
-  bool TraverseConstructorInitializer(CXXCtorInitializer *Init) {
-    if (!Init->isWritten())
-      VisitedImplicitInitializer = true;
-    Match("initializer", Init->getSourceLocation());
-    return ExpectedLocationVisitor<
-        CXXCtorInitializerVisitor>::TraverseConstructorInitializer(Init);
-  }
-
-  bool VisitedImplicitInitializer = false;
-
-private:
-  bool VisitImplicitCode;
-};
-
-// Check to ensure that CXXCtorInitializer is not visited when implicit code
-// should not be visited and that it is visited when implicit code should be
-// visited.
-TEST(RecursiveASTVisitor, CXXCtorInitializerVisitNoImplicit) {
-  for (bool VisitImplCode : {true, false}) {
-    CXXCtorInitializerVisitor Visitor(VisitImplCode);
-    Visitor.ExpectMatch("initializer", 7, 17);
-    llvm::StringRef Code = R"cpp(
-        class A {};
-        class B : public A {
-          B() {};
-        };
-        class C : public A {
-          C() : A() {}
-        };
-      )cpp";
-    EXPECT_TRUE(Visitor.runOver(Code, CXXCtorInitializerVisitor::Lang_CXX));
-    EXPECT_EQ(Visitor.VisitedImplicitInitializer, VisitImplCode);
-  }
-}
-} // end anonymous namespace
diff --git a/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/InitListExprPostOrder.cpp b/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/InitListExprPostOrder.cpp
deleted file mode 100644
index 80d9c987350..00000000000
--- a/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/InitListExprPostOrder.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-//===- unittest/Tooling/RecursiveASTVisitorTests/InitListExprPostOrder.cpp -==//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "TestVisitor.h"
-
-using namespace clang;
-
-namespace {
-
-class InitListExprPostOrderVisitor
-    : public ExpectedLocationVisitor<InitListExprPostOrderVisitor> {
-public:
-  bool shouldTraversePostOrder() const { return true; }
-
-  bool VisitInitListExpr(InitListExpr *ILE) {
-    Match(ILE->isSemanticForm() ? "semantic" : "syntactic", ILE->getBeginLoc());
-    return true;
-  }
-};
-
-TEST(RecursiveASTVisitor, InitListExprIsPostOrderVisitedTwice) {
-  InitListExprPostOrderVisitor Visitor;
-  Visitor.ExpectMatch("syntactic", 2, 21);
-  Visitor.ExpectMatch("semantic", 2, 21);
-  EXPECT_TRUE(Visitor.runOver("struct S { int x; };\n"
-                              "static struct S s = {.x = 0};\n",
-                              InitListExprPostOrderVisitor::Lang_C));
-}
-
-} // end anonymous namespace
diff --git a/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/InitListExprPostOrderNoQueue.cpp b/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/InitListExprPostOrderNoQueue.cpp
deleted file mode 100644
index a15f4c83c5e..00000000000
--- a/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/InitListExprPostOrderNoQueue.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-//===- unittest/Tooling/RecursiveASTVisitorTests/InitListExprPostOrderNoQueue.cpp -===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "TestVisitor.h"
-
-using namespace clang;
-
-namespace {
-
-class InitListExprPostOrderNoQueueVisitor
-    : public ExpectedLocationVisitor<InitListExprPostOrderNoQueueVisitor> {
-public:
-  bool shouldTraversePostOrder() const { return true; }
-
-  bool TraverseInitListExpr(InitListExpr *ILE) {
-    return ExpectedLocationVisitor::TraverseInitListExpr(ILE);
-  }
-
-  bool VisitInitListExpr(InitListExpr *ILE) {
-    Match(ILE->isSemanticForm() ? "semantic" : "syntactic", ILE->getBeginLoc());
-    return true;
-  }
-};
-
-TEST(RecursiveASTVisitor, InitListExprIsPostOrderNoQueueVisitedTwice) {
-  InitListExprPostOrderNoQueueVisitor Visitor;
-  Visitor.ExpectMatch("syntactic", 2, 21);
-  Visitor.ExpectMatch("semantic", 2, 21);
-  EXPECT_TRUE(Visitor.runOver("struct S { int x; };\n"
-                              "static struct S s = {.x = 0};\n",
-                              InitListExprPostOrderNoQueueVisitor::Lang_C));
-}
-
-} // end anonymous namespace
diff --git a/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/InitListExprPreOrder.cpp b/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/InitListExprPreOrder.cpp
deleted file mode 100644
index 3fa1529ea0e..00000000000
--- a/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/InitListExprPreOrder.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-//===- unittest/Tooling/RecursiveASTVisitorTests/InitListExprPreOrder.cpp -===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "TestVisitor.h"
-
-using namespace clang;
-
-namespace {
-
-// Check to ensure that InitListExpr is visited twice, once each for the
-// syntactic and semantic form.
-class InitListExprPreOrderVisitor
-    : public ExpectedLocationVisitor<InitListExprPreOrderVisitor> {
-public:
-  InitListExprPreOrderVisitor(bool VisitImplicitCode)
-      : VisitImplicitCode(VisitImplicitCode) {}
-
-  bool shouldVisitImplicitCode() const { return VisitImplicitCode; }
-
-  bool VisitInitListExpr(InitListExpr *ILE) {
-    Match(ILE->isSemanticForm() ? "semantic" : "syntactic", ILE->getBeginLoc());
-    return true;
-  }
-
-private:
-  bool VisitImplicitCode;
-};
-
-TEST(RecursiveASTVisitor, InitListExprIsPreOrderVisitedTwice) {
-  InitListExprPreOrderVisitor Visitor(/*VisitImplicitCode=*/true);
-  Visitor.ExpectMatch("syntactic", 2, 21);
-  Visitor.ExpectMatch("semantic", 2, 21);
-  EXPECT_TRUE(Visitor.runOver("struct S { int x; };\n"
-                              "static struct S s = {.x = 0};\n",
-                              InitListExprPreOrderVisitor::Lang_C));
-}
-
-TEST(RecursiveASTVisitor, InitListExprVisitedOnceWhenNoImplicit) {
-  InitListExprPreOrderVisitor Visitor(/*VisitImplicitCode=*/false);
-  Visitor.ExpectMatch("syntactic", 2, 21);
-  Visitor.DisallowMatch("semantic", 2, 21);
-  EXPECT_TRUE(Visitor.runOver("struct S { int x; };\n"
-                              "static struct S s = {.x = 0};\n",
-                              InitListExprPreOrderVisitor::Lang_C));
-}
-
-} // end anonymous namespace
diff --git a/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/InitListExprPreOrderNoQueue.cpp b/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/InitListExprPreOrderNoQueue.cpp
deleted file mode 100644
index 1dafeef7cda..00000000000
--- a/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/InitListExprPreOrderNoQueue.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-//===- unittest/Tooling/RecursiveASTVisitorTests/InitListExprPreOrderNoQueue.cpp -===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "TestVisitor.h"
-
-using namespace clang;
-
-namespace {
-
-class InitListExprPreOrderNoQueueVisitor
-    : public ExpectedLocationVisitor<InitListExprPreOrderNoQueueVisitor> {
-public:
-  bool TraverseInitListExpr(InitListExpr *ILE) {
-    return ExpectedLocationVisitor::TraverseInitListExpr(ILE);
-  }
-
-  bool VisitInitListExpr(InitListExpr *ILE) {
-    Match(ILE->isSemanticForm() ? "semantic" : "syntactic", ILE->getBeginLoc());
-    return true;
-  }
-};
-
-TEST(RecursiveASTVisitor, InitListExprIsPreOrderNoQueueVisitedTwice) {
-  InitListExprPreOrderNoQueueVisitor Visitor;
-  Visitor.ExpectMatch("syntactic", 2, 21);
-  Visitor.ExpectMatch("semantic", 2, 21);
-  EXPECT_TRUE(Visitor.runOver("struct S { int x; };\n"
-                              "static struct S s = {.x = 0};\n",
-                              InitListExprPreOrderNoQueueVisitor::Lang_C));
-}
-
-} // end anonymous namespace
diff --git a/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/IntegerLiteral.cpp b/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/IntegerLiteral.cpp
deleted file mode 100644
index 3fc3cb1a99a..00000000000
--- a/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/IntegerLiteral.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-//===- unittest/Tooling/RecursiveASTVisitorTests/IntegerLiteral.cpp -------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "TestVisitor.h"
-
-using namespace clang;
-
-namespace {
-
-// Check to ensure that implicit default argument expressions are visited.
-class IntegerLiteralVisitor
-    : public ExpectedLocationVisitor<IntegerLiteralVisitor> {
-public:
-  bool VisitIntegerLiteral(const IntegerLiteral *IL) {
-    Match("literal", IL->getLocation());
-    return true;
-  }
-};
-
-TEST(RecursiveASTVisitor, DefaultArgumentsAreVisited) {
-  IntegerLiteralVisitor Visitor;
-  Visitor.ExpectMatch("literal", 1, 15, 2);
-  EXPECT_TRUE(Visitor.runOver("int f(int i = 1);\n"
-                              "static int k = f();\n"));
-}
-
-} // end anonymous namespace
diff --git a/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/LambdaDefaultCapture.cpp b/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/LambdaDefaultCapture.cpp
deleted file mode 100644
index b1d6d593e73..00000000000
--- a/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/LambdaDefaultCapture.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-//===- unittest/Tooling/RecursiveASTVisitorTests/LambdaDefaultCapture.cpp -===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "TestVisitor.h"
-
-using namespace clang;
-
-namespace {
-
-// Matches the (optional) capture-default of a lambda-introducer.
-class LambdaDefaultCaptureVisitor
-  : public ExpectedLocationVisitor<LambdaDefaultCaptureVisitor> {
-public:
-  bool VisitLambdaExpr(LambdaExpr *Lambda) {
-    if (Lambda->getCaptureDefault() != LCD_None) {
-      Match("", Lambda->getCaptureDefaultLoc());
-    }
-    return true;
-  }
-};
-
-TEST(RecursiveASTVisitor, HasCaptureDefaultLoc) {
-  LambdaDefaultCaptureVisitor Visitor;
-  Visitor.ExpectMatch("", 1, 20);
-  EXPECT_TRUE(Visitor.runOver("void f() { int a; [=]{a;}; }",
-                              LambdaDefaultCaptureVisitor::Lang_CXX11));
-}
-
-} // end anonymous namespace
diff --git a/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/LambdaExpr.cpp b/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/LambdaExpr.cpp
deleted file mode 100644
index 8e234878409..00000000000
--- a/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/LambdaExpr.cpp
+++ /dev/null
@@ -1,99 +0,0 @@
-//===- unittest/Tooling/RecursiveASTVisitorTests/LambdaExpr.cpp -----------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "TestVisitor.h"
-#include "llvm/Support/Host.h"
-#include <stack>
-
-using namespace clang;
-
-namespace {
-
-class LambdaExprVisitor : public ExpectedLocationVisitor<LambdaExprVisitor> {
-public:
-  bool VisitLambdaExpr(LambdaExpr *Lambda) {
-    PendingBodies.push(Lambda->getBody());
-    PendingClasses.push(Lambda->getLambdaClass());
-    Match("", Lambda->getIntroducerRange().getBegin());
-    return true;
-  }
-  /// For each call to VisitLambdaExpr, we expect a subsequent call to visit
-  /// the body (and maybe the lambda class, which is implicit).
-  bool VisitStmt(Stmt *S) {
-    if (!PendingBodies.empty() && S == PendingBodies.top())
-      PendingBodies.pop();
-    return true;
-  }
-  bool VisitDecl(Decl *D) {
-    if (!PendingClasses.empty() && D == PendingClasses.top())
-      PendingClasses.pop();
-    return true;
-  }
-  /// Determine whether parts of lambdas (VisitLambdaExpr) were later traversed.
-  bool allBodiesHaveBeenTraversed() const { return PendingBodies.empty(); }
-  bool allClassesHaveBeenTraversed() const { return PendingClasses.empty(); }
-
-  bool VisitImplicitCode = false;
-  bool shouldVisitImplicitCode() const { return VisitImplicitCode; }
-
-private:
-  std::stack<Stmt *> PendingBodies;
-  std::stack<Decl *> PendingClasses;
-};
-
-TEST(RecursiveASTVisitor, VisitsLambdaExpr) {
-  LambdaExprVisitor Visitor;
-  Visitor.ExpectMatch("", 1, 12);
-  EXPECT_TRUE(Visitor.runOver("void f() { []{ return; }(); }",
-                              LambdaExprVisitor::Lang_CXX11));
-  EXPECT_TRUE(Visitor.allBodiesHaveBeenTraversed());
-  EXPECT_FALSE(Visitor.allClassesHaveBeenTraversed());
-}
-
-TEST(RecursiveASTVisitor, LambdaInLambda) {
-  LambdaExprVisitor Visitor;
-  Visitor.ExpectMatch("", 1, 12);
-  Visitor.ExpectMatch("", 1, 16);
-  EXPECT_TRUE(Visitor.runOver("void f() { []{ []{ return; }; }(); }",
-                              LambdaExprVisitor::Lang_CXX11));
-  EXPECT_TRUE(Visitor.allBodiesHaveBeenTraversed());
-  EXPECT_FALSE(Visitor.allClassesHaveBeenTraversed());
-}
-
-TEST(RecursiveASTVisitor, TopLevelLambda) {
-  LambdaExprVisitor Visitor;
-  Visitor.VisitImplicitCode = true;
-  Visitor.ExpectMatch("", 1, 10);
-  Visitor.ExpectMatch("", 1, 14);
-  EXPECT_TRUE(Visitor.runOver("auto x = []{ [] {}; };",
-                              LambdaExprVisitor::Lang_CXX11));
-  EXPECT_TRUE(Visitor.allBodiesHaveBeenTraversed());
-  EXPECT_TRUE(Visitor.allClassesHaveBeenTraversed());
-}
-
-TEST(RecursiveASTVisitor, VisitsLambdaExprAndImplicitClass) {
-  LambdaExprVisitor Visitor;
-  Visitor.VisitImplicitCode = true;
-  Visitor.ExpectMatch("", 1, 12);
-  EXPECT_TRUE(Visitor.runOver("void f() { []{ return; }(); }",
-                              LambdaExprVisitor::Lang_CXX11));
-  EXPECT_TRUE(Visitor.allBodiesHaveBeenTraversed());
-  EXPECT_TRUE(Visitor.allClassesHaveBeenTraversed());
-}
-
-TEST(RecursiveASTVisitor, VisitsAttributedLambdaExpr) {
-  if (llvm::Triple(llvm::sys::getDefaultTargetTriple()).isPS4())
-    return; // PS4 does not support fastcall.
-  LambdaExprVisitor Visitor;
-  Visitor.ExpectMatch("", 1, 12);
-  EXPECT_TRUE(Visitor.runOver(
-      "void f() { [] () __attribute__ (( fastcall )) { return; }(); }",
-      LambdaExprVisitor::Lang_CXX14));
-}
-
-} // end anonymous namespace
diff --git a/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/LambdaTemplateParams.cpp b/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/LambdaTemplateParams.cpp
deleted file mode 100644
index 34b38f69095..00000000000
--- a/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/LambdaTemplateParams.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-//===- unittest/Tooling/RecursiveASTVisitorTests/LambdaTemplateParams.cpp -===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "TestVisitor.h"
-
-using namespace clang;
-
-namespace {
-
-// Matches (optional) explicit template parameters.
-class LambdaTemplateParametersVisitor
-  : public ExpectedLocationVisitor<LambdaTemplateParametersVisitor> {
-public:
-  bool shouldVisitImplicitCode() const { return false; }
-
-  bool VisitTemplateTypeParmDecl(TemplateTypeParmDecl *D) {
-    EXPECT_FALSE(D->isImplicit());
-    Match(D->getName(), D->getBeginLoc());
-    return true;
-  }
-
-  bool VisitNonTypeTemplateParmDecl(NonTypeTemplateParmDecl *D) {
-    EXPECT_FALSE(D->isImplicit());
-    Match(D->getName(), D->getBeginLoc());
-    return true;
-  }
-
-  bool VisitTemplateTemplateParmDecl(TemplateTemplateParmDecl *D) {
-    EXPECT_FALSE(D->isImplicit());
-    Match(D->getName(), D->getBeginLoc());
-    return true;
-  }
-};
-
-TEST(RecursiveASTVisitor, VisitsLambdaExplicitTemplateParameters) {
-  LambdaTemplateParametersVisitor Visitor;
-  Visitor.ExpectMatch("T",  2, 15);
-  Visitor.ExpectMatch("I",  2, 24);
-  Visitor.ExpectMatch("TT", 2, 31);
-  EXPECT_TRUE(Visitor.runOver(
-      "void f() { \n"
-      "  auto l = []<class T, int I, template<class> class TT>(auto p) { }; \n"
-      "}",
-      LambdaTemplateParametersVisitor::Lang_CXX2a));
-}
-
-} // end anonymous namespace
diff --git a/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/MemberPointerTypeLoc.cpp b/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/MemberPointerTypeLoc.cpp
deleted file mode 100644
index d67bd0395a6..00000000000
--- a/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/MemberPointerTypeLoc.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-//===- unittest/Tooling/RecursiveASTVisitorTests/MemberPointerTypeLoc.cpp -===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "TestVisitor.h"
-#include "llvm/ADT/StringRef.h"
-
-using namespace clang;
-
-namespace {
-
-class MemberPointerTypeLocVisitor
-    : public ExpectedLocationVisitor<MemberPointerTypeLocVisitor> {
-public:
-  bool VisitTemplateTypeParmTypeLoc(TemplateTypeParmTypeLoc TL) {
-    if (!TL)
-      return true;
-    Match(TL.getDecl()->getName(), TL.getNameLoc());
-    return true;
-  }
-  bool VisitRecordTypeLoc(RecordTypeLoc RTL) {
-    if (!RTL)
-      return true;
-    Match(RTL.getDecl()->getName(), RTL.getNameLoc());
-    return true;
-  }
-};
-
-TEST(RecursiveASTVisitor, VisitTypeLocInMemberPointerTypeLoc) {
-  MemberPointerTypeLocVisitor Visitor;
-  Visitor.ExpectMatch("Bar", 4, 36);
-  Visitor.ExpectMatch("T", 7, 23);
-  llvm::StringLiteral Code = R"cpp(
-     class Bar { void func(int); };
-     class Foo {
-       void bind(const char*, void(Bar::*Foo)(int)) {}
-
-       template<typename T>
-       void test(void(T::*Foo)());
-     };
-  )cpp";
-  EXPECT_TRUE(Visitor.runOver(Code));
-}
-
-TEST(RecursiveASTVisitor, NoCrash) {
-  MemberPointerTypeLocVisitor Visitor;
-  llvm::StringLiteral Code = R"cpp(
-     // MemberPointerTypeLoc.getClassTInfo() is null.
-     class a(b(a::*)) class
-  )cpp";
-  EXPECT_FALSE(Visitor.runOver(Code));
-}
-
-} // end anonymous namespace
diff --git a/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/NestedNameSpecifiers.cpp b/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/NestedNameSpecifiers.cpp
deleted file mode 100644
index 868a3988c75..00000000000
--- a/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/NestedNameSpecifiers.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-//===- unittest/Tooling/RecursiveASTVisitorTests/NestedNameSpecifiers.cpp -===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "TestVisitor.h"
-
-using namespace clang;
-
-namespace {
-
-// Check to ensure that nested name specifiers are visited.
-class NestedNameSpecifiersVisitor
-    : public ExpectedLocationVisitor<NestedNameSpecifiersVisitor> {
-public:
-  bool VisitRecordTypeLoc(RecordTypeLoc RTL) {
-    if (!RTL)
-      return true;
-    Match(RTL.getDecl()->getName(), RTL.getNameLoc());
-    return true;
-  }
-
-  bool TraverseNestedNameSpecifierLoc(NestedNameSpecifierLoc NNS) {
-    if (!NNS)
-      return true;
-    if (const NamespaceDecl *ND =
-            NNS.getNestedNameSpecifier()->getAsNamespace())
-      Match(ND->getName(), NNS.getLocalBeginLoc());
-    return ExpectedLocationVisitor::TraverseNestedNameSpecifierLoc(NNS);
-  }
-};
-
-TEST(RecursiveASTVisitor,
-     NestedNameSpecifiersForTemplateSpecializationsAreVisited) {
-  StringRef Source = R"(
-namespace ns {
-struct Outer {
-    template<typename T, typename U>
-    struct Nested { };
-
-    template<typename T>
-    static T x;
-};
-}
-
-template<>
-struct ns::Outer::Nested<int, int>;
-
-template<>
-struct ns::Outer::Nested<int, int> { };
-
-template<typename T>
-struct ns::Outer::Nested<int, T> { };
-
-template<>
-int ns::Outer::x<int> = 0;
-)";
-  NestedNameSpecifiersVisitor Visitor;
-  Visitor.ExpectMatch("ns", 13, 8);
-  Visitor.ExpectMatch("ns", 16, 8);
-  Visitor.ExpectMatch("ns", 19, 8);
-  Visitor.ExpectMatch("ns", 22, 5);
-  Visitor.ExpectMatch("Outer", 13, 12);
-  Visitor.ExpectMatch("Outer", 16, 12);
-  Visitor.ExpectMatch("Outer", 19, 12);
-  Visitor.ExpectMatch("Outer", 22, 9);
-  EXPECT_TRUE(Visitor.runOver(Source, NestedNameSpecifiersVisitor::Lang_CXX14));
-}
-
-} // end anonymous namespace
diff --git a/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/ParenExpr.cpp b/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/ParenExpr.cpp
deleted file mode 100644
index c316f98f40c..00000000000
--- a/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/ParenExpr.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-//===- unittest/Tooling/RecursiveASTVisitorTests/ParenExpr.cpp ------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "TestVisitor.h"
-
-using namespace clang;
-
-namespace {
-
-class ParenExprVisitor : public ExpectedLocationVisitor<ParenExprVisitor> {
-public:
-  bool VisitParenExpr(ParenExpr *Parens) {
-    Match("", Parens->getExprLoc());
-    return true;
-  }
-};
-
-TEST(RecursiveASTVisitor, VisitsParensDuringDataRecursion) {
-  ParenExprVisitor Visitor;
-  Visitor.ExpectMatch("", 1, 9);
-  EXPECT_TRUE(Visitor.runOver("int k = (4) + 9;\n"));
-}
-
-} // end anonymous namespace
diff --git a/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/TemplateArgumentLocTraverser.cpp b/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/TemplateArgumentLocTraverser.cpp
deleted file mode 100644
index 5eee19f0730..00000000000
--- a/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/TemplateArgumentLocTraverser.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-//===- unittest/Tooling/RecursiveASTVisitorTests/TemplateArgumentLocTraverser.cpp -===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "TestVisitor.h"
-
-using namespace clang;
-
-namespace {
-
-class TemplateArgumentLocTraverser
-  : public ExpectedLocationVisitor<TemplateArgumentLocTraverser> {
-public:
-  bool TraverseTemplateArgumentLoc(const TemplateArgumentLoc &ArgLoc) {
-    std::string ArgStr;
-    llvm::raw_string_ostream Stream(ArgStr);
-    const TemplateArgument &Arg = ArgLoc.getArgument();
-
-    Arg.print(Context->getPrintingPolicy(), Stream, /*IncludeType*/ true);
-    Match(Stream.str(), ArgLoc.getLocation());
-    return ExpectedLocationVisitor<TemplateArgumentLocTraverser>::
-      TraverseTemplateArgumentLoc(ArgLoc);
-  }
-};
-
-TEST(RecursiveASTVisitor, VisitsClassTemplateTemplateParmDefaultArgument) {
-  TemplateArgumentLocTraverser Visitor;
-  Visitor.ExpectMatch("X", 2, 40);
-  EXPECT_TRUE(Visitor.runOver(
-    "template<typename T> class X;\n"
-    "template<template <typename> class T = X> class Y;\n"
-    "template<template <typename> class T> class Y {};\n"));
-}
-
-} // end anonymous namespace
diff --git a/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/TraversalScope.cpp b/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/TraversalScope.cpp
deleted file mode 100644
index 9e71f9554e5..00000000000
--- a/gnu/llvm/clang/unittests/Tooling/RecursiveASTVisitorTests/TraversalScope.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-//===- unittest/Tooling/RecursiveASTVisitorTests/TraversalScope.cpp -------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "TestVisitor.h"
-
-using namespace clang;
-
-namespace {
-
-class Visitor : public ExpectedLocationVisitor<Visitor, clang::TestVisitor> {
-public:
-  Visitor(ASTContext *Context) { this->Context = Context; }
-
-  bool VisitTranslationUnitDecl(TranslationUnitDecl *D) {
-    auto &SM = D->getParentASTContext().getSourceManager();
-    Match("TU", SM.getLocForStartOfFile(SM.getMainFileID()));
-    return true;
-  }
-
-  bool VisitNamedDecl(NamedDecl *D) {
-    if (!D->isImplicit())
-      Match(D->getName(), D->getLocation());
-    return true;
-  }
-};
-
-TEST(RecursiveASTVisitor, RespectsTraversalScope) {
-  auto AST = tooling::buildASTFromCode(
-      R"cpp(
-struct foo {
-  struct bar {
-    struct baz {};
-  };
-};
-      )cpp",
-      "foo.cpp", std::make_shared<PCHContainerOperations>());
-  auto &Ctx = AST->getASTContext();
-  auto &TU = *Ctx.getTranslationUnitDecl();
-  auto &Foo = *TU.lookup(&Ctx.Idents.get("foo")).front();
-  auto &Bar = *cast<DeclContext>(Foo).lookup(&Ctx.Idents.get("bar")).front();
-
-  Ctx.setTraversalScope({&Bar});
-
-  Visitor V(&Ctx);
-  V.ExpectMatch("TU", 1, 1);
-  V.DisallowMatch("foo", 2, 8);
-  V.ExpectMatch("bar", 3, 10);
-  V.ExpectMatch("baz", 4, 12);
-  V.TraverseAST(Ctx);
-}
-
-} // end anonymous namespace
diff --git a/gnu/llvm/clang/unittests/Tooling/RefactoringActionRulesTest.cpp b/gnu/llvm/clang/unittests/Tooling/RefactoringActionRulesTest.cpp
deleted file mode 100644
index b471cf207cf..00000000000
--- a/gnu/llvm/clang/unittests/Tooling/RefactoringActionRulesTest.cpp
+++ /dev/null
@@ -1,247 +0,0 @@
-//===- unittest/Tooling/RefactoringTestActionRulesTest.cpp ----------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "ReplacementTest.h"
-#include "RewriterTestContext.h"
-#include "clang/Tooling/Refactoring.h"
-#include "clang/Tooling/Refactoring/Extract/Extract.h"
-#include "clang/Tooling/Refactoring/RefactoringAction.h"
-#include "clang/Tooling/Refactoring/RefactoringDiagnostic.h"
-#include "clang/Tooling/Refactoring/Rename/SymbolName.h"
-#include "clang/Tooling/Tooling.h"
-#include "llvm/Support/Errc.h"
-#include "gtest/gtest.h"
-
-using namespace clang;
-using namespace tooling;
-
-namespace {
-
-class RefactoringActionRulesTest : public ::testing::Test {
-protected:
-  void SetUp() override {
-    Context.Sources.setMainFileID(
-        Context.createInMemoryFile("input.cpp", DefaultCode));
-  }
-
-  RewriterTestContext Context;
-  std::string DefaultCode = std::string(100, 'a');
-};
-
-Expected<AtomicChanges>
-createReplacements(const std::unique_ptr<RefactoringActionRule> &Rule,
-                   RefactoringRuleContext &Context) {
-  class Consumer final : public RefactoringResultConsumer {
-    void handleError(llvm::Error Err) override { Result = std::move(Err); }
-
-    void handle(AtomicChanges SourceReplacements) override {
-      Result = std::move(SourceReplacements);
-    }
-    void handle(SymbolOccurrences Occurrences) override {
-      RefactoringResultConsumer::handle(std::move(Occurrences));
-    }
-
-  public:
-    Optional<Expected<AtomicChanges>> Result;
-  };
-
-  Consumer C;
-  Rule->invoke(C, Context);
-  return std::move(*C.Result);
-}
-
-TEST_F(RefactoringActionRulesTest, MyFirstRefactoringRule) {
-  class ReplaceAWithB : public SourceChangeRefactoringRule {
-    std::pair<SourceRange, int> Selection;
-
-  public:
-    ReplaceAWithB(std::pair<SourceRange, int> Selection)
-        : Selection(Selection) {}
-
-    static Expected<ReplaceAWithB>
-    initiate(RefactoringRuleContext &Cotnext,
-             std::pair<SourceRange, int> Selection) {
-      return ReplaceAWithB(Selection);
-    }
-
-    Expected<AtomicChanges>
-    createSourceReplacements(RefactoringRuleContext &Context) {
-      const SourceManager &SM = Context.getSources();
-      SourceLocation Loc =
-          Selection.first.getBegin().getLocWithOffset(Selection.second);
-      AtomicChange Change(SM, Loc);
-      llvm::Error E = Change.replace(SM, Loc, 1, "b");
-      if (E)
-        return std::move(E);
-      return AtomicChanges{Change};
-    }
-  };
-
-  class SelectionRequirement : public SourceRangeSelectionRequirement {
-  public:
-    Expected<std::pair<SourceRange, int>>
-    evaluate(RefactoringRuleContext &Context) const {
-      Expected<SourceRange> R =
-          SourceRangeSelectionRequirement::evaluate(Context);
-      if (!R)
-        return R.takeError();
-      return std::make_pair(*R, 20);
-    }
-  };
-  auto Rule =
-      createRefactoringActionRule<ReplaceAWithB>(SelectionRequirement());
-
-  // When the requirements are satisfied, the rule's function must be invoked.
-  {
-    RefactoringRuleContext RefContext(Context.Sources);
-    SourceLocation Cursor =
-        Context.Sources.getLocForStartOfFile(Context.Sources.getMainFileID())
-            .getLocWithOffset(10);
-    RefContext.setSelectionRange({Cursor, Cursor});
-
-    Expected<AtomicChanges> ErrorOrResult =
-        createReplacements(Rule, RefContext);
-    ASSERT_FALSE(!ErrorOrResult);
-    AtomicChanges Result = std::move(*ErrorOrResult);
-    ASSERT_EQ(Result.size(), 1u);
-    std::string YAMLString =
-        const_cast<AtomicChange &>(Result[0]).toYAMLString();
-
-    ASSERT_STREQ("---\n"
-                 "Key:             'input.cpp:30'\n"
-                 "FilePath:        input.cpp\n"
-                 "Error:           ''\n"
-                 "InsertedHeaders: []\n"
-                 "RemovedHeaders:  []\n"
-                 "Replacements:\n"
-                 "  - FilePath:        input.cpp\n"
-                 "    Offset:          30\n"
-                 "    Length:          1\n"
-                 "    ReplacementText: b\n"
-                 "...\n",
-                 YAMLString.c_str());
-  }
-
-  // When one of the requirements is not satisfied, invoke should return a
-  // valid error.
-  {
-    RefactoringRuleContext RefContext(Context.Sources);
-    Expected<AtomicChanges> ErrorOrResult =
-        createReplacements(Rule, RefContext);
-
-    ASSERT_TRUE(!ErrorOrResult);
-    unsigned DiagID;
-    llvm::handleAllErrors(ErrorOrResult.takeError(),
-                          [&](DiagnosticError &Error) {
-                            DiagID = Error.getDiagnostic().second.getDiagID();
-                          });
-    EXPECT_EQ(DiagID, diag::err_refactor_no_selection);
-  }
-}
-
-TEST_F(RefactoringActionRulesTest, ReturnError) {
-  class ErrorRule : public SourceChangeRefactoringRule {
-  public:
-    static Expected<ErrorRule> initiate(RefactoringRuleContext &,
-                                        SourceRange R) {
-      return ErrorRule(R);
-    }
-
-    ErrorRule(SourceRange R) {}
-    Expected<AtomicChanges> createSourceReplacements(RefactoringRuleContext &) {
-      return llvm::make_error<llvm::StringError>(
-          "Error", llvm::make_error_code(llvm::errc::invalid_argument));
-    }
-  };
-
-  auto Rule =
-      createRefactoringActionRule<ErrorRule>(SourceRangeSelectionRequirement());
-  RefactoringRuleContext RefContext(Context.Sources);
-  SourceLocation Cursor =
-      Context.Sources.getLocForStartOfFile(Context.Sources.getMainFileID());
-  RefContext.setSelectionRange({Cursor, Cursor});
-  Expected<AtomicChanges> Result = createReplacements(Rule, RefContext);
-
-  ASSERT_TRUE(!Result);
-  std::string Message;
-  llvm::handleAllErrors(Result.takeError(), [&](llvm::StringError &Error) {
-    Message = Error.getMessage();
-  });
-  EXPECT_EQ(Message, "Error");
-}
-
-Optional<SymbolOccurrences> findOccurrences(RefactoringActionRule &Rule,
-                                            RefactoringRuleContext &Context) {
-  class Consumer final : public RefactoringResultConsumer {
-    void handleError(llvm::Error) override {}
-    void handle(SymbolOccurrences Occurrences) override {
-      Result = std::move(Occurrences);
-    }
-    void handle(AtomicChanges Changes) override {
-      RefactoringResultConsumer::handle(std::move(Changes));
-    }
-
-  public:
-    Optional<SymbolOccurrences> Result;
-  };
-
-  Consumer C;
-  Rule.invoke(C, Context);
-  return std::move(C.Result);
-}
-
-TEST_F(RefactoringActionRulesTest, ReturnSymbolOccurrences) {
-  class FindOccurrences : public FindSymbolOccurrencesRefactoringRule {
-    SourceRange Selection;
-
-  public:
-    FindOccurrences(SourceRange Selection) : Selection(Selection) {}
-
-    static Expected<FindOccurrences> initiate(RefactoringRuleContext &,
-                                              SourceRange Selection) {
-      return FindOccurrences(Selection);
-    }
-
-    Expected<SymbolOccurrences>
-    findSymbolOccurrences(RefactoringRuleContext &) override {
-      SymbolOccurrences Occurrences;
-      Occurrences.push_back(SymbolOccurrence(SymbolName("test"),
-                                             SymbolOccurrence::MatchingSymbol,
-                                             Selection.getBegin()));
-      return std::move(Occurrences);
-    }
-  };
-
-  auto Rule = createRefactoringActionRule<FindOccurrences>(
-      SourceRangeSelectionRequirement());
-
-  RefactoringRuleContext RefContext(Context.Sources);
-  SourceLocation Cursor =
-      Context.Sources.getLocForStartOfFile(Context.Sources.getMainFileID());
-  RefContext.setSelectionRange({Cursor, Cursor});
-  Optional<SymbolOccurrences> Result = findOccurrences(*Rule, RefContext);
-
-  ASSERT_FALSE(!Result);
-  SymbolOccurrences Occurrences = std::move(*Result);
-  EXPECT_EQ(Occurrences.size(), 1u);
-  EXPECT_EQ(Occurrences[0].getKind(), SymbolOccurrence::MatchingSymbol);
-  EXPECT_EQ(Occurrences[0].getNameRanges().size(), 1u);
-  EXPECT_EQ(Occurrences[0].getNameRanges()[0],
-            SourceRange(Cursor, Cursor.getLocWithOffset(strlen("test"))));
-}
-
-TEST_F(RefactoringActionRulesTest, EditorCommandBinding) {
-  const RefactoringDescriptor &Descriptor = ExtractFunction::describe();
-  EXPECT_EQ(Descriptor.Name, "extract-function");
-  EXPECT_EQ(
-      Descriptor.Description,
-      "(WIP action; use with caution!) Extracts code into a new function");
-  EXPECT_EQ(Descriptor.Title, "Extract Function");
-}
-
-} // end anonymous namespace
diff --git a/gnu/llvm/clang/unittests/Tooling/RefactoringCallbacksTest.cpp b/gnu/llvm/clang/unittests/Tooling/RefactoringCallbacksTest.cpp
deleted file mode 100644
index 47c1c11ac9f..00000000000
--- a/gnu/llvm/clang/unittests/Tooling/RefactoringCallbacksTest.cpp
+++ /dev/null
@@ -1,151 +0,0 @@
-//===- unittest/Tooling/RefactoringCallbacksTest.cpp ----------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "RewriterTestContext.h"
-#include "clang/ASTMatchers/ASTMatchFinder.h"
-#include "clang/ASTMatchers/ASTMatchers.h"
-#include "clang/Tooling/RefactoringCallbacks.h"
-#include "gtest/gtest.h"
-
-namespace clang {
-namespace tooling {
-
-using namespace ast_matchers;
-
-template <typename T>
-void expectRewritten(const std::string &Code, const std::string &Expected,
-                     const T &AMatcher, RefactoringCallback &Callback) {
-  std::map<std::string, Replacements> FileToReplace;
-  ASTMatchRefactorer Finder(FileToReplace);
-  Finder.addMatcher(traverse(TK_AsIs, AMatcher), &Callback);
-  std::unique_ptr<tooling::FrontendActionFactory> Factory(
-      tooling::newFrontendActionFactory(&Finder));
-  ASSERT_TRUE(tooling::runToolOnCode(Factory->create(), Code))
-      << "Parsing error in \"" << Code << "\"";
-  RewriterTestContext Context;
-  FileID ID = Context.createInMemoryFile("input.cc", Code);
-  EXPECT_TRUE(tooling::applyAllReplacements(FileToReplace["input.cc"],
-                                            Context.Rewrite));
-  EXPECT_EQ(Expected, Context.getRewrittenText(ID));
-}
-
-TEST(RefactoringCallbacksTest, ReplacesStmtsWithString) {
-  std::string Code = "void f() { int i = 1; }";
-  std::string Expected = "void f() { ; }";
-  ReplaceStmtWithText Callback("id", ";");
-  expectRewritten(Code, Expected, declStmt().bind("id"), Callback);
-}
-
-TEST(RefactoringCallbacksTest, ReplacesStmtsInCalledMacros) {
-  std::string Code = "#define A void f() { int i = 1; }\nA";
-  std::string Expected = "#define A void f() { ; }\nA";
-  ReplaceStmtWithText Callback("id", ";");
-  expectRewritten(Code, Expected, declStmt().bind("id"), Callback);
-}
-
-TEST(RefactoringCallbacksTest, IgnoresStmtsInUncalledMacros) {
-  std::string Code = "#define A void f() { int i = 1; }";
-  std::string Expected = "#define A void f() { int i = 1; }";
-  ReplaceStmtWithText Callback("id", ";");
-  expectRewritten(Code, Expected, declStmt().bind("id"), Callback);
-}
-
-TEST(RefactoringCallbacksTest, ReplacesInteger) {
-  std::string Code = "void f() { int i = 1; }";
-  std::string Expected = "void f() { int i = 2; }";
-  ReplaceStmtWithText Callback("id", "2");
-  expectRewritten(Code, Expected, expr(integerLiteral()).bind("id"), Callback);
-}
-
-TEST(RefactoringCallbacksTest, ReplacesStmtWithStmt) {
-  std::string Code = "void f() { int i = false ? 1 : i * 2; }";
-  std::string Expected = "void f() { int i = i * 2; }";
-  ReplaceStmtWithStmt Callback("always-false", "should-be");
-  expectRewritten(
-      Code, Expected,
-      conditionalOperator(hasCondition(cxxBoolLiteral(equals(false))),
-                          hasFalseExpression(expr().bind("should-be")))
-          .bind("always-false"),
-      Callback);
-}
-
-TEST(RefactoringCallbacksTest, ReplacesIfStmt) {
-  std::string Code = "bool a; void f() { if (a) f(); else a = true; }";
-  std::string Expected = "bool a; void f() { f(); }";
-  ReplaceIfStmtWithItsBody Callback("id", true);
-  expectRewritten(Code, Expected,
-                  ifStmt(hasCondition(implicitCastExpr(hasSourceExpression(
-                             declRefExpr(to(varDecl(hasName("a"))))))))
-                      .bind("id"),
-                  Callback);
-}
-
-TEST(RefactoringCallbacksTest, RemovesEntireIfOnEmptyElse) {
-  std::string Code = "void f() { if (false) int i = 0; }";
-  std::string Expected = "void f() {  }";
-  ReplaceIfStmtWithItsBody Callback("id", false);
-  expectRewritten(
-      Code, Expected,
-      ifStmt(hasCondition(cxxBoolLiteral(equals(false)))).bind("id"), Callback);
-}
-
-TEST(RefactoringCallbacksTest, TemplateJustText) {
-  std::string Code = "void f() { int i = 1; }";
-  std::string Expected = "void f() { FOO }";
-  auto Callback = ReplaceNodeWithTemplate::create("id", "FOO");
-  EXPECT_FALSE(Callback.takeError());
-  expectRewritten(Code, Expected, declStmt().bind("id"), **Callback);
-}
-
-TEST(RefactoringCallbacksTest, TemplateSimpleSubst) {
-  std::string Code = "void f() { int i = 1; }";
-  std::string Expected = "void f() { long x = 1; }";
-  auto Callback = ReplaceNodeWithTemplate::create("decl", "long x = ${init}");
-  EXPECT_FALSE(Callback.takeError());
-  expectRewritten(Code, Expected,
-                  varDecl(hasInitializer(expr().bind("init"))).bind("decl"),
-                  **Callback);
-}
-
-TEST(RefactoringCallbacksTest, TemplateLiteral) {
-  std::string Code = "void f() { int i = 1; }";
-  std::string Expected = "void f() { string x = \"$-1\"; }";
-  auto Callback = ReplaceNodeWithTemplate::create("decl",
-                                                  "string x = \"$$-${init}\"");
-  EXPECT_FALSE(Callback.takeError());
-  expectRewritten(Code, Expected,
-                  varDecl(hasInitializer(expr().bind("init"))).bind("decl"),
-                  **Callback);
-}
-
-static void ExpectStringError(const std::string &Expected,
-                              llvm::Error E) {
-  std::string Found;
-  handleAllErrors(std::move(E), [&](const llvm::StringError &SE) {
-      llvm::raw_string_ostream Stream(Found);
-      SE.log(Stream);
-    });
-  EXPECT_EQ(Expected, Found);
-}
-
-TEST(RefactoringCallbacksTest, TemplateUnterminated) {
-  auto Callback = ReplaceNodeWithTemplate::create("decl",
-                                                  "string x = \"$$-${init\"");
-  ExpectStringError("Unterminated ${...} in replacement template near ${init\"",
-                    Callback.takeError());
-}
-
-TEST(RefactoringCallbacksTest, TemplateUnknownDollar) {
-  auto Callback = ReplaceNodeWithTemplate::create("decl",
-                                                  "string x = \"$<");
-  ExpectStringError("Invalid $ in replacement template near $<",
-                    Callback.takeError());
-}
-
-} // namespace tooling
-} // end namespace clang
diff --git a/gnu/llvm/clang/unittests/Tooling/RefactoringTest.cpp b/gnu/llvm/clang/unittests/Tooling/RefactoringTest.cpp
deleted file mode 100644
index d239aba31d1..00000000000
--- a/gnu/llvm/clang/unittests/Tooling/RefactoringTest.cpp
+++ /dev/null
@@ -1,1734 +0,0 @@
-//===- unittest/Tooling/RefactoringTest.cpp - Refactoring unit tests ------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/Tooling/Refactoring.h"
-#include "ReplacementTest.h"
-#include "RewriterTestContext.h"
-#include "clang/AST/ASTConsumer.h"
-#include "clang/AST/ASTContext.h"
-#include "clang/AST/DeclCXX.h"
-#include "clang/AST/DeclGroup.h"
-#include "clang/AST/RecursiveASTVisitor.h"
-#include "clang/Basic/Diagnostic.h"
-#include "clang/Basic/DiagnosticOptions.h"
-#include "clang/Basic/FileManager.h"
-#include "clang/Basic/LangOptions.h"
-#include "clang/Basic/SourceManager.h"
-#include "clang/Format/Format.h"
-#include "clang/Frontend/CompilerInstance.h"
-#include "clang/Frontend/FrontendAction.h"
-#include "clang/Frontend/TextDiagnosticPrinter.h"
-#include "clang/Rewrite/Core/Rewriter.h"
-#include "clang/Tooling/Refactoring/AtomicChange.h"
-#include "clang/Tooling/Tooling.h"
-#include "llvm/ADT/SmallString.h"
-#include "llvm/Support/VirtualFileSystem.h"
-#include "gtest/gtest.h"
-
-namespace clang {
-namespace tooling {
-
-TEST_F(ReplacementTest, CanDeleteAllText) {
-  FileID ID = Context.createInMemoryFile("input.cpp", "text");
-  SourceLocation Location = Context.getLocation(ID, 1, 1);
-  Replacement Replace(createReplacement(Location, 4, ""));
-  EXPECT_TRUE(Replace.apply(Context.Rewrite));
-  EXPECT_EQ("", Context.getRewrittenText(ID));
-}
-
-TEST_F(ReplacementTest, CanDeleteAllTextInTextWithNewlines) {
-  FileID ID = Context.createInMemoryFile("input.cpp", "line1\nline2\nline3");
-  SourceLocation Location = Context.getLocation(ID, 1, 1);
-  Replacement Replace(createReplacement(Location, 17, ""));
-  EXPECT_TRUE(Replace.apply(Context.Rewrite));
-  EXPECT_EQ("", Context.getRewrittenText(ID));
-}
-
-TEST_F(ReplacementTest, CanAddText) {
-  FileID ID = Context.createInMemoryFile("input.cpp", "");
-  SourceLocation Location = Context.getLocation(ID, 1, 1);
-  Replacement Replace(createReplacement(Location, 0, "result"));
-  EXPECT_TRUE(Replace.apply(Context.Rewrite));
-  EXPECT_EQ("result", Context.getRewrittenText(ID));
-}
-
-TEST_F(ReplacementTest, CanReplaceTextAtPosition) {
-  FileID ID = Context.createInMemoryFile("input.cpp",
-                                         "line1\nline2\nline3\nline4");
-  SourceLocation Location = Context.getLocation(ID, 2, 3);
-  Replacement Replace(createReplacement(Location, 12, "x"));
-  EXPECT_TRUE(Replace.apply(Context.Rewrite));
-  EXPECT_EQ("line1\nlixne4", Context.getRewrittenText(ID));
-}
-
-TEST_F(ReplacementTest, CanReplaceTextAtPositionMultipleTimes) {
-  FileID ID = Context.createInMemoryFile("input.cpp",
-                                         "line1\nline2\nline3\nline4");
-  SourceLocation Location1 = Context.getLocation(ID, 2, 3);
-  Replacement Replace1(createReplacement(Location1, 12, "x\ny\n"));
-  EXPECT_TRUE(Replace1.apply(Context.Rewrite));
-  EXPECT_EQ("line1\nlix\ny\nne4", Context.getRewrittenText(ID));
-
-  // Since the original source has not been modified, the (4, 4) points to the
-  // 'e' in the original content.
-  SourceLocation Location2 = Context.getLocation(ID, 4, 4);
-  Replacement Replace2(createReplacement(Location2, 1, "f"));
-  EXPECT_TRUE(Replace2.apply(Context.Rewrite));
-  EXPECT_EQ("line1\nlix\ny\nnf4", Context.getRewrittenText(ID));
-}
-
-TEST_F(ReplacementTest, ApplyFailsForNonExistentLocation) {
-  Replacement Replace("nonexistent-file.cpp", 0, 1, "");
-  EXPECT_FALSE(Replace.apply(Context.Rewrite));
-}
-
-TEST_F(ReplacementTest, CanRetrivePath) {
-  Replacement Replace("/path/to/file.cpp", 0, 1, "");
-  EXPECT_EQ("/path/to/file.cpp", Replace.getFilePath());
-}
-
-TEST_F(ReplacementTest, ReturnsInvalidPath) {
-  Replacement Replace1(Context.Sources, SourceLocation(), 0, "");
-  EXPECT_TRUE(Replace1.getFilePath().empty());
-
-  Replacement Replace2;
-  EXPECT_TRUE(Replace2.getFilePath().empty());
-}
-
-// Checks that an llvm::Error instance contains a ReplacementError with expected
-// error code, expected new replacement, and expected existing replacement.
-static bool checkReplacementError(llvm::Error &&Error,
-                                  replacement_error ExpectedErr,
-                                  llvm::Optional<Replacement> ExpectedExisting,
-                                  llvm::Optional<Replacement> ExpectedNew) {
-  if (!Error) {
-    llvm::errs() << "Error is a success.";
-    return false;
-  }
-  std::string ErrorMessage;
-  llvm::raw_string_ostream OS(ErrorMessage);
-  llvm::handleAllErrors(std::move(Error), [&](const ReplacementError &RE) {
-    llvm::errs() << "Handling error...\n";
-    if (ExpectedErr != RE.get())
-      OS << "Unexpected error code: " << int(RE.get()) << "\n";
-    if (ExpectedExisting != RE.getExistingReplacement()) {
-      OS << "Expected Existing != Actual Existing.\n";
-      if (ExpectedExisting.hasValue())
-        OS << "Expected existing replacement: " << ExpectedExisting->toString()
-           << "\n";
-      if (RE.getExistingReplacement().hasValue())
-        OS << "Actual existing replacement: "
-           << RE.getExistingReplacement()->toString() << "\n";
-    }
-    if (ExpectedNew != RE.getNewReplacement()) {
-      OS << "Expected New != Actual New.\n";
-      if (ExpectedNew.hasValue())
-        OS << "Expected new replacement: " << ExpectedNew->toString() << "\n";
-      if (RE.getNewReplacement().hasValue())
-        OS << "Actual new replacement: " << RE.getNewReplacement()->toString()
-           << "\n";
-    }
-  });
-  OS.flush();
-  if (ErrorMessage.empty()) return true;
-  llvm::errs() << ErrorMessage;
-  return false;
-}
-
-TEST_F(ReplacementTest, FailAddReplacements) {
-  Replacements Replaces;
-  Replacement Deletion("x.cc", 0, 10, "3");
-  auto Err = Replaces.add(Deletion);
-  EXPECT_TRUE(!Err);
-  llvm::consumeError(std::move(Err));
-
-  Replacement OverlappingReplacement("x.cc", 0, 2, "a");
-  Err = Replaces.add(OverlappingReplacement);
-  EXPECT_TRUE(checkReplacementError(std::move(Err),
-                                    replacement_error::overlap_conflict,
-                                    Deletion, OverlappingReplacement));
-
-  Replacement ContainedReplacement("x.cc", 2, 2, "a");
-  Err = Replaces.add(Replacement(ContainedReplacement));
-  EXPECT_TRUE(checkReplacementError(std::move(Err),
-                                    replacement_error::overlap_conflict,
-                                    Deletion, ContainedReplacement));
-
-  Replacement WrongPathReplacement("y.cc", 20, 2, "");
-  Err = Replaces.add(WrongPathReplacement);
-  EXPECT_TRUE(checkReplacementError(std::move(Err),
-                                    replacement_error::wrong_file_path,
-                                    Deletion, WrongPathReplacement));
-
-  EXPECT_EQ(1u, Replaces.size());
-  EXPECT_EQ(Deletion, *Replaces.begin());
-}
-
-TEST_F(ReplacementTest, DeletionInReplacements) {
-  Replacements Replaces;
-  Replacement R("x.cc", 0, 10, "3");
-  auto Err = Replaces.add(R);
-  EXPECT_TRUE(!Err);
-  llvm::consumeError(std::move(Err));
-  Err = Replaces.add(Replacement("x.cc", 0, 2, ""));
-  EXPECT_TRUE(!Err);
-  llvm::consumeError(std::move(Err));
-  Err = Replaces.add(Replacement("x.cc", 2, 2, ""));
-  EXPECT_TRUE(!Err);
-  llvm::consumeError(std::move(Err));
-  EXPECT_EQ(1u, Replaces.size());
-  EXPECT_EQ(R, *Replaces.begin());
-}
-
-TEST_F(ReplacementTest, OverlappingReplacements) {
-  Replacements Replaces;
-  auto Err = Replaces.add(Replacement("x.cc", 0, 3, "345"));
-  EXPECT_TRUE(!Err);
-  llvm::consumeError(std::move(Err));
-  Err = Replaces.add(Replacement("x.cc", 2, 3, "543"));
-  EXPECT_TRUE(!Err);
-  llvm::consumeError(std::move(Err));
-
-  EXPECT_EQ(1u, Replaces.size());
-  EXPECT_EQ(Replacement("x.cc", 0, 5, "34543"), *Replaces.begin());
-
-  Err = Replaces.add(Replacement("x.cc", 2, 1, "5"));
-  EXPECT_TRUE(!Err);
-  llvm::consumeError(std::move(Err));
-  EXPECT_EQ(1u, Replaces.size());
-  EXPECT_EQ(Replacement("x.cc", 0, 5, "34543"), *Replaces.begin());
-}
-
-TEST_F(ReplacementTest, AddAdjacentInsertionAndReplacement) {
-  Replacements Replaces;
-  // Test adding an insertion at the offset of an existing replacement.
-  auto Err = Replaces.add(Replacement("x.cc", 10, 3, "replace"));
-  EXPECT_TRUE(!Err);
-  llvm::consumeError(std::move(Err));
-  Err = Replaces.add(Replacement("x.cc", 10, 0, "insert"));
-  EXPECT_TRUE(!Err);
-  llvm::consumeError(std::move(Err));
-  EXPECT_EQ(Replaces.size(), 2u);
-
-  Replaces.clear();
-  // Test overlap with an existing insertion.
-  Err = Replaces.add(Replacement("x.cc", 10, 0, "insert"));
-  EXPECT_TRUE(!Err);
-  llvm::consumeError(std::move(Err));
-  Err = Replaces.add(Replacement("x.cc", 10, 3, "replace"));
-  EXPECT_TRUE(!Err);
-  llvm::consumeError(std::move(Err));
-  EXPECT_EQ(Replaces.size(), 2u);
-}
-
-TEST_F(ReplacementTest, MergeNewDeletions) {
-  Replacements Replaces;
-  Replacement ContainingReplacement("x.cc", 0, 10, "");
-  auto Err = Replaces.add(ContainingReplacement);
-  EXPECT_TRUE(!Err);
-  llvm::consumeError(std::move(Err));
-
-  Err = Replaces.add(Replacement("x.cc", 5, 3, ""));
-  EXPECT_TRUE(!Err);
-  llvm::consumeError(std::move(Err));
-
-  Err = Replaces.add(Replacement("x.cc", 0, 10, ""));
-  EXPECT_TRUE(!Err);
-  llvm::consumeError(std::move(Err));
-
-  Err = Replaces.add(Replacement("x.cc", 5, 5, ""));
-  EXPECT_TRUE(!Err);
-  llvm::consumeError(std::move(Err));
-
-  EXPECT_EQ(1u, Replaces.size());
-  EXPECT_EQ(*Replaces.begin(), ContainingReplacement);
-}
-
-TEST_F(ReplacementTest, MergeOverlappingButNotAdjacentReplacement) {
-  Replacements Replaces;
-  auto Err = Replaces.add(Replacement("x.cc", 0, 2, ""));
-  EXPECT_TRUE(!Err);
-  llvm::consumeError(std::move(Err));
-
-  Err = Replaces.add(Replacement("x.cc", 5, 5, ""));
-  EXPECT_TRUE(!Err);
-  llvm::consumeError(std::move(Err));
-
-  Replacement After = Replacement("x.cc", 10, 5, "");
-  Err = Replaces.add(After);
-  EXPECT_TRUE(!Err);
-  llvm::consumeError(std::move(Err));
-
-  Replacement ContainingReplacement("x.cc", 0, 10, "");
-  Err = Replaces.add(ContainingReplacement);
-  EXPECT_TRUE(!Err);
-  llvm::consumeError(std::move(Err));
-
-  EXPECT_EQ(2u, Replaces.size());
-  EXPECT_EQ(*Replaces.begin(), ContainingReplacement);
-  EXPECT_EQ(*(++Replaces.begin()), After);
-}
-
-TEST_F(ReplacementTest, InsertionBeforeMergedDeletions) {
-  Replacements Replaces;
-
-  Replacement Insertion("x.cc", 0, 0, "123");
-  auto Err = Replaces.add(Insertion);
-  EXPECT_TRUE(!Err);
-  llvm::consumeError(std::move(Err));
-
-  Err = Replaces.add(Replacement("x.cc", 5, 5, ""));
-  EXPECT_TRUE(!Err);
-  llvm::consumeError(std::move(Err));
-
-  Replacement Deletion("x.cc", 0, 10, "");
-  Err = Replaces.add(Deletion);
-  EXPECT_TRUE(!Err);
-  llvm::consumeError(std::move(Err));
-
-  EXPECT_EQ(2u, Replaces.size());
-  EXPECT_EQ(*Replaces.begin(), Insertion);
-  EXPECT_EQ(*(++Replaces.begin()), Deletion);
-}
-
-TEST_F(ReplacementTest, MergeOverlappingDeletions) {
-  Replacements Replaces;
-  auto Err = Replaces.add(Replacement("x.cc", 0, 2, ""));
-  EXPECT_TRUE(!Err);
-  llvm::consumeError(std::move(Err));
-
-  Err = Replaces.add(Replacement("x.cc", 0, 5, ""));
-  EXPECT_TRUE(!Err);
-  llvm::consumeError(std::move(Err));
-
-  EXPECT_EQ(1u, Replaces.size());
-  EXPECT_EQ(Replacement("x.cc", 0, 5, ""), *Replaces.begin());
-
-  Err = Replaces.add(Replacement("x.cc", 1, 5, ""));
-  EXPECT_TRUE(!Err);
-  llvm::consumeError(std::move(Err));
-  EXPECT_EQ(1u, Replaces.size());
-  EXPECT_EQ(Replacement("x.cc", 0, 6, ""), *Replaces.begin());
-}
-
-TEST_F(ReplacementTest, FailedMergeExistingDeletions) {
-  Replacements Replaces;
-  Replacement First("x.cc", 0, 2, "");
-  auto Err = Replaces.add(First);
-  EXPECT_TRUE(!Err);
-  llvm::consumeError(std::move(Err));
-
-  Replacement Second("x.cc", 5, 5, "");
-  Err = Replaces.add(Second);
-  EXPECT_TRUE(!Err);
-  llvm::consumeError(std::move(Err));
-
-  Err = Replaces.add(Replacement("x.cc", 1, 10, ""));
-  EXPECT_TRUE(!Err);
-  llvm::consumeError(std::move(Err));
-
-  EXPECT_EQ(1u, Replaces.size());
-  EXPECT_EQ(Replacement("x.cc", 0, 11, ""), *Replaces.begin());
-}
-
-TEST_F(ReplacementTest, FailAddRegression) {
-  Replacements Replaces;
-  // Create two replacements, where the second one is an insertion of the empty
-  // string exactly at the end of the first one.
-  auto Err = Replaces.add(Replacement("x.cc", 0, 10, "1"));
-  EXPECT_TRUE(!Err);
-  llvm::consumeError(std::move(Err));
-  Err = Replaces.add(Replacement("x.cc", 10, 0, ""));
-  EXPECT_TRUE(!Err);
-  llvm::consumeError(std::move(Err));
-
-  // Make sure we find the overlap with the first entry when inserting a
-  // replacement that ends exactly at the seam of the existing replacements.
-  Replacement OverlappingReplacement("x.cc", 5, 5, "fail");
-  Err = Replaces.add(OverlappingReplacement);
-  EXPECT_TRUE(checkReplacementError(std::move(Err),
-                                    replacement_error::overlap_conflict,
-                                    *Replaces.begin(), OverlappingReplacement));
-
-  Err = Replaces.add(Replacement("x.cc", 10, 0, ""));
-  EXPECT_TRUE(!Err);
-  llvm::consumeError(std::move(Err));
-}
-
-TEST_F(ReplacementTest, InsertAtOffsetOfReplacement) {
-  Replacements Replaces;
-  auto Err = Replaces.add(Replacement("x.cc", 10, 2, ""));
-  EXPECT_TRUE(!Err);
-  llvm::consumeError(std::move(Err));
-  Err = Replaces.add(Replacement("x.cc", 10, 0, ""));
-  EXPECT_TRUE(!Err);
-  llvm::consumeError(std::move(Err));
-  EXPECT_EQ(Replaces.size(), 2u);
-
-  Replaces.clear();
-  Err = Replaces.add(Replacement("x.cc", 10, 0, ""));
-  EXPECT_TRUE(!Err);
-  llvm::consumeError(std::move(Err));
-  Err = Replaces.add(Replacement("x.cc", 10, 2, ""));
-  EXPECT_TRUE(!Err);
-  llvm::consumeError(std::move(Err));
-  EXPECT_EQ(Replaces.size(), 2u);
-}
-
-TEST_F(ReplacementTest, AddInsertAtOtherInsertWhenOderIndependent) {
-  Replacements Replaces;
-  auto Err = Replaces.add(Replacement("x.cc", 10, 0, "a"));
-  EXPECT_TRUE(!Err);
-  llvm::consumeError(std::move(Err));
-  Replacement ConflictInsertion("x.cc", 10, 0, "b");
-  Err = Replaces.add(ConflictInsertion);
-  EXPECT_TRUE(checkReplacementError(std::move(Err),
-                                    replacement_error::insert_conflict,
-                                    *Replaces.begin(), ConflictInsertion));
-
-  Replaces.clear();
-  Err = Replaces.add(Replacement("x.cc", 10, 0, "a"));
-  EXPECT_TRUE(!Err);
-  llvm::consumeError(std::move(Err));
-  Err = Replaces.add(Replacement("x.cc", 10, 0, "aa"));
-  EXPECT_TRUE(!Err);
-  llvm::consumeError(std::move(Err));
-  EXPECT_EQ(1u, Replaces.size());
-  EXPECT_EQ(Replacement("x.cc", 10, 0, "aaa"), *Replaces.begin());
-
-  Replaces.clear();
-  Err = Replaces.add(Replacement("x.cc", 10, 0, ""));
-  EXPECT_TRUE(!Err);
-  llvm::consumeError(std::move(Err));
-  Err = Replaces.add(Replacement("x.cc", 10, 3, ""));
-  EXPECT_TRUE(!Err);
-  llvm::consumeError(std::move(Err));
-  Err = Replaces.add(Replacement("x.cc", 10, 0, ""));
-  EXPECT_TRUE(!Err);
-  llvm::consumeError(std::move(Err));
-  EXPECT_EQ(2u, Replaces.size());
-  EXPECT_EQ(Replacement("x.cc", 10, 0, ""), *Replaces.begin());
-  EXPECT_EQ(Replacement("x.cc", 10, 3, ""), *std::next(Replaces.begin()));
-}
-
-TEST_F(ReplacementTest, InsertBetweenAdjacentReplacements) {
-  Replacements Replaces;
-  auto Err = Replaces.add(Replacement("x.cc", 10, 5, "a"));
-  EXPECT_TRUE(!Err);
-  llvm::consumeError(std::move(Err));
-  Err = Replaces.add(Replacement("x.cc", 8, 2, "a"));
-  EXPECT_TRUE(!Err);
-  llvm::consumeError(std::move(Err));
-  Err = Replaces.add(Replacement("x.cc", 10, 0, "b"));
-  EXPECT_TRUE(!Err);
-  llvm::consumeError(std::move(Err));
-}
-
-TEST_F(ReplacementTest, CanApplyReplacements) {
-  FileID ID = Context.createInMemoryFile("input.cpp",
-                                         "line1\nline2\nline3\nline4");
-  Replacements Replaces =
-      toReplacements({Replacement(Context.Sources,
-                                  Context.getLocation(ID, 2, 1), 5, "replaced"),
-                      Replacement(Context.Sources,
-                                  Context.getLocation(ID, 3, 1), 5, "other")});
-  EXPECT_TRUE(applyAllReplacements(Replaces, Context.Rewrite));
-  EXPECT_EQ("line1\nreplaced\nother\nline4", Context.getRewrittenText(ID));
-}
-
-// Verifies that replacement/deletion is applied before insertion at the same
-// offset.
-TEST_F(ReplacementTest, InsertAndDelete) {
-  FileID ID = Context.createInMemoryFile("input.cpp",
-                                         "line1\nline2\nline3\nline4");
-  Replacements Replaces = toReplacements(
-      {Replacement(Context.Sources, Context.getLocation(ID, 2, 1), 6, ""),
-       Replacement(Context.Sources, Context.getLocation(ID, 2, 1), 0,
-                   "other\n")});
-  EXPECT_TRUE(applyAllReplacements(Replaces, Context.Rewrite));
-  EXPECT_EQ("line1\nother\nline3\nline4", Context.getRewrittenText(ID));
-}
-
-TEST_F(ReplacementTest, AdjacentReplacements) {
-  FileID ID = Context.createInMemoryFile("input.cpp",
-                                         "ab");
-  Replacements Replaces = toReplacements(
-      {Replacement(Context.Sources, Context.getLocation(ID, 1, 1), 1, "x"),
-       Replacement(Context.Sources, Context.getLocation(ID, 1, 2), 1, "y")});
-  EXPECT_TRUE(applyAllReplacements(Replaces, Context.Rewrite));
-  EXPECT_EQ("xy", Context.getRewrittenText(ID));
-}
-
-TEST_F(ReplacementTest, AddDuplicateReplacements) {
-  FileID ID = Context.createInMemoryFile("input.cpp",
-                                         "line1\nline2\nline3\nline4");
-  auto Replaces = toReplacements({Replacement(
-      Context.Sources, Context.getLocation(ID, 2, 1), 5, "replaced")});
-
-  auto Err = Replaces.add(Replacement(
-      Context.Sources, Context.getLocation(ID, 2, 1), 5, "replaced"));
-  EXPECT_TRUE(!Err);
-  llvm::consumeError(std::move(Err));
-
-  Err = Replaces.add(Replacement(Context.Sources, Context.getLocation(ID, 2, 1),
-                                 5, "replaced"));
-  EXPECT_TRUE(!Err);
-  llvm::consumeError(std::move(Err));
-
-  EXPECT_TRUE(applyAllReplacements(Replaces, Context.Rewrite));
-  EXPECT_EQ("line1\nreplaced\nline3\nline4", Context.getRewrittenText(ID));
-}
-
-TEST_F(ReplacementTest, FailOrderDependentReplacements) {
-  FileID ID = Context.createInMemoryFile("input.cpp",
-                                         "line1\nline2\nline3\nline4");
-  auto Replaces = toReplacements({Replacement(
-      Context.Sources, Context.getLocation(ID, 2, 1), 5, "other")});
-
-  Replacement ConflictReplacement(Context.Sources,
-                                  Context.getLocation(ID, 2, 1), 5, "rehto");
-  auto Err = Replaces.add(ConflictReplacement);
-  EXPECT_TRUE(checkReplacementError(std::move(Err),
-                                    replacement_error::overlap_conflict,
-                                    *Replaces.begin(), ConflictReplacement));
-
-  EXPECT_TRUE(applyAllReplacements(Replaces, Context.Rewrite));
-  EXPECT_EQ("line1\nother\nline3\nline4", Context.getRewrittenText(ID));
-}
-
-TEST_F(ReplacementTest, InvalidSourceLocationFailsApplyAll) {
-  Replacements Replaces =
-      toReplacements({Replacement(Context.Sources, SourceLocation(), 5, "2")});
-
-  EXPECT_FALSE(applyAllReplacements(Replaces, Context.Rewrite));
-}
-
-TEST_F(ReplacementTest, MultipleFilesReplaceAndFormat) {
-  // Column limit is 20.
-  std::string Code1 = "Long *a =\n"
-                      "    new Long();\n"
-                      "long x = 1;";
-  std::string Expected1 = "auto a = new Long();\n"
-                          "long x =\n"
-                          "    12345678901;";
-  std::string Code2 = "int x = 123;\n"
-                      "int y = 0;";
-  std::string Expected2 = "int x =\n"
-                          "    1234567890123;\n"
-                          "int y = 10;";
-  StringRef File1 = "format_1.cpp";
-  StringRef File2 = "format_2.cpp";
-  FileID ID1 = Context.createInMemoryFile(File1, Code1);
-  FileID ID2 = Context.createInMemoryFile(File2, Code2);
-
-  // Scrambled the order of replacements.
-  std::map<std::string, Replacements> FileToReplaces;
-  FileToReplaces[std::string(File1)] = toReplacements(
-      {tooling::Replacement(Context.Sources, Context.getLocation(ID1, 1, 1), 6,
-                            "auto "),
-       tooling::Replacement(Context.Sources, Context.getLocation(ID1, 3, 10), 1,
-                            "12345678901")});
-  FileToReplaces[std::string(File2)] = toReplacements(
-      {tooling::Replacement(Context.Sources, Context.getLocation(ID2, 1, 12), 0,
-                            "4567890123"),
-       tooling::Replacement(Context.Sources, Context.getLocation(ID2, 2, 9), 1,
-                            "10")});
-  EXPECT_TRUE(
-      formatAndApplyAllReplacements(FileToReplaces, Context.Rewrite,
-                                    "{BasedOnStyle: LLVM, ColumnLimit: 20}"));
-  EXPECT_EQ(Expected1, Context.getRewrittenText(ID1));
-  EXPECT_EQ(Expected2, Context.getRewrittenText(ID2));
-}
-
-TEST(ShiftedCodePositionTest, FindsNewCodePosition) {
-  Replacements Replaces =
-      toReplacements({Replacement("", 0, 1, ""), Replacement("", 4, 3, " ")});
-  // Assume ' int   i;' is turned into 'int i;' and cursor is located at '|'.
-  EXPECT_EQ(0u, Replaces.getShiftedCodePosition(0)); // |int   i;
-  EXPECT_EQ(0u, Replaces.getShiftedCodePosition(1)); //  |nt   i;
-  EXPECT_EQ(1u, Replaces.getShiftedCodePosition(2)); //  i|t   i;
-  EXPECT_EQ(2u, Replaces.getShiftedCodePosition(3)); //  in|   i;
-  EXPECT_EQ(3u, Replaces.getShiftedCodePosition(4)); //  int|  i;
-  EXPECT_EQ(3u, Replaces.getShiftedCodePosition(5)); //  int | i;
-  EXPECT_EQ(3u, Replaces.getShiftedCodePosition(6)); //  int  |i;
-  EXPECT_EQ(4u, Replaces.getShiftedCodePosition(7)); //  int   |;
-  EXPECT_EQ(5u, Replaces.getShiftedCodePosition(8)); //  int   i|
-}
-
-TEST(ShiftedCodePositionTest, FindsNewCodePositionWithInserts) {
-  Replacements Replaces = toReplacements({Replacement("", 4, 0, "\"\n\"")});
-  // Assume '"12345678"' is turned into '"1234"\n"5678"'.
-  EXPECT_EQ(3u, Replaces.getShiftedCodePosition(3)); // "123|5678"
-  EXPECT_EQ(7u, Replaces.getShiftedCodePosition(4)); // "1234|678"
-  EXPECT_EQ(8u, Replaces.getShiftedCodePosition(5)); // "12345|78"
-}
-
-TEST(ShiftedCodePositionTest, FindsNewCodePositionInReplacedText) {
-  // Replace the first four characters with "abcd".
-  auto Replaces = toReplacements({Replacement("", 0, 4, "abcd")});
-  for (unsigned i = 0; i < 3; ++i)
-    EXPECT_EQ(i, Replaces.getShiftedCodePosition(i));
-}
-
-TEST(ShiftedCodePositionTest, NoReplacementText) {
-  Replacements Replaces = toReplacements({Replacement("", 0, 42, "")});
-  EXPECT_EQ(0u, Replaces.getShiftedCodePosition(0));
-  EXPECT_EQ(0u, Replaces.getShiftedCodePosition(39));
-  EXPECT_EQ(3u, Replaces.getShiftedCodePosition(45));
-  EXPECT_EQ(0u, Replaces.getShiftedCodePosition(42));
-}
-
-class FlushRewrittenFilesTest : public ::testing::Test {
-public:
-   FlushRewrittenFilesTest() {}
-
-   ~FlushRewrittenFilesTest() override {
-    for (llvm::StringMap<std::string>::iterator I = TemporaryFiles.begin(),
-                                                E = TemporaryFiles.end();
-         I != E; ++I) {
-      llvm::StringRef Name = I->second;
-      std::error_code EC = llvm::sys::fs::remove(Name);
-      (void)EC;
-      assert(!EC);
-    }
-  }
-
-  FileID createFile(llvm::StringRef Name, llvm::StringRef Content) {
-    SmallString<1024> Path;
-    int FD;
-    std::error_code EC = llvm::sys::fs::createTemporaryFile(Name, "", FD, Path);
-    assert(!EC);
-    (void)EC;
-
-    llvm::raw_fd_ostream OutStream(FD, true);
-    OutStream << Content;
-    OutStream.close();
-    auto File = Context.Files.getOptionalFileRef(Path);
-    assert(File);
-
-    StringRef Found =
-        TemporaryFiles.insert(std::make_pair(Name, std::string(Path.str())))
-            .first->second;
-    assert(Found == Path);
-    (void)Found;
-    return Context.Sources.createFileID(*File, SourceLocation(),
-                                        SrcMgr::C_User);
-  }
-
-  std::string getFileContentFromDisk(llvm::StringRef Name) {
-    std::string Path = TemporaryFiles.lookup(Name);
-    assert(!Path.empty());
-    // We need to read directly from the FileManager without relaying through
-    // a FileEntry, as otherwise we'd read through an already opened file
-    // descriptor, which might not see the changes made.
-    // FIXME: Figure out whether there is a way to get the SourceManger to
-    // reopen the file.
-    auto FileBuffer = Context.Files.getBufferForFile(Path);
-    return std::string((*FileBuffer)->getBuffer());
-  }
-
-  llvm::StringMap<std::string> TemporaryFiles;
-  RewriterTestContext Context;
-};
-
-TEST_F(FlushRewrittenFilesTest, StoresChangesOnDisk) {
-  FileID ID = createFile("input.cpp", "line1\nline2\nline3\nline4");
-  Replacements Replaces = toReplacements({Replacement(
-      Context.Sources, Context.getLocation(ID, 2, 1), 5, "replaced")});
-  EXPECT_TRUE(applyAllReplacements(Replaces, Context.Rewrite));
-  EXPECT_FALSE(Context.Rewrite.overwriteChangedFiles());
-  EXPECT_EQ("line1\nreplaced\nline3\nline4",
-            getFileContentFromDisk("input.cpp"));
-}
-
-namespace {
-template <typename T>
-class TestVisitor : public clang::RecursiveASTVisitor<T> {
-public:
-  bool runOver(StringRef Code) {
-    return runToolOnCode(std::make_unique<TestAction>(this), Code);
-  }
-
-protected:
-  clang::SourceManager *SM;
-  clang::ASTContext *Context;
-
-private:
-  class FindConsumer : public clang::ASTConsumer {
-  public:
-    FindConsumer(TestVisitor *Visitor) : Visitor(Visitor) {}
-
-    void HandleTranslationUnit(clang::ASTContext &Context) override {
-      Visitor->TraverseDecl(Context.getTranslationUnitDecl());
-    }
-
-  private:
-    TestVisitor *Visitor;
-  };
-
-  class TestAction : public clang::ASTFrontendAction {
-  public:
-    TestAction(TestVisitor *Visitor) : Visitor(Visitor) {}
-
-    std::unique_ptr<clang::ASTConsumer>
-    CreateASTConsumer(clang::CompilerInstance &compiler,
-                      llvm::StringRef dummy) override {
-      Visitor->SM = &compiler.getSourceManager();
-      Visitor->Context = &compiler.getASTContext();
-      /// TestConsumer will be deleted by the framework calling us.
-      return std::make_unique<FindConsumer>(Visitor);
-    }
-
-  private:
-    TestVisitor *Visitor;
-  };
-};
-} // end namespace
-
-void expectReplacementAt(const Replacement &Replace,
-                         StringRef File, unsigned Offset, unsigned Length) {
-  ASSERT_TRUE(Replace.isApplicable());
-  EXPECT_EQ(File, Replace.getFilePath());
-  EXPECT_EQ(Offset, Replace.getOffset());
-  EXPECT_EQ(Length, Replace.getLength());
-}
-
-class ClassDeclXVisitor : public TestVisitor<ClassDeclXVisitor> {
-public:
-  bool VisitCXXRecordDecl(CXXRecordDecl *Record) {
-    if (Record->getName() == "X") {
-      Replace = Replacement(*SM, Record, "");
-    }
-    return true;
-  }
-  Replacement Replace;
-};
-
-TEST(Replacement, CanBeConstructedFromNode) {
-  ClassDeclXVisitor ClassDeclX;
-  EXPECT_TRUE(ClassDeclX.runOver("     class X;"));
-  expectReplacementAt(ClassDeclX.Replace, "input.cc", 5, 7);
-}
-
-TEST(Replacement, ReplacesAtSpellingLocation) {
-  ClassDeclXVisitor ClassDeclX;
-  EXPECT_TRUE(ClassDeclX.runOver("#define A(Y) Y\nA(class X);"));
-  expectReplacementAt(ClassDeclX.Replace, "input.cc", 17, 7);
-}
-
-class CallToFVisitor : public TestVisitor<CallToFVisitor> {
-public:
-  bool VisitCallExpr(CallExpr *Call) {
-    if (Call->getDirectCallee()->getName() == "F") {
-      Replace = Replacement(*SM, Call, "");
-    }
-    return true;
-  }
-  Replacement Replace;
-};
-
-TEST(Replacement, FunctionCall) {
-  CallToFVisitor CallToF;
-  EXPECT_TRUE(CallToF.runOver("void F(); void G() { F(); }"));
-  expectReplacementAt(CallToF.Replace, "input.cc", 21, 3);
-}
-
-TEST(Replacement, TemplatedFunctionCall) {
-  CallToFVisitor CallToF;
-  EXPECT_TRUE(CallToF.runOver(
-        "template <typename T> void F(); void G() { F<int>(); }"));
-  expectReplacementAt(CallToF.Replace, "input.cc", 43, 8);
-}
-
-class NestedNameSpecifierAVisitor
-    : public TestVisitor<NestedNameSpecifierAVisitor> {
-public:
-  bool TraverseNestedNameSpecifierLoc(NestedNameSpecifierLoc NNSLoc) {
-    if (NNSLoc.getNestedNameSpecifier()) {
-      if (const NamespaceDecl* NS = NNSLoc.getNestedNameSpecifier()->getAsNamespace()) {
-        if (NS->getName() == "a") {
-          Replace = Replacement(*SM, &NNSLoc, "", Context->getLangOpts());
-        }
-      }
-    }
-    return TestVisitor<NestedNameSpecifierAVisitor>::TraverseNestedNameSpecifierLoc(
-        NNSLoc);
-  }
-  Replacement Replace;
-};
-
-TEST(Replacement, ColonColon) {
-  NestedNameSpecifierAVisitor VisitNNSA;
-  EXPECT_TRUE(VisitNNSA.runOver("namespace a { void f() { ::a::f(); } }"));
-  expectReplacementAt(VisitNNSA.Replace, "input.cc", 25, 5);
-}
-
-TEST(Range, overlaps) {
-  EXPECT_TRUE(Range(10, 10).overlapsWith(Range(0, 11)));
-  EXPECT_TRUE(Range(0, 11).overlapsWith(Range(10, 10)));
-  EXPECT_FALSE(Range(10, 10).overlapsWith(Range(0, 10)));
-  EXPECT_FALSE(Range(0, 10).overlapsWith(Range(10, 10)));
-  EXPECT_TRUE(Range(0, 10).overlapsWith(Range(2, 6)));
-  EXPECT_TRUE(Range(2, 6).overlapsWith(Range(0, 10)));
-}
-
-TEST(Range, contains) {
-  EXPECT_TRUE(Range(0, 10).contains(Range(0, 10)));
-  EXPECT_TRUE(Range(0, 10).contains(Range(2, 6)));
-  EXPECT_FALSE(Range(2, 6).contains(Range(0, 10)));
-  EXPECT_FALSE(Range(0, 10).contains(Range(0, 11)));
-}
-
-TEST(Range, CalculateRangesOfReplacements) {
-  // Before: aaaabbbbbbz
-  // After : bbbbbbzzzzzzoooooooooooooooo
-  Replacements Replaces = toReplacements(
-      {Replacement("foo", 0, 4, ""), Replacement("foo", 10, 1, "zzzzzz"),
-       Replacement("foo", 11, 0, "oooooooooooooooo")});
-
-  std::vector<Range> Ranges = Replaces.getAffectedRanges();
-
-  EXPECT_EQ(2ul, Ranges.size());
-  EXPECT_TRUE(Ranges[0].getOffset() == 0);
-  EXPECT_TRUE(Ranges[0].getLength() == 0);
-  EXPECT_TRUE(Ranges[1].getOffset() == 6);
-  EXPECT_TRUE(Ranges[1].getLength() == 22);
-}
-
-TEST(Range, CalculateRangesOfInsertionAroundReplacement) {
-  Replacements Replaces = toReplacements(
-      {Replacement("foo", 0, 2, ""), Replacement("foo", 0, 0, "ba")});
-
-  std::vector<Range> Ranges = Replaces.getAffectedRanges();
-
-  EXPECT_EQ(1ul, Ranges.size());
-  EXPECT_EQ(0u, Ranges[0].getOffset());
-  EXPECT_EQ(2u, Ranges[0].getLength());
-}
-
-TEST(Range, RangesAfterEmptyReplacements) {
-  std::vector<Range> Ranges = {Range(5, 6), Range(10, 5)};
-  Replacements Replaces;
-  std::vector<Range> Expected = {Range(5, 10)};
-  EXPECT_EQ(Expected, calculateRangesAfterReplacements(Replaces, Ranges));
-}
-
-TEST(Range, RangesAfterReplacements) {
-  std::vector<Range> Ranges = {Range(5, 2), Range(10, 5)};
-  Replacements Replaces = toReplacements({Replacement("foo", 0, 2, "1234")});
-  std::vector<Range> Expected = {Range(0, 4), Range(7, 2), Range(12, 5)};
-  EXPECT_EQ(Expected, calculateRangesAfterReplacements(Replaces, Ranges));
-}
-
-TEST(Range, RangesBeforeReplacements) {
-  std::vector<Range> Ranges = {Range(5, 2), Range(10, 5)};
-  Replacements Replaces = toReplacements({Replacement("foo", 20, 2, "1234")});
-  std::vector<Range> Expected = {Range(5, 2), Range(10, 5), Range(20, 4)};
-  EXPECT_EQ(Expected, calculateRangesAfterReplacements(Replaces, Ranges));
-}
-
-TEST(Range, NotAffectedByReplacements) {
-  std::vector<Range> Ranges = {Range(0, 2), Range(5, 2), Range(10, 5)};
-  Replacements Replaces = toReplacements({Replacement("foo", 3, 2, "12"),
-                                          Replacement("foo", 12, 2, "12"),
-                                          Replacement("foo", 20, 5, "")});
-  std::vector<Range> Expected = {Range(0, 2), Range(3, 4), Range(10, 5),
-                                 Range(20, 0)};
-  EXPECT_EQ(Expected, calculateRangesAfterReplacements(Replaces, Ranges));
-}
-
-TEST(Range, RangesWithNonOverlappingReplacements) {
-  std::vector<Range> Ranges = {Range(0, 2), Range(5, 2), Range(10, 5)};
-  Replacements Replaces = toReplacements({Replacement("foo", 3, 1, ""),
-                                          Replacement("foo", 6, 1, "123"),
-                                          Replacement("foo", 20, 2, "12345")});
-  std::vector<Range> Expected = {Range(0, 2), Range(3, 0), Range(4, 4),
-                                 Range(11, 5), Range(21, 5)};
-  EXPECT_EQ(Expected, calculateRangesAfterReplacements(Replaces, Ranges));
-}
-
-TEST(Range, RangesWithOverlappingReplacements) {
-  std::vector<Range> Ranges = {Range(0, 2), Range(5, 2), Range(15, 5),
-                               Range(30, 5)};
-  Replacements Replaces = toReplacements(
-      {Replacement("foo", 1, 3, ""), Replacement("foo", 6, 1, "123"),
-       Replacement("foo", 13, 3, "1"), Replacement("foo", 25, 15, "")});
-  std::vector<Range> Expected = {Range(0, 1), Range(2, 4), Range(12, 5),
-                                 Range(22, 0)};
-  EXPECT_EQ(Expected, calculateRangesAfterReplacements(Replaces, Ranges));
-}
-
-TEST(Range, MergeIntoOneRange) {
-  std::vector<Range> Ranges = {Range(0, 2), Range(5, 2), Range(15, 5)};
-  Replacements Replaces =
-      toReplacements({Replacement("foo", 1, 15, "1234567890")});
-  std::vector<Range> Expected = {Range(0, 15)};
-  EXPECT_EQ(Expected, calculateRangesAfterReplacements(Replaces, Ranges));
-}
-
-TEST(Range, ReplacementsStartingAtRangeOffsets) {
-  std::vector<Range> Ranges = {Range(0, 2), Range(5, 5), Range(15, 5)};
-  Replacements Replaces = toReplacements(
-      {Replacement("foo", 0, 2, "12"), Replacement("foo", 5, 1, "123"),
-       Replacement("foo", 7, 4, "12345"), Replacement("foo", 15, 10, "12")});
-  std::vector<Range> Expected = {Range(0, 2), Range(5, 9), Range(18, 2)};
-  EXPECT_EQ(Expected, calculateRangesAfterReplacements(Replaces, Ranges));
-}
-
-TEST(Range, ReplacementsEndingAtRangeEnds) {
-  std::vector<Range> Ranges = {Range(0, 2), Range(5, 2), Range(15, 5)};
-  Replacements Replaces = toReplacements(
-      {Replacement("foo", 6, 1, "123"), Replacement("foo", 17, 3, "12")});
-  std::vector<Range> Expected = {Range(0, 2), Range(5, 4), Range(17, 4)};
-  EXPECT_EQ(Expected, calculateRangesAfterReplacements(Replaces, Ranges));
-}
-
-TEST(Range, AjacentReplacements) {
-  std::vector<Range> Ranges = {Range(0, 0), Range(15, 5)};
-  Replacements Replaces = toReplacements(
-      {Replacement("foo", 1, 2, "123"), Replacement("foo", 12, 3, "1234")});
-  std::vector<Range> Expected = {Range(0, 0), Range(1, 3), Range(13, 9)};
-  EXPECT_EQ(Expected, calculateRangesAfterReplacements(Replaces, Ranges));
-}
-
-TEST(Range, MergeRangesAfterReplacements) {
-  std::vector<Range> Ranges = {Range(8, 0), Range(5, 2), Range(9, 0), Range(0, 1)};
-  Replacements Replaces = toReplacements({Replacement("foo", 1, 3, ""),
-                                          Replacement("foo", 7, 0, "12"),
-                                          Replacement("foo", 9, 2, "")});
-  std::vector<Range> Expected = {Range(0, 1), Range(2, 4), Range(7, 0),
-                                 Range(8, 0)};
-  EXPECT_EQ(Expected, calculateRangesAfterReplacements(Replaces, Ranges));
-}
-
-TEST(Range, ConflictingRangesBeforeReplacements) {
-  std::vector<Range> Ranges = {Range(8, 3), Range(5, 4), Range(9, 1)};
-  Replacements Replaces = toReplacements({Replacement("foo", 1, 3, "")});
-  std::vector<Range> Expected = {Range(1, 0), Range(2, 6)};
-  EXPECT_EQ(Expected, calculateRangesAfterReplacements(Replaces, Ranges));
-}
-
-class MergeReplacementsTest : public ::testing::Test {
-protected:
-  void mergeAndTestRewrite(StringRef Code, StringRef Intermediate,
-                           StringRef Result, const Replacements &First,
-                           const Replacements &Second) {
-    // These are mainly to verify the test itself and make it easier to read.
-    auto AfterFirst = applyAllReplacements(Code, First);
-    EXPECT_TRUE(static_cast<bool>(AfterFirst));
-    auto InSequenceRewrite = applyAllReplacements(*AfterFirst, Second);
-    EXPECT_TRUE(static_cast<bool>(InSequenceRewrite));
-    EXPECT_EQ(Intermediate, *AfterFirst);
-    EXPECT_EQ(Result, *InSequenceRewrite);
-
-    tooling::Replacements Merged = First.merge(Second);
-    auto MergedRewrite = applyAllReplacements(Code, Merged);
-    EXPECT_TRUE(static_cast<bool>(MergedRewrite));
-    EXPECT_EQ(*InSequenceRewrite, *MergedRewrite);
-    if (*InSequenceRewrite != *MergedRewrite)
-      for (tooling::Replacement M : Merged)
-        llvm::errs() << M.getOffset() << " " << M.getLength() << " "
-                     << M.getReplacementText() << "\n";
-  }
-  void mergeAndTestRewrite(StringRef Code, const Replacements &First,
-                           const Replacements &Second) {
-    auto AfterFirst = applyAllReplacements(Code, First);
-    EXPECT_TRUE(static_cast<bool>(AfterFirst));
-    auto InSequenceRewrite = applyAllReplacements(*AfterFirst, Second);
-    tooling::Replacements Merged = First.merge(Second);
-    auto MergedRewrite = applyAllReplacements(Code, Merged);
-    EXPECT_TRUE(static_cast<bool>(MergedRewrite));
-    EXPECT_EQ(*InSequenceRewrite, *MergedRewrite);
-    if (*InSequenceRewrite != *MergedRewrite)
-      for (tooling::Replacement M : Merged)
-        llvm::errs() << M.getOffset() << " " << M.getLength() << " "
-                     << M.getReplacementText() << "\n";
-  }
-};
-
-TEST_F(MergeReplacementsTest, Offsets) {
-  mergeAndTestRewrite("aaa", "aabab", "cacabab",
-                      toReplacements({{"", 2, 0, "b"}, {"", 3, 0, "b"}}),
-                      toReplacements({{"", 0, 0, "c"}, {"", 1, 0, "c"}}));
-  mergeAndTestRewrite("aaa", "babaa", "babacac",
-                      toReplacements({{"", 0, 0, "b"}, {"", 1, 0, "b"}}),
-                      toReplacements({{"", 4, 0, "c"}, {"", 5, 0, "c"}}));
-  mergeAndTestRewrite("aaaa", "aaa", "aac", toReplacements({{"", 1, 1, ""}}),
-                      toReplacements({{"", 2, 1, "c"}}));
-
-  mergeAndTestRewrite("aa", "bbabba", "bbabcba",
-                      toReplacements({{"", 0, 0, "bb"}, {"", 1, 0, "bb"}}),
-                      toReplacements({{"", 4, 0, "c"}}));
-}
-
-TEST_F(MergeReplacementsTest, Concatenations) {
-  // Basic concatenations. It is important to merge these into a single
-  // replacement to ensure the correct order.
-  {
-    auto First = toReplacements({{"", 0, 0, "a"}});
-    auto Second = toReplacements({{"", 1, 0, "b"}});
-    EXPECT_EQ(toReplacements({{"", 0, 0, "ab"}}), First.merge(Second));
-  }
-  {
-    auto First = toReplacements({{"", 0, 0, "a"}});
-    auto Second = toReplacements({{"", 0, 0, "b"}});
-    EXPECT_EQ(toReplacements({{"", 0, 0, "ba"}}), First.merge(Second));
-  }
-  mergeAndTestRewrite("", "a", "ab", toReplacements({{"", 0, 0, "a"}}),
-                      toReplacements({{"", 1, 0, "b"}}));
-  mergeAndTestRewrite("", "a", "ba", toReplacements({{"", 0, 0, "a"}}),
-                      toReplacements({{"", 0, 0, "b"}}));
-}
-
-TEST_F(MergeReplacementsTest, NotChangingLengths) {
-  mergeAndTestRewrite("aaaa", "abba", "acca",
-                      toReplacements({{"", 1, 2, "bb"}}),
-                      toReplacements({{"", 1, 2, "cc"}}));
-  mergeAndTestRewrite("aaaa", "abba", "abcc",
-                      toReplacements({{"", 1, 2, "bb"}}),
-                      toReplacements({{"", 2, 2, "cc"}}));
-  mergeAndTestRewrite("aaaa", "abba", "ccba",
-                      toReplacements({{"", 1, 2, "bb"}}),
-                      toReplacements({{"", 0, 2, "cc"}}));
-  mergeAndTestRewrite("aaaaaa", "abbdda", "abccda",
-                      toReplacements({{"", 1, 2, "bb"}, {"", 3, 2, "dd"}}),
-                      toReplacements({{"", 2, 2, "cc"}}));
-}
-
-TEST_F(MergeReplacementsTest, OverlappingRanges) {
-  mergeAndTestRewrite("aaa", "bbd", "bcbcd",
-                      toReplacements({{"", 0, 1, "bb"}, {"", 1, 2, "d"}}),
-                      toReplacements({{"", 1, 0, "c"}, {"", 2, 0, "c"}}));
-
-  mergeAndTestRewrite("aaaa", "aabbaa", "acccca",
-                      toReplacements({{"", 2, 0, "bb"}}),
-                      toReplacements({{"", 1, 4, "cccc"}}));
-  mergeAndTestRewrite("aaaa", "aababa", "acccca",
-                      toReplacements({{"", 2, 0, "b"}, {"", 3, 0, "b"}}),
-                      toReplacements({{"", 1, 4, "cccc"}}));
-  mergeAndTestRewrite("aaaaaa", "abbbba", "abba",
-                      toReplacements({{"", 1, 4, "bbbb"}}),
-                      toReplacements({{"", 2, 2, ""}}));
-  mergeAndTestRewrite("aaaa", "aa", "cc",
-                      toReplacements({{"", 1, 1, ""}, {"", 2, 1, ""}}),
-                      toReplacements({{"", 0, 2, "cc"}}));
-  mergeAndTestRewrite("aa", "abbba", "abcbcba",
-                      toReplacements({{"", 1, 0, "bbb"}}),
-                      toReplacements({{"", 2, 0, "c"}, {"", 3, 0, "c"}}));
-
-  mergeAndTestRewrite(
-      "aaa", "abbab", "ccdd",
-      toReplacements({{"", 0, 1, ""}, {"", 2, 0, "bb"}, {"", 3, 0, "b"}}),
-      toReplacements({{"", 0, 2, "cc"}, {"", 2, 3, "dd"}}));
-  mergeAndTestRewrite(
-      "aa", "babbab", "ccdd",
-      toReplacements({{"", 0, 0, "b"}, {"", 1, 0, "bb"}, {"", 2, 0, "b"}}),
-      toReplacements({{"", 0, 3, "cc"}, {"", 3, 3, "dd"}}));
-}
-
-TEST(DeduplicateByFileTest, PathsWithDots) {
-  std::map<std::string, Replacements> FileToReplaces;
-  llvm::IntrusiveRefCntPtr<llvm::vfs::InMemoryFileSystem> VFS(
-      new llvm::vfs::InMemoryFileSystem());
-  FileManager FileMgr(FileSystemOptions(), VFS);
-#if !defined(_WIN32)
-  StringRef Path1 = "a/b/.././c.h";
-  StringRef Path2 = "a/c.h";
-#else
-  StringRef Path1 = "a\\b\\..\\.\\c.h";
-  StringRef Path2 = "a\\c.h";
-#endif
-  EXPECT_TRUE(VFS->addFile(Path1, 0, llvm::MemoryBuffer::getMemBuffer("")));
-  EXPECT_TRUE(VFS->addFile(Path2, 0, llvm::MemoryBuffer::getMemBuffer("")));
-  FileToReplaces[std::string(Path1)] = Replacements();
-  FileToReplaces[std::string(Path2)] = Replacements();
-  FileToReplaces = groupReplacementsByFile(FileMgr, FileToReplaces);
-  EXPECT_EQ(1u, FileToReplaces.size());
-  EXPECT_EQ(Path1, FileToReplaces.begin()->first);
-}
-
-TEST(DeduplicateByFileTest, PathWithDotSlash) {
-  std::map<std::string, Replacements> FileToReplaces;
-  llvm::IntrusiveRefCntPtr<llvm::vfs::InMemoryFileSystem> VFS(
-      new llvm::vfs::InMemoryFileSystem());
-  FileManager FileMgr(FileSystemOptions(), VFS);
-#if !defined(_WIN32)
-  StringRef Path1 = "./a/b/c.h";
-  StringRef Path2 = "a/b/c.h";
-#else
-  StringRef Path1 = ".\\a\\b\\c.h";
-  StringRef Path2 = "a\\b\\c.h";
-#endif
-  EXPECT_TRUE(VFS->addFile(Path1, 0, llvm::MemoryBuffer::getMemBuffer("")));
-  EXPECT_TRUE(VFS->addFile(Path2, 0, llvm::MemoryBuffer::getMemBuffer("")));
-  FileToReplaces[std::string(Path1)] = Replacements();
-  FileToReplaces[std::string(Path2)] = Replacements();
-  FileToReplaces = groupReplacementsByFile(FileMgr, FileToReplaces);
-  EXPECT_EQ(1u, FileToReplaces.size());
-  EXPECT_EQ(Path1, FileToReplaces.begin()->first);
-}
-
-TEST(DeduplicateByFileTest, NonExistingFilePath) {
-  std::map<std::string, Replacements> FileToReplaces;
-  llvm::IntrusiveRefCntPtr<llvm::vfs::InMemoryFileSystem> VFS(
-      new llvm::vfs::InMemoryFileSystem());
-  FileManager FileMgr(FileSystemOptions(), VFS);
-#if !defined(_WIN32)
-  StringRef Path1 = "./a/b/c.h";
-  StringRef Path2 = "a/b/c.h";
-#else
-  StringRef Path1 = ".\\a\\b\\c.h";
-  StringRef Path2 = "a\\b\\c.h";
-#endif
-  FileToReplaces[std::string(Path1)] = Replacements();
-  FileToReplaces[std::string(Path2)] = Replacements();
-  FileToReplaces = groupReplacementsByFile(FileMgr, FileToReplaces);
-  EXPECT_TRUE(FileToReplaces.empty());
-}
-
-class AtomicChangeTest : public ::testing::Test {
-  protected:
-    void SetUp() override {
-      DefaultFileID = Context.createInMemoryFile("input.cpp", DefaultCode);
-      DefaultLoc = Context.Sources.getLocForStartOfFile(DefaultFileID)
-                       .getLocWithOffset(20);
-      assert(DefaultLoc.isValid() && "Default location must be valid.");
-    }
-
-    RewriterTestContext Context;
-    std::string DefaultCode = std::string(100, 'a');
-    unsigned DefaultOffset = 20;
-    SourceLocation DefaultLoc;
-    FileID DefaultFileID;
-};
-
-TEST_F(AtomicChangeTest, AtomicChangeToYAML) {
-  AtomicChange Change(Context.Sources, DefaultLoc);
-  llvm::Error Err =
-      Change.insert(Context.Sources, DefaultLoc, "aa", /*InsertAfter=*/false);
-  ASSERT_TRUE(!Err);
-  Err = Change.insert(Context.Sources, DefaultLoc.getLocWithOffset(10), "bb",
-                    /*InsertAfter=*/false);
-  ASSERT_TRUE(!Err);
-  Change.addHeader("a.h");
-  Change.removeHeader("b.h");
-  std::string YAMLString = Change.toYAMLString();
-
-  // NOTE: If this test starts to fail for no obvious reason, check whitespace.
-  ASSERT_STREQ("---\n"
-               "Key:             'input.cpp:20'\n"
-               "FilePath:        input.cpp\n"
-               "Error:           ''\n"
-               "InsertedHeaders:\n"
-               "  - a.h\n"
-               "RemovedHeaders:\n"
-               "  - b.h\n"
-               "Replacements:\n"
-               "  - FilePath:        input.cpp\n"
-               "    Offset:          20\n"
-               "    Length:          0\n"
-               "    ReplacementText: aa\n"
-               "  - FilePath:        input.cpp\n"
-               "    Offset:          30\n"
-               "    Length:          0\n"
-               "    ReplacementText: bb\n"
-               "...\n",
-               YAMLString.c_str());
-}
-
-TEST_F(AtomicChangeTest, YAMLToAtomicChange) {
-  std::string YamlContent = "---\n"
-                            "Key:             'input.cpp:20'\n"
-                            "FilePath:        input.cpp\n"
-                            "Error:           'ok'\n"
-                            "InsertedHeaders:\n"
-                            "  - a.h\n"
-                            "RemovedHeaders:\n"
-                            "  - b.h\n"
-                            "Replacements:\n"
-                            "  - FilePath:        input.cpp\n"
-                            "    Offset:          20\n"
-                            "    Length:          0\n"
-                            "    ReplacementText: aa\n"
-                            "  - FilePath:        input.cpp\n"
-                            "    Offset:          30\n"
-                            "    Length:          0\n"
-                            "    ReplacementText: bb\n"
-                            "...\n";
-  AtomicChange ExpectedChange(Context.Sources, DefaultLoc);
-  llvm::Error Err = ExpectedChange.insert(Context.Sources, DefaultLoc, "aa",
-                                        /*InsertAfter=*/false);
-  ASSERT_TRUE(!Err);
-  Err = ExpectedChange.insert(Context.Sources, DefaultLoc.getLocWithOffset(10),
-                            "bb", /*InsertAfter=*/false);
-  ASSERT_TRUE(!Err);
-
-  ExpectedChange.addHeader("a.h");
-  ExpectedChange.removeHeader("b.h");
-  ExpectedChange.setError("ok");
-
-  AtomicChange ActualChange = AtomicChange::convertFromYAML(YamlContent);
-  EXPECT_EQ(ExpectedChange.getKey(), ActualChange.getKey());
-  EXPECT_EQ(ExpectedChange.getFilePath(), ActualChange.getFilePath());
-  EXPECT_EQ(ExpectedChange.getError(), ActualChange.getError());
-  EXPECT_EQ(ExpectedChange.getInsertedHeaders(),
-            ActualChange.getInsertedHeaders());
-  EXPECT_EQ(ExpectedChange.getRemovedHeaders(),
-            ActualChange.getRemovedHeaders());
-  EXPECT_EQ(ExpectedChange.getReplacements().size(),
-            ActualChange.getReplacements().size());
-  EXPECT_EQ(2u, ActualChange.getReplacements().size());
-  EXPECT_EQ(*ExpectedChange.getReplacements().begin(),
-            *ActualChange.getReplacements().begin());
-  EXPECT_EQ(*(++ExpectedChange.getReplacements().begin()),
-            *(++ActualChange.getReplacements().begin()));
-}
-
-TEST_F(AtomicChangeTest, CheckKeyAndKeyFile) {
-  AtomicChange Change(Context.Sources, DefaultLoc);
-  EXPECT_EQ("input.cpp:20", Change.getKey());
-  EXPECT_EQ("input.cpp", Change.getFilePath());
-}
-
-TEST_F(AtomicChangeTest, Replace) {
-  AtomicChange Change(Context.Sources, DefaultLoc);
-  llvm::Error Err = Change.replace(Context.Sources, DefaultLoc, 2, "aa");
-  ASSERT_TRUE(!Err);
-  EXPECT_EQ(Change.getReplacements().size(), 1u);
-  EXPECT_EQ(*Change.getReplacements().begin(),
-            Replacement(Context.Sources, DefaultLoc, 2, "aa"));
-
-  // Add a new replacement that conflicts with the existing one.
-  Err = Change.replace(Context.Sources, DefaultLoc, 3, "ab");
-  EXPECT_TRUE((bool)Err);
-  llvm::consumeError(std::move(Err));
-  EXPECT_EQ(Change.getReplacements().size(), 1u);
-}
-
-TEST_F(AtomicChangeTest, ReplaceWithRange) {
-  AtomicChange Change(Context.Sources, DefaultLoc);
-  SourceLocation End = DefaultLoc.getLocWithOffset(20);
-  llvm::Error Err = Change.replace(
-      Context.Sources, CharSourceRange::getCharRange(DefaultLoc, End), "aa");
-  ASSERT_TRUE(!Err);
-  EXPECT_EQ(Change.getReplacements().size(), 1u);
-  EXPECT_EQ(*Change.getReplacements().begin(),
-            Replacement(Context.Sources, DefaultLoc, 20, "aa"));
-}
-
-TEST_F(AtomicChangeTest, InsertBefore) {
-  AtomicChange Change(Context.Sources, DefaultLoc);
-  llvm::Error Err = Change.insert(Context.Sources, DefaultLoc, "aa");
-  ASSERT_TRUE(!Err);
-  EXPECT_EQ(Change.getReplacements().size(), 1u);
-  EXPECT_EQ(*Change.getReplacements().begin(),
-            Replacement(Context.Sources, DefaultLoc, 0, "aa"));
-  Err = Change.insert(Context.Sources, DefaultLoc, "b", /*InsertAfter=*/false);
-  ASSERT_TRUE(!Err);
-  EXPECT_EQ(Change.getReplacements().size(), 1u);
-  EXPECT_EQ(*Change.getReplacements().begin(),
-            Replacement(Context.Sources, DefaultLoc, 0, "baa"));
-}
-
-TEST_F(AtomicChangeTest, InsertAfter) {
-  AtomicChange Change(Context.Sources, DefaultLoc);
-  llvm::Error Err = Change.insert(Context.Sources, DefaultLoc, "aa");
-  ASSERT_TRUE(!Err);
-  EXPECT_EQ(Change.getReplacements().size(), 1u);
-  EXPECT_EQ(*Change.getReplacements().begin(),
-            Replacement(Context.Sources, DefaultLoc, 0, "aa"));
-  Err = Change.insert(Context.Sources, DefaultLoc, "b");
-  ASSERT_TRUE(!Err);
-  EXPECT_EQ(Change.getReplacements().size(), 1u);
-  EXPECT_EQ(*Change.getReplacements().begin(),
-            Replacement(Context.Sources, DefaultLoc, 0, "aab"));
-}
-
-TEST_F(AtomicChangeTest, InsertBeforeWithInvalidLocation) {
-  AtomicChange Change(Context.Sources, DefaultLoc);
-  llvm::Error Err =
-      Change.insert(Context.Sources, DefaultLoc, "a", /*InsertAfter=*/false);
-  ASSERT_TRUE(!Err);
-
-  // Invalid location.
-  Err = Change.insert(Context.Sources, SourceLocation(), "a",
-                    /*InsertAfter=*/false);
-  ASSERT_TRUE((bool)Err);
-  EXPECT_TRUE(checkReplacementError(
-      std::move(Err), replacement_error::wrong_file_path,
-      Replacement(Context.Sources, DefaultLoc, 0, "a"),
-      Replacement(Context.Sources, SourceLocation(), 0, "a")));
-}
-
-TEST_F(AtomicChangeTest, InsertBeforeToWrongFile) {
-  AtomicChange Change(Context.Sources, DefaultLoc);
-  llvm::Error Err =
-      Change.insert(Context.Sources, DefaultLoc, "a", /*InsertAfter=*/false);
-  ASSERT_TRUE(!Err);
-
-  // Inserting at a different file.
-  FileID NewID = Context.createInMemoryFile("extra.cpp", DefaultCode);
-  SourceLocation NewLoc = Context.Sources.getLocForStartOfFile(NewID);
-  Err = Change.insert(Context.Sources, NewLoc, "b", /*InsertAfter=*/false);
-  ASSERT_TRUE((bool)Err);
-  EXPECT_TRUE(
-      checkReplacementError(std::move(Err), replacement_error::wrong_file_path,
-                            Replacement(Context.Sources, DefaultLoc, 0, "a"),
-                            Replacement(Context.Sources, NewLoc, 0, "b")));
-}
-
-TEST_F(AtomicChangeTest, InsertAfterWithInvalidLocation) {
-  AtomicChange Change(Context.Sources, DefaultLoc);
-  llvm::Error Err = Change.insert(Context.Sources, DefaultLoc, "a");
-  ASSERT_TRUE(!Err);
-
-  // Invalid location.
-  Err = Change.insert(Context.Sources, SourceLocation(), "b");
-  ASSERT_TRUE((bool)Err);
-  EXPECT_TRUE(checkReplacementError(
-      std::move(Err), replacement_error::wrong_file_path,
-      Replacement(Context.Sources, DefaultLoc, 0, "a"),
-      Replacement(Context.Sources, SourceLocation(), 0, "b")));
-}
-
-TEST_F(AtomicChangeTest, Metadata) {
-  AtomicChange Change(Context.Sources, DefaultLoc, 17);
-  const llvm::Any &Metadata = Change.getMetadata();
-  ASSERT_TRUE(llvm::any_isa<int>(Metadata));
-  EXPECT_EQ(llvm::any_cast<int>(Metadata), 17);
-}
-
-TEST_F(AtomicChangeTest, NoMetadata) {
-  AtomicChange Change(Context.Sources, DefaultLoc);
-  EXPECT_FALSE(Change.getMetadata().hasValue());
-}
-
-class ApplyAtomicChangesTest : public ::testing::Test {
-protected:
-  ApplyAtomicChangesTest() : FilePath("file.cc") {
-    Spec.Cleanup = true;
-    Spec.Format = ApplyChangesSpec::kAll;
-    Spec.Style = format::getLLVMStyle();
-  }
-
-  ~ApplyAtomicChangesTest() override {}
-
-  void setInput(llvm::StringRef Input) {
-    Code = std::string(Input);
-    FID = Context.createInMemoryFile(FilePath, Code);
-  }
-
-  SourceLocation getLoc(unsigned Offset) const {
-    return Context.Sources.getLocForStartOfFile(FID).getLocWithOffset(Offset);
-  }
-
-  AtomicChange replacementToAtomicChange(llvm::StringRef Key, unsigned Offset,
-                                         unsigned Length,
-                                         llvm::StringRef Text) {
-    AtomicChange Change(FilePath, Key);
-    llvm::Error Err =
-        Change.replace(Context.Sources, getLoc(Offset), Length, Text);
-    EXPECT_FALSE(Err);
-    return Change;
-  }
-
-  std::string rewrite(bool FailureExpected = false) {
-    llvm::Expected<std::string> ChangedCode =
-        applyAtomicChanges(FilePath, Code, Changes, Spec);
-    EXPECT_EQ(FailureExpected, !ChangedCode);
-    if (!ChangedCode) {
-      llvm::errs() << "Failed to apply changes: "
-                   << llvm::toString(ChangedCode.takeError()) << "\n";
-      return "";
-    }
-    return *ChangedCode;
-  }
-
-  RewriterTestContext Context;
-  FileID FID;
-  ApplyChangesSpec Spec;
-  std::string Code;
-  std::string FilePath;
-  llvm::SmallVector<AtomicChange, 8> Changes;
-};
-
-TEST_F(ApplyAtomicChangesTest, BasicRefactoring) {
-  setInput("int a;");
-  AtomicChange Change(FilePath, "key1");
-  Changes.push_back(replacementToAtomicChange("key1", 4, 1, "b"));
-  EXPECT_EQ("int b;", rewrite());
-}
-
-TEST_F(ApplyAtomicChangesTest, SeveralRefactorings) {
-  setInput("int a;\n"
-           "int b;");
-  Changes.push_back(replacementToAtomicChange("key1", 0, 3, "float"));
-  Changes.push_back(replacementToAtomicChange("key2", 4, 1, "f"));
-  Changes.push_back(replacementToAtomicChange("key3", 11, 1, "g"));
-  Changes.push_back(replacementToAtomicChange("key4", 7, 3, "float"));
-  EXPECT_EQ("float f;\n"
-            "float g;",
-            rewrite());
-}
-
-TEST_F(ApplyAtomicChangesTest, IgnorePathsInRefactorings) {
-  setInput("int a;\n"
-           "int b;");
-  Changes.push_back(replacementToAtomicChange("key1", 4, 1, "aa"));
-
-  FileID ID = Context.createInMemoryFile("AnotherFile", "12345678912345");
-  Changes.emplace_back("AnotherFile", "key2");
-  auto Err = Changes.back().replace(
-      Context.Sources,
-      Context.Sources.getLocForStartOfFile(ID).getLocWithOffset(11), 1, "bb");
-  ASSERT_TRUE(!Err);
-  EXPECT_EQ("int aa;\n"
-            "int bb;",
-            rewrite());
-}
-
-TEST_F(ApplyAtomicChangesTest, AppliesDuplicateInsertions) {
-  setInput("int a;");
-  Changes.push_back(replacementToAtomicChange("key1", 5, 0, "b"));
-  Changes.push_back(replacementToAtomicChange("key2", 5, 0, "b"));
-  EXPECT_EQ("int abb;", rewrite());
-}
-
-TEST_F(ApplyAtomicChangesTest, BailsOnOverlappingRefactorings) {
-  setInput("int a;");
-  Changes.push_back(replacementToAtomicChange("key1", 0, 5, "float f"));
-  Changes.push_back(replacementToAtomicChange("key2", 4, 1, "b"));
-  EXPECT_EQ("", rewrite(/*FailureExpected=*/true));
-}
-
-TEST_F(ApplyAtomicChangesTest, BasicReformatting) {
-  setInput("int  a;");
-  Changes.push_back(replacementToAtomicChange("key1", 5, 1, "b"));
-  EXPECT_EQ("int b;", rewrite());
-}
-
-TEST_F(ApplyAtomicChangesTest, OnlyFormatWhenViolateColumnLimits) {
-  Spec.Format = ApplyChangesSpec::kViolations;
-  Spec.Style.ColumnLimit = 8;
-  setInput("int  a;\n"
-           "int    a;\n"
-           "int  aaaaaaaa;\n");
-  Changes.push_back(replacementToAtomicChange("key1", 5, 1, "x"));
-  Changes.push_back(replacementToAtomicChange("key2", 15, 1, "x"));
-  Changes.push_back(replacementToAtomicChange("key3", 23, 8, "xx"));
-  EXPECT_EQ("int  x;\n"
-            "int x;\n"
-            "int  xx;\n",
-            rewrite());
-}
-
-TEST_F(ApplyAtomicChangesTest, LastLineViolateColumnLimits) {
-  Spec.Format = ApplyChangesSpec::kViolations;
-  Spec.Style.ColumnLimit = 8;
-  setInput("int  a;\n"
-           "int    a;");
-  Changes.push_back(replacementToAtomicChange("key1", 0, 1, "i"));
-  Changes.push_back(replacementToAtomicChange("key2", 15, 2, "y;"));
-  EXPECT_EQ("int  a;\n"
-            "int y;",
-            rewrite());
-}
-
-TEST_F(ApplyAtomicChangesTest, LastLineWithNewlineViolateColumnLimits) {
-  Spec.Format = ApplyChangesSpec::kViolations;
-  Spec.Style.ColumnLimit = 8;
-  setInput("int  a;\n"
-           "int   a;\n");
-  Changes.push_back(replacementToAtomicChange("key1", 0, 1, "i"));
-  Changes.push_back(replacementToAtomicChange("key2", 14, 3, "y;\n"));
-  EXPECT_EQ("int  a;\n"
-            "int   y;\n",
-            rewrite());
-}
-
-TEST_F(ApplyAtomicChangesTest, Longer) {
-  setInput("int  a;");
-  Changes.push_back(replacementToAtomicChange("key1", 5, 1, "bbb"));
-  EXPECT_EQ("int bbb;", rewrite());
-}
-
-TEST_F(ApplyAtomicChangesTest, Shorter) {
-  setInput("int  aaa;");
-  Changes.push_back(replacementToAtomicChange("key1", 5, 3, "b"));
-  EXPECT_EQ("int b;", rewrite());
-}
-
-TEST_F(ApplyAtomicChangesTest, OnlyFormatChangedLines) {
-  setInput("int  aaa;\n"
-           "int a = b;\n"
-           "int  bbb;");
-  Changes.push_back(replacementToAtomicChange("key1", 14, 1, "b"));
-  EXPECT_EQ("int  aaa;\n"
-            "int b = b;\n"
-            "int  bbb;",
-            rewrite());
-}
-
-TEST_F(ApplyAtomicChangesTest, DisableFormatting) {
-  Spec.Format = ApplyChangesSpec::kNone;
-  setInput("int  aaa;\n"
-           "int a   = b;\n"
-           "int  bbb;");
-  Changes.push_back(replacementToAtomicChange("key1", 14, 1, "b"));
-  EXPECT_EQ("int  aaa;\n"
-            "int b   = b;\n"
-            "int  bbb;",
-            rewrite());
-}
-
-TEST_F(ApplyAtomicChangesTest, AdaptsToLocalPointerStyle) {
-  setInput("int *aaa;\n"
-           "int *bbb;");
-  Changes.push_back(replacementToAtomicChange("key1", 0, 0, "int* ccc;\n"));
-  EXPECT_EQ("int *ccc;\n"
-            "int *aaa;\n"
-            "int *bbb;",
-            rewrite());
-}
-
-TEST_F(ApplyAtomicChangesTest, AcceptsSurroundingFormatting) {
-  setInput("   int  aaa;\n"
-           "   int a = b;\n"
-           "   int  bbb;");
-  Changes.push_back(replacementToAtomicChange("key1", 20, 1, "b"));
-  EXPECT_EQ("   int  aaa;\n"
-            "   int b = b;\n"
-            "   int  bbb;",
-            rewrite());
-}
-
-TEST_F(ApplyAtomicChangesTest, BailsOutOnConflictingChanges) {
-  setInput("int c;\n"
-           "int f;");
-  // Insertions at the same offset are only allowed in the same AtomicChange.
-  Changes.push_back(replacementToAtomicChange("key1", 0, 0, "int a;\n"));
-  Changes.push_back(replacementToAtomicChange("key2", 0, 0, "int b;\n"));
-  EXPECT_EQ("", rewrite(/*FailureExpected=*/true));
-}
-
-TEST_F(ApplyAtomicChangesTest, InsertsNewIncludesInRightOrder) {
-  setInput("int a;");
-  Changes.emplace_back(FilePath, "key1");
-  Changes.back().addHeader("b");
-  Changes.back().addHeader("c");
-  Changes.emplace_back(FilePath, "key2");
-  Changes.back().addHeader("a");
-  EXPECT_EQ("#include \"a\"\n"
-            "#include \"b\"\n"
-            "#include \"c\"\n"
-            "int a;",
-            rewrite());
-}
-
-TEST_F(ApplyAtomicChangesTest, RemoveAndSortIncludes) {
-  setInput("#include \"a\"\n"
-           "#include \"b\"\n"
-           "#include \"c\"\n"
-           "\n"
-           "int a;");
-  Changes.emplace_back(FilePath, "key1");
-  Changes.back().removeHeader("b");
-  EXPECT_EQ("#include \"a\"\n"
-            "#include \"c\"\n"
-            "\n"
-            "int a;",
-            rewrite());
-}
-TEST_F(ApplyAtomicChangesTest, InsertsSystemIncludes) {
-  setInput("#include <asys>\n"
-           "#include <csys>\n"
-           "\n"
-           "#include \"a\"\n"
-           "#include \"c\"\n");
-  Changes.emplace_back(FilePath, "key1");
-  Changes.back().addHeader("<asys>"); // Already exists.
-  Changes.back().addHeader("<b>");
-  Changes.back().addHeader("<d>");
-  Changes.back().addHeader("\"b-already-escaped\"");
-  EXPECT_EQ("#include <asys>\n"
-            "#include <b>\n"
-            "#include <csys>\n"
-            "#include <d>\n"
-            "\n"
-            "#include \"a\"\n"
-            "#include \"b-already-escaped\"\n"
-            "#include \"c\"\n",
-            rewrite());
-}
-
-TEST_F(ApplyAtomicChangesTest, RemoveSystemIncludes) {
-  setInput("#include <a>\n"
-           "#include <b>\n"
-           "\n"
-           "#include \"c\""
-           "\n"
-           "int a;");
-  Changes.emplace_back(FilePath, "key1");
-  Changes.back().removeHeader("<a>");
-  EXPECT_EQ("#include <b>\n"
-            "\n"
-            "#include \"c\""
-            "\n"
-            "int a;",
-            rewrite());
-}
-
-TEST_F(ApplyAtomicChangesTest,
-       DoNotFormatFollowingLinesIfSeparatedWithNewline) {
-  setInput("#ifndef __H__\n"
-           "#define __H__\n"
-           "#include \"b\"\n"
-           "\n"
-           "int  a;\n"
-           "int  a;\n"
-           "int  a;\n"
-           "#endif // __H__\n");
-  Changes.push_back(replacementToAtomicChange("key1",
-                                              llvm::StringRef("#ifndef __H__\n"
-                                                              "#define __H__\n"
-                                                              "\n"
-                                                              "#include \"b\"\n"
-                                                              "int  a;\n"
-                                                              "int  ")
-                                                  .size(),
-                                              1, "b"));
-  Changes.back().addHeader("a");
-  EXPECT_EQ("#ifndef __H__\n"
-            "#define __H__\n"
-            "#include \"a\"\n"
-            "#include \"b\"\n"
-            "\n"
-            "int  a;\n"
-            "int b;\n"
-            "int  a;\n"
-            "#endif // __H__\n",
-            rewrite());
-}
-
-TEST_F(ApplyAtomicChangesTest, FormatsCorrectLineWhenHeaderIsRemoved) {
-  setInput("#include \"a\"\n"
-           "\n"
-           "int  a;\n"
-           "int  a;\n"
-           "int  a;");
-  Changes.push_back(replacementToAtomicChange("key1", 27, 1, "b"));
-  Changes.back().removeHeader("a");
-  EXPECT_EQ("\n"
-            "int  a;\n"
-            "int b;\n"
-            "int  a;",
-            rewrite());
-}
-
-TEST_F(ApplyAtomicChangesTest, CleansUpCtorInitializers) {
-  setInput("A::A() : a(), b() {}\n"
-           "A::A() : a(), b() {}\n"
-           "A::A() : a(), b() {}\n"
-           "A::A() : a()/**/, b() {}\n"
-           "A::A() : a()  ,// \n"
-           "   /**/    b()    {}");
-  Changes.emplace_back(FilePath, "key1");
-  auto Err = Changes.back().replace(Context.Sources, getLoc(9), 3, "");
-  ASSERT_TRUE(!Err);
-  Err = Changes.back().replace(Context.Sources, getLoc(35), 3, "");
-  ASSERT_TRUE(!Err);
-  Err = Changes.back().replace(Context.Sources, getLoc(51), 3, "");
-  ASSERT_TRUE(!Err);
-  Err = Changes.back().replace(Context.Sources, getLoc(56), 3, "");
-  ASSERT_TRUE(!Err);
-  Err = Changes.back().replace(Context.Sources, getLoc(72), 3, "");
-  ASSERT_TRUE(!Err);
-  Err = Changes.back().replace(Context.Sources, getLoc(97), 3, "");
-  ASSERT_TRUE(!Err);
-  Err = Changes.back().replace(Context.Sources, getLoc(118), 3, "");
-  ASSERT_TRUE(!Err);
-  EXPECT_EQ("A::A() : b() {}\n"
-            "A::A() : a() {}\n"
-            "A::A() {}\n"
-            "A::A() : b() {}\n"
-            "A::A() {}",
-            rewrite());
-}
-
-TEST_F(ApplyAtomicChangesTest, CleansUpParameterLists) {
-  setInput("void f(int i, float f, string s);\n"
-           "f(1, 2.0f, \"a\");\n"
-           "g(1, 1);");
-  Changes.emplace_back(FilePath, "key1");
-  auto Err = Changes.back().replace(Context.Sources, getLoc(7), 5, "");
-  ASSERT_TRUE(!Err);
-  Err = Changes.back().replace(Context.Sources, getLoc(23), 8, "");
-  ASSERT_TRUE(!Err);
-  Err = Changes.back().replace(Context.Sources, getLoc(36), 1, "");
-  ASSERT_TRUE(!Err);
-  Err = Changes.back().replace(Context.Sources, getLoc(45), 3, "");
-  ASSERT_TRUE(!Err);
-  Err = Changes.back().replace(Context.Sources, getLoc(53), 1, "");
-  ASSERT_TRUE(!Err);
-  Err = Changes.back().replace(Context.Sources, getLoc(56), 1, "");
-  ASSERT_TRUE(!Err);
-  EXPECT_EQ("void f(float f);\n"
-            "f(2.0f);\n"
-            "g();",
-            rewrite());
-}
-
-TEST_F(ApplyAtomicChangesTest, DisableCleanup) {
-  Spec.Cleanup = false;
-  setInput("void f(int i, float f, string s);\n"
-           "f(1, 2.0f, \"a\");\n"
-           "g(1, 1);");
-  Changes.emplace_back(FilePath, "key1");
-  auto Err = Changes.back().replace(Context.Sources, getLoc(7), 5, "");
-  ASSERT_TRUE(!Err);
-  Err = Changes.back().replace(Context.Sources, getLoc(23), 8, "");
-  ASSERT_TRUE(!Err);
-  Err = Changes.back().replace(Context.Sources, getLoc(36), 1, "");
-  ASSERT_TRUE(!Err);
-  Err = Changes.back().replace(Context.Sources, getLoc(45), 3, "");
-  ASSERT_TRUE(!Err);
-  Err = Changes.back().replace(Context.Sources, getLoc(53), 1, "");
-  ASSERT_TRUE(!Err);
-  Err = Changes.back().replace(Context.Sources, getLoc(56), 1, "");
-  ASSERT_TRUE(!Err);
-  EXPECT_EQ("void f(, float f, );\n"
-            "f(, 2.0f, );\n"
-            "g(, );",
-            rewrite());
-}
-
-TEST_F(ApplyAtomicChangesTest, EverythingDeleted) {
-  setInput("int a;");
-  Changes.push_back(replacementToAtomicChange("key1", 0, 6, ""));
-  EXPECT_EQ("", rewrite());
-}
-
-TEST_F(ApplyAtomicChangesTest, DoesNotDeleteInserts) {
-  setInput("int a;\n"
-           "int b;");
-  Changes.emplace_back(FilePath, "key1");
-  auto Err = Changes.back().replace(Context.Sources, getLoc(4), 1, "");
-  ASSERT_TRUE(!Err);
-  Err = Changes.back().replace(Context.Sources, getLoc(4), 0, "b");
-  ASSERT_TRUE(!Err);
-  Err = Changes.back().replace(Context.Sources, getLoc(11), 0, "a");
-  ASSERT_TRUE(!Err);
-  Err = Changes.back().replace(Context.Sources, getLoc(11), 1, "");
-  ASSERT_TRUE(!Err);
-  EXPECT_EQ("int b;\n"
-            "int a;",
-            rewrite());
-}
-
-} // end namespace tooling
-} // end namespace clang
diff --git a/gnu/llvm/clang/unittests/Tooling/ReplacementTest.h b/gnu/llvm/clang/unittests/Tooling/ReplacementTest.h
deleted file mode 100644
index b97e0e7f2f1..00000000000
--- a/gnu/llvm/clang/unittests/Tooling/ReplacementTest.h
+++ /dev/null
@@ -1,55 +0,0 @@
-//===- unittest/Tooling/ReplacementTest.h - Replacements related test------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-//  This file defines utility class and function for Replacement related tests.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_CLANG_UNITTESTS_TOOLING_REPLACEMENTTESTBASE_H
-#define LLVM_CLANG_UNITTESTS_TOOLING_REPLACEMENTTESTBASE_H
-
-#include "RewriterTestContext.h"
-#include "clang/Tooling/Core/Replacement.h"
-#include "gtest/gtest.h"
-
-namespace clang {
-namespace tooling {
-
-/// \brief Converts a set of replacements to Replacements class.
-/// \return A Replacements class containing \p Replaces on success; otherwise,
-/// an empty Replacements is returned.
-inline tooling::Replacements
-toReplacements(const std::set<tooling::Replacement> &Replaces) {
-  tooling::Replacements Result;
-  for (const auto &R : Replaces) {
-    auto Err = Result.add(R);
-    EXPECT_TRUE(!Err);
-    if (Err) {
-      llvm::errs() << llvm::toString(std::move(Err)) << "\n";
-      return tooling::Replacements();
-    }
-  }
-  return Result;
-}
-
-/// \brief A utility class for replacement related tests.
-class ReplacementTest : public ::testing::Test {
-protected:
-  tooling::Replacement createReplacement(SourceLocation Start, unsigned Length,
-                                         llvm::StringRef ReplacementText) {
-    return tooling::Replacement(Context.Sources, Start, Length,
-                                ReplacementText);
-  }
-
-  RewriterTestContext Context;
-};
-
-} // namespace tooling
-} // namespace clang
-
-#endif // LLVM_CLANG_UNITTESTS_TOOLING_REPLACEMENTTESTBASE_H
diff --git a/gnu/llvm/clang/unittests/Tooling/ReplacementsYamlTest.cpp b/gnu/llvm/clang/unittests/Tooling/ReplacementsYamlTest.cpp
deleted file mode 100644
index 3328d9bad55..00000000000
--- a/gnu/llvm/clang/unittests/Tooling/ReplacementsYamlTest.cpp
+++ /dev/null
@@ -1,122 +0,0 @@
-//===- unittests/Tooling/ReplacementsYamlTest.cpp - Serialization tests ---===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// Tests for serialization of Replacements.
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/Tooling/ReplacementsYaml.h"
-#include "gtest/gtest.h"
-
-using namespace llvm;
-using namespace clang::tooling;
-
-TEST(ReplacementsYamlTest, serializesReplacements) {
-
-  TranslationUnitReplacements Doc;
-
-  Doc.MainSourceFile = "/path/to/source.cpp";
-  Doc.Replacements.emplace_back("/path/to/file1.h", 232, 56, "replacement #1");
-  Doc.Replacements.emplace_back("/path/to/file2.h", 301, 2, "replacement #2");
-
-  std::string YamlContent;
-  llvm::raw_string_ostream YamlContentStream(YamlContent);
-
-  yaml::Output YAML(YamlContentStream);
-  YAML << Doc;
-
-  // NOTE: If this test starts to fail for no obvious reason, check whitespace.
-  ASSERT_STREQ("---\n"
-               "MainSourceFile:  '/path/to/source.cpp'\n"
-               "Replacements:\n"
-               "  - FilePath:        '/path/to/file1.h'\n"
-               "    Offset:          232\n"
-               "    Length:          56\n"
-               "    ReplacementText: 'replacement #1'\n"
-               "  - FilePath:        '/path/to/file2.h'\n"
-               "    Offset:          301\n"
-               "    Length:          2\n"
-               "    ReplacementText: 'replacement #2'\n"
-               "...\n",
-               YamlContentStream.str().c_str());
-}
-
-TEST(ReplacementsYamlTest, serializesNewLines) {
-  TranslationUnitReplacements Doc;
-
-  Doc.MainSourceFile = "/path/to/source.cpp";
-  Doc.Replacements.emplace_back("/path/to/file1.h", 0, 0, "#include <utility>\n");
-
-  std::string YamlContent;
-  llvm::raw_string_ostream YamlContentStream(YamlContent);
-
-  yaml::Output YAML(YamlContentStream);
-  YAML << Doc;
-
-  // NOTE: If this test starts to fail for no obvious reason, check whitespace.
-  ASSERT_STREQ("---\n"
-               "MainSourceFile:  '/path/to/source.cpp'\n"
-               "Replacements:\n"
-               "  - FilePath:        '/path/to/file1.h'\n"
-               "    Offset:          0\n"
-               "    Length:          0\n"
-               "    ReplacementText: \"#include <utility>\\n\"\n"
-               "...\n",
-               YamlContentStream.str().c_str());
-}
-
-TEST(ReplacementsYamlTest, deserializesReplacements) {
-  std::string YamlContent = "---\n"
-                            "MainSourceFile:      /path/to/source.cpp\n"
-                            "Replacements:\n"
-                            "  - FilePath:        /path/to/file1.h\n"
-                            "    Offset:          232\n"
-                            "    Length:          56\n"
-                            "    ReplacementText: 'replacement #1'\n"
-                            "  - FilePath:        /path/to/file2.h\n"
-                            "    Offset:          301\n"
-                            "    Length:          2\n"
-                            "    ReplacementText: 'replacement #2'\n"
-                            "...\n";
-  TranslationUnitReplacements DocActual;
-  yaml::Input YAML(YamlContent);
-  YAML >> DocActual;
-  ASSERT_FALSE(YAML.error());
-  ASSERT_EQ(2u, DocActual.Replacements.size());
-  ASSERT_EQ("/path/to/source.cpp", DocActual.MainSourceFile);
-  ASSERT_EQ("/path/to/file1.h", DocActual.Replacements[0].getFilePath());
-  ASSERT_EQ(232u, DocActual.Replacements[0].getOffset());
-  ASSERT_EQ(56u, DocActual.Replacements[0].getLength());
-  ASSERT_EQ("replacement #1", DocActual.Replacements[0].getReplacementText());
-  ASSERT_EQ("/path/to/file2.h", DocActual.Replacements[1].getFilePath());
-  ASSERT_EQ(301u, DocActual.Replacements[1].getOffset());
-  ASSERT_EQ(2u, DocActual.Replacements[1].getLength());
-  ASSERT_EQ("replacement #2", DocActual.Replacements[1].getReplacementText());
-}
-
-TEST(ReplacementsYamlTest, deserializesWithoutContext) {
-  // Make sure a doc can be read without the context field.
-  std::string YamlContent = "---\n"
-                            "MainSourceFile:      /path/to/source.cpp\n"
-                            "Replacements:\n"
-                            "  - FilePath:        target_file.h\n"
-                            "    Offset:          1\n"
-                            "    Length:          10\n"
-                            "    ReplacementText: replacement\n"
-                            "...\n";
-  TranslationUnitReplacements DocActual;
-  yaml::Input YAML(YamlContent);
-  YAML >> DocActual;
-  ASSERT_FALSE(YAML.error());
-  ASSERT_EQ("/path/to/source.cpp", DocActual.MainSourceFile);
-  ASSERT_EQ(1u, DocActual.Replacements.size());
-  ASSERT_EQ("target_file.h", DocActual.Replacements[0].getFilePath());
-  ASSERT_EQ(1u, DocActual.Replacements[0].getOffset());
-  ASSERT_EQ(10u, DocActual.Replacements[0].getLength());
-  ASSERT_EQ("replacement", DocActual.Replacements[0].getReplacementText());
-}
diff --git a/gnu/llvm/clang/unittests/Tooling/RewriterTest.cpp b/gnu/llvm/clang/unittests/Tooling/RewriterTest.cpp
deleted file mode 100644
index e744940783a..00000000000
--- a/gnu/llvm/clang/unittests/Tooling/RewriterTest.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-//===- unittest/Tooling/RewriterTest.cpp ----------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "RewriterTestContext.h"
-#include "clang/Tooling/Core/Replacement.h"
-#include "gtest/gtest.h"
-
-namespace clang {
-namespace tooling {
-namespace {
-
-TEST(Rewriter, OverwritesChangedFiles) {
-  RewriterTestContext Context;
-  FileID ID = Context.createOnDiskFile("t.cpp", "line1\nline2\nline3\nline4");
-  Context.Rewrite.ReplaceText(Context.getLocation(ID, 2, 1), 5, "replaced");
-  EXPECT_FALSE(Context.Rewrite.overwriteChangedFiles());
-  EXPECT_EQ("line1\nreplaced\nline3\nline4",
-            Context.getFileContentFromDisk("t.cpp")); 
-}
-
-TEST(Rewriter, ContinuesOverwritingFilesOnError) {
-  RewriterTestContext Context;
-  FileID FailingID = Context.createInMemoryFile("invalid/failing.cpp", "test");
-  Context.Rewrite.ReplaceText(Context.getLocation(FailingID, 1, 2), 1, "other");
-  FileID WorkingID = Context.createOnDiskFile(
-    "working.cpp", "line1\nline2\nline3\nline4");
-  Context.Rewrite.ReplaceText(Context.getLocation(WorkingID, 2, 1), 5,
-                              "replaced");
-  EXPECT_TRUE(Context.Rewrite.overwriteChangedFiles());
-  EXPECT_EQ("line1\nreplaced\nline3\nline4",
-            Context.getFileContentFromDisk("working.cpp")); 
-}
-
-TEST(Rewriter, AdjacentInsertAndDelete) {
-  Replacements Replaces;
-  auto Err = Replaces.add(Replacement("<file>", 6, 6, ""));
-  EXPECT_TRUE(!Err);
-  Replaces =
-      Replaces.merge(Replacements(Replacement("<file>", 6, 0, "replaced\n")));
-
-  auto Rewritten = applyAllReplacements("line1\nline2\nline3\nline4", Replaces);
-  EXPECT_TRUE(static_cast<bool>(Rewritten));
-  EXPECT_EQ("line1\nreplaced\nline3\nline4", *Rewritten);
-}
-
-} // end namespace
-} // end namespace tooling
-} // end namespace clang
diff --git a/gnu/llvm/clang/unittests/Tooling/RewriterTestContext.h b/gnu/llvm/clang/unittests/Tooling/RewriterTestContext.h
deleted file mode 100644
index a618ebd3a86..00000000000
--- a/gnu/llvm/clang/unittests/Tooling/RewriterTestContext.h
+++ /dev/null
@@ -1,144 +0,0 @@
-//===--- RewriterTestContext.h ----------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-//  This file defines a utility class for Rewriter related tests.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_CLANG_UNITTESTS_TOOLING_REWRITERTESTCONTEXT_H
-#define LLVM_CLANG_UNITTESTS_TOOLING_REWRITERTESTCONTEXT_H
-
-#include "clang/Basic/Diagnostic.h"
-#include "clang/Basic/DiagnosticOptions.h"
-#include "clang/Basic/FileManager.h"
-#include "clang/Basic/LangOptions.h"
-#include "clang/Basic/SourceManager.h"
-#include "clang/Rewrite/Core/Rewriter.h"
-#include "llvm/Support/FileSystem.h"
-#include "llvm/Support/Path.h"
-#include "llvm/Support/raw_ostream.h"
-
-namespace clang {
-
-/// \brief A very simple diagnostic consumer that prints to stderr and keeps
-/// track of the number of diagnostics.
-///
-/// This avoids a dependency on clangFrontend for FormatTests.
-struct RewriterDiagnosticConsumer : public DiagnosticConsumer {
-  RewriterDiagnosticConsumer() : NumDiagnosticsSeen(0) {}
-  void HandleDiagnostic(DiagnosticsEngine::Level DiagLevel,
-                        const Diagnostic &Info) override {
-    ++NumDiagnosticsSeen;
-    SmallString<100> OutStr;
-    Info.FormatDiagnostic(OutStr);
-    llvm::errs() << OutStr;
-  }
-  unsigned NumDiagnosticsSeen;
-};
-
-/// \brief A class that sets up a ready to use Rewriter.
-///
-/// Useful in unit tests that need a Rewriter. Creates all dependencies
-/// of a Rewriter with default values for testing and provides convenience
-/// methods, which help with writing tests that change files.
-class RewriterTestContext {
- public:
-   RewriterTestContext()
-       : DiagOpts(new DiagnosticOptions()),
-         Diagnostics(IntrusiveRefCntPtr<DiagnosticIDs>(new DiagnosticIDs),
-                     &*DiagOpts),
-         InMemoryFileSystem(new llvm::vfs::InMemoryFileSystem),
-         OverlayFileSystem(
-             new llvm::vfs::OverlayFileSystem(llvm::vfs::getRealFileSystem())),
-         Files(FileSystemOptions(), OverlayFileSystem),
-         Sources(Diagnostics, Files), Rewrite(Sources, Options) {
-     Diagnostics.setClient(&DiagnosticPrinter, false);
-     // FIXME: To make these tests truly in-memory, we need to overlay the
-     // builtin headers.
-     OverlayFileSystem->pushOverlay(InMemoryFileSystem);
-  }
-
-  ~RewriterTestContext() {}
-
-  FileID createInMemoryFile(StringRef Name, StringRef Content) {
-    std::unique_ptr<llvm::MemoryBuffer> Source =
-        llvm::MemoryBuffer::getMemBuffer(Content);
-    InMemoryFileSystem->addFile(Name, 0, std::move(Source));
-
-    auto Entry = Files.getOptionalFileRef(Name);
-    assert(Entry);
-    return Sources.createFileID(*Entry, SourceLocation(), SrcMgr::C_User);
-  }
-
-  // FIXME: this code is mostly a duplicate of
-  // unittests/Tooling/RefactoringTest.cpp. Figure out a way to share it.
-  FileID createOnDiskFile(StringRef Name, StringRef Content) {
-    SmallString<1024> Path;
-    int FD;
-    std::error_code EC = llvm::sys::fs::createTemporaryFile(Name, "", FD, Path);
-    assert(!EC);
-    (void)EC;
-
-    llvm::raw_fd_ostream OutStream(FD, true);
-    OutStream << Content;
-    OutStream.close();
-    auto File = Files.getOptionalFileRef(Path);
-    assert(File);
-
-    StringRef Found =
-        TemporaryFiles.insert(std::make_pair(Name, std::string(Path.str())))
-            .first->second;
-    assert(Found == Path);
-    (void)Found;
-    return Sources.createFileID(*File, SourceLocation(), SrcMgr::C_User);
-  }
-
-  SourceLocation getLocation(FileID ID, unsigned Line, unsigned Column) {
-    SourceLocation Result = Sources.translateFileLineCol(
-        Sources.getFileEntryForID(ID), Line, Column);
-    assert(Result.isValid());
-    return Result;
-  }
-
-  std::string getRewrittenText(FileID ID) {
-    std::string Result;
-    llvm::raw_string_ostream OS(Result);
-    Rewrite.getEditBuffer(ID).write(OS);
-    OS.flush();
-    return Result;
-  }
-
-  std::string getFileContentFromDisk(StringRef Name) {
-    std::string Path = TemporaryFiles.lookup(Name);
-    assert(!Path.empty());
-    // We need to read directly from the FileManager without relaying through
-    // a FileEntry, as otherwise we'd read through an already opened file
-    // descriptor, which might not see the changes made.
-    // FIXME: Figure out whether there is a way to get the SourceManger to
-    // reopen the file.
-    auto FileBuffer = Files.getBufferForFile(Path);
-    return std::string((*FileBuffer)->getBuffer());
-  }
-
-  IntrusiveRefCntPtr<DiagnosticOptions> DiagOpts;
-  DiagnosticsEngine Diagnostics;
-  RewriterDiagnosticConsumer DiagnosticPrinter;
-  IntrusiveRefCntPtr<llvm::vfs::InMemoryFileSystem> InMemoryFileSystem;
-  IntrusiveRefCntPtr<llvm::vfs::OverlayFileSystem> OverlayFileSystem;
-  FileManager Files;
-  SourceManager Sources;
-  LangOptions Options;
-  Rewriter Rewrite;
-
-  // Will be set once on disk files are generated.
-  llvm::StringMap<std::string> TemporaryFiles;
-};
-
-} // end namespace clang
-
-#endif
diff --git a/gnu/llvm/clang/unittests/Tooling/SourceCodeBuildersTest.cpp b/gnu/llvm/clang/unittests/Tooling/SourceCodeBuildersTest.cpp
deleted file mode 100644
index ce99d1e7f52..00000000000
--- a/gnu/llvm/clang/unittests/Tooling/SourceCodeBuildersTest.cpp
+++ /dev/null
@@ -1,248 +0,0 @@
-//===- unittest/Tooling/SourceCodeBuildersTest.cpp ------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/Tooling/Transformer/SourceCodeBuilders.h"
-#include "clang/ASTMatchers/ASTMatchFinder.h"
-#include "clang/ASTMatchers/ASTMatchers.h"
-#include "clang/Tooling/Tooling.h"
-#include "llvm/Testing/Support/SupportHelpers.h"
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-
-using namespace clang;
-using namespace tooling;
-using namespace ast_matchers;
-
-namespace {
-using MatchResult = MatchFinder::MatchResult;
-using llvm::ValueIs;
-
-// Create a valid translation unit from a statement.
-static std::string wrapSnippet(StringRef StatementCode) {
-  return ("struct S { S(); S(int); int field; };\n"
-          "S operator+(const S &a, const S &b);\n"
-          "auto test_snippet = []{" +
-          StatementCode + "};")
-      .str();
-}
-
-static DeclarationMatcher wrapMatcher(const StatementMatcher &Matcher) {
-  return varDecl(hasName("test_snippet"),
-                 hasDescendant(compoundStmt(hasAnySubstatement(Matcher))));
-}
-
-struct TestMatch {
-  // The AST unit from which `result` is built. We bundle it because it backs
-  // the result. Users are not expected to access it.
-  std::unique_ptr<ASTUnit> AstUnit;
-  // The result to use in the test. References `ast_unit`.
-  MatchResult Result;
-};
-
-// Matches `Matcher` against the statement `StatementCode` and returns the
-// result. Handles putting the statement inside a function and modifying the
-// matcher correspondingly. `Matcher` should match one of the statements in
-// `StatementCode` exactly -- that is, produce exactly one match. However,
-// `StatementCode` may contain other statements not described by `Matcher`.
-static llvm::Optional<TestMatch> matchStmt(StringRef StatementCode,
-                                           StatementMatcher Matcher) {
-  auto AstUnit = buildASTFromCode(wrapSnippet(StatementCode));
-  if (AstUnit == nullptr) {
-    ADD_FAILURE() << "AST construction failed";
-    return llvm::None;
-  }
-  ASTContext &Context = AstUnit->getASTContext();
-  auto Matches = ast_matchers::match(wrapMatcher(Matcher), Context);
-  // We expect a single, exact match for the statement.
-  if (Matches.size() != 1) {
-    ADD_FAILURE() << "Wrong number of matches: " << Matches.size();
-    return llvm::None;
-  }
-  return TestMatch{std::move(AstUnit), MatchResult(Matches[0], &Context)};
-}
-
-static void testPredicate(bool (*Pred)(const Expr &), StringRef Snippet,
-                          bool Expected) {
-  auto StmtMatch = matchStmt(Snippet, expr().bind("expr"));
-  ASSERT_TRUE(StmtMatch) << "Snippet: " << Snippet;
-  EXPECT_EQ(Expected, Pred(*StmtMatch->Result.Nodes.getNodeAs<Expr>("expr")))
-      << "Snippet: " << Snippet;
-}
-
-// Tests the predicate on the call argument, assuming `Snippet` is a function
-// call.
-static void testPredicateOnArg(bool (*Pred)(const Expr &), StringRef Snippet,
-                               bool Expected) {
-  auto StmtMatch = matchStmt(
-      Snippet, expr(ignoringImplicit(callExpr(hasArgument(
-                   0, ignoringElidableConstructorCall(expr().bind("arg")))))));
-  ASSERT_TRUE(StmtMatch) << "Snippet: " << Snippet;
-  EXPECT_EQ(Expected, Pred(*StmtMatch->Result.Nodes.getNodeAs<Expr>("arg")))
-      << "Snippet: " << Snippet;
-}
-
-TEST(SourceCodeBuildersTest, needParensAfterUnaryOperator) {
-  testPredicate(needParensAfterUnaryOperator, "3 + 5;", true);
-  testPredicate(needParensAfterUnaryOperator, "true ? 3 : 5;", true);
-  testPredicate(needParensAfterUnaryOperator, "S(3) + S(5);", true);
-
-  testPredicate(needParensAfterUnaryOperator, "int x; x;", false);
-  testPredicate(needParensAfterUnaryOperator, "int(3.0);", false);
-  testPredicate(needParensAfterUnaryOperator, "void f(); f();", false);
-  testPredicate(needParensAfterUnaryOperator, "int a[3]; a[0];", false);
-  testPredicate(needParensAfterUnaryOperator, "S x; x.field;", false);
-  testPredicate(needParensAfterUnaryOperator, "int x = 1; --x;", false);
-  testPredicate(needParensAfterUnaryOperator, "int x = 1; -x;", false);
-}
-
-TEST(SourceCodeBuildersTest, needParensAfterUnaryOperatorInImplicitConversion) {
-  // The binary operation will be embedded in various implicit
-  // expressions. Verify they are ignored.
-  testPredicateOnArg(needParensAfterUnaryOperator, "void f(S); f(3 + 5);",
-                     true);
-}
-
-TEST(SourceCodeBuildersTest, mayEverNeedParens) {
-  testPredicate(mayEverNeedParens, "3 + 5;", true);
-  testPredicate(mayEverNeedParens, "true ? 3 : 5;", true);
-  testPredicate(mayEverNeedParens, "int x = 1; --x;", true);
-  testPredicate(mayEverNeedParens, "int x = 1; -x;", true);
-
-  testPredicate(mayEverNeedParens, "int x; x;", false);
-  testPredicate(mayEverNeedParens, "int(3.0);", false);
-  testPredicate(mayEverNeedParens, "void f(); f();", false);
-  testPredicate(mayEverNeedParens, "int a[3]; a[0];", false);
-  testPredicate(mayEverNeedParens, "S x; x.field;", false);
-}
-
-TEST(SourceCodeBuildersTest, mayEverNeedParensInImplictConversion) {
-  // The binary operation will be embedded in various implicit
-  // expressions. Verify they are ignored.
-  testPredicateOnArg(mayEverNeedParens, "void f(S); f(3 + 5);", true);
-}
-
-static void testBuilder(
-    llvm::Optional<std::string> (*Builder)(const Expr &, const ASTContext &),
-    StringRef Snippet, StringRef Expected) {
-  auto StmtMatch = matchStmt(Snippet, expr().bind("expr"));
-  ASSERT_TRUE(StmtMatch);
-  EXPECT_THAT(Builder(*StmtMatch->Result.Nodes.getNodeAs<Expr>("expr"),
-                      *StmtMatch->Result.Context),
-              ValueIs(std::string(Expected)));
-}
-
-TEST(SourceCodeBuildersTest, BuildParensUnaryOp) {
-  testBuilder(buildParens, "-4;", "(-4)");
-}
-
-TEST(SourceCodeBuildersTest, BuildParensBinOp) {
-  testBuilder(buildParens, "4 + 4;", "(4 + 4)");
-}
-
-TEST(SourceCodeBuildersTest, BuildParensValue) {
-  testBuilder(buildParens, "4;", "4");
-}
-
-TEST(SourceCodeBuildersTest, BuildParensSubscript) {
-  testBuilder(buildParens, "int a[3]; a[0];", "a[0]");
-}
-
-TEST(SourceCodeBuildersTest, BuildParensCall) {
-  testBuilder(buildParens, "int f(int); f(4);", "f(4)");
-}
-
-TEST(SourceCodeBuildersTest, BuildAddressOfValue) {
-  testBuilder(buildAddressOf, "S x; x;", "&x");
-}
-
-TEST(SourceCodeBuildersTest, BuildAddressOfPointerDereference) {
-  testBuilder(buildAddressOf, "S *x; *x;", "x");
-}
-
-TEST(SourceCodeBuildersTest, BuildAddressOfPointerDereferenceIgnoresParens) {
-  testBuilder(buildAddressOf, "S *x; *(x);", "x");
-}
-
-TEST(SourceCodeBuildersTest, BuildAddressOfBinaryOperation) {
-  testBuilder(buildAddressOf, "S x; x + x;", "&(x + x)");
-}
-
-TEST(SourceCodeBuildersTest, BuildAddressOfImplicitThis) {
-  StringRef Snippet = R"cc(
-    struct Struct {
-      void foo() {}
-      void bar() {
-        foo();
-      }
-    };
-  )cc";
-  auto StmtMatch = matchStmt(
-      Snippet,
-      cxxMemberCallExpr(onImplicitObjectArgument(cxxThisExpr().bind("expr"))));
-  ASSERT_TRUE(StmtMatch);
-  EXPECT_THAT(buildAddressOf(*StmtMatch->Result.Nodes.getNodeAs<Expr>("expr"),
-                             *StmtMatch->Result.Context),
-              ValueIs(std::string("this")));
-}
-
-TEST(SourceCodeBuildersTest, BuildDereferencePointer) {
-  testBuilder(buildDereference, "S *x; x;", "*x");
-}
-
-TEST(SourceCodeBuildersTest, BuildDereferenceValueAddress) {
-  testBuilder(buildDereference, "S x; &x;", "x");
-}
-
-TEST(SourceCodeBuildersTest, BuildDereferenceValueAddressIgnoresParens) {
-  testBuilder(buildDereference, "S x; &(x);", "x");
-}
-
-TEST(SourceCodeBuildersTest, BuildDereferenceBinaryOperation) {
-  testBuilder(buildDereference, "S *x; x + 1;", "*(x + 1)");
-}
-
-TEST(SourceCodeBuildersTest, BuildDotValue) {
-  testBuilder(buildDot, "S x; x;", "x.");
-}
-
-TEST(SourceCodeBuildersTest, BuildDotPointerDereference) {
-  testBuilder(buildDot, "S *x; *x;", "x->");
-}
-
-TEST(SourceCodeBuildersTest, BuildDotPointerDereferenceIgnoresParens) {
-  testBuilder(buildDot, "S *x; *(x);", "x->");
-}
-
-TEST(SourceCodeBuildersTest, BuildDotBinaryOperation) {
-  testBuilder(buildDot, "S x; x + x;", "(x + x).");
-}
-
-TEST(SourceCodeBuildersTest, BuildDotPointerDereferenceExprWithParens) {
-  testBuilder(buildDot, "S *x; *(x + 1);", "(x + 1)->");
-}
-
-TEST(SourceCodeBuildersTest, BuildArrowPointer) {
-  testBuilder(buildArrow, "S *x; x;", "x->");
-}
-
-TEST(SourceCodeBuildersTest, BuildArrowValueAddress) {
-  testBuilder(buildArrow, "S x; &x;", "x.");
-}
-
-TEST(SourceCodeBuildersTest, BuildArrowValueAddressIgnoresParens) {
-  testBuilder(buildArrow, "S x; &(x);", "x.");
-}
-
-TEST(SourceCodeBuildersTest, BuildArrowBinaryOperation) {
-  testBuilder(buildArrow, "S *x; x + 1;", "(x + 1)->");
-}
-
-TEST(SourceCodeBuildersTest, BuildArrowValueAddressWithParens) {
-  testBuilder(buildArrow, "S x; &(true ? x : x);", "(true ? x : x).");
-}
-} // namespace
diff --git a/gnu/llvm/clang/unittests/Tooling/SourceCodeTest.cpp b/gnu/llvm/clang/unittests/Tooling/SourceCodeTest.cpp
deleted file mode 100644
index badc6f88fc0..00000000000
--- a/gnu/llvm/clang/unittests/Tooling/SourceCodeTest.cpp
+++ /dev/null
@@ -1,691 +0,0 @@
-//===- unittest/Tooling/SourceCodeTest.cpp --------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/Tooling/Transformer/SourceCode.h"
-#include "TestVisitor.h"
-#include "clang/Basic/Diagnostic.h"
-#include "clang/Basic/SourceLocation.h"
-#include "clang/Lex/Lexer.h"
-#include "llvm/Testing/Support/Annotations.h"
-#include "llvm/Testing/Support/Error.h"
-#include "llvm/Testing/Support/SupportHelpers.h"
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
-using namespace clang;
-
-using llvm::Failed;
-using llvm::Succeeded;
-using llvm::ValueIs;
-using tooling::getAssociatedRange;
-using tooling::getExtendedRange;
-using tooling::getExtendedText;
-using tooling::getRangeForEdit;
-using tooling::getText;
-using tooling::maybeExtendRange;
-using tooling::validateEditRange;
-
-namespace {
-
-struct IntLitVisitor : TestVisitor<IntLitVisitor> {
-  bool VisitIntegerLiteral(IntegerLiteral *Expr) {
-    OnIntLit(Expr, Context);
-    return true;
-  }
-
-  std::function<void(IntegerLiteral *, ASTContext *Context)> OnIntLit;
-};
-
-struct CallsVisitor : TestVisitor<CallsVisitor> {
-  bool VisitCallExpr(CallExpr *Expr) {
-    OnCall(Expr, Context);
-    return true;
-  }
-
-  std::function<void(CallExpr *, ASTContext *Context)> OnCall;
-};
-
-// Equality matcher for `clang::CharSourceRange`, which lacks `operator==`.
-MATCHER_P(EqualsRange, R, "") {
-  return arg.isTokenRange() == R.isTokenRange() &&
-         arg.getBegin() == R.getBegin() && arg.getEnd() == R.getEnd();
-}
-
-MATCHER_P2(EqualsAnnotatedRange, Context, R, "") {
-  if (arg.getBegin().isMacroID()) {
-    *result_listener << "which starts in a macro";
-    return false;
-  }
-  if (arg.getEnd().isMacroID()) {
-    *result_listener << "which ends in a macro";
-    return false;
-  }
-
-  CharSourceRange Range = Lexer::getAsCharRange(
-      arg, Context->getSourceManager(), Context->getLangOpts());
-  unsigned Begin = Context->getSourceManager().getFileOffset(Range.getBegin());
-  unsigned End = Context->getSourceManager().getFileOffset(Range.getEnd());
-
-  *result_listener << "which is a " << (arg.isTokenRange() ? "Token" : "Char")
-                   << " range [" << Begin << "," << End << ")";
-  return Begin == R.Begin && End == R.End;
-}
-
-static ::testing::Matcher<CharSourceRange> AsRange(const SourceManager &SM,
-                                                   llvm::Annotations::Range R) {
-  return EqualsRange(CharSourceRange::getCharRange(
-      SM.getLocForStartOfFile(SM.getMainFileID()).getLocWithOffset(R.Begin),
-      SM.getLocForStartOfFile(SM.getMainFileID()).getLocWithOffset(R.End)));
-}
-
-// Base class for visitors that expect a single match corresponding to a
-// specific annotated range.
-template <typename T> class AnnotatedCodeVisitor : public TestVisitor<T> {
-protected:
-  int MatchCount = 0;
-  llvm::Annotations Code;
-
-public:
-  AnnotatedCodeVisitor() : Code("$r[[]]") {}
-  // Helper for tests of `getAssociatedRange`.
-  bool VisitDeclHelper(Decl *Decl) {
-    // Only consider explicit declarations.
-    if (Decl->isImplicit())
-      return true;
-
-    ++MatchCount;
-    EXPECT_THAT(getAssociatedRange(*Decl, *this->Context),
-                EqualsAnnotatedRange(this->Context, Code.range("r")))
-        << Code.code();
-    return true;
-  }
-
-  bool runOverAnnotated(llvm::StringRef AnnotatedCode,
-                        std::vector<std::string> Args = {}) {
-    Code = llvm::Annotations(AnnotatedCode);
-    MatchCount = 0;
-    Args.push_back("-std=c++11");
-    Args.push_back("-fno-delayed-template-parsing");
-    bool result = tooling::runToolOnCodeWithArgs(this->CreateTestAction(),
-                                                 Code.code(), Args);
-    EXPECT_EQ(MatchCount, 1) << AnnotatedCode;
-    return result;
-  }
-};
-
-TEST(SourceCodeTest, getText) {
-  CallsVisitor Visitor;
-
-  Visitor.OnCall = [](CallExpr *CE, ASTContext *Context) {
-    EXPECT_EQ("foo(x, y)", getText(*CE, *Context));
-  };
-  Visitor.runOver("void foo(int x, int y) { foo(x, y); }");
-
-  Visitor.OnCall = [](CallExpr *CE, ASTContext *Context) {
-    EXPECT_EQ("APPLY(foo, x, y)", getText(*CE, *Context));
-  };
-  Visitor.runOver("#define APPLY(f, x, y) f(x, y)\n"
-                  "void foo(int x, int y) { APPLY(foo, x, y); }");
-}
-
-TEST(SourceCodeTest, getTextWithMacro) {
-  CallsVisitor Visitor;
-
-  Visitor.OnCall = [](CallExpr *CE, ASTContext *Context) {
-    EXPECT_EQ("F OO", getText(*CE, *Context));
-    Expr *P0 = CE->getArg(0);
-    Expr *P1 = CE->getArg(1);
-    EXPECT_EQ("", getText(*P0, *Context));
-    EXPECT_EQ("", getText(*P1, *Context));
-  };
-  Visitor.runOver("#define F foo(\n"
-                  "#define OO x, y)\n"
-                  "void foo(int x, int y) { F OO ; }");
-
-  Visitor.OnCall = [](CallExpr *CE, ASTContext *Context) {
-    EXPECT_EQ("", getText(*CE, *Context));
-    Expr *P0 = CE->getArg(0);
-    Expr *P1 = CE->getArg(1);
-    EXPECT_EQ("x", getText(*P0, *Context));
-    EXPECT_EQ("y", getText(*P1, *Context));
-  };
-  Visitor.runOver("#define FOO(x, y) (void)x; (void)y; foo(x, y);\n"
-                  "void foo(int x, int y) { FOO(x,y) }");
-}
-
-TEST(SourceCodeTest, getExtendedText) {
-  CallsVisitor Visitor;
-
-  Visitor.OnCall = [](CallExpr *CE, ASTContext *Context) {
-    EXPECT_EQ("foo(x, y);",
-              getExtendedText(*CE, tok::TokenKind::semi, *Context));
-
-    Expr *P0 = CE->getArg(0);
-    Expr *P1 = CE->getArg(1);
-    EXPECT_EQ("x", getExtendedText(*P0, tok::TokenKind::semi, *Context));
-    EXPECT_EQ("x,", getExtendedText(*P0, tok::TokenKind::comma, *Context));
-    EXPECT_EQ("y", getExtendedText(*P1, tok::TokenKind::semi, *Context));
-  };
-  Visitor.runOver("void foo(int x, int y) { foo(x, y); }");
-  Visitor.runOver("void foo(int x, int y) { if (true) foo(x, y); }");
-  Visitor.runOver("int foo(int x, int y) { if (true) return 3 + foo(x, y); }");
-  Visitor.runOver("void foo(int x, int y) { for (foo(x, y);;) ++x; }");
-  Visitor.runOver(
-      "bool foo(int x, int y) { for (;foo(x, y);) x = 1; return true; }");
-
-  Visitor.OnCall = [](CallExpr *CE, ASTContext *Context) {
-    EXPECT_EQ("foo()", getExtendedText(*CE, tok::TokenKind::semi, *Context));
-  };
-  Visitor.runOver("bool foo() { if (foo()) return true; return false; }");
-  Visitor.runOver("void foo() { int x; for (;; foo()) ++x; }");
-  Visitor.runOver("int foo() { return foo() + 3; }");
-}
-
-TEST(SourceCodeTest, maybeExtendRange_TokenRange) {
-  struct ExtendTokenRangeVisitor
-      : AnnotatedCodeVisitor<ExtendTokenRangeVisitor> {
-    bool VisitCallExpr(CallExpr *CE) {
-      ++MatchCount;
-      EXPECT_THAT(getExtendedRange(*CE, tok::TokenKind::semi, *Context),
-                  EqualsAnnotatedRange(Context, Code.range("r")));
-      return true;
-    }
-  };
-
-  ExtendTokenRangeVisitor Visitor;
-  // Extends to include semicolon.
-  Visitor.runOverAnnotated("void f(int x, int y) { $r[[f(x, y);]] }");
-  // Does not extend to include semicolon.
-  Visitor.runOverAnnotated(
-      "int f(int x, int y) { if (0) return $r[[f(x, y)]] + 3; }");
-}
-
-TEST(SourceCodeTest, maybeExtendRange_CharRange) {
-  struct ExtendCharRangeVisitor : AnnotatedCodeVisitor<ExtendCharRangeVisitor> {
-    bool VisitCallExpr(CallExpr *CE) {
-      ++MatchCount;
-      CharSourceRange Call = Lexer::getAsCharRange(CE->getSourceRange(),
-                                                   Context->getSourceManager(),
-                                                   Context->getLangOpts());
-      EXPECT_THAT(maybeExtendRange(Call, tok::TokenKind::semi, *Context),
-                  EqualsAnnotatedRange(Context, Code.range("r")));
-      return true;
-    }
-  };
-  ExtendCharRangeVisitor Visitor;
-  // Extends to include semicolon.
-  Visitor.runOverAnnotated("void f(int x, int y) { $r[[f(x, y);]] }");
-  // Does not extend to include semicolon.
-  Visitor.runOverAnnotated(
-      "int f(int x, int y) { if (0) return $r[[f(x, y)]] + 3; }");
-}
-
-TEST(SourceCodeTest, getAssociatedRange) {
-  struct VarDeclsVisitor : AnnotatedCodeVisitor<VarDeclsVisitor> {
-    bool VisitVarDecl(VarDecl *Decl) { return VisitDeclHelper(Decl); }
-  };
-  VarDeclsVisitor Visitor;
-
-  // Includes semicolon.
-  Visitor.runOverAnnotated("$r[[int x = 4;]]");
-
-  // Includes newline and semicolon.
-  Visitor.runOverAnnotated("$r[[int x = 4;\n]]");
-
-  // Includes trailing comments.
-  Visitor.runOverAnnotated("$r[[int x = 4; // Comment\n]]");
-  Visitor.runOverAnnotated("$r[[int x = 4; /* Comment */\n]]");
-
-  // Does *not* include trailing comments when another entity appears between
-  // the decl and the comment.
-  Visitor.runOverAnnotated("$r[[int x = 4;]] class C {}; // Comment\n");
-
-  // Includes attributes.
-  Visitor.runOverAnnotated(R"cpp(
-      #define ATTR __attribute__((deprecated("message")))
-      $r[[ATTR
-      int x;]])cpp");
-
-  // Includes attributes and comments together.
-  Visitor.runOverAnnotated(R"cpp(
-      #define ATTR __attribute__((deprecated("message")))
-      $r[[ATTR
-      // Commment.
-      int x;]])cpp");
-}
-
-TEST(SourceCodeTest, getAssociatedRangeClasses) {
-  struct RecordDeclsVisitor : AnnotatedCodeVisitor<RecordDeclsVisitor> {
-    bool VisitRecordDecl(RecordDecl *Decl) { return VisitDeclHelper(Decl); }
-  };
-  RecordDeclsVisitor Visitor;
-
-  Visitor.runOverAnnotated("$r[[class A;]]");
-  Visitor.runOverAnnotated("$r[[class A {};]]");
-
-  // Includes leading template annotation.
-  Visitor.runOverAnnotated("$r[[template <typename T> class A;]]");
-  Visitor.runOverAnnotated("$r[[template <typename T> class A {};]]");
-}
-
-TEST(SourceCodeTest, getAssociatedRangeClassTemplateSpecializations) {
-  struct CXXRecordDeclsVisitor : AnnotatedCodeVisitor<CXXRecordDeclsVisitor> {
-    bool VisitCXXRecordDecl(CXXRecordDecl *Decl) {
-      return Decl->getTemplateSpecializationKind() !=
-                 TSK_ExplicitSpecialization ||
-             VisitDeclHelper(Decl);
-    }
-  };
-  CXXRecordDeclsVisitor Visitor;
-
-  Visitor.runOverAnnotated(R"cpp(
-      template <typename T> class A{};
-      $r[[template <> class A<int>;]])cpp");
-  Visitor.runOverAnnotated(R"cpp(
-      template <typename T> class A{};
-      $r[[template <> class A<int> {};]])cpp");
-}
-
-TEST(SourceCodeTest, getAssociatedRangeFunctions) {
-  struct FunctionDeclsVisitor : AnnotatedCodeVisitor<FunctionDeclsVisitor> {
-    bool VisitFunctionDecl(FunctionDecl *Decl) { return VisitDeclHelper(Decl); }
-  };
-  FunctionDeclsVisitor Visitor;
-
-  Visitor.runOverAnnotated("$r[[int f();]]");
-  Visitor.runOverAnnotated("$r[[int f() { return 0; }]]");
-  // Includes leading template annotation.
-  Visitor.runOverAnnotated("$r[[template <typename T> int f();]]");
-  Visitor.runOverAnnotated("$r[[template <typename T> int f() { return 0; }]]");
-}
-
-TEST(SourceCodeTest, getAssociatedRangeMemberTemplates) {
-  struct CXXMethodDeclsVisitor : AnnotatedCodeVisitor<CXXMethodDeclsVisitor> {
-    bool VisitCXXMethodDecl(CXXMethodDecl *Decl) {
-      // Only consider the definition of the template.
-      return !Decl->doesThisDeclarationHaveABody() || VisitDeclHelper(Decl);
-    }
-  };
-  CXXMethodDeclsVisitor Visitor;
-
-  Visitor.runOverAnnotated(R"cpp(
-      template <typename C>
-      struct A { template <typename T> int member(T v); };
-
-      $r[[template <typename C>
-      template  <typename T>
-      int A<C>::member(T v) { return 0; }]])cpp");
-}
-
-TEST(SourceCodeTest, getAssociatedRangeWithComments) {
-  struct VarDeclsVisitor : AnnotatedCodeVisitor<VarDeclsVisitor> {
-    bool VisitVarDecl(VarDecl *Decl) { return VisitDeclHelper(Decl); }
-  };
-
-  VarDeclsVisitor Visitor;
-  auto Visit = [&](llvm::StringRef AnnotatedCode) {
-    Visitor.runOverAnnotated(AnnotatedCode, {"-fparse-all-comments"});
-  };
-
-  // Includes leading comments.
-  Visit("$r[[// Comment.\nint x = 4;]]");
-  Visit("$r[[// Comment.\nint x = 4;\n]]");
-  Visit("$r[[/* Comment.*/\nint x = 4;\n]]");
-  // ... even if separated by (extra) horizontal whitespace.
-  Visit("$r[[/* Comment.*/  \nint x = 4;\n]]");
-
-  // Includes comments even in the presence of trailing whitespace.
-  Visit("$r[[// Comment.\nint x = 4;]]  ");
-
-  // Includes comments when the declaration is followed by the beginning or end
-  // of a compound statement.
-  Visit(R"cpp(
-  void foo() {
-    $r[[/* C */
-    int x = 4;
-  ]]};)cpp");
-  Visit(R"cpp(
-  void foo() {
-    $r[[/* C */
-    int x = 4;
-   ]]{ class Foo {}; }
-   })cpp");
-
-  // Includes comments inside macros (when decl is in the same macro).
-  Visit(R"cpp(
-      #define DECL /* Comment */ int x
-      $r[[DECL;]])cpp");
-
-  // Does not include comments when only the decl or the comment come from a
-  // macro.
-  // FIXME: Change code to allow this.
-  Visit(R"cpp(
-      #define DECL int x
-      // Comment
-      $r[[DECL;]])cpp");
-  Visit(R"cpp(
-      #define COMMENT /* Comment */
-      COMMENT
-      $r[[int x;]])cpp");
-
-  // Includes multi-line comments.
-  Visit(R"cpp(
-      $r[[/* multi
-       * line
-       * comment
-       */
-      int x;]])cpp");
-  Visit(R"cpp(
-      $r[[// multi
-      // line
-      // comment
-      int x;]])cpp");
-
-  // Does not include comments separated by multiple empty lines.
-  Visit("// Comment.\n\n\n$r[[int x = 4;\n]]");
-  Visit("/* Comment.*/\n\n\n$r[[int x = 4;\n]]");
-
-  // Does not include comments before a *series* of declarations.
-  Visit(R"cpp(
-      // Comment.
-      $r[[int x = 4;
-      ]]class foo {};)cpp");
-
-  // Does not include IfThisThenThat comments
-  Visit("// LINT.IfChange.\n$r[[int x = 4;]]");
-  Visit("// LINT.ThenChange.\n$r[[int x = 4;]]");
-
-  // Includes attributes.
-  Visit(R"cpp(
-      #define ATTR __attribute__((deprecated("message")))
-      $r[[ATTR
-      int x;]])cpp");
-
-  // Includes attributes and comments together.
-  Visit(R"cpp(
-      #define ATTR __attribute__((deprecated("message")))
-      $r[[ATTR
-      // Commment.
-      int x;]])cpp");
-}
-
-TEST(SourceCodeTest, getAssociatedRangeInvalidForPartialExpansions) {
-  struct FailingVarDeclsVisitor : TestVisitor<FailingVarDeclsVisitor> {
-    FailingVarDeclsVisitor() {}
-    bool VisitVarDecl(VarDecl *Decl) {
-      EXPECT_TRUE(getAssociatedRange(*Decl, *Context).isInvalid());
-      return true;
-    }
-  };
-
-  FailingVarDeclsVisitor Visitor;
-  // Should fail because it only includes a part of the expansion.
-  std::string Code = R"cpp(
-      #define DECL class foo { }; int x
-      DECL;)cpp";
-  Visitor.runOver(Code);
-}
-
-TEST(SourceCodeTest, EditRangeWithMacroExpansionsShouldSucceed) {
-  // The call expression, whose range we are extracting, includes two macro
-  // expansions.
-  llvm::Annotations Code(R"cpp(
-#define M(a) a * 13
-int foo(int x, int y);
-int a = $r[[foo(M(1), M(2))]];
-)cpp");
-
-  CallsVisitor Visitor;
-
-  Visitor.OnCall = [&Code](CallExpr *CE, ASTContext *Context) {
-    auto Range = CharSourceRange::getTokenRange(CE->getSourceRange());
-    EXPECT_THAT(getRangeForEdit(Range, *Context),
-                ValueIs(AsRange(Context->getSourceManager(), Code.range("r"))));
-  };
-  Visitor.runOver(Code.code());
-}
-
-TEST(SourceCodeTest, EditWholeMacroExpansionShouldSucceed) {
-  llvm::Annotations Code(R"cpp(
-#define FOO 10
-int a = $r[[FOO]];
-)cpp");
-
-  IntLitVisitor Visitor;
-  Visitor.OnIntLit = [&Code](IntegerLiteral *Expr, ASTContext *Context) {
-    auto Range = CharSourceRange::getTokenRange(Expr->getSourceRange());
-    EXPECT_THAT(getRangeForEdit(Range, *Context),
-                ValueIs(AsRange(Context->getSourceManager(), Code.range("r"))));
-  };
-  Visitor.runOver(Code.code());
-}
-
-TEST(SourceCodeTest, EditPartialMacroExpansionShouldFail) {
-  std::string Code = R"cpp(
-#define BAR 10+
-int c = BAR 3.0;
-)cpp";
-
-  IntLitVisitor Visitor;
-  Visitor.OnIntLit = [](IntegerLiteral *Expr, ASTContext *Context) {
-    auto Range = CharSourceRange::getTokenRange(Expr->getSourceRange());
-    EXPECT_FALSE(getRangeForEdit(Range, *Context).hasValue());
-  };
-  Visitor.runOver(Code);
-}
-
-TEST(SourceCodeTest, EditWholeMacroArgShouldSucceed) {
-  llvm::Annotations Code(R"cpp(
-#define FOO(a) a + 7.0;
-int a = FOO($r[[10]]);
-)cpp");
-
-  IntLitVisitor Visitor;
-  Visitor.OnIntLit = [&Code](IntegerLiteral *Expr, ASTContext *Context) {
-    auto Range = CharSourceRange::getTokenRange(Expr->getSourceRange());
-    EXPECT_THAT(getRangeForEdit(Range, *Context),
-                ValueIs(AsRange(Context->getSourceManager(), Code.range("r"))));
-  };
-  Visitor.runOver(Code.code());
-}
-
-TEST(SourceCodeTest, EditPartialMacroArgShouldSucceed) {
-  llvm::Annotations Code(R"cpp(
-#define FOO(a) a + 7.0;
-int a = FOO($r[[10]] + 10.0);
-)cpp");
-
-  IntLitVisitor Visitor;
-  Visitor.OnIntLit = [&Code](IntegerLiteral *Expr, ASTContext *Context) {
-    auto Range = CharSourceRange::getTokenRange(Expr->getSourceRange());
-    EXPECT_THAT(getRangeForEdit(Range, *Context),
-                ValueIs(AsRange(Context->getSourceManager(), Code.range("r"))));
-  };
-  Visitor.runOver(Code.code());
-}
-
-TEST(SourceCodeTest, EditRangeWithMacroExpansionsIsValid) {
-  // The call expression, whose range we are extracting, includes two macro
-  // expansions.
-  llvm::StringRef Code = R"cpp(
-#define M(a) a * 13
-int foo(int x, int y);
-int a = foo(M(1), M(2));
-)cpp";
-
-  CallsVisitor Visitor;
-
-  Visitor.OnCall = [](CallExpr *CE, ASTContext *Context) {
-    auto Range = CharSourceRange::getTokenRange(CE->getSourceRange());
-    EXPECT_THAT_ERROR(validateEditRange(Range, Context->getSourceManager()),
-                      Succeeded());
-  };
-  Visitor.runOver(Code);
-}
-
-TEST(SourceCodeTest, SpellingRangeOfMacroArgIsValid) {
-  llvm::StringRef Code = R"cpp(
-#define FOO(a) a + 7.0;
-int a = FOO(10);
-)cpp";
-
-  IntLitVisitor Visitor;
-  Visitor.OnIntLit = [](IntegerLiteral *Expr, ASTContext *Context) {
-    SourceLocation ArgLoc =
-        Context->getSourceManager().getSpellingLoc(Expr->getBeginLoc());
-    // The integer literal is a single token.
-    auto ArgRange = CharSourceRange::getTokenRange(ArgLoc);
-    EXPECT_THAT_ERROR(validateEditRange(ArgRange, Context->getSourceManager()),
-                      Succeeded());
-  };
-  Visitor.runOver(Code);
-}
-
-TEST(SourceCodeTest, InvalidEditRangeIsInvalid) {
-  llvm::StringRef Code = "int c = 10;";
-
-  // We use the visitor just to get a valid context.
-  IntLitVisitor Visitor;
-  Visitor.OnIntLit = [](IntegerLiteral *, ASTContext *Context) {
-    CharSourceRange Invalid;
-    EXPECT_THAT_ERROR(validateEditRange(Invalid, Context->getSourceManager()),
-                      Failed());
-  };
-  Visitor.runOver(Code);
-}
-
-TEST(SourceCodeTest, InvertedEditRangeIsInvalid) {
-  llvm::StringRef Code = R"cpp(
-int foo(int x);
-int a = foo(2);
-)cpp";
-
-  CallsVisitor Visitor;
-  Visitor.OnCall = [](CallExpr *Expr, ASTContext *Context) {
-    auto InvertedRange = CharSourceRange::getTokenRange(
-        SourceRange(Expr->getEndLoc(), Expr->getBeginLoc()));
-    EXPECT_THAT_ERROR(
-        validateEditRange(InvertedRange, Context->getSourceManager()),
-        Failed());
-  };
-  Visitor.runOver(Code);
-}
-
-TEST(SourceCodeTest, MacroArgIsInvalid) {
-  llvm::StringRef Code = R"cpp(
-#define FOO(a) a + 7.0;
-int a = FOO(10);
-)cpp";
-
-  IntLitVisitor Visitor;
-  Visitor.OnIntLit = [](IntegerLiteral *Expr, ASTContext *Context) {
-    auto Range = CharSourceRange::getTokenRange(Expr->getSourceRange());
-    EXPECT_THAT_ERROR(validateEditRange(Range, Context->getSourceManager()),
-                      Failed());
-  };
-  Visitor.runOver(Code);
-}
-
-TEST(SourceCodeTest, EditWholeMacroExpansionIsInvalid) {
-  llvm::StringRef Code = R"cpp(
-#define FOO 10
-int a = FOO;
-)cpp";
-
-  IntLitVisitor Visitor;
-  Visitor.OnIntLit = [](IntegerLiteral *Expr, ASTContext *Context) {
-    auto Range = CharSourceRange::getTokenRange(Expr->getSourceRange());
-    EXPECT_THAT_ERROR(validateEditRange(Range, Context->getSourceManager()),
-                      Failed());
-
-  };
-  Visitor.runOver(Code);
-}
-
-TEST(SourceCodeTest, EditPartialMacroExpansionIsInvalid) {
-  llvm::StringRef Code = R"cpp(
-#define BAR 10+
-int c = BAR 3.0;
-)cpp";
-
-  IntLitVisitor Visitor;
-  Visitor.OnIntLit = [](IntegerLiteral *Expr, ASTContext *Context) {
-    auto Range = CharSourceRange::getTokenRange(Expr->getSourceRange());
-    EXPECT_THAT_ERROR(validateEditRange(Range, Context->getSourceManager()),
-                      Failed());
-  };
-  Visitor.runOver(Code);
-}
-
-TEST(SourceCodeTest, GetCallReturnType_Dependent) {
-  llvm::Annotations Code{R"cpp(
-template<class T, class F>
-void templ(const T& t, F f) {}
-
-template<class T, class F>
-void templ1(const T& t, F f) {
-  $test1[[f(t)]];
-}
-
-int f_overload(int) { return 1; }
-int f_overload(double) { return 2; }
-
-void f1() {
-  int i = 0;
-  templ(i, [](const auto &p) {
-    $test2[[f_overload(p)]];
-  });
-}
-
-struct A {
-  void f_overload(int);
-  void f_overload(double);
-};
-
-void f2() {
- int i = 0;
- templ(i, [](const auto &p) {
-   A a;
-   $test3[[a.f_overload(p)]];
- });
-}
-)cpp"};
-
-  llvm::Annotations::Range R1 = Code.range("test1");
-  llvm::Annotations::Range R2 = Code.range("test2");
-  llvm::Annotations::Range R3 = Code.range("test3");
-
-  CallsVisitor Visitor;
-  Visitor.OnCall = [&R1, &R2, &R3](CallExpr *Expr, ASTContext *Context) {
-    unsigned Begin = Context->getSourceManager().getFileOffset(
-        Expr->getSourceRange().getBegin());
-    unsigned End = Context->getSourceManager().getFileOffset(
-        Expr->getSourceRange().getEnd());
-    llvm::Annotations::Range R{Begin, End + 1};
-
-    QualType CalleeType = Expr->getCallee()->getType();
-    if (R == R1) {
-      ASSERT_TRUE(CalleeType->isDependentType());
-      EXPECT_EQ(Expr->getCallReturnType(*Context), Context->DependentTy);
-    } else if (R == R2) {
-      ASSERT_FALSE(CalleeType->isDependentType());
-      ASSERT_TRUE(CalleeType->isSpecificPlaceholderType(BuiltinType::Overload));
-      ASSERT_TRUE(isa<UnresolvedLookupExpr>(Expr->getCallee()));
-      EXPECT_EQ(Expr->getCallReturnType(*Context), Context->DependentTy);
-    } else if (R == R3) {
-      ASSERT_FALSE(CalleeType->isDependentType());
-      ASSERT_TRUE(
-          CalleeType->isSpecificPlaceholderType(BuiltinType::BoundMember));
-      ASSERT_TRUE(isa<UnresolvedMemberExpr>(Expr->getCallee()));
-      EXPECT_EQ(Expr->getCallReturnType(*Context), Context->DependentTy);
-    }
-  };
-  Visitor.runOver(Code.code(), CallsVisitor::Lang_CXX14);
-}
-
-} // end anonymous namespace
diff --git a/gnu/llvm/clang/unittests/Tooling/StencilTest.cpp b/gnu/llvm/clang/unittests/Tooling/StencilTest.cpp
deleted file mode 100644
index 0b5b9691dad..00000000000
--- a/gnu/llvm/clang/unittests/Tooling/StencilTest.cpp
+++ /dev/null
@@ -1,710 +0,0 @@
-//===- unittest/Tooling/StencilTest.cpp -----------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/Tooling/Transformer/Stencil.h"
-#include "clang/AST/ASTTypeTraits.h"
-#include "clang/AST/Expr.h"
-#include "clang/ASTMatchers/ASTMatchers.h"
-#include "clang/Tooling/FixIt.h"
-#include "clang/Tooling/Tooling.h"
-#include "llvm/Support/Error.h"
-#include "llvm/Testing/Support/Error.h"
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-
-using namespace clang;
-using namespace transformer;
-using namespace ast_matchers;
-
-namespace {
-using ::llvm::Failed;
-using ::llvm::HasValue;
-using ::llvm::StringError;
-using ::testing::AllOf;
-using ::testing::HasSubstr;
-using MatchResult = MatchFinder::MatchResult;
-
-// Create a valid translation-unit from a statement.
-static std::string wrapSnippet(StringRef ExtraPreface,
-                               StringRef StatementCode) {
-  constexpr char Preface[] = R"cc(
-    namespace N { class C {}; }
-    namespace { class AnonC {}; }
-    struct S { int Field; };
-    struct Smart {
-      S* operator->() const;
-      S& operator*() const;
-    };
-  )cc";
-  return (Preface + ExtraPreface + "auto stencil_test_snippet = []{" +
-          StatementCode + "};")
-      .str();
-}
-
-static DeclarationMatcher wrapMatcher(const StatementMatcher &Matcher) {
-  return varDecl(hasName("stencil_test_snippet"),
-                 hasDescendant(compoundStmt(hasAnySubstatement(Matcher))));
-}
-
-struct TestMatch {
-  // The AST unit from which `result` is built. We bundle it because it backs
-  // the result. Users are not expected to access it.
-  std::unique_ptr<ASTUnit> AstUnit;
-  // The result to use in the test. References `ast_unit`.
-  MatchResult Result;
-};
-
-// Matches `Matcher` against the statement `StatementCode` and returns the
-// result. Handles putting the statement inside a function and modifying the
-// matcher correspondingly. `Matcher` should match one of the statements in
-// `StatementCode` exactly -- that is, produce exactly one match. However,
-// `StatementCode` may contain other statements not described by `Matcher`.
-// `ExtraPreface` (optionally) adds extra decls to the TU, before the code.
-static llvm::Optional<TestMatch> matchStmt(StringRef StatementCode,
-                                           StatementMatcher Matcher,
-                                           StringRef ExtraPreface = "") {
-  auto AstUnit = tooling::buildASTFromCodeWithArgs(
-      wrapSnippet(ExtraPreface, StatementCode), {"-Wno-unused-value"});
-  if (AstUnit == nullptr) {
-    ADD_FAILURE() << "AST construction failed";
-    return llvm::None;
-  }
-  ASTContext &Context = AstUnit->getASTContext();
-  auto Matches = ast_matchers::match(wrapMatcher(Matcher), Context);
-  // We expect a single, exact match for the statement.
-  if (Matches.size() != 1) {
-    ADD_FAILURE() << "Wrong number of matches: " << Matches.size();
-    return llvm::None;
-  }
-  return TestMatch{std::move(AstUnit), MatchResult(Matches[0], &Context)};
-}
-
-class StencilTest : public ::testing::Test {
-protected:
-  // Verifies that the given stencil fails when evaluated on a valid match
-  // result. Binds a statement to "stmt", a (non-member) ctor-initializer to
-  // "init", an expression to "expr" and a (nameless) declaration to "decl".
-  void testError(const Stencil &Stencil,
-                 ::testing::Matcher<std::string> Matcher) {
-    const std::string Snippet = R"cc(
-      struct A {};
-      class F : public A {
-       public:
-        F(int) {}
-      };
-      F(1);
-    )cc";
-    auto StmtMatch = matchStmt(
-        Snippet,
-        stmt(hasDescendant(
-                 cxxConstructExpr(
-                     hasDeclaration(decl(hasDescendant(cxxCtorInitializer(
-                                                           isBaseInitializer())
-                                                           .bind("init")))
-                                        .bind("decl")))
-                     .bind("expr")))
-            .bind("stmt"));
-    ASSERT_TRUE(StmtMatch);
-    if (auto ResultOrErr = Stencil->eval(StmtMatch->Result)) {
-      ADD_FAILURE() << "Expected failure but succeeded: " << *ResultOrErr;
-    } else {
-      auto Err = llvm::handleErrors(ResultOrErr.takeError(),
-                                    [&Matcher](const StringError &Err) {
-                                      EXPECT_THAT(Err.getMessage(), Matcher);
-                                    });
-      if (Err) {
-        ADD_FAILURE() << "Unhandled error: " << llvm::toString(std::move(Err));
-      }
-    }
-  }
-
-  // Tests failures caused by references to unbound nodes. `unbound_id` is the
-  // id that will cause the failure.
-  void testUnboundNodeError(const Stencil &Stencil, StringRef UnboundId) {
-    testError(Stencil,
-              AllOf(HasSubstr(std::string(UnboundId)), HasSubstr("not bound")));
-  }
-};
-
-TEST_F(StencilTest, SingleStatement) {
-  StringRef Condition("C"), Then("T"), Else("E");
-  const std::string Snippet = R"cc(
-    if (true)
-      return 1;
-    else
-      return 0;
-  )cc";
-  auto StmtMatch = matchStmt(
-      Snippet, ifStmt(hasCondition(expr().bind(Condition)),
-                      hasThen(stmt().bind(Then)), hasElse(stmt().bind(Else))));
-  ASSERT_TRUE(StmtMatch);
-  // Invert the if-then-else.
-  auto Stencil =
-      cat("if (!", node(std::string(Condition)), ") ",
-          statement(std::string(Else)), " else ", statement(std::string(Then)));
-  EXPECT_THAT_EXPECTED(Stencil->eval(StmtMatch->Result),
-                       HasValue("if (!true) return 0; else return 1;"));
-}
-
-TEST_F(StencilTest, UnboundNode) {
-  const std::string Snippet = R"cc(
-    if (true)
-      return 1;
-    else
-      return 0;
-  )cc";
-  auto StmtMatch = matchStmt(Snippet, ifStmt(hasCondition(stmt().bind("a1")),
-                                             hasThen(stmt().bind("a2"))));
-  ASSERT_TRUE(StmtMatch);
-  auto Stencil = cat("if(!", node("a1"), ") ", node("UNBOUND"), ";");
-  auto ResultOrErr = Stencil->eval(StmtMatch->Result);
-  EXPECT_TRUE(llvm::errorToBool(ResultOrErr.takeError()))
-      << "Expected unbound node, got " << *ResultOrErr;
-}
-
-// Tests that a stencil with a single parameter (`Id`) evaluates to the expected
-// string, when `Id` is bound to the expression-statement in `Snippet`.
-void testExpr(StringRef Id, StringRef Snippet, const Stencil &Stencil,
-              StringRef Expected) {
-  auto StmtMatch = matchStmt(Snippet, expr().bind(Id));
-  ASSERT_TRUE(StmtMatch);
-  EXPECT_THAT_EXPECTED(Stencil->eval(StmtMatch->Result),
-                       HasValue(std::string(Expected)));
-}
-
-void testFailure(StringRef Id, StringRef Snippet, const Stencil &Stencil,
-                 testing::Matcher<std::string> MessageMatcher) {
-  auto StmtMatch = matchStmt(Snippet, expr().bind(Id));
-  ASSERT_TRUE(StmtMatch);
-  EXPECT_THAT_EXPECTED(Stencil->eval(StmtMatch->Result),
-                       Failed<StringError>(testing::Property(
-                           &StringError::getMessage, MessageMatcher)));
-}
-
-TEST_F(StencilTest, SelectionOp) {
-  StringRef Id = "id";
-  testExpr(Id, "3;", cat(node(std::string(Id))), "3");
-}
-
-TEST_F(StencilTest, IfBoundOpBound) {
-  StringRef Id = "id";
-  testExpr(Id, "3;", ifBound(Id, cat("5"), cat("7")), "5");
-}
-
-TEST_F(StencilTest, IfBoundOpUnbound) {
-  StringRef Id = "id";
-  testExpr(Id, "3;", ifBound("other", cat("5"), cat("7")), "7");
-}
-
-TEST_F(StencilTest, ExpressionOpNoParens) {
-  StringRef Id = "id";
-  testExpr(Id, "3;", expression(Id), "3");
-}
-
-// Don't parenthesize a parens expression.
-TEST_F(StencilTest, ExpressionOpNoParensParens) {
-  StringRef Id = "id";
-  testExpr(Id, "(3);", expression(Id), "(3)");
-}
-
-TEST_F(StencilTest, ExpressionOpBinaryOpParens) {
-  StringRef Id = "id";
-  testExpr(Id, "3+4;", expression(Id), "(3+4)");
-}
-
-// `expression` shares code with other ops, so we get sufficient coverage of the
-// error handling code with this test. If that changes in the future, more error
-// tests should be added.
-TEST_F(StencilTest, ExpressionOpUnbound) {
-  StringRef Id = "id";
-  testFailure(Id, "3;", expression("ACACA"),
-              AllOf(HasSubstr("ACACA"), HasSubstr("not bound")));
-}
-
-TEST_F(StencilTest, DerefPointer) {
-  StringRef Id = "id";
-  testExpr(Id, "int *x; x;", deref(Id), "*x");
-}
-
-TEST_F(StencilTest, DerefBinOp) {
-  StringRef Id = "id";
-  testExpr(Id, "int *x; x + 1;", deref(Id), "*(x + 1)");
-}
-
-TEST_F(StencilTest, DerefAddressExpr) {
-  StringRef Id = "id";
-  testExpr(Id, "int x; &x;", deref(Id), "x");
-}
-
-TEST_F(StencilTest, AddressOfValue) {
-  StringRef Id = "id";
-  testExpr(Id, "int x; x;", addressOf(Id), "&x");
-}
-
-TEST_F(StencilTest, AddressOfDerefExpr) {
-  StringRef Id = "id";
-  testExpr(Id, "int *x; *x;", addressOf(Id), "x");
-}
-
-TEST_F(StencilTest, MaybeDerefValue) {
-  StringRef Id = "id";
-  testExpr(Id, "int x; x;", maybeDeref(Id), "x");
-}
-
-TEST_F(StencilTest, MaybeDerefPointer) {
-  StringRef Id = "id";
-  testExpr(Id, "int *x; x;", maybeDeref(Id), "*x");
-}
-
-TEST_F(StencilTest, MaybeDerefBinOp) {
-  StringRef Id = "id";
-  testExpr(Id, "int *x; x + 1;", maybeDeref(Id), "*(x + 1)");
-}
-
-TEST_F(StencilTest, MaybeDerefAddressExpr) {
-  StringRef Id = "id";
-  testExpr(Id, "int x; &x;", maybeDeref(Id), "x");
-}
-
-TEST_F(StencilTest, MaybeDerefSmartPointer) {
-  StringRef Id = "id";
-  std::string Snippet = R"cc(
-    Smart x;
-    x;
-  )cc";
-  testExpr(Id, Snippet, maybeDeref(Id), "*x");
-}
-
-// Tests that unique_ptr specifically is handled.
-TEST_F(StencilTest, MaybeDerefSmartPointerUniquePtr) {
-  StringRef Id = "id";
-  // We deliberately specify `unique_ptr` as empty to verify that it matches
-  // because of its name, rather than its contents.
-  StringRef ExtraPreface =
-      "namespace std { template <typename T> class unique_ptr {}; }\n";
-  StringRef Snippet = R"cc(
-    std::unique_ptr<int> x;
-    x;
-  )cc";
-  auto StmtMatch = matchStmt(Snippet, expr().bind(Id), ExtraPreface);
-  ASSERT_TRUE(StmtMatch);
-  EXPECT_THAT_EXPECTED(maybeDeref(Id)->eval(StmtMatch->Result),
-                       HasValue(std::string("*x")));
-}
-
-TEST_F(StencilTest, MaybeDerefSmartPointerFromMemberExpr) {
-  StringRef Id = "id";
-  std::string Snippet = "Smart x; x->Field;";
-  auto StmtMatch =
-      matchStmt(Snippet, memberExpr(hasObjectExpression(expr().bind(Id))));
-  ASSERT_TRUE(StmtMatch);
-  const Stencil Stencil = maybeDeref(Id);
-  EXPECT_THAT_EXPECTED(Stencil->eval(StmtMatch->Result), HasValue("*x"));
-}
-
-TEST_F(StencilTest, MaybeAddressOfPointer) {
-  StringRef Id = "id";
-  testExpr(Id, "int *x; x;", maybeAddressOf(Id), "x");
-}
-
-TEST_F(StencilTest, MaybeAddressOfValue) {
-  StringRef Id = "id";
-  testExpr(Id, "int x; x;", addressOf(Id), "&x");
-}
-
-TEST_F(StencilTest, MaybeAddressOfBinOp) {
-  StringRef Id = "id";
-  testExpr(Id, "int x; x + 1;", maybeAddressOf(Id), "&(x + 1)");
-}
-
-TEST_F(StencilTest, MaybeAddressOfDerefExpr) {
-  StringRef Id = "id";
-  testExpr(Id, "int *x; *x;", addressOf(Id), "x");
-}
-
-TEST_F(StencilTest, MaybeAddressOfSmartPointer) {
-  StringRef Id = "id";
-  testExpr(Id, "Smart x; x;", maybeAddressOf(Id), "x");
-}
-
-TEST_F(StencilTest, MaybeAddressOfSmartPointerFromMemberCall) {
-  StringRef Id = "id";
-  std::string Snippet = "Smart x; x->Field;";
-  auto StmtMatch =
-      matchStmt(Snippet, memberExpr(hasObjectExpression(expr().bind(Id))));
-  ASSERT_TRUE(StmtMatch);
-  const Stencil Stencil = maybeAddressOf(Id);
-  EXPECT_THAT_EXPECTED(Stencil->eval(StmtMatch->Result), HasValue("x"));
-}
-
-TEST_F(StencilTest, MaybeAddressOfSmartPointerDerefNoCancel) {
-  StringRef Id = "id";
-  testExpr(Id, "Smart x; *x;", maybeAddressOf(Id), "&*x");
-}
-
-TEST_F(StencilTest, AccessOpValue) {
-  StringRef Snippet = R"cc(
-    S x;
-    x;
-  )cc";
-  StringRef Id = "id";
-  testExpr(Id, Snippet, access(Id, "field"), "x.field");
-}
-
-TEST_F(StencilTest, AccessOpValueExplicitText) {
-  StringRef Snippet = R"cc(
-    S x;
-    x;
-  )cc";
-  StringRef Id = "id";
-  testExpr(Id, Snippet, access(Id, cat("field")), "x.field");
-}
-
-TEST_F(StencilTest, AccessOpValueAddress) {
-  StringRef Snippet = R"cc(
-    S x;
-    &x;
-  )cc";
-  StringRef Id = "id";
-  testExpr(Id, Snippet, access(Id, "field"), "x.field");
-}
-
-TEST_F(StencilTest, AccessOpPointer) {
-  StringRef Snippet = R"cc(
-    S *x;
-    x;
-  )cc";
-  StringRef Id = "id";
-  testExpr(Id, Snippet, access(Id, "field"), "x->field");
-}
-
-TEST_F(StencilTest, AccessOpPointerDereference) {
-  StringRef Snippet = R"cc(
-    S *x;
-    *x;
-  )cc";
-  StringRef Id = "id";
-  testExpr(Id, Snippet, access(Id, "field"), "x->field");
-}
-
-TEST_F(StencilTest, AccessOpSmartPointer) {
-  StringRef Snippet = R"cc(
-    Smart x;
-    x;
-  )cc";
-  StringRef Id = "id";
-  testExpr(Id, Snippet, access(Id, "field"), "x->field");
-}
-
-TEST_F(StencilTest, AccessOpSmartPointerDereference) {
-  StringRef Snippet = R"cc(
-    Smart x;
-    *x;
-  )cc";
-  StringRef Id = "id";
-  testExpr(Id, Snippet, access(Id, "field"), "x->field");
-}
-
-TEST_F(StencilTest, AccessOpSmartPointerMemberCall) {
-  StringRef Snippet = R"cc(
-    Smart x;
-    x->Field;
-  )cc";
-  StringRef Id = "id";
-  auto StmtMatch =
-      matchStmt(Snippet, memberExpr(hasObjectExpression(expr().bind(Id))));
-  ASSERT_TRUE(StmtMatch);
-  EXPECT_THAT_EXPECTED(access(Id, "field")->eval(StmtMatch->Result),
-                       HasValue("x->field"));
-}
-
-TEST_F(StencilTest, AccessOpExplicitThis) {
-  using clang::ast_matchers::hasObjectExpression;
-  using clang::ast_matchers::memberExpr;
-
-  // Set up the code so we can bind to a use of this.
-  StringRef Snippet = R"cc(
-    class C {
-     public:
-      int x;
-      int foo() { return this->x; }
-    };
-  )cc";
-  auto StmtMatch = matchStmt(
-      Snippet,
-      traverse(TK_AsIs, returnStmt(hasReturnValue(ignoringImplicit(memberExpr(
-                            hasObjectExpression(expr().bind("obj"))))))));
-  ASSERT_TRUE(StmtMatch);
-  const Stencil Stencil = access("obj", "field");
-  EXPECT_THAT_EXPECTED(Stencil->eval(StmtMatch->Result),
-                       HasValue("this->field"));
-}
-
-TEST_F(StencilTest, AccessOpImplicitThis) {
-  using clang::ast_matchers::hasObjectExpression;
-  using clang::ast_matchers::memberExpr;
-
-  // Set up the code so we can bind to a use of (implicit) this.
-  StringRef Snippet = R"cc(
-    class C {
-     public:
-      int x;
-      int foo() { return x; }
-    };
-  )cc";
-  auto StmtMatch =
-      matchStmt(Snippet, returnStmt(hasReturnValue(ignoringImplicit(memberExpr(
-                             hasObjectExpression(expr().bind("obj")))))));
-  ASSERT_TRUE(StmtMatch);
-  const Stencil Stencil = access("obj", "field");
-  EXPECT_THAT_EXPECTED(Stencil->eval(StmtMatch->Result), HasValue("field"));
-}
-
-TEST_F(StencilTest, DescribeType) {
-  std::string Snippet = "int *x; x;";
-  std::string Expected = "int *";
-  auto StmtMatch =
-      matchStmt(Snippet, declRefExpr(hasType(qualType().bind("type"))));
-  ASSERT_TRUE(StmtMatch);
-  EXPECT_THAT_EXPECTED(describe("type")->eval(StmtMatch->Result),
-                       HasValue(std::string(Expected)));
-}
-
-TEST_F(StencilTest, DescribeSugaredType) {
-  std::string Snippet = "using Ty = int; Ty *x; x;";
-  std::string Expected = "Ty *";
-  auto StmtMatch =
-      matchStmt(Snippet, declRefExpr(hasType(qualType().bind("type"))));
-  ASSERT_TRUE(StmtMatch);
-  EXPECT_THAT_EXPECTED(describe("type")->eval(StmtMatch->Result),
-                       HasValue(std::string(Expected)));
-}
-
-TEST_F(StencilTest, DescribeDeclType) {
-  std::string Snippet = "S s; s;";
-  std::string Expected = "S";
-  auto StmtMatch =
-      matchStmt(Snippet, declRefExpr(hasType(qualType().bind("type"))));
-  ASSERT_TRUE(StmtMatch);
-  EXPECT_THAT_EXPECTED(describe("type")->eval(StmtMatch->Result),
-                       HasValue(std::string(Expected)));
-}
-
-TEST_F(StencilTest, DescribeQualifiedType) {
-  std::string Snippet = "N::C c; c;";
-  std::string Expected = "N::C";
-  auto StmtMatch =
-      matchStmt(Snippet, declRefExpr(hasType(qualType().bind("type"))));
-  ASSERT_TRUE(StmtMatch);
-  EXPECT_THAT_EXPECTED(describe("type")->eval(StmtMatch->Result),
-                       HasValue(std::string(Expected)));
-}
-
-TEST_F(StencilTest, DescribeUnqualifiedType) {
-  std::string Snippet = "using N::C; C c; c;";
-  std::string Expected = "N::C";
-  auto StmtMatch =
-      matchStmt(Snippet, declRefExpr(hasType(qualType().bind("type"))));
-  ASSERT_TRUE(StmtMatch);
-  EXPECT_THAT_EXPECTED(describe("type")->eval(StmtMatch->Result),
-                       HasValue(std::string(Expected)));
-}
-
-TEST_F(StencilTest, DescribeAnonNamespaceType) {
-  std::string Snippet = "AnonC c; c;";
-  std::string Expected = "(anonymous namespace)::AnonC";
-  auto StmtMatch =
-      matchStmt(Snippet, declRefExpr(hasType(qualType().bind("type"))));
-  ASSERT_TRUE(StmtMatch);
-  EXPECT_THAT_EXPECTED(describe("type")->eval(StmtMatch->Result),
-                       HasValue(std::string(Expected)));
-}
-
-TEST_F(StencilTest, RunOp) {
-  StringRef Id = "id";
-  auto SimpleFn = [Id](const MatchResult &R) {
-    return std::string(R.Nodes.getNodeAs<Stmt>(Id) != nullptr ? "Bound"
-                                                              : "Unbound");
-  };
-  testExpr(Id, "3;", run(SimpleFn), "Bound");
-}
-
-TEST_F(StencilTest, CatOfMacroRangeSucceeds) {
-  StringRef Snippet = R"cpp(
-#define MACRO 3.77
-  double foo(double d);
-  foo(MACRO);)cpp";
-
-  auto StmtMatch =
-      matchStmt(Snippet, callExpr(callee(functionDecl(hasName("foo"))),
-                                  argumentCountIs(1),
-                                  hasArgument(0, expr().bind("arg"))));
-  ASSERT_TRUE(StmtMatch);
-  Stencil S = cat(node("arg"));
-  EXPECT_THAT_EXPECTED(S->eval(StmtMatch->Result), HasValue("MACRO"));
-}
-
-TEST_F(StencilTest, CatOfMacroArgRangeSucceeds) {
-  StringRef Snippet = R"cpp(
-#define MACRO(a, b) a + b
-  MACRO(2, 3);)cpp";
-
-  auto StmtMatch =
-      matchStmt(Snippet, binaryOperator(hasRHS(expr().bind("rhs"))));
-  ASSERT_TRUE(StmtMatch);
-  Stencil S = cat(node("rhs"));
-  EXPECT_THAT_EXPECTED(S->eval(StmtMatch->Result), HasValue("3"));
-}
-
-TEST_F(StencilTest, CatOfMacroArgSubRangeSucceeds) {
-  StringRef Snippet = R"cpp(
-#define MACRO(a, b) a + b
-  int foo(int);
-  MACRO(2, foo(3));)cpp";
-
-  auto StmtMatch = matchStmt(
-      Snippet, binaryOperator(hasRHS(callExpr(
-                   callee(functionDecl(hasName("foo"))), argumentCountIs(1),
-                   hasArgument(0, expr().bind("arg"))))));
-  ASSERT_TRUE(StmtMatch);
-  Stencil S = cat(node("arg"));
-  EXPECT_THAT_EXPECTED(S->eval(StmtMatch->Result), HasValue("3"));
-}
-
-TEST_F(StencilTest, CatOfInvalidRangeFails) {
-  StringRef Snippet = R"cpp(
-#define MACRO (3.77)
-  double foo(double d);
-  foo(MACRO);)cpp";
-
-  auto StmtMatch =
-      matchStmt(Snippet, callExpr(callee(functionDecl(hasName("foo"))),
-                                  argumentCountIs(1),
-                                  hasArgument(0, expr().bind("arg"))));
-  ASSERT_TRUE(StmtMatch);
-  Stencil S = cat(node("arg"));
-  Expected<std::string> Result = S->eval(StmtMatch->Result);
-  ASSERT_THAT_EXPECTED(Result, Failed<StringError>());
-  llvm::handleAllErrors(Result.takeError(), [](const llvm::StringError &E) {
-    EXPECT_THAT(E.getMessage(), AllOf(HasSubstr("selected range"),
-                                      HasSubstr("macro expansion")));
-  });
-}
-
-// The `StencilToStringTest` tests verify that the string representation of the
-// stencil combinator matches (as best possible) the spelling of the
-// combinator's construction.  Exceptions include those combinators that have no
-// explicit spelling (like raw text) and those supporting non-printable
-// arguments (like `run`, `selection`).
-
-TEST(StencilToStringTest, RawTextOp) {
-  auto S = cat("foo bar baz");
-  StringRef Expected = R"("foo bar baz")";
-  EXPECT_EQ(S->toString(), Expected);
-}
-
-TEST(StencilToStringTest, RawTextOpEscaping) {
-  auto S = cat("foo \"bar\" baz\\n");
-  StringRef Expected = R"("foo \"bar\" baz\\n")";
-  EXPECT_EQ(S->toString(), Expected);
-}
-
-TEST(StencilToStringTest, DescribeOp) {
-  auto S = describe("Id");
-  StringRef Expected = R"repr(describe("Id"))repr";
-  EXPECT_EQ(S->toString(), Expected);
-}
-
-TEST(StencilToStringTest, DebugPrintNodeOp) {
-  auto S = dPrint("Id");
-  StringRef Expected = R"repr(dPrint("Id"))repr";
-  EXPECT_EQ(S->toString(), Expected);
-}
-
-TEST(StencilToStringTest, ExpressionOp) {
-  auto S = expression("Id");
-  StringRef Expected = R"repr(expression("Id"))repr";
-  EXPECT_EQ(S->toString(), Expected);
-}
-
-TEST(StencilToStringTest, DerefOp) {
-  auto S = deref("Id");
-  StringRef Expected = R"repr(deref("Id"))repr";
-  EXPECT_EQ(S->toString(), Expected);
-}
-
-TEST(StencilToStringTest, AddressOfOp) {
-  auto S = addressOf("Id");
-  StringRef Expected = R"repr(addressOf("Id"))repr";
-  EXPECT_EQ(S->toString(), Expected);
-}
-
-TEST(StencilToStringTest, SelectionOp) {
-  auto S1 = cat(node("node1"));
-  EXPECT_EQ(S1->toString(), "selection(...)");
-}
-
-TEST(StencilToStringTest, AccessOpText) {
-  auto S = access("Id", "memberData");
-  StringRef Expected = R"repr(access("Id", "memberData"))repr";
-  EXPECT_EQ(S->toString(), Expected);
-}
-
-TEST(StencilToStringTest, AccessOpSelector) {
-  auto S = access("Id", cat(name("otherId")));
-  StringRef Expected = R"repr(access("Id", selection(...)))repr";
-  EXPECT_EQ(S->toString(), Expected);
-}
-
-TEST(StencilToStringTest, AccessOpStencil) {
-  auto S = access("Id", cat("foo_", "bar"));
-  StringRef Expected = R"repr(access("Id", seq("foo_", "bar")))repr";
-  EXPECT_EQ(S->toString(), Expected);
-}
-
-TEST(StencilToStringTest, IfBoundOp) {
-  auto S = ifBound("Id", cat("trueText"), access("exprId", "memberData"));
-  StringRef Expected =
-      R"repr(ifBound("Id", "trueText", access("exprId", "memberData")))repr";
-  EXPECT_EQ(S->toString(), Expected);
-}
-
-TEST(StencilToStringTest, RunOp) {
-  auto F1 = [](const MatchResult &R) { return "foo"; };
-  auto S1 = run(F1);
-  EXPECT_EQ(S1->toString(), "run(...)");
-}
-
-TEST(StencilToStringTest, Sequence) {
-  auto S = cat("foo", access("x", "m()"), "bar",
-               ifBound("x", cat("t"), access("e", "f")));
-  StringRef Expected = R"repr(seq("foo", access("x", "m()"), "bar", )repr"
-                       R"repr(ifBound("x", "t", access("e", "f"))))repr";
-  EXPECT_EQ(S->toString(), Expected);
-}
-
-TEST(StencilToStringTest, SequenceEmpty) {
-  auto S = cat();
-  StringRef Expected = "seq()";
-  EXPECT_EQ(S->toString(), Expected);
-}
-
-TEST(StencilToStringTest, SequenceSingle) {
-  auto S = cat("foo");
-  StringRef Expected = "\"foo\"";
-  EXPECT_EQ(S->toString(), Expected);
-}
-
-TEST(StencilToStringTest, SequenceFromVector) {
-  auto S = catVector({cat("foo"), access("x", "m()"), cat("bar"),
-                      ifBound("x", cat("t"), access("e", "f"))});
-  StringRef Expected = R"repr(seq("foo", access("x", "m()"), "bar", )repr"
-                       R"repr(ifBound("x", "t", access("e", "f"))))repr";
-  EXPECT_EQ(S->toString(), Expected);
-}
-} // namespace
diff --git a/gnu/llvm/clang/unittests/Tooling/Syntax/BuildTreeTest.cpp b/gnu/llvm/clang/unittests/Tooling/Syntax/BuildTreeTest.cpp
deleted file mode 100644
index 8529d652657..00000000000
--- a/gnu/llvm/clang/unittests/Tooling/Syntax/BuildTreeTest.cpp
+++ /dev/null
@@ -1,5840 +0,0 @@
-//===- BuildTreeTest.cpp --------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file tests the syntax tree generation from the ClangAST.
-//
-//===----------------------------------------------------------------------===//
-
-#include "TreeTestBase.h"
-
-using namespace clang;
-using namespace clang::syntax;
-
-namespace {
-
-class BuildSyntaxTreeTest : public SyntaxTreeTest {
-protected:
-  ::testing::AssertionResult treeDumpEqual(StringRef Code, StringRef Tree) {
-    SCOPED_TRACE(llvm::join(GetParam().getCommandLineArgs(), " "));
-
-    auto *Root = buildTree(Code, GetParam());
-    auto ErrorOK = errorOK(Code);
-    if (!ErrorOK)
-      return ErrorOK;
-    auto Actual = StringRef(Root->dump(Arena->getSourceManager())).trim().str();
-    // EXPECT_EQ shows the diff between the two strings if they are different.
-    EXPECT_EQ(Tree.trim().str(), Actual);
-    if (Actual != Tree.trim().str()) {
-      return ::testing::AssertionFailure();
-    }
-    return ::testing::AssertionSuccess();
-  }
-
-  ::testing::AssertionResult
-  treeDumpEqualOnAnnotations(StringRef CodeWithAnnotations,
-                             ArrayRef<StringRef> TreeDumps) {
-    SCOPED_TRACE(llvm::join(GetParam().getCommandLineArgs(), " "));
-
-    auto AnnotatedCode = llvm::Annotations(CodeWithAnnotations);
-    auto *Root = buildTree(AnnotatedCode.code(), GetParam());
-
-    auto ErrorOK = errorOK(AnnotatedCode.code());
-    if (!ErrorOK)
-      return ErrorOK;
-
-    auto AnnotatedRanges = AnnotatedCode.ranges();
-    if (AnnotatedRanges.size() != TreeDumps.size()) {
-      return ::testing::AssertionFailure()
-             << "The number of annotated ranges in the source code is "
-                "different "
-                "to the number of their corresponding tree dumps.";
-    }
-    bool Failed = false;
-    for (unsigned i = 0; i < AnnotatedRanges.size(); i++) {
-      auto *AnnotatedNode = nodeByRange(AnnotatedRanges[i], Root);
-      assert(AnnotatedNode);
-      auto AnnotatedNodeDump =
-          StringRef(AnnotatedNode->dump(Arena->getSourceManager()))
-              .trim()
-              .str();
-      // EXPECT_EQ shows the diff between the two strings if they are different.
-      EXPECT_EQ(TreeDumps[i].trim().str(), AnnotatedNodeDump)
-          << "Dumps diverged for the code:\n"
-          << AnnotatedCode.code().slice(AnnotatedRanges[i].Begin,
-                                        AnnotatedRanges[i].End);
-      if (AnnotatedNodeDump != TreeDumps[i].trim().str())
-        Failed = true;
-    }
-    return Failed ? ::testing::AssertionFailure()
-                  : ::testing::AssertionSuccess();
-  }
-
-private:
-  ::testing::AssertionResult errorOK(StringRef RawCode) {
-    if (!RawCode.contains("error-ok")) {
-      if (Diags->getClient()->getNumErrors() != 0) {
-        return ::testing::AssertionFailure()
-               << "Source file has syntax errors (suppress with /*error-ok*/), "
-                  "they were printed to the "
-                  "test log";
-      }
-    }
-    return ::testing::AssertionSuccess();
-  }
-};
-
-INSTANTIATE_TEST_SUITE_P(SyntaxTreeTests, BuildSyntaxTreeTest,
-                        testing::ValuesIn(allTestClangConfigs()) );
-
-TEST_P(BuildSyntaxTreeTest, Simple) {
-  EXPECT_TRUE(treeDumpEqual(
-      R"cpp(
-int main() {}
-void foo() {}
-)cpp",
-      R"txt(
-TranslationUnit Detached
-|-SimpleDeclaration
-| |-'int'
-| |-DeclaratorList Declarators
-| | `-SimpleDeclarator ListElement
-| |   |-'main'
-| |   `-ParametersAndQualifiers
-| |     |-'(' OpenParen
-| |     `-')' CloseParen
-| `-CompoundStatement
-|   |-'{' OpenParen
-|   `-'}' CloseParen
-`-SimpleDeclaration
-  |-'void'
-  |-DeclaratorList Declarators
-  | `-SimpleDeclarator ListElement
-  |   |-'foo'
-  |   `-ParametersAndQualifiers
-  |     |-'(' OpenParen
-  |     `-')' CloseParen
-  `-CompoundStatement
-    |-'{' OpenParen
-    `-'}' CloseParen
-)txt"));
-}
-
-TEST_P(BuildSyntaxTreeTest, SimpleVariable) {
-  EXPECT_TRUE(treeDumpEqual(
-      R"cpp(
-int a;
-int b = 42;
-)cpp",
-      R"txt(
-TranslationUnit Detached
-|-SimpleDeclaration
-| |-'int'
-| |-DeclaratorList Declarators
-| | `-SimpleDeclarator ListElement
-| |   `-'a'
-| `-';'
-`-SimpleDeclaration
-  |-'int'
-  |-DeclaratorList Declarators
-  | `-SimpleDeclarator ListElement
-  |   |-'b'
-  |   |-'='
-  |   `-IntegerLiteralExpression
-  |     `-'42' LiteralToken
-  `-';'
-)txt"));
-}
-
-TEST_P(BuildSyntaxTreeTest, SimpleFunction) {
-  EXPECT_TRUE(treeDumpEqual(
-      R"cpp(
-void foo(int a, int b) {}
-)cpp",
-      R"txt(
-TranslationUnit Detached
-`-SimpleDeclaration
-  |-'void'
-  |-DeclaratorList Declarators
-  | `-SimpleDeclarator ListElement
-  |   |-'foo'
-  |   `-ParametersAndQualifiers
-  |     |-'(' OpenParen
-  |     |-ParameterDeclarationList Parameters
-  |     | |-SimpleDeclaration ListElement
-  |     | | |-'int'
-  |     | | `-DeclaratorList Declarators
-  |     | |   `-SimpleDeclarator ListElement
-  |     | |     `-'a'
-  |     | |-',' ListDelimiter
-  |     | `-SimpleDeclaration ListElement
-  |     |   |-'int'
-  |     |   `-DeclaratorList Declarators
-  |     |     `-SimpleDeclarator ListElement
-  |     |       `-'b'
-  |     `-')' CloseParen
-  `-CompoundStatement
-    |-'{' OpenParen
-    `-'}' CloseParen
-)txt"));
-}
-
-TEST_P(BuildSyntaxTreeTest, Simple_BackslashInsideToken) {
-  EXPECT_TRUE(treeDumpEqual(
-      R"cpp(
-in\
-t a;
-)cpp",
-      R"txt(
-TranslationUnit Detached
-`-SimpleDeclaration
-  |-'in\
-t'
-  |-DeclaratorList Declarators
-  | `-SimpleDeclarator ListElement
-  |   `-'a'
-  `-';'
-)txt"));
-}
-
-TEST_P(BuildSyntaxTreeTest, If) {
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-void test() {
-  [[if (1) {}]]
-  [[if (1) {} else if (0) {}]]
-}
-)cpp",
-      {R"txt(
-IfStatement Statement
-|-'if' IntroducerKeyword
-|-'('
-|-ExpressionStatement Condition
-| `-IntegerLiteralExpression Expression
-|   `-'1' LiteralToken
-|-')'
-`-CompoundStatement ThenStatement
-  |-'{' OpenParen
-  `-'}' CloseParen
-  )txt",
-       R"txt(
-IfStatement Statement
-|-'if' IntroducerKeyword
-|-'('
-|-ExpressionStatement Condition
-| `-IntegerLiteralExpression Expression
-|   `-'1' LiteralToken
-|-')'
-|-CompoundStatement ThenStatement
-| |-'{' OpenParen
-| `-'}' CloseParen
-|-'else' ElseKeyword
-`-IfStatement ElseStatement
-  |-'if' IntroducerKeyword
-  |-'('
-  |-ExpressionStatement Condition
-  | `-IntegerLiteralExpression Expression
-  |   `-'0' LiteralToken
-  |-')'
-  `-CompoundStatement ThenStatement
-    |-'{' OpenParen
-    `-'}' CloseParen
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, IfDecl) {
-  if (!GetParam().isCXX17OrLater()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-void test() {
-  [[if (int a = 5) {}]]
-  [[if (int a; a == 5) {}]]
-}
-)cpp",
-      {R"txt(
-IfStatement Statement
-|-'if' IntroducerKeyword
-|-'('
-|-DeclarationStatement Condition
-| `-SimpleDeclaration
-|   |-'int'
-|   `-DeclaratorList Declarators
-|     `-SimpleDeclarator ListElement
-|       |-'a'
-|       |-'='
-|       `-IntegerLiteralExpression
-|         `-'5' LiteralToken
-|-')'
-`-CompoundStatement ThenStatement
-  |-'{' OpenParen
-  `-'}' CloseParen
-      )txt",
-       R"txt(
-IfStatement Statement
-|-'if' IntroducerKeyword
-|-'('
-|-DeclarationStatement
-| |-SimpleDeclaration
-| | |-'int'
-| | `-DeclaratorList Declarators
-| |   `-SimpleDeclarator ListElement
-| |     `-'a'
-| `-';'
-|-ExpressionStatement Condition
-| `-BinaryOperatorExpression Expression
-|   |-IdExpression LeftHandSide
-|   | `-UnqualifiedId UnqualifiedId
-|   |   `-'a'
-|   |-'==' OperatorToken
-|   `-IntegerLiteralExpression RightHandSide
-|     `-'5' LiteralToken
-|-')'
-`-CompoundStatement ThenStatement
-  |-'{' OpenParen
-  `-'}' CloseParen
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, For) {
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-void test() {
-  [[for (;;)  {}]]
-}
-)cpp",
-      {R"txt(
-ForStatement Statement
-|-'for' IntroducerKeyword
-|-'('
-|-';'
-|-';'
-|-')'
-`-CompoundStatement BodyStatement
-  |-'{' OpenParen
-  `-'}' CloseParen
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, RangeBasedFor) {
-  if (!GetParam().isCXX11OrLater()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-void test() {
-  int a[3];
-  [[for (int x : a)
-    ;]]
-}
-)cpp",
-      {R"txt(
-RangeBasedForStatement Statement
-|-'for' IntroducerKeyword
-|-'('
-|-SimpleDeclaration
-| |-'int'
-| |-DeclaratorList Declarators
-| | `-SimpleDeclarator ListElement
-| |   `-'x'
-| `-':'
-|-IdExpression
-| `-UnqualifiedId UnqualifiedId
-|   `-'a'
-|-')'
-`-EmptyStatement BodyStatement
-  `-';'
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, DeclarationStatement) {
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-void test() {
-  [[int a = 10;]]
-}
-)cpp",
-      {R"txt(
-DeclarationStatement Statement
-|-SimpleDeclaration
-| |-'int'
-| `-DeclaratorList Declarators
-|   `-SimpleDeclarator ListElement
-|     |-'a'
-|     |-'='
-|     `-IntegerLiteralExpression
-|       `-'10' LiteralToken
-`-';'
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, Switch) {
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-void test() {
-  [[switch (1) {
-    case 0:
-    default:;
-  }]]
-}
-)cpp",
-      {R"txt(
-SwitchStatement Statement
-|-'switch' IntroducerKeyword
-|-'('
-|-IntegerLiteralExpression
-| `-'1' LiteralToken
-|-')'
-`-CompoundStatement BodyStatement
-  |-'{' OpenParen
-  |-CaseStatement Statement
-  | |-'case' IntroducerKeyword
-  | |-IntegerLiteralExpression CaseValue
-  | | `-'0' LiteralToken
-  | |-':'
-  | `-DefaultStatement BodyStatement
-  |   |-'default' IntroducerKeyword
-  |   |-':'
-  |   `-EmptyStatement BodyStatement
-  |     `-';'
-  `-'}' CloseParen
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, While) {
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-void test() {
-  [[while (1) { continue; break; }]]
-}
-)cpp",
-      {R"txt(
-WhileStatement Statement
-|-'while' IntroducerKeyword
-|-'('
-|-IntegerLiteralExpression
-| `-'1' LiteralToken
-|-')'
-`-CompoundStatement BodyStatement
-  |-'{' OpenParen
-  |-ContinueStatement Statement
-  | |-'continue' IntroducerKeyword
-  | `-';'
-  |-BreakStatement Statement
-  | |-'break' IntroducerKeyword
-  | `-';'
-  `-'}' CloseParen
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, UnhandledStatement) {
-  // Unhandled statements should end up as 'unknown statement'.
-  // This example uses a 'label statement', which does not yet have a syntax
-  // counterpart.
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-int test() {
-  [[foo: return 100;]]
-}
-)cpp",
-      {R"txt(
-UnknownStatement Statement
-|-'foo'
-|-':'
-`-ReturnStatement
-  |-'return' IntroducerKeyword
-  |-IntegerLiteralExpression ReturnValue
-  | `-'100' LiteralToken
-  `-';'
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, Expressions) {
-  // expressions should be wrapped in 'ExpressionStatement' when they appear
-  // in a statement position.
-  EXPECT_TRUE(treeDumpEqual(
-      R"cpp(
-void test() {
-  test();
-  if (1) test(); else test();
-}
-)cpp",
-      R"txt(
-TranslationUnit Detached
-`-SimpleDeclaration
-  |-'void'
-  |-DeclaratorList Declarators
-  | `-SimpleDeclarator ListElement
-  |   |-'test'
-  |   `-ParametersAndQualifiers
-  |     |-'(' OpenParen
-  |     `-')' CloseParen
-  `-CompoundStatement
-    |-'{' OpenParen
-    |-ExpressionStatement Statement
-    | |-CallExpression Expression
-    | | |-IdExpression Callee
-    | | | `-UnqualifiedId UnqualifiedId
-    | | |   `-'test'
-    | | |-'(' OpenParen
-    | | `-')' CloseParen
-    | `-';'
-    |-IfStatement Statement
-    | |-'if' IntroducerKeyword
-    | |-'('
-    | |-ExpressionStatement Condition
-    | | `-IntegerLiteralExpression Expression
-    | |   `-'1' LiteralToken
-    | |-')'
-    | |-ExpressionStatement ThenStatement
-    | | |-CallExpression Expression
-    | | | |-IdExpression Callee
-    | | | | `-UnqualifiedId UnqualifiedId
-    | | | |   `-'test'
-    | | | |-'(' OpenParen
-    | | | `-')' CloseParen
-    | | `-';'
-    | |-'else' ElseKeyword
-    | `-ExpressionStatement ElseStatement
-    |   |-CallExpression Expression
-    |   | |-IdExpression Callee
-    |   | | `-UnqualifiedId UnqualifiedId
-    |   | |   `-'test'
-    |   | |-'(' OpenParen
-    |   | `-')' CloseParen
-    |   `-';'
-    `-'}' CloseParen
-)txt"));
-}
-
-TEST_P(BuildSyntaxTreeTest, ConditionalOperator) {
-  // FIXME: conditional expression is not modeled yet.
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-void test() {
-  [[1?:2]];
-}
-)cpp",
-      {R"txt(
-UnknownExpression Expression
-|-IntegerLiteralExpression
-| `-'1' LiteralToken
-|-'?'
-|-':'
-`-IntegerLiteralExpression
-  `-'2' LiteralToken
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, UnqualifiedId_Identifier) {
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-void test(int a) {
-  [[a]];
-}
-)cpp",
-      {R"txt(
-IdExpression Expression
-`-UnqualifiedId UnqualifiedId
-  `-'a'
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, UnqualifiedId_OperatorFunctionId) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-struct X {
-  friend X operator+(const X&, const X&);
-};
-void test(X x) {
-  [[operator+(x, x)]];
-}
-)cpp",
-      {R"txt(
-CallExpression Expression
-|-IdExpression Callee
-| `-UnqualifiedId UnqualifiedId
-|   |-'operator'
-|   `-'+'
-|-'(' OpenParen
-|-CallArguments Arguments
-| |-IdExpression ListElement
-| | `-UnqualifiedId UnqualifiedId
-| |   `-'x'
-| |-',' ListDelimiter
-| `-IdExpression ListElement
-|   `-UnqualifiedId UnqualifiedId
-|     `-'x'
-`-')' CloseParen
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, UnqualifiedId_ConversionFunctionId) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-struct X {
-  operator int();
-};
-void test(X x) {
-  [[x.operator int()]];
-}
-)cpp",
-      {R"txt(
-CallExpression Expression
-|-MemberExpression Callee
-| |-IdExpression Object
-| | `-UnqualifiedId UnqualifiedId
-| |   `-'x'
-| |-'.' AccessToken
-| `-IdExpression Member
-|   `-UnqualifiedId UnqualifiedId
-|     |-'operator'
-|     `-'int'
-|-'(' OpenParen
-`-')' CloseParen
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, UnqualifiedId_LiteralOperatorId) {
-  if (!GetParam().isCXX11OrLater()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-unsigned operator "" _w(char);
-void test() {
-  [[operator "" _w('1')]];
-}
-)cpp",
-      {R"txt(
-CallExpression Expression
-|-IdExpression Callee
-| `-UnqualifiedId UnqualifiedId
-|   |-'operator'
-|   |-'""'
-|   `-'_w'
-|-'(' OpenParen
-|-CallArguments Arguments
-| `-CharacterLiteralExpression ListElement
-|   `-''1'' LiteralToken
-`-')' CloseParen
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, UnqualifiedId_Destructor) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-struct X { };
-void test(X x) {
-  [[x.~X()]];
-}
-)cpp",
-      {R"txt(
-CallExpression Expression
-|-MemberExpression Callee
-| |-IdExpression Object
-| | `-UnqualifiedId UnqualifiedId
-| |   `-'x'
-| |-'.' AccessToken
-| `-IdExpression Member
-|   `-UnqualifiedId UnqualifiedId
-|     |-'~'
-|     `-'X'
-|-'(' OpenParen
-`-')' CloseParen
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, UnqualifiedId_DecltypeDestructor) {
-  if (!GetParam().isCXX11OrLater()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-struct X { };
-void test(X x) {
-  // FIXME: Make `decltype(x)` a child of `MemberExpression`. It is currently
-  // not because `Expr::getSourceRange()` returns the range of `x.~` for the
-  // `MemberExpr` instead of the expected `x.~decltype(x)`, this is a bug in
-  // clang.
-  [[x.~decltype(x)()]];
-}
-)cpp",
-      {R"txt(
-CallExpression Expression
-|-MemberExpression Callee
-| |-IdExpression Object
-| | `-UnqualifiedId UnqualifiedId
-| |   `-'x'
-| |-'.' AccessToken
-| `-IdExpression Member
-|   `-UnqualifiedId UnqualifiedId
-|     `-'~'
-|-'decltype'
-|-'('
-|-'x'
-|-')'
-|-'('
-`-')' CloseParen
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, UnqualifiedId_TemplateId) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-template<typename T>
-T f();
-void test() {
-  [[f<int>()]];
-}
-)cpp",
-      {R"txt(
-CallExpression Expression
-|-IdExpression Callee
-| `-UnqualifiedId UnqualifiedId
-|   |-'f'
-|   |-'<'
-|   |-'int'
-|   `-'>'
-|-'(' OpenParen
-`-')' CloseParen
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, QualifiedId_NamespaceSpecifier) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-namespace n {
-  struct S { };
-}
-void test() {
-  [[::n::S s1]];
-  [[n::S s2]];
-}
-)cpp",
-      {R"txt(
-SimpleDeclaration
-|-NestedNameSpecifier
-| |-'::' ListDelimiter
-| |-IdentifierNameSpecifier ListElement
-| | `-'n'
-| `-'::' ListDelimiter
-|-'S'
-`-DeclaratorList Declarators
-  `-SimpleDeclarator ListElement
-    `-'s1'
-)txt",
-       R"txt(
-SimpleDeclaration
-|-NestedNameSpecifier
-| |-IdentifierNameSpecifier ListElement
-| | `-'n'
-| `-'::' ListDelimiter
-|-'S'
-`-DeclaratorList Declarators
-  `-SimpleDeclarator ListElement
-    `-'s2'
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, QualifiedId_TemplateSpecifier) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-template<typename T>
-struct ST {
-  struct S { };
-};
-void test() {
-  [[::template ST<int>::S s1]];
-  [[::ST<int>::S s2]];
-}
-)cpp",
-      {R"txt(
-SimpleDeclaration
-|-NestedNameSpecifier
-| |-'::' ListDelimiter
-| |-SimpleTemplateNameSpecifier ListElement
-| | |-'template'
-| | |-'ST'
-| | |-'<'
-| | |-'int'
-| | `-'>'
-| `-'::' ListDelimiter
-|-'S'
-`-DeclaratorList Declarators
-  `-SimpleDeclarator ListElement
-    `-'s1'
-)txt",
-       R"txt(
-SimpleDeclaration
-|-NestedNameSpecifier
-| |-'::' ListDelimiter
-| |-SimpleTemplateNameSpecifier ListElement
-| | |-'ST'
-| | |-'<'
-| | |-'int'
-| | `-'>'
-| `-'::' ListDelimiter
-|-'S'
-`-DeclaratorList Declarators
-  `-SimpleDeclarator ListElement
-    `-'s2'
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, QualifiedId_DecltypeSpecifier) {
-  if (!GetParam().isCXX11OrLater()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-struct S {
-  static void f(){}
-};
-void test(S s) {
-  [[decltype(s)::f()]];
-}
-)cpp",
-      {R"txt(
-CallExpression Expression
-|-IdExpression Callee
-| |-NestedNameSpecifier Qualifier
-| | |-DecltypeNameSpecifier ListElement
-| | | |-'decltype'
-| | | |-'('
-| | | |-IdExpression
-| | | | `-UnqualifiedId UnqualifiedId
-| | | |   `-'s'
-| | | `-')'
-| | `-'::' ListDelimiter
-| `-UnqualifiedId UnqualifiedId
-|   `-'f'
-|-'(' OpenParen
-`-')' CloseParen
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, QualifiedId_OptionalTemplateKw) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-struct S {
-  template<typename U>
-  static U f();
-};
-void test() {
-  [[S::f<int>()]];
-  [[S::template f<int>()]];
-}
-)cpp",
-      {R"txt(
-CallExpression Expression
-|-IdExpression Callee
-| |-NestedNameSpecifier Qualifier
-| | |-IdentifierNameSpecifier ListElement
-| | | `-'S'
-| | `-'::' ListDelimiter
-| `-UnqualifiedId UnqualifiedId
-|   |-'f'
-|   |-'<'
-|   |-'int'
-|   `-'>'
-|-'(' OpenParen
-`-')' CloseParen
-)txt",
-       R"txt(
-CallExpression Expression
-|-IdExpression Callee
-| |-NestedNameSpecifier Qualifier
-| | |-IdentifierNameSpecifier ListElement
-| | | `-'S'
-| | `-'::' ListDelimiter
-| |-'template' TemplateKeyword
-| `-UnqualifiedId UnqualifiedId
-|   |-'f'
-|   |-'<'
-|   |-'int'
-|   `-'>'
-|-'(' OpenParen
-`-')' CloseParen
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, QualifiedId_Complex) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-namespace n {
-  template<typename T>
-  struct ST {
-    template<typename U>
-    static U f();
-  };
-}
-void test() {
-  [[::n::template ST<int>::template f<int>()]];
-}
-)cpp",
-      {R"txt(
-CallExpression Expression
-|-IdExpression Callee
-| |-NestedNameSpecifier Qualifier
-| | |-'::' ListDelimiter
-| | |-IdentifierNameSpecifier ListElement
-| | | `-'n'
-| | |-'::' ListDelimiter
-| | |-SimpleTemplateNameSpecifier ListElement
-| | | |-'template'
-| | | |-'ST'
-| | | |-'<'
-| | | |-'int'
-| | | `-'>'
-| | `-'::' ListDelimiter
-| |-'template' TemplateKeyword
-| `-UnqualifiedId UnqualifiedId
-|   |-'f'
-|   |-'<'
-|   |-'int'
-|   `-'>'
-|-'(' OpenParen
-`-')' CloseParen
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, QualifiedId_DependentType) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  if (GetParam().hasDelayedTemplateParsing()) {
-    // FIXME: Make this test work on Windows by generating the expected syntax
-    // tree when `-fdelayed-template-parsing` is active.
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-template <typename T>
-void test() {
-  [[T::template U<int>::f()]];
-  [[T::U::f()]];
-  [[T::template f<0>()]];
-}
-)cpp",
-      {R"txt(
-CallExpression Expression
-|-IdExpression Callee
-| |-NestedNameSpecifier Qualifier
-| | |-IdentifierNameSpecifier ListElement
-| | | `-'T'
-| | |-'::' ListDelimiter
-| | |-SimpleTemplateNameSpecifier ListElement
-| | | |-'template'
-| | | |-'U'
-| | | |-'<'
-| | | |-'int'
-| | | `-'>'
-| | `-'::' ListDelimiter
-| `-UnqualifiedId UnqualifiedId
-|   `-'f'
-|-'(' OpenParen
-`-')' CloseParen
-)txt",
-       R"txt(
-CallExpression Expression
-|-IdExpression Callee
-| |-NestedNameSpecifier Qualifier
-| | |-IdentifierNameSpecifier ListElement
-| | | `-'T'
-| | |-'::' ListDelimiter
-| | |-IdentifierNameSpecifier ListElement
-| | | `-'U'
-| | `-'::' ListDelimiter
-| `-UnqualifiedId UnqualifiedId
-|   `-'f'
-|-'(' OpenParen
-`-')' CloseParen
-)txt",
-       R"txt(
-CallExpression Expression
-|-IdExpression Callee
-| |-NestedNameSpecifier Qualifier
-| | |-IdentifierNameSpecifier ListElement
-| | | `-'T'
-| | `-'::' ListDelimiter
-| |-'template' TemplateKeyword
-| `-UnqualifiedId UnqualifiedId
-|   |-'f'
-|   |-'<'
-|   |-IntegerLiteralExpression
-|   | `-'0' LiteralToken
-|   `-'>'
-|-'(' OpenParen
-`-')' CloseParen
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, This_Simple) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-struct S {
-  S* test(){
-    return [[this]];
-  }
-};
-)cpp",
-      {R"txt(
-ThisExpression ReturnValue
-`-'this' IntroducerKeyword
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, This_ExplicitMemberAccess) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-struct S {
-  int a;
-  void test(){
-    [[this->a]];
-  }
-};
-)cpp",
-      {R"txt(
-MemberExpression Expression
-|-ThisExpression Object
-| `-'this' IntroducerKeyword
-|-'->' AccessToken
-`-IdExpression Member
-  `-UnqualifiedId UnqualifiedId
-    `-'a'
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, This_ImplicitMemberAccess) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-struct S {
-  int a;
-  void test(){
-    [[a]];
-  }
-};
-)cpp",
-      {R"txt(
-IdExpression Expression
-`-UnqualifiedId UnqualifiedId
-  `-'a'
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, ParenExpr) {
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-void test() {
-  [[(1)]];
-  [[((1))]];
-  [[(1 + (2))]];
-}
-)cpp",
-      {R"txt(
-ParenExpression Expression
-|-'(' OpenParen
-|-IntegerLiteralExpression SubExpression
-| `-'1' LiteralToken
-`-')' CloseParen
-)txt",
-       R"txt(
-ParenExpression Expression
-|-'(' OpenParen
-|-ParenExpression SubExpression
-| |-'(' OpenParen
-| |-IntegerLiteralExpression SubExpression
-| | `-'1' LiteralToken
-| `-')' CloseParen
-`-')' CloseParen
-)txt",
-       R"txt(
-ParenExpression Expression
-|-'(' OpenParen
-|-BinaryOperatorExpression SubExpression
-| |-IntegerLiteralExpression LeftHandSide
-| | `-'1' LiteralToken
-| |-'+' OperatorToken
-| `-ParenExpression RightHandSide
-|   |-'(' OpenParen
-|   |-IntegerLiteralExpression SubExpression
-|   | `-'2' LiteralToken
-|   `-')' CloseParen
-`-')' CloseParen
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, UserDefinedLiteral_Char) {
-  if (!GetParam().isCXX11OrLater()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-unsigned operator "" _c(char);
-void test() {
-  [['2'_c]];
-}
-    )cpp",
-      {R"txt(
-CharUserDefinedLiteralExpression Expression
-`-''2'_c' LiteralToken
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, UserDefinedLiteral_String) {
-  if (!GetParam().isCXX11OrLater()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-typedef decltype(sizeof(void *)) size_t;
-
-unsigned operator "" _s(const char*, size_t);
-
-void test() {
-  [["12"_s]];
-}
-    )cpp",
-      {R"txt(
-StringUserDefinedLiteralExpression Expression
-`-'"12"_s' LiteralToken
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, UserDefinedLiteral_Integer) {
-  if (!GetParam().isCXX11OrLater()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-unsigned operator "" _i(unsigned long long);
-unsigned operator "" _r(const char*);
-template <char...>
-unsigned operator "" _t();
-
-void test() {
-  [[12_i]];
-  [[12_r]];
-  [[12_t]];
-}
-    )cpp",
-      {R"txt(
-IntegerUserDefinedLiteralExpression Expression
-`-'12_i' LiteralToken
-)txt",
-       R"txt(
-IntegerUserDefinedLiteralExpression Expression
-`-'12_r' LiteralToken
-)txt",
-       R"txt(
-IntegerUserDefinedLiteralExpression Expression
-`-'12_t' LiteralToken
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, UserDefinedLiteral_Float) {
-  if (!GetParam().isCXX11OrLater()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-unsigned operator "" _f(long double);
-unsigned operator "" _r(const char*);
-template <char...>
-unsigned operator "" _t();
-
-void test() {
-  [[1.2_f]];
-  [[1.2_r]];
-  [[1.2_t]];
-}
-    )cpp",
-      {R"txt(
-FloatUserDefinedLiteralExpression Expression
-`-'1.2_f' LiteralToken
-)txt",
-       R"txt(
-FloatUserDefinedLiteralExpression Expression
-`-'1.2_r' LiteralToken
-)txt",
-       R"txt(
-FloatUserDefinedLiteralExpression Expression
-`-'1.2_t' LiteralToken
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, IntegerLiteral_LongLong) {
-  if (!GetParam().isCXX11OrLater()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-void test() {
-  [[12ll]];
-  [[12ull]];
-}
-)cpp",
-      {R"txt(
-IntegerLiteralExpression Expression
-`-'12ll' LiteralToken
-)txt",
-       R"txt(
-IntegerLiteralExpression Expression
-`-'12ull' LiteralToken
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, IntegerLiteral_Binary) {
-  if (!GetParam().isCXX14OrLater()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-void test() {
-  [[0b1100]];
-}
-)cpp",
-      {R"txt(
-IntegerLiteralExpression Expression
-`-'0b1100' LiteralToken
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, IntegerLiteral_WithDigitSeparators) {
-  if (!GetParam().isCXX14OrLater()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-void test() {
-  [[1'2'0ull]];
-}
-)cpp",
-      {R"txt(
-IntegerLiteralExpression Expression
-`-'1'2'0ull' LiteralToken
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, CharacterLiteral) {
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-void test() {
-  [['a']];
-  [['\n']];
-  [['\x20']];
-  [['\0']];
-  [[L'a']];
-  [[L'α']];
-}
-)cpp",
-      {R"txt(
-CharacterLiteralExpression Expression
-`-''a'' LiteralToken
-)txt",
-       R"txt(
-CharacterLiteralExpression Expression
-`-''\n'' LiteralToken
-)txt",
-       R"txt(
-CharacterLiteralExpression Expression
-`-''\x20'' LiteralToken
-)txt",
-       R"txt(
-CharacterLiteralExpression Expression
-`-''\0'' LiteralToken
-)txt",
-       R"txt(
-CharacterLiteralExpression Expression
-`-'L'a'' LiteralToken
-)txt",
-       R"txt(
-CharacterLiteralExpression Expression
-`-'L'α'' LiteralToken
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, CharacterLiteral_Utf) {
-  if (!GetParam().isCXX11OrLater()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-void test() {
-  [[u'a']];
-  [[u'構']];
-  [[U'a']];
-  [[U'🌲']];
-}
-)cpp",
-      {R"txt(
-CharacterLiteralExpression Expression
-`-'u'a'' LiteralToken
-)txt",
-       R"txt(
-CharacterLiteralExpression Expression
-`-'u'構'' LiteralToken
-)txt",
-       R"txt(
-CharacterLiteralExpression Expression
-`-'U'a'' LiteralToken
-)txt",
-       R"txt(
-CharacterLiteralExpression Expression
-`-'U'🌲'' LiteralToken
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, CharacterLiteral_Utf8) {
-  if (!GetParam().isCXX17OrLater()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-void test() {
-  [[u8'a']];
-  [[u8'\x7f']];
-}
-)cpp",
-      {R"txt(
-CharacterLiteralExpression Expression
-`-'u8'a'' LiteralToken
-)txt",
-       R"txt(
-CharacterLiteralExpression Expression
-`-'u8'\x7f'' LiteralToken
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, FloatingLiteral) {
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-void test() {
-  [[1e-2]];
-  [[2.]];
-  [[.2]];
-  [[2.f]];
-}
-)cpp",
-      {R"txt(
-FloatingLiteralExpression Expression
-`-'1e-2' LiteralToken
-)txt",
-       R"txt(
-FloatingLiteralExpression Expression
-`-'2.' LiteralToken
-)txt",
-       R"txt(
-FloatingLiteralExpression Expression
-`-'.2' LiteralToken
-)txt",
-       R"txt(
-FloatingLiteralExpression Expression
-`-'2.f' LiteralToken
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, FloatingLiteral_Hexadecimal) {
-  if (!GetParam().isCXX17OrLater()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-void test() {
-  [[0xfp1]];
-  [[0xf.p1]];
-  [[0x.fp1]];
-  [[0xf.fp1f]];
-}
-)cpp",
-      {R"txt(
-FloatingLiteralExpression Expression
-`-'0xfp1' LiteralToken
-)txt",
-       R"txt(
-FloatingLiteralExpression Expression
-`-'0xf.p1' LiteralToken
-)txt",
-       R"txt(
-FloatingLiteralExpression Expression
-`-'0x.fp1' LiteralToken
-)txt",
-       R"txt(
-FloatingLiteralExpression Expression
-`-'0xf.fp1f' LiteralToken
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, StringLiteral) {
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-void test() {
-  [["a\n\0\x20"]];
-  [[L"αβ"]];
-}
-)cpp",
-      {R"txt(
-StringLiteralExpression Expression
-`-'"a\n\0\x20"' LiteralToken
-)txt",
-       R"txt(
-StringLiteralExpression Expression
-`-'L"αβ"' LiteralToken
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, StringLiteral_Utf) {
-  if (!GetParam().isCXX11OrLater()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-void test() {
-  [[u8"a\x1f\x05"]];
-  [[u"C++抽象構文木"]];
-  [[U"📖🌲\n"]];
-}
-)cpp",
-      {R"txt(
-StringLiteralExpression Expression
-`-'u8"a\x1f\x05"' LiteralToken
-)txt",
-       R"txt(
-StringLiteralExpression Expression
-`-'u"C++抽象構文木"' LiteralToken
-)txt",
-       R"txt(
-StringLiteralExpression Expression
-`-'U"📖🌲\n"' LiteralToken
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, StringLiteral_Raw) {
-  if (!GetParam().isCXX11OrLater()) {
-    return;
-  }
-  // This test uses regular string literals instead of raw string literals to
-  // hold source code and expected output because of a bug in MSVC up to MSVC
-  // 2019 16.2:
-  // https://developercommunity.visualstudio.com/content/problem/67300/stringifying-raw-string-literal.html
-  EXPECT_TRUE(treeDumpEqual( //
-      "void test() {\n"
-      "  R\"SyntaxTree(\n"
-      "  Hello \"Syntax\" \\\"\n"
-      "  )SyntaxTree\";\n"
-      "}\n",
-      "TranslationUnit Detached\n"
-      "`-SimpleDeclaration\n"
-      "  |-'void'\n"
-      "  |-DeclaratorList Declarators\n"
-      "  | `-SimpleDeclarator ListElement\n"
-      "  |   |-'test'\n"
-      "  |   `-ParametersAndQualifiers\n"
-      "  |     |-'(' OpenParen\n"
-      "  |     `-')' CloseParen\n"
-      "  `-CompoundStatement\n"
-      "    |-'{' OpenParen\n"
-      "    |-ExpressionStatement Statement\n"
-      "    | |-StringLiteralExpression Expression\n"
-      "    | | `-'R\"SyntaxTree(\n"
-      "  Hello \"Syntax\" \\\"\n"
-      "  )SyntaxTree\"' LiteralToken\n"
-      "    | `-';'\n"
-      "    `-'}' CloseParen\n"));
-}
-
-TEST_P(BuildSyntaxTreeTest, BoolLiteral) {
-  if (GetParam().isC()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-void test() {
-  [[true]];
-  [[false]];
-}
-)cpp",
-      {R"txt(
-BoolLiteralExpression Expression
-`-'true' LiteralToken
-)txt",
-       R"txt(
-BoolLiteralExpression Expression
-`-'false' LiteralToken
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, CxxNullPtrLiteral) {
-  if (!GetParam().isCXX11OrLater()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-void test() {
-  [[nullptr]];
-}
-)cpp",
-      {R"txt(
-CxxNullPtrExpression Expression
-`-'nullptr' LiteralToken
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, PostfixUnaryOperator) {
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-void test(int a) {
-  [[a++]];
-  [[a--]];
-}
-)cpp",
-      {R"txt(
-PostfixUnaryOperatorExpression Expression
-|-IdExpression Operand
-| `-UnqualifiedId UnqualifiedId
-|   `-'a'
-`-'++' OperatorToken
-)txt",
-       R"txt(
-PostfixUnaryOperatorExpression Expression
-|-IdExpression Operand
-| `-UnqualifiedId UnqualifiedId
-|   `-'a'
-`-'--' OperatorToken
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, PrefixUnaryOperator) {
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-void test(int a, int *ap) {
-  [[--a]]; [[++a]];
-  [[~a]];
-  [[-a]];
-  [[+a]];
-  [[&a]];
-  [[*ap]];
-  [[!a]];
-  [[__real a]]; [[__imag a]];
-}
-)cpp",
-      {R"txt(
-PrefixUnaryOperatorExpression Expression
-|-'--' OperatorToken
-`-IdExpression Operand
-  `-UnqualifiedId UnqualifiedId
-    `-'a'
-)txt",
-       R"txt(
-PrefixUnaryOperatorExpression Expression
-|-'++' OperatorToken
-`-IdExpression Operand
-  `-UnqualifiedId UnqualifiedId
-    `-'a'
-)txt",
-       R"txt(
-PrefixUnaryOperatorExpression Expression
-|-'~' OperatorToken
-`-IdExpression Operand
-  `-UnqualifiedId UnqualifiedId
-    `-'a'
-)txt",
-       R"txt(
-PrefixUnaryOperatorExpression Expression
-|-'-' OperatorToken
-`-IdExpression Operand
-  `-UnqualifiedId UnqualifiedId
-    `-'a'
-)txt",
-       R"txt(
-PrefixUnaryOperatorExpression Expression
-|-'+' OperatorToken
-`-IdExpression Operand
-  `-UnqualifiedId UnqualifiedId
-    `-'a'
-)txt",
-       R"txt(
-PrefixUnaryOperatorExpression Expression
-|-'&' OperatorToken
-`-IdExpression Operand
-  `-UnqualifiedId UnqualifiedId
-    `-'a'
-)txt",
-       R"txt(
-PrefixUnaryOperatorExpression Expression
-|-'*' OperatorToken
-`-IdExpression Operand
-  `-UnqualifiedId UnqualifiedId
-    `-'ap'
-)txt",
-       R"txt(
-PrefixUnaryOperatorExpression Expression
-|-'!' OperatorToken
-`-IdExpression Operand
-  `-UnqualifiedId UnqualifiedId
-    `-'a'
-)txt",
-       R"txt(
-PrefixUnaryOperatorExpression Expression
-|-'__real' OperatorToken
-`-IdExpression Operand
-  `-UnqualifiedId UnqualifiedId
-    `-'a'
-)txt",
-       R"txt(
-PrefixUnaryOperatorExpression Expression
-|-'__imag' OperatorToken
-`-IdExpression Operand
-  `-UnqualifiedId UnqualifiedId
-    `-'a'
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, PrefixUnaryOperatorCxx) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-void test(int a, bool b) {
-  [[compl a]];
-  [[not b]];
-}
-)cpp",
-      {R"txt(
-PrefixUnaryOperatorExpression Expression
-|-'compl' OperatorToken
-`-IdExpression Operand
-  `-UnqualifiedId UnqualifiedId
-    `-'a'
-)txt",
-       R"txt(
-PrefixUnaryOperatorExpression Expression
-|-'not' OperatorToken
-`-IdExpression Operand
-  `-UnqualifiedId UnqualifiedId
-    `-'b'
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, BinaryOperator) {
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-void test(int a) {
-  [[1 - 2]];
-  [[1 == 2]];
-  [[a = 1]];
-  [[a <<= 1]];
-  [[1 || 0]];
-  [[1 & 2]];
-  [[a != 3]];
-}
-)cpp",
-      {R"txt(
-BinaryOperatorExpression Expression
-|-IntegerLiteralExpression LeftHandSide
-| `-'1' LiteralToken
-|-'-' OperatorToken
-`-IntegerLiteralExpression RightHandSide
-  `-'2' LiteralToken
-)txt",
-       R"txt(
-BinaryOperatorExpression Expression
-|-IntegerLiteralExpression LeftHandSide
-| `-'1' LiteralToken
-|-'==' OperatorToken
-`-IntegerLiteralExpression RightHandSide
-  `-'2' LiteralToken
-)txt",
-       R"txt(
-BinaryOperatorExpression Expression
-|-IdExpression LeftHandSide
-| `-UnqualifiedId UnqualifiedId
-|   `-'a'
-|-'=' OperatorToken
-`-IntegerLiteralExpression RightHandSide
-  `-'1' LiteralToken
-)txt",
-       R"txt(
-BinaryOperatorExpression Expression
-|-IdExpression LeftHandSide
-| `-UnqualifiedId UnqualifiedId
-|   `-'a'
-|-'<<=' OperatorToken
-`-IntegerLiteralExpression RightHandSide
-  `-'1' LiteralToken
-)txt",
-       R"txt(
-BinaryOperatorExpression Expression
-|-IntegerLiteralExpression LeftHandSide
-| `-'1' LiteralToken
-|-'||' OperatorToken
-`-IntegerLiteralExpression RightHandSide
-  `-'0' LiteralToken
-)txt",
-       R"txt(
-BinaryOperatorExpression Expression
-|-IntegerLiteralExpression LeftHandSide
-| `-'1' LiteralToken
-|-'&' OperatorToken
-`-IntegerLiteralExpression RightHandSide
-  `-'2' LiteralToken
-)txt",
-       R"txt(
-BinaryOperatorExpression Expression
-|-IdExpression LeftHandSide
-| `-UnqualifiedId UnqualifiedId
-|   `-'a'
-|-'!=' OperatorToken
-`-IntegerLiteralExpression RightHandSide
-  `-'3' LiteralToken
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, BinaryOperatorCxx) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-void test(int a) {
-  [[true || false]];
-  [[true or false]];
-  [[1 bitand 2]];
-  [[a xor_eq 3]];
-}
-)cpp",
-      {R"txt(
-BinaryOperatorExpression Expression
-|-BoolLiteralExpression LeftHandSide
-| `-'true' LiteralToken
-|-'||' OperatorToken
-`-BoolLiteralExpression RightHandSide
-  `-'false' LiteralToken
-)txt",
-       R"txt(
-BinaryOperatorExpression Expression
-|-BoolLiteralExpression LeftHandSide
-| `-'true' LiteralToken
-|-'or' OperatorToken
-`-BoolLiteralExpression RightHandSide
-  `-'false' LiteralToken
-)txt",
-       R"txt(
-BinaryOperatorExpression Expression
-|-IntegerLiteralExpression LeftHandSide
-| `-'1' LiteralToken
-|-'bitand' OperatorToken
-`-IntegerLiteralExpression RightHandSide
-  `-'2' LiteralToken
-)txt",
-       R"txt(
-BinaryOperatorExpression Expression
-|-IdExpression LeftHandSide
-| `-UnqualifiedId UnqualifiedId
-|   `-'a'
-|-'xor_eq' OperatorToken
-`-IntegerLiteralExpression RightHandSide
-  `-'3' LiteralToken
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, BinaryOperator_NestedWithParenthesis) {
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-void test() {
-  [[(1 + 2) * (4 / 2)]];
-}
-)cpp",
-      {R"txt(
-BinaryOperatorExpression Expression
-|-ParenExpression LeftHandSide
-| |-'(' OpenParen
-| |-BinaryOperatorExpression SubExpression
-| | |-IntegerLiteralExpression LeftHandSide
-| | | `-'1' LiteralToken
-| | |-'+' OperatorToken
-| | `-IntegerLiteralExpression RightHandSide
-| |   `-'2' LiteralToken
-| `-')' CloseParen
-|-'*' OperatorToken
-`-ParenExpression RightHandSide
-  |-'(' OpenParen
-  |-BinaryOperatorExpression SubExpression
-  | |-IntegerLiteralExpression LeftHandSide
-  | | `-'4' LiteralToken
-  | |-'/' OperatorToken
-  | `-IntegerLiteralExpression RightHandSide
-  |   `-'2' LiteralToken
-  `-')' CloseParen
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, BinaryOperator_Associativity) {
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-void test(int a, int b) {
-  [[a + b + 42]];
-  [[a = b = 42]];
-}
-)cpp",
-      {R"txt(
-BinaryOperatorExpression Expression
-|-BinaryOperatorExpression LeftHandSide
-| |-IdExpression LeftHandSide
-| | `-UnqualifiedId UnqualifiedId
-| |   `-'a'
-| |-'+' OperatorToken
-| `-IdExpression RightHandSide
-|   `-UnqualifiedId UnqualifiedId
-|     `-'b'
-|-'+' OperatorToken
-`-IntegerLiteralExpression RightHandSide
-  `-'42' LiteralToken
-)txt",
-       R"txt(
-BinaryOperatorExpression Expression
-|-IdExpression LeftHandSide
-| `-UnqualifiedId UnqualifiedId
-|   `-'a'
-|-'=' OperatorToken
-`-BinaryOperatorExpression RightHandSide
-  |-IdExpression LeftHandSide
-  | `-UnqualifiedId UnqualifiedId
-  |   `-'b'
-  |-'=' OperatorToken
-  `-IntegerLiteralExpression RightHandSide
-    `-'42' LiteralToken
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, BinaryOperator_Precedence) {
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-void test() {
-  [[1 + 2 * 3 + 4]];
-  [[1 % 2 + 3 * 4]];
-}
-)cpp",
-      {R"txt(
-BinaryOperatorExpression Expression
-|-BinaryOperatorExpression LeftHandSide
-| |-IntegerLiteralExpression LeftHandSide
-| | `-'1' LiteralToken
-| |-'+' OperatorToken
-| `-BinaryOperatorExpression RightHandSide
-|   |-IntegerLiteralExpression LeftHandSide
-|   | `-'2' LiteralToken
-|   |-'*' OperatorToken
-|   `-IntegerLiteralExpression RightHandSide
-|     `-'3' LiteralToken
-|-'+' OperatorToken
-`-IntegerLiteralExpression RightHandSide
-  `-'4' LiteralToken
-)txt",
-       R"txt(
-BinaryOperatorExpression Expression
-|-BinaryOperatorExpression LeftHandSide
-| |-IntegerLiteralExpression LeftHandSide
-| | `-'1' LiteralToken
-| |-'%' OperatorToken
-| `-IntegerLiteralExpression RightHandSide
-|   `-'2' LiteralToken
-|-'+' OperatorToken
-`-BinaryOperatorExpression RightHandSide
-  |-IntegerLiteralExpression LeftHandSide
-  | `-'3' LiteralToken
-  |-'*' OperatorToken
-  `-IntegerLiteralExpression RightHandSide
-    `-'4' LiteralToken
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, OverloadedOperator_Assignment) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-struct X {
-  X& operator=(const X&);
-};
-void test(X x, X y) {
-  [[x = y]];
-}
-)cpp",
-      {R"txt(
-BinaryOperatorExpression Expression
-|-IdExpression LeftHandSide
-| `-UnqualifiedId UnqualifiedId
-|   `-'x'
-|-'=' OperatorToken
-`-IdExpression RightHandSide
-  `-UnqualifiedId UnqualifiedId
-    `-'y'
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, OverloadedOperator_Plus) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-struct X {
-  friend X operator+(X, const X&);
-};
-void test(X x, X y) {
-  [[x + y]];
-}
-)cpp",
-      {R"txt(
-BinaryOperatorExpression Expression
-|-IdExpression LeftHandSide
-| `-UnqualifiedId UnqualifiedId
-|   `-'x'
-|-'+' OperatorToken
-`-IdExpression RightHandSide
-  `-UnqualifiedId UnqualifiedId
-    `-'y'
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, OverloadedOperator_Less) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-struct X {
-  friend bool operator<(const X&, const X&);
-};
-void test(X x, X y) {
-  [[x < y]];
-}
-)cpp",
-      {R"txt(
-BinaryOperatorExpression Expression
-|-IdExpression LeftHandSide
-| `-UnqualifiedId UnqualifiedId
-|   `-'x'
-|-'<' OperatorToken
-`-IdExpression RightHandSide
-  `-UnqualifiedId UnqualifiedId
-    `-'y'
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, OverloadedOperator_LeftShift) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-struct X {
-  friend X operator<<(X&, const X&);
-};
-void test(X x, X y) {
-  [[x << y]];
-}
-)cpp",
-      {R"txt(
-BinaryOperatorExpression Expression
-|-IdExpression LeftHandSide
-| `-UnqualifiedId UnqualifiedId
-|   `-'x'
-|-'<<' OperatorToken
-`-IdExpression RightHandSide
-  `-UnqualifiedId UnqualifiedId
-    `-'y'
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, OverloadedOperator_Comma) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-struct X {
-  X operator,(X&);
-};
-void test(X x, X y) {
-  [[x, y]];
-}
-)cpp",
-      {R"txt(
-BinaryOperatorExpression Expression
-|-IdExpression LeftHandSide
-| `-UnqualifiedId UnqualifiedId
-|   `-'x'
-|-',' OperatorToken
-`-IdExpression RightHandSide
-  `-UnqualifiedId UnqualifiedId
-    `-'y'
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, OverloadedOperator_PointerToMember) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-struct X {
-  X operator->*(int);
-};
-void test(X* xp, int X::* pmi) {
-  [[xp->*pmi]];
-}
-)cpp",
-      {R"txt(
-BinaryOperatorExpression Expression
-|-IdExpression LeftHandSide
-| `-UnqualifiedId UnqualifiedId
-|   `-'xp'
-|-'->*' OperatorToken
-`-IdExpression RightHandSide
-  `-UnqualifiedId UnqualifiedId
-    `-'pmi'
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, OverloadedOperator_Negation) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-struct X {
-  bool operator!();
-};
-void test(X x) {
-  [[!x]];
-}
-)cpp",
-      {R"txt(
-PrefixUnaryOperatorExpression Expression
-|-'!' OperatorToken
-`-IdExpression Operand
-  `-UnqualifiedId UnqualifiedId
-    `-'x'
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, OverloadedOperator_AddressOf) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-struct X {
-  X* operator&();
-};
-void test(X x) {
-  [[&x]];
-}
-)cpp",
-      {R"txt(
-PrefixUnaryOperatorExpression Expression
-|-'&' OperatorToken
-`-IdExpression Operand
-  `-UnqualifiedId UnqualifiedId
-    `-'x'
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, OverloadedOperator_PrefixIncrement) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-struct X {
-  X operator++();
-};
-void test(X x) {
-  [[++x]];
-}
-)cpp",
-      {R"txt(
-PrefixUnaryOperatorExpression Expression
-|-'++' OperatorToken
-`-IdExpression Operand
-  `-UnqualifiedId UnqualifiedId
-    `-'x'
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, OverloadedOperator_PostfixIncrement) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-struct X {
-  X operator++(int);
-};
-void test(X x) {
-  [[x++]];
-}
-)cpp",
-      {R"txt(
-PostfixUnaryOperatorExpression Expression
-|-IdExpression Operand
-| `-UnqualifiedId UnqualifiedId
-|   `-'x'
-`-'++' OperatorToken
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, MemberExpression_SimpleWithDot) {
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-struct S {
-  int a;
-};
-void test(struct S s) {
-  [[s.a]];
-}
-)cpp",
-      {R"txt(
-MemberExpression Expression
-|-IdExpression Object
-| `-UnqualifiedId UnqualifiedId
-|   `-'s'
-|-'.' AccessToken
-`-IdExpression Member
-  `-UnqualifiedId UnqualifiedId
-    `-'a'
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, MemberExpression_StaticDataMember) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-struct S {
-  static int a;
-};
-void test(S s) {
-  [[s.a]];
-}
-)cpp",
-      {R"txt(
-MemberExpression Expression
-|-IdExpression Object
-| `-UnqualifiedId UnqualifiedId
-|   `-'s'
-|-'.' AccessToken
-`-IdExpression Member
-  `-UnqualifiedId UnqualifiedId
-    `-'a'
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, MemberExpression_SimpleWithArrow) {
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-struct S {
-  int a;
-};
-void test(struct S* sp) {
-  [[sp->a]];
-}
-)cpp",
-      {R"txt(
-MemberExpression Expression
-|-IdExpression Object
-| `-UnqualifiedId UnqualifiedId
-|   `-'sp'
-|-'->' AccessToken
-`-IdExpression Member
-  `-UnqualifiedId UnqualifiedId
-    `-'a'
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, MemberExpression_Chaining) {
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-struct S {
-  struct S* next;
-};
-void test(struct S s){
-  [[s.next->next]];
-}
-)cpp",
-      {R"txt(
-MemberExpression Expression
-|-MemberExpression Object
-| |-IdExpression Object
-| | `-UnqualifiedId UnqualifiedId
-| |   `-'s'
-| |-'.' AccessToken
-| `-IdExpression Member
-|   `-UnqualifiedId UnqualifiedId
-|     `-'next'
-|-'->' AccessToken
-`-IdExpression Member
-  `-UnqualifiedId UnqualifiedId
-    `-'next'
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, MemberExpression_OperatorFunction) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-struct S {
-  bool operator!();
-};
-void test(S s) {
-  [[s.operator!()]];
-}
-)cpp",
-      {R"txt(
-CallExpression Expression
-|-MemberExpression Callee
-| |-IdExpression Object
-| | `-UnqualifiedId UnqualifiedId
-| |   `-'s'
-| |-'.' AccessToken
-| `-IdExpression Member
-|   `-UnqualifiedId UnqualifiedId
-|     |-'operator'
-|     `-'!'
-|-'(' OpenParen
-`-')' CloseParen
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, MemberExpression_VariableTemplate) {
-  if (!GetParam().isCXX14OrLater()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-struct S {
-  template<typename T>
-  static constexpr T x = 42;
-};
-// FIXME: `<int>` should be a child of `MemberExpression` and `;` of
-// `ExpressionStatement`. This is a bug in clang, in `getSourceRange` methods.
-void test(S s) [[{
-  s.x<int>;
-}]]
-)cpp",
-      {R"txt(
-CompoundStatement
-|-'{' OpenParen
-|-ExpressionStatement Statement
-| `-MemberExpression Expression
-|   |-IdExpression Object
-|   | `-UnqualifiedId UnqualifiedId
-|   |   `-'s'
-|   |-'.' AccessToken
-|   `-IdExpression Member
-|     `-UnqualifiedId UnqualifiedId
-|       `-'x'
-|-'<'
-|-'int'
-|-'>'
-|-';'
-`-'}' CloseParen
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, MemberExpression_FunctionTemplate) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-struct S {
-  template<typename T>
-  T f();
-};
-void test(S* sp){
-  [[sp->f<int>()]];
-}
-)cpp",
-      {R"txt(
-CallExpression Expression
-|-MemberExpression Callee
-| |-IdExpression Object
-| | `-UnqualifiedId UnqualifiedId
-| |   `-'sp'
-| |-'->' AccessToken
-| `-IdExpression Member
-|   `-UnqualifiedId UnqualifiedId
-|     |-'f'
-|     |-'<'
-|     |-'int'
-|     `-'>'
-|-'(' OpenParen
-`-')' CloseParen
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest,
-       MemberExpression_FunctionTemplateWithTemplateKeyword) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-struct S {
-  template<typename T>
-  T f();
-};
-void test(S s){
-  [[s.template f<int>()]];
-}
-)cpp",
-      {R"txt(
-CallExpression Expression
-|-MemberExpression Callee
-| |-IdExpression Object
-| | `-UnqualifiedId UnqualifiedId
-| |   `-'s'
-| |-'.' AccessToken
-| |-'template'
-| `-IdExpression Member
-|   `-UnqualifiedId UnqualifiedId
-|     |-'f'
-|     |-'<'
-|     |-'int'
-|     `-'>'
-|-'(' OpenParen
-`-')' CloseParen
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, MemberExpression_WithQualifier) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-struct Base {
-  void f();
-};
-struct S : public Base {};
-void test(S s){
-  [[s.Base::f()]];
-  [[s.::S::~S()]];
-}
-)cpp",
-      {R"txt(
-CallExpression Expression
-|-MemberExpression Callee
-| |-IdExpression Object
-| | `-UnqualifiedId UnqualifiedId
-| |   `-'s'
-| |-'.' AccessToken
-| `-IdExpression Member
-|   |-NestedNameSpecifier Qualifier
-|   | |-IdentifierNameSpecifier ListElement
-|   | | `-'Base'
-|   | `-'::' ListDelimiter
-|   `-UnqualifiedId UnqualifiedId
-|     `-'f'
-|-'(' OpenParen
-`-')' CloseParen
-      )txt",
-       R"txt(
-CallExpression Expression
-|-MemberExpression Callee
-| |-IdExpression Object
-| | `-UnqualifiedId UnqualifiedId
-| |   `-'s'
-| |-'.' AccessToken
-| `-IdExpression Member
-|   |-NestedNameSpecifier Qualifier
-|   | |-'::' ListDelimiter
-|   | |-IdentifierNameSpecifier ListElement
-|   | | `-'S'
-|   | `-'::' ListDelimiter
-|   `-UnqualifiedId UnqualifiedId
-|     |-'~'
-|     `-'S'
-|-'(' OpenParen
-`-')' CloseParen
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, MemberExpression_Complex) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-template<typename T>
-struct U {
-  template<typename U>
-  U f();
-};
-struct S {
-  U<int> getU();
-};
-void test(S* sp) {
-  // FIXME: The first 'template' keyword is a child of `NestedNameSpecifier`,
-  // but it should be a child of `MemberExpression` according to the grammar.
-  // However one might argue that the 'template' keyword fits better inside
-  // `NestedNameSpecifier` because if we change `U<int>` to `UI` we would like
-  // equally to change the `NameSpecifier` `template U<int>` to just `UI`.
-  [[sp->getU().template U<int>::template f<int>()]];
-}
-)cpp",
-      {R"txt(
-CallExpression Expression
-|-MemberExpression Callee
-| |-CallExpression Object
-| | |-MemberExpression Callee
-| | | |-IdExpression Object
-| | | | `-UnqualifiedId UnqualifiedId
-| | | |   `-'sp'
-| | | |-'->' AccessToken
-| | | `-IdExpression Member
-| | |   `-UnqualifiedId UnqualifiedId
-| | |     `-'getU'
-| | |-'(' OpenParen
-| | `-')' CloseParen
-| |-'.' AccessToken
-| `-IdExpression Member
-|   |-NestedNameSpecifier Qualifier
-|   | |-SimpleTemplateNameSpecifier ListElement
-|   | | |-'template'
-|   | | |-'U'
-|   | | |-'<'
-|   | | |-'int'
-|   | | `-'>'
-|   | `-'::' ListDelimiter
-|   |-'template' TemplateKeyword
-|   `-UnqualifiedId UnqualifiedId
-|     |-'f'
-|     |-'<'
-|     |-'int'
-|     `-'>'
-|-'(' OpenParen
-`-')' CloseParen
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, CallExpression_Callee_Member) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-struct S{
-  void f();
-};
-void test(S s) {
-  [[s.f()]];
-}
-)cpp",
-      {R"txt(
-CallExpression Expression
-|-MemberExpression Callee
-| |-IdExpression Object
-| | `-UnqualifiedId UnqualifiedId
-| |   `-'s'
-| |-'.' AccessToken
-| `-IdExpression Member
-|   `-UnqualifiedId UnqualifiedId
-|     `-'f'
-|-'(' OpenParen
-`-')' CloseParen
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, CallExpression_Callee_OperatorParens) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-struct S {
-  void operator()();
-};
-void test(S s) {
-  [[s()]];
-}
-)cpp",
-      {R"txt(
-CallExpression Expression
-|-IdExpression Callee
-| `-UnqualifiedId UnqualifiedId
-|   `-'s'
-|-'(' OpenParen
-`-')' CloseParen
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, CallExpression_Callee_OperatorParensChaining) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-struct S {
-  S operator()();
-};
-void test(S s) {
-  [[s()()]];
-}
-)cpp",
-      {R"txt(
-CallExpression Expression
-|-CallExpression Callee
-| |-IdExpression Callee
-| | `-UnqualifiedId UnqualifiedId
-| |   `-'s'
-| |-'(' OpenParen
-| `-')' CloseParen
-|-'(' OpenParen
-`-')' CloseParen
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, CallExpression_Callee_MemberWithThis) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-struct Base {
-  void f();
-};
-struct S: public Base {
-  void f();
-  void test() {
-    [[this->f()]];
-    [[f()]];
-    [[this->Base::f()]];
-  }
-};
-)cpp",
-      {R"txt(
-CallExpression Expression
-|-MemberExpression Callee
-| |-ThisExpression Object
-| | `-'this' IntroducerKeyword
-| |-'->' AccessToken
-| `-IdExpression Member
-|   `-UnqualifiedId UnqualifiedId
-|     `-'f'
-|-'(' OpenParen
-`-')' CloseParen
-      )txt",
-       R"txt(
-CallExpression Expression
-|-IdExpression Callee
-| `-UnqualifiedId UnqualifiedId
-|   `-'f'
-|-'(' OpenParen
-`-')' CloseParen
-      )txt",
-       R"txt(
-CallExpression Expression
-|-MemberExpression Callee
-| |-ThisExpression Object
-| | `-'this' IntroducerKeyword
-| |-'->' AccessToken
-| `-IdExpression Member
-|   |-NestedNameSpecifier Qualifier
-|   | |-IdentifierNameSpecifier ListElement
-|   | | `-'Base'
-|   | `-'::' ListDelimiter
-|   `-UnqualifiedId UnqualifiedId
-|     `-'f'
-|-'(' OpenParen
-`-')' CloseParen
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, CallExpression_Callee_FunctionPointer) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-void (*pf)();
-void test() {
-  [[pf()]];
-  [[(*pf)()]];
-}
-)cpp",
-      {R"txt(
-CallExpression Expression
-|-IdExpression Callee
-| `-UnqualifiedId UnqualifiedId
-|   `-'pf'
-|-'(' OpenParen
-`-')' CloseParen
-)txt",
-       R"txt(
-CallExpression Expression
-|-ParenExpression Callee
-| |-'(' OpenParen
-| |-PrefixUnaryOperatorExpression SubExpression
-| | |-'*' OperatorToken
-| | `-IdExpression Operand
-| |   `-UnqualifiedId UnqualifiedId
-| |     `-'pf'
-| `-')' CloseParen
-|-'(' OpenParen
-`-')' CloseParen
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, CallExpression_Callee_MemberFunctionPointer) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-struct S {
-  void f();
-};
-void test(S s) {
-  void (S::*pmf)();
-  pmf = &S::f;
-  [[(s.*pmf)()]];
-}
-)cpp",
-      {R"txt(
-CallExpression Expression
-|-ParenExpression Callee
-| |-'(' OpenParen
-| |-BinaryOperatorExpression SubExpression
-| | |-IdExpression LeftHandSide
-| | | `-UnqualifiedId UnqualifiedId
-| | |   `-'s'
-| | |-'.*' OperatorToken
-| | `-IdExpression RightHandSide
-| |   `-UnqualifiedId UnqualifiedId
-| |     `-'pmf'
-| `-')' CloseParen
-|-'(' OpenParen
-`-')' CloseParen
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, CallExpression_Arguments_Zero) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-void f();
-void test() {
-  [[f();]]
-}
-)cpp",
-      {R"txt(
-ExpressionStatement Statement
-|-CallExpression Expression
-| |-IdExpression Callee
-| | `-UnqualifiedId UnqualifiedId
-| |   `-'f'
-| |-'(' OpenParen
-| `-')' CloseParen
-`-';'
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, CallExpression_Arguments_One) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-void f(int);
-void test() {
-  [[f(1);]]
-}
-)cpp",
-      {R"txt(
-ExpressionStatement Statement
-|-CallExpression Expression
-| |-IdExpression Callee
-| | `-UnqualifiedId UnqualifiedId
-| |   `-'f'
-| |-'(' OpenParen
-| |-CallArguments Arguments
-| | `-IntegerLiteralExpression ListElement
-| |   `-'1' LiteralToken
-| `-')' CloseParen
-`-';'
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, CallExpression_Arguments_Multiple) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-void f(int, char, float);
-void test() {
-  [[f(1, '2', 3.);]]
-}
-)cpp",
-      {R"txt(
-ExpressionStatement Statement
-|-CallExpression Expression
-| |-IdExpression Callee
-| | `-UnqualifiedId UnqualifiedId
-| |   `-'f'
-| |-'(' OpenParen
-| |-CallArguments Arguments
-| | |-IntegerLiteralExpression ListElement
-| | | `-'1' LiteralToken
-| | |-',' ListDelimiter
-| | |-CharacterLiteralExpression ListElement
-| | | `-''2'' LiteralToken
-| | |-',' ListDelimiter
-| | `-FloatingLiteralExpression ListElement
-| |   `-'3.' LiteralToken
-| `-')' CloseParen
-`-';'
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, CallExpression_Arguments_Assignment) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-void f(int);
-void test(int a) {
-  [[f(a = 1);]]
-}
-)cpp",
-      {R"txt(
-ExpressionStatement Statement
-|-CallExpression Expression
-| |-IdExpression Callee
-| | `-UnqualifiedId UnqualifiedId
-| |   `-'f'
-| |-'(' OpenParen
-| |-CallArguments Arguments
-| | `-BinaryOperatorExpression ListElement
-| |   |-IdExpression LeftHandSide
-| |   | `-UnqualifiedId UnqualifiedId
-| |   |   `-'a'
-| |   |-'=' OperatorToken
-| |   `-IntegerLiteralExpression RightHandSide
-| |     `-'1' LiteralToken
-| `-')' CloseParen
-`-';'
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, CallExpression_Arguments_BracedInitList_Empty) {
-  if (!GetParam().isCXX11OrLater()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-void f(int[]);
-void test() {
-  [[f({});]]
-}
-)cpp",
-      {R"txt(
-ExpressionStatement Statement
-|-CallExpression Expression
-| |-IdExpression Callee
-| | `-UnqualifiedId UnqualifiedId
-| |   `-'f'
-| |-'(' OpenParen
-| |-CallArguments Arguments
-| | `-UnknownExpression ListElement
-| |   `-UnknownExpression
-| |     |-'{'
-| |     `-'}'
-| `-')' CloseParen
-`-';'
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, CallExpression_Arguments_BracedInitList_Simple) {
-  if (!GetParam().isCXX11OrLater()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-struct TT {};
-struct T{
-  int a;
-  TT b;
-};
-void f(T);
-void test() {
-  [[f({1, {}});]]
-}
-)cpp",
-      {R"txt(
-ExpressionStatement Statement
-|-CallExpression Expression
-| |-IdExpression Callee
-| | `-UnqualifiedId UnqualifiedId
-| |   `-'f'
-| |-'(' OpenParen
-| |-CallArguments Arguments
-| | `-UnknownExpression ListElement
-| |   `-UnknownExpression
-| |     |-'{'
-| |     |-IntegerLiteralExpression
-| |     | `-'1' LiteralToken
-| |     |-','
-| |     |-UnknownExpression
-| |     | `-UnknownExpression
-| |     |   |-'{'
-| |     |   `-'}'
-| |     `-'}'
-| `-')' CloseParen
-`-';'
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest,
-       CallExpression_Arguments_BracedInitList_Designated) {
-  if (!GetParam().isCXX11OrLater()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-struct TT {};
-struct T{
-  int a;
-  TT b;
-};
-void f(T);
-void test() {
-  [[f({.a = 1, .b {}});]]
-}
-)cpp",
-      {R"txt(
-ExpressionStatement Statement
-|-CallExpression Expression
-| |-IdExpression Callee
-| | `-UnqualifiedId UnqualifiedId
-| |   `-'f'
-| |-'(' OpenParen
-| |-CallArguments Arguments
-| | `-UnknownExpression ListElement
-| |   `-UnknownExpression
-| |     |-'{'
-| |     |-UnknownExpression
-| |     | |-'.'
-| |     | |-'a'
-| |     | |-'='
-| |     | `-IntegerLiteralExpression
-| |     |   `-'1' LiteralToken
-| |     |-','
-| |     |-UnknownExpression
-| |     | |-'.'
-| |     | |-'b'
-| |     | `-UnknownExpression
-| |     |   `-UnknownExpression
-| |     |     |-'{'
-| |     |     `-'}'
-| |     `-'}'
-| `-')' CloseParen
-`-';'
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, CallExpression_Arguments_ParameterPack) {
-  if (!GetParam().isCXX11OrLater() || GetParam().hasDelayedTemplateParsing()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-template<typename T, typename... Args>
-void test(T t, Args... args) {
-  [[test(args...)]];
-}
-)cpp",
-      {R"txt(
-CallExpression Expression
-|-UnknownExpression Callee
-| `-'test'
-|-'(' OpenParen
-|-CallArguments Arguments
-| `-UnknownExpression ListElement
-|   |-IdExpression
-|   | `-UnqualifiedId UnqualifiedId
-|   |   `-'args'
-|   `-'...'
-`-')' CloseParen
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, CallExpression_DefaultArguments) {
-  if (!GetParam().isCXX11OrLater()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-void f(int i = 1, char c = '2');
-void test() {
-  [[f()]];
-  [[f(1)]];
-  [[f(1, '2')]];
-}
-)cpp",
-      {R"txt(
-CallExpression Expression
-|-IdExpression Callee
-| `-UnqualifiedId UnqualifiedId
-|   `-'f'
-|-'(' OpenParen
-`-')' CloseParen
-      )txt",
-       R"txt(
-CallExpression Expression
-|-IdExpression Callee
-| `-UnqualifiedId UnqualifiedId
-|   `-'f'
-|-'(' OpenParen
-|-CallArguments Arguments
-| `-IntegerLiteralExpression ListElement
-|   `-'1' LiteralToken
-`-')' CloseParen
-      )txt",
-       R"txt(
-CallExpression Expression
-|-IdExpression Callee
-| `-UnqualifiedId UnqualifiedId
-|   `-'f'
-|-'(' OpenParen
-|-CallArguments Arguments
-| |-IntegerLiteralExpression ListElement
-| | `-'1' LiteralToken
-| |-',' ListDelimiter
-| `-CharacterLiteralExpression ListElement
-|   `-''2'' LiteralToken
-`-')' CloseParen
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, MultipleDeclaratorsGrouping) {
-  EXPECT_TRUE(treeDumpEqual(
-      R"cpp(
-int *a, b;
-int *c, d;
-)cpp",
-      R"txt(
-TranslationUnit Detached
-|-SimpleDeclaration
-| |-'int'
-| |-DeclaratorList Declarators
-| | |-SimpleDeclarator ListElement
-| | | |-'*'
-| | | `-'a'
-| | |-',' ListDelimiter
-| | `-SimpleDeclarator ListElement
-| |   `-'b'
-| `-';'
-`-SimpleDeclaration
-  |-'int'
-  |-DeclaratorList Declarators
-  | |-SimpleDeclarator ListElement
-  | | |-'*'
-  | | `-'c'
-  | |-',' ListDelimiter
-  | `-SimpleDeclarator ListElement
-  |   `-'d'
-  `-';'
-)txt"));
-}
-
-TEST_P(BuildSyntaxTreeTest, MultipleDeclaratorsGroupingTypedef) {
-  EXPECT_TRUE(treeDumpEqual(
-      R"cpp(
-typedef int *a, b;
-)cpp",
-      R"txt(
-TranslationUnit Detached
-`-SimpleDeclaration
-  |-'typedef'
-  |-'int'
-  |-DeclaratorList Declarators
-  | |-SimpleDeclarator ListElement
-  | | |-'*'
-  | | `-'a'
-  | |-',' ListDelimiter
-  | `-SimpleDeclarator ListElement
-  |   `-'b'
-  `-';'
-)txt"));
-}
-
-TEST_P(BuildSyntaxTreeTest, MultipleDeclaratorsInsideStatement) {
-  EXPECT_TRUE(treeDumpEqual(
-      R"cpp(
-void foo() {
-  int *a, b;
-  typedef int *ta, tb;
-}
-)cpp",
-      R"txt(
-TranslationUnit Detached
-`-SimpleDeclaration
-  |-'void'
-  |-DeclaratorList Declarators
-  | `-SimpleDeclarator ListElement
-  |   |-'foo'
-  |   `-ParametersAndQualifiers
-  |     |-'(' OpenParen
-  |     `-')' CloseParen
-  `-CompoundStatement
-    |-'{' OpenParen
-    |-DeclarationStatement Statement
-    | |-SimpleDeclaration
-    | | |-'int'
-    | | `-DeclaratorList Declarators
-    | |   |-SimpleDeclarator ListElement
-    | |   | |-'*'
-    | |   | `-'a'
-    | |   |-',' ListDelimiter
-    | |   `-SimpleDeclarator ListElement
-    | |     `-'b'
-    | `-';'
-    |-DeclarationStatement Statement
-    | |-SimpleDeclaration
-    | | |-'typedef'
-    | | |-'int'
-    | | `-DeclaratorList Declarators
-    | |   |-SimpleDeclarator ListElement
-    | |   | |-'*'
-    | |   | `-'ta'
-    | |   |-',' ListDelimiter
-    | |   `-SimpleDeclarator ListElement
-    | |     `-'tb'
-    | `-';'
-    `-'}' CloseParen
-)txt"));
-}
-
-TEST_P(BuildSyntaxTreeTest, SizeTTypedef) {
-  if (!GetParam().isCXX11OrLater()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqual(
-      R"cpp(
-typedef decltype(sizeof(void *)) size_t;
-    )cpp",
-      R"txt(
-TranslationUnit Detached
-`-SimpleDeclaration
-  |-'typedef'
-  |-'decltype'
-  |-'('
-  |-UnknownExpression
-  | |-'sizeof'
-  | |-'('
-  | |-'void'
-  | |-'*'
-  | `-')'
-  |-')'
-  |-DeclaratorList Declarators
-  | `-SimpleDeclarator ListElement
-  |   `-'size_t'
-  `-';'
-)txt"));
-}
-
-TEST_P(BuildSyntaxTreeTest, Namespace_Nested) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqual(
-      R"cpp(
-namespace a { namespace b {} }
-)cpp",
-      R"txt(
-TranslationUnit Detached
-`-NamespaceDefinition
-  |-'namespace'
-  |-'a'
-  |-'{'
-  |-NamespaceDefinition
-  | |-'namespace'
-  | |-'b'
-  | |-'{'
-  | `-'}'
-  `-'}'
-)txt"));
-}
-
-TEST_P(BuildSyntaxTreeTest, Namespace_NestedDefinition) {
-  if (!GetParam().isCXX17OrLater()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqual(
-      R"cpp(
-namespace a::b {}
-)cpp",
-      R"txt(
-TranslationUnit Detached
-`-NamespaceDefinition
-  |-'namespace'
-  |-'a'
-  |-'::'
-  |-'b'
-  |-'{'
-  `-'}'
-)txt"));
-}
-
-TEST_P(BuildSyntaxTreeTest, Namespace_Unnamed) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqual(
-      R"cpp(
-namespace {}
-)cpp",
-      R"txt(
-TranslationUnit Detached
-`-NamespaceDefinition
-  |-'namespace'
-  |-'{'
-  `-'}'
-)txt"));
-}
-
-TEST_P(BuildSyntaxTreeTest, Namespace_Alias) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-namespace a {}
-[[namespace foo = a;]]
-)cpp",
-      {R"txt(
-NamespaceAliasDefinition
-|-'namespace'
-|-'foo'
-|-'='
-|-'a'
-`-';'
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, UsingDirective) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-namespace ns {}
-[[using namespace ::ns;]]
-)cpp",
-      {R"txt(
-UsingNamespaceDirective
-|-'using'
-|-'namespace'
-|-NestedNameSpecifier
-| `-'::' ListDelimiter
-|-'ns'
-`-';'
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, UsingDeclaration_Namespace) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-namespace ns { int a; }
-[[using ns::a;]]
-)cpp",
-      {R"txt(
-UsingDeclaration
-|-'using'
-|-NestedNameSpecifier
-| |-IdentifierNameSpecifier ListElement
-| | `-'ns'
-| `-'::' ListDelimiter
-|-'a'
-`-';'
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, UsingDeclaration_ClassMember) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-template <class T> struct X {
-  [[using T::foo;]]
-  [[using typename T::bar;]]
-};
-)cpp",
-      {R"txt(
-UsingDeclaration
-|-'using'
-|-NestedNameSpecifier
-| |-IdentifierNameSpecifier ListElement
-| | `-'T'
-| `-'::' ListDelimiter
-|-'foo'
-`-';'
-)txt",
-       R"txt(
-UsingDeclaration
-|-'using'
-|-'typename'
-|-NestedNameSpecifier
-| |-IdentifierNameSpecifier ListElement
-| | `-'T'
-| `-'::' ListDelimiter
-|-'bar'
-`-';'
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, UsingTypeAlias) {
-  if (!GetParam().isCXX11OrLater()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqual(
-      R"cpp(
-using type = int;
-)cpp",
-      R"txt(
-TranslationUnit Detached
-`-TypeAliasDeclaration
-  |-'using'
-  |-'type'
-  |-'='
-  |-'int'
-  `-';'
-)txt"));
-}
-
-TEST_P(BuildSyntaxTreeTest, FreeStandingClass_ForwardDeclaration) {
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-[[struct X;]]
-[[struct Y *y1;]]
-)cpp",
-      {R"txt(
-SimpleDeclaration
-|-'struct'
-|-'X'
-`-';'
-)txt",
-       R"txt(
-SimpleDeclaration
-|-'struct'
-|-'Y'
-|-DeclaratorList Declarators
-| `-SimpleDeclarator ListElement
-|   |-'*'
-|   `-'y1'
-`-';'
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, FreeStandingClasses_Definition) {
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-[[struct X {};]]
-[[struct Y {} *y2;]]
-[[struct {} *a1;]]
-)cpp",
-      {R"txt(
-SimpleDeclaration
-|-'struct'
-|-'X'
-|-'{'
-|-'}'
-`-';'
-)txt",
-       R"txt(
-SimpleDeclaration
-|-'struct'
-|-'Y'
-|-'{'
-|-'}'
-|-DeclaratorList Declarators
-| `-SimpleDeclarator ListElement
-|   |-'*'
-|   `-'y2'
-`-';'
-)txt",
-       R"txt(
-SimpleDeclaration
-|-'struct'
-|-'{'
-|-'}'
-|-DeclaratorList Declarators
-| `-SimpleDeclarator ListElement
-|   |-'*'
-|   `-'a1'
-`-';'
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, StaticMemberFunction) {
-  if (!GetParam().isCXX11OrLater()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-struct S {
-  [[static void f(){}]]
-};
-)cpp",
-      {R"txt(
-SimpleDeclaration
-|-'static'
-|-'void'
-|-DeclaratorList Declarators
-| `-SimpleDeclarator ListElement
-|   |-'f'
-|   `-ParametersAndQualifiers
-|     |-'(' OpenParen
-|     `-')' CloseParen
-`-CompoundStatement
-  |-'{' OpenParen
-  `-'}' CloseParen
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, OutOfLineMemberFunctionDefinition) {
-  if (!GetParam().isCXX11OrLater()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-struct S {
-  void f();
-};
-[[void S::f(){}]]
-)cpp",
-      {R"txt(
-SimpleDeclaration
-|-'void'
-|-DeclaratorList Declarators
-| `-SimpleDeclarator ListElement
-|   |-NestedNameSpecifier
-|   | |-IdentifierNameSpecifier ListElement
-|   | | `-'S'
-|   | `-'::' ListDelimiter
-|   |-'f'
-|   `-ParametersAndQualifiers
-|     |-'(' OpenParen
-|     `-')' CloseParen
-`-CompoundStatement
-  |-'{' OpenParen
-  `-'}' CloseParen
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, ConversionMemberFunction) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-struct X {
-  [[operator int();]]
-};
-)cpp",
-      {R"txt(
-SimpleDeclaration
-|-DeclaratorList Declarators
-| `-SimpleDeclarator ListElement
-|   |-'operator'
-|   |-'int'
-|   `-ParametersAndQualifiers
-|     |-'(' OpenParen
-|     `-')' CloseParen
-`-';'
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, LiteralOperatorDeclaration) {
-  if (!GetParam().isCXX11OrLater()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqual(
-      R"cpp(
-unsigned operator "" _c(char);
-    )cpp",
-      R"txt(
-TranslationUnit Detached
-`-SimpleDeclaration
-  |-'unsigned'
-  |-DeclaratorList Declarators
-  | `-SimpleDeclarator ListElement
-  |   |-'operator'
-  |   |-'""'
-  |   |-'_c'
-  |   `-ParametersAndQualifiers
-  |     |-'(' OpenParen
-  |     |-ParameterDeclarationList Parameters
-  |     | `-SimpleDeclaration ListElement
-  |     |   `-'char'
-  |     `-')' CloseParen
-  `-';'
-)txt"));
-}
-
-TEST_P(BuildSyntaxTreeTest, NumericLiteralOperatorTemplateDeclaration) {
-  if (!GetParam().isCXX11OrLater()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqual(
-      R"cpp(
-template <char...>
-unsigned operator "" _t();
-    )cpp",
-      R"txt(
-TranslationUnit Detached
-`-TemplateDeclaration Declaration
-  |-'template' IntroducerKeyword
-  |-'<'
-  |-SimpleDeclaration
-  | `-'char'
-  |-'...'
-  |-'>'
-  `-SimpleDeclaration
-    |-'unsigned'
-    |-DeclaratorList Declarators
-    | `-SimpleDeclarator ListElement
-    |   |-'operator'
-    |   |-'""'
-    |   |-'_t'
-    |   `-ParametersAndQualifiers
-    |     |-'(' OpenParen
-    |     `-')' CloseParen
-    `-';'
-)txt"));
-}
-
-TEST_P(BuildSyntaxTreeTest, OverloadedOperatorDeclaration) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-struct X {
-  [[X& operator=(const X&);]]
-};
-)cpp",
-      {R"txt(
-SimpleDeclaration
-|-'X'
-|-DeclaratorList Declarators
-| `-SimpleDeclarator ListElement
-|   |-'&'
-|   |-'operator'
-|   |-'='
-|   `-ParametersAndQualifiers
-|     |-'(' OpenParen
-|     |-ParameterDeclarationList Parameters
-|     | `-SimpleDeclaration ListElement
-|     |   |-'const'
-|     |   |-'X'
-|     |   `-DeclaratorList Declarators
-|     |     `-SimpleDeclarator ListElement
-|     |       `-'&'
-|     `-')' CloseParen
-`-';'
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, OverloadedOperatorFriendDeclaration) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-struct X {
-  [[friend X operator+(X, const X&);]]
-};
-)cpp",
-      {R"txt(
-UnknownDeclaration
-`-SimpleDeclaration
-  |-'friend'
-  |-'X'
-  |-DeclaratorList Declarators
-  | `-SimpleDeclarator ListElement
-  |   |-'operator'
-  |   |-'+'
-  |   `-ParametersAndQualifiers
-  |     |-'(' OpenParen
-  |     |-ParameterDeclarationList Parameters
-  |     | |-SimpleDeclaration ListElement
-  |     | | `-'X'
-  |     | |-',' ListDelimiter
-  |     | `-SimpleDeclaration ListElement
-  |     |   |-'const'
-  |     |   |-'X'
-  |     |   `-DeclaratorList Declarators
-  |     |     `-SimpleDeclarator ListElement
-  |     |       `-'&'
-  |     `-')' CloseParen
-  `-';'
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, ClassTemplateDeclaration) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqual(
-      R"cpp(
-template<typename T>
-struct ST {};
-)cpp",
-      R"txt(
-TranslationUnit Detached
-`-TemplateDeclaration Declaration
-  |-'template' IntroducerKeyword
-  |-'<'
-  |-UnknownDeclaration
-  | |-'typename'
-  | `-'T'
-  |-'>'
-  `-SimpleDeclaration
-    |-'struct'
-    |-'ST'
-    |-'{'
-    |-'}'
-    `-';'
-)txt"));
-}
-
-TEST_P(BuildSyntaxTreeTest, FunctionTemplateDeclaration) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqual(
-      R"cpp(
-template<typename T>
-T f();
-)cpp",
-      R"txt(
-TranslationUnit Detached
-`-TemplateDeclaration Declaration
-  |-'template' IntroducerKeyword
-  |-'<'
-  |-UnknownDeclaration
-  | |-'typename'
-  | `-'T'
-  |-'>'
-  `-SimpleDeclaration
-    |-'T'
-    |-DeclaratorList Declarators
-    | `-SimpleDeclarator ListElement
-    |   |-'f'
-    |   `-ParametersAndQualifiers
-    |     |-'(' OpenParen
-    |     `-')' CloseParen
-    `-';'
-)txt"));
-}
-
-TEST_P(BuildSyntaxTreeTest, VariableTemplateDeclaration) {
-  if (!GetParam().isCXX14OrLater()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqual(
-      R"cpp(
-template <class T> T var = 10;
-)cpp",
-      R"txt(
-TranslationUnit Detached
-`-TemplateDeclaration Declaration
-  |-'template' IntroducerKeyword
-  |-'<'
-  |-UnknownDeclaration
-  | |-'class'
-  | `-'T'
-  |-'>'
-  `-SimpleDeclaration
-    |-'T'
-    |-DeclaratorList Declarators
-    | `-SimpleDeclarator ListElement
-    |   |-'var'
-    |   |-'='
-    |   `-IntegerLiteralExpression
-    |     `-'10' LiteralToken
-    `-';'
-)txt"));
-}
-
-TEST_P(BuildSyntaxTreeTest, StaticMemberFunctionTemplate) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-struct S {
-  [[template<typename U>
-  static U f();]]
-};
-)cpp",
-      {R"txt(
-TemplateDeclaration Declaration
-|-'template' IntroducerKeyword
-|-'<'
-|-UnknownDeclaration
-| |-'typename'
-| `-'U'
-|-'>'
-`-SimpleDeclaration
-  |-'static'
-  |-'U'
-  |-DeclaratorList Declarators
-  | `-SimpleDeclarator ListElement
-  |   |-'f'
-  |   `-ParametersAndQualifiers
-  |     |-'(' OpenParen
-  |     `-')' CloseParen
-  `-';'
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, NestedTemplates) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqual(
-      R"cpp(
-template <class T>
-struct X {
-  template <class U>
-  U foo();
-};
-)cpp",
-      R"txt(
-TranslationUnit Detached
-`-TemplateDeclaration Declaration
-  |-'template' IntroducerKeyword
-  |-'<'
-  |-UnknownDeclaration
-  | |-'class'
-  | `-'T'
-  |-'>'
-  `-SimpleDeclaration
-    |-'struct'
-    |-'X'
-    |-'{'
-    |-TemplateDeclaration Declaration
-    | |-'template' IntroducerKeyword
-    | |-'<'
-    | |-UnknownDeclaration
-    | | |-'class'
-    | | `-'U'
-    | |-'>'
-    | `-SimpleDeclaration
-    |   |-'U'
-    |   |-DeclaratorList Declarators
-    |   | `-SimpleDeclarator ListElement
-    |   |   |-'foo'
-    |   |   `-ParametersAndQualifiers
-    |   |     |-'(' OpenParen
-    |   |     `-')' CloseParen
-    |   `-';'
-    |-'}'
-    `-';'
-)txt"));
-}
-
-TEST_P(BuildSyntaxTreeTest, NestedTemplatesInNamespace) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqual(
-      R"cpp(
-namespace n {
-  template<typename T>
-  struct ST {
-    template<typename U>
-    static U f();
-  };
-}
-)cpp",
-      R"txt(
-TranslationUnit Detached
-`-NamespaceDefinition
-  |-'namespace'
-  |-'n'
-  |-'{'
-  |-TemplateDeclaration Declaration
-  | |-'template' IntroducerKeyword
-  | |-'<'
-  | |-UnknownDeclaration
-  | | |-'typename'
-  | | `-'T'
-  | |-'>'
-  | `-SimpleDeclaration
-  |   |-'struct'
-  |   |-'ST'
-  |   |-'{'
-  |   |-TemplateDeclaration Declaration
-  |   | |-'template' IntroducerKeyword
-  |   | |-'<'
-  |   | |-UnknownDeclaration
-  |   | | |-'typename'
-  |   | | `-'U'
-  |   | |-'>'
-  |   | `-SimpleDeclaration
-  |   |   |-'static'
-  |   |   |-'U'
-  |   |   |-DeclaratorList Declarators
-  |   |   | `-SimpleDeclarator ListElement
-  |   |   |   |-'f'
-  |   |   |   `-ParametersAndQualifiers
-  |   |   |     |-'(' OpenParen
-  |   |   |     `-')' CloseParen
-  |   |   `-';'
-  |   |-'}'
-  |   `-';'
-  `-'}'
-)txt"));
-}
-
-TEST_P(BuildSyntaxTreeTest, ClassTemplate_MemberClassDefinition) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-template <class T> struct X { struct Y; };
-[[template <class T> struct X<T>::Y {};]]
-)cpp",
-      {R"txt(
-TemplateDeclaration Declaration
-|-'template' IntroducerKeyword
-|-'<'
-|-UnknownDeclaration
-| |-'class'
-| `-'T'
-|-'>'
-`-SimpleDeclaration
-  |-'struct'
-  |-NestedNameSpecifier
-  | |-SimpleTemplateNameSpecifier ListElement
-  | | |-'X'
-  | | |-'<'
-  | | |-'T'
-  | | `-'>'
-  | `-'::' ListDelimiter
-  |-'Y'
-  |-'{'
-  |-'}'
-  `-';'
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, ExplicitClassTemplateInstantiation_Definition) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-template <class T> struct X {};
-[[template struct X<double>;]]
-)cpp",
-      {R"txt(
-ExplicitTemplateInstantiation
-|-'template' IntroducerKeyword
-`-SimpleDeclaration Declaration
-  |-'struct'
-  |-'X'
-  |-'<'
-  |-'double'
-  |-'>'
-  `-';'
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, ExplicitClassTemplateInstantiation_Declaration) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-template <class T> struct X {};
-[[extern template struct X<float>;]]
-)cpp",
-      {R"txt(
-ExplicitTemplateInstantiation
-|-'extern' ExternKeyword
-|-'template' IntroducerKeyword
-`-SimpleDeclaration Declaration
-  |-'struct'
-  |-'X'
-  |-'<'
-  |-'float'
-  |-'>'
-  `-';'
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, ClassTemplateSpecialization_Partial) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-template <class T> struct X {};
-[[template <class T> struct X<T*> {};]]
-)cpp",
-      {R"txt(
-TemplateDeclaration Declaration
-|-'template' IntroducerKeyword
-|-'<'
-|-UnknownDeclaration
-| |-'class'
-| `-'T'
-|-'>'
-`-SimpleDeclaration
-  |-'struct'
-  |-'X'
-  |-'<'
-  |-'T'
-  |-'*'
-  |-'>'
-  |-'{'
-  |-'}'
-  `-';'
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, ClassTemplateSpecialization_Full) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-template <class T> struct X {};
-[[template <> struct X<int> {};]]
-)cpp",
-      {R"txt(
-TemplateDeclaration Declaration
-|-'template' IntroducerKeyword
-|-'<'
-|-'>'
-`-SimpleDeclaration
-  |-'struct'
-  |-'X'
-  |-'<'
-  |-'int'
-  |-'>'
-  |-'{'
-  |-'}'
-  `-';'
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, EmptyDeclaration) {
-  EXPECT_TRUE(treeDumpEqual(
-      R"cpp(
-;
-)cpp",
-      R"txt(
-TranslationUnit Detached
-`-EmptyDeclaration
-  `-';'
-)txt"));
-}
-
-TEST_P(BuildSyntaxTreeTest, StaticAssert) {
-  if (!GetParam().isCXX11OrLater()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqual(
-      R"cpp(
-static_assert(true, "message");
-)cpp",
-      R"txt(
-TranslationUnit Detached
-`-StaticAssertDeclaration
-  |-'static_assert'
-  |-'('
-  |-BoolLiteralExpression Condition
-  | `-'true' LiteralToken
-  |-','
-  |-StringLiteralExpression Message
-  | `-'"message"' LiteralToken
-  |-')'
-  `-';'
-)txt"));
-}
-
-TEST_P(BuildSyntaxTreeTest, StaticAssert_WithoutMessage) {
-  if (!GetParam().isCXX17OrLater()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqual(
-      R"cpp(
-static_assert(true);
-)cpp",
-      R"txt(
-TranslationUnit Detached
-`-StaticAssertDeclaration
-  |-'static_assert'
-  |-'('
-  |-BoolLiteralExpression Condition
-  | `-'true' LiteralToken
-  |-')'
-  `-';'
-)txt"));
-}
-
-TEST_P(BuildSyntaxTreeTest, ExternC) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqual(
-      R"cpp(
-extern "C" int a;
-extern "C" { int b; int c; }
-)cpp",
-      R"txt(
-TranslationUnit Detached
-|-LinkageSpecificationDeclaration
-| |-'extern'
-| |-'"C"'
-| `-SimpleDeclaration
-|   |-'int'
-|   |-DeclaratorList Declarators
-|   | `-SimpleDeclarator ListElement
-|   |   `-'a'
-|   `-';'
-`-LinkageSpecificationDeclaration
-  |-'extern'
-  |-'"C"'
-  |-'{'
-  |-SimpleDeclaration
-  | |-'int'
-  | |-DeclaratorList Declarators
-  | | `-SimpleDeclarator ListElement
-  | |   `-'b'
-  | `-';'
-  |-SimpleDeclaration
-  | |-'int'
-  | |-DeclaratorList Declarators
-  | | `-SimpleDeclarator ListElement
-  | |   `-'c'
-  | `-';'
-  `-'}'
-)txt"));
-}
-
-TEST_P(BuildSyntaxTreeTest, Macro_ObjectLike_Leaf) {
-  // All nodes can be mutated.
-  EXPECT_TRUE(treeDumpEqual(
-      R"cpp(
-#define OPEN {
-#define CLOSE }
-
-void test() {
-  OPEN
-    1;
-  CLOSE
-
-  OPEN
-    2;
-  }
-}
-)cpp",
-      R"txt(
-TranslationUnit Detached
-`-SimpleDeclaration
-  |-'void'
-  |-DeclaratorList Declarators
-  | `-SimpleDeclarator ListElement
-  |   |-'test'
-  |   `-ParametersAndQualifiers
-  |     |-'(' OpenParen
-  |     `-')' CloseParen
-  `-CompoundStatement
-    |-'{' OpenParen
-    |-CompoundStatement Statement
-    | |-'{' OpenParen
-    | |-ExpressionStatement Statement
-    | | |-IntegerLiteralExpression Expression
-    | | | `-'1' LiteralToken
-    | | `-';'
-    | `-'}' CloseParen
-    |-CompoundStatement Statement
-    | |-'{' OpenParen
-    | |-ExpressionStatement Statement
-    | | |-IntegerLiteralExpression Expression
-    | | | `-'2' LiteralToken
-    | | `-';'
-    | `-'}' CloseParen
-    `-'}' CloseParen
-)txt"));
-}
-
-TEST_P(BuildSyntaxTreeTest, Macro_ObjectLike_MatchTree) {
-  // Some nodes are unmodifiable, they are marked with 'unmodifiable'.
-  EXPECT_TRUE(treeDumpEqual(
-      R"cpp(
-#define BRACES {}
-
-void test() BRACES
-)cpp",
-      R"txt(
-TranslationUnit Detached
-`-SimpleDeclaration
-  |-'void'
-  |-DeclaratorList Declarators
-  | `-SimpleDeclarator ListElement
-  |   |-'test'
-  |   `-ParametersAndQualifiers
-  |     |-'(' OpenParen
-  |     `-')' CloseParen
-  `-CompoundStatement
-    |-'{' OpenParen unmodifiable
-    `-'}' CloseParen unmodifiable
-)txt"));
-}
-
-TEST_P(BuildSyntaxTreeTest, Macro_ObjectLike_MismatchTree) {
-  EXPECT_TRUE(treeDumpEqual(
-      R"cpp(
-#define HALF_IF if (1+
-#define HALF_IF_2 1) {}
-void test() {
-  HALF_IF HALF_IF_2 else {}
-})cpp",
-      R"txt(
-TranslationUnit Detached
-`-SimpleDeclaration
-  |-'void'
-  |-DeclaratorList Declarators
-  | `-SimpleDeclarator ListElement
-  |   |-'test'
-  |   `-ParametersAndQualifiers
-  |     |-'(' OpenParen
-  |     `-')' CloseParen
-  `-CompoundStatement
-    |-'{' OpenParen
-    |-IfStatement Statement
-    | |-'if' IntroducerKeyword unmodifiable
-    | |-'(' unmodifiable
-    | |-ExpressionStatement Condition unmodifiable
-    | | `-BinaryOperatorExpression Expression unmodifiable
-    | |   |-IntegerLiteralExpression LeftHandSide unmodifiable
-    | |   | `-'1' LiteralToken unmodifiable
-    | |   |-'+' OperatorToken unmodifiable
-    | |   `-IntegerLiteralExpression RightHandSide unmodifiable
-    | |     `-'1' LiteralToken unmodifiable
-    | |-')' unmodifiable
-    | |-CompoundStatement ThenStatement unmodifiable
-    | | |-'{' OpenParen unmodifiable
-    | | `-'}' CloseParen unmodifiable
-    | |-'else' ElseKeyword
-    | `-CompoundStatement ElseStatement
-    |   |-'{' OpenParen
-    |   `-'}' CloseParen
-    `-'}' CloseParen
-)txt"));
-}
-
-TEST_P(BuildSyntaxTreeTest, Macro_FunctionLike_ModifiableArguments) {
-  // FIXME: Note that the substitutions for `X` and `Y` are marked modifiable.
-  // However we cannot change `X` freely. Indeed if we change its substitution
-  // in the condition we should also change it the then-branch.
-  EXPECT_TRUE(treeDumpEqual(
-      R"cpp(
-#define MIN(X,Y) X < Y ? X : Y
-
-void test() {
-  MIN(1,2);
-}
-)cpp",
-      R"txt(
-TranslationUnit Detached
-`-SimpleDeclaration
-  |-'void'
-  |-DeclaratorList Declarators
-  | `-SimpleDeclarator ListElement
-  |   |-'test'
-  |   `-ParametersAndQualifiers
-  |     |-'(' OpenParen
-  |     `-')' CloseParen
-  `-CompoundStatement
-    |-'{' OpenParen
-    |-ExpressionStatement Statement
-    | |-UnknownExpression Expression
-    | | |-BinaryOperatorExpression unmodifiable
-    | | | |-IntegerLiteralExpression LeftHandSide
-    | | | | `-'1' LiteralToken
-    | | | |-'<' OperatorToken unmodifiable
-    | | | `-IntegerLiteralExpression RightHandSide
-    | | |   `-'2' LiteralToken
-    | | |-'?' unmodifiable
-    | | |-IntegerLiteralExpression
-    | | | `-'1' LiteralToken
-    | | |-':' unmodifiable
-    | | `-IntegerLiteralExpression
-    | |   `-'2' LiteralToken
-    | `-';'
-    `-'}' CloseParen
-)txt"));
-}
-
-TEST_P(BuildSyntaxTreeTest, Macro_FunctionLike_MismatchTree) {
-  EXPECT_TRUE(treeDumpEqual(
-      R"cpp(
-#define HALF_IF(X) if (X &&
-#define HALF_IF_2(Y) Y) {}
-void test() {
-  HALF_IF(1) HALF_IF_2(0) else {}
-})cpp",
-      R"txt(
-TranslationUnit Detached
-`-SimpleDeclaration
-  |-'void'
-  |-DeclaratorList Declarators
-  | `-SimpleDeclarator ListElement
-  |   |-'test'
-  |   `-ParametersAndQualifiers
-  |     |-'(' OpenParen
-  |     `-')' CloseParen
-  `-CompoundStatement
-    |-'{' OpenParen
-    |-IfStatement Statement
-    | |-'if' IntroducerKeyword unmodifiable
-    | |-'(' unmodifiable
-    | |-ExpressionStatement Condition unmodifiable
-    | | `-BinaryOperatorExpression Expression unmodifiable
-    | |   |-IntegerLiteralExpression LeftHandSide
-    | |   | `-'1' LiteralToken
-    | |   |-'&&' OperatorToken unmodifiable
-    | |   `-IntegerLiteralExpression RightHandSide
-    | |     `-'0' LiteralToken
-    | |-')' unmodifiable
-    | |-CompoundStatement ThenStatement unmodifiable
-    | | |-'{' OpenParen unmodifiable
-    | | `-'}' CloseParen unmodifiable
-    | |-'else' ElseKeyword
-    | `-CompoundStatement ElseStatement
-    |   |-'{' OpenParen
-    |   `-'}' CloseParen
-    `-'}' CloseParen
-)txt"));
-}
-
-TEST_P(BuildSyntaxTreeTest, Macro_FunctionLike_Variadic) {
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-#define CALL(F_NAME, ...) F_NAME(__VA_ARGS__)
-
-void f(int);
-void g(int, int);
-void test() [[{
-  CALL(f, 0);
-  CALL(g, 0, 1);
-}]]
-)cpp",
-      {R"txt(
-CompoundStatement
-|-'{' OpenParen
-|-ExpressionStatement Statement
-| |-CallExpression Expression
-| | |-IdExpression Callee
-| | | `-UnqualifiedId UnqualifiedId
-| | |   `-'f'
-| | |-'(' OpenParen unmodifiable
-| | |-CallArguments Arguments
-| | | `-IntegerLiteralExpression ListElement
-| | |   `-'0' LiteralToken
-| | `-')' CloseParen unmodifiable
-| `-';'
-|-ExpressionStatement Statement
-| |-CallExpression Expression
-| | |-IdExpression Callee
-| | | `-UnqualifiedId UnqualifiedId
-| | |   `-'g'
-| | |-'(' OpenParen unmodifiable
-| | |-CallArguments Arguments
-| | | |-IntegerLiteralExpression ListElement
-| | | | `-'0' LiteralToken
-| | | |-',' ListDelimiter
-| | | `-IntegerLiteralExpression ListElement
-| | |   `-'1' LiteralToken
-| | `-')' CloseParen unmodifiable
-| `-';'
-`-'}' CloseParen
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, InitDeclarator_Equal) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-struct S { S(int);};
-void test() {
-  [[S s = 1]];
-}
-)cpp",
-      {R"txt(
-SimpleDeclaration
-|-'S'
-`-DeclaratorList Declarators
-  `-SimpleDeclarator ListElement
-    |-'s'
-    |-'='
-    `-IntegerLiteralExpression
-      `-'1' LiteralToken
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, InitDeclarator_Brace) {
-  if (!GetParam().isCXX11OrLater()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-struct S { 
-  S();
-  S(int);
-  S(int, float);
-};
-void test(){
-  // FIXME: 's...' is a declarator and '{...}' is initializer
-  [[S s0{}]];
-  [[S s1{1}]];
-  [[S s2{1, 2.}]];
-}
-)cpp",
-      {R"txt(
-SimpleDeclaration
-|-'S'
-`-DeclaratorList Declarators
-  `-SimpleDeclarator ListElement
-    `-UnknownExpression
-      |-'s0'
-      |-'{'
-      `-'}'
-  )txt",
-       R"txt(
-SimpleDeclaration
-|-'S'
-`-DeclaratorList Declarators
-  `-SimpleDeclarator ListElement
-    `-UnknownExpression
-      |-'s1'
-      |-'{'
-      |-IntegerLiteralExpression
-      | `-'1' LiteralToken
-      `-'}'
-  )txt",
-       R"txt(
-SimpleDeclaration
-|-'S'
-`-DeclaratorList Declarators
-  `-SimpleDeclarator ListElement
-    `-UnknownExpression
-      |-'s2'
-      |-'{'
-      |-IntegerLiteralExpression
-      | `-'1' LiteralToken
-      |-','
-      |-FloatingLiteralExpression
-      | `-'2.' LiteralToken
-      `-'}'
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, InitDeclarator_EqualBrace) {
-  if (!GetParam().isCXX11OrLater()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-struct S { 
-  S();
-  S(int);
-  S(int, float);
-};
-void test() {
-  // FIXME: '= {...}' is initializer
-  [[S s0 = {}]];
-  [[S s1 = {1}]];
-  [[S s2 = {1, 2.}]];
-}
-)cpp",
-      {R"txt(
-SimpleDeclaration
-|-'S'
-`-DeclaratorList Declarators
-  `-SimpleDeclarator ListElement
-    |-'s0'
-    |-'='
-    `-UnknownExpression
-      |-'{'
-      `-'}'
-  )txt",
-       R"txt(
-SimpleDeclaration
-|-'S'
-`-DeclaratorList Declarators
-  `-SimpleDeclarator ListElement
-    |-'s1'
-    |-'='
-    `-UnknownExpression
-      |-'{'
-      |-IntegerLiteralExpression
-      | `-'1' LiteralToken
-      `-'}'
-  )txt",
-       R"txt(
-SimpleDeclaration
-|-'S'
-`-DeclaratorList Declarators
-  `-SimpleDeclarator ListElement
-    |-'s2'
-    |-'='
-    `-UnknownExpression
-      |-'{'
-      |-IntegerLiteralExpression
-      | `-'1' LiteralToken
-      |-','
-      |-FloatingLiteralExpression
-      | `-'2.' LiteralToken
-      `-'}'
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, InitDeclarator_Paren) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-struct S {
-  S(int);
-  S(int, float);
-};
-// FIXME: 's...' is a declarator and '(...)' is initializer
-[[S s1(1);]]
-[[S s2(1, 2.);]]
-)cpp",
-      {R"txt(
-SimpleDeclaration
-|-'S'
-|-DeclaratorList Declarators
-| `-SimpleDeclarator ListElement
-|   `-UnknownExpression
-|     |-'s1'
-|     |-'('
-|     |-IntegerLiteralExpression
-|     | `-'1' LiteralToken
-|     `-')'
-`-';'
-  )txt",
-       R"txt(
-SimpleDeclaration
-|-'S'
-|-DeclaratorList Declarators
-| `-SimpleDeclarator ListElement
-|   `-UnknownExpression
-|     |-'s2'
-|     |-'('
-|     |-IntegerLiteralExpression
-|     | `-'1' LiteralToken
-|     |-','
-|     |-FloatingLiteralExpression
-|     | `-'2.' LiteralToken
-|     `-')'
-`-';'
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, InitDeclarator_Paren_DefaultArguments) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-struct S {
-  S(int i = 1, float = 2.);
-};
-[[S s0;]]
-// FIXME: 's...' is a declarator and '(...)' is initializer
-[[S s1(1);]]
-[[S s2(1, 2.);]]
-)cpp",
-      {R"txt(
-SimpleDeclaration
-|-'S'
-|-DeclaratorList Declarators
-| `-SimpleDeclarator ListElement
-|   `-'s0'
-`-';'
-  )txt",
-       R"txt(
-SimpleDeclaration
-|-'S'
-|-DeclaratorList Declarators
-| `-SimpleDeclarator ListElement
-|   `-UnknownExpression
-|     |-'s1'
-|     |-'('
-|     |-IntegerLiteralExpression
-|     | `-'1' LiteralToken
-|     `-')'
-`-';'
-  )txt",
-       R"txt(
-SimpleDeclaration
-|-'S'
-|-DeclaratorList Declarators
-| `-SimpleDeclarator ListElement
-|   `-UnknownExpression
-|     |-'s2'
-|     |-'('
-|     |-IntegerLiteralExpression
-|     | `-'1' LiteralToken
-|     |-','
-|     |-FloatingLiteralExpression
-|     | `-'2.' LiteralToken
-|     `-')'
-`-';'
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, ImplicitConversion_Argument) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-struct X {
-  X(int);
-};
-void TakeX(const X&);
-void test() {
-  [[TakeX(1)]];
-}
-)cpp",
-      {R"txt(
-CallExpression Expression
-|-IdExpression Callee
-| `-UnqualifiedId UnqualifiedId
-|   `-'TakeX'
-|-'(' OpenParen
-|-CallArguments Arguments
-| `-IntegerLiteralExpression ListElement
-|   `-'1' LiteralToken
-`-')' CloseParen
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, ImplicitConversion_Return) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-struct X {
-  X(int);
-};
-X CreateX(){
-  [[return 1;]]
-}
-)cpp",
-      {R"txt(
-ReturnStatement Statement
-|-'return' IntroducerKeyword
-|-IntegerLiteralExpression ReturnValue
-| `-'1' LiteralToken
-`-';'
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, ConstructorCall_ZeroArguments) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-struct X {
-  X();
-};
-X test() {
-  [[return X();]]
-}
-)cpp",
-      {R"txt(
-ReturnStatement Statement
-|-'return' IntroducerKeyword
-|-UnknownExpression ReturnValue
-| |-'X'
-| |-'('
-| `-')'
-`-';'
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, ConstructorCall_OneArgument) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-struct X {
-  X(int);
-};
-X test() {
-  [[return X(1);]]
-}
-)cpp",
-      {R"txt(
-ReturnStatement Statement
-|-'return' IntroducerKeyword
-|-UnknownExpression ReturnValue
-| |-'X'
-| |-'('
-| |-IntegerLiteralExpression
-| | `-'1' LiteralToken
-| `-')'
-`-';'
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, ConstructorCall_MultipleArguments) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-struct X {
-  X(int, char);
-};
-X test() {
-  [[return X(1, '2');]]
-}
-)cpp",
-      {R"txt(
-ReturnStatement Statement
-|-'return' IntroducerKeyword
-|-UnknownExpression ReturnValue
-| |-'X'
-| |-'('
-| |-IntegerLiteralExpression
-| | `-'1' LiteralToken
-| |-','
-| |-CharacterLiteralExpression
-| | `-''2'' LiteralToken
-| `-')'
-`-';'
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, ConstructorCall_DefaultArguments) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-struct X {
-  X(int i = 1, char c = '2');
-};
-X test() {
-  auto x0 = [[X()]];
-  auto x1 = [[X(1)]];
-  auto x2 = [[X(1, '2')]];
-}
-)cpp",
-      {R"txt(
-UnknownExpression
-|-'X'
-|-'('
-`-')'
-)txt",
-       R"txt(
-UnknownExpression
-|-'X'
-|-'('
-|-IntegerLiteralExpression
-| `-'1' LiteralToken
-`-')'
-)txt",
-       R"txt(
-UnknownExpression
-|-'X'
-|-'('
-|-IntegerLiteralExpression
-| `-'1' LiteralToken
-|-','
-|-CharacterLiteralExpression
-| `-''2'' LiteralToken
-`-')'
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, TypeConversion_FunctionalNotation) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-float test() {
-  [[return float(1);]]
-}
-)cpp",
-      {R"txt(
-ReturnStatement Statement
-|-'return' IntroducerKeyword
-|-UnknownExpression ReturnValue
-| |-'float'
-| |-'('
-| |-IntegerLiteralExpression
-| | `-'1' LiteralToken
-| `-')'
-`-';'
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, ArrayDeclarator_Simple) {
-  EXPECT_TRUE(treeDumpEqual(
-      R"cpp(
-int a[10];
-)cpp",
-      R"txt(
-TranslationUnit Detached
-`-SimpleDeclaration
-  |-'int'
-  |-DeclaratorList Declarators
-  | `-SimpleDeclarator ListElement
-  |   |-'a'
-  |   `-ArraySubscript
-  |     |-'[' OpenParen
-  |     |-IntegerLiteralExpression Size
-  |     | `-'10' LiteralToken
-  |     `-']' CloseParen
-  `-';'
-)txt"));
-}
-
-TEST_P(BuildSyntaxTreeTest, ArrayDeclarator_Multidimensional) {
-  EXPECT_TRUE(treeDumpEqual(
-      R"cpp(
-int b[1][2][3];
-)cpp",
-      R"txt(
-TranslationUnit Detached
-`-SimpleDeclaration
-  |-'int'
-  |-DeclaratorList Declarators
-  | `-SimpleDeclarator ListElement
-  |   |-'b'
-  |   |-ArraySubscript
-  |   | |-'[' OpenParen
-  |   | |-IntegerLiteralExpression Size
-  |   | | `-'1' LiteralToken
-  |   | `-']' CloseParen
-  |   |-ArraySubscript
-  |   | |-'[' OpenParen
-  |   | |-IntegerLiteralExpression Size
-  |   | | `-'2' LiteralToken
-  |   | `-']' CloseParen
-  |   `-ArraySubscript
-  |     |-'[' OpenParen
-  |     |-IntegerLiteralExpression Size
-  |     | `-'3' LiteralToken
-  |     `-']' CloseParen
-  `-';'
-)txt"));
-}
-
-TEST_P(BuildSyntaxTreeTest, ArrayDeclarator_UnknownBound) {
-  EXPECT_TRUE(treeDumpEqual(
-      R"cpp(
-int c[] = {1,2,3};
-)cpp",
-      R"txt(
-TranslationUnit Detached
-`-SimpleDeclaration
-  |-'int'
-  |-DeclaratorList Declarators
-  | `-SimpleDeclarator ListElement
-  |   |-'c'
-  |   |-ArraySubscript
-  |   | |-'[' OpenParen
-  |   | `-']' CloseParen
-  |   |-'='
-  |   `-UnknownExpression
-  |     `-UnknownExpression
-  |       |-'{'
-  |       |-IntegerLiteralExpression
-  |       | `-'1' LiteralToken
-  |       |-','
-  |       |-IntegerLiteralExpression
-  |       | `-'2' LiteralToken
-  |       |-','
-  |       |-IntegerLiteralExpression
-  |       | `-'3' LiteralToken
-  |       `-'}'
-  `-';'
-)txt"));
-}
-
-TEST_P(BuildSyntaxTreeTest, ArrayDeclarator_Static) {
-  if (!GetParam().isC99OrLater()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqual(
-      R"cpp(
-void f(int xs[static 10]);
-)cpp",
-      R"txt(
-TranslationUnit Detached
-`-SimpleDeclaration
-  |-'void'
-  |-DeclaratorList Declarators
-  | `-SimpleDeclarator ListElement
-  |   |-'f'
-  |   `-ParametersAndQualifiers
-  |     |-'(' OpenParen
-  |     |-ParameterDeclarationList Parameters
-  |     | `-SimpleDeclaration ListElement
-  |     |   |-'int'
-  |     |   `-DeclaratorList Declarators
-  |     |     `-SimpleDeclarator ListElement
-  |     |       |-'xs'
-  |     |       `-ArraySubscript
-  |     |         |-'[' OpenParen
-  |     |         |-'static'
-  |     |         |-IntegerLiteralExpression Size
-  |     |         | `-'10' LiteralToken
-  |     |         `-']' CloseParen
-  |     `-')' CloseParen
-  `-';'
-)txt"));
-}
-
-TEST_P(BuildSyntaxTreeTest, ParametersAndQualifiers_InFreeFunctions_Empty) {
-  EXPECT_TRUE(treeDumpEqual(
-      R"cpp(
-int func();
-)cpp",
-      R"txt(
-TranslationUnit Detached
-`-SimpleDeclaration
-  |-'int'
-  |-DeclaratorList Declarators
-  | `-SimpleDeclarator ListElement
-  |   |-'func'
-  |   `-ParametersAndQualifiers
-  |     |-'(' OpenParen
-  |     `-')' CloseParen
-  `-';'
-)txt"));
-}
-
-TEST_P(BuildSyntaxTreeTest, ParametersAndQualifiers_InFreeFunctions_Named) {
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-     int func1([[int a]]);
-     int func2([[int *ap]]);
-     int func3([[int a, float b]]);
-     int func4([[undef a]]); // error-ok: no crash on invalid type
-   )cpp",
-      {R"txt(
-ParameterDeclarationList Parameters
-`-SimpleDeclaration ListElement
-  |-'int'
-  `-DeclaratorList Declarators
-    `-SimpleDeclarator ListElement
-      `-'a'
-)txt",
-       R"txt(
-ParameterDeclarationList Parameters
-`-SimpleDeclaration ListElement
-  |-'int'
-  `-DeclaratorList Declarators
-    `-SimpleDeclarator ListElement
-      |-'*'
-      `-'ap'
-)txt",
-       R"txt(
-ParameterDeclarationList Parameters
-|-SimpleDeclaration ListElement
-| |-'int'
-| `-DeclaratorList Declarators
-|   `-SimpleDeclarator ListElement
-|     `-'a'
-|-',' ListDelimiter
-`-SimpleDeclaration ListElement
-  |-'float'
-  `-DeclaratorList Declarators
-    `-SimpleDeclarator ListElement
-      `-'b'
-)txt",
-       R"txt(
-ParameterDeclarationList Parameters
-`-SimpleDeclaration ListElement
-  |-'undef'
-  `-DeclaratorList Declarators
-    `-SimpleDeclarator ListElement
-      `-'a'
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, ParametersAndQualifiers_InFreeFunctions_Unnamed) {
-  EXPECT_TRUE(treeDumpEqual(
-      R"cpp(
-int func1(int);
-int func2(int *);
-int func3(int, float);
-)cpp",
-      R"txt(
-TranslationUnit Detached
-|-SimpleDeclaration
-| |-'int'
-| |-DeclaratorList Declarators
-| | `-SimpleDeclarator ListElement
-| |   |-'func1'
-| |   `-ParametersAndQualifiers
-| |     |-'(' OpenParen
-| |     |-ParameterDeclarationList Parameters
-| |     | `-SimpleDeclaration ListElement
-| |     |   `-'int'
-| |     `-')' CloseParen
-| `-';'
-|-SimpleDeclaration
-| |-'int'
-| |-DeclaratorList Declarators
-| | `-SimpleDeclarator ListElement
-| |   |-'func2'
-| |   `-ParametersAndQualifiers
-| |     |-'(' OpenParen
-| |     |-ParameterDeclarationList Parameters
-| |     | `-SimpleDeclaration ListElement
-| |     |   |-'int'
-| |     |   `-DeclaratorList Declarators
-| |     |     `-SimpleDeclarator ListElement
-| |     |       `-'*'
-| |     `-')' CloseParen
-| `-';'
-`-SimpleDeclaration
-  |-'int'
-  |-DeclaratorList Declarators
-  | `-SimpleDeclarator ListElement
-  |   |-'func3'
-  |   `-ParametersAndQualifiers
-  |     |-'(' OpenParen
-  |     |-ParameterDeclarationList Parameters
-  |     | |-SimpleDeclaration ListElement
-  |     | | `-'int'
-  |     | |-',' ListDelimiter
-  |     | `-SimpleDeclaration ListElement
-  |     |   `-'float'
-  |     `-')' CloseParen
-  `-';'
-)txt"));
-}
-
-TEST_P(BuildSyntaxTreeTest,
-       ParametersAndQualifiers_InFreeFunctions_Default_One) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-int func1([[int a = 1]]);
-)cpp",
-      {R"txt(
-ParameterDeclarationList Parameters
-`-SimpleDeclaration ListElement
-  |-'int'
-  `-DeclaratorList Declarators
-    `-SimpleDeclarator ListElement
-      |-'a'
-      |-'='
-      `-IntegerLiteralExpression
-        `-'1' LiteralToken
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest,
-       ParametersAndQualifiers_InFreeFunctions_Default_Multiple) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-int func2([[int *ap, int a = 1, char c = '2']]);
-)cpp",
-      {R"txt(
-ParameterDeclarationList Parameters
-|-SimpleDeclaration ListElement
-| |-'int'
-| `-DeclaratorList Declarators
-|   `-SimpleDeclarator ListElement
-|     |-'*'
-|     `-'ap'
-|-',' ListDelimiter
-|-SimpleDeclaration ListElement
-| |-'int'
-| `-DeclaratorList Declarators
-|   `-SimpleDeclarator ListElement
-|     |-'a'
-|     |-'='
-|     `-IntegerLiteralExpression
-|       `-'1' LiteralToken
-|-',' ListDelimiter
-`-SimpleDeclaration ListElement
-  |-'char'
-  `-DeclaratorList Declarators
-    `-SimpleDeclarator ListElement
-      |-'c'
-      |-'='
-      `-CharacterLiteralExpression
-        `-''2'' LiteralToken
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest,
-       ParametersAndQualifiers_InVariadicFunctionTemplate_ParameterPack) {
-  if (!GetParam().isCXX11OrLater() || GetParam().hasDelayedTemplateParsing()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-template<typename T, typename... Args>
-[[void test(T , Args... );]]
-)cpp",
-      {R"txt(
-SimpleDeclaration
-|-'void'
-|-DeclaratorList Declarators
-| `-SimpleDeclarator ListElement
-|   |-'test'
-|   `-ParametersAndQualifiers
-|     |-'(' OpenParen
-|     |-ParameterDeclarationList Parameters
-|     | |-SimpleDeclaration ListElement
-|     | | `-'T'
-|     | |-',' ListDelimiter
-|     | `-SimpleDeclaration ListElement
-|     |   |-'Args'
-|     |   `-'...'
-|     `-')' CloseParen
-`-';'
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest,
-       ParametersAndQualifiers_InVariadicFunctionTemplate_NamedParameterPack) {
-  if (!GetParam().isCXX11OrLater() || GetParam().hasDelayedTemplateParsing()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-template<typename T, typename... Args>
-[[void test(T t, Args... args);]]
-)cpp",
-      {R"txt(
-SimpleDeclaration
-|-'void'
-|-DeclaratorList Declarators
-| `-SimpleDeclarator ListElement
-|   |-'test'
-|   `-ParametersAndQualifiers
-|     |-'(' OpenParen
-|     |-ParameterDeclarationList Parameters
-|     | |-SimpleDeclaration ListElement
-|     | | |-'T'
-|     | | `-DeclaratorList Declarators
-|     | |   `-SimpleDeclarator ListElement
-|     | |     `-'t'
-|     | |-',' ListDelimiter
-|     | `-SimpleDeclaration ListElement
-|     |   |-'Args'
-|     |   |-'...'
-|     |   `-DeclaratorList Declarators
-|     |     `-SimpleDeclarator ListElement
-|     |       `-'args'
-|     `-')' CloseParen
-`-';'
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest,
-       ParametersAndQualifiers_InFreeFunctions_VariadicArguments) {
-  if (!GetParam().isCXX11OrLater()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqual(
-      R"cpp(
-void test(int , char ...);
-)cpp",
-      R"txt(
-TranslationUnit Detached
-`-SimpleDeclaration
-  |-'void'
-  |-DeclaratorList Declarators
-  | `-SimpleDeclarator ListElement
-  |   |-'test'
-  |   `-ParametersAndQualifiers
-  |     |-'(' OpenParen
-  |     |-ParameterDeclarationList Parameters
-  |     | |-SimpleDeclaration ListElement
-  |     | | `-'int'
-  |     | |-',' ListDelimiter
-  |     | `-SimpleDeclaration ListElement
-  |     |   `-'char'
-  |     |-'...'
-  |     `-')' CloseParen
-  `-';'
-)txt"));
-}
-
-TEST_P(BuildSyntaxTreeTest,
-       ParametersAndQualifiers_InFreeFunctions_Cxx_CvQualifiers) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqual(
-      R"cpp(
-int func(const int a, volatile int b, const volatile int c);
-)cpp",
-      R"txt(
-TranslationUnit Detached
-`-SimpleDeclaration
-  |-'int'
-  |-DeclaratorList Declarators
-  | `-SimpleDeclarator ListElement
-  |   |-'func'
-  |   `-ParametersAndQualifiers
-  |     |-'(' OpenParen
-  |     |-ParameterDeclarationList Parameters
-  |     | |-SimpleDeclaration ListElement
-  |     | | |-'const'
-  |     | | |-'int'
-  |     | | `-DeclaratorList Declarators
-  |     | |   `-SimpleDeclarator ListElement
-  |     | |     `-'a'
-  |     | |-',' ListDelimiter
-  |     | |-SimpleDeclaration ListElement
-  |     | | |-'volatile'
-  |     | | |-'int'
-  |     | | `-DeclaratorList Declarators
-  |     | |   `-SimpleDeclarator ListElement
-  |     | |     `-'b'
-  |     | |-',' ListDelimiter
-  |     | `-SimpleDeclaration ListElement
-  |     |   |-'const'
-  |     |   |-'volatile'
-  |     |   |-'int'
-  |     |   `-DeclaratorList Declarators
-  |     |     `-SimpleDeclarator ListElement
-  |     |       `-'c'
-  |     `-')' CloseParen
-  `-';'
-)txt"));
-}
-
-TEST_P(BuildSyntaxTreeTest, ParametersAndQualifiers_InFreeFunctions_Cxx_Ref) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqual(
-      R"cpp(
-int func(int& a);
-)cpp",
-      R"txt(
-TranslationUnit Detached
-`-SimpleDeclaration
-  |-'int'
-  |-DeclaratorList Declarators
-  | `-SimpleDeclarator ListElement
-  |   |-'func'
-  |   `-ParametersAndQualifiers
-  |     |-'(' OpenParen
-  |     |-ParameterDeclarationList Parameters
-  |     | `-SimpleDeclaration ListElement
-  |     |   |-'int'
-  |     |   `-DeclaratorList Declarators
-  |     |     `-SimpleDeclarator ListElement
-  |     |       |-'&'
-  |     |       `-'a'
-  |     `-')' CloseParen
-  `-';'
-)txt"));
-}
-
-TEST_P(BuildSyntaxTreeTest,
-       ParametersAndQualifiers_InFreeFunctions_Cxx11_RefRef) {
-  if (!GetParam().isCXX11OrLater()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqual(
-      R"cpp(
-int func(int&& a);
-)cpp",
-      R"txt(
-TranslationUnit Detached
-`-SimpleDeclaration
-  |-'int'
-  |-DeclaratorList Declarators
-  | `-SimpleDeclarator ListElement
-  |   |-'func'
-  |   `-ParametersAndQualifiers
-  |     |-'(' OpenParen
-  |     |-ParameterDeclarationList Parameters
-  |     | `-SimpleDeclaration ListElement
-  |     |   |-'int'
-  |     |   `-DeclaratorList Declarators
-  |     |     `-SimpleDeclarator ListElement
-  |     |       |-'&&'
-  |     |       `-'a'
-  |     `-')' CloseParen
-  `-';'
-)txt"));
-}
-
-TEST_P(BuildSyntaxTreeTest, ParametersAndQualifiers_InMemberFunctions_Simple) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqual(
-      R"cpp(
-struct Test {
-  int a();
-};
-)cpp",
-      R"txt(
-TranslationUnit Detached
-`-SimpleDeclaration
-  |-'struct'
-  |-'Test'
-  |-'{'
-  |-SimpleDeclaration
-  | |-'int'
-  | |-DeclaratorList Declarators
-  | | `-SimpleDeclarator ListElement
-  | |   |-'a'
-  | |   `-ParametersAndQualifiers
-  | |     |-'(' OpenParen
-  | |     `-')' CloseParen
-  | `-';'
-  |-'}'
-  `-';'
-)txt"));
-}
-
-TEST_P(BuildSyntaxTreeTest,
-       ParametersAndQualifiers_InMemberFunctions_CvQualifiers) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-struct Test {
-  [[int b() const;]]
-  [[int c() volatile;]]
-  [[int d() const volatile;]]
-};
-)cpp",
-      {R"txt(
-SimpleDeclaration
-|-'int'
-|-DeclaratorList Declarators
-| `-SimpleDeclarator ListElement
-|   |-'b'
-|   `-ParametersAndQualifiers
-|     |-'(' OpenParen
-|     |-')' CloseParen
-|     `-'const'
-`-';'
-)txt",
-       R"txt(
-SimpleDeclaration
-|-'int'
-|-DeclaratorList Declarators
-| `-SimpleDeclarator ListElement
-|   |-'c'
-|   `-ParametersAndQualifiers
-|     |-'(' OpenParen
-|     |-')' CloseParen
-|     `-'volatile'
-`-';'
-)txt",
-       R"txt(
-SimpleDeclaration
-|-'int'
-|-DeclaratorList Declarators
-| `-SimpleDeclarator ListElement
-|   |-'d'
-|   `-ParametersAndQualifiers
-|     |-'(' OpenParen
-|     |-')' CloseParen
-|     |-'const'
-|     `-'volatile'
-`-';'
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, ParametersAndQualifiers_InMemberFunctions_Ref) {
-  if (!GetParam().isCXX11OrLater()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-struct Test {
-  [[int e() &;]]
-};
-)cpp",
-      {R"txt(
-SimpleDeclaration
-|-'int'
-|-DeclaratorList Declarators
-| `-SimpleDeclarator ListElement
-|   |-'e'
-|   `-ParametersAndQualifiers
-|     |-'(' OpenParen
-|     |-')' CloseParen
-|     `-'&'
-`-';'
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, ParametersAndQualifiers_InMemberFunctions_RefRef) {
-  if (!GetParam().isCXX11OrLater()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-struct Test {
-  [[int f() &&;]]
-};
-)cpp",
-      {R"txt(
-SimpleDeclaration
-|-'int'
-|-DeclaratorList Declarators
-| `-SimpleDeclarator ListElement
-|   |-'f'
-|   `-ParametersAndQualifiers
-|     |-'(' OpenParen
-|     |-')' CloseParen
-|     `-'&&'
-`-';'
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, TrailingReturn) {
-  if (!GetParam().isCXX11OrLater()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqual(
-      R"cpp(
-auto foo() -> int;
-)cpp",
-      R"txt(
-TranslationUnit Detached
-`-SimpleDeclaration
-  |-'auto'
-  |-DeclaratorList Declarators
-  | `-SimpleDeclarator ListElement
-  |   |-'foo'
-  |   `-ParametersAndQualifiers
-  |     |-'(' OpenParen
-  |     |-')' CloseParen
-  |     `-TrailingReturnType TrailingReturn
-  |       |-'->' ArrowToken
-  |       `-'int'
-  `-';'
-)txt"));
-}
-
-TEST_P(BuildSyntaxTreeTest, DynamicExceptionSpecification) {
-  if (!GetParam().supportsCXXDynamicExceptionSpecification()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-struct MyException1 {};
-struct MyException2 {};
-[[int a() throw();]]
-[[int b() throw(...);]]
-[[int c() throw(MyException1);]]
-[[int d() throw(MyException1, MyException2);]]
-)cpp",
-      {R"txt(
-SimpleDeclaration
-|-'int'
-|-DeclaratorList Declarators
-| `-SimpleDeclarator ListElement
-|   |-'a'
-|   `-ParametersAndQualifiers
-|     |-'(' OpenParen
-|     |-')' CloseParen
-|     |-'throw'
-|     |-'('
-|     `-')'
-`-';'
-)txt",
-       R"txt(
-SimpleDeclaration
-|-'int'
-|-DeclaratorList Declarators
-| `-SimpleDeclarator ListElement
-|   |-'b'
-|   `-ParametersAndQualifiers
-|     |-'(' OpenParen
-|     |-')' CloseParen
-|     |-'throw'
-|     |-'('
-|     |-'...'
-|     `-')'
-`-';'
-)txt",
-       R"txt(
-SimpleDeclaration
-|-'int'
-|-DeclaratorList Declarators
-| `-SimpleDeclarator ListElement
-|   |-'c'
-|   `-ParametersAndQualifiers
-|     |-'(' OpenParen
-|     |-')' CloseParen
-|     |-'throw'
-|     |-'('
-|     |-'MyException1'
-|     `-')'
-`-';'
-)txt",
-       R"txt(
-SimpleDeclaration
-|-'int'
-|-DeclaratorList Declarators
-| `-SimpleDeclarator ListElement
-|   |-'d'
-|   `-ParametersAndQualifiers
-|     |-'(' OpenParen
-|     |-')' CloseParen
-|     |-'throw'
-|     |-'('
-|     |-'MyException1'
-|     |-','
-|     |-'MyException2'
-|     `-')'
-`-';'
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, NoexceptExceptionSpecification) {
-  if (!GetParam().isCXX11OrLater()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqual(
-      R"cpp(
-int a() noexcept;
-int b() noexcept(true);
-)cpp",
-      R"txt(
-TranslationUnit Detached
-|-SimpleDeclaration
-| |-'int'
-| |-DeclaratorList Declarators
-| | `-SimpleDeclarator ListElement
-| |   |-'a'
-| |   `-ParametersAndQualifiers
-| |     |-'(' OpenParen
-| |     |-')' CloseParen
-| |     `-'noexcept'
-| `-';'
-`-SimpleDeclaration
-  |-'int'
-  |-DeclaratorList Declarators
-  | `-SimpleDeclarator ListElement
-  |   |-'b'
-  |   `-ParametersAndQualifiers
-  |     |-'(' OpenParen
-  |     |-')' CloseParen
-  |     |-'noexcept'
-  |     |-'('
-  |     |-BoolLiteralExpression
-  |     | `-'true' LiteralToken
-  |     `-')'
-  `-';'
-)txt"));
-}
-
-TEST_P(BuildSyntaxTreeTest, DeclaratorsInParentheses) {
-  EXPECT_TRUE(treeDumpEqual(
-      R"cpp(
-int (a);
-int *(b);
-int (*c)(int);
-int *(d)(int);
-)cpp",
-      R"txt(
-TranslationUnit Detached
-|-SimpleDeclaration
-| |-'int'
-| |-DeclaratorList Declarators
-| | `-SimpleDeclarator ListElement
-| |   `-ParenDeclarator
-| |     |-'(' OpenParen
-| |     |-'a'
-| |     `-')' CloseParen
-| `-';'
-|-SimpleDeclaration
-| |-'int'
-| |-DeclaratorList Declarators
-| | `-SimpleDeclarator ListElement
-| |   |-'*'
-| |   `-ParenDeclarator
-| |     |-'(' OpenParen
-| |     |-'b'
-| |     `-')' CloseParen
-| `-';'
-|-SimpleDeclaration
-| |-'int'
-| |-DeclaratorList Declarators
-| | `-SimpleDeclarator ListElement
-| |   |-ParenDeclarator
-| |   | |-'(' OpenParen
-| |   | |-'*'
-| |   | |-'c'
-| |   | `-')' CloseParen
-| |   `-ParametersAndQualifiers
-| |     |-'(' OpenParen
-| |     |-ParameterDeclarationList Parameters
-| |     | `-SimpleDeclaration ListElement
-| |     |   `-'int'
-| |     `-')' CloseParen
-| `-';'
-`-SimpleDeclaration
-  |-'int'
-  |-DeclaratorList Declarators
-  | `-SimpleDeclarator ListElement
-  |   |-'*'
-  |   |-ParenDeclarator
-  |   | |-'(' OpenParen
-  |   | |-'d'
-  |   | `-')' CloseParen
-  |   `-ParametersAndQualifiers
-  |     |-'(' OpenParen
-  |     |-ParameterDeclarationList Parameters
-  |     | `-SimpleDeclaration ListElement
-  |     |   `-'int'
-  |     `-')' CloseParen
-  `-';'
-)txt"));
-}
-
-TEST_P(BuildSyntaxTreeTest, Declaration_ConstVolatileQualifiers_SimpleConst) {
-  EXPECT_TRUE(treeDumpEqual(
-      R"cpp(
-const int west = -1;
-int const east = 1;
-)cpp",
-      R"txt(
-TranslationUnit Detached
-|-SimpleDeclaration
-| |-'const'
-| |-'int'
-| |-DeclaratorList Declarators
-| | `-SimpleDeclarator ListElement
-| |   |-'west'
-| |   |-'='
-| |   `-PrefixUnaryOperatorExpression
-| |     |-'-' OperatorToken
-| |     `-IntegerLiteralExpression Operand
-| |       `-'1' LiteralToken
-| `-';'
-`-SimpleDeclaration
-  |-'int'
-  |-'const'
-  |-DeclaratorList Declarators
-  | `-SimpleDeclarator ListElement
-  |   |-'east'
-  |   |-'='
-  |   `-IntegerLiteralExpression
-  |     `-'1' LiteralToken
-  `-';'
-)txt"));
-}
-
-TEST_P(BuildSyntaxTreeTest, Declaration_ConstVolatileQualifiers_MultipleConst) {
-  EXPECT_TRUE(treeDumpEqual(
-      R"cpp(
-const int const universal = 0;
-)cpp",
-      R"txt(
-TranslationUnit Detached
-`-SimpleDeclaration
-  |-'const'
-  |-'int'
-  |-'const'
-  |-DeclaratorList Declarators
-  | `-SimpleDeclarator ListElement
-  |   |-'universal'
-  |   |-'='
-  |   `-IntegerLiteralExpression
-  |     `-'0' LiteralToken
-  `-';'
-)txt"));
-}
-
-TEST_P(BuildSyntaxTreeTest,
-       Declaration_ConstVolatileQualifiers_ConstAndVolatile) {
-  EXPECT_TRUE(treeDumpEqual(
-      R"cpp(
-const int const *const *volatile b;
-)cpp",
-      R"txt(
-TranslationUnit Detached
-`-SimpleDeclaration
-  |-'const'
-  |-'int'
-  |-'const'
-  |-DeclaratorList Declarators
-  | `-SimpleDeclarator ListElement
-  |   |-'*'
-  |   |-'const'
-  |   |-'*'
-  |   |-'volatile'
-  |   `-'b'
-  `-';'
-)txt"));
-}
-
-TEST_P(BuildSyntaxTreeTest, RangesOfDeclaratorsWithTrailingReturnTypes) {
-  if (!GetParam().isCXX11OrLater()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqual(
-      R"cpp(
-auto foo() -> auto(*)(int) -> double*;
-)cpp",
-      R"txt(
-TranslationUnit Detached
-`-SimpleDeclaration
-  |-'auto'
-  |-DeclaratorList Declarators
-  | `-SimpleDeclarator ListElement
-  |   |-'foo'
-  |   `-ParametersAndQualifiers
-  |     |-'(' OpenParen
-  |     |-')' CloseParen
-  |     `-TrailingReturnType TrailingReturn
-  |       |-'->' ArrowToken
-  |       |-'auto'
-  |       `-SimpleDeclarator Declarator
-  |         |-ParenDeclarator
-  |         | |-'(' OpenParen
-  |         | |-'*'
-  |         | `-')' CloseParen
-  |         `-ParametersAndQualifiers
-  |           |-'(' OpenParen
-  |           |-ParameterDeclarationList Parameters
-  |           | `-SimpleDeclaration ListElement
-  |           |   `-'int'
-  |           |-')' CloseParen
-  |           `-TrailingReturnType TrailingReturn
-  |             |-'->' ArrowToken
-  |             |-'double'
-  |             `-SimpleDeclarator Declarator
-  |               `-'*'
-  `-';'
-)txt"));
-}
-
-TEST_P(BuildSyntaxTreeTest, MemberPointers) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-struct X {};
-[[int X::* a;]]
-[[const int X::* b;]]
-)cpp",
-      {R"txt(
-SimpleDeclaration
-|-'int'
-|-DeclaratorList Declarators
-| `-SimpleDeclarator ListElement
-|   |-MemberPointer
-|   | |-'X'
-|   | |-'::'
-|   | `-'*'
-|   `-'a'
-`-';'
-)txt",
-       R"txt(
-SimpleDeclaration
-|-'const'
-|-'int'
-|-DeclaratorList Declarators
-| `-SimpleDeclarator ListElement
-|   |-MemberPointer
-|   | |-'X'
-|   | |-'::'
-|   | `-'*'
-|   `-'b'
-`-';'
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, MemberFunctionPointer) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  EXPECT_TRUE(treeDumpEqualOnAnnotations(
-      R"cpp(
-struct X {
-  struct Y {};
-};
-[[void (X::*xp)();]]
-[[void (X::**xpp)(const int*);]]
-// FIXME: Generate the right syntax tree for this type,
-// i.e. create a syntax node for the outer member pointer
-[[void (X::Y::*xyp)(const int*, char);]]
-)cpp",
-      {R"txt(
-SimpleDeclaration
-|-'void'
-|-DeclaratorList Declarators
-| `-SimpleDeclarator ListElement
-|   |-ParenDeclarator
-|   | |-'(' OpenParen
-|   | |-MemberPointer
-|   | | |-'X'
-|   | | |-'::'
-|   | | `-'*'
-|   | |-'xp'
-|   | `-')' CloseParen
-|   `-ParametersAndQualifiers
-|     |-'(' OpenParen
-|     `-')' CloseParen
-`-';'
-)txt",
-       R"txt(
-SimpleDeclaration
-|-'void'
-|-DeclaratorList Declarators
-| `-SimpleDeclarator ListElement
-|   |-ParenDeclarator
-|   | |-'(' OpenParen
-|   | |-MemberPointer
-|   | | |-'X'
-|   | | |-'::'
-|   | | `-'*'
-|   | |-'*'
-|   | |-'xpp'
-|   | `-')' CloseParen
-|   `-ParametersAndQualifiers
-|     |-'(' OpenParen
-|     |-ParameterDeclarationList Parameters
-|     | `-SimpleDeclaration ListElement
-|     |   |-'const'
-|     |   |-'int'
-|     |   `-DeclaratorList Declarators
-|     |     `-SimpleDeclarator ListElement
-|     |       `-'*'
-|     `-')' CloseParen
-`-';'
-)txt",
-       R"txt(
-SimpleDeclaration
-|-'void'
-|-DeclaratorList Declarators
-| `-SimpleDeclarator ListElement
-|   |-ParenDeclarator
-|   | |-'(' OpenParen
-|   | |-'X'
-|   | |-'::'
-|   | |-MemberPointer
-|   | | |-'Y'
-|   | | |-'::'
-|   | | `-'*'
-|   | |-'xyp'
-|   | `-')' CloseParen
-|   `-ParametersAndQualifiers
-|     |-'(' OpenParen
-|     |-ParameterDeclarationList Parameters
-|     | |-SimpleDeclaration ListElement
-|     | | |-'const'
-|     | | |-'int'
-|     | | `-DeclaratorList Declarators
-|     | |   `-SimpleDeclarator ListElement
-|     | |     `-'*'
-|     | |-',' ListDelimiter
-|     | `-SimpleDeclaration ListElement
-|     |   `-'char'
-|     `-')' CloseParen
-`-';'
-)txt"}));
-}
-
-TEST_P(BuildSyntaxTreeTest, ComplexDeclarator) {
-  EXPECT_TRUE(treeDumpEqual(
-      R"cpp(
-void x(char a, short (*b)(int));
-)cpp",
-      R"txt(
-TranslationUnit Detached
-`-SimpleDeclaration
-  |-'void'
-  |-DeclaratorList Declarators
-  | `-SimpleDeclarator ListElement
-  |   |-'x'
-  |   `-ParametersAndQualifiers
-  |     |-'(' OpenParen
-  |     |-ParameterDeclarationList Parameters
-  |     | |-SimpleDeclaration ListElement
-  |     | | |-'char'
-  |     | | `-DeclaratorList Declarators
-  |     | |   `-SimpleDeclarator ListElement
-  |     | |     `-'a'
-  |     | |-',' ListDelimiter
-  |     | `-SimpleDeclaration ListElement
-  |     |   |-'short'
-  |     |   `-DeclaratorList Declarators
-  |     |     `-SimpleDeclarator ListElement
-  |     |       |-ParenDeclarator
-  |     |       | |-'(' OpenParen
-  |     |       | |-'*'
-  |     |       | |-'b'
-  |     |       | `-')' CloseParen
-  |     |       `-ParametersAndQualifiers
-  |     |         |-'(' OpenParen
-  |     |         |-ParameterDeclarationList Parameters
-  |     |         | `-SimpleDeclaration ListElement
-  |     |         |   `-'int'
-  |     |         `-')' CloseParen
-  |     `-')' CloseParen
-  `-';'
-)txt"));
-}
-
-TEST_P(BuildSyntaxTreeTest, ComplexDeclarator2) {
-  EXPECT_TRUE(treeDumpEqual(
-      R"cpp(
-void x(char a, short (*b)(int), long (**c)(long long));
-)cpp",
-      R"txt(
-TranslationUnit Detached
-`-SimpleDeclaration
-  |-'void'
-  |-DeclaratorList Declarators
-  | `-SimpleDeclarator ListElement
-  |   |-'x'
-  |   `-ParametersAndQualifiers
-  |     |-'(' OpenParen
-  |     |-ParameterDeclarationList Parameters
-  |     | |-SimpleDeclaration ListElement
-  |     | | |-'char'
-  |     | | `-DeclaratorList Declarators
-  |     | |   `-SimpleDeclarator ListElement
-  |     | |     `-'a'
-  |     | |-',' ListDelimiter
-  |     | |-SimpleDeclaration ListElement
-  |     | | |-'short'
-  |     | | `-DeclaratorList Declarators
-  |     | |   `-SimpleDeclarator ListElement
-  |     | |     |-ParenDeclarator
-  |     | |     | |-'(' OpenParen
-  |     | |     | |-'*'
-  |     | |     | |-'b'
-  |     | |     | `-')' CloseParen
-  |     | |     `-ParametersAndQualifiers
-  |     | |       |-'(' OpenParen
-  |     | |       |-ParameterDeclarationList Parameters
-  |     | |       | `-SimpleDeclaration ListElement
-  |     | |       |   `-'int'
-  |     | |       `-')' CloseParen
-  |     | |-',' ListDelimiter
-  |     | `-SimpleDeclaration ListElement
-  |     |   |-'long'
-  |     |   `-DeclaratorList Declarators
-  |     |     `-SimpleDeclarator ListElement
-  |     |       |-ParenDeclarator
-  |     |       | |-'(' OpenParen
-  |     |       | |-'*'
-  |     |       | |-'*'
-  |     |       | |-'c'
-  |     |       | `-')' CloseParen
-  |     |       `-ParametersAndQualifiers
-  |     |         |-'(' OpenParen
-  |     |         |-ParameterDeclarationList Parameters
-  |     |         | `-SimpleDeclaration ListElement
-  |     |         |   |-'long'
-  |     |         |   `-'long'
-  |     |         `-')' CloseParen
-  |     `-')' CloseParen
-  `-';'
-)txt"));
-}
-
-} // namespace
diff --git a/gnu/llvm/clang/unittests/Tooling/Syntax/CMakeLists.txt b/gnu/llvm/clang/unittests/Tooling/Syntax/CMakeLists.txt
deleted file mode 100644
index 174f3e7bf57..00000000000
--- a/gnu/llvm/clang/unittests/Tooling/Syntax/CMakeLists.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  Support
-  )
-
-add_clang_unittest(SyntaxTests
-  TreeTestBase.cpp
-  BuildTreeTest.cpp
-  MutationsTest.cpp
-  SynthesisTest.cpp
-  TreeTest.cpp
-  TokensTest.cpp
-)
-
-clang_target_link_libraries(SyntaxTests
-  PRIVATE
-  clangAST
-  clangBasic
-  clangFrontend
-  clangLex
-  clangSerialization
-  clangTesting
-  clangTooling
-  clangToolingCore
-  clangToolingSyntax
-  )
-
-target_link_libraries(SyntaxTests
-  PRIVATE
-  LLVMTestingSupport
-)
diff --git a/gnu/llvm/clang/unittests/Tooling/Syntax/MutationsTest.cpp b/gnu/llvm/clang/unittests/Tooling/Syntax/MutationsTest.cpp
deleted file mode 100644
index 34279dc2d94..00000000000
--- a/gnu/llvm/clang/unittests/Tooling/Syntax/MutationsTest.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-//===- MutationsTest.cpp --------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file tests mutation API for syntax trees.
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/Tooling/Syntax/Mutations.h"
-#include "TreeTestBase.h"
-#include "clang/Tooling/Syntax/BuildTree.h"
-
-using namespace clang;
-using namespace clang::syntax;
-
-namespace {
-
-class MutationTest : public SyntaxTreeTest {
-protected:
-  using Transformation = std::function<void(const llvm::Annotations & /*Input*/,
-                                            TranslationUnit * /*Root*/)>;
-  void CheckTransformation(Transformation Transform, std::string Input,
-                           std::string Expected) {
-    llvm::Annotations Source(Input);
-    auto *Root = buildTree(Source.code(), GetParam());
-
-    Transform(Source, Root);
-
-    auto Replacements = syntax::computeReplacements(*Arena, *Root);
-    auto Output = tooling::applyAllReplacements(Source.code(), Replacements);
-    if (!Output) {
-      ADD_FAILURE() << "could not apply replacements: "
-                    << llvm::toString(Output.takeError());
-      return;
-    }
-
-    EXPECT_EQ(Expected, *Output) << "input is:\n" << Input;
-  };
-
-  // Removes the selected statement. Input should have exactly one selected
-  // range and it should correspond to a single statement.
-  Transformation RemoveStatement = [this](const llvm::Annotations &Input,
-                                          TranslationUnit *Root) {
-    auto *S = cast<syntax::Statement>(nodeByRange(Input.range(), Root));
-    ASSERT_TRUE(S->canModify()) << "cannot remove a statement";
-    syntax::removeStatement(*Arena, S);
-    EXPECT_TRUE(S->isDetached());
-    EXPECT_FALSE(S->isOriginal())
-        << "node removed from tree cannot be marked as original";
-  };
-};
-
-INSTANTIATE_TEST_SUITE_P(SyntaxTreeTests, MutationTest,
-                        ::testing::ValuesIn(allTestClangConfigs()) );
-
-TEST_P(MutationTest, RemoveStatement_InCompound) {
-  CheckTransformation(RemoveStatement, "void test() { [[100+100;]] test(); }",
-                      "void test() {  test(); }");
-}
-
-TEST_P(MutationTest, RemoveStatement_InCompound_Empty) {
-  CheckTransformation(RemoveStatement, "void test() { [[;]] }",
-                      "void test() {  }");
-}
-
-TEST_P(MutationTest, RemoveStatement_LeaveEmpty) {
-  CheckTransformation(RemoveStatement, "void test() { if (1) [[{}]] else {} }",
-                      "void test() { if (1) ; else {} }");
-}
-} // namespace
diff --git a/gnu/llvm/clang/unittests/Tooling/Syntax/SynthesisTest.cpp b/gnu/llvm/clang/unittests/Tooling/Syntax/SynthesisTest.cpp
deleted file mode 100644
index 0bdc7bbdeb0..00000000000
--- a/gnu/llvm/clang/unittests/Tooling/Syntax/SynthesisTest.cpp
+++ /dev/null
@@ -1,269 +0,0 @@
-//===- SynthesisTest.cpp --------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file tests synthesis API for syntax trees.
-//
-//===----------------------------------------------------------------------===//
-
-#include "TreeTestBase.h"
-#include "clang/Tooling/Syntax/BuildTree.h"
-#include "clang/Tooling/Syntax/Nodes.h"
-#include "gtest/gtest.h"
-
-using namespace clang;
-using namespace clang::syntax;
-
-namespace {
-
-class SynthesisTest : public SyntaxTreeTest {
-protected:
-  ::testing::AssertionResult treeDumpEqual(syntax::Node *Root, StringRef Dump) {
-    if (!Root)
-      return ::testing::AssertionFailure()
-             << "Root was not built successfully.";
-
-    auto Actual = StringRef(Root->dump(Arena->getSourceManager())).trim().str();
-    auto Expected = Dump.trim().str();
-    // EXPECT_EQ shows the diff between the two strings if they are different.
-    EXPECT_EQ(Expected, Actual);
-    if (Actual != Expected) {
-      return ::testing::AssertionFailure();
-    }
-    return ::testing::AssertionSuccess();
-  }
-};
-
-INSTANTIATE_TEST_SUITE_P(SynthesisTests, SynthesisTest,
-                        ::testing::ValuesIn(allTestClangConfigs()) );
-
-TEST_P(SynthesisTest, Leaf_Punctuation) {
-  buildTree("", GetParam());
-
-  auto *Leaf = createLeaf(*Arena, tok::comma);
-
-  EXPECT_TRUE(treeDumpEqual(Leaf, R"txt(
-',' Detached synthesized
-  )txt"));
-}
-
-TEST_P(SynthesisTest, Leaf_Punctuation_CXX) {
-  if (!GetParam().isCXX())
-    return;
-
-  buildTree("", GetParam());
-
-  auto *Leaf = createLeaf(*Arena, tok::coloncolon);
-
-  EXPECT_TRUE(treeDumpEqual(Leaf, R"txt(
-'::' Detached synthesized
-  )txt"));
-}
-
-TEST_P(SynthesisTest, Leaf_Keyword) {
-  buildTree("", GetParam());
-
-  auto *Leaf = createLeaf(*Arena, tok::kw_if);
-
-  EXPECT_TRUE(treeDumpEqual(Leaf, R"txt(
-'if' Detached synthesized
-  )txt"));
-}
-
-TEST_P(SynthesisTest, Leaf_Keyword_CXX11) {
-  if (!GetParam().isCXX11OrLater())
-    return;
-
-  buildTree("", GetParam());
-
-  auto *Leaf = createLeaf(*Arena, tok::kw_nullptr);
-
-  EXPECT_TRUE(treeDumpEqual(Leaf, R"txt(
-'nullptr' Detached synthesized
-  )txt"));
-}
-
-TEST_P(SynthesisTest, Leaf_Identifier) {
-  buildTree("", GetParam());
-
-  auto *Leaf = createLeaf(*Arena, tok::identifier, "a");
-
-  EXPECT_TRUE(treeDumpEqual(Leaf, R"txt(
-'a' Detached synthesized
-  )txt"));
-}
-
-TEST_P(SynthesisTest, Leaf_Number) {
-  buildTree("", GetParam());
-
-  auto *Leaf = createLeaf(*Arena, tok::numeric_constant, "1");
-
-  EXPECT_TRUE(treeDumpEqual(Leaf, R"txt(
-'1' Detached synthesized
-  )txt"));
-}
-
-TEST_P(SynthesisTest, Tree_Empty) {
-  buildTree("", GetParam());
-
-  auto *Tree = createTree(*Arena, {}, NodeKind::UnknownExpression);
-
-  EXPECT_TRUE(treeDumpEqual(Tree, R"txt(
-UnknownExpression Detached synthesized
-  )txt"));
-}
-
-TEST_P(SynthesisTest, Tree_Flat) {
-  buildTree("", GetParam());
-
-  auto *LeafLParen = createLeaf(*Arena, tok::l_paren);
-  auto *LeafRParen = createLeaf(*Arena, tok::r_paren);
-  auto *TreeParen = createTree(*Arena,
-                               {{LeafLParen, NodeRole::LeftHandSide},
-                                {LeafRParen, NodeRole::RightHandSide}},
-                               NodeKind::ParenExpression);
-
-  EXPECT_TRUE(treeDumpEqual(TreeParen, R"txt(
-ParenExpression Detached synthesized
-|-'(' LeftHandSide synthesized
-`-')' RightHandSide synthesized
-  )txt"));
-}
-
-TEST_P(SynthesisTest, Tree_OfTree) {
-  buildTree("", GetParam());
-
-  auto *Leaf1 = createLeaf(*Arena, tok::numeric_constant, "1");
-  auto *Int1 = createTree(*Arena, {{Leaf1, NodeRole::LiteralToken}},
-                          NodeKind::IntegerLiteralExpression);
-
-  auto *LeafPlus = createLeaf(*Arena, tok::plus);
-
-  auto *Leaf2 = createLeaf(*Arena, tok::numeric_constant, "2");
-  auto *Int2 = createTree(*Arena, {{Leaf2, NodeRole::LiteralToken}},
-                          NodeKind::IntegerLiteralExpression);
-
-  auto *TreeBinaryOperator = createTree(*Arena,
-                                        {{Int1, NodeRole::LeftHandSide},
-                                         {LeafPlus, NodeRole::OperatorToken},
-                                         {Int2, NodeRole::RightHandSide}},
-                                        NodeKind::BinaryOperatorExpression);
-
-  EXPECT_TRUE(treeDumpEqual(TreeBinaryOperator, R"txt(
-BinaryOperatorExpression Detached synthesized
-|-IntegerLiteralExpression LeftHandSide synthesized
-| `-'1' LiteralToken synthesized
-|-'+' OperatorToken synthesized
-`-IntegerLiteralExpression RightHandSide synthesized
-  `-'2' LiteralToken synthesized
-  )txt"));
-}
-
-TEST_P(SynthesisTest, DeepCopy_Synthesized) {
-  buildTree("", GetParam());
-
-  auto *LeafContinue = createLeaf(*Arena, tok::kw_continue);
-  auto *LeafSemiColon = createLeaf(*Arena, tok::semi);
-  auto *StatementContinue = createTree(*Arena,
-                                       {{LeafContinue, NodeRole::LiteralToken},
-                                        {LeafSemiColon, NodeRole::Unknown}},
-                                       NodeKind::ContinueStatement);
-
-  auto *Copy = deepCopyExpandingMacros(*Arena, StatementContinue);
-  EXPECT_TRUE(
-      treeDumpEqual(Copy, StatementContinue->dump(Arena->getSourceManager())));
-  // FIXME: Test that copy is independent of original, once the Mutations API is
-  // more developed.
-}
-
-TEST_P(SynthesisTest, DeepCopy_Original) {
-  auto *OriginalTree = buildTree("int a;", GetParam());
-
-  auto *Copy = deepCopyExpandingMacros(*Arena, OriginalTree);
-  EXPECT_TRUE(treeDumpEqual(Copy, R"txt(
-TranslationUnit Detached synthesized
-`-SimpleDeclaration synthesized
-  |-'int' synthesized
-  |-DeclaratorList Declarators synthesized
-  | `-SimpleDeclarator ListElement synthesized
-  |   `-'a' synthesized
-  `-';' synthesized
-  )txt"));
-}
-
-TEST_P(SynthesisTest, DeepCopy_Child) {
-  auto *OriginalTree = buildTree("int a;", GetParam());
-
-  auto *Copy = deepCopyExpandingMacros(*Arena, OriginalTree->getFirstChild());
-  EXPECT_TRUE(treeDumpEqual(Copy, R"txt(
-SimpleDeclaration Detached synthesized
-|-'int' synthesized
-|-DeclaratorList Declarators synthesized
-| `-SimpleDeclarator ListElement synthesized
-|   `-'a' synthesized
-`-';' synthesized
-  )txt"));
-}
-
-TEST_P(SynthesisTest, DeepCopy_Macro) {
-  auto *OriginalTree = buildTree(R"cpp(
-#define HALF_IF if (1+
-#define HALF_IF_2 1) {}
-void test() {
-  HALF_IF HALF_IF_2 else {}
-})cpp",
-                                 GetParam());
-
-  auto *Copy = deepCopyExpandingMacros(*Arena, OriginalTree);
-
-  // The syntax tree stores already expanded Tokens, we can only see whether the
-  // macro was expanded when computing replacements. The dump does show that
-  // nodes in the copy are `modifiable`.
-  EXPECT_TRUE(treeDumpEqual(Copy, R"txt(
-TranslationUnit Detached synthesized
-`-SimpleDeclaration synthesized
-  |-'void' synthesized
-  |-DeclaratorList Declarators synthesized
-  | `-SimpleDeclarator ListElement synthesized
-  |   |-'test' synthesized
-  |   `-ParametersAndQualifiers synthesized
-  |     |-'(' OpenParen synthesized
-  |     `-')' CloseParen synthesized
-  `-CompoundStatement synthesized
-    |-'{' OpenParen synthesized
-    |-IfStatement Statement synthesized
-    | |-'if' IntroducerKeyword synthesized
-    | |-'(' synthesized
-    | |-ExpressionStatement Condition synthesized
-    | | `-BinaryOperatorExpression Expression synthesized
-    | |   |-IntegerLiteralExpression LeftHandSide synthesized
-    | |   | `-'1' LiteralToken synthesized
-    | |   |-'+' OperatorToken synthesized
-    | |   `-IntegerLiteralExpression RightHandSide synthesized
-    | |     `-'1' LiteralToken synthesized
-    | |-')' synthesized
-    | |-CompoundStatement ThenStatement synthesized
-    | | |-'{' OpenParen synthesized
-    | | `-'}' CloseParen synthesized
-    | |-'else' ElseKeyword synthesized
-    | `-CompoundStatement ElseStatement synthesized
-    |   |-'{' OpenParen synthesized
-    |   `-'}' CloseParen synthesized
-    `-'}' CloseParen synthesized
-  )txt"));
-}
-
-TEST_P(SynthesisTest, Statement_EmptyStatement) {
-  buildTree("", GetParam());
-
-  auto *S = createEmptyStatement(*Arena);
-  EXPECT_TRUE(treeDumpEqual(S, R"txt(
-EmptyStatement Detached synthesized
-`-';' synthesized
-  )txt"));
-}
-} // namespace
diff --git a/gnu/llvm/clang/unittests/Tooling/Syntax/TokensTest.cpp b/gnu/llvm/clang/unittests/Tooling/Syntax/TokensTest.cpp
deleted file mode 100644
index 1768529e0a6..00000000000
--- a/gnu/llvm/clang/unittests/Tooling/Syntax/TokensTest.cpp
+++ /dev/null
@@ -1,1050 +0,0 @@
-//===- TokensTest.cpp -----------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/Tooling/Syntax/Tokens.h"
-#include "clang/AST/ASTConsumer.h"
-#include "clang/AST/Expr.h"
-#include "clang/Basic/Diagnostic.h"
-#include "clang/Basic/DiagnosticIDs.h"
-#include "clang/Basic/DiagnosticOptions.h"
-#include "clang/Basic/FileManager.h"
-#include "clang/Basic/FileSystemOptions.h"
-#include "clang/Basic/LLVM.h"
-#include "clang/Basic/LangOptions.h"
-#include "clang/Basic/SourceLocation.h"
-#include "clang/Basic/SourceManager.h"
-#include "clang/Basic/TokenKinds.def"
-#include "clang/Basic/TokenKinds.h"
-#include "clang/Frontend/CompilerInstance.h"
-#include "clang/Frontend/FrontendAction.h"
-#include "clang/Frontend/Utils.h"
-#include "clang/Lex/Lexer.h"
-#include "clang/Lex/PreprocessorOptions.h"
-#include "clang/Lex/Token.h"
-#include "clang/Tooling/Tooling.h"
-#include "llvm/ADT/ArrayRef.h"
-#include "llvm/ADT/IntrusiveRefCntPtr.h"
-#include "llvm/ADT/None.h"
-#include "llvm/ADT/Optional.h"
-#include "llvm/ADT/STLExtras.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/Support/FormatVariadic.h"
-#include "llvm/Support/MemoryBuffer.h"
-#include "llvm/Support/VirtualFileSystem.h"
-#include "llvm/Support/raw_os_ostream.h"
-#include "llvm/Support/raw_ostream.h"
-#include "llvm/Testing/Support/Annotations.h"
-#include "llvm/Testing/Support/SupportHelpers.h"
-#include "gmock/gmock.h"
-#include <cassert>
-#include <cstdlib>
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-#include <memory>
-#include <ostream>
-#include <string>
-
-using namespace clang;
-using namespace clang::syntax;
-
-using llvm::ValueIs;
-using ::testing::_;
-using ::testing::AllOf;
-using ::testing::Contains;
-using ::testing::ElementsAre;
-using ::testing::Field;
-using ::testing::IsEmpty;
-using ::testing::Matcher;
-using ::testing::Not;
-using ::testing::Pointee;
-using ::testing::StartsWith;
-
-namespace {
-// Checks the passed ArrayRef<T> has the same begin() and end() iterators as the
-// argument.
-MATCHER_P(SameRange, A, "") {
-  return A.begin() == arg.begin() && A.end() == arg.end();
-}
-
-Matcher<TokenBuffer::Expansion>
-IsExpansion(Matcher<llvm::ArrayRef<syntax::Token>> Spelled,
-            Matcher<llvm::ArrayRef<syntax::Token>> Expanded) {
-  return AllOf(Field(&TokenBuffer::Expansion::Spelled, Spelled),
-               Field(&TokenBuffer::Expansion::Expanded, Expanded));
-}
-// Matchers for syntax::Token.
-MATCHER_P(Kind, K, "") { return arg.kind() == K; }
-MATCHER_P2(HasText, Text, SourceMgr, "") {
-  return arg.text(*SourceMgr) == Text;
-}
-/// Checks the start and end location of a token are equal to SourceRng.
-MATCHER_P(RangeIs, SourceRng, "") {
-  return arg.location() == SourceRng.first &&
-         arg.endLocation() == SourceRng.second;
-}
-
-class TokenCollectorTest : public ::testing::Test {
-public:
-  /// Run the clang frontend, collect the preprocessed tokens from the frontend
-  /// invocation and store them in this->Buffer.
-  /// This also clears SourceManager before running the compiler.
-  void recordTokens(llvm::StringRef Code) {
-    class RecordTokens : public ASTFrontendAction {
-    public:
-      explicit RecordTokens(TokenBuffer &Result) : Result(Result) {}
-
-      bool BeginSourceFileAction(CompilerInstance &CI) override {
-        assert(!Collector && "expected only a single call to BeginSourceFile");
-        Collector.emplace(CI.getPreprocessor());
-        return true;
-      }
-      void EndSourceFileAction() override {
-        assert(Collector && "BeginSourceFileAction was never called");
-        Result = std::move(*Collector).consume();
-        Result.indexExpandedTokens();
-      }
-
-      std::unique_ptr<ASTConsumer>
-      CreateASTConsumer(CompilerInstance &CI, StringRef InFile) override {
-        return std::make_unique<ASTConsumer>();
-      }
-
-    private:
-      TokenBuffer &Result;
-      llvm::Optional<TokenCollector> Collector;
-    };
-
-    constexpr const char *FileName = "./input.cpp";
-    FS->addFile(FileName, time_t(), llvm::MemoryBuffer::getMemBufferCopy(""));
-    // Prepare to run a compiler.
-    if (!Diags->getClient())
-      Diags->setClient(new IgnoringDiagConsumer);
-    std::vector<const char *> Args = {"tok-test", "-std=c++03", "-fsyntax-only",
-                                      FileName};
-    auto CI = createInvocationFromCommandLine(Args, Diags, FS);
-    assert(CI);
-    CI->getFrontendOpts().DisableFree = false;
-    CI->getPreprocessorOpts().addRemappedFile(
-        FileName, llvm::MemoryBuffer::getMemBufferCopy(Code).release());
-    CompilerInstance Compiler;
-    Compiler.setInvocation(std::move(CI));
-    Compiler.setDiagnostics(Diags.get());
-    Compiler.setFileManager(FileMgr.get());
-    Compiler.setSourceManager(SourceMgr.get());
-
-    this->Buffer = TokenBuffer(*SourceMgr);
-    RecordTokens Recorder(this->Buffer);
-    ASSERT_TRUE(Compiler.ExecuteAction(Recorder))
-        << "failed to run the frontend";
-  }
-
-  /// Record the tokens and return a test dump of the resulting buffer.
-  std::string collectAndDump(llvm::StringRef Code) {
-    recordTokens(Code);
-    return Buffer.dumpForTests();
-  }
-
-  // Adds a file to the test VFS.
-  void addFile(llvm::StringRef Path, llvm::StringRef Contents) {
-    if (!FS->addFile(Path, time_t(),
-                     llvm::MemoryBuffer::getMemBufferCopy(Contents))) {
-      ADD_FAILURE() << "could not add a file to VFS: " << Path;
-    }
-  }
-
-  /// Add a new file, run syntax::tokenize() on the range if any, run it on the
-  /// whole file otherwise and return the results.
-  std::vector<syntax::Token> tokenize(llvm::StringRef Text) {
-    llvm::Annotations Annot(Text);
-    auto FID = SourceMgr->createFileID(
-        llvm::MemoryBuffer::getMemBufferCopy(Annot.code()));
-    // FIXME: pass proper LangOptions.
-    if (Annot.ranges().empty())
-      return syntax::tokenize(FID, *SourceMgr, LangOptions());
-    return syntax::tokenize(
-        syntax::FileRange(FID, Annot.range().Begin, Annot.range().End),
-        *SourceMgr, LangOptions());
-  }
-
-  // Specialized versions of matchers that hide the SourceManager from clients.
-  Matcher<syntax::Token> HasText(std::string Text) const {
-    return ::HasText(Text, SourceMgr.get());
-  }
-  Matcher<syntax::Token> RangeIs(llvm::Annotations::Range R) const {
-    std::pair<SourceLocation, SourceLocation> Ls;
-    Ls.first = SourceMgr->getLocForStartOfFile(SourceMgr->getMainFileID())
-                   .getLocWithOffset(R.Begin);
-    Ls.second = SourceMgr->getLocForStartOfFile(SourceMgr->getMainFileID())
-                    .getLocWithOffset(R.End);
-    return ::RangeIs(Ls);
-  }
-
-  /// Finds a subrange in O(n * m).
-  template <class T, class U, class Eq>
-  llvm::ArrayRef<T> findSubrange(llvm::ArrayRef<U> Subrange,
-                                 llvm::ArrayRef<T> Range, Eq F) {
-    assert(Subrange.size() >= 1);
-    if (Range.size() < Subrange.size())
-      return llvm::makeArrayRef(Range.end(), Range.end());
-    for (auto Begin = Range.begin(), Last = Range.end() - Subrange.size();
-         Begin <= Last; ++Begin) {
-      auto It = Begin;
-      for (auto ItSub = Subrange.begin(); ItSub != Subrange.end();
-           ++ItSub, ++It) {
-        if (!F(*ItSub, *It))
-          goto continue_outer;
-      }
-      return llvm::makeArrayRef(Begin, It);
-    continue_outer:;
-    }
-    return llvm::makeArrayRef(Range.end(), Range.end());
-  }
-
-  /// Finds a subrange in \p Tokens that match the tokens specified in \p Query.
-  /// The match should be unique. \p Query is a whitespace-separated list of
-  /// tokens to search for.
-  llvm::ArrayRef<syntax::Token>
-  findTokenRange(llvm::StringRef Query, llvm::ArrayRef<syntax::Token> Tokens) {
-    llvm::SmallVector<llvm::StringRef, 8> QueryTokens;
-    Query.split(QueryTokens, ' ', /*MaxSplit=*/-1, /*KeepEmpty=*/false);
-    if (QueryTokens.empty()) {
-      ADD_FAILURE() << "will not look for an empty list of tokens";
-      std::abort();
-    }
-    // An equality test for search.
-    auto TextMatches = [this](llvm::StringRef Q, const syntax::Token &T) {
-      return Q == T.text(*SourceMgr);
-    };
-    // Find a match.
-    auto Found =
-        findSubrange(llvm::makeArrayRef(QueryTokens), Tokens, TextMatches);
-    if (Found.begin() == Tokens.end()) {
-      ADD_FAILURE() << "could not find the subrange for " << Query;
-      std::abort();
-    }
-    // Check that the match is unique.
-    if (findSubrange(llvm::makeArrayRef(QueryTokens),
-                     llvm::makeArrayRef(Found.end(), Tokens.end()), TextMatches)
-            .begin() != Tokens.end()) {
-      ADD_FAILURE() << "match is not unique for " << Query;
-      std::abort();
-    }
-    return Found;
-  };
-
-  // Specialized versions of findTokenRange for expanded and spelled tokens.
-  llvm::ArrayRef<syntax::Token> findExpanded(llvm::StringRef Query) {
-    return findTokenRange(Query, Buffer.expandedTokens());
-  }
-  llvm::ArrayRef<syntax::Token> findSpelled(llvm::StringRef Query,
-                                            FileID File = FileID()) {
-    if (!File.isValid())
-      File = SourceMgr->getMainFileID();
-    return findTokenRange(Query, Buffer.spelledTokens(File));
-  }
-
-  // Data fields.
-  llvm::IntrusiveRefCntPtr<DiagnosticsEngine> Diags =
-      new DiagnosticsEngine(new DiagnosticIDs, new DiagnosticOptions);
-  IntrusiveRefCntPtr<llvm::vfs::InMemoryFileSystem> FS =
-      new llvm::vfs::InMemoryFileSystem;
-  llvm::IntrusiveRefCntPtr<FileManager> FileMgr =
-      new FileManager(FileSystemOptions(), FS);
-  llvm::IntrusiveRefCntPtr<SourceManager> SourceMgr =
-      new SourceManager(*Diags, *FileMgr);
-  /// Contains last result of calling recordTokens().
-  TokenBuffer Buffer = TokenBuffer(*SourceMgr);
-};
-
-TEST_F(TokenCollectorTest, RawMode) {
-  EXPECT_THAT(tokenize("int main() {}"),
-              ElementsAre(Kind(tok::kw_int),
-                          AllOf(HasText("main"), Kind(tok::identifier)),
-                          Kind(tok::l_paren), Kind(tok::r_paren),
-                          Kind(tok::l_brace), Kind(tok::r_brace)));
-  // Comments are ignored for now.
-  EXPECT_THAT(tokenize("/* foo */int a; // more comments"),
-              ElementsAre(Kind(tok::kw_int),
-                          AllOf(HasText("a"), Kind(tok::identifier)),
-                          Kind(tok::semi)));
-  EXPECT_THAT(tokenize("int [[main() {]]}"),
-              ElementsAre(AllOf(HasText("main"), Kind(tok::identifier)),
-                          Kind(tok::l_paren), Kind(tok::r_paren),
-                          Kind(tok::l_brace)));
-  EXPECT_THAT(tokenize("int [[main() {   ]]}"),
-              ElementsAre(AllOf(HasText("main"), Kind(tok::identifier)),
-                          Kind(tok::l_paren), Kind(tok::r_paren),
-                          Kind(tok::l_brace)));
-  // First token is partially parsed, last token is fully included even though
-  // only a part of it is contained in the range.
-  EXPECT_THAT(tokenize("int m[[ain() {ret]]urn 0;}"),
-              ElementsAre(AllOf(HasText("ain"), Kind(tok::identifier)),
-                          Kind(tok::l_paren), Kind(tok::r_paren),
-                          Kind(tok::l_brace), Kind(tok::kw_return)));
-}
-
-TEST_F(TokenCollectorTest, Basic) {
-  std::pair</*Input*/ std::string, /*Expected*/ std::string> TestCases[] = {
-      {"int main() {}",
-       R"(expanded tokens:
-  int main ( ) { }
-file './input.cpp'
-  spelled tokens:
-    int main ( ) { }
-  no mappings.
-)"},
-      // All kinds of whitespace are ignored.
-      {"\t\n  int\t\n  main\t\n  (\t\n  )\t\n{\t\n  }\t\n",
-       R"(expanded tokens:
-  int main ( ) { }
-file './input.cpp'
-  spelled tokens:
-    int main ( ) { }
-  no mappings.
-)"},
-      // Annotation tokens are ignored.
-      {R"cpp(
-        #pragma GCC visibility push (public)
-        #pragma GCC visibility pop
-      )cpp",
-       R"(expanded tokens:
-  <empty>
-file './input.cpp'
-  spelled tokens:
-    # pragma GCC visibility push ( public ) # pragma GCC visibility pop
-  mappings:
-    ['#'_0, '<eof>'_13) => ['<eof>'_0, '<eof>'_0)
-)"},
-      // Empty files should not crash.
-      {R"cpp()cpp", R"(expanded tokens:
-  <empty>
-file './input.cpp'
-  spelled tokens:
-    <empty>
-  no mappings.
-)"},
-      // Should not crash on errors inside '#define' directives. Error is that
-      // stringification (#B) does not refer to a macro parameter.
-      {
-          R"cpp(
-a
-#define MACRO() A #B
-)cpp",
-          R"(expanded tokens:
-  a
-file './input.cpp'
-  spelled tokens:
-    a # define MACRO ( ) A # B
-  mappings:
-    ['#'_1, '<eof>'_9) => ['<eof>'_1, '<eof>'_1)
-)"}};
-  for (auto &Test : TestCases)
-    EXPECT_EQ(collectAndDump(Test.first), Test.second)
-        << collectAndDump(Test.first);
-}
-
-TEST_F(TokenCollectorTest, Locations) {
-  // Check locations of the tokens.
-  llvm::Annotations Code(R"cpp(
-    $r1[[int]] $r2[[a]] $r3[[=]] $r4[["foo bar baz"]] $r5[[;]]
-  )cpp");
-  recordTokens(Code.code());
-  // Check expanded tokens.
-  EXPECT_THAT(
-      Buffer.expandedTokens(),
-      ElementsAre(AllOf(Kind(tok::kw_int), RangeIs(Code.range("r1"))),
-                  AllOf(Kind(tok::identifier), RangeIs(Code.range("r2"))),
-                  AllOf(Kind(tok::equal), RangeIs(Code.range("r3"))),
-                  AllOf(Kind(tok::string_literal), RangeIs(Code.range("r4"))),
-                  AllOf(Kind(tok::semi), RangeIs(Code.range("r5"))),
-                  Kind(tok::eof)));
-  // Check spelled tokens.
-  EXPECT_THAT(
-      Buffer.spelledTokens(SourceMgr->getMainFileID()),
-      ElementsAre(AllOf(Kind(tok::kw_int), RangeIs(Code.range("r1"))),
-                  AllOf(Kind(tok::identifier), RangeIs(Code.range("r2"))),
-                  AllOf(Kind(tok::equal), RangeIs(Code.range("r3"))),
-                  AllOf(Kind(tok::string_literal), RangeIs(Code.range("r4"))),
-                  AllOf(Kind(tok::semi), RangeIs(Code.range("r5")))));
-
-  auto StartLoc = SourceMgr->getLocForStartOfFile(SourceMgr->getMainFileID());
-  for (auto &R : Code.ranges()) {
-    EXPECT_THAT(Buffer.spelledTokenAt(StartLoc.getLocWithOffset(R.Begin)),
-                Pointee(RangeIs(R)));
-  }
-}
-
-TEST_F(TokenCollectorTest, MacroDirectives) {
-  // Macro directives are not stored anywhere at the moment.
-  std::string Code = R"cpp(
-    #define FOO a
-    #include "unresolved_file.h"
-    #undef FOO
-    #ifdef X
-    #else
-    #endif
-    #ifndef Y
-    #endif
-    #if 1
-    #elif 2
-    #else
-    #endif
-    #pragma once
-    #pragma something lalala
-
-    int a;
-  )cpp";
-  std::string Expected =
-      "expanded tokens:\n"
-      "  int a ;\n"
-      "file './input.cpp'\n"
-      "  spelled tokens:\n"
-      "    # define FOO a # include \"unresolved_file.h\" # undef FOO "
-      "# ifdef X # else # endif # ifndef Y # endif # if 1 # elif 2 # else "
-      "# endif # pragma once # pragma something lalala int a ;\n"
-      "  mappings:\n"
-      "    ['#'_0, 'int'_39) => ['int'_0, 'int'_0)\n";
-  EXPECT_EQ(collectAndDump(Code), Expected);
-}
-
-TEST_F(TokenCollectorTest, MacroReplacements) {
-  std::pair</*Input*/ std::string, /*Expected*/ std::string> TestCases[] = {
-      // A simple object-like macro.
-      {R"cpp(
-    #define INT int const
-    INT a;
-  )cpp",
-       R"(expanded tokens:
-  int const a ;
-file './input.cpp'
-  spelled tokens:
-    # define INT int const INT a ;
-  mappings:
-    ['#'_0, 'INT'_5) => ['int'_0, 'int'_0)
-    ['INT'_5, 'a'_6) => ['int'_0, 'a'_2)
-)"},
-      // A simple function-like macro.
-      {R"cpp(
-    #define INT(a) const int
-    INT(10+10) a;
-  )cpp",
-       R"(expanded tokens:
-  const int a ;
-file './input.cpp'
-  spelled tokens:
-    # define INT ( a ) const int INT ( 10 + 10 ) a ;
-  mappings:
-    ['#'_0, 'INT'_8) => ['const'_0, 'const'_0)
-    ['INT'_8, 'a'_14) => ['const'_0, 'a'_2)
-)"},
-      // Recursive macro replacements.
-      {R"cpp(
-    #define ID(X) X
-    #define INT int const
-    ID(ID(INT)) a;
-  )cpp",
-       R"(expanded tokens:
-  int const a ;
-file './input.cpp'
-  spelled tokens:
-    # define ID ( X ) X # define INT int const ID ( ID ( INT ) ) a ;
-  mappings:
-    ['#'_0, 'ID'_12) => ['int'_0, 'int'_0)
-    ['ID'_12, 'a'_19) => ['int'_0, 'a'_2)
-)"},
-      // A little more complicated recursive macro replacements.
-      {R"cpp(
-    #define ADD(X, Y) X+Y
-    #define MULT(X, Y) X*Y
-
-    int a = ADD(MULT(1,2), MULT(3,ADD(4,5)));
-  )cpp",
-       "expanded tokens:\n"
-       "  int a = 1 * 2 + 3 * 4 + 5 ;\n"
-       "file './input.cpp'\n"
-       "  spelled tokens:\n"
-       "    # define ADD ( X , Y ) X + Y # define MULT ( X , Y ) X * Y int "
-       "a = ADD ( MULT ( 1 , 2 ) , MULT ( 3 , ADD ( 4 , 5 ) ) ) ;\n"
-       "  mappings:\n"
-       "    ['#'_0, 'int'_22) => ['int'_0, 'int'_0)\n"
-       "    ['ADD'_25, ';'_46) => ['1'_3, ';'_12)\n"},
-      // Empty macro replacement.
-      // FIXME: the #define directives should not be glued together.
-      {R"cpp(
-    #define EMPTY
-    #define EMPTY_FUNC(X)
-    EMPTY
-    EMPTY_FUNC(1+2+3)
-    )cpp",
-       R"(expanded tokens:
-  <empty>
-file './input.cpp'
-  spelled tokens:
-    # define EMPTY # define EMPTY_FUNC ( X ) EMPTY EMPTY_FUNC ( 1 + 2 + 3 )
-  mappings:
-    ['#'_0, 'EMPTY'_9) => ['<eof>'_0, '<eof>'_0)
-    ['EMPTY'_9, 'EMPTY_FUNC'_10) => ['<eof>'_0, '<eof>'_0)
-    ['EMPTY_FUNC'_10, '<eof>'_18) => ['<eof>'_0, '<eof>'_0)
-)"},
-      // File ends with a macro replacement.
-      {R"cpp(
-    #define FOO 10+10;
-    int a = FOO
-    )cpp",
-       R"(expanded tokens:
-  int a = 10 + 10 ;
-file './input.cpp'
-  spelled tokens:
-    # define FOO 10 + 10 ; int a = FOO
-  mappings:
-    ['#'_0, 'int'_7) => ['int'_0, 'int'_0)
-    ['FOO'_10, '<eof>'_11) => ['10'_3, '<eof>'_7)
-)"},
-      {R"cpp(
-         #define NUM 42
-         #define ID(a) a
-         #define M 1 + ID
-         M(NUM)
-       )cpp",
-       R"(expanded tokens:
-  1 + 42
-file './input.cpp'
-  spelled tokens:
-    # define NUM 42 # define ID ( a ) a # define M 1 + ID M ( NUM )
-  mappings:
-    ['#'_0, 'M'_17) => ['1'_0, '1'_0)
-    ['M'_17, '<eof>'_21) => ['1'_0, '<eof>'_3)
-)"},
-  };
-
-  for (auto &Test : TestCases) {
-    std::string Dump = collectAndDump(Test.first);
-    EXPECT_EQ(Test.second, Dump) << Dump;
-  }
-}
-
-TEST_F(TokenCollectorTest, SpecialTokens) {
-  // Tokens coming from concatenations.
-  recordTokens(R"cpp(
-    #define CONCAT(a, b) a ## b
-    int a = CONCAT(1, 2);
-  )cpp");
-  EXPECT_THAT(std::vector<syntax::Token>(Buffer.expandedTokens()),
-              Contains(HasText("12")));
-  // Multi-line tokens with slashes at the end.
-  recordTokens("i\\\nn\\\nt");
-  EXPECT_THAT(Buffer.expandedTokens(),
-              ElementsAre(AllOf(Kind(tok::kw_int), HasText("i\\\nn\\\nt")),
-                          Kind(tok::eof)));
-  // FIXME: test tokens with digraphs and UCN identifiers.
-}
-
-TEST_F(TokenCollectorTest, LateBoundTokens) {
-  // The parser eventually breaks the first '>>' into two tokens ('>' and '>'),
-  // but we choose to record them as a single token (for now).
-  llvm::Annotations Code(R"cpp(
-    template <class T>
-    struct foo { int a; };
-    int bar = foo<foo<int$br[[>>]]().a;
-    int baz = 10 $op[[>>]] 2;
-  )cpp");
-  recordTokens(Code.code());
-  EXPECT_THAT(std::vector<syntax::Token>(Buffer.expandedTokens()),
-              AllOf(Contains(AllOf(Kind(tok::greatergreater),
-                                   RangeIs(Code.range("br")))),
-                    Contains(AllOf(Kind(tok::greatergreater),
-                                   RangeIs(Code.range("op"))))));
-}
-
-TEST_F(TokenCollectorTest, DelayedParsing) {
-  llvm::StringLiteral Code = R"cpp(
-    struct Foo {
-      int method() {
-        // Parser will visit method bodies and initializers multiple times, but
-        // TokenBuffer should only record the first walk over the tokens;
-        return 100;
-      }
-      int a = 10;
-
-      struct Subclass {
-        void foo() {
-          Foo().method();
-        }
-      };
-    };
-  )cpp";
-  std::string ExpectedTokens =
-      "expanded tokens:\n"
-      "  struct Foo { int method ( ) { return 100 ; } int a = 10 ; struct "
-      "Subclass { void foo ( ) { Foo ( ) . method ( ) ; } } ; } ;\n";
-  EXPECT_THAT(collectAndDump(Code), StartsWith(ExpectedTokens));
-}
-
-TEST_F(TokenCollectorTest, MultiFile) {
-  addFile("./foo.h", R"cpp(
-    #define ADD(X, Y) X+Y
-    int a = 100;
-    #include "bar.h"
-  )cpp");
-  addFile("./bar.h", R"cpp(
-    int b = ADD(1, 2);
-    #define MULT(X, Y) X*Y
-  )cpp");
-  llvm::StringLiteral Code = R"cpp(
-    #include "foo.h"
-    int c = ADD(1, MULT(2,3));
-  )cpp";
-
-  std::string Expected = R"(expanded tokens:
-  int a = 100 ; int b = 1 + 2 ; int c = 1 + 2 * 3 ;
-file './input.cpp'
-  spelled tokens:
-    # include "foo.h" int c = ADD ( 1 , MULT ( 2 , 3 ) ) ;
-  mappings:
-    ['#'_0, 'int'_3) => ['int'_12, 'int'_12)
-    ['ADD'_6, ';'_17) => ['1'_15, ';'_20)
-file './foo.h'
-  spelled tokens:
-    # define ADD ( X , Y ) X + Y int a = 100 ; # include "bar.h"
-  mappings:
-    ['#'_0, 'int'_11) => ['int'_0, 'int'_0)
-    ['#'_16, '<eof>'_19) => ['int'_5, 'int'_5)
-file './bar.h'
-  spelled tokens:
-    int b = ADD ( 1 , 2 ) ; # define MULT ( X , Y ) X * Y
-  mappings:
-    ['ADD'_3, ';'_9) => ['1'_8, ';'_11)
-    ['#'_10, '<eof>'_21) => ['int'_12, 'int'_12)
-)";
-
-  EXPECT_EQ(Expected, collectAndDump(Code))
-      << "input: " << Code << "\nresults: " << collectAndDump(Code);
-}
-
-class TokenBufferTest : public TokenCollectorTest {};
-
-TEST_F(TokenBufferTest, SpelledByExpanded) {
-  recordTokens(R"cpp(
-    a1 a2 a3 b1 b2
-  )cpp");
-
-  // Sanity check: expanded and spelled tokens are stored separately.
-  EXPECT_THAT(findExpanded("a1 a2"), Not(SameRange(findSpelled("a1 a2"))));
-  // Searching for subranges of expanded tokens should give the corresponding
-  // spelled ones.
-  EXPECT_THAT(Buffer.spelledForExpanded(findExpanded("a1 a2 a3 b1 b2")),
-              ValueIs(SameRange(findSpelled("a1 a2 a3 b1 b2"))));
-  EXPECT_THAT(Buffer.spelledForExpanded(findExpanded("a1 a2 a3")),
-              ValueIs(SameRange(findSpelled("a1 a2 a3"))));
-  EXPECT_THAT(Buffer.spelledForExpanded(findExpanded("b1 b2")),
-              ValueIs(SameRange(findSpelled("b1 b2"))));
-
-  // Test search on simple macro expansions.
-  recordTokens(R"cpp(
-    #define A a1 a2 a3
-    #define B b1 b2
-
-    A split B
-  )cpp");
-  // Ranges going across expansion boundaries.
-  EXPECT_THAT(Buffer.spelledForExpanded(findExpanded("a1 a2 a3 split b1 b2")),
-              ValueIs(SameRange(findSpelled("A split B"))));
-  EXPECT_THAT(Buffer.spelledForExpanded(findExpanded("a1 a2 a3")),
-              ValueIs(SameRange(findSpelled("A split").drop_back())));
-  EXPECT_THAT(Buffer.spelledForExpanded(findExpanded("b1 b2")),
-              ValueIs(SameRange(findSpelled("split B").drop_front())));
-  // Ranges not fully covering macro invocations should fail.
-  EXPECT_EQ(Buffer.spelledForExpanded(findExpanded("a1 a2")), llvm::None);
-  EXPECT_EQ(Buffer.spelledForExpanded(findExpanded("b2")), llvm::None);
-  EXPECT_EQ(Buffer.spelledForExpanded(findExpanded("a2 a3 split b1 b2")),
-            llvm::None);
-
-  // Recursive macro invocations.
-  recordTokens(R"cpp(
-    #define ID(x) x
-    #define B b1 b2
-
-    ID(ID(ID(a1) a2 a3)) split ID(B)
-  )cpp");
-
-  EXPECT_THAT(Buffer.spelledForExpanded(findExpanded("b1 b2")),
-              ValueIs(SameRange(findSpelled("( B").drop_front())));
-  EXPECT_THAT(Buffer.spelledForExpanded(findExpanded("a1 a2 a3 split b1 b2")),
-              ValueIs(SameRange(findSpelled(
-                  "ID ( ID ( ID ( a1 ) a2 a3 ) ) split ID ( B )"))));
-  // Mixed ranges with expanded and spelled tokens.
-  EXPECT_THAT(
-      Buffer.spelledForExpanded(findExpanded("a1 a2 a3 split")),
-      ValueIs(SameRange(findSpelled("ID ( ID ( ID ( a1 ) a2 a3 ) ) split"))));
-  EXPECT_THAT(Buffer.spelledForExpanded(findExpanded("split b1 b2")),
-              ValueIs(SameRange(findSpelled("split ID ( B )"))));
-  // Macro arguments
-  EXPECT_THAT(Buffer.spelledForExpanded(findExpanded("a1")),
-              ValueIs(SameRange(findSpelled("a1"))));
-  EXPECT_THAT(Buffer.spelledForExpanded(findExpanded("a2")),
-              ValueIs(SameRange(findSpelled("a2"))));
-  EXPECT_THAT(Buffer.spelledForExpanded(findExpanded("a3")),
-              ValueIs(SameRange(findSpelled("a3"))));
-  EXPECT_THAT(Buffer.spelledForExpanded(findExpanded("a1 a2")),
-              ValueIs(SameRange(findSpelled("ID ( a1 ) a2"))));
-  EXPECT_THAT(Buffer.spelledForExpanded(findExpanded("a1 a2 a3")),
-              ValueIs(SameRange(findSpelled("ID ( a1 ) a2 a3"))));
-
-  // Empty macro expansions.
-  recordTokens(R"cpp(
-    #define EMPTY
-    #define ID(X) X
-
-    EMPTY EMPTY ID(1 2 3) EMPTY EMPTY split1
-    EMPTY EMPTY ID(4 5 6) split2
-    ID(7 8 9) EMPTY EMPTY
-  )cpp");
-  EXPECT_THAT(Buffer.spelledForExpanded(findExpanded("1 2 3")),
-              ValueIs(SameRange(findSpelled("1 2 3"))));
-  EXPECT_THAT(Buffer.spelledForExpanded(findExpanded("4 5 6")),
-              ValueIs(SameRange(findSpelled("4 5 6"))));
-  EXPECT_THAT(Buffer.spelledForExpanded(findExpanded("7 8 9")),
-              ValueIs(SameRange(findSpelled("7 8 9"))));
-
-  // Empty mappings coming from various directives.
-  recordTokens(R"cpp(
-    #define ID(X) X
-    ID(1)
-    #pragma lalala
-    not_mapped
-  )cpp");
-  EXPECT_THAT(Buffer.spelledForExpanded(findExpanded("not_mapped")),
-              ValueIs(SameRange(findSpelled("not_mapped"))));
-
-  // Multiple macro arguments
-  recordTokens(R"cpp(
-    #define ID(X) X
-    #define ID2(X, Y) X Y
-
-    ID2(ID(a1), ID(a2) a3) ID2(a4, a5 a6 a7)
-  )cpp");
-  // Should fail, spans multiple arguments.
-  EXPECT_EQ(Buffer.spelledForExpanded(findExpanded("a1 a2")), llvm::None);
-  EXPECT_THAT(Buffer.spelledForExpanded(findExpanded("a2 a3")),
-              ValueIs(SameRange(findSpelled("ID ( a2 ) a3"))));
-  EXPECT_THAT(
-      Buffer.spelledForExpanded(findExpanded("a1 a2 a3")),
-      ValueIs(SameRange(findSpelled("ID2 ( ID ( a1 ) , ID ( a2 ) a3 )"))));
-  EXPECT_THAT(Buffer.spelledForExpanded(findExpanded("a5 a6")),
-              ValueIs(SameRange(findSpelled("a5 a6"))));
-  EXPECT_THAT(Buffer.spelledForExpanded(findExpanded("a4 a5 a6 a7")),
-              ValueIs(SameRange(findSpelled("ID2 ( a4 , a5 a6 a7 )"))));
-  // Should fail, spans multiple invocations.
-  EXPECT_EQ(Buffer.spelledForExpanded(findExpanded("a1 a2 a3 a4")), llvm::None);
-}
-
-TEST_F(TokenBufferTest, ExpandedTokensForRange) {
-  recordTokens(R"cpp(
-    #define SIGN(X) X##_washere
-    A SIGN(B) C SIGN(D) E SIGN(F) G
-  )cpp");
-
-  SourceRange R(findExpanded("C").front().location(),
-                findExpanded("F_washere").front().location());
-  // Sanity check: expanded and spelled tokens are stored separately.
-  EXPECT_THAT(Buffer.expandedTokens(R),
-              SameRange(findExpanded("C D_washere E F_washere")));
-  EXPECT_THAT(Buffer.expandedTokens(SourceRange()), testing::IsEmpty());
-}
-
-TEST_F(TokenBufferTest, ExpansionsOverlapping) {
-  // Object-like macro expansions.
-  recordTokens(R"cpp(
-    #define FOO 3+4
-    int a = FOO 1;
-    int b = FOO 2;
-  )cpp");
-
-  llvm::ArrayRef<syntax::Token> Foo1 = findSpelled("FOO 1");
-  EXPECT_THAT(
-      Buffer.expansionStartingAt(Foo1.data()),
-      ValueIs(IsExpansion(SameRange(Foo1.drop_back()),
-                          SameRange(findExpanded("3 + 4 1").drop_back()))));
-  EXPECT_THAT(
-      Buffer.expansionsOverlapping(Foo1),
-      ElementsAre(IsExpansion(SameRange(Foo1.drop_back()),
-                              SameRange(findExpanded("3 + 4 1").drop_back()))));
-
-  llvm::ArrayRef<syntax::Token> Foo2 = findSpelled("FOO 2");
-  EXPECT_THAT(
-      Buffer.expansionStartingAt(Foo2.data()),
-      ValueIs(IsExpansion(SameRange(Foo2.drop_back()),
-                          SameRange(findExpanded("3 + 4 2").drop_back()))));
-  EXPECT_THAT(Buffer.expansionsOverlapping(
-                  llvm::makeArrayRef(Foo1.begin(), Foo2.end())),
-              ElementsAre(IsExpansion(SameRange(Foo1.drop_back()), _),
-                          IsExpansion(SameRange(Foo2.drop_back()), _)));
-
-  // Function-like macro expansions.
-  recordTokens(R"cpp(
-    #define ID(X) X
-    int a = ID(1+2+3);
-    int b = ID(ID(2+3+4));
-  )cpp");
-
-  llvm::ArrayRef<syntax::Token> ID1 = findSpelled("ID ( 1 + 2 + 3 )");
-  EXPECT_THAT(Buffer.expansionStartingAt(&ID1.front()),
-              ValueIs(IsExpansion(SameRange(ID1),
-                                  SameRange(findExpanded("1 + 2 + 3")))));
-  // Only the first spelled token should be found.
-  for (const auto &T : ID1.drop_front())
-    EXPECT_EQ(Buffer.expansionStartingAt(&T), llvm::None);
-
-  llvm::ArrayRef<syntax::Token> ID2 = findSpelled("ID ( ID ( 2 + 3 + 4 ) )");
-  EXPECT_THAT(Buffer.expansionStartingAt(&ID2.front()),
-              ValueIs(IsExpansion(SameRange(ID2),
-                                  SameRange(findExpanded("2 + 3 + 4")))));
-  // Only the first spelled token should be found.
-  for (const auto &T : ID2.drop_front())
-    EXPECT_EQ(Buffer.expansionStartingAt(&T), llvm::None);
-
-  EXPECT_THAT(Buffer.expansionsOverlapping(llvm::makeArrayRef(
-                  findSpelled("1 + 2").data(), findSpelled("4").data())),
-              ElementsAre(IsExpansion(SameRange(ID1), _),
-                          IsExpansion(SameRange(ID2), _)));
-
-  // PP directives.
-  recordTokens(R"cpp(
-#define FOO 1
-int a = FOO;
-#pragma once
-int b = 1;
-  )cpp");
-
-  llvm::ArrayRef<syntax::Token> DefineFoo = findSpelled("# define FOO 1");
-  EXPECT_THAT(
-      Buffer.expansionStartingAt(&DefineFoo.front()),
-      ValueIs(IsExpansion(SameRange(DefineFoo),
-                          SameRange(findExpanded("int a").take_front(0)))));
-  // Only the first spelled token should be found.
-  for (const auto &T : DefineFoo.drop_front())
-    EXPECT_EQ(Buffer.expansionStartingAt(&T), llvm::None);
-
-  llvm::ArrayRef<syntax::Token> PragmaOnce = findSpelled("# pragma once");
-  EXPECT_THAT(
-      Buffer.expansionStartingAt(&PragmaOnce.front()),
-      ValueIs(IsExpansion(SameRange(PragmaOnce),
-                          SameRange(findExpanded("int b").take_front(0)))));
-  // Only the first spelled token should be found.
-  for (const auto &T : PragmaOnce.drop_front())
-    EXPECT_EQ(Buffer.expansionStartingAt(&T), llvm::None);
-
-  EXPECT_THAT(
-      Buffer.expansionsOverlapping(findSpelled("FOO ; # pragma")),
-      ElementsAre(IsExpansion(SameRange(findSpelled("FOO ;").drop_back()), _),
-                  IsExpansion(SameRange(PragmaOnce), _)));
-}
-
-TEST_F(TokenBufferTest, TokensToFileRange) {
-  addFile("./foo.h", "token_from_header");
-  llvm::Annotations Code(R"cpp(
-    #define FOO token_from_expansion
-    #include "./foo.h"
-    $all[[$i[[int]] a = FOO;]]
-  )cpp");
-  recordTokens(Code.code());
-
-  auto &SM = *SourceMgr;
-
-  // Two simple examples.
-  auto Int = findExpanded("int").front();
-  auto Semi = findExpanded(";").front();
-  EXPECT_EQ(Int.range(SM), FileRange(SM.getMainFileID(), Code.range("i").Begin,
-                                     Code.range("i").End));
-  EXPECT_EQ(syntax::Token::range(SM, Int, Semi),
-            FileRange(SM.getMainFileID(), Code.range("all").Begin,
-                      Code.range("all").End));
-  // We don't test assertion failures because death tests are slow.
-}
-
-TEST_F(TokenBufferTest, MacroExpansions) {
-  llvm::Annotations Code(R"cpp(
-    #define FOO B
-    #define FOO2 BA
-    #define CALL(X) int X
-    #define G CALL(FOO2)
-    int B;
-    $macro[[FOO]];
-    $macro[[CALL]](A);
-    $macro[[G]];
-  )cpp");
-  recordTokens(Code.code());
-  auto &SM = *SourceMgr;
-  auto Expansions = Buffer.macroExpansions(SM.getMainFileID());
-  std::vector<FileRange> ExpectedMacroRanges;
-  for (auto Range : Code.ranges("macro"))
-    ExpectedMacroRanges.push_back(
-        FileRange(SM.getMainFileID(), Range.Begin, Range.End));
-  std::vector<FileRange> ActualMacroRanges;
-  for (auto Expansion : Expansions)
-    ActualMacroRanges.push_back(Expansion->range(SM));
-  EXPECT_EQ(ExpectedMacroRanges, ActualMacroRanges);
-}
-
-TEST_F(TokenBufferTest, Touching) {
-  llvm::Annotations Code("^i^nt^ ^a^b^=^1;^");
-  recordTokens(Code.code());
-
-  auto Touching = [&](int Index) {
-    SourceLocation Loc = SourceMgr->getComposedLoc(SourceMgr->getMainFileID(),
-                                                   Code.points()[Index]);
-    return spelledTokensTouching(Loc, Buffer);
-  };
-  auto Identifier = [&](int Index) {
-    SourceLocation Loc = SourceMgr->getComposedLoc(SourceMgr->getMainFileID(),
-                                                   Code.points()[Index]);
-    const syntax::Token *Tok = spelledIdentifierTouching(Loc, Buffer);
-    return Tok ? Tok->text(*SourceMgr) : "";
-  };
-
-  EXPECT_THAT(Touching(0), SameRange(findSpelled("int")));
-  EXPECT_EQ(Identifier(0), "");
-  EXPECT_THAT(Touching(1), SameRange(findSpelled("int")));
-  EXPECT_EQ(Identifier(1), "");
-  EXPECT_THAT(Touching(2), SameRange(findSpelled("int")));
-  EXPECT_EQ(Identifier(2), "");
-
-  EXPECT_THAT(Touching(3), SameRange(findSpelled("ab")));
-  EXPECT_EQ(Identifier(3), "ab");
-  EXPECT_THAT(Touching(4), SameRange(findSpelled("ab")));
-  EXPECT_EQ(Identifier(4), "ab");
-
-  EXPECT_THAT(Touching(5), SameRange(findSpelled("ab =")));
-  EXPECT_EQ(Identifier(5), "ab");
-
-  EXPECT_THAT(Touching(6), SameRange(findSpelled("= 1")));
-  EXPECT_EQ(Identifier(6), "");
-
-  EXPECT_THAT(Touching(7), SameRange(findSpelled(";")));
-  EXPECT_EQ(Identifier(7), "");
-
-  ASSERT_EQ(Code.points().size(), 8u);
-}
-
-TEST_F(TokenBufferTest, ExpandedBySpelled) {
-  recordTokens(R"cpp(
-    a1 a2 a3 b1 b2
-  )cpp");
-  // Sanity check: expanded and spelled tokens are stored separately.
-  EXPECT_THAT(findExpanded("a1 a2"), Not(SameRange(findSpelled("a1 a2"))));
-  // Searching for subranges of expanded tokens should give the corresponding
-  // spelled ones.
-  EXPECT_THAT(Buffer.expandedForSpelled(findSpelled("a1 a2 a3 b1 b2")),
-              ElementsAre(SameRange(findExpanded("a1 a2 a3 b1 b2"))));
-  EXPECT_THAT(Buffer.expandedForSpelled(findSpelled("a1 a2 a3")),
-              ElementsAre(SameRange(findExpanded("a1 a2 a3"))));
-  EXPECT_THAT(Buffer.expandedForSpelled(findSpelled("b1 b2")),
-              ElementsAre(SameRange(findExpanded("b1 b2"))));
-
-  // Test search on simple macro expansions.
-  recordTokens(R"cpp(
-    #define A a1 a2 a3
-    #define B b1 b2
-
-    A split B
-  )cpp");
-  EXPECT_THAT(Buffer.expandedForSpelled(findSpelled("A split B")),
-              ElementsAre(SameRange(findExpanded("a1 a2 a3 split b1 b2"))));
-  EXPECT_THAT(Buffer.expandedForSpelled(findSpelled("A split").drop_back()),
-              ElementsAre(SameRange(findExpanded("a1 a2 a3"))));
-  EXPECT_THAT(Buffer.expandedForSpelled(findSpelled("split B").drop_front()),
-              ElementsAre(SameRange(findExpanded("b1 b2"))));
-
-  // Ranges not fully covering macro expansions should fail.
-  recordTokens(R"cpp(
-    #define ID(x) x
-
-    ID(a)
-  )cpp");
-  // Spelled don't cover entire mapping (missing ID token) -> empty result
-  EXPECT_THAT(Buffer.expandedForSpelled(findSpelled("( a )")), IsEmpty());
-  // Spelled don't cover entire mapping (missing ) token) -> empty result
-  EXPECT_THAT(Buffer.expandedForSpelled(findSpelled("ID ( a")), IsEmpty());
-
-  // Recursive macro invocations.
-  recordTokens(R"cpp(
-    #define ID(x) x
-    #define B b1 b2
-
-    ID(ID(ID(a1) a2 a3)) split ID(B)
-  )cpp");
-
-  EXPECT_THAT(
-      Buffer.expandedForSpelled(findSpelled("ID ( ID ( ID ( a1 ) a2 a3 ) )")),
-      ElementsAre(SameRange(findExpanded("a1 a2 a3"))));
-  EXPECT_THAT(Buffer.expandedForSpelled(findSpelled("ID ( B )")),
-              ElementsAre(SameRange(findExpanded("b1 b2"))));
-  EXPECT_THAT(Buffer.expandedForSpelled(
-                  findSpelled("ID ( ID ( ID ( a1 ) a2 a3 ) ) split ID ( B )")),
-              ElementsAre(SameRange(findExpanded("a1 a2 a3 split b1 b2"))));
-  // FIXME: these should succeed, but we do not support macro arguments yet.
-  EXPECT_THAT(Buffer.expandedForSpelled(findSpelled("a1")), IsEmpty());
-  EXPECT_THAT(Buffer.expandedForSpelled(findSpelled("ID ( a1 ) a2")),
-              IsEmpty());
-
-  // Empty macro expansions.
-  recordTokens(R"cpp(
-    #define EMPTY
-    #define ID(X) X
-
-    EMPTY EMPTY ID(1 2 3) EMPTY EMPTY split1
-    EMPTY EMPTY ID(4 5 6) split2
-    ID(7 8 9) EMPTY EMPTY
-  )cpp");
-  // Covered by empty expansions on one of both of the sides.
-  EXPECT_THAT(Buffer.expandedForSpelled(findSpelled("ID ( 1 2 3 )")),
-              ElementsAre(SameRange(findExpanded("1 2 3"))));
-  EXPECT_THAT(Buffer.expandedForSpelled(findSpelled("ID ( 4 5 6 )")),
-              ElementsAre(SameRange(findExpanded("4 5 6"))));
-  EXPECT_THAT(Buffer.expandedForSpelled(findSpelled("ID ( 7 8 9 )")),
-              ElementsAre(SameRange(findExpanded("7 8 9"))));
-  // Including the empty macro expansions on the side.
-  EXPECT_THAT(Buffer.expandedForSpelled(findSpelled("EMPTY ID ( 1 2 3 )")),
-              ElementsAre(SameRange(findExpanded("1 2 3"))));
-  EXPECT_THAT(Buffer.expandedForSpelled(findSpelled("ID ( 1 2 3 ) EMPTY")),
-              ElementsAre(SameRange(findExpanded("1 2 3"))));
-  EXPECT_THAT(
-      Buffer.expandedForSpelled(findSpelled("EMPTY ID ( 1 2 3 ) EMPTY")),
-      ElementsAre(SameRange(findExpanded("1 2 3"))));
-
-  // Empty mappings coming from various directives.
-  recordTokens(R"cpp(
-    #define ID(X) X
-    ID(1)
-    #pragma lalala
-    not_mapped
-  )cpp");
-  EXPECT_THAT(Buffer.expandedForSpelled(findSpelled("# define ID ( X ) X")),
-              IsEmpty());
-  EXPECT_THAT(Buffer.expandedForSpelled(findSpelled("# pragma lalala")),
-              IsEmpty());
-
-  // Empty macro expansion.
-  recordTokens(R"cpp(
-    #define EMPTY
-    EMPTY int a = 100;
-  )cpp");
-  EXPECT_THAT(Buffer.expandedForSpelled(findSpelled("EMPTY int").drop_back()),
-              IsEmpty());
-}
-
-TEST_F(TokenCollectorTest, Pragmas) {
-  // Tokens coming from concatenations.
-  recordTokens(R"cpp(
-    void foo() {
-      #pragma unroll 4
-      for(int i=0;i<4;++i);
-    }
-  )cpp");
-}
-} // namespace
diff --git a/gnu/llvm/clang/unittests/Tooling/Syntax/TreeTest.cpp b/gnu/llvm/clang/unittests/Tooling/Syntax/TreeTest.cpp
deleted file mode 100644
index 06da4e80156..00000000000
--- a/gnu/llvm/clang/unittests/Tooling/Syntax/TreeTest.cpp
+++ /dev/null
@@ -1,406 +0,0 @@
-//===- TreeTest.cpp ---------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/Tooling/Syntax/Tree.h"
-#include "TreeTestBase.h"
-#include "clang/Basic/SourceManager.h"
-#include "clang/Tooling/Syntax/BuildTree.h"
-#include "clang/Tooling/Syntax/Nodes.h"
-#include "llvm/ADT/STLExtras.h"
-#include "gtest/gtest.h"
-
-using namespace clang;
-using namespace clang::syntax;
-
-namespace {
-using testing::ElementsAre;
-
-class TreeTest : public SyntaxTreeTest {
-private:
-  Tree *createTree(ArrayRef<const Node *> Children) {
-    std::vector<std::pair<Node *, NodeRole>> ChildrenWithRoles;
-    ChildrenWithRoles.reserve(Children.size());
-    for (const auto *Child : Children) {
-      ChildrenWithRoles.push_back(std::make_pair(
-          deepCopyExpandingMacros(*Arena, Child), NodeRole::Unknown));
-    }
-    return clang::syntax::createTree(*Arena, ChildrenWithRoles,
-                                     NodeKind::UnknownExpression);
-  }
-
-  // Generate Forests by combining `Children` into `ParentCount` Trees.
-  //
-  // We do this recursively.
-  std::vector<std::vector<const Tree *>>
-  generateAllForests(ArrayRef<const Node *> Children, unsigned ParentCount) {
-    assert(ParentCount > 0);
-    // If there is only one Parent node, then combine `Children` under
-    // this Parent.
-    if (ParentCount == 1)
-      return {{createTree(Children)}};
-
-    // Otherwise, combine `ChildrenCount` children under the last parent and
-    // solve the smaller problem without these children and this parent. Do this
-    // for every `ChildrenCount` and combine the results.
-    std::vector<std::vector<const Tree *>> AllForests;
-    for (unsigned ChildrenCount = 0; ChildrenCount <= Children.size();
-         ++ChildrenCount) {
-      auto *LastParent = createTree(Children.take_back(ChildrenCount));
-      for (auto &Forest : generateAllForests(Children.drop_back(ChildrenCount),
-                                             ParentCount - 1)) {
-        Forest.push_back(LastParent);
-        AllForests.push_back(Forest);
-      }
-    }
-    return AllForests;
-  }
-
-protected:
-  // Generates all trees with a `Base` of `Node`s and `NodeCountPerLayer`
-  // `Node`s per layer. An example of Tree with `Base` = {`(`, `)`} and
-  // `NodeCountPerLayer` = {2, 2}:
-  //  Tree
-  //  |-Tree
-  //  `-Tree
-  //    |-Tree
-  //    | `-'('
-  //    `-Tree
-  //      `-')'
-  std::vector<const Tree *>
-  generateAllTreesWithShape(ArrayRef<const Node *> Base,
-                            ArrayRef<unsigned> NodeCountPerLayer) {
-    // We compute the solution per layer. A layer is a collection of bases,
-    // where each base has the same number of nodes, given by
-    // `NodeCountPerLayer`.
-    auto GenerateNextLayer = [this](ArrayRef<std::vector<const Node *>> Layer,
-                                    unsigned NextLayerNodeCount) {
-      std::vector<std::vector<const Node *>> NextLayer;
-      for (const auto &Base : Layer) {
-        for (const auto &NextBase :
-             generateAllForests(Base, NextLayerNodeCount)) {
-          NextLayer.push_back(
-              std::vector<const Node *>(NextBase.begin(), NextBase.end()));
-        }
-      }
-      return NextLayer;
-    };
-
-    std::vector<std::vector<const Node *>> Layer = {Base};
-    for (auto NodeCount : NodeCountPerLayer)
-      Layer = GenerateNextLayer(Layer, NodeCount);
-
-    std::vector<const Tree *> AllTrees;
-    AllTrees.reserve(Layer.size());
-    for (const auto &Base : Layer)
-      AllTrees.push_back(createTree(Base));
-
-    return AllTrees;
-  }
-};
-
-INSTANTIATE_TEST_SUITE_P(TreeTests, TreeTest,
-                        ::testing::ValuesIn(allTestClangConfigs()) );
-
-TEST_P(TreeTest, FirstLeaf) {
-  buildTree("", GetParam());
-  std::vector<const Node *> Leafs = {createLeaf(*Arena, tok::l_paren),
-                                     createLeaf(*Arena, tok::r_paren)};
-  for (const auto *Tree : generateAllTreesWithShape(Leafs, {3u})) {
-    ASSERT_TRUE(Tree->findFirstLeaf() != nullptr);
-    EXPECT_EQ(Tree->findFirstLeaf()->getToken()->kind(), tok::l_paren);
-  }
-}
-
-TEST_P(TreeTest, LastLeaf) {
-  buildTree("", GetParam());
-  std::vector<const Node *> Leafs = {createLeaf(*Arena, tok::l_paren),
-                                     createLeaf(*Arena, tok::r_paren)};
-  for (const auto *Tree : generateAllTreesWithShape(Leafs, {3u})) {
-    ASSERT_TRUE(Tree->findLastLeaf() != nullptr);
-    EXPECT_EQ(Tree->findLastLeaf()->getToken()->kind(), tok::r_paren);
-  }
-}
-
-TEST_F(TreeTest, Iterators) {
-  buildTree("", allTestClangConfigs().front());
-  std::vector<Node *> Children = {createLeaf(*Arena, tok::identifier, "a"),
-                                  createLeaf(*Arena, tok::identifier, "b"),
-                                  createLeaf(*Arena, tok::identifier, "c")};
-  auto *Tree = syntax::createTree(*Arena,
-                                  {{Children[0], NodeRole::LeftHandSide},
-                                   {Children[1], NodeRole::OperatorToken},
-                                   {Children[2], NodeRole::RightHandSide}},
-                                  NodeKind::TranslationUnit);
-  const auto *ConstTree = Tree;
-
-  auto Range = Tree->getChildren();
-  EXPECT_THAT(Range, ElementsAre(role(NodeRole::LeftHandSide),
-                                 role(NodeRole::OperatorToken),
-                                 role(NodeRole::RightHandSide)));
-
-  auto ConstRange = ConstTree->getChildren();
-  EXPECT_THAT(ConstRange, ElementsAre(role(NodeRole::LeftHandSide),
-                                      role(NodeRole::OperatorToken),
-                                      role(NodeRole::RightHandSide)));
-
-  // FIXME: mutate and observe no invalidation. Mutations are private for now...
-  auto It = Range.begin();
-  auto CIt = ConstRange.begin();
-  static_assert(std::is_same<decltype(*It), syntax::Node &>::value,
-                "mutable range");
-  static_assert(std::is_same<decltype(*CIt), const syntax::Node &>::value,
-                "const range");
-
-  for (unsigned I = 0; I < 3; ++I) {
-    EXPECT_EQ(It, CIt);
-    EXPECT_TRUE(It);
-    EXPECT_TRUE(CIt);
-    EXPECT_EQ(It.asPointer(), Children[I]);
-    EXPECT_EQ(CIt.asPointer(), Children[I]);
-    EXPECT_EQ(&*It, Children[I]);
-    EXPECT_EQ(&*CIt, Children[I]);
-    ++It;
-    ++CIt;
-  }
-  EXPECT_EQ(It, CIt);
-  EXPECT_EQ(It, Tree::ChildIterator());
-  EXPECT_EQ(CIt, Tree::ConstChildIterator());
-  EXPECT_FALSE(It);
-  EXPECT_FALSE(CIt);
-  EXPECT_EQ(nullptr, It.asPointer());
-  EXPECT_EQ(nullptr, CIt.asPointer());
-}
-
-class ListTest : public SyntaxTreeTest {
-private:
-  std::string dumpQuotedTokensOrNull(const Node *N) {
-    return N ? "'" +
-                   StringRef(N->dumpTokens(Arena->getSourceManager()))
-                       .trim()
-                       .str() +
-                   "'"
-             : "null";
-  }
-
-protected:
-  std::string
-  dumpElementsAndDelimiters(ArrayRef<List::ElementAndDelimiter<Node>> EDs) {
-    std::string Storage;
-    llvm::raw_string_ostream OS(Storage);
-
-    OS << "[";
-
-    llvm::interleaveComma(
-        EDs, OS, [&OS, this](const List::ElementAndDelimiter<Node> &ED) {
-          OS << "(" << dumpQuotedTokensOrNull(ED.element) << ", "
-             << dumpQuotedTokensOrNull(ED.delimiter) << ")";
-        });
-
-    OS << "]";
-
-    return OS.str();
-  }
-
-  std::string dumpNodes(ArrayRef<Node *> Nodes) {
-    std::string Storage;
-    llvm::raw_string_ostream OS(Storage);
-
-    OS << "[";
-
-    llvm::interleaveComma(Nodes, OS, [&OS, this](const Node *N) {
-      OS << dumpQuotedTokensOrNull(N);
-    });
-
-    OS << "]";
-
-    return OS.str();
-  }
-};
-
-INSTANTIATE_TEST_SUITE_P(TreeTests, ListTest,
-                        ::testing::ValuesIn(allTestClangConfigs()) );
-
-/// "a, b, c"  <=> [("a", ","), ("b", ","), ("c", null)]
-TEST_P(ListTest, List_Separated_WellFormed) {
-  buildTree("", GetParam());
-
-  // "a, b, c"
-  auto *List = dyn_cast<syntax::List>(syntax::createTree(
-      *Arena,
-      {
-          {createLeaf(*Arena, tok::identifier, "a"), NodeRole::ListElement},
-          {createLeaf(*Arena, tok::comma), NodeRole::ListDelimiter},
-          {createLeaf(*Arena, tok::identifier, "b"), NodeRole::ListElement},
-          {createLeaf(*Arena, tok::comma), NodeRole::ListDelimiter},
-          {createLeaf(*Arena, tok::identifier, "c"), NodeRole::ListElement},
-      },
-      NodeKind::CallArguments));
-
-  EXPECT_EQ(dumpElementsAndDelimiters(List->getElementsAsNodesAndDelimiters()),
-            "[('a', ','), ('b', ','), ('c', null)]");
-  EXPECT_EQ(dumpNodes(List->getElementsAsNodes()), "['a', 'b', 'c']");
-}
-
-/// "a,  , c"  <=> [("a", ","), (null, ","), ("c", null)]
-TEST_P(ListTest, List_Separated_MissingElement) {
-  buildTree("", GetParam());
-
-  // "a,  , c"
-  auto *List = dyn_cast<syntax::List>(syntax::createTree(
-      *Arena,
-      {
-          {createLeaf(*Arena, tok::identifier, "a"), NodeRole::ListElement},
-          {createLeaf(*Arena, tok::comma), NodeRole::ListDelimiter},
-          {createLeaf(*Arena, tok::comma), NodeRole::ListDelimiter},
-          {createLeaf(*Arena, tok::identifier, "c"), NodeRole::ListElement},
-      },
-      NodeKind::CallArguments));
-
-  EXPECT_EQ(dumpElementsAndDelimiters(List->getElementsAsNodesAndDelimiters()),
-            "[('a', ','), (null, ','), ('c', null)]");
-  EXPECT_EQ(dumpNodes(List->getElementsAsNodes()), "['a', null, 'c']");
-}
-
-/// "a, b  c"  <=> [("a", ","), ("b", null), ("c", null)]
-TEST_P(ListTest, List_Separated_MissingDelimiter) {
-  buildTree("", GetParam());
-
-  // "a, b  c"
-  auto *List = dyn_cast<syntax::List>(syntax::createTree(
-      *Arena,
-      {
-          {createLeaf(*Arena, tok::identifier, "a"), NodeRole::ListElement},
-          {createLeaf(*Arena, tok::comma), NodeRole::ListDelimiter},
-          {createLeaf(*Arena, tok::identifier, "b"), NodeRole::ListElement},
-          {createLeaf(*Arena, tok::identifier, "c"), NodeRole::ListElement},
-      },
-      NodeKind::CallArguments));
-
-  EXPECT_EQ(dumpElementsAndDelimiters(List->getElementsAsNodesAndDelimiters()),
-            "[('a', ','), ('b', null), ('c', null)]");
-  EXPECT_EQ(dumpNodes(List->getElementsAsNodes()), "['a', 'b', 'c']");
-}
-
-/// "a, b,"    <=> [("a", ","), ("b", ","), (null, null)]
-TEST_P(ListTest, List_Separated_MissingLastElement) {
-  buildTree("", GetParam());
-
-  // "a, b, c"
-  auto *List = dyn_cast<syntax::List>(syntax::createTree(
-      *Arena,
-      {
-          {createLeaf(*Arena, tok::identifier, "a"), NodeRole::ListElement},
-          {createLeaf(*Arena, tok::comma), NodeRole::ListDelimiter},
-          {createLeaf(*Arena, tok::identifier, "b"), NodeRole::ListElement},
-          {createLeaf(*Arena, tok::comma), NodeRole::ListDelimiter},
-      },
-      NodeKind::CallArguments));
-
-  EXPECT_EQ(dumpElementsAndDelimiters(List->getElementsAsNodesAndDelimiters()),
-            "[('a', ','), ('b', ','), (null, null)]");
-  EXPECT_EQ(dumpNodes(List->getElementsAsNodes()), "['a', 'b', null]");
-}
-
-/// "a:: b:: c::" <=> [("a", "::"), ("b", "::"), ("c", "::")]
-TEST_P(ListTest, List_Terminated_WellFormed) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  buildTree("", GetParam());
-
-  // "a:: b:: c::"
-  auto *List = dyn_cast<syntax::List>(syntax::createTree(
-      *Arena,
-      {
-          {createLeaf(*Arena, tok::identifier, "a"), NodeRole::ListElement},
-          {createLeaf(*Arena, tok::coloncolon), NodeRole::ListDelimiter},
-          {createLeaf(*Arena, tok::identifier, "b"), NodeRole::ListElement},
-          {createLeaf(*Arena, tok::coloncolon), NodeRole::ListDelimiter},
-          {createLeaf(*Arena, tok::identifier, "c"), NodeRole::ListElement},
-          {createLeaf(*Arena, tok::coloncolon), NodeRole::ListDelimiter},
-      },
-      NodeKind::NestedNameSpecifier));
-
-  EXPECT_EQ(dumpElementsAndDelimiters(List->getElementsAsNodesAndDelimiters()),
-            "[('a', '::'), ('b', '::'), ('c', '::')]");
-  EXPECT_EQ(dumpNodes(List->getElementsAsNodes()), "['a', 'b', 'c']");
-}
-
-/// "a::  :: c::" <=> [("a", "::"), (null, "::"), ("c", "::")]
-TEST_P(ListTest, List_Terminated_MissingElement) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  buildTree("", GetParam());
-
-  // "a:: b:: c::"
-  auto *List = dyn_cast<syntax::List>(syntax::createTree(
-      *Arena,
-      {
-          {createLeaf(*Arena, tok::identifier, "a"), NodeRole::ListElement},
-          {createLeaf(*Arena, tok::coloncolon), NodeRole::ListDelimiter},
-          {createLeaf(*Arena, tok::coloncolon), NodeRole::ListDelimiter},
-          {createLeaf(*Arena, tok::identifier, "c"), NodeRole::ListElement},
-          {createLeaf(*Arena, tok::coloncolon), NodeRole::ListDelimiter},
-      },
-      NodeKind::NestedNameSpecifier));
-
-  EXPECT_EQ(dumpElementsAndDelimiters(List->getElementsAsNodesAndDelimiters()),
-            "[('a', '::'), (null, '::'), ('c', '::')]");
-  EXPECT_EQ(dumpNodes(List->getElementsAsNodes()), "['a', null, 'c']");
-}
-
-/// "a:: b  c::" <=> [("a", "::"), ("b", null), ("c", "::")]
-TEST_P(ListTest, List_Terminated_MissingDelimiter) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  buildTree("", GetParam());
-
-  // "a:: b  c::"
-  auto *List = dyn_cast<syntax::List>(syntax::createTree(
-      *Arena,
-      {
-          {createLeaf(*Arena, tok::identifier, "a"), NodeRole::ListElement},
-          {createLeaf(*Arena, tok::coloncolon), NodeRole::ListDelimiter},
-          {createLeaf(*Arena, tok::identifier, "b"), NodeRole::ListElement},
-          {createLeaf(*Arena, tok::identifier, "c"), NodeRole::ListElement},
-          {createLeaf(*Arena, tok::coloncolon), NodeRole::ListDelimiter},
-      },
-      NodeKind::NestedNameSpecifier));
-
-  EXPECT_EQ(dumpElementsAndDelimiters(List->getElementsAsNodesAndDelimiters()),
-            "[('a', '::'), ('b', null), ('c', '::')]");
-  EXPECT_EQ(dumpNodes(List->getElementsAsNodes()), "['a', 'b', 'c']");
-}
-
-/// "a:: b:: c"  <=> [("a", "::"), ("b", "::"), ("c", null)]
-TEST_P(ListTest, List_Terminated_MissingLastDelimiter) {
-  if (!GetParam().isCXX()) {
-    return;
-  }
-  buildTree("", GetParam());
-
-  // "a:: b:: c"
-  auto *List = dyn_cast<syntax::List>(syntax::createTree(
-      *Arena,
-      {
-          {createLeaf(*Arena, tok::identifier, "a"), NodeRole::ListElement},
-          {createLeaf(*Arena, tok::coloncolon), NodeRole::ListDelimiter},
-          {createLeaf(*Arena, tok::identifier, "b"), NodeRole::ListElement},
-          {createLeaf(*Arena, tok::coloncolon), NodeRole::ListDelimiter},
-          {createLeaf(*Arena, tok::identifier, "c"), NodeRole::ListElement},
-      },
-      NodeKind::NestedNameSpecifier));
-
-  EXPECT_EQ(dumpElementsAndDelimiters(List->getElementsAsNodesAndDelimiters()),
-            "[('a', '::'), ('b', '::'), ('c', null)]");
-  EXPECT_EQ(dumpNodes(List->getElementsAsNodes()), "['a', 'b', 'c']");
-}
-
-} // namespace
diff --git a/gnu/llvm/clang/unittests/Tooling/Syntax/TreeTestBase.cpp b/gnu/llvm/clang/unittests/Tooling/Syntax/TreeTestBase.cpp
deleted file mode 100644
index 92d0c07ce23..00000000000
--- a/gnu/llvm/clang/unittests/Tooling/Syntax/TreeTestBase.cpp
+++ /dev/null
@@ -1,178 +0,0 @@
-//===- TreeTestBase.cpp ---------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file provides the test infrastructure for syntax trees.
-//
-//===----------------------------------------------------------------------===//
-
-#include "TreeTestBase.h"
-#include "clang/AST/ASTConsumer.h"
-#include "clang/Basic/LLVM.h"
-#include "clang/Frontend/CompilerInstance.h"
-#include "clang/Frontend/CompilerInvocation.h"
-#include "clang/Frontend/FrontendAction.h"
-#include "clang/Frontend/TextDiagnosticPrinter.h"
-#include "clang/Lex/PreprocessorOptions.h"
-#include "clang/Testing/CommandLineArgs.h"
-#include "clang/Testing/TestClangConfig.h"
-#include "clang/Tooling/Syntax/BuildTree.h"
-#include "clang/Tooling/Syntax/Nodes.h"
-#include "clang/Tooling/Syntax/Tokens.h"
-#include "clang/Tooling/Syntax/Tree.h"
-#include "llvm/ADT/ArrayRef.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/Support/Casting.h"
-#include "llvm/Support/Error.h"
-#include "llvm/Testing/Support/Annotations.h"
-#include "gtest/gtest.h"
-
-using namespace clang;
-using namespace clang::syntax;
-
-namespace {
-ArrayRef<syntax::Token> tokens(syntax::Node *N) {
-  assert(N->isOriginal() && "tokens of modified nodes are not well-defined");
-  if (auto *L = dyn_cast<syntax::Leaf>(N))
-    return llvm::makeArrayRef(L->getToken(), 1);
-  auto *T = cast<syntax::Tree>(N);
-  return llvm::makeArrayRef(T->findFirstLeaf()->getToken(),
-                            T->findLastLeaf()->getToken() + 1);
-}
-} // namespace
-
-std::vector<TestClangConfig> clang::syntax::allTestClangConfigs() {
-  std::vector<TestClangConfig> all_configs;
-  for (TestLanguage lang : {Lang_C89, Lang_C99, Lang_CXX03, Lang_CXX11,
-                            Lang_CXX14, Lang_CXX17, Lang_CXX20}) {
-    TestClangConfig config;
-    config.Language = lang;
-    config.Target = "x86_64-pc-linux-gnu";
-    all_configs.push_back(config);
-
-    // Windows target is interesting to test because it enables
-    // `-fdelayed-template-parsing`.
-    config.Target = "x86_64-pc-win32-msvc";
-    all_configs.push_back(config);
-  }
-  return all_configs;
-}
-
-syntax::TranslationUnit *
-SyntaxTreeTest::buildTree(StringRef Code, const TestClangConfig &ClangConfig) {
-  // FIXME: this code is almost the identical to the one in TokensTest. Share
-  //        it.
-  class BuildSyntaxTree : public ASTConsumer {
-  public:
-    BuildSyntaxTree(syntax::TranslationUnit *&Root,
-                    std::unique_ptr<syntax::TokenBuffer> &TB,
-                    std::unique_ptr<syntax::Arena> &Arena,
-                    std::unique_ptr<syntax::TokenCollector> Tokens)
-        : Root(Root), TB(TB), Arena(Arena), Tokens(std::move(Tokens)) {
-      assert(this->Tokens);
-    }
-
-    void HandleTranslationUnit(ASTContext &Ctx) override {
-      TB = std::make_unique<syntax::TokenBuffer>(std::move(*Tokens).consume());
-      Tokens = nullptr; // make sure we fail if this gets called twice.
-      Arena = std::make_unique<syntax::Arena>(Ctx.getSourceManager(),
-                                              Ctx.getLangOpts(), *TB);
-      Root = syntax::buildSyntaxTree(*Arena, Ctx);
-    }
-
-  private:
-    syntax::TranslationUnit *&Root;
-    std::unique_ptr<syntax::TokenBuffer> &TB;
-    std::unique_ptr<syntax::Arena> &Arena;
-    std::unique_ptr<syntax::TokenCollector> Tokens;
-  };
-
-  class BuildSyntaxTreeAction : public ASTFrontendAction {
-  public:
-    BuildSyntaxTreeAction(syntax::TranslationUnit *&Root,
-                          std::unique_ptr<syntax::TokenBuffer> &TB,
-                          std::unique_ptr<syntax::Arena> &Arena)
-        : Root(Root), TB(TB), Arena(Arena) {}
-
-    std::unique_ptr<ASTConsumer> CreateASTConsumer(CompilerInstance &CI,
-                                                   StringRef InFile) override {
-      // We start recording the tokens, ast consumer will take on the result.
-      auto Tokens =
-          std::make_unique<syntax::TokenCollector>(CI.getPreprocessor());
-      return std::make_unique<BuildSyntaxTree>(Root, TB, Arena,
-                                               std::move(Tokens));
-    }
-
-  private:
-    syntax::TranslationUnit *&Root;
-    std::unique_ptr<syntax::TokenBuffer> &TB;
-    std::unique_ptr<syntax::Arena> &Arena;
-  };
-
-  constexpr const char *FileName = "./input.cpp";
-  FS->addFile(FileName, time_t(), llvm::MemoryBuffer::getMemBufferCopy(""));
-
-  if (!Diags->getClient())
-    Diags->setClient(new TextDiagnosticPrinter(llvm::errs(), DiagOpts.get()));
-  Diags->setSeverityForGroup(diag::Flavor::WarningOrError, "unused-value",
-                             diag::Severity::Ignored, SourceLocation());
-
-  // Prepare to run a compiler.
-  std::vector<std::string> Args = {
-      "syntax-test",
-      "-fsyntax-only",
-  };
-  llvm::copy(ClangConfig.getCommandLineArgs(), std::back_inserter(Args));
-  Args.push_back(FileName);
-
-  std::vector<const char *> ArgsCStr;
-  for (const std::string &arg : Args) {
-    ArgsCStr.push_back(arg.c_str());
-  }
-
-  Invocation = createInvocationFromCommandLine(ArgsCStr, Diags, FS);
-  assert(Invocation);
-  Invocation->getFrontendOpts().DisableFree = false;
-  Invocation->getPreprocessorOpts().addRemappedFile(
-      FileName, llvm::MemoryBuffer::getMemBufferCopy(Code).release());
-  CompilerInstance Compiler;
-  Compiler.setInvocation(Invocation);
-  Compiler.setDiagnostics(Diags.get());
-  Compiler.setFileManager(FileMgr.get());
-  Compiler.setSourceManager(SourceMgr.get());
-
-  syntax::TranslationUnit *Root = nullptr;
-  BuildSyntaxTreeAction Recorder(Root, this->TB, this->Arena);
-
-  // Action could not be executed but the frontend didn't identify any errors
-  // in the code ==> problem in setting up the action.
-  if (!Compiler.ExecuteAction(Recorder) &&
-      Diags->getClient()->getNumErrors() == 0) {
-    ADD_FAILURE() << "failed to run the frontend";
-    std::abort();
-  }
-  return Root;
-}
-
-syntax::Node *SyntaxTreeTest::nodeByRange(llvm::Annotations::Range R,
-                                          syntax::Node *Root) {
-  ArrayRef<syntax::Token> Toks = tokens(Root);
-
-  if (Toks.front().location().isFileID() && Toks.back().location().isFileID() &&
-      syntax::Token::range(*SourceMgr, Toks.front(), Toks.back()) ==
-          syntax::FileRange(SourceMgr->getMainFileID(), R.Begin, R.End))
-    return Root;
-
-  auto *T = dyn_cast<syntax::Tree>(Root);
-  if (!T)
-    return nullptr;
-  for (auto *C = T->getFirstChild(); C != nullptr; C = C->getNextSibling()) {
-    if (auto *Result = nodeByRange(R, C))
-      return Result;
-  }
-  return nullptr;
-}
diff --git a/gnu/llvm/clang/unittests/Tooling/Syntax/TreeTestBase.h b/gnu/llvm/clang/unittests/Tooling/Syntax/TreeTestBase.h
deleted file mode 100644
index a86b5d7ce77..00000000000
--- a/gnu/llvm/clang/unittests/Tooling/Syntax/TreeTestBase.h
+++ /dev/null
@@ -1,68 +0,0 @@
-//===- TreeTestBase.h -----------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file provides the test infrastructure for syntax trees.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_CLANG_UNITTESTS_TOOLING_SYNTAX_TREETESTBASE_H
-#define LLVM_CLANG_UNITTESTS_TOOLING_SYNTAX_TREETESTBASE_H
-
-#include "clang/Basic/LLVM.h"
-#include "clang/Frontend/CompilerInvocation.h"
-#include "clang/Testing/TestClangConfig.h"
-#include "clang/Tooling/Syntax/Nodes.h"
-#include "clang/Tooling/Syntax/Tokens.h"
-#include "clang/Tooling/Syntax/Tree.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/Support/ScopedPrinter.h"
-#include "llvm/Testing/Support/Annotations.h"
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-
-namespace clang {
-namespace syntax {
-class SyntaxTreeTest : public ::testing::Test,
-                       public ::testing::WithParamInterface<TestClangConfig> {
-protected:
-  // Build a syntax tree for the code.
-  TranslationUnit *buildTree(StringRef Code,
-                             const TestClangConfig &ClangConfig);
-
-  /// Finds the deepest node in the tree that covers exactly \p R.
-  /// FIXME: implement this efficiently and move to public syntax tree API.
-  syntax::Node *nodeByRange(llvm::Annotations::Range R, syntax::Node *Root);
-
-  // Data fields.
-  IntrusiveRefCntPtr<DiagnosticOptions> DiagOpts = new DiagnosticOptions();
-  IntrusiveRefCntPtr<DiagnosticsEngine> Diags =
-      new DiagnosticsEngine(new DiagnosticIDs, DiagOpts.get());
-  IntrusiveRefCntPtr<llvm::vfs::InMemoryFileSystem> FS =
-      new llvm::vfs::InMemoryFileSystem;
-  IntrusiveRefCntPtr<FileManager> FileMgr =
-      new FileManager(FileSystemOptions(), FS);
-  IntrusiveRefCntPtr<SourceManager> SourceMgr =
-      new SourceManager(*Diags, *FileMgr);
-  std::shared_ptr<CompilerInvocation> Invocation;
-  // Set after calling buildTree().
-  std::unique_ptr<syntax::TokenBuffer> TB;
-  std::unique_ptr<syntax::Arena> Arena;
-};
-
-std::vector<TestClangConfig> allTestClangConfigs();
-
-MATCHER_P(role, R, "") {
-  if (arg.getRole() == R)
-    return true;
-  *result_listener << "role is " << llvm::to_string(arg.getRole());
-  return false;
-}
-
-} // namespace syntax
-} // namespace clang
-#endif // LLVM_CLANG_UNITTESTS_TOOLING_SYNTAX_TREETESTBASE_H
diff --git a/gnu/llvm/clang/unittests/Tooling/TestVisitor.h b/gnu/llvm/clang/unittests/Tooling/TestVisitor.h
deleted file mode 100644
index 751ca74d1a8..00000000000
--- a/gnu/llvm/clang/unittests/Tooling/TestVisitor.h
+++ /dev/null
@@ -1,252 +0,0 @@
-//===--- TestVisitor.h ------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-///
-/// \file
-/// \brief Defines utility templates for RecursiveASTVisitor related tests.
-///
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_CLANG_UNITTESTS_TOOLING_TESTVISITOR_H
-#define LLVM_CLANG_UNITTESTS_TOOLING_TESTVISITOR_H
-
-#include "clang/AST/ASTConsumer.h"
-#include "clang/AST/ASTContext.h"
-#include "clang/AST/RecursiveASTVisitor.h"
-#include "clang/Frontend/CompilerInstance.h"
-#include "clang/Frontend/FrontendAction.h"
-#include "clang/Tooling/Tooling.h"
-#include "gtest/gtest.h"
-#include <vector>
-
-namespace clang {
-
-/// \brief Base class for simple RecursiveASTVisitor based tests.
-///
-/// This is a drop-in replacement for RecursiveASTVisitor itself, with the
-/// additional capability of running it over a snippet of code.
-///
-/// Visits template instantiations and implicit code by default.
-template <typename T>
-class TestVisitor : public RecursiveASTVisitor<T> {
-public:
-  TestVisitor() { }
-
-  virtual ~TestVisitor() { }
-
-  enum Language {
-    Lang_C,
-    Lang_CXX98,
-    Lang_CXX11,
-    Lang_CXX14,
-    Lang_CXX17,
-    Lang_CXX2a,
-    Lang_OBJC,
-    Lang_OBJCXX11,
-    Lang_CXX = Lang_CXX98
-  };
-
-  /// \brief Runs the current AST visitor over the given code.
-  bool runOver(StringRef Code, Language L = Lang_CXX) {
-    std::vector<std::string> Args;
-    switch (L) {
-      case Lang_C:
-        Args.push_back("-x");
-        Args.push_back("c");
-        break;
-      case Lang_CXX98: Args.push_back("-std=c++98"); break;
-      case Lang_CXX11: Args.push_back("-std=c++11"); break;
-      case Lang_CXX14: Args.push_back("-std=c++14"); break;
-      case Lang_CXX17: Args.push_back("-std=c++17"); break;
-      case Lang_CXX2a: Args.push_back("-std=c++2a"); break;
-      case Lang_OBJC:
-        Args.push_back("-ObjC");
-        Args.push_back("-fobjc-runtime=macosx-10.12.0");
-        break;
-      case Lang_OBJCXX11:
-        Args.push_back("-ObjC++");
-        Args.push_back("-std=c++11");
-        Args.push_back("-fblocks");
-        break;
-    }
-    return tooling::runToolOnCodeWithArgs(CreateTestAction(), Code, Args);
-  }
-
-  bool shouldVisitTemplateInstantiations() const {
-    return true;
-  }
-
-  bool shouldVisitImplicitCode() const {
-    return true;
-  }
-
-protected:
-  virtual std::unique_ptr<ASTFrontendAction> CreateTestAction() {
-    return std::make_unique<TestAction>(this);
-  }
-
-  class FindConsumer : public ASTConsumer {
-  public:
-    FindConsumer(TestVisitor *Visitor) : Visitor(Visitor) {}
-
-    void HandleTranslationUnit(clang::ASTContext &Context) override {
-      Visitor->Context = &Context;
-      Visitor->TraverseDecl(Context.getTranslationUnitDecl());
-    }
-
-  private:
-    TestVisitor *Visitor;
-  };
-
-  class TestAction : public ASTFrontendAction {
-  public:
-    TestAction(TestVisitor *Visitor) : Visitor(Visitor) {}
-
-    std::unique_ptr<clang::ASTConsumer>
-    CreateASTConsumer(CompilerInstance &, llvm::StringRef dummy) override {
-      /// TestConsumer will be deleted by the framework calling us.
-      return std::make_unique<FindConsumer>(Visitor);
-    }
-
-  protected:
-    TestVisitor *Visitor;
-  };
-
-  ASTContext *Context;
-};
-
-/// \brief A RecursiveASTVisitor to check that certain matches are (or are
-/// not) observed during visitation.
-///
-/// This is a RecursiveASTVisitor for testing the RecursiveASTVisitor itself,
-/// and allows simple creation of test visitors running matches on only a small
-/// subset of the Visit* methods.
-template <typename T, template <typename> class Visitor = TestVisitor>
-class ExpectedLocationVisitor : public Visitor<T> {
-public:
-  /// \brief Expect 'Match' *not* to occur at the given 'Line' and 'Column'.
-  ///
-  /// Any number of matches can be disallowed.
-  void DisallowMatch(Twine Match, unsigned Line, unsigned Column) {
-    DisallowedMatches.push_back(MatchCandidate(Match, Line, Column));
-  }
-
-  /// \brief Expect 'Match' to occur at the given 'Line' and 'Column'.
-  ///
-  /// Any number of expected matches can be set by calling this repeatedly.
-  /// Each is expected to be matched 'Times' number of times. (This is useful in
-  /// cases in which different AST nodes can match at the same source code
-  /// location.)
-  void ExpectMatch(Twine Match, unsigned Line, unsigned Column,
-                   unsigned Times = 1) {
-    ExpectedMatches.push_back(ExpectedMatch(Match, Line, Column, Times));
-  }
-
-  /// \brief Checks that all expected matches have been found.
-  ~ExpectedLocationVisitor() override {
-    for (typename std::vector<ExpectedMatch>::const_iterator
-             It = ExpectedMatches.begin(), End = ExpectedMatches.end();
-         It != End; ++It) {
-      It->ExpectFound();
-    }
-  }
-
-protected:
-  /// \brief Checks an actual match against expected and disallowed matches.
-  ///
-  /// Implementations are required to call this with appropriate values
-  /// for 'Name' during visitation.
-  void Match(StringRef Name, SourceLocation Location) {
-    const FullSourceLoc FullLocation = this->Context->getFullLoc(Location);
-
-    for (typename std::vector<MatchCandidate>::const_iterator
-             It = DisallowedMatches.begin(), End = DisallowedMatches.end();
-         It != End; ++It) {
-      EXPECT_FALSE(It->Matches(Name, FullLocation))
-          << "Matched disallowed " << *It;
-    }
-
-    for (typename std::vector<ExpectedMatch>::iterator
-             It = ExpectedMatches.begin(), End = ExpectedMatches.end();
-         It != End; ++It) {
-      It->UpdateFor(Name, FullLocation, this->Context->getSourceManager());
-    }
-  }
-
- private:
-  struct MatchCandidate {
-    std::string ExpectedName;
-    unsigned LineNumber;
-    unsigned ColumnNumber;
-
-    MatchCandidate(Twine Name, unsigned LineNumber, unsigned ColumnNumber)
-      : ExpectedName(Name.str()), LineNumber(LineNumber),
-        ColumnNumber(ColumnNumber) {
-    }
-
-    bool Matches(StringRef Name, FullSourceLoc const &Location) const {
-      return MatchesName(Name) && MatchesLocation(Location);
-    }
-
-    bool PartiallyMatches(StringRef Name, FullSourceLoc const &Location) const {
-      return MatchesName(Name) || MatchesLocation(Location);
-    }
-
-    bool MatchesName(StringRef Name) const {
-      return Name == ExpectedName;
-    }
-
-    bool MatchesLocation(FullSourceLoc const &Location) const {
-      return Location.isValid() &&
-          Location.getSpellingLineNumber() == LineNumber &&
-          Location.getSpellingColumnNumber() == ColumnNumber;
-    }
-
-    friend std::ostream &operator<<(std::ostream &Stream,
-                                    MatchCandidate const &Match) {
-      return Stream << Match.ExpectedName
-                    << " at " << Match.LineNumber << ":" << Match.ColumnNumber;
-    }
-  };
-
-  struct ExpectedMatch {
-    ExpectedMatch(Twine Name, unsigned LineNumber, unsigned ColumnNumber,
-                  unsigned Times)
-        : Candidate(Name, LineNumber, ColumnNumber), TimesExpected(Times),
-          TimesSeen(0) {}
-
-    void UpdateFor(StringRef Name, FullSourceLoc Location, SourceManager &SM) {
-      if (Candidate.Matches(Name, Location)) {
-        EXPECT_LT(TimesSeen, TimesExpected);
-        ++TimesSeen;
-      } else if (TimesSeen < TimesExpected &&
-                 Candidate.PartiallyMatches(Name, Location)) {
-        llvm::raw_string_ostream Stream(PartialMatches);
-        Stream << ", partial match: \"" << Name << "\" at ";
-        Location.print(Stream, SM);
-      }
-    }
-
-    void ExpectFound() const {
-      EXPECT_EQ(TimesExpected, TimesSeen)
-          << "Expected \"" << Candidate.ExpectedName
-          << "\" at " << Candidate.LineNumber
-          << ":" << Candidate.ColumnNumber << PartialMatches;
-    }
-
-    MatchCandidate Candidate;
-    std::string PartialMatches;
-    unsigned TimesExpected;
-    unsigned TimesSeen;
-  };
-
-  std::vector<MatchCandidate> DisallowedMatches;
-  std::vector<ExpectedMatch> ExpectedMatches;
-};
-}
-
-#endif
diff --git a/gnu/llvm/clang/unittests/Tooling/ToolingTest.cpp b/gnu/llvm/clang/unittests/Tooling/ToolingTest.cpp
deleted file mode 100644
index fe853048600..00000000000
--- a/gnu/llvm/clang/unittests/Tooling/ToolingTest.cpp
+++ /dev/null
@@ -1,913 +0,0 @@
-//===- unittest/Tooling/ToolingTest.cpp - Tooling unit tests --------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/AST/ASTConsumer.h"
-#include "clang/AST/DeclCXX.h"
-#include "clang/AST/DeclGroup.h"
-#include "clang/Driver/Compilation.h"
-#include "clang/Driver/Driver.h"
-#include "clang/Frontend/ASTUnit.h"
-#include "clang/Frontend/CompilerInstance.h"
-#include "clang/Frontend/FrontendAction.h"
-#include "clang/Frontend/FrontendActions.h"
-#include "clang/Tooling/ArgumentsAdjusters.h"
-#include "clang/Tooling/CompilationDatabase.h"
-#include "clang/Tooling/Tooling.h"
-#include "llvm/ADT/STLExtras.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/Support/Host.h"
-#include "llvm/Support/Path.h"
-#include "llvm/Support/TargetRegistry.h"
-#include "llvm/Support/TargetSelect.h"
-#include "gtest/gtest.h"
-#include <algorithm>
-#include <string>
-#include <vector>
-
-namespace clang {
-namespace tooling {
-
-namespace {
-/// Takes an ast consumer and returns it from CreateASTConsumer. This only
-/// works with single translation unit compilations.
-class TestAction : public clang::ASTFrontendAction {
-public:
-  /// Takes ownership of TestConsumer.
-  explicit TestAction(std::unique_ptr<clang::ASTConsumer> TestConsumer)
-      : TestConsumer(std::move(TestConsumer)) {}
-
-protected:
-  std::unique_ptr<clang::ASTConsumer>
-  CreateASTConsumer(clang::CompilerInstance &compiler,
-                    StringRef dummy) override {
-    /// TestConsumer will be deleted by the framework calling us.
-    return std::move(TestConsumer);
-  }
-
-private:
-  std::unique_ptr<clang::ASTConsumer> TestConsumer;
-};
-
-class FindTopLevelDeclConsumer : public clang::ASTConsumer {
- public:
-  explicit FindTopLevelDeclConsumer(bool *FoundTopLevelDecl)
-      : FoundTopLevelDecl(FoundTopLevelDecl) {}
-  bool HandleTopLevelDecl(clang::DeclGroupRef DeclGroup) override {
-    *FoundTopLevelDecl = true;
-    return true;
-  }
- private:
-  bool * const FoundTopLevelDecl;
-};
-} // end namespace
-
-TEST(runToolOnCode, FindsNoTopLevelDeclOnEmptyCode) {
-  bool FoundTopLevelDecl = false;
-  EXPECT_TRUE(runToolOnCode(
-      std::make_unique<TestAction>(
-          std::make_unique<FindTopLevelDeclConsumer>(&FoundTopLevelDecl)),
-      ""));
-  EXPECT_FALSE(FoundTopLevelDecl);
-}
-
-namespace {
-class FindClassDeclXConsumer : public clang::ASTConsumer {
- public:
-  FindClassDeclXConsumer(bool *FoundClassDeclX)
-      : FoundClassDeclX(FoundClassDeclX) {}
-  bool HandleTopLevelDecl(clang::DeclGroupRef GroupRef) override {
-    if (CXXRecordDecl* Record = dyn_cast<clang::CXXRecordDecl>(
-            *GroupRef.begin())) {
-      if (Record->getName() == "X") {
-        *FoundClassDeclX = true;
-      }
-    }
-    return true;
-  }
- private:
-  bool *FoundClassDeclX;
-};
-bool FindClassDeclX(ASTUnit *AST) {
-  for (std::vector<Decl *>::iterator i = AST->top_level_begin(),
-                                     e = AST->top_level_end();
-       i != e; ++i) {
-    if (CXXRecordDecl* Record = dyn_cast<clang::CXXRecordDecl>(*i)) {
-      if (Record->getName() == "X") {
-        return true;
-      }
-    }
-  }
-  return false;
-}
-
-struct TestDiagnosticConsumer : public DiagnosticConsumer {
-  TestDiagnosticConsumer() : NumDiagnosticsSeen(0) {}
-  void HandleDiagnostic(DiagnosticsEngine::Level DiagLevel,
-                        const Diagnostic &Info) override {
-    ++NumDiagnosticsSeen;
-  }
-  unsigned NumDiagnosticsSeen;
-};
-} // end namespace
-
-TEST(runToolOnCode, FindsClassDecl) {
-  bool FoundClassDeclX = false;
-  EXPECT_TRUE(runToolOnCode(
-      std::make_unique<TestAction>(
-          std::make_unique<FindClassDeclXConsumer>(&FoundClassDeclX)),
-      "class X;"));
-  EXPECT_TRUE(FoundClassDeclX);
-
-  FoundClassDeclX = false;
-  EXPECT_TRUE(runToolOnCode(
-      std::make_unique<TestAction>(
-          std::make_unique<FindClassDeclXConsumer>(&FoundClassDeclX)),
-      "class Y;"));
-  EXPECT_FALSE(FoundClassDeclX);
-}
-
-TEST(buildASTFromCode, FindsClassDecl) {
-  std::unique_ptr<ASTUnit> AST = buildASTFromCode("class X;");
-  ASSERT_TRUE(AST.get());
-  EXPECT_TRUE(FindClassDeclX(AST.get()));
-
-  AST = buildASTFromCode("class Y;");
-  ASSERT_TRUE(AST.get());
-  EXPECT_FALSE(FindClassDeclX(AST.get()));
-}
-
-TEST(buildASTFromCode, ReportsErrors) {
-  TestDiagnosticConsumer Consumer;
-  std::unique_ptr<ASTUnit> AST = buildASTFromCodeWithArgs(
-      "int x = \"A\";", {}, "input.cc", "clang-tool",
-      std::make_shared<PCHContainerOperations>(),
-      getClangStripDependencyFileAdjuster(), FileContentMappings(), &Consumer);
-  EXPECT_TRUE(AST.get());
-  EXPECT_EQ(1u, Consumer.NumDiagnosticsSeen);
-}
-
-TEST(newFrontendActionFactory, CreatesFrontendActionFactoryFromType) {
-  std::unique_ptr<FrontendActionFactory> Factory(
-      newFrontendActionFactory<SyntaxOnlyAction>());
-  std::unique_ptr<FrontendAction> Action(Factory->create());
-  EXPECT_TRUE(Action.get() != nullptr);
-}
-
-struct IndependentFrontendActionCreator {
-  std::unique_ptr<ASTConsumer> newASTConsumer() {
-    return std::make_unique<FindTopLevelDeclConsumer>(nullptr);
-  }
-};
-
-TEST(newFrontendActionFactory, CreatesFrontendActionFactoryFromFactoryType) {
-  IndependentFrontendActionCreator Creator;
-  std::unique_ptr<FrontendActionFactory> Factory(
-      newFrontendActionFactory(&Creator));
-  std::unique_ptr<FrontendAction> Action(Factory->create());
-  EXPECT_TRUE(Action.get() != nullptr);
-}
-
-TEST(ToolInvocation, TestMapVirtualFile) {
-  llvm::IntrusiveRefCntPtr<llvm::vfs::OverlayFileSystem> OverlayFileSystem(
-      new llvm::vfs::OverlayFileSystem(llvm::vfs::getRealFileSystem()));
-  llvm::IntrusiveRefCntPtr<llvm::vfs::InMemoryFileSystem> InMemoryFileSystem(
-      new llvm::vfs::InMemoryFileSystem);
-  OverlayFileSystem->pushOverlay(InMemoryFileSystem);
-  llvm::IntrusiveRefCntPtr<FileManager> Files(
-      new FileManager(FileSystemOptions(), OverlayFileSystem));
-  std::vector<std::string> Args;
-  Args.push_back("tool-executable");
-  Args.push_back("-Idef");
-  Args.push_back("-fsyntax-only");
-  Args.push_back("test.cpp");
-  clang::tooling::ToolInvocation Invocation(
-      Args, std::make_unique<SyntaxOnlyAction>(), Files.get());
-  InMemoryFileSystem->addFile(
-      "test.cpp", 0, llvm::MemoryBuffer::getMemBuffer("#include <abc>\n"));
-  InMemoryFileSystem->addFile("def/abc", 0,
-                              llvm::MemoryBuffer::getMemBuffer("\n"));
-  EXPECT_TRUE(Invocation.run());
-}
-
-TEST(ToolInvocation, TestVirtualModulesCompilation) {
-  // FIXME: Currently, this only tests that we don't exit with an error if a
-  // mapped module.map is found on the include path. In the future, expand this
-  // test to run a full modules enabled compilation, so we make sure we can
-  // rerun modules compilations with a virtual file system.
-  llvm::IntrusiveRefCntPtr<llvm::vfs::OverlayFileSystem> OverlayFileSystem(
-      new llvm::vfs::OverlayFileSystem(llvm::vfs::getRealFileSystem()));
-  llvm::IntrusiveRefCntPtr<llvm::vfs::InMemoryFileSystem> InMemoryFileSystem(
-      new llvm::vfs::InMemoryFileSystem);
-  OverlayFileSystem->pushOverlay(InMemoryFileSystem);
-  llvm::IntrusiveRefCntPtr<FileManager> Files(
-      new FileManager(FileSystemOptions(), OverlayFileSystem));
-  std::vector<std::string> Args;
-  Args.push_back("tool-executable");
-  Args.push_back("-Idef");
-  Args.push_back("-fsyntax-only");
-  Args.push_back("test.cpp");
-  clang::tooling::ToolInvocation Invocation(
-      Args, std::make_unique<SyntaxOnlyAction>(), Files.get());
-  InMemoryFileSystem->addFile(
-      "test.cpp", 0, llvm::MemoryBuffer::getMemBuffer("#include <abc>\n"));
-  InMemoryFileSystem->addFile("def/abc", 0,
-                              llvm::MemoryBuffer::getMemBuffer("\n"));
-  // Add a module.map file in the include directory of our header, so we trigger
-  // the module.map header search logic.
-  InMemoryFileSystem->addFile("def/module.map", 0,
-                              llvm::MemoryBuffer::getMemBuffer("\n"));
-  EXPECT_TRUE(Invocation.run());
-}
-
-struct DiagnosticConsumerExpectingSourceManager : public DiagnosticConsumer {
-  bool SawSourceManager;
-
-  DiagnosticConsumerExpectingSourceManager() : SawSourceManager(false) {}
-
-  void HandleDiagnostic(clang::DiagnosticsEngine::Level,
-                        const clang::Diagnostic &info) override {
-    SawSourceManager = info.hasSourceManager();
-  }
-};
-
-TEST(ToolInvocation, DiagConsumerExpectingSourceManager) {
-  llvm::IntrusiveRefCntPtr<llvm::vfs::OverlayFileSystem> OverlayFileSystem(
-      new llvm::vfs::OverlayFileSystem(llvm::vfs::getRealFileSystem()));
-  llvm::IntrusiveRefCntPtr<llvm::vfs::InMemoryFileSystem> InMemoryFileSystem(
-      new llvm::vfs::InMemoryFileSystem);
-  OverlayFileSystem->pushOverlay(InMemoryFileSystem);
-  llvm::IntrusiveRefCntPtr<FileManager> Files(
-      new FileManager(FileSystemOptions(), OverlayFileSystem));
-  std::vector<std::string> Args;
-  Args.push_back("tool-executable");
-  // Note: intentional error; user probably meant -ferror-limit=0.
-  Args.push_back("-ferror-limit=-1");
-  Args.push_back("-fsyntax-only");
-  Args.push_back("test.cpp");
-  clang::tooling::ToolInvocation Invocation(
-      Args, std::make_unique<SyntaxOnlyAction>(), Files.get());
-  InMemoryFileSystem->addFile(
-      "test.cpp", 0, llvm::MemoryBuffer::getMemBuffer("int main() {}\n"));
-
-  DiagnosticConsumerExpectingSourceManager Consumer;
-  Invocation.setDiagnosticConsumer(&Consumer);
-
-  EXPECT_TRUE(Invocation.run());
-  EXPECT_TRUE(Consumer.SawSourceManager);
-}
-
-namespace {
-/// Overlays the real filesystem with the given VFS and returns the result.
-llvm::IntrusiveRefCntPtr<llvm::vfs::OverlayFileSystem>
-overlayRealFS(llvm::IntrusiveRefCntPtr<llvm::vfs::FileSystem> VFS) {
-  auto RFS = llvm::vfs::getRealFileSystem();
-  auto OverlayFS = llvm::makeIntrusiveRefCnt<llvm::vfs::OverlayFileSystem>(RFS);
-  OverlayFS->pushOverlay(VFS);
-  return OverlayFS;
-}
-
-struct CommandLineExtractorTest : public ::testing::Test {
-  llvm::IntrusiveRefCntPtr<llvm::vfs::InMemoryFileSystem> InMemoryFS;
-  llvm::IntrusiveRefCntPtr<DiagnosticsEngine> Diags;
-  driver::Driver Driver;
-
-public:
-  CommandLineExtractorTest()
-      : InMemoryFS(new llvm::vfs::InMemoryFileSystem),
-        Diags(CompilerInstance::createDiagnostics(new DiagnosticOptions)),
-        Driver("clang", llvm::sys::getDefaultTargetTriple(), *Diags,
-               "clang LLVM compiler", overlayRealFS(InMemoryFS)) {}
-
-  void addFile(StringRef Name, StringRef Content) {
-    InMemoryFS->addFile(Name, 0, llvm::MemoryBuffer::getMemBuffer(Content));
-  }
-
-  const llvm::opt::ArgStringList *
-  extractCC1Arguments(llvm::ArrayRef<const char *> Argv) {
-    const std::unique_ptr<driver::Compilation> Compilation(
-        Driver.BuildCompilation(llvm::makeArrayRef(Argv)));
-
-    return getCC1Arguments(Diags.get(), Compilation.get());
-  }
-};
-} // namespace
-
-TEST_F(CommandLineExtractorTest, AcceptOffloading) {
-  addFile("test.c", "int main() {}\n");
-  const char *Args[] = {"clang",     "-target",  "arm64-apple-macosx11.0.0",
-                        "-x",        "hip",      "test.c",
-                        "-nogpulib", "-nogpuinc"};
-  EXPECT_NE(extractCC1Arguments(Args), nullptr);
-}
-
-TEST_F(CommandLineExtractorTest, AcceptOffloadingCompile) {
-  addFile("test.c", "int main() {}\n");
-  const char *Args[] = {"clang",  "-target",   "arm64-apple-macosx11.0.0",
-                        "-c",     "-x",        "hip",
-                        "test.c", "-nogpulib", "-nogpuinc"};
-  EXPECT_NE(extractCC1Arguments(Args), nullptr);
-}
-
-TEST_F(CommandLineExtractorTest, AcceptOffloadingSyntaxOnly) {
-  addFile("test.c", "int main() {}\n");
-  const char *Args[] = {
-      "clang",         "-target",   "arm64-apple-macosx11.0.0",
-      "-fsyntax-only", "-x",        "hip",
-      "test.c",        "-nogpulib", "-nogpuinc"};
-  EXPECT_NE(extractCC1Arguments(Args), nullptr);
-}
-
-TEST_F(CommandLineExtractorTest, AcceptExternalAssembler) {
-  addFile("test.c", "int main() {}\n");
-  const char *Args[] = {
-      "clang", "-target", "arm64-apple-macosx11.0.0", "-fno-integrated-as",
-      "-c",    "test.c"};
-  EXPECT_NE(extractCC1Arguments(Args), nullptr);
-}
-
-TEST_F(CommandLineExtractorTest, AcceptEmbedBitcode) {
-  addFile("test.c", "int main() {}\n");
-  const char *Args[] = {"clang", "-target",         "arm64-apple-macosx11.0.0",
-                        "-c",    "-fembed-bitcode", "test.c"};
-  EXPECT_NE(extractCC1Arguments(Args), nullptr);
-}
-
-TEST_F(CommandLineExtractorTest, AcceptSaveTemps) {
-  addFile("test.c", "int main() {}\n");
-  const char *Args[] = {"clang", "-target",     "arm64-apple-macosx11.0.0",
-                        "-c",    "-save-temps", "test.c"};
-  EXPECT_NE(extractCC1Arguments(Args), nullptr);
-}
-
-TEST_F(CommandLineExtractorTest, RejectMultipleArchitectures) {
-  addFile("test.c", "int main() {}\n");
-  const char *Args[] = {"clang", "-target", "arm64-apple-macosx11.0.0",
-                        "-arch", "x86_64",  "-arch",
-                        "arm64", "-c",      "test.c"};
-  EXPECT_EQ(extractCC1Arguments(Args), nullptr);
-}
-
-TEST_F(CommandLineExtractorTest, RejectMultipleInputFiles) {
-  addFile("one.c", "void one() {}\n");
-  addFile("two.c", "void two() {}\n");
-  const char *Args[] = {"clang", "-target", "arm64-apple-macosx11.0.0",
-                        "-c",    "one.c",   "two.c"};
-  EXPECT_EQ(extractCC1Arguments(Args), nullptr);
-}
-
-struct VerifyEndCallback : public SourceFileCallbacks {
-  VerifyEndCallback() : BeginCalled(0), EndCalled(0), Matched(false) {}
-  bool handleBeginSource(CompilerInstance &CI) override {
-    ++BeginCalled;
-    return true;
-  }
-  void handleEndSource() override { ++EndCalled; }
-  std::unique_ptr<ASTConsumer> newASTConsumer() {
-    return std::make_unique<FindTopLevelDeclConsumer>(&Matched);
-  }
-  unsigned BeginCalled;
-  unsigned EndCalled;
-  bool Matched;
-};
-
-#if !defined(_WIN32)
-TEST(newFrontendActionFactory, InjectsSourceFileCallbacks) {
-  VerifyEndCallback EndCallback;
-
-  FixedCompilationDatabase Compilations("/", std::vector<std::string>());
-  std::vector<std::string> Sources;
-  Sources.push_back("/a.cc");
-  Sources.push_back("/b.cc");
-  ClangTool Tool(Compilations, Sources);
-
-  Tool.mapVirtualFile("/a.cc", "void a() {}");
-  Tool.mapVirtualFile("/b.cc", "void b() {}");
-
-  std::unique_ptr<FrontendActionFactory> Action(
-      newFrontendActionFactory(&EndCallback, &EndCallback));
-  Tool.run(Action.get());
-
-  EXPECT_TRUE(EndCallback.Matched);
-  EXPECT_EQ(2u, EndCallback.BeginCalled);
-  EXPECT_EQ(2u, EndCallback.EndCalled);
-}
-#endif
-
-struct SkipBodyConsumer : public clang::ASTConsumer {
-  /// Skip the 'skipMe' function.
-  bool shouldSkipFunctionBody(Decl *D) override {
-    NamedDecl *F = dyn_cast<NamedDecl>(D);
-    return F && F->getNameAsString() == "skipMe";
-  }
-};
-
-struct SkipBodyAction : public clang::ASTFrontendAction {
-  std::unique_ptr<ASTConsumer> CreateASTConsumer(CompilerInstance &Compiler,
-                                                 StringRef) override {
-    Compiler.getFrontendOpts().SkipFunctionBodies = true;
-    return std::make_unique<SkipBodyConsumer>();
-  }
-};
-
-TEST(runToolOnCode, TestSkipFunctionBody) {
-  std::vector<std::string> Args = {"-std=c++11"};
-  std::vector<std::string> Args2 = {"-fno-delayed-template-parsing"};
-
-  EXPECT_TRUE(runToolOnCode(std::make_unique<SkipBodyAction>(),
-                            "int skipMe() { an_error_here }"));
-  EXPECT_FALSE(runToolOnCode(std::make_unique<SkipBodyAction>(),
-                             "int skipMeNot() { an_error_here }"));
-
-  // Test constructors with initializers
-  EXPECT_TRUE(runToolOnCodeWithArgs(
-      std::make_unique<SkipBodyAction>(),
-      "struct skipMe { skipMe() : an_error() { more error } };", Args));
-  EXPECT_TRUE(runToolOnCodeWithArgs(
-      std::make_unique<SkipBodyAction>(), "struct skipMe { skipMe(); };"
-                          "skipMe::skipMe() : an_error([](){;}) { more error }",
-      Args));
-  EXPECT_TRUE(runToolOnCodeWithArgs(
-      std::make_unique<SkipBodyAction>(), "struct skipMe { skipMe(); };"
-                          "skipMe::skipMe() : an_error{[](){;}} { more error }",
-      Args));
-  EXPECT_TRUE(runToolOnCodeWithArgs(
-      std::make_unique<SkipBodyAction>(),
-      "struct skipMe { skipMe(); };"
-      "skipMe::skipMe() : a<b<c>(e)>>(), f{}, g() { error }",
-      Args));
-  EXPECT_TRUE(runToolOnCodeWithArgs(
-      std::make_unique<SkipBodyAction>(), "struct skipMe { skipMe() : bases()... { error } };",
-      Args));
-
-  EXPECT_FALSE(runToolOnCodeWithArgs(
-      std::make_unique<SkipBodyAction>(), "struct skipMeNot { skipMeNot() : an_error() { } };",
-      Args));
-  EXPECT_FALSE(runToolOnCodeWithArgs(std::make_unique<SkipBodyAction>(),
-                                     "struct skipMeNot { skipMeNot(); };"
-                                     "skipMeNot::skipMeNot() : an_error() { }",
-                                     Args));
-
-  // Try/catch
-  EXPECT_TRUE(runToolOnCode(
-      std::make_unique<SkipBodyAction>(),
-      "void skipMe() try { an_error() } catch(error) { error };"));
-  EXPECT_TRUE(runToolOnCode(
-      std::make_unique<SkipBodyAction>(),
-      "struct S { void skipMe() try { an_error() } catch(error) { error } };"));
-  EXPECT_TRUE(
-      runToolOnCode(std::make_unique<SkipBodyAction>(),
-                    "void skipMe() try { an_error() } catch(error) { error; }"
-                    "catch(error) { error } catch (error) { }"));
-  EXPECT_FALSE(runToolOnCode(
-      std::make_unique<SkipBodyAction>(),
-      "void skipMe() try something;")); // don't crash while parsing
-
-  // Template
-  EXPECT_TRUE(runToolOnCode(
-      std::make_unique<SkipBodyAction>(), "template<typename T> int skipMe() { an_error_here }"
-                          "int x = skipMe<int>();"));
-  EXPECT_FALSE(runToolOnCodeWithArgs(
-      std::make_unique<SkipBodyAction>(),
-      "template<typename T> int skipMeNot() { an_error_here }", Args2));
-}
-
-TEST(runToolOnCodeWithArgs, TestNoDepFile) {
-  llvm::SmallString<32> DepFilePath;
-  ASSERT_FALSE(llvm::sys::fs::getPotentiallyUniqueTempFileName("depfile", "d",
-                                                               DepFilePath));
-  std::vector<std::string> Args;
-  Args.push_back("-MMD");
-  Args.push_back("-MT");
-  Args.push_back(std::string(DepFilePath.str()));
-  Args.push_back("-MF");
-  Args.push_back(std::string(DepFilePath.str()));
-  EXPECT_TRUE(runToolOnCodeWithArgs(std::make_unique<SkipBodyAction>(), "", Args));
-  EXPECT_FALSE(llvm::sys::fs::exists(DepFilePath.str()));
-  EXPECT_FALSE(llvm::sys::fs::remove(DepFilePath.str()));
-}
-
-struct CheckColoredDiagnosticsAction : public clang::ASTFrontendAction {
-  CheckColoredDiagnosticsAction(bool ShouldShowColor)
-      : ShouldShowColor(ShouldShowColor) {}
-  std::unique_ptr<ASTConsumer> CreateASTConsumer(CompilerInstance &Compiler,
-                                                 StringRef) override {
-    if (Compiler.getDiagnosticOpts().ShowColors != ShouldShowColor)
-      Compiler.getDiagnostics().Report(
-          Compiler.getDiagnostics().getCustomDiagID(
-              DiagnosticsEngine::Fatal,
-              "getDiagnosticOpts().ShowColors != ShouldShowColor"));
-    return std::make_unique<ASTConsumer>();
-  }
-
-private:
-  bool ShouldShowColor = true;
-};
-
-TEST(runToolOnCodeWithArgs, DiagnosticsColor) {
-  EXPECT_TRUE(runToolOnCodeWithArgs(
-      std::make_unique<CheckColoredDiagnosticsAction>(true), "",
-      {"-fcolor-diagnostics"}));
-  EXPECT_TRUE(runToolOnCodeWithArgs(
-      std::make_unique<CheckColoredDiagnosticsAction>(false), "",
-      {"-fno-color-diagnostics"}));
-  EXPECT_TRUE(runToolOnCodeWithArgs(
-      std::make_unique<CheckColoredDiagnosticsAction>(true), "",
-      {"-fno-color-diagnostics", "-fcolor-diagnostics"}));
-  EXPECT_TRUE(runToolOnCodeWithArgs(
-      std::make_unique<CheckColoredDiagnosticsAction>(false), "",
-      {"-fcolor-diagnostics", "-fno-color-diagnostics"}));
-  EXPECT_TRUE(runToolOnCodeWithArgs(
-      std::make_unique<CheckColoredDiagnosticsAction>(true), "",
-      {"-fno-color-diagnostics", "-fdiagnostics-color=always"}));
-
-  // Check that this test would fail if ShowColors is not what it should.
-  EXPECT_FALSE(runToolOnCodeWithArgs(
-      std::make_unique<CheckColoredDiagnosticsAction>(false), "",
-      {"-fcolor-diagnostics"}));
-}
-
-TEST(ClangToolTest, ArgumentAdjusters) {
-  FixedCompilationDatabase Compilations("/", std::vector<std::string>());
-
-  ClangTool Tool(Compilations, std::vector<std::string>(1, "/a.cc"));
-  Tool.mapVirtualFile("/a.cc", "void a() {}");
-
-  std::unique_ptr<FrontendActionFactory> Action(
-      newFrontendActionFactory<SyntaxOnlyAction>());
-
-  bool Found = false;
-  bool Ran = false;
-  ArgumentsAdjuster CheckSyntaxOnlyAdjuster =
-      [&Found, &Ran](const CommandLineArguments &Args, StringRef /*unused*/) {
-    Ran = true;
-    if (llvm::is_contained(Args, "-fsyntax-only"))
-      Found = true;
-    return Args;
-  };
-  Tool.appendArgumentsAdjuster(CheckSyntaxOnlyAdjuster);
-  Tool.run(Action.get());
-  EXPECT_TRUE(Ran);
-  EXPECT_TRUE(Found);
-
-  Ran = Found = false;
-  Tool.clearArgumentsAdjusters();
-  Tool.appendArgumentsAdjuster(CheckSyntaxOnlyAdjuster);
-  Tool.appendArgumentsAdjuster(getClangSyntaxOnlyAdjuster());
-  Tool.run(Action.get());
-  EXPECT_TRUE(Ran);
-  EXPECT_FALSE(Found);
-}
-
-TEST(ClangToolTest, NoDoubleSyntaxOnly) {
-  FixedCompilationDatabase Compilations("/", {"-fsyntax-only"});
-
-  ClangTool Tool(Compilations, std::vector<std::string>(1, "/a.cc"));
-  Tool.mapVirtualFile("/a.cc", "void a() {}");
-
-  std::unique_ptr<FrontendActionFactory> Action(
-      newFrontendActionFactory<SyntaxOnlyAction>());
-
-  size_t SyntaxOnlyCount = 0;
-  ArgumentsAdjuster CheckSyntaxOnlyAdjuster =
-      [&SyntaxOnlyCount](const CommandLineArguments &Args,
-                         StringRef /*unused*/) {
-        for (llvm::StringRef Arg : Args) {
-          if (Arg == "-fsyntax-only")
-            ++SyntaxOnlyCount;
-        }
-        return Args;
-      };
-
-  Tool.clearArgumentsAdjusters();
-  Tool.appendArgumentsAdjuster(getClangSyntaxOnlyAdjuster());
-  Tool.appendArgumentsAdjuster(CheckSyntaxOnlyAdjuster);
-  Tool.run(Action.get());
-  EXPECT_EQ(SyntaxOnlyCount, 1U);
-}
-
-TEST(ClangToolTest, NoOutputCommands) {
-  FixedCompilationDatabase Compilations("/", {"-save-temps", "-save-temps=cwd",
-                                              "--save-temps",
-                                              "--save-temps=somedir"});
-
-  ClangTool Tool(Compilations, std::vector<std::string>(1, "/a.cc"));
-  Tool.mapVirtualFile("/a.cc", "void a() {}");
-
-  std::unique_ptr<FrontendActionFactory> Action(
-      newFrontendActionFactory<SyntaxOnlyAction>());
-
-  const std::vector<llvm::StringRef> OutputCommands = {"-save-temps"};
-  bool Ran = false;
-  ArgumentsAdjuster CheckSyntaxOnlyAdjuster =
-      [&OutputCommands, &Ran](const CommandLineArguments &Args,
-                              StringRef /*unused*/) {
-        for (llvm::StringRef Arg : Args) {
-          for (llvm::StringRef OutputCommand : OutputCommands)
-            EXPECT_FALSE(Arg.contains(OutputCommand));
-        }
-        Ran = true;
-        return Args;
-      };
-
-  Tool.clearArgumentsAdjusters();
-  Tool.appendArgumentsAdjuster(getClangSyntaxOnlyAdjuster());
-  Tool.appendArgumentsAdjuster(CheckSyntaxOnlyAdjuster);
-  Tool.run(Action.get());
-  EXPECT_TRUE(Ran);
-}
-
-TEST(ClangToolTest, BaseVirtualFileSystemUsage) {
-  FixedCompilationDatabase Compilations("/", std::vector<std::string>());
-  llvm::IntrusiveRefCntPtr<llvm::vfs::OverlayFileSystem> OverlayFileSystem(
-      new llvm::vfs::OverlayFileSystem(llvm::vfs::getRealFileSystem()));
-  llvm::IntrusiveRefCntPtr<llvm::vfs::InMemoryFileSystem> InMemoryFileSystem(
-      new llvm::vfs::InMemoryFileSystem);
-  OverlayFileSystem->pushOverlay(InMemoryFileSystem);
-
-  InMemoryFileSystem->addFile(
-      "a.cpp", 0, llvm::MemoryBuffer::getMemBuffer("int main() {}"));
-
-  ClangTool Tool(Compilations, std::vector<std::string>(1, "a.cpp"),
-                 std::make_shared<PCHContainerOperations>(), OverlayFileSystem);
-  std::unique_ptr<FrontendActionFactory> Action(
-      newFrontendActionFactory<SyntaxOnlyAction>());
-  EXPECT_EQ(0, Tool.run(Action.get()));
-}
-
-// Check getClangStripDependencyFileAdjuster doesn't strip args after -MD/-MMD.
-TEST(ClangToolTest, StripDependencyFileAdjuster) {
-  FixedCompilationDatabase Compilations("/", {"-MD", "-c", "-MMD", "-w"});
-
-  ClangTool Tool(Compilations, std::vector<std::string>(1, "/a.cc"));
-  Tool.mapVirtualFile("/a.cc", "void a() {}");
-
-  std::unique_ptr<FrontendActionFactory> Action(
-      newFrontendActionFactory<SyntaxOnlyAction>());
-
-  CommandLineArguments FinalArgs;
-  ArgumentsAdjuster CheckFlagsAdjuster =
-    [&FinalArgs](const CommandLineArguments &Args, StringRef /*unused*/) {
-      FinalArgs = Args;
-      return Args;
-    };
-  Tool.clearArgumentsAdjusters();
-  Tool.appendArgumentsAdjuster(getClangStripDependencyFileAdjuster());
-  Tool.appendArgumentsAdjuster(CheckFlagsAdjuster);
-  Tool.run(Action.get());
-
-  auto HasFlag = [&FinalArgs](const std::string &Flag) {
-    return llvm::find(FinalArgs, Flag) != FinalArgs.end();
-  };
-  EXPECT_FALSE(HasFlag("-MD"));
-  EXPECT_FALSE(HasFlag("-MMD"));
-  EXPECT_TRUE(HasFlag("-c"));
-  EXPECT_TRUE(HasFlag("-w"));
-}
-
-// Check getClangStripDependencyFileAdjuster strips /showIncludes and variants
-TEST(ClangToolTest, StripDependencyFileAdjusterShowIncludes) {
-  FixedCompilationDatabase Compilations(
-      "/", {"/showIncludes", "/showIncludes:user", "-showIncludes",
-            "-showIncludes:user", "-c"});
-
-  ClangTool Tool(Compilations, std::vector<std::string>(1, "/a.cc"));
-  Tool.mapVirtualFile("/a.cc", "void a() {}");
-
-  std::unique_ptr<FrontendActionFactory> Action(
-      newFrontendActionFactory<SyntaxOnlyAction>());
-
-  CommandLineArguments FinalArgs;
-  ArgumentsAdjuster CheckFlagsAdjuster =
-      [&FinalArgs](const CommandLineArguments &Args, StringRef /*unused*/) {
-        FinalArgs = Args;
-        return Args;
-      };
-  Tool.clearArgumentsAdjusters();
-  Tool.appendArgumentsAdjuster(getClangStripDependencyFileAdjuster());
-  Tool.appendArgumentsAdjuster(CheckFlagsAdjuster);
-  Tool.run(Action.get());
-
-  auto HasFlag = [&FinalArgs](const std::string &Flag) {
-    return llvm::find(FinalArgs, Flag) != FinalArgs.end();
-  };
-  EXPECT_FALSE(HasFlag("/showIncludes"));
-  EXPECT_FALSE(HasFlag("/showIncludes:user"));
-  EXPECT_FALSE(HasFlag("-showIncludes"));
-  EXPECT_FALSE(HasFlag("-showIncludes:user"));
-  EXPECT_TRUE(HasFlag("-c"));
-}
-
-// Check getClangStripDependencyFileAdjuster doesn't strip args when using the
-// MSVC cl.exe driver
-TEST(ClangToolTest, StripDependencyFileAdjusterMsvc) {
-  FixedCompilationDatabase Compilations(
-      "/", {"--driver-mode=cl", "-MD", "-MDd", "-MT", "-O1", "-MTd", "-MP"});
-
-  ClangTool Tool(Compilations, std::vector<std::string>(1, "/a.cc"));
-  Tool.mapVirtualFile("/a.cc", "void a() {}");
-
-  std::unique_ptr<FrontendActionFactory> Action(
-      newFrontendActionFactory<SyntaxOnlyAction>());
-
-  CommandLineArguments FinalArgs;
-  ArgumentsAdjuster CheckFlagsAdjuster =
-      [&FinalArgs](const CommandLineArguments &Args, StringRef /*unused*/) {
-        FinalArgs = Args;
-        return Args;
-      };
-  Tool.clearArgumentsAdjusters();
-  Tool.appendArgumentsAdjuster(getClangStripDependencyFileAdjuster());
-  Tool.appendArgumentsAdjuster(CheckFlagsAdjuster);
-  Tool.run(Action.get());
-
-  auto HasFlag = [&FinalArgs](const std::string &Flag) {
-    return llvm::find(FinalArgs, Flag) != FinalArgs.end();
-  };
-  EXPECT_TRUE(HasFlag("-MD"));
-  EXPECT_TRUE(HasFlag("-MDd"));
-  EXPECT_TRUE(HasFlag("-MT"));
-  EXPECT_TRUE(HasFlag("-O1"));
-  EXPECT_TRUE(HasFlag("-MTd"));
-  EXPECT_TRUE(HasFlag("-MP"));
-}
-
-// Check getClangStripPluginsAdjuster strips plugin related args.
-TEST(ClangToolTest, StripPluginsAdjuster) {
-  FixedCompilationDatabase Compilations(
-      "/", {"-Xclang", "-add-plugin", "-Xclang", "random-plugin"});
-
-  ClangTool Tool(Compilations, std::vector<std::string>(1, "/a.cc"));
-  Tool.mapVirtualFile("/a.cc", "void a() {}");
-
-  std::unique_ptr<FrontendActionFactory> Action(
-      newFrontendActionFactory<SyntaxOnlyAction>());
-
-  CommandLineArguments FinalArgs;
-  ArgumentsAdjuster CheckFlagsAdjuster =
-      [&FinalArgs](const CommandLineArguments &Args, StringRef /*unused*/) {
-        FinalArgs = Args;
-        return Args;
-      };
-  Tool.clearArgumentsAdjusters();
-  Tool.appendArgumentsAdjuster(getStripPluginsAdjuster());
-  Tool.appendArgumentsAdjuster(CheckFlagsAdjuster);
-  Tool.run(Action.get());
-
-  auto HasFlag = [&FinalArgs](const std::string &Flag) {
-    return llvm::find(FinalArgs, Flag) != FinalArgs.end();
-  };
-  EXPECT_FALSE(HasFlag("-Xclang"));
-  EXPECT_FALSE(HasFlag("-add-plugin"));
-  EXPECT_FALSE(HasFlag("-random-plugin"));
-}
-
-namespace {
-/// Find a target name such that looking for it in TargetRegistry by that name
-/// returns the same target. We expect that there is at least one target
-/// configured with this property.
-std::string getAnyTarget() {
-  llvm::InitializeAllTargets();
-  for (const auto &Target : llvm::TargetRegistry::targets()) {
-    std::string Error;
-    StringRef TargetName(Target.getName());
-    if (TargetName == "x86-64")
-      TargetName = "x86_64";
-    if (llvm::TargetRegistry::lookupTarget(std::string(TargetName), Error) ==
-        &Target) {
-      return std::string(TargetName);
-    }
-  }
-  return "";
-}
-}
-
-TEST(addTargetAndModeForProgramName, AddsTargetAndMode) {
-  std::string Target = getAnyTarget();
-  ASSERT_FALSE(Target.empty());
-
-  std::vector<std::string> Args = {"clang", "-foo"};
-  addTargetAndModeForProgramName(Args, "");
-  EXPECT_EQ((std::vector<std::string>{"clang", "-foo"}), Args);
-  addTargetAndModeForProgramName(Args, Target + "-g++");
-  EXPECT_EQ((std::vector<std::string>{"clang", "--target=" + Target,
-                                      "--driver-mode=g++", "-foo"}),
-            Args);
-}
-
-TEST(addTargetAndModeForProgramName, PathIgnored) {
-  std::string Target = getAnyTarget();
-  ASSERT_FALSE(Target.empty());
-
-  SmallString<32> ToolPath;
-  llvm::sys::path::append(ToolPath, "foo", "bar", Target + "-g++");
-
-  std::vector<std::string> Args = {"clang", "-foo"};
-  addTargetAndModeForProgramName(Args, ToolPath);
-  EXPECT_EQ((std::vector<std::string>{"clang", "--target=" + Target,
-                                      "--driver-mode=g++", "-foo"}),
-            Args);
-}
-
-TEST(addTargetAndModeForProgramName, IgnoresExistingTarget) {
-  std::string Target = getAnyTarget();
-  ASSERT_FALSE(Target.empty());
-
-  std::vector<std::string> Args = {"clang", "-foo", "-target", "something"};
-  addTargetAndModeForProgramName(Args, Target + "-g++");
-  EXPECT_EQ((std::vector<std::string>{"clang", "--driver-mode=g++", "-foo",
-                                      "-target", "something"}),
-            Args);
-
-  std::vector<std::string> ArgsAlt = {"clang", "-foo", "--target=something"};
-  addTargetAndModeForProgramName(ArgsAlt, Target + "-g++");
-  EXPECT_EQ((std::vector<std::string>{"clang", "--driver-mode=g++", "-foo",
-                                      "--target=something"}),
-            ArgsAlt);
-}
-
-TEST(addTargetAndModeForProgramName, IgnoresExistingMode) {
-  std::string Target = getAnyTarget();
-  ASSERT_FALSE(Target.empty());
-
-  std::vector<std::string> Args = {"clang", "-foo", "--driver-mode=abc"};
-  addTargetAndModeForProgramName(Args, Target + "-g++");
-  EXPECT_EQ((std::vector<std::string>{"clang", "--target=" + Target, "-foo",
-                                      "--driver-mode=abc"}),
-            Args);
-}
-
-#ifndef _WIN32
-TEST(ClangToolTest, BuildASTs) {
-  FixedCompilationDatabase Compilations("/", std::vector<std::string>());
-
-  std::vector<std::string> Sources;
-  Sources.push_back("/a.cc");
-  Sources.push_back("/b.cc");
-  ClangTool Tool(Compilations, Sources);
-
-  Tool.mapVirtualFile("/a.cc", "void a() {}");
-  Tool.mapVirtualFile("/b.cc", "void b() {}");
-
-  std::vector<std::unique_ptr<ASTUnit>> ASTs;
-  EXPECT_EQ(0, Tool.buildASTs(ASTs));
-  EXPECT_EQ(2u, ASTs.size());
-}
-
-TEST(ClangToolTest, InjectDiagnosticConsumer) {
-  FixedCompilationDatabase Compilations("/", std::vector<std::string>());
-  ClangTool Tool(Compilations, std::vector<std::string>(1, "/a.cc"));
-  Tool.mapVirtualFile("/a.cc", "int x = undeclared;");
-  TestDiagnosticConsumer Consumer;
-  Tool.setDiagnosticConsumer(&Consumer);
-  std::unique_ptr<FrontendActionFactory> Action(
-      newFrontendActionFactory<SyntaxOnlyAction>());
-  Tool.run(Action.get());
-  EXPECT_EQ(1u, Consumer.NumDiagnosticsSeen);
-}
-
-TEST(ClangToolTest, InjectDiagnosticConsumerInBuildASTs) {
-  FixedCompilationDatabase Compilations("/", std::vector<std::string>());
-  ClangTool Tool(Compilations, std::vector<std::string>(1, "/a.cc"));
-  Tool.mapVirtualFile("/a.cc", "int x = undeclared;");
-  TestDiagnosticConsumer Consumer;
-  Tool.setDiagnosticConsumer(&Consumer);
-  std::vector<std::unique_ptr<ASTUnit>> ASTs;
-  Tool.buildASTs(ASTs);
-  EXPECT_EQ(1u, ASTs.size());
-  EXPECT_EQ(1u, Consumer.NumDiagnosticsSeen);
-}
-#endif
-
-TEST(runToolOnCode, TestResetDiagnostics) {
-  // This is a tool that resets the diagnostic during the compilation.
-  struct ResetDiagnosticAction : public clang::ASTFrontendAction {
-    std::unique_ptr<ASTConsumer> CreateASTConsumer(CompilerInstance &Compiler,
-                                                   StringRef) override {
-      struct Consumer : public clang::ASTConsumer {
-        bool HandleTopLevelDecl(clang::DeclGroupRef D) override {
-          auto &Diags = (*D.begin())->getASTContext().getDiagnostics();
-          // Ignore any error
-          Diags.Reset();
-          // Disable warnings because computing the CFG might crash.
-          Diags.setIgnoreAllWarnings(true);
-          return true;
-        }
-      };
-      return std::make_unique<Consumer>();
-    }
-  };
-
-  // Should not crash
-  EXPECT_FALSE(
-      runToolOnCode(std::make_unique<ResetDiagnosticAction>(),
-                    "struct Foo { Foo(int); ~Foo(); struct Fwd _fwd; };"
-                    "void func() { long x; Foo f(x); }"));
-}
-
-} // end namespace tooling
-} // end namespace clang
diff --git a/gnu/llvm/clang/unittests/Tooling/TransformerTest.cpp b/gnu/llvm/clang/unittests/Tooling/TransformerTest.cpp
deleted file mode 100644
index 9ef1c08a7cf..00000000000
--- a/gnu/llvm/clang/unittests/Tooling/TransformerTest.cpp
+++ /dev/null
@@ -1,1641 +0,0 @@
-//===- unittest/Tooling/TransformerTest.cpp -------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/Tooling/Transformer/Transformer.h"
-#include "clang/ASTMatchers/ASTMatchers.h"
-#include "clang/Tooling/Tooling.h"
-#include "clang/Tooling/Transformer/RangeSelector.h"
-#include "clang/Tooling/Transformer/RewriteRule.h"
-#include "clang/Tooling/Transformer/Stencil.h"
-#include "llvm/Support/Errc.h"
-#include "llvm/Support/Error.h"
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-
-using namespace clang;
-using namespace tooling;
-using namespace ast_matchers;
-namespace {
-using ::clang::transformer::addInclude;
-using ::clang::transformer::applyFirst;
-using ::clang::transformer::before;
-using ::clang::transformer::cat;
-using ::clang::transformer::changeTo;
-using ::clang::transformer::makeRule;
-using ::clang::transformer::member;
-using ::clang::transformer::name;
-using ::clang::transformer::node;
-using ::clang::transformer::remove;
-using ::clang::transformer::rewriteDescendants;
-using ::clang::transformer::RewriteRule;
-using ::clang::transformer::statement;
-using ::testing::ElementsAre;
-using ::testing::IsEmpty;
-
-constexpr char KHeaderContents[] = R"cc(
-  struct string {
-    string(const char*);
-    char* c_str();
-    int size();
-  };
-  int strlen(const char*);
-
-  namespace proto {
-  struct PCFProto {
-    int foo();
-  };
-  struct ProtoCommandLineFlag : PCFProto {
-    PCFProto& GetProto();
-  };
-  }  // namespace proto
-  class Logger {};
-  void operator<<(Logger& l, string msg);
-  Logger& log(int level);
-)cc";
-
-static ast_matchers::internal::Matcher<clang::QualType>
-isOrPointsTo(const clang::ast_matchers::DeclarationMatcher &TypeMatcher) {
-  return anyOf(hasDeclaration(TypeMatcher), pointsTo(TypeMatcher));
-}
-
-static std::string format(StringRef Code) {
-  const std::vector<Range> Ranges(1, Range(0, Code.size()));
-  auto Style = format::getLLVMStyle();
-  const auto Replacements = format::reformat(Style, Code, Ranges);
-  auto Formatted = applyAllReplacements(Code, Replacements);
-  if (!Formatted) {
-    ADD_FAILURE() << "Could not format code: "
-                  << llvm::toString(Formatted.takeError());
-    return std::string();
-  }
-  return *Formatted;
-}
-
-static void compareSnippets(StringRef Expected,
-                     const llvm::Optional<std::string> &MaybeActual) {
-  ASSERT_TRUE(MaybeActual) << "Rewrite failed. Expecting: " << Expected;
-  auto Actual = *MaybeActual;
-  std::string HL = "#include \"header.h\"\n";
-  auto I = Actual.find(HL);
-  if (I != std::string::npos)
-    Actual.erase(I, HL.size());
-  EXPECT_EQ(format(Expected), format(Actual));
-}
-
-// FIXME: consider separating this class into its own file(s).
-class ClangRefactoringTestBase : public testing::Test {
-protected:
-  void appendToHeader(StringRef S) { FileContents[0].second += S; }
-
-  void addFile(StringRef Filename, StringRef Content) {
-    FileContents.emplace_back(std::string(Filename), std::string(Content));
-  }
-
-  llvm::Optional<std::string> rewrite(StringRef Input) {
-    std::string Code = ("#include \"header.h\"\n" + Input).str();
-    auto Factory = newFrontendActionFactory(&MatchFinder);
-    if (!runToolOnCodeWithArgs(
-            Factory->create(), Code, std::vector<std::string>(), "input.cc",
-            "clang-tool", std::make_shared<PCHContainerOperations>(),
-            FileContents)) {
-      llvm::errs() << "Running tool failed.\n";
-      return None;
-    }
-    if (ErrorCount != 0) {
-      llvm::errs() << "Generating changes failed.\n";
-      return None;
-    }
-    auto ChangedCode =
-        applyAtomicChanges("input.cc", Code, Changes, ApplyChangesSpec());
-    if (!ChangedCode) {
-      llvm::errs() << "Applying changes failed: "
-                   << llvm::toString(ChangedCode.takeError()) << "\n";
-      return None;
-    }
-    return *ChangedCode;
-  }
-
-  Transformer::ChangeConsumer consumer() {
-    return [this](Expected<AtomicChange> C) {
-      if (C) {
-        Changes.push_back(std::move(*C));
-      } else {
-        // FIXME: stash this error rather then printing.
-        llvm::errs() << "Error generating changes: "
-                     << llvm::toString(C.takeError()) << "\n";
-        ++ErrorCount;
-      }
-    };
-  }
-
-  template <typename R>
-  void testRule(R Rule, StringRef Input, StringRef Expected) {
-    Transformers.push_back(
-        std::make_unique<Transformer>(std::move(Rule), consumer()));
-    Transformers.back()->registerMatchers(&MatchFinder);
-    compareSnippets(Expected, rewrite(Input));
-  }
-
-  template <typename R> void testRuleFailure(R Rule, StringRef Input) {
-    Transformers.push_back(
-        std::make_unique<Transformer>(std::move(Rule), consumer()));
-    Transformers.back()->registerMatchers(&MatchFinder);
-    ASSERT_FALSE(rewrite(Input)) << "Expected failure to rewrite code";
-  }
-
-  // Transformers are referenced by MatchFinder.
-  std::vector<std::unique_ptr<Transformer>> Transformers;
-  clang::ast_matchers::MatchFinder MatchFinder;
-  // Records whether any errors occurred in individual changes.
-  int ErrorCount = 0;
-  AtomicChanges Changes;
-
-private:
-  FileContentMappings FileContents = {{"header.h", ""}};
-};
-
-class TransformerTest : public ClangRefactoringTestBase {
-protected:
-  TransformerTest() { appendToHeader(KHeaderContents); }
-};
-
-// Given string s, change strlen($s.c_str()) to REPLACED.
-static RewriteRule ruleStrlenSize() {
-  StringRef StringExpr = "strexpr";
-  auto StringType = namedDecl(hasAnyName("::basic_string", "::string"));
-  auto R = makeRule(
-      callExpr(callee(functionDecl(hasName("strlen"))),
-               hasArgument(0, cxxMemberCallExpr(
-                                  on(expr(hasType(isOrPointsTo(StringType)))
-                                         .bind(StringExpr)),
-                                  callee(cxxMethodDecl(hasName("c_str")))))),
-      changeTo(cat("REPLACED")), cat("Use size() method directly on string."));
-  return R;
-}
-
-TEST_F(TransformerTest, StrlenSize) {
-  std::string Input = "int f(string s) { return strlen(s.c_str()); }";
-  std::string Expected = "int f(string s) { return REPLACED; }";
-  testRule(ruleStrlenSize(), Input, Expected);
-}
-
-// Tests that no change is applied when a match is not expected.
-TEST_F(TransformerTest, NoMatch) {
-  std::string Input = "int f(string s) { return s.size(); }";
-  testRule(ruleStrlenSize(), Input, Input);
-}
-
-// Tests replacing an expression.
-TEST_F(TransformerTest, Flag) {
-  StringRef Flag = "flag";
-  RewriteRule Rule = makeRule(
-      cxxMemberCallExpr(on(expr(hasType(cxxRecordDecl(
-                                    hasName("proto::ProtoCommandLineFlag"))))
-                               .bind(Flag)),
-                        unless(callee(cxxMethodDecl(hasName("GetProto"))))),
-      changeTo(node(std::string(Flag)), cat("EXPR")));
-
-  std::string Input = R"cc(
-    proto::ProtoCommandLineFlag flag;
-    int x = flag.foo();
-    int y = flag.GetProto().foo();
-  )cc";
-  std::string Expected = R"cc(
-    proto::ProtoCommandLineFlag flag;
-    int x = EXPR.foo();
-    int y = flag.GetProto().foo();
-  )cc";
-
-  testRule(std::move(Rule), Input, Expected);
-}
-
-TEST_F(TransformerTest, AddIncludeQuoted) {
-  RewriteRule Rule =
-      makeRule(callExpr(callee(functionDecl(hasName("f")))),
-               {addInclude("clang/OtherLib.h"), changeTo(cat("other()"))});
-
-  std::string Input = R"cc(
-    int f(int x);
-    int h(int x) { return f(x); }
-  )cc";
-  std::string Expected = R"cc(#include "clang/OtherLib.h"
-
-    int f(int x);
-    int h(int x) { return other(); }
-  )cc";
-
-  testRule(Rule, Input, Expected);
-}
-
-TEST_F(TransformerTest, AddIncludeAngled) {
-  RewriteRule Rule = makeRule(
-      callExpr(callee(functionDecl(hasName("f")))),
-      {addInclude("clang/OtherLib.h", transformer::IncludeFormat::Angled),
-       changeTo(cat("other()"))});
-
-  std::string Input = R"cc(
-    int f(int x);
-    int h(int x) { return f(x); }
-  )cc";
-  std::string Expected = R"cc(#include <clang/OtherLib.h>
-
-    int f(int x);
-    int h(int x) { return other(); }
-  )cc";
-
-  testRule(Rule, Input, Expected);
-}
-
-TEST_F(TransformerTest, AddIncludeQuotedForRule) {
-  RewriteRule Rule = makeRule(callExpr(callee(functionDecl(hasName("f")))),
-                              changeTo(cat("other()")));
-  addInclude(Rule, "clang/OtherLib.h");
-
-  std::string Input = R"cc(
-    int f(int x);
-    int h(int x) { return f(x); }
-  )cc";
-  std::string Expected = R"cc(#include "clang/OtherLib.h"
-
-    int f(int x);
-    int h(int x) { return other(); }
-  )cc";
-
-  testRule(Rule, Input, Expected);
-}
-
-TEST_F(TransformerTest, AddIncludeAngledForRule) {
-  RewriteRule Rule = makeRule(callExpr(callee(functionDecl(hasName("f")))),
-                              changeTo(cat("other()")));
-  addInclude(Rule, "clang/OtherLib.h", transformer::IncludeFormat::Angled);
-
-  std::string Input = R"cc(
-    int f(int x);
-    int h(int x) { return f(x); }
-  )cc";
-  std::string Expected = R"cc(#include <clang/OtherLib.h>
-
-    int f(int x);
-    int h(int x) { return other(); }
-  )cc";
-
-  testRule(Rule, Input, Expected);
-}
-
-TEST_F(TransformerTest, NodePartNameNamedDecl) {
-  StringRef Fun = "fun";
-  RewriteRule Rule = makeRule(functionDecl(hasName("bad")).bind(Fun),
-                              changeTo(name(std::string(Fun)), cat("good")));
-
-  std::string Input = R"cc(
-    int bad(int x);
-    int bad(int x) { return x * x; }
-  )cc";
-  std::string Expected = R"cc(
-    int good(int x);
-    int good(int x) { return x * x; }
-  )cc";
-
-  testRule(Rule, Input, Expected);
-}
-
-TEST_F(TransformerTest, NodePartNameDeclRef) {
-  std::string Input = R"cc(
-    template <typename T>
-    T bad(T x) {
-      return x;
-    }
-    int neutral(int x) { return bad<int>(x) * x; }
-  )cc";
-  std::string Expected = R"cc(
-    template <typename T>
-    T bad(T x) {
-      return x;
-    }
-    int neutral(int x) { return good<int>(x) * x; }
-  )cc";
-
-  StringRef Ref = "ref";
-  testRule(makeRule(declRefExpr(to(functionDecl(hasName("bad")))).bind(Ref),
-                    changeTo(name(std::string(Ref)), cat("good"))),
-           Input, Expected);
-}
-
-TEST_F(TransformerTest, NodePartNameDeclRefFailure) {
-  std::string Input = R"cc(
-    struct Y {
-      int operator*();
-    };
-    int neutral(int x) {
-      Y y;
-      int (Y::*ptr)() = &Y::operator*;
-      return *y + x;
-    }
-  )cc";
-
-  StringRef Ref = "ref";
-  Transformer T(makeRule(declRefExpr(to(functionDecl())).bind(Ref),
-                         changeTo(name(std::string(Ref)), cat("good"))),
-                consumer());
-  T.registerMatchers(&MatchFinder);
-  EXPECT_FALSE(rewrite(Input));
-}
-
-TEST_F(TransformerTest, NodePartMember) {
-  StringRef E = "expr";
-  RewriteRule Rule =
-      makeRule(memberExpr(clang::ast_matchers::member(hasName("bad"))).bind(E),
-               changeTo(member(std::string(E)), cat("good")));
-
-  std::string Input = R"cc(
-    struct S {
-      int bad;
-    };
-    int g() {
-      S s;
-      return s.bad;
-    }
-  )cc";
-  std::string Expected = R"cc(
-    struct S {
-      int bad;
-    };
-    int g() {
-      S s;
-      return s.good;
-    }
-  )cc";
-
-  testRule(Rule, Input, Expected);
-}
-
-TEST_F(TransformerTest, NodePartMemberQualified) {
-  std::string Input = R"cc(
-    struct S {
-      int bad;
-      int good;
-    };
-    struct T : public S {
-      int bad;
-    };
-    int g() {
-      T t;
-      return t.S::bad;
-    }
-  )cc";
-  std::string Expected = R"cc(
-    struct S {
-      int bad;
-      int good;
-    };
-    struct T : public S {
-      int bad;
-    };
-    int g() {
-      T t;
-      return t.S::good;
-    }
-  )cc";
-
-  StringRef E = "expr";
-  testRule(makeRule(memberExpr().bind(E),
-                    changeTo(member(std::string(E)), cat("good"))),
-           Input, Expected);
-}
-
-TEST_F(TransformerTest, NodePartMemberMultiToken) {
-  std::string Input = R"cc(
-    struct Y {
-      int operator*();
-      int good();
-      template <typename T> void foo(T t);
-    };
-    int neutral(int x) {
-      Y y;
-      y.template foo<int>(3);
-      return y.operator *();
-    }
-  )cc";
-  std::string Expected = R"cc(
-    struct Y {
-      int operator*();
-      int good();
-      template <typename T> void foo(T t);
-    };
-    int neutral(int x) {
-      Y y;
-      y.template good<int>(3);
-      return y.good();
-    }
-  )cc";
-
-  StringRef MemExpr = "member";
-  testRule(makeRule(memberExpr().bind(MemExpr),
-                    changeTo(member(std::string(MemExpr)), cat("good"))),
-           Input, Expected);
-}
-
-TEST_F(TransformerTest, NoEdits) {
-  using transformer::noEdits;
-  std::string Input = "int f(int x) { return x; }";
-  testRule(makeRule(returnStmt().bind("return"), noEdits()), Input, Input);
-}
-
-TEST_F(TransformerTest, NoopEdit) {
-  using transformer::node;
-  using transformer::noopEdit;
-  std::string Input = "int f(int x) { return x; }";
-  testRule(makeRule(returnStmt().bind("return"), noopEdit(node("return"))),
-           Input, Input);
-}
-
-TEST_F(TransformerTest, IfBound2Args) {
-  using transformer::ifBound;
-  std::string Input = "int f(int x) { return x; }";
-  std::string Expected = "int f(int x) { CHANGE; }";
-  testRule(makeRule(returnStmt().bind("return"),
-                    ifBound("return", changeTo(cat("CHANGE;")))),
-           Input, Expected);
-}
-
-TEST_F(TransformerTest, IfBound3Args) {
-  using transformer::ifBound;
-  std::string Input = "int f(int x) { return x; }";
-  std::string Expected = "int f(int x) { CHANGE; }";
-  testRule(makeRule(returnStmt().bind("return"),
-                    ifBound("nothing", changeTo(cat("ERROR")),
-                            changeTo(cat("CHANGE;")))),
-           Input, Expected);
-}
-
-TEST_F(TransformerTest, ShrinkTo) {
-  using transformer::shrinkTo;
-  std::string Input = "int f(int x) { return x; }";
-  std::string Expected = "return x;";
-  testRule(makeRule(functionDecl(hasDescendant(returnStmt().bind("return")))
-                        .bind("function"),
-                    shrinkTo(node("function"), node("return"))),
-           Input, Expected);
-}
-
-// Rewrite various Stmts inside a Decl.
-TEST_F(TransformerTest, RewriteDescendantsDeclChangeStmt) {
-  std::string Input =
-      "int f(int x) { int y = x; { int z = x * x; } return x; }";
-  std::string Expected =
-      "int f(int x) { int y = 3; { int z = 3 * 3; } return 3; }";
-  auto InlineX =
-      makeRule(declRefExpr(to(varDecl(hasName("x")))), changeTo(cat("3")));
-  testRule(makeRule(functionDecl(hasName("f")).bind("fun"),
-                    rewriteDescendants("fun", InlineX)),
-           Input, Expected);
-}
-
-// Rewrite various TypeLocs inside a Decl.
-TEST_F(TransformerTest, RewriteDescendantsDeclChangeTypeLoc) {
-  std::string Input = "int f(int *x) { return *x; }";
-  std::string Expected = "char f(char *x) { return *x; }";
-  auto IntToChar = makeRule(typeLoc(loc(qualType(isInteger(), builtinType()))),
-                            changeTo(cat("char")));
-  testRule(makeRule(functionDecl(hasName("f")).bind("fun"),
-                    rewriteDescendants("fun", IntToChar)),
-           Input, Expected);
-}
-
-TEST_F(TransformerTest, RewriteDescendantsStmt) {
-  // Add an unrelated definition to the header that also has a variable named
-  // "x", to test that the rewrite is limited to the scope we intend.
-  appendToHeader(R"cc(int g(int x) { return x; })cc");
-  std::string Input =
-      "int f(int x) { int y = x; { int z = x * x; } return x; }";
-  std::string Expected =
-      "int f(int x) { int y = 3; { int z = 3 * 3; } return 3; }";
-  auto InlineX =
-      makeRule(declRefExpr(to(varDecl(hasName("x")))), changeTo(cat("3")));
-  testRule(makeRule(functionDecl(hasName("f"), hasBody(stmt().bind("body"))),
-                    rewriteDescendants("body", InlineX)),
-           Input, Expected);
-}
-
-TEST_F(TransformerTest, RewriteDescendantsStmtWithAdditionalChange) {
-  std::string Input =
-      "int f(int x) { int y = x; { int z = x * x; } return x; }";
-  std::string Expected =
-      "int newName(int x) { int y = 3; { int z = 3 * 3; } return 3; }";
-  auto InlineX =
-      makeRule(declRefExpr(to(varDecl(hasName("x")))), changeTo(cat("3")));
-  testRule(
-      makeRule(
-          functionDecl(hasName("f"), hasBody(stmt().bind("body"))).bind("f"),
-          flatten(changeTo(name("f"), cat("newName")),
-                  rewriteDescendants("body", InlineX))),
-      Input, Expected);
-}
-
-TEST_F(TransformerTest, RewriteDescendantsTypeLoc) {
-  std::string Input = "int f(int *x) { return *x; }";
-  std::string Expected = "int f(char *x) { return *x; }";
-  auto IntToChar =
-      makeRule(typeLoc(loc(qualType(isInteger(), builtinType()))).bind("loc"),
-               changeTo(cat("char")));
-  testRule(
-      makeRule(functionDecl(hasName("f"),
-                            hasParameter(0, varDecl(hasTypeLoc(
-                                                typeLoc().bind("parmType"))))),
-               rewriteDescendants("parmType", IntToChar)),
-      Input, Expected);
-}
-
-TEST_F(TransformerTest, RewriteDescendantsReferToParentBinding) {
-  std::string Input =
-      "int f(int p) { int y = p; { int z = p * p; } return p; }";
-  std::string Expected =
-      "int f(int p) { int y = 3; { int z = 3 * 3; } return 3; }";
-  std::string VarId = "var";
-  auto InlineVar = makeRule(declRefExpr(to(varDecl(equalsBoundNode(VarId)))),
-                            changeTo(cat("3")));
-  testRule(makeRule(functionDecl(hasName("f"),
-                                 hasParameter(0, varDecl().bind(VarId)))
-                        .bind("fun"),
-                    rewriteDescendants("fun", InlineVar)),
-           Input, Expected);
-}
-
-TEST_F(TransformerTest, RewriteDescendantsUnboundNode) {
-  std::string Input =
-      "int f(int x) { int y = x; { int z = x * x; } return x; }";
-  auto InlineX =
-      makeRule(declRefExpr(to(varDecl(hasName("x")))), changeTo(cat("3")));
-  Transformer T(makeRule(functionDecl(hasName("f")),
-                         rewriteDescendants("UNBOUND", InlineX)),
-                consumer());
-  T.registerMatchers(&MatchFinder);
-  EXPECT_FALSE(rewrite(Input));
-  EXPECT_THAT(Changes, IsEmpty());
-  EXPECT_EQ(ErrorCount, 1);
-}
-
-TEST_F(TransformerTest, RewriteDescendantsInvalidNodeType) {
-  std::string Input =
-      "int f(int x) { int y = x; { int z = x * x; } return x; }";
-  auto IntToChar =
-      makeRule(qualType(isInteger(), builtinType()), changeTo(cat("char")));
-  Transformer T(
-      makeRule(functionDecl(
-                   hasName("f"),
-                   hasParameter(0, varDecl(hasType(qualType().bind("type"))))),
-               rewriteDescendants("type", IntToChar)),
-      consumer());
-  T.registerMatchers(&MatchFinder);
-  EXPECT_FALSE(rewrite(Input));
-  EXPECT_THAT(Changes, IsEmpty());
-  EXPECT_EQ(ErrorCount, 1);
-}
-
-//
-// We include one test per typed overload. We don't test extensively since that
-// is already covered by the tests above.
-//
-
-TEST_F(TransformerTest, RewriteDescendantsTypedStmt) {
-  // Add an unrelated definition to the header that also has a variable named
-  // "x", to test that the rewrite is limited to the scope we intend.
-  appendToHeader(R"cc(int g(int x) { return x; })cc");
-  std::string Input =
-      "int f(int x) { int y = x; { int z = x * x; } return x; }";
-  std::string Expected =
-      "int f(int x) { int y = 3; { int z = 3 * 3; } return 3; }";
-  auto InlineX =
-      makeRule(declRefExpr(to(varDecl(hasName("x")))), changeTo(cat("3")));
-  testRule(makeRule(functionDecl(hasName("f"), hasBody(stmt().bind("body"))),
-                    [&InlineX](const MatchFinder::MatchResult &R) {
-                      const auto *Node = R.Nodes.getNodeAs<Stmt>("body");
-                      assert(Node != nullptr && "body must be bound");
-                      return transformer::detail::rewriteDescendants(
-                          *Node, InlineX, R);
-                    }),
-           Input, Expected);
-}
-
-TEST_F(TransformerTest, RewriteDescendantsTypedDecl) {
-  std::string Input =
-      "int f(int x) { int y = x; { int z = x * x; } return x; }";
-  std::string Expected =
-      "int f(int x) { int y = 3; { int z = 3 * 3; } return 3; }";
-  auto InlineX =
-      makeRule(declRefExpr(to(varDecl(hasName("x")))), changeTo(cat("3")));
-  testRule(makeRule(functionDecl(hasName("f")).bind("fun"),
-                    [&InlineX](const MatchFinder::MatchResult &R) {
-                      const auto *Node = R.Nodes.getNodeAs<Decl>("fun");
-                      assert(Node != nullptr && "fun must be bound");
-                      return transformer::detail::rewriteDescendants(
-                          *Node, InlineX, R);
-                    }),
-           Input, Expected);
-}
-
-TEST_F(TransformerTest, RewriteDescendantsTypedTypeLoc) {
-  std::string Input = "int f(int *x) { return *x; }";
-  std::string Expected = "int f(char *x) { return *x; }";
-  auto IntToChar =
-      makeRule(typeLoc(loc(qualType(isInteger(), builtinType()))).bind("loc"),
-               changeTo(cat("char")));
-  testRule(
-      makeRule(
-          functionDecl(
-              hasName("f"),
-              hasParameter(0, varDecl(hasTypeLoc(typeLoc().bind("parmType"))))),
-          [&IntToChar](const MatchFinder::MatchResult &R) {
-            const auto *Node = R.Nodes.getNodeAs<TypeLoc>("parmType");
-            assert(Node != nullptr && "parmType must be bound");
-            return transformer::detail::rewriteDescendants(*Node, IntToChar, R);
-          }),
-      Input, Expected);
-}
-
-TEST_F(TransformerTest, RewriteDescendantsTypedDynTyped) {
-  // Add an unrelated definition to the header that also has a variable named
-  // "x", to test that the rewrite is limited to the scope we intend.
-  appendToHeader(R"cc(int g(int x) { return x; })cc");
-  std::string Input =
-      "int f(int x) { int y = x; { int z = x * x; } return x; }";
-  std::string Expected =
-      "int f(int x) { int y = 3; { int z = 3 * 3; } return 3; }";
-  auto InlineX =
-      makeRule(declRefExpr(to(varDecl(hasName("x")))), changeTo(cat("3")));
-  testRule(
-      makeRule(functionDecl(hasName("f"), hasBody(stmt().bind("body"))),
-               [&InlineX](const MatchFinder::MatchResult &R) {
-                 auto It = R.Nodes.getMap().find("body");
-                 assert(It != R.Nodes.getMap().end() && "body must be bound");
-                 return transformer::detail::rewriteDescendants(It->second,
-                                                                InlineX, R);
-               }),
-      Input, Expected);
-}
-
-TEST_F(TransformerTest, InsertBeforeEdit) {
-  std::string Input = R"cc(
-    int f() {
-      return 7;
-    }
-  )cc";
-  std::string Expected = R"cc(
-    int f() {
-      int y = 3;
-      return 7;
-    }
-  )cc";
-
-  StringRef Ret = "return";
-  testRule(
-      makeRule(returnStmt().bind(Ret),
-               insertBefore(statement(std::string(Ret)), cat("int y = 3;"))),
-      Input, Expected);
-}
-
-TEST_F(TransformerTest, InsertAfterEdit) {
-  std::string Input = R"cc(
-    int f() {
-      int x = 5;
-      return 7;
-    }
-  )cc";
-  std::string Expected = R"cc(
-    int f() {
-      int x = 5;
-      int y = 3;
-      return 7;
-    }
-  )cc";
-
-  StringRef Decl = "decl";
-  testRule(
-      makeRule(declStmt().bind(Decl),
-               insertAfter(statement(std::string(Decl)), cat("int y = 3;"))),
-      Input, Expected);
-}
-
-TEST_F(TransformerTest, RemoveEdit) {
-  std::string Input = R"cc(
-    int f() {
-      int x = 5;
-      return 7;
-    }
-  )cc";
-  std::string Expected = R"cc(
-    int f() {
-      return 7;
-    }
-  )cc";
-
-  StringRef Decl = "decl";
-  testRule(
-      makeRule(declStmt().bind(Decl), remove(statement(std::string(Decl)))),
-      Input, Expected);
-}
-
-TEST_F(TransformerTest, WithMetadata) {
-  auto makeMetadata = [](const MatchFinder::MatchResult &R) -> llvm::Any {
-    int N =
-        R.Nodes.getNodeAs<IntegerLiteral>("int")->getValue().getLimitedValue();
-    return N;
-  };
-
-  std::string Input = R"cc(
-    int f() {
-      int x = 5;
-      return 7;
-    }
-  )cc";
-
-  Transformer T(
-      makeRule(
-          declStmt(containsDeclaration(0, varDecl(hasInitializer(
-                                              integerLiteral().bind("int")))))
-              .bind("decl"),
-          withMetadata(remove(statement(std::string("decl"))), makeMetadata)),
-      consumer());
-  T.registerMatchers(&MatchFinder);
-  auto Factory = newFrontendActionFactory(&MatchFinder);
-  EXPECT_TRUE(runToolOnCodeWithArgs(
-      Factory->create(), Input, std::vector<std::string>(), "input.cc",
-      "clang-tool", std::make_shared<PCHContainerOperations>(), {}));
-  ASSERT_EQ(Changes.size(), 1u);
-  const llvm::Any &Metadata = Changes[0].getMetadata();
-  ASSERT_TRUE(llvm::any_isa<int>(Metadata));
-  EXPECT_THAT(llvm::any_cast<int>(Metadata), 5);
-}
-
-TEST_F(TransformerTest, MultiChange) {
-  std::string Input = R"cc(
-    void foo() {
-      if (10 > 1.0)
-        log(1) << "oh no!";
-      else
-        log(0) << "ok";
-    }
-  )cc";
-  std::string Expected = R"(
-    void foo() {
-      if (true) { /* then */ }
-      else { /* else */ }
-    }
-  )";
-
-  StringRef C = "C", T = "T", E = "E";
-  testRule(
-      makeRule(ifStmt(hasCondition(expr().bind(C)), hasThen(stmt().bind(T)),
-                      hasElse(stmt().bind(E))),
-               {changeTo(node(std::string(C)), cat("true")),
-                changeTo(statement(std::string(T)), cat("{ /* then */ }")),
-                changeTo(statement(std::string(E)), cat("{ /* else */ }"))}),
-      Input, Expected);
-}
-
-TEST_F(TransformerTest, EditList) {
-  using clang::transformer::editList;
-  std::string Input = R"cc(
-    void foo() {
-      if (10 > 1.0)
-        log(1) << "oh no!";
-      else
-        log(0) << "ok";
-    }
-  )cc";
-  std::string Expected = R"(
-    void foo() {
-      if (true) { /* then */ }
-      else { /* else */ }
-    }
-  )";
-
-  StringRef C = "C", T = "T", E = "E";
-  testRule(makeRule(ifStmt(hasCondition(expr().bind(C)),
-                           hasThen(stmt().bind(T)), hasElse(stmt().bind(E))),
-                    editList({changeTo(node(std::string(C)), cat("true")),
-                              changeTo(statement(std::string(T)),
-                                       cat("{ /* then */ }")),
-                              changeTo(statement(std::string(E)),
-                                       cat("{ /* else */ }"))})),
-           Input, Expected);
-}
-
-TEST_F(TransformerTest, Flatten) {
-  using clang::transformer::editList;
-  std::string Input = R"cc(
-    void foo() {
-      if (10 > 1.0)
-        log(1) << "oh no!";
-      else
-        log(0) << "ok";
-    }
-  )cc";
-  std::string Expected = R"(
-    void foo() {
-      if (true) { /* then */ }
-      else { /* else */ }
-    }
-  )";
-
-  StringRef C = "C", T = "T", E = "E";
-  testRule(
-      makeRule(
-          ifStmt(hasCondition(expr().bind(C)), hasThen(stmt().bind(T)),
-                 hasElse(stmt().bind(E))),
-          flatten(changeTo(node(std::string(C)), cat("true")),
-                  changeTo(statement(std::string(T)), cat("{ /* then */ }")),
-                  changeTo(statement(std::string(E)), cat("{ /* else */ }")))),
-      Input, Expected);
-}
-
-TEST_F(TransformerTest, FlattenWithMixedArgs) {
-  using clang::transformer::editList;
-  std::string Input = R"cc(
-    void foo() {
-      if (10 > 1.0)
-        log(1) << "oh no!";
-      else
-        log(0) << "ok";
-    }
-  )cc";
-  std::string Expected = R"(
-    void foo() {
-      if (true) { /* then */ }
-      else { /* else */ }
-    }
-  )";
-
-  StringRef C = "C", T = "T", E = "E";
-  testRule(makeRule(ifStmt(hasCondition(expr().bind(C)),
-                           hasThen(stmt().bind(T)), hasElse(stmt().bind(E))),
-                    flatten(changeTo(node(std::string(C)), cat("true")),
-                            edit(changeTo(statement(std::string(T)),
-                                          cat("{ /* then */ }"))),
-                            editList({changeTo(statement(std::string(E)),
-                                               cat("{ /* else */ }"))}))),
-           Input, Expected);
-}
-
-TEST_F(TransformerTest, OrderedRuleUnrelated) {
-  StringRef Flag = "flag";
-  RewriteRule FlagRule = makeRule(
-      cxxMemberCallExpr(on(expr(hasType(cxxRecordDecl(
-                                    hasName("proto::ProtoCommandLineFlag"))))
-                               .bind(Flag)),
-                        unless(callee(cxxMethodDecl(hasName("GetProto"))))),
-      changeTo(node(std::string(Flag)), cat("PROTO")));
-
-  std::string Input = R"cc(
-    proto::ProtoCommandLineFlag flag;
-    int x = flag.foo();
-    int y = flag.GetProto().foo();
-    int f(string s) { return strlen(s.c_str()); }
-  )cc";
-  std::string Expected = R"cc(
-    proto::ProtoCommandLineFlag flag;
-    int x = PROTO.foo();
-    int y = flag.GetProto().foo();
-    int f(string s) { return REPLACED; }
-  )cc";
-
-  testRule(applyFirst({ruleStrlenSize(), FlagRule}), Input, Expected);
-}
-
-TEST_F(TransformerTest, OrderedRuleRelated) {
-  std::string Input = R"cc(
-    void f1();
-    void f2();
-    void call_f1() { f1(); }
-    void call_f2() { f2(); }
-  )cc";
-  std::string Expected = R"cc(
-    void f1();
-    void f2();
-    void call_f1() { REPLACE_F1; }
-    void call_f2() { REPLACE_F1_OR_F2; }
-  )cc";
-
-  RewriteRule ReplaceF1 =
-      makeRule(callExpr(callee(functionDecl(hasName("f1")))),
-               changeTo(cat("REPLACE_F1")));
-  RewriteRule ReplaceF1OrF2 =
-      makeRule(callExpr(callee(functionDecl(hasAnyName("f1", "f2")))),
-               changeTo(cat("REPLACE_F1_OR_F2")));
-  testRule(applyFirst({ReplaceF1, ReplaceF1OrF2}), Input, Expected);
-}
-
-// Change the order of the rules to get a different result. When `ReplaceF1OrF2`
-// comes first, it applies for both uses, so `ReplaceF1` never applies.
-TEST_F(TransformerTest, OrderedRuleRelatedSwapped) {
-  std::string Input = R"cc(
-    void f1();
-    void f2();
-    void call_f1() { f1(); }
-    void call_f2() { f2(); }
-  )cc";
-  std::string Expected = R"cc(
-    void f1();
-    void f2();
-    void call_f1() { REPLACE_F1_OR_F2; }
-    void call_f2() { REPLACE_F1_OR_F2; }
-  )cc";
-
-  RewriteRule ReplaceF1 =
-      makeRule(callExpr(callee(functionDecl(hasName("f1")))),
-               changeTo(cat("REPLACE_F1")));
-  RewriteRule ReplaceF1OrF2 =
-      makeRule(callExpr(callee(functionDecl(hasAnyName("f1", "f2")))),
-               changeTo(cat("REPLACE_F1_OR_F2")));
-  testRule(applyFirst({ReplaceF1OrF2, ReplaceF1}), Input, Expected);
-}
-
-// Verify that a set of rules whose matchers have different base kinds works
-// properly, including that `applyFirst` produces multiple matchers.  We test
-// two different kinds of rules: Expr and Decl. We place the Decl rule in the
-// middle to test that `buildMatchers` works even when the kinds aren't grouped
-// together.
-TEST_F(TransformerTest, OrderedRuleMultipleKinds) {
-  std::string Input = R"cc(
-    void f1();
-    void f2();
-    void call_f1() { f1(); }
-    void call_f2() { f2(); }
-  )cc";
-  std::string Expected = R"cc(
-    void f1();
-    void DECL_RULE();
-    void call_f1() { REPLACE_F1; }
-    void call_f2() { REPLACE_F1_OR_F2; }
-  )cc";
-
-  RewriteRule ReplaceF1 =
-      makeRule(callExpr(callee(functionDecl(hasName("f1")))),
-               changeTo(cat("REPLACE_F1")));
-  RewriteRule ReplaceF1OrF2 =
-      makeRule(callExpr(callee(functionDecl(hasAnyName("f1", "f2")))),
-               changeTo(cat("REPLACE_F1_OR_F2")));
-  RewriteRule DeclRule = makeRule(functionDecl(hasName("f2")).bind("fun"),
-                                  changeTo(name("fun"), cat("DECL_RULE")));
-
-  RewriteRule Rule = applyFirst({ReplaceF1, DeclRule, ReplaceF1OrF2});
-  EXPECT_EQ(transformer::detail::buildMatchers(Rule).size(), 2UL);
-  testRule(Rule, Input, Expected);
-}
-
-// Verifies that a rule with a top-level matcher for an implicit node (like
-// `implicitCastExpr`) works correctly -- the implicit nodes are not skipped.
-TEST_F(TransformerTest, OrderedRuleImplicitMatched) {
-  std::string Input = R"cc(
-    void f1();
-    int f2();
-    void call_f1() { f1(); }
-    float call_f2() { return f2(); }
-  )cc";
-  std::string Expected = R"cc(
-    void f1();
-    int f2();
-    void call_f1() { REPLACE_F1; }
-    float call_f2() { return REPLACE_F2; }
-  )cc";
-
-  RewriteRule ReplaceF1 =
-      makeRule(callExpr(callee(functionDecl(hasName("f1")))),
-               changeTo(cat("REPLACE_F1")));
-  RewriteRule ReplaceF2 =
-      makeRule(implicitCastExpr(hasSourceExpression(callExpr())),
-               changeTo(cat("REPLACE_F2")));
-  testRule(applyFirst({ReplaceF1, ReplaceF2}), Input, Expected);
-}
-
-//
-// Negative tests (where we expect no transformation to occur).
-//
-
-// Tests for a conflict in edits from a single match for a rule.
-TEST_F(TransformerTest, TextGeneratorFailure) {
-  std::string Input = "int conflictOneRule() { return 3 + 7; }";
-  // Try to change the whole binary-operator expression AND one its operands:
-  StringRef O = "O";
-  class AlwaysFail : public transformer::MatchComputation<std::string> {
-    llvm::Error eval(const ast_matchers::MatchFinder::MatchResult &,
-                     std::string *) const override {
-      return llvm::createStringError(llvm::errc::invalid_argument, "ERROR");
-    }
-    std::string toString() const override { return "AlwaysFail"; }
-  };
-  Transformer T(
-      makeRule(binaryOperator().bind(O),
-               changeTo(node(std::string(O)), std::make_shared<AlwaysFail>())),
-      consumer());
-  T.registerMatchers(&MatchFinder);
-  EXPECT_FALSE(rewrite(Input));
-  EXPECT_THAT(Changes, IsEmpty());
-  EXPECT_EQ(ErrorCount, 1);
-}
-
-// Tests for a conflict in edits from a single match for a rule.
-TEST_F(TransformerTest, OverlappingEditsInRule) {
-  std::string Input = "int conflictOneRule() { return 3 + 7; }";
-  // Try to change the whole binary-operator expression AND one its operands:
-  StringRef O = "O", L = "L";
-  Transformer T(makeRule(binaryOperator(hasLHS(expr().bind(L))).bind(O),
-                         {changeTo(node(std::string(O)), cat("DELETE_OP")),
-                          changeTo(node(std::string(L)), cat("DELETE_LHS"))}),
-                consumer());
-  T.registerMatchers(&MatchFinder);
-  EXPECT_FALSE(rewrite(Input));
-  EXPECT_THAT(Changes, IsEmpty());
-  EXPECT_EQ(ErrorCount, 1);
-}
-
-// Tests for a conflict in edits across multiple matches (of the same rule).
-TEST_F(TransformerTest, OverlappingEditsMultipleMatches) {
-  std::string Input = "int conflictOneRule() { return -7; }";
-  // Try to change the whole binary-operator expression AND one its operands:
-  StringRef E = "E";
-  Transformer T(makeRule(expr().bind(E),
-                         changeTo(node(std::string(E)), cat("DELETE_EXPR"))),
-                consumer());
-  T.registerMatchers(&MatchFinder);
-  // The rewrite process fails because the changes conflict with each other...
-  EXPECT_FALSE(rewrite(Input));
-  // ... but two changes were produced.
-  EXPECT_EQ(Changes.size(), 2u);
-  EXPECT_EQ(ErrorCount, 0);
-}
-
-TEST_F(TransformerTest, ErrorOccurredMatchSkipped) {
-  // Syntax error in the function body:
-  std::string Input = "void errorOccurred() { 3 }";
-  Transformer T(makeRule(functionDecl(hasName("errorOccurred")),
-                         changeTo(cat("DELETED;"))),
-                consumer());
-  T.registerMatchers(&MatchFinder);
-  // The rewrite process itself fails...
-  EXPECT_FALSE(rewrite(Input));
-  // ... and no changes or errors are produced in the process.
-  EXPECT_THAT(Changes, IsEmpty());
-  EXPECT_EQ(ErrorCount, 0);
-}
-
-TEST_F(TransformerTest, ImplicitNodes_ConstructorDecl) {
-
-  std::string OtherStructPrefix = R"cpp(
-struct Other {
-)cpp";
-  std::string OtherStructSuffix = "};";
-
-  std::string CopyableStructName = "struct Copyable";
-  std::string BrokenStructName = "struct explicit Copyable";
-
-  std::string CodeSuffix = R"cpp(
-{
-    Other m_i;
-    Copyable();
-};
-)cpp";
-
-  std::string CopyCtor = "Other(const Other&) = default;";
-  std::string ExplicitCopyCtor = "explicit Other(const Other&) = default;";
-  std::string BrokenExplicitCopyCtor =
-      "explicit explicit explicit Other(const Other&) = default;";
-
-  std::string RewriteInput = OtherStructPrefix + CopyCtor + OtherStructSuffix +
-                             CopyableStructName + CodeSuffix;
-  std::string ExpectedRewriteOutput = OtherStructPrefix + ExplicitCopyCtor +
-                                      OtherStructSuffix + CopyableStructName +
-                                      CodeSuffix;
-  std::string BrokenRewriteOutput = OtherStructPrefix + BrokenExplicitCopyCtor +
-                                    OtherStructSuffix + BrokenStructName +
-                                    CodeSuffix;
-
-  auto MatchedRecord =
-      cxxConstructorDecl(isCopyConstructor()).bind("copyConstructor");
-
-  auto RewriteRule =
-      changeTo(before(node("copyConstructor")), cat("explicit "));
-
-  testRule(makeRule(traverse(TK_IgnoreUnlessSpelledInSource, MatchedRecord),
-                    RewriteRule),
-           RewriteInput, ExpectedRewriteOutput);
-
-  testRule(makeRule(traverse(TK_AsIs, MatchedRecord), RewriteRule),
-           RewriteInput, BrokenRewriteOutput);
-}
-
-TEST_F(TransformerTest, ImplicitNodes_RangeFor) {
-
-  std::string CodePrefix = R"cpp(
-struct Container
-{
-    int* begin() const;
-    int* end() const;
-    int* cbegin() const;
-    int* cend() const;
-};
-
-void foo()
-{
-  const Container c;
-)cpp";
-
-  std::string BeginCallBefore = "  c.begin();";
-  std::string BeginCallAfter = "  c.cbegin();";
-
-  std::string ForLoop = "for (auto i : c)";
-  std::string BrokenForLoop = "for (auto i :.cbegin() c)";
-
-  std::string CodeSuffix = R"cpp(
-  {
-  }
-}
-)cpp";
-
-  std::string RewriteInput =
-      CodePrefix + BeginCallBefore + ForLoop + CodeSuffix;
-  std::string ExpectedRewriteOutput =
-      CodePrefix + BeginCallAfter + ForLoop + CodeSuffix;
-  std::string BrokenRewriteOutput =
-      CodePrefix + BeginCallAfter + BrokenForLoop + CodeSuffix;
-
-  auto MatchedRecord =
-      cxxMemberCallExpr(on(expr(hasType(qualType(isConstQualified(),
-                                                 hasDeclaration(cxxRecordDecl(
-                                                     hasName("Container"))))))
-                               .bind("callTarget")),
-                        callee(cxxMethodDecl(hasName("begin"))))
-          .bind("constBeginCall");
-
-  auto RewriteRule =
-      changeTo(node("constBeginCall"), cat(name("callTarget"), ".cbegin()"));
-
-  testRule(makeRule(traverse(TK_IgnoreUnlessSpelledInSource, MatchedRecord),
-                    RewriteRule),
-           RewriteInput, ExpectedRewriteOutput);
-
-  testRule(makeRule(traverse(TK_AsIs, MatchedRecord), RewriteRule),
-           RewriteInput, BrokenRewriteOutput);
-}
-
-TEST_F(TransformerTest, ImplicitNodes_ForStmt) {
-
-  std::string CodePrefix = R"cpp(
-struct NonTrivial {
-    NonTrivial() {}
-    NonTrivial(NonTrivial&) {}
-    NonTrivial& operator=(NonTrivial const&) { return *this; }
-
-    ~NonTrivial() {}
-};
-
-struct ContainsArray {
-    NonTrivial arr[2];
-    ContainsArray& operator=(ContainsArray const&) = default;
-};
-
-void testIt()
-{
-    ContainsArray ca1;
-    ContainsArray ca2;
-    ca2 = ca1;
-)cpp";
-
-  auto CodeSuffix = "}";
-
-  auto LoopBody = R"cpp(
-    {
-
-    }
-)cpp";
-
-  auto RawLoop = "for (auto i = 0; i != 5; ++i)";
-
-  auto RangeLoop = "for (auto i : boost::irange(5))";
-
-  // Expect to rewrite the raw loop to the ranged loop.
-  // This works in TK_IgnoreUnlessSpelledInSource mode, but TK_AsIs
-  // mode also matches the hidden for loop generated in the copy assignment
-  // operator of ContainsArray. Transformer then fails to transform the code at
-  // all.
-
-  auto RewriteInput =
-      CodePrefix + RawLoop + LoopBody + RawLoop + LoopBody + CodeSuffix;
-
-  auto RewriteOutput =
-      CodePrefix + RangeLoop + LoopBody + RangeLoop + LoopBody + CodeSuffix;
-
-    auto MatchedLoop = forStmt(
-        has(declStmt(
-            hasSingleDecl(varDecl(hasInitializer(integerLiteral(equals(0))))
-                              .bind("loopVar")))),
-        has(binaryOperator(hasOperatorName("!="),
-                           hasLHS(ignoringImplicit(declRefExpr(
-                               to(varDecl(equalsBoundNode("loopVar")))))),
-                           hasRHS(expr().bind("upperBoundExpr")))),
-        has(unaryOperator(hasOperatorName("++"),
-                          hasUnaryOperand(declRefExpr(
-                              to(varDecl(equalsBoundNode("loopVar"))))))
-                .bind("incrementOp")));
-
-    auto RewriteRule =
-        changeTo(transformer::enclose(node("loopVar"), node("incrementOp")),
-                 cat("auto ", name("loopVar"), " : boost::irange(",
-                     node("upperBoundExpr"), ")"));
-
-    testRule(makeRule(traverse(TK_IgnoreUnlessSpelledInSource, MatchedLoop),
-                      RewriteRule),
-             RewriteInput, RewriteOutput);
-
-    testRuleFailure(makeRule(traverse(TK_AsIs, MatchedLoop), RewriteRule),
-                    RewriteInput);
-
-}
-
-TEST_F(TransformerTest, ImplicitNodes_ForStmt2) {
-
-  std::string CodePrefix = R"cpp(
-struct NonTrivial {
-    NonTrivial() {}
-    NonTrivial(NonTrivial&) {}
-    NonTrivial& operator=(NonTrivial const&) { return *this; }
-
-    ~NonTrivial() {}
-};
-
-struct ContainsArray {
-    NonTrivial arr[2];
-    ContainsArray& operator=(ContainsArray const&) = default;
-};
-
-void testIt()
-{
-    ContainsArray ca1;
-    ContainsArray ca2;
-    ca2 = ca1;
-)cpp";
-
-  auto CodeSuffix = "}";
-
-  auto LoopBody = R"cpp(
-    {
-
-    }
-)cpp";
-
-  auto RawLoop = "for (auto i = 0; i != 5; ++i)";
-
-  auto RangeLoop = "for (auto i : boost::irange(5))";
-
-  // Expect to rewrite the raw loop to the ranged loop.
-  // This works in TK_IgnoreUnlessSpelledInSource mode, but TK_AsIs
-  // mode also matches the hidden for loop generated in the copy assignment
-  // operator of ContainsArray. Transformer then fails to transform the code at
-  // all.
-
-  auto RewriteInput =
-      CodePrefix + RawLoop + LoopBody + RawLoop + LoopBody + CodeSuffix;
-
-  auto RewriteOutput =
-      CodePrefix + RangeLoop + LoopBody + RangeLoop + LoopBody + CodeSuffix;
-    auto MatchedLoop = forStmt(
-        hasLoopInit(declStmt(
-            hasSingleDecl(varDecl(hasInitializer(integerLiteral(equals(0))))
-                              .bind("loopVar")))),
-        hasCondition(binaryOperator(hasOperatorName("!="),
-                                    hasLHS(ignoringImplicit(declRefExpr(to(
-                                        varDecl(equalsBoundNode("loopVar")))))),
-                                    hasRHS(expr().bind("upperBoundExpr")))),
-        hasIncrement(unaryOperator(hasOperatorName("++"),
-                                   hasUnaryOperand(declRefExpr(to(
-                                       varDecl(equalsBoundNode("loopVar"))))))
-                         .bind("incrementOp")));
-
-    auto RewriteRule =
-        changeTo(transformer::enclose(node("loopVar"), node("incrementOp")),
-                 cat("auto ", name("loopVar"), " : boost::irange(",
-                     node("upperBoundExpr"), ")"));
-
-    testRule(makeRule(traverse(TK_IgnoreUnlessSpelledInSource, MatchedLoop),
-                      RewriteRule),
-             RewriteInput, RewriteOutput);
-
-    testRuleFailure(makeRule(traverse(TK_AsIs, MatchedLoop), RewriteRule),
-                    RewriteInput);
-
-}
-
-TEST_F(TransformerTest, TemplateInstantiation) {
-
-  std::string NonTemplatesInput = R"cpp(
-struct S {
-  int m_i;
-};
-)cpp";
-  std::string NonTemplatesExpected = R"cpp(
-struct S {
-  safe_int m_i;
-};
-)cpp";
-
-  std::string TemplatesInput = R"cpp(
-template<typename T>
-struct TemplStruct {
-  TemplStruct() {}
-  ~TemplStruct() {}
-
-private:
-  T m_t;
-};
-
-void instantiate()
-{
-  TemplStruct<int> ti;
-}
-)cpp";
-
-  auto MatchedField = fieldDecl(hasType(asString("int"))).bind("theField");
-
-  // Changes the 'int' in 'S', but not the 'T' in 'TemplStruct':
-  testRule(makeRule(traverse(TK_IgnoreUnlessSpelledInSource, MatchedField),
-                    changeTo(cat("safe_int ", name("theField"), ";"))),
-           NonTemplatesInput + TemplatesInput,
-           NonTemplatesExpected + TemplatesInput);
-
-  // In AsIs mode, template instantiations are modified, which is
-  // often not desired:
-
-  std::string IncorrectTemplatesExpected = R"cpp(
-template<typename T>
-struct TemplStruct {
-  TemplStruct() {}
-  ~TemplStruct() {}
-
-private:
-  safe_int m_t;
-};
-
-void instantiate()
-{
-  TemplStruct<int> ti;
-}
-)cpp";
-
-  // Changes the 'int' in 'S', and (incorrectly) the 'T' in 'TemplStruct':
-  testRule(makeRule(traverse(TK_AsIs, MatchedField),
-                    changeTo(cat("safe_int ", name("theField"), ";"))),
-
-           NonTemplatesInput + TemplatesInput,
-           NonTemplatesExpected + IncorrectTemplatesExpected);
-}
-
-// Transformation of macro source text when the change encompasses the entirety
-// of the expanded text.
-TEST_F(TransformerTest, SimpleMacro) {
-  std::string Input = R"cc(
-#define ZERO 0
-    int f(string s) { return ZERO; }
-  )cc";
-  std::string Expected = R"cc(
-#define ZERO 0
-    int f(string s) { return 999; }
-  )cc";
-
-  StringRef zero = "zero";
-  RewriteRule R = makeRule(integerLiteral(equals(0)).bind(zero),
-                           changeTo(node(std::string(zero)), cat("999")));
-  testRule(R, Input, Expected);
-}
-
-// Transformation of macro source text when the change encompasses the entirety
-// of the expanded text, for the case of function-style macros.
-TEST_F(TransformerTest, FunctionMacro) {
-  std::string Input = R"cc(
-#define MACRO(str) strlen((str).c_str())
-    int f(string s) { return MACRO(s); }
-  )cc";
-  std::string Expected = R"cc(
-#define MACRO(str) strlen((str).c_str())
-    int f(string s) { return REPLACED; }
-  )cc";
-
-  testRule(ruleStrlenSize(), Input, Expected);
-}
-
-// Tests that expressions in macro arguments can be rewritten.
-TEST_F(TransformerTest, MacroArg) {
-  std::string Input = R"cc(
-#define PLUS(e) e + 1
-    int f(string s) { return PLUS(strlen(s.c_str())); }
-  )cc";
-  std::string Expected = R"cc(
-#define PLUS(e) e + 1
-    int f(string s) { return PLUS(REPLACED); }
-  )cc";
-
-  testRule(ruleStrlenSize(), Input, Expected);
-}
-
-// Tests that expressions in macro arguments can be rewritten, even when the
-// macro call occurs inside another macro's definition.
-TEST_F(TransformerTest, MacroArgInMacroDef) {
-  std::string Input = R"cc(
-#define NESTED(e) e
-#define MACRO(str) NESTED(strlen((str).c_str()))
-    int f(string s) { return MACRO(s); }
-  )cc";
-  std::string Expected = R"cc(
-#define NESTED(e) e
-#define MACRO(str) NESTED(strlen((str).c_str()))
-    int f(string s) { return REPLACED; }
-  )cc";
-
-  testRule(ruleStrlenSize(), Input, Expected);
-}
-
-// Tests the corner case of the identity macro, specifically that it is
-// discarded in the rewrite rather than preserved (like PLUS is preserved in the
-// previous test).  This behavior is of dubious value (and marked with a FIXME
-// in the code), but we test it to verify (and demonstrate) how this case is
-// handled.
-TEST_F(TransformerTest, IdentityMacro) {
-  std::string Input = R"cc(
-#define ID(e) e
-    int f(string s) { return ID(strlen(s.c_str())); }
-  )cc";
-  std::string Expected = R"cc(
-#define ID(e) e
-    int f(string s) { return REPLACED; }
-  )cc";
-
-  testRule(ruleStrlenSize(), Input, Expected);
-}
-
-// Tests that two changes in a single macro expansion do not lead to conflicts
-// in applying the changes.
-TEST_F(TransformerTest, TwoChangesInOneMacroExpansion) {
-  std::string Input = R"cc(
-#define PLUS(a,b) (a) + (b)
-    int f() { return PLUS(3, 4); }
-  )cc";
-  std::string Expected = R"cc(
-#define PLUS(a,b) (a) + (b)
-    int f() { return PLUS(LIT, LIT); }
-  )cc";
-
-  testRule(makeRule(integerLiteral(), changeTo(cat("LIT"))), Input, Expected);
-}
-
-// Tests case where the rule's match spans both source from the macro and its
-// arg, with the begin location (the "anchor") being the arg.
-TEST_F(TransformerTest, MatchSpansMacroTextButChangeDoesNot) {
-  std::string Input = R"cc(
-#define PLUS_ONE(a) a + 1
-    int f() { return PLUS_ONE(3); }
-  )cc";
-  std::string Expected = R"cc(
-#define PLUS_ONE(a) a + 1
-    int f() { return PLUS_ONE(LIT); }
-  )cc";
-
-  StringRef E = "expr";
-  testRule(makeRule(binaryOperator(hasLHS(expr().bind(E))),
-                    changeTo(node(std::string(E)), cat("LIT"))),
-           Input, Expected);
-}
-
-// Tests case where the rule's match spans both source from the macro and its
-// arg, with the begin location (the "anchor") being inside the macro.
-TEST_F(TransformerTest, MatchSpansMacroTextButChangeDoesNotAnchoredInMacro) {
-  std::string Input = R"cc(
-#define PLUS_ONE(a) 1 + a
-    int f() { return PLUS_ONE(3); }
-  )cc";
-  std::string Expected = R"cc(
-#define PLUS_ONE(a) 1 + a
-    int f() { return PLUS_ONE(LIT); }
-  )cc";
-
-  StringRef E = "expr";
-  testRule(makeRule(binaryOperator(hasRHS(expr().bind(E))),
-                    changeTo(node(std::string(E)), cat("LIT"))),
-           Input, Expected);
-}
-
-// No rewrite is applied when the changed text does not encompass the entirety
-// of the expanded text. That is, the edit would have to be applied to the
-// macro's definition to succeed and editing the expansion point would not
-// suffice.
-TEST_F(TransformerTest, NoPartialRewriteOMacroExpansion) {
-  std::string Input = R"cc(
-#define ZERO_PLUS 0 + 3
-    int f(string s) { return ZERO_PLUS; })cc";
-
-  StringRef zero = "zero";
-  RewriteRule R = makeRule(integerLiteral(equals(0)).bind(zero),
-                           changeTo(node(std::string(zero)), cat("0")));
-  testRule(R, Input, Input);
-}
-
-// This test handles the corner case where a macro expands within another macro
-// to matching code, but that code is an argument to the nested macro call.  A
-// simple check of isMacroArgExpansion() vs. isMacroBodyExpansion() will get
-// this wrong, and transform the code.
-TEST_F(TransformerTest, NoPartialRewriteOfMacroExpansionForMacroArgs) {
-  std::string Input = R"cc(
-#define NESTED(e) e
-#define MACRO(str) 1 + NESTED(strlen((str).c_str()))
-    int f(string s) { return MACRO(s); }
-  )cc";
-
-  testRule(ruleStrlenSize(), Input, Input);
-}
-
-#if !defined(NDEBUG) && GTEST_HAS_DEATH_TEST
-// Verifies that `Type` and `QualType` are not allowed as top-level matchers in
-// rules.
-TEST(TransformerDeathTest, OrderedRuleTypes) {
-  RewriteRule QualTypeRule = makeRule(qualType(), changeTo(cat("Q")));
-  EXPECT_DEATH(transformer::detail::buildMatchers(QualTypeRule),
-               "Matcher must be.*node matcher");
-
-  RewriteRule TypeRule = makeRule(arrayType(), changeTo(cat("T")));
-  EXPECT_DEATH(transformer::detail::buildMatchers(TypeRule),
-               "Matcher must be.*node matcher");
-}
-#endif
-
-// Edits are able to span multiple files; in this case, a header and an
-// implementation file.
-TEST_F(TransformerTest, MultipleFiles) {
-  std::string Header = R"cc(void RemoveThisFunction();)cc";
-  std::string Source = R"cc(#include "input.h"
-                            void RemoveThisFunction();)cc";
-  Transformer T(
-      makeRule(functionDecl(hasName("RemoveThisFunction")), changeTo(cat(""))),
-      consumer());
-  T.registerMatchers(&MatchFinder);
-  auto Factory = newFrontendActionFactory(&MatchFinder);
-  EXPECT_TRUE(runToolOnCodeWithArgs(
-      Factory->create(), Source, std::vector<std::string>(), "input.cc",
-      "clang-tool", std::make_shared<PCHContainerOperations>(),
-      {{"input.h", Header}}));
-
-  std::sort(Changes.begin(), Changes.end(),
-            [](const AtomicChange &L, const AtomicChange &R) {
-              return L.getFilePath() < R.getFilePath();
-            });
-
-  ASSERT_EQ(Changes[0].getFilePath(), "./input.h");
-  EXPECT_THAT(Changes[0].getInsertedHeaders(), IsEmpty());
-  EXPECT_THAT(Changes[0].getRemovedHeaders(), IsEmpty());
-  llvm::Expected<std::string> UpdatedCode =
-      clang::tooling::applyAllReplacements(Header,
-                                           Changes[0].getReplacements());
-  ASSERT_TRUE(static_cast<bool>(UpdatedCode))
-      << "Could not update code: " << llvm::toString(UpdatedCode.takeError());
-  EXPECT_EQ(format(*UpdatedCode), "");
-
-  ASSERT_EQ(Changes[1].getFilePath(), "input.cc");
-  EXPECT_THAT(Changes[1].getInsertedHeaders(), IsEmpty());
-  EXPECT_THAT(Changes[1].getRemovedHeaders(), IsEmpty());
-  UpdatedCode = clang::tooling::applyAllReplacements(
-      Source, Changes[1].getReplacements());
-  ASSERT_TRUE(static_cast<bool>(UpdatedCode))
-      << "Could not update code: " << llvm::toString(UpdatedCode.takeError());
-  EXPECT_EQ(format(*UpdatedCode), format("#include \"input.h\"\n"));
-}
-
-TEST_F(TransformerTest, AddIncludeMultipleFiles) {
-  std::string Header = R"cc(void RemoveThisFunction();)cc";
-  std::string Source = R"cc(#include "input.h"
-                            void Foo() {RemoveThisFunction();})cc";
-  Transformer T(
-      makeRule(callExpr(callee(
-                   functionDecl(hasName("RemoveThisFunction")).bind("fun"))),
-               addInclude(node("fun"), "header.h")),
-      consumer());
-  T.registerMatchers(&MatchFinder);
-  auto Factory = newFrontendActionFactory(&MatchFinder);
-  EXPECT_TRUE(runToolOnCodeWithArgs(
-      Factory->create(), Source, std::vector<std::string>(), "input.cc",
-      "clang-tool", std::make_shared<PCHContainerOperations>(),
-      {{"input.h", Header}}));
-
-  ASSERT_EQ(Changes.size(), 1U);
-  ASSERT_EQ(Changes[0].getFilePath(), "./input.h");
-  EXPECT_THAT(Changes[0].getInsertedHeaders(), ElementsAre("header.h"));
-  EXPECT_THAT(Changes[0].getRemovedHeaders(), IsEmpty());
-  llvm::Expected<std::string> UpdatedCode =
-      clang::tooling::applyAllReplacements(Header,
-                                           Changes[0].getReplacements());
-  ASSERT_TRUE(static_cast<bool>(UpdatedCode))
-      << "Could not update code: " << llvm::toString(UpdatedCode.takeError());
-  EXPECT_EQ(format(*UpdatedCode), format(Header));
-}
-} // namespace
diff --git a/gnu/llvm/clang/unittests/libclang/CMakeLists.txt b/gnu/llvm/clang/unittests/libclang/CMakeLists.txt
deleted file mode 100644
index b3644a0e710..00000000000
--- a/gnu/llvm/clang/unittests/libclang/CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-add_clang_unittest(libclangTests
-  LibclangTest.cpp
-  )
-
-target_link_libraries(libclangTests
-  PRIVATE
-  libclang
-  )
-
-add_subdirectory(CrashTests)
diff --git a/gnu/llvm/clang/unittests/libclang/CrashTests/CMakeLists.txt b/gnu/llvm/clang/unittests/libclang/CrashTests/CMakeLists.txt
deleted file mode 100644
index 82f0e4c16e9..00000000000
--- a/gnu/llvm/clang/unittests/libclang/CrashTests/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-add_clang_unittest(libclangCrashTests
-  LibclangCrashTest.cpp
-  )
-
-target_link_libraries(libclangCrashTests
-  PRIVATE
-  libclang
-  )
diff --git a/gnu/llvm/clang/unittests/libclang/CrashTests/LibclangCrashTest.cpp b/gnu/llvm/clang/unittests/libclang/CrashTests/LibclangCrashTest.cpp
deleted file mode 100644
index 26c63cfbd42..00000000000
--- a/gnu/llvm/clang/unittests/libclang/CrashTests/LibclangCrashTest.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-//===- unittests/libclang/LibclangCrashTest.cpp --- libclang tests --------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "../TestUtils.h"
-#include "clang-c/FatalErrorHandler.h"
-#include "gtest/gtest.h"
-#include <string>
-
-TEST_F(LibclangParseTest, InstallAbortingLLVMFatalErrorHandler) {
-  clang_toggleCrashRecovery(0);
-  clang_install_aborting_llvm_fatal_error_handler();
-
-  std::string Main = "main.h";
-  WriteFile(Main, "#pragma clang __debug llvm_fatal_error");
-
-  EXPECT_DEATH(clang_parseTranslationUnit(Index, Main.c_str(), nullptr, 0,
-                                          nullptr, 0, TUFlags),
-               "");
-}
-
-TEST_F(LibclangParseTest, UninstallAbortingLLVMFatalErrorHandler) {
-  clang_toggleCrashRecovery(0);
-  clang_install_aborting_llvm_fatal_error_handler();
-  clang_uninstall_llvm_fatal_error_handler();
-
-  std::string Main = "main.h";
-  WriteFile(Main, "#pragma clang __debug llvm_fatal_error");
-
-  EXPECT_DEATH(clang_parseTranslationUnit(Index, Main.c_str(), nullptr, 0,
-                                          nullptr, 0, TUFlags),
-               "ERROR");
-}
diff --git a/gnu/llvm/clang/unittests/libclang/LibclangTest.cpp b/gnu/llvm/clang/unittests/libclang/LibclangTest.cpp
deleted file mode 100644
index fc3ad43b495..00000000000
--- a/gnu/llvm/clang/unittests/libclang/LibclangTest.cpp
+++ /dev/null
@@ -1,932 +0,0 @@
-//===- unittests/libclang/LibclangTest.cpp --- libclang tests -------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang-c/Index.h"
-#include "clang-c/Rewrite.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/Support/Debug.h"
-#include "llvm/Support/FileSystem.h"
-#include "llvm/Support/Path.h"
-#include "llvm/Support/raw_ostream.h"
-#include "gtest/gtest.h"
-#include "TestUtils.h"
-#include <fstream>
-#include <functional>
-#include <map>
-#include <memory>
-#include <set>
-#define DEBUG_TYPE "libclang-test"
-
-TEST(libclang, clang_parseTranslationUnit2_InvalidArgs) {
-  EXPECT_EQ(CXError_InvalidArguments,
-            clang_parseTranslationUnit2(nullptr, nullptr, nullptr, 0, nullptr,
-                                        0, 0, nullptr));
-}
-
-TEST(libclang, clang_createTranslationUnit_InvalidArgs) {
-  EXPECT_EQ(nullptr, clang_createTranslationUnit(nullptr, nullptr));
-}
-
-TEST(libclang, clang_createTranslationUnit2_InvalidArgs) {
-  EXPECT_EQ(CXError_InvalidArguments,
-            clang_createTranslationUnit2(nullptr, nullptr, nullptr));
-
-  CXTranslationUnit TU = reinterpret_cast<CXTranslationUnit>(1);
-  EXPECT_EQ(CXError_InvalidArguments,
-            clang_createTranslationUnit2(nullptr, nullptr, &TU));
-  EXPECT_EQ(nullptr, TU);
-}
-
-namespace {
-struct TestVFO {
-  const char *Contents;
-  CXVirtualFileOverlay VFO;
-
-  TestVFO(const char *Contents) : Contents(Contents) {
-    VFO = clang_VirtualFileOverlay_create(0);
-  }
-
-  void map(const char *VPath, const char *RPath) {
-    CXErrorCode Err = clang_VirtualFileOverlay_addFileMapping(VFO, VPath, RPath);
-    EXPECT_EQ(Err, CXError_Success);
-  }
-
-  void mapError(const char *VPath, const char *RPath, CXErrorCode ExpErr) {
-    CXErrorCode Err = clang_VirtualFileOverlay_addFileMapping(VFO, VPath, RPath);
-    EXPECT_EQ(Err, ExpErr);
-  }
-
-  ~TestVFO() {
-    if (Contents) {
-      char *BufPtr;
-      unsigned BufSize;
-      clang_VirtualFileOverlay_writeToBuffer(VFO, 0, &BufPtr, &BufSize);
-      std::string BufStr(BufPtr, BufSize);
-      EXPECT_STREQ(Contents, BufStr.c_str());
-      clang_free(BufPtr);
-    }
-    clang_VirtualFileOverlay_dispose(VFO);
-  }
-};
-}
-
-TEST(libclang, VirtualFileOverlay_Basic) {
-  const char *contents =
-      "{\n"
-      "  'version': 0,\n"
-      "  'roots': [\n"
-      "    {\n"
-      "      'type': 'directory',\n"
-      "      'name': \"/path/virtual\",\n"
-      "      'contents': [\n"
-      "        {\n"
-      "          'type': 'file',\n"
-      "          'name': \"foo.h\",\n"
-      "          'external-contents': \"/real/foo.h\"\n"
-      "        }\n"
-      "      ]\n"
-      "    }\n"
-      "  ]\n"
-      "}\n";
-  TestVFO T(contents);
-  T.map("/path/virtual/foo.h", "/real/foo.h");
-}
-
-TEST(libclang, VirtualFileOverlay_Unicode) {
-  const char *contents =
-      "{\n"
-      "  'version': 0,\n"
-      "  'roots': [\n"
-      "    {\n"
-      "      'type': 'directory',\n"
-      "      'name': \"/path/\\u266B\",\n"
-      "      'contents': [\n"
-      "        {\n"
-      "          'type': 'file',\n"
-      "          'name': \"\\u2602.h\",\n"
-      "          'external-contents': \"/real/\\u2602.h\"\n"
-      "        }\n"
-      "      ]\n"
-      "    }\n"
-      "  ]\n"
-      "}\n";
-  TestVFO T(contents);
-  T.map("/path/♫/☂.h", "/real/☂.h");
-}
-
-TEST(libclang, VirtualFileOverlay_InvalidArgs) {
-  TestVFO T(nullptr);
-  T.mapError("/path/./virtual/../foo.h", "/real/foo.h",
-             CXError_InvalidArguments);
-}
-
-TEST(libclang, VirtualFileOverlay_RemapDirectories) {
-  const char *contents =
-      "{\n"
-      "  'version': 0,\n"
-      "  'roots': [\n"
-      "    {\n"
-      "      'type': 'directory',\n"
-      "      'name': \"/another/dir\",\n"
-      "      'contents': [\n"
-      "        {\n"
-      "          'type': 'file',\n"
-      "          'name': \"foo2.h\",\n"
-      "          'external-contents': \"/real/foo2.h\"\n"
-      "        }\n"
-      "      ]\n"
-      "    },\n"
-      "    {\n"
-      "      'type': 'directory',\n"
-      "      'name': \"/path/virtual/dir\",\n"
-      "      'contents': [\n"
-      "        {\n"
-      "          'type': 'file',\n"
-      "          'name': \"foo1.h\",\n"
-      "          'external-contents': \"/real/foo1.h\"\n"
-      "        },\n"
-      "        {\n"
-      "          'type': 'file',\n"
-      "          'name': \"foo3.h\",\n"
-      "          'external-contents': \"/real/foo3.h\"\n"
-      "        },\n"
-      "        {\n"
-      "          'type': 'directory',\n"
-      "          'name': \"in/subdir\",\n"
-      "          'contents': [\n"
-      "            {\n"
-      "              'type': 'file',\n"
-      "              'name': \"foo4.h\",\n"
-      "              'external-contents': \"/real/foo4.h\"\n"
-      "            }\n"
-      "          ]\n"
-      "        }\n"
-      "      ]\n"
-      "    }\n"
-      "  ]\n"
-      "}\n";
-  TestVFO T(contents);
-  T.map("/path/virtual/dir/foo1.h", "/real/foo1.h");
-  T.map("/another/dir/foo2.h", "/real/foo2.h");
-  T.map("/path/virtual/dir/foo3.h", "/real/foo3.h");
-  T.map("/path/virtual/dir/in/subdir/foo4.h", "/real/foo4.h");
-}
-
-TEST(libclang, VirtualFileOverlay_CaseInsensitive) {
-  const char *contents =
-      "{\n"
-      "  'version': 0,\n"
-      "  'case-sensitive': 'false',\n"
-      "  'roots': [\n"
-      "    {\n"
-      "      'type': 'directory',\n"
-      "      'name': \"/path/virtual\",\n"
-      "      'contents': [\n"
-      "        {\n"
-      "          'type': 'file',\n"
-      "          'name': \"foo.h\",\n"
-      "          'external-contents': \"/real/foo.h\"\n"
-      "        }\n"
-      "      ]\n"
-      "    }\n"
-      "  ]\n"
-      "}\n";
-  TestVFO T(contents);
-  T.map("/path/virtual/foo.h", "/real/foo.h");
-  clang_VirtualFileOverlay_setCaseSensitivity(T.VFO, false);
-}
-
-TEST(libclang, VirtualFileOverlay_SharedPrefix) {
-  const char *contents =
-      "{\n"
-      "  'version': 0,\n"
-      "  'roots': [\n"
-      "    {\n"
-      "      'type': 'directory',\n"
-      "      'name': \"/path/foo\",\n"
-      "      'contents': [\n"
-      "        {\n"
-      "          'type': 'file',\n"
-      "          'name': \"bar\",\n"
-      "          'external-contents': \"/real/bar\"\n"
-      "        },\n"
-      "        {\n"
-      "          'type': 'file',\n"
-      "          'name': \"bar.h\",\n"
-      "          'external-contents': \"/real/bar.h\"\n"
-      "        }\n"
-      "      ]\n"
-      "    },\n"
-      "    {\n"
-      "      'type': 'directory',\n"
-      "      'name': \"/path/foobar\",\n"
-      "      'contents': [\n"
-      "        {\n"
-      "          'type': 'file',\n"
-      "          'name': \"baz.h\",\n"
-      "          'external-contents': \"/real/baz.h\"\n"
-      "        }\n"
-      "      ]\n"
-      "    },\n"
-      "    {\n"
-      "      'type': 'directory',\n"
-      "      'name': \"/path\",\n"
-      "      'contents': [\n"
-      "        {\n"
-      "          'type': 'file',\n"
-      "          'name': \"foobarbaz.h\",\n"
-      "          'external-contents': \"/real/foobarbaz.h\"\n"
-      "        }\n"
-      "      ]\n"
-      "    }\n"
-      "  ]\n"
-      "}\n";
-  TestVFO T(contents);
-  T.map("/path/foo/bar.h", "/real/bar.h");
-  T.map("/path/foo/bar", "/real/bar");
-  T.map("/path/foobar/baz.h", "/real/baz.h");
-  T.map("/path/foobarbaz.h", "/real/foobarbaz.h");
-}
-
-TEST(libclang, VirtualFileOverlay_AdjacentDirectory) {
-  const char *contents =
-      "{\n"
-      "  'version': 0,\n"
-      "  'roots': [\n"
-      "    {\n"
-      "      'type': 'directory',\n"
-      "      'name': \"/path/dir1\",\n"
-      "      'contents': [\n"
-      "        {\n"
-      "          'type': 'file',\n"
-      "          'name': \"foo.h\",\n"
-      "          'external-contents': \"/real/foo.h\"\n"
-      "        },\n"
-      "        {\n"
-      "          'type': 'directory',\n"
-      "          'name': \"subdir\",\n"
-      "          'contents': [\n"
-      "            {\n"
-      "              'type': 'file',\n"
-      "              'name': \"bar.h\",\n"
-      "              'external-contents': \"/real/bar.h\"\n"
-      "            }\n"
-      "          ]\n"
-      "        }\n"
-      "      ]\n"
-      "    },\n"
-      "    {\n"
-      "      'type': 'directory',\n"
-      "      'name': \"/path/dir2\",\n"
-      "      'contents': [\n"
-      "        {\n"
-      "          'type': 'file',\n"
-      "          'name': \"baz.h\",\n"
-      "          'external-contents': \"/real/baz.h\"\n"
-      "        }\n"
-      "      ]\n"
-      "    }\n"
-      "  ]\n"
-      "}\n";
-  TestVFO T(contents);
-  T.map("/path/dir1/foo.h", "/real/foo.h");
-  T.map("/path/dir1/subdir/bar.h", "/real/bar.h");
-  T.map("/path/dir2/baz.h", "/real/baz.h");
-}
-
-TEST(libclang, VirtualFileOverlay_TopLevel) {
-  const char *contents =
-      "{\n"
-      "  'version': 0,\n"
-      "  'roots': [\n"
-      "    {\n"
-      "      'type': 'directory',\n"
-      "      'name': \"/\",\n"
-      "      'contents': [\n"
-      "        {\n"
-      "          'type': 'file',\n"
-      "          'name': \"foo.h\",\n"
-      "          'external-contents': \"/real/foo.h\"\n"
-      "        }\n"
-      "      ]\n"
-      "    }\n"
-      "  ]\n"
-      "}\n";
-  TestVFO T(contents);
-  T.map("/foo.h", "/real/foo.h");
-}
-
-TEST(libclang, VirtualFileOverlay_Empty) {
-  const char *contents =
-      "{\n"
-      "  'version': 0,\n"
-      "  'roots': [\n"
-      "  ]\n"
-      "}\n";
-  TestVFO T(contents);
-}
-
-TEST(libclang, ModuleMapDescriptor) {
-  const char *Contents =
-    "framework module TestFrame {\n"
-    "  umbrella header \"TestFrame.h\"\n"
-    "\n"
-    "  export *\n"
-    "  module * { export * }\n"
-    "}\n";
-
-  CXModuleMapDescriptor MMD = clang_ModuleMapDescriptor_create(0);
-
-  clang_ModuleMapDescriptor_setFrameworkModuleName(MMD, "TestFrame");
-  clang_ModuleMapDescriptor_setUmbrellaHeader(MMD, "TestFrame.h");
-
-  char *BufPtr;
-  unsigned BufSize;
-  clang_ModuleMapDescriptor_writeToBuffer(MMD, 0, &BufPtr, &BufSize);
-  std::string BufStr(BufPtr, BufSize);
-  EXPECT_STREQ(Contents, BufStr.c_str());
-  clang_free(BufPtr);
-  clang_ModuleMapDescriptor_dispose(MMD);
-}
-
-TEST_F(LibclangParseTest, AllSkippedRanges) {
-  std::string Header = "header.h", Main = "main.cpp";
-  WriteFile(Header,
-    "#ifdef MANGOS\n"
-    "printf(\"mmm\");\n"
-    "#endif");
-  WriteFile(Main,
-    "#include \"header.h\"\n"
-    "#ifdef KIWIS\n"
-    "printf(\"mmm!!\");\n"
-    "#endif");
-
-  ClangTU = clang_parseTranslationUnit(Index, Main.c_str(), nullptr, 0,
-                                       nullptr, 0, TUFlags);
-
-  CXSourceRangeList *Ranges = clang_getAllSkippedRanges(ClangTU);
-  EXPECT_EQ(2U, Ranges->count);
-  
-  CXSourceLocation cxl;
-  unsigned line;
-  cxl = clang_getRangeStart(Ranges->ranges[0]);
-  clang_getSpellingLocation(cxl, nullptr, &line, nullptr, nullptr);
-  EXPECT_EQ(1U, line);
-  cxl = clang_getRangeEnd(Ranges->ranges[0]);
-  clang_getSpellingLocation(cxl, nullptr, &line, nullptr, nullptr);
-  EXPECT_EQ(3U, line);
-
-  cxl = clang_getRangeStart(Ranges->ranges[1]);
-  clang_getSpellingLocation(cxl, nullptr, &line, nullptr, nullptr);
-  EXPECT_EQ(2U, line);
-  cxl = clang_getRangeEnd(Ranges->ranges[1]);
-  clang_getSpellingLocation(cxl, nullptr, &line, nullptr, nullptr);
-  EXPECT_EQ(4U, line);
-
-  clang_disposeSourceRangeList(Ranges);
-}
-
-TEST_F(LibclangParseTest, EvaluateChildExpression) {
-  std::string Main = "main.m";
-  WriteFile(Main, "#define kFOO @\"foo\"\n"
-                  "void foobar(void) {\n"
-                  " {kFOO;}\n"
-                  "}\n");
-  ClangTU = clang_parseTranslationUnit(Index, Main.c_str(), nullptr, 0, nullptr,
-                                       0, TUFlags);
-
-  CXCursor C = clang_getTranslationUnitCursor(ClangTU);
-  clang_visitChildren(
-      C,
-      [](CXCursor cursor, CXCursor parent,
-         CXClientData client_data) -> CXChildVisitResult {
-        if (clang_getCursorKind(cursor) == CXCursor_FunctionDecl) {
-          int numberedStmt = 0;
-          clang_visitChildren(
-              cursor,
-              [](CXCursor cursor, CXCursor parent,
-                 CXClientData client_data) -> CXChildVisitResult {
-                int &numberedStmt = *((int *)client_data);
-                if (clang_getCursorKind(cursor) == CXCursor_CompoundStmt) {
-                  if (numberedStmt) {
-                    CXEvalResult RE = clang_Cursor_Evaluate(cursor);
-                    EXPECT_NE(RE, nullptr);
-                    EXPECT_EQ(clang_EvalResult_getKind(RE),
-                              CXEval_ObjCStrLiteral);
-                    clang_EvalResult_dispose(RE);
-                    return CXChildVisit_Break;
-                  }
-                  numberedStmt++;
-                }
-                return CXChildVisit_Recurse;
-              },
-              &numberedStmt);
-          EXPECT_EQ(numberedStmt, 1);
-        }
-        return CXChildVisit_Continue;
-      },
-      nullptr);
-}
-
-class LibclangReparseTest : public LibclangParseTest {
-public:
-  void DisplayDiagnostics() {
-    unsigned NumDiagnostics = clang_getNumDiagnostics(ClangTU);
-    for (unsigned i = 0; i < NumDiagnostics; ++i) {
-      auto Diag = clang_getDiagnostic(ClangTU, i);
-      LLVM_DEBUG(llvm::dbgs()
-                 << clang_getCString(clang_formatDiagnostic(
-                        Diag, clang_defaultDiagnosticDisplayOptions()))
-                 << "\n");
-      clang_disposeDiagnostic(Diag);
-    }
-  }
-  bool ReparseTU(unsigned num_unsaved_files, CXUnsavedFile* unsaved_files) {
-    if (clang_reparseTranslationUnit(ClangTU, num_unsaved_files, unsaved_files,
-                                     clang_defaultReparseOptions(ClangTU))) {
-      LLVM_DEBUG(llvm::dbgs() << "Reparse failed\n");
-      return false;
-    }
-    DisplayDiagnostics();
-    return true;
-  }
-};
-
-TEST_F(LibclangReparseTest, FileName) {
-  std::string CppName = "main.cpp";
-  WriteFile(CppName, "int main() {}");
-  ClangTU = clang_parseTranslationUnit(Index, CppName.c_str(), nullptr, 0,
-                                       nullptr, 0, TUFlags);
-  CXFile cxf = clang_getFile(ClangTU, CppName.c_str());
-
-  CXString cxname = clang_getFileName(cxf);
-  ASSERT_STREQ(clang_getCString(cxname), CppName.c_str());
-  clang_disposeString(cxname);
-
-  cxname = clang_File_tryGetRealPathName(cxf);
-  ASSERT_TRUE(llvm::StringRef(clang_getCString(cxname)).endswith("main.cpp"));
-  clang_disposeString(cxname);
-}
-
-TEST_F(LibclangReparseTest, Reparse) {
-  const char *HeaderTop = "#ifndef H\n#define H\nstruct Foo { int bar;";
-  const char *HeaderBottom = "\n};\n#endif\n";
-  const char *CppFile = "#include \"HeaderFile.h\"\nint main() {"
-                         " Foo foo; foo.bar = 7; foo.baz = 8; }\n";
-  std::string HeaderName = "HeaderFile.h";
-  std::string CppName = "CppFile.cpp";
-  WriteFile(CppName, CppFile);
-  WriteFile(HeaderName, std::string(HeaderTop) + HeaderBottom);
-
-  ClangTU = clang_parseTranslationUnit(Index, CppName.c_str(), nullptr, 0,
-                                       nullptr, 0, TUFlags);
-  EXPECT_EQ(1U, clang_getNumDiagnostics(ClangTU));
-  DisplayDiagnostics();
-
-  // Immedaitely reparse.
-  ASSERT_TRUE(ReparseTU(0, nullptr /* No unsaved files. */));
-  EXPECT_EQ(1U, clang_getNumDiagnostics(ClangTU));
-
-  std::string NewHeaderContents =
-      std::string(HeaderTop) + "int baz;" + HeaderBottom;
-  WriteFile(HeaderName, NewHeaderContents);
-
-  // Reparse after fix.
-  ASSERT_TRUE(ReparseTU(0, nullptr /* No unsaved files. */));
-  EXPECT_EQ(0U, clang_getNumDiagnostics(ClangTU));
-}
-
-TEST_F(LibclangReparseTest, ReparseWithModule) {
-  const char *HeaderTop = "#ifndef H\n#define H\nstruct Foo { int bar;";
-  const char *HeaderBottom = "\n};\n#endif\n";
-  const char *MFile = "#include \"HeaderFile.h\"\nint main() {"
-                         " struct Foo foo; foo.bar = 7; foo.baz = 8; }\n";
-  const char *ModFile = "module A { header \"HeaderFile.h\" }\n";
-  std::string HeaderName = "HeaderFile.h";
-  std::string MName = "MFile.m";
-  std::string ModName = "module.modulemap";
-  WriteFile(MName, MFile);
-  WriteFile(HeaderName, std::string(HeaderTop) + HeaderBottom);
-  WriteFile(ModName, ModFile);
-
-  std::string ModulesCache = std::string("-fmodules-cache-path=") + TestDir;
-  const char *Args[] = { "-fmodules", ModulesCache.c_str(),
-                         "-I", TestDir.c_str() };
-  int NumArgs = sizeof(Args) / sizeof(Args[0]);
-  ClangTU = clang_parseTranslationUnit(Index, MName.c_str(), Args, NumArgs,
-                                       nullptr, 0, TUFlags);
-  EXPECT_EQ(1U, clang_getNumDiagnostics(ClangTU));
-  DisplayDiagnostics();
-
-  // Immedaitely reparse.
-  ASSERT_TRUE(ReparseTU(0, nullptr /* No unsaved files. */));
-  EXPECT_EQ(1U, clang_getNumDiagnostics(ClangTU));
-
-  std::string NewHeaderContents =
-      std::string(HeaderTop) + "int baz;" + HeaderBottom;
-  WriteFile(HeaderName, NewHeaderContents);
-
-  // Reparse after fix.
-  ASSERT_TRUE(ReparseTU(0, nullptr /* No unsaved files. */));
-  EXPECT_EQ(0U, clang_getNumDiagnostics(ClangTU));
-}
-
-TEST_F(LibclangReparseTest, clang_parseTranslationUnit2FullArgv) {
-  // Provide a fake GCC 99.9.9 standard library that always overrides any local
-  // GCC installation.
-  std::string EmptyFiles[] = {"lib/gcc/arm-linux-gnueabi/99.9.9/crtbegin.o",
-                              "include/arm-linux-gnueabi/.keep",
-                              "include/c++/99.9.9/vector"};
-
-  for (auto &Name : EmptyFiles)
-    WriteFile(Name, "\n");
-
-  std::string Filename = "test.cc";
-  WriteFile(Filename, "#include <vector>\n");
-
-  std::string Clang = "bin/clang";
-  WriteFile(Clang, "");
-
-  const char *Argv[] = {Clang.c_str(), "-target", "arm-linux-gnueabi",
-                        "-stdlib=libstdc++", "--gcc-toolchain="};
-
-  EXPECT_EQ(CXError_Success,
-            clang_parseTranslationUnit2FullArgv(Index, Filename.c_str(), Argv,
-                                                sizeof(Argv) / sizeof(Argv[0]),
-                                                nullptr, 0, TUFlags, &ClangTU));
-  EXPECT_EQ(0U, clang_getNumDiagnostics(ClangTU));
-  DisplayDiagnostics();
-}
-
-class LibclangPrintingPolicyTest : public LibclangParseTest {
-public:
-  CXPrintingPolicy Policy = nullptr;
-
-  void SetUp() override {
-    LibclangParseTest::SetUp();
-    std::string File = "file.cpp";
-    WriteFile(File, "int i;\n");
-    ClangTU = clang_parseTranslationUnit(Index, File.c_str(), nullptr, 0,
-                                         nullptr, 0, TUFlags);
-    CXCursor TUCursor = clang_getTranslationUnitCursor(ClangTU);
-    Policy = clang_getCursorPrintingPolicy(TUCursor);
-  }
-  void TearDown() override {
-    clang_PrintingPolicy_dispose(Policy);
-    LibclangParseTest::TearDown();
-  }
-};
-
-TEST_F(LibclangPrintingPolicyTest, SetAndGetProperties) {
-  for (unsigned Value = 0; Value < 2; ++Value) {
-    for (int I = 0; I < CXPrintingPolicy_LastProperty; ++I) {
-      auto Property = static_cast<enum CXPrintingPolicyProperty>(I);
-
-      clang_PrintingPolicy_setProperty(Policy, Property, Value);
-      EXPECT_EQ(Value, clang_PrintingPolicy_getProperty(Policy, Property));
-    }
-  }
-}
-
-TEST_F(LibclangReparseTest, PreprocessorSkippedRanges) {
-  std::string Header = "header.h", Main = "main.cpp";
-  WriteFile(Header,
-    "#ifdef MANGOS\n"
-    "printf(\"mmm\");\n"
-    "#endif");
-  WriteFile(Main,
-    "#include \"header.h\"\n"
-    "#ifdef GUAVA\n"
-    "#endif\n"
-    "#ifdef KIWIS\n"
-    "printf(\"mmm!!\");\n"
-    "#endif");
-
-  for (int i = 0; i != 3; ++i) {
-    unsigned flags = TUFlags | CXTranslationUnit_PrecompiledPreamble;
-    if (i == 2)
-      flags |= CXTranslationUnit_CreatePreambleOnFirstParse;
-
-    if (i != 0)
-       clang_disposeTranslationUnit(ClangTU);  // dispose from previous iter
-
-    // parse once
-    ClangTU = clang_parseTranslationUnit(Index, Main.c_str(), nullptr, 0,
-                                         nullptr, 0, flags);
-    if (i != 0) {
-      // reparse
-      ASSERT_TRUE(ReparseTU(0, nullptr /* No unsaved files. */));
-    }
-
-    // Check all ranges are there
-    CXSourceRangeList *Ranges = clang_getAllSkippedRanges(ClangTU);
-    EXPECT_EQ(3U, Ranges->count);
-
-    CXSourceLocation cxl;
-    unsigned line;
-    cxl = clang_getRangeStart(Ranges->ranges[0]);
-    clang_getSpellingLocation(cxl, nullptr, &line, nullptr, nullptr);
-    EXPECT_EQ(1U, line);
-    cxl = clang_getRangeEnd(Ranges->ranges[0]);
-    clang_getSpellingLocation(cxl, nullptr, &line, nullptr, nullptr);
-    EXPECT_EQ(3U, line);
-
-    cxl = clang_getRangeStart(Ranges->ranges[1]);
-    clang_getSpellingLocation(cxl, nullptr, &line, nullptr, nullptr);
-    EXPECT_EQ(2U, line);
-    cxl = clang_getRangeEnd(Ranges->ranges[1]);
-    clang_getSpellingLocation(cxl, nullptr, &line, nullptr, nullptr);
-    EXPECT_EQ(3U, line);
-
-    cxl = clang_getRangeStart(Ranges->ranges[2]);
-    clang_getSpellingLocation(cxl, nullptr, &line, nullptr, nullptr);
-    EXPECT_EQ(4U, line);
-    cxl = clang_getRangeEnd(Ranges->ranges[2]);
-    clang_getSpellingLocation(cxl, nullptr, &line, nullptr, nullptr);
-    EXPECT_EQ(6U, line);
-
-    clang_disposeSourceRangeList(Ranges);
-
-    // Check obtaining ranges by each file works
-    CXFile cxf = clang_getFile(ClangTU, Header.c_str());
-    Ranges = clang_getSkippedRanges(ClangTU, cxf);
-    EXPECT_EQ(1U, Ranges->count);
-    cxl = clang_getRangeStart(Ranges->ranges[0]);
-    clang_getSpellingLocation(cxl, nullptr, &line, nullptr, nullptr);
-    EXPECT_EQ(1U, line);
-    clang_disposeSourceRangeList(Ranges);
-
-    cxf = clang_getFile(ClangTU, Main.c_str());
-    Ranges = clang_getSkippedRanges(ClangTU, cxf);
-    EXPECT_EQ(2U, Ranges->count);
-    cxl = clang_getRangeStart(Ranges->ranges[0]);
-    clang_getSpellingLocation(cxl, nullptr, &line, nullptr, nullptr);
-    EXPECT_EQ(2U, line);
-    cxl = clang_getRangeStart(Ranges->ranges[1]);
-    clang_getSpellingLocation(cxl, nullptr, &line, nullptr, nullptr);
-    EXPECT_EQ(4U, line);
-    clang_disposeSourceRangeList(Ranges);
-  }
-}
-
-class LibclangSerializationTest : public LibclangParseTest {
-public:
-  bool SaveAndLoadTU(const std::string &Filename) {
-    unsigned options = clang_defaultSaveOptions(ClangTU);
-    if (clang_saveTranslationUnit(ClangTU, Filename.c_str(), options) !=
-        CXSaveError_None) {
-      LLVM_DEBUG(llvm::dbgs() << "Saving failed\n");
-      return false;
-    }
-
-    clang_disposeTranslationUnit(ClangTU);
-
-    ClangTU = clang_createTranslationUnit(Index, Filename.c_str());
-
-    if (!ClangTU) {
-      LLVM_DEBUG(llvm::dbgs() << "Loading failed\n");
-      return false;
-    }
-
-    return true;
-  }
-};
-
-TEST_F(LibclangSerializationTest, TokenKindsAreCorrectAfterLoading) {
-  // Ensure that "class" is recognized as a keyword token after serializing
-  // and reloading the AST, as it is not a keyword for the default LangOptions.
-  std::string HeaderName = "test.h";
-  WriteFile(HeaderName, "enum class Something {};");
-
-  const char *Argv[] = {"-xc++-header", "-std=c++11"};
-
-  ClangTU = clang_parseTranslationUnit(Index, HeaderName.c_str(), Argv,
-                                       sizeof(Argv) / sizeof(Argv[0]), nullptr,
-                                       0, TUFlags);
-
-  auto CheckTokenKinds = [=]() {
-    CXSourceRange Range =
-        clang_getCursorExtent(clang_getTranslationUnitCursor(ClangTU));
-
-    CXToken *Tokens;
-    unsigned int NumTokens;
-    clang_tokenize(ClangTU, Range, &Tokens, &NumTokens);
-
-    ASSERT_EQ(6u, NumTokens);
-    EXPECT_EQ(CXToken_Keyword, clang_getTokenKind(Tokens[0]));
-    EXPECT_EQ(CXToken_Keyword, clang_getTokenKind(Tokens[1]));
-    EXPECT_EQ(CXToken_Identifier, clang_getTokenKind(Tokens[2]));
-    EXPECT_EQ(CXToken_Punctuation, clang_getTokenKind(Tokens[3]));
-    EXPECT_EQ(CXToken_Punctuation, clang_getTokenKind(Tokens[4]));
-    EXPECT_EQ(CXToken_Punctuation, clang_getTokenKind(Tokens[5]));
-
-    clang_disposeTokens(ClangTU, Tokens, NumTokens);
-  };
-
-  CheckTokenKinds();
-
-  std::string ASTName = "test.ast";
-  WriteFile(ASTName, "");
-
-  ASSERT_TRUE(SaveAndLoadTU(ASTName));
-
-  CheckTokenKinds();
-}
-
-TEST_F(LibclangParseTest, clang_getVarDeclInitializer) {
-  std::string Main = "main.cpp";
-  WriteFile(Main, "int foo() { return 5; }; const int a = foo();");
-  ClangTU = clang_parseTranslationUnit(Index, Main.c_str(), nullptr, 0, nullptr,
-                                       0, TUFlags);
-
-  CXCursor C = clang_getTranslationUnitCursor(ClangTU);
-  clang_visitChildren(
-      C,
-      [](CXCursor cursor, CXCursor parent,
-         CXClientData client_data) -> CXChildVisitResult {
-        if (clang_getCursorKind(cursor) == CXCursor_VarDecl) {
-          const CXCursor Initializer = clang_Cursor_getVarDeclInitializer(cursor);
-          EXPECT_FALSE(clang_Cursor_isNull(Initializer));
-          CXString Spelling = clang_getCursorSpelling(Initializer);
-          const char* const SpellingCSstr = clang_getCString(Spelling);
-          EXPECT_TRUE(SpellingCSstr);
-          EXPECT_EQ(std::string(SpellingCSstr), std::string("foo"));
-          clang_disposeString(Spelling);
-          return CXChildVisit_Break;
-        }
-        return CXChildVisit_Continue;
-      },
-      nullptr);
-}
-
-TEST_F(LibclangParseTest, clang_hasVarDeclGlobalStorageFalse) {
-  std::string Main = "main.cpp";
-  WriteFile(Main, "void foo() { int a; }");
-  ClangTU = clang_parseTranslationUnit(Index, Main.c_str(), nullptr, 0, nullptr,
-                                       0, TUFlags);
-
-  CXCursor C = clang_getTranslationUnitCursor(ClangTU);
-  clang_visitChildren(
-      C,
-      [](CXCursor cursor, CXCursor parent,
-         CXClientData client_data) -> CXChildVisitResult {
-        if (clang_getCursorKind(cursor) == CXCursor_VarDecl) {
-          EXPECT_FALSE(clang_Cursor_hasVarDeclGlobalStorage(cursor));
-          return CXChildVisit_Break;
-        }
-        return CXChildVisit_Continue;
-      },
-      nullptr);
-}
-
-TEST_F(LibclangParseTest, clang_Cursor_hasVarDeclGlobalStorageTrue) {
-  std::string Main = "main.cpp";
-  WriteFile(Main, "int a;");
-  ClangTU = clang_parseTranslationUnit(Index, Main.c_str(), nullptr, 0, nullptr,
-                                       0, TUFlags);
-
-  CXCursor C = clang_getTranslationUnitCursor(ClangTU);
-  clang_visitChildren(
-      C,
-      [](CXCursor cursor, CXCursor parent,
-         CXClientData client_data) -> CXChildVisitResult {
-        if (clang_getCursorKind(cursor) == CXCursor_VarDecl) {
-          EXPECT_TRUE(clang_Cursor_hasVarDeclGlobalStorage(cursor));
-          return CXChildVisit_Break;
-        }
-        return CXChildVisit_Continue;
-      },
-      nullptr);
-}
-
-TEST_F(LibclangParseTest, clang_Cursor_hasVarDeclExternalStorageFalse) {
-  std::string Main = "main.cpp";
-  WriteFile(Main, "int a;");
-  ClangTU = clang_parseTranslationUnit(Index, Main.c_str(), nullptr, 0, nullptr,
-                                       0, TUFlags);
-
-  CXCursor C = clang_getTranslationUnitCursor(ClangTU);
-  clang_visitChildren(
-      C,
-      [](CXCursor cursor, CXCursor parent,
-         CXClientData client_data) -> CXChildVisitResult {
-        if (clang_getCursorKind(cursor) == CXCursor_VarDecl) {
-          EXPECT_FALSE(clang_Cursor_hasVarDeclExternalStorage(cursor));
-          return CXChildVisit_Break;
-        }
-        return CXChildVisit_Continue;
-      },
-      nullptr);
-}
-
-TEST_F(LibclangParseTest, clang_Cursor_hasVarDeclExternalStorageTrue) {
-  std::string Main = "main.cpp";
-  WriteFile(Main, "extern int a;");
-  ClangTU = clang_parseTranslationUnit(Index, Main.c_str(), nullptr, 0, nullptr,
-                                       0, TUFlags);
-
-  CXCursor C = clang_getTranslationUnitCursor(ClangTU);
-  clang_visitChildren(
-      C,
-      [](CXCursor cursor, CXCursor parent,
-         CXClientData client_data) -> CXChildVisitResult {
-        if (clang_getCursorKind(cursor) == CXCursor_VarDecl) {
-          EXPECT_TRUE(clang_Cursor_hasVarDeclExternalStorage(cursor));
-          return CXChildVisit_Break;
-        }
-        return CXChildVisit_Continue;
-      },
-      nullptr);
-}
-class LibclangRewriteTest : public LibclangParseTest {
-public:
-  CXRewriter Rew = nullptr;
-  std::string Filename;
-  CXFile File = nullptr;
-
-  void SetUp() override {
-    LibclangParseTest::SetUp();
-    Filename = "file.cpp";
-    WriteFile(Filename, "int main() { return 0; }");
-    ClangTU = clang_parseTranslationUnit(Index, Filename.c_str(), nullptr, 0,
-                                         nullptr, 0, TUFlags);
-    Rew = clang_CXRewriter_create(ClangTU);
-    File = clang_getFile(ClangTU, Filename.c_str());
-  }
-  void TearDown() override {
-    clang_CXRewriter_dispose(Rew);
-    LibclangParseTest::TearDown();
-  }
-};
-
-static std::string getFileContent(const std::string& Filename) {
-  std::ifstream RewrittenFile(Filename);
-  std::string RewrittenFileContent;
-  std::string Line;
-  while (std::getline(RewrittenFile, Line)) {
-    if (RewrittenFileContent.empty())
-      RewrittenFileContent = Line;
-    else {
-      RewrittenFileContent += "\n" + Line;
-    }
-  }
-  return RewrittenFileContent;
-}
-
-TEST_F(LibclangRewriteTest, RewriteReplace) {
-  CXSourceLocation B = clang_getLocation(ClangTU, File, 1, 5);
-  CXSourceLocation E = clang_getLocation(ClangTU, File, 1, 9);
-  CXSourceRange Rng	= clang_getRange(B, E);
-
-  clang_CXRewriter_replaceText(Rew, Rng, "MAIN");
-
-  ASSERT_EQ(clang_CXRewriter_overwriteChangedFiles(Rew), 0);
-  EXPECT_EQ(getFileContent(Filename), "int MAIN() { return 0; }");
-}
-
-TEST_F(LibclangRewriteTest, RewriteReplaceShorter) {
-  CXSourceLocation B = clang_getLocation(ClangTU, File, 1, 5);
-  CXSourceLocation E = clang_getLocation(ClangTU, File, 1, 9);
-  CXSourceRange Rng	= clang_getRange(B, E);
-
-  clang_CXRewriter_replaceText(Rew, Rng, "foo");
-
-  ASSERT_EQ(clang_CXRewriter_overwriteChangedFiles(Rew), 0);
-  EXPECT_EQ(getFileContent(Filename), "int foo() { return 0; }");
-}
-
-TEST_F(LibclangRewriteTest, RewriteReplaceLonger) {
-  CXSourceLocation B = clang_getLocation(ClangTU, File, 1, 5);
-  CXSourceLocation E = clang_getLocation(ClangTU, File, 1, 9);
-  CXSourceRange Rng	= clang_getRange(B, E);
-
-  clang_CXRewriter_replaceText(Rew, Rng, "patatino");
-
-  ASSERT_EQ(clang_CXRewriter_overwriteChangedFiles(Rew), 0);
-  EXPECT_EQ(getFileContent(Filename), "int patatino() { return 0; }");
-}
-
-TEST_F(LibclangRewriteTest, RewriteInsert) {
-  CXSourceLocation Loc = clang_getLocation(ClangTU, File, 1, 5);
-
-  clang_CXRewriter_insertTextBefore(Rew, Loc, "ro");
-
-  ASSERT_EQ(clang_CXRewriter_overwriteChangedFiles(Rew), 0);
-  EXPECT_EQ(getFileContent(Filename), "int romain() { return 0; }");
-}
-
-TEST_F(LibclangRewriteTest, RewriteRemove) {
-  CXSourceLocation B = clang_getLocation(ClangTU, File, 1, 5);
-  CXSourceLocation E = clang_getLocation(ClangTU, File, 1, 9);
-  CXSourceRange Rng	= clang_getRange(B, E);
-
-  clang_CXRewriter_removeText(Rew, Rng);
-
-  ASSERT_EQ(clang_CXRewriter_overwriteChangedFiles(Rew), 0);
-  EXPECT_EQ(getFileContent(Filename), "int () { return 0; }");
-}
diff --git a/gnu/llvm/clang/unittests/libclang/TestUtils.h b/gnu/llvm/clang/unittests/libclang/TestUtils.h
deleted file mode 100644
index 347fa460866..00000000000
--- a/gnu/llvm/clang/unittests/libclang/TestUtils.h
+++ /dev/null
@@ -1,94 +0,0 @@
-//===- unittests/libclang/TestUtils.h -------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_CLANG_TEST_TESTUTILS_H
-#define LLVM_CLANG_TEST_TESTUTILS_H
-
-#include "clang-c/Index.h"
-#include "llvm/ADT/StringRef.h"
-#include "llvm/Support/FileSystem.h"
-#include "llvm/Support/Path.h"
-
-#include <fstream>
-#include <memory>
-#include <string>
-#include <vector>
-#include "gtest/gtest.h"
-
-class LibclangParseTest : public ::testing::Test {
-  std::set<std::string> Files;
-  typedef std::unique_ptr<std::string> fixed_addr_string;
-  std::map<fixed_addr_string, fixed_addr_string> UnsavedFileContents;
-public:
-  std::string TestDir;
-  CXIndex Index;
-  CXTranslationUnit ClangTU;
-  unsigned TUFlags;
-  std::vector<CXUnsavedFile> UnsavedFiles;
-
-  void SetUp() override {
-    llvm::SmallString<256> Dir;
-    ASSERT_FALSE(llvm::sys::fs::createUniqueDirectory("libclang-test", Dir));
-    TestDir = std::string(Dir.str());
-    TUFlags = CXTranslationUnit_DetailedPreprocessingRecord |
-      clang_defaultEditingTranslationUnitOptions();
-    Index = clang_createIndex(0, 0);
-    ClangTU = nullptr;
-  }
-  void TearDown() override {
-    clang_disposeTranslationUnit(ClangTU);
-    clang_disposeIndex(Index);
-    for (const std::string &Path : Files)
-      llvm::sys::fs::remove(Path);
-    llvm::sys::fs::remove(TestDir);
-  }
-  void WriteFile(std::string &Filename, const std::string &Contents) {
-    if (!llvm::sys::path::is_absolute(Filename)) {
-      llvm::SmallString<256> Path(TestDir);
-      llvm::sys::path::append(Path, Filename);
-      Filename = std::string(Path.str());
-      Files.insert(Filename);
-    }
-    llvm::sys::fs::create_directories(llvm::sys::path::parent_path(Filename));
-    std::ofstream OS(Filename);
-    OS << Contents;
-    assert(OS.good());
-  }
-  void MapUnsavedFile(std::string Filename, const std::string &Contents) {
-    if (!llvm::sys::path::is_absolute(Filename)) {
-      llvm::SmallString<256> Path(TestDir);
-      llvm::sys::path::append(Path, Filename);
-      Filename = std::string(Path.str());
-    }
-    auto it = UnsavedFileContents.insert(std::make_pair(
-        fixed_addr_string(new std::string(Filename)),
-        fixed_addr_string(new std::string(Contents))));
-    UnsavedFiles.push_back({
-        it.first->first->c_str(),   // filename
-        it.first->second->c_str(),  // contents
-        it.first->second->size()    // length
-    });
-  }
-  template<typename F>
-  void Traverse(const F &TraversalFunctor) {
-    CXCursor TuCursor = clang_getTranslationUnitCursor(ClangTU);
-    std::reference_wrapper<const F> FunctorRef = std::cref(TraversalFunctor);
-    clang_visitChildren(TuCursor,
-        &TraverseStateless<std::reference_wrapper<const F>>,
-        &FunctorRef);
-  }
-private:
-  template<typename TState>
-  static CXChildVisitResult TraverseStateless(CXCursor cx, CXCursor parent,
-      CXClientData data) {
-    TState *State = static_cast<TState*>(data);
-    return State->get()(cx, parent);
-  }
-};
-
-#endif // LLVM_CLANG_TEST_TESTUTILS_H
\ No newline at end of file
-- 
2.20.1