Mark the profiler attach thread during attach

1 files changed, 16 insertions, 5 deletions

diff --git a/src/vm/profilerdiagnosticprotocolhelper.cpp b/src/vm/profilerdiagnosticprotocolhelper.cpp
index 3f81b51226..3f9691206c 100644
--- a/src/vm/profilerdiagnosticprotocolhelper.cpp
+++ b/src/vm/profilerdiagnosticprotocolhelper.cpp
@@ -102,12 +102,23 @@ void ProfilerDiagnosticProtocolHelper::AttachProfiler(DiagnosticsIpc::IpcMessage
         hr = CORPROF_E_RUNTIME_UNINITIALIZED;
         goto ErrExit;
     }
+    
+    // Certain actions are only allowable during attach, and this flag is how we track it.
+    ClrFlsSetThreadType(ThreadType_ProfAPI_Attach);
+
+    EX_TRY
+    {
+        hr = ProfilingAPIUtility::LoadProfilerForAttach(&payload->profilerGuid,
+                                                        payload->pwszProfilerPath,
+                                                        payload->pClientData,
+                                                        payload->cbClientData,
+                                                        payload->dwAttachTimeout);
+    }
+    EX_CATCH_HRESULT(hr);
+
+    // Clear the flag so this thread isn't permanently marked as the attach thread.
+    ClrFlsClearThreadType(ThreadType_ProfAPI_Attach);
 
-    hr = ProfilingAPIUtility::LoadProfilerForAttach(&payload->profilerGuid,
-                                                    payload->pwszProfilerPath,
-                                                    payload->pClientData,
-                                                    payload->cbClientData,
-                                                    payload->dwAttachTimeout);
 ErrExit:
     if (hr != S_OK)
     {