do not use vnf, but only use useEnclosingTypeAsArg0

Author: kunalspathak

src/coreclr/jit/valuenum.cpp

@@ -12301,7 +12301,7 @@ void Compiler::fgValueNumberHelperCallFunc(GenTreeCall* call, VNFunc vnf, ValueN
     CallArgs* args                    = &call->gtArgs;
     bool      generateUniqueVN        = false;
     bool      useEntryPointAddrAsArg0 = false;
-    bool      useEnclosingTypeAsArg0  = call->IsArgNeedsEnclosingType();
+    bool      useEnclosingTypeAsArg0  = false;
 
     switch (vnf)
     {
@@ -12367,8 +12367,15 @@ void Compiler::fgValueNumberHelperCallFunc(GenTreeCall* call, VNFunc vnf, ValueN
             if (IsTargetAbi(CORINFO_NATIVEAOT_ABI))
             {
                 // TODO: Do this for R2R as well
-                vnf = VNF_ReadyToRunStaticBaseCommon;
-                assert(useEnclosingTypeAsArg0 || (call->gtInitClsHnd == NO_CLASS_HANDLE));
+                if (call->IsArgNeedsEnclosingType())
+                {
+                    useEnclosingTypeAsArg0 = true;
+                    assert((call->gtInitClsHnd != NO_CLASS_HANDLE) && ((ssize_t)call->gtInitClsHnd != 0xcccccccc));
+                }
+                else
+                {
+                    useEntryPointAddrAsArg0 = true;
+                }
             }
             else
             {

src/coreclr/jit/valuenumfuncs.h

@@ -119,7 +119,6 @@ ValueNumFuncDef(GetsharedGcstaticBase, 2, false, true, true, false)
 ValueNumFuncDef(GetsharedNongcstaticBase, 2, false, true, true, false)
 ValueNumFuncDef(GetsharedGcstaticBaseNoctor, 1, false, true, true, false)
 ValueNumFuncDef(GetsharedNongcstaticBaseNoctor, 1, false, true, true, false)
-ValueNumFuncDef(ReadyToRunStaticBaseCommon, 1, false, true, true, false)
 ValueNumFuncDef(ReadyToRunStaticBaseGC, 1, false, true, true, false)
 ValueNumFuncDef(ReadyToRunStaticBaseNonGC, 1, false, true, true, false)
 ValueNumFuncDef(ReadyToRunStaticBaseThread, 1, false, true, true, false)