From b2a03a2b562ccf8748a77b088f07c339f0af2220 Mon Sep 17 00:00:00 2001
From: Jan Vorlicek <janvorli@microsoft.com>
Date: Wed, 3 May 2017 11:57:04 -0700
Subject: [PATCH] Remove COMCoverage::nativeCoverBlock (dotnet/coreclr#11364)

Remove this unused function and the corresponding references in
ecalllist.h

Commit migrated from https://github.com/dotnet/coreclr/commit/e85c2b298e89147d71605c36d9109f87be2b3079
---
 src/coreclr/src/vm/CMakeLists.txt |  1 -
 src/coreclr/src/vm/coverage.cpp   | 55 ---------------------------------------
 src/coreclr/src/vm/coverage.h     | 19 --------------
 src/coreclr/src/vm/ecalllist.h    |  9 -------
 src/coreclr/src/vm/mscorlib.cpp   |  2 --
 5 files changed, 86 deletions(-)
 delete mode 100644 src/coreclr/src/vm/coverage.cpp
 delete mode 100644 src/coreclr/src/vm/coverage.h

diff --git a/src/coreclr/src/vm/CMakeLists.txt b/src/coreclr/src/vm/CMakeLists.txt
index da1aa8f..ec4ff42 100644
--- a/src/coreclr/src/vm/CMakeLists.txt
+++ b/src/coreclr/src/vm/CMakeLists.txt
@@ -155,7 +155,6 @@ set(VM_SOURCES_WKS
     comthreadpool.cpp
     comutilnative.cpp
     comwaithandle.cpp
-    coverage.cpp
     customattribute.cpp
     custommarshalerinfo.cpp
     dllimportcallback.cpp
diff --git a/src/coreclr/src/vm/coverage.cpp b/src/coreclr/src/vm/coverage.cpp
deleted file mode 100644
index 2a5e5ff..0000000
--- a/src/coreclr/src/vm/coverage.cpp
+++ /dev/null
@@ -1,55 +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.
-
-
-#include "common.h"
-
-#include "coverage.h"
-
-
-//
-//  This is part of the runtime test teams Code Coverge Tools. Due to the special nature of MSCORLIB.dll
-//  We have to work around several issues (Like the initilization of the Secutiry Manager) to be able to get
-//  Code coverage on mscorlib.dll
-// 
-
-FCIMPL1(unsigned __int64, COMCoverage::nativeCoverBlock, INT32 id)
-{
-    FCALL_CONTRACT;
-
-    unsigned __int64 retVal = 0;
-    HELPER_METHOD_FRAME_BEGIN_RET_0();
-
-    HMODULE ilcovnat = 0;
-    if (id == 1)
-    {
-        ilcovnat = CLRLoadLibrary(W("Ilcovnat.dll"));
-
-        if (ilcovnat)
-        {
-            retVal = (unsigned __int64)GetProcAddress(ilcovnat, "CoverBlockNative");
-        }
-    }
-    else if (id == 2)
-    {
-        ilcovnat = CLRLoadLibrary(W("coverage.dll"));
-
-        if (ilcovnat)
-        {
-            retVal = (unsigned __int64)GetProcAddress(ilcovnat, "CoverageRegisterBinaryWithStruct");
-        }
-    }
-    else if (id == 3)
-    {
-        ilcovnat = CLRLoadLibrary(W("Ilcovnat.dll"));
-        if (ilcovnat)
-        {
-            retVal = (unsigned __int64)GetProcAddress(ilcovnat, "CoverMonRegisterMscorlib");
-        }
-    }
-
-    HELPER_METHOD_FRAME_END();
-    return retVal;
-}
-FCIMPLEND
diff --git a/src/coreclr/src/vm/coverage.h b/src/coreclr/src/vm/coverage.h
deleted file mode 100644
index 9be2cc1..0000000
--- a/src/coreclr/src/vm/coverage.h
+++ /dev/null
@@ -1,19 +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.
-
-
-#ifndef _COVERAGE_H_
-#define _COVERAGE_H_
-
-// Please see coverage.cpp for info on this file
-class COMCoverage 
-{
-public:
-    //typedef struct 
-    //{
-    //    DECLARE_ECALL_I4_ARG(INT32, id);
-    //} _CoverageArgs;
-    static FCDECL1(unsigned __int64, nativeCoverBlock, INT32 id);
-};
-#endif // _COVERAGE_H_
diff --git a/src/coreclr/src/vm/ecalllist.h b/src/coreclr/src/vm/ecalllist.h
index f2784d1..81bc656 100644
--- a/src/coreclr/src/vm/ecalllist.h
+++ b/src/coreclr/src/vm/ecalllist.h
@@ -1237,10 +1237,6 @@ FCFuncStart(gStubHelperFuncs)
 #endif //FEATURE_STUBS_AS_IL
 FCFuncEnd()
 
-FCFuncStart(gCoverageFuncs)
-    FCUnreferenced FCFuncElement("nativeCoverBlock", COMCoverage::nativeCoverBlock)
-FCFuncEnd()
-
 FCFuncStart(gGCHandleFuncs)
     FCFuncElement("InternalAlloc", MarshalNative::GCHandleInternalAlloc)
     FCFuncElement("InternalFree", MarshalNative::GCHandleInternalFree)
@@ -1388,12 +1384,7 @@ FCClassElement("GCHandle", "System.Runtime.InteropServices", gGCHandleFuncs)
 FCClassElement("IEnumerable", "System.Collections", gStdMngIEnumerableFuncs)
 FCClassElement("IEnumerator", "System.Collections", gStdMngIEnumeratorFuncs)
 FCClassElement("IExpando", "System.Runtime.InteropServices.Expando", gStdMngIExpandoFuncs)
-#endif // FEATURE_COMINTEROP
-FCClassElement("ILCover", "System.Coverage", gCoverageFuncs)
-#ifdef FEATURE_COMINTEROP
 FCClassElement("IReflect", "System.Reflection", gStdMngIReflectFuncs)
-#endif
-#ifdef FEATURE_COMINTEROP
 FCClassElement("InterfaceMarshaler", "System.StubHelpers", gInterfaceMarshalerFuncs)
 #endif
 FCClassElement("Interlocked", "System.Threading", gInterlockedFuncs)
diff --git a/src/coreclr/src/vm/mscorlib.cpp b/src/coreclr/src/vm/mscorlib.cpp
index 5deaaef..d1f48bd 100644
--- a/src/coreclr/src/vm/mscorlib.cpp
+++ b/src/coreclr/src/vm/mscorlib.cpp
@@ -72,8 +72,6 @@
 #include "mdaassistants.h"
 #endif
 
-#include "coverage.h"
-
 #ifdef FEATURE_COMINTEROP
 #include "variant.h"
 #include "oavariant.h"
-- 
2.7.4