Remove nonExpansive parameter from Dictionary::PopulateEntry (#122758)

The `nonExpansive` parameter in `Dictionary::PopulateEntry` was always
passed as `FALSE` from its only call site in `jithelpers.cpp`. This
change removes the dead parameter and simplifies the implementation by
eliminating unreachable code paths.

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: jkotas <6668460+jkotas@users.noreply.github.com>

Author: 2 people

src/coreclr/vm/genericdict.cpp

@@ -669,7 +669,6 @@ Dictionary::PopulateEntry(
     MethodDesc *       pMD,
     MethodTable *      pMT,
     LPVOID             signature,
-    BOOL               nonExpansive,
     DictionaryEntry ** ppSlot,
     DWORD              dictionaryIndexAndSlot, /* = -1 */
     Module *           pModule /* = NULL */)
@@ -811,16 +810,11 @@ Dictionary::PopulateEntry(
             declaringType = ptr.GetTypeHandleThrowing(
                 pLookupModule,
                 &typeContext,
-                (nonExpansive ? ClassLoader::DontLoadTypes : ClassLoader::LoadTypes),
+                ClassLoader::LoadTypes,
                 CLASS_LOADED,
                 FALSE,
                 NULL,
                 pZapSigContext);
-            if (declaringType.IsNull())
-            {
-                _ASSERTE(nonExpansive);
-                return NULL;
-            }
             IfFailThrow(ptr.SkipExactlyOne());
 
             FALLTHROUGH;
@@ -831,16 +825,11 @@ Dictionary::PopulateEntry(
             TypeHandle th = ptr.GetTypeHandleThrowing(
                 pLookupModule,
                 &typeContext,
-                (nonExpansive ? ClassLoader::DontLoadTypes : ClassLoader::LoadTypes),
+                ClassLoader::LoadTypes,
                 CLASS_LOADED,
                 FALSE,
                 NULL,
                 pZapSigContext);
-            if (th.IsNull())
-            {
-                _ASSERTE(nonExpansive);
-                return NULL;
-            }
             IfFailThrow(ptr.SkipExactlyOne());
 
             if (!declaringType.IsNull())
@@ -864,16 +853,11 @@ Dictionary::PopulateEntry(
             constraintType = ptr.GetTypeHandleThrowing(
                 pLookupModule,
                 &typeContext,
-                (nonExpansive ? ClassLoader::DontLoadTypes : ClassLoader::LoadTypes),
+                ClassLoader::LoadTypes,
                 CLASS_LOADED,
                 FALSE,
                 NULL,
                 pZapSigContext);
-            if (constraintType.IsNull())
-            {
-                _ASSERTE(nonExpansive);
-                return NULL;
-            }
             IfFailThrow(ptr.SkipExactlyOne());
 
             FALLTHROUGH;
@@ -967,7 +951,6 @@ Dictionary::PopulateEntry(
                 if (ownerType.IsNull())
                     ownerType = pMethod->GetMethodTable();
 
-                _ASSERT(!ownerType.IsNull() && !nonExpansive);
                 pOwnerMT = ownerType.GetMethodTable();
 
                 if (kind == DispatchStubAddrSlot && pMethod->IsVtableMethod())
@@ -981,22 +964,13 @@ Dictionary::PopulateEntry(
                 ownerType = ptr.GetTypeHandleThrowing(
                     pLookupModule,
                     &typeContext,
-                    (nonExpansive ? ClassLoader::DontLoadTypes : ClassLoader::LoadTypes),
+                    ClassLoader::LoadTypes,
                     CLASS_LOADED,
                     FALSE,
                     NULL,
                     pZapSigContext);
-                if (ownerType.IsNull())
-                {
-                    _ASSERTE(nonExpansive);
-                    return NULL;
-                }
                 IfFailThrow(ptr.SkipExactlyOne());
 
-                // <NICE> wsperf: Create a path that doesn't load types or create new handles if nonExpansive is set </NICE>
-                if (nonExpansive)
-                    return NULL;
-
                 pOwnerMT = ownerType.GetMethodTable();
                 _ASSERTE(pOwnerMT != NULL);
 
@@ -1026,16 +1000,11 @@ Dictionary::PopulateEntry(
                     TypeHandle thMethodDefType = ptr.GetTypeHandleThrowing(
                         pLookupModule,
                         &typeContext,
-                        (nonExpansive ? ClassLoader::DontLoadTypes : ClassLoader::LoadTypes),
+                        ClassLoader::LoadTypes,
                         CLASS_LOADED,
                         FALSE,
                         NULL,
                         pZapSigContext);
-                    if (thMethodDefType.IsNull())
-                    {
-                        _ASSERTE(nonExpansive);
-                        return NULL;
-                    }
                     IfFailThrow(ptr.SkipExactlyOne());
                     MethodTable * pMethodDefMT = thMethodDefType.GetMethodTable();
                     _ASSERTE(pMethodDefMT != NULL);
@@ -1257,16 +1226,11 @@ Dictionary::PopulateEntry(
                 ownerType = ptr.GetTypeHandleThrowing(
                     pLookupModule,
                     &typeContext,
-                    (nonExpansive ? ClassLoader::DontLoadTypes : ClassLoader::LoadTypes),
+                    ClassLoader::LoadTypes,
                     CLASS_LOADED,
                     FALSE,
                     NULL,
                     pZapSigContext);
-                if (ownerType.IsNull())
-                {
-                    _ASSERTE(nonExpansive);
-                    return NULL;
-                }
                 IfFailThrow(ptr.SkipExactlyOne());
 
                 // Computed by MethodTable::GetIndexForFieldDesc().

src/coreclr/vm/genericdict.h

@@ -276,7 +276,6 @@ class Dictionary
     static DictionaryEntry PopulateEntry(MethodDesc * pMD,
                                          MethodTable * pMT,
                                          LPVOID signature,
-                                         BOOL nonExpansive,
                                          DictionaryEntry ** ppSlot,
                                          DWORD dictionaryIndexAndSlot = -1,
                                          Module * pModule = NULL);

src/coreclr/vm/jithelpers.cpp

@@ -557,7 +557,7 @@ DictionaryEntry GenericHandleWorkerCore(MethodDesc * pMD, MethodTable * pMT, LPV
     }
 
     DictionaryEntry * pSlot;
-    result = Dictionary::PopulateEntry(pMD, pDeclaringMT, signature, FALSE, &pSlot, dictionaryIndexAndSlot, pModule);
+    result = Dictionary::PopulateEntry(pMD, pDeclaringMT, signature, &pSlot, dictionaryIndexAndSlot, pModule);
 
     if (pMT != NULL && pDeclaringMT != pMT)
     {