Fix and disable many warnings in particular in the LLVM area (tested …

…with gcc 6.1 and AppleClang)
saberduck · Aug 30, 2016 · d26573a · d26573a
1 parent 8c75bb8
commit d26573a
Show file tree

Hide file tree

Showing 13 changed files with 49 additions and 31 deletions.
diff --git a/bindings/pyroot/CMakeLists.txt b/bindings/pyroot/CMakeLists.txt
@@ -5,9 +5,7 @@ include_directories(${PYTHON_INCLUDE_DIRS})
 
 ROOT_GENERATE_DICTIONARY(G__PyROOT *.h MODULE PyROOT LINKDEF LinkDef.h OPTIONS "-writeEmptyRootPCM")
 
-if(GCC_MAJOR EQUAL 4)
-  add_definitions(-fno-strict-aliasing)
-endif()
+ROOT_ADD_CXX_FLAG(CMAKE_CXX_FLAGS -fno-strict-aliasing)
 
 if(WIN32)
   set(ROOTULIBS -include:_G__cpp_setupG__Net

diff --git a/bindings/r/CMakeLists.txt b/bindings/r/CMakeLists.txt
@@ -9,6 +9,8 @@ set(libname RInterface)
 
 include_directories(${R_INCLUDE_DIRS})
 
+ROOT_ADD_CXX_FLAG(CMAKE_CXX_FLAGS -Wno-overloaded-virtual)
+
 set(R_HEADERS ${CMAKE_SOURCE_DIR}/bindings/r/inc/TRInterface.h
               ${CMAKE_SOURCE_DIR}/bindings/r/inc/TRObject.h 
               ${CMAKE_SOURCE_DIR}/bindings/r/inc/TRFunctionExport.h

diff --git a/core/rint/src/TRint.cxx b/core/rint/src/TRint.cxx
@@ -554,7 +554,7 @@ char *TRint::GetPrompt()
 
 const char *TRint::SetPrompt(const char *newPrompt)
 {
-   TString op = fDefaultPrompt;
+   static TString op = fDefaultPrompt;
 
    if (newPrompt && strlen(newPrompt) <= 55)
       fDefaultPrompt = newPrompt;

diff --git a/interpreter/CMakeLists.txt b/interpreter/CMakeLists.txt
@@ -1,6 +1,6 @@
 
 #---Define the way we want to build and what of llvm/clang/cling------------------------------------
-set(LLVM_ENABLE_WARNINGS ON CACHE BOOL "")
+set(LLVM_ENABLE_WARNINGS OFF CACHE BOOL "")
 set(LLVM_INCLUDE_TESTS OFF CACHE BOOL "")
 set(LLVM_INCLUDE_EXAMPLES OFF CACHE BOOL "")
 set(LLVM_BUILD_TOOLS OFF CACHE BOOL "")
@@ -34,14 +34,28 @@ endif()
 set(LLVM_TARGETS_TO_BUILD ${ROOT_CLING_TARGET} CACHE STRING "Semicolon-separated list of targets to build, or \"all\".")
 
 #---Protect against warnings clang/gcc would fire----------------------------------------------------
-set(INTERP_COMMON_ADDITIONAL_FLAGS "-Wno-comment -Wno-unused-parameter")
-if(CMAKE_COMPILER_IS_GNUCXX)
-   set(INTERP_ADDITIONAL_FLAGS "${INTERP_COMMON_ADDITIONAL_FLAGS} -Wno-maybe-uninitialized -Wno-unused-but-set-variable -Wno-missing-field-initializers")
-elseif(${CMAKE_CXX_COMPILER_ID} STREQUAL Clang)
-   set(INTERP_ADDITIONAL_FLAGS "${INTERP_COMMON_ADDITIONAL_FLAGS} -Wno-conditional-uninitialized -Wno-parentheses-equality -Wno-unused-private-field")
+ROOT_ADD_CXX_FLAG(INTERP_ADDITIONAL_CXX_FLAGS -Wno-comment)
+ROOT_ADD_CXX_FLAG(INTERP_ADDITIONAL_CXX_FLAGS -Wno-missing-field-initializers)
+if(${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
+  ROOT_ADD_CXX_FLAG(INTERP_ADDITIONAL_CXX_FLAGS -Wno-conditional-uninitialized)
+  ROOT_ADD_CXX_FLAG(INTERP_ADDITIONAL_CXX_FLAGS -Wno-unused-private-field)
+  ROOT_ADD_CXX_FLAG(INTERP_ADDITIONAL_CXX_FLAGS -Wno-unused-local-typedef)
+  ROOT_ADD_CXX_FLAG(INTERP_ADDITIONAL_CXX_FLAGS -Wno-parentheses-equality)
+  ROOT_ADD_C_FLAG(INTERP_ADDITIONAL_C_FLAGS -Wno-parentheses-equality)
 endif()
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${INTERP_ADDITIONAL_FLAGS}")
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${INTERP_ADDITIONAL_FLAGS}")
+if(APPLE)
+  ROOT_ADD_CXX_FLAG(INTERP_ADDITIONAL_CXX_FLAGS -Wno-deprecated-declarations)
+endif()
+ROOT_ADD_CXX_FLAG(INTERP_ADDITIONAL_CXX_FLAGS -Wno-overloaded-virtual)
+ROOT_ADD_CXX_FLAG(INTERP_ADDITIONAL_CXX_FLAGS -Wno-maybe-uninitialized)
+ROOT_ADD_CXX_FLAG(INTERP_ADDITIONAL_CXX_FLAGS -Wno-unused-parameter)
+ROOT_ADD_C_FLAG(INTERP_ADDITIONAL_C_FLAGS -Wno-unused-parameter)
+ROOT_ADD_CXX_FLAG(INTERP_ADDITIONAL_CXX_FLAGS -Wno-unused-variable)
+ROOT_ADD_CXX_FLAG(INTERP_ADDITIONAL_CXX_FLAGS -Wno-unused-but-set-variable)
+ROOT_ADD_CXX_FLAG(INTERP_ADDITIONAL_CXX_FLAGS -Wno-unused-function)
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${INTERP_ADDITIONAL_CXX_FLAGS}")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${INTERP_ADDITIONAL_C_FLAGS}")
 
 #---Do not transform warnings in errors-------------------------------------------------------------
 string(REPLACE "-Werror " "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})

diff --git a/interpreter/llvm/src/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp b/interpreter/llvm/src/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp
@@ -617,7 +617,7 @@ Error RuntimeDyldImpl::emitWeakSymbols(const ObjectFile &Obj,
 
     uint64_t SectOffset;
     if (auto Err = getOffset(Sym, *SI, SectOffset))
-      return std::move(Err);
+      return Err;
     bool IsCode = SI->isText();
     unsigned SectionID;
     if (auto SectionIDOrErr = findOrEmitSection(Obj, *SI, IsCode,LocalSections))

diff --git a/math/mathcore/CMakeLists.txt b/math/mathcore/CMakeLists.txt
@@ -23,6 +23,9 @@ ROOT_GENERATE_DICTIONARY(G__MathCore   TComplex.h TMath.h ${MATHCORE_HEADERS} Fi
 
 add_definitions(-DUSE_ROOT_ERROR )
 ROOT_ADD_C_FLAG(_flags -Wno-strict-overflow)  # Avoid what it seems a compiler false positive warning
+ROOT_ADD_C_FLAG(_flags -Wno-maybe-uninitialized)  # Avoid what it seems a compiler false positive warning
+ROOT_ADD_C_FLAG(_flags -Wno-parentheses-equality)
+
 set_source_files_properties(src/triangle.c COMPILE_FLAGS "${_flags}")
 
 ROOT_LINKER_LIBRARY(MathCore *.cxx *.c G__MathCore.cxx LIBRARIES ${CMAKE_THREAD_LIBS_INIT} DEPENDENCIES Core)

diff --git a/math/rtools/CMakeLists.txt b/math/rtools/CMakeLists.txt
@@ -5,6 +5,8 @@
 
 include_directories(${R_INCLUDE_DIRS})
 
+ROOT_ADD_CXX_FLAG(CMAKE_CXX_FLAGS -Wno-overloaded-virtual)
+
 ROOT_GENERATE_DICTIONARY(G__Rtools Math/RMinimizer.h MODULE Rtools LINKDEF LinkDef.h)
 ROOT_LINKER_LIBRARY(Rtools *.cxx G__Rtools.cxx LIBRARIES Core ${R_LIBRARIES} DEPENDENCIES MathCore RInterface)
 ROOT_INSTALL_HEADERS()

diff --git a/math/unuran/CMakeLists.txt b/math/unuran/CMakeLists.txt
@@ -50,8 +50,8 @@ endif()
 
 #---We need to disable some warnings-------------------------------------------------------------------
 string(REPLACE -Wall "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
-if(${CMAKE_CXX_COMPILER_ID} STREQUAL Clang)
-  add_definitions(-Wno-parentheses-equality)
+if(${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
+  ROOT_ADD_C_FLAG(CMAKE_C_FLAGS -Wno-parentheses-equality)
 endif()
 
 include_directories(BEFORE ${UNR_UNTARDIR} ${UNR_UNTARDIR}/src ${UNR_UNTARDIR}/src/utils)

diff --git a/proof/proofd/CMakeLists.txt b/proof/proofd/CMakeLists.txt
@@ -11,6 +11,8 @@ add_definitions(${XROOTD_CFLAGS})
 # Uncomment if not the case (G Ganis, 18/5/2016)
 # ROOT_ADD_CXX_FLAG(CMAKE_CXX_FLAGS -Wno-undefined-bool-conversion)
 
+ROOT_ADD_CXX_FLAG(CMAKE_CXX_FLAGS -Wno-nonnull-compare)
+
 if(WIN32)
   ROOT_LINKER_LIBRARY(XrdProofd XProofProtUtils.cxx LIBRARIES ${XROOTD_LIBRARIES})
 else()

diff --git a/tmva/pymva/src/MethodPyAdaBoost.cxx b/tmva/pymva/src/MethodPyAdaBoost.cxx
@@ -16,14 +16,14 @@
  * (http://tmva.sourceforge.net/LICENSE)                                          *
  *                                                                                *
  **********************************************************************************/
-#pragma GCC diagnostic ignored "-Wunused-parameter"
-#include <iomanip>
-#include <fstream>
-
 #include <Python.h>
 #define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
 #include <numpy/arrayobject.h>
 
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#include <iomanip>
+#include <fstream>
+
 #include "TMath.h"
 #include "Riostream.h"
 #include "TMatrix.h"

diff --git a/tmva/pymva/src/MethodPyGTB.cxx b/tmva/pymva/src/MethodPyGTB.cxx
@@ -17,14 +17,14 @@
  *                                                                                *
  **********************************************************************************/
 
-#pragma GCC diagnostic ignored "-Wunused-parameter"
-#include <iomanip>
-#include <fstream>
-
 #include <Python.h>
 #define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
 #include <numpy/arrayobject.h>
 
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#include <iomanip>
+#include <fstream>
+
 #include "TMath.h"
 #include "Riostream.h"
 #include "TMatrix.h"

diff --git a/tmva/pymva/src/MethodPyRandomForest.cxx b/tmva/pymva/src/MethodPyRandomForest.cxx
@@ -16,14 +16,14 @@
  * (http://tmva.sourceforge.net/LICENSE)                                          *
  *                                                                                *
  **********************************************************************************/
-#pragma GCC diagnostic ignored "-Wunused-parameter"
-#include <iomanip>
-#include <fstream>
-
 #include <Python.h>
 #define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
 #include <numpy/arrayobject.h>
 
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#include <iomanip>
+#include <fstream>
+
 #include "TMath.h"
 #include "Riostream.h"
 #include "TMatrix.h"

diff --git a/tmva/rmva/CMakeLists.txt b/tmva/rmva/CMakeLists.txt
@@ -9,20 +9,17 @@ set(libname RMVA)
 
 include_directories(${R_INCLUDE_DIRS})
 
-
 set(R_HEADERS ${CMAKE_SOURCE_DIR}/tmva/rmva/inc/TMVA/RMethodBase.h 
               ${CMAKE_SOURCE_DIR}/tmva/rmva/inc/TMVA/MethodC50.h
               ${CMAKE_SOURCE_DIR}/tmva/rmva/inc/TMVA/MethodRSNNS.h
               ${CMAKE_SOURCE_DIR}/tmva/rmva/inc/TMVA/MethodRSVM.h
               ${CMAKE_SOURCE_DIR}/tmva/rmva/inc/TMVA/MethodRXGB.h
               )
 
+ROOT_ADD_CXX_FLAG(CMAKE_CXX_FLAGS -Wno-overloaded-virtual)
 ROOT_GENERATE_DICTIONARY(G__RMVA ${R_HEADERS} MODULE ${libname} LINKDEF LinkDef.h)
-# ROOT_GENERATE_ROOTMAP(RInterface LINKDEF LinkDef.h)
-
 ROOT_LINKER_LIBRARY(RMVA *.cxx G__RMVA.cxx LIBRARIES ${R_LIBRARIES}  DEPENDENCIES Core Matrix Thread RIO RInterface TMVA)
 
-
 ROOT_INSTALL_HEADERS()