Skip to content

Conversation

mizvekov
Copy link
Contributor

This reintroduces Type.h, having earlier been renamed to TypeBase.h, as a redirection to TypeBase.h, and redirects most users to include the former instead.

This is a preparatory patch for being able to provide inline definitions for Type methods which would otherwise cause a circular dependency with Decl{,CXX}.h.

Doing these operations into their own NFC patch helps the git rename detection logic work, preserving the history.

This patch makes clang just a little slower to build (~0.17%), just because it makes more code indirectly include DeclCXX.h.

@mizvekov mizvekov self-assigned this Aug 23, 2025
@llvmbot llvmbot added clang Clang issues not falling into any other category clang-tools-extra lldb backend:RISC-V backend:PowerPC clangd clang-tidy clang:frontend Language frontend issues, e.g. anything involving "Sema" clang:modules C++20 modules and Clang Header Modules clang:codegen IR generation bugs: mangling, exceptions, etc. clang:as-a-library libclang and C++ API clang:static analyzer debuginfo backend:DirectX HLSL HLSL Language Support clang:dataflow Clang Dataflow Analysis framework - https://clang.llvm.org/docs/DataFlowAnalysisIntro.html clang:analysis clang:openmp OpenMP related changes to Clang ClangIR Anything related to the ClangIR project labels Aug 23, 2025
@llvmbot
Copy link
Member

llvmbot commented Aug 23, 2025

@llvm/pr-subscribers-hlsl
@llvm/pr-subscribers-clang-analysis
@llvm/pr-subscribers-clangd
@llvm/pr-subscribers-backend-powerpc
@llvm/pr-subscribers-clang-codegen
@llvm/pr-subscribers-clang-static-analyzer-1
@llvm/pr-subscribers-clang-tidy

@llvm/pr-subscribers-lldb

Author: Matheus Izvekov (mizvekov)

Changes

This reintroduces Type.h, having earlier been renamed to TypeBase.h, as a redirection to TypeBase.h, and redirects most users to include the former instead.

This is a preparatory patch for being able to provide inline definitions for Type methods which would otherwise cause a circular dependency with Decl{,CXX}.h.

Doing these operations into their own NFC patch helps the git rename detection logic work, preserving the history.

This patch makes clang just a little slower to build (~0.17%), just because it makes more code indirectly include DeclCXX.h.


Patch is 131.34 KiB, truncated to 20.00 KiB below, full version: https://github.com/llvm/llvm-project/pull/155050.diff

251 Files Affected:

  • (modified) clang-tools-extra/clang-doc/Representation.h (+1-1)
  • (modified) clang-tools-extra/clang-include-fixer/find-all-symbols/FindAllSymbols.cpp (+1-1)
  • (modified) clang-tools-extra/clang-tidy/bugprone/CastingThroughVoidCheck.cpp (+1-1)
  • (modified) clang-tools-extra/clang-tidy/bugprone/ComparePointerToMemberVirtualFunctionCheck.cpp (+1-1)
  • (modified) clang-tools-extra/clang-tidy/bugprone/NarrowingConversionsCheck.cpp (+1-1)
  • (modified) clang-tools-extra/clang-tidy/bugprone/StandaloneEmptyCheck.cpp (+1-1)
  • (modified) clang-tools-extra/clang-tidy/bugprone/UnintendedCharOstreamOutputCheck.cpp (+1-1)
  • (modified) clang-tools-extra/clang-tidy/bugprone/UnusedLocalNonTrivialVariableCheck.cpp (+1-1)
  • (modified) clang-tools-extra/clang-tidy/cppcoreguidelines/InitVariablesCheck.cpp (+1-1)
  • (modified) clang-tools-extra/clang-tidy/misc/CoroutineHostileRAIICheck.cpp (+1-1)
  • (modified) clang-tools-extra/clang-tidy/modernize/UseNodiscardCheck.cpp (+1-1)
  • (modified) clang-tools-extra/clang-tidy/modernize/UseScopedLockCheck.cpp (+1-1)
  • (modified) clang-tools-extra/clang-tidy/modernize/UseStdNumbersCheck.cpp (+1-1)
  • (modified) clang-tools-extra/clang-tidy/objc/NSInvocationArgumentLifetimeCheck.cpp (+1-1)
  • (modified) clang-tools-extra/clang-tidy/readability/MagicNumbersCheck.cpp (+1-1)
  • (modified) clang-tools-extra/clang-tidy/readability/SuspiciousCallArgumentCheck.cpp (+1-1)
  • (modified) clang-tools-extra/clang-tidy/utils/DeclRefExprUtils.h (+1-1)
  • (modified) clang-tools-extra/clang-tidy/utils/DesignatedInitializers.cpp (+1)
  • (modified) clang-tools-extra/clang-tidy/utils/ExceptionSpecAnalyzer.cpp (+1)
  • (modified) clang-tools-extra/clang-tidy/utils/FixItHintUtils.cpp (+1-1)
  • (modified) clang-tools-extra/clang-tidy/utils/FixItHintUtils.h (+1-1)
  • (modified) clang-tools-extra/clang-tidy/utils/TypeTraits.h (+1-1)
  • (modified) clang-tools-extra/clangd/DumpAST.cpp (+1-1)
  • (modified) clang-tools-extra/clangd/ExpectedTypes.cpp (+1-1)
  • (modified) clang-tools-extra/clangd/ExpectedTypes.h (+1-1)
  • (modified) clang-tools-extra/clangd/FindTarget.cpp (+1-1)
  • (modified) clang-tools-extra/clangd/Hover.cpp (+1-1)
  • (modified) clang-tools-extra/clangd/IncludeFixer.cpp (+1-1)
  • (modified) clang-tools-extra/clangd/IncludeFixer.h (+1-1)
  • (modified) clang-tools-extra/clangd/InlayHints.cpp (+1-1)
  • (modified) clang-tools-extra/clangd/Preamble.cpp (+1-1)
  • (modified) clang-tools-extra/clangd/SemanticHighlighting.cpp (+1-1)
  • (modified) clang-tools-extra/clangd/XRefs.cpp (+1-1)
  • (modified) clang-tools-extra/clangd/refactor/tweaks/AddUsing.cpp (+1-1)
  • (modified) clang-tools-extra/clangd/refactor/tweaks/DumpAST.cpp (+1-1)
  • (modified) clang-tools-extra/clangd/refactor/tweaks/ExpandDeducedType.cpp (+1-1)
  • (modified) clang-tools-extra/clangd/refactor/tweaks/OverridePureVirtuals.cpp (+1-1)
  • (modified) clang-tools-extra/clangd/refactor/tweaks/PopulateSwitch.cpp (+1-1)
  • (modified) clang-tools-extra/include-cleaner/lib/WalkAST.cpp (+1-1)
  • (modified) clang/include/clang/AST/AST.h (+1-1)
  • (modified) clang/include/clang/AST/ASTDiagnostic.h (+1-1)
  • (modified) clang/include/clang/AST/ASTImporter.h (+1-1)
  • (modified) clang/include/clang/AST/ASTNodeTraverser.h (+1-1)
  • (modified) clang/include/clang/AST/AbstractTypeReader.h (+1-1)
  • (modified) clang/include/clang/AST/AbstractTypeWriter.h (+1-1)
  • (modified) clang/include/clang/AST/Attr.h (+1-1)
  • (modified) clang/include/clang/AST/CXXInheritance.h (+1-1)
  • (modified) clang/include/clang/AST/CanonicalType.h (+1-1)
  • (modified) clang/include/clang/AST/Comment.h (+1-1)
  • (modified) clang/include/clang/AST/DeclCXX.h (+1-1)
  • (modified) clang/include/clang/AST/DeclObjC.h (+1-1)
  • (modified) clang/include/clang/AST/DeclOpenMP.h (+1-1)
  • (modified) clang/include/clang/AST/DeclTemplate.h (+1-1)
  • (modified) clang/include/clang/AST/DependentDiagnostic.h (+1-1)
  • (modified) clang/include/clang/AST/ExprCXX.h (+1-1)
  • (modified) clang/include/clang/AST/ExprConcepts.h (+1-1)
  • (modified) clang/include/clang/AST/ExprObjC.h (+1-1)
  • (modified) clang/include/clang/AST/JSONNodeDumper.h (+1-1)
  • (modified) clang/include/clang/AST/LocInfoType.h (+1-1)
  • (modified) clang/include/clang/AST/Mangle.h (+1-1)
  • (modified) clang/include/clang/AST/NestedNameSpecifier.h (+1-1)
  • (modified) clang/include/clang/AST/NonTrivialTypeVisitor.h (+1-1)
  • (modified) clang/include/clang/AST/ODRHash.h (+1-1)
  • (modified) clang/include/clang/AST/RecursiveASTVisitor.h (+1-1)
  • (modified) clang/include/clang/AST/SYCLKernelInfo.h (+1-1)
  • (modified) clang/include/clang/AST/TextNodeDumper.h (+1-1)
  • (added) clang/include/clang/AST/Type.h (+46)
  • (modified) clang/include/clang/AST/TypeBase.h (-18)
  • (modified) clang/include/clang/AST/TypeOrdering.h (+1-1)
  • (modified) clang/include/clang/AST/TypeVisitor.h (+1-1)
  • (modified) clang/include/clang/ASTMatchers/ASTMatchers.h (+1-1)
  • (modified) clang/include/clang/ASTMatchers/ASTMatchersInternal.h (+1-1)
  • (modified) clang/include/clang/ASTMatchers/LowLevelHelpers.h (+1-1)
  • (modified) clang/include/clang/Analysis/Analyses/ThreadSafetyCommon.h (+1-1)
  • (modified) clang/include/clang/Analysis/FlowSensitive/ASTOps.h (+1-1)
  • (modified) clang/include/clang/Analysis/FlowSensitive/CachedConstAccessorsLattice.h (+1-1)
  • (modified) clang/include/clang/Analysis/FlowSensitive/DataflowEnvironment.h (+1-1)
  • (modified) clang/include/clang/Analysis/FlowSensitive/StorageLocation.h (+1-1)
  • (modified) clang/include/clang/CodeGen/CGFunctionInfo.h (+1-1)
  • (modified) clang/include/clang/CodeGen/CodeGenABITypes.h (+1-1)
  • (modified) clang/include/clang/CodeGen/SwiftCallingConv.h (+1-1)
  • (modified) clang/include/clang/Sema/Attr.h (+1-1)
  • (modified) clang/include/clang/Sema/CodeCompleteConsumer.h (+1-1)
  • (modified) clang/include/clang/Sema/DelayedDiagnostic.h (+1-1)
  • (modified) clang/include/clang/Sema/ExternalSemaSource.h (+1-1)
  • (modified) clang/include/clang/Sema/Initialization.h (+1-1)
  • (modified) clang/include/clang/Sema/Lookup.h (+1-1)
  • (modified) clang/include/clang/Sema/Overload.h (+1-1)
  • (modified) clang/include/clang/Sema/ScopeInfo.h (+1-1)
  • (modified) clang/include/clang/Sema/Sema.h (+1-1)
  • (modified) clang/include/clang/Sema/SemaCodeCompletion.h (+1-1)
  • (modified) clang/include/clang/Sema/SemaHLSL.h (+1-1)
  • (modified) clang/include/clang/Sema/SemaObjC.h (+1-1)
  • (modified) clang/include/clang/Sema/SemaPPC.h (+1-1)
  • (modified) clang/include/clang/Sema/SemaRISCV.h (+1-1)
  • (modified) clang/include/clang/Sema/SemaSYCL.h (+1-1)
  • (modified) clang/include/clang/Sema/Template.h (+1-1)
  • (modified) clang/include/clang/Serialization/ASTBitCodes.h (+1-1)
  • (modified) clang/include/clang/Serialization/ASTReader.h (+1-1)
  • (modified) clang/include/clang/Serialization/ASTWriter.h (+1-1)
  • (modified) clang/include/clang/StaticAnalyzer/Core/PathSensitive/BasicValueFactory.h (+1-1)
  • (modified) clang/include/clang/StaticAnalyzer/Core/PathSensitive/CallEvent.h (+1-1)
  • (modified) clang/include/clang/StaticAnalyzer/Core/PathSensitive/DynamicCastInfo.h (+1-1)
  • (modified) clang/include/clang/StaticAnalyzer/Core/PathSensitive/DynamicType.h (+1-1)
  • (modified) clang/include/clang/StaticAnalyzer/Core/PathSensitive/DynamicTypeInfo.h (+1-1)
  • (modified) clang/include/clang/StaticAnalyzer/Core/PathSensitive/ExprEngine.h (+1-1)
  • (modified) clang/include/clang/StaticAnalyzer/Core/PathSensitive/MemRegion.h (+1-1)
  • (modified) clang/include/clang/StaticAnalyzer/Core/PathSensitive/SValBuilder.h (+1-1)
  • (modified) clang/include/clang/StaticAnalyzer/Core/PathSensitive/SVals.h (+1-1)
  • (modified) clang/include/clang/StaticAnalyzer/Core/PathSensitive/Store.h (+1-1)
  • (modified) clang/include/clang/StaticAnalyzer/Core/PathSensitive/SymExpr.h (+1-1)
  • (modified) clang/include/clang/StaticAnalyzer/Core/PathSensitive/SymbolManager.h (+1-1)
  • (modified) clang/lib/AST/APValue.cpp (+1-1)
  • (modified) clang/lib/AST/ASTContext.cpp (+1-1)
  • (modified) clang/lib/AST/ASTDiagnostic.cpp (+1-1)
  • (modified) clang/lib/AST/ASTImporter.cpp (+1-1)
  • (modified) clang/lib/AST/ASTStructuralEquivalence.cpp (+1-1)
  • (modified) clang/lib/AST/AttrImpl.cpp (+1-1)
  • (modified) clang/lib/AST/CXXABI.h (+1-1)
  • (modified) clang/lib/AST/CXXInheritance.cpp (+1-1)
  • (modified) clang/lib/AST/ComparisonCategories.cpp (+1-1)
  • (modified) clang/lib/AST/Decl.cpp (+1-1)
  • (modified) clang/lib/AST/DeclBase.cpp (+1-1)
  • (modified) clang/lib/AST/DeclCXX.cpp (+1-1)
  • (modified) clang/lib/AST/DeclObjC.cpp (+1-1)
  • (modified) clang/lib/AST/DeclTemplate.cpp (+1-1)
  • (modified) clang/lib/AST/DeclarationName.cpp (+1-1)
  • (modified) clang/lib/AST/ExprCXX.cpp (+1-1)
  • (modified) clang/lib/AST/ExprConcepts.cpp (+1-1)
  • (modified) clang/lib/AST/ExprConstant.cpp (+1-1)
  • (modified) clang/lib/AST/ExprObjC.cpp (+1-1)
  • (modified) clang/lib/AST/FormatStringParsing.h (+1-1)
  • (modified) clang/lib/AST/ItaniumCXXABI.cpp (+1-1)
  • (modified) clang/lib/AST/JSONNodeDumper.cpp (+1-1)
  • (modified) clang/lib/AST/Linkage.h (+1-1)
  • (modified) clang/lib/AST/MicrosoftCXXABI.cpp (+1-1)
  • (modified) clang/lib/AST/NestedNameSpecifier.cpp (+1-1)
  • (modified) clang/lib/AST/QualTypeNames.cpp (+1-1)
  • (modified) clang/lib/AST/Stmt.cpp (+1-1)
  • (modified) clang/lib/AST/StmtIterator.cpp (+1-1)
  • (modified) clang/lib/AST/StmtPrinter.cpp (+1-1)
  • (modified) clang/lib/AST/TemplateBase.cpp (+1-1)
  • (modified) clang/lib/AST/TextNodeDumper.cpp (+1-1)
  • (modified) clang/lib/AST/Type.cpp (+1-1)
  • (modified) clang/lib/AST/TypePrinter.cpp (+1-1)
  • (modified) clang/lib/AST/VTTBuilder.cpp (+1-1)
  • (modified) clang/lib/Analysis/CFG.cpp (+1-1)
  • (modified) clang/lib/Analysis/CalledOnceCheck.cpp (+1-1)
  • (modified) clang/lib/Analysis/CocoaConventions.cpp (+1-1)
  • (modified) clang/lib/Analysis/Consumed.cpp (+1-1)
  • (modified) clang/lib/Analysis/FlowSensitive/ASTOps.cpp (+1-1)
  • (modified) clang/lib/Analysis/FlowSensitive/DataflowEnvironment.cpp (+1-1)
  • (modified) clang/lib/Analysis/FlowSensitive/Models/UncheckedOptionalAccessModel.cpp (+1-1)
  • (modified) clang/lib/Analysis/FlowSensitive/SmartPointerAccessorCaching.cpp (+1-1)
  • (modified) clang/lib/Analysis/FlowSensitive/Transfer.cpp (+1-1)
  • (modified) clang/lib/Analysis/LifetimeSafety.cpp (+1-1)
  • (modified) clang/lib/Analysis/PathDiagnostic.cpp (+1-1)
  • (modified) clang/lib/Analysis/ThreadSafety.cpp (+1-1)
  • (modified) clang/lib/Analysis/ThreadSafetyCommon.cpp (+1-1)
  • (modified) clang/lib/Analysis/UninitializedValues.cpp (+1-1)
  • (modified) clang/lib/Analysis/UnsafeBufferUsage.cpp (+1-1)
  • (modified) clang/lib/CIR/CodeGen/CIRGenClass.cpp (+1-1)
  • (modified) clang/lib/CIR/CodeGen/CIRGenFunction.h (+1-1)
  • (modified) clang/lib/CIR/CodeGen/CIRGenTypes.cpp (+1-1)
  • (modified) clang/lib/CIR/CodeGen/CIRGenTypes.h (+1-1)
  • (modified) clang/lib/CIR/CodeGen/CIRGenValue.h (+1-1)
  • (modified) clang/lib/CodeGen/ABIInfo.h (+1-1)
  • (modified) clang/lib/CodeGen/Address.h (+1-1)
  • (modified) clang/lib/CodeGen/CGBlocks.h (+1-1)
  • (modified) clang/lib/CodeGen/CGCall.h (+1-1)
  • (modified) clang/lib/CodeGen/CGDebugInfo.h (+1-1)
  • (modified) clang/lib/CodeGen/CGHLSLRuntime.cpp (+1-1)
  • (modified) clang/lib/CodeGen/CGOpenCLRuntime.h (+1-1)
  • (modified) clang/lib/CodeGen/CGOpenMPRuntime.h (+1-1)
  • (modified) clang/lib/CodeGen/CGPointerAuthInfo.h (+1-1)
  • (modified) clang/lib/CodeGen/CGValue.h (+1-1)
  • (modified) clang/lib/CodeGen/CodeGenFunction.h (+1-1)
  • (modified) clang/lib/CodeGen/CodeGenTBAA.h (+1-1)
  • (modified) clang/lib/CodeGen/HLSLBufferLayoutBuilder.cpp (+1-1)
  • (modified) clang/lib/CodeGen/ItaniumCXXABI.cpp (+1-1)
  • (modified) clang/lib/CodeGen/SanitizerMetadata.cpp (+1-1)
  • (modified) clang/lib/CodeGen/SanitizerMetadata.h (+1-1)
  • (modified) clang/lib/CodeGen/TargetInfo.h (+1-1)
  • (modified) clang/lib/CodeGen/Targets/DirectX.cpp (+1-1)
  • (modified) clang/lib/ExtractAPI/DeclarationFragments.cpp (+1-1)
  • (modified) clang/lib/Frontend/ASTUnit.cpp (+1-1)
  • (modified) clang/lib/Frontend/LayoutOverrideSource.cpp (+1)
  • (modified) clang/lib/Index/IndexBody.cpp (+1-1)
  • (modified) clang/lib/Interpreter/InterpreterValuePrinter.cpp (+1-1)
  • (modified) clang/lib/Interpreter/Value.cpp (+1-1)
  • (modified) clang/lib/Sema/AnalysisBasedWarnings.cpp (+1-1)
  • (modified) clang/lib/Sema/CheckExprLifetime.cpp (+1-1)
  • (modified) clang/lib/Sema/CodeCompleteConsumer.cpp (+1-1)
  • (modified) clang/lib/Sema/HLSLBuiltinTypeDeclBuilder.cpp (+1-1)
  • (modified) clang/lib/Sema/HLSLBuiltinTypeDeclBuilder.h (+1-1)
  • (modified) clang/lib/Sema/HLSLExternalSemaSource.cpp (+1-1)
  • (modified) clang/lib/Sema/HeuristicResolver.cpp (+1-1)
  • (modified) clang/lib/Sema/SemaBPF.cpp (+1-1)
  • (modified) clang/lib/Sema/SemaChecking.cpp (+1-1)
  • (modified) clang/lib/Sema/SemaCodeComplete.cpp (+1-1)
  • (modified) clang/lib/Sema/SemaDecl.cpp (+1-1)
  • (modified) clang/lib/Sema/SemaDeclAttr.cpp (+1-1)
  • (modified) clang/lib/Sema/SemaExpr.cpp (+1-1)
  • (modified) clang/lib/Sema/SemaExprCXX.cpp (+1-1)
  • (modified) clang/lib/Sema/SemaFunctionEffects.cpp (+1-1)
  • (modified) clang/lib/Sema/SemaHLSL.cpp (+1-1)
  • (modified) clang/lib/Sema/SemaOverload.cpp (+1-1)
  • (modified) clang/lib/Sema/SemaPPC.cpp (+1-1)
  • (modified) clang/lib/Sema/SemaTemplate.cpp (+1-1)
  • (modified) clang/lib/Sema/SemaTemplateDeduction.cpp (+1-1)
  • (modified) clang/lib/Sema/SemaTemplateDeductionGuide.cpp (+1-1)
  • (modified) clang/lib/Sema/SemaTemplateInstantiate.cpp (+1-1)
  • (modified) clang/lib/Sema/SemaType.cpp (+1-1)
  • (modified) clang/lib/Sema/SemaTypeTraits.cpp (+1-1)
  • (modified) clang/lib/Sema/SemaWasm.cpp (+1-1)
  • (modified) clang/lib/Serialization/ASTReader.cpp (+1-1)
  • (modified) clang/lib/Serialization/ASTReaderDecl.cpp (+1-1)
  • (modified) clang/lib/Serialization/ASTReaderStmt.cpp (+1-1)
  • (modified) clang/lib/Serialization/ASTWriter.cpp (+1-1)
  • (modified) clang/lib/StaticAnalyzer/Checkers/CheckObjCInstMethSignature.cpp (+1-1)
  • (modified) clang/lib/StaticAnalyzer/Checkers/FuchsiaHandleChecker.cpp (+1-1)
  • (modified) clang/lib/StaticAnalyzer/Checkers/SmartPtrModeling.cpp (+1-1)
  • (modified) clang/lib/StaticAnalyzer/Checkers/StdVariantChecker.cpp (+1-1)
  • (modified) clang/lib/StaticAnalyzer/Checkers/UndefBranchChecker.cpp (+1-1)
  • (modified) clang/lib/StaticAnalyzer/Core/BugReporterVisitors.cpp (+1-1)
  • (modified) clang/lib/StaticAnalyzer/Core/CallEvent.cpp (+1-1)
  • (modified) clang/lib/StaticAnalyzer/Core/ConstraintManager.cpp (+1-1)
  • (modified) clang/lib/StaticAnalyzer/Core/ExprEngine.cpp (+1-1)
  • (modified) clang/lib/StaticAnalyzer/Core/MemRegion.cpp (+1-1)
  • (modified) clang/lib/StaticAnalyzer/Core/SValBuilder.cpp (+1-1)
  • (modified) clang/lib/StaticAnalyzer/Core/SVals.cpp (+1-1)
  • (modified) clang/lib/StaticAnalyzer/Core/Store.cpp (+1-1)
  • (modified) clang/tools/libclang/CIndexCodeCompletion.cpp (+1-1)
  • (modified) clang/tools/libclang/CXType.cpp (+1-1)
  • (modified) clang/tools/libclang/CXType.h (+1-1)
  • (modified) clang/unittests/AST/DeclBaseTest.cpp (+1-1)
  • (modified) clang/unittests/AST/SizelessTypesTest.cpp (+1-1)
  • (modified) clang/unittests/Analysis/FlowSensitive/CachedConstAccessorsLatticeTest.cpp (+1-1)
  • (modified) clang/unittests/Analysis/FlowSensitive/TypeErasedDataflowAnalysisTest.cpp (+1-1)
  • (modified) clang/unittests/Frontend/FixedPointString.cpp (+1-1)
  • (modified) clang/unittests/StaticAnalyzer/SValTest.cpp (+1-1)
  • (modified) clang/unittests/Tooling/RecursiveASTVisitorTests/Concept.cpp (+1-1)
  • (modified) clang/unittests/Tooling/SourceCodeBuildersTest.cpp (+1-1)
  • (modified) lldb/source/Plugins/ExpressionParser/Clang/ClangUtil.h (+1-1)
  • (modified) lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntime.cpp (+1-1)
  • (modified) lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.cpp (+1-1)
  • (modified) lldb/source/Plugins/LanguageRuntime/ObjC/ObjCLanguageRuntime.cpp (+1-1)
  • (modified) lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.cpp (+1-1)
  • (modified) lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.h (+1-1)
  • (modified) lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp (+1-1)
  • (modified) lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.h (+1-1)
diff --git a/clang-tools-extra/clang-doc/Representation.h b/clang-tools-extra/clang-doc/Representation.h
index 201cb016bf037..2a75f89696b7d 100644
--- a/clang-tools-extra/clang-doc/Representation.h
+++ b/clang-tools-extra/clang-doc/Representation.h
@@ -14,7 +14,7 @@
 #ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_DOC_REPRESENTATION_H
 #define LLVM_CLANG_TOOLS_EXTRA_CLANG_DOC_REPRESENTATION_H
 
-#include "clang/AST/TypeBase.h"
+#include "clang/AST/Type.h"
 #include "clang/Basic/Specifiers.h"
 #include "clang/Tooling/StandaloneExecution.h"
 #include "llvm/ADT/APSInt.h"
diff --git a/clang-tools-extra/clang-include-fixer/find-all-symbols/FindAllSymbols.cpp b/clang-tools-extra/clang-include-fixer/find-all-symbols/FindAllSymbols.cpp
index 972786e6c6a34..1f30d27c0a54f 100644
--- a/clang-tools-extra/clang-include-fixer/find-all-symbols/FindAllSymbols.cpp
+++ b/clang-tools-extra/clang-include-fixer/find-all-symbols/FindAllSymbols.cpp
@@ -12,7 +12,7 @@
 #include "SymbolInfo.h"
 #include "clang/AST/Decl.h"
 #include "clang/AST/DeclCXX.h"
-#include "clang/AST/TypeBase.h"
+#include "clang/AST/Type.h"
 #include "clang/ASTMatchers/ASTMatchFinder.h"
 #include "clang/ASTMatchers/ASTMatchers.h"
 #include "clang/Tooling/Tooling.h"
diff --git a/clang-tools-extra/clang-tidy/bugprone/CastingThroughVoidCheck.cpp b/clang-tools-extra/clang-tidy/bugprone/CastingThroughVoidCheck.cpp
index d349878dc580d..f0a9ace229740 100644
--- a/clang-tools-extra/clang-tidy/bugprone/CastingThroughVoidCheck.cpp
+++ b/clang-tools-extra/clang-tidy/bugprone/CastingThroughVoidCheck.cpp
@@ -8,7 +8,7 @@
 
 #include "CastingThroughVoidCheck.h"
 #include "clang/AST/Expr.h"
-#include "clang/AST/TypeBase.h"
+#include "clang/AST/Type.h"
 #include "clang/ASTMatchers/ASTMatchFinder.h"
 #include "clang/ASTMatchers/ASTMatchers.h"
 
diff --git a/clang-tools-extra/clang-tidy/bugprone/ComparePointerToMemberVirtualFunctionCheck.cpp b/clang-tools-extra/clang-tidy/bugprone/ComparePointerToMemberVirtualFunctionCheck.cpp
index 1e99ed495128c..1cbf1e22a33a7 100644
--- a/clang-tools-extra/clang-tidy/bugprone/ComparePointerToMemberVirtualFunctionCheck.cpp
+++ b/clang-tools-extra/clang-tidy/bugprone/ComparePointerToMemberVirtualFunctionCheck.cpp
@@ -10,7 +10,7 @@
 #include "clang/AST/ASTContext.h"
 #include "clang/AST/DeclCXX.h"
 #include "clang/AST/OperationKinds.h"
-#include "clang/AST/TypeBase.h"
+#include "clang/AST/Type.h"
 #include "clang/ASTMatchers/ASTMatchFinder.h"
 #include "clang/ASTMatchers/ASTMatchers.h"
 #include "clang/ASTMatchers/ASTMatchersMacros.h"
diff --git a/clang-tools-extra/clang-tidy/bugprone/NarrowingConversionsCheck.cpp b/clang-tools-extra/clang-tidy/bugprone/NarrowingConversionsCheck.cpp
index e605128b81a14..249c77ca0c432 100644
--- a/clang-tools-extra/clang-tidy/bugprone/NarrowingConversionsCheck.cpp
+++ b/clang-tools-extra/clang-tidy/bugprone/NarrowingConversionsCheck.cpp
@@ -10,7 +10,7 @@
 #include "../utils/OptionsUtils.h"
 #include "clang/AST/ASTContext.h"
 #include "clang/AST/Expr.h"
-#include "clang/AST/TypeBase.h"
+#include "clang/AST/Type.h"
 #include "clang/ASTMatchers/ASTMatchFinder.h"
 #include "clang/ASTMatchers/ASTMatchers.h"
 #include "llvm/ADT/APSInt.h"
diff --git a/clang-tools-extra/clang-tidy/bugprone/StandaloneEmptyCheck.cpp b/clang-tools-extra/clang-tidy/bugprone/StandaloneEmptyCheck.cpp
index 78f876ad3719b..5d9e91e0b82c7 100644
--- a/clang-tools-extra/clang-tidy/bugprone/StandaloneEmptyCheck.cpp
+++ b/clang-tools-extra/clang-tidy/bugprone/StandaloneEmptyCheck.cpp
@@ -14,7 +14,7 @@
 #include "clang/AST/Expr.h"
 #include "clang/AST/ExprCXX.h"
 #include "clang/AST/Stmt.h"
-#include "clang/AST/TypeBase.h"
+#include "clang/AST/Type.h"
 #include "clang/ASTMatchers/ASTMatchFinder.h"
 #include "clang/ASTMatchers/ASTMatchers.h"
 #include "clang/Basic/Diagnostic.h"
diff --git a/clang-tools-extra/clang-tidy/bugprone/UnintendedCharOstreamOutputCheck.cpp b/clang-tools-extra/clang-tidy/bugprone/UnintendedCharOstreamOutputCheck.cpp
index bb4f8db75cd8b..57e1f744fcd7d 100644
--- a/clang-tools-extra/clang-tidy/bugprone/UnintendedCharOstreamOutputCheck.cpp
+++ b/clang-tools-extra/clang-tidy/bugprone/UnintendedCharOstreamOutputCheck.cpp
@@ -9,7 +9,7 @@
 #include "UnintendedCharOstreamOutputCheck.h"
 #include "../utils/Matchers.h"
 #include "../utils/OptionsUtils.h"
-#include "clang/AST/TypeBase.h"
+#include "clang/AST/Type.h"
 #include "clang/ASTMatchers/ASTMatchFinder.h"
 #include "clang/ASTMatchers/ASTMatchers.h"
 #include "clang/Basic/Diagnostic.h"
diff --git a/clang-tools-extra/clang-tidy/bugprone/UnusedLocalNonTrivialVariableCheck.cpp b/clang-tools-extra/clang-tidy/bugprone/UnusedLocalNonTrivialVariableCheck.cpp
index 3448bbb19000c..ac494152fdfdb 100644
--- a/clang-tools-extra/clang-tidy/bugprone/UnusedLocalNonTrivialVariableCheck.cpp
+++ b/clang-tools-extra/clang-tidy/bugprone/UnusedLocalNonTrivialVariableCheck.cpp
@@ -11,7 +11,7 @@
 #include "../utils/OptionsUtils.h"
 #include "clang/AST/ASTContext.h"
 #include "clang/AST/ASTTypeTraits.h"
-#include "clang/AST/TypeBase.h"
+#include "clang/AST/Type.h"
 #include "clang/ASTMatchers/ASTMatchFinder.h"
 #include "clang/ASTMatchers/ASTMatchers.h"
 #include "clang/ASTMatchers/ASTMatchersMacros.h"
diff --git a/clang-tools-extra/clang-tidy/cppcoreguidelines/InitVariablesCheck.cpp b/clang-tools-extra/clang-tidy/cppcoreguidelines/InitVariablesCheck.cpp
index 9901c7839cfb7..3eef2fd12cc8e 100644
--- a/clang-tools-extra/clang-tidy/cppcoreguidelines/InitVariablesCheck.cpp
+++ b/clang-tools-extra/clang-tidy/cppcoreguidelines/InitVariablesCheck.cpp
@@ -10,7 +10,7 @@
 
 #include "../utils/LexerUtils.h"
 #include "clang/AST/ASTContext.h"
-#include "clang/AST/TypeBase.h"
+#include "clang/AST/Type.h"
 #include "clang/ASTMatchers/ASTMatchFinder.h"
 #include "clang/Lex/Preprocessor.h"
 #include <optional>
diff --git a/clang-tools-extra/clang-tidy/misc/CoroutineHostileRAIICheck.cpp b/clang-tools-extra/clang-tidy/misc/CoroutineHostileRAIICheck.cpp
index 6f46222e75332..360335b86c641 100644
--- a/clang-tools-extra/clang-tidy/misc/CoroutineHostileRAIICheck.cpp
+++ b/clang-tools-extra/clang-tidy/misc/CoroutineHostileRAIICheck.cpp
@@ -12,7 +12,7 @@
 #include "clang/AST/Decl.h"
 #include "clang/AST/ExprCXX.h"
 #include "clang/AST/Stmt.h"
-#include "clang/AST/TypeBase.h"
+#include "clang/AST/Type.h"
 #include "clang/ASTMatchers/ASTMatchFinder.h"
 #include "clang/ASTMatchers/ASTMatchers.h"
 #include "clang/ASTMatchers/ASTMatchersInternal.h"
diff --git a/clang-tools-extra/clang-tidy/modernize/UseNodiscardCheck.cpp b/clang-tools-extra/clang-tidy/modernize/UseNodiscardCheck.cpp
index 07a7589e4ee8b..6de80dcb99c60 100644
--- a/clang-tools-extra/clang-tidy/modernize/UseNodiscardCheck.cpp
+++ b/clang-tools-extra/clang-tidy/modernize/UseNodiscardCheck.cpp
@@ -9,7 +9,7 @@
 #include "UseNodiscardCheck.h"
 #include "clang/AST/ASTContext.h"
 #include "clang/AST/Decl.h"
-#include "clang/AST/TypeBase.h"
+#include "clang/AST/Type.h"
 #include "clang/ASTMatchers/ASTMatchFinder.h"
 
 using namespace clang::ast_matchers;
diff --git a/clang-tools-extra/clang-tidy/modernize/UseScopedLockCheck.cpp b/clang-tools-extra/clang-tidy/modernize/UseScopedLockCheck.cpp
index 4a279f6cfa2fb..c74db0ed861b4 100644
--- a/clang-tools-extra/clang-tidy/modernize/UseScopedLockCheck.cpp
+++ b/clang-tools-extra/clang-tidy/modernize/UseScopedLockCheck.cpp
@@ -10,7 +10,7 @@
 #include "clang/AST/ASTContext.h"
 #include "clang/AST/Decl.h"
 #include "clang/AST/Stmt.h"
-#include "clang/AST/TypeBase.h"
+#include "clang/AST/Type.h"
 #include "clang/ASTMatchers/ASTMatchFinder.h"
 #include "clang/ASTMatchers/ASTMatchers.h"
 #include "clang/Basic/SourceLocation.h"
diff --git a/clang-tools-extra/clang-tidy/modernize/UseStdNumbersCheck.cpp b/clang-tools-extra/clang-tidy/modernize/UseStdNumbersCheck.cpp
index 0b9077ec34bd6..934cc24817d73 100644
--- a/clang-tools-extra/clang-tidy/modernize/UseStdNumbersCheck.cpp
+++ b/clang-tools-extra/clang-tidy/modernize/UseStdNumbersCheck.cpp
@@ -12,7 +12,7 @@
 #include "clang/AST/Decl.h"
 #include "clang/AST/Expr.h"
 #include "clang/AST/Stmt.h"
-#include "clang/AST/TypeBase.h"
+#include "clang/AST/Type.h"
 #include "clang/ASTMatchers/ASTMatchFinder.h"
 #include "clang/ASTMatchers/ASTMatchers.h"
 #include "clang/ASTMatchers/ASTMatchersInternal.h"
diff --git a/clang-tools-extra/clang-tidy/objc/NSInvocationArgumentLifetimeCheck.cpp b/clang-tools-extra/clang-tidy/objc/NSInvocationArgumentLifetimeCheck.cpp
index 20e3111d41b1b..8e4ed41c5f501 100644
--- a/clang-tools-extra/clang-tidy/objc/NSInvocationArgumentLifetimeCheck.cpp
+++ b/clang-tools-extra/clang-tidy/objc/NSInvocationArgumentLifetimeCheck.cpp
@@ -12,7 +12,7 @@
 #include "clang/AST/Decl.h"
 #include "clang/AST/Expr.h"
 #include "clang/AST/ExprObjC.h"
-#include "clang/AST/TypeBase.h"
+#include "clang/AST/Type.h"
 #include "clang/AST/TypeLoc.h"
 #include "clang/ASTMatchers/ASTMatchFinder.h"
 #include "clang/ASTMatchers/ASTMatchers.h"
diff --git a/clang-tools-extra/clang-tidy/readability/MagicNumbersCheck.cpp b/clang-tools-extra/clang-tidy/readability/MagicNumbersCheck.cpp
index 1ff7c5a9c06a4..6f91527c420e8 100644
--- a/clang-tools-extra/clang-tidy/readability/MagicNumbersCheck.cpp
+++ b/clang-tools-extra/clang-tidy/readability/MagicNumbersCheck.cpp
@@ -15,7 +15,7 @@
 #include "../utils/OptionsUtils.h"
 #include "clang/AST/ASTContext.h"
 #include "clang/AST/ASTTypeTraits.h"
-#include "clang/AST/TypeBase.h"
+#include "clang/AST/Type.h"
 #include "clang/ASTMatchers/ASTMatchFinder.h"
 #include "llvm/ADT/STLExtras.h"
 
diff --git a/clang-tools-extra/clang-tidy/readability/SuspiciousCallArgumentCheck.cpp b/clang-tools-extra/clang-tidy/readability/SuspiciousCallArgumentCheck.cpp
index 8a0c376bea33e..a80637dee18f4 100644
--- a/clang-tools-extra/clang-tidy/readability/SuspiciousCallArgumentCheck.cpp
+++ b/clang-tools-extra/clang-tidy/readability/SuspiciousCallArgumentCheck.cpp
@@ -9,7 +9,7 @@
 #include "SuspiciousCallArgumentCheck.h"
 #include "../utils/OptionsUtils.h"
 #include "clang/AST/ASTContext.h"
-#include "clang/AST/TypeBase.h"
+#include "clang/AST/Type.h"
 #include "clang/ASTMatchers/ASTMatchFinder.h"
 #include <optional>
 
diff --git a/clang-tools-extra/clang-tidy/utils/DeclRefExprUtils.h b/clang-tools-extra/clang-tidy/utils/DeclRefExprUtils.h
index 8477528c18646..8361b9d89ed26 100644
--- a/clang-tools-extra/clang-tidy/utils/DeclRefExprUtils.h
+++ b/clang-tools-extra/clang-tidy/utils/DeclRefExprUtils.h
@@ -10,7 +10,7 @@
 #define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_UTILS_DECLREFEXPRUTILS_H
 
 #include "clang/AST/ASTContext.h"
-#include "clang/AST/TypeBase.h"
+#include "clang/AST/Type.h"
 #include "llvm/ADT/SmallPtrSet.h"
 
 namespace clang::tidy::utils::decl_ref_expr {
diff --git a/clang-tools-extra/clang-tidy/utils/DesignatedInitializers.cpp b/clang-tools-extra/clang-tidy/utils/DesignatedInitializers.cpp
index 6914ec2beb2fb..d43716e901e84 100644
--- a/clang-tools-extra/clang-tidy/utils/DesignatedInitializers.cpp
+++ b/clang-tools-extra/clang-tidy/utils/DesignatedInitializers.cpp
@@ -13,6 +13,7 @@
 
 #include "DesignatedInitializers.h"
 #include "clang/AST/DeclCXX.h"
+#include "clang/AST/Type.h"
 #include "llvm/ADT/DenseSet.h"
 #include "llvm/ADT/ScopeExit.h"
 
diff --git a/clang-tools-extra/clang-tidy/utils/ExceptionSpecAnalyzer.cpp b/clang-tools-extra/clang-tidy/utils/ExceptionSpecAnalyzer.cpp
index 4314817e4f69d..4693c656a6602 100644
--- a/clang-tools-extra/clang-tidy/utils/ExceptionSpecAnalyzer.cpp
+++ b/clang-tools-extra/clang-tidy/utils/ExceptionSpecAnalyzer.cpp
@@ -9,6 +9,7 @@
 #include "ExceptionSpecAnalyzer.h"
 
 #include "clang/AST/Expr.h"
+#include "clang/AST/Type.h"
 
 namespace clang::tidy::utils {
 
diff --git a/clang-tools-extra/clang-tidy/utils/FixItHintUtils.cpp b/clang-tools-extra/clang-tidy/utils/FixItHintUtils.cpp
index f69fbf0d09da9..a15589f9721c7 100644
--- a/clang-tools-extra/clang-tidy/utils/FixItHintUtils.cpp
+++ b/clang-tools-extra/clang-tidy/utils/FixItHintUtils.cpp
@@ -10,7 +10,7 @@
 #include "LexerUtils.h"
 #include "clang/AST/ASTContext.h"
 #include "clang/AST/ExprCXX.h"
-#include "clang/AST/TypeBase.h"
+#include "clang/AST/Type.h"
 #include "clang/Sema/DeclSpec.h"
 #include "clang/Tooling/FixIt.h"
 #include <optional>
diff --git a/clang-tools-extra/clang-tidy/utils/FixItHintUtils.h b/clang-tools-extra/clang-tidy/utils/FixItHintUtils.h
index 6119e6f32aa47..e690dbaefe642 100644
--- a/clang-tools-extra/clang-tidy/utils/FixItHintUtils.h
+++ b/clang-tools-extra/clang-tidy/utils/FixItHintUtils.h
@@ -11,7 +11,7 @@
 
 #include "clang/AST/ASTContext.h"
 #include "clang/AST/Decl.h"
-#include "clang/AST/TypeBase.h"
+#include "clang/AST/Type.h"
 #include <optional>
 
 namespace clang::tidy::utils::fixit {
diff --git a/clang-tools-extra/clang-tidy/utils/TypeTraits.h b/clang-tools-extra/clang-tidy/utils/TypeTraits.h
index befeb63ec58ab..eb4dd0ff3a510 100644
--- a/clang-tools-extra/clang-tidy/utils/TypeTraits.h
+++ b/clang-tools-extra/clang-tidy/utils/TypeTraits.h
@@ -10,7 +10,7 @@
 #define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_UTILS_TYPETRAITS_H
 
 #include "clang/AST/ASTContext.h"
-#include "clang/AST/TypeBase.h"
+#include "clang/AST/Type.h"
 #include <optional>
 
 namespace clang::tidy::utils::type_traits {
diff --git a/clang-tools-extra/clangd/DumpAST.cpp b/clang-tools-extra/clangd/DumpAST.cpp
index bb18fc556205c..9a8d41d870929 100644
--- a/clang-tools-extra/clangd/DumpAST.cpp
+++ b/clang-tools-extra/clangd/DumpAST.cpp
@@ -17,7 +17,7 @@
 #include "clang/AST/PrettyPrinter.h"
 #include "clang/AST/RecursiveASTVisitor.h"
 #include "clang/AST/TextNodeDumper.h"
-#include "clang/AST/TypeBase.h"
+#include "clang/AST/Type.h"
 #include "clang/AST/TypeLoc.h"
 #include "clang/Basic/Specifiers.h"
 #include "clang/Tooling/Syntax/Tokens.h"
diff --git a/clang-tools-extra/clangd/ExpectedTypes.cpp b/clang-tools-extra/clangd/ExpectedTypes.cpp
index 9a9cf5a358ddc..eaa87096d0d0e 100644
--- a/clang-tools-extra/clangd/ExpectedTypes.cpp
+++ b/clang-tools-extra/clangd/ExpectedTypes.cpp
@@ -9,7 +9,7 @@
 #include "ExpectedTypes.h"
 #include "clang/AST/ASTContext.h"
 #include "clang/AST/DeclTemplate.h"
-#include "clang/AST/TypeBase.h"
+#include "clang/AST/Type.h"
 #include "clang/Index/USRGeneration.h"
 #include "clang/Sema/CodeCompleteConsumer.h"
 #include <optional>
diff --git a/clang-tools-extra/clangd/ExpectedTypes.h b/clang-tools-extra/clangd/ExpectedTypes.h
index 6f3da7d8cb773..8182e7684416d 100644
--- a/clang-tools-extra/clangd/ExpectedTypes.h
+++ b/clang-tools-extra/clangd/ExpectedTypes.h
@@ -18,7 +18,7 @@
 #ifndef LLVM_CLANG_TOOLS_EXTRA_CLANGD_EXPECTEDTYPES_H
 #define LLVM_CLANG_TOOLS_EXTRA_CLANGD_EXPECTEDTYPES_H
 
-#include "clang/AST/TypeBase.h"
+#include "clang/AST/Type.h"
 #include "llvm/ADT/StringRef.h"
 #include <optional>
 
diff --git a/clang-tools-extra/clangd/FindTarget.cpp b/clang-tools-extra/clangd/FindTarget.cpp
index 93f781ee454b7..32018d1bf3a84 100644
--- a/clang-tools-extra/clangd/FindTarget.cpp
+++ b/clang-tools-extra/clangd/FindTarget.cpp
@@ -26,7 +26,7 @@
 #include "clang/AST/RecursiveASTVisitor.h"
 #include "clang/AST/StmtVisitor.h"
 #include "clang/AST/TemplateBase.h"
-#include "clang/AST/TypeBase.h"
+#include "clang/AST/Type.h"
 #include "clang/AST/TypeLoc.h"
 #include "clang/AST/TypeLocVisitor.h"
 #include "clang/AST/TypeVisitor.h"
diff --git a/clang-tools-extra/clangd/Hover.cpp b/clang-tools-extra/clangd/Hover.cpp
index f074eb3f27d58..6e45c9ae4f8bf 100644
--- a/clang-tools-extra/clangd/Hover.cpp
+++ b/clang-tools-extra/clangd/Hover.cpp
@@ -39,7 +39,7 @@
 #include "clang/AST/OperationKinds.h"
 #include "clang/AST/PrettyPrinter.h"
 #include "clang/AST/RecordLayout.h"
-#include "clang/AST/TypeBase.h"
+#include "clang/AST/Type.h"
 #include "clang/Basic/CharInfo.h"
 #include "clang/Basic/LLVM.h"
 #include "clang/Basic/LangOptions.h"
diff --git a/clang-tools-extra/clangd/IncludeFixer.cpp b/clang-tools-extra/clangd/IncludeFixer.cpp
index 69bc283247984..c27d960cd963b 100644
--- a/clang-tools-extra/clangd/IncludeFixer.cpp
+++ b/clang-tools-extra/clangd/IncludeFixer.cpp
@@ -18,7 +18,7 @@
 #include "clang/AST/DeclBase.h"
 #include "clang/AST/DeclarationName.h"
 #include "clang/AST/NestedNameSpecifier.h"
-#include "clang/AST/TypeBase.h"
+#include "clang/AST/Type.h"
 #include "clang/Basic/Diagnostic.h"
 #include "clang/Basic/DiagnosticParse.h"
 #include "clang/Basic/DiagnosticSema.h"
diff --git a/clang-tools-extra/clangd/IncludeFixer.h b/clang-tools-extra/clangd/IncludeFixer.h
index 506a89da4b653..84c60f756edb8 100644
--- a/clang-tools-extra/clangd/IncludeFixer.h
+++ b/clang-tools-extra/clangd/IncludeFixer.h
@@ -13,7 +13,7 @@
 #include "Headers.h"
 #include "index/Index.h"
 #include "index/Symbol.h"
-#include "clang/AST/TypeBase.h"
+#include "clang/AST/Type.h"
 #include "clang/Basic/Diagnostic.h"
 #include "clang/Basic/SourceLocation.h"
 #include "clang/Sema/ExternalSemaSource.h"
diff --git a/clang-tools-extra/clangd/InlayHints.cpp b/clang-tools-extra/clangd/InlayHints.cpp
index f5c82e40abf8e..cd479e1b7c9bc 100644
--- a/clang-tools-extra/clangd/InlayHints.cpp
+++ b/clang-tools-extra/clangd/InlayHints.cpp
@@ -21,7 +21,7 @@
 #include "clang/AST/RecursiveASTVisitor.h"
 #include "clang/AST/Stmt.h"
 #include "clang/AST/StmtVisitor.h"
-#include "clang/AST/TypeBase.h"
+#include "clang/AST/Type.h"
 #include "clang/Basic/Builtins.h"
 #include "clang/Basic/OperatorKinds.h"
 #include "clang/Basic/SourceLocation.h"
diff --git a/clang-tools-extra/clangd/Preamble.cpp b/clang-tools-extra/clangd/Preamble.cpp
index fca041e22d80d..8af9e4649218d 100644
--- a/clang-tools-extra/clangd/Preamble.cpp
+++ b/clang-tools-extra/clangd/Preamble.cpp
@@ -22,7 +22,7 @@
 #include "support/ThreadsafeFS.h"
 #include "support/Trace.h"
 #include "clang/AST/DeclTemplate.h"
-#include "clang/AST/TypeBase.h"
+#include "clang/AST/Type.h"
 #include "clang/Basic/Diagnostic.h"
 #include "clang/Basic/DiagnosticLex.h"
 #include "clang/Basic/DiagnosticOptions.h"
diff --git a/clang-tools-extra/clangd/SemanticHighlighting.cpp b/clang-tools-extra/clangd/SemanticHighlighting.cpp
index beca14db7b54a..2b151b1274428 100644
--- a/clang-tools-extra/clangd/SemanticHighlighting.cpp
+++ b/clang-tools-extra/clangd/SemanticHighlighting.cpp
@@ -21,7 +21,7 @@
 #include "clang/AST/DeclarationName.h"
 #include "clang/AST/ExprCXX.h"
 #include "clang/AST/RecursiveASTVisitor.h"
-#include "clang/AST/TypeBase.h"
+#include "clang/AST/Type.h"
 #include "clang/AST/TypeLoc.h"
 #include "clang/Basic/LangOptions.h"
 #include "clang/Basic/SourceLocation.h"
diff --git a/clang-tools-extra/clangd/XRefs.cpp b/clang-tools-extra/clangd/XRefs.cpp
index 0680dafd7e132..a253a630a48cc 100644
--- a/clang-tools-extra/clangd/XRefs.cpp
+++ b/clang-tools-extra/clangd/XRefs.cpp
@@ -40,7 +40,7 @@
 #include "clang/AST/Stmt.h"
 #include "clang/AST/StmtCXX.h"
 #include "clang/AST/StmtVisitor.h"
-#include "clang/AST/TypeBase.h"
+#include "clang/AST/Type.h"
 #include "clang/Basic/LLVM.h"
 #include "clang/Basic/LangOptions.h"
 #include "clang/Basic/SourceLocation.h"
diff --git a/clang-tools-extra/clangd/refactor/tweaks/AddUsing.cpp b/clang-tools-extra/clangd/refactor/tweaks/AddUsing.cpp
index 2eec9fe3219f0..f65c74fdbc9ee 100644
--- a/clang-tools-extra/clangd/refactor/tweaks/AddUsing.cpp
+++ b/clang-tools-extra/clangd/refactor/tweaks/AddUsing.cpp
@@ -15,7 +15,7 @@
 #include "clang/AST/Expr.h"
 #include "clang/AST/NestedNameSpecifier.h"
 #include "clang/AST/RecursiveASTVisitor.h"
-#include "clang/AST/TypeBase.h"
+#include "clang/AST/Type.h"
 #include "clang/AST/TypeLoc.h"
 #include "clang/Basic/LLVM.h"
 #include "clang/Basic/SourceLocation.h"
diff --git a/clang-tools-extra/clangd/refactor/tweaks/DumpAST.cpp b/clang-tools-extra/clangd/refactor/tweaks/DumpAST.cpp
index d8ea7bc445798..e126e72ef2532 100644
--- a/clang-tools-extra/clangd/refactor/tweaks/DumpAST.cpp
+++ b/clang-tools-extra/clangd/refactor/tweaks/DumpAST.cpp
@@ -12,7 +12,7 @@
 #include "XRefs.h"
 #include "refactor/Tweak.h"
 #include "clang/AST/ASTTypeTraits.h"
-#include "clang/AST/TypeBase.h"
+#include "clang/AST/Type.h"
 #include "llvm/Support/FormatVariadic.h"
 #include "llvm/Support/ScopedPrinter.h"
 #include "llvm/Support/raw_ostream.h"
diff --git a/clang-tools-extra/clangd/refactor/tweaks/ExpandDeducedType.cpp b/clang-tools-extra/clangd/refactor/tweaks/ExpandDeducedType.cpp
index 25558aab24788..fec5f5797cb62 100644
--- a/clang-tools-extra/clangd/refactor/tweaks/ExpandDeducedType.cpp
+++ b/clang-tools-extra/clangd/refactor/tweaks/ExpandDeducedType.cpp
@@ -8,7 +8,7 @@
 #include "refactor/Tweak.h"
 
 #include "suppo...
[truncated]

Copy link

github-actions bot commented Aug 23, 2025

⚠️ C/C++ code formatter, clang-format found issues in your code. ⚠️

You can test this locally with the following command:
git-clang-format --diff HEAD~1 HEAD --extensions h,cpp -- clang/include/clang/AST/Type.h clang-tools-extra/clang-doc/Representation.h clang-tools-extra/clang-include-fixer/find-all-symbols/FindAllSymbols.cpp clang-tools-extra/clang-tidy/bugprone/CastingThroughVoidCheck.cpp clang-tools-extra/clang-tidy/bugprone/ComparePointerToMemberVirtualFunctionCheck.cpp clang-tools-extra/clang-tidy/bugprone/NarrowingConversionsCheck.cpp clang-tools-extra/clang-tidy/bugprone/StandaloneEmptyCheck.cpp clang-tools-extra/clang-tidy/bugprone/UnintendedCharOstreamOutputCheck.cpp clang-tools-extra/clang-tidy/bugprone/UnusedLocalNonTrivialVariableCheck.cpp clang-tools-extra/clang-tidy/cppcoreguidelines/InitVariablesCheck.cpp clang-tools-extra/clang-tidy/misc/CoroutineHostileRAIICheck.cpp clang-tools-extra/clang-tidy/modernize/UseNodiscardCheck.cpp clang-tools-extra/clang-tidy/modernize/UseScopedLockCheck.cpp clang-tools-extra/clang-tidy/modernize/UseStdNumbersCheck.cpp clang-tools-extra/clang-tidy/objc/NSInvocationArgumentLifetimeCheck.cpp clang-tools-extra/clang-tidy/readability/MagicNumbersCheck.cpp clang-tools-extra/clang-tidy/readability/SuspiciousCallArgumentCheck.cpp clang-tools-extra/clang-tidy/utils/DeclRefExprUtils.h clang-tools-extra/clang-tidy/utils/DesignatedInitializers.cpp clang-tools-extra/clang-tidy/utils/ExceptionSpecAnalyzer.cpp clang-tools-extra/clang-tidy/utils/FixItHintUtils.cpp clang-tools-extra/clang-tidy/utils/FixItHintUtils.h clang-tools-extra/clang-tidy/utils/TypeTraits.h clang-tools-extra/clangd/DumpAST.cpp clang-tools-extra/clangd/ExpectedTypes.cpp clang-tools-extra/clangd/ExpectedTypes.h clang-tools-extra/clangd/FindTarget.cpp clang-tools-extra/clangd/Hover.cpp clang-tools-extra/clangd/IncludeFixer.cpp clang-tools-extra/clangd/IncludeFixer.h clang-tools-extra/clangd/InlayHints.cpp clang-tools-extra/clangd/Preamble.cpp clang-tools-extra/clangd/SemanticHighlighting.cpp clang-tools-extra/clangd/XRefs.cpp clang-tools-extra/clangd/refactor/tweaks/AddUsing.cpp clang-tools-extra/clangd/refactor/tweaks/DumpAST.cpp clang-tools-extra/clangd/refactor/tweaks/ExpandDeducedType.cpp clang-tools-extra/clangd/refactor/tweaks/OverridePureVirtuals.cpp clang-tools-extra/clangd/refactor/tweaks/PopulateSwitch.cpp clang-tools-extra/include-cleaner/lib/WalkAST.cpp clang/include/clang/AST/AST.h clang/include/clang/AST/ASTDiagnostic.h clang/include/clang/AST/ASTImporter.h clang/include/clang/AST/ASTNodeTraverser.h clang/include/clang/AST/AbstractTypeReader.h clang/include/clang/AST/AbstractTypeWriter.h clang/include/clang/AST/Attr.h clang/include/clang/AST/CXXInheritance.h clang/include/clang/AST/CanonicalType.h clang/include/clang/AST/Comment.h clang/include/clang/AST/DeclCXX.h clang/include/clang/AST/DeclObjC.h clang/include/clang/AST/DeclOpenMP.h clang/include/clang/AST/DeclTemplate.h clang/include/clang/AST/DependentDiagnostic.h clang/include/clang/AST/ExprCXX.h clang/include/clang/AST/ExprConcepts.h clang/include/clang/AST/ExprObjC.h clang/include/clang/AST/JSONNodeDumper.h clang/include/clang/AST/LocInfoType.h clang/include/clang/AST/Mangle.h clang/include/clang/AST/NestedNameSpecifier.h clang/include/clang/AST/NonTrivialTypeVisitor.h clang/include/clang/AST/ODRHash.h clang/include/clang/AST/RecursiveASTVisitor.h clang/include/clang/AST/SYCLKernelInfo.h clang/include/clang/AST/TextNodeDumper.h clang/include/clang/AST/TypeBase.h clang/include/clang/AST/TypeOrdering.h clang/include/clang/AST/TypeVisitor.h clang/include/clang/ASTMatchers/ASTMatchers.h clang/include/clang/ASTMatchers/ASTMatchersInternal.h clang/include/clang/ASTMatchers/LowLevelHelpers.h clang/include/clang/Analysis/Analyses/ThreadSafetyCommon.h clang/include/clang/Analysis/FlowSensitive/ASTOps.h clang/include/clang/Analysis/FlowSensitive/CachedConstAccessorsLattice.h clang/include/clang/Analysis/FlowSensitive/DataflowEnvironment.h clang/include/clang/Analysis/FlowSensitive/StorageLocation.h clang/include/clang/CodeGen/CGFunctionInfo.h clang/include/clang/CodeGen/CodeGenABITypes.h clang/include/clang/CodeGen/SwiftCallingConv.h clang/include/clang/Sema/Attr.h clang/include/clang/Sema/CodeCompleteConsumer.h clang/include/clang/Sema/DelayedDiagnostic.h clang/include/clang/Sema/ExternalSemaSource.h clang/include/clang/Sema/Initialization.h clang/include/clang/Sema/Lookup.h clang/include/clang/Sema/Overload.h clang/include/clang/Sema/ScopeInfo.h clang/include/clang/Sema/Sema.h clang/include/clang/Sema/SemaCodeCompletion.h clang/include/clang/Sema/SemaHLSL.h clang/include/clang/Sema/SemaObjC.h clang/include/clang/Sema/SemaPPC.h clang/include/clang/Sema/SemaRISCV.h clang/include/clang/Sema/SemaSYCL.h clang/include/clang/Sema/Template.h clang/include/clang/Serialization/ASTBitCodes.h clang/include/clang/Serialization/ASTReader.h clang/include/clang/Serialization/ASTWriter.h clang/include/clang/StaticAnalyzer/Core/PathSensitive/BasicValueFactory.h clang/include/clang/StaticAnalyzer/Core/PathSensitive/CallEvent.h clang/include/clang/StaticAnalyzer/Core/PathSensitive/DynamicCastInfo.h clang/include/clang/StaticAnalyzer/Core/PathSensitive/DynamicType.h clang/include/clang/StaticAnalyzer/Core/PathSensitive/DynamicTypeInfo.h clang/include/clang/StaticAnalyzer/Core/PathSensitive/ExprEngine.h clang/include/clang/StaticAnalyzer/Core/PathSensitive/MemRegion.h clang/include/clang/StaticAnalyzer/Core/PathSensitive/SValBuilder.h clang/include/clang/StaticAnalyzer/Core/PathSensitive/SVals.h clang/include/clang/StaticAnalyzer/Core/PathSensitive/Store.h clang/include/clang/StaticAnalyzer/Core/PathSensitive/SymExpr.h clang/include/clang/StaticAnalyzer/Core/PathSensitive/SymbolManager.h clang/lib/AST/APValue.cpp clang/lib/AST/ASTContext.cpp clang/lib/AST/ASTDiagnostic.cpp clang/lib/AST/ASTImporter.cpp clang/lib/AST/ASTStructuralEquivalence.cpp clang/lib/AST/AttrImpl.cpp clang/lib/AST/CXXABI.h clang/lib/AST/CXXInheritance.cpp clang/lib/AST/ComparisonCategories.cpp clang/lib/AST/Decl.cpp clang/lib/AST/DeclBase.cpp clang/lib/AST/DeclCXX.cpp clang/lib/AST/DeclObjC.cpp clang/lib/AST/DeclTemplate.cpp clang/lib/AST/DeclarationName.cpp clang/lib/AST/ExprCXX.cpp clang/lib/AST/ExprConcepts.cpp clang/lib/AST/ExprConstant.cpp clang/lib/AST/ExprObjC.cpp clang/lib/AST/FormatStringParsing.h clang/lib/AST/ItaniumCXXABI.cpp clang/lib/AST/JSONNodeDumper.cpp clang/lib/AST/Linkage.h clang/lib/AST/MicrosoftCXXABI.cpp clang/lib/AST/NestedNameSpecifier.cpp clang/lib/AST/QualTypeNames.cpp clang/lib/AST/Stmt.cpp clang/lib/AST/StmtIterator.cpp clang/lib/AST/StmtPrinter.cpp clang/lib/AST/TemplateBase.cpp clang/lib/AST/TextNodeDumper.cpp clang/lib/AST/Type.cpp clang/lib/AST/TypePrinter.cpp clang/lib/AST/VTTBuilder.cpp clang/lib/Analysis/CFG.cpp clang/lib/Analysis/CalledOnceCheck.cpp clang/lib/Analysis/CocoaConventions.cpp clang/lib/Analysis/Consumed.cpp clang/lib/Analysis/FlowSensitive/ASTOps.cpp clang/lib/Analysis/FlowSensitive/DataflowEnvironment.cpp clang/lib/Analysis/FlowSensitive/Models/UncheckedOptionalAccessModel.cpp clang/lib/Analysis/FlowSensitive/SmartPointerAccessorCaching.cpp clang/lib/Analysis/FlowSensitive/Transfer.cpp clang/lib/Analysis/LifetimeSafety.cpp clang/lib/Analysis/PathDiagnostic.cpp clang/lib/Analysis/ThreadSafety.cpp clang/lib/Analysis/ThreadSafetyCommon.cpp clang/lib/Analysis/UninitializedValues.cpp clang/lib/Analysis/UnsafeBufferUsage.cpp clang/lib/CIR/CodeGen/CIRGenClass.cpp clang/lib/CIR/CodeGen/CIRGenFunction.h clang/lib/CIR/CodeGen/CIRGenTypes.cpp clang/lib/CIR/CodeGen/CIRGenTypes.h clang/lib/CIR/CodeGen/CIRGenValue.h clang/lib/CodeGen/ABIInfo.h clang/lib/CodeGen/Address.h clang/lib/CodeGen/CGBlocks.h clang/lib/CodeGen/CGCall.h clang/lib/CodeGen/CGDebugInfo.h clang/lib/CodeGen/CGHLSLRuntime.cpp clang/lib/CodeGen/CGOpenCLRuntime.h clang/lib/CodeGen/CGOpenMPRuntime.h clang/lib/CodeGen/CGPointerAuthInfo.h clang/lib/CodeGen/CGValue.h clang/lib/CodeGen/CodeGenFunction.h clang/lib/CodeGen/CodeGenTBAA.h clang/lib/CodeGen/HLSLBufferLayoutBuilder.cpp clang/lib/CodeGen/ItaniumCXXABI.cpp clang/lib/CodeGen/SanitizerMetadata.cpp clang/lib/CodeGen/SanitizerMetadata.h clang/lib/CodeGen/TargetInfo.h clang/lib/CodeGen/Targets/DirectX.cpp clang/lib/ExtractAPI/DeclarationFragments.cpp clang/lib/Frontend/ASTUnit.cpp clang/lib/Frontend/LayoutOverrideSource.cpp clang/lib/Index/IndexBody.cpp clang/lib/Interpreter/InterpreterValuePrinter.cpp clang/lib/Interpreter/Value.cpp clang/lib/Sema/AnalysisBasedWarnings.cpp clang/lib/Sema/CheckExprLifetime.cpp clang/lib/Sema/CodeCompleteConsumer.cpp clang/lib/Sema/HLSLBuiltinTypeDeclBuilder.cpp clang/lib/Sema/HLSLBuiltinTypeDeclBuilder.h clang/lib/Sema/HLSLExternalSemaSource.cpp clang/lib/Sema/HeuristicResolver.cpp clang/lib/Sema/SemaBPF.cpp clang/lib/Sema/SemaChecking.cpp clang/lib/Sema/SemaCodeComplete.cpp clang/lib/Sema/SemaDecl.cpp clang/lib/Sema/SemaDeclAttr.cpp clang/lib/Sema/SemaExpr.cpp clang/lib/Sema/SemaExprCXX.cpp clang/lib/Sema/SemaFunctionEffects.cpp clang/lib/Sema/SemaHLSL.cpp clang/lib/Sema/SemaOverload.cpp clang/lib/Sema/SemaPPC.cpp clang/lib/Sema/SemaTemplate.cpp clang/lib/Sema/SemaTemplateDeduction.cpp clang/lib/Sema/SemaTemplateDeductionGuide.cpp clang/lib/Sema/SemaTemplateInstantiate.cpp clang/lib/Sema/SemaType.cpp clang/lib/Sema/SemaTypeTraits.cpp clang/lib/Sema/SemaWasm.cpp clang/lib/Serialization/ASTReader.cpp clang/lib/Serialization/ASTReaderDecl.cpp clang/lib/Serialization/ASTReaderStmt.cpp clang/lib/Serialization/ASTWriter.cpp clang/lib/StaticAnalyzer/Checkers/CheckObjCInstMethSignature.cpp clang/lib/StaticAnalyzer/Checkers/FuchsiaHandleChecker.cpp clang/lib/StaticAnalyzer/Checkers/SmartPtrModeling.cpp clang/lib/StaticAnalyzer/Checkers/StdVariantChecker.cpp clang/lib/StaticAnalyzer/Checkers/UndefBranchChecker.cpp clang/lib/StaticAnalyzer/Core/BugReporterVisitors.cpp clang/lib/StaticAnalyzer/Core/CallEvent.cpp clang/lib/StaticAnalyzer/Core/ConstraintManager.cpp clang/lib/StaticAnalyzer/Core/ExprEngine.cpp clang/lib/StaticAnalyzer/Core/MemRegion.cpp clang/lib/StaticAnalyzer/Core/SValBuilder.cpp clang/lib/StaticAnalyzer/Core/SVals.cpp clang/lib/StaticAnalyzer/Core/Store.cpp clang/tools/libclang/CIndexCodeCompletion.cpp clang/tools/libclang/CXType.cpp clang/tools/libclang/CXType.h clang/unittests/AST/DeclBaseTest.cpp clang/unittests/AST/SizelessTypesTest.cpp clang/unittests/Analysis/FlowSensitive/CachedConstAccessorsLatticeTest.cpp clang/unittests/Analysis/FlowSensitive/TypeErasedDataflowAnalysisTest.cpp clang/unittests/Frontend/FixedPointString.cpp clang/unittests/StaticAnalyzer/SValTest.cpp clang/unittests/Tooling/RecursiveASTVisitorTests/Concept.cpp clang/unittests/Tooling/SourceCodeBuildersTest.cpp lldb/source/Plugins/ExpressionParser/Clang/ClangUtil.h lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntime.cpp lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.cpp lldb/source/Plugins/LanguageRuntime/ObjC/ObjCLanguageRuntime.cpp lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.cpp lldb/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.h lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.h
View the diff from clang-format here.
diff --git a/clang/include/clang/AST/AbstractTypeWriter.h b/clang/include/clang/AST/AbstractTypeWriter.h
index 62006ef0f..e5035dc76 100644
--- a/clang/include/clang/AST/AbstractTypeWriter.h
+++ b/clang/include/clang/AST/AbstractTypeWriter.h
@@ -9,9 +9,9 @@
 #ifndef LLVM_CLANG_AST_ABSTRACTTYPEWRITER_H
 #define LLVM_CLANG_AST_ABSTRACTTYPEWRITER_H
 
-#include "clang/AST/Type.h"
 #include "clang/AST/AbstractBasicWriter.h"
 #include "clang/AST/DeclObjC.h"
+#include "clang/AST/Type.h"
 
 namespace clang {
 namespace serialization {
diff --git a/clang/include/clang/AST/JSONNodeDumper.h b/clang/include/clang/AST/JSONNodeDumper.h
index 864078020..25fbe99cd 100644
--- a/clang/include/clang/AST/JSONNodeDumper.h
+++ b/clang/include/clang/AST/JSONNodeDumper.h
@@ -20,8 +20,8 @@
 #include "clang/AST/AttrVisitor.h"
 #include "clang/AST/CommentCommandTraits.h"
 #include "clang/AST/CommentVisitor.h"
-#include "clang/AST/ExprConcepts.h"
 #include "clang/AST/ExprCXX.h"
+#include "clang/AST/ExprConcepts.h"
 #include "clang/AST/Mangle.h"
 #include "clang/AST/Type.h"
 #include "llvm/Support/JSON.h"
diff --git a/clang/include/clang/AST/ODRHash.h b/clang/include/clang/AST/ODRHash.h
index ae3fab697..1ec7f2c61 100644
--- a/clang/include/clang/AST/ODRHash.h
+++ b/clang/include/clang/AST/ODRHash.h
@@ -16,8 +16,8 @@
 #define LLVM_CLANG_AST_ODRHASH_H
 
 #include "clang/AST/DeclarationName.h"
-#include "clang/AST/Type.h"
 #include "clang/AST/TemplateBase.h"
+#include "clang/AST/Type.h"
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/ADT/FoldingSet.h"
 #include "llvm/ADT/PointerUnion.h"
diff --git a/clang/include/clang/AST/TextNodeDumper.h b/clang/include/clang/AST/TextNodeDumper.h
index 6d2795111..bad59b9a4 100644
--- a/clang/include/clang/AST/TextNodeDumper.h
+++ b/clang/include/clang/AST/TextNodeDumper.h
@@ -19,8 +19,8 @@
 #include "clang/AST/CommentCommandTraits.h"
 #include "clang/AST/CommentVisitor.h"
 #include "clang/AST/DeclVisitor.h"
-#include "clang/AST/ExprConcepts.h"
 #include "clang/AST/ExprCXX.h"
+#include "clang/AST/ExprConcepts.h"
 #include "clang/AST/StmtVisitor.h"
 #include "clang/AST/TemplateArgumentVisitor.h"
 #include "clang/AST/Type.h"
diff --git a/clang/include/clang/CodeGen/CGFunctionInfo.h b/clang/include/clang/CodeGen/CGFunctionInfo.h
index 713b52a4c..e66eec737 100644
--- a/clang/include/clang/CodeGen/CGFunctionInfo.h
+++ b/clang/include/clang/CodeGen/CGFunctionInfo.h
@@ -19,8 +19,8 @@
 #include "clang/AST/CharUnits.h"
 #include "clang/AST/Decl.h"
 #include "clang/AST/Type.h"
-#include "llvm/IR/DerivedTypes.h"
 #include "llvm/ADT/FoldingSet.h"
+#include "llvm/IR/DerivedTypes.h"
 #include "llvm/Support/TrailingObjects.h"
 #include <cassert>
 
diff --git a/clang/include/clang/StaticAnalyzer/Core/PathSensitive/ExprEngine.h b/clang/include/clang/StaticAnalyzer/Core/PathSensitive/ExprEngine.h
index d184986cd..61e193617 100644
--- a/clang/include/clang/StaticAnalyzer/Core/PathSensitive/ExprEngine.h
+++ b/clang/include/clang/StaticAnalyzer/Core/PathSensitive/ExprEngine.h
@@ -21,18 +21,18 @@
 #include "clang/Analysis/DomainSpecific/ObjCNoReturn.h"
 #include "clang/Analysis/ProgramPoint.h"
 #include "clang/Basic/LLVM.h"
-#include "clang/StaticAnalyzer/Core/CheckerManager.h"
 #include "clang/StaticAnalyzer/Core/BugReporter/BugReporter.h"
 #include "clang/StaticAnalyzer/Core/BugReporter/BugReporterVisitors.h"
+#include "clang/StaticAnalyzer/Core/CheckerManager.h"
 #include "clang/StaticAnalyzer/Core/PathSensitive/AnalysisManager.h"
 #include "clang/StaticAnalyzer/Core/PathSensitive/CoreEngine.h"
 #include "clang/StaticAnalyzer/Core/PathSensitive/FunctionSummary.h"
 #include "clang/StaticAnalyzer/Core/PathSensitive/ProgramState.h"
 #include "clang/StaticAnalyzer/Core/PathSensitive/ProgramStateTrait.h"
 #include "clang/StaticAnalyzer/Core/PathSensitive/ProgramState_Fwd.h"
-#include "clang/StaticAnalyzer/Core/PathSensitive/Store.h"
 #include "clang/StaticAnalyzer/Core/PathSensitive/SValBuilder.h"
 #include "clang/StaticAnalyzer/Core/PathSensitive/SVals.h"
+#include "clang/StaticAnalyzer/Core/PathSensitive/Store.h"
 #include "clang/StaticAnalyzer/Core/PathSensitive/WorkList.h"
 #include "llvm/ADT/ArrayRef.h"
 #include <cassert>
diff --git a/clang/lib/AST/FormatStringParsing.h b/clang/lib/AST/FormatStringParsing.h
index 764e5d463..48b8f6287 100644
--- a/clang/lib/AST/FormatStringParsing.h
+++ b/clang/lib/AST/FormatStringParsing.h
@@ -15,8 +15,8 @@
 #define LLVM_CLANG_LIB_ANALYSIS_FORMATSTRINGPARSING_H
 
 #include "clang/AST/ASTContext.h"
-#include "clang/AST/Type.h"
 #include "clang/AST/FormatString.h"
+#include "clang/AST/Type.h"
 
 namespace clang {
 
diff --git a/clang/lib/StaticAnalyzer/Checkers/CheckObjCInstMethSignature.cpp b/clang/lib/StaticAnalyzer/Checkers/CheckObjCInstMethSignature.cpp
index c8fe5c2cc..c6fa991e6 100644
--- a/clang/lib/StaticAnalyzer/Checkers/CheckObjCInstMethSignature.cpp
+++ b/clang/lib/StaticAnalyzer/Checkers/CheckObjCInstMethSignature.cpp
@@ -12,11 +12,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/StaticAnalyzer/Checkers/BuiltinCheckerRegistration.h"
-#include "clang/Analysis/PathDiagnostic.h"
 #include "clang/AST/ASTContext.h"
 #include "clang/AST/DeclObjC.h"
 #include "clang/AST/Type.h"
+#include "clang/Analysis/PathDiagnostic.h"
+#include "clang/StaticAnalyzer/Checkers/BuiltinCheckerRegistration.h"
 #include "clang/StaticAnalyzer/Core/BugReporter/BugReporter.h"
 #include "clang/StaticAnalyzer/Core/Checker.h"
 #include "llvm/ADT/DenseMap.h"

@mizvekov mizvekov force-pushed the users/mizvekov/rename-ast-type-typebase branch from 605621e to 6d8f7a3 Compare August 23, 2025 05:34
@mizvekov mizvekov force-pushed the users/mizvekov/rename-ast-readd-type branch from cb3309c to 76970a3 Compare August 23, 2025 05:34
@mizvekov mizvekov force-pushed the users/mizvekov/rename-ast-type-typebase branch from 6d8f7a3 to 7742ecd Compare August 23, 2025 05:42
@mizvekov mizvekov force-pushed the users/mizvekov/rename-ast-readd-type branch from 76970a3 to ae2c34d Compare August 23, 2025 05:42
@mizvekov mizvekov force-pushed the users/mizvekov/rename-ast-type-typebase branch from 7742ecd to f6aa7bd Compare August 23, 2025 17:05
@mizvekov mizvekov force-pushed the users/mizvekov/rename-ast-readd-type branch 2 times, most recently from 9393676 to 367b46c Compare August 25, 2025 01:29
@mizvekov mizvekov force-pushed the users/mizvekov/rename-ast-type-typebase branch 2 times, most recently from f30ce6c to a7624a1 Compare August 25, 2025 23:41
@mizvekov mizvekov force-pushed the users/mizvekov/rename-ast-readd-type branch from 367b46c to b4178e9 Compare August 25, 2025 23:41
@mizvekov mizvekov force-pushed the users/mizvekov/rename-ast-type-typebase branch from a7624a1 to 6efe4e2 Compare August 26, 2025 19:08
@mizvekov mizvekov force-pushed the users/mizvekov/rename-ast-readd-type branch from b4178e9 to 3ec61b4 Compare August 26, 2025 19:08
@mizvekov mizvekov force-pushed the users/mizvekov/rename-ast-type-typebase branch from 6efe4e2 to 94b6d43 Compare August 26, 2025 19:44
@mizvekov mizvekov force-pushed the users/mizvekov/rename-ast-readd-type branch 2 times, most recently from a260168 to 5245315 Compare August 27, 2025 10:09
@mizvekov mizvekov force-pushed the users/mizvekov/rename-ast-type-typebase branch from 94b6d43 to bf955b2 Compare August 27, 2025 10:09
Base automatically changed from users/mizvekov/rename-ast-type-typebase to main August 27, 2025 16:09
This reintroduces `Type.h`, having earlier been renamed to `TypeBase.h`,
as a redirection to `TypeBase.h`, and redirects most users to include the
former instead.

This is a preparatory patch for being able to provide inline definitions
for `Type` methods which would otherwise cause a circular dependency with
`Decl{,CXX}.h`.

Doing these operations into their own NFC patch helps the git rename
detection logic work, preserving the history.

This patch makes clang just a little slower to build (~0.17%), just
because it makes more code indirectly include `DeclCXX.h`.
@mizvekov mizvekov force-pushed the users/mizvekov/rename-ast-readd-type branch from 5245315 to 829b1bf Compare August 27, 2025 16:11
@mizvekov mizvekov merged commit 249167a into main Aug 27, 2025
6 of 12 checks passed
@mizvekov mizvekov deleted the users/mizvekov/rename-ast-readd-type branch August 27, 2025 16:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backend:DirectX backend:PowerPC backend:RISC-V clang:analysis clang:as-a-library libclang and C++ API clang:codegen IR generation bugs: mangling, exceptions, etc. clang:dataflow Clang Dataflow Analysis framework - https://clang.llvm.org/docs/DataFlowAnalysisIntro.html clang:frontend Language frontend issues, e.g. anything involving "Sema" clang:modules C++20 modules and Clang Header Modules clang:openmp OpenMP related changes to Clang clang:static analyzer clang Clang issues not falling into any other category clang-tidy clang-tools-extra clangd ClangIR Anything related to the ClangIR project debuginfo HLSL HLSL Language Support lldb
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants