Moving ICC pybind#2196 suppression to CMakeLists.txt

Author: rwgk

include/pybind11/pybind11.h

@@ -13,10 +13,7 @@
 //
 // THE `push` HERE NEED TO BE KEPT IN SYNC WITH THE CORRESPONDING `pop` AT THE BOTTOM OF THIS FILE.
 //
-#if defined(__INTEL_COMPILER)
-#  pragma warning push
-#  pragma warning disable 2196  // warning #2196: routine is both "inline" and "noinline"
-#elif defined(_MSC_VER)
+#if defined(_MSC_VER)
 #  pragma warning(push)
 #  pragma warning(disable: 4100) // warning C4100: Unreferenced formal parameter
 #  pragma warning(disable: 4127) // warning C4127: Conditional expression is constant
@@ -2381,9 +2378,7 @@ PYBIND11_NAMESPACE_END(PYBIND11_NAMESPACE)
 //
 // THE `pop` HERE NEED TO BE KEPT IN SYNC WITH THE CORRESPONDING `push` AT THE TOP OF THIS FILE.
 //
-#if defined(__INTEL_COMPILER)
-#    pragma warning pop
-#elif defined(_MSC_VER)
+#if defined(_MSC_VER)
 #    pragma warning(pop)
 #elif defined(__GNUG__) && !defined(__clang__) && !defined(__INTEL_COMPILER)
 #    pragma GCC diagnostic pop

tests/CMakeLists.txt

@@ -310,8 +310,13 @@ function(pybind11_enable_warnings target_name)
         ${target_name}
         PRIVATE
           -Werror-all
-          # "Inlining inhibited by limit max-size", "Inlining inhibited by limit max-total-size"
-          -diag-disable 11074,11076)
+          # 2196: routine is both "inline" and "noinline" (no way to `pop` and not get the warning:
+          #       https://community.intel.com/t5/Intel-C-Compiler/Inline-and-no-inline-warning/td-p/1216764)
+          # 11074: Inlining inhibited by limit max-size
+          # 11074: Inlining inhibited by limit max-total-size
+          # 11076: To get full report use -qopt-report=4 -qopt-report-phase ipo
+          -diag-disable
+          2196,11074,11076)
     endif()
   endif()
 

tests/constructor_stats.h

@@ -70,11 +70,6 @@ inspection/testing in python) by using the functions with `print_` replaced with
 #include <typeindex>
 #include <sstream>
 
-#if defined(__INTEL_COMPILER)
-#    pragma warning push
-#    pragma warning disable 2196 // warning #2196: routine is both "inline" and "noinline"
-#endif
-
 class ConstructorStats {
 protected:
     std::unordered_map<void*, int> _instances; // Need a map rather than set because members can shared address with parents
@@ -278,7 +273,3 @@ template <class T, typename... Values> void print_values(T *inst, Values &&...va
     print_constr_details(inst, ":", values...);
     track_values(inst, values...);
 }
-
-#if defined(__INTEL_COMPILER)
-#    pragma warning pop
-#endif

tests/pybind11_cross_module_tests.cpp

@@ -16,11 +16,6 @@
 #include <numeric>
 #include <utility>
 
-#if defined(__INTEL_COMPILER)
-#    pragma warning push
-#    pragma warning disable 2196 // warning #2196: routine is both "inline" and "noinline"
-#endif
-
 PYBIND11_MODULE(pybind11_cross_module_tests, m) {
     m.doc() = "pybind11 cross-module test module";
 
@@ -154,7 +149,3 @@ PYBIND11_MODULE(pybind11_cross_module_tests, m) {
     m.def("missing_header_arg", [](const std::vector<float> &) {});
     m.def("missing_header_return", []() { return std::vector<float>(); });
 }
-
-#if defined(__INTEL_COMPILER)
-#    pragma warning pop
-#endif

tests/pybind11_tests.cpp

@@ -13,11 +13,6 @@
 #include <functional>
 #include <list>
 
-#if defined(__INTEL_COMPILER)
-#    pragma warning push
-#    pragma warning disable 2196 // warning #2196: routine is both "inline" and "noinline"
-#endif
-
 /*
 For testing purposes, we define a static global variable here in a function that each individual
 test .cpp calls with its initialization lambda.  It's convenient here because we can just not
@@ -94,7 +89,3 @@ PYBIND11_MODULE(pybind11_tests, m) {
     for (const auto &initializer : initializers())
         initializer(m);
 }
-
-#if defined(__INTEL_COMPILER)
-#    pragma warning pop
-#endif

tests/pybind11_tests.h

@@ -10,9 +10,6 @@
 // We get some really long type names here which causes MSVC 2015 to emit warnings
 #    pragma warning(                                                                              \
         disable : 4503) // warning C4503: decorated name length exceeded, name was truncated
-#elif defined(__INTEL_COMPILER)
-#    pragma warning push
-#    pragma warning disable 2196 // warning #2196: routine is both "inline" and "noinline"
 #endif
 
 namespace py = pybind11;
@@ -90,9 +87,3 @@ void ignoreOldStyleInitWarnings(F &&body) {
         body()
     )", py::dict(py::arg("body") = py::cpp_function(body)));
 }
-
-#if defined(_MSC_VER) && _MSC_VER < 1910
-#    pragma warning(pop)
-#elif defined(__INTEL_COMPILER)
-#    pragma warning pop
-#endif