Skip to content

Commit 3ff8c89

Browse files
authored
Merge branch 'main' into 135672-raise-counter-diag-2
2 parents e108206 + 797a580 commit 3ff8c89

File tree

579 files changed

+25225
-5135
lines changed

Some content is hidden

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

579 files changed

+25225
-5135
lines changed

clang/docs/ReleaseNotes.rst

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -506,6 +506,8 @@ Improvements to Clang's diagnostics
506506
behavior of the C99 feature as it was introduced into C++20. Fixes #GH47037
507507
- ``-Wreserved-identifier`` now fires on reserved parameter names in a function
508508
declaration which is not a definition.
509+
- Clang now prints the namespace for an attribute, if any,
510+
when emitting an unknown attribute diagnostic.
509511

510512
- Several compatibility diagnostics that were incorrectly being grouped under
511513
``-Wpre-c++20-compat`` are now part of ``-Wc++20-compat``. (#GH138775)
@@ -564,7 +566,7 @@ Bug Fixes in This Version
564566
- Fixed a bug where an attribute before a ``pragma clang attribute`` or
565567
``pragma clang __debug`` would cause an assertion. Instead, this now diagnoses
566568
the invalid attribute location appropriately. (#GH137861)
567-
- Fixed a crash when a malformed ``_Pragma`` directive appears as part of an
569+
- Fixed a crash when a malformed ``_Pragma`` directive appears as part of an
568570
``#include`` directive. (#GH138094)
569571
- Fixed a crash during constant evaluation involving invalid lambda captures
570572
(#GH138832)
@@ -673,11 +675,11 @@ Bug Fixes to C++ Support
673675
- Fixed an assertion when trying to constant-fold various builtins when the argument
674676
referred to a reference to an incomplete type. (#GH129397)
675677
- Fixed a crash when a cast involved a parenthesized aggregate initialization in dependent context. (#GH72880)
676-
- Fixed a crash when forming an invalid function type in a dependent context. (#GH138657) (#GH115725) (#GH68852)
677678
- No longer crashes when instantiating invalid variable template specialization
678679
whose type depends on itself. (#GH51347), (#GH55872)
679680
- Improved parser recovery of invalid requirement expressions. In turn, this
680681
fixes crashes from follow-on processing of the invalid requirement. (#GH138820)
682+
- Fixed the handling of pack indexing types in the constraints of a member function redeclaration. (#GH138255)
681683

682684
Bug Fixes to AST Handling
683685
^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -727,6 +729,9 @@ X86 Support
727729

728730
Arm and AArch64 Support
729731
^^^^^^^^^^^^^^^^^^^^^^^
732+
733+
- Support has been added for the following processors (command-line identifiers in parentheses):
734+
- Arm Cortex-A320 (``cortex-a320``)
730735
- For ARM targets, cc1as now considers the FPU's features for the selected CPU or Architecture.
731736
- The ``+nosimd`` attribute is now fully supported for ARM. Previously, this had no effect when being used with
732737
ARM targets, however this will now disable NEON instructions being generated. The ``simd`` option is
@@ -900,6 +905,10 @@ OpenMP Support
900905
- Added support 'no_openmp_constructs' assumption clause.
901906
- Added support for 'self_maps' in map and requirement clause.
902907
- Added support for 'omp stripe' directive.
908+
- Fixed a crashing bug with ``omp tile sizes`` if the argument to ``sizes`` was
909+
an invalid expression. (#GH139073)
910+
- Fixed a crashing bug with ``omp distribute dist_schedule`` if the argument to
911+
``dist_schedule`` was not strictly positive. (#GH139266)
903912

904913
Improvements
905914
^^^^^^^^^^^^

clang/include/clang/AST/ASTContext.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,8 @@ class ASTContext : public RefCountedBase<ASTContext> {
221221
mutable llvm::ContextualFoldingSet<DependentDecltypeType, ASTContext &>
222222
DependentDecltypeTypes;
223223

224-
mutable llvm::FoldingSet<PackIndexingType> DependentPackIndexingTypes;
224+
mutable llvm::ContextualFoldingSet<PackIndexingType, ASTContext &>
225+
DependentPackIndexingTypes;
225226

226227
mutable llvm::FoldingSet<TemplateTypeParmType> TemplateTypeParmTypes;
227228
mutable llvm::FoldingSet<ObjCTypeParamType> ObjCTypeParamTypes;

clang/include/clang/AST/ExprCXX.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4547,6 +4547,7 @@ class PackIndexingExpr final
45474547
static PackIndexingExpr *CreateDeserialized(ASTContext &Context,
45484548
unsigned NumTransformedExprs);
45494549

4550+
// The index expression and all elements of the pack have been substituted.
45504551
bool isFullySubstituted() const { return FullySubstituted; }
45514552

45524553
/// Determine if the expression was expanded to empty.

clang/include/clang/AST/OpenMPClause.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9475,15 +9475,17 @@ class ConstOMPClauseVisitor :
94759475
class OMPClausePrinter final : public OMPClauseVisitor<OMPClausePrinter> {
94769476
raw_ostream &OS;
94779477
const PrintingPolicy &Policy;
9478+
unsigned Version;
94789479

94799480
/// Process clauses with list of variables.
94809481
template <typename T> void VisitOMPClauseList(T *Node, char StartSym);
94819482
/// Process motion clauses.
94829483
template <typename T> void VisitOMPMotionClause(T *Node);
94839484

94849485
public:
9485-
OMPClausePrinter(raw_ostream &OS, const PrintingPolicy &Policy)
9486-
: OS(OS), Policy(Policy) {}
9486+
OMPClausePrinter(raw_ostream &OS, const PrintingPolicy &Policy,
9487+
unsigned OpenMPVersion)
9488+
: OS(OS), Policy(Policy), Version(OpenMPVersion) {}
94879489

94889490
#define GEN_CLANG_CLAUSE_CLASS
94899491
#define CLAUSE_CLASS(Enum, Str, Class) void Visit##Class(Class *S);

clang/include/clang/AST/Type.h

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5976,7 +5976,6 @@ class PackIndexingType final
59765976
private llvm::TrailingObjects<PackIndexingType, QualType> {
59775977
friend TrailingObjects;
59785978

5979-
const ASTContext &Context;
59805979
QualType Pattern;
59815980
Expr *IndexExpr;
59825981

@@ -5987,9 +5986,8 @@ class PackIndexingType final
59875986

59885987
protected:
59895988
friend class ASTContext; // ASTContext creates these.
5990-
PackIndexingType(const ASTContext &Context, QualType Canonical,
5991-
QualType Pattern, Expr *IndexExpr, bool FullySubstituted,
5992-
ArrayRef<QualType> Expansions = {});
5989+
PackIndexingType(QualType Canonical, QualType Pattern, Expr *IndexExpr,
5990+
bool FullySubstituted, ArrayRef<QualType> Expansions = {});
59935991

59945992
public:
59955993
Expr *getIndexExpr() const { return IndexExpr; }
@@ -6024,14 +6022,10 @@ class PackIndexingType final
60246022
return T->getTypeClass() == PackIndexing;
60256023
}
60266024

6027-
void Profile(llvm::FoldingSetNodeID &ID) {
6028-
if (hasSelectedType())
6029-
getSelectedType().Profile(ID);
6030-
else
6031-
Profile(ID, Context, getPattern(), getIndexExpr(), isFullySubstituted());
6032-
}
6025+
void Profile(llvm::FoldingSetNodeID &ID, const ASTContext &Context);
60336026
static void Profile(llvm::FoldingSetNodeID &ID, const ASTContext &Context,
6034-
QualType Pattern, Expr *E, bool FullySubstituted);
6027+
QualType Pattern, Expr *E, bool FullySubstituted,
6028+
ArrayRef<QualType> Expansions);
60356029

60366030
private:
60376031
const QualType *getExpansionsPtr() const {

clang/include/clang/Basic/AttributeCommonInfo.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,7 @@ class AttributeCommonInfo {
196196
/// with surrounding underscores removed as appropriate (e.g.
197197
/// __gnu__::__attr__ will be normalized to gnu::attr).
198198
std::string getNormalizedFullName() const;
199+
SourceRange getNormalizedRange() const;
199200

200201
bool isDeclspecAttribute() const { return SyntaxUsed == AS_Declspec; }
201202
bool isMicrosoftAttribute() const { return SyntaxUsed == AS_Microsoft; }

clang/include/clang/CIR/MissingFeatures.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,8 @@ struct MissingFeatures {
104104
static bool opCallExtParameterInfo() { return false; }
105105
static bool opCallCIRGenFuncInfoParamInfo() { return false; }
106106
static bool opCallCIRGenFuncInfoExtParamInfo() { return false; }
107+
static bool opCallLandingPad() { return false; }
108+
static bool opCallContinueBlock() { return false; }
107109

108110
// ScopeOp handling
109111
static bool opScopeCleanupRegion() { return false; }

clang/include/clang/Driver/Options.td

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3269,6 +3269,13 @@ def fmodules_disable_diagnostic_validation : Flag<["-"], "fmodules-disable-diagn
32693269
Group<i_Group>, Visibility<[ClangOption, CC1Option]>,
32703270
HelpText<"Disable validation of the diagnostic options when loading the module">,
32713271
MarshallingInfoNegativeFlag<HeaderSearchOpts<"ModulesValidateDiagnosticOptions">>;
3272+
defm modules_force_validate_user_headers : BoolOption<"f", "modules-force-validate-user-headers",
3273+
HeaderSearchOpts<"ModulesForceValidateUserHeaders">, DefaultTrue,
3274+
PosFlag<SetTrue, [], [], "Force">,
3275+
NegFlag<SetFalse, [], [CC1Option], "Do not force">,
3276+
BothFlags<[], [ClangOption],
3277+
" validation of user headers when repeatedly loading a module file within single build session">>,
3278+
Group<i_Group>;
32723279
defm modules_validate_system_headers : BoolOption<"f", "modules-validate-system-headers",
32733280
HeaderSearchOpts<"ModulesValidateSystemHeaders">, DefaultFalse,
32743281
PosFlag<SetTrue, [], [ClangOption, CC1Option],

clang/include/clang/InstallAPI/DylibVerifier.h

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,31 @@ enum class VerificationMode {
2525
Pedantic,
2626
};
2727

28-
using LibAttrs = llvm::StringMap<ArchitectureSet>;
2928
using ReexportedInterfaces = llvm::SmallVector<llvm::MachO::InterfaceFile, 8>;
3029

30+
/// Represents dynamic library specific attributes that are tied to
31+
/// architecture slices. It is commonly used for comparing options
32+
/// passed on the command line to installapi and what exists in dylib load
33+
/// commands.
34+
class LibAttrs {
35+
public:
36+
using Entry = std::pair<std::string, ArchitectureSet>;
37+
using AttrsToArchs = llvm::SmallVector<Entry, 10>;
38+
39+
// Mutable access to architecture set tied to the input attribute.
40+
ArchitectureSet &getArchSet(StringRef Attr);
41+
// Get entry based on the attribute.
42+
std::optional<Entry> find(StringRef Attr) const;
43+
// Immutable access to underlying container.
44+
const AttrsToArchs &get() const { return LibraryAttributes; };
45+
// Mutable access to underlying container.
46+
AttrsToArchs &get() { return LibraryAttributes; };
47+
bool operator==(const LibAttrs &Other) const { return Other.get() == get(); };
48+
49+
private:
50+
AttrsToArchs LibraryAttributes;
51+
};
52+
3153
// Pointers to information about a zippered declaration used for
3254
// querying and reporting violations against different
3355
// declarations that all map to the same symbol.

clang/include/clang/Lex/HeaderSearchOptions.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,11 @@ class HeaderSearchOptions {
217217
LLVM_PREFERRED_TYPE(bool)
218218
unsigned ModulesValidateSystemHeaders : 1;
219219

220+
/// Whether to force the validation of user input files when a module is
221+
/// loaded (even despite the build session saying that is not necessary).
222+
LLVM_PREFERRED_TYPE(bool)
223+
unsigned ModulesForceValidateUserHeaders : 1;
224+
220225
// Whether the content of input files should be hashed and used to
221226
// validate consistency.
222227
LLVM_PREFERRED_TYPE(bool)
@@ -286,6 +291,7 @@ class HeaderSearchOptions {
286291
UseStandardCXXIncludes(true), UseLibcxx(false), Verbose(false),
287292
ModulesValidateOncePerBuildSession(false),
288293
ModulesValidateSystemHeaders(false),
294+
ModulesForceValidateUserHeaders(true),
289295
ValidateASTInputFilesContent(false),
290296
ForceCheckCXX20ModulesInputFiles(false), UseDebugInfo(false),
291297
ModulesValidateDiagnosticOptions(true),

0 commit comments

Comments
 (0)