From 11dcf213b961d7184c21a3d669620890fe52f1ea Mon Sep 17 00:00:00 2001 From: Dan Moseley Date: Wed, 1 May 2019 22:49:50 -0700 Subject: [PATCH] Adjust some terms (dotnet/coreclr#24351) Commit migrated from https://github.com/dotnet/coreclr/commit/78e2dd7a4dbe9846806215741783a0900f698159 --- .../src/System/Reflection/Emit/SignatureHelper.cs | 2 +- src/coreclr/src/ToolBox/SOS/SOSAndICorDebug.md | 2 +- src/coreclr/src/debug/di/process.cpp | 6 +++--- src/coreclr/src/debug/ee/debugger.cpp | 4 ++-- src/coreclr/src/inc/corinfo.h | 2 +- src/coreclr/src/inc/sstring.h | 2 +- src/coreclr/src/jit/compiler.hpp | 2 +- src/coreclr/src/jit/utils.cpp | 2 +- src/coreclr/src/md/ceefilegen/cceegen.cpp | 2 +- .../tests/palsuite/c_runtime/_vsnprintf_s/_vsnprintf_s.h | 2 +- .../tests/palsuite/c_runtime/_vsnwprintf_s/_vsnwprintf_s.h | 2 +- .../src/pal/tests/palsuite/c_runtime/vsprintf/vsprintf.h | 2 +- .../src/pal/tests/palsuite/c_runtime/vswprintf/vswprintf.h | 2 +- src/coreclr/src/palrt/path.cpp | 2 +- src/coreclr/src/vm/ceeload.cpp | 2 +- src/coreclr/src/vm/excep.cpp | 4 ++-- src/coreclr/src/vm/excep.h | 2 +- src/coreclr/src/vm/i386/stublinkerx86.cpp | 2 +- src/coreclr/src/vm/instmethhash.cpp | 2 +- src/coreclr/src/vm/profattach.cpp | 2 +- src/coreclr/src/vm/profattachclient.cpp | 2 +- src/coreclr/src/vm/syncblk.cpp | 2 +- src/coreclr/src/vm/threadsuspend.cpp | 2 +- .../src/System/IO/PathHelper.Windows.cs | 2 +- 24 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/coreclr/src/System.Private.CoreLib/src/System/Reflection/Emit/SignatureHelper.cs b/src/coreclr/src/System.Private.CoreLib/src/System/Reflection/Emit/SignatureHelper.cs index 89c000fcd7b..fe0f39d506b 100644 --- a/src/coreclr/src/System.Private.CoreLib/src/System/Reflection/Emit/SignatureHelper.cs +++ b/src/coreclr/src/System.Private.CoreLib/src/System/Reflection/Emit/SignatureHelper.cs @@ -705,7 +705,7 @@ internal byte[] InternalGetSignature(out int length) // If we have more than 128 variables, we can't just set the length, we need // to compress it. Unfortunately, this means that we need to copy the entire - // array. Bummer, eh? + // array. SetNumberOfSignatureElements(false); } diff --git a/src/coreclr/src/ToolBox/SOS/SOSAndICorDebug.md b/src/coreclr/src/ToolBox/SOS/SOSAndICorDebug.md index 725d01881cc..7398f6324b4 100644 --- a/src/coreclr/src/ToolBox/SOS/SOSAndICorDebug.md +++ b/src/coreclr/src/ToolBox/SOS/SOSAndICorDebug.md @@ -12,7 +12,7 @@ Note: Use of the name “windbg” in this document is meant to actually indicat ### What’s checked in - suboptimal For MQ, SOS activates mscordbi.dll via the “typical” mechanism of calling into mscoree.dll to get the ICLRDebugging interface, on which SOS calls OpenVirtualProcess. -Although this works, it sucks. +Although this works, it is not ideal. It assumes the CLR you want to debug has been formally installed onto the debugging machine (complete with mscoree.dll in your system32 / syswow64 directory). ### Recommendation diff --git a/src/coreclr/src/debug/di/process.cpp b/src/coreclr/src/debug/di/process.cpp index 36b4b3a6320..ae1dd033144 100644 --- a/src/coreclr/src/debug/di/process.cpp +++ b/src/coreclr/src/debug/di/process.cpp @@ -12225,7 +12225,7 @@ Reaction CordbProcess::TriageExcep1stChanceAndInit(CordbUnmanagedThread * pUnman LOG((LF_CORDB, LL_INFO1000, "CP::TE1stCAI: Enter\n")); #ifdef _DEBUG - // Some Interop bugs involve threads that land at a crazy IP. Since we're interop-debugging, we can't + // Some Interop bugs involve threads that land at a bad IP. Since we're interop-debugging, we can't // attach a debugger to the LS. So we have some debug mode where we enable the SS flag and thus // produce a trace of where a thread is going. if (pUnmanagedThread->IsDEBUGTrace() && (dwExCode == STATUS_SINGLE_STEP)) @@ -12784,7 +12784,7 @@ void CordbProcess::HandleDebugEventForInteropDebugging(const DEBUG_EVENT * pEven STRESS_LOG1(LF_CORDB, LL_INFO1000, "W32ET::W32EL: Thread 0x%x is suspended\n", pEvent->dwThreadId); } - // For debugging crazy races in retail, we'll keep a rolling queue of win32 debug events. + // For debugging races in retail, we'll keep a rolling queue of win32 debug events. this->DebugRecordWin32Event(pEvent, pUnmanagedThread); @@ -13390,7 +13390,7 @@ DWORD GetDbgContinueFlag() } -// Some Interop bugs involve threads that land at a crazy IP. Since we're interop-debugging, we can't +// Some Interop bugs involve threads that land at a bad IP. Since we're interop-debugging, we can't // attach a debugger to the LS. So we have some debug mode where we enable the SS flag and thus // produce a trace of where a thread is going. #ifdef _DEBUG diff --git a/src/coreclr/src/debug/ee/debugger.cpp b/src/coreclr/src/debug/ee/debugger.cpp index e8e8de94c36..235a937cd6f 100644 --- a/src/coreclr/src/debug/ee/debugger.cpp +++ b/src/coreclr/src/debug/ee/debugger.cpp @@ -261,7 +261,7 @@ bool IsGuardPageGone() // We're not going to be called for a unmanaged exception. // Should always have a managed thread, but just in case something really - // crazy happens, it's not worth an AV. (since this is just being used as a hint) + // strange happens, it's not worth an AV. (since this is just being used as a hint) if (pThread == NULL) { return false; @@ -13171,7 +13171,7 @@ HRESULT Debugger::UpdateNotYetLoadedFunction(mdMethodDef token, Module * pModule HRESULT hr = pModule->GetMDImport()->GetParentToken(token, &classToken); if (FAILED(hr)) { - // We never expect this to actually fail, but just in case it does for some other crazy reason, + // We never expect this to actually fail, but just in case it does for some other strange reason, // we'll return before we AV. CONSISTENCY_CHECK_MSGF(false, ("Class lookup failed:mdToken:0x%08x, pModule=%p. hr=0x%08x\n", token, pModule, hr)); return hr; diff --git a/src/coreclr/src/inc/corinfo.h b/src/coreclr/src/inc/corinfo.h index ae6ee2050c7..df6adfe1546 100644 --- a/src/coreclr/src/inc/corinfo.h +++ b/src/coreclr/src/inc/corinfo.h @@ -330,7 +330,7 @@ struct SYSTEMV_AMD64_CORINFO_STRUCT_REG_PASSING_DESCRIPTOR // returns true if we the eightbyte at index slotIndex is of SSE type. // // Follows the rules of the AMD64 System V ABI specification at www.x86-64.org/documentation/abi.pdf. - // Please reffer to it for definitions/examples. + // Please refer to it for definitions/examples. // bool IsSseSlot(unsigned slotIndex) const { diff --git a/src/coreclr/src/inc/sstring.h b/src/coreclr/src/inc/sstring.h index bfbaa814298..267912a0974 100644 --- a/src/coreclr/src/inc/sstring.h +++ b/src/coreclr/src/inc/sstring.h @@ -674,7 +674,7 @@ private: // WARNING: The MBCS version of printf function are factory for globalization // issues when used to format Unicode strings (%S). The Unicode versions are - // preffered in this case. + // preferred in this case. void Printf(const CHAR *format, ...); void VPrintf(const CHAR *format, va_list args); diff --git a/src/coreclr/src/jit/compiler.hpp b/src/coreclr/src/jit/compiler.hpp index d6894a5f69b..fb6b295e694 100644 --- a/src/coreclr/src/jit/compiler.hpp +++ b/src/coreclr/src/jit/compiler.hpp @@ -2687,7 +2687,7 @@ inline bool Compiler::fgIsThrowHlpBlk(BasicBlock* block) } // We can get to this point for blocks that we didn't create as throw helper blocks - // under stress, with crazy flow graph optimizations. So, walk the fgAddCodeList + // under stress, with implausible flow graph optimizations. So, walk the fgAddCodeList // for the final determination. for (AddCodeDsc* add = fgAddCodeList; add; add = add->acdNext) diff --git a/src/coreclr/src/jit/utils.cpp b/src/coreclr/src/jit/utils.cpp index 029ba03f5b5..60f5cee81bc 100644 --- a/src/coreclr/src/jit/utils.cpp +++ b/src/coreclr/src/jit/utils.cpp @@ -736,7 +736,7 @@ void ConfigMethodRange::InitRanges(const wchar_t* rangeStr, unsigned capacity) assert(m_ranges == nullptr); assert(m_lastRange == 0); - // Flag any crazy-looking requests + // Flag any strange-looking requests assert(capacity < 100000); if (rangeStr == nullptr) diff --git a/src/coreclr/src/md/ceefilegen/cceegen.cpp b/src/coreclr/src/md/ceefilegen/cceegen.cpp index bd69c8daed4..41451433753 100644 --- a/src/coreclr/src/md/ceefilegen/cceegen.cpp +++ b/src/coreclr/src/md/ceefilegen/cceegen.cpp @@ -513,7 +513,7 @@ HRESULT CCeeGen::getSectionCreate (const char *name, DWORD flags, CeeSection **s HRESULT hr = m_peSectionMan->getSectionCreate(name, flags, &pewSect); TESTANDRETURNHR(hr); CeeSection *newSect = new CeeSection(*this, *pewSect); - // if this fails, the PESection will get nuked in the destructor for CCeeGen + // if this fails, the PESection will get zapped in the destructor for CCeeGen if (newSect == NULL) { return E_OUTOFMEMORY; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/_vsnprintf_s.h b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/_vsnprintf_s.h index 7c81136f718..d549bbef51a 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/_vsnprintf_s.h +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnprintf_s/_vsnprintf_s.h @@ -14,7 +14,7 @@ #ifndef __STRINGTEST_H__ #define __STRINGTEST_H__ -/* These functions leaks memory like crazy. C'est la vie. */ +/* These functions leaks memory a lot. C'est la vie. */ int Testvsnprintf(char* buf, size_t count, const char* format, ...) { int retVal; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/_vsnwprintf_s.h b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/_vsnwprintf_s.h index 34cf411c258..3e81bb21685 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/_vsnwprintf_s.h +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/_vsnwprintf_s/_vsnwprintf_s.h @@ -14,7 +14,7 @@ #ifndef ___VSNWPRINTF_H__ #define ___VSNWPRINTF_H__ -/* These functions leaks memory like crazy. C'est la vie. */ +/* These functions leaks memory a lot. C'est la vie. */ int TestVsnwprintf_s(wchar_t* buf, size_t count, const wchar_t* format, ...) { int retVal = 0; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/vsprintf.h b/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/vsprintf.h index 22bf53e53b3..d0275624273 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/vsprintf.h +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/vsprintf/vsprintf.h @@ -13,7 +13,7 @@ #ifndef __VSPRINTF_H__ #define __VSPRINTF_H__ -/* These functions leaks memory like crazy. C'est la vie. */ +/* These functions leaks memory a lot. C'est la vie. */ int testvsp(char* buf, size_t buffSize, const char* format, ...) { int retVal; diff --git a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/vswprintf.h b/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/vswprintf.h index 36895d207fe..ac9626084e0 100644 --- a/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/vswprintf.h +++ b/src/coreclr/src/pal/tests/palsuite/c_runtime/vswprintf/vswprintf.h @@ -14,7 +14,7 @@ #ifndef __vswprintf_H__ #define __vswprintf_H__ -/* These functions leaks memory like crazy. C'est la vie. */ +/* These functions leaks memory a lot. C'est la vie. */ int testvswp(wchar_t* buf, size_t buffSize, const wchar_t* format, ...) { int retVal = 0; diff --git a/src/coreclr/src/palrt/path.cpp b/src/coreclr/src/palrt/path.cpp index 3d6c7a65647..0560f6c7392 100644 --- a/src/coreclr/src/palrt/path.cpp +++ b/src/coreclr/src/palrt/path.cpp @@ -467,7 +467,7 @@ STDAPI_(LPWSTR) PathCombineW(LPWSTR lpszDest, LPCWSTR lpszDir, LPCWSTR lpszFile) { // Skip the backslash when copying // Note: We don't support strings longer than 4GB, but that's - // okay because we already barf at MAX_PATH + // okay because we already fail at MAX_PATH int iRemaining = (int)(ARRAYSIZE(szTemp) - (pszT - szTemp)); StringCchCopyNW(pszT, iRemaining, lpszFile+1, iRemaining); } diff --git a/src/coreclr/src/vm/ceeload.cpp b/src/coreclr/src/vm/ceeload.cpp index fc9178655ec..e1f2b2bfec4 100644 --- a/src/coreclr/src/vm/ceeload.cpp +++ b/src/coreclr/src/vm/ceeload.cpp @@ -1519,7 +1519,7 @@ PTR_Module Module::ComputePreferredZapModule(Module * pDefinitionModule, } // -// Is pModule likely a dependency of pOtherModule? Heuristic used by preffered zap module algorithm. +// Is pModule likely a dependency of pOtherModule? Heuristic used by preferred zap module algorithm. // It can return both false positives and negatives. // static bool IsLikelyDependencyOf(Module * pModule, Module * pOtherModule) diff --git a/src/coreclr/src/vm/excep.cpp b/src/coreclr/src/vm/excep.cpp index 0e99239d4cc..b19e1e43e55 100644 --- a/src/coreclr/src/vm/excep.cpp +++ b/src/coreclr/src/vm/excep.cpp @@ -12821,7 +12821,7 @@ VOID DECLSPEC_NORETURN RealCOMPlusThrow(RuntimeExceptionKind reKind, LPCWSTR wsz // // - Can be called with gc enabled or disabled. // This allows a catch-all error path to post a generic catchall error -// message w/out bonking more specific error messages posted by inner functions. +// message w/out overwriting more specific error messages posted by inner functions. //========================================================================== VOID DECLSPEC_NORETURN ThrowTypeLoadException(LPCWSTR pFullTypeName, LPCWSTR pAssemblyName, @@ -12960,7 +12960,7 @@ VOID DECLSPEC_NORETURN RealCOMPlusThrowArgumentException(LPCWSTR argName, LPCWST // // - Can be called with gc enabled or disabled. // This allows a catch-all error path to post a generic catchall error -// message w/out bonking more specific error messages posted by inner functions. +// message w/out overwriting more specific error messages posted by inner functions. //========================================================================== VOID DECLSPEC_NORETURN ThrowTypeLoadException(LPCUTF8 pszNameSpace, LPCUTF8 pTypeName, diff --git a/src/coreclr/src/vm/excep.h b/src/coreclr/src/vm/excep.h index cc4e97f07f8..9d8e5d2edb7 100644 --- a/src/coreclr/src/vm/excep.h +++ b/src/coreclr/src/vm/excep.h @@ -579,7 +579,7 @@ void COMPlusThrowBoot(HRESULT hr); // // - Can be called with gc enabled or disabled. // This allows a catch-all error path to post a generic catchall error -// message w/out bonking more specific error messages posted by inner functions. +// message w/out overwriting more specific error messages posted by inner functions. //========================================================================== VOID DECLSPEC_NORETURN ThrowTypeLoadException(LPCUTF8 pNameSpace, LPCUTF8 pTypeName, LPCWSTR pAssemblyName, LPCUTF8 pMessageArg, diff --git a/src/coreclr/src/vm/i386/stublinkerx86.cpp b/src/coreclr/src/vm/i386/stublinkerx86.cpp index c1fbd4db878..bb674c2788f 100644 --- a/src/coreclr/src/vm/i386/stublinkerx86.cpp +++ b/src/coreclr/src/vm/i386/stublinkerx86.cpp @@ -5840,7 +5840,7 @@ static void EncodeOneGCOffset(CPUSTUBLINKER *pSl, ULONG delta, BOOL maybeInterio // by shifting and gaining a free high-bit. ULONG encodedDelta = delta >> 1; #else - // For 32-bit, we just limit our frame size to <2GB. (I know, such a bummer!) + // For 32-bit, we just limit our frame size to <2GB. ULONG encodedDelta = delta; #endif _ASSERTE((encodedDelta & 0x80000003) == 0); diff --git a/src/coreclr/src/vm/instmethhash.cpp b/src/coreclr/src/vm/instmethhash.cpp index 05378b4450c..f675e4342fc 100644 --- a/src/coreclr/src/vm/instmethhash.cpp +++ b/src/coreclr/src/vm/instmethhash.cpp @@ -147,7 +147,7 @@ MethodDesc* InstMethodHashTable::FindMethodDesc(TypeHandle declaringType, // We temporarily disable IBC logging here // because the pMD that we search through may not be restored - // and ComputePrefferedZapModule will assert on finding an + // and ComputePreferredZapModule will assert on finding an // encode fixup pointer // IBCLoggingDisabler disableIbcLogging; diff --git a/src/coreclr/src/vm/profattach.cpp b/src/coreclr/src/vm/profattach.cpp index 9064fd99339..cae073c15bb 100644 --- a/src/coreclr/src/vm/profattach.cpp +++ b/src/coreclr/src/vm/profattach.cpp @@ -391,7 +391,7 @@ static HRESULT GetIntegritySidString(__out LPWSTR * pwszIntegritySidString) // "security feature". It's mainly useful as defense-in-depth or to protect // IE users and admins from themselves in most cases. // * It's impossible to spawn a system integrity trigger process outside of - // session 0 services. So profiling ASP.NET would be crazy hard without this + // session 0 services. So profiling ASP.NET would be really hard without this // policy. DWORD * pdwIntegrityLevel = SecurityUtil::GetIntegrityLevelFromMandatorySID(ptml->Label.Sid); if (*pdwIntegrityLevel > SECURITY_MANDATORY_HIGH_RID) diff --git a/src/coreclr/src/vm/profattachclient.cpp b/src/coreclr/src/vm/profattachclient.cpp index 45370176ee9..7852a7bc1dd 100644 --- a/src/coreclr/src/vm/profattachclient.cpp +++ b/src/coreclr/src/vm/profattachclient.cpp @@ -189,7 +189,7 @@ HRESULT ProfilingAPIAttachClient::AttachProfiler( HRESULT hr; - // Is cbClientData just crazy-sick-overflow big? + // Is cbClientData just huge? if (cbClientData >= 0xFFFFffffUL - sizeof(AttachRequestMessage)) { return E_OUTOFMEMORY; diff --git a/src/coreclr/src/vm/syncblk.cpp b/src/coreclr/src/vm/syncblk.cpp index 9aea18f0c6c..7afdc167f25 100644 --- a/src/coreclr/src/vm/syncblk.cpp +++ b/src/coreclr/src/vm/syncblk.cpp @@ -2250,7 +2250,7 @@ SyncBlock *ObjHeader::GetSyncBlock() SyncTableEntry::GetSyncTableEntry() [indx].m_SyncBlock = syncBlock; - // in order to avoid a race where some thread tries to get the AD index and we've already nuked it, + // in order to avoid a race where some thread tries to get the AD index and we've already zapped it, // make sure the syncblock etc is all setup with the AD index prior to replacing the index // in the header if (GetHeaderSyncBlockIndex() == 0) diff --git a/src/coreclr/src/vm/threadsuspend.cpp b/src/coreclr/src/vm/threadsuspend.cpp index 9760fe4293e..36d1621c57d 100644 --- a/src/coreclr/src/vm/threadsuspend.cpp +++ b/src/coreclr/src/vm/threadsuspend.cpp @@ -6685,7 +6685,7 @@ retry_for_debugger: } EX_CATCH { - // Bummer... couldn't init the abort event. Its a shame, but not fatal. We'll simply not use it + // Couldn't init the abort event. Its a shame, but not fatal. We'll simply not use it // on this iteration and try again next time. if (pEvent) { _ASSERTE(!pEvent->IsValid()); diff --git a/src/libraries/System.Private.CoreLib/src/System/IO/PathHelper.Windows.cs b/src/libraries/System.Private.CoreLib/src/System/IO/PathHelper.Windows.cs index f494412a52f..83618cfa13c 100644 --- a/src/libraries/System.Private.CoreLib/src/System/IO/PathHelper.Windows.cs +++ b/src/libraries/System.Private.CoreLib/src/System/IO/PathHelper.Windows.cs @@ -130,7 +130,7 @@ internal static int PrependDevicePathChars(ref ValueStringBuilder content, bool internal static string TryExpandShortFileName(ref ValueStringBuilder outputBuilder, string? originalPath) { // We guarantee we'll expand short names for paths that only partially exist. As such, we need to find the part of the path that actually does exist. To - // avoid allocating like crazy we'll create only one input array and modify the contents with embedded nulls. + // avoid allocating a lot we'll create only one input array and modify the contents with embedded nulls. Debug.Assert(!PathInternal.IsPartiallyQualified(outputBuilder.AsSpan()), "should have resolved by now"); -- GitLab