Skip to content

Commit 3cd08b5

Browse files
ronliebronlieb
authored
merge main into amd-staging (llvm#2183)
2 parents 9248a03 + 0485d59 commit 3cd08b5

File tree

127 files changed

+3719
-1531
lines changed

Some content is hidden

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

127 files changed

+3719
-1531
lines changed

‎bolt/test/X86/callcont-fallthru.s

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# RUN: %clangxx %cxxflags %s %t.so -o %t -Wl,-q -nostdlib
77
# RUN: link_fdata %s %t %t.pat PREAGGT1
88
# RUN: link_fdata %s %t %t.pat2 PREAGGT2
9-
# DONTRUN: link_fdata %s %t %t.patplt PREAGGPLT
9+
# RUN-DISABLED: link_fdata %s %t %t.patplt PREAGGPLT
1010

1111
# RUN: llvm-strip --strip-unneeded %t -o %t.strip
1212
# RUN: llvm-objcopy --remove-section=.eh_frame %t.strip %t.noeh
@@ -26,8 +26,8 @@
2626

2727
## Check pre-aggregated traces don't report zero-sized PLT fall-through as
2828
## invalid trace
29-
# DONTRUN: llvm-bolt %t.strip --pa -p %t.patplt -o %t.out | FileCheck %s \
30-
# DONTRUN: --check-prefix=CHECK-PLT
29+
# RUN-DISABLED: llvm-bolt %t.strip --pa -p %t.patplt -o %t.out | FileCheck %s \
30+
# RUN-DISABLED: --check-prefix=CHECK-PLT
3131
# CHECK-PLT: traces mismatching disassembled function contents: 0
3232

3333
.globl foo

‎clang/docs/ReleaseNotes.rst

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -549,6 +549,19 @@ Improvements to Clang's diagnostics
549549
- A new off-by-default warning ``-Wms-bitfield-padding`` has been added to alert to cases where bit-field
550550
packing may differ under the MS struct ABI (#GH117428).
551551

552+
- ``-Watomic-access`` no longer fires on unreachable code. e.g.,
553+
554+
.. code-block:: c
555+
556+
_Atomic struct S { int a; } s;
557+
void func(void) {
558+
if (0)
559+
s.a = 12; // Previously diagnosed with -Watomic-access, now silenced
560+
s.a = 12; // Still diagnosed with -Watomic-access
561+
return;
562+
s.a = 12; // Previously diagnosed, now silenced
563+
}
564+
552565
553566
Improvements to Clang's time-trace
554567
----------------------------------
@@ -613,6 +626,7 @@ Bug Fixes in This Version
613626
- Fixed a crash with an invalid member function parameter list with a default
614627
argument which contains a pragma. (#GH113722)
615628
- Fixed assertion failures when generating name lookup table in modules. (#GH61065, #GH134739)
629+
- Fixed an assertion failure in constant compound literal statements. (#GH139160)
616630

617631
Bug Fixes to Compiler Builtins
618632
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -726,6 +740,7 @@ Bug Fixes to C++ Support
726740
- Clang now correctly parses arbitrary order of ``[[]]``, ``__attribute__`` and ``alignas`` attributes for declarations (#GH133107)
727741
- Fixed a crash when forming an invalid function type in a dependent context. (#GH138657) (#GH115725) (#GH68852)
728742
- Clang no longer segfaults when there is a configuration mismatch between modules and their users (http://crbug.com/400353616).
743+
- Fix an incorrect deduction when calling an explicit object member function template through an overload set address.
729744

730745
Bug Fixes to AST Handling
731746
^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -878,6 +893,11 @@ clang-format
878893
- Add ``OneLineFormatOffRegex`` option for turning formatting off for one line.
879894
- Add ``SpaceAfterOperatorKeyword`` option.
880895

896+
clang-refactor
897+
--------------
898+
- Reject `0` as column or line number in 1-based command-line source locations.
899+
Fixes crash caused by `0` input in `-selection=<file>:<line>:<column>[-<line>:<column>]`. (#GH139457)
900+
881901
libclang
882902
--------
883903
- Fixed a bug in ``clang_File_isEqual`` that sometimes led to different
@@ -896,6 +916,8 @@ libclang
896916

897917
Code Completion
898918
---------------
919+
- Reject `0` as column or line number in 1-based command-line source locations.
920+
Fixes crash caused by `0` input in `-code-completion-at=<file>:<line>:<column>`. (#GH139457)
899921

900922
Static Analyzer
901923
---------------

‎clang/include/clang/AST/ASTConcept.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,11 +93,11 @@ struct ASTConstraintSatisfaction final :
9393
bool ContainsErrors : 1;
9494

9595
const UnsatisfiedConstraintRecord *begin() const {
96-
return getTrailingObjects<UnsatisfiedConstraintRecord>();
96+
return getTrailingObjects();
9797
}
9898

9999
const UnsatisfiedConstraintRecord *end() const {
100-
return getTrailingObjects<UnsatisfiedConstraintRecord>() + NumRecords;
100+
return getTrailingObjects() + NumRecords;
101101
}
102102

103103
ASTConstraintSatisfaction(const ASTContext &C,

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

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ class PragmaCommentDecl final
185185

186186
PragmaMSCommentKind getCommentKind() const { return CommentKind; }
187187

188-
StringRef getArg() const { return getTrailingObjects<char>(); }
188+
StringRef getArg() const { return getTrailingObjects(); }
189189

190190
// Implement isa/cast/dyncast/etc.
191191
static bool classof(const Decl *D) { return classofKind(D->getKind()); }
@@ -217,8 +217,8 @@ class PragmaDetectMismatchDecl final
217217
static PragmaDetectMismatchDecl *
218218
CreateDeserialized(ASTContext &C, GlobalDeclID ID, unsigned NameValueSize);
219219

220-
StringRef getName() const { return getTrailingObjects<char>(); }
221-
StringRef getValue() const { return getTrailingObjects<char>() + ValueStart; }
220+
StringRef getName() const { return getTrailingObjects(); }
221+
StringRef getValue() const { return getTrailingObjects() + ValueStart; }
222222

223223
// Implement isa/cast/dyncast/etc.
224224
static bool classof(const Decl *D) { return classofKind(D->getKind()); }
@@ -1991,7 +1991,7 @@ class FunctionDecl : public DeclaratorDecl,
19911991
/// Get the unqualified lookup results that should be used in this
19921992
/// defaulted function definition.
19931993
ArrayRef<DeclAccessPair> getUnqualifiedLookups() const {
1994-
return {getTrailingObjects<DeclAccessPair>(), NumLookups};
1994+
return getTrailingObjects<DeclAccessPair>(NumLookups);
19951995
}
19961996

19971997
StringLiteral *getDeletedMessage() const {
@@ -4780,13 +4780,9 @@ class OutlinedFunctionDecl final
47804780

47814781
explicit OutlinedFunctionDecl(DeclContext *DC, unsigned NumParams);
47824782

4783-
ImplicitParamDecl *const *getParams() const {
4784-
return getTrailingObjects<ImplicitParamDecl *>();
4785-
}
4783+
ImplicitParamDecl *const *getParams() const { return getTrailingObjects(); }
47864784

4787-
ImplicitParamDecl **getParams() {
4788-
return getTrailingObjects<ImplicitParamDecl *>();
4789-
}
4785+
ImplicitParamDecl **getParams() { return getTrailingObjects(); }
47904786

47914787
public:
47924788
friend class ASTDeclReader;
@@ -4857,13 +4853,9 @@ class CapturedDecl final
48574853

48584854
explicit CapturedDecl(DeclContext *DC, unsigned NumParams);
48594855

4860-
ImplicitParamDecl *const *getParams() const {
4861-
return getTrailingObjects<ImplicitParamDecl *>();
4862-
}
4856+
ImplicitParamDecl *const *getParams() const { return getTrailingObjects(); }
48634857

4864-
ImplicitParamDecl **getParams() {
4865-
return getTrailingObjects<ImplicitParamDecl *>();
4866-
}
4858+
ImplicitParamDecl **getParams() { return getTrailingObjects(); }
48674859

48684860
public:
48694861
friend class ASTDeclReader;
@@ -5187,12 +5179,10 @@ class HLSLRootSignatureDecl final
51875179

51885180
unsigned NumElems;
51895181

5190-
llvm::hlsl::rootsig::RootElement *getElems() {
5191-
return getTrailingObjects<llvm::hlsl::rootsig::RootElement>();
5192-
}
5182+
llvm::hlsl::rootsig::RootElement *getElems() { return getTrailingObjects(); }
51935183

51945184
const llvm::hlsl::rootsig::RootElement *getElems() const {
5195-
return getTrailingObjects<llvm::hlsl::rootsig::RootElement>();
5185+
return getTrailingObjects();
51965186
}
51975187

51985188
HLSLRootSignatureDecl(DeclContext *DC, SourceLocation Loc, IdentifierInfo *ID,

‎clang/include/clang/AST/DeclTemplate.h

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -712,7 +712,7 @@ class DependentFunctionTemplateSpecializationInfo final
712712

713713
/// Returns the candidates for the primary function template.
714714
ArrayRef<FunctionTemplateDecl *> getCandidates() const {
715-
return {getTrailingObjects<FunctionTemplateDecl *>(), NumCandidates};
715+
return getTrailingObjects(NumCandidates);
716716
}
717717
};
718718

@@ -1325,8 +1325,7 @@ class TemplateTypeParmDecl final : public TypeDecl,
13251325
/// Returns the type constraint associated with this template parameter (if
13261326
/// any).
13271327
const TypeConstraint *getTypeConstraint() const {
1328-
return TypeConstraintInitialized ? getTrailingObjects<TypeConstraint>() :
1329-
nullptr;
1328+
return TypeConstraintInitialized ? getTrailingObjects() : nullptr;
13301329
}
13311330

13321331
void setTypeConstraint(ConceptReference *CR,
@@ -1711,7 +1710,7 @@ class TemplateTemplateParmDecl final
17111710
/// pack.
17121711
TemplateParameterList *getExpansionTemplateParameters(unsigned I) const {
17131712
assert(I < NumExpandedParams && "Out-of-range expansion type index");
1714-
return getTrailingObjects<TemplateParameterList *>()[I];
1713+
return getTrailingObjects()[I];
17151714
}
17161715

17171716
const DefArgStorage &getDefaultArgStorage() const { return DefaultArgument; }
@@ -3254,8 +3253,7 @@ class ImplicitConceptSpecializationDecl final
32543253
unsigned NumTemplateArgs);
32553254

32563255
ArrayRef<TemplateArgument> getTemplateArguments() const {
3257-
return ArrayRef<TemplateArgument>(getTrailingObjects<TemplateArgument>(),
3258-
NumTemplateArgs);
3256+
return getTrailingObjects(NumTemplateArgs);
32593257
}
32603258
void setTemplateArguments(ArrayRef<TemplateArgument> Converted);
32613259

‎clang/include/clang/Basic/DiagnosticDriverKinds.td

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -683,6 +683,10 @@ def note_drv_verify_prefix_spelling : Note<
683683
"-verify prefixes must start with a letter and contain only alphanumeric"
684684
" characters, hyphens, and underscores">;
685685

686+
def note_command_line_code_loc_requirement
687+
: Note<"-code-completion-at=<file>:<line>:<column> requires <line> and "
688+
"<column> to be integers greater than zero">;
689+
686690
def warn_drv_global_isel_incomplete : Warning<
687691
"-fglobal-isel support for the '%0' architecture is incomplete">,
688692
InGroup<GlobalISel>;

0 commit comments

Comments
 (0)