Skip to content

Commit 295fe33

Browse files
committed
Merge "merge main into amd-staging" into amd-staging
2 parents 2370736 + 702bf59 commit 295fe33

File tree

184 files changed

+3532
-4731
lines changed

Some content is hidden

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

184 files changed

+3532
-4731
lines changed

.github/dependabot.yml

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,19 @@
1-
version: 2
2-
updates:
3-
- package-ecosystem: "pip" # See documentation for possible values
4-
directory: "/amd/hipcc/docs/sphinx" # Location of package manifests
5-
open-pull-requests-limit: 10
6-
schedule:
7-
interval: "daily"
8-
labels:
9-
- "documentation"
10-
reviewers:
11-
- "samjwu"
1+
version: 2
2+
updates:
3+
- package-ecosystem: "github-actions"
4+
directory: "/"
5+
schedule:
6+
interval: "monthly"
7+
groups:
8+
github-actions:
9+
patterns:
10+
- "*"
11+
- package-ecosystem: "pip" # See documentation for possible values
12+
directory: "/amd/hipcc/docs/sphinx" # Location of package manifests
13+
open-pull-requests-limit: 10
14+
schedule:
15+
interval: "daily"
16+
labels:
17+
- "documentation"
18+
reviewers:
19+
- "samjwu"

.github/workflows/release-binaries.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737

3838
steps:
3939
- name: Checkout LLVM
40-
uses: actions/checkout@v4
40+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
4141

4242
- name: Validate and parse tag
4343
id: validate-tag
@@ -77,15 +77,15 @@ jobs:
7777
- ubuntu-22.04
7878
steps:
7979
- name: Checkout LLVM
80-
uses: actions/checkout@v4
80+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
8181
with:
8282
ref: ${{ needs.prepare.outputs.ref }}
8383

8484
- name: Install Ninja
85-
uses: llvm/actions/install-ninja@main
85+
uses: llvm/actions/install-ninja@22e9f909d35b50bd1181709564bfe816eaeaae81 # main
8686

8787
- name: Setup sccache
88-
uses: hendrikmuhs/ccache-action@v1
88+
uses: hendrikmuhs/ccache-action@ca3acd2731eef11f1572ccb126356c2f9298d35e # v1.2.9
8989
with:
9090
max-size: 250M
9191
key: sccache-${{ matrix.os }}-release
@@ -119,13 +119,13 @@ jobs:
119119
120120
steps:
121121
- name: Checkout LLVM
122-
uses: actions/checkout@v4
122+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
123123
with:
124124
ref: ${{ needs.prepare.outputs.ref }}
125125
path: ${{ needs.prepare.outputs.build-dir }}/llvm-project
126126

127127
- name: Setup sccache
128-
uses: hendrikmuhs/ccache-action@v1
128+
uses: hendrikmuhs/ccache-action@ca3acd2731eef11f1572ccb126356c2f9298d35e # v1.2.9
129129
with:
130130
max-size: 250M
131131
key: sccache-${{ matrix.target.os }}-release

.github/workflows/release-tasks.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
echo "release-version=$release_version" >> "$GITHUB_OUTPUT"
2626
2727
- name: Checkout LLVM
28-
uses: actions/checkout@v4
28+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
2929

3030
- name: Install Dependencies
3131
run: |
@@ -36,7 +36,7 @@ jobs:
3636
python3-github \
3737
ninja-build \
3838
texlive-font-utils
39-
pip3 install --user -r ./llvm/docs/requirements.txt
39+
pip3 install --user --require-hashes -r ./llvm/docs/requirements-hashed.txt
4040
4141
- name: Create Release
4242
run: |
@@ -48,14 +48,14 @@ jobs:
4848
./llvm/utils/release/github-upload-release.py --token ${{ github.token }} --release ${{ steps.validate-tag.outputs.release-version }} upload --files ./*doxygen*.tar.xz
4949
5050
- name: Create Release Notes Artifact
51-
uses: actions/upload-artifact@v3
51+
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
5252
with:
5353
name: release-notes
5454
path: docs-build/html-export/
5555

5656
- name: Clone www-releases
5757
if: ${{ !contains(steps.validate-tag.outputs.release-version, 'rc') }}
58-
uses: actions/checkout@v4
58+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
5959
with:
6060
repository: ${{ github.repository_owner }}/www-releases
6161
ref: main
@@ -79,10 +79,10 @@ jobs:
7979
if: github.repository == 'llvm/llvm-project'
8080
steps:
8181
- name: Checkout LLVM
82-
uses: actions/checkout@v4
82+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
8383

8484
- name: Setup Cpp
85-
uses: aminya/setup-cpp@v1
85+
uses: aminya/setup-cpp@6e563b8e5f796db317104d19605a414345807897 # v1
8686
with:
8787
compiler: llvm-16.0.6
8888
cmake: true
@@ -108,14 +108,14 @@ jobs:
108108
python3 setup.py sdist
109109
110110
- name: Upload lit to test.pypi.org
111-
uses: pypa/gh-action-pypi-publish@release/v1
111+
uses: pypa/gh-action-pypi-publish@2f6f737ca5f74c637829c0f5c3acd0e29ea5e8bf # release/v1
112112
with:
113113
password: ${{ secrets.LLVM_LIT_TEST_PYPI_API_TOKEN }}
114114
repository-url: https://test.pypi.org/legacy/
115115
packages-dir: llvm/utils/lit/dist/
116116

117117
- name: Upload lit to pypi.org
118-
uses: pypa/gh-action-pypi-publish@release/v1
118+
uses: pypa/gh-action-pypi-publish@2f6f737ca5f74c637829c0f5c3acd0e29ea5e8bf # release/v1
119119
with:
120120
password: ${{ secrets.LLVM_LIT_PYPI_API_TOKEN }}
121121
packages-dir: llvm/utils/lit/dist/

bolt/tools/bat-dump/bat-dump.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ static std::string GetExecutablePath(const char *Argv0) {
7575
if (llvm::ErrorOr<std::string> P =
7676
llvm::sys::findProgramByName(ExecutablePath))
7777
ExecutablePath = *P;
78-
return std::string(ExecutablePath.str());
78+
return std::string(ExecutablePath);
7979
}
8080

8181
void dumpBATFor(llvm::object::ELFObjectFileBase *InputFile) {

bolt/tools/driver/llvm-bolt.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ static std::string GetExecutablePath(const char *Argv0) {
174174
if (llvm::ErrorOr<std::string> P =
175175
llvm::sys::findProgramByName(ExecutablePath))
176176
ExecutablePath = *P;
177-
return std::string(ExecutablePath.str());
177+
return std::string(ExecutablePath);
178178
}
179179

180180
int main(int argc, char **argv) {

bolt/tools/heatmap/heatmap.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ static std::string GetExecutablePath(const char *Argv0) {
4646
if (llvm::ErrorOr<std::string> P =
4747
llvm::sys::findProgramByName(ExecutablePath))
4848
ExecutablePath = *P;
49-
return std::string(ExecutablePath.str());
49+
return std::string(ExecutablePath);
5050
}
5151

5252
int main(int argc, char **argv) {

clang-tools-extra/clang-tidy/readability/AvoidNestedConditionalOperatorCheck.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//===--- AvoidNestedConditionalOperatorCheck.cpp - clang-tidy ----------===//
1+
//===--- AvoidNestedConditionalOperatorCheck.cpp - clang-tidy -------------===//
22
//
33
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
44
// See https://llvm.org/LICENSE.txt for license information.

clang-tools-extra/modularize/ModularizeUtilities.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ std::error_code ModularizeUtilities::loadSingleHeaderListsAndDependencies(
195195
// Get canonical form.
196196
HeaderFileName = getCanonicalPath(HeaderFileName);
197197
// Save the resulting header file path and dependencies.
198-
HeaderFileNames.push_back(std::string(HeaderFileName.str()));
198+
HeaderFileNames.push_back(std::string(HeaderFileName));
199199
Dependencies[HeaderFileName.str()] = Dependents;
200200
}
201201
return std::error_code();
@@ -248,7 +248,7 @@ std::error_code ModularizeUtilities::loadProblemHeaderList(
248248
// Get canonical form.
249249
HeaderFileName = getCanonicalPath(HeaderFileName);
250250
// Save the resulting header file path.
251-
ProblemFileNames.push_back(std::string(HeaderFileName.str()));
251+
ProblemFileNames.push_back(std::string(HeaderFileName));
252252
}
253253
return std::error_code();
254254
}

clang/docs/ReleaseNotes.rst

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -240,11 +240,6 @@ C Language Changes
240240
- Enums will now be represented in TBAA metadata using their actual underlying
241241
integer type. Previously they were treated as chars, which meant they could
242242
alias with all other types.
243-
- Clang now supports the C-only attribute ``counted_by``. When applied to a
244-
struct's flexible array member, it points to the struct field that holds the
245-
number of elements in the flexible array member. This information can improve
246-
the results of the array bound sanitizer and the
247-
``__builtin_dynamic_object_size`` builtin.
248243

249244
C23 Feature Support
250245
^^^^^^^^^^^^^^^^^^^

clang/include/clang/AST/DeclBase.h

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
#include "clang/AST/SelectorLocationsKind.h"
2020
#include "clang/Basic/IdentifierTable.h"
2121
#include "clang/Basic/LLVM.h"
22-
#include "clang/Basic/LangOptions.h"
2322
#include "clang/Basic/SourceLocation.h"
2423
#include "clang/Basic/Specifiers.h"
2524
#include "llvm/ADT/ArrayRef.h"
@@ -489,15 +488,6 @@ class alignas(8) Decl {
489488
// Return true if this is a FileContext Decl.
490489
bool isFileContextDecl() const;
491490

492-
/// Whether it resembles a flexible array member. This is a static member
493-
/// because we want to be able to call it with a nullptr. That allows us to
494-
/// perform non-Decl specific checks based on the object's type and strict
495-
/// flex array level.
496-
static bool isFlexibleArrayMemberLike(
497-
ASTContext &Context, const Decl *D, QualType Ty,
498-
LangOptions::StrictFlexArraysLevelKind StrictFlexArraysLevel,
499-
bool IgnoreTemplateOrMacroSubstitution);
500-
501491
ASTContext &getASTContext() const LLVM_READONLY;
502492

503493
/// Helper to get the language options from the ASTContext.

0 commit comments

Comments
 (0)