Skip to content

Commit b7a60f9

Browse files
SC llvm teamSC llvm team
authored andcommitted
Merged main:74df2032d467 into origin/amd-gfx:6caae3dff80a
Local branch origin/amd-gfx 6caae3d Merged main:e122483762b4 into origin/amd-gfx:7bfad56fcee3 Remote branch main 74df203 [Github] Bump old action versions (llvm#129833)
2 parents 6caae3d + 74df203 commit b7a60f9

File tree

154 files changed

+2381
-2244
lines changed

Some content is hidden

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

154 files changed

+2381
-2244
lines changed

.github/workflows/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
fetch-depth: 1
6666
- name: Get subprojects that have doc changes
6767
id: docs-changed-subprojects
68-
uses: tj-actions/changed-files@fea790cb660e33aef4bdf07304e28fedd77dfa13 # v39.2.4
68+
uses: tj-actions/changed-files@dcc7a0cba800f454d79fff4b993e8c3555bcc0a8 # v45.0.7
6969
with:
7070
files_yaml: |
7171
llvm:

.github/workflows/issue-write.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939

4040
- name: 'Comment on PR'
4141
if: steps.download-artifact.outputs.artifact-id != ''
42-
uses: actions/github-script@ffc2c79a5b2490bd33e0a41c1de74b877714d736 # v3.2.0
42+
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
4343
with:
4444
github-token: ${{ secrets.GITHUB_TOKEN }}
4545
script: |

clang/include/clang/Tooling/DependencyScanning/DependencyScanningService.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,11 @@ enum class ScanningOptimizations {
6767
IgnoreCWD = (1 << 4),
6868

6969
DSS_LAST_BITMASK_ENUM(IgnoreCWD),
70-
Default = All
70+
71+
// The build system needs to be aware that the current working
72+
// directory is ignored. Without a good way of notifying the build
73+
// system, it is less risky to default to off.
74+
Default = All & (~IgnoreCWD)
7175
};
7276

7377
#undef DSS_LAST_BITMASK_ENUM

clang/lib/AST/ByteCode/Interp.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -714,6 +714,9 @@ bool CheckCallable(InterpState &S, CodePtr OpPC, const Function *F) {
714714
return false;
715715
}
716716

717+
if (S.checkingPotentialConstantExpression() && S.Current->getDepth() != 0)
718+
return false;
719+
717720
if (F->isConstexpr() && F->hasBody() &&
718721
(F->getDecl()->isConstexpr() || F->getDecl()->hasAttr<MSConstexprAttr>()))
719722
return true;

clang/lib/Tooling/DependencyScanning/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
set(LLVM_LINK_COMPONENTS
2-
${LLVM_TARGETS_TO_BUILD}
32
Core
43
Option
54
Support

clang/lib/Tooling/DependencyScanning/DependencyScanningService.cpp

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
//===----------------------------------------------------------------------===//
88

99
#include "clang/Tooling/DependencyScanning/DependencyScanningService.h"
10-
#include "llvm/Support/TargetSelect.h"
1110

1211
using namespace clang;
1312
using namespace tooling;
@@ -17,10 +16,4 @@ DependencyScanningService::DependencyScanningService(
1716
ScanningMode Mode, ScanningOutputFormat Format,
1817
ScanningOptimizations OptimizeArgs, bool EagerLoadModules, bool TraceVFS)
1918
: Mode(Mode), Format(Format), OptimizeArgs(OptimizeArgs),
20-
EagerLoadModules(EagerLoadModules), TraceVFS(TraceVFS) {
21-
// Initialize targets for object file support.
22-
llvm::InitializeAllTargets();
23-
llvm::InitializeAllTargetMCs();
24-
llvm::InitializeAllAsmPrinters();
25-
llvm::InitializeAllAsmParsers();
26-
}
19+
EagerLoadModules(EagerLoadModules), TraceVFS(TraceVFS) {}

clang/test/AST/ByteCode/functions.cpp

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -681,3 +681,16 @@ namespace StableAddress {
681681
static_assert(sum<str{"$hello $world."}>() == 1234, "");
682682
}
683683
#endif
684+
685+
namespace NoDiags {
686+
void huh();
687+
template <unsigned>
688+
constexpr void hd_fun() {
689+
huh();
690+
}
691+
692+
constexpr bool foo() {
693+
hd_fun<1>();
694+
return true;
695+
}
696+
}

clang/test/ClangScanDeps/modules-context-hash-cwd.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99
// RUN: sed -e "s|DIR|%/t|g" %t/cdb3.json.in > %t/cdb3.json
1010
// RUN: sed -e "s|DIR|%/t|g" %t/cdb4.json.in > %t/cdb4.json
1111
// RUN: sed -e "s|DIR|%/t|g" %t/cdb5.json.in > %t/cdb5.json
12-
// RUN: clang-scan-deps -compilation-database %t/cdb0.json -format experimental-full > %t/result0.json
13-
// RUN: clang-scan-deps -compilation-database %t/cdb1.json -format experimental-full > %t/result1.json
12+
// RUN: clang-scan-deps -compilation-database %t/cdb0.json -format experimental-full -optimize-args=all > %t/result0.json
13+
// RUN: clang-scan-deps -compilation-database %t/cdb1.json -format experimental-full -optimize-args=all > %t/result1.json
1414
// It is not a typo to use cdb1.json for result2. We intend to use the same
1515
// compilation database, but different clang-scan-deps optimize-args options.
1616
// RUN: clang-scan-deps -compilation-database %t/cdb1.json -format experimental-full -optimize-args=header-search,system-warnings,vfs,canonicalize-macros > %t/result2.json
17-
// RUN: clang-scan-deps -compilation-database %t/cdb3.json -format experimental-full > %t/result3.json
18-
// RUN: clang-scan-deps -compilation-database %t/cdb4.json -format experimental-full > %t/result4.json
19-
// RUN: clang-scan-deps -compilation-database %t/cdb5.json -format experimental-full > %t/result5.json
17+
// RUN: clang-scan-deps -compilation-database %t/cdb3.json -format experimental-full -optimize-args=all > %t/result3.json
18+
// RUN: clang-scan-deps -compilation-database %t/cdb4.json -format experimental-full -optimize-args=all > %t/result4.json
19+
// RUN: clang-scan-deps -compilation-database %t/cdb5.json -format experimental-full -optimize-args=all > %t/result5.json
2020
// RUN: cat %t/result0.json %t/result1.json | FileCheck %s
2121
// RUN: cat %t/result0.json %t/result2.json | FileCheck %s -check-prefix=SKIPOPT
2222
// RUN: cat %t/result3.json %t/result4.json | FileCheck %s -check-prefix=RELPATH

clang/test/ClangScanDeps/modules-debug-dir.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// RUN: split-file %s %t
55
// RUN: sed -e "s|DIR|%/t|g" %t/cdb.json.in > %t/cdb.json
66
// RUN: clang-scan-deps -compilation-database %t/cdb.json -format \
7-
// RUN: experimental-full > %t/result.json
7+
// RUN: experimental-full -optimize-args=all > %t/result.json
88
// RUN: cat %t/result.json | sed 's:\\\\\?:/:g' | FileCheck %s
99

1010
//--- cdb.json.in

compiler-rt/lib/ctx_profile/CtxInstrContextNode.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,14 @@ class ContextNode final {
114114
};
115115

116116
/// Abstraction for the parameter passed to `__llvm_ctx_profile_fetch`.
117+
/// `startContextSection` is called before any context roots are sent for
118+
/// writing. Then one or more `writeContextual` calls are made; finally,
119+
/// `endContextSection` is called.
117120
class ProfileWriter {
118121
public:
122+
virtual void startContextSection() = 0;
119123
virtual void writeContextual(const ctx_profile::ContextNode &RootNode) = 0;
124+
virtual void endContextSection() = 0;
120125
virtual ~ProfileWriter() = default;
121126
};
122127
} // namespace ctx_profile

0 commit comments

Comments
 (0)