Rename COM+ in code comments (#111097)

* Rename obvious cases to CLR

* Code/path impact

* Variant

* Mentions of CLR 1.0

* IL impact

* Unused ntimage definition

* Avoid 'CLR signature'

* Apply suggestions from code review

Co-authored-by: Jan Kotas <[email protected]>

src/coreclr/System.Private.CoreLib/src/System/Diagnostics/Debugger.cs

@@ -68,7 +68,7 @@ static void NotifyOfCrossThreadDependencySlow()
         // Constants representing the importance level of messages to be logged.
         //
         // An attached debugger can enable or disable which messages will
-        // actually be reported to the user through the COM+ debugger
+        // actually be reported to the user through the debugger
         // services API.  This info is communicated to the runtime so only
         // desired events are actually reported to the debugger.
         //

src/coreclr/System.Private.CoreLib/src/System/Exception.CoreCLR.cs

@@ -163,14 +163,14 @@ internal void RestoreDispatchState(in DispatchState dispatchState)
         private string? _source;         // Mainly used by VB.
         private UIntPtr _ipForWatsonBuckets; // Used to persist the IP for Watson Bucketing
         private readonly IntPtr _xptrs;             // Internal EE stuff
-        private readonly int _xcode = _COMPlusExceptionCode;             // Internal EE stuff
+        private readonly int _xcode = EXCEPTION_COMPLUS;             // Internal EE stuff
 #pragma warning restore CA1823, 414
 
         // @MANAGED: HResult is used from within the EE!  Rename with care - check VM directory
         private int _HResult;       // HResult
 
         // See src\inc\corexcep.h's EXCEPTION_COMPLUS definition:
-        private const int _COMPlusExceptionCode = unchecked((int)0xe0434352);   // Win32 exception code for COM+ exceptions
+        private const int EXCEPTION_COMPLUS = unchecked((int)0xe0434352);   // Win32 exception code for CLR exceptions
 
         private bool HasBeenThrown => _stackTrace != null;
 

src/coreclr/System.Private.CoreLib/src/System/OleAutBinder.cs

@@ -33,7 +33,7 @@ public override object ChangeType(object value, Type type, CultureInfo? cultureI
             }
 
             // If we are trying to convert from an object to another type then we don't
-            // need the OLEAUT change type, we can just use the normal COM+ mechanisms.
+            // need the OLEAUT change type, we can just use the normal CLR mechanisms.
             if (!type.IsPrimitive && type.IsInstanceOfType(value))
             {
 #if DISPLAY_DEBUG_INFO

src/coreclr/debug/di/process.cpp

@@ -7184,7 +7184,7 @@ HRESULT CordbProcess::WriteMemory(CORDB_ADDRESS address, DWORD size,
             CONSISTENCY_CHECK_MSGF(false,
                 ("You're using ICorDebugProcess::WriteMemory() to write an 'int3' (1 byte 0xCC) at address 0x%p.\n"
                 "If you're trying to set a breakpoint, you should be using ICorDebugProcess::SetUnmanagedBreakpoint() instead.\n"
-                "(This assert is only enabled under the COM+ knob DbgCheckInt3.)\n",
+                "(This assert is only enabled under the CLR knob DbgCheckInt3.)\n",
                 CORDB_ADDRESS_TO_PTR(address)));
         }
 #endif // TARGET_X86 || TARGET_AMD64
@@ -7201,7 +7201,7 @@ HRESULT CordbProcess::WriteMemory(CORDB_ADDRESS address, DWORD size,
                 ("You're using ICorDebugProcess::WriteMemory() to write an 'opcode (0x%x)' at address 0x%p.\n"
                 "There's already a native patch at that address from ICorDebugProcess::SetUnmanagedBreakpoint().\n"
                 "If you're trying to remove the breakpoint, use ICDProcess::ClearUnmanagedBreakpoint() instead.\n"
-                "(This assert is only enabled under the COM+ knob DbgCheckInt3.)\n",
+                "(This assert is only enabled under the CLR knob DbgCheckInt3.)\n",
                 (DWORD) (buffer[0]), CORDB_ADDRESS_TO_PTR(address)));
             }
         }

src/coreclr/debug/di/rsthread.cpp

@@ -4075,7 +4075,7 @@ void CordbUnmanagedThread::SetupForSkipBreakpoint(NativePatch * pNativePatch)
     if (fTrapOnSkip)
     {
         CONSISTENCY_CHECK_MSGF(false, ("The CLR is skipping a native BP at %p on thread 0x%x (%d)."
-            "\nYou're getting this notification in debug builds b/c you have com+ var 'DbgTrapOnSkip' enabled.",
+            "\nYou're getting this notification in debug builds b/c you have CLR config 'DbgTrapOnSkip' enabled.",
             pNativePatch->pAddress, this->m_id, this->m_id));
 
         // We skipped this BP b/c IsCantStop was true. For debugging convenience, call IsCantStop here

src/coreclr/debug/di/symbolinfo.cpp

@@ -584,7 +584,7 @@ STDMETHODIMP SymbolInfo::EnumPermissionSets (          // S_OK, S_FALSE, or erro
 STDMETHODIMP SymbolInfo::FindMember (
     mdTypeDef   td,                     // [IN] given typedef
     LPCWSTR     szName,                 // [IN] member name
-    PCCOR_SIGNATURE pvSigBlob,          // [IN] point to a blob value of CLR signature
+    PCCOR_SIGNATURE pvSigBlob,          // [IN] point to a blob value of signature
     ULONG       cbSigBlob,              // [IN] count of bytes in the signature blob
     mdToken     *pmb)             // [OUT] matching memberdef
 {
@@ -595,7 +595,7 @@ STDMETHODIMP SymbolInfo::FindMember (
 STDMETHODIMP SymbolInfo::FindMethod (
     mdTypeDef   td,                     // [IN] given typedef
     LPCWSTR     szName,                 // [IN] member name
-    PCCOR_SIGNATURE pvSigBlob,          // [IN] point to a blob value of CLR signature
+    PCCOR_SIGNATURE pvSigBlob,          // [IN] point to a blob value of signature
     ULONG       cbSigBlob,              // [IN] count of bytes in the signature blob
     mdMethodDef *pmb)             // [OUT] matching memberdef
 {
@@ -606,7 +606,7 @@ STDMETHODIMP SymbolInfo::FindMethod (
 STDMETHODIMP SymbolInfo::FindField (
     mdTypeDef   td,                     // [IN] given typedef
     LPCWSTR     szName,                 // [IN] member name
-    PCCOR_SIGNATURE pvSigBlob,          // [IN] point to a blob value of CLR signature
+    PCCOR_SIGNATURE pvSigBlob,          // [IN] point to a blob value of signature
     ULONG       cbSigBlob,              // [IN] count of bytes in the signature blob
     mdFieldDef  *pmb)             // [OUT] matching memberdef
 {
@@ -617,7 +617,7 @@ STDMETHODIMP SymbolInfo::FindField (
 STDMETHODIMP SymbolInfo::FindMemberRef (
     mdTypeRef   td,                     // [IN] given typeRef
     LPCWSTR     szName,                 // [IN] member name
-    PCCOR_SIGNATURE pvSigBlob,          // [IN] point to a blob value of CLR signature
+    PCCOR_SIGNATURE pvSigBlob,          // [IN] point to a blob value of signature
     ULONG       cbSigBlob,              // [IN] count of bytes in the signature blob
     mdMemberRef *pmr)             // [OUT] matching memberref
 {
@@ -1073,7 +1073,7 @@ STDMETHODIMP SymbolInfo::DefineMethod (                // S_OK or error.
     mdTypeDef   td,                     // Parent TypeDef
     LPCWSTR     szName,                 // Name of member
     DWORD       dwMethodFlags,          // Member attributes
-    PCCOR_SIGNATURE pvSigBlob,          // [IN] point to a blob value of CLR signature
+    PCCOR_SIGNATURE pvSigBlob,          // [IN] point to a blob value of signature
     ULONG       cbSigBlob,              // [IN] count of bytes in the signature blob
     ULONG       ulCodeRVA,
     DWORD       dwImplFlags,
@@ -1117,7 +1117,7 @@ STDMETHODIMP SymbolInfo::DefineImportType (            // S_OK or error.
 STDMETHODIMP SymbolInfo::DefineMemberRef (             // S_OK or error
     mdToken     tkImport,               // [IN] ClassRef or ClassDef importing a member.
     LPCWSTR     szName,                 // [IN] member's name
-    PCCOR_SIGNATURE pvSigBlob,          // [IN] point to a blob value of CLR signature
+    PCCOR_SIGNATURE pvSigBlob,          // [IN] point to a blob value of signature
     ULONG       cbSigBlob,              // [IN] count of bytes in the signature blob
     mdMemberRef *pmr)             // [OUT] memberref token
 {
@@ -1351,7 +1351,7 @@ STDMETHODIMP SymbolInfo::DefineField (                 // S_OK or error.
     mdTypeDef   td,                     // Parent TypeDef
     LPCWSTR     szName,                 // Name of member
     DWORD       dwFieldFlags,           // Member attributes
-    PCCOR_SIGNATURE pvSigBlob,          // [IN] point to a blob value of CLR signature
+    PCCOR_SIGNATURE pvSigBlob,          // [IN] point to a blob value of signature
     ULONG       cbSigBlob,              // [IN] count of bytes in the signature blob
     DWORD       dwCPlusTypeFlag,        // [IN] flag for value type. selected ELEMENT_TYPE_*
     void const  *pValue,                // [IN] constant value

src/coreclr/debug/di/symbolinfo.h

@@ -216,28 +216,28 @@ class SymbolInfo:  IMetaDataEmit,  IMetaDataImport
     STDMETHOD(FindMember)(
         mdTypeDef   td,                     // [IN] given typedef
         LPCWSTR     szName,                 // [IN] member name
-        PCCOR_SIGNATURE pvSigBlob,          // [IN] point to a blob value of CLR signature
+        PCCOR_SIGNATURE pvSigBlob,          // [IN] point to a blob value of signature
         ULONG       cbSigBlob,              // [IN] count of bytes in the signature blob
         mdToken     *pmb);             // [OUT] matching memberdef
 
     STDMETHOD(FindMethod)(
         mdTypeDef   td,                     // [IN] given typedef
         LPCWSTR     szName,                 // [IN] member name
-        PCCOR_SIGNATURE pvSigBlob,          // [IN] point to a blob value of CLR signature
+        PCCOR_SIGNATURE pvSigBlob,          // [IN] point to a blob value of signature
         ULONG       cbSigBlob,              // [IN] count of bytes in the signature blob
         mdMethodDef *pmb);             // [OUT] matching memberdef
 
     STDMETHOD(FindField)(
         mdTypeDef   td,                     // [IN] given typedef
         LPCWSTR     szName,                 // [IN] member name
-        PCCOR_SIGNATURE pvSigBlob,          // [IN] point to a blob value of CLR signature
+        PCCOR_SIGNATURE pvSigBlob,          // [IN] point to a blob value of signature
         ULONG       cbSigBlob,              // [IN] count of bytes in the signature blob
         mdFieldDef  *pmb);             // [OUT] matching memberdef
 
     STDMETHOD(FindMemberRef)(
         mdTypeRef   td,                     // [IN] given typeRef
         LPCWSTR     szName,                 // [IN] member name
-        PCCOR_SIGNATURE pvSigBlob,          // [IN] point to a blob value of CLR signature
+        PCCOR_SIGNATURE pvSigBlob,          // [IN] point to a blob value of signature
         ULONG       cbSigBlob,              // [IN] count of bytes in the signature blob
         mdMemberRef *pmr);             // [OUT] matching memberref
 
@@ -544,7 +544,7 @@ class SymbolInfo:  IMetaDataEmit,  IMetaDataImport
         mdTypeDef   td,                     // Parent TypeDef
         LPCWSTR     szName,                 // Name of member
         DWORD       dwMethodFlags,          // Member attributes
-        PCCOR_SIGNATURE pvSigBlob,          // [IN] point to a blob value of CLR signature
+        PCCOR_SIGNATURE pvSigBlob,          // [IN] point to a blob value of signature
         ULONG       cbSigBlob,              // [IN] count of bytes in the signature blob
         ULONG       ulCodeRVA,
         DWORD       dwImplFlags,
@@ -572,7 +572,7 @@ class SymbolInfo:  IMetaDataEmit,  IMetaDataImport
     STDMETHOD(DefineMemberRef)(             // S_OK or error
         mdToken     tkImport,               // [IN] ClassRef or ClassDef importing a member.
         LPCWSTR     szName,                 // [IN] member's name
-        PCCOR_SIGNATURE pvSigBlob,          // [IN] point to a blob value of CLR signature
+        PCCOR_SIGNATURE pvSigBlob,          // [IN] point to a blob value of signature
         ULONG       cbSigBlob,              // [IN] count of bytes in the signature blob
         mdMemberRef *pmr);             // [OUT] memberref token
 
@@ -716,7 +716,7 @@ class SymbolInfo:  IMetaDataEmit,  IMetaDataImport
         mdTypeDef   td,                     // Parent TypeDef
         LPCWSTR     szName,                 // Name of member
         DWORD       dwFieldFlags,           // Member attributes
-        PCCOR_SIGNATURE pvSigBlob,          // [IN] point to a blob value of CLR signature
+        PCCOR_SIGNATURE pvSigBlob,          // [IN] point to a blob value of signature
         ULONG       cbSigBlob,              // [IN] count of bytes in the signature blob
         DWORD       dwCPlusTypeFlag,        // [IN] flag for value type. selected ELEMENT_TYPE_*
         void const  *pValue,                // [IN] constant value

src/coreclr/debug/ee/debugger.cpp

@@ -2074,7 +2074,7 @@ HRESULT Debugger::StartupPhase2(Thread * pThread)
                 SString szName(W("DebuggerStressStartup"));
                 SString szDescription(W("MDA used for debugger-stress scenario. This is fired to trigger a jit-attach")
                     W("to allow us to attach a debugger to any managed app that starts up.")
-                    W("This MDA is only fired when the 'DbgAttachOnStartup' COM+ knob/reg-key is set on checked builds."));
+                    W("This MDA is only fired when the 'DbgAttachOnStartup' CLR knob/reg-key is set on checked builds."));
                 SString szXML(W("<xml>See the description</xml>"));
 
                 SendMDANotification(
@@ -5423,7 +5423,7 @@ bool Debugger::IsJMCMethod(Module* pModule, mdMethodDef tkMethod)
 /******************************************************************************
  * Called by Runtime when on a 1st chance Native Exception.
  * This is likely when we hit a breakpoint / single-step.
- * This is called for all native exceptions (except COM+) on managed threads,
+ * This is called for all native exceptions (except CLR) on managed threads,
  * regardless of whether the debugger is attached.
  ******************************************************************************/
 bool Debugger::FirstChanceNativeException(EXCEPTION_RECORD *exception,

src/coreclr/debug/ee/debugger.h

@@ -5,7 +5,7 @@
 //
 
 //
-// Header file for Runtime Controller classes of the COM+ Debugging Services.
+// Header file for Runtime Controller classes of the CLR Debugging Services.
 //
 //*****************************************************************************
 

src/coreclr/dlls/mscordbi/mscordbi.cpp

@@ -3,7 +3,7 @@
 //*****************************************************************************
 // MSCorDBI.cpp
 //
-// COM+ Debugging Services -- Debugger Interface DLL
+// CLR Debugging Services -- Debugger Interface DLL
 //
 // Dll* routines for entry points, and support for COM framework.
 //

src/coreclr/dlls/mscorpe/ceefilegenwriter.cpp

@@ -14,7 +14,7 @@
 #include "corerror.h"
 #include <posterror.h>
 
-// The following block contains a template for the default entry point stubs of a COM+
+// The following block contains a template for the default entry point stubs of a CLR
 // IL only program.  One can emit these stubs (with some fix-ups) and make
 // the code supplied the entry point value for the image.  The fix-ups will
 // in turn cause mscoree.dll to be loaded and the correct entry point to be

src/coreclr/ilasm/asmparse.h

@@ -1,7 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 /**************************************************************************/
-/* asmParse is basically a wrapper around a YACC grammer COM+ assembly  */
+/* asmParse is basically a wrapper around a YACC grammer IL assembly  */
 
 #ifndef asmparse_h
 #define asmparse_h

src/coreclr/ilasm/assem.cpp

@@ -5,7 +5,7 @@
 //
 
 //
-// COM+ IL assembler
+// CLR IL assembler
 //
 #include "ilasmpch.h"
 

src/coreclr/ildasm/ceeload.cpp

@@ -186,7 +186,7 @@ BOOL PELoader::getCOMHeader(IMAGE_COR20_HEADER **ppCorHeader)
     {
         PIMAGE_NT_HEADERS32     pImageHeader;
         // Get the image header from the image, then get the directory location
-        // of the COM+ header which may or may not be filled out.
+        // of the CLR header which may or may not be filled out.
         pImageHeader = (PIMAGE_NT_HEADERS32)Cor_RtlImageNtHeader(m_hMod, (ULONG) m_FileSize);
         PREFIX_ASSUME(pImageHeader != NULL);
         pSectionHeader = (PIMAGE_SECTION_HEADER) Cor_RtlImageRvaToVa32(pImageHeader, (PBYTE)m_hMod,
@@ -198,7 +198,7 @@ BOOL PELoader::getCOMHeader(IMAGE_COR20_HEADER **ppCorHeader)
         PIMAGE_NT_HEADERS64     pImageHeader;
 
         // Get the image header from the image, then get the directory location
-        // of the COM+ header which may or may not be filled out.
+        // of the CLR header which may or may not be filled out.
         pImageHeader = (PIMAGE_NT_HEADERS64)Cor_RtlImageNtHeader(m_hMod, (ULONG) m_FileSize);
         PREFIX_ASSUME(pImageHeader != NULL);
         pSectionHeader = (PIMAGE_SECTION_HEADER) Cor_RtlImageRvaToVa64(pImageHeader, (PBYTE)m_hMod,
@@ -212,7 +212,7 @@ BOOL PELoader::getCOMHeader(IMAGE_COR20_HEADER **ppCorHeader)
         *ppCorHeader = (IMAGE_COR20_HEADER *) pSectionHeader;
         return TRUE;
     }
-    // If there is no COM+ Data in this image, return false.
+    // If there is no CLR Data in this image, return false.
     else
         return FALSE;
 }
@@ -225,7 +225,7 @@ BOOL PELoader::getVAforRVA(DWORD rva,void **ppva)
     if (m_bIsPE32)
     {
         // Get the image header from the image, then get the directory location
-        // of the COM+ header which may or may not be filled out.
+        // of the CLR header which may or may not be filled out.
         PIMAGE_NT_HEADERS32     pImageHeader;
         pImageHeader = (PIMAGE_NT_HEADERS32) Cor_RtlImageNtHeader(m_hMod, (ULONG) m_FileSize);
         PREFIX_ASSUME(pImageHeader != NULL);
@@ -247,7 +247,7 @@ BOOL PELoader::getVAforRVA(DWORD rva,void **ppva)
         *ppva = pSectionHeader;
         return TRUE;
     }
-    // If there is no COM+ Data in this image, return false.
+    // If there is no CLR Data in this image, return false.
     else
         return FALSE;
 }

src/coreclr/ildasm/windasm.cpp

@@ -4,8 +4,8 @@
 /************************************************************************************************
  *                                                                                              *
  *  File:    winmain.cpp                                                                        *
- *                                                         *
- *  Purpose: Main program for graphic COM+ 2.0 disassembler ILDASM.exe                          *
+ *                                                                                              *
+ *  Purpose: Main program for CLR disassembler ILDASM.exe                                       *
  *                                                                                              *
  ************************************************************************************************/
 #include "ildasmpch.h"

src/coreclr/inc/ceegen.h

@@ -179,7 +179,7 @@ class CCeeGen : public ICeeGenInternal {
   protected:
     short m_textIdx;            // m_sections[] index for the .text section
     short m_metaIdx;            // m_sections[] index for metadata (.text, or .cormeta for obj files)
-    short m_corHdrIdx;          // m_sections[] index for the COM+ header (.text0)
+    short m_corHdrIdx;          // m_sections[] index for the CLR header (.text0)
     short m_stringIdx;          // m_sections[] index for strings (.text, or .rdata for EnC)
     short m_ilIdx;              // m_sections[] index for IL (.text)