From 2e9ec7d3e5c58424fde4312784e2a9faab58fe2c Mon Sep 17 00:00:00 2001 From: PJ Reiniger Date: Sun, 8 May 2022 13:34:07 -0400 Subject: [PATCH 13/31] Add compiler warning pragrams --- llvm/include/llvm/ADT/FunctionExtras.h | 10 ++++++++++ llvm/include/llvm/ADT/Hashing.h | 9 +++++++++ llvm/include/llvm/ADT/SmallVector.h | 8 ++++++++ llvm/include/llvm/Support/MathExtras.h | 9 +++++++++ llvm/include/llvm/Support/MemAlloc.h | 13 +++++++++++++ llvm/lib/Support/raw_ostream.cpp | 4 ++++ llvm/unittests/ADT/DenseMapTest.cpp | 4 ++++ llvm/unittests/ADT/MapVectorTest.cpp | 7 +++++++ llvm/unittests/ADT/SmallVectorTest.cpp | 4 ++++ llvm/unittests/Support/AlignOfTest.cpp | 7 +++---- 10 files changed, 71 insertions(+), 4 deletions(-) diff --git a/llvm/include/llvm/ADT/FunctionExtras.h b/llvm/include/llvm/ADT/FunctionExtras.h index 1a26cb702cae..3b834236b8fa 100644 --- a/llvm/include/llvm/ADT/FunctionExtras.h +++ b/llvm/include/llvm/ADT/FunctionExtras.h @@ -54,6 +54,12 @@ namespace llvm { /// It can hold functions with a non-const operator(), like mutable lambdas. template class unique_function; +// GCC warns on OutOfLineStorage +#if defined(__GNUC__) && !defined(__clang__) +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#endif + namespace detail { template @@ -405,6 +411,10 @@ public: } }; +#if defined(__GNUC__) && !defined(__clang__) +#pragma GCC diagnostic pop +#endif + } // end namespace llvm #endif // LLVM_ADT_FUNCTIONEXTRAS_H diff --git a/llvm/include/llvm/ADT/Hashing.h b/llvm/include/llvm/ADT/Hashing.h index e296c1c53ebd..8f90b4214b92 100644 --- a/llvm/include/llvm/ADT/Hashing.h +++ b/llvm/include/llvm/ADT/Hashing.h @@ -55,6 +55,11 @@ #include #include +#ifdef _WIN32 +#pragma warning(push) +#pragma warning(disable : 26495) +#endif + namespace llvm { /// An opaque object representing a hash code. @@ -679,4 +684,8 @@ hash_code hash_value(const std::basic_string &arg) { } // namespace llvm +#ifdef _WIN32 +#pragma warning(pop) +#endif + #endif diff --git a/llvm/include/llvm/ADT/SmallVector.h b/llvm/include/llvm/ADT/SmallVector.h index 602fcc5b7a98..690d512a43c8 100644 --- a/llvm/include/llvm/ADT/SmallVector.h +++ b/llvm/include/llvm/ADT/SmallVector.h @@ -13,6 +13,14 @@ #ifndef LLVM_ADT_SMALLVECTOR_H #define LLVM_ADT_SMALLVECTOR_H +// This file uses std::memcpy() to copy std::pair. +// That type is POD, but the standard doesn't guarantee that. GCC doesn't treat +// the type as POD so it throws a warning. We want to consider this a warning +// instead of an error. +#if __GNUC__ >= 8 +#pragma GCC diagnostic warning "-Wclass-memaccess" +#endif + #include "llvm/ADT/iterator_range.h" #include "llvm/Support/Compiler.h" #include "llvm/Support/ErrorHandling.h" diff --git a/llvm/include/llvm/Support/MathExtras.h b/llvm/include/llvm/Support/MathExtras.h index da843ef79ff9..fac12dd0e4c6 100644 --- a/llvm/include/llvm/Support/MathExtras.h +++ b/llvm/include/llvm/Support/MathExtras.h @@ -435,6 +435,11 @@ inline uint64_t maxUIntN(uint64_t N) { return UINT64_MAX >> (64 - N); } +#ifdef _WIN32 +#pragma warning(push) +#pragma warning(disable : 4146) +#endif + /// Gets the minimum value for a N-bit signed integer. inline int64_t minIntN(int64_t N) { assert(N > 0 && N <= 64 && "integer width out of range"); @@ -442,6 +447,10 @@ inline int64_t minIntN(int64_t N) { return UINT64_C(1) + ~(UINT64_C(1) << (N - 1)); } +#ifdef _WIN32 +#pragma warning(pop) +#endif + /// Gets the maximum value for a N-bit signed integer. inline int64_t maxIntN(int64_t N) { assert(N > 0 && N <= 64 && "integer width out of range"); diff --git a/llvm/include/llvm/Support/MemAlloc.h b/llvm/include/llvm/Support/MemAlloc.h index d6012bd5a698..01007deb89bb 100644 --- a/llvm/include/llvm/Support/MemAlloc.h +++ b/llvm/include/llvm/Support/MemAlloc.h @@ -22,6 +22,14 @@ namespace llvm { +#ifdef _WIN32 +#pragma warning(push) +// Warning on NONNULL, report is not known to abort +#pragma warning(disable : 6387) +#pragma warning(disable : 28196) +#pragma warning(disable : 28183) +#endif + LLVM_ATTRIBUTE_RETURNS_NONNULL inline void *safe_malloc(size_t Sz) { void *Result = std::malloc(Sz); if (Result == nullptr) { @@ -84,4 +92,9 @@ allocate_buffer(size_t Size, size_t Alignment); void deallocate_buffer(void *Ptr, size_t Size, size_t Alignment); } // namespace llvm + +#ifdef _WIN32 +#pragma warning(pop) +#endif + #endif diff --git a/llvm/lib/Support/raw_ostream.cpp b/llvm/lib/Support/raw_ostream.cpp index 306cc981ed8f..bff7b6c9a77b 100644 --- a/llvm/lib/Support/raw_ostream.cpp +++ b/llvm/lib/Support/raw_ostream.cpp @@ -10,6 +10,10 @@ // //===----------------------------------------------------------------------===// +#ifdef _WIN32 +#define _CRT_NONSTDC_NO_WARNINGS +#endif + #include "llvm/Support/raw_ostream.h" #include "llvm/ADT/STLExtras.h" #include "llvm/ADT/StringExtras.h" diff --git a/llvm/unittests/ADT/DenseMapTest.cpp b/llvm/unittests/ADT/DenseMapTest.cpp index a122f1fe3bdf..123012a3118d 100644 --- a/llvm/unittests/ADT/DenseMapTest.cpp +++ b/llvm/unittests/ADT/DenseMapTest.cpp @@ -6,6 +6,10 @@ // //===----------------------------------------------------------------------===// +#if defined(__GNUC__) && !defined(__clang__) +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#endif + #include "llvm/ADT/DenseMap.h" #include "gtest/gtest.h" #include diff --git a/llvm/unittests/ADT/MapVectorTest.cpp b/llvm/unittests/ADT/MapVectorTest.cpp index 552f9956bdc2..20ebcd753bcc 100644 --- a/llvm/unittests/ADT/MapVectorTest.cpp +++ b/llvm/unittests/ADT/MapVectorTest.cpp @@ -6,6 +6,13 @@ // //===----------------------------------------------------------------------===// +#if defined(__GNUC__) +#pragma GCC diagnostic ignored "-Wpedantic" +#if !defined(__clang__) +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#endif +#endif + #include "llvm/ADT/MapVector.h" #include "llvm/ADT/iterator_range.h" #include "gtest/gtest.h" diff --git a/llvm/unittests/ADT/SmallVectorTest.cpp b/llvm/unittests/ADT/SmallVectorTest.cpp index 1914f38fac6c..387229c32d5a 100644 --- a/llvm/unittests/ADT/SmallVectorTest.cpp +++ b/llvm/unittests/ADT/SmallVectorTest.cpp @@ -17,6 +17,10 @@ #include #include +#if defined(__GNUC__) +#pragma GCC diagnostic ignored "-Wpedantic" +#endif + using namespace llvm; namespace { diff --git a/llvm/unittests/Support/AlignOfTest.cpp b/llvm/unittests/Support/AlignOfTest.cpp index f84895c18602..6a50205b143b 100644 --- a/llvm/unittests/Support/AlignOfTest.cpp +++ b/llvm/unittests/Support/AlignOfTest.cpp @@ -31,10 +31,9 @@ namespace { #pragma clang diagnostic ignored "-Wunknown-pragmas" #pragma clang diagnostic ignored "-Winaccessible-base" #elif ((__GNUC__ * 100) + __GNUC_MINOR__) >= 402 -// Pragma based warning suppression was introduced in GGC 4.2. Additionally -// this warning is "enabled by default". The warning still appears if -Wall is -// suppressed. Apparently GCC suppresses it when -w is specifed, which is odd. -#pragma GCC diagnostic warning "-w" +#pragma GCC diagnostic warning "-Wunknown-pragmas" +#pragma GCC diagnostic warning "-Winaccessible-base" +#pragma GCC diagnostic warning "-Wunused-function" #endif // Define some fixed alignment types to use in these tests. -- 2.20.1.windows.1