Only ignore -Wdeprecated-copy if the used compiler supports the warning

[uabelho]

Summary

This is needed after

https://reviews.llvm.org/rG9658d045926545e62cc3f963fe611d7c5d0c9d98

which introduced code that at least didn't compile clean with clang 8.

[xbolva00]

Thanks

[uabelho]

In D101288#2716450, @xbolva00 wrote:

Thanks

Would you mind submitting it if you think it's correct? @xbolva00

[xbolva00]

In D101288#2716457, @uabelho wrote:

In D101288#2716450, @xbolva00 wrote:

Thanks

Would you mind submitting it if you think it's correct? @xbolva00

Ok

[Conanap]

Hello,

This patch seems to upset the PowerPC compilers:

In file included from /home/buildbots/ppc64le-lld-multistage-test/ppc64le-lld-multistage-test/llvm-project/llvm/unittests/Support/YAMLIOTest.cpp:18:
/home/buildbots/ppc64le-lld-multistage-test/ppc64le-lld-multistage-test/llvm-project/llvm/utils/unittest/googlemock/include/gmock/gmock.h:58:40: error: missing binary operator before token "("
 #if defined(__clang__) && __has_warning("-Wdeprecated-copy")

Buildbot in question: https://lab.llvm.org/buildbot/#/builders/36/builds/7742

[xbolva00]

This has issue (error: missing binary operator before token "(") on GCC, I trusted and thought you checked it if it builds fine.

Try:

#if defined(__clang__) 
#if __has_warning("-Wdeprecated-copy")
#endif
#endif

I am not gonna spend my time on this deprecated-copy hell anymore. Public bots are ok, you use clang 8, so please try again & commit by yourself.

[jpienaar]

This seems to have broken gcc builds - https://buildkite.com/mlir/mlir-core/builds/13292#e38ea533-d197-46bc-b5c2-d6a42da9110f

[uabelho]

Use
#ifdef clang
#if has_warning("-Wdeprecated-copy")
instead of
#if defined(clang) && has_warning("-Wdeprecated-copy")
as the latter seems to break gcc bots.

[uabelho]

In D101288#2716923, @uabelho wrote:

Use
#ifdef clang
#if has_warning("-Wdeprecated-copy")
instead of
#if defined(clang) && has_warning("-Wdeprecated-copy")
as the latter seems to break gcc bots.

I have no idea if this is the best fix but it works for me with clang 8 and gcc 9.3.0.

[uabelho]

If you don't want to review this fix of your patch https://reviews.llvm.org/rG9658d045926545e62cc3f963fe611d7c5d0c9d98 then please add someone who can.

Thanks.

[xbolva00]

In D101288#2716930, @uabelho wrote:

In D101288#2716923, @uabelho wrote:

Use
#ifdef clang
#if has_warning("-Wdeprecated-copy")
instead of
#if defined(clang) && has_warning("-Wdeprecated-copy")
as the latter seems to break gcc bots.

I have no idea if this is the best fix but it works for me with clang 8 and gcc 9.3.0.

Best fix is remove all deprecated things but yeah, for now this is ok.

[uabelho]

In D101288#2717045, @xbolva00 wrote:

In D101288#2716930, @uabelho wrote:

In D101288#2716923, @uabelho wrote:

Use
#ifdef clang
#if has_warning("-Wdeprecated-copy")
instead of
#if defined(clang) && has_warning("-Wdeprecated-copy")
as the latter seems to break gcc bots.

I have no idea if this is the best fix but it works for me with clang 8 and gcc 9.3.0.

Best fix is remove all deprecated things but yeah, for now this is ok.

Ok, pushed a new attempt to fix the problem in
https://reviews.llvm.org/rG33f04e485c7d95626e12aa522b09cc81109fc6ab

llvm/utils/unittest/googlemock/include/gmock/gmock-matchers.h

 #include "gmock/internal/gmock-port.h"
 #include "gtest/gtest.h"
 
 #if GTEST_HAS_STD_INITIALIZER_LIST_
 # include <initializer_list>  // NOLINT -- must be after gtest.h
 #endif
 
 #ifdef __clang__
+#if __has_warning("-Wdeprecated-copy")
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-copy"
 #endif
+#endif
 
 namespace testing {
 
 // To implement a matcher Foo for type T, define:
 //   1. a class FooMatcherImpl that implements the
 //      MatcherInterface<T> interface, and
 //   2. a factory function that creates a Matcher<T> object from a
 //      FooMatcherImpl*.

 #define ASSERT_THAT(value, matcher) ASSERT_PRED_FORMAT1(\
     ::testing::internal::MakePredicateFormatterFromMatcher(matcher), value)
 #define EXPECT_THAT(value, matcher) EXPECT_PRED_FORMAT1(\
     ::testing::internal::MakePredicateFormatterFromMatcher(matcher), value)
 
 }  // namespace testing
 
 #ifdef __clang__
+#if __has_warning("-Wdeprecated-copy")
 #pragma clang diagnostic pop
 #endif
+#endif
 
 // Include any custom callback matchers added by the local installation.
 // We must include this header at the end to make sure it can use the
 // declarations from this file.
 #include "gmock/internal/custom/gmock-matchers.h"
 #endif  // GMOCK_INCLUDE_GMOCK_GMOCK_MATCHERS_H_

llvm/utils/unittest/googlemock/include/gmock/gmock.h

 //     .InSequence(...) *
 //     .WillOnce(...) *
 //     .WillRepeatedly(...) ?
 //     .RetiresOnSaturation() ? ;
 //
 // where all clauses are optional and WillOnce() can be repeated.
 
 #ifdef __clang__
+#if __has_warning("-Wdeprecated-copy")
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-copy"
 #endif
+#endif
 
 #include "gmock/gmock-actions.h"
 #include "gmock/gmock-cardinalities.h"
 #include "gmock/gmock-generated-actions.h"
 #include "gmock/gmock-generated-function-mockers.h"
 #include "gmock/gmock-generated-nice-strict.h"
 #include "gmock/gmock-generated-matchers.h"
 #include "gmock/gmock-matchers.h"

 
 // This overloaded version can be used in Windows programs compiled in
 // UNICODE mode.
 GTEST_API_ void InitGoogleMock(int* argc, wchar_t** argv);
 
 }  // namespace testing
 
 #ifdef __clang__
+#if __has_warning("-Wdeprecated-copy")
 #pragma clang diagnostic pop
 #endif
+#endif
 #endif  // GMOCK_INCLUDE_GMOCK_GMOCK_H_

llvm/utils/unittest/googletest/include/gtest/internal/gtest-param-util-generated.h

 // *unconditionally*.  Therefore these #includes cannot be moved
 // inside #if GTEST_HAS_PARAM_TEST.
 #include "gtest/internal/gtest-param-util.h"
 #include "gtest/internal/gtest-port.h"
 
 #if GTEST_HAS_PARAM_TEST
 
 #ifdef __clang__
+#if __has_warning("-Wdeprecated-copy")
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-copy"
 #endif
+#endif
 
 namespace testing {
 
 // Forward declarations of ValuesIn(), which is implemented in
 // include/gtest/gtest-param-test.h.
 template <typename ForwardIterator>
 internal::ParamGenerator<
   typename ::testing::internal::IteratorTraits<ForwardIterator>::value_type>

 };  // class CartesianProductHolder10
 
 # endif  // GTEST_HAS_COMBINE
 
 }  // namespace internal
 }  // namespace testing
 
 #ifdef __clang__
+#if __has_warning("-Wdeprecated-copy")
 #pragma clang diagnostic pop
 #endif
+#endif
 
 #endif  //  GTEST_HAS_PARAM_TEST
 
 #endif  // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PARAM_UTIL_GENERATED_H_