ldtoken shortcut

src/jit/gentree.cpp

@@ -12337,7 +12337,7 @@ GenTree* Compiler::gtFoldTypeCompare(GenTree* tree)
         }
 
         // We can't answer the equality comparison definitively at jit
-        // time, but can still simplify the comparison.
+        // time, but can still simplfy the comparison.
         //
         // Find out how we can compare the two handles.
         // NOTE: We're potentially passing NO_CLASS_HANDLE, but the runtime knows what to do with it here.

src/vm/jithelpers.cpp

@@ -4103,6 +4103,9 @@ NOINLINE HCIMPL1(Object*, JIT_GetRuntimeType_Framed, CORINFO_CLASS_HANDLE type)
     if (refType == NULL)
     {
         HELPER_METHOD_FRAME_BEGIN_RET_1(refType);
+        // Compensate for CORINFO_TOKENKIND_Ldtoken optimization done by CEEInfo::embedGenericHandle
+        if (!typeHandle.IsTypeDesc() && typeHandle.AsMethodTable()->IsArray())
+            typeHandle = ArrayBase::GetTypeHandle(typeHandle.AsMethodTable());
         refType = typeHandle.GetManagedClassObject();
         HELPER_METHOD_FRAME_END();
     }

src/vm/jitinterface.cpp

@@ -2625,7 +2625,12 @@ void CEEInfo::embedGenericHandle(
 
         pResult->handleType = CORINFO_HANDLETYPE_CLASS;
 
-        if (pResolvedToken->tokenType == CORINFO_TOKENKIND_Newarr)
+        if (pResolvedToken->tokenType == CORINFO_TOKENKIND_Newarr
+#ifndef FEATURE_READYTORUN_COMPILER
+            // This enables use of MethodTable fast-path through JIT_GetRuntimeTypeHandle helper
+            || (pResolvedToken->tokenType == CORINFO_TOKENKIND_Ldtoken && th.IsArray())
+#endif
+            )
         {
             pResult->compileTimeHandle = (CORINFO_GENERIC_HANDLE)th.AsArray()->GetTemplateMethodTable();
         }