Skip to content

Commit 9158141

Browse files
authored
Delete misc unnecessary code (#92764)
1 parent 876f763 commit 9158141

File tree

5 files changed

+12
-34
lines changed

5 files changed

+12
-34
lines changed

src/coreclr/nativeaot/Runtime/gcrhenv.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,7 @@ uint32_t RedhawkGCInterface::GetGCDescSize(void * pType)
503503

504504
COOP_PINVOKE_HELPER(FC_BOOL_RET, RhCompareObjectContentsAndPadding, (Object* pObj1, Object* pObj2))
505505
{
506-
ASSERT(pObj1->GetMethodTable()->IsEquivalentTo(pObj2->GetMethodTable()));
506+
ASSERT(pObj1->GetMethodTable() == pObj2->GetMethodTable());
507507
ASSERT(pObj1->GetMethodTable()->IsValueType());
508508

509509
MethodTable * pEEType = pObj1->GetMethodTable();

src/coreclr/nativeaot/Runtime/inc/MethodTable.h

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -260,22 +260,6 @@ class MethodTable
260260
return (m_uFlags & OptionalFieldsFlag) != 0;
261261
}
262262

263-
bool IsEquivalentTo(MethodTable * pOtherEEType)
264-
{
265-
if (this == pOtherEEType)
266-
return true;
267-
268-
MethodTable * pThisEEType = this;
269-
270-
if (pThisEEType->IsParameterizedType() && pOtherEEType->IsParameterizedType())
271-
{
272-
return pThisEEType->GetRelatedParameterType()->IsEquivalentTo(pOtherEEType->GetRelatedParameterType()) &&
273-
pThisEEType->GetParameterizedTypeShape() == pOtherEEType->GetParameterizedTypeShape();
274-
}
275-
276-
return false;
277-
}
278-
279263
// How many vtable slots are there?
280264
uint16_t GetNumVtableSlots()
281265
{ return m_usNumVtableSlots; }
@@ -348,4 +332,3 @@ class MethodTable
348332
};
349333

350334
#pragma warning(pop)
351-

src/coreclr/nativeaot/System.Private.CoreLib/src/System/EETypePtr.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ internal bool IsEnum
164164
{
165165
// Q: When is an enum type a constructed generic type?
166166
// A: When it's nested inside a generic type.
167-
if (!(IsDefType))
167+
if (!IsDefType)
168168
return false;
169169

170170
// Generic type definitions that return true for IsPrimitive are type definitions of generic enums.

src/coreclr/vm/ceeload.cpp

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2188,6 +2188,16 @@ ISymUnmanagedReader *Module::GetISymUnmanagedReaderNoThrow(void)
21882188
RETURN (ret);
21892189
}
21902190

2191+
#if defined(HOST_AMD64)
2192+
#define NATIVE_SYMBOL_READER_DLL W("Microsoft.DiaSymReader.Native.amd64.dll")
2193+
#elif defined(HOST_X86)
2194+
#define NATIVE_SYMBOL_READER_DLL W("Microsoft.DiaSymReader.Native.x86.dll")
2195+
#elif defined(HOST_ARM)
2196+
#define NATIVE_SYMBOL_READER_DLL W("Microsoft.DiaSymReader.Native.arm.dll")
2197+
#elif defined(HOST_ARM64)
2198+
#define NATIVE_SYMBOL_READER_DLL W("Microsoft.DiaSymReader.Native.arm64.dll")
2199+
#endif
2200+
21912201
ISymUnmanagedReader *Module::GetISymUnmanagedReader(void)
21922202
{
21932203
CONTRACT(ISymUnmanagedReader *)

src/coreclr/vm/ceeload.h

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -79,21 +79,6 @@ class EnCEEClassData;
7979
#define METHOD_STUBS_HASH_BUCKETS 11
8080
#define GUID_TO_TYPE_HASH_BUCKETS 16
8181

82-
// The native symbol reader dll name
83-
#if defined(HOST_AMD64)
84-
#define NATIVE_SYMBOL_READER_DLL W("Microsoft.DiaSymReader.Native.amd64.dll")
85-
#elif defined(HOST_X86)
86-
#define NATIVE_SYMBOL_READER_DLL W("Microsoft.DiaSymReader.Native.x86.dll")
87-
#elif defined(HOST_ARM)
88-
#define NATIVE_SYMBOL_READER_DLL W("Microsoft.DiaSymReader.Native.arm.dll")
89-
#elif defined(HOST_ARM64)
90-
#define NATIVE_SYMBOL_READER_DLL W("Microsoft.DiaSymReader.Native.arm64.dll")
91-
#elif defined(HOST_LOONGARCH64)
92-
#define NATIVE_SYMBOL_READER_DLL W("Microsoft.DiaSymReader.Native.loongarch64.dll")
93-
#elif defined(HOST_RISCV64)
94-
#define NATIVE_SYMBOL_READER_DLL W("Microsoft.DiaSymReader.Native.riscv64.dll")
95-
#endif
96-
9782
typedef DPTR(JITInlineTrackingMap) PTR_JITInlineTrackingMap;
9883

9984
//

0 commit comments

Comments
 (0)