Skip to content

Commit ed19250

Browse files
authored
Merge branch 'main' into size
2 parents 8bf9947 + 8bfb54b commit ed19250

File tree

4 files changed

+11
-1
lines changed

4 files changed

+11
-1
lines changed

llvm/lib/Target/AMDGPU/SIMachineFunctionInfo.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ using namespace llvm;
3333
// optimal RC for Opc and Dest of MFMA. In particular, there are high RP cases
3434
// where it is better to produce the VGPR form (e.g. if there are VGPR users
3535
// of the MFMA result).
36-
cl::opt<bool> MFMAVGPRForm(
36+
static cl::opt<bool> MFMAVGPRForm(
3737
"amdgpu-mfma-vgpr-form", cl::Hidden,
3838
cl::desc("Whether to force use VGPR for Opc and Dest of MFMA. If "
3939
"unspecified, default to compiler heuristics"),

llvm/utils/gn/secondary/clang-tools-extra/clangd/unittests/BUILD.gn

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ unittest("ClangdTests") {
108108
"SourceCodeTests.cpp",
109109
"StdLibTests.cpp",
110110
"SymbolCollectorTests.cpp",
111+
"SymbolDocumentationTests.cpp",
111112
"SymbolInfoTests.cpp",
112113
"SyncAPI.cpp",
113114
"TUSchedulerTests.cpp",

llvm/utils/gn/secondary/clang/unittests/Interpreter/BUILD.gn

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,11 @@ unittest("ClangReplInterpreterTests") {
2727
ldflags = [ "-rdynamic" ]
2828
}
2929
}
30+
31+
# FIXME: This is included conditionally in the CMake build if
32+
# compiler-rt is available. The test currently fails in the GN
33+
# build. Figure out if we can get it to pass.
34+
group("dummy_sources") {
35+
sources = [ "OutOfProcessInterpreterTests.cpp" ]
36+
not_needed(sources)
37+
}

llvm/utils/gn/secondary/lldb/tools/lldb-dap/BUILD.gn

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ static_library("lib") {
7272
"LLDBUtils.cpp",
7373
"OutputRedirector.cpp",
7474
"ProgressEvent.cpp",
75+
"Protocol/DAPTypes.cpp",
7576
"Protocol/ProtocolBase.cpp",
7677
"Protocol/ProtocolEvents.cpp",
7778
"Protocol/ProtocolRequests.cpp",

0 commit comments

Comments
 (0)