Fix and unset "-Wno-nan-infinity-disabled"

daschuer · Nov 14, 2024 · 1e8d32a · 1e8d32a
1 parent 028e3ff
commit 1e8d32a
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 25 deletions.
diff --git a/.github/workflows/build-checks.yml b/.github/workflows/build-checks.yml
@@ -68,8 +68,6 @@ jobs:
           CXX: clazy
       - name: Configure (clang-tidy)
         if: matrix.name == 'clang-tidy'
-        # Our code contains the use of infinity(), which Clang >= 18 reports
-        # as error, if you compile with -fast-math
         run: |
           cmake \
             -DCMAKE_BUILD_TYPE=Debug \
@@ -90,7 +88,6 @@ jobs:
             -DMAD=ON \
             -DMODPLUG=ON \
             -DWAVPACK=ON \
-            -DCMAKE_CXX_FLAGS="-Wno-nan-infinity-disabled" \
             ..
         working-directory: build
         env:

diff --git a/src/test/durationutiltest.cpp b/src/test/durationutiltest.cpp
@@ -1,10 +1,10 @@
-#include <limits>
-
 #include <gtest/gtest.h>
 
-#include "util/duration.h"
-
 #include <QtDebug>
+#include <limits>
+
+#include "util/duration.h"
+#include "util/fpclassify.h"
 
 namespace {
 
@@ -115,9 +115,7 @@ TEST_F(DurationUtilTest, formatTime) {
     formatTime("24:00:00.000", 24 * 3600);
     formatTime("24:00:01.000", 24 * 3600 + 1);
     formatTime("25:00:01.000", 25 * 3600 + 1);
-    // If you change the following line, check if it solves #13780,
-    // and allows to remove -Wno-nan-infinity-disabled from the clang-tidy call
-    formatTime("?", std::numeric_limits<double>::infinity());
+    formatTime("?", util_double_infinity());
     formatTime("?", -1);
 }
 

diff --git a/src/test/frametest.cpp b/src/test/frametest.cpp
@@ -3,6 +3,7 @@
 #include <QDebug>
 
 #include "audio/frame.h"
+#include "util/fpclassify.h"
 
 class FrameTest : public testing::Test {
 };
@@ -18,9 +19,7 @@ TEST_F(FrameTest, TestFramePosValid) {
     // Denormals
     EXPECT_TRUE(mixxx::audio::FramePos(0.0).isValid());
     EXPECT_TRUE(mixxx::audio::FramePos(std::numeric_limits<double>::min() / 2.0).isValid());
-    // If you change the following line, check if it solves #13780,
-    // and allows to remove -Wno-nan-infinity-disabled from the clang-tidy call
-    EXPECT_FALSE(mixxx::audio::FramePos(std::numeric_limits<double>::infinity()).isValid());
+    EXPECT_FALSE(mixxx::audio::FramePos(util_double_infinity()).isValid());
     // NaN
     EXPECT_FALSE(mixxx::audio::FramePos().isValid());
     EXPECT_FALSE(mixxx::audio::FramePos(std::numeric_limits<double>::quiet_NaN()).isValid());
@@ -55,19 +54,13 @@ TEST_F(FrameTest, TestFramePosEquality) {
     EXPECT_EQ(mixxx::audio::FramePos(),
             mixxx::audio::FramePos(std::numeric_limits<
                     mixxx::audio::FramePos::value_t>::quiet_NaN()));
-    // If you change the following 3 tests, check if it solves #13780,
-    // and allows to remove -Wno-nan-infinity-disabled from the clang-tidy call
     EXPECT_EQ(mixxx::audio::FramePos(),
-            mixxx::audio::FramePos(std::numeric_limits<
-                    mixxx::audio::FramePos::value_t>::infinity()));
+            mixxx::audio::FramePos(util_double_infinity()));
     EXPECT_EQ(mixxx::audio::FramePos(),
-            mixxx::audio::FramePos(
-                    -std::numeric_limits<
-                            mixxx::audio::FramePos::value_t>::infinity()));
+            mixxx::audio::FramePos(-util_double_infinity()));
     EXPECT_EQ(mixxx::audio::FramePos(std::numeric_limits<
                       mixxx::audio::FramePos::value_t>::quiet_NaN()),
-            mixxx::audio::FramePos(std::numeric_limits<
-                    mixxx::audio::FramePos::value_t>::infinity()));
+            mixxx::audio::FramePos(util_double_infinity()));
 }
 
 TEST_F(FrameTest, LowerFrameBoundary) {

diff --git a/src/test/mathutiltest.cpp b/src/test/mathutiltest.cpp
@@ -1,9 +1,9 @@
 #include <gtest/gtest.h>
 
 #include <QtDebug>
-#include <limits>
 
 #include "util/denormalsarezero.h"
+#include "util/fpclassify.h"
 #include "util/math.h"
 
 namespace {
@@ -51,11 +51,11 @@ TEST_F(MathUtilTest, IsNaN) {
 TEST_F(MathUtilTest, IsInf) {
     // Test floats can be recognized as infinity.
     EXPECT_FALSE(util_isinf(0.0f));
-    EXPECT_TRUE(util_isinf(std::numeric_limits<float>::infinity()));
+    EXPECT_TRUE(util_isinf(util_float_infinity()));
 
     // Test doubles can be recognized as infinity.
     EXPECT_FALSE(util_isinf(0.0f));
-    EXPECT_TRUE(util_isinf(std::numeric_limits<double>::infinity()));
+    EXPECT_TRUE(util_isinf(util_double_infinity()));
 }
 
 TEST_F(MathUtilTest, Denormal) {

diff --git a/src/util/fpclassify.cpp b/src/util/fpclassify.cpp
@@ -8,6 +8,7 @@
 #endif
 
 #include <cmath>
+#include <limits>
 
 int util_fpclassify(float x) {
     return std::fpclassify(x);
@@ -48,3 +49,11 @@ int util_isnan(double x) {
 int util_isinf(double x) {
     return std::isinf(x);
 }
+
+float util_float_infinity() {
+    return std::numeric_limits<double>::infinity();
+}
+
+double util_double_infinity() {
+    return std::numeric_limits<double>::infinity();
+}
diff --git a/src/util/fpclassify.h b/src/util/fpclassify.h
@@ -24,3 +24,6 @@ int util_isnan(double x);
 
 int util_isinf(float x);
 int util_isinf(double x);
+
+float util_float_infinity();
+double util_double_infinity();