Review feedback.

src/coreclr/interop/inc/interoplib.h

@@ -92,7 +92,7 @@ namespace InteropLib
 
          // Destroy the supplied wrapper.
         // Optionally notify the wrapper of collection at the same time.
-        void DestroyWrapperForExternal(_In_ void* context, _In_ bool notifyIsCollected = false) noexcept;
+        void DestroyWrapperForExternal(_In_ void* context, _In_ bool notifyIsBeingCollected = false) noexcept;
 
         // Separate the supplied wrapper from the tracker runtime.
         void SeparateWrapperFromTrackerRuntime(_In_ void* context) noexcept;

src/coreclr/interop/interoplib.cpp

@@ -185,14 +185,14 @@ namespace InteropLib
             }
         }
 
-        void DestroyWrapperForExternal(_In_ void* contextMaybe, _In_ bool notifyIsCollected) noexcept
+        void DestroyWrapperForExternal(_In_ void* contextMaybe, _In_ bool notifyIsBeingCollected) noexcept
         {
             NativeObjectWrapperContext* context = NativeObjectWrapperContext::MapFromRuntimeContext(contextMaybe);
 
             // A caller should not be destroying a context without knowing if the context is valid.
             _ASSERTE(context != nullptr);
 
-            if (notifyIsCollected)
+            if (notifyIsBeingCollected)
                 NotifyWrapperForExternalIsBeingCollected(contextMaybe);
 
              NativeObjectWrapperContext::Destroy(context);

src/coreclr/vm/interoplibinterface_comwrappers.cpp

@@ -179,7 +179,7 @@ namespace
                 // We also request collection notification since this holder is presently
                 // only used for new activation of wrappers therefore the notification won't occur
                 // at the typical time of before finalization.
-                InteropLib::Com::DestroyWrapperForExternal(Result.Context, /* notifyIsCollected */ true);
+                InteropLib::Com::DestroyWrapperForExternal(Result.Context, /* notifyIsBeingCollected */ true);
             }
         }
         InteropLib::Com::ExternalWrapperResult* operator&()

src/tests/Interop/COM/ComWrappers/Common.cs

@@ -157,8 +157,11 @@ public static AllocationCountResult CountTrackerObjectAllocations()
         [DllImport(nameof(MockReferenceTrackerRuntime))]
         extern public static int TrackerTarget_ReleaseFromReferenceTracker(IntPtr ptr);
 
+        // Suppressing the GC transition here as we want to make sure we are in-sync
+        // with the GC which is setting the connected value.
+        [SuppressGCTransition]
         [DllImport(nameof(MockReferenceTrackerRuntime))]
-        extern public static int IsWrapperConnected(IntPtr instance);
+        extern public static byte IsTrackerObjectConnected(IntPtr instance);
     }
 
     [Guid("42951130-245C-485E-B60B-4ED4254256F8")]
@@ -222,7 +225,7 @@ static IntPtr CreateInstance(IntPtr outer, out IntPtr inner)
             }
             else
             {
-                int isConnected = MockReferenceTrackerRuntime.IsWrapperConnected(this.classNative.Instance);
+                byte isConnected = MockReferenceTrackerRuntime.IsTrackerObjectConnected(this.classNative.Instance);
                 if (isConnected != 0)
                 {
                     throw new Exception("TrackerObject should be disconnected prior to finalization");

src/tests/Interop/COM/ComWrappers/MockReferenceTrackerRuntime/ReferenceTrackerRuntime.cpp

@@ -551,10 +551,10 @@ extern "C" DLL_EXPORT int STDMETHODCALLTYPE Trigger_NotifyEndOfReferenceTracking
     return TrackerRuntimeManager.NotifyEndOfReferenceTrackingOnThread();
 }
 
-extern "C" DLL_EXPORT BOOL STDMETHODCALLTYPE IsWrapperConnected(IUnknown* inst)
+extern "C" DLL_EXPORT bool STDMETHODCALLTYPE IsTrackerObjectConnected(IUnknown* inst)
 {
     auto trackerObject = reinterpret_cast<TrackerObject::TrackerObjectImpl*>(inst);
-    return trackerObject->IsConnected() ? TRUE : FALSE;
+    return trackerObject->IsConnected();
 }
 
 extern "C" DLL_EXPORT void* STDMETHODCALLTYPE TrackerTarget_AddRefFromReferenceTrackerAndReturn(IUnknown *obj)