Change type of DiagnosticHandlerTy#86504
Conversation
|
@llvm/pr-subscribers-llvm-support @llvm/pr-subscribers-lto Author: Abhin P Jose (Abhinkop) ChangesChanging type of DiagnosticHandlerTy due to adding -Wcast-function-type-mismatch to -Wextra group(#86131 (comment)). Changed the reference argument DiagnosticInfo to a pointer and edited the test cases failing due to this change. Added another small change where Gtest api was throwing an warning due varargs argument not being passed. Full diff: https://github.com/llvm/llvm-project/pull/86504.diff 3 Files Affected:
diff --git a/llvm/include/llvm/IR/DiagnosticHandler.h b/llvm/include/llvm/IR/DiagnosticHandler.h
index db7d7444f75f05..aa1e4d14e82b61 100644
--- a/llvm/include/llvm/IR/DiagnosticHandler.h
+++ b/llvm/include/llvm/IR/DiagnosticHandler.h
@@ -28,7 +28,7 @@ struct DiagnosticHandler {
: DiagnosticContext(DiagContext) {}
virtual ~DiagnosticHandler() = default;
- using DiagnosticHandlerTy = void (*)(const DiagnosticInfo &DI, void *Context);
+ using DiagnosticHandlerTy = void (*)(const DiagnosticInfo* DI, void *Context);
/// DiagHandlerCallback is settable from the C API and base implementation
/// of DiagnosticHandler will call it from handleDiagnostics(). Any derived
@@ -42,7 +42,7 @@ struct DiagnosticHandler {
/// with a prefix based on the severity.
virtual bool handleDiagnostics(const DiagnosticInfo &DI) {
if (DiagHandlerCallback) {
- DiagHandlerCallback(DI, DiagnosticContext);
+ DiagHandlerCallback(&DI, DiagnosticContext);
return true;
}
return false;
diff --git a/llvm/unittests/Linker/LinkModulesTest.cpp b/llvm/unittests/Linker/LinkModulesTest.cpp
index 182ce73178c1d4..884e20e89c5c2f 100644
--- a/llvm/unittests/Linker/LinkModulesTest.cpp
+++ b/llvm/unittests/Linker/LinkModulesTest.cpp
@@ -72,7 +72,7 @@ class LinkModuleTest : public testing::Test {
BasicBlock *ExitBB;
};
-static void expectNoDiags(const DiagnosticInfo &DI, void *C) {
+static void expectNoDiags(const DiagnosticInfo *DI, void *C) {
llvm_unreachable("expectNoDiags called!");
}
diff --git a/llvm/unittests/Support/ThreadPool.cpp b/llvm/unittests/Support/ThreadPool.cpp
index d74c625d122950..381b4fc2a26b8e 100644
--- a/llvm/unittests/Support/ThreadPool.cpp
+++ b/llvm/unittests/Support/ThreadPool.cpp
@@ -126,7 +126,7 @@ using ThreadPoolImpls = ::testing::Types<
#endif
SingleThreadExecutor>;
-TYPED_TEST_SUITE(ThreadPoolTest, ThreadPoolImpls);
+TYPED_TEST_SUITE(ThreadPoolTest, ThreadPoolImpls, );
#define CHECK_UNSUPPORTED() \
do { \
|
|
✅ With the latest revision this PR passed the Python code formatter. |
|
✅ With the latest revision this PR passed the C/C++ code formatter. |
|
|
||
| using DiagnosticHandlerTy = void (*)(const DiagnosticInfo &DI, void *Context); | ||
| using DiagnosticHandlerTy = void (*)(const DiagnosticInfo *DI, void *Context); | ||
|
|
There was a problem hiding this comment.
I am not sure if this change will break some other projects.
There was a problem hiding this comment.
If no one has any further comments, this LGTM and resolves the stage 2 bootstrap issue on the ppc64le-lld-multistage-test bot within my local testing.
|
@AaronBallman @amy-kwan Can we merge it? I'll watch the issue for a couple of days for any fallout breakages. |
Yes, I am OK if we merge this. LGTM. |
Newer versions of clang include -Wcast-function-type-mismatch in -Wextra, which triggers a warning when we cast between function pointers that differ between a pointer and a reference in an argument. Resolve this by making the types consistent. This change is equivalent to llvm/llvm-project#86504 from upstream.
Newer versions of clang include -Wcast-function-type-mismatch in -Wextra, which triggers a warning when we cast between function pointers that differ between a pointer and a reference in an argument. Resolve this by making the types consistent. This change is equivalent to llvm/llvm-project#86504 from upstream. (cherry picked from commit b05a11a)
Changing type of DiagnosticHandlerTy due to adding -Wcast-function-type-mismatch to -Wextra group(#86131 (comment)). Changed the reference argument DiagnosticInfo to a pointer and edited the test cases failing due to this change. Added another small change where Gtest api was throwing an warning due varargs argument not being passed.