Merge pull request #4728 from dotnet/nmirror

Merge nmirror to master

2 files changed, 0 insertions, 34 deletions

diff --git a/src/Native/Runtime/DebugFuncEval.cpp b/src/Native/Runtime/DebugFuncEval.cpp
index b9226a53b..ae920a46a 100644
--- a/src/Native/Runtime/DebugFuncEval.cpp
+++ b/src/Native/Runtime/DebugFuncEval.cpp
@@ -7,18 +7,12 @@
 #include "DebugFuncEval.h"
 
 GVAL_IMPL_INIT(UInt32, g_FuncEvalMode, 0);
-GVAL_IMPL_INIT(UInt64, g_FuncEvalTarget, 0);
 GVAL_IMPL_INIT(UInt32, g_FuncEvalParameterBufferSize, 0);
 GVAL_IMPL_INIT(UInt64, g_MostRecentFuncEvalHijackInstructionPointer, 0);
 GPTR_IMPL_INIT(PTR_VOID, g_HighLevelDebugFuncEvalAbortHelperAddr, 0);
 
 #ifndef DACCESS_COMPILE
 
-/* static */ void* DebugFuncEval::GetFuncEvalTarget()
-{
-    return (void*)g_FuncEvalTarget;
-}
-
 /* static */ UInt32 DebugFuncEval::GetFuncEvalParameterBufferSize()
 {
     return g_FuncEvalParameterBufferSize;
@@ -45,21 +39,6 @@ GPTR_IMPL_INIT(PTR_VOID, g_HighLevelDebugFuncEvalAbortHelperAddr, 0);
 }
 
 /// <summary>
-/// Retrieve the global FuncEval target address.
-/// </summary>
-/// <remarks>
-/// During debugging, if a FuncEval is requested, 
-/// the func eval infrastructure needs to know which function to call, and
-/// the C# supporting code will call this API to obtain the FuncEval target address.
-/// By that time, the value should have been set through the UpdateFuncEvalTarget() method 
-/// on the ISosRedhawk7 interface.
-/// </remarks>
-EXTERN_C REDHAWK_API void* __cdecl RhpGetFuncEvalTargetAddress()
-{
-    return DebugFuncEval::GetFuncEvalTarget();
-}
-
-/// <summary>
 /// Retrieve the global FuncEval parameter buffer size.
 /// </summary>
 /// <remarks>
diff --git a/src/Native/Runtime/DebugFuncEval.h b/src/Native/Runtime/DebugFuncEval.h
index 87f48ba3a..20315c35a 100644
--- a/src/Native/Runtime/DebugFuncEval.h
+++ b/src/Native/Runtime/DebugFuncEval.h
@@ -21,19 +21,6 @@ class DebugFuncEval
 {
 public:
     /// <summary>
-    /// Retrieve the global FuncEval target address
-    /// </summary>
-    /// <remarks>
-    /// During debugging, if a FuncEval is requested, 
-    /// The func eval infrastructure needs to know which function to call, and
-    /// It will call this API to obtain the target address.
-    /// By the time, the value should have been set through the UpdateFuncEvalTarget() method 
-    /// on the ISosRedhawk7 interface.
-    /// </remarks>
-    static void* GetFuncEvalTarget();
-
-
-    /// <summary>
     /// Retrieve the global FuncEval parameter buffer size.
     /// </summary>
     /// <remarks>