From 6e5d485197aafa7e815b6506aa0cacfda987af47 Mon Sep 17 00:00:00 2001
From: chunseoklee <chunseoklee@naver.com>
Date: Thu, 3 Nov 2016 07:18:53 +0900
Subject: [PATCH] Suppress SOS.NETCore.dll error msg in release mode
 (dotnet/coreclr#6975)

Suppress error msg when running coreclr without
SOS.NETCore.dll in release mode

Commit migrated from https://github.com/dotnet/coreclr/commit/8a05dcd07441b8779ec5b9eff9bdcb90f24fcb8e
---
 src/coreclr/src/dlls/mscoree/unixinterface.cpp | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/coreclr/src/dlls/mscoree/unixinterface.cpp b/src/coreclr/src/dlls/mscoree/unixinterface.cpp
index 4e75b33..edd361c 100644
--- a/src/coreclr/src/dlls/mscoree/unixinterface.cpp
+++ b/src/coreclr/src/dlls/mscoree/unixinterface.cpp
@@ -247,22 +247,23 @@ int coreclr_initialize(
         host.SuppressRelease();
         *hostHandle = host;
 #ifdef FEATURE_GDBJIT
-
-        hr = coreclr_create_delegate(*hostHandle,
-                                     *domainId,
-                                     "SOS.NETCore",
-                                     "SOS.SymbolReader",
-                                     "GetInfoForMethod",
-                                     (void**)&getInfoForMethodDelegate);
-
-        if (!SUCCEEDED(hr))
+        HRESULT createDelegateResult;
+        createDelegateResult = coreclr_create_delegate(*hostHandle,
+                                                       *domainId,
+                                                       "SOS.NETCore",
+                                                       "SOS.SymbolReader",
+                                                       "GetInfoForMethod",
+                                                       (void**)&getInfoForMethodDelegate);
+
+#if defined(_DEBUG)
+        if (!SUCCEEDED(createDelegateResult))
         {
             fprintf(stderr,
                     "Can't create delegate for 'SOS.SymbolReader.GetInfoForMethod' "
-                    "method - status: 0x%08x\n", hr);
+                    "method - status: 0x%08x\n", createDelegateResult);
         }
+#endif // _DEBUG
 
-        hr = S_OK; // We don't need to fail if we can't create delegate
 #endif
     }
     return hr;
-- 
2.7.4