Skip to content

Commit 328ca14

Browse files
SC llvm teamSC llvm team
SC llvm team
authored and
SC llvm team
committed
Merged main:65683b081fd0 into amd-gfx:d53d13329270
Local branch amd-gfx d53d133 Merged main:077e0c134a31 into amd-gfx:895bae00ec58 Remote branch main 65683b0 [RISCV][TTI] Fix test fails for llvm#124221 NFC. (llvm#125792)
2 parents d53d133 + 65683b0 commit 328ca14

File tree

426 files changed

+23752
-11820
lines changed

Some content is hidden

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

426 files changed

+23752
-11820
lines changed

‎.github/workflows/build-ci-container.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ jobs:
9696
run: |
9797
function push_container {
9898
image_name=$1
99-
latest_name=$(echo $image_name | sed 's/:[.0-9]\+$/:latest/g')
99+
latest_name=$(echo $image_name | sed 's/:[a-f0-9]\+$/:latest/g')
100100
podman tag $image_name $latest_name
101101
echo "Pushing $image_name ..."
102102
podman push $image_name

‎.github/workflows/release-binaries.yml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ jobs:
5858
target-cmake-flags: ${{ steps.vars.outputs.target-cmake-flags }}
5959
ccache: ${{ steps.vars.outputs.ccache }}
6060
build-flang: ${{ steps.vars.outputs.build-flang }}
61-
enable-pgo: ${{ steps.vars.outputs.enable-pgo }}
6261
release-binary-basename: ${{ steps.vars.outputs.release-binary-basename }}
6362
release-binary-filename: ${{ steps.vars.outputs.release-binary-filename }}
6463
build-runs-on: ${{ steps.vars.outputs.build-runs-on }}
@@ -130,9 +129,6 @@ jobs:
130129
echo ccache=sccache >> $GITHUB_OUTPUT
131130
fi
132131
133-
# Detect necessary CMake flags
134-
echo "enable-pgo=false" >> $GITHUB_OUTPUT
135-
target_cmake_flags="-DLLVM_RELEASE_ENABLE_PGO=OFF"
136132
# The macOS builds try to cross compile some libraries so we need to
137133
# add extra CMake args to disable them.
138134
# See https://github.com/llvm/llvm-project/issues/99767
@@ -238,13 +234,14 @@ jobs:
238234
${{ needs.prepare.outputs.target-cmake-flags }} \
239235
-C clang/cmake/caches/Release.cmake \
240236
-DBOOTSTRAP_LLVM_PARALLEL_LINK_JOBS=1 \
241-
-DBOOTSTRAP_CPACK_PACKAGE_FILE_NAME="${{ needs.prepare.outputs.release-binary-basename }}"
237+
-DBOOTSTRAP_BOOTSTRAP_CPACK_PACKAGE_FILE_NAME="${{ needs.prepare.outputs.release-binary-basename }}"
242238
243239
- name: Build
244240
shell: bash
245241
run: |
246242
ninja -v -C ${{ steps.setup-stage.outputs.build-prefix }}/build stage2-package
247-
mv ${{ steps.setup-stage.outputs.build-prefix }}/build/tools/clang/stage2-bins/${{ needs.prepare.outputs.release-binary-filename }} .
243+
release_dir=`find ${{ steps.setup-stage.outputs.build-prefix }}/build -iname 'stage2-bins'`
244+
mv $release_dir/${{ needs.prepare.outputs.release-binary-filename }} .
248245
249246
- uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 #v4.3.0
250247
with:
@@ -259,7 +256,7 @@ jobs:
259256
shell: bash
260257
run: |
261258
find ${{ steps.setup-stage.outputs.build-prefix }}/build -iname ${{ needs.prepare.outputs.release-binary-filename }} -delete
262-
rm -Rf ${{ steps.setup-stage.outputs.build-prefix }}/build/tools/clang/stage2-bins/_CPack_Packages
259+
find ${{ steps.setup-stage.outputs.build-prefix }}/build -iname _CPack_Packages -prune -exec rm -r {} +
263260
264261
- name: Save Stage
265262
uses: ./workflows-main/.github/workflows/release-binaries-save-stage

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -964,7 +964,7 @@ HTMLGenerator::generateDocs(StringRef RootDir,
964964
for (const auto &Group : FileToInfos) {
965965
std::error_code FileErr;
966966
llvm::raw_fd_ostream InfoOS(Group.getKey(), FileErr,
967-
llvm::sys::fs::OF_None);
967+
llvm::sys::fs::OF_Text);
968968
if (FileErr) {
969969
return llvm::createStringError(FileErr, "Error opening file '%s'",
970970
Group.getKey().str().c_str());
@@ -1047,7 +1047,7 @@ static llvm::Error serializeIndex(ClangDocContext &CDCtx) {
10471047
llvm::SmallString<128> FilePath;
10481048
llvm::sys::path::native(CDCtx.OutDirectory, FilePath);
10491049
llvm::sys::path::append(FilePath, "index_json.js");
1050-
llvm::raw_fd_ostream OS(FilePath, FileErr, llvm::sys::fs::OF_None);
1050+
llvm::raw_fd_ostream OS(FilePath, FileErr, llvm::sys::fs::OF_Text);
10511051
if (FileErr != OK) {
10521052
return llvm::createStringError(llvm::inconvertibleErrorCode(),
10531053
"error creating index file: " +
@@ -1108,7 +1108,7 @@ static llvm::Error genIndex(const ClangDocContext &CDCtx) {
11081108
llvm::SmallString<128> IndexPath;
11091109
llvm::sys::path::native(CDCtx.OutDirectory, IndexPath);
11101110
llvm::sys::path::append(IndexPath, "index.html");
1111-
llvm::raw_fd_ostream IndexOS(IndexPath, FileErr, llvm::sys::fs::OF_None);
1111+
llvm::raw_fd_ostream IndexOS(IndexPath, FileErr, llvm::sys::fs::OF_Text);
11121112
if (FileErr != OK) {
11131113
return llvm::createStringError(llvm::inconvertibleErrorCode(),
11141114
"error creating main index: " +

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ static llvm::Error serializeIndex(ClangDocContext &CDCtx) {
300300
llvm::SmallString<128> FilePath;
301301
llvm::sys::path::native(CDCtx.OutDirectory, FilePath);
302302
llvm::sys::path::append(FilePath, "all_files.md");
303-
llvm::raw_fd_ostream OS(FilePath, FileErr, llvm::sys::fs::OF_None);
303+
llvm::raw_fd_ostream OS(FilePath, FileErr, llvm::sys::fs::OF_Text);
304304
if (FileErr)
305305
return llvm::createStringError(llvm::inconvertibleErrorCode(),
306306
"error creating index file: " +
@@ -323,7 +323,7 @@ static llvm::Error genIndex(ClangDocContext &CDCtx) {
323323
llvm::SmallString<128> FilePath;
324324
llvm::sys::path::native(CDCtx.OutDirectory, FilePath);
325325
llvm::sys::path::append(FilePath, "index.md");
326-
llvm::raw_fd_ostream OS(FilePath, FileErr, llvm::sys::fs::OF_None);
326+
llvm::raw_fd_ostream OS(FilePath, FileErr, llvm::sys::fs::OF_Text);
327327
if (FileErr)
328328
return llvm::createStringError(llvm::inconvertibleErrorCode(),
329329
"error creating index file: " +
@@ -407,7 +407,7 @@ MDGenerator::generateDocs(StringRef RootDir,
407407
for (const auto &Group : FileToInfos) {
408408
std::error_code FileErr;
409409
llvm::raw_fd_ostream InfoOS(Group.getKey(), FileErr,
410-
llvm::sys::fs::OF_None);
410+
llvm::sys::fs::OF_Text);
411411
if (FileErr) {
412412
return llvm::createStringError(FileErr, "Error opening file '%s'",
413413
Group.getKey().str().c_str());

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ YAMLGenerator::generateDocs(StringRef RootDir,
347347
}
348348

349349
std::error_code FileErr;
350-
llvm::raw_fd_ostream InfoOS(Path, FileErr, llvm::sys::fs::OF_None);
350+
llvm::raw_fd_ostream InfoOS(Path, FileErr, llvm::sys::fs::OF_Text);
351351
if (FileErr) {
352352
return llvm::createStringError(FileErr, "Error opening file '%s'",
353353
Path.c_str());

‎clang-tools-extra/clang-include-fixer/FuzzySymbolIndex.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ FuzzySymbolIndex::queryRegexp(const std::vector<std::string> &Tokens) {
131131

132132
llvm::Expected<std::unique_ptr<FuzzySymbolIndex>>
133133
FuzzySymbolIndex::createFromYAML(StringRef FilePath) {
134-
auto Buffer = llvm::MemoryBuffer::getFile(FilePath);
134+
auto Buffer = llvm::MemoryBuffer::getFile(FilePath, /*IsText=*/true);
135135
if (!Buffer)
136136
return llvm::errorCodeToError(Buffer.getError());
137137
return std::make_unique<MemSymbolIndex>(

‎clang-tools-extra/clang-include-fixer/YamlSymbolIndex.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ namespace include_fixer {
2222

2323
llvm::ErrorOr<std::unique_ptr<YamlSymbolIndex>>
2424
YamlSymbolIndex::createFromFile(llvm::StringRef FilePath) {
25-
auto Buffer = llvm::MemoryBuffer::getFile(FilePath);
25+
auto Buffer = llvm::MemoryBuffer::getFile(FilePath, /*IsText=*/true);
2626
if (!Buffer)
2727
return Buffer.getError();
2828

‎clang-tools-extra/clang-include-fixer/find-all-symbols/tool/FindAllSymbolsMain.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ bool Merge(llvm::StringRef MergeDir, llvm::StringRef OutputFile) {
9595
// Parse YAML files in parallel.
9696
Pool.async(
9797
[&AddSymbols](std::string Path) {
98-
auto Buffer = llvm::MemoryBuffer::getFile(Path);
98+
auto Buffer = llvm::MemoryBuffer::getFile(Path, /*IsText=*/true);
9999
if (!Buffer) {
100100
llvm::errs() << "Can't open " << Path << "\n";
101101
return;
@@ -114,7 +114,7 @@ bool Merge(llvm::StringRef MergeDir, llvm::StringRef OutputFile) {
114114
}
115115
}
116116

117-
llvm::raw_fd_ostream OS(OutputFile, EC, llvm::sys::fs::OF_None);
117+
llvm::raw_fd_ostream OS(OutputFile, EC, llvm::sys::fs::OF_Text);
118118
if (EC) {
119119
llvm::errs() << "Can't open '" << OutputFile << "': " << EC.message()
120120
<< '\n';

‎clang-tools-extra/clang-include-fixer/tool/ClangIncludeFixer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -415,7 +415,7 @@ int includeFixerMain(int argc, const char **argv) {
415415
llvm::errs() << llvm::toString(InsertStyle.takeError()) << "\n";
416416
return 1;
417417
}
418-
auto Buffer = llvm::MemoryBuffer::getFile(FilePath);
418+
auto Buffer = llvm::MemoryBuffer::getFile(FilePath, /*IsText=*/true);
419419
if (!Buffer) {
420420
errs() << "Couldn't open file: " + FilePath.str() + ": "
421421
<< Buffer.getError().message() + "\n";

‎clang/docs/ReleaseNotes.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ C++ Specific Potentially Breaking Changes
4545
ABI Changes in This Version
4646
---------------------------
4747

48+
- Return larger CXX records in memory instead of using AVX registers. Code compiled with older clang will be incompatible with newer version of the clang unless -fclang-abi-compat=20 is provided. (#GH120670)
49+
4850
AST Dumping Potentially Breaking Changes
4951
----------------------------------------
5052

@@ -136,6 +138,7 @@ Bug Fixes to Compiler Builtins
136138

137139
Bug Fixes to Attribute Support
138140
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
141+
- Fixed crash when a parameter to the ``clang::annotate`` attribute evaluates to ``void``. See #GH119125
139142

140143
Bug Fixes to C++ Support
141144
^^^^^^^^^^^^^^^^^^^^^^^^

‎clang/include/clang/AST/Expr.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6678,7 +6678,6 @@ class PseudoObjectExpr final
66786678
class AtomicExpr : public Expr {
66796679
public:
66806680
enum AtomicOp {
6681-
#define BUILTIN(ID, TYPE, ATTRS)
66826681
#define ATOMIC_BUILTIN(ID, TYPE, ATTRS) AO ## ID,
66836682
#include "clang/Basic/Builtins.inc"
66846683
// Avoid trailing comma
@@ -6742,7 +6741,6 @@ class AtomicExpr : public Expr {
67426741
AtomicOp getOp() const { return Op; }
67436742
StringRef getOpAsString() const {
67446743
switch (Op) {
6745-
#define BUILTIN(ID, TYPE, ATTRS)
67466744
#define ATOMIC_BUILTIN(ID, TYPE, ATTRS) \
67476745
case AO##ID: \
67486746
return #ID;

0 commit comments

Comments
 (0)