From 3448a0d827e5f19947fb81d29834951bbae045a0 Mon Sep 17 00:00:00 2001
From: Andrew Au <andrewau@microsoft.com>
Date: Fri, 10 Aug 2018 15:17:01 -0700
Subject: [PATCH] Use proper macros for GetContainingObject()

Commit migrated from https://github.com/dotnet/coreclr/commit/31e996f77aad66847eaeb97e3e163ae0e14c4ae3
---
 src/coreclr/src/debug/di/process.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/coreclr/src/debug/di/process.cpp b/src/coreclr/src/debug/di/process.cpp
index 5225205..0cdb69a 100644
--- a/src/coreclr/src/debug/di/process.cpp
+++ b/src/coreclr/src/debug/di/process.cpp
@@ -2534,12 +2534,12 @@ COM_METHOD CordbProcess::GetContainingObject(CORDB_ADDRESS interiorPointer, ICor
 
     HRESULT hr = S_OK;
     // TODO, databp, I don't know what I am doing, NO_LOCK doesn't sound right
-    PUBLIC_API_NO_LOCK_BEGIN(this);
+    PUBLIC_API_ENTRY(this);
+    FAIL_IF_NEUTERED(this);
+    ATT_REQUIRE_STOPPED_MAY_FAIL(this);
 
     *ppContainingObject = nullptr;
 
-    RSLockHolder ch(this->GetStopGoLock());
-
     DebuggerIPCEvent      event;
     this->InitIPCEvent(&event,
         DB_IPCE_GET_CONTAINER,
@@ -2565,7 +2565,6 @@ COM_METHOD CordbProcess::GetContainingObject(CORDB_ADDRESS interiorPointer, ICor
         }
     }
 
-    PUBLIC_API_END(hr);
     return hr;
 }
 
-- 
2.7.4