Moved warning disables from warningcontrol.h to configurecompiler.cmake (#33439)

* Moved warning disables from warningcontrol.h to configurecompiler.cmake

* Completely moved the contents of inc/warningcontrol.hto configurecompiler.cmake.

diff --git a/src/coreclr/CMakeLists.txt b/src/coreclr/CMakeLists.txt
index 09072e1..7e2b66c 100644 (file)
--- a/src/coreclr/CMakeLists.txt
+++ b/src/coreclr/CMakeLists.txt
@@ -160,7 +160,6 @@ add_subdirectory(src/tools/crossgen2/jitinterface)
 # All of the compiler options are specified in file compileoptions.cmake
 # Do not add any new options here. They should be added in compileoptions.cmake
 if(CLR_CMAKE_HOST_WIN32)
-  add_compile_options(/FIWarningControl.h) # force include of WarningControl.h
   add_compile_options(/Zl) # omit default library name in .OBJ
 endif(CLR_CMAKE_HOST_WIN32)
 

diff --git a/src/coreclr/configurecompiler.cmake b/src/coreclr/configurecompiler.cmake
index f086485..792ea04 100644 (file)
--- a/src/coreclr/configurecompiler.cmake
+++ b/src/coreclr/configurecompiler.cmake
@@ -429,7 +429,40 @@ if (MSVC)
   add_compile_options(/MP) # Build with Multiple Processes (number of processes equal to the number of processors)
   add_compile_options(/GS) # Buffer Security Check
   add_compile_options(/Zm200) # Specify Precompiled Header Memory Allocation Limit of 150MB
+
   add_compile_options(/wd4960 /wd4961 /wd4603 /wd4627 /wd4838 /wd4456 /wd4457 /wd4458 /wd4459 /wd4091 /we4640)
+
+  # Disable Warnings:
+  # 4291: Delete not defined for new, c++ exception may cause leak.
+  # 4302: Truncation from '%$S' to '%$S'.
+  # 4311: Pointer truncation from '%$S' to '%$S'.
+  # 4312: '<function-style-cast>' : conversion from '%$S' to '%$S' of greater size.
+  # 4477: Format string '%$S' requires an argument of type '%$S', but variadic argument %d has type '%$S'.
+  add_compile_options(/wd4291 /wd4302 /wd4311 /wd4312 /wd4477)
+
+  # Treat Warnings as Errors:
+  # 4007: 'main' : must be __cdecl.
+  # 4013: 'function' undefined - assuming extern returning int.
+  # 4102: "'%$S' : unreferenced label".
+  # 4551: Function call missing argument list.
+  # 4700: Local used w/o being initialized.
+  # 4806: Unsafe operation involving type 'bool'.
+  add_compile_options(/we4007 /we4013 /we4102 /we4551 /we4700 /we4806)
+
+  # Set Warning Level 3:
+  # 4092: Sizeof returns 'unsigned long'.
+  # 4121: Structure is sensitive to alignment.
+  # 4125: Decimal digit in octal sequence.
+  # 4130: Logical operation on address of string constant.
+  # 4132: Const object should be initialized.
+  # 4212: Function declaration used ellipsis.
+  # 4530: C++ exception handler used, but unwind semantics are not enabled. Specify -GX.
+  add_compile_options(/w34092 /w34121 /w34125 /w34130 /w34132 /w34212 /w34530)
+
+  # Set Warning Level 4:
+  # 4177: Pragma data_seg s/b at global scope.
+  add_compile_options(/w44177)
+
   add_compile_options(/Zi) # enable debugging information
   add_compile_options(/ZH:SHA_256) # use SHA256 for generating hashes of compiler processed source files.
   add_compile_options(/source-charset:utf-8) # Force MSVC to compile source as UTF-8.

diff --git a/src/coreclr/src/inc/warningcontrol.h b/src/coreclr/src/inc/warningcontrol.h
deleted file mode 100644 (file)
index e3b6f07..0000000
--- a/src/coreclr/src/inc/warningcontrol.h
+++ /dev/null
@@ -1,48 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-//
-// warningcontrol.h
-//
-// Header file to globally control the warning settings for the entire Viper build.
-// You do not need to explicitly include this file; rather, it gets included
-// on the command line with a /FI (force include) directive. This is controlled
-// in sources.vip.
-//
-// KEEP THIS LIST SORTED!
-//
-
-#if defined(_MSC_VER)
-#pragma warning(error   :4007)   // 'main' : must be __cdecl
-#pragma warning(error   :4013)   // 'function' undefined - assuming extern returning int
-#pragma warning(3       :4092)   // sizeof returns 'unsigned long'
-#pragma warning(error   :4102)   // "'%$S' : unreferenced label"
-#pragma warning(3       :4121)   // structure is sensitive to alignment
-#pragma warning(3       :4125)   // decimal digit in octal sequence
-#pragma warning(3       :4130)   // logical operation on address of string constant
-#pragma warning(3       :4132)   // const object should be initialized
-#pragma warning(4       :4177)   // pragma data_seg s/b at global scope
-#pragma warning(3       :4212)   // function declaration used ellipsis
-#pragma warning(disable :4291)   // delete not defined for new, c++ exception may cause leak
-#pragma warning(disable :4302)   // truncation from '%$S' to '%$S'
-#pragma warning(disable :4311)   // pointer truncation from '%$S' to '%$S'
-#pragma warning(disable :4312)   // '<function-style-cast>' : conversion from '%$S' to '%$S' of greater size
-#pragma warning(disable :4477)   // format string '%$S' requires an argument of type '%$S', but variadic argument %d has type '%$S'
-#pragma warning(3       :4530)   // C++ exception handler used, but unwind semantics are not enabled. Specify -GX
-#pragma warning(error   :4551)   // Function call missing argument list
-
-#pragma warning(error   :4700)   // Local used w/o being initialized
-#pragma warning(error   :4806)   // unsafe operation involving type 'bool'
-
-#if defined(_DEBUG) && (!defined(_MSC_FULL_VER) || (_MSC_FULL_VER <= 181040116))
-// The CLR header file check.h, macro CHECK_MSG_EX, can create unreachable code if the LEAVE_DEBUG_ONLY_CODE
-// macro is not empty (such as it is defined in contract.h) and the _RESULT macro expands to "return".
-// Checked-in compilers used by the TFS-based desktop build (e.g., version 18.10.40116.8) started reporting
-// unreachable code warnings when debugholder.h was changed to no longer #define "return" to something relatively
-// complex. However, newer compilers, such as Visual Studio 2015, used to build the CLR from the open source
-// GitHub repo, still do not report this warning. We don't want to disable this warning for open source build,
-// which will use a newer compiler. Hence, only disable it for older compilers.
-#pragma warning(disable :4702)   // unreachable code
-#endif
-
-#endif  // defined(_MSC_VER)

diff --git a/src/coreclr/src/vm/common.h b/src/coreclr/src/vm/common.h
index 2f26763..f60ac23 100644 (file)
--- a/src/coreclr/src/vm/common.h
+++ b/src/coreclr/src/vm/common.h
@@ -104,7 +104,6 @@
 #include "classnames.h"
 #include "util.hpp"
 #include "corpriv.h"
-//#include "WarningControl.h"
 
 #include <daccess.h>