From b9e6cc06686b0e1ed3e5e21248166fb65aa713ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Strehovsk=C3=BD?= Date: Thu, 11 Jul 2024 13:24:11 +0200 Subject: [PATCH 1/2] Delete FEATURE_READYTORUN_COMPILER ifdef #103361 resurrected this long-deleted ifdef (crossgen1-specific code). --- src/coreclr/vm/jitinterface.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/coreclr/vm/jitinterface.cpp b/src/coreclr/vm/jitinterface.cpp index 935f1ccde8202c..f4ef774e518e46 100644 --- a/src/coreclr/vm/jitinterface.cpp +++ b/src/coreclr/vm/jitinterface.cpp @@ -1906,10 +1906,6 @@ CEEInfo::getHeapClassSize( _ASSERTE(pMT); _ASSERTE(!pMT->HasComponentSize()); -#ifdef FEATURE_READYTORUN_COMPILER - _ASSERTE(!IsReadyToRunCompilation() || pMT->IsInheritanceChainLayoutFixedInCurrentVersionBubble()); -#endif - // Add OBJECT_SIZE to account for method table pointer. // if (pMT->IsValueType()) From 85c45377b9b0600d1d1610bf22ac7924d1e460d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Strehovsk=C3=BD?= Date: Thu, 11 Jul 2024 22:37:21 +0200 Subject: [PATCH 2/2] Update jitinterface.cpp --- src/coreclr/vm/jitinterface.cpp | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/coreclr/vm/jitinterface.cpp b/src/coreclr/vm/jitinterface.cpp index f4ef774e518e46..e1b5670819714b 100644 --- a/src/coreclr/vm/jitinterface.cpp +++ b/src/coreclr/vm/jitinterface.cpp @@ -1904,18 +1904,11 @@ CEEInfo::getHeapClassSize( TypeHandle VMClsHnd(clsHnd); MethodTable* pMT = VMClsHnd.GetMethodTable(); _ASSERTE(pMT); + _ASSERTE(!pMT->IsValueType()); _ASSERTE(!pMT->HasComponentSize()); // Add OBJECT_SIZE to account for method table pointer. - // - if (pMT->IsValueType()) - { - result = VMClsHnd.GetSize() + OBJECT_SIZE; - } - else - { - result = pMT->GetNumInstanceFieldBytes() + OBJECT_SIZE; - } + result = pMT->GetNumInstanceFieldBytes() + OBJECT_SIZE; EE_TO_JIT_TRANSITION_LEAF(); return result;