Fold bound checks for static readonly arrays/strings

src/coreclr/inc/corinfo.h

@@ -1056,6 +1056,7 @@ typedef struct CORINFO_DEPENDENCY_STRUCT_*  CORINFO_DEPENDENCY_HANDLE;
 typedef struct CORINFO_CLASS_STRUCT_*       CORINFO_CLASS_HANDLE;
 typedef struct CORINFO_METHOD_STRUCT_*      CORINFO_METHOD_HANDLE;
 typedef struct CORINFO_FIELD_STRUCT_*       CORINFO_FIELD_HANDLE;
+typedef struct CORINFO_OBJECT_STRUCT_*      CORINFO_OBJECT_HANDLE;
 typedef struct CORINFO_ARG_LIST_STRUCT_*    CORINFO_ARG_LIST_HANDLE;    // represents a list of argument types
 typedef struct CORINFO_JUST_MY_CODE_HANDLE_*CORINFO_JUST_MY_CODE_HANDLE;
 typedef struct CORINFO_PROFILING_STRUCT_*   CORINFO_PROFILING_HANDLE;   // a handle guaranteed to be unique per process
@@ -2284,7 +2285,7 @@ class ICorStaticInfo
     //    Bytes written to the given buffer, the range is [0..bufferSize)
     //
     virtual size_t printObjectDescription (
-            void*                       handle,                       /* IN  */
+            CORINFO_OBJECT_HANDLE       handle,                       /* IN  */
             char*                       buffer,                       /* OUT */
             size_t                      bufferSize,                   /* IN  */
             size_t*                     pRequiredBufferSize = nullptr /* OUT */
@@ -2500,7 +2501,7 @@ class ICorStaticInfo
             CORINFO_CLASS_HANDLE        cls
             ) = 0;
 
-    virtual void* getRuntimeTypePointer(
+    virtual CORINFO_OBJECT_HANDLE getRuntimeTypePointer(
             CORINFO_CLASS_HANDLE        cls
             ) = 0;
 
@@ -2514,7 +2515,7 @@ class ICorStaticInfo
     //    Returns true if object is known to be immutable
     //
     virtual bool isObjectImmutable(
-            void*                       objPtr
+            CORINFO_OBJECT_HANDLE       objPtr
             ) = 0;
 
     //------------------------------------------------------------------------------
@@ -2527,7 +2528,7 @@ class ICorStaticInfo
     //    Returns CORINFO_CLASS_HANDLE handle that represents given object's type
     //
     virtual CORINFO_CLASS_HANDLE getObjectType(
-            void*                       objPtr
+            CORINFO_OBJECT_HANDLE       objPtr
             ) = 0;
 
     virtual bool getReadyToRunHelper(
@@ -2729,6 +2730,8 @@ class ICorStaticInfo
     // Returns true iff "fldHnd" represents a static field.
     virtual bool isFieldStatic(CORINFO_FIELD_HANDLE fldHnd) = 0;
 
+    virtual int getArrayOrStringLength(CORINFO_OBJECT_HANDLE objHnd) = 0;
+
     /*********************************************************************************/
     //
     // ICorDebugInfo
@@ -3196,23 +3199,22 @@ class ICorDynamicInfo : public ICorStaticInfo
 
     //------------------------------------------------------------------------------
     // getReadonlyStaticFieldValue: returns true and the actual field's value if the given
-    //    field represents a statically initialized readonly field of any type, it might be:
-    //    * integer/floating point primitive
-    //    * null
-    //    * frozen object reference (string, array or object)
+    //    field represents a statically initialized readonly field of any type.
     //
     // Arguments:
-    //    field      - field handle
-    //    buffer     - buffer field's value will be stored to
-    //    bufferSize - size of buffer
+    //    field                - field handle
+    //    buffer               - buffer field's value will be stored to
+    //    bufferSize           - size of buffer
+    //    ignoreMovableObjects - ignore movable reference types or not
     //
     // Return Value:
     //    Returns true if field's constant value was available and successfully copied to buffer
     //
     virtual bool getReadonlyStaticFieldValue(
                     CORINFO_FIELD_HANDLE    field,
                     uint8_t                *buffer,
-                    int                     bufferSize
+                    int                     bufferSize,
+                    bool                    ignoreMovableObjects = true
                     ) = 0;
 
     // If pIsSpeculative is NULL, return the class handle for the value of ref-class typed

src/coreclr/inc/icorjitinfoimpl_generated.h

@@ -177,7 +177,7 @@ int getStringLiteral(
           int startIndex) override;
 
 size_t printObjectDescription(
-          void* handle,
+          CORINFO_OBJECT_HANDLE handle,
           char* buffer,
           size_t bufferSize,
           size_t* pRequiredBufferSize) override;
@@ -287,14 +287,14 @@ CorInfoHelpFunc getBoxHelper(
 CorInfoHelpFunc getUnBoxHelper(
           CORINFO_CLASS_HANDLE cls) override;
 
-void* getRuntimeTypePointer(
+CORINFO_OBJECT_HANDLE getRuntimeTypePointer(
           CORINFO_CLASS_HANDLE cls) override;
 
 bool isObjectImmutable(
-          void* objPtr) override;
+          CORINFO_OBJECT_HANDLE objPtr) override;
 
 CORINFO_CLASS_HANDLE getObjectType(
-          void* objPtr) override;
+          CORINFO_OBJECT_HANDLE objPtr) override;
 
 bool getReadyToRunHelper(
           CORINFO_RESOLVED_TOKEN* pResolvedToken,
@@ -404,6 +404,9 @@ void getFieldInfo(
 bool isFieldStatic(
           CORINFO_FIELD_HANDLE fldHnd) override;
 
+int getArrayOrStringLength(
+          CORINFO_OBJECT_HANDLE objHnd) override;
+
 void getBoundaries(
           CORINFO_METHOD_HANDLE ftn,
           unsigned int* cILOffsets,
@@ -616,7 +619,8 @@ void* getFieldAddress(
 bool getReadonlyStaticFieldValue(
           CORINFO_FIELD_HANDLE field,
           uint8_t* buffer,
-          int bufferSize) override;
+          int bufferSize,
+          bool ignoreMovableObjects) override;
 
 CORINFO_CLASS_HANDLE getStaticFieldCurrentClass(
           CORINFO_FIELD_HANDLE field,

src/coreclr/inc/jiteeversionguid.h

@@ -43,11 +43,11 @@ typedef const GUID *LPCGUID;
 #define GUID_DEFINED
 #endif // !GUID_DEFINED
 
-constexpr GUID JITEEVersionIdentifier = { /* 2ed4cd12-48ed-4a0e-892e-d24d004a5e4c */
-    0x2ed4cd12,
-    0x48ed,
-    0x4a0e,
-    {0x89, 0x2e, 0xd2, 0x4d, 0x00, 0x4a, 0x5e, 0x4c}
+constexpr GUID JITEEVersionIdentifier = { /* 77b6df16-d27f-4118-9dfd-d8073ff20fb6 */
+    0x77b6df16,
+    0xd27f,
+    0x4118,
+    {0x9d, 0xfd, 0xd8, 0x7, 0x3f, 0xf2, 0xf, 0xb6}
   };
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////

src/coreclr/jit/ICorJitInfo_names_generated.h

@@ -102,6 +102,7 @@ DEF_CLR_API(getFieldType)
 DEF_CLR_API(getFieldOffset)
 DEF_CLR_API(getFieldInfo)
 DEF_CLR_API(isFieldStatic)
+DEF_CLR_API(getArrayOrStringLength)
 DEF_CLR_API(getBoundaries)
 DEF_CLR_API(setBoundaries)
 DEF_CLR_API(getVars)

src/coreclr/jit/ICorJitInfo_wrapper_generated.hpp

@@ -376,7 +376,7 @@ int WrapICorJitInfo::getStringLiteral(
 }
 
 size_t WrapICorJitInfo::printObjectDescription(
-          void* handle,
+          CORINFO_OBJECT_HANDLE handle,
           char* buffer,
           size_t bufferSize,
           size_t* pRequiredBufferSize)
@@ -665,17 +665,17 @@ CorInfoHelpFunc WrapICorJitInfo::getUnBoxHelper(
     return temp;
 }
 
-void* WrapICorJitInfo::getRuntimeTypePointer(
+CORINFO_OBJECT_HANDLE WrapICorJitInfo::getRuntimeTypePointer(
           CORINFO_CLASS_HANDLE cls)
 {
     API_ENTER(getRuntimeTypePointer);
-    void* temp = wrapHnd->getRuntimeTypePointer(cls);
+    CORINFO_OBJECT_HANDLE temp = wrapHnd->getRuntimeTypePointer(cls);
     API_LEAVE(getRuntimeTypePointer);
     return temp;
 }
 
 bool WrapICorJitInfo::isObjectImmutable(
-          void* objPtr)
+          CORINFO_OBJECT_HANDLE objPtr)
 {
     API_ENTER(isObjectImmutable);
     bool temp = wrapHnd->isObjectImmutable(objPtr);
@@ -684,7 +684,7 @@ bool WrapICorJitInfo::isObjectImmutable(
 }
 
 CORINFO_CLASS_HANDLE WrapICorJitInfo::getObjectType(
-          void* objPtr)
+          CORINFO_OBJECT_HANDLE objPtr)
 {
     API_ENTER(getObjectType);
     CORINFO_CLASS_HANDLE temp = wrapHnd->getObjectType(objPtr);
@@ -965,6 +965,15 @@ bool WrapICorJitInfo::isFieldStatic(
     return temp;
 }
 
+int WrapICorJitInfo::getArrayOrStringLength(
+          CORINFO_OBJECT_HANDLE objHnd)
+{
+    API_ENTER(getArrayOrStringLength);
+    int temp = wrapHnd->getArrayOrStringLength(objHnd);
+    API_LEAVE(getArrayOrStringLength);
+    return temp;
+}
+
 void WrapICorJitInfo::getBoundaries(
           CORINFO_METHOD_HANDLE ftn,
           unsigned int* cILOffsets,
@@ -1473,10 +1482,11 @@ void* WrapICorJitInfo::getFieldAddress(
 bool WrapICorJitInfo::getReadonlyStaticFieldValue(
           CORINFO_FIELD_HANDLE field,
           uint8_t* buffer,
-          int bufferSize)
+          int bufferSize,
+          bool ignoreMovableObjects)
 {
     API_ENTER(getReadonlyStaticFieldValue);
-    bool temp = wrapHnd->getReadonlyStaticFieldValue(field, buffer, bufferSize);
+    bool temp = wrapHnd->getReadonlyStaticFieldValue(field, buffer, bufferSize, ignoreMovableObjects);
     API_LEAVE(getReadonlyStaticFieldValue);
     return temp;
 }

src/coreclr/jit/assertionprop.cpp

@@ -6127,6 +6127,7 @@ Compiler::fgWalkResult Compiler::optVNConstantPropCurStmt(BasicBlock* block, Sta
         case GT_NEG:
         case GT_CAST:
         case GT_INTRINSIC:
+        case GT_ARR_LENGTH:
             break;
 
         case GT_IND:

src/coreclr/jit/compiler.h

@@ -7779,7 +7779,7 @@ class Compiler
     const char* eeGetFieldName(CORINFO_FIELD_HANDLE fieldHnd, const char** classNamePtr = nullptr);
 
 #if defined(DEBUG)
-    void eePrintObjectDescriptionDescription(const char* prefix, size_t handle);
+    void eePrintObjectDescriptionDescription(const char* prefix, CORINFO_OBJECT_HANDLE handle);
     unsigned eeTryGetClassSize(CORINFO_CLASS_HANDLE clsHnd);
     const char16_t* eeGetShortClassName(CORINFO_CLASS_HANDLE clsHnd);
 #endif

src/coreclr/jit/ee_il_dll.cpp

@@ -1615,15 +1615,15 @@ const char16_t* Compiler::eeGetShortClassName(CORINFO_CLASS_HANDLE clsHnd)
     return param.classNameWidePtr;
 }
 
-void Compiler::eePrintObjectDescriptionDescription(const char* prefix, size_t handle)
+void Compiler::eePrintObjectDescriptionDescription(const char* prefix, CORINFO_OBJECT_HANDLE handle)
 {
     const size_t maxStrSize = 64;
     char         str[maxStrSize];
     size_t       actualLen = 0;
 
     // Ignore potential SPMI failures
     bool success = eeRunFunctorWithSPMIErrorTrap(
-        [&]() { actualLen = this->info.compCompHnd->printObjectDescription((void*)handle, str, maxStrSize); });
+        [&]() { actualLen = this->info.compCompHnd->printObjectDescription(handle, str, maxStrSize); });
 
     if (!success)
     {

src/coreclr/jit/emit.cpp

@@ -4135,7 +4135,7 @@ void emitter::emitDispCommentForHandle(size_t handle, size_t cookie, GenTreeFlag
     else if (flag == GTF_ICON_OBJ_HDL)
     {
 #ifdef DEBUG
-        emitComp->eePrintObjectDescriptionDescription(commentPrefix, handle);
+        emitComp->eePrintObjectDescriptionDescription(commentPrefix, (CORINFO_OBJECT_HANDLE)handle);
 #else
         str                   = "frozen object handle";
 #endif

src/coreclr/jit/gentree.cpp

@@ -11134,7 +11134,7 @@ void Compiler::gtDispConst(GenTree* tree)
             }
             else if (tree->IsIconHandle(GTF_ICON_OBJ_HDL))
             {
-                eePrintObjectDescriptionDescription(" ", tree->AsIntCon()->gtIconVal);
+                eePrintObjectDescriptionDescription(" ", (CORINFO_OBJECT_HANDLE)tree->AsIntCon()->gtIconVal);
             }
             else
             {
@@ -17619,7 +17619,7 @@ CORINFO_CLASS_HANDLE Compiler::gtGetClassHandle(GenTree* tree, bool* pIsExact, b
         {
             if (tree->IsIconHandle(GTF_ICON_OBJ_HDL))
             {
-                objClass = info.compCompHnd->getObjectType((void*)tree->AsIntCon()->IconValue());
+                objClass = info.compCompHnd->getObjectType((CORINFO_OBJECT_HANDLE)tree->AsIntCon()->IconValue());
                 if (objClass != NO_CLASS_HANDLE)
                 {
                     // if we managed to get a class handle it's definitely not null

src/coreclr/jit/importer.cpp

@@ -4344,7 +4344,7 @@ GenTree* Compiler::impImportCnsTreeFromBuffer(uint8_t* buffer, var_types valueTy
         }
         case TYP_REF:
         {
-            void* ptr;
+            size_t ptr;
             memcpy(&ptr, buffer, sizeof(ssize_t));
 
             if (ptr == 0)
@@ -4354,9 +4354,9 @@ GenTree* Compiler::impImportCnsTreeFromBuffer(uint8_t* buffer, var_types valueTy
             else
             {
                 setMethodHasFrozenObjects();
-                tree         = gtNewIconEmbHndNode(ptr, nullptr, GTF_ICON_OBJ_HDL, nullptr);
+                tree         = gtNewIconEmbHndNode((void*)ptr, nullptr, GTF_ICON_OBJ_HDL, nullptr);
                 tree->gtType = TYP_REF;
-                INDEBUG(tree->AsIntCon()->gtTargetHandle = (size_t)ptr);
+                INDEBUG(tree->AsIntCon()->gtTargetHandle = ptr);
             }
             break;
         }

src/coreclr/jit/lower.cpp

@@ -7180,7 +7180,7 @@ void Lowering::LowerStoreIndirCommon(GenTreeStoreInd* ind)
         if (ind->Data()->IsIconHandle(GTF_ICON_OBJ_HDL))
         {
             const ssize_t handle = ind->Data()->AsIntCon()->IconValue();
-            if (!comp->info.compCompHnd->isObjectImmutable(reinterpret_cast<void*>(handle)))
+            if (!comp->info.compCompHnd->isObjectImmutable(reinterpret_cast<CORINFO_OBJECT_HANDLE>(handle)))
             {
                 // On platforms with weaker memory model we need to make sure we use a store with the release semantic
                 // when we publish a potentially mutable object

src/coreclr/jit/morph.cpp

@@ -8298,11 +8298,11 @@ GenTree* Compiler::fgMorphCall(GenTreeCall* call)
         CORINFO_CLASS_HANDLE hClass  = gtGetHelperArgClassHandle(argNode);
         if ((hClass != NO_CLASS_HANDLE) && !gtIsActiveCSE_Candidate(argNode))
         {
-            void* ptr = info.compCompHnd->getRuntimeTypePointer(hClass);
-            if (ptr != nullptr)
+            CORINFO_OBJECT_HANDLE ptr = info.compCompHnd->getRuntimeTypePointer(hClass);
+            if (ptr != NULL)
             {
                 setMethodHasFrozenObjects();
-                GenTree* retNode = gtNewIconEmbHndNode(ptr, nullptr, GTF_ICON_OBJ_HDL, nullptr);
+                GenTree* retNode = gtNewIconEmbHndNode((void*)ptr, nullptr, GTF_ICON_OBJ_HDL, nullptr);
                 retNode->gtType  = TYP_REF;
                 INDEBUG(retNode->AsIntCon()->gtTargetHandle = (size_t)ptr);
                 return fgMorphTree(retNode);