Skip to content

Commit b8a4dd5

Browse files
authored
merge main into amd-staging (llvm#3771)
2 parents 244278c + 0dc9da6 commit b8a4dd5

File tree

214 files changed

+15096
-14979
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

214 files changed

+15096
-14979
lines changed

clang-tools-extra/clang-doc/Serialize.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -778,7 +778,9 @@ static void populateSymbolInfo(SymbolInfo &I, const T *D, const FullComment *C,
778778
Mangler->mangleCXXVTable(CXXD, MangledStream);
779779
else
780780
MangledStream << D->getNameAsString();
781-
if (MangledName.size() > 255)
781+
// A 250 length limit was chosen since 255 is a common limit across
782+
// different filesystems, with a 5 character buffer for file extensions.
783+
if (MangledName.size() > 250)
782784
// File creation fails if the mangled name is too long, so default to the
783785
// USR. We should look for a better check since filesystems differ in
784786
// maximum filename length

clang-tools-extra/clang-tidy/utils/DesignatedInitializers.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
#include "DesignatedInitializers.h"
1515
#include "clang/AST/DeclCXX.h"
16+
#include "clang/AST/Type.h"
1617
#include "llvm/ADT/DenseSet.h"
1718
#include "llvm/ADT/ScopeExit.h"
1819

clang-tools-extra/clang-tidy/utils/ExceptionSpecAnalyzer.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#include "ExceptionSpecAnalyzer.h"
1010

1111
#include "clang/AST/Expr.h"
12+
#include "clang/AST/Type.h"
1213

1314
namespace clang::tidy::utils {
1415

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
// RUN: rm -rf %t && mkdir -p %t
2+
// RUN: clang-doc --output=%t --format=mustache --executor=standalone %s
3+
// RUN: ls %t/json | FileCheck %s -check-prefix=CHECK-JSON
4+
// RUN: ls %t/html | FileCheck %s -check-prefix=CHECK-HTML
5+
6+
struct ThisStructHasANameThatResultsInAMangledNameThatIsExactly250CharactersLongThatIsSupposedToTestTheFilenameLengthLimitsWithinClangDocInOrdertoSeeifclangdocwillcrashornotdependingonthelengthofthestructIfTheLengthIsTooLongThenClangDocWillCrashAnd12 {};
7+
8+
// This name is 1 character over the limit, so it will be serialized as a USR.
9+
struct ThisStructHasANameThatResultsInAMangledNameThatIsExactly251CharactersLongThatIsSupposedToTestTheFilenameLengthLimitsWithinClangDocInOrdertoSeeifclangdocwillcrashornotdependingonthelengthofthestructIfTheLengthIsTooLongThenClangDocWillCrashAnd123 {};
10+
11+
// CHECK-JSON: ThisStructHasANameThatResultsInAMangledNameThatIsExactly250CharactersLongThatIsSupposedToTestTheFilenameLengthLimitsWithinClangDocInOrdertoSeeifclangdocwillcrashornotdependingonthelengthofthestructIfTheLengthIsTooLongThenClangDocWillCrashAnd12.json
12+
// CHECK-JSON: {{[0-9A-F]*}}.json
13+
// CHECK-HTML: ThisStructHasANameThatResultsInAMangledNameThatIsExactly250CharactersLongThatIsSupposedToTestTheFilenameLengthLimitsWithinClangDocInOrdertoSeeifclangdocwillcrashornotdependingonthelengthofthestructIfTheLengthIsTooLongThenClangDocWillCrashAnd12.html
14+
// CHECK-HTML: {{[0-9A-F]*}}.html

clang/include/clang/AST/Decl.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#include "clang/AST/ExternalASTSource.h"
2323
#include "clang/AST/NestedNameSpecifierBase.h"
2424
#include "clang/AST/Redeclarable.h"
25-
#include "clang/AST/Type.h"
25+
#include "clang/AST/TypeBase.h"
2626
#include "clang/Basic/AddressSpaces.h"
2727
#include "clang/Basic/Diagnostic.h"
2828
#include "clang/Basic/IdentifierTable.h"

clang/include/clang/AST/DeclCXX.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
#include "clang/AST/Expr.h"
2323
#include "clang/AST/ExternalASTSource.h"
2424
#include "clang/AST/LambdaCapture.h"
25-
#include "clang/AST/NestedNameSpecifier.h"
25+
#include "clang/AST/NestedNameSpecifierBase.h"
2626
#include "clang/AST/Redeclarable.h"
2727
#include "clang/AST/Stmt.h"
28-
#include "clang/AST/Type.h"
28+
#include "clang/AST/TypeBase.h"
2929
#include "clang/AST/TypeLoc.h"
3030
#include "clang/AST/UnresolvedSet.h"
3131
#include "clang/Basic/LLVM.h"

clang/include/clang/AST/DeclarationName.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#ifndef LLVM_CLANG_AST_DECLARATIONNAME_H
1414
#define LLVM_CLANG_AST_DECLARATIONNAME_H
1515

16-
#include "clang/AST/Type.h"
16+
#include "clang/AST/TypeBase.h"
1717
#include "clang/Basic/Diagnostic.h"
1818
#include "clang/Basic/IdentifierTable.h"
1919
#include "clang/Basic/OperatorKinds.h"

clang/include/clang/AST/Expr.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#include "clang/AST/OperationKinds.h"
2424
#include "clang/AST/Stmt.h"
2525
#include "clang/AST/TemplateBase.h"
26-
#include "clang/AST/Type.h"
26+
#include "clang/AST/TypeBase.h"
2727
#include "clang/Basic/CharInfo.h"
2828
#include "clang/Basic/LangOptions.h"
2929
#include "clang/Basic/SyncScope.h"

clang/include/clang/AST/TemplateBase.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include "clang/AST/DependenceFlags.h"
1818
#include "clang/AST/NestedNameSpecifierBase.h"
1919
#include "clang/AST/TemplateName.h"
20-
#include "clang/AST/Type.h"
20+
#include "clang/AST/TypeBase.h"
2121
#include "clang/Basic/LLVM.h"
2222
#include "clang/Basic/SourceLocation.h"
2323
#include "llvm/ADT/APInt.h"

0 commit comments

Comments
 (0)