Skip to content

Commit f801801

Browse files
SC llvm teamSC llvm team
authored andcommitted
Merged main:534c096ec9a6 into amd-gfx:c21ceacdbde5
Local branch amd-gfx c21ceac Merged main:186a4b3b6578 into amd-gfx:7ad30b56268e Remote branch main 534c096 [llvm-exegesis] Remove unused using decls (NFC)
2 parents c21ceac + 534c096 commit f801801

File tree

15 files changed

+3
-28
lines changed

15 files changed

+3
-28
lines changed

clang-tools-extra/clangd/unittests/ClangdLSPServerTests.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
namespace clang {
4545
namespace clangd {
4646
namespace {
47-
using llvm::Succeeded;
4847
using testing::ElementsAre;
4948

5049
MATCHER_P(diagMessage, M, "") {

clang-tools-extra/clangd/unittests/HeadersTests.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ namespace {
3333
using ::testing::AllOf;
3434
using ::testing::Contains;
3535
using ::testing::ElementsAre;
36-
using ::testing::Eq;
3736
using ::testing::IsEmpty;
3837
using ::testing::Not;
3938
using ::testing::UnorderedElementsAre;

clang-tools-extra/clangd/unittests/ParsedASTTests.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ using ::testing::Contains;
4747
using ::testing::ElementsAre;
4848
using ::testing::ElementsAreArray;
4949
using ::testing::IsEmpty;
50-
using ::testing::UnorderedElementsAreArray;
5150

5251
MATCHER_P(declNamed, Name, "") {
5352
if (NamedDecl *ND = dyn_cast<NamedDecl>(arg))

clang-tools-extra/clangd/unittests/PreambleTests.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,10 @@
4343
using testing::AllOf;
4444
using testing::Contains;
4545
using testing::ElementsAre;
46-
using testing::ElementsAreArray;
47-
using testing::Eq;
4846
using testing::Field;
49-
using testing::HasSubstr;
5047
using testing::IsEmpty;
5148
using testing::Matcher;
5249
using testing::MatchesRegex;
53-
using testing::Not;
5450
using testing::UnorderedElementsAre;
5551
using testing::UnorderedElementsAreArray;
5652

clang-tools-extra/clangd/unittests/TUSchedulerTests.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ namespace clang {
4949
namespace clangd {
5050
namespace {
5151

52-
using ::testing::_;
5352
using ::testing::AllOf;
5453
using ::testing::AnyOf;
5554
using ::testing::Contains;

clang-tools-extra/clangd/unittests/tweaks/DefineOutlineTests.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111
#include "gmock/gmock.h"
1212
#include "gtest/gtest.h"
1313

14-
using ::testing::ElementsAre;
15-
1614
namespace clang {
1715
namespace clangd {
1816
namespace {

clang-tools-extra/clangd/unittests/tweaks/DumpSymbolTests.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
#include <string>
1313

1414
using ::testing::AllOf;
15-
using ::testing::HasSubstr;
1615
using ::testing::StartsWith;
1716

1817
namespace clang {

libunwind/src/Unwind-sjlj.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,8 @@ struct _Unwind_FunctionContext {
8282
static _LIBUNWIND_THREAD_LOCAL struct _Unwind_FunctionContext *stack = NULL;
8383
#endif
8484

85-
static struct _Unwind_FunctionContext *__Unwind_SjLj_GetTopOfFunctionStack() {
85+
static struct _Unwind_FunctionContext *
86+
__Unwind_SjLj_GetTopOfFunctionStack(void) {
8687
#if defined(__APPLE__)
8788
return _pthread_getspecific_direct(__PTK_LIBC_DYLD_Unwind_SjLj_Key);
8889
#else

llvm/include/llvm/Config/llvm-config.h.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
/* Indicate that this is LLVM compiled from the amd-gfx branch. */
1818
#define LLVM_HAVE_BRANCH_AMD_GFX
19-
#define LLVM_MAIN_REVISION 475745
19+
#define LLVM_MAIN_REVISION 475748
2020

2121
/* Define if LLVM_ENABLE_DUMP is enabled */
2222
#cmakedefine LLVM_ENABLE_DUMP

llvm/unittests/tools/llvm-exegesis/AArch64/TargetTest.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ void InitializeAArch64ExegesisTarget();
2424

2525
namespace {
2626

27-
using testing::Gt;
2827
using testing::IsEmpty;
2928
using testing::Not;
3029
using testing::NotNull;

llvm/unittests/tools/llvm-exegesis/Mips/BenchmarkResultTest.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,7 @@
2020
#include "gmock/gmock.h"
2121
#include "gtest/gtest.h"
2222

23-
using ::testing::AllOf;
24-
using ::testing::Eq;
25-
using ::testing::get;
2623
using ::testing::Pointwise;
27-
using ::testing::Property;
2824

2925
using llvm::unittest::TempDir;
3026

llvm/unittests/tools/llvm-exegesis/X86/BenchmarkResultTest.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,9 @@
2020
#include "gtest/gtest.h"
2121

2222
using ::testing::AllOf;
23-
using ::testing::ElementsAre;
2423
using ::testing::Eq;
2524
using ::testing::Field;
26-
using ::testing::get;
2725
using ::testing::Pointwise;
28-
using ::testing::Property;
2926

3027
namespace llvm {
3128
namespace exegesis {

llvm/unittests/tools/llvm-exegesis/X86/SnippetFileTest.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,8 @@ void InitializeX86ExegesisTarget();
2828

2929
namespace {
3030

31-
using testing::AllOf;
3231
using testing::ElementsAre;
3332
using testing::Eq;
34-
using testing::Field;
3533
using testing::Property;
3634
using testing::SizeIs;
3735
using testing::UnorderedElementsAre;

llvm/unittests/tools/llvm-exegesis/X86/SnippetGeneratorTest.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,11 @@ namespace {
2727

2828
using testing::AnyOf;
2929
using testing::ElementsAre;
30-
using testing::Ge;
3130
using testing::Gt;
3231
using testing::HasSubstr;
3332
using testing::IsEmpty;
3433
using testing::Not;
3534
using testing::SizeIs;
36-
using testing::UnorderedElementsAre;
3735

3836
MATCHER(IsInvalid, "") { return !arg.isValid(); }
3937
MATCHER(IsReg, "") { return arg.isReg(); }

llvm/unittests/tools/llvm-exegesis/X86/TargetTest.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,9 @@ using testing::AllOf;
6060
using testing::ElementsAre;
6161
using testing::ElementsAreArray;
6262
using testing::Eq;
63-
using testing::Gt;
6463
using testing::IsEmpty;
6564
using testing::Matcher;
66-
using testing::NotNull;
6765
using testing::Property;
68-
using testing::SizeIs;
6966

7067
Matcher<MCOperand> IsImm(int64_t Value) {
7168
return AllOf(Property(&MCOperand::isImm, Eq(true)),

0 commit comments

Comments
 (0)