Merge pull request #3005 from beutlich/remove-clang-warning

Silence clang warning -Wtautological-pointer-compare

Author: beutlich

Modelica/Resources/BuildProjects/autotools/configure.ac

@@ -14,6 +14,21 @@ AC_SUBST(LIBZLIB)
 AC_SUBST(LIBHDF5)
 dnl Check for HDF5, etc
 
+AC_DEFUN([C_FLAG_CHECK_AND_ADD],
+[dnl
+  AC_MSG_CHECKING([if $CC supports $1])
+  AC_LANG_PUSH([C])
+  ac_saved_cflags="$CFLAGS"
+  CFLAGS="-Werror $1"
+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])],
+    [AC_MSG_RESULT([yes])],
+    [AC_MSG_ERROR([no]) ; CFLAGS="$ac_saved_cflags"]
+  )
+  AC_LANG_POP([C])
+])
+
+C_FLAG_CHECK_AND_ADD([-fno-delete-null-pointer-checks])
+
 AC_SEARCH_LIBS([floor],[m])
 
 LIBS_BEFORE="$LIBS"

Modelica/Resources/BuildProjects/gcc/Makefile

@@ -1,7 +1,7 @@
 AR = ar -ru
 RM = rm -f
 
-CFLAGS = -O3 -Wno-attributes
+CFLAGS = -O3 -Wno-attributes -fno-delete-null-pointer-checks
 CPPFLAGS = -DNDEBUG -DHAVE_UNISTD_H -DHAVE_STDARG_H -DHAVE_HIDDEN -DHAVE_MEMCPY
 INC = -I"../../C-Sources/zlib"
 

Modelica/Resources/C-Sources/ModelicaIO.c

@@ -178,6 +178,9 @@ static int IsNumber(char* token);
 static void transpose(_Inout_ double* table, size_t nRow, size_t nCol) MODELICA_NONNULLATTR;
   /* Cycle-based in-place array transposition */
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wtautological-compare"
+
 void ModelicaIO_readMatrixSizes(_In_z_ const char* fileName,
                                 _In_z_ const char* matrixName,
                                 _Out_ int* dim) {
@@ -1077,4 +1080,6 @@ static void transpose(_Inout_ double* table, size_t nRow, size_t nCol) {
     }
 }
 
+#pragma clang diagnostic pop
+
 #endif

Modelica/Resources/C-Sources/ModelicaStandardTables.c

@@ -544,6 +544,9 @@ static void spline2DClose(CubicHermite2D** spline);
 
 /* ----- Interface functions ----- */
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wtautological-compare"
+
 void* ModelicaStandardTables_CombiTimeTable_init(_In_z_ const char* tableName,
                                                  _In_z_ const char* fileName,
                                                  _In_ double* table, size_t nRow,
@@ -5694,3 +5697,5 @@ static READ_RESULT readTable(_In_z_ const char* fileName, _In_z_ const char* tab
     return NULL;
 #endif /* #if !defined(NO_FILE_SYSTEM) */
 }
+
+#pragma clang diagnostic pop