diff options
| author | Mike McLaughlin <mikem@microsoft.com> | 2018-03-17 11:12:21 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-17 11:12:21 -0700 |
| commit | 828c6c3306e74d2a3c140496d3c1c0587b3f4682 (patch) | |
| tree | ea65e1f5adc282155cbbecd68afbaa81397494e6 /src/debug/daccess | |
| parent | d25e794bfd7c6c31247450cb48c4c8c561e771c1 (diff) | |
| download | coreclr-828c6c3306e74d2a3c140496d3c1c0587b3f4682.tar.gz coreclr-828c6c3306e74d2a3c140496d3c1c0587b3f4682.tar.bz2 coreclr-828c6c3306e74d2a3c140496d3c1c0587b3f4682.zip | |
Add environment variable (COMPlus_EnableDiagnostics) to disable debugging and profiling. (#16141)
This reverts commit e9985126acb0f1efd7c780faac4e66bc798b73c0.
Diffstat (limited to 'src/debug/daccess')
| -rw-r--r-- | src/debug/daccess/enummem.cpp | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/src/debug/daccess/enummem.cpp b/src/debug/daccess/enummem.cpp index 007af0ba4b..50bf408dd6 100644 --- a/src/debug/daccess/enummem.cpp +++ b/src/debug/daccess/enummem.cpp @@ -273,10 +273,10 @@ HRESULT ClrDataAccess::EnumMemCLRStatic(IN CLRDataEnumMemoryFlags flags) CATCH_ALL_EXCEPT_RETHROW_COR_E_OPERATIONCANCELLED( g_runtimeLoadedBaseAddress.EnumMem(); ) #endif // !FEATURE_PAL - // These are the structures that are pointed by global pointers and we care. - // Some may reside in heap and some may reside as a static byte array in mscorwks.dll - // That is ok. We will report them explicitly. - // + // These are the structures that are pointed by global pointers and we care. + // Some may reside in heap and some may reside as a static byte array in mscorwks.dll + // That is ok. We will report them explicitly. + // CATCH_ALL_EXCEPT_RETHROW_COR_E_OPERATIONCANCELLED( g_pConfig.EnumMem(); ) CATCH_ALL_EXCEPT_RETHROW_COR_E_OPERATIONCANCELLED( g_pPredefinedArrayTypes.EnumMem(); ) CATCH_ALL_EXCEPT_RETHROW_COR_E_OPERATIONCANCELLED( g_pObjectClass.EnumMem(); ) @@ -295,14 +295,17 @@ HRESULT ClrDataAccess::EnumMemCLRStatic(IN CLRDataEnumMemoryFlags flags) CATCH_ALL_EXCEPT_RETHROW_COR_E_OPERATIONCANCELLED( g_pFreeObjectMethodTable.EnumMem(); ) CATCH_ALL_EXCEPT_RETHROW_COR_E_OPERATIONCANCELLED( g_fHostConfig.EnumMem(); ) - // These two static pointers are pointed to static data of byte[] - // then run constructor in place - // + // These two static pointers are pointed to static data of byte[] + // then run constructor in place + // CATCH_ALL_EXCEPT_RETHROW_COR_E_OPERATIONCANCELLED( SystemDomain::m_pSystemDomain.EnumMem(); ) CATCH_ALL_EXCEPT_RETHROW_COR_E_OPERATIONCANCELLED( SharedDomain::m_pSharedDomain.EnumMem(); ) CATCH_ALL_EXCEPT_RETHROW_COR_E_OPERATIONCANCELLED( g_pDebugger.EnumMem(); ) CATCH_ALL_EXCEPT_RETHROW_COR_E_OPERATIONCANCELLED( g_pEEInterface.EnumMem(); ) - CATCH_ALL_EXCEPT_RETHROW_COR_E_OPERATIONCANCELLED( g_pDebugInterface.EnumMem(); ) + if (g_pDebugInterface != nullptr) + { + CATCH_ALL_EXCEPT_RETHROW_COR_E_OPERATIONCANCELLED(g_pDebugInterface.EnumMem(); ) + } CATCH_ALL_EXCEPT_RETHROW_COR_E_OPERATIONCANCELLED( g_pEEDbgInterfaceImpl.EnumMem(); ) CATCH_ALL_EXCEPT_RETHROW_COR_E_OPERATIONCANCELLED( g_CORDebuggerControlFlags.EnumMem(); ) CATCH_ALL_EXCEPT_RETHROW_COR_E_OPERATIONCANCELLED( g_Mscorlib.EnumMem(); ) |