Merge pull request #3850 from dotnet-bot/from-tfs

Merge changes from TFS

3 files changed, 5 insertions, 5 deletions

diff --git a/src/Native/Runtime/DebuggerHook.cpp b/src/Native/Runtime/DebuggerHook.cpp
index 59042d912..dafa56b4b 100644
--- a/src/Native/Runtime/DebuggerHook.cpp
+++ b/src/Native/Runtime/DebuggerHook.cpp
@@ -49,7 +49,7 @@ GVAL_IMPL_INIT(UInt32, g_numGcProtectionRequests, 0);
             }
         }
 
-        // TODO: Consider an optimization to eliminate this message when they is nothing required from the
+        // TODO, FuncEval, consider an optimization to eliminate this message when they is nothing required from the
         // debugger side to fill
 
         command.commandCode = DebuggerGcProtectionMessage::ConservativeReportingBufferReady;
@@ -101,8 +101,8 @@ GVAL_IMPL_INIT(UInt32, g_numGcProtectionRequests, 0);
     s_debuggerProtectedBuffers = new (std::nothrow) DebuggerProtectedBufferList();
     if (s_debuggerProtectedBuffers == nullptr)
     {
-        // TODO: We cannot handle the debugger request to protect a buffer (we have to break our promise)
-        // TODO: We need to figure out how to communicate this broken promise to the debugger
+        // TODO, FuncEval, we cannot handle the debugger request to protect a buffer (we have to break our promise)
+        // TODO, FuncEval, we need to figure out how to communicate this broken promise to the debugger
     }
     else
     {
diff --git a/src/Native/Runtime/StackFrameIterator.cpp b/src/Native/Runtime/StackFrameIterator.cpp
index 34f2aa0e4..86de077a1 100644
--- a/src/Native/Runtime/StackFrameIterator.cpp
+++ b/src/Native/Runtime/StackFrameIterator.cpp
@@ -100,7 +100,7 @@ PTR_PInvokeTransitionFrame GetPInvokeTransitionFrame(PTR_VOID pTransitionFrame)
     return static_cast<PTR_PInvokeTransitionFrame>(pTransitionFrame);
 }
 
-// TODO: Remove the assumption that there is only 1 func eval in progress
+// TODO, FuncEval, remove the assumption that there is only 1 func eval in progress
 GVAL_IMPL_INIT(UInt64, g_debuggermagic, 0);
 
 StackFrameIterator::StackFrameIterator(Thread * pThreadToWalk, PTR_VOID pInitialTransitionFrame)
diff --git a/src/System.Private.TypeLoader/src/Internal/Runtime/TypeLoader/DebugFuncEval.cs b/src/System.Private.TypeLoader/src/Internal/Runtime/TypeLoader/DebugFuncEval.cs
index 624c41fc1..cdf1c7b0a 100644
--- a/src/System.Private.TypeLoader/src/Internal/Runtime/TypeLoader/DebugFuncEval.cs
+++ b/src/System.Private.TypeLoader/src/Internal/Runtime/TypeLoader/DebugFuncEval.cs
@@ -209,7 +209,7 @@ namespace Internal.Runtime.TypeLoader
                 LocalVariableType[] argumentTypes = new LocalVariableType[parameters.Length];
                 for (int i = 0; i < parameters.Length; i++)
                 {
-                    // TODO: What these false really means? Need to make sure our format contains those information
+                    // TODO, FuncEval, what these false really means? Need to make sure our format contains those information
                     argumentTypes[i] = new LocalVariableType(typesAndValues.types[i], false, false);
                 }