Skip to content

Commit ac2f64c

Browse files
ronliebronlieb
committed
merge main into amd-staging
breaks build of rccl blas rocSolver Revert "[Clang] Allow the value of unroll count to be zero in `#pragma GCC unroll Change-Id: Ic5ad7b6559ad928006a022ad937b1e276b238a20
2 parents 5bc91b0 + b6824c9 commit ac2f64c

File tree

544 files changed

+29464
-8359
lines changed

Some content is hidden

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

544 files changed

+29464
-8359
lines changed

‎.github/CODEOWNERS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,10 @@ clang/test/AST/Interp/ @tbaederr
119119
/mlir/test/python/ @ftynse @makslevental @stellaraccident
120120
/mlir/python/ @ftynse @makslevental @stellaraccident
121121

122+
# MLIR Mem2Reg/SROA
123+
/mlir/**/Transforms/Mem2Reg.* @moxinilian
124+
/mlir/**/Transforms/SROA.* @moxinilian
125+
122126
# BOLT
123127
/bolt/ @aaupov @maksfb @rafaelauler @ayermolo @dcci
124128

‎bolt/test/AArch64/constant_island_pie_update.s

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
# RUN: llvm-objdump -j .text -d --show-all-symbols %t.relr.bolt | FileCheck %s
1919
# RUN: llvm-objdump -j .text -d %t.relr.bolt | \
2020
# RUN: FileCheck %s --check-prefix=ADDENDCHECK
21-
# RUN: llvm-readelf -rsW %t.relr.bolt | FileCheck --check-prefix=ELFCHECK %s
21+
# RUN: llvm-readelf -rsW %t.relr.bolt | FileCheck --check-prefix=RELRELFCHECK %s
2222
# RUN: llvm-readelf -SW %t.relr.bolt | FileCheck --check-prefix=RELRSZCHECK %s
2323

2424
// Check that the CI value was updated
@@ -51,6 +51,12 @@
5151
# ELFCHECK-NEXT: {{.*}} R_AARCH64_RELATIVE
5252
# ELFCHECK: {{.*}}[[#OFF]] {{.*}} $d
5353

54+
# RELRELFCHECK: $d{{$}}
55+
# RELRELFCHECK-NEXT: $d + 0x8{{$}}
56+
# RELRELFCHECK-NEXT: $d + 0x18{{$}}
57+
# RELRELFCHECK-NEXT: mytextP
58+
# RELRELFCHECK-EMPTY:
59+
5460
// Check that .relr.dyn size is 2 bytes to ensure that last 3 relocations were
5561
// encoded as a bitmap so the total section size for 3 relocations is 2 bytes.
5662
# RELRSZCHECK: .relr.dyn RELR [[#%x,ADDR:]] [[#%x,OFF:]] {{0*}}10

‎clang-tools-extra/clang-doc/Representation.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -380,8 +380,8 @@ ClangDocContext::ClangDocContext(tooling::ExecutionContext *ECtx,
380380
this->SourceRoot = std::string(SourceRootDir);
381381
if (!RepositoryUrl.empty()) {
382382
this->RepositoryUrl = std::string(RepositoryUrl);
383-
if (!RepositoryUrl.empty() && RepositoryUrl.find("http://") != 0 &&
384-
RepositoryUrl.find("https://") != 0)
383+
if (!RepositoryUrl.empty() && !RepositoryUrl.starts_with("http://") &&
384+
!RepositoryUrl.starts_with("https://"))
385385
this->RepositoryUrl->insert(0, "https://");
386386
}
387387
}

‎clang-tools-extra/clang-tidy/bugprone/LambdaFunctionNameCheck.cpp

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88

99
#include "LambdaFunctionNameCheck.h"
1010
#include "clang/AST/ASTContext.h"
11+
#include "clang/AST/DeclCXX.h"
1112
#include "clang/ASTMatchers/ASTMatchFinder.h"
13+
#include "clang/ASTMatchers/ASTMatchers.h"
1214
#include "clang/Frontend/CompilerInstance.h"
1315
#include "clang/Lex/MacroInfo.h"
1416
#include "clang/Lex/Preprocessor.h"
@@ -56,6 +58,8 @@ class MacroExpansionsWithFileAndLine : public PPCallbacks {
5658
LambdaFunctionNameCheck::SourceRangeSet* SuppressMacroExpansions;
5759
};
5860

61+
AST_MATCHER(CXXMethodDecl, isInLambda) { return Node.getParent()->isLambda(); }
62+
5963
} // namespace
6064

6165
LambdaFunctionNameCheck::LambdaFunctionNameCheck(StringRef Name,
@@ -69,9 +73,13 @@ void LambdaFunctionNameCheck::storeOptions(ClangTidyOptions::OptionMap &Opts) {
6973
}
7074

7175
void LambdaFunctionNameCheck::registerMatchers(MatchFinder *Finder) {
72-
// Match on PredefinedExprs inside a lambda.
73-
Finder->addMatcher(predefinedExpr(hasAncestor(lambdaExpr())).bind("E"),
74-
this);
76+
Finder->addMatcher(
77+
cxxMethodDecl(isInLambda(),
78+
hasBody(forEachDescendant(
79+
predefinedExpr(hasAncestor(cxxMethodDecl().bind("fn")))
80+
.bind("E"))),
81+
equalsBoundNode("fn")),
82+
this);
7583
}
7684

7785
void LambdaFunctionNameCheck::registerPPCallbacks(

‎clang-tools-extra/clangd/unittests/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ set(LLVM_LINK_COMPONENTS
22
support
33
AllTargetsInfos
44
FrontendOpenMP
5+
TargetParser
56
)
67

78
if(CLANG_BUILT_STANDALONE)

‎clang-tools-extra/docs/ReleaseNotes.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,10 @@ Changes in existing checks
155155
<clang-tidy/checks/bugprone/inc-dec-in-conditions>` check to ignore code
156156
within unevaluated contexts, such as ``decltype``.
157157

158+
- Improved :doc:`bugprone-lambda-function-name<clang-tidy/checks/bugprone/lambda-function-name>`
159+
check by ignoring ``__func__`` macro in lambda captures, initializers of
160+
default parameters and nested function declarations.
161+
158162
- Improved :doc:`bugprone-non-zero-enum-to-bool-conversion
159163
<clang-tidy/checks/bugprone/non-zero-enum-to-bool-conversion>` check by
160164
eliminating false positives resulting from direct usage of bitwise operators

‎clang-tools-extra/test/clang-tidy/checkers/bugprone/lambda-function-name.cpp

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,22 @@ void Positives() {
1919
// CHECK-MESSAGES-NO-CONFIG: :[[@LINE-1]]:8: warning: inside a lambda, '__FUNCTION__' expands to the name of the function call operator; consider capturing the name of the enclosing function explicitly [bugprone-lambda-function-name]
2020
[] { EMBED_IN_ANOTHER_MACRO1; }();
2121
// CHECK-MESSAGES-NO-CONFIG: :[[@LINE-1]]:8: warning: inside a lambda, '__func__' expands to the name of the function call operator; consider capturing the name of the enclosing function explicitly [bugprone-lambda-function-name]
22+
[] {
23+
__func__;
24+
// CHECK-MESSAGES: :[[@LINE-1]]:5: warning: inside a lambda, '__func__' expands to the name of the function call operator; consider capturing the name of the enclosing function explicitly [bugprone-lambda-function-name]
25+
struct S {
26+
void f() {
27+
__func__;
28+
[] {
29+
__func__;
30+
// CHECK-MESSAGES: :[[@LINE-1]]:11: warning: inside a lambda, '__func__' expands to the name of the function call operator; consider capturing the name of the enclosing function explicitly [bugprone-lambda-function-name]
31+
}();
32+
__func__;
33+
}
34+
};
35+
__func__;
36+
// CHECK-MESSAGES: :[[@LINE-1]]:5: warning: inside a lambda, '__func__' expands to the name of the function call operator; consider capturing the name of the enclosing function explicitly [bugprone-lambda-function-name]
37+
}();
2238
}
2339

2440
#define FUNC_MACRO_WITH_FILE_AND_LINE Foo(__func__, __FILE__, __LINE__)
@@ -40,4 +56,7 @@ void Negatives() {
4056
[] { FUNC_MACRO_WITH_FILE_AND_LINE; }();
4157
[] { FUNCTION_MACRO_WITH_FILE_AND_LINE; }();
4258
[] { EMBED_IN_ANOTHER_MACRO2; }();
59+
60+
[] (const char* func = __func__) { func; }();
61+
[func=__func__] { func; }();
4362
}

‎clang/cmake/caches/Apple-stage2.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ set(LLVM_ENABLE_BACKTRACES OFF CACHE BOOL "")
1616
set(LLVM_ENABLE_MODULES ON CACHE BOOL "")
1717
set(LLVM_EXTERNALIZE_DEBUGINFO ON CACHE BOOL "")
1818
set(LLVM_ENABLE_EXPORTED_SYMBOLS_IN_EXECUTABLES OFF CACHE BOOL "")
19+
set(LLVM_PLUGIN_SUPPORT OFF CACHE BOOL "")
1920
set(CLANG_PLUGIN_SUPPORT OFF CACHE BOOL "")
2021
set(CLANG_SPAWN_CC1 ON CACHE BOOL "")
2122
set(BUG_REPORT_URL "http://developer.apple.com/bugreporter/" CACHE STRING "")

‎clang/docs/ClangOffloadBundler.rst

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -518,11 +518,14 @@ The compressed offload bundle begins with a header followed by the compressed bi
518518
This is a unique identifier to distinguish compressed offload bundles. The value is the string 'CCOB' (Compressed Clang Offload Bundle).
519519

520520
- **Version Number (16-bit unsigned int)**:
521-
This denotes the version of the compressed offload bundle format. The current version is `1`.
521+
This denotes the version of the compressed offload bundle format. The current version is `2`.
522522

523523
- **Compression Method (16-bit unsigned int)**:
524524
This field indicates the compression method used. The value corresponds to either `zlib` or `zstd`, represented as a 16-bit unsigned integer cast from the LLVM compression enumeration.
525525

526+
- **Total File Size (32-bit unsigned int)**:
527+
This is the total size (in bytes) of the file, including the header. Available in version 2 and above.
528+
526529
- **Uncompressed Binary Size (32-bit unsigned int)**:
527530
This is the size (in bytes) of the binary data before it was compressed.
528531

‎clang/docs/ReleaseNotes.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -530,6 +530,7 @@ Bug Fixes to C++ Support
530530
- Fix a crash in requires expression with templated base class member function. Fixes (#GH84020).
531531
- Fix a crash caused by defined struct in a type alias template when the structure
532532
has fields with dependent type. Fixes (#GH75221).
533+
- Fix the Itanium mangling of lambdas defined in a member of a local class (#GH88906)
533534

534535
Bug Fixes to AST Handling
535536
^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -539,6 +540,9 @@ Bug Fixes to AST Handling
539540
Miscellaneous Bug Fixes
540541
^^^^^^^^^^^^^^^^^^^^^^^
541542

543+
- Fixed an infinite recursion in ASTImporter, on return type declared inside
544+
body of C++11 lambda without trailing return (#GH68775).
545+
542546
Miscellaneous Clang Crashes Fixed
543547
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
544548

@@ -681,6 +685,8 @@ Static Analyzer
681685
- Support C++23 static operator calls. (#GH84972)
682686
- Fixed a crash in ``security.cert.env.InvalidPtr`` checker when accidentally
683687
matched user-defined ``strerror`` and similar library functions. (GH#88181)
688+
- Fixed a crash when storing through an address that refers to the address of
689+
a label. (GH#89185)
684690

685691
New features
686692
^^^^^^^^^^^^

‎clang/include/clang/AST/Decl.h

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ class PragmaCommentDecl final
157157
SourceLocation CommentLoc,
158158
PragmaMSCommentKind CommentKind,
159159
StringRef Arg);
160-
static PragmaCommentDecl *CreateDeserialized(ASTContext &C, unsigned ID,
160+
static PragmaCommentDecl *CreateDeserialized(ASTContext &C, DeclID ID,
161161
unsigned ArgSize);
162162

163163
PragmaMSCommentKind getCommentKind() const { return CommentKind; }
@@ -192,7 +192,7 @@ class PragmaDetectMismatchDecl final
192192
SourceLocation Loc, StringRef Name,
193193
StringRef Value);
194194
static PragmaDetectMismatchDecl *
195-
CreateDeserialized(ASTContext &C, unsigned ID, unsigned NameValueSize);
195+
CreateDeserialized(ASTContext &C, DeclID ID, unsigned NameValueSize);
196196

197197
StringRef getName() const { return getTrailingObjects<char>(); }
198198
StringRef getValue() const { return getTrailingObjects<char>() + ValueStart; }
@@ -518,7 +518,7 @@ class LabelDecl : public NamedDecl {
518518
static LabelDecl *Create(ASTContext &C, DeclContext *DC,
519519
SourceLocation IdentL, IdentifierInfo *II,
520520
SourceLocation GnuLabelL);
521-
static LabelDecl *CreateDeserialized(ASTContext &C, unsigned ID);
521+
static LabelDecl *CreateDeserialized(ASTContext &C, DeclID ID);
522522

523523
LabelStmt *getStmt() const { return TheStmt; }
524524
void setStmt(LabelStmt *T) { TheStmt = T; }
@@ -581,7 +581,7 @@ class NamespaceDecl : public NamedDecl, public DeclContext,
581581
IdentifierInfo *Id, NamespaceDecl *PrevDecl,
582582
bool Nested);
583583

584-
static NamespaceDecl *CreateDeserialized(ASTContext &C, unsigned ID);
584+
static NamespaceDecl *CreateDeserialized(ASTContext &C, DeclID ID);
585585

586586
using redecl_range = redeclarable_base::redecl_range;
587587
using redecl_iterator = redeclarable_base::redecl_iterator;
@@ -1146,7 +1146,7 @@ class VarDecl : public DeclaratorDecl, public Redeclarable<VarDecl> {
11461146
const IdentifierInfo *Id, QualType T,
11471147
TypeSourceInfo *TInfo, StorageClass S);
11481148

1149-
static VarDecl *CreateDeserialized(ASTContext &C, unsigned ID);
1149+
static VarDecl *CreateDeserialized(ASTContext &C, DeclID ID);
11501150

11511151
SourceRange getSourceRange() const override LLVM_READONLY;
11521152

@@ -1728,7 +1728,7 @@ class ImplicitParamDecl : public VarDecl {
17281728
static ImplicitParamDecl *Create(ASTContext &C, QualType T,
17291729
ImplicitParamKind ParamKind);
17301730

1731-
static ImplicitParamDecl *CreateDeserialized(ASTContext &C, unsigned ID);
1731+
static ImplicitParamDecl *CreateDeserialized(ASTContext &C, DeclID ID);
17321732

17331733
ImplicitParamDecl(ASTContext &C, DeclContext *DC, SourceLocation IdLoc,
17341734
const IdentifierInfo *Id, QualType Type,
@@ -1782,7 +1782,7 @@ class ParmVarDecl : public VarDecl {
17821782
TypeSourceInfo *TInfo, StorageClass S,
17831783
Expr *DefArg);
17841784

1785-
static ParmVarDecl *CreateDeserialized(ASTContext &C, unsigned ID);
1785+
static ParmVarDecl *CreateDeserialized(ASTContext &C, DeclID ID);
17861786

17871787
SourceRange getSourceRange() const override LLVM_READONLY;
17881788

@@ -2178,7 +2178,7 @@ class FunctionDecl : public DeclaratorDecl,
21782178
bool hasWrittenPrototype, ConstexprSpecKind ConstexprKind,
21792179
Expr *TrailingRequiresClause);
21802180

2181-
static FunctionDecl *CreateDeserialized(ASTContext &C, unsigned ID);
2181+
static FunctionDecl *CreateDeserialized(ASTContext &C, DeclID ID);
21822182

21832183
DeclarationNameInfo getNameInfo() const {
21842184
return DeclarationNameInfo(getDeclName(), getLocation(), DNLoc);
@@ -3136,7 +3136,7 @@ class FieldDecl : public DeclaratorDecl, public Mergeable<FieldDecl> {
31363136
TypeSourceInfo *TInfo, Expr *BW, bool Mutable,
31373137
InClassInitStyle InitStyle);
31383138

3139-
static FieldDecl *CreateDeserialized(ASTContext &C, unsigned ID);
3139+
static FieldDecl *CreateDeserialized(ASTContext &C, DeclID ID);
31403140

31413141
/// Returns the index of this field within its record,
31423142
/// as appropriate for passing to ASTRecordLayout::getFieldOffset.
@@ -3311,7 +3311,7 @@ class EnumConstantDecl : public ValueDecl,
33113311
SourceLocation L, IdentifierInfo *Id,
33123312
QualType T, Expr *E,
33133313
const llvm::APSInt &V);
3314-
static EnumConstantDecl *CreateDeserialized(ASTContext &C, unsigned ID);
3314+
static EnumConstantDecl *CreateDeserialized(ASTContext &C, DeclID ID);
33153315

33163316
const Expr *getInitExpr() const { return (const Expr*) Init; }
33173317
Expr *getInitExpr() { return (Expr*) Init; }
@@ -3357,7 +3357,7 @@ class IndirectFieldDecl : public ValueDecl,
33573357
QualType T,
33583358
llvm::MutableArrayRef<NamedDecl *> CH);
33593359

3360-
static IndirectFieldDecl *CreateDeserialized(ASTContext &C, unsigned ID);
3360+
static IndirectFieldDecl *CreateDeserialized(ASTContext &C, DeclID ID);
33613361

33623362
using chain_iterator = ArrayRef<NamedDecl *>::const_iterator;
33633363

@@ -3542,7 +3542,7 @@ class TypedefDecl : public TypedefNameDecl {
35423542
static TypedefDecl *Create(ASTContext &C, DeclContext *DC,
35433543
SourceLocation StartLoc, SourceLocation IdLoc,
35443544
const IdentifierInfo *Id, TypeSourceInfo *TInfo);
3545-
static TypedefDecl *CreateDeserialized(ASTContext &C, unsigned ID);
3545+
static TypedefDecl *CreateDeserialized(ASTContext &C, DeclID ID);
35463546

35473547
SourceRange getSourceRange() const override LLVM_READONLY;
35483548

@@ -3567,7 +3567,7 @@ class TypeAliasDecl : public TypedefNameDecl {
35673567
static TypeAliasDecl *Create(ASTContext &C, DeclContext *DC,
35683568
SourceLocation StartLoc, SourceLocation IdLoc,
35693569
const IdentifierInfo *Id, TypeSourceInfo *TInfo);
3570-
static TypeAliasDecl *CreateDeserialized(ASTContext &C, unsigned ID);
3570+
static TypeAliasDecl *CreateDeserialized(ASTContext &C, DeclID ID);
35713571

35723572
SourceRange getSourceRange() const override LLVM_READONLY;
35733573

@@ -3977,7 +3977,7 @@ class EnumDecl : public TagDecl {
39773977
IdentifierInfo *Id, EnumDecl *PrevDecl,
39783978
bool IsScoped, bool IsScopedUsingClassTag,
39793979
bool IsFixed);
3980-
static EnumDecl *CreateDeserialized(ASTContext &C, unsigned ID);
3980+
static EnumDecl *CreateDeserialized(ASTContext &C, DeclID ID);
39813981

39823982
/// Overrides to provide correct range when there's an enum-base specifier
39833983
/// with forward declarations.
@@ -4182,7 +4182,7 @@ class RecordDecl : public TagDecl {
41824182
static RecordDecl *Create(const ASTContext &C, TagKind TK, DeclContext *DC,
41834183
SourceLocation StartLoc, SourceLocation IdLoc,
41844184
IdentifierInfo *Id, RecordDecl* PrevDecl = nullptr);
4185-
static RecordDecl *CreateDeserialized(const ASTContext &C, unsigned ID);
4185+
static RecordDecl *CreateDeserialized(const ASTContext &C, DeclID ID);
41864186

41874187
RecordDecl *getPreviousDecl() {
41884188
return cast_or_null<RecordDecl>(
@@ -4433,7 +4433,7 @@ class FileScopeAsmDecl : public Decl {
44334433
StringLiteral *Str, SourceLocation AsmLoc,
44344434
SourceLocation RParenLoc);
44354435

4436-
static FileScopeAsmDecl *CreateDeserialized(ASTContext &C, unsigned ID);
4436+
static FileScopeAsmDecl *CreateDeserialized(ASTContext &C, DeclID ID);
44374437

44384438
SourceLocation getAsmLoc() const { return getLocation(); }
44394439
SourceLocation getRParenLoc() const { return RParenLoc; }
@@ -4469,7 +4469,7 @@ class TopLevelStmtDecl : public Decl, public DeclContext {
44694469

44704470
public:
44714471
static TopLevelStmtDecl *Create(ASTContext &C, Stmt *Statement);
4472-
static TopLevelStmtDecl *CreateDeserialized(ASTContext &C, unsigned ID);
4472+
static TopLevelStmtDecl *CreateDeserialized(ASTContext &C, DeclID ID);
44734473

44744474
SourceRange getSourceRange() const override LLVM_READONLY;
44754475
Stmt *getStmt() { return Statement; }
@@ -4563,7 +4563,7 @@ class BlockDecl : public Decl, public DeclContext {
45634563

45644564
public:
45654565
static BlockDecl *Create(ASTContext &C, DeclContext *DC, SourceLocation L);
4566-
static BlockDecl *CreateDeserialized(ASTContext &C, unsigned ID);
4566+
static BlockDecl *CreateDeserialized(ASTContext &C, DeclID ID);
45674567

45684568
SourceLocation getCaretLocation() const { return getLocation(); }
45694569

@@ -4717,7 +4717,7 @@ class CapturedDecl final
47174717

47184718
static CapturedDecl *Create(ASTContext &C, DeclContext *DC,
47194719
unsigned NumParams);
4720-
static CapturedDecl *CreateDeserialized(ASTContext &C, unsigned ID,
4720+
static CapturedDecl *CreateDeserialized(ASTContext &C, DeclID ID,
47214721
unsigned NumParams);
47224722

47234723
Stmt *getBody() const override;
@@ -4851,7 +4851,7 @@ class ImportDecl final : public Decl,
48514851
SourceLocation EndLoc);
48524852

48534853
/// Create a new, deserialized module import declaration.
4854-
static ImportDecl *CreateDeserialized(ASTContext &C, unsigned ID,
4854+
static ImportDecl *CreateDeserialized(ASTContext &C, DeclID ID,
48554855
unsigned NumLocations);
48564856

48574857
/// Retrieve the module that was imported by the import declaration.
@@ -4892,7 +4892,7 @@ class ExportDecl final : public Decl, public DeclContext {
48924892
public:
48934893
static ExportDecl *Create(ASTContext &C, DeclContext *DC,
48944894
SourceLocation ExportLoc);
4895-
static ExportDecl *CreateDeserialized(ASTContext &C, unsigned ID);
4895+
static ExportDecl *CreateDeserialized(ASTContext &C, DeclID ID);
48964896

48974897
SourceLocation getExportLoc() const { return getLocation(); }
48984898
SourceLocation getRBraceLoc() const { return RBraceLoc; }
@@ -4931,7 +4931,7 @@ class EmptyDecl : public Decl {
49314931
public:
49324932
static EmptyDecl *Create(ASTContext &C, DeclContext *DC,
49334933
SourceLocation L);
4934-
static EmptyDecl *CreateDeserialized(ASTContext &C, unsigned ID);
4934+
static EmptyDecl *CreateDeserialized(ASTContext &C, DeclID ID);
49354935

49364936
static bool classof(const Decl *D) { return classofKind(D->getKind()); }
49374937
static bool classofKind(Kind K) { return K == Empty; }
@@ -4957,7 +4957,7 @@ class HLSLBufferDecl final : public NamedDecl, public DeclContext {
49574957
bool CBuffer, SourceLocation KwLoc,
49584958
IdentifierInfo *ID, SourceLocation IDLoc,
49594959
SourceLocation LBrace);
4960-
static HLSLBufferDecl *CreateDeserialized(ASTContext &C, unsigned ID);
4960+
static HLSLBufferDecl *CreateDeserialized(ASTContext &C, DeclID ID);
49614961

49624962
SourceRange getSourceRange() const override LLVM_READONLY {
49634963
return SourceRange(getLocStart(), RBraceLoc);

0 commit comments

Comments
 (0)