Skip to content

Commit 9b1684a

Browse files
ronliebronlieb
committed
merge main into amd-staging
reverts: composableKernels 53d2f4d [CUDA][HIP] warn incompatible redeclare (llvm#77359) breaks MIOpen 18ec885 [RFC][AMDGPU] Remove old llvm.amdgcn.buffer.* and tbuffer intrinsics (llvm#93801) Change-Id: I7191261fb80fe1dc8a47063f74d785ab415290b0
2 parents 0e9ca91 + 1fe4f2d commit 9b1684a

File tree

322 files changed

+9176
-2904
lines changed

Some content is hidden

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

322 files changed

+9176
-2904
lines changed

‎bolt/include/bolt/Rewrite/DWARFRewriter.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#include "bolt/Core/DIEBuilder.h"
1313
#include "bolt/Core/DebugData.h"
1414
#include "bolt/Core/DebugNames.h"
15+
#include "bolt/Core/GDBIndex.h"
1516
#include "llvm/ADT/StringRef.h"
1617
#include "llvm/CodeGen/DIE.h"
1718
#include "llvm/DWP/DWP.h"
@@ -131,7 +132,8 @@ class DWARFRewriter {
131132
makeFinalLocListsSection(DWARFVersion Version);
132133

133134
/// Finalize type sections in the main binary.
134-
CUOffsetMap finalizeTypeSections(DIEBuilder &DIEBlder, DIEStreamer &Streamer);
135+
CUOffsetMap finalizeTypeSections(DIEBuilder &DIEBlder, DIEStreamer &Streamer,
136+
GDBIndex &GDBIndexSection);
135137

136138
/// Process and write out CUs that are passsed in.
137139
void finalizeCompileUnits(DIEBuilder &DIEBlder, DIEStreamer &Streamer,

‎bolt/lib/Rewrite/DWARFRewriter.cpp

Lines changed: 34 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ namespace bolt {
184184
/// Emits debug information into .debug_info or .debug_types section.
185185
class DIEStreamer : public DwarfStreamer {
186186
DIEBuilder *DIEBldr;
187-
DWARFRewriter &Rewriter;
187+
GDBIndex &GDBIndexSection;
188188

189189
private:
190190
/// Emit the compilation unit header for \p Unit in the debug_info
@@ -247,7 +247,7 @@ class DIEStreamer : public DwarfStreamer {
247247
const uint64_t TypeSignature = cast<DWARFTypeUnit>(Unit).getTypeHash();
248248
DIE *TypeDIE = DIEBldr->getTypeDIE(Unit);
249249
const DIEBuilder::DWARFUnitInfo &UI = DIEBldr->getUnitInfoByDwarfUnit(Unit);
250-
Rewriter.addGDBTypeUnitEntry(
250+
GDBIndexSection.addGDBTypeUnitEntry(
251251
{UI.UnitOffset, TypeSignature, TypeDIE->getOffset()});
252252
if (Unit.getVersion() < 5) {
253253
// Switch the section to .debug_types section.
@@ -278,12 +278,12 @@ class DIEStreamer : public DwarfStreamer {
278278
}
279279

280280
public:
281-
DIEStreamer(DIEBuilder *DIEBldr, DWARFRewriter &Rewriter,
281+
DIEStreamer(DIEBuilder *DIEBldr, GDBIndex &GDBIndexSection,
282282
DWARFLinkerBase::OutputFileType OutFileType,
283283
raw_pwrite_stream &OutFile,
284284
DWARFLinkerBase::MessageHandlerTy Warning)
285285
: DwarfStreamer(OutFileType, OutFile, Warning), DIEBldr(DIEBldr),
286-
Rewriter(Rewriter){};
286+
GDBIndexSection(GDBIndexSection) {};
287287

288288
using DwarfStreamer::emitCompileUnitHeader;
289289

@@ -326,12 +326,11 @@ static cl::opt<bool> KeepARanges(
326326
"keep or generate .debug_aranges section if .gdb_index is written"),
327327
cl::Hidden, cl::cat(BoltCategory));
328328

329-
static cl::opt<bool>
330-
DeterministicDebugInfo("deterministic-debuginfo",
331-
cl::desc("disables parallel execution of tasks that may produce "
332-
"nondeterministic debug info"),
333-
cl::init(true),
334-
cl::cat(BoltCategory));
329+
static cl::opt<bool> DeterministicDebugInfo(
330+
"deterministic-debuginfo",
331+
cl::desc("disables parallel execution of tasks that may produce "
332+
"nondeterministic debug info"),
333+
cl::init(true), cl::cat(BoltCategory));
335334

336335
static cl::opt<std::string> DwarfOutputPath(
337336
"dwarf-output-path",
@@ -460,10 +459,11 @@ static std::optional<uint64_t> getAsAddress(const DWARFUnit &DU,
460459
static std::unique_ptr<DIEStreamer>
461460
createDIEStreamer(const Triple &TheTriple, raw_pwrite_stream &OutFile,
462461
StringRef Swift5ReflectionSegmentName, DIEBuilder &DIEBldr,
463-
DWARFRewriter &Rewriter) {
462+
GDBIndex &GDBIndexSection) {
464463

465464
std::unique_ptr<DIEStreamer> Streamer = std::make_unique<DIEStreamer>(
466-
&DIEBldr, Rewriter, DWARFLinkerBase::OutputFileType::Object, OutFile,
465+
&DIEBldr, GDBIndexSection, DWARFLinkerBase::OutputFileType::Object,
466+
OutFile,
467467
[&](const Twine &Warning, StringRef Context, const DWARFDie *) {});
468468
Error Err = Streamer->init(TheTriple, Swift5ReflectionSegmentName);
469469
if (Err)
@@ -484,13 +484,12 @@ emitUnit(DIEBuilder &DIEBldr, DIEStreamer &Streamer, DWARFUnit &Unit) {
484484
return {U.UnitOffset, U.UnitLength, TypeHash};
485485
}
486486

487-
static void emitDWOBuilder(const std::string &DWOName,
488-
DIEBuilder &DWODIEBuilder, DWARFRewriter &Rewriter,
489-
DWARFUnit &SplitCU, DWARFUnit &CU,
490-
DWARFRewriter::DWPState &State,
491-
DebugLocWriter &LocWriter,
492-
DebugStrOffsetsWriter &StrOffstsWriter,
493-
DebugStrWriter &StrWriter) {
487+
static void
488+
emitDWOBuilder(const std::string &DWOName, DIEBuilder &DWODIEBuilder,
489+
DWARFRewriter &Rewriter, DWARFUnit &SplitCU, DWARFUnit &CU,
490+
DWARFRewriter::DWPState &State, DebugLocWriter &LocWriter,
491+
DebugStrOffsetsWriter &StrOffstsWriter,
492+
DebugStrWriter &StrWriter, GDBIndex &GDBIndexSection) {
494493
// Populate debug_info and debug_abbrev for current dwo into StringRef.
495494
DWODIEBuilder.generateAbbrevs();
496495
DWODIEBuilder.finish();
@@ -500,8 +499,9 @@ static void emitDWOBuilder(const std::string &DWOName,
500499
std::make_shared<raw_svector_ostream>(OutBuffer);
501500
const object::ObjectFile *File = SplitCU.getContext().getDWARFObj().getFile();
502501
auto TheTriple = std::make_unique<Triple>(File->makeTriple());
503-
std::unique_ptr<DIEStreamer> Streamer = createDIEStreamer(
504-
*TheTriple, *ObjOS, "DwoStreamerInitAug2", DWODIEBuilder, Rewriter);
502+
std::unique_ptr<DIEStreamer> Streamer =
503+
createDIEStreamer(*TheTriple, *ObjOS, "DwoStreamerInitAug2",
504+
DWODIEBuilder, GDBIndexSection);
505505
DWARFRewriter::UnitMetaVectorType TUMetaVector;
506506
DWARFRewriter::UnitMeta CUMI = {0, 0, 0};
507507
if (SplitCU.getContext().getMaxDWOVersion() >= 5) {
@@ -652,6 +652,7 @@ void DWARFRewriter::updateDebugInfo() {
652652

653653
DWARF5AcceleratorTable DebugNamesTable(opts::CreateDebugNames, BC,
654654
*StrWriter);
655+
GDBIndex GDBIndexSection(BC);
655656
DWPState State;
656657
if (opts::WriteDWP)
657658
initDWPState(State);
@@ -704,7 +705,8 @@ void DWARFRewriter::updateDebugInfo() {
704705
TempRangesSectionWriter->finalizeSection();
705706

706707
emitDWOBuilder(DWOName, DWODIEBuilder, *this, **SplitCU, *Unit, State,
707-
DebugLocDWoWriter, DWOStrOffstsWriter, DWOStrWriter);
708+
DebugLocDWoWriter, DWOStrOffstsWriter, DWOStrWriter,
709+
GDBIndexSection);
708710
}
709711

710712
if (Unit->getVersion() >= 5) {
@@ -729,9 +731,10 @@ void DWARFRewriter::updateDebugInfo() {
729731
std::make_unique<raw_svector_ostream>(OutBuffer);
730732
const object::ObjectFile *File = BC.DwCtx->getDWARFObj().getFile();
731733
auto TheTriple = std::make_unique<Triple>(File->makeTriple());
732-
std::unique_ptr<DIEStreamer> Streamer =
733-
createDIEStreamer(*TheTriple, *ObjOS, "TypeStreamer", DIEBlder, *this);
734-
CUOffsetMap OffsetMap = finalizeTypeSections(DIEBlder, *Streamer);
734+
std::unique_ptr<DIEStreamer> Streamer = createDIEStreamer(
735+
*TheTriple, *ObjOS, "TypeStreamer", DIEBlder, GDBIndexSection);
736+
CUOffsetMap OffsetMap =
737+
finalizeTypeSections(DIEBlder, *Streamer, GDBIndexSection);
735738

736739
const bool SingleThreadedMode =
737740
opts::NoThreads || opts::DeterministicDebugInfo;
@@ -761,7 +764,8 @@ void DWARFRewriter::updateDebugInfo() {
761764

762765
finalizeDebugSections(DIEBlder, DebugNamesTable, *Streamer, *ObjOS,
763766
OffsetMap);
764-
updateGdbIndexSection(OffsetMap, CUIndex);
767+
GDBIndexSection.updateGdbIndexSection(OffsetMap, CUIndex,
768+
*ARangesSectionWriter);
765769
}
766770

767771
void DWARFRewriter::updateUnitDebugInfo(
@@ -1429,7 +1433,8 @@ void DWARFRewriter::updateLineTableOffsets(const MCAsmLayout &Layout) {
14291433
}
14301434

14311435
CUOffsetMap DWARFRewriter::finalizeTypeSections(DIEBuilder &DIEBlder,
1432-
DIEStreamer &Streamer) {
1436+
DIEStreamer &Streamer,
1437+
GDBIndex &GDBIndexSection) {
14331438
// update TypeUnit DW_AT_stmt_list with new .debug_line information.
14341439
auto updateLineTable = [&](const DWARFUnit &Unit) -> void {
14351440
DIE *UnitDIE = DIEBlder.getUnitDIEbyUnit(Unit);
@@ -1449,8 +1454,8 @@ CUOffsetMap DWARFRewriter::finalizeTypeSections(DIEBuilder &DIEBlder,
14491454
std::make_shared<raw_svector_ostream>(OutBuffer);
14501455
const object::ObjectFile *File = BC.DwCtx->getDWARFObj().getFile();
14511456
auto TheTriple = std::make_unique<Triple>(File->makeTriple());
1452-
std::unique_ptr<DIEStreamer> TypeStreamer =
1453-
createDIEStreamer(*TheTriple, *ObjOS, "TypeStreamer", DIEBlder, *this);
1457+
std::unique_ptr<DIEStreamer> TypeStreamer = createDIEStreamer(
1458+
*TheTriple, *ObjOS, "TypeStreamer", DIEBlder, GDBIndexSection);
14541459

14551460
// generate debug_info and CUMap
14561461
CUOffsetMap CUMap;

‎clang-tools-extra/clang-tidy/tool/clang-tidy-diff.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ def main():
242242
filename = None
243243
lines_by_file = {}
244244
for line in sys.stdin:
245-
match = re.search('^\+\+\+\ "?(.*?/){%s}([^ \t\n"]*)' % args.p, line)
245+
match = re.search('^\\+\\+\\+\\ "?(.*?/){%s}([^ \t\n"]*)' % args.p, line)
246246
if match:
247247
filename = match.group(2)
248248
if filename is None:
@@ -255,7 +255,7 @@ def main():
255255
if not re.match("^%s$" % args.iregex, filename, re.IGNORECASE):
256256
continue
257257

258-
match = re.search("^@@.*\+(\d+)(,(\d+))?", line)
258+
match = re.search(r"^@@.*\+(\d+)(,(\d+))?", line)
259259
if match:
260260
start_line = int(match.group(1))
261261
line_count = 1

‎clang-tools-extra/docs/clang-tidy/checks/clang-analyzer/cplusplus.ArrayDelete.rst

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
.. title:: clang-tidy - clang-analyzer-cplusplus.ArrayDelete
2+
.. meta::
3+
:http-equiv=refresh: 5;URL=https://clang.llvm.org/docs/analyzer/checkers.html#cplusplus-arraydelete
4+
5+
clang-analyzer-cplusplus.ArrayDelete
6+
====================================
7+
8+
Reports destructions of arrays of polymorphic objects that are destructed as
9+
their base class.
10+
11+
The `clang-analyzer-cplusplus.ArrayDelete` check is an alias, please see
12+
`Clang Static Analyzer Available Checkers
13+
<https://clang.llvm.org/docs/analyzer/checkers.html#cplusplus-arraydelete>`_
14+
for more information.

‎clang-tools-extra/docs/clang-tidy/checks/clang-analyzer/security.SetgidSetuidOrder.rst

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
.. title:: clang-tidy - clang-analyzer-security.SetgidSetuidOrder
2+
3+
clang-analyzer-security.SetgidSetuidOrder
4+
=========================================
5+
6+
Warn on possible reversed order of 'setgid(getgid()))' and 'setuid(getuid())'
7+
(CERT: POS36-C).
8+
9+
The clang-analyzer-security.SetgidSetuidOrder check is an alias of
10+
Clang Static Analyzer security.SetgidSetuidOrder.

‎clang-tools-extra/docs/clang-tidy/checks/clang-analyzer/unix.Stream.rst

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
.. title:: clang-tidy - clang-analyzer-unix.Stream
2+
.. meta::
3+
:http-equiv=refresh: 5;URL=https://clang.llvm.org/docs/analyzer/checkers.html#unix-stream
4+
5+
clang-analyzer-unix.Stream
6+
==========================
7+
8+
Check stream handling functions.
9+
10+
The `clang-analyzer-unix.Stream` check is an alias, please see
11+
`Clang Static Analyzer Available Checkers
12+
<https://clang.llvm.org/docs/analyzer/checkers.html#unix-stream>`_
13+
for more information.

‎clang-tools-extra/docs/clang-tidy/checks/gen-static-analyzer-docs.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ def get_checkers(checkers_td, checkers_rst):
4747
parent_package_ = package["ParentPackage"]
4848
hidden = (checker["Hidden"] != 0) or (package["Hidden"] != 0)
4949

50-
while parent_package_ != None:
50+
while parent_package_ is not None:
5151
parent_package = table_entries[parent_package_["def"]]
5252
checker_package_prefix = (
5353
parent_package["PackageName"] + "." + checker_package_prefix
@@ -59,7 +59,7 @@ def get_checkers(checkers_td, checkers_rst):
5959
"clang-analyzer-" + checker_package_prefix + "." + checker_name
6060
)
6161
anchor_url = re.sub(
62-
"\.", "-", checker_package_prefix + "." + checker_name
62+
r"\.", "-", checker_package_prefix + "." + checker_name
6363
).lower()
6464

6565
if not hidden and "alpha" not in full_package_name.lower():
@@ -130,7 +130,7 @@ def generate_documentation(checker, has_documentation):
130130
def update_documentation_list(checkers):
131131
with open(os.path.join(__location__, "list.rst"), "r+") as f:
132132
f_text = f.read()
133-
check_text = f_text.split(".. csv-table:: Aliases..\n")[1]
133+
check_text = f_text.split(':header: "Name", "Redirect", "Offers fixes"\n')[1]
134134
checks = [x for x in check_text.split("\n") if ":header:" not in x and x]
135135
old_check_text = "\n".join(checks)
136136
checks = [x for x in checks if "clang-analyzer-" not in x]

‎clang-tools-extra/docs/clang-tidy/checks/list.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -443,6 +443,7 @@ Check aliases
443443
:doc:`clang-analyzer-core.uninitialized.CapturedBlockVariable <clang-analyzer/core.uninitialized.CapturedBlockVariable>`, `Clang Static Analyzer core.uninitialized.CapturedBlockVariable <https://clang.llvm.org/docs/analyzer/checkers.html#core-uninitialized-capturedblockvariable>`_,
444444
:doc:`clang-analyzer-core.uninitialized.NewArraySize <clang-analyzer/core.uninitialized.NewArraySize>`, `Clang Static Analyzer core.uninitialized.NewArraySize <https://clang.llvm.org/docs/analyzer/checkers.html#core-uninitialized-newarraysize>`_,
445445
:doc:`clang-analyzer-core.uninitialized.UndefReturn <clang-analyzer/core.uninitialized.UndefReturn>`, `Clang Static Analyzer core.uninitialized.UndefReturn <https://clang.llvm.org/docs/analyzer/checkers.html#core-uninitialized-undefreturn>`_,
446+
:doc:`clang-analyzer-cplusplus.ArrayDelete <clang-analyzer/cplusplus.ArrayDelete>`, `Clang Static Analyzer cplusplus.ArrayDelete <https://clang.llvm.org/docs/analyzer/checkers.html#cplusplus-arraydelete>`_,
446447
:doc:`clang-analyzer-cplusplus.InnerPointer <clang-analyzer/cplusplus.InnerPointer>`, `Clang Static Analyzer cplusplus.InnerPointer <https://clang.llvm.org/docs/analyzer/checkers.html#cplusplus-innerpointer>`_,
447448
:doc:`clang-analyzer-cplusplus.Move <clang-analyzer/cplusplus.Move>`, Clang Static Analyzer cplusplus.Move,
448449
:doc:`clang-analyzer-cplusplus.NewDelete <clang-analyzer/cplusplus.NewDelete>`, `Clang Static Analyzer cplusplus.NewDelete <https://clang.llvm.org/docs/analyzer/checkers.html#cplusplus-newdelete>`_,
@@ -497,6 +498,7 @@ Check aliases
497498
:doc:`clang-analyzer-osx.coreFoundation.containers.OutOfBounds <clang-analyzer/osx.coreFoundation.containers.OutOfBounds>`, `Clang Static Analyzer osx.coreFoundation.containers.OutOfBounds <https://clang.llvm.org/docs/analyzer/checkers.html#osx-corefoundation-containers-outofbounds>`_,
498499
:doc:`clang-analyzer-osx.coreFoundation.containers.PointerSizedValues <clang-analyzer/osx.coreFoundation.containers.PointerSizedValues>`, `Clang Static Analyzer osx.coreFoundation.containers.PointerSizedValues <https://clang.llvm.org/docs/analyzer/checkers.html#osx-corefoundation-containers-pointersizedvalues>`_,
499500
:doc:`clang-analyzer-security.FloatLoopCounter <clang-analyzer/security.FloatLoopCounter>`, `Clang Static Analyzer security.FloatLoopCounter <https://clang.llvm.org/docs/analyzer/checkers.html#security-floatloopcounter>`_,
501+
:doc:`clang-analyzer-security.SetgidSetuidOrder <clang-analyzer/security.SetgidSetuidOrder>`, Clang Static Analyzer security.SetgidSetuidOrder,
500502
:doc:`clang-analyzer-security.cert.env.InvalidPtr <clang-analyzer/security.cert.env.InvalidPtr>`, `Clang Static Analyzer security.cert.env.InvalidPtr <https://clang.llvm.org/docs/analyzer/checkers.html#security-cert-env-invalidptr>`_,
501503
:doc:`clang-analyzer-security.insecureAPI.DeprecatedOrUnsafeBufferHandling <clang-analyzer/security.insecureAPI.DeprecatedOrUnsafeBufferHandling>`, `Clang Static Analyzer security.insecureAPI.DeprecatedOrUnsafeBufferHandling <https://clang.llvm.org/docs/analyzer/checkers.html#security-insecureapi-deprecatedorunsafebufferhandling>`_,
502504
:doc:`clang-analyzer-security.insecureAPI.UncheckedReturn <clang-analyzer/security.insecureAPI.UncheckedReturn>`, `Clang Static Analyzer security.insecureAPI.UncheckedReturn <https://clang.llvm.org/docs/analyzer/checkers.html#security-insecureapi-uncheckedreturn>`_,
@@ -517,6 +519,7 @@ Check aliases
517519
:doc:`clang-analyzer-unix.MallocSizeof <clang-analyzer/unix.MallocSizeof>`, `Clang Static Analyzer unix.MallocSizeof <https://clang.llvm.org/docs/analyzer/checkers.html#unix-mallocsizeof>`_,
518520
:doc:`clang-analyzer-unix.MismatchedDeallocator <clang-analyzer/unix.MismatchedDeallocator>`, `Clang Static Analyzer unix.MismatchedDeallocator <https://clang.llvm.org/docs/analyzer/checkers.html#unix-mismatcheddeallocator>`_,
519521
:doc:`clang-analyzer-unix.StdCLibraryFunctions <clang-analyzer/unix.StdCLibraryFunctions>`, `Clang Static Analyzer unix.StdCLibraryFunctions <https://clang.llvm.org/docs/analyzer/checkers.html#unix-stdclibraryfunctions>`_,
522+
:doc:`clang-analyzer-unix.Stream <clang-analyzer/unix.Stream>`, `Clang Static Analyzer unix.Stream <https://clang.llvm.org/docs/analyzer/checkers.html#unix-stream>`_,
520523
:doc:`clang-analyzer-unix.Vfork <clang-analyzer/unix.Vfork>`, `Clang Static Analyzer unix.Vfork <https://clang.llvm.org/docs/analyzer/checkers.html#unix-vfork>`_,
521524
:doc:`clang-analyzer-unix.cstring.BadSizeArg <clang-analyzer/unix.cstring.BadSizeArg>`, `Clang Static Analyzer unix.cstring.BadSizeArg <https://clang.llvm.org/docs/analyzer/checkers.html#unix-cstring-badsizearg>`_,
522525
:doc:`clang-analyzer-unix.cstring.NullArg <clang-analyzer/unix.cstring.NullArg>`, `Clang Static Analyzer unix.cstring.NullArg <https://clang.llvm.org/docs/analyzer/checkers.html#unix-cstring-nullarg>`_,

‎clang/CMakeLists.txt

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -873,23 +873,17 @@ if (CLANG_ENABLE_BOOTSTRAP)
873873
set(CLANG_BOOTSTRAP_TARGETS check-llvm check-clang check-all)
874874
endif()
875875
foreach(target ${CLANG_BOOTSTRAP_TARGETS})
876-
# Install targets have side effects, so we always want to execute them.
877-
# "install" is reserved by CMake and can't be used as a step name for
878-
# ExternalProject_Add_Step, so we can match against "^install-" instead of
879-
# "^install" to get a tighter match. CMake's installation scripts already
880-
# skip up-to-date files, so there's no behavior change if you install to the
881-
# same destination multiple times.
882-
if(target MATCHES "^install-")
883-
set(step_always ON)
884-
else()
885-
set(step_always OFF)
886-
endif()
887876

888877
ExternalProject_Add_Step(${NEXT_CLANG_STAGE} ${target}
889878
COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --target ${target}
890879
COMMENT "Performing ${target} for '${NEXT_CLANG_STAGE}'"
891880
DEPENDEES configure
892-
ALWAYS ${step_always}
881+
# We need to set ALWAYS to ON here, otherwise these targets won't be
882+
# built on a second invocation of ninja. The targets have their own
883+
# logic to determine if they should build or not so setting ALWAYS ON
884+
# here does not mean the targets will always rebuild it just means that
885+
# they will check their dependenices and see if they need to be built.
886+
ALWAYS ON
893887
EXCLUDE_FROM_MAIN ON
894888
USES_TERMINAL 1
895889
)

‎clang/cmake/caches/Release.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ endfunction()
3030
#
3131
# cmake -D LLVM_RELEASE_ENABLE_PGO=ON -C Release.cmake
3232
set(LLVM_RELEASE_ENABLE_LTO THIN CACHE STRING "")
33-
set(LLVM_RELEASE_ENABLE_PGO OFF CACHE BOOL "")
33+
set(LLVM_RELEASE_ENABLE_PGO ON CACHE BOOL "")
3434
set(LLVM_RELEASE_ENABLE_RUNTIMES "compiler-rt;libcxx;libcxxabi;libunwind" CACHE STRING "")
3535
set(LLVM_RELEASE_ENABLE_PROJECTS "clang;lld;lldb;clang-tools-extra;bolt;polly;mlir;flang" CACHE STRING "")
3636
# Note we don't need to add install here, since it is one of the pre-defined

‎clang/include/clang/AST/ASTContext.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3203,9 +3203,6 @@ class ASTContext : public RefCountedBase<ASTContext> {
32033203
/// valid feature names.
32043204
ParsedTargetAttr filterFunctionTargetAttrs(const TargetAttr *TD) const;
32053205

3206-
std::vector<std::string>
3207-
filterFunctionTargetVersionAttrs(const TargetVersionAttr *TV) const;
3208-
32093206
void getFunctionFeatureMap(llvm::StringMap<bool> &FeatureMap,
32103207
const FunctionDecl *) const;
32113208
void getFunctionFeatureMap(llvm::StringMap<bool> &FeatureMap,

‎clang/include/clang/AST/CommentCommands.td

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,9 +132,9 @@ def Tparam : BlockCommand<"tparam"> { let IsTParamCommand = 1; }
132132
// HeaderDoc command for template parameter documentation.
133133
def Templatefield : BlockCommand<"templatefield"> { let IsTParamCommand = 1; }
134134

135-
def Throws : BlockCommand<"throws"> { let IsThrowsCommand = 1; }
136-
def Throw : BlockCommand<"throw"> { let IsThrowsCommand = 1; }
137-
def Exception : BlockCommand<"exception"> { let IsThrowsCommand = 1; }
135+
def Throws : BlockCommand<"throws"> { let IsThrowsCommand = 1; let NumArgs = 1; }
136+
def Throw : BlockCommand<"throw"> { let IsThrowsCommand = 1; let NumArgs = 1; }
137+
def Exception : BlockCommand<"exception"> { let IsThrowsCommand = 1; let NumArgs = 1;}
138138

139139
def Deprecated : BlockCommand<"deprecated"> {
140140
let IsEmptyParagraphAllowed = 1;

0 commit comments

Comments
 (0)