Cleanup some dead code (#110579)

* pal/misc.h * COMCharacter * MAX_CACHE_LINE_SIZE * clr/fs
dotnet · hez2010 · Dec 6, 2024 · Dec 9, 2024 · Dec 9, 2024 · Dec 9, 2024
commit 6d18e0dd96ab5c1d79eeff18b2e5b9f73ca57a75
diff --git a/src/coreclr/inc/clr/fs.h b/src/coreclr/inc/clr/fs.h
diff --git a/src/coreclr/inc/clr/fs/path.h b/src/coreclr/inc/clr/fs/path.h
@@ -10,10 +10,6 @@
 
 #include "clrtypes.h"
 
-#include "strsafe.h"
-
-#include "clr/str.h"
-
 namespace clr
 {
     namespace fs

diff --git a/src/coreclr/inc/clr/str.h b/src/coreclr/inc/clr/str.h
diff --git a/src/coreclr/pal/src/include/pal/misc.h b/src/coreclr/pal/src/include/pal/misc.h
diff --git a/src/coreclr/pal/src/init/pal.cpp b/src/coreclr/pal/src/init/pal.cpp
@@ -30,7 +30,6 @@ SET_DEFAULT_DEBUG_CHANNEL(PAL); // some headers have code with asserts, so do th
 #include "../thread/procprivate.hpp"
 #include "pal/module.h"
 #include "pal/virtual.h"
-#include "pal/misc.h"
 #include "pal/environ.h"
 #include "pal/utils.h"
 #include "pal/debug.h"

diff --git a/src/coreclr/pal/src/misc/fmtmessage.cpp b/src/coreclr/pal/src/misc/fmtmessage.cpp
@@ -23,7 +23,6 @@ Revision History:
 #include "pal/dbgmsg.h"
 #include "pal/critsect.h"
 #include "pal/module.h"
-#include "pal/misc.h"
 
 #include "errorstrings.h"
 

diff --git a/src/coreclr/pal/src/misc/perftrace.cpp b/src/coreclr/pal/src/misc/perftrace.cpp
@@ -27,7 +27,6 @@ Module Name:
 #include "pal/perftrace.h"
 #include "pal/dbgmsg.h"
 #include "pal/cruntime.h"
-#include "pal/misc.h"
 
 /* Standard headers */
 #include <stdio.h>

diff --git a/src/coreclr/pal/src/misc/time.cpp b/src/coreclr/pal/src/misc/time.cpp
@@ -19,7 +19,6 @@ Module Name:
 
 #include "pal/palinternal.h"
 #include "pal/dbgmsg.h"
-#include "pal/misc.h"
 
 #include <time.h>
 #include <sys/time.h>

diff --git a/src/coreclr/vm/util.cpp b/src/coreclr/vm/util.cpp
@@ -1889,62 +1889,6 @@ int __cdecl stricmpUTF8(const char* szStr1, const char* szStr2)
 }
 
 #ifndef DACCESS_COMPILE
-//
-//
-// COMCharacter and Helper functions
-//
-//
-
-#ifndef TARGET_UNIX
-/*============================GetCharacterInfoHelper============================
-**Determines character type info (digit, whitespace, etc) for the given char.
-**Args:   c is the character on which to operate.
-**        CharInfoType is one of CT_CTYPE1, CT_CTYPE2, CT_CTYPE3 and specifies the type
-**        of information being requested.
-**Returns: The bitmask returned by GetStringTypeEx.  The caller needs to know
-**         how to interpret this.
-**Exceptions: ArgumentException if GetStringTypeEx fails.
-==============================================================================*/
-INT32 GetCharacterInfoHelper(WCHAR c, INT32 CharInfoType)
-{
-    WRAPPER_NO_CONTRACT;
-
-    unsigned short result=0;
-    if (!GetStringTypeEx(LOCALE_USER_DEFAULT, CharInfoType, &(c), 1, &result)) {
-        _ASSERTE(!"This should not happen, verify the arguments passed to GetStringTypeEx()");
-    }
-    return(INT32)result;
-}
-#endif // !TARGET_UNIX
-
-/*==============================nativeIsWhiteSpace==============================
-**The locally available version of IsWhiteSpace.  Designed to be called by other
-**native methods.  The work is mostly done by GetCharacterInfoHelper
-**Args:  c -- the character to check.
-**Returns: true if c is whitespace, false otherwise.
-**Exceptions:  Only those thrown by GetCharacterInfoHelper.
-==============================================================================*/
-BOOL COMCharacter::nativeIsWhiteSpace(WCHAR c)
-{
-    WRAPPER_NO_CONTRACT;
-
-#ifndef TARGET_UNIX
-    if (c <= (WCHAR) 0x7F) // common case
-    {
-        BOOL result = (c == ' ') || (c == '\r') || (c == '\n') || (c == '\t') || (c == '\f') || (c == (WCHAR) 0x0B);
-
-        ASSERT(result == ((GetCharacterInfoHelper(c, CT_CTYPE1) & C1_SPACE)!=0));
-
-        return result;
-    }
-
-    // GetCharacterInfoHelper costs around 160 instructions
-    return((GetCharacterInfoHelper(c, CT_CTYPE1) & C1_SPACE)!=0);
-#else // !TARGET_UNIX
-    return iswspace(c);
-#endif // !TARGET_UNIX
-}
-
 BOOL RuntimeFileNotFound(HRESULT hr)
 {
     LIMITED_METHOD_CONTRACT;

diff --git a/src/coreclr/vm/util.hpp b/src/coreclr/vm/util.hpp
@@ -18,13 +18,6 @@
 #include "posterror.h"
 #include <type_traits>
 
-// Hot cache lines need to be aligned to cache line size to improve performance
-#if defined(TARGET_ARM64)
-#define MAX_CACHE_LINE_SIZE 128
-#else
-#define MAX_CACHE_LINE_SIZE 64
-#endif
-
 #ifndef DACCESS_COMPILE
 #if defined(TARGET_WINDOWS) && defined(TARGET_ARM64)
 // Flag to check if atomics feature is available on
@@ -800,17 +793,6 @@ BOOL DbgIsExecutable(LPVOID lpMem, SIZE_T length);
 
 int GetRandomInt(int maxVal);
 
-//
-//
-// COMCHARACTER
-//
-//
-class COMCharacter {
-public:
-    //These are here for support from native code.  They are never called from our managed classes.
-    static BOOL nativeIsWhiteSpace(WCHAR c);
-};
-
 // ======================================================================================
 // Simple, reusable 100ns timer for normalizing ticks. For use in Q/FCalls to avoid discrepency with
 // tick frequency between native and managed.