Add /we4189 switch to CMAKE_CXX_FLAGS for MSVC.

- treat unused local variables warnings as error in Debug

Change-Id: I2da08b72e0f0083d3cdf932fbf92ef4981a88615

Author: HoppeMateusz

CMakeLists.txt

@@ -129,7 +129,7 @@ if(NOT DEFINED AUB_STREAM_DIR AND NOT DISABLE_AUB_STREAM)
     endif()
 else()
     unset(AUB_STREAM_DIR)
-endif(NOT DEFINED AUB_STREAM_DIR)
+endif()
 
 if(LIBDRM_DIR)
   get_filename_component(I915_INCLUDES_DIR "${LIBDRM_DIR}/include" ABSOLUTE)
@@ -469,7 +469,10 @@ endif()
 if(MSVC)
 	# Force to treat warnings as errors
 	if(NOT CMAKE_CXX_FLAGS MATCHES "/WX")
-		 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX")
+		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX")
+        if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
+            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /we4189")
+        endif()
 	endif()
 
 # Support for WUD

offline_compiler/utilities/windows/seh_exception.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018 Intel Corporation
+ * Copyright (C) 2018-2019 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -73,6 +73,10 @@ void SehException::getCallStack(unsigned int code, struct _EXCEPTION_POINTERS *e
     stack.clear();
 
     BOOL result = SymInitialize(hProcess, NULL, TRUE);
+    if (result == FALSE) {
+        return;
+    }
+
     STACKFRAME64 stackFrame;
     memset(&stackFrame, 0, sizeof(STACKFRAME64));
     const int nameSize = 255;

runtime/os_interface/windows/device_factory_win.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2018 Intel Corporation
+ * Copyright (C) 2017-2019 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *

runtime/os_interface/windows/kmdaf_listener.cpp

@@ -1,12 +1,15 @@
 /*
- * Copyright (C) 2018 Intel Corporation
+ * Copyright (C) 2018-2019 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #include "runtime/os_interface/windows/kmdaf_listener.h"
+#pragma warning(push)           // save the current state
+#pragma warning(disable : 4189) // disable warning 4189 (unused local variable)
 #include "kmdaf.h"
+#pragma warning(pop) // restore state.
 
 namespace OCLRT {
 

runtime/os_interface/windows/thk_wrapper.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2018 Intel Corporation
+ * Copyright (C) 2017-2019 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -80,8 +80,7 @@ class ThkWrapper {
             SYSTEM_ENTER()
             NTSTATUS Status;
             Status = mFunc(param);
-            unsigned int ID = getId<Param>();
-            SYSTEM_LEAVE(ID);
+            SYSTEM_LEAVE(getId<Param>());
             return Status;
         } else {
             return mFunc(param);

runtime/os_interface/windows/wddm/wddm.cpp

@@ -943,7 +943,7 @@ bool Wddm::init(PreemptionMode preemptionMode) {
 
 EvictionStatus Wddm::evictAllTemporaryResources() {
     decltype(temporaryResources) resourcesToEvict;
-    auto &lock = acquireLock(temporaryResourcesLock);
+    auto lock = acquireLock(temporaryResourcesLock);
     temporaryResources.swap(resourcesToEvict);
     if (resourcesToEvict.empty()) {
         return EvictionStatus::NOT_APPLIED;
@@ -959,7 +959,7 @@ EvictionStatus Wddm::evictAllTemporaryResources() {
 }
 
 EvictionStatus Wddm::evictTemporaryResource(WddmAllocation &allocation) {
-    auto &lock = acquireLock(temporaryResourcesLock);
+    auto lock = acquireLock(temporaryResourcesLock);
     auto position = std::find(temporaryResources.begin(), temporaryResources.end(), allocation.handle);
     if (position == temporaryResources.end()) {
         return EvictionStatus::NOT_APPLIED;

runtime/sharings/d3d/d3d_sharing.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2018 Intel Corporation
+ * Copyright (C) 2017-2019 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -41,8 +41,6 @@ D3DSharing<D3D>::~D3DSharing() {
 
 template <typename D3D>
 void D3DSharing<D3D>::synchronizeObject(UpdateData &updateData) {
-    void *sharedHandle = nullptr;
-
     sharingFunctions->getDeviceContext(d3dQuery);
     if (!sharedResource) {
         sharingFunctions->copySubresourceRegion(resourceStaging, 0, resource, subresource);

unit_tests/device/device_win_timers_tests.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2018 Intel Corporation
+ * Copyright (C) 2017-2019 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -22,7 +22,9 @@ TEST_F(MockOSTimeWinTest, DynamicResolution) {
     auto wddmMock = std::unique_ptr<WddmMock>(new WddmMock());
     auto mDev = std::unique_ptr<MockDevice>(MockDevice::createWithNewExecutionEnvironment<MockDevice>(nullptr));
 
-    bool error = wddmMock->init(mDev->getPreemptionMode());
+    bool success = wddmMock->init(mDev->getPreemptionMode());
+    EXPECT_TRUE(success);
+
     std::unique_ptr<MockOSTimeWin> timeWin(new MockOSTimeWin(wddmMock.get()));
 
     double res = 0.0;

unit_tests/gen9/windows/os_interface_tests_gen9.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2018 Intel Corporation
+ * Copyright (C) 2017-2019 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -13,7 +13,6 @@ typedef OsInterfaceTest OsInterfaceTestSkl;
 
 GEN9TEST_F(OsInterfaceTestSkl, askKmdIfPreemptionRegisterWhitelisted) {
     HardwareInfo *hwInfo = nullptr;
-    const HardwareInfo *refHwinfo = *platformDevices;
     size_t numDevices = 0;
 
     ExecutionEnvironment executionEnvironment;

unit_tests/main.cpp

@@ -172,13 +172,13 @@ int main(int argc, char **argv) {
     int retVal = 0;
     bool useDefaultListener = false;
     bool enable_alarm = true;
-    bool enable_segv = true;
-    bool enable_abrt = true;
     bool setupFeatureTable = testMode == TestMode::AubTests ? true : false;
 
     applyWorkarounds();
 
 #if defined(__linux__)
+    bool enable_segv = true;
+    bool enable_abrt = true;
     if (getenv("IGDRCL_TEST_SELF_EXEC") == nullptr) {
         std::string wd = getRunPath(argv[0]);
         setenv("LD_LIBRARY_PATH", wd.c_str(), 1);